diff --git a/third_party/nixpkgs/.github/CODEOWNERS b/third_party/nixpkgs/.github/CODEOWNERS index 17777b0587..7d6d7205a1 100644 --- a/third_party/nixpkgs/.github/CODEOWNERS +++ b/third_party/nixpkgs/.github/CODEOWNERS @@ -96,8 +96,8 @@ /pkgs/development/ruby-modules @alyssais # Rust -/pkgs/development/compilers/rust @Mic92 @LnL7 -/pkgs/build-support/rust @andir +/pkgs/development/compilers/rust @Mic92 @LnL7 @zowoq +/pkgs/build-support/rust @andir @zowoq # Darwin-related /pkgs/stdenv/darwin @NixOS/darwin-maintainers diff --git a/third_party/nixpkgs/.github/CONTRIBUTING.md b/third_party/nixpkgs/.github/CONTRIBUTING.md index fd2a6073df..8ec9d53533 100644 --- a/third_party/nixpkgs/.github/CONTRIBUTING.md +++ b/third_party/nixpkgs/.github/CONTRIBUTING.md @@ -53,10 +53,10 @@ For package version upgrades and such a one-line commit message is usually suffi Follow these steps to backport a change into a release branch in compliance with the [commit policy](https://nixos.org/nixpkgs/manual/#submitting-changes-stable-release-branches). 1. Take note of the commits in which the change was introduced into `master` branch. -2. Check out the target _release branch_, e.g. `release-20.03`. Do not use a _channel branch_ like `nixos-20.03` or `nixpkgs-20.03`. +2. Check out the target _release branch_, e.g. `release-20.09`. Do not use a _channel branch_ like `nixos-20.09` or `nixpkgs-20.09`. 3. Create a branch for your change, e.g. `git checkout -b backport`. 4. When the reason to backport is not obvious from the original commit message, use `git cherry-pick -xe ` and add a reason. Otherwise use `git cherry-pick -x `. That's fine for minor version updates that only include security and bug fixes, commits that fixes an otherwise broken package or similar. Please also ensure the commits exists on the master branch; in the case of squashed or rebased merges, the commit hash will change and the new commits can be found in the merge message at the bottom of the master pull request. -5. Push to GitHub and open a backport pull request. Make sure to select the release branch (e.g. `release-20.03`) as the target branch of the pull request, and link to the pull request in which the original change was comitted to `master`. The pull request title should be the commit title with the release version as prefix, e.g. `[20.03]`. +5. Push to GitHub and open a backport pull request. Make sure to select the release branch (e.g. `release-20.09`) as the target branch of the pull request, and link to the pull request in which the original change was comitted to `master`. The pull request title should be the commit title with the release version as prefix, e.g. `[20.09]`. ## Reviewing contributions diff --git a/third_party/nixpkgs/.github/STALE-BOT.md b/third_party/nixpkgs/.github/STALE-BOT.md new file mode 100644 index 0000000000..3b1599baeb --- /dev/null +++ b/third_party/nixpkgs/.github/STALE-BOT.md @@ -0,0 +1,34 @@ +# Stale bot information + +- Thanks for your contribution! +- To remove the stale label, just leave a new comment. +- _How to find the right people to ping?_ → [`git blame`](https://git-scm.com/docs/git-blame) to the rescue! (or GitHub's history and blame buttons.) +- You can always ask for help on [our Discourse Forum](https://discourse.nixos.org/) or on the [#nixos IRC channel](https://webchat.freenode.net/#nixos). + +## Suggestions for PRs + +1. If it is unfinished but you plan to finish it, please mark it as a draft. +2. If you don't expect to work on it any time soon, closing it with a short comment may encourage someone else to pick up your work. +3. To get things rolling again, rebase the PR against the target branch and address valid comments. +4. If you need a review to move forward, ask in [the Discourse thread for PRs that need help](https://discourse.nixos.org/t/prs-in-distress/3604). +5. If all you need is a merge, check the git history to find and [request reviews](https://docs.github.com/en/github/collaborating-with-issues-and-pull-requests/requesting-a-pull-request-review) from people who usually merge related contributions. + +## Suggestions for issues + +1. If it is resolved (either for you personally, or in general), please consider closing it. +2. If this might still be an issue, but you are not interested in promoting its resolution, please consider closing it while encouraging others to take over and reopen an issue if they care enough. +3. If you still have interest in resolving it, try to ping somebody who you believe might have an interest in the topic. Consider discussing the problem in [our Discourse Forum](https://discourse.nixos.org/). +4. As with all open source projects, your best option is to submit a Pull Request that addresses this issue. We :heart: this attitude! + +**Memorandum on closing issues** + +Don't be afraid to close an issue that holds valuable information. Closed issues stay in the system for people to search, read, cross-reference, or even reopen--nothing is lost! Closing obsolete issues is an important way to help maintainers focus their time and effort. + +## Useful GitHub search queries + +- [Open PRs with any stale-bot interaction](https://github.com/NixOS/nixpkgs/pulls?q=is%3Apr+is%3Aopen+commenter%3Aapp%2Fstale+) +- [Open PRs with any stale-bot interaction and `2.status: stale`](https://github.com/NixOS/nixpkgs/pulls?q=is%3Apr+is%3Aopen+commenter%3Aapp%2Fstale+label%3A%222.status%3A+stale%22) +- [Open PRs with any stale-bot interaction and NOT `2.status: stale`](https://github.com/NixOS/nixpkgs/pulls?q=is%3Apr+is%3Aopen+commenter%3Aapp%2Fstale+-label%3A%222.status%3A+stale%22+) +- [Open Issues with any stale-bot interaction](https://github.com/NixOS/nixpkgs/issues?q=is%3Aissue+is%3Aopen+commenter%3Aapp%2Fstale+) +- [Open Issues with any stale-bot interaction and `2.status: stale`](https://github.com/NixOS/nixpkgs/issues?q=is%3Aissue+is%3Aopen+commenter%3Aapp%2Fstale+label%3A%222.status%3A+stale%22+) +- [Open Issues with any stale-bot interaction and NOT `2.status: stale`](https://github.com/NixOS/nixpkgs/issues?q=is%3Aissue+is%3Aopen+commenter%3Aapp%2Fstale+-label%3A%222.status%3A+stale%22+) diff --git a/third_party/nixpkgs/.github/stale.yml b/third_party/nixpkgs/.github/stale.yml index 606d5637cc..b5e6ec93ba 100644 --- a/third_party/nixpkgs/.github/stale.yml +++ b/third_party/nixpkgs/.github/stale.yml @@ -1,41 +1,10 @@ # Configuration for probot-stale - https://github.com/probot/stale -# Number of days of inactivity before an issue becomes stale daysUntilStale: 180 -# Number of days of inactivity before a stale issue is closed daysUntilClose: false -# Issues with these labels will never be considered stale exemptLabels: - "1.severity: security" -# Label to use when marking an issue as stale + - "2.status: never-stale" staleLabel: "2.status: stale" -# Comment to post when marking an issue as stale. Set to `false` to disable -pulls: - markComment: | - Hello, I'm a bot and I thank you in the name of the community for your contributions. - - Nixpkgs is a busy repository, and unfortunately sometimes PRs get left behind for too long. Nevertheless, we'd like to help committers reach the PRs that are still important. This PR has had no activity for 180 days, and so I marked it as stale, but you can rest assured it will never be closed by a non-human. - - If this is still important to you and you'd like to remove the stale label, we ask that you leave a comment. Your comment can be as simple as "still important to me". But there's a bit more you can do: - - If you received an approval by an unprivileged maintainer and you are just waiting for a merge, you can @ mention someone with merge permissions and ask them to help. You might be able to find someone relevant by using [Git blame](https://git-scm.com/docs/git-blame) on the relevant files, or via [GitHub's web interface](https://docs.github.com/en/github/managing-files-in-a-repository/tracking-changes-in-a-file). You can see if someone's a member of the [nixpkgs-committers](https://github.com/orgs/NixOS/teams/nixpkgs-committers) team, by hovering with the mouse over their username on the web interface, or by searching them directly on [the list](https://github.com/orgs/NixOS/teams/nixpkgs-committers). - - If your PR wasn't reviewed at all, it might help to find someone who's perhaps a user of the package or module you are changing, or alternatively, ask once more for a review by the maintainer of the package/module this is about. If you don't know any, you can use [Git blame](https://git-scm.com/docs/git-blame) on the relevant files, or [GitHub's web interface](https://docs.github.com/en/github/managing-files-in-a-repository/tracking-changes-in-a-file) to find someone who touched the relevant files in the past. - - If your PR has had reviews and nevertheless got stale, make sure you've responded to all of the reviewer's requests / questions. Usually when PR authors show responsibility and dedication, reviewers (privileged or not) show dedication as well. If you've pushed a change, it's possible the reviewer wasn't notified about your push via email, so you can always [officially request them for a review](https://docs.github.com/en/github/collaborating-with-issues-and-pull-requests/requesting-a-pull-request-review), or just @ mention them and say you've addressed their comments. - - Lastly, you can always ask for help at [our Discourse Forum](https://discourse.nixos.org/), or more specifically, [at this thread](https://discourse.nixos.org/t/prs-in-distress/3604) or at [#nixos' IRC channel](https://webchat.freenode.net/#nixos). - -issues: - markComment: | - Hello, I'm a bot and I thank you in the name of the community for opening this issue. - - To help our human contributors focus on the most-relevant reports, I check up on old issues to see if they're still relevant. This issue has had no activity for 180 days, and so I marked it as stale, but you can rest assured it will never be closed by a non-human. - - The community would appreciate your effort in checking if the issue is still valid. If it isn't, please close it. - - If the issue persists, and you'd like to remove the stale label, you simply need to leave a comment. Your comment can be as simple as "still important to me". If you'd like it to get more attention, you can ask for help by searching for maintainers and people that previously touched related code and @ mention them in a comment. You can use [Git blame](https://git-scm.com/docs/git-blame) or [GitHub's web interface](https://docs.github.com/en/github/managing-files-in-a-repository/tracking-changes-in-a-file) on the relevant files to find them. - - Lastly, you can always ask for help at [our Discourse Forum](https://discourse.nixos.org/) or at [#nixos' IRC channel](https://webchat.freenode.net/#nixos). - -# Comment to post when closing a stale issue. Set to `false` to disable +markComment: | + I marked this as stale due to inactivity. → [More info](https://github.com/NixOS/nixpkgs/blob/master/.github/STALE-BOT.md) closeComment: false diff --git a/third_party/nixpkgs/README.md b/third_party/nixpkgs/README.md index d1187b3728..70d50e5efc 100644 --- a/third_party/nixpkgs/README.md +++ b/third_party/nixpkgs/README.md @@ -46,9 +46,9 @@ Nixpkgs and NixOS are built and tested by our continuous integration system, [Hydra](https://hydra.nixos.org/). * [Continuous package builds for unstable/master](https://hydra.nixos.org/jobset/nixos/trunk-combined) -* [Continuous package builds for the NixOS 20.03 release](https://hydra.nixos.org/jobset/nixos/release-20.03) +* [Continuous package builds for the NixOS 20.09 release](https://hydra.nixos.org/jobset/nixos/release-20.09) * [Tests for unstable/master](https://hydra.nixos.org/job/nixos/trunk-combined/tested#tabs-constituents) -* [Tests for the NixOS 20.03 release](https://hydra.nixos.org/job/nixos/release-20.03/tested#tabs-constituents) +* [Tests for the NixOS 20.09 release](https://hydra.nixos.org/job/nixos/release-20.09/tested#tabs-constituents) Artifacts successfully built with Hydra are published to cache at https://cache.nixos.org/. When successful build and test criteria are diff --git a/third_party/nixpkgs/doc/languages-frameworks/haskell.section.md b/third_party/nixpkgs/doc/languages-frameworks/haskell.section.md index c2838c733c..67318a5b74 100644 --- a/third_party/nixpkgs/doc/languages-frameworks/haskell.section.md +++ b/third_party/nixpkgs/doc/languages-frameworks/haskell.section.md @@ -3,1125 +3,11 @@ title: User's Guide for Haskell in Nixpkgs author: Peter Simons date: 2015-06-01 --- + # Haskell - -## How to install Haskell packages - -Nixpkgs distributes build instructions for all Haskell packages registered on -[Hackage](http://hackage.haskell.org/), but strangely enough normal Nix package -lookups don't seem to discover any of them, except for the default version of ghc, cabal-install, and stack: -``` -$ nix-env -i alex -error: selector ‘alex’ matches no derivations -$ nix-env -qa ghc -ghc-7.10.2 -``` - -The Haskell package set is not registered in the top-level namespace because it -is *huge*. If all Haskell packages were visible to these commands, then -name-based search/install operations would be much slower than they are now. We -avoided that by keeping all Haskell-related packages in a separate attribute -set called `haskellPackages`, which the following command will list: -``` -$ nix-env -f "" -qaP -A haskellPackages -haskellPackages.a50 a50-0.5 -haskellPackages.AAI AAI-0.2.0.1 -haskellPackages.abacate abacate-0.0.0.0 -haskellPackages.abc-puzzle abc-puzzle-0.2.1 -haskellPackages.abcBridge abcBridge-0.15 -haskellPackages.abcnotation abcnotation-1.9.0 -haskellPackages.abeson abeson-0.1.0.1 -[... some 14000 entries omitted ...] -``` - -To install any of those packages into your profile, refer to them by their -attribute path (first column): -```shell -nix-env -f "" -iA haskellPackages.Allure ... -``` - -The attribute path of any Haskell packages corresponds to the name of that -particular package on Hackage: the package `cabal-install` has the attribute -`haskellPackages.cabal-install`, and so on. (Actually, this convention causes -trouble with packages like `3dmodels` and `4Blocks`, because these names are -invalid identifiers in the Nix language. The issue of how to deal with these -rare corner cases is currently unresolved.) - -Haskell packages whose Nix name (second column) begins with a `haskell-` prefix -are packages that provide a library whereas packages without that prefix -provide just executables. Libraries may provide executables too, though: the -package `haskell-pandoc`, for example, installs both a library and an -application. You can install and use Haskell executables just like any other -program in Nixpkgs, but using Haskell libraries for development is a bit -trickier and we'll address that subject in great detail in section [How to -create a development environment](#how-to-create-a-development-environment). - -Attribute paths are deterministic inside of Nixpkgs, but the path necessary to -reach Nixpkgs varies from system to system. We dodged that problem by giving -`nix-env` an explicit `-f ""` parameter, but if you call `nix-env` -without that flag, then chances are the invocation fails: -``` -$ nix-env -iA haskellPackages.cabal-install -error: attribute ‘haskellPackages’ in selection path - ‘haskellPackages.cabal-install’ not found -``` - -On NixOS, for example, Nixpkgs does *not* exist in the top-level namespace by -default. To figure out the proper attribute path, it's easiest to query for the -path of a well-known Nixpkgs package, i.e.: -``` -$ nix-env -qaP coreutils -nixos.coreutils coreutils-8.23 -``` - -If your system responds like that (most NixOS installations will), then the -attribute path to `haskellPackages` is `nixos.haskellPackages`. Thus, if you -want to use `nix-env` without giving an explicit `-f` flag, then that's the way -to do it: -```shell -nix-env -qaP -A nixos.haskellPackages -nix-env -iA nixos.haskellPackages.cabal-install -``` - -Our current default compiler is GHC 8.8.x and the `haskellPackages` set -contains packages built with that particular version. Nixpkgs contains the last -three major releases of GHC and there is a whole family of package sets -available that defines Hackage packages built with each of those compilers, -too: -```shell -nix-env -f "" -qaP -A haskell.packages.ghc865 -nix-env -f "" -qaP -A haskell.packages.ghc8101 -``` - -The name `haskellPackages` is really just a synonym for -`haskell.packages.ghc882`, because we prefer that package set internally and -recommend it to our users as their default choice, but ultimately you are free -to compile your Haskell packages with any GHC version you please. The following -command displays the complete list of available compilers: -``` -$ nix-env -f "" -qaP -A haskell.compiler -haskell.compiler.ghc8101 ghc-8.10.1 -haskell.compiler.integer-simple.ghc8101 ghc-8.10.1 -haskell.compiler.ghcHEAD ghc-8.11.20200505 -haskell.compiler.integer-simple.ghcHEAD ghc-8.11.20200505 -haskell.compiler.ghc822Binary ghc-8.2.2-binary -haskell.compiler.ghc844 ghc-8.4.4 -haskell.compiler.ghc863Binary ghc-8.6.3-binary -haskell.compiler.ghc865 ghc-8.6.5 -haskell.compiler.integer-simple.ghc865 ghc-8.6.5 -haskell.compiler.ghc882 ghc-8.8.2 -haskell.compiler.integer-simple.ghc882 ghc-8.8.2 -haskell.compiler.ghc883 ghc-8.8.3 -haskell.compiler.integer-simple.ghc883 ghc-8.8.3 -haskell.compiler.ghcjs ghcjs-8.6.0.1 -``` - -We have no package sets for `jhc` or `uhc` yet, unfortunately, but for every -version of GHC listed above, there exists a package set based on that compiler. -Also, the attributes `haskell.compiler.ghcXYC` and -`haskell.packages.ghcXYC.ghc` are synonymous for the sake of convenience. - -## How to create a development environment - -### How to install a compiler - -A simple development environment consists of a Haskell compiler and one or both -of the tools `cabal-install` and `stack`. We saw in section -[How to install Haskell packages](#how-to-install-haskell-packages) how you can install those programs into your -user profile: -```shell -nix-env -f "" -iA haskellPackages.ghc haskellPackages.cabal-install -``` - -Instead of the default package set `haskellPackages`, you can also use the more -precise name `haskell.compiler.ghc7102`, which has the advantage that it refers -to the same GHC version regardless of what Nixpkgs considers "default" at any -given time. - -Once you've made those tools available in `$PATH`, it's possible to build -Hackage packages the same way people without access to Nix do it all the time: -```shell -cabal get lens-4.11 && cd lens-4.11 -cabal install -j --dependencies-only -cabal configure -cabal build -``` - -If you enjoy working with Cabal sandboxes, then that's entirely possible too: -just execute the command -```shell -cabal sandbox init -``` -before installing the required dependencies. - -The `nix-shell` utility makes it easy to switch to a different compiler -version; just enter the Nix shell environment with the command -```shell -nix-shell -p haskell.compiler.ghc784 -``` -to bring GHC 7.8.4 into `$PATH`. Alternatively, you can use Stack instead of -`nix-shell` directly to select compiler versions and other build tools -per-project. It uses `nix-shell` under the hood when Nix support is turned on. -See [How to build a Haskell project using Stack](#how-to-build-a-haskell-project-using-stack). - -If you're using `cabal-install`, re-running `cabal configure` inside the spawned -shell switches your build to use that compiler instead. If you're working on -a project that doesn't depend on any additional system libraries outside of GHC, -then it's even sufficient to just run the `cabal configure` command inside of -the shell: -```shell -nix-shell -p haskell.compiler.ghc784 --command "cabal configure" -``` - -Afterwards, all other commands like `cabal build` work just fine in any shell -environment, because the configure phase recorded the absolute paths to all -required tools like GHC in its build configuration inside of the `dist/` -directory. Please note, however, that `nix-collect-garbage` can break such an -environment because the Nix store paths created by `nix-shell` aren't "alive" -anymore once `nix-shell` has terminated. If you find that your Haskell builds -no longer work after garbage collection, then you'll have to re-run `cabal -configure` inside of a new `nix-shell` environment. - -### How to install a compiler with libraries - -GHC expects to find all installed libraries inside of its own `lib` directory. -This approach works fine on traditional Unix systems, but it doesn't work for -Nix, because GHC's store path is immutable once it's built. We cannot install -additional libraries into that location. As a consequence, our copies of GHC -don't know any packages except their own core libraries, like `base`, -`containers`, `Cabal`, etc. - -We can register additional libraries to GHC, however, using a special build -function called `ghcWithPackages`. That function expects one argument: a -function that maps from an attribute set of Haskell packages to a list of -packages, which determines the libraries known to that particular version of -GHC. For example, the Nix expression `ghcWithPackages (pkgs: [pkgs.mtl])` -generates a copy of GHC that has the `mtl` library registered in addition to -its normal core packages: -``` -$ nix-shell -p "haskellPackages.ghcWithPackages (pkgs: [pkgs.mtl])" - -[nix-shell:~]$ ghc-pkg list mtl -/nix/store/zy79...-ghc-7.10.2/lib/ghc-7.10.2/package.conf.d: - mtl-2.2.1 -``` - -This function allows users to define their own development environment by means -of an override. After adding the following snippet to `~/.config/nixpkgs/config.nix`, -```nix -{ - packageOverrides = super: let self = super.pkgs; in - { - myHaskellEnv = self.haskell.packages.ghc7102.ghcWithPackages - (haskellPackages: with haskellPackages; [ - # libraries - arrows async cgi criterion - # tools - cabal-install haskintex - ]); - }; -} -``` -it's possible to install that compiler with `nix-env -f "" -iA -myHaskellEnv`. If you'd like to switch that development environment to a -different version of GHC, just replace the `ghc7102` bit in the previous -definition with the appropriate name. Of course, it's also possible to define -any number of these development environments! (You can't install two of them -into the same profile at the same time, though, because that would result in -file conflicts.) - -The generated `ghc` program is a wrapper script that re-directs the real -GHC executable to use a new `lib` directory --- one that we specifically -constructed to contain all those packages the user requested: -``` -$ cat $(type -p ghc) -#! /nix/store/xlxj...-bash-4.3-p33/bin/bash -e -export NIX_GHC=/nix/store/19sm...-ghc-7.10.2/bin/ghc -export NIX_GHCPKG=/nix/store/19sm...-ghc-7.10.2/bin/ghc-pkg -export NIX_GHC_DOCDIR=/nix/store/19sm...-ghc-7.10.2/share/doc/ghc/html -export NIX_GHC_LIBDIR=/nix/store/19sm...-ghc-7.10.2/lib/ghc-7.10.2 -exec /nix/store/j50p...-ghc-7.10.2/bin/ghc "-B$NIX_GHC_LIBDIR" "$@" -``` - -The variables `$NIX_GHC`, `$NIX_GHCPKG`, etc. point to the *new* store path -`ghcWithPackages` constructed specifically for this environment. The last line -of the wrapper script then executes the real `ghc`, but passes the path to the -new `lib` directory using GHC's `-B` flag. - -The purpose of those environment variables is to work around an impurity in the -popular [ghc-paths](http://hackage.haskell.org/package/ghc-paths) library. That -library promises to give its users access to GHC's installation paths. Only, -the library can't possible know that path when it's compiled, because the path -GHC considers its own is determined only much later, when the user configures -it through `ghcWithPackages`. So we [patched -ghc-paths](https://github.com/NixOS/nixpkgs/blob/master/pkgs/development/haskell-modules/patches/ghc-paths-nix.patch) -to return the paths found in those environment variables at run-time rather -than trying to guess them at compile-time. - -To make sure that mechanism works properly all the time, we recommend that you -set those variables to meaningful values in your shell environment, too, i.e. -by adding the following code to your `~/.bashrc`: -```bash -if type >/dev/null 2>&1 -p ghc; then - eval "$(egrep ^export "$(type -p ghc)")" -fi -``` - -If you are certain that you'll use only one GHC environment which is located in -your user profile, then you can use the following code, too, which has the -advantage that it doesn't contain any paths from the Nix store, i.e. those -settings always remain valid even if a `nix-env -u` operation updates the GHC -environment in your profile: -```bash -if [ -e ~/.nix-profile/bin/ghc ]; then - export NIX_GHC="$HOME/.nix-profile/bin/ghc" - export NIX_GHCPKG="$HOME/.nix-profile/bin/ghc-pkg" - export NIX_GHC_DOCDIR="$HOME/.nix-profile/share/doc/ghc/html" - export NIX_GHC_LIBDIR="$HOME/.nix-profile/lib/ghc-$($NIX_GHC --numeric-version)" -fi -``` - -### How to install a compiler with libraries, hoogle and documentation indexes - -If you plan to use your environment for interactive programming, not just -compiling random Haskell code, you might want to replace `ghcWithPackages` in -all the listings above with `ghcWithHoogle`. - -This environment generator not only produces an environment with GHC and all -the specified libraries, but also generates a `hoogle` and `haddock` indexes -for all the packages, and provides a wrapper script around `hoogle` binary that -uses all those things. A precise name for this thing would be -"`ghcWithPackagesAndHoogleAndDocumentationIndexes`", which is, regrettably, too -long and scary. - -For example, installing the following environment -```nix -{ - packageOverrides = super: let self = super.pkgs; in - { - myHaskellEnv = self.haskellPackages.ghcWithHoogle - (haskellPackages: with haskellPackages; [ - # libraries - arrows async cgi criterion - # tools - cabal-install haskintex - ]); - }; -} -``` -allows one to browse module documentation index [not too dissimilar to -this](https://downloads.haskell.org/~ghc/latest/docs/html/libraries/index.html) -for all the specified packages and their dependencies by directing a browser of -choice to `~/.nix-profile/share/doc/hoogle/index.html` (or -`/run/current-system/sw/share/doc/hoogle/index.html` in case you put it in -`environment.systemPackages` in NixOS). - -After you've marveled enough at that try adding the following to your -`~/.ghc/ghci.conf` -``` -:def hoogle \s -> return $ ":! hoogle search -cl --count=15 \"" ++ s ++ "\"" -:def doc \s -> return $ ":! hoogle search -cl --info \"" ++ s ++ "\"" -``` -and test it by typing into `ghci`: -``` -:hoogle a -> a -:doc a -> a -``` - -Be sure to note the links to `haddock` files in the output. With any modern and -properly configured terminal emulator you can just click those links to -navigate there. - -Finally, you can run -```shell -hoogle server --local -p 8080 -``` -and navigate to http://localhost:8080/ for your own local -[Hoogle](https://www.haskell.org/hoogle/). The `--local` flag makes the hoogle -server serve files from your nix store over http, without the flag it will use -`file://` URIs. Note, however, that Firefox and possibly other browsers -disallow navigation from `http://` to `file://` URIs for security reasons, -which might be quite an inconvenience. Versions before v5 did not have this -flag. See -[this page](http://kb.mozillazine.org/Links_to_local_pages_do_not_work) for -workarounds. - -For NixOS users there's a service which runs this exact command for you. -Specify the `packages` you want documentation for and the `haskellPackages` set -you want them to come from. Add the following to `configuration.nix`. - -```nix -services.hoogle = { - enable = true; - packages = (hpkgs: with hpkgs; [text cryptonite]); - haskellPackages = pkgs.haskellPackages; -}; -``` - -### How to install haskell-language-server - -In short: Install `pkgs.haskell-language-server` and use the -`haskell-language-server-wrapper` command to run it. See the [hls -README](https://github.com/haskell/haskell-language-server) on how to configure -your text editor to use hls and how to test your setup. - -Hls needs to be compiled with the ghc version of the project you use it on. - -`pkgs.haskell-language-server` provides `haskell-language-server-wrapper`, -`haskell-language-server`, `haskell-language-server-x.x` and -`haskell-language-server-x.x.x` binaries, where `x.x.x` is the ghc version for -which it is compiled. By default it includes binaries for all ghc versions -that are provided in the binary caches. You can override that list with e.g. - -```nix -pkgs.haskell-language-server.override { supportedGhcVersions = [ "884" "901" ]; } -``` - -When you run `haskell-language-server-wrapper` it will detect the ghc version -used by the project you are working on (by asking e.g. cabal or stack) and pick -the appropriate above mentioned binary from your path. - -Be careful when installing hls globally and using a pinned nixpkgs for a Haskell -project in a nix-shell. If the nixpkgs versions deviate to much (e.g. use -different `glibc` versions) hls might fail. It is recommended to then install hls -in the nix-shell from the nixpkgs version pinned in there. - -If you know, that you only use one ghc version, e.g. in a project specific -nix-shell You can either use an override as given above or simply install -`pkgs.haskellPackages.haskell-language-server` instead of the top-level -attribute `pkgs.haskell-language-server`. - -### How to build a Haskell project using Stack - -[Stack](http://haskellstack.org) is a popular build tool for Haskell projects. -It has first-class support for Nix. Stack can optionally use Nix to -automatically select the right version of GHC and other build tools to build, -test and execute apps in an existing project downloaded from somewhere on the -Internet. Pass the `--nix` flag to any `stack` command to do so, e.g. -```shell -git clone --recurse-submodules https://github.com/yesodweb/wai.git -cd wai -stack --nix build -``` - -If you want `stack` to use Nix by default, you can add a `nix` section to the -`stack.yaml` file, as explained in the [Stack documentation][stack-nix-doc]. For -example: -```yaml -nix: - enable: true - packages: [pkgconfig zeromq zlib] -``` - -The example configuration snippet above tells Stack to create an ad hoc -environment for `nix-shell` as in the below section, in which the `pkgconfig`, -`zeromq` and `zlib` packages from Nixpkgs are available. All `stack` commands -will implicitly be executed inside this ad hoc environment. - -Some projects have more sophisticated needs. For examples, some ad hoc -environments might need to expose Nixpkgs packages compiled in a certain way, or -with extra environment variables. In these cases, you'll need a `shell` field -instead of `packages`: -```yaml -nix: - enable: true - shell-file: shell.nix -``` - -For more on how to write a `shell.nix` file see the below section. You'll need -to express a derivation. Note that Nixpkgs ships with a convenience wrapper -function around `mkDerivation` called `haskell.lib.buildStackProject` to help you -create this derivation in exactly the way Stack expects. However for this to work -you need to disable the sandbox, which you can do by using `--option sandbox relaxed` -or `--option sandbox false` to the Nix command. All of the same inputs -as `mkDerivation` can be provided. For example, to build a Stack project that -including packages that link against a version of the R library compiled with -special options turned on: -```nix -with (import { }); - -let R = pkgs.R.override { enableStrictBarrier = true; }; -in -haskell.lib.buildStackProject { - name = "HaskellR"; - buildInputs = [ R zeromq zlib ]; -} -``` - -You can select a particular GHC version to compile with by setting the -`ghc` attribute as an argument to `buildStackProject`. Better yet, let -Stack choose what GHC version it wants based on the snapshot specified -in `stack.yaml` (only works with Stack >= 1.1.3): -```nix -{nixpkgs ? import { }, ghc ? nixpkgs.ghc}: - -with nixpkgs; - -let R = pkgs.R.override { enableStrictBarrier = true; }; -in -haskell.lib.buildStackProject { - name = "HaskellR"; - buildInputs = [ R zeromq zlib ]; - inherit ghc; -} -``` - -[stack-nix-doc]: http://docs.haskellstack.org/en/stable/nix_integration.html - -### How to create ad hoc environments for `nix-shell` - -The easiest way to create an ad hoc development environment is to run -`nix-shell` with the appropriate GHC environment given on the command-line: -```shell -nix-shell -p "haskellPackages.ghcWithPackages (pkgs: with pkgs; [mtl pandoc])" -``` - -For more sophisticated use-cases, however, it's more convenient to save the -desired configuration in a file called `shell.nix` that looks like this: -```nix -{ nixpkgs ? import {}, compiler ? "ghc7102" }: -let - inherit (nixpkgs) pkgs; - ghc = pkgs.haskell.packages.${compiler}.ghcWithPackages (ps: with ps; [ - monad-par mtl - ]); -in -pkgs.stdenv.mkDerivation { - name = "my-haskell-env-0"; - buildInputs = [ ghc ]; - shellHook = "eval $(egrep ^export ${ghc}/bin/ghc)"; -} -``` - -Now run `nix-shell` --- or even `nix-shell --pure` --- to enter a shell -environment that has the appropriate compiler in `$PATH`. If you use `--pure`, -then add all other packages that your development environment needs into the -`buildInputs` attribute. If you'd like to switch to a different compiler -version, then pass an appropriate `compiler` argument to the expression, i.e. -`nix-shell --argstr compiler ghc784`. - -If you need such an environment because you'd like to compile a Hackage package -outside of Nix --- i.e. because you're hacking on the latest version from Git ----, then the package set provides suitable nix-shell environments for you -already! Every Haskell package has an `env` attribute that provides a shell -environment suitable for compiling that particular package. If you'd like to -hack the `lens` library, for example, then you just have to check out the -source code and enter the appropriate environment: -``` -$ cabal get lens-4.11 && cd lens-4.11 -Downloading lens-4.11... -Unpacking to lens-4.11/ - -$ nix-shell "" -A haskellPackages.lens.env -[nix-shell:/tmp/lens-4.11]$ -``` - -At point, you can run `cabal configure`, `cabal build`, and all the other -development commands. Note that you need `cabal-install` installed in your -`$PATH` already to use it here --- the `nix-shell` environment does not provide -it. - -## How to create Nix builds for your own private Haskell packages - -If your own Haskell packages have build instructions for Cabal, then you can -convert those automatically into build instructions for Nix using the -`cabal2nix` utility, which you can install into your profile by running -`nix-env -i cabal2nix`. - -### How to build a stand-alone project - -For example, let's assume that you're working on a private project called -`foo`. To generate a Nix build expression for it, change into the project's -top-level directory and run the command: -```shell -cabal2nix . > foo.nix -``` -Then write the following snippet into a file called `default.nix`: -```nix -{ nixpkgs ? import {}, compiler ? "ghc7102" }: -nixpkgs.pkgs.haskell.packages.${compiler}.callPackage ./foo.nix { } -``` - -Finally, store the following code in a file called `shell.nix`: -```nix -{ nixpkgs ? import {}, compiler ? "ghc7102" }: -(import ./default.nix { inherit nixpkgs compiler; }).env -``` - -At this point, you can run `nix-build` to have Nix compile your project and -install it into a Nix store path. The local directory will contain a symlink -called `result` after `nix-build` returns that points into that location. Of -course, passing the flag `--argstr compiler ghc763` allows switching the build -to any version of GHC currently supported. - -Furthermore, you can call `nix-shell` to enter an interactive development -environment in which you can use `cabal configure` and `cabal build` to develop -your code. That environment will automatically contain a proper GHC derivation -with all the required libraries registered as well as all the system-level -libraries your package might need. - -If your package does not depend on any system-level libraries, then it's -sufficient to run -```shell -nix-shell --command "cabal configure" -``` -once to set up your build. `cabal-install` determines the absolute paths to all -resources required for the build and writes them into a config file in the -`dist/` directory. Once that's done, you can run `cabal build` and any other -command for that project even outside of the `nix-shell` environment. This -feature is particularly nice for those of us who like to edit their code with -an IDE, like Emacs' `haskell-mode`, because it's not necessary to start Emacs -inside of nix-shell just to make it find out the necessary settings for -building the project; `cabal-install` has already done that for us. - -If you want to do some quick-and-dirty hacking and don't want to bother setting -up a `default.nix` and `shell.nix` file manually, then you can use the -`--shell` flag offered by `cabal2nix` to have it generate a stand-alone -`nix-shell` environment for you. With that feature, running -```shell -cabal2nix --shell . > shell.nix -nix-shell --command "cabal configure" -``` -is usually enough to set up a build environment for any given Haskell package. -You can even use that generated file to run `nix-build`, too: -```shell -nix-build shell.nix -``` - -### How to build projects that depend on each other - -If you have multiple private Haskell packages that depend on each other, then -you'll have to register those packages in the Nixpkgs set to make them visible -for the dependency resolution performed by `callPackage`. First of all, change -into each of your projects top-level directories and generate a `default.nix` -file with `cabal2nix`: -```shell -cd ~/src/foo && cabal2nix . > default.nix -cd ~/src/bar && cabal2nix . > default.nix -``` -Then edit your `~/.config/nixpkgs/config.nix` file to register those builds in the -default Haskell package set: -```nix -{ - packageOverrides = super: let self = super.pkgs; in - { - haskellPackages = super.haskellPackages.override { - overrides = self: super: { - foo = self.callPackage ../src/foo {}; - bar = self.callPackage ../src/bar {}; - }; - }; - }; -} -``` -Once that's accomplished, `nix-env -f "" -qA haskellPackages` will -show your packages like any other package from Hackage, and you can build them -```shell -nix-build "" -A haskellPackages.foo -``` -or enter an interactive shell environment suitable for building them: -```shell -nix-shell "" -A haskellPackages.bar.env -``` - -## Miscellaneous Topics - -### How to build with profiling enabled - -Every Haskell package set takes a function called `overrides` that you can use -to manipulate the package as much as you please. One useful application of this -feature is to replace the default `mkDerivation` function with one that enables -library profiling for all packages. To accomplish that add the following -snippet to your `~/.config/nixpkgs/config.nix` file: -```nix -{ - packageOverrides = super: let self = super.pkgs; in - { - profiledHaskellPackages = self.haskellPackages.override { - overrides = self: super: { - mkDerivation = args: super.mkDerivation (args // { - enableLibraryProfiling = true; - }); - }; - }; - }; -} -``` -Then, replace instances of `haskellPackages` in the `cabal2nix`-generated -`default.nix` or `shell.nix` files with `profiledHaskellPackages`. - -### How to override package versions in a compiler-specific package set - -Nixpkgs provides the latest version of -[`ghc-events`](http://hackage.haskell.org/package/ghc-events), which is 0.4.4.0 -at the time of this writing. This is fine for users of GHC 7.10.x, but GHC -7.8.4 cannot compile that binary. Now, one way to solve that problem is to -register an older version of `ghc-events` in the 7.8.x-specific package set. -The first step is to generate Nix build instructions with `cabal2nix`: -```shell -cabal2nix cabal://ghc-events-0.4.3.0 > ~/.nixpkgs/ghc-events-0.4.3.0.nix -``` -Then add the override in `~/.config/nixpkgs/config.nix`: -```nix -{ - packageOverrides = super: let self = super.pkgs; in - { - haskell = super.haskell // { - packages = super.haskell.packages // { - ghc784 = super.haskell.packages.ghc784.override { - overrides = self: super: { - ghc-events = self.callPackage ./ghc-events-0.4.3.0.nix {}; - }; - }; - }; - }; - }; -} -``` - -This code is a little crazy, no doubt, but it's necessary because the intuitive -version -```nix -{ # ... - - haskell.packages.ghc784 = super.haskell.packages.ghc784.override { - overrides = self: super: { - ghc-events = self.callPackage ./ghc-events-0.4.3.0.nix {}; - }; - }; -} -``` -doesn't do what we want it to: that code replaces the `haskell` package set in -Nixpkgs with one that contains only one entry,`packages`, which contains only -one entry `ghc784`. This override loses the `haskell.compiler` set, and it -loses the `haskell.packages.ghcXYZ` sets for all compilers but GHC 7.8.4. To -avoid that problem, we have to perform the convoluted little dance from above, -iterating over each step in hierarchy. - -Once it's accomplished, however, we can install a variant of `ghc-events` -that's compiled with GHC 7.8.4: -```shell -nix-env -f "" -iA haskell.packages.ghc784.ghc-events -``` -Unfortunately, it turns out that this build fails again while executing the -test suite! Apparently, the release archive on Hackage is missing some data -files that the test suite requires, so we cannot run it. We accomplish that by -re-generating the Nix expression with the `--no-check` flag: -```shell -cabal2nix --no-check cabal://ghc-events-0.4.3.0 > ~/.nixpkgs/ghc-events-0.4.3.0.nix -``` -Now the builds succeeds. - -Of course, in the concrete example of `ghc-events` this whole exercise is not -an ideal solution, because `ghc-events` can analyze the output emitted by any -version of GHC later than 6.12 regardless of the compiler version that was used -to build the `ghc-events` executable, so strictly speaking there's no reason to -prefer one built with GHC 7.8.x in the first place. However, for users who -cannot use GHC 7.10.x at all for some reason, the approach of downgrading to an -older version might be useful. - -### How to override packages in all compiler-specific package sets - -In the previous section we learned how to override a package in a single -compiler-specific package set. You may have some overrides defined that you want -to use across multiple package sets. To accomplish this you could use the -technique that we learned in the previous section by repeating the overrides for -all the compiler-specific package sets. For example: - -```nix -{ - packageOverrides = super: let self = super.pkgs; in - { - haskell = super.haskell // { - packages = super.haskell.packages // { - ghc784 = super.haskell.packages.ghc784.override { - overrides = self: super: { - my-package = ...; - my-other-package = ...; - }; - }; - ghc822 = super.haskell.packages.ghc784.override { - overrides = self: super: { - my-package = ...; - my-other-package = ...; - }; - }; - ... - }; - }; - }; -} -``` - -However there's a more convenient way to override all compiler-specific package -sets at once: - -```nix -{ - packageOverrides = super: let self = super.pkgs; in - { - haskell = super.haskell // { - packageOverrides = self: super: { - my-package = ...; - my-other-package = ...; - }; - }; - }; -} -``` - -### How to specify source overrides for your Haskell package - -When starting a Haskell project you can use `developPackage` -to define a derivation for your package at the `root` path -as well as source override versions for Hackage packages, like so: - -```nix -# default.nix -{ compilerVersion ? "ghc842" }: -let - # pinning nixpkgs using new Nix 2.0 builtin `fetchGit` - pkgs = import (fetchGit (import ./version.nix)) { }; - compiler = pkgs.haskell.packages."${compilerVersion}"; - pkg = compiler.developPackage { - root = ./.; - source-overrides = { - # Let's say the GHC 8.4.2 haskellPackages uses 1.6.0.0 and your test suite is incompatible with >= 1.6.0.0 - HUnit = "1.5.0.0"; - }; - }; -in pkg -``` - -This could be used in place of a simplified `stack.yaml` defining a Nix -derivation for your Haskell package. - -As you can see this allows you to specify only the source version found on -Hackage and nixpkgs will take care of the rest. - -You can also specify `buildInputs` for your Haskell derivation for packages -that directly depend on external libraries like so: - -```nix -# default.nix -{ compilerVersion ? "ghc842" }: -let - # pinning nixpkgs using new Nix 2.0 builtin `fetchGit` - pkgs = import (fetchGit (import ./version.nix)) { }; - compiler = pkgs.haskell.packages."${compilerVersion}"; - pkg = compiler.developPackage { - root = ./.; - source-overrides = { - HUnit = "1.5.0.0"; # Let's say the GHC 8.4.2 haskellPackages uses 1.6.0.0 and your test suite is incompatible with >= 1.6.0.0 - }; - }; - # in case your package source depends on any libraries directly, not just transitively. - buildInputs = [ zlib ]; -in pkg.overrideAttrs(attrs: { - buildInputs = attrs.buildInputs ++ buildInputs; -}) -``` - -Notice that you will need to override (via `overrideAttrs` or similar) the -derivation returned by the `developPackage` Nix lambda as there is no `buildInputs` -named argument you can pass directly into the `developPackage` lambda. - -### How to recover from GHC's infamous non-deterministic library ID bug - -GHC and distributed build farms don't get along well: - - - https://ghc.haskell.org/trac/ghc/ticket/4012 - -When you see an error like this one -``` -package foo-0.7.1.0 is broken due to missing package -text-1.2.0.4-98506efb1b9ada233bb5c2b2db516d91 -``` -then you have to download and re-install `foo` and all its dependents from -scratch: -```shell -nix-store -q --referrers /nix/store/*-haskell-text-1.2.0.4 \ - | xargs -L 1 nix-store --repair-path -``` - -If you're using additional Hydra servers other than `hydra.nixos.org`, then it -might be necessary to purge the local caches that store data from those -machines to disable these binary channels for the duration of the previous -command, i.e. by running: -```shell -rm ~/.cache/nix/binary-cache*.sqlite -``` - -### Builds on Darwin fail with `math.h` not found - -Users of GHC on Darwin have occasionally reported that builds fail, because the -compiler complains about a missing include file: -``` -fatal error: 'math.h' file not found -``` -The issue has been discussed at length in [ticket -6390](https://github.com/NixOS/nixpkgs/issues/6390), and so far no good -solution has been proposed. As a work-around, users who run into this problem -can configure the environment variables -```shell -export NIX_CFLAGS_COMPILE="-idirafter /usr/include" -export NIX_CFLAGS_LINK="-L/usr/lib" -``` -in their `~/.bashrc` file to avoid the compiler error. - -### Builds using Stack complain about missing system libraries - -``` --- While building package zlib-0.5.4.2 using: - runhaskell -package=Cabal-1.22.4.0 -clear-package-db [... lots of flags ...] -Process exited with code: ExitFailure 1 -Logs have been written to: /home/foo/src/stack-ide/.stack-work/logs/zlib-0.5.4.2.log - -Configuring zlib-0.5.4.2... -Setup.hs: Missing dependency on a foreign library: -* Missing (or bad) header file: zlib.h -This problem can usually be solved by installing the system package that -provides this library (you may need the "-dev" version). If the library is -already installed but in a non-standard location then you can use the flags ---extra-include-dirs= and --extra-lib-dirs= to specify where it is. -If the header file does exist, it may contain errors that are caught by the C -compiler at the preprocessing stage. In this case you can re-run configure -with the verbosity flag -v3 to see the error messages. -``` - -When you run the build inside of the nix-shell environment, the system -is configured to find `libz.so` without any special flags -- the compiler -and linker "just know" how to find it. Consequently, Cabal won't record -any search paths for `libz.so` in the package description, which means -that the package works fine inside of nix-shell, but once you leave the -shell the shared object can no longer be found. That issue is by no -means specific to Stack: you'll have that problem with any other -Haskell package that's built inside of nix-shell but run outside of that -environment. - -You can remedy this issue in several ways. The easiest is to add a `nix` section -to the `stack.yaml` like the following: -```yaml -nix: - enable: true - packages: [ zlib ] -``` - -Stack's Nix support knows to add `${zlib.out}/lib` and `${zlib.dev}/include` -as an `--extra-lib-dirs` and `extra-include-dirs`, respectively. -Alternatively, you can achieve the same effect by hand. First of all, run -``` -$ nix-build --no-out-link "" -A zlib -/nix/store/alsvwzkiw4b7ip38l4nlfjijdvg3fvzn-zlib-1.2.8 -``` -to find out the store path of the system's zlib library. Now, you can - - 1. add that path (plus a "/lib" suffix) to your `$LD_LIBRARY_PATH` - environment variable to make sure your system linker finds `libz.so` - automatically. It's no pretty solution, but it will work. - - 2. As a variant of (1), you can also install any number of system - libraries into your user's profile (or some other profile) and point - `$LD_LIBRARY_PATH` to that profile instead, so that you don't have to - list dozens of those store paths all over the place. - - 3. The solution I prefer is to call stack with an appropriate - --extra-lib-dirs flag like so: - ```shell - stack --extra-lib-dirs=/nix/store/alsvwzkiw4b7ip38l4nlfjijdvg3fvzn-zlib-1.2.8/lib build - ``` - -Typically, you'll need `--extra-include-dirs` as well. It's possible -to add those flag to the project's `stack.yaml` or your user's -global `~/.stack/global/stack.yaml` file so that you don't have to -specify them manually every time. But again, you're likely better off -using Stack's Nix support instead. - -The same thing applies to `cabal configure`, of course, if you're -building with `cabal-install` instead of Stack. - -### Creating statically linked binaries - -There are two levels of static linking. The first option is to configure the -build with the Cabal flag `--disable-executable-dynamic`. In Nix expressions, -this can be achieved by setting the attribute: -``` -enableSharedExecutables = false; -``` -That gives you a binary with statically linked Haskell libraries and -dynamically linked system libraries. - -To link both Haskell libraries and system libraries statically, the additional -flags `--ghc-option=-optl=-static --ghc-option=-optl=-pthread` need to be used. -In Nix, this is accomplished with: -``` -configureFlags = [ "--ghc-option=-optl=-static" "--ghc-option=-optl=-pthread" ]; -``` - -It's important to realize, however, that most system libraries in Nix are -built as shared libraries only, i.e. there is just no static library -available that Cabal could link! - -### Building GHC with integer-simple - -By default GHC implements the Integer type using the -[GNU Multiple Precision Arithmetic (GMP) library](https://gmplib.org/). -The implementation can be found in the -[integer-gmp](http://hackage.haskell.org/package/integer-gmp) package. - -A potential problem with this is that GMP is licensed under the -[GNU Lesser General Public License (LGPL)](https://www.gnu.org/copyleft/lesser.html), -a kind of "copyleft" license. According to the terms of the LGPL, paragraph 5, -you may distribute a program that is designed to be compiled and dynamically -linked with the library under the terms of your choice (i.e., commercially) but -if your program incorporates portions of the library, if it is linked -statically, then your program is a "derivative"--a "work based on the -library"--and according to paragraph 2, section c, you "must cause the whole of -the work to be licensed" under the terms of the LGPL (including for free). - -The LGPL licensing for GMP is a problem for the overall licensing of binary -programs compiled with GHC because most distributions (and builds) of GHC use -static libraries. (Dynamic libraries are currently distributed only for macOS.) -The LGPL licensing situation may be worse: even though -[The Glasgow Haskell Compiler License](https://www.haskell.org/ghc/license) -is essentially a "free software" license (BSD3), according to -paragraph 2 of the LGPL, GHC must be distributed under the terms of the LGPL! - -To work around these problems GHC can be build with a slower but LGPL-free -alternative implementation for Integer called -[integer-simple](http://hackage.haskell.org/package/integer-simple). - -To get a GHC compiler build with `integer-simple` instead of `integer-gmp` use -the attribute: `haskell.compiler.integer-simple."${ghcVersion}"`. -For example: -``` -$ nix-build -E '(import {}).haskell.compiler.integer-simple.ghc802' -... -$ result/bin/ghc-pkg list | grep integer - integer-simple-0.1.1.1 -``` -The following command displays the complete list of GHC compilers build with `integer-simple`: -``` -$ nix-env -f "" -qaP -A haskell.compiler.integer-simple -haskell.compiler.integer-simple.ghc7102 ghc-7.10.2 -haskell.compiler.integer-simple.ghc7103 ghc-7.10.3 -haskell.compiler.integer-simple.ghc722 ghc-7.2.2 -haskell.compiler.integer-simple.ghc742 ghc-7.4.2 -haskell.compiler.integer-simple.ghc783 ghc-7.8.3 -haskell.compiler.integer-simple.ghc784 ghc-7.8.4 -haskell.compiler.integer-simple.ghc801 ghc-8.0.1 -haskell.compiler.integer-simple.ghc802 ghc-8.0.2 -haskell.compiler.integer-simple.ghcHEAD ghc-8.1.20170106 -``` - -To get a package set supporting `integer-simple` use the attribute: -`haskell.packages.integer-simple."${ghcVersion}"`. For example -use the following to get the `scientific` package build with `integer-simple`: -```shell -nix-build -A haskell.packages.integer-simple.ghc802.scientific -``` - -### Quality assurance - -The `haskell.lib` library includes a number of functions for checking for -various imperfections in Haskell packages. It's useful to apply these functions -to your own Haskell packages and integrate that in a Continuous Integration -server like [hydra](https://nixos.org/hydra/) to assure your packages maintain a -minimum level of quality. This section discusses some of these functions. - -#### failOnAllWarnings - -Applying `haskell.lib.failOnAllWarnings` to a Haskell package enables the -`-Wall` and `-Werror` GHC options to turn all warnings into build failures. - -#### buildStrictly - -Applying `haskell.lib.buildStrictly` to a Haskell package calls -`failOnAllWarnings` on the given package to turn all warnings into build -failures. Additionally the source of your package is gotten from first invoking -`cabal sdist` to ensure all needed files are listed in the Cabal file. - -#### checkUnusedPackages - -Applying `haskell.lib.checkUnusedPackages` to a Haskell package invokes -the [packunused](http://hackage.haskell.org/package/packunused) tool on the -package. `packunused` complains when it finds packages listed as build-depends -in the Cabal file which are redundant. For example: - -``` -$ nix-build -E 'let pkgs = import {}; in pkgs.haskell.lib.checkUnusedPackages {} pkgs.haskellPackages.scientific' -these derivations will be built: - /nix/store/3lc51cxj2j57y3zfpq5i69qbzjpvyci1-scientific-0.3.5.1.drv -... -detected package components -~~~~~~~~~~~~~~~~~~~~~~~~~~~ - - - library - - testsuite(s): test-scientific - - benchmark(s): bench-scientific* - -(component names suffixed with '*' are not configured to be built) - -library -~~~~~~~ - -The following package dependencies seem redundant: - - - ghc-prim-0.5.0.0 - -testsuite(test-scientific) -~~~~~~~~~~~~~~~~~~~~~~~~~~ - -no redundant packages dependencies found - -builder for ‘/nix/store/3lc51cxj2j57y3zfpq5i69qbzjpvyci1-scientific-0.3.5.1.drv’ failed with exit code 1 -error: build of ‘/nix/store/3lc51cxj2j57y3zfpq5i69qbzjpvyci1-scientific-0.3.5.1.drv’ failed -``` - -As you can see, `packunused` finds out that although the testsuite component has -no redundant dependencies the library component of `scientific-0.3.5.1` depends -on `ghc-prim` which is unused in the library. - -### Using hackage2nix with nixpkgs - -Hackage package derivations are found in the -[`hackage-packages.nix`](https://github.com/NixOS/nixpkgs/blob/master/pkgs/development/haskell-modules/hackage-packages.nix) -file within `nixpkgs` and are used as the initial package set for -`haskellPackages`. The `hackage-packages.nix` file is not meant to be edited -by hand, but rather autogenerated by [`hackage2nix`](https://github.com/NixOS/cabal2nix/tree/master/hackage2nix), -which by default uses the [`configuration-hackage2nix.yaml`](https://github.com/NixOS/nixpkgs/blob/master/pkgs/development/haskell-modules/configuration-hackage2nix.yaml) -file to generate all the derivations. - -To modify the contents `configuration-hackage2nix.yaml`, follow the -instructions on [`hackage2nix`](https://github.com/NixOS/cabal2nix/tree/master/hackage2nix). - -## Other resources - - - The Youtube video [Nix Loves Haskell](https://www.youtube.com/watch?v=BsBhi_r-OeE) - provides an introduction into Haskell NG aimed at beginners. The slides are - available at http://cryp.to/nixos-meetup-3-slides.pdf and also -- in a form - ready for cut & paste -- at - https://github.com/NixOS/cabal2nix/blob/master/doc/nixos-meetup-3-slides.md. - - - Another Youtube video is [Escaping Cabal Hell with Nix](https://www.youtube.com/watch?v=mQd3s57n_2Y), - which discusses the subject of Haskell development with Nix but also provides - a basic introduction to Nix as well, i.e. it's suitable for viewers with - almost no prior Nix experience. - - - Oliver Charles wrote a very nice [Tutorial how to develop Haskell packages with Nix](http://wiki.ocharles.org.uk/Nix). - - - The *Journey into the Haskell NG infrastructure* series of postings - describe the new Haskell infrastructure in great detail: - - - [Part 1](https://nixos.org/nix-dev/2015-January/015591.html) - explains the differences between the old and the new code and gives - instructions how to migrate to the new setup. - - - [Part 2](https://nixos.org/nix-dev/2015-January/015608.html) - looks in-depth at how to tweak and configure your setup by means of - overrides. - - - [Part 3](https://nixos.org/nix-dev/2015-April/016912.html) - describes the infrastructure that keeps the Haskell package set in Nixpkgs - up-to-date. +The documentation for the Haskell infrastructure is published at +. The source code for that +site lives in the `doc/` sub-directory of the +[`cabal2nix` Git repository](https://github.com/NixOS/cabal2nix) +and changes can be submitted there. diff --git a/third_party/nixpkgs/lib/debug.nix b/third_party/nixpkgs/lib/debug.nix index 2879f72ed2..ea6aed60ab 100644 --- a/third_party/nixpkgs/lib/debug.nix +++ b/third_party/nixpkgs/lib/debug.nix @@ -14,9 +14,25 @@ */ { lib }: let - inherit (builtins) trace isAttrs isList isInt - head substring attrNames; - inherit (lib) id elem isFunction; + inherit (lib) + isInt + attrNames + isList + isAttrs + substring + addErrorContext + attrValues + concatLists + concatStringsSep + const + elem + generators + head + id + isDerivation + isFunction + mapAttrs + trace; in rec { @@ -94,7 +110,7 @@ rec { trace: { a = { b = {…}; }; } => null */ - traceSeqN = depth: x: y: with lib; + traceSeqN = depth: x: y: let snip = v: if isList v then noQuotes "[…]" v else if isAttrs v then noQuotes "{…}" v else v; @@ -149,7 +165,7 @@ rec { */ runTests = # Tests to run - tests: lib.concatLists (lib.attrValues (lib.mapAttrs (name: test: + tests: concatLists (attrValues (mapAttrs (name: test: let testsToRun = if tests ? tests then tests.tests else []; in if (substring 0 4 name == "test" || elem name testsToRun) && ((testsToRun == []) || elem name tests.tests) @@ -176,9 +192,9 @@ rec { + "and will be removed in the next release. " + "Please use more specific concatenation " + "for your uses (`lib.concat(Map)StringsSep`)." ) - (lib.concatStringsSep "; " (map (x: "${x}=") (attrNames a))); + (concatStringsSep "; " (map (x: "${x}=") (attrNames a))); - showVal = with lib; + showVal = trace ( "Warning: `showVal` is deprecated " + "and will be removed in the next release, " + "please use `traceSeqN`" ) @@ -226,7 +242,7 @@ rec { trace ( "Warning: `addErrorContextToAttrs` is deprecated " + "and will be removed in the next release. " + "Please use `builtins.addErrorContext` directly." ) - (lib.mapAttrs (a: v: lib.addErrorContext "while evaluating ${a}" v) attrs); + (mapAttrs (a: v: addErrorContext "while evaluating ${a}" v) attrs); # example: (traceCallXml "myfun" id 3) will output something like # calling myfun arg 1: 3 result: 3 diff --git a/third_party/nixpkgs/lib/default.nix b/third_party/nixpkgs/lib/default.nix index 44076d2951..d2239d26ea 100644 --- a/third_party/nixpkgs/lib/default.nix +++ b/third_party/nixpkgs/lib/default.nix @@ -9,7 +9,7 @@ let lib = makeExtensible (self: let callLibs = file: import file { lib = self; }; - in with self; { + in { # often used, or depending on very little trivial = callLibs ./trivial.nix; @@ -54,7 +54,7 @@ let filesystem = callLibs ./filesystem.nix; # back-compat aliases - platforms = systems.doubles; + platforms = self.systems.doubles; # linux kernel configuration kernel = callLibs ./kernel.nix; @@ -63,14 +63,14 @@ let deepSeq elem elemAt filter genericClosure genList getAttr hasAttr head isAttrs isBool isInt isList isString length lessThan listToAttrs pathExists readFile replaceStrings seq - stringLength sub substring tail; - inherit (trivial) id const pipe concat or and bitAnd bitOr bitXor - bitNot boolToString mergeAttrs flip mapNullable inNixShell min max + stringLength sub substring tail trace; + inherit (self.trivial) id const pipe concat or and bitAnd bitOr bitXor + bitNot boolToString mergeAttrs flip mapNullable inNixShell isFloat min max importJSON importTOML warn info showWarnings nixpkgsVersion version mod compare splitByAndCompare functionArgs setFunctionArgs isFunction toHexString toBaseDigits; - inherit (fixedPoints) fix fix' converge extends composeExtensions + inherit (self.fixedPoints) fix fix' converge extends composeExtensions makeExtensible makeExtensibleWithCustomName; - inherit (attrsets) attrByPath hasAttrByPath setAttrByPath + inherit (self.attrsets) attrByPath hasAttrByPath setAttrByPath getAttrFromPath attrVals attrValues getAttrs catAttrs filterAttrs filterAttrsRecursive foldAttrs collect nameValuePair mapAttrs mapAttrs' mapAttrsToList mapAttrsRecursive mapAttrsRecursiveCond @@ -79,13 +79,13 @@ let recursiveUpdate matchAttrs overrideExisting getOutput getBin getLib getDev getMan chooseDevOutputs zipWithNames zip recurseIntoAttrs dontRecurseIntoAttrs; - inherit (lists) singleton forEach foldr fold foldl foldl' imap0 imap1 + inherit (self.lists) singleton forEach foldr fold foldl foldl' imap0 imap1 concatMap flatten remove findSingle findFirst any all count optional optionals toList range partition zipListsWith zipLists reverseList listDfs toposort sort naturalSort compareLists take drop sublist last init crossLists unique intersectLists subtractLists mutuallyExclusive groupBy groupBy'; - inherit (strings) concatStrings concatMapStrings concatImapStrings + inherit (self.strings) concatStrings concatMapStrings concatImapStrings intersperse concatStringsSep concatMapStringsSep concatImapStringsSep makeSearchPath makeSearchPathOutput makeLibraryPath makeBinPath optionalString @@ -97,19 +97,19 @@ let nameFromURL enableFeature enableFeatureAs withFeature withFeatureAs fixedWidthString fixedWidthNumber isStorePath toInt readPathsFromFile fileContents; - inherit (stringsWithDeps) textClosureList textClosureMap + inherit (self.stringsWithDeps) textClosureList textClosureMap noDepEntry fullDepEntry packEntry stringAfter; - inherit (customisation) overrideDerivation makeOverridable + inherit (self.customisation) overrideDerivation makeOverridable callPackageWith callPackagesWith extendDerivation hydraJob makeScope; - inherit (meta) addMetaAttrs dontDistribute setName updateName + inherit (self.meta) addMetaAttrs dontDistribute setName updateName appendToName mapDerivationAttrset setPrio lowPrio lowPrioSet hiPrio hiPrioSet; - inherit (sources) pathType pathIsDirectory cleanSourceFilter + inherit (self.sources) pathType pathIsDirectory cleanSourceFilter cleanSource sourceByRegex sourceFilesBySuffices commitIdFromGitRepo cleanSourceWith pathHasContext canCleanSource pathIsRegularFile pathIsGitRepo; - inherit (modules) evalModules unifyModuleSyntax + inherit (self.modules) evalModules unifyModuleSyntax applyIfFunction mergeModules mergeModules' mergeOptionDecls evalOptionValue mergeDefinitions pushDownProperties dischargeProperties filterOverrides @@ -119,21 +119,21 @@ let mkAliasAndWrapDefinitions fixMergeModules mkRemovedOptionModule mkRenamedOptionModule mkMergedOptionModule mkChangedOptionModule mkAliasOptionModule doRename; - inherit (options) isOption mkEnableOption mkSinkUndeclaredOptions + inherit (self.options) isOption mkEnableOption mkSinkUndeclaredOptions mergeDefaultOption mergeOneOption mergeEqualOption getValues getFiles optionAttrSetToDocList optionAttrSetToDocList' scrubOptionValue literalExample showOption showFiles unknownModule mkOption; - inherit (types) isType setType defaultTypeMerge defaultFunctor + inherit (self.types) isType setType defaultTypeMerge defaultFunctor isOptionType mkOptionType; - inherit (asserts) + inherit (self.asserts) assertMsg assertOneOf; - inherit (debug) addErrorContextToAttrs traceIf traceVal traceValFn + inherit (self.debug) addErrorContextToAttrs traceIf traceVal traceValFn traceXMLVal traceXMLValMarked traceSeq traceSeqN traceValSeq traceValSeqFn traceValSeqN traceValSeqNFn traceShowVal traceShowValMarked showVal traceCall traceCall2 traceCall3 traceValIfNot runTests testAllTrue traceCallXml attrNamesToStr; - inherit (misc) maybeEnv defaultMergeArg defaultMerge foldArgs + inherit (self.misc) maybeEnv defaultMergeArg defaultMerge foldArgs maybeAttrNullable maybeAttr ifEnable checkFlag getValue checkReqs uniqList uniqListExt condConcat lazyGenericClosure innerModifySumArgs modifySumArgs innerClosePropagation @@ -143,7 +143,7 @@ let mergeAttrsByFuncDefaultsClean mergeAttrBy fakeHash fakeSha256 fakeSha512 nixType imap; - inherit (versions) + inherit (self.versions) splitVersion; }); in lib diff --git a/third_party/nixpkgs/lib/lists.nix b/third_party/nixpkgs/lib/lists.nix index f424946c72..6c97e0686a 100644 --- a/third_party/nixpkgs/lib/lists.nix +++ b/third_party/nixpkgs/lib/lists.nix @@ -1,9 +1,9 @@ # General list operations. { lib }: -with lib.trivial; let inherit (lib.strings) toInt; + inherit (lib.trivial) compare min; in rec { diff --git a/third_party/nixpkgs/lib/modules.nix b/third_party/nixpkgs/lib/modules.nix index df3a2ad17e..d2d35dbaae 100644 --- a/third_party/nixpkgs/lib/modules.nix +++ b/third_party/nixpkgs/lib/modules.nix @@ -1,12 +1,53 @@ { lib }: -with lib.lists; -with lib.strings; -with lib.trivial; -with lib.attrsets; -with lib.options; -with lib.debug; -with lib.types; +let + inherit (lib) + all + any + attrByPath + attrNames + catAttrs + concatLists + concatMap + count + elem + filter + findFirst + flip + foldl + foldl' + getAttrFromPath + head + id + imap1 + isAttrs + isBool + isFunction + isString + length + mapAttrs + mapAttrsToList + mapAttrsRecursiveCond + min + optional + optionalAttrs + optionalString + recursiveUpdate + reverseList sort + setAttrByPath + toList + types + warn + ; + inherit (lib.options) + isOption + mkOption + showDefs + showFiles + showOption + unknownModule + ; +in rec { @@ -616,7 +657,7 @@ rec { fixupOptionType = loc: opt: let options = opt.options or - (throw "Option `${showOption loc'}' has type optionSet but has no option attribute, in ${showFiles opt.declarations}."); + (throw "Option `${showOption loc}' has type optionSet but has no option attribute, in ${showFiles opt.declarations}."); f = tp: let optionSetIn = type: (tp.name == type) && (tp.functor.wrapped.name == "optionSet"); in @@ -719,7 +760,7 @@ rec { mkRemovedOptionModule [ "boot" "loader" "grub" "bootDevice" ] "" - causes a warning if the user defines boot.loader.grub.bootDevice. + causes a assertion if the user defines boot.loader.grub.bootDevice. replacementInstructions is a string that provides instructions on how to achieve the same functionality without the removed option, diff --git a/third_party/nixpkgs/lib/options.nix b/third_party/nixpkgs/lib/options.nix index 5b7482c809..87cd8b7979 100644 --- a/third_party/nixpkgs/lib/options.nix +++ b/third_party/nixpkgs/lib/options.nix @@ -1,11 +1,40 @@ # Nixpkgs/NixOS option handling. { lib }: -with lib.trivial; -with lib.lists; -with lib.attrsets; -with lib.strings; - +let + inherit (lib) + all + collect + concatLists + concatMap + elemAt + filter + foldl' + head + isAttrs + isBool + isDerivation + isFunction + isInt + isList + isString + length + mapAttrs + optional + optionals + take + ; + inherit (lib.attrsets) + optionalAttrs + ; + inherit (lib.strings) + concatMapStrings + concatStringsSep + ; + inherit (lib.types) + mkOptionType + ; +in rec { /* Returns true when the given argument is an option @@ -110,7 +139,7 @@ rec { # Return early if we only have one element # This also makes it work for functions, because the foldl' below would try # to compare the first element with itself, which is false for functions - else if length defs == 1 then (elemAt defs 0).value + else if length defs == 1 then (head defs).value else (foldl' (first: def: if def.value != first.value then throw "The option `${showOption loc}' has conflicting definition values:${showDefs [ first def ]}" diff --git a/third_party/nixpkgs/lib/sources.nix b/third_party/nixpkgs/lib/sources.nix index 776fcc3205..702a0ef889 100644 --- a/third_party/nixpkgs/lib/sources.nix +++ b/third_party/nixpkgs/lib/sources.nix @@ -1,16 +1,33 @@ # Functions for copying sources to the Nix store. { lib }: +let + inherit (builtins) + hasContext + match + readDir + storeDir + tryEval + ; + inherit (lib) + filter + getAttr + isString + pathExists + readFile + split + ; +in rec { # Returns the type of a path: regular (for file), symlink, or directory - pathType = p: with builtins; getAttr (baseNameOf p) (readDir (dirOf p)); + pathType = p: getAttr (baseNameOf p) (readDir (dirOf p)); # Returns true if the path exists and is a directory, false otherwise - pathIsDirectory = p: if builtins.pathExists p then (pathType p) == "directory" else false; + pathIsDirectory = p: if pathExists p then (pathType p) == "directory" else false; # Returns true if the path exists and is a regular file, false otherwise - pathIsRegularFile = p: if builtins.pathExists p then (pathType p) == "regular" else false; + pathIsRegularFile = p: if pathExists p then (pathType p) == "regular" else false; # Bring in a path as a source, filtering out all Subversion and CVS # directories, as well as backup files (*~). @@ -19,8 +36,8 @@ rec { (baseName == ".git" || type == "directory" && (baseName == ".svn" || baseName == "CVS" || baseName == ".hg")) || # Filter out editor backup / swap files. lib.hasSuffix "~" baseName || - builtins.match "^\\.sw[a-z]$" baseName != null || - builtins.match "^\\..*\\.sw[a-z]$" baseName != null || + match "^\\.sw[a-z]$" baseName != null || + match "^\\..*\\.sw[a-z]$" baseName != null || # Filter out generates files. lib.hasSuffix ".o" baseName || @@ -89,7 +106,7 @@ rec { in lib.cleanSourceWith { filter = (path: type: let relPath = lib.removePrefix (toString origSrc + "/") (toString path); - in lib.any (re: builtins.match re relPath != null) regexes); + in lib.any (re: match re relPath != null) regexes); inherit src; }; @@ -102,13 +119,12 @@ rec { in type == "directory" || lib.any (ext: lib.hasSuffix ext base) exts; in cleanSourceWith { inherit filter; src = path; }; - pathIsGitRepo = path: (builtins.tryEval (commitIdFromGitRepo path)).success; + pathIsGitRepo = path: (tryEval (commitIdFromGitRepo path)).success; # Get the commit id of a git repo # Example: commitIdFromGitRepo commitIdFromGitRepo = let readCommitFromFile = file: path: - with builtins; let fileName = toString path + "/" + file; packedRefsName = toString path + "/packed-refs"; absolutePath = base: path: @@ -145,11 +161,11 @@ rec { # packed-refs file, so we have to grep through it: then let fileContent = readFile packedRefsName; - matchRef = builtins.match "([a-z0-9]+) ${file}"; - isRef = s: builtins.isString s && (matchRef s) != null; + matchRef = match "([a-z0-9]+) ${file}"; + isRef = s: isString s && (matchRef s) != null; # there is a bug in libstdc++ leading to stackoverflow for long strings: # https://github.com/NixOS/nix/issues/2147#issuecomment-659868795 - refs = builtins.filter isRef (builtins.split "\n" fileContent); + refs = filter isRef (split "\n" fileContent); in if refs == [] then throw ("Could not find " + file + " in " + packedRefsName) else lib.head (matchRef (lib.head refs)) @@ -157,7 +173,7 @@ rec { else throw ("Not a .git directory: " + path); in readCommitFromFile "HEAD"; - pathHasContext = builtins.hasContext or (lib.hasPrefix builtins.storeDir); + pathHasContext = builtins.hasContext or (lib.hasPrefix storeDir); canCleanSource = src: src ? _isLibCleanSourceWith || !(pathHasContext (toString src)); } diff --git a/third_party/nixpkgs/lib/strings-with-deps.nix b/third_party/nixpkgs/lib/strings-with-deps.nix index e333698342..7b88b018da 100644 --- a/third_party/nixpkgs/lib/strings-with-deps.nix +++ b/third_party/nixpkgs/lib/strings-with-deps.nix @@ -41,10 +41,15 @@ Usage: [1] maybe this behaviour should be removed to keep things simple (?) */ -with lib.lists; -with lib.attrsets; -with lib.strings; - +let + inherit (lib) + concatStringsSep + head + isAttrs + listToAttrs + tail + ; +in rec { /* !!! The interface of this function is kind of messed up, since diff --git a/third_party/nixpkgs/lib/strings.nix b/third_party/nixpkgs/lib/strings.nix index d81e46a176..f62ff6679e 100644 --- a/third_party/nixpkgs/lib/strings.nix +++ b/third_party/nixpkgs/lib/strings.nix @@ -8,7 +8,29 @@ in rec { - inherit (builtins) stringLength substring head tail isString replaceStrings; + inherit (builtins) + compareVersions + elem + elemAt + filter + fromJSON + head + isInt + isList + isString + match + parseDrvName + readFile + replaceStrings + split + storeDir + stringLength + substring + tail + toJSON + typeOf + unsafeDiscardStringContext + ; /* Concatenate a list of strings. @@ -120,7 +142,7 @@ rec { subDir: # List of base paths paths: - concatStringsSep ":" (map (path: path + "/" + subDir) (builtins.filter (x: x != null) paths)); + concatStringsSep ":" (map (path: path + "/" + subDir) (filter (x: x != null) paths)); /* Construct a Unix-style search path by appending the given `subDir` to the specified `output` of each of the packages. If no @@ -313,7 +335,7 @@ rec { escapeNixString "hello\${}\n" => "\"hello\\\${}\\n\"" */ - escapeNixString = s: escape ["$"] (builtins.toJSON s); + escapeNixString = s: escape ["$"] (toJSON s); /* Turn a string into an exact regular expression @@ -337,7 +359,7 @@ rec { */ escapeNixIdentifier = s: # Regex from https://github.com/NixOS/nix/blob/d048577909e383439c2549e849c5c2f2016c997e/src/libexpr/lexer.l#L91 - if builtins.match "[a-zA-Z_][a-zA-Z0-9_'-]*" s != null + if match "[a-zA-Z_][a-zA-Z0-9_'-]*" s != null then s else escapeNixString s; # Obsolete - use replaceStrings instead. @@ -466,7 +488,7 @@ rec { versionOlder "1.1" "1.1" => false */ - versionOlder = v1: v2: builtins.compareVersions v2 v1 == 1; + versionOlder = v1: v2: compareVersions v2 v1 == 1; /* Return true if string v1 denotes a version equal to or newer than v2. @@ -492,7 +514,7 @@ rec { */ getName = x: let - parse = drv: (builtins.parseDrvName drv).name; + parse = drv: (parseDrvName drv).name; in if isString x then parse x else x.pname or (parse x.name); @@ -509,7 +531,7 @@ rec { */ getVersion = x: let - parse = drv: (builtins.parseDrvName drv).version; + parse = drv: (parseDrvName drv).version; in if isString x then parse x else x.version or (parse x.name); @@ -527,7 +549,7 @@ rec { let components = splitString "/" url; filename = lib.last components; - name = builtins.head (splitString sep filename); + name = head (splitString sep filename); in assert name != filename; name; /* Create an --{enable,disable}- string that can be passed to @@ -617,14 +639,14 @@ rec { */ floatToString = float: let result = toString float; - precise = float == builtins.fromJSON result; + precise = float == fromJSON result; in if precise then result else lib.warn "Imprecise conversion from float to string ${result}" result; /* Check whether a value can be coerced to a string */ isCoercibleToString = x: - builtins.elem (builtins.typeOf x) [ "path" "string" "null" "int" "float" "bool" ] || - (builtins.isList x && lib.all isCoercibleToString x) || + elem (typeOf x) [ "path" "string" "null" "int" "float" "bool" ] || + (isList x && lib.all isCoercibleToString x) || x ? outPath || x ? __toString; @@ -643,8 +665,8 @@ rec { isStorePath = x: if isCoercibleToString x then let str = toString x; in - builtins.substring 0 1 str == "/" - && dirOf str == builtins.storeDir + substring 0 1 str == "/" + && dirOf str == storeDir else false; @@ -662,8 +684,8 @@ rec { */ # Obviously, it is a bit hacky to use fromJSON this way. toInt = str: - let may_be_int = builtins.fromJSON str; in - if builtins.isInt may_be_int + let may_be_int = fromJSON str; in + if isInt may_be_int then may_be_int else throw "Could not convert ${str} to int."; @@ -685,10 +707,10 @@ rec { readPathsFromFile = lib.warn "lib.readPathsFromFile is deprecated, use a list instead" (rootPath: file: let - lines = lib.splitString "\n" (builtins.readFile file); + lines = lib.splitString "\n" (readFile file); removeComments = lib.filter (line: line != "" && !(lib.hasPrefix "#" line)); relativePaths = removeComments lines; - absolutePaths = builtins.map (path: rootPath + "/${path}") relativePaths; + absolutePaths = map (path: rootPath + "/${path}") relativePaths; in absolutePaths); @@ -702,7 +724,7 @@ rec { fileContents ./version => "1.0" */ - fileContents = file: removeSuffix "\n" (builtins.readFile file); + fileContents = file: removeSuffix "\n" (readFile file); /* Creates a valid derivation name from a potentially invalid one. @@ -720,13 +742,13 @@ rec { sanitizeDerivationName = string: lib.pipe string [ # Get rid of string context. This is safe under the assumption that the # resulting string is only used as a derivation name - builtins.unsafeDiscardStringContext + unsafeDiscardStringContext # Strip all leading "." - (x: builtins.elemAt (builtins.match "\\.*(.*)" x) 0) + (x: elemAt (match "\\.*(.*)" x) 0) # Split out all invalid characters # https://github.com/NixOS/nix/blob/2.3.2/src/libstore/store-api.cc#L85-L112 # https://github.com/NixOS/nix/blob/2242be83c61788b9c0736a92bb0b5c7bbfc40803/nix-rust/src/store/path.rs#L100-L125 - (builtins.split "[^[:alnum:]+._?=-]+") + (split "[^[:alnum:]+._?=-]+") # Replace invalid character ranges with a "-" (concatMapStrings (s: if lib.isList s then "-" else s)) # Limit to 211 characters (minus 4 chars for ".drv") diff --git a/third_party/nixpkgs/lib/types.nix b/third_party/nixpkgs/lib/types.nix index e9e45dc25c..ee891f8231 100644 --- a/third_party/nixpkgs/lib/types.nix +++ b/third_party/nixpkgs/lib/types.nix @@ -1,12 +1,65 @@ # Definitions related to run-time type checking. Used in particular # to type-check NixOS configurations. { lib }: -with lib.lists; -with lib.attrsets; -with lib.options; -with lib.trivial; -with lib.strings; + let + inherit (lib) + elem + flip + functionArgs + isAttrs + isBool + isDerivation + isFloat + isFunction + isInt + isList + isString + isStorePath + setFunctionArgs + toDerivation + toList + ; + inherit (lib.lists) + all + concatLists + count + elemAt + filter + foldl' + head + imap1 + last + length + tail + unique + ; + inherit (lib.attrsets) + attrNames + filterAttrs + hasAttr + mapAttrs + optionalAttrs + zipAttrsWith + ; + inherit (lib.options) + getFiles + getValues + mergeDefaultOption + mergeEqualOption + mergeOneOption + showFiles + showOption + ; + inherit (lib.strings) + concatMapStringsSep + concatStringsSep + escapeNixString + isCoercibleToString + ; + inherit (lib.trivial) + boolToString + ; inherit (lib.modules) mergeDefinitions; outer_types = @@ -270,7 +323,7 @@ rec { name = "attrs"; description = "attribute set"; check = isAttrs; - merge = loc: foldl' (res: def: mergeAttrs res def.value) {}; + merge = loc: foldl' (res: def: res // def.value) {}; emptyValue = { value = {}; }; }; @@ -499,7 +552,7 @@ rec { show = v: if builtins.isString v then ''"${v}"'' else if builtins.isInt v then builtins.toString v - else if builtins.isBool v then if v then "true" else "false" + else if builtins.isBool v then boolToString v else ''<${builtins.typeOf v}>''; in mkOptionType rec { diff --git a/third_party/nixpkgs/maintainers/maintainer-list.nix b/third_party/nixpkgs/maintainers/maintainer-list.nix index eeb23378b6..c0b1ae06ab 100644 --- a/third_party/nixpkgs/maintainers/maintainer-list.nix +++ b/third_party/nixpkgs/maintainers/maintainer-list.nix @@ -2169,6 +2169,12 @@ githubId = 8852888; name = "David Izquierdo"; }; + djanatyn = { + email = "djanatyn@gmail.com"; + github = "djanatyn"; + githubId = 523628; + name = "Jonathan Strickland"; + }; Dje4321 = { email = "dje4321@gmail.com"; github = "dje4321"; @@ -3437,6 +3443,12 @@ githubId = 2405974; name = "Sébastian Méric de Bellefon"; }; + henrikolsson = { + email = "henrik@fixme.se"; + github = "henrikolsson"; + githubId = 982322; + name = "Henrik Olsson"; + }; henrytill = { email = "henrytill@gmail.com"; github = "henrytill"; @@ -3945,6 +3957,16 @@ githubId = 2736480; name = "Johannes Frankenau"; }; + jfroche = { + name = "Jean-François Roche"; + email = "jfroche@pyxel.be"; + github = "jfroche"; + githubId = 207369; + keys = [{ + longkeyid = "dsa1024/0xD1D09DE169EA19A0"; + fingerprint = "7EB1 C02A B62B B464 6D7C E4AE D1D0 9DE1 69EA 19A0"; + }]; + }; jgeerds = { email = "jascha@geerds.org"; github = "jgeerds"; @@ -6003,6 +6025,12 @@ githubId = 788953; name = "Matthijs Steen"; }; + mstrangfeld = { + email = "marvin@strangfeld.io"; + github = "mstrangfeld"; + githubId = 36842980; + name = "Marvin Strangfeld"; + }; mt-caret = { email = "mtakeda.enigsol@gmail.com"; github = "mt-caret"; @@ -6407,6 +6435,12 @@ githubId = 4728903; name = "Owen Lynch"; }; + omasanori = { + email = "167209+omasanori@users.noreply.github.com"; + github = "omasanori"; + githubId = 167209; + name = "Masanori Ogino"; + }; omnipotententity = { email = "omnipotententity@gmail.com"; github = "omnipotententity"; @@ -9618,6 +9652,12 @@ githubId = 1069303; name = "Kim Simmons"; }; + zopieux = { + email = "zopieux@gmail.com"; + github = "zopieux"; + githubId = 81353; + name = "Alexandre Macabies"; + }; zowoq = { email = "59103226+zowoq@users.noreply.github.com"; github = "zowoq"; @@ -9834,4 +9874,10 @@ github = "hloeffler"; githubId = 6627191; }; + wilsonehusin = { + name = "Wilson E. Husin"; + email = "wilsonehusin@gmail.com"; + github = "wilsonehusin"; + githubId = 14004487; + }; } diff --git a/third_party/nixpkgs/maintainers/scripts/hydra-eval-failures.py b/third_party/nixpkgs/maintainers/scripts/hydra-eval-failures.py index 0f738c5427..b7518b1285 100755 --- a/third_party/nixpkgs/maintainers/scripts/hydra-eval-failures.py +++ b/third_party/nixpkgs/maintainers/scripts/hydra-eval-failures.py @@ -1,5 +1,5 @@ #!/usr/bin/env nix-shell -#!nix-shell -i python3 -p 'python3.withPackages(ps: with ps; [ requests pyquery click ])' +#!nix-shell -i python3 -p "python3.withPackages(ps: with ps; [ requests pyquery click ])" # To use, just execute this script with --help to display help. diff --git a/third_party/nixpkgs/nixos/doc/manual/README b/third_party/nixpkgs/nixos/doc/manual/README index 587f627519..120c127d7a 100644 --- a/third_party/nixpkgs/nixos/doc/manual/README +++ b/third_party/nixpkgs/nixos/doc/manual/README @@ -1,12 +1,3 @@ -To build the manual, you need Nix installed on your system (no need -for NixOS). To install Nix, follow the instructions at +Moved to: ./contributing-to-this-manual.xml. Link: - https://nixos.org/nix/download.html - -When you have Nix on your system, in the root directory of the project -(i.e., `nixpkgs`), run: - - nix-build nixos/release.nix -A manual.x86_64-linux - -When this command successfully finishes, it will tell you where the -manual got generated. +https://nixos.org/manual/nixos/unstable/#chap-contributing diff --git a/third_party/nixpkgs/nixos/doc/manual/configuration/user-mgmt.xml b/third_party/nixpkgs/nixos/doc/manual/configuration/user-mgmt.xml index cbec83814c..e83e7b75ef 100644 --- a/third_party/nixpkgs/nixos/doc/manual/configuration/user-mgmt.xml +++ b/third_party/nixpkgs/nixos/doc/manual/configuration/user-mgmt.xml @@ -38,7 +38,7 @@ assigned by setting the user's hashedPassword option. A hashed password can be generated using mkpasswd -m - sha-512 after installing the mkpasswd package. + sha-512. A user ID (uid) is assigned automatically. You can also specify a uid diff --git a/third_party/nixpkgs/nixos/doc/manual/contributing-to-this-manual.xml b/third_party/nixpkgs/nixos/doc/manual/contributing-to-this-manual.xml new file mode 100644 index 0000000000..9820e75fc3 --- /dev/null +++ b/third_party/nixpkgs/nixos/doc/manual/contributing-to-this-manual.xml @@ -0,0 +1,22 @@ + + Contributing to this documentation + + The DocBook sources of NixOS' manual are in the +nixos/doc/manual subdirectory of the Nixpkgs repository. + + + You can quickly check your edits with the following: + + +$ cd /path/to/nixpkgs/nixos/doc/manual +$ nix-build nixos/release.nix -A manual.x86_64-linux + + + If the build succeeds, the manual will be in + ./result/share/doc/nixos/index.html. + + diff --git a/third_party/nixpkgs/nixos/doc/manual/installation/upgrading.xml b/third_party/nixpkgs/nixos/doc/manual/installation/upgrading.xml index 08780051d5..15ba5db9a3 100644 --- a/third_party/nixpkgs/nixos/doc/manual/installation/upgrading.xml +++ b/third_party/nixpkgs/nixos/doc/manual/installation/upgrading.xml @@ -14,7 +14,7 @@ Stable channels, such as nixos-20.03. + xlink:href="https://nixos.org/channels/nixos-20.09">nixos-20.09. These only get conservative bug fixes and package upgrades. For instance, a channel update may cause the Linux kernel on your system to be upgraded from 4.19.34 to 4.19.38 (a minor bug fix), but not from @@ -38,7 +38,7 @@ Small channels, such as nixos-20.03-small + xlink:href="https://nixos.org/channels/nixos-20.09-small">nixos-20.09-small or nixos-unstable-small. @@ -63,8 +63,8 @@ When you first install NixOS, you’re automatically subscribed to the NixOS channel that corresponds to your installation source. For instance, if you - installed from a 20.03 ISO, you will be subscribed to the - nixos-20.03 channel. To see which NixOS channel you’re + installed from a 20.09 ISO, you will be subscribed to the + nixos-20.09 channel. To see which NixOS channel you’re subscribed to, run the following as root: # nix-channel --list | grep nixos @@ -75,13 +75,13 @@ nixos https://nixos.org/channels/nixos-unstable # nix-channel --add https://nixos.org/channels/channel-name nixos (Be sure to include the nixos parameter at the end.) For - instance, to use the NixOS 20.03 stable channel: + instance, to use the NixOS 20.09 stable channel: -# nix-channel --add https://nixos.org/channels/nixos-20.03 nixos +# nix-channel --add https://nixos.org/channels/nixos-20.09 nixos If you have a server, you may want to use the “small” channel instead: -# nix-channel --add https://nixos.org/channels/nixos-20.03-small nixos +# nix-channel --add https://nixos.org/channels/nixos-20.09-small nixos And if you want to live on the bleeding edge: @@ -132,7 +132,7 @@ nixos https://nixos.org/channels/nixos-unstable kernel, initrd or kernel modules. You can also specify a channel explicitly, e.g. - = https://nixos.org/channels/nixos-20.03; + = https://nixos.org/channels/nixos-20.09; diff --git a/third_party/nixpkgs/nixos/doc/manual/manual.xml b/third_party/nixpkgs/nixos/doc/manual/manual.xml index 18a67a2dd9..db9e731383 100644 --- a/third_party/nixpkgs/nixos/doc/manual/manual.xml +++ b/third_party/nixpkgs/nixos/doc/manual/manual.xml @@ -19,5 +19,6 @@ + diff --git a/third_party/nixpkgs/nixos/doc/manual/release-notes/rl-2009.xml b/third_party/nixpkgs/nixos/doc/manual/release-notes/rl-2009.xml index 04086275d7..89bdd12adf 100644 --- a/third_party/nixpkgs/nixos/doc/manual/release-notes/rl-2009.xml +++ b/third_party/nixpkgs/nixos/doc/manual/release-notes/rl-2009.xml @@ -3,8 +3,11 @@ xmlns:xi="http://www.w3.org/2001/XInclude" version="5.0" xml:id="sec-release-20.09"> - Release 20.09 (“Nightingale”, 2020.09/??) + Release 20.09 (“Nightingale”, 2020.10/26) + + Support is planned until the end of April 2021, handing over to 21.03. +
Highlights - In addition to numerous new and upgraded packages, this release has the + In addition to 7349 new, 14442 updated, and 8181 removed packages, this release has the following highlights: - Support is planned until the end of April 2021, handing over to 21.03. + Core version changes: - - - GNOME desktop environment was upgraded to 3.36, see its release notes. - - - - The Cinnamon desktop environment (v4.6) has been added. services.xserver.desktopManager.cinnamon.enable = true; to try it out! - Remember that, with any new feature it's possible you could run into issues, so please send all support requests to github.com/NixOS/nixpkgs to notify the maintainers. - + + + + gcc: 9.2.0 -> 9.3.0 + + + + + glibc: 2.30 -> 2.31 + + + + + linux: still defaults to 5.4.x, all supported kernels available + + + + + mesa: 19.3.5 -> 20.1.7 + + + - Quickly configure a complete, private, self-hosted video - conferencing solution with the new Jitsi Meet module. + Desktop Enironments: + + + + plasma5: 5.17.5 -> 5.18.5 + + + + + kdeApplications: 19.12.3 -> 20.08.1 + + + + + gnome3: 3.34 -> 3.36, see its release notes. + + + + + cinnamon: added at 4.6 + + + + + NixOS now distributes an official GNOME ISO. + + + + + + + + Programming Languages and Frameworks: + + + + + + Agda ecosystem was heavily reworked (see more details below). + + + + + PHP now defaults to PHP 7.4, updated from 7.3. + + + + + PHP 7.2 is no longer supported due to upstream not supporting this version for the entire lifecycle of the 20.09 release. + + + + + Python 3 now defaults to Python 3.8 instead of 3.7. + + + + + Python 3.5 has reached its upstream EOL at the end of September 2020: it + has been removed from the list of available packages. + + + + + + + + Databases and Service Monitoring: + + + + + MariaDB has been updated to 10.4, MariaDB Galera to 26.4. Please read the related upgrade instructions under backwards incompatibilities before upgrading. + + + + + Zabbix now defaults to 5.0, updated from 4.4. Please read related sections under backwards compatibilities before upgrading. + + + + + + + + Major module changes: + + + + + Quickly configure a complete, private, self-hosted video + conferencing solution with the new Jitsi Meet module. + + + + + Two new options, authorizedKeysCommand + and authorizedKeysCommandUser, have + been added to the openssh module. If you have AuthorizedKeysCommand + in your services.openssh.extraConfig you should + make use of these new options instead. + + + + + There is a new module for Podman(virtualisation.podman), a drop-in replacement for the Docker command line. + + + + + The new virtualisation.containers module manages configuration shared by the CRI-O and Podman modules. + + + + + Declarative Docker containers are renamed from docker-containers to virtualisation.oci-containers.containers. + This is to make it possible to use podman instead of docker. + + + + + The new option documentation.man.generateCaches + has been added to automatically generate the man-db caches, which are needed by utilities + like whatis and apropos. The caches are generated during the build of + the NixOS configuration: since this can be expensive when a large number of packages are installed, the + feature is disabled by default. + + + + + services.postfix.sslCACert was replaced by services.postfix.tlsTrustedAuthorities which now defaults to system certificate authorities. + + + + + The various documented workarounds to use steam have been converted to a module. programs.steam.enable enables steam, controller support and the workarounds. + + + + + Support for built-in LCDs in various pieces of Logitech hardware (keyboards and USB speakers). hardware.logitech.lcd.enable enables support for all hardware supported by the g15daemon project. + + + + + The GRUB module gained support for basic password protection, which + allows to restrict non-default entries in the boot menu to one or more + users. The users and passwords are defined via the option + . + Note: Password support is only avaiable in GRUB version 2. + + + + + + + + NixOS module changes: + + + + + The NixOS module system now supports freeform modules as a mix between types.attrsOf and types.submodule. These allow you to explicitly declare a subset of options while still permitting definitions without an associated option. See for how to use them. + + + + + Following its deprecation in 20.03, the Perl NixOS test driver has been removed. + All remaining tests have been ported to the Python test framework. + Code outside nixpkgs using make-test.nix or + testing.nix needs to be ported to + make-test-python.nix and + testing-python.nix respectively. + + + + + Subordinate GID and UID mappings are now set up automatically for all normal users. + This will make container tools like Podman work as non-root users out of the box. + + + + + + +
+ +
+ New Services + + + In addition to 1119 new, 118 updated, and 476 removed options; 61 new modules were added since the last release: + + + + + + Hardware: + + + + + adds easy support of system76 firmware. + + + + + loads uinput kernel module. + + + + + enable good defaults for HiDPI displays. + + + + + support for Wooting keyboards. + + + + + xpadneo driver for Xbox One wireless controllers. + + + - maxx package removed along with services.xserver.desktopManager.maxx module. - Please migrate to cdesktopenv and services.xserver.desktopManager.cde module. + Programs: + + + + enable hamster time tracking. + + + + + adds easy enablement of steam and related system configuration. + + + - We now distribute a GNOME ISO. + Security: + + + + alternative to sudo, allows non-root users to execute commands as root. + + + + + add Trusted Platform Module 2 support. + + + - PHP now defaults to PHP 7.4, updated from 7.3. + System: + + + + Start an OpenVPN client during initrd boot. + + + - PHP 7.2 is no longer supported due to upstream not supporting this version for the entire lifecycle of the 20.09 release. + Virtualization: + + + + Use nixos-containers. + + + + + Run OCI (Docker) containers. + + + + + Daemonless container engine. + + + + - Python 3 now defaults to Python 3.8 instead of 3.7. - - - - - Python 3.5 has reached its upstream EOL at the end of September 2020: it - has been removed from the list of available packages. - - - - - Two new options, authorizedKeysCommand - and authorizedKeysCommandUser, have - been added to the openssh module. If you have AuthorizedKeysCommand - in your services.openssh.extraConfig you should - make use of these new options instead. - - - - - There is a new module for Podman(virtualisation.podman), a drop-in replacement for the Docker command line. - - - - - The new virtualisation.containers module manages configuration shared by the CRI-O and Podman modules. - - - - - Declarative Docker containers are renamed from docker-containers to virtualisation.oci-containers.containers. - This is to make it possible to use podman instead of docker. + Services: + + + + Anki sync server. + + + + + subtitle manager for Sonarr and Radarr. + + + + + Biboumi XMPP gateway to IRC. + + + + + Blockbook-frontend, a service for the Trezor wallet. + + + + + Wayland cage service. + + + + + IRC daemon, which can be accessed throught the browser. + + + + + Tool for coordinating helpers and shifts on large events. + + + + + text-expander written in rust. + + + + + Folding@home client. + + + + + Folding@home client. + + + + + Web-based team code collaboration tool. + + + + + Matrix bot. + + + + + xow as a systemd service. + + + + + Hercules CI build agent. + + + + + Jitsi Conference Focus, component of Jitsi Meet. + + + + + a web file repository. + + + + + secure, simple and scalable video conferences. + + + + + Jitsi Videobridge, a WebRTC compatible router. + + + + + Jupyterhub development server. + + + + + lightweight kubernetes distribution. + + + + + Magic Wormhole Mailbox Server. + + + + + parental control support. + + + + + Matrix and Discord bridge. + + + + + Matrix-Telegram puppeting/relaybot bridge. + + + + + Japanese DTV Tuner Server Service. + + + + + Molly-Brown Gemini server. + + + + + Mullvad VPN daemon. + + + + + Namecoin to DNS bridge. + + + + + NextDNS to DoH Proxy service. + + + + + Enable a Google storage bucket to be used as a nix store. + + + + + OneDrive sync service. + + + + + Pastebin-like service. + + + + + manage network booting of machines. + + + + + Privacy authentication server. + + + + + Quorum blockchain daemon. + + + + + RobustIRC bridge. + + + + + generate RSS and Atom feeds. + + + + + rTorrent service. + + + + + SmartDNS DNS server. + + + + + SOGo groupware. + + + + + Teeworlds game server. + + + + + torque computing node. + + + + + enable torque server. + + + + + a total uptime service. + + + + + X11 remote server. + + + + + Wasabi backend service. + + + + + Yubikey agent. + + + + + Zigbee to MQTT bridge. + + + + + + +
+ +
+ Backward Incompatibilities + + + When upgrading from a previous release, please be aware of the following + incompatible changes: + + + MariaDB has been updated to 10.4, MariaDB Galera to 26.4. @@ -144,36 +665,7 @@ GRANT ALL PRIVILEGES ON *.* TO 'mysql'@'localhost' WITH GRANT OPTION; from the default of mysql to a different user please change 'mysql'@'localhost' to the corresponding user instead. - - - The new option documentation.man.generateCaches - has been added to automatically generate the man-db caches, which are needed by utilities - like whatis and apropos. The caches are generated during the build of - the NixOS configuration: since this can be expensive when a large number of packages are installed, the - feature is disabled by default. - - - - - services.postfix.sslCACert was replaced by services.postfix.tlsTrustedAuthorities which now defaults to system certificate authorities. - - - - - Subordinate GID and UID mappings are now set up automatically for all normal users. - This will make container tools like Podman work as non-root users out of the box. - - - - - The various documented workarounds to use steam have been converted to a module. programs.steam.enable enables steam, controller support and the workarounds. - - - - - Support for built-in LCDs in various pieces of Logitech hardware (keyboards and USB speakers). hardware.logitech.lcd.enable enables support for all hardware supported by the g15daemon project. - - + Zabbix now defaults to 5.0, updated from 4.4. Please carefully read through @@ -208,72 +700,13 @@ GRANT ALL PRIVILEGES ON *.* TO 'mysql'@'localhost' WITH GRANT OPTION; - - - The NixOS module system now supports freeform modules as a mix between types.attrsOf and types.submodule. These allow you to explicitly declare a subset of options while still permitting definitions without an associated option. See for how to use them. - - - - - The GRUB module gained support for basic password protection, which - allows to restrict non-default entries in the boot menu to one or more - users. The users and passwords are defined via the option - . - Note: Password support is only avaiable in GRUB version 2. - - - - - Following its deprecation in 20.03, the Perl NixOS test driver has been removed. - All remaining tests have been ported to the Python test framework. - Code outside nixpkgs using make-test.nix or - testing.nix needs to be ported to - make-test-python.nix and - testing-python.nix respectively. - - - -
-
- New Services - - - The following new services were added since the last release: - - - - There is a new module that provides doas, a lighter alternative to sudo with many of the same features. - - - - - Hercules CI Agent is a specialized build agent for projects built with Nix. See the options and setup. + maxx package removed along with services.xserver.desktopManager.maxx module. + Please migrate to cdesktopenv and services.xserver.desktopManager.cde module. - - -
- -
- Backward Incompatibilities - - - When upgrading from a previous release, please be aware of the following - incompatible changes: - - - The matrix-synapse module no longer includes optional dependencies by default, they have to be added through the plugins option. @@ -643,6 +1076,13 @@ systemd.services.nginx.serviceConfig.ReadWritePaths = [ "/var/www" ]; In the resilio module, has been changed to listen to [::1] instead of 0.0.0.0. + + + sslh has been updated to version + 1.21. The ssl probe must be + renamed to tls in . + + Users of OpenAFS 1.6 must diff --git a/third_party/nixpkgs/nixos/doc/manual/release-notes/rl-2103.xml b/third_party/nixpkgs/nixos/doc/manual/release-notes/rl-2103.xml index c160ab5783..374ea1cbd1 100644 --- a/third_party/nixpkgs/nixos/doc/manual/release-notes/rl-2103.xml +++ b/third_party/nixpkgs/nixos/doc/manual/release-notes/rl-2103.xml @@ -99,6 +99,16 @@ to /run/pdns-recursor to match upstream. + + + PowerDNS has been updated from 4.2.x to 4.3.x. Please + be sure to review the Upgrade Notes + provided by upstream before upgrading. Worth specifically noting is that the service now runs + entirely as a dedicated pdns user, instead of starting as root + and dropping privileges, as well as the default socket-dir location changing from + /var/lib/powerdns to /run/pdns. + +
diff --git a/third_party/nixpkgs/nixos/lib/build-vms.nix b/third_party/nixpkgs/nixos/lib/build-vms.nix index b1575fc13b..ebbb0296be 100644 --- a/third_party/nixpkgs/nixos/lib/build-vms.nix +++ b/third_party/nixpkgs/nixos/lib/build-vms.nix @@ -18,9 +18,6 @@ rec { inherit pkgs; - qemu = pkgs.qemu_test; - - # Build a virtual network from an attribute set `{ machine1 = # config1; ... machineN = configN; }', where `machineX' is the # hostname and `configX' is a NixOS system configuration. Each @@ -39,7 +36,6 @@ rec { [ ../modules/virtualisation/qemu-vm.nix ../modules/testing/test-instrumentation.nix # !!! should only get added for automated test runs { key = "no-manual"; documentation.nixos.enable = false; } - { key = "qemu"; system.build.qemu = qemu; } { key = "nodes"; _module.args.nodes = nodes; } ] ++ optional minimal ../modules/testing/minimal-kernel.nix; }; diff --git a/third_party/nixpkgs/nixos/lib/test-driver/test-driver.py b/third_party/nixpkgs/nixos/lib/test-driver/test-driver.py index 156392ad1e..68bd35dd98 100644 --- a/third_party/nixpkgs/nixos/lib/test-driver/test-driver.py +++ b/third_party/nixpkgs/nixos/lib/test-driver/test-driver.py @@ -110,7 +110,6 @@ def create_vlan(vlan_nr: str) -> Tuple[str, str, "subprocess.Popen[bytes]", Any] pty_master, pty_slave = pty.openpty() vde_process = subprocess.Popen( ["vde_switch", "-s", vde_socket, "--dirmode", "0700"], - bufsize=1, stdin=pty_slave, stdout=subprocess.PIPE, stderr=subprocess.PIPE, @@ -748,7 +747,6 @@ class Machine: self.process = subprocess.Popen( self.script, - bufsize=1, stdin=subprocess.DEVNULL, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, diff --git a/third_party/nixpkgs/nixos/lib/testing-python.nix b/third_party/nixpkgs/nixos/lib/testing-python.nix index 302c7f78bf..13abfb9a11 100644 --- a/third_party/nixpkgs/nixos/lib/testing-python.nix +++ b/third_party/nixpkgs/nixos/lib/testing-python.nix @@ -3,13 +3,13 @@ # Use a minimal kernel? , minimal ? false # Ignored -, config ? {} +, config ? { } # !!! See comment about args in lib/modules.nix -, specialArgs ? {} +, specialArgs ? { } # Modules to add to each VM -, extraConfigurations ? [] }: +, extraConfigurations ? [ ] +}: -with import ./build-vms.nix { inherit system pkgs minimal specialArgs extraConfigurations; }; with pkgs; rec { @@ -17,42 +17,41 @@ rec { inherit pkgs; - mkTestDriver = let - testDriverScript = ./test-driver/test-driver.py; - in qemu_pkg: stdenv.mkDerivation { - name = "nixos-test-driver"; + mkTestDriver = + let + testDriverScript = ./test-driver/test-driver.py; + in + qemu_pkg: stdenv.mkDerivation { + name = "nixos-test-driver"; - nativeBuildInputs = [ makeWrapper ]; - buildInputs = [ (python3.withPackages (p: [ p.ptpython ])) ]; - checkInputs = with python3Packages; [ pylint black mypy ]; + nativeBuildInputs = [ makeWrapper ]; + buildInputs = [ (python3.withPackages (p: [ p.ptpython ])) ]; + checkInputs = with python3Packages; [ pylint black mypy ]; - dontUnpack = true; + dontUnpack = true; - preferLocalBuild = true; + preferLocalBuild = true; - doCheck = true; - checkPhase = '' - mypy --disallow-untyped-defs \ - --no-implicit-optional \ - --ignore-missing-imports ${testDriverScript} - pylint --errors-only ${testDriverScript} - black --check --diff ${testDriverScript} - ''; - - installPhase = - '' - mkdir -p $out/bin - cp ${testDriverScript} $out/bin/nixos-test-driver - chmod u+x $out/bin/nixos-test-driver - # TODO: copy user script part into this file (append) - - wrapProgram $out/bin/nixos-test-driver \ - --prefix PATH : "${lib.makeBinPath [ qemu_pkg vde2 netpbm coreutils ]}" \ + doCheck = true; + checkPhase = '' + mypy --disallow-untyped-defs \ + --no-implicit-optional \ + --ignore-missing-imports ${testDriverScript} + pylint --errors-only ${testDriverScript} + black --check --diff ${testDriverScript} ''; - }; - testDriver = mkTestDriver qemu_test; - testDriverInteractive = mkTestDriver qemu_kvm; + installPhase = + '' + mkdir -p $out/bin + cp ${testDriverScript} $out/bin/nixos-test-driver + chmod u+x $out/bin/nixos-test-driver + # TODO: copy user script part into this file (append) + + wrapProgram $out/bin/nixos-test-driver \ + --prefix PATH : "${lib.makeBinPath [ qemu_pkg vde2 netpbm coreutils ]}" \ + ''; + }; # Run an automated test suite in the given virtual network. # `driver' is the script that runs the network. @@ -75,11 +74,10 @@ rec { { testScript , enableOCR ? false , name ? "unnamed" - # Skip linting (mainly intended for faster dev cycles) + # Skip linting (mainly intended for faster dev cycles) , skipLint ? false , ... } @ t: - let # A standard store path to the vm monitor is built like this: # /tmp/nix-build-vm-test-run-$name.drv-0/vm-state-machine/monitor @@ -88,25 +86,7 @@ rec { maxTestNameLen = 50; testNameLen = builtins.stringLength name; - testDriverName = with builtins; - if testNameLen > maxTestNameLen then - abort ("The name of the test '${name}' must not be longer than ${toString maxTestNameLen} " + - "it's currently ${toString testNameLen} characters long.") - else - "nixos-test-driver-${name}"; - nodes = buildVirtualNetwork ( - t.nodes or (if t ? machine then { machine = t.machine; } else { })); - - testScript' = - # Call the test script with the computed nodes. - if lib.isFunction testScript - then testScript { inherit nodes; } - else testScript; - - vlans = map (m: m.config.virtualisation.vlans) (lib.attrValues nodes); - - vms = map (m: m.config.system.build.vm) (lib.attrValues nodes); ocrProg = tesseract4.override { enableLanguages = [ "eng" ]; }; @@ -115,78 +95,124 @@ rec { # Generate convenience wrappers for running the test driver # interactively with the specified network, and for starting the # VMs from the command line. - driver = testDriver: + mkDriver = qemu_pkg: let + build-vms = import ./build-vms.nix { + inherit system pkgs minimal specialArgs; + extraConfigurations = extraConfigurations ++ (pkgs.lib.optional (qemu_pkg != null) + { + virtualisation.qemu.package = qemu_pkg; + } + ); + }; + + # FIXME: get this pkg from the module system + testDriver = mkTestDriver (if qemu_pkg == null then pkgs.qemu_test else qemu_pkg); + + nodes = build-vms.buildVirtualNetwork ( + t.nodes or (if t ? machine then { machine = t.machine; } else { }) + ); + vlans = map (m: m.config.virtualisation.vlans) (lib.attrValues nodes); + vms = map (m: m.config.system.build.vm) (lib.attrValues nodes); + + testScript' = + # Call the test script with the computed nodes. + if lib.isFunction testScript + then testScript { inherit nodes; } + else testScript; + + testDriverName = with builtins; + if testNameLen > maxTestNameLen then + abort + ("The name of the test '${name}' must not be longer than ${toString maxTestNameLen} " + + "it's currently ${toString testNameLen} characters long.") + else + "nixos-test-driver-${name}"; + warn = if skipLint then lib.warn "Linting is disabled!" else lib.id; in warn (runCommand testDriverName - { buildInputs = [ makeWrapper]; - testScript = testScript'; - preferLocalBuild = true; - testName = name; - } - '' - mkdir -p $out/bin + { + buildInputs = [ makeWrapper ]; + testScript = testScript'; + preferLocalBuild = true; + testName = name; + passthru = { + inherit nodes; + }; + } + '' + mkdir -p $out/bin - echo -n "$testScript" > $out/test-script - ${lib.optionalString (!skipLint) '' - ${python3Packages.black}/bin/black --check --diff $out/test-script - ''} + echo -n "$testScript" > $out/test-script + ${lib.optionalString (!skipLint) '' + ${python3Packages.black}/bin/black --check --diff $out/test-script + ''} - ln -s ${testDriver}/bin/nixos-test-driver $out/bin/ - vms=($(for i in ${toString vms}; do echo $i/bin/run-*-vm; done)) - wrapProgram $out/bin/nixos-test-driver \ - --add-flags "''${vms[*]}" \ - ${lib.optionalString enableOCR - "--prefix PATH : '${ocrProg}/bin:${imagemagick_tiff}/bin'"} \ - --run "export testScript=\"\$(${coreutils}/bin/cat $out/test-script)\"" \ - --set VLANS '${toString vlans}' - ln -s ${testDriver}/bin/nixos-test-driver $out/bin/nixos-run-vms - wrapProgram $out/bin/nixos-run-vms \ - --add-flags "''${vms[*]}" \ - ${lib.optionalString enableOCR "--prefix PATH : '${ocrProg}/bin'"} \ - --set tests 'start_all(); join_all();' \ - --set VLANS '${toString vlans}' \ - ${lib.optionalString (builtins.length vms == 1) "--set USE_SERIAL 1"} - ''); # " + ln -s ${testDriver}/bin/nixos-test-driver $out/bin/ + vms=($(for i in ${toString vms}; do echo $i/bin/run-*-vm; done)) + wrapProgram $out/bin/nixos-test-driver \ + --add-flags "''${vms[*]}" \ + ${lib.optionalString enableOCR + "--prefix PATH : '${ocrProg}/bin:${imagemagick_tiff}/bin'"} \ + --run "export testScript=\"\$(${coreutils}/bin/cat $out/test-script)\"" \ + --set VLANS '${toString vlans}' + ln -s ${testDriver}/bin/nixos-test-driver $out/bin/nixos-run-vms + wrapProgram $out/bin/nixos-run-vms \ + --add-flags "''${vms[*]}" \ + ${lib.optionalString enableOCR "--prefix PATH : '${ocrProg}/bin'"} \ + --set tests 'start_all(); join_all();' \ + --set VLANS '${toString vlans}' \ + ${lib.optionalString (builtins.length vms == 1) "--set USE_SERIAL 1"} + ''); # " passMeta = drv: drv // lib.optionalAttrs (t ? meta) { - meta = (drv.meta or {}) // t.meta; + meta = (drv.meta or { }) // t.meta; }; - test = passMeta (runTests (driver testDriver)); + driver = mkDriver null; + driverInteractive = mkDriver pkgs.qemu; - nodeNames = builtins.attrNames nodes; + test = passMeta (runTests driver); + + nodeNames = builtins.attrNames driver.nodes; invalidNodeNames = lib.filter - (node: builtins.match "^[A-z_]([A-z0-9_]+)?$" node == null) nodeNames; + (node: builtins.match "^[A-z_]([A-z0-9_]+)?$" node == null) + nodeNames; in - if lib.length invalidNodeNames > 0 then - throw '' - Cannot create machines out of (${lib.concatStringsSep ", " invalidNodeNames})! - All machines are referenced as python variables in the testing framework which will break the - script when special characters are used. + if lib.length invalidNodeNames > 0 then + throw '' + Cannot create machines out of (${lib.concatStringsSep ", " invalidNodeNames})! + All machines are referenced as python variables in the testing framework which will break the + script when special characters are used. - Please stick to alphanumeric chars and underscores as separation. - '' - else - test // { - inherit nodes test; - driver = driver testDriver; - driverInteractive = driver testDriverInteractive; - }; + Please stick to alphanumeric chars and underscores as separation. + '' + else + test // { + inherit test driver driverInteractive; + inherit (driver) nodes; + }; runInMachine = { drv , machine , preBuild ? "" , postBuild ? "" + , qemu ? pkgs.qemu_test , ... # ??? }: let - vm = buildVM { } - [ machine - { key = "run-in-machine"; + build-vms = import ./build-vms.nix { + inherit system pkgs minimal specialArgs extraConfigurations; + }; + + vm = build-vms.buildVM { } + [ + machine + { + key = "run-in-machine"; networking.hostName = "client"; nix.readOnlyStore = false; virtualisation.writableStore = false; @@ -229,20 +255,20 @@ rec { unset xchg export tests='${testScript}' - ${testDriver}/bin/nixos-test-driver ${vm.config.system.build.vm}/bin/run-*-vm + ${mkTestDriver qemu}/bin/nixos-test-driver --keep-vm-state ${vm.config.system.build.vm}/bin/run-*-vm ''; # */ in - lib.overrideDerivation drv (attrs: { - requiredSystemFeatures = [ "kvm" ]; - builder = "${bash}/bin/sh"; - args = ["-e" vmRunCommand]; - origArgs = attrs.args; - origBuilder = attrs.builder; - }); + lib.overrideDerivation drv (attrs: { + requiredSystemFeatures = [ "kvm" ]; + builder = "${bash}/bin/sh"; + args = [ "-e" vmRunCommand ]; + origArgs = attrs.args; + origBuilder = attrs.builder; + }); - runInMachineWithX = { require ? [], ... } @ args: + runInMachineWithX = { require ? [ ], ... } @ args: let client = { ... }: @@ -258,13 +284,13 @@ rec { services.xserver.windowManager.icewm.enable = true; }; in - runInMachine ({ - machine = client; - preBuild = - '' - client.wait_for_x() - ''; - } // args); + runInMachine ({ + machine = client; + preBuild = + '' + client.wait_for_x() + ''; + } // args); simpleTest = as: (makeTest as).test; diff --git a/third_party/nixpkgs/nixos/modules/config/system-path.nix b/third_party/nixpkgs/nixos/modules/config/system-path.nix index c46937f800..c65fa1a684 100644 --- a/third_party/nixpkgs/nixos/modules/config/system-path.nix +++ b/third_party/nixpkgs/nixos/modules/config/system-path.nix @@ -33,6 +33,7 @@ let pkgs.ncurses pkgs.netcat config.programs.ssh.package + pkgs.mkpasswd pkgs.procps pkgs.su pkgs.time diff --git a/third_party/nixpkgs/nixos/modules/config/users-groups.nix b/third_party/nixpkgs/nixos/modules/config/users-groups.nix index 5264d5b56f..72285fe631 100644 --- a/third_party/nixpkgs/nixos/modules/config/users-groups.nix +++ b/third_party/nixpkgs/nixos/modules/config/users-groups.nix @@ -35,8 +35,7 @@ let ''; hashedPasswordDescription = '' - To generate a hashed password install the mkpasswd - package and run mkpasswd -m sha-512. + To generate a hashed password run mkpasswd -m sha-512. If set to an empty string (""), this user will be able to log in without being asked for a password (but not via remote diff --git a/third_party/nixpkgs/nixos/modules/hardware/rtl-sdr.nix b/third_party/nixpkgs/nixos/modules/hardware/rtl-sdr.nix new file mode 100644 index 0000000000..77c8cb59a3 --- /dev/null +++ b/third_party/nixpkgs/nixos/modules/hardware/rtl-sdr.nix @@ -0,0 +1,20 @@ +{ config, lib, pkgs, ... }: + +let + cfg = config.hardware.rtl-sdr; + +in { + options.hardware.rtl-sdr = { + enable = lib.mkEnableOption '' + Enables rtl-sdr udev rules and ensures 'plugdev' group exists. + This is a prerequisite to using devices supported by rtl-sdr without + being root, since rtl-sdr USB descriptors will be owned by plugdev + through udev. + ''; + }; + + config = lib.mkIf cfg.enable { + services.udev.packages = [ pkgs.rtl-sdr ]; + users.groups.plugdev = {}; + }; +} diff --git a/third_party/nixpkgs/nixos/modules/installer/cd-dvd/installation-cd-graphical-gnome.nix b/third_party/nixpkgs/nixos/modules/installer/cd-dvd/installation-cd-graphical-gnome.nix index 8c98691116..803bae4212 100644 --- a/third_party/nixpkgs/nixos/modules/installer/cd-dvd/installation-cd-graphical-gnome.nix +++ b/third_party/nixpkgs/nixos/modules/installer/cd-dvd/installation-cd-graphical-gnome.nix @@ -9,7 +9,14 @@ with lib; isoImage.edition = "gnome"; - services.xserver.desktopManager.gnome3.enable = true; + services.xserver.desktopManager.gnome3 = { + # Add firefox to favorite-apps + favoriteAppsOverride = '' + [org.gnome.shell] + favorite-apps=[ 'firefox.desktop', 'org.gnome.Geary.desktop', 'org.gnome.Calendar.desktop', 'org.gnome.Music.desktop', 'org.gnome.Photos.desktop', 'org.gnome.Nautilus.desktop' ] + ''; + enable = true; + }; services.xserver.displayManager = { gdm = { diff --git a/third_party/nixpkgs/nixos/modules/installer/tools/nix-fallback-paths.nix b/third_party/nixpkgs/nixos/modules/installer/tools/nix-fallback-paths.nix index a15a2dbadb..bd70bd2001 100644 --- a/third_party/nixpkgs/nixos/modules/installer/tools/nix-fallback-paths.nix +++ b/third_party/nixpkgs/nixos/modules/installer/tools/nix-fallback-paths.nix @@ -1,6 +1,6 @@ { - x86_64-linux = "/nix/store/4vz8sh9ngx34ivi0bw5hlycxdhvy5hvz-nix-2.3.7"; - i686-linux = "/nix/store/dzxkg9lpp60bjmzvagns42vqlz3yq5kx-nix-2.3.7"; - aarch64-linux = "/nix/store/cfvf8nl8mwyw817by5y8zd3s8pnf5m9f-nix-2.3.7"; - x86_64-darwin = "/nix/store/5ira7xgs92inqz1x8l0n1wci4r79hnd0-nix-2.3.7"; + x86_64-linux = "/nix/store/qxayqjmlpqnmwg5yfsjjayw220ls8i2r-nix-2.3.8"; + i686-linux = "/nix/store/5834psaay75048jp6d07liqh4j0v1swd-nix-2.3.8"; + aarch64-linux = "/nix/store/pic90a5fxvifz05jzkd0zak21f9mjin6-nix-2.3.8"; + x86_64-darwin = "/nix/store/cjx3f8z12wlayp5983kli2a52ipi8jz2-nix-2.3.8"; } diff --git a/third_party/nixpkgs/nixos/modules/installer/tools/nixos-build-vms/build-vms.nix b/third_party/nixpkgs/nixos/modules/installer/tools/nixos-build-vms/build-vms.nix index 0c9f8522cc..e49ceba242 100644 --- a/third_party/nixpkgs/nixos/modules/installer/tools/nixos-build-vms/build-vms.nix +++ b/third_party/nixpkgs/nixos/modules/installer/tools/nixos-build-vms/build-vms.nix @@ -15,4 +15,4 @@ with import ../../../../lib/testing-python.nix { pkgs = import ../../../../.. { inherit system config; }; }; -(makeTest { inherit nodes; testScript = ""; }).driver +(makeTest { inherit nodes; testScript = ""; }).driverInteractive diff --git a/third_party/nixpkgs/nixos/modules/installer/tools/nixos-generate-config.pl b/third_party/nixpkgs/nixos/modules/installer/tools/nixos-generate-config.pl index 54b84521bd..44f4c44a56 100644 --- a/third_party/nixpkgs/nixos/modules/installer/tools/nixos-generate-config.pl +++ b/third_party/nixpkgs/nixos/modules/installer/tools/nixos-generate-config.pl @@ -625,6 +625,10 @@ EOF my $networkingDhcpConfig = generateNetworkingDhcpConfig(); + (my $desktopConfiguration = <nixos-generate-config - saves to /etc/nixos/configuration.nix. + options.system.nixos-generate-config = { + configuration = mkOption { + internal = true; + type = types.str; + description = '' + The NixOS module that nixos-generate-config + saves to /etc/nixos/configuration.nix. - This is an internal option. No backward compatibility is guaranteed. - Use at your own risk! + This is an internal option. No backward compatibility is guaranteed. + Use at your own risk! - Note that this string gets spliced into a Perl script. The perl - variable $bootLoaderConfig can be used to - splice in the boot loader configuration. - ''; + Note that this string gets spliced into a Perl script. The perl + variable $bootLoaderConfig can be used to + splice in the boot loader configuration. + ''; + }; + + desktopConfiguration = mkOption { + internal = true; + type = types.str; + default = ""; + description = '' + Text to preseed the desktop configuration that nixos-generate-config + saves to /etc/nixos/configuration.nix. + + This is an internal option. No backward compatibility is guaranteed. + Use at your own risk! + + Note that this string gets spliced into a Perl script. The perl + variable $bootLoaderConfig can be used to + splice in the boot loader configuration. + ''; + }; }; config = { - system.nixos-generate-config.configuration = mkDefault '' # Edit this configuration file to define what should be installed on # your system. Help is available in the configuration.nix(5) man page @@ -113,6 +131,9 @@ in # networking.hostName = "nixos"; # Define your hostname. # networking.wireless.enable = true; # Enables wireless support via wpa_supplicant. + # Set your time zone. + # time.timeZone = "Europe/Amsterdam"; + $networkingDhcpConfig # Configure network proxy if necessary # networking.proxy.default = "http://user:password\@proxy:port/"; @@ -125,13 +146,32 @@ in # keyMap = "us"; # }; - # Set your time zone. - # time.timeZone = "Europe/Amsterdam"; + $desktopConfiguration + # Configure keymap in X11 + # services.xserver.layout = "us"; + # services.xserver.xkbOptions = "eurosign:e"; + + # Enable CUPS to print documents. + # services.printing.enable = true; + + # Enable sound. + # sound.enable = true; + # hardware.pulseaudio.enable = true; + + # Enable touchpad support (enabled default in most desktopManager). + # services.xserver.libinput.enable = true; + + # Define a user account. Don't forget to set a password with ‘passwd’. + # users.users.jane = { + # isNormalUser = true; + # extraGroups = [ "wheel" ]; # Enable ‘sudo’ for the user. + # }; # List packages installed in system profile. To search, run: # \$ nix search wget # environment.systemPackages = with pkgs; [ # wget vim + # firefox # ]; # Some programs need SUID wrappers, can be configured further or are @@ -140,7 +180,6 @@ in # programs.gnupg.agent = { # enable = true; # enableSSHSupport = true; - # pinentryFlavor = "gnome3"; # }; # List services that you want to enable: @@ -154,31 +193,6 @@ in # Or disable the firewall altogether. # networking.firewall.enable = false; - # Enable CUPS to print documents. - # services.printing.enable = true; - - # Enable sound. - # sound.enable = true; - # hardware.pulseaudio.enable = true; - - # Enable the X11 windowing system. - # services.xserver.enable = true; - # services.xserver.layout = "us"; - # services.xserver.xkbOptions = "eurosign:e"; - - # Enable touchpad support. - # services.xserver.libinput.enable = true; - - # Enable the KDE Desktop Environment. - # services.xserver.displayManager.sddm.enable = true; - # services.xserver.desktopManager.plasma5.enable = true; - - # Define a user account. Don't forget to set a password with ‘passwd’. - # users.users.jane = { - # isNormalUser = true; - # extraGroups = [ "wheel" ]; # Enable ‘sudo’ for the user. - # }; - # This value determines the NixOS release from which the default # settings for stateful data, like file locations and database versions # on your system were taken. It‘s perfectly fine and recommended to leave diff --git a/third_party/nixpkgs/nixos/modules/module-list.nix b/third_party/nixpkgs/nixos/modules/module-list.nix index ed6201237b..cce4e8e74b 100644 --- a/third_party/nixpkgs/nixos/modules/module-list.nix +++ b/third_party/nixpkgs/nixos/modules/module-list.nix @@ -59,6 +59,7 @@ ./hardware/pcmcia.nix ./hardware/printers.nix ./hardware/raid/hpsa.nix + ./hardware/rtl-sdr.nix ./hardware/steam-hardware.nix ./hardware/system-76.nix ./hardware/tuxedo-keyboard.nix diff --git a/third_party/nixpkgs/nixos/modules/programs/ssmtp.nix b/third_party/nixpkgs/nixos/modules/programs/ssmtp.nix index 15d2750c19..98ff21bd37 100644 --- a/third_party/nixpkgs/nixos/modules/programs/ssmtp.nix +++ b/third_party/nixpkgs/nixos/modules/programs/ssmtp.nix @@ -1,6 +1,6 @@ # Configuration for `ssmtp', a trivial mail transfer agent that can # replace sendmail/postfix on simple systems. It delivers email -# directly to an SMTP server defined in its configuration file, wihout +# directly to an SMTP server defined in its configuration file, without # queueing mail locally. { config, lib, pkgs, ... }: diff --git a/third_party/nixpkgs/nixos/modules/security/pam.nix b/third_party/nixpkgs/nixos/modules/security/pam.nix index a20d0a243a..a517f9e51c 100644 --- a/third_party/nixpkgs/nixos/modules/security/pam.nix +++ b/third_party/nixpkgs/nixos/modules/security/pam.nix @@ -318,6 +318,42 @@ let ''; }; + gnupg = { + enable = mkOption { + type = types.bool; + default = false; + description = '' + If enabled, pam_gnupg will attempt to automatically unlock the + user's GPG keys with the login password via + gpg-agent. The keygrips of all keys to be + unlocked should be written to ~/.pam-gnupg, + and can be queried with gpg -K --with-keygrip. + Presetting passphrases must be enabled by adding + allow-preset-passphrase in + ~/.gnupg/gpg-agent.conf. + ''; + }; + + noAutostart = mkOption { + type = types.bool; + default = false; + description = '' + Don't start gpg-agent if it is not running. + Useful in conjunction with starting gpg-agent as + a systemd user service. + ''; + }; + + storeOnly = mkOption { + type = types.bool; + default = false; + description = '' + Don't send the password immediately after login, but store for PAM + session. + ''; + }; + }; + text = mkOption { type = types.nullOr types.lines; description = "Contents of the PAM service file."; @@ -386,6 +422,7 @@ let || cfg.enableKwallet || cfg.enableGnomeKeyring || cfg.googleAuthenticator.enable + || cfg.gnupg.enable || cfg.duoSecurity.enable)) '' auth required pam_unix.so ${optionalString cfg.allowNullPassword "nullok"} ${optionalString cfg.nodelay "nodelay"} likeauth ${optionalString config.security.pam.enableEcryptfs @@ -397,6 +434,10 @@ let " kwalletd=${pkgs.kdeFrameworks.kwallet.bin}/bin/kwalletd5")} ${optionalString cfg.enableGnomeKeyring "auth optional ${pkgs.gnome3.gnome-keyring}/lib/security/pam_gnome_keyring.so"} + ${optionalString cfg.gnupg.enable + "auth optional ${pkgs.pam_gnupg}/lib/security/pam_gnupg.so" + + optionalString cfg.gnupg.storeOnly " store-only" + } ${optionalString cfg.googleAuthenticator.enable "auth required ${pkgs.googleAuthenticator}/lib/security/pam_google_authenticator.so no_increment_hotp"} ${optionalString cfg.duoSecurity.enable @@ -472,6 +513,10 @@ let " kwalletd=${pkgs.kdeFrameworks.kwallet.bin}/bin/kwalletd5")} ${optionalString (cfg.enableGnomeKeyring) "session optional ${pkgs.gnome3.gnome-keyring}/lib/security/pam_gnome_keyring.so auto_start"} + ${optionalString cfg.gnupg.enable + "session optional ${pkgs.pam_gnupg}/lib/security/pam_gnupg.so" + + optionalString cfg.gnupg.noAutostart " no-autostart" + } ${optionalString (config.virtualisation.lxc.lxcfs.enable) "session optional ${pkgs.lxc}/lib/security/pam_cgfs.so -c all"} ''); diff --git a/third_party/nixpkgs/nixos/modules/services/admin/salt/master.nix b/third_party/nixpkgs/nixos/modules/services/admin/salt/master.nix index c6b1b0cc0b..cb803d323b 100644 --- a/third_party/nixpkgs/nixos/modules/services/admin/salt/master.nix +++ b/third_party/nixpkgs/nixos/modules/services/admin/salt/master.nix @@ -59,5 +59,5 @@ in }; }; - meta.maintainers = with lib.maintainers; [ aneeshusa ]; + meta.maintainers = with lib.maintainers; [ Flakebi ]; } diff --git a/third_party/nixpkgs/nixos/modules/services/backup/syncoid.nix b/third_party/nixpkgs/nixos/modules/services/backup/syncoid.nix index fff119c2cf..e72e3fa59c 100644 --- a/third_party/nixpkgs/nixos/modules/services/backup/syncoid.nix +++ b/third_party/nixpkgs/nixos/modules/services/backup/syncoid.nix @@ -4,6 +4,15 @@ with lib; let cfg = config.services.syncoid; + + # Extract pool names of local datasets (ones that don't contain "@") that + # have the specified type (either "source" or "target") + getPools = type: unique (map (d: head (builtins.match "([^/]+).*" d)) ( + # Filter local datasets + filter (d: !hasInfix "@" d) + # Get datasets of the specified type + (catAttrs type (attrValues cfg.commands)) + )); in { # Interface @@ -26,14 +35,25 @@ in { user = mkOption { type = types.str; - default = "root"; + default = "syncoid"; example = "backup"; description = '' - The user for the service. Sudo or ZFS privilege delegation must be - configured to use a user other than root. + The user for the service. ZFS privilege delegation will be + automatically configured for any local pools used by syncoid if this + option is set to a user other than root. The user will be given the + "hold" and "send" privileges on any pool that has datasets being sent + and the "create", "mount", "receive", and "rollback" privileges on + any pool that has datasets being received. ''; }; + group = mkOption { + type = types.str; + default = "syncoid"; + example = "backup"; + description = "The group for the service."; + }; + sshKey = mkOption { type = types.nullOr types.path; # Prevent key from being copied to store @@ -150,6 +170,18 @@ in { # Implementation config = mkIf cfg.enable { + users = { + users = mkIf (cfg.user == "syncoid") { + syncoid = { + group = cfg.group; + isSystemUser = true; + }; + }; + groups = mkIf (cfg.group == "syncoid") { + syncoid = {}; + }; + }; + systemd.services.syncoid = { description = "Syncoid ZFS synchronization service"; script = concatMapStringsSep "\n" (c: lib.escapeShellArgs @@ -160,10 +192,22 @@ in { ++ c.extraArgs ++ [ "--sendoptions" c.sendOptions "--recvoptions" c.recvOptions + "--no-privilege-elevation" c.source c.target ])) (attrValues cfg.commands); after = [ "zfs.target" ]; - serviceConfig.User = cfg.user; + serviceConfig = { + ExecStartPre = (map (pool: lib.escapeShellArgs [ + "+/run/booted-system/sw/bin/zfs" "allow" + cfg.user "hold,send" pool + ]) (getPools "source")) ++ + (map (pool: lib.escapeShellArgs [ + "+/run/booted-system/sw/bin/zfs" "allow" + cfg.user "create,mount,receive,rollback" pool + ]) (getPools "target")); + User = cfg.user; + Group = cfg.group; + }; startAt = cfg.interval; }; }; diff --git a/third_party/nixpkgs/nixos/modules/services/continuous-integration/hydra/default.nix b/third_party/nixpkgs/nixos/modules/services/continuous-integration/hydra/default.nix index 502a5898a5..252ca17006 100644 --- a/third_party/nixpkgs/nixos/modules/services/continuous-integration/hydra/default.nix +++ b/third_party/nixpkgs/nixos/modules/services/continuous-integration/hydra/default.nix @@ -37,8 +37,6 @@ let haveLocalDB = cfg.dbi == localDB; - inherit (config.system) stateVersion; - hydra-package = let makeWrapperArgs = concatStringsSep " " (mapAttrsToList (key: value: "--set \"${key}\" \"${value}\"") hydraEnv); @@ -96,7 +94,8 @@ in package = mkOption { type = types.package; - defaultText = "pkgs.hydra"; + default = pkgs.hydra-unstable; + defaultText = "pkgs.hydra-unstable"; description = "The Hydra package."; }; @@ -225,34 +224,6 @@ in config = mkIf cfg.enable { - warnings = optional (cfg.package.migration or false) '' - You're currently deploying an older version of Hydra which is needed to - make some required database changes[1]. As soon as this is done, it's recommended - to run `hydra-backfill-ids` and set `services.hydra.package` to `pkgs.hydra-unstable` - after that. - - [1] https://github.com/NixOS/hydra/pull/711 - ''; - - services.hydra.package = with pkgs; - mkDefault ( - if pkgs ? hydra - then throw '' - The Hydra package doesn't exist anymore in `nixpkgs`! It probably exists - due to an overlay. To upgrade Hydra, you need to take two steps as some - bigger changes in the database schema were implemented recently[1]. You first - need to deploy `pkgs.hydra-migration`, run `hydra-backfill-ids` on the server - and then deploy `pkgs.hydra-unstable`. - - If you want to use `pkgs.hydra` from your overlay, please set `services.hydra.package` - explicitly to `pkgs.hydra` and make sure you know what you're doing. - - [1] https://github.com/NixOS/hydra/pull/711 - '' - else if versionOlder stateVersion "20.03" then hydra-migration - else hydra-unstable - ); - users.groups.hydra = { gid = config.ids.gids.hydra; }; diff --git a/third_party/nixpkgs/nixos/modules/services/desktops/flatpak.nix b/third_party/nixpkgs/nixos/modules/services/desktops/flatpak.nix index 7da92cc9f2..d0f6b66328 100644 --- a/third_party/nixpkgs/nixos/modules/services/desktops/flatpak.nix +++ b/third_party/nixpkgs/nixos/modules/services/desktops/flatpak.nix @@ -15,6 +15,18 @@ in { options = { services.flatpak = { enable = mkEnableOption "flatpak"; + + guiPackages = mkOption { + internal = true; + type = types.listOf types.package; + default = []; + example = literalExample "[ pkgs.gnome3.gnome-software ]"; + description = '' + Packages that provide an interface for flatpak + (like gnome-software) that will be automatically available + to all users when flatpak is enabled. + ''; + }; }; }; @@ -28,7 +40,7 @@ in { } ]; - environment.systemPackages = [ pkgs.flatpak ]; + environment.systemPackages = [ pkgs.flatpak ] ++ cfg.guiPackages; services.dbus.packages = [ pkgs.flatpak ]; diff --git a/third_party/nixpkgs/nixos/modules/services/desktops/pipewire.nix b/third_party/nixpkgs/nixos/modules/services/desktops/pipewire.nix index 5aee59cfdc..5179cbaf6b 100644 --- a/third_party/nixpkgs/nixos/modules/services/desktops/pipewire.nix +++ b/third_party/nixpkgs/nixos/modules/services/desktops/pipewire.nix @@ -5,8 +5,22 @@ with lib; let cfg = config.services.pipewire; - packages = with pkgs; [ pipewire ]; + enable32BitAlsaPlugins = cfg.alsa.support32Bit + && pkgs.stdenv.isx86_64 + && pkgs.pkgsi686Linux.pipewire != null; + # The package doesn't output to $out/lib/pipewire directly so that the + # overlays can use the outputs to replace the originals in FHS environments. + # + # This doesn't work in general because of missing development information. + jack-libs = pkgs.runCommand "jack-libs" {} '' + mkdir -p "$out/lib" + ln -s "${pkgs.pipewire.jack}/lib" "$out/lib/pipewire" + ''; + pulse-libs = pkgs.runCommand "pulse-libs" {} '' + mkdir -p "$out/lib" + ln -s "${pkgs.pipewire.pulse}/lib" "$out/lib/pipewire" + ''; in { meta = { @@ -25,17 +39,67 @@ in { Automatically run pipewire when connections are made to the pipewire socket. ''; }; + + alsa = { + enable = mkEnableOption "ALSA support"; + support32Bit = mkEnableOption "32-bit ALSA support on 64-bit systems"; + }; + + jack = { + enable = mkEnableOption "JACK audio emulation"; + }; + + pulse = { + enable = mkEnableOption "PulseAudio emulation"; + }; }; }; ###### implementation config = mkIf cfg.enable { - environment.systemPackages = packages; + assertions = [ + { + assertion = cfg.pulse.enable -> !config.hardware.pulseaudio.enable; + message = "PipeWire based PulseAudio emulation doesn't use the PulseAudio service"; + } + { + assertion = cfg.jack.enable -> !config.services.jack.jackd.enable; + message = "PIpeWire based JACK emulation doesn't use the JACK service"; + } + ]; - systemd.packages = packages; + environment.systemPackages = [ pkgs.pipewire ] + ++ lib.optional cfg.jack.enable jack-libs + ++ lib.optional cfg.pulse.enable pulse-libs; + systemd.packages = [ pkgs.pipewire ]; + + # PipeWire depends on DBUS but doesn't list it. Without this booting + # into a terminal results in the service crashing with an error. systemd.user.sockets.pipewire.wantedBy = lib.mkIf cfg.socketActivation [ "sockets.target" ]; - }; + systemd.user.services.pipewire.bindsTo = [ "dbus.service" ]; + services.udev.packages = [ pkgs.pipewire ]; + # If any paths are updated here they must also be updated in the package test. + sound.extraConfig = mkIf cfg.alsa.enable '' + pcm_type.pipewire { + libs.native = ${pkgs.pipewire.lib}/lib/alsa-lib/libasound_module_pcm_pipewire.so ; + ${optionalString enable32BitAlsaPlugins + "libs.32Bit = ${pkgs.pkgsi686Linux.pipewire.lib}/lib/alsa-lib/libasound_module_pcm_pipewire.so ;"} + } + pcm.!default { + @func getenv + vars [ PCM ] + default "plug:pipewire" + playback_mode "-1" + capture_mode "-1" + } + ''; + environment.etc."alsa/conf.d/50-pipewire.conf" = mkIf cfg.alsa.enable { + source = "${pkgs.pipewire}/share/alsa/alsa.conf.d/50-pipewire.conf"; + }; + environment.sessionVariables.LD_LIBRARY_PATH = + lib.optional (cfg.jack.enable || cfg.pulse.enable) "/run/current-system/sw/lib/pipewire"; + }; } diff --git a/third_party/nixpkgs/nixos/modules/services/mail/rspamd.nix b/third_party/nixpkgs/nixos/modules/services/mail/rspamd.nix index aacdbe2aee..86a3f52107 100644 --- a/third_party/nixpkgs/nixos/modules/services/mail/rspamd.nix +++ b/third_party/nixpkgs/nixos/modules/services/mail/rspamd.nix @@ -153,7 +153,7 @@ let ${concatStringsSep "\n" (mapAttrsToList (name: value: let includeName = if name == "rspamd_proxy" then "proxy" else name; - tryOverride = if value.extraConfig == "" then "true" else "false"; + tryOverride = boolToString (value.extraConfig == ""); in '' worker "${value.type}" { type = "${value.type}"; diff --git a/third_party/nixpkgs/nixos/modules/services/misc/nix-daemon.nix b/third_party/nixpkgs/nixos/modules/services/misc/nix-daemon.nix index 2680b1cc0d..ed05882a63 100644 --- a/third_party/nixpkgs/nixos/modules/services/misc/nix-daemon.nix +++ b/third_party/nixpkgs/nixos/modules/services/misc/nix-daemon.nix @@ -45,7 +45,7 @@ let trusted-substituters = ${toString cfg.trustedBinaryCaches} trusted-public-keys = ${toString cfg.binaryCachePublicKeys} auto-optimise-store = ${boolToString cfg.autoOptimiseStore} - require-sigs = ${if cfg.requireSignedBinaryCaches then "true" else "false"} + require-sigs = ${boolToString cfg.requireSignedBinaryCaches} trusted-users = ${toString cfg.trustedUsers} allowed-users = ${toString cfg.allowedUsers} ${optionalString (!cfg.distributedBuilds) '' diff --git a/third_party/nixpkgs/nixos/modules/services/monitoring/prometheus/exporters.nix b/third_party/nixpkgs/nixos/modules/services/monitoring/prometheus/exporters.nix index 1233e5cdd1..a4aa470f5b 100644 --- a/third_party/nixpkgs/nixos/modules/services/monitoring/prometheus/exporters.nix +++ b/third_party/nixpkgs/nixos/modules/services/monitoring/prometheus/exporters.nix @@ -43,6 +43,7 @@ let "postgres" "redis" "rspamd" + "rtl_433" "snmp" "surfboard" "tor" @@ -224,6 +225,8 @@ in services.prometheus.exporters.minio.minioAccessSecret = mkDefault config.services.minio.secretKey; })] ++ [(mkIf config.services.rspamd.enable { services.prometheus.exporters.rspamd.url = mkDefault "http://localhost:11334/stat"; + })] ++ [(mkIf config.services.prometheus.exporters.rtl_433.enable { + hardware.rtl-sdr.enable = mkDefault true; })] ++ [(mkIf config.services.nginx.enable { systemd.services.prometheus-nginx-exporter.after = [ "nginx.service" ]; systemd.services.prometheus-nginx-exporter.requires = [ "nginx.service" ]; diff --git a/third_party/nixpkgs/nixos/modules/services/monitoring/prometheus/exporters/rtl_433.nix b/third_party/nixpkgs/nixos/modules/services/monitoring/prometheus/exporters/rtl_433.nix new file mode 100644 index 0000000000..01e420db38 --- /dev/null +++ b/third_party/nixpkgs/nixos/modules/services/monitoring/prometheus/exporters/rtl_433.nix @@ -0,0 +1,78 @@ +{ config, lib, pkgs, options }: + +let + cfg = config.services.prometheus.exporters.rtl_433; +in +{ + port = 9550; + + extraOpts = let + mkMatcherOptionType = field: description: with lib.types; + listOf (submodule { + options = { + name = lib.mkOption { + type = str; + description = "Name to match."; + }; + "${field}" = lib.mkOption { + type = int; + inherit description; + }; + location = lib.mkOption { + type = str; + description = "Location to match."; + }; + }; + }); + in + { + rtl433Flags = lib.mkOption { + type = lib.types.str; + default = "-C si"; + example = "-C si -R 19"; + description = '' + Flags passed verbatim to rtl_433 binary. + Having -C si (the default) is recommended since only Celsius temperatures are parsed. + ''; + }; + channels = lib.mkOption { + type = mkMatcherOptionType "channel" "Channel to match."; + default = []; + example = [ + { name = "Acurite"; channel = 6543; location = "Kitchen"; } + ]; + description = '' + List of channel matchers to export. + ''; + }; + ids = lib.mkOption { + type = mkMatcherOptionType "id" "ID to match."; + default = []; + example = [ + { name = "Nexus"; id = 1; location = "Bedroom"; } + ]; + description = '' + List of ID matchers to export. + ''; + }; + }; + + serviceOpts = { + serviceConfig = { + # rtl-sdr udev rules make supported USB devices +rw by plugdev. + SupplementaryGroups = "plugdev"; + ExecStart = let + matchers = (map (m: + "--channel_matcher '${m.name},${toString m.channel},${m.location}'" + ) cfg.channels) ++ (map (m: + "--id_matcher '${m.name},${toString m.id},${m.location}'" + ) cfg.ids); in '' + ${pkgs.prometheus-rtl_433-exporter}/bin/rtl_433_prometheus \ + -listen ${cfg.listenAddress}:${toString cfg.port} \ + -subprocess "${pkgs.rtl_433}/bin/rtl_433 -F json ${cfg.rtl433Flags}" \ + ${lib.concatStringsSep " \\\n " matchers} \ + ${lib.concatStringsSep " \\\n " cfg.extraFlags} + ''; + }; + }; +} diff --git a/third_party/nixpkgs/nixos/modules/services/networking/avahi-daemon.nix b/third_party/nixpkgs/nixos/modules/services/networking/avahi-daemon.nix index 2900c37f99..0b7d5575c1 100644 --- a/third_party/nixpkgs/nixos/modules/services/networking/avahi-daemon.nix +++ b/third_party/nixpkgs/nixos/modules/services/networking/avahi-daemon.nix @@ -86,7 +86,8 @@ in ipv6 = mkOption { type = types.bool; - default = false; + default = config.networking.enableIPv6; + defaultText = "config.networking.enableIPv6"; description = "Whether to use IPv6."; }; diff --git a/third_party/nixpkgs/nixos/modules/services/networking/dnscrypt-wrapper.nix b/third_party/nixpkgs/nixos/modules/services/networking/dnscrypt-wrapper.nix index b9333cd19a..ee7e9b0454 100644 --- a/third_party/nixpkgs/nixos/modules/services/networking/dnscrypt-wrapper.nix +++ b/third_party/nixpkgs/nixos/modules/services/networking/dnscrypt-wrapper.nix @@ -55,7 +55,10 @@ let rotateKeys = '' # check if keys are not expired keyValid() { - fingerprint=$(dnscrypt-wrapper --show-provider-publickey | awk '{print $(NF)}') + fingerprint=$(dnscrypt-wrapper \ + --show-provider-publickey \ + --provider-publickey-file=${publicKey} \ + | awk '{print $(NF)}') dnscrypt-proxy --test=${toString (cfg.keys.checkInterval + 1)} \ --resolver-address=127.0.0.1:${toString cfg.port} \ --provider-name=${cfg.providerName} \ diff --git a/third_party/nixpkgs/nixos/modules/services/networking/mosquitto.nix b/third_party/nixpkgs/nixos/modules/services/networking/mosquitto.nix index d2feb93e2b..4a85b3956d 100644 --- a/third_party/nixpkgs/nixos/modules/services/networking/mosquitto.nix +++ b/third_party/nixpkgs/nixos/modules/services/networking/mosquitto.nix @@ -123,12 +123,33 @@ in ''; }; + passwordFile = mkOption { + type = with types; uniq (nullOr str); + example = "/path/to/file"; + default = null; + description = '' + Specifies the path to a file containing the + clear text password for the MQTT user. + ''; + }; + hashedPassword = mkOption { type = with types; uniq (nullOr str); default = null; description = '' Specifies the hashed password for the MQTT User. - overrides . + To generate hashed password install mosquitto + package and use mosquitto_passwd. + ''; + }; + + hashedPasswordFile = mkOption { + type = with types; uniq (nullOr str); + example = "/path/to/file"; + default = null; + description = '' + Specifies the path to a file containing the + hashed password for the MQTT user. To generate hashed password install mosquitto package and use mosquitto_passwd. ''; @@ -190,6 +211,13 @@ in config = mkIf cfg.enable { + assertions = mapAttrsToList (name: cfg: { + assertion = length (filter (s: s != null) (with cfg; [ + password passwordFile hashedPassword hashedPasswordFile + ])) <= 1; + message = "Cannot set more than one password option"; + }) cfg.users; + systemd.services.mosquitto = { description = "Mosquitto MQTT Broker Daemon"; wantedBy = [ "multi-user.target" ]; @@ -210,7 +238,11 @@ in touch ${cfg.dataDir}/passwd '' + concatStringsSep "\n" ( mapAttrsToList (n: c: - if c.hashedPassword != null then + if c.hashedPasswordFile != null then + "echo '${n}:'$(cat '${c.hashedPasswordFile}') >> ${cfg.dataDir}/passwd" + else if c.passwordFile != null then + "${pkgs.mosquitto}/bin/mosquitto_passwd -b ${cfg.dataDir}/passwd ${n} $(cat '${c.passwordFile}')" + else if c.hashedPassword != null then "echo '${n}:${c.hashedPassword}' >> ${cfg.dataDir}/passwd" else optionalString (c.password != null) "${pkgs.mosquitto}/bin/mosquitto_passwd -b ${cfg.dataDir}/passwd ${n} '${c.password}'" diff --git a/third_party/nixpkgs/nixos/modules/services/networking/powerdns.nix b/third_party/nixpkgs/nixos/modules/services/networking/powerdns.nix index ba05e15389..8cae61b835 100644 --- a/third_party/nixpkgs/nixos/modules/services/networking/powerdns.nix +++ b/third_party/nixpkgs/nixos/modules/services/networking/powerdns.nix @@ -8,42 +8,40 @@ let in { options = { services.powerdns = { - enable = mkEnableOption "Powerdns domain name server"; + enable = mkEnableOption "PowerDNS domain name server"; extraConfig = mkOption { type = types.lines; default = "launch=bind"; description = '' - Extra lines to be added verbatim to pdns.conf. - Powerdns will chroot to /var/lib/powerdns. - So any file, powerdns is supposed to be read, - should be in /var/lib/powerdns and needs to specified - relative to the chroot. + PowerDNS configuration. Refer to + + for details on supported values. ''; }; }; }; - config = mkIf config.services.powerdns.enable { + config = mkIf cfg.enable { + + systemd.packages = [ pkgs.powerdns ]; + systemd.services.pdns = { - unitConfig.Documentation = "man:pdns_server(1) man:pdns_control(1)"; - description = "Powerdns name server"; wantedBy = [ "multi-user.target" ]; - after = ["network.target" "mysql.service" "postgresql.service" "openldap.service"]; + after = [ "network.target" "mysql.service" "postgresql.service" "openldap.service" ]; serviceConfig = { - Restart="on-failure"; - RestartSec="1"; - StartLimitInterval="0"; - PrivateDevices=true; - CapabilityBoundingSet="CAP_CHOWN CAP_NET_BIND_SERVICE CAP_SETGID CAP_SETUID CAP_SYS_CHROOT"; - NoNewPrivileges=true; - ExecStartPre = "${pkgs.coreutils}/bin/mkdir -p /var/lib/powerdns"; - ExecStart = "${pkgs.powerdns}/bin/pdns_server --setuid=nobody --setgid=nogroup --chroot=/var/lib/powerdns --socket-dir=/ --daemon=no --guardian=no --disable-syslog --write-pid=no --config-dir=${configDir}"; - ProtectSystem="full"; - ProtectHome=true; - RestrictAddressFamilies="AF_UNIX AF_INET AF_INET6"; + ExecStart = [ "" "${pkgs.powerdns}/bin/pdns_server --config-dir=${configDir} --guardian=no --daemon=no --disable-syslog --log-timestamp=no --write-pid=no" ]; }; }; + + users.users.pdns = { + isSystemUser = true; + group = "pdns"; + description = "PowerDNS"; + }; + + users.groups.pdns = {}; + }; } diff --git a/third_party/nixpkgs/nixos/modules/services/networking/prosody.nix b/third_party/nixpkgs/nixos/modules/services/networking/prosody.nix index a6c1cb0f47..e7a7aa700b 100644 --- a/third_party/nixpkgs/nixos/modules/services/networking/prosody.nix +++ b/third_party/nixpkgs/nixos/modules/services/networking/prosody.nix @@ -261,7 +261,7 @@ let toLua = x: if builtins.isString x then ''"${x}"'' - else if builtins.isBool x then (if x == true then "true" else "false") + else if builtins.isBool x then boolToString x else if builtins.isInt x then toString x else if builtins.isList x then ''{ ${lib.concatStringsSep ", " (map (n: toLua n) x) } }'' else throw "Invalid Lua value"; diff --git a/third_party/nixpkgs/nixos/modules/services/networking/ssh/sshd.nix b/third_party/nixpkgs/nixos/modules/services/networking/ssh/sshd.nix index 5365b8b9b1..1b745931c4 100644 --- a/third_party/nixpkgs/nixos/modules/services/networking/ssh/sshd.nix +++ b/third_party/nixpkgs/nixos/modules/services/networking/ssh/sshd.nix @@ -269,6 +269,7 @@ in kexAlgorithms = mkOption { type = types.listOf types.str; default = [ + "curve25519-sha256" "curve25519-sha256@libssh.org" "diffie-hellman-group-exchange-sha256" ]; @@ -279,7 +280,7 @@ in Defaults to recommended settings from both and - + ''; }; @@ -300,7 +301,7 @@ in Defaults to recommended settings from both and - + ''; }; @@ -321,7 +322,7 @@ in Defaults to recommended settings from both and - + ''; }; diff --git a/third_party/nixpkgs/nixos/modules/services/networking/sslh.nix b/third_party/nixpkgs/nixos/modules/services/networking/sslh.nix index 0921febba6..4c2740d201 100644 --- a/third_party/nixpkgs/nixos/modules/services/networking/sslh.nix +++ b/third_party/nixpkgs/nixos/modules/services/networking/sslh.nix @@ -31,7 +31,7 @@ let { name: "openvpn"; host: "localhost"; port: "1194"; probe: "builtin"; }, { name: "xmpp"; host: "localhost"; port: "5222"; probe: "builtin"; }, { name: "http"; host: "localhost"; port: "80"; probe: "builtin"; }, - { name: "ssl"; host: "localhost"; port: "443"; probe: "builtin"; }, + { name: "tls"; host: "localhost"; port: "443"; probe: "builtin"; }, { name: "anyprot"; host: "localhost"; port: "443"; probe: "builtin"; } ); ''; diff --git a/third_party/nixpkgs/nixos/modules/services/security/fail2ban.nix b/third_party/nixpkgs/nixos/modules/services/security/fail2ban.nix index 3f84f9c256..cf0d72d5c5 100644 --- a/third_party/nixpkgs/nixos/modules/services/security/fail2ban.nix +++ b/third_party/nixpkgs/nixos/modules/services/security/fail2ban.nix @@ -282,12 +282,12 @@ in services.fail2ban.jails.DEFAULT = '' ${optionalString cfg.bantime-increment.enable '' # Bantime incremental - bantime.increment = ${if cfg.bantime-increment.enable then "true" else "false"} + bantime.increment = ${boolToString cfg.bantime-increment.enable} bantime.maxtime = ${cfg.bantime-increment.maxtime} bantime.factor = ${cfg.bantime-increment.factor} bantime.formula = ${cfg.bantime-increment.formula} bantime.multipliers = ${cfg.bantime-increment.multipliers} - bantime.overalljails = ${if cfg.bantime-increment.overalljails then "true" else "false"} + bantime.overalljails = ${boolToString cfg.bantime-increment.overalljails} ''} # Miscellaneous options ignoreip = 127.0.0.1/8 ${optionalString config.networking.enableIPv6 "::1"} ${concatStringsSep " " cfg.ignoreIP} diff --git a/third_party/nixpkgs/nixos/modules/services/security/usbguard.nix b/third_party/nixpkgs/nixos/modules/services/security/usbguard.nix index 16a90da523..71fd71a2ca 100644 --- a/third_party/nixpkgs/nixos/modules/services/security/usbguard.nix +++ b/third_party/nixpkgs/nixos/modules/services/security/usbguard.nix @@ -19,13 +19,13 @@ let PresentDevicePolicy=${cfg.presentDevicePolicy} PresentControllerPolicy=${cfg.presentControllerPolicy} InsertedDevicePolicy=${cfg.insertedDevicePolicy} - RestoreControllerDeviceState=${if cfg.restoreControllerDeviceState then "true" else "false"} + RestoreControllerDeviceState=${boolToString cfg.restoreControllerDeviceState} # this does not seem useful for endusers to change DeviceManagerBackend=uevent IPCAllowedUsers=${concatStringsSep " " cfg.IPCAllowedUsers} IPCAllowedGroups=${concatStringsSep " " cfg.IPCAllowedGroups} IPCAccessControlFiles=/var/lib/usbguard/IPCAccessControl.d/ - DeviceRulesWithPort=${if cfg.deviceRulesWithPort then "true" else "false"} + DeviceRulesWithPort=${boolToString cfg.deviceRulesWithPort} # HACK: that way audit logs still land in the journal AuditFilePath=/dev/null ''; diff --git a/third_party/nixpkgs/nixos/modules/services/system/dbus.nix b/third_party/nixpkgs/nixos/modules/services/system/dbus.nix index d9dd26f0f1..f8d909a4a3 100644 --- a/third_party/nixpkgs/nixos/modules/services/system/dbus.nix +++ b/third_party/nixpkgs/nixos/modules/services/system/dbus.nix @@ -1,6 +1,6 @@ # D-Bus configuration and system bus daemon. -{ config, lib, pkgs, ... }: +{ config, lib, options, pkgs, ... }: with lib; @@ -18,13 +18,6 @@ let in { - - imports = [ - (mkRemovedOptionModule - [ "services" "dbus" "socketActivated" ] - "The user D-Bus session is now always socket activated and this option can safely be removed.") - ]; - ###### interface options = { @@ -57,12 +50,29 @@ in pkg/share/dbus-1/services ''; }; + + socketActivated = mkOption { + type = types.nullOr types.bool; + default = null; + visible = false; + description = '' + Removed option, do not use. + ''; + }; }; }; ###### implementation config = mkIf cfg.enable { + warnings = optional (cfg.socketActivated != null) ( + let + files = showFiles options.services.dbus.socketActivated.files; + in + "The option 'services.dbus.socketActivated' in ${files} no longer has" + + " any effect and can be safely removed: the user D-Bus session is" + + " now always socket activated." + ); environment.systemPackages = [ pkgs.dbus.daemon pkgs.dbus ]; diff --git a/third_party/nixpkgs/nixos/modules/services/web-servers/nginx/default.nix b/third_party/nixpkgs/nixos/modules/services/web-servers/nginx/default.nix index 6d2ddea927..631e92fd6e 100644 --- a/third_party/nixpkgs/nixos/modules/services/web-servers/nginx/default.nix +++ b/third_party/nixpkgs/nixos/modules/services/web-servers/nginx/default.nix @@ -86,7 +86,7 @@ let ''} ssl_protocols ${cfg.sslProtocols}; - ssl_ciphers ${cfg.sslCiphers}; + ${optionalString (cfg.sslCiphers != null) "ssl_ciphers ${cfg.sslCiphers};"} ${optionalString (cfg.sslDhparam != null) "ssl_dhparam ${cfg.sslDhparam};"} ${optionalString (cfg.recommendedTlsSettings) '' @@ -487,7 +487,7 @@ in }; sslCiphers = mkOption { - type = types.str; + type = types.nullOr types.str; # Keep in sync with https://ssl-config.mozilla.org/#server=nginx&config=intermediate default = "ECDHE-ECDSA-AES128-GCM-SHA256:ECDHE-RSA-AES128-GCM-SHA256:ECDHE-ECDSA-AES256-GCM-SHA384:ECDHE-RSA-AES256-GCM-SHA384:ECDHE-ECDSA-CHACHA20-POLY1305:ECDHE-RSA-CHACHA20-POLY1305:DHE-RSA-AES128-GCM-SHA256:DHE-RSA-AES256-GCM-SHA384"; description = "Ciphers to choose from when negotiating TLS handshakes."; diff --git a/third_party/nixpkgs/nixos/modules/services/x11/desktop-managers/gnome3.nix b/third_party/nixpkgs/nixos/modules/services/x11/desktop-managers/gnome3.nix index acccbdb995..9dfac56c7f 100644 --- a/third_party/nixpkgs/nixos/modules/services/x11/desktop-managers/gnome3.nix +++ b/third_party/nixpkgs/nixos/modules/services/x11/desktop-managers/gnome3.nix @@ -17,6 +17,11 @@ let ''; }; + defaultFavoriteAppsOverride = '' + [org.gnome.shell] + favorite-apps=[ 'org.gnome.Geary.desktop', 'org.gnome.Calendar.desktop', 'org.gnome.Music.desktop', 'org.gnome.Photos.desktop', 'org.gnome.Nautilus.desktop' ] + ''; + nixos-gsettings-desktop-schemas = let defaultPackages = with pkgs; [ gsettings-desktop-schemas gnome3.gnome-shell ]; in @@ -42,8 +47,7 @@ let [org.gnome.desktop.screensaver] picture-uri='file://${pkgs.nixos-artwork.wallpapers.simple-dark-gray-bottom.gnomeFilePath}' - [org.gnome.shell] - favorite-apps=[ 'org.gnome.Epiphany.desktop', 'org.gnome.Geary.desktop', 'org.gnome.Music.desktop', 'org.gnome.Photos.desktop', 'org.gnome.Nautilus.desktop', 'org.gnome.Software.desktop' ] + ${cfg.favoriteAppsOverride} ${cfg.extraGSettingsOverrides} EOF @@ -123,6 +127,17 @@ in apply = list: list ++ [ pkgs.gnome3.gnome-shell pkgs.gnome3.gnome-shell-extensions ]; }; + favoriteAppsOverride = mkOption { + internal = true; # this is messy + default = defaultFavoriteAppsOverride; + type = types.lines; + example = literalExample '' + [org.gnome.shell] + favorite-apps=[ 'firefox.desktop', 'org.gnome.Calendar.desktop' ] + ''; + description = "List of desktop files to put as favorite apps into gnome-shell. These need to be installed somehow globally."; + }; + extraGSettingsOverrides = mkOption { default = ""; type = types.lines; @@ -179,6 +194,14 @@ in config = mkMerge [ (mkIf (cfg.enable || flashbackEnabled) { + # Seed our configuration into nixos-generate-config + system.nixos-generate-config.desktopConfiguration = '' + # Enable the GNOME 3 Desktop Environment. + services.xserver.enable = true; + services.xserver.displayManager.gdm.enable = true; + services.xserver.desktopManager.gnome3.enable = true; + ''; + services.gnome3.core-os-services.enable = true; services.gnome3.core-shell.enable = true; services.gnome3.core-utilities.enable = mkDefault true; @@ -207,6 +230,11 @@ in # If gnome3 is installed, build vim for gtk3 too. nixpkgs.config.vim.gui = "gtk3"; + + # Install gnome-software if flatpak is enabled + services.flatpak.guiPackages = [ + pkgs.gnome3.gnome-software + ]; }) (mkIf flashbackEnabled { @@ -389,7 +417,6 @@ in gnome-music gnome-photos gnome-screenshot - gnome-software gnome-system-monitor gnome-weather nautilus diff --git a/third_party/nixpkgs/nixos/modules/services/x11/desktop-managers/pantheon.nix b/third_party/nixpkgs/nixos/modules/services/x11/desktop-managers/pantheon.nix index e67e216f90..cf02a71248 100644 --- a/third_party/nixpkgs/nixos/modules/services/x11/desktop-managers/pantheon.nix +++ b/third_party/nixpkgs/nixos/modules/services/x11/desktop-managers/pantheon.nix @@ -180,7 +180,6 @@ in gtk3.out hicolor-icon-theme lightlocker - nixos-artwork.wallpapers.simple-dark-gray onboard qgnomeplatform shared-mime-info diff --git a/third_party/nixpkgs/nixos/modules/services/x11/desktop-managers/plasma5.nix b/third_party/nixpkgs/nixos/modules/services/x11/desktop-managers/plasma5.nix index e48b5f23b5..ad0385ddee 100644 --- a/third_party/nixpkgs/nixos/modules/services/x11/desktop-managers/plasma5.nix +++ b/third_party/nixpkgs/nixos/modules/services/x11/desktop-managers/plasma5.nix @@ -184,6 +184,14 @@ in config = mkMerge [ (mkIf cfg.enable { + # Seed our configuration into nixos-generate-config + system.nixos-generate-config.desktopConfiguration = '' + # Enable the Plasma 5 Desktop Environment. + services.xserver.enable = true; + services.xserver.displayManager.sddm.enable = true; + services.xserver.desktopManager.plasma5.enable = true; + ''; + services.xserver.desktopManager.session = singleton { name = "plasma5"; bgSupport = true; diff --git a/third_party/nixpkgs/nixos/modules/services/x11/display-managers/default.nix b/third_party/nixpkgs/nixos/modules/services/x11/display-managers/default.nix index 568aeaceef..6945a241f9 100644 --- a/third_party/nixpkgs/nixos/modules/services/x11/display-managers/default.nix +++ b/third_party/nixpkgs/nixos/modules/services/x11/display-managers/default.nix @@ -474,6 +474,12 @@ in ) [dms wms] ); + + # Make xsessions and wayland sessions available in XDG_DATA_DIRS + # as some programs have behavior that depends on them being present + environment.sessionVariables.XDG_DATA_DIRS = [ + "${cfg.displayManager.sessionData.desktops}/share" + ]; }; imports = [ diff --git a/third_party/nixpkgs/nixos/modules/services/x11/display-managers/gdm.nix b/third_party/nixpkgs/nixos/modules/services/x11/display-managers/gdm.nix index eae70a57c7..25b424e485 100644 --- a/third_party/nixpkgs/nixos/modules/services/x11/display-managers/gdm.nix +++ b/third_party/nixpkgs/nixos/modules/services/x11/display-managers/gdm.nix @@ -264,7 +264,7 @@ in # presented and there's a little delay. environment.etc."gdm/custom.conf".text = '' [daemon] - WaylandEnable=${if cfg.gdm.wayland then "true" else "false"} + WaylandEnable=${boolToString cfg.gdm.wayland} ${optionalString cfg.autoLogin.enable ( if cfg.gdm.autoLogin.delay > 0 then '' TimedLoginEnable=true diff --git a/third_party/nixpkgs/nixos/modules/services/x11/display-managers/lightdm.nix b/third_party/nixpkgs/nixos/modules/services/x11/display-managers/lightdm.nix index 143785db0b..2dafee9e36 100644 --- a/third_party/nixpkgs/nixos/modules/services/x11/display-managers/lightdm.nix +++ b/third_party/nixpkgs/nixos/modules/services/x11/display-managers/lightdm.nix @@ -308,6 +308,7 @@ in home = "/var/lib/lightdm"; group = "lightdm"; uid = config.ids.uids.lightdm; + shell = pkgs.bash; }; systemd.tmpfiles.rules = [ diff --git a/third_party/nixpkgs/nixos/modules/services/x11/display-managers/sddm.nix b/third_party/nixpkgs/nixos/modules/services/x11/display-managers/sddm.nix index e63bb2e445..4040b90342 100644 --- a/third_party/nixpkgs/nixos/modules/services/x11/display-managers/sddm.nix +++ b/third_party/nixpkgs/nixos/modules/services/x11/display-managers/sddm.nix @@ -55,10 +55,10 @@ let XauthPath=${pkgs.xorg.xauth}/bin/xauth DisplayCommand=${Xsetup} DisplayStopCommand=${Xstop} - EnableHidpi=${if cfg.enableHidpi then "true" else "false"} + EnableHidpi=${boolToString cfg.enableHidpi} [Wayland] - EnableHidpi=${if cfg.enableHidpi then "true" else "false"} + EnableHidpi=${boolToString cfg.enableHidpi} SessionDir=${dmcfg.sessionData.desktops}/share/wayland-sessions ${optionalString dmcfg.autoLogin.enable '' diff --git a/third_party/nixpkgs/nixos/modules/testing/test-instrumentation.nix b/third_party/nixpkgs/nixos/modules/testing/test-instrumentation.nix index dbbcb0bed5..be5fa88b8a 100644 --- a/third_party/nixpkgs/nixos/modules/testing/test-instrumentation.nix +++ b/third_party/nixpkgs/nixos/modules/testing/test-instrumentation.nix @@ -45,13 +45,22 @@ with import ../../lib/qemu-flags.nix { inherit pkgs; }; systemd.services."serial-getty@${qemuSerialDevice}".enable = false; systemd.services."serial-getty@hvc0".enable = false; - # Only use a serial console, no TTY. - # NOTE: optionalAttrs - # test-instrumentation.nix appears to be used without qemu-vm.nix, so - # we avoid defining consoles if not possible. - # TODO: refactor such that test-instrumentation can import qemu-vm - # or declare virtualisation.qemu.console option in a module that's always imported - virtualisation = lib.optionalAttrs (options ? virtualisation.qemu.consoles) { qemu.consoles = [ qemuSerialDevice ]; }; + # Only set these settings when the options exist. Some tests (e.g. those + # that do not specify any nodes, or an empty attr set as nodes) will not + # have the QEMU module loaded and thuse these options can't and should not + # be set. + virtualisation = lib.optionalAttrs (options ? virtualisation.qemu) { + qemu = { + # Only use a serial console, no TTY. + # NOTE: optionalAttrs + # test-instrumentation.nix appears to be used without qemu-vm.nix, so + # we avoid defining consoles if not possible. + # TODO: refactor such that test-instrumentation can import qemu-vm + # or declare virtualisation.qemu.console option in a module that's always imported + consoles = [ qemuSerialDevice ]; + package = lib.mkDefault pkgs.qemu_test; + }; + }; boot.initrd.preDeviceCommands = '' diff --git a/third_party/nixpkgs/nixos/modules/virtualisation/qemu-vm.nix b/third_party/nixpkgs/nixos/modules/virtualisation/qemu-vm.nix index 42e43f5ee0..191d7c758c 100644 --- a/third_party/nixpkgs/nixos/modules/virtualisation/qemu-vm.nix +++ b/third_party/nixpkgs/nixos/modules/virtualisation/qemu-vm.nix @@ -14,10 +14,11 @@ with import ../../lib/qemu-flags.nix { inherit pkgs; }; let - qemu = config.system.build.qemu or pkgs.qemu_test; cfg = config.virtualisation; + qemu = cfg.qemu.package; + consoles = lib.concatMapStringsSep " " (c: "console=${c}") cfg.qemu.consoles; driveOpts = { ... }: { @@ -401,6 +402,14 @@ in }; virtualisation.qemu = { + package = + mkOption { + type = types.package; + default = pkgs.qemu; + example = "pkgs.qemu_test"; + description = "QEMU package to use."; + }; + options = mkOption { type = types.listOf types.unspecified; diff --git a/third_party/nixpkgs/nixos/tests/all-tests.nix b/third_party/nixpkgs/nixos/tests/all-tests.nix index 6564a958d5..9ffeba27a7 100644 --- a/third_party/nixpkgs/nixos/tests/all-tests.nix +++ b/third_party/nixpkgs/nixos/tests/all-tests.nix @@ -150,7 +150,6 @@ in hostname = handleTest ./hostname.nix {}; hound = handleTest ./hound.nix {}; hydra = handleTest ./hydra {}; - hydra-db-migration = handleTest ./hydra/db-migration.nix {}; i3wm = handleTest ./i3wm.nix {}; icingaweb2 = handleTest ./icingaweb2.nix {}; iftop = handleTest ./iftop.nix {}; diff --git a/third_party/nixpkgs/nixos/tests/bitcoind.nix b/third_party/nixpkgs/nixos/tests/bitcoind.nix index 09f3e4a6ec..9068b29b8e 100644 --- a/third_party/nixpkgs/nixos/tests/bitcoind.nix +++ b/third_party/nixpkgs/nixos/tests/bitcoind.nix @@ -31,16 +31,16 @@ import ./make-test-python.nix ({ pkgs, ... }: { machine.wait_for_unit("bitcoind-testnet.service") machine.wait_until_succeeds( - 'curl --user rpc:rpc --data-binary \'{"jsonrpc": "1.0", "id":"curltest", "method": "getblockchaininfo", "params": [] }\' -H \'content-type: text/plain;\' localhost:8332 | grep \'"chain":"main"\' ' + 'curl --fail --user rpc:rpc --data-binary \'{"jsonrpc": "1.0", "id":"curltest", "method": "getblockchaininfo", "params": [] }\' -H \'content-type: text/plain;\' localhost:8332 | grep \'"chain":"main"\' ' ) machine.wait_until_succeeds( - 'curl --user rpc2:rpc2 --data-binary \'{"jsonrpc": "1.0", "id":"curltest", "method": "getblockchaininfo", "params": [] }\' -H \'content-type: text/plain;\' localhost:8332 | grep \'"chain":"main"\' ' + 'curl --fail --user rpc2:rpc2 --data-binary \'{"jsonrpc": "1.0", "id":"curltest", "method": "getblockchaininfo", "params": [] }\' -H \'content-type: text/plain;\' localhost:8332 | grep \'"chain":"main"\' ' ) machine.wait_until_succeeds( - 'curl --user rpc:rpc --data-binary \'{"jsonrpc": "1.0", "id":"curltest", "method": "getblockchaininfo", "params": [] }\' -H \'content-type: text/plain;\' localhost:18332 | grep \'"chain":"test"\' ' + 'curl --fail --user rpc:rpc --data-binary \'{"jsonrpc": "1.0", "id":"curltest", "method": "getblockchaininfo", "params": [] }\' -H \'content-type: text/plain;\' localhost:18332 | grep \'"chain":"test"\' ' ) machine.wait_until_succeeds( - 'curl --user rpc2:rpc2 --data-binary \'{"jsonrpc": "1.0", "id":"curltest", "method": "getblockchaininfo", "params": [] }\' -H \'content-type: text/plain;\' localhost:18332 | grep \'"chain":"test"\' ' + 'curl --fail --user rpc2:rpc2 --data-binary \'{"jsonrpc": "1.0", "id":"curltest", "method": "getblockchaininfo", "params": [] }\' -H \'content-type: text/plain;\' localhost:18332 | grep \'"chain":"test"\' ' ) ''; }) diff --git a/third_party/nixpkgs/nixos/tests/caddy.nix b/third_party/nixpkgs/nixos/tests/caddy.nix index 445a7fa6b0..f2de34ff2d 100644 --- a/third_party/nixpkgs/nixos/tests/caddy.nix +++ b/third_party/nixpkgs/nixos/tests/caddy.nix @@ -57,11 +57,13 @@ import ./make-test-python.nix ({ pkgs, ... }: { def check_etag(url): etag = webserver.succeed( - "curl -v '{}' 2>&1 | sed -n -e \"s/^< [Ee][Tt][Aa][Gg]: *//p\"".format(url) + "curl --fail -v '{}' 2>&1 | sed -n -e \"s/^< [Ee][Tt][Aa][Gg]: *//p\"".format( + url + ) ) etag = etag.replace("\r\n", " ") http_code = webserver.succeed( - "curl --silent --show-error -o /dev/null -w \"%{{http_code}}\" --head -H 'If-None-Match: {}' {}".format( + "curl --fail --silent --show-error -o /dev/null -w \"%{{http_code}}\" --head -H 'If-None-Match: {}' {}".format( etag, url ) ) diff --git a/third_party/nixpkgs/nixos/tests/cadvisor.nix b/third_party/nixpkgs/nixos/tests/cadvisor.nix index 60c04f1478..664aa3ad87 100644 --- a/third_party/nixpkgs/nixos/tests/cadvisor.nix +++ b/third_party/nixpkgs/nixos/tests/cadvisor.nix @@ -19,16 +19,16 @@ import ./make-test-python.nix ({ pkgs, ... } : { testScript = '' start_all() machine.wait_for_unit("cadvisor.service") - machine.succeed("curl http://localhost:8080/containers/") + machine.succeed("curl -f http://localhost:8080/containers/") influxdb.wait_for_unit("influxdb.service") # create influxdb database influxdb.succeed( - 'curl -XPOST http://localhost:8086/query --data-urlencode "q=CREATE DATABASE root"' + 'curl -f -XPOST http://localhost:8086/query --data-urlencode "q=CREATE DATABASE root"' ) influxdb.wait_for_unit("cadvisor.service") - influxdb.succeed("curl http://localhost:8080/containers/") + influxdb.succeed("curl -f http://localhost:8080/containers/") ''; }) diff --git a/third_party/nixpkgs/nixos/tests/certmgr.nix b/third_party/nixpkgs/nixos/tests/certmgr.nix index ef32f54400..8f5b894877 100644 --- a/third_party/nixpkgs/nixos/tests/certmgr.nix +++ b/third_party/nixpkgs/nixos/tests/certmgr.nix @@ -11,7 +11,7 @@ let file = { group = "nginx"; owner = "nginx"; - path = "/tmp/${host}-ca.pem"; + path = "/var/ssl/${host}-ca.pem"; }; label = "www_ca"; profile = "three-month"; @@ -20,13 +20,13 @@ let certificate = { group = "nginx"; owner = "nginx"; - path = "/tmp/${host}-cert.pem"; + path = "/var/ssl/${host}-cert.pem"; }; private_key = { group = "nginx"; mode = "0600"; owner = "nginx"; - path = "/tmp/${host}-key.pem"; + path = "/var/ssl/${host}-key.pem"; }; request = { CN = host; @@ -57,6 +57,8 @@ let services.cfssl.enable = true; systemd.services.cfssl.after = [ "cfssl-init.service" "networking.target" ]; + systemd.tmpfiles.rules = [ "d /var/ssl 777 root root" ]; + systemd.services.cfssl-init = { description = "Initialize the cfssl CA"; wantedBy = [ "multi-user.target" ]; @@ -87,8 +89,8 @@ let enable = true; virtualHosts = lib.mkMerge (map (host: { ${host} = { - sslCertificate = "/tmp/${host}-cert.pem"; - sslCertificateKey = "/tmp/${host}-key.pem"; + sslCertificate = "/var/ssl/${host}-cert.pem"; + sslCertificateKey = "/var/ssl/${host}-key.pem"; extraConfig = '' ssl_protocols TLSv1 TLSv1.1 TLSv1.2; ''; @@ -124,16 +126,18 @@ in }; testScript = '' machine.wait_for_unit("cfssl.service") - machine.wait_until_succeeds("ls /tmp/decl.example.org-ca.pem") - machine.wait_until_succeeds("ls /tmp/decl.example.org-key.pem") - machine.wait_until_succeeds("ls /tmp/decl.example.org-cert.pem") - machine.wait_until_succeeds("ls /tmp/imp.example.org-ca.pem") - machine.wait_until_succeeds("ls /tmp/imp.example.org-key.pem") - machine.wait_until_succeeds("ls /tmp/imp.example.org-cert.pem") + machine.wait_until_succeeds("ls /var/ssl/decl.example.org-ca.pem") + machine.wait_until_succeeds("ls /var/ssl/decl.example.org-key.pem") + machine.wait_until_succeeds("ls /var/ssl/decl.example.org-cert.pem") + machine.wait_until_succeeds("ls /var/ssl/imp.example.org-ca.pem") + machine.wait_until_succeeds("ls /var/ssl/imp.example.org-key.pem") + machine.wait_until_succeeds("ls /var/ssl/imp.example.org-cert.pem") machine.wait_for_unit("nginx.service") assert 1 < int(machine.succeed('journalctl -u nginx | grep "Starting Nginx" | wc -l')) - machine.succeed("curl --cacert /tmp/imp.example.org-ca.pem https://imp.example.org") - machine.succeed("curl --cacert /tmp/decl.example.org-ca.pem https://decl.example.org") + machine.succeed("curl --cacert /var/ssl/imp.example.org-ca.pem https://imp.example.org") + machine.succeed( + "curl --cacert /var/ssl/decl.example.org-ca.pem https://decl.example.org" + ) ''; }; diff --git a/third_party/nixpkgs/nixos/tests/cfssl.nix b/third_party/nixpkgs/nixos/tests/cfssl.nix index e291fc285f..170f09d9b7 100644 --- a/third_party/nixpkgs/nixos/tests/cfssl.nix +++ b/third_party/nixpkgs/nixos/tests/cfssl.nix @@ -38,7 +38,7 @@ import ./make-test-python.nix ({ pkgs, ...} : { testScript = let cfsslrequest = with pkgs; writeScript "cfsslrequest" '' - curl -X POST -H "Content-Type: application/json" -d @${csr} \ + curl -f -X POST -H "Content-Type: application/json" -d @${csr} \ http://localhost:8888/api/v1/cfssl/newkey | ${cfssl}/bin/cfssljson /tmp/certificate ''; csr = pkgs.writeText "csr.json" (builtins.toJSON { diff --git a/third_party/nixpkgs/nixos/tests/convos.nix b/third_party/nixpkgs/nixos/tests/convos.nix index b4ff1188fd..af2758c857 100644 --- a/third_party/nixpkgs/nixos/tests/convos.nix +++ b/third_party/nixpkgs/nixos/tests/convos.nix @@ -25,6 +25,6 @@ in machine.wait_for_unit("convos") machine.wait_for_open_port("${toString port}") machine.succeed("journalctl -u convos | grep -q 'Listening at.*${toString port}'") - machine.succeed("curl http://localhost:${toString port}/") + machine.succeed("curl -f http://localhost:${toString port}/") ''; }) diff --git a/third_party/nixpkgs/nixos/tests/corerad.nix b/third_party/nixpkgs/nixos/tests/corerad.nix index 37a1e90477..638010f92f 100644 --- a/third_party/nixpkgs/nixos/tests/corerad.nix +++ b/third_party/nixpkgs/nixos/tests/corerad.nix @@ -80,7 +80,7 @@ import ./make-test-python.nix ( ), "SLAAC temporary address was not configured on client after router advertisement" with subtest("Verify HTTP debug server is configured"): - out = router.succeed("curl localhost:9430/metrics") + out = router.succeed("curl -f localhost:9430/metrics") assert ( "corerad_build_info" in out diff --git a/third_party/nixpkgs/nixos/tests/docker-edge.nix b/third_party/nixpkgs/nixos/tests/docker-edge.nix index 96de885a55..703179eef1 100644 --- a/third_party/nixpkgs/nixos/tests/docker-edge.nix +++ b/third_party/nixpkgs/nixos/tests/docker-edge.nix @@ -43,7 +43,7 @@ import ./make-test-python.nix ({ pkgs, ...} : { docker.fail("sudo -u noprivs docker ps") docker.succeed("docker stop sleeping") - # Must match version twice to ensure client and server versions are correct - docker.succeed('[ $(docker version | grep ${pkgs.docker-edge.version} | wc -l) = "2" ]') + # Must match version 4 times to ensure client and server git commits and versions are correct + docker.succeed('[ $(docker version | grep ${pkgs.docker-edge.version} | wc -l) = "4" ]') ''; }) diff --git a/third_party/nixpkgs/nixos/tests/docker-tools.nix b/third_party/nixpkgs/nixos/tests/docker-tools.nix index edb9aec62d..c1c41b0fc1 100644 --- a/third_party/nixpkgs/nixos/tests/docker-tools.nix +++ b/third_party/nixpkgs/nixos/tests/docker-tools.nix @@ -115,7 +115,7 @@ import ./make-test-python.nix ({ pkgs, ... }: { "docker load --input='${examples.nginx}'", "docker run --name nginx -d -p 8000:80 ${examples.nginx.imageName}", ) - docker.wait_until_succeeds("curl http://localhost:8000/") + docker.wait_until_succeeds("curl -f http://localhost:8000/") docker.succeed( "docker rm --force nginx", "docker rmi '${examples.nginx.imageName}'", ) diff --git a/third_party/nixpkgs/nixos/tests/ferm.nix b/third_party/nixpkgs/nixos/tests/ferm.nix index a73c9ce739..112b5f19a7 100644 --- a/third_party/nixpkgs/nixos/tests/ferm.nix +++ b/third_party/nixpkgs/nixos/tests/ferm.nix @@ -56,6 +56,7 @@ import ./make-test-python.nix ({ pkgs, ...} : { start_all() client.wait_for_unit("network-online.target") + server.wait_for_unit("network-online.target") server.wait_for_unit("ferm.service") server.wait_for_unit("nginx.service") server.wait_until_succeeds("ss -ntl | grep -q 80") diff --git a/third_party/nixpkgs/nixos/tests/go-neb.nix b/third_party/nixpkgs/nixos/tests/go-neb.nix index d9e5db0b4a..531ab5a667 100644 --- a/third_party/nixpkgs/nixos/tests/go-neb.nix +++ b/third_party/nixpkgs/nixos/tests/go-neb.nix @@ -34,7 +34,7 @@ import ./make-test-python.nix ({ pkgs, ... }: start_all() server.wait_for_unit("go-neb.service") server.wait_until_succeeds( - "curl -L http://localhost:4050/services/hooks/d2lraXBlZGlhX3NlcnZpY2U" + "curl -fL http://localhost:4050/services/hooks/d2lraXBlZGlhX3NlcnZpY2U" ) server.wait_until_succeeds( "journalctl -eu go-neb -o cat | grep -q service_id=wikipedia_service" diff --git a/third_party/nixpkgs/nixos/tests/hadoop/hdfs.nix b/third_party/nixpkgs/nixos/tests/hadoop/hdfs.nix index 85aaab34b1..f1f98ed42e 100644 --- a/third_party/nixpkgs/nixos/tests/hadoop/hdfs.nix +++ b/third_party/nixpkgs/nixos/tests/hadoop/hdfs.nix @@ -48,7 +48,7 @@ import ../make-test-python.nix ({...}: { datanode.wait_for_open_port(9866) datanode.wait_for_open_port(9867) - namenode.succeed("curl http://namenode:9870") - datanode.succeed("curl http://datanode:9864") + namenode.succeed("curl -f http://namenode:9870") + datanode.succeed("curl -f http://datanode:9864") ''; }) diff --git a/third_party/nixpkgs/nixos/tests/hadoop/yarn.nix b/third_party/nixpkgs/nixos/tests/hadoop/yarn.nix index 2264ecaff1..01077245d3 100644 --- a/third_party/nixpkgs/nixos/tests/hadoop/yarn.nix +++ b/third_party/nixpkgs/nixos/tests/hadoop/yarn.nix @@ -40,7 +40,7 @@ import ../make-test-python.nix ({...}: { nodemanager.wait_for_open_port(8042) nodemanager.wait_for_open_port(8041) - resourcemanager.succeed("curl http://localhost:8088") - nodemanager.succeed("curl http://localhost:8042") + resourcemanager.succeed("curl -f http://localhost:8088") + nodemanager.succeed("curl -f http://localhost:8042") ''; }) diff --git a/third_party/nixpkgs/nixos/tests/haproxy.nix b/third_party/nixpkgs/nixos/tests/haproxy.nix index ffb77c052a..2c3878131b 100644 --- a/third_party/nixpkgs/nixos/tests/haproxy.nix +++ b/third_party/nixpkgs/nixos/tests/haproxy.nix @@ -39,9 +39,9 @@ import ./make-test-python.nix ({ pkgs, ...}: { machine.wait_for_unit("multi-user.target") machine.wait_for_unit("haproxy.service") machine.wait_for_unit("httpd.service") - assert "We are all good!" in machine.succeed("curl -k http://localhost:80/index.txt") + assert "We are all good!" in machine.succeed("curl -fk http://localhost:80/index.txt") assert "haproxy_process_pool_allocated_bytes" in machine.succeed( - "curl -k http://localhost:80/metrics" + "curl -fk http://localhost:80/metrics" ) with subtest("reload"): @@ -49,7 +49,7 @@ import ./make-test-python.nix ({ pkgs, ...}: { # wait some time to ensure the following request hits the reloaded haproxy machine.sleep(5) assert "We are all good!" in machine.succeed( - "curl -k http://localhost:80/index.txt" + "curl -fk http://localhost:80/index.txt" ) ''; }) diff --git a/third_party/nixpkgs/nixos/tests/hitch/default.nix b/third_party/nixpkgs/nixos/tests/hitch/default.nix index 904d12619d..8a2193e75f 100644 --- a/third_party/nixpkgs/nixos/tests/hitch/default.nix +++ b/third_party/nixpkgs/nixos/tests/hitch/default.nix @@ -28,6 +28,6 @@ import ../make-test-python.nix ({ pkgs, ... }: machine.wait_for_unit("multi-user.target") machine.wait_for_unit("hitch.service") machine.wait_for_open_port(443) - assert "We are all good!" in machine.succeed("curl -k https://localhost:443/index.txt") + assert "We are all good!" in machine.succeed("curl -fk https://localhost:443/index.txt") ''; }) diff --git a/third_party/nixpkgs/nixos/tests/hound.nix b/third_party/nixpkgs/nixos/tests/hound.nix index 27c65abdf2..b8b10022bd 100644 --- a/third_party/nixpkgs/nixos/tests/hound.nix +++ b/third_party/nixpkgs/nixos/tests/hound.nix @@ -53,7 +53,7 @@ import ./make-test-python.nix ({ pkgs, ... } : { machine.wait_for_unit("hound.service") machine.wait_for_open_port(6080) machine.wait_until_succeeds( - "curl http://127.0.0.1:6080/api/v1/search\?stats\=fosho\&repos\=\*\&rng=%3A20\&q\=hi\&files\=\&i=nope | grep 'Filename' | grep 'hello'" + "curl -f http://127.0.0.1:6080/api/v1/search\?stats\=fosho\&repos\=\*\&rng=%3A20\&q\=hi\&files\=\&i=nope | grep 'Filename' | grep 'hello'" ) ''; }) diff --git a/third_party/nixpkgs/nixos/tests/hydra/db-migration.nix b/third_party/nixpkgs/nixos/tests/hydra/db-migration.nix deleted file mode 100644 index ca65e2e66a..0000000000 --- a/third_party/nixpkgs/nixos/tests/hydra/db-migration.nix +++ /dev/null @@ -1,92 +0,0 @@ -{ system ? builtins.currentSystem -, pkgs ? import ../../.. { inherit system; } -, ... -}: - -let inherit (import ./common.nix { inherit system; }) baseConfig; in - -with import ../../lib/testing-python.nix { inherit system pkgs; }; -with pkgs.lib; - -{ mig = makeTest { - name = "hydra-db-migration"; - meta = with pkgs.stdenv.lib.maintainers; { - maintainers = [ ma27 ]; - }; - - nodes = { - original = { pkgs, lib, ... }: { - imports = [ baseConfig ]; - - # An older version of Hydra before the db change - # for testing purposes. - services.hydra.package = pkgs.hydra-migration.overrideAttrs (old: { - inherit (old) pname; - version = "2020-02-06"; - src = pkgs.fetchFromGitHub { - owner = "NixOS"; - repo = "hydra"; - rev = "2b4f14963b16b21ebfcd6b6bfa7832842e9b2afc"; - sha256 = "16q0cffcsfx5pqd91n9k19850c1nbh4vvbd9h8yi64ihn7v8bick"; - }; - }); - }; - - migration_phase1 = { pkgs, lib, ... }: { - imports = [ baseConfig ]; - services.hydra.package = pkgs.hydra-migration; - }; - - finished = { pkgs, lib, ... }: { - imports = [ baseConfig ]; - services.hydra.package = pkgs.hydra-unstable; - }; - }; - - testScript = { nodes, ... }: let - next = nodes.migration_phase1.config.system.build.toplevel; - finished = nodes.finished.config.system.build.toplevel; - in '' - original.start() - original.wait_for_unit("multi-user.target") - original.wait_for_unit("postgresql.service") - original.wait_for_unit("hydra-init.service") - original.require_unit_state("hydra-queue-runner.service") - original.require_unit_state("hydra-evaluator.service") - original.require_unit_state("hydra-notify.service") - original.succeed("hydra-create-user admin --role admin --password admin") - original.wait_for_open_port(3000) - original.succeed("create-trivial-project.sh") - original.wait_until_succeeds( - 'curl -L -s http://localhost:3000/build/1 -H "Accept: application/json" | jq .buildstatus | xargs test 0 -eq' - ) - - out = original.succeed("su -l postgres -c 'psql -d hydra <<< \"\\d+ builds\" -A'") - assert "jobset_id" not in out - - original.succeed( - "${next}/bin/switch-to-configuration test >&2" - ) - original.wait_for_unit("hydra-init.service") - - out = original.succeed("su -l postgres -c 'psql -d hydra <<< \"\\d+ builds\" -A'") - assert "jobset_id|integer|||" in out - - original.succeed("hydra-backfill-ids") - - original.succeed( - "${finished}/bin/switch-to-configuration test >&2" - ) - original.wait_for_unit("hydra-init.service") - - out = original.succeed("su -l postgres -c 'psql -d hydra <<< \"\\d+ builds\" -A'") - assert "jobset_id|integer||not null|" in out - - original.wait_until_succeeds( - 'curl -L -s http://localhost:3000/build/1 -H "Accept: application/json" | jq .buildstatus | xargs test 0 -eq' - ) - - original.shutdown() - ''; - }; -} diff --git a/third_party/nixpkgs/nixos/tests/hydra/default.nix b/third_party/nixpkgs/nixos/tests/hydra/default.nix index 2336e4033d..e91a1cd335 100644 --- a/third_party/nixpkgs/nixos/tests/hydra/default.nix +++ b/third_party/nixpkgs/nixos/tests/hydra/default.nix @@ -11,7 +11,7 @@ let inherit (import ./common.nix { inherit system; }) baseConfig; hydraPkgs = { - inherit (pkgs) hydra-migration hydra-unstable; + inherit (pkgs) hydra-unstable; }; makeHydraTest = with pkgs.lib; name: package: makeTest { diff --git a/third_party/nixpkgs/nixos/tests/installed-tests/default.nix b/third_party/nixpkgs/nixos/tests/installed-tests/default.nix index 889a00d4b5..50ca8ad2b5 100644 --- a/third_party/nixpkgs/nixos/tests/installed-tests/default.nix +++ b/third_party/nixpkgs/nixos/tests/installed-tests/default.nix @@ -101,5 +101,6 @@ in libxmlb = callInstalledTest ./libxmlb.nix {}; malcontent = callInstalledTest ./malcontent.nix {}; ostree = callInstalledTest ./ostree.nix {}; + pipewire = callInstalledTest ./pipewire.nix {}; xdg-desktop-portal = callInstalledTest ./xdg-desktop-portal.nix {}; } diff --git a/third_party/nixpkgs/nixos/tests/installed-tests/pipewire.nix b/third_party/nixpkgs/nixos/tests/installed-tests/pipewire.nix new file mode 100644 index 0000000000..f4154b5d2f --- /dev/null +++ b/third_party/nixpkgs/nixos/tests/installed-tests/pipewire.nix @@ -0,0 +1,5 @@ +{ pkgs, lib, makeInstalledTest, ... }: + +makeInstalledTest { + tested = pkgs.pipewire; +} diff --git a/third_party/nixpkgs/nixos/tests/leaps.nix b/third_party/nixpkgs/nixos/tests/leaps.nix index ac0c602d44..ec5b69a762 100644 --- a/third_party/nixpkgs/nixos/tests/leaps.nix +++ b/third_party/nixpkgs/nixos/tests/leaps.nix @@ -26,7 +26,7 @@ import ./make-test-python.nix ({ pkgs, ... }: server.wait_for_open_port(6666) client.wait_for_unit("network.target") assert "leaps" in client.succeed( - "${pkgs.curl}/bin/curl http://server:6666/leaps/" + "${pkgs.curl}/bin/curl -f http://server:6666/leaps/" ) ''; }) diff --git a/third_party/nixpkgs/nixos/tests/limesurvey.nix b/third_party/nixpkgs/nixos/tests/limesurvey.nix index 7228fcb833..dad807fb73 100644 --- a/third_party/nixpkgs/nixos/tests/limesurvey.nix +++ b/third_party/nixpkgs/nixos/tests/limesurvey.nix @@ -20,7 +20,7 @@ import ./make-test-python.nix ({ pkgs, ... }: { machine.wait_for_unit("phpfpm-limesurvey.service") assert "The following surveys are available" in machine.succeed( - "curl http://example.local/" + "curl -f http://example.local/" ) ''; }) diff --git a/third_party/nixpkgs/nixos/tests/mailcatcher.nix b/third_party/nixpkgs/nixos/tests/mailcatcher.nix index 2ef38544fe..a55fba8a99 100644 --- a/third_party/nixpkgs/nixos/tests/mailcatcher.nix +++ b/third_party/nixpkgs/nixos/tests/mailcatcher.nix @@ -24,7 +24,7 @@ import ./make-test-python.nix ({ lib, ... }: 'echo "this is the body of the email" | mail -s "subject" root@example.org' ) assert "this is the body of the email" in machine.succeed( - "curl http://localhost:1080/messages/1.source" + "curl -f http://localhost:1080/messages/1.source" ) ''; }) diff --git a/third_party/nixpkgs/nixos/tests/matrix-synapse.nix b/third_party/nixpkgs/nixos/tests/matrix-synapse.nix index 9ca8087217..6c8f1e188d 100644 --- a/third_party/nixpkgs/nixos/tests/matrix-synapse.nix +++ b/third_party/nixpkgs/nixos/tests/matrix-synapse.nix @@ -77,12 +77,12 @@ in { start_all() serverpostgres.wait_for_unit("matrix-synapse.service") serverpostgres.wait_until_succeeds( - "curl -L --cacert ${ca_pem} https://localhost:8448/" + "curl --fail -L --cacert ${ca_pem} https://localhost:8448/" ) serverpostgres.require_unit_state("postgresql.service") serversqlite.wait_for_unit("matrix-synapse.service") serversqlite.wait_until_succeeds( - "curl -L --cacert ${ca_pem} https://localhost:8448/" + "curl --fail -L --cacert ${ca_pem} https://localhost:8448/" ) serversqlite.succeed("[ -e /var/lib/matrix-synapse/homeserver.db ]") ''; diff --git a/third_party/nixpkgs/nixos/tests/mediawiki.nix b/third_party/nixpkgs/nixos/tests/mediawiki.nix index 008682310c..702fefefa1 100644 --- a/third_party/nixpkgs/nixos/tests/mediawiki.nix +++ b/third_party/nixpkgs/nixos/tests/mediawiki.nix @@ -22,7 +22,7 @@ import ./make-test-python.nix ({ pkgs, lib, ... }: { machine.wait_for_unit("phpfpm-mediawiki.service") - page = machine.succeed("curl -L http://localhost/") + page = machine.succeed("curl -fL http://localhost/") assert "MediaWiki has been installed" in page ''; }) diff --git a/third_party/nixpkgs/nixos/tests/metabase.nix b/third_party/nixpkgs/nixos/tests/metabase.nix index 1450a4e908..65619cc793 100644 --- a/third_party/nixpkgs/nixos/tests/metabase.nix +++ b/third_party/nixpkgs/nixos/tests/metabase.nix @@ -15,6 +15,6 @@ import ./make-test-python.nix ({ pkgs, ... }: { start_all() machine.wait_for_unit("metabase.service") machine.wait_for_open_port(3000) - machine.wait_until_succeeds("curl -L http://localhost:3000/setup | grep Metabase") + machine.wait_until_succeeds("curl -fL http://localhost:3000/setup | grep Metabase") ''; }) diff --git a/third_party/nixpkgs/nixos/tests/morty.nix b/third_party/nixpkgs/nixos/tests/morty.nix index 64c5a27665..ff30b7c072 100644 --- a/third_party/nixpkgs/nixos/tests/morty.nix +++ b/third_party/nixpkgs/nixos/tests/morty.nix @@ -24,7 +24,7 @@ import ./make-test-python.nix ({ pkgs, ... }: '' mortyProxyWithKey.wait_for_unit("default.target") mortyProxyWithKey.wait_for_open_port(3001) - mortyProxyWithKey.succeed("curl -L 127.0.0.1:3001 | grep MortyProxy") + mortyProxyWithKey.succeed("curl -fL 127.0.0.1:3001 | grep MortyProxy") ''; }) diff --git a/third_party/nixpkgs/nixos/tests/neo4j.nix b/third_party/nixpkgs/nixos/tests/neo4j.nix index 32ee7f501b..8329e5630d 100644 --- a/third_party/nixpkgs/nixos/tests/neo4j.nix +++ b/third_party/nixpkgs/nixos/tests/neo4j.nix @@ -15,6 +15,6 @@ import ./make-test-python.nix { master.wait_for_unit("neo4j") master.wait_for_open_port(7474) - master.succeed("curl http://localhost:7474/") + master.succeed("curl -f http://localhost:7474/") ''; } diff --git a/third_party/nixpkgs/nixos/tests/nixos-generate-config.nix b/third_party/nixpkgs/nixos/tests/nixos-generate-config.nix index 6c83ccecc7..5daa55a8ab 100644 --- a/third_party/nixpkgs/nixos/tests/nixos-generate-config.nix +++ b/third_party/nixpkgs/nixos/tests/nixos-generate-config.nix @@ -7,8 +7,16 @@ import ./make-test-python.nix ({ lib, ... } : { { config, pkgs, ... }: { imports = [ ./hardware-configuration.nix ]; $bootLoaderConfig + $desktopConfiguration } ''; + + system.nixos-generate-config.desktopConfiguration = '' + # DESKTOP + # services.xserver.enable = true; + # services.xserver.displayManager.gdm.enable = true; + # services.xserver.desktopManager.gnome3.enable = true; + ''; }; testScript = '' start_all() @@ -18,9 +26,17 @@ import ./make-test-python.nix ({ lib, ... } : { # Test if the configuration really is overridden machine.succeed("grep 'OVERRIDDEN' /etc/nixos/configuration.nix") + # Test if desktop configuration really is overridden + machine.succeed("grep 'DESKTOP' /etc/nixos/configuration.nix") + # Test of if the Perl variable $bootLoaderConfig is spliced correctly: machine.succeed( "grep 'boot\\.loader\\.grub\\.enable = true;' /etc/nixos/configuration.nix" ) + + # Test if the Perl variable $desktopConfiguration is spliced correctly + machine.succeed( + "grep 'services\\.xserver\\.desktopManager\\.gnome3\\.enable = true;' /etc/nixos/configuration.nix" + ) ''; }) diff --git a/third_party/nixpkgs/nixos/tests/nzbget.nix b/third_party/nixpkgs/nixos/tests/nzbget.nix index 12d8ed6ea8..b39c9b035e 100644 --- a/third_party/nixpkgs/nixos/tests/nzbget.nix +++ b/third_party/nixpkgs/nixos/tests/nzbget.nix @@ -21,7 +21,7 @@ import ./make-test-python.nix ({ pkgs, ...} : { server.wait_for_unit("network.target") server.wait_for_open_port(6789) assert "This file is part of nzbget" in server.succeed( - "curl -s -u nzbget:tegbzn6789 http://127.0.0.1:6789" + "curl -f -s -u nzbget:tegbzn6789 http://127.0.0.1:6789" ) server.succeed( "${pkgs.nzbget}/bin/nzbget -n -o Control_iP=127.0.0.1 -o Control_port=6789 -o Control_password=tegbzn6789 -V" diff --git a/third_party/nixpkgs/nixos/tests/oci-containers.nix b/third_party/nixpkgs/nixos/tests/oci-containers.nix index bb6c019f07..0dfc7ffb27 100644 --- a/third_party/nixpkgs/nixos/tests/oci-containers.nix +++ b/third_party/nixpkgs/nixos/tests/oci-containers.nix @@ -32,7 +32,7 @@ let start_all() ${backend}.wait_for_unit("${backend}-nginx.service") ${backend}.wait_for_open_port(8181) - ${backend}.wait_until_succeeds("curl http://localhost:8181 | grep Hello") + ${backend}.wait_until_succeeds("curl -f http://localhost:8181 | grep Hello") ''; }; diff --git a/third_party/nixpkgs/nixos/tests/osrm-backend.nix b/third_party/nixpkgs/nixos/tests/osrm-backend.nix index db67a5a589..4067d5b1a2 100644 --- a/third_party/nixpkgs/nixos/tests/osrm-backend.nix +++ b/third_party/nixpkgs/nixos/tests/osrm-backend.nix @@ -48,10 +48,10 @@ in { machine.wait_for_unit("osrm.service") machine.wait_for_open_port(${toString port}) assert "Boulevard Rainier III" in machine.succeed( - "curl --silent '${query}' | jq .waypoints[0].name" + "curl --fail --silent '${query}' | jq .waypoints[0].name" ) assert "Avenue de la Costa" in machine.succeed( - "curl --silent '${query}' | jq .waypoints[1].name" + "curl --fail --silent '${query}' | jq .waypoints[1].name" ) ''; }) diff --git a/third_party/nixpkgs/nixos/tests/paperless.nix b/third_party/nixpkgs/nixos/tests/paperless.nix index 355e7041d3..fb83e6f976 100644 --- a/third_party/nixpkgs/nixos/tests/paperless.nix +++ b/third_party/nixpkgs/nixos/tests/paperless.nix @@ -23,14 +23,14 @@ import ./make-test-python.nix ({ lib, ... } : { with subtest("Service gets ready"): machine.wait_for_unit("paperless-server.service") # Wait until server accepts connections - machine.wait_until_succeeds("curl -s localhost:28981") + machine.wait_until_succeeds("curl -fs localhost:28981") with subtest("Test document is consumed"): machine.wait_until_succeeds( - "(($(curl -s localhost:28981/api/documents/ | jq .count) == 1))" + "(($(curl -fs localhost:28981/api/documents/ | jq .count) == 1))" ) assert "2005-10-16" in machine.succeed( - "curl -s localhost:28981/api/documents/ | jq '.results | .[0] | .created'" + "curl -fs localhost:28981/api/documents/ | jq '.results | .[0] | .created'" ) ''; }) diff --git a/third_party/nixpkgs/nixos/tests/peerflix.nix b/third_party/nixpkgs/nixos/tests/peerflix.nix index 37628604d4..6e534dedc4 100644 --- a/third_party/nixpkgs/nixos/tests/peerflix.nix +++ b/third_party/nixpkgs/nixos/tests/peerflix.nix @@ -18,6 +18,6 @@ import ./make-test-python.nix ({ pkgs, ...} : { start_all() peerflix.wait_for_unit("peerflix.service") - peerflix.wait_until_succeeds("curl localhost:9000") + peerflix.wait_until_succeeds("curl -f localhost:9000") ''; }) diff --git a/third_party/nixpkgs/nixos/tests/php/fpm.nix b/third_party/nixpkgs/nixos/tests/php/fpm.nix index 513abd9437..9ad515ebdd 100644 --- a/third_party/nixpkgs/nixos/tests/php/fpm.nix +++ b/third_party/nixpkgs/nixos/tests/php/fpm.nix @@ -43,7 +43,7 @@ import ../make-test-python.nix ({pkgs, lib, ...}: { machine.wait_for_unit("phpfpm-foobar.service") # Check so we get an evaluated PHP back - response = machine.succeed("curl -vvv -s http://127.0.0.1:80/") + response = machine.succeed("curl -fvvv -s http://127.0.0.1:80/") assert "PHP Version ${pkgs.php.version}" in response, "PHP version not detected" # Check so we have database and some other extensions loaded diff --git a/third_party/nixpkgs/nixos/tests/php/httpd.nix b/third_party/nixpkgs/nixos/tests/php/httpd.nix index 1092e0ecad..27ea7a24e3 100644 --- a/third_party/nixpkgs/nixos/tests/php/httpd.nix +++ b/third_party/nixpkgs/nixos/tests/php/httpd.nix @@ -21,7 +21,7 @@ import ../make-test-python.nix ({pkgs, lib, ...}: { machine.wait_for_unit("httpd.service") # Check so we get an evaluated PHP back - response = machine.succeed("curl -vvv -s http://127.0.0.1:80/") + response = machine.succeed("curl -fvvv -s http://127.0.0.1:80/") assert "PHP Version ${pkgs.php.version}" in response, "PHP version not detected" # Check so we have database and some other extensions loaded diff --git a/third_party/nixpkgs/nixos/tests/php/pcre.nix b/third_party/nixpkgs/nixos/tests/php/pcre.nix index 3dd0964e60..3ea19304bf 100644 --- a/third_party/nixpkgs/nixos/tests/php/pcre.nix +++ b/third_party/nixpkgs/nixos/tests/php/pcre.nix @@ -32,7 +32,7 @@ in import ../make-test-python.nix ({lib, ...}: { '' machine.wait_for_unit("httpd.service") # Ensure php evaluation by matching on the var_dump syntax - response = machine.succeed("curl -vvv -s http://127.0.0.1:80/index.php") + response = machine.succeed("curl -fvvv -s http://127.0.0.1:80/index.php") expected = 'string(${toString (builtins.stringLength testString)}) "${testString}"' assert expected in response, "Does not appear to be able to use subgroups." ''; diff --git a/third_party/nixpkgs/nixos/tests/powerdns.nix b/third_party/nixpkgs/nixos/tests/powerdns.nix index 75d71315e6..d025934ad2 100644 --- a/third_party/nixpkgs/nixos/tests/powerdns.nix +++ b/third_party/nixpkgs/nixos/tests/powerdns.nix @@ -1,13 +1,65 @@ -import ./make-test-python.nix ({ pkgs, ... }: { +# This test runs PowerDNS authoritative server with the +# generic MySQL backend (gmysql) to connect to a +# MariaDB server using UNIX sockets authentication. + +import ./make-test-python.nix ({ pkgs, lib, ... }: { name = "powerdns"; nodes.server = { ... }: { services.powerdns.enable = true; - environment.systemPackages = [ pkgs.dnsutils ]; + services.powerdns.extraConfig = '' + launch=gmysql + gmysql-user=pdns + ''; + + services.mysql = { + enable = true; + package = pkgs.mariadb; + ensureDatabases = [ "powerdns" ]; + ensureUsers = lib.singleton + { name = "pdns"; + ensurePermissions = { "powerdns.*" = "ALL PRIVILEGES"; }; + }; + }; + + environment.systemPackages = with pkgs; + [ dnsutils powerdns mariadb ]; }; testScript = '' - server.wait_for_unit("pdns") - server.succeed("dig version.bind txt chaos \@127.0.0.1") + import re + + with subtest("PowerDNS database exists"): + server.wait_for_unit("mysql") + server.succeed("echo 'SHOW DATABASES;' | sudo -u pdns mysql -u pdns >&2") + + with subtest("Loading the MySQL schema works"): + server.succeed( + "sudo -u pdns mysql -u pdns -D powerdns <" + "${pkgs.powerdns}/share/doc/pdns/schema.mysql.sql" + ) + + with subtest("PowerDNS server starts"): + server.wait_for_unit("pdns") + server.succeed("dig version.bind txt chaos @127.0.0.1 >&2") + + with subtest("Adding an example zone works"): + # Extract configuration file needed by pdnsutil + unit = server.succeed("systemctl cat pdns") + conf = re.search("(--config-dir=[^ ]+)", unit).group(1) + pdnsutil = "sudo -u pdns pdnsutil " + conf + server.succeed(f"{pdnsutil} create-zone example.com ns1.example.com") + server.succeed(f"{pdnsutil} add-record example.com ns1 A 192.168.1.2") + + with subtest("Querying the example zone works"): + reply = server.succeed("dig +noall +answer ns1.example.com @127.0.0.1") + assert ( + "192.168.1.2" in reply + ), f"""" + The reply does not contain the expected IP address: + Expected: + ns1.example.com. 3600 IN A 192.168.1.2 + Reply: + {reply}""" ''; }) diff --git a/third_party/nixpkgs/nixos/tests/prometheus-exporters.nix b/third_party/nixpkgs/nixos/tests/prometheus-exporters.nix index ad2fff2b01..2553f5dcf7 100644 --- a/third_party/nixpkgs/nixos/tests/prometheus-exporters.nix +++ b/third_party/nixpkgs/nixos/tests/prometheus-exporters.nix @@ -563,6 +563,37 @@ let ''; }; + rtl_433 = { + exporterConfig = { + enable = true; + }; + metricProvider = { + # Mock rtl_433 binary to return a dummy metric stream. + nixpkgs.overlays = [ (self: super: { + rtl_433 = self.runCommand "rtl_433" {} '' + mkdir -p "$out/bin" + cat < "$out/bin/rtl_433" + #!/bin/sh + while true; do + printf '{"time" : "2020-04-26 13:37:42", "model" : "zopieux", "id" : 55, "channel" : 3, "temperature_C" : 18.000}\n' + sleep 4 + done + EOF + chmod +x "$out/bin/rtl_433" + ''; + }) ]; + }; + exporterTest = '' + wait_for_unit("prometheus-rtl_433-exporter.service") + wait_for_open_port(9550) + wait_until_succeeds( + "curl -sSf localhost:9550/metrics | grep -q '{}'".format( + 'rtl_433_temperature_celsius{channel="3",id="55",location="",model="zopieux"} 18' + ) + ) + ''; + }; + snmp = { exporterConfig = { enable = true; diff --git a/third_party/nixpkgs/nixos/tests/prometheus.nix b/third_party/nixpkgs/nixos/tests/prometheus.nix index af2aa66a55..de1d10aa7c 100644 --- a/third_party/nixpkgs/nixos/tests/prometheus.nix +++ b/third_party/nixpkgs/nixos/tests/prometheus.nix @@ -193,13 +193,13 @@ in import ./make-test-python.nix { # Check if prometheus responds to requests: prometheus.wait_for_unit("prometheus.service") prometheus.wait_for_open_port(${toString queryPort}) - prometheus.succeed("curl -s http://127.0.0.1:${toString queryPort}/metrics") + prometheus.succeed("curl -sf http://127.0.0.1:${toString queryPort}/metrics") # Let's test if pushing a metric to the pushgateway succeeds: prometheus.wait_for_unit("pushgateway.service") prometheus.succeed( "echo 'some_metric 3.14' | " - + "curl --data-binary \@- " + + "curl -f --data-binary \@- " + "http://127.0.0.1:${toString pushgwPort}/metrics/job/some_job" ) diff --git a/third_party/nixpkgs/nixos/tests/sanoid.nix b/third_party/nixpkgs/nixos/tests/sanoid.nix index 284b38932c..66ddaad60e 100644 --- a/third_party/nixpkgs/nixos/tests/sanoid.nix +++ b/third_party/nixpkgs/nixos/tests/sanoid.nix @@ -38,7 +38,7 @@ in { services.syncoid = { enable = true; - sshKey = "/root/.ssh/id_ecdsa"; + sshKey = "/var/lib/syncoid/id_ecdsa"; commonArgs = [ "--no-sync-snap" ]; commands."pool/test".target = "root@target:pool/test"; }; @@ -69,11 +69,12 @@ in { "udevadm settle", ) - source.succeed("mkdir -m 700 /root/.ssh") source.succeed( - "cat '${snakeOilPrivateKey}' > /root/.ssh/id_ecdsa" + "mkdir -m 700 -p /var/lib/syncoid", + "cat '${snakeOilPrivateKey}' > /var/lib/syncoid/id_ecdsa", + "chmod 600 /var/lib/syncoid/id_ecdsa", + "chown -R syncoid:syncoid /var/lib/syncoid/", ) - source.succeed("chmod 600 /root/.ssh/id_ecdsa") source.succeed("touch /tmp/mnt/test.txt") source.systemctl("start --wait sanoid.service") diff --git a/third_party/nixpkgs/nixos/tests/service-runner.nix b/third_party/nixpkgs/nixos/tests/service-runner.nix index 39ae66fe11..55fbbb7293 100644 --- a/third_party/nixpkgs/nixos/tests/service-runner.nix +++ b/third_party/nixpkgs/nixos/tests/service-runner.nix @@ -29,7 +29,7 @@ import ./make-test-python.nix ({ pkgs, ... }: { """ ) machine.wait_for_open_port(80) - machine.succeed(f"curl {url}") + machine.succeed(f"curl -f {url}") machine.succeed("kill -INT $(cat my-nginx.pid)") machine.wait_for_closed_port(80) ''; diff --git a/third_party/nixpkgs/nixos/tests/spacecookie.nix b/third_party/nixpkgs/nixos/tests/spacecookie.nix index 6eff32a2e7..5b5022a742 100644 --- a/third_party/nixpkgs/nixos/tests/spacecookie.nix +++ b/third_party/nixpkgs/nixos/tests/spacecookie.nix @@ -32,7 +32,7 @@ in ${gopherHost}.wait_for_unit("spacecookie.service") client.wait_for_unit("network.target") - fileResponse = client.succeed("curl -s gopher://${gopherHost}//${fileName}") + fileResponse = client.succeed("curl -f -s gopher://${gopherHost}//${fileName}") # the file response should return our created file exactly if not (fileResponse == "${fileContent}\n"): @@ -41,7 +41,7 @@ in # sanity check on the directory listing: we serve a directory and a file # via gopher, so the directory listing should have exactly two entries, # one with gopher file type 0 (file) and one with file type 1 (directory). - dirResponse = client.succeed("curl -s gopher://${gopherHost}") + dirResponse = client.succeed("curl -f -s gopher://${gopherHost}") dirEntries = [l[0] for l in dirResponse.split("\n") if len(l) > 0] dirEntries.sort() diff --git a/third_party/nixpkgs/nixos/tests/sslh.nix b/third_party/nixpkgs/nixos/tests/sslh.nix index 2a800aa52d..17094606e8 100644 --- a/third_party/nixpkgs/nixos/tests/sslh.nix +++ b/third_party/nixpkgs/nixos/tests/sslh.nix @@ -78,6 +78,6 @@ import ./make-test-python.nix { server.succeed(f"grep '{ip}' /tmp/foo{arg}") # check that http through sslh works - assert client.succeed(f"curl {arg} http://server:443").strip() == "hello world" + assert client.succeed(f"curl -f {arg} http://server:443").strip() == "hello world" ''; } diff --git a/third_party/nixpkgs/nixos/tests/sympa.nix b/third_party/nixpkgs/nixos/tests/sympa.nix index 280691f7cb..eb38df180a 100644 --- a/third_party/nixpkgs/nixos/tests/sympa.nix +++ b/third_party/nixpkgs/nixos/tests/sympa.nix @@ -30,7 +30,7 @@ import ./make-test-python.nix ({ pkgs, lib, ... }: { machine.wait_for_unit("sympa.service") machine.wait_for_unit("wwsympa.service") assert "Mailing lists service" in machine.succeed( - "curl --insecure -L http://localhost/" + "curl --fail --insecure -L http://localhost/" ) ''; }) diff --git a/third_party/nixpkgs/nixos/tests/syncthing-relay.nix b/third_party/nixpkgs/nixos/tests/syncthing-relay.nix index cd72ef1cbe..c144bf7fca 100644 --- a/third_party/nixpkgs/nixos/tests/syncthing-relay.nix +++ b/third_party/nixpkgs/nixos/tests/syncthing-relay.nix @@ -19,7 +19,7 @@ import ./make-test-python.nix ({ lib, pkgs, ... }: { machine.wait_for_open_port(12346) out = machine.succeed( - "curl -sS http://localhost:12346/status | jq -r '.options.\"provided-by\"'" + "curl -sSf http://localhost:12346/status | jq -r '.options.\"provided-by\"'" ) assert "nixos-test" in out ''; diff --git a/third_party/nixpkgs/nixos/tests/syncthing.nix b/third_party/nixpkgs/nixos/tests/syncthing.nix index 9e2a8e01e3..ac9df5e50c 100644 --- a/third_party/nixpkgs/nixos/tests/syncthing.nix +++ b/third_party/nixpkgs/nixos/tests/syncthing.nix @@ -25,7 +25,7 @@ import ./make-test-python.nix ({ lib, pkgs, ... }: { "xmllint --xpath 'string(configuration/gui/apikey)' %s/config.xml" % confdir ).strip() oldConf = host.succeed( - "curl -Ss -H 'X-API-Key: %s' 127.0.0.1:8384/rest/system/config" % APIKey + "curl -Ssf -H 'X-API-Key: %s' 127.0.0.1:8384/rest/system/config" % APIKey ) conf = json.loads(oldConf) conf["devices"].append({"deviceID": deviceID, "id": name}) @@ -39,7 +39,7 @@ import ./make-test-python.nix ({ lib, pkgs, ... }: { ) newConf = json.dumps(conf) host.succeed( - "curl -Ss -H 'X-API-Key: %s' 127.0.0.1:8384/rest/system/config -d %s" + "curl -Ssf -H 'X-API-Key: %s' 127.0.0.1:8384/rest/system/config -d %s" % (APIKey, shlex.quote(newConf)) ) diff --git a/third_party/nixpkgs/nixos/tests/trac.nix b/third_party/nixpkgs/nixos/tests/trac.nix index 7953f8d41f..af7182d1e1 100644 --- a/third_party/nixpkgs/nixos/tests/trac.nix +++ b/third_party/nixpkgs/nixos/tests/trac.nix @@ -14,6 +14,6 @@ import ./make-test-python.nix ({ pkgs, ... }: { start_all() machine.wait_for_unit("trac.service") machine.wait_for_open_port(8000) - machine.wait_until_succeeds("curl -L http://localhost:8000/ | grep 'Trac Powered'") + machine.wait_until_succeeds("curl -fL http://localhost:8000/ | grep 'Trac Powered'") ''; }) diff --git a/third_party/nixpkgs/nixos/tests/trezord.nix b/third_party/nixpkgs/nixos/tests/trezord.nix index b7b3dd3194..7c8370f409 100644 --- a/third_party/nixpkgs/nixos/tests/trezord.nix +++ b/third_party/nixpkgs/nixos/tests/trezord.nix @@ -14,6 +14,6 @@ import ./make-test-python.nix ({ pkgs, ... }: { start_all() machine.wait_for_unit("trezord.service") machine.wait_for_open_port(21325) - machine.wait_until_succeeds("curl -L http://localhost:21325/status/ | grep Version") + machine.wait_until_succeeds("curl -fL http://localhost:21325/status/ | grep Version") ''; }) diff --git a/third_party/nixpkgs/nixos/tests/trickster.nix b/third_party/nixpkgs/nixos/tests/trickster.nix index 713ac8f0b2..e32f919a1a 100644 --- a/third_party/nixpkgs/nixos/tests/trickster.nix +++ b/third_party/nixpkgs/nixos/tests/trickster.nix @@ -19,19 +19,19 @@ import ./make-test-python.nix ({ pkgs, ... }: { prometheus.wait_for_unit("prometheus.service") prometheus.wait_for_open_port(9090) prometheus.wait_until_succeeds( - "curl -L http://localhost:9090/metrics | grep 'promhttp_metric_handler_requests_total{code=\"500\"} 0'" + "curl -fL http://localhost:9090/metrics | grep 'promhttp_metric_handler_requests_total{code=\"500\"} 0'" ) trickster.wait_for_unit("trickster.service") trickster.wait_for_open_port(8082) trickster.wait_for_open_port(9090) trickster.wait_until_succeeds( - "curl -L http://localhost:8082/metrics | grep 'promhttp_metric_handler_requests_total{code=\"500\"} 0'" + "curl -fL http://localhost:8082/metrics | grep 'promhttp_metric_handler_requests_total{code=\"500\"} 0'" ) trickster.wait_until_succeeds( - "curl -L http://prometheus:9090/metrics | grep 'promhttp_metric_handler_requests_total{code=\"500\"} 0'" + "curl -fL http://prometheus:9090/metrics | grep 'promhttp_metric_handler_requests_total{code=\"500\"} 0'" ) trickster.wait_until_succeeds( - "curl -L http://localhost:9090/metrics | grep 'promhttp_metric_handler_requests_total{code=\"500\"} 0'" + "curl -fL http://localhost:9090/metrics | grep 'promhttp_metric_handler_requests_total{code=\"500\"} 0'" ) ''; }) diff --git a/third_party/nixpkgs/nixos/tests/upnp.nix b/third_party/nixpkgs/nixos/tests/upnp.nix index a7d837ea07..046c0a56b2 100644 --- a/third_party/nixpkgs/nixos/tests/upnp.nix +++ b/third_party/nixpkgs/nixos/tests/upnp.nix @@ -90,7 +90,7 @@ in client1.succeed("upnpc -a ${internalClient1Address} 9000 9000 TCP") client1.wait_for_unit("httpd") - client2.wait_until_succeeds("curl http://${externalRouterAddress}:9000/") + client2.wait_until_succeeds("curl -f http://${externalRouterAddress}:9000/") ''; }) diff --git a/third_party/nixpkgs/nixos/tests/uwsgi.nix b/third_party/nixpkgs/nixos/tests/uwsgi.nix index 78a87147f5..7f4945a880 100644 --- a/third_party/nixpkgs/nixos/tests/uwsgi.nix +++ b/third_party/nixpkgs/nixos/tests/uwsgi.nix @@ -33,6 +33,6 @@ import ./make-test-python.nix ({ pkgs, ... }: machine.wait_for_unit("multi-user.target") machine.wait_for_unit("uwsgi.service") machine.wait_for_open_port(8000) - assert "Hello World" in machine.succeed("curl -v 127.0.0.1:8000") + assert "Hello World" in machine.succeed("curl -fv 127.0.0.1:8000") ''; }) diff --git a/third_party/nixpkgs/nixos/tests/victoriametrics.nix b/third_party/nixpkgs/nixos/tests/victoriametrics.nix index 73ef8b7286..fff8d7005d 100644 --- a/third_party/nixpkgs/nixos/tests/victoriametrics.nix +++ b/third_party/nixpkgs/nixos/tests/victoriametrics.nix @@ -19,9 +19,11 @@ import ./make-test-python.nix ({ pkgs, ...} : { # write some points and run simple query out = one.succeed( - "curl -d 'measurement,tag1=value1,tag2=value2 field1=123,field2=1.23' -X POST 'http://localhost:8428/write'" + "curl -f -d 'measurement,tag1=value1,tag2=value2 field1=123,field2=1.23' -X POST 'http://localhost:8428/write'" + ) + cmd = ( + """curl -f -s -G 'http://localhost:8428/api/v1/export' -d 'match={__name__!=""}'""" ) - cmd = """curl -s -G 'http://localhost:8428/api/v1/export' -d 'match={__name__!=""}'""" # data takes a while to appear one.wait_until_succeeds(f"[[ $({cmd} | wc -l) -ne 0 ]]") out = one.succeed(cmd) diff --git a/third_party/nixpkgs/nixos/tests/web-servers/unit-php.nix b/third_party/nixpkgs/nixos/tests/web-servers/unit-php.nix index 2a0a5bdaa5..033036ee76 100644 --- a/third_party/nixpkgs/nixos/tests/web-servers/unit-php.nix +++ b/third_party/nixpkgs/nixos/tests/web-servers/unit-php.nix @@ -47,7 +47,7 @@ in { machine.wait_for_unit("unit.service") # Check so we get an evaluated PHP back - response = machine.succeed("curl -vvv -s http://127.0.0.1:9074/") + response = machine.succeed("curl -f -vvv -s http://127.0.0.1:9074/") assert "PHP Version ${pkgs.unit.usedPhp74.version}" in response, "PHP version not detected" # Check so we have database and some other extensions loaded diff --git a/third_party/nixpkgs/nixos/tests/wordpress.nix b/third_party/nixpkgs/nixos/tests/wordpress.nix index b7449859f7..5d740502bb 100644 --- a/third_party/nixpkgs/nixos/tests/wordpress.nix +++ b/third_party/nixpkgs/nixos/tests/wordpress.nix @@ -40,7 +40,7 @@ import ./make-test-python.nix ({ pkgs, ... }: with subtest("website returns welcome screen"): for site_name in site_names: - assert "Welcome to the famous" in machine.succeed(f"curl -L {site_name}") + assert "Welcome to the famous" in machine.succeed(f"curl -fL {site_name}") with subtest("wordpress-init went through"): for site_name in site_names: diff --git a/third_party/nixpkgs/pkgs/applications/audio/asunder/default.nix b/third_party/nixpkgs/pkgs/applications/audio/asunder/default.nix index 998535a8eb..610085a137 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/asunder/default.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/asunder/default.nix @@ -12,11 +12,11 @@ with stdenv.lib; stdenv.mkDerivation rec { - version = "2.9.6"; + version = "2.9.7"; pname = "asunder"; src = fetchurl { url = "http://littlesvr.ca/asunder/releases/${pname}-${version}.tar.bz2"; - sha256 = "1ycnd82lh7qy1pcbngd4b41s16j9hnm2kyfrncg4cwr3bfk7yg7a"; + sha256 = "1x3l308ss0iqhz90qyjb94gyd8b4piyrm2nzjmg5kf049k9prjf1"; }; nativeBuildInputs = [ intltool makeWrapper pkgconfig ]; diff --git a/third_party/nixpkgs/pkgs/applications/audio/cantata/default.nix b/third_party/nixpkgs/pkgs/applications/audio/cantata/default.nix index df19ac9422..85806ca9a0 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/cantata/default.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/cantata/default.nix @@ -31,7 +31,7 @@ assert withReplaygain -> withTaglib; assert withLibVlc -> withHttpStream; let - version = "2.4.1"; + version = "2.4.2"; pname = "cantata"; fstat = x: fn: "-DENABLE_" + fn + "=" + (if x then "ON" else "OFF"); fstats = x: map (fstat x); @@ -47,7 +47,7 @@ in mkDerivation { owner = "CDrummond"; repo = "cantata"; rev = "v${version}"; - sha256 = "0ix7xp352bziwz31mw79y7wxxmdn6060p8ry2px243ni1lz1qx1c"; + sha256 = "15qfx9bpfdplxxs08inwf2j8kvf7g5cln5sv1wj1l2l41vbf1mjr"; }; patches = [ diff --git a/third_party/nixpkgs/pkgs/applications/audio/cozy-audiobooks/default.nix b/third_party/nixpkgs/pkgs/applications/audio/cozy-audiobooks/default.nix index a5947bd37f..1a78b783f5 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/cozy-audiobooks/default.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/cozy-audiobooks/default.nix @@ -20,7 +20,7 @@ python3Packages.buildPythonApplication rec { format = "other"; # no setup.py pname = "cozy"; - version = "0.6.7"; + version = "0.7.2"; # Temporary fix # See https://github.com/NixOS/nixpkgs/issues/57029 @@ -31,7 +31,7 @@ python3Packages.buildPythonApplication rec { owner = "geigi"; repo = pname; rev = version; - sha256 = "0f8dyqj6111czn8spgsnic1fqs3kimjwl1b19mw55fa924b9bhsa"; + sha256 = "0fmbddi4ga0bppwg3rm3yjmf7jgqc6zfslmavnr1pglbzkjhy9fs"; }; nativeBuildInputs = [ @@ -55,18 +55,23 @@ python3Packages.buildPythonApplication rec { ]); propagatedBuildInputs = with python3Packages; [ - gst-python - pygobject3 + apsw + cairo dbus-python - mutagen - peewee + distro + gst-python magic + mutagen + packaging + peewee + pygobject3 + pytz + requests ]; postPatch = '' - chmod +x data/meson_post_install.py - patchShebangs data/meson_post_install.py - substituteInPlace cozy/magic/magic.py --replace "ctypes.util.find_library('magic')" "'${file}/lib/libmagic${stdenv.hostPlatform.extensions.sharedLibrary}'" + chmod +x meson/post_install.py + patchShebangs meson/post_install.py ''; postInstall = '' diff --git a/third_party/nixpkgs/pkgs/applications/audio/ncspot/default.nix b/third_party/nixpkgs/pkgs/applications/audio/ncspot/default.nix index 2fcbf82107..0f65438737 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/ncspot/default.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/ncspot/default.nix @@ -14,16 +14,16 @@ let in rustPlatform.buildRustPackage rec { pname = "ncspot"; - version = "0.2.2"; + version = "0.2.3"; src = fetchFromGitHub { owner = "hrkfdn"; repo = "ncspot"; rev = "v${version}"; - sha256 = "1i17pidw2hylijwfn96f2bnswfxxwdln2ydsq8b1q4hfzfbxlfk2"; + sha256 = "08lxdd6biypxmzfc34cbrpsp9ajb157my4vc51ra5237b7jmy6vk"; }; - cargoSha256 = "1cpy4wrj9dz2crva4p18f8hzym73x4m2mcfds4ppri4ir7qg29dr"; + cargoSha256 = "110mqm1md8x7vjw3hsy4yz8nj38h6mwrr357awchq52inxj3jmbk"; cargoBuildFlags = [ "--no-default-features" "--features" "${lib.concatStringsSep "," features}" ]; diff --git a/third_party/nixpkgs/pkgs/applications/audio/opustags/default.nix b/third_party/nixpkgs/pkgs/applications/audio/opustags/default.nix new file mode 100644 index 0000000000..eb056c720d --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/audio/opustags/default.nix @@ -0,0 +1,24 @@ +{ stdenv, lib, cmake, pkgconfig, libogg, fetchFromGitHub, libiconv }: +stdenv.mkDerivation rec { + pname = "opustags"; + version = "1.3.0"; + + src = fetchFromGitHub { + owner = "fmang"; + repo = "opustags"; + rev = version; + sha256 = "09z0cdg20algaj2yyhfz3hxh1biwjjvzx1pc2vdc64n8lkswqsc1"; + }; + + buildInputs = [ libogg ]; + + nativeBuildInputs = [ cmake pkgconfig ] ++ lib.optional stdenv.isDarwin libiconv; + + meta = with lib; { + homepage = "https://github.com/fmang/opustags"; + description = "Ogg Opus tags editor"; + platforms = platforms.all; + maintainers = [ maintainers.kmein ]; + license = licenses.bsd3; + }; +} diff --git a/third_party/nixpkgs/pkgs/applications/audio/picard/default.nix b/third_party/nixpkgs/pkgs/applications/audio/picard/default.nix index d8c927be26..cf8523b4ef 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/picard/default.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/picard/default.nix @@ -12,13 +12,13 @@ let ; in pythonPackages.buildPythonApplication rec { pname = "picard"; - version = "2.4.4"; + version = "2.5"; src = fetchFromGitHub { owner = "metabrainz"; repo = pname; rev = "release-${version}"; - sha256 = "0iw2v37j70881v0a2rjp2miq97nscq04x1ysk1dqmi1b9hi0y17q"; + sha256 = "02px6r086pyhpf6wia876c73bgr4xa4pyx2yykv6j74zyp5wig3z"; }; nativeBuildInputs = [ gettext qt5.wrapQtAppsHook qt5.qtbase ] diff --git a/third_party/nixpkgs/pkgs/applications/blockchains/bitcoin-unlimited.nix b/third_party/nixpkgs/pkgs/applications/blockchains/bitcoin-unlimited.nix index fe39b955a2..f8988af683 100644 --- a/third_party/nixpkgs/pkgs/applications/blockchains/bitcoin-unlimited.nix +++ b/third_party/nixpkgs/pkgs/applications/blockchains/bitcoin-unlimited.nix @@ -7,13 +7,13 @@ with stdenv.lib; stdenv.mkDerivation rec { name = "bitcoin" + (toString (optional (!withGui) "d")) + "-unlimited-" + version; - version = "1.8.0.0"; + version = "1.9.0.1"; src = fetchFromGitHub { owner = "bitcoinunlimited"; repo = "bitcoinunlimited"; rev = "BCHunlimited${version}"; - sha256 = "01qi15li5x9fvhsmvx7ai5fz6yzqqd3r9yv7081h75jn0nxai49q"; + sha256 = "018a22zbvjqky0whizmgxzscmna0sh2xqgyw02yjk8qj4yi0zp8c"; }; nativeBuildInputs = [ pkgconfig autoreconfHook python3 ] diff --git a/third_party/nixpkgs/pkgs/applications/blockchains/exodus/default.nix b/third_party/nixpkgs/pkgs/applications/blockchains/exodus/default.nix index af49bb9121..0c0b6a2430 100644 --- a/third_party/nixpkgs/pkgs/applications/blockchains/exodus/default.nix +++ b/third_party/nixpkgs/pkgs/applications/blockchains/exodus/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchurl, unzip, glib, systemd, nss, nspr, gtk3-x11, gnome2, +{ stdenv, lib, fetchurl, unzip, glib, systemd, nss, nspr, gtk3-x11, pango, atk, cairo, gdk-pixbuf, xorg, xorg_sys_opengl, utillinux, alsaLib, dbus, at-spi2-atk, cups, vivaldi-ffmpeg-codecs, libpulseaudio, at-spi2-core }: @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { nss nspr gtk3-x11 - gnome2.pango + pango atk cairo gdk-pixbuf diff --git a/third_party/nixpkgs/pkgs/applications/editors/android-studio/default.nix b/third_party/nixpkgs/pkgs/applications/editors/android-studio/default.nix index e8d8eb9002..e16464fb84 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/android-studio/default.nix +++ b/third_party/nixpkgs/pkgs/applications/editors/android-studio/default.nix @@ -19,9 +19,9 @@ let sha256Hash = "sha256-qbxmR9g8DSKzcP09bJuc+am79BSXWG39UQxFEb1bZ88="; }; latestVersion = { # canary & dev - version = "4.2.0.13"; # "Android Studio 4.2 Canary 13" - build = "202.6863838"; - sha256Hash = "sha256-avkRelP5/sDXW7pdVrOknmb3PtR6XQEmQXivZFljpLc="; + version = "4.2.0.14"; # "Android Studio 4.2 Canary 14" + build = "202.6907010"; + sha256Hash = "sha256-A6nl4uN25CWOjpwBvOQG26EZnJP5tNvSrGtoF+IQmtY="; }; in { # Attributes are named by their corresponding release channels diff --git a/third_party/nixpkgs/pkgs/applications/editors/cudatext/default.nix b/third_party/nixpkgs/pkgs/applications/editors/cudatext/default.nix index a1af859af8..af3f087dae 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/cudatext/default.nix +++ b/third_party/nixpkgs/pkgs/applications/editors/cudatext/default.nix @@ -30,22 +30,21 @@ let deps = lib.mapAttrs (name: spec: fetchFromGitHub { - owner = "Alexey-T"; repo = name; - inherit (spec) rev sha256; + inherit (spec) owner rev sha256; } ) (builtins.fromJSON (builtins.readFile ./deps.json)); in stdenv.mkDerivation rec { pname = "cudatext"; - version = "1.111.0"; + version = "1.115.0"; src = fetchFromGitHub { owner = "Alexey-T"; repo = "CudaText"; rev = version; - sha256 = "1ai0g8fmw4m237dqh5dkr8w9qqricyvp49ijz2ivvmg9dsdfzjfp"; + sha256 = "0q7gfpzc97fvyvabjdb9a4d3c2qhm4zf5bqgnsj73vkly80kgww8"; }; patches = [ @@ -74,6 +73,7 @@ stdenv.mkDerivation rec { cp -r --no-preserve=mode ${dep} ${name} '') deps) + '' lazbuild --lazarusdir=${lazarus}/share/lazarus --pcp=./lazarus --ws=${widgetset} \ + bgrabitmap/bgrabitmap/bgrabitmappack.lpk \ EncConv/encconv/encconv_package.lpk \ ATBinHex-Lazarus/atbinhex/atbinhex_package.lpk \ ATFlatControls/atflatcontrols/atflatcontrols_package.lpk \ diff --git a/third_party/nixpkgs/pkgs/applications/editors/cudatext/deps.json b/third_party/nixpkgs/pkgs/applications/editors/cudatext/deps.json index 9c3270bb28..02418d2584 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/cudatext/deps.json +++ b/third_party/nixpkgs/pkgs/applications/editors/cudatext/deps.json @@ -1,42 +1,57 @@ { "EncConv": { + "owner": "Alexey-T", "rev": "2020.06.15", "sha256": "07dpvq3ppfq3b70i1smkf7vwdlzq8qnxs3fk94hi9h1z36bz2rw3" }, "ATBinHex-Lazarus": { + "owner": "Alexey-T", "rev": "2020.09.05", "sha256": "022yx5vic4hnc9lz53wvr4h7hf0h71801dzlilj55x5mf8p59072" }, "ATFlatControls": { - "rev": "2020.08.23", - "sha256": "1axzwiz5h62v11ncynxcg431dfbky9pwyha7cd6kpizjdjagfklw" + "owner": "Alexey-T", + "rev": "2020.09.20", + "sha256": "09svn8yyqp6znvfpcxrsybkclh828h5rvah7nhbhk7nrfzj8i63x" }, "ATSynEdit": { - "rev": "2020.09.05", - "sha256": "0qn0fp7rbi48f3nrysb0knkd7a3a6pl5w72yf95g5iibal4zrib2" + "owner": "Alexey-T", + "rev": "2020.10.12", + "sha256": "07vznwwfa3c1jr1cd32yppw0mmmm1ja9bmsxhxlcbnc2nb30n9zr" }, "ATSynEdit_Cmp": { - "rev": "2020.09.05", - "sha256": "1bd25zc97001b7lg0bvi8va9mazkr6jih6d2ddkabcxcnsj0dxnq" + "owner": "Alexey-T", + "rev": "2020.10.11", + "sha256": "11vx685i85izp7wzb34dalcwlkmkbz1vzva5j9cf2yz1jff1v4qw" }, "EControl": { - "rev": "2020.09.05", - "sha256": "1n7s1zkhrr216gqdqvq6wq0n3jq7s78mwpi5s5j8054p0fak1ywi" + "owner": "Alexey-T", + "rev": "2020.10.04", + "sha256": "0ypbaca3y5biw2207yh3x5p28gm8g51qf7glm5622w3cgbrf9mdq" }, "ATSynEdit_Ex": { - "rev": "2020.09.05", - "sha256": "17y2cx5syj3jvrszjgdyf1p6vilp2qgaggz4y8yqnz99cvd0shs7" + "owner": "Alexey-T", + "rev": "2020.10.04", + "sha256": "0z66cm9pgdi7whqaim6hva4aa08zrr1881n1fal7lnz6wlla824k" }, "Python-for-Lazarus": { + "owner": "Alexey-T", "rev": "2020.07.31", "sha256": "0qbs51h6gw8qd3h06kwy1j7db35shbg7r2rayrhvvw0vzr9n330j" }, "Emmet-Pascal": { + "owner": "Alexey-T", "rev": "2020.09.05", "sha256": "0qfiirxnk5g3whx8y8hp54ch3h6gkkd01yf79m95bwar5qvdfybg" }, "CudaText-lexers": { + "owner": "Alexey-T", "rev": "2020.08.10", "sha256": "1gzs2psyfhb9si1qyacxzfjb3dz2v255hv7y4jlkbxdxv0kckqr6" + }, + "bgrabitmap": { + "owner": "bgrabitmap", + "rev": "v11.2.4", + "sha256": "1zk88crfn07md16wg6af4i8nlx4ikkhxq9gfk49jirwimgwbf1md" } } diff --git a/third_party/nixpkgs/pkgs/applications/editors/cudatext/dont-check-update.patch b/third_party/nixpkgs/pkgs/applications/editors/cudatext/dont-check-update.patch index 44912160b2..5c896bc046 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/cudatext/dont-check-update.patch +++ b/third_party/nixpkgs/pkgs/applications/editors/cudatext/dont-check-update.patch @@ -1,8 +1,8 @@ diff --git i/app/formmain.pas w/app/formmain.pas -index 8c1131680..6c6c0043f 100644 +index f6f37febb..cf993d75e 100644 --- i/app/formmain.pas +++ w/app/formmain.pas -@@ -2135,6 +2135,7 @@ begin +@@ -2156,6 +2156,7 @@ begin false {$endif}; *) diff --git a/third_party/nixpkgs/pkgs/applications/editors/geany/default.nix b/third_party/nixpkgs/pkgs/applications/editors/geany/default.nix index d3cc362441..d56e5acc71 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/geany/default.nix +++ b/third_party/nixpkgs/pkgs/applications/editors/geany/default.nix @@ -12,13 +12,13 @@ stdenv.mkDerivation rec { pname = "geany"; - version = "1.36"; + version = "1.37"; outputs = [ "out" "dev" "doc" "man" ]; src = fetchurl { url = "https://download.geany.org/${pname}-${version}.tar.bz2"; - sha256 = "0gnm17cr4rf3pmkf0axz4a0fxwnvp55ji0q0lzy88yqbshyxv14i"; + sha256 = "dde52584823b769c56704c27dbedddb7a6bbaf4eacb9587d10bbc387816e3d51"; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/applications/editors/jetbrains/default.nix b/third_party/nixpkgs/pkgs/applications/editors/jetbrains/default.nix index d54513971a..9fbab34690 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/jetbrains/default.nix +++ b/third_party/nixpkgs/pkgs/applications/editors/jetbrains/default.nix @@ -268,12 +268,12 @@ in clion = buildClion rec { name = "clion-${version}"; - version = "2020.2.3"; /* updated by script */ + version = "2020.2.4"; /* updated by script */ description = "C/C++ IDE. New. Intelligent. Cross-platform"; license = stdenv.lib.licenses.unfree; src = fetchurl { url = "https://download.jetbrains.com/cpp/CLion-${version}.tar.gz"; - sha256 = "1kdlmdsfxmwks3rk2dzm5q30vwzpxcwzpyjsir122k36xnqvaqxq"; /* updated by script */ + sha256 = "0xkra8l3ga8qsmzbvfisn99lxm5wxa8c4d4jzljjwn8855bs20a3"; /* updated by script */ }; wmClass = "jetbrains-clion"; update-channel = "CLion RELEASE"; # channel's id as in http://www.jetbrains.com/updates/updates.xml @@ -307,12 +307,12 @@ in idea-community = buildIdea rec { name = "idea-community-${version}"; - version = "2020.2.2"; /* updated by script */ + version = "2020.2.3"; /* updated by script */ description = "Integrated Development Environment (IDE) by Jetbrains, community edition"; license = stdenv.lib.licenses.asl20; src = fetchurl { url = "https://download.jetbrains.com/idea/ideaIC-${version}.tar.gz"; - sha256 = "0kbn9q7fvhrzb1w6l8i2nv4cx8qrj74jp7fidj9yk8vkv9lfijg6"; /* updated by script */ + sha256 = "092swkz7l1p3asrna6fxj6j324sh7pdbgzrlapdwka8kq9y40ajz"; /* updated by script */ }; wmClass = "jetbrains-idea-ce"; update-channel = "IntelliJ IDEA RELEASE"; @@ -320,12 +320,12 @@ in idea-ultimate = buildIdea rec { name = "idea-ultimate-${version}"; - version = "2020.2.2"; /* updated by script */ + version = "2020.2.3"; /* updated by script */ description = "Integrated Development Environment (IDE) by Jetbrains, requires paid license"; license = stdenv.lib.licenses.unfree; src = fetchurl { url = "https://download.jetbrains.com/idea/ideaIU-${version}-no-jbr.tar.gz"; - sha256 = "1196zrcbgrr9271kjrzd2mzvhvxd7hkr1d2a4ij4h8f97qmsd6r6"; /* updated by script */ + sha256 = "1416ikna169d2hx77yd0bb8hpxkpnf27jgyq5yrgla1w6h1fp1p0"; /* updated by script */ }; wmClass = "jetbrains-idea"; update-channel = "IntelliJ IDEA RELEASE"; @@ -333,12 +333,12 @@ in mps = buildMps rec { name = "mps-${version}"; - version = "2020.2"; /* updated by script */ + version = "2020.2.2"; /* updated by script */ description = "Create your own domain-specific language"; license = stdenv.lib.licenses.unfree; src = fetchurl { url = "https://download.jetbrains.com/mps/2020.2/MPS-${version}.tar.gz"; - sha256 = "06c0yv9vvz0y5njh1sghn7ijpn1d81mxsyk5xjpj29bvvg511pjs"; /* updated by script */ + sha256 = "1a09yahky8ii2dypj69m89c3yh7akn7sa74n0j0mff7r46ad421y"; /* updated by script */ }; wmClass = "jetbrains-mps"; update-channel = "MPS RELEASE"; @@ -346,12 +346,12 @@ in phpstorm = buildPhpStorm rec { name = "phpstorm-${version}"; - version = "2020.2.1"; /* updated by script */ + version = "2020.2.3"; /* updated by script */ description = "Professional IDE for Web and PHP developers"; license = stdenv.lib.licenses.unfree; src = fetchurl { url = "https://download.jetbrains.com/webide/PhpStorm-${version}.tar.gz"; - sha256 = "14hz6w5lgn8ddscicm4s9xhi07j5adsq0bmyr8amzmj5q6jgw4p9"; /* updated by script */ + sha256 = "0bdxmxml6337cdpb2amhdqlvxicng50cgzlnmiw0wqnmwj5ihpih"; /* updated by script */ }; wmClass = "jetbrains-phpstorm"; update-channel = "PhpStorm RELEASE"; @@ -359,12 +359,12 @@ in pycharm-community = buildPycharm rec { name = "pycharm-community-${version}"; - version = "2020.2.2"; /* updated by script */ + version = "2020.2.3"; /* updated by script */ description = "PyCharm Community Edition"; license = stdenv.lib.licenses.asl20; src = fetchurl { url = "https://download.jetbrains.com/python/${name}.tar.gz"; - sha256 = "1a1vhlc2q5n3dxli0x6ppxx3mgary4gpakcxdp9nylmixjzjph6v"; /* updated by script */ + sha256 = "0wqhcag32fxqxg6aml2a3d0rpds0d48rgbcl7cp0ah8xj6x72047"; /* updated by script */ }; wmClass = "jetbrains-pycharm-ce"; update-channel = "PyCharm RELEASE"; @@ -372,12 +372,12 @@ in pycharm-professional = buildPycharm rec { name = "pycharm-professional-${version}"; - version = "2020.2.2"; /* updated by script */ + version = "2020.2.3"; /* updated by script */ description = "PyCharm Professional Edition"; license = stdenv.lib.licenses.unfree; src = fetchurl { url = "https://download.jetbrains.com/python/${name}.tar.gz"; - sha256 = "0v64f5sbv1639d6fjg0shfgdy40f1xc2zbn0jqfrx6xmkg7wgsz9"; /* updated by script */ + sha256 = "0g7bki4bzi3a1w3rlwik2w0ma10xb4g450qxm4fr4fp8dy2xaysc"; /* updated by script */ }; wmClass = "jetbrains-pycharm"; update-channel = "PyCharm RELEASE"; @@ -385,12 +385,12 @@ in rider = buildRider rec { name = "rider-${version}"; - version = "2020.2.3"; /* updated by script */ + version = "2020.2.4"; /* updated by script */ description = "A cross-platform .NET IDE based on the IntelliJ platform and ReSharper"; license = stdenv.lib.licenses.unfree; src = fetchurl { url = "https://download.jetbrains.com/rider/JetBrains.Rider-${version}.tar.gz"; - sha256 = "01namzd29chj975w3awanlzf38hh30cfjzyljqfkp6y3djn0if1r"; /* updated by script */ + sha256 = "1anl48ifv5ayqn876dqckxc1b5fw1271pvamzf1vvk501wv6dpaf"; /* updated by script */ }; wmClass = "jetbrains-rider"; update-channel = "Rider RELEASE"; @@ -398,12 +398,12 @@ in ruby-mine = buildRubyMine rec { name = "ruby-mine-${version}"; - version = "2020.2.2"; /* updated by script */ + version = "2020.2.3"; /* updated by script */ description = "The Most Intelligent Ruby and Rails IDE"; license = stdenv.lib.licenses.unfree; src = fetchurl { url = "https://download.jetbrains.com/ruby/RubyMine-${version}.tar.gz"; - sha256 = "11v26hpf891nq5vj8i0ad4shhzpy8b7rvyrkr3l29dwfnd83lgpz"; /* updated by script */ + sha256 = "03f1z7xhz90j9l8xp3il115yvb15kda0i6ba5ndhby7nf52vnphk"; /* updated by script */ }; wmClass = "jetbrains-rubymine"; update-channel = "RubyMine RELEASE"; @@ -411,12 +411,12 @@ in webstorm = buildWebStorm rec { name = "webstorm-${version}"; - version = "2020.2.2"; /* updated by script */ + version = "2020.2.3"; /* updated by script */ description = "Professional IDE for Web and JavaScript development"; license = stdenv.lib.licenses.unfree; src = fetchurl { url = "https://download.jetbrains.com/webstorm/WebStorm-${version}.tar.gz"; - sha256 = "1w17cf0qj0vyizkzj1frcmi52q5qxbf31msg8df38wy2l8r0b928"; /* updated by script */ + sha256 = "1c60k38ai63s4779fs55vaiswfc6bi7ki6p96hrmmkrnpzgsipg5"; /* updated by script */ }; wmClass = "jetbrains-webstorm"; update-channel = "WebStorm RELEASE"; diff --git a/third_party/nixpkgs/pkgs/applications/graphics/krita/default.nix b/third_party/nixpkgs/pkgs/applications/graphics/krita/default.nix index 95a3e1e092..6ffe7f3c4f 100644 --- a/third_party/nixpkgs/pkgs/applications/graphics/krita/default.nix +++ b/third_party/nixpkgs/pkgs/applications/graphics/krita/default.nix @@ -10,11 +10,11 @@ mkDerivation rec { pname = "krita"; - version = "4.3.0"; + version = "4.4.0"; src = fetchurl { url = "https://download.kde.org/stable/${pname}/${version}/${pname}-${version}.tar.xz"; - sha256 = "19qlpp9ds60bab73pwi64dq1zn4zn2hcdkrxhjr1j438mc4pflsd"; + sha256 = "0ydmxql8iym62q0nqwn9mnb94jz1nh84i6bni0mgzwjk8p4zfzw3"; }; # *somtimes* fails with can't find ui_manager.h, also see https://github.com/NixOS/nixpkgs/issues/35359 diff --git a/third_party/nixpkgs/pkgs/applications/graphics/xournalpp/default.nix b/third_party/nixpkgs/pkgs/applications/graphics/xournalpp/default.nix index ba396bfd92..da453b4267 100644 --- a/third_party/nixpkgs/pkgs/applications/graphics/xournalpp/default.nix +++ b/third_party/nixpkgs/pkgs/applications/graphics/xournalpp/default.nix @@ -22,13 +22,13 @@ stdenv.mkDerivation rec { pname = "xournalpp"; - version = "1.0.18"; + version = "1.0.19"; src = fetchFromGitHub { owner = "xournalpp"; repo = pname; rev = version; - sha256 = "0a9ygbmd4dwgck3k8wsrm2grynqa0adb12wwspzmzvpisbadffjy"; + sha256 = "05nx4cmrka6hwdn7r91yy4h46qpa9k7iy9dkgaq3hrkh9z3fxlkq"; }; nativeBuildInputs = [ cmake gettext pkgconfig wrapGAppsHook ]; @@ -54,8 +54,8 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Xournal++ is a handwriting Notetaking software with PDF annotation support"; - homepage = "https://github.com/xournalpp/xournalpp"; - license = licenses.gpl2; + homepage = "https://xournalpp.github.io/"; + license = licenses.gpl2Plus; maintainers = with maintainers; [ andrew-d sikmir ]; platforms = platforms.linux; }; diff --git a/third_party/nixpkgs/pkgs/applications/misc/barrier/default.nix b/third_party/nixpkgs/pkgs/applications/misc/barrier/default.nix index 28b65d2b58..f08b33f098 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/barrier/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/barrier/default.nix @@ -5,13 +5,14 @@ mkDerivation rec { pname = "barrier"; - version = "2.3.2"; + version = "2.3.3"; src = fetchFromGitHub { owner = "debauchee"; repo = pname; rev = "v${version}"; - sha256 = "1gbg3p7c0vcsdzsjj1ssx6k8xpj3rpyvais12266f0xvnbvihczd"; + sha256 = "11vqkzpcjiv3pq6ps022223j6skgm1d23dj18n4a5nsf53wsvvp4"; + fetchSubmodules = true; }; buildInputs = [ curl xorg.libX11 xorg.libXext xorg.libXtst avahiWithLibdnssdCompat qtbase ]; diff --git a/third_party/nixpkgs/pkgs/applications/misc/birdtray/default.nix b/third_party/nixpkgs/pkgs/applications/misc/birdtray/default.nix index 8eb6a16872..df12d2b9f8 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/birdtray/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/birdtray/default.nix @@ -12,13 +12,13 @@ mkDerivation rec { pname = "birdtray"; - version = "1.8.1"; + version = "1.9.0"; src = fetchFromGitHub { owner = "gyunaev"; repo = pname; - rev = version; - sha256 = "15l8drdmamq1dpqpj0h9ajj2r5vcs23cx421drvhfgs6bqlzd1hl"; + rev = "v${version}"; + sha256 = "1469ng6zk0qx0qfsihrnlz1j9i1wk0hx4vqdaplz9mdpyxvmlryk"; }; patches = [ diff --git a/third_party/nixpkgs/pkgs/applications/misc/blugon/default.nix b/third_party/nixpkgs/pkgs/applications/misc/blugon/default.nix index 896daa27f7..9aa8d3da39 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/blugon/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/blugon/default.nix @@ -13,6 +13,12 @@ stdenv.mkDerivation rec { buildInputs = [ python3 libX11 libXrandr ]; + # Remove at next release + # https://github.com/jumper149/blugon/commit/d262cd05 + postPatch = '' + sed -i 's,CC = gcc,CC ?= gcc,g' backends/scg/Makefile + ''; + makeFlags = [ "PREFIX=$(out)" ]; meta = with stdenv.lib; { diff --git a/third_party/nixpkgs/pkgs/applications/misc/calcurse/default.nix b/third_party/nixpkgs/pkgs/applications/misc/calcurse/default.nix index 9f55975764..a3cad7d9f2 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/calcurse/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/calcurse/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "calcurse"; - version = "4.6.0"; + version = "4.7.0"; src = fetchurl { url = "https://calcurse.org/files/${pname}-${version}.tar.gz"; - sha256 = "0hzhdpkkn75jlymanwzl69hrrf1pw29hrchr11wlxqjpl43h62gs"; + sha256 = "0dc4bka2l9z03bnlygsnl06l1zi2wbn29rkc02b13x2kdab7arpg"; }; buildInputs = [ ncurses gettext python3 python3Packages.wrapPython ]; diff --git a/third_party/nixpkgs/pkgs/applications/misc/copyq/default.nix b/third_party/nixpkgs/pkgs/applications/misc/copyq/default.nix index 7cf89a74e1..de1dacd50c 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/copyq/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/copyq/default.nix @@ -5,13 +5,13 @@ mkDerivation rec { pname = "CopyQ"; - version = "3.12.0"; + version = "3.13.0"; src = fetchFromGitHub { owner = "hluk"; repo = "CopyQ"; rev = "v${version}"; - sha256 = "04jidibf0b80c5vd659pz2wibmggjyyj9yz2bw7j4g84hwraksxb"; + sha256 = "0qssyavx0dkgsyj2myqg8n7sih8niy960nyb1yknsbjm37iqraah"; }; nativeBuildInputs = [ cmake ]; diff --git a/third_party/nixpkgs/pkgs/applications/misc/corectrl/default.nix b/third_party/nixpkgs/pkgs/applications/misc/corectrl/default.nix new file mode 100644 index 0000000000..cee390d064 --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/misc/corectrl/default.nix @@ -0,0 +1,74 @@ +{ stdenv +, fetchFromGitLab +, extra-cmake-modules +, botan2 +, karchive +, kauth +, libdrm +, mesa-demos +, procps +, utillinux +, vulkan-tools +, qtbase +, qtcharts +, qtquickcontrols2 +, qtsvg +, qttools +, qtxmlpatterns +, wrapQtAppsHook +} : + +stdenv.mkDerivation rec{ + pname = "corectrl"; + version = "1.1.1"; + + src = fetchFromGitLab { + owner = "corectrl"; + repo = "corectrl"; + rev = "v${version}"; + sha256 = "sha256-YQDrxPqCa3OzNKd3UiAffqqvOrgbXmDFJGjYPetolyY="; + }; + + nativeBuildInputs = [ + extra-cmake-modules + wrapQtAppsHook + ]; + buildInputs = [ + botan2 + karchive + kauth + libdrm + mesa-demos + procps + utillinux + vulkan-tools + qtbase + qtcharts + qtquickcontrols2 + qtsvg + qttools + qtxmlpatterns + ]; + + runtimeDeps = [ mesa-demos vulkan-tools ]; + binPath = stdenv.lib.makeBinPath runtimeDeps; + + dontWrapQtApps = true; + + postInstall = '' + wrapQtApp $out/bin/corectrl --prefix PATH ":" ${binPath} + ''; + + meta = with stdenv.lib; { + homepage = "https://gitlab.com/corectrl/corectrl/"; + description = "Control your computer hardware via application profiles"; + longDescription = '' + CoreCtrl is a Free and Open Source GNU/Linux application that allows you + to control with ease your computer hardware using application profiles. It + aims to be flexible, comfortable and accessible to regular users. + ''; + license = licenses.gpl3Plus; + platforms = platforms.linux; + }; +} +# TODO: report upstream that libdrm is not detected at configure time diff --git a/third_party/nixpkgs/pkgs/applications/misc/dbeaver/default.nix b/third_party/nixpkgs/pkgs/applications/misc/dbeaver/default.nix index c5cd4fa6c7..547a605668 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/dbeaver/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/dbeaver/default.nix @@ -7,7 +7,7 @@ stdenv.mkDerivation rec { pname = "dbeaver-ce"; - version = "7.2.2"; + version = "7.2.3"; desktopItem = makeDesktopItem { name = "dbeaver"; @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "https://dbeaver.io/files/${version}/dbeaver-ce-${version}-linux.gtk.x86_64.tar.gz"; - sha256 = "08dm10smmzrpsc4vc5p3p6fbkg6a5r1sgmbdgr2ihkbk28gylfh0"; + sha256 = "sha256-XYAe+e9zK/fvxBJ2Caz9/95++JzIQykXj8953IocDZU="; }; installPhase = '' diff --git a/third_party/nixpkgs/pkgs/applications/misc/dstask/default.nix b/third_party/nixpkgs/pkgs/applications/misc/dstask/default.nix index d5c02f6955..c9b3e2dd89 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/dstask/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/dstask/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "dstask"; - version = "0.21"; + version = "0.22"; src = fetchFromGitHub { owner = "naggie"; repo = pname; rev = "v${version}"; - sha256 = "0af85rs4s0wfnibdhn28qycvy90aafkczccs5vyh36y7cnyhvgkl"; + sha256 = "0vwkar827ncwmva091q37gq8fvs9jz1765zdxrcvhczlj5a0qdgi"; }; # Set vendorSha256 to null because dstask vendors its dependencies (meaning diff --git a/third_party/nixpkgs/pkgs/applications/misc/heimer/default.nix b/third_party/nixpkgs/pkgs/applications/misc/heimer/default.nix index 19034c1dc7..2a443303e2 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/heimer/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/heimer/default.nix @@ -2,13 +2,13 @@ mkDerivation rec { pname = "heimer"; - version = "1.19.0"; + version = "1.20.0"; src = fetchFromGitHub { owner = "juzzlin"; repo = pname; rev = version; - sha256 = "18paabqfxz49fahdi4fs5z870aynmyfj3xw8q768qffgc26zhl3m"; + sha256 = "01pgmwq539a0z7xsgx60vz6hmnr0c72xp6apx75qkvjsqbwmzhjh"; }; nativeBuildInputs = [ cmake ]; diff --git a/third_party/nixpkgs/pkgs/applications/misc/j4-dmenu-desktop/default.nix b/third_party/nixpkgs/pkgs/applications/misc/j4-dmenu-desktop/default.nix index c20fa4ed9d..2b1b093fd3 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/j4-dmenu-desktop/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/j4-dmenu-desktop/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "j4-dmenu-desktop"; - version = "2.17"; + version = "2.18"; src = fetchFromGitHub { owner = "enkore"; repo = pname; rev = "r${version}"; - sha256 = "0v23fimkn83dcm5p53y2ymhklff3kwppxhf75sm8xmswrzkixpgc"; + sha256 = "1gxpgifzy0hnpd0ymw3r32amzr32z3bgb90ldjzl438p6h1q0i26"; }; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/applications/misc/kanboard/default.nix b/third_party/nixpkgs/pkgs/applications/misc/kanboard/default.nix index 4f84420330..ebe31b10c6 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/kanboard/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/kanboard/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "kanboard"; - version = "1.2.15"; + version = "1.2.16"; src = fetchFromGitHub { owner = "kanboard"; repo = "kanboard"; rev = "v${version}"; - sha256 = "0lib2qlc8a59i9dak0g1j5hymwbq9vhflp5srhcjislxypfvrizs"; + sha256 = "1nps7xcw1gp7kfdp13wyj2sprc8hn5iamdb0xj4202qygpzm63wq"; }; dontBuild = true; diff --git a/third_party/nixpkgs/pkgs/applications/misc/kdeconnect/default.nix b/third_party/nixpkgs/pkgs/applications/misc/kdeconnect/default.nix index 31e919e377..d042f011bb 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/kdeconnect/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/kdeconnect/default.nix @@ -28,11 +28,11 @@ mkDerivation rec { pname = "kdeconnect"; - version = "20.08.1"; + version = "20.08.2"; src = fetchurl { url = "https://download.kde.org/stable/release-service/${version}/src/${pname}-kde-${version}.tar.xz"; - sha256 = "0s76djgpx08jfmh99c7kx18mnr3w7bv4hdra120nicq89mmy7gwf"; + sha256 = "0rzfnkgkv759d4pa16qk0sw87wqzwgkd99yzrzfy2zcq423f6hvd"; }; patches = [ diff --git a/third_party/nixpkgs/pkgs/applications/misc/keepassx/community.nix b/third_party/nixpkgs/pkgs/applications/misc/keepassx/community.nix index f0131712b2..f718ab4d80 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/keepassx/community.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/keepassx/community.nix @@ -40,13 +40,13 @@ with stdenv.lib; stdenv.mkDerivation rec { pname = "keepassxc"; - version = "2.6.1"; + version = "2.6.2"; src = fetchFromGitHub { owner = "keepassxreboot"; repo = "keepassxc"; rev = version; - sha256 = "0wgn0glmcxaa670bpxh7n7abjlxcx4h1rl1169cmah0ddxnxnxpq"; + sha256 = "032dzywvwpclhsl3n1pq2m9gyxqpg0gkci6axbvbs7bn82wznc4h"; }; NIX_CFLAGS_COMPILE = stdenv.lib.optionalString stdenv.cc.isClang [ diff --git a/third_party/nixpkgs/pkgs/applications/misc/mediainfo-gui/default.nix b/third_party/nixpkgs/pkgs/applications/misc/mediainfo-gui/default.nix index 96833bb25d..b3e23f2245 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/mediainfo-gui/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/mediainfo-gui/default.nix @@ -2,11 +2,11 @@ , desktop-file-utils, libSM, imagemagick }: stdenv.mkDerivation rec { - version = "20.08"; + version = "20.09"; pname = "mediainfo-gui"; src = fetchurl { url = "https://mediaarea.net/download/source/mediainfo/${version}/mediainfo_${version}.tar.xz"; - sha256 = "1baf2dj5s3g1x4ssqli1b2r1203syk42m09zhp36qcinmfixv11l"; + sha256 = "0rqg9z7s5bk7vlvjrs4gackzg7ib05a0dffi2ihsjf5a7kw7wcir"; }; nativeBuildInputs = [ autoreconfHook pkgconfig ]; diff --git a/third_party/nixpkgs/pkgs/applications/misc/mediainfo/default.nix b/third_party/nixpkgs/pkgs/applications/misc/mediainfo/default.nix index 09f20a9ba5..0fd3826f4e 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/mediainfo/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/mediainfo/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, autoreconfHook, pkgconfig, libzen, libmediainfo, zlib }: stdenv.mkDerivation rec { - version = "20.08"; + version = "20.09"; pname = "mediainfo"; src = fetchurl { url = "https://mediaarea.net/download/source/mediainfo/${version}/mediainfo_${version}.tar.xz"; - sha256 = "1baf2dj5s3g1x4ssqli1b2r1203syk42m09zhp36qcinmfixv11l"; + sha256 = "0rqg9z7s5bk7vlvjrs4gackzg7ib05a0dffi2ihsjf5a7kw7wcir"; }; nativeBuildInputs = [ autoreconfHook pkgconfig ]; diff --git a/third_party/nixpkgs/pkgs/applications/misc/nwg-launchers/default.nix b/third_party/nixpkgs/pkgs/applications/misc/nwg-launchers/default.nix index fc8cf3ee02..d14d4d43e8 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/nwg-launchers/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/nwg-launchers/default.nix @@ -12,13 +12,13 @@ stdenv.mkDerivation rec { pname = "nwg-launchers"; - version = "0.3.3"; + version = "0.4.0"; src = fetchFromGitHub { owner = "nwg-piotr"; repo = pname; rev = "v${version}"; - sha256 = "1p1bwsn7l4vp7y183735pgsfbh7dssdfn0wjzacl4s87arjdcgvb"; + sha256 = "0r0wj4w3jj3l56z1lx6ypkzz4fsgx4vzqbvs95661l8q362pndzw"; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/applications/misc/obsidian/default.nix b/third_party/nixpkgs/pkgs/applications/misc/obsidian/default.nix index 4e53657a74..0f929439e4 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/obsidian/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/obsidian/default.nix @@ -30,12 +30,12 @@ let in stdenv.mkDerivation rec { pname = "obsidian"; - version = "0.9.1"; + version = "0.9.4"; src = fetchurl { url = "https://github.com/obsidianmd/obsidian-releases/releases/download/v${version}/obsidian-${version}.asar.gz"; - sha256 = "1skilcqfawvvyj9dnacsmlls55cqq6a4hzz9is165cwkyab185c5"; + sha256 = "0qahgm9gf4sap28wy7cxbf41h8zldplbwxnv8shyajbkxn108g5p"; }; nativeBuildInputs = [ makeWrapper graphicsmagick ]; diff --git a/third_party/nixpkgs/pkgs/applications/misc/opentx/default.nix b/third_party/nixpkgs/pkgs/applications/misc/opentx/default.nix index a117ecc06a..6bdcd0da1f 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/opentx/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/opentx/default.nix @@ -6,13 +6,13 @@ mkDerivation rec { pname = "opentx"; - version = "2.3.9"; + version = "2.3.10"; src = fetchFromGitHub { owner = "opentx"; repo = "opentx"; rev = "release/${version}"; - sha256 = "0kh3jdy1pgvns8lrncf61ayaq0hmsv41j8xv4r4rf17zyvjl0qph"; + sha256 = "1pp3k1802gl1rji98clv17wj0619dliq821mpi4446lk22q692yq"; }; enableParallelBuilding = true; diff --git a/third_party/nixpkgs/pkgs/applications/misc/polar-bookshelf/default.nix b/third_party/nixpkgs/pkgs/applications/misc/polar-bookshelf/default.nix index fc86b2e885..cd309797aa 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/polar-bookshelf/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/polar-bookshelf/default.nix @@ -1,29 +1,29 @@ { stdenv, lib, makeWrapper, fetchurl , dpkg, wrapGAppsHook, autoPatchelfHook -, gtk3, cairo, gnome2, atk, gdk-pixbuf, glib +, gtk3, cairo, pango, atk, gdk-pixbuf, glib , at-spi2-atk, dbus, libX11, libxcb, libXi , libXcursor, libXdamage, libXrandr, libXcomposite , libXext, libXfixes, libXrender, libXtst, libXScrnSaver , nss, nspr, alsaLib, cups, fontconfig, expat -, libudev0-shim, glibc, curl, openssl, libnghttp2, gnome3 }: +, libudev0-shim, glibc, curl, openssl, libnghttp2, gsettings-desktop-schemas }: stdenv.mkDerivation rec { pname = "polar-bookshelf"; - version = "1.13.10"; + version = "2.0.42"; # fetching a .deb because there's no easy way to package this Electron app src = fetchurl { - url = "https://github.com/burtonator/polar-bookshelf/releases/download/v${version}/polar-bookshelf-${version}-amd64.deb"; - sha256 = "1bxcyf6n2m5x1z8ic6kzskinyyc6lh6nj0bycbwc524n6ms5j99p"; + url = "https://github.com/burtonator/polar-bookshelf/releases/download/v${version}/polar-desktop-app-${version}-amd64.deb"; + hash = "sha256-JyO71wyE6b0iHAYs/6/WbG+OdUVUUPpJla+ZUzg0Gng="; }; buildInputs = [ - gnome3.gsettings_desktop_schemas + gsettings-desktop-schemas glib gtk3 cairo - gnome2.pango + pango atk gdk-pixbuf at-spi2-atk @@ -64,16 +64,15 @@ stdenv.mkDerivation rec { mkdir -p $out/bin mkdir -p $out/lib - mv opt/Polar\ Bookshelf/* $out/share/polar-bookshelf + mv opt/Polar/* $out/share/polar-bookshelf mv $out/share/polar-bookshelf/*.so $out/lib mv usr/share/* $out/share/ - ln -s $out/share/polar-bookshelf/polar-bookshelf $out/bin/polar-bookshelf + ln -s $out/share/polar-bookshelf/polar-desktop-app $out/bin/polar-desktop-app - # Correct desktop file `Exec` - substituteInPlace $out/share/applications/polar-bookshelf.desktop \ - --replace "/opt/Polar Bookshelf/polar-bookshelf" "$out/bin/polar-bookshelf" + substituteInPlace $out/share/applications/polar-desktop-app.desktop \ + --replace "/opt/Polar/polar-desktop-app" "$out/bin/polar-desktop-app" ''; preFixup = '' diff --git a/third_party/nixpkgs/pkgs/applications/misc/prusa-slicer/super-slicer.nix b/third_party/nixpkgs/pkgs/applications/misc/prusa-slicer/super-slicer.nix index da8cea8ab0..1e8f9fc995 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/prusa-slicer/super-slicer.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/prusa-slicer/super-slicer.nix @@ -3,7 +3,7 @@ }: let appname = "SuperSlicer"; - version = "2.2.54.0"; + version = "2.2.54.1"; pname = "super-slicer"; description = "PrusaSlicer fork with more features and faster development cycle"; override = super: { @@ -12,7 +12,7 @@ let src = fetchFromGitHub { owner = "supermerill"; repo = "SuperSlicer"; - sha256 = "sha256-vvuUecysSdBvGBKOariQnsGJ9/Qccwp/lSq8WCED+Uk="; + sha256 = "sha256-0NWrck9nqAlc8xX3nTrRlnzjso4MRRjJSW7bUvCX6Y4="; rev = version; }; diff --git a/third_party/nixpkgs/pkgs/applications/misc/razergenie/default.nix b/third_party/nixpkgs/pkgs/applications/misc/razergenie/default.nix index 9042ab38e7..ac0f373dc9 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/razergenie/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/razergenie/default.nix @@ -27,8 +27,8 @@ in stdenv.mkDerivation { ]; mesonFlags = [ - "-Denable_experimental=${if enableExperimental then "true" else "false"}" - "-Dinclude_matrix_discovery=${if includeMatrixDiscovery then "true" else "false"}" + "-Denable_experimental=${lib.boolToString enableExperimental}" + "-Dinclude_matrix_discovery=${lib.boolToString includeMatrixDiscovery}" ]; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/applications/misc/xmrig/proxy.nix b/third_party/nixpkgs/pkgs/applications/misc/xmrig/proxy.nix index 39cd502040..a166ca3b50 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/xmrig/proxy.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/xmrig/proxy.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { pname = "xmrig-proxy"; - version = "5.11.0"; + version = "6.3.0"; src = fetchFromGitHub { owner = "xmrig"; repo = "xmrig-proxy"; rev = "v${version}"; - sha256 = "0wwvsmanvcn0kbb5zqrj8786yg9rmdbink6rsnsm7ifak1iwvls9"; + sha256 = "1jh527bcl74018jd0qi32y4pcgmnbm21dyfhj4kg0j0ip15mx9j6"; }; nativeBuildInputs = [ cmake ]; diff --git a/third_party/nixpkgs/pkgs/applications/networking/browsers/amfora/default.nix b/third_party/nixpkgs/pkgs/applications/networking/browsers/amfora/default.nix index 2772cb6d98..eaea5f12b8 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/browsers/amfora/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/browsers/amfora/default.nix @@ -13,6 +13,11 @@ buildGoModule rec { vendorSha256 = "10f3bh3r3jc1185r8r1ihg8rprdpl8qwg5b6wqwsda96ydkbpi2b"; + postInstall = '' + sed -i "s:amfora:$out/bin/amfora:" amfora.desktop + install -Dm644 amfora.desktop -t $out/share/applications + ''; + doCheck = false; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/applications/networking/browsers/brave/default.nix b/third_party/nixpkgs/pkgs/applications/networking/browsers/brave/default.nix index ceceffb8da..fc4b5521b0 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/browsers/brave/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/browsers/brave/default.nix @@ -86,11 +86,11 @@ in stdenv.mkDerivation rec { pname = "brave"; - version = "1.12.112"; + version = "1.15.76"; src = fetchurl { url = "https://github.com/brave/brave-browser/releases/download/v${version}/brave-browser_${version}_amd64.deb"; - sha256 = "0nvxmz1wrr6cfyhbnrfjsy9szbjmvjl6080pgkp25xa8rcql5gmb"; + sha256 = "3b054584c2272a9eeb9029f754cabaf4804db295fd0e6b84ead680b08af38d48"; }; dontConfigure = true; diff --git a/third_party/nixpkgs/pkgs/applications/networking/browsers/chromium/README.md b/third_party/nixpkgs/pkgs/applications/networking/browsers/chromium/README.md new file mode 100644 index 0000000000..5b7c9fe550 --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/networking/browsers/chromium/README.md @@ -0,0 +1,66 @@ +# Maintainers + +- TODO: We need more maintainers: + - https://github.com/NixOS/nixpkgs/issues/78450 + - If you just want to help out without becoming a maintainer: + - Look for open Nixpkgs issues or PRs related to Chromium + - Make your own PRs (but please try to make reviews as easy as possible) +- Primary maintainer (responsible for updating Chromium): @primeos +- Testers (test all stable channel updates) + - `nixos-unstable`: + - `x86_64`: @danielfullmer + - `aarch64`: @thefloweringash + - Stable channel: + - `x86_64`: @Frostman +- Other relevant packages: + - `chromiumBeta` and `chromiumDev`: For testing purposes (not build on Hydra) + - `google-chrome`, `google-chrome-beta`, `google-chrome-dev`: Updated via + Chromium's `upstream-info.json` + - `ungoogled-chromium`: Based on `chromium` (the expressions are regularly + copied over and patched accordingly) + +# Upstream links + +- Source code: https://source.chromium.org/chromium/chromium/src +- Bugs: https://bugs.chromium.org/p/chromium/issues/list +- Release updates: https://chromereleases.googleblog.com/ + - Available as Atom or RSS feed (filter for + "Stable Channel Update for Desktop") + - Channel overview: https://omahaproxy.appspot.com/ + - Release schedule: https://chromiumdash.appspot.com/schedule + +# Updating Chromium + +Simply run `./pkgs/applications/networking/browsers/chromium/update.py` to +update `upstream-info.json`. After updates it is important to test at least +`nixosTests.chromium` (or basic manual testing) and `google-chrome` (which +reuses `upstream-info.json`). + +## Backports + +All updates are considered security critical and should be ported to the stable +channel ASAP. When there is a new stable release the old one should receive +security updates for roughly one month. After that it is important to mark +Chromium as insecure (see 69e4ae56c4b for an example; it is important that the +tested job still succeeds and that all browsers that use `upstream-info.json` +are marked as insecure). + +## Major version updates + +Unfortunately, Chromium regularly breaks on major updates and might need +various patches. Either due to issues with the Nix build sandbox (e.g. we cannot +fetch dependencies via the network and do not use standard FHS paths) or due to +missing upstream fixes that need to be backported. + +Good sources for such patches and other hints: +- https://github.com/archlinux/svntogit-packages/tree/packages/chromium/trunk +- https://gitweb.gentoo.org/repo/gentoo.git/tree/www-client/chromium +- https://src.fedoraproject.org/rpms/chromium/tree/master + +If the build fails immediately due to unknown compiler flags this usually means +that a new major release of LLVM is required. + +## Beta and Dev channels + +Those channels are only used to test and fix builds in advance. They may be +broken at times and must not delay stable channel updates. diff --git a/third_party/nixpkgs/pkgs/applications/networking/browsers/chromium/browser.nix b/third_party/nixpkgs/pkgs/applications/networking/browsers/chromium/browser.nix index 3d87325984..c44968a412 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/browsers/chromium/browser.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/browsers/chromium/browser.nix @@ -77,18 +77,11 @@ mkChromiumDerivation (base: rec { of source code for Google Chrome (which has some additional features). ''; homepage = "https://www.chromium.org/"; - maintainers = with maintainers; [ bendlas thefloweringash primeos ]; - # Overview of the maintainer roles: - # nixos-unstable: - # - TODO: Need a new maintainer for x86_64 [0] - # - @thefloweringash: aarch64 - # - @primeos: Provisional maintainer (x86_64) - # Stable channel: - # - TODO (need someone to test backports [0]) - # [0]: https://github.com/NixOS/nixpkgs/issues/78450 + maintainers = with maintainers; [ primeos thefloweringash bendlas ]; # See README.md license = if enableWideVine then licenses.unfree else licenses.bsd3; platforms = platforms.linux; hydraPlatforms = if channel == "stable" then ["aarch64-linux" "x86_64-linux"] else []; - timeout = 172800; # 48 hours + timeout = 172800; # 48 hours (increased from the Hydra default of 10h) + broken = channel == "dev"; # Blocked on https://bugs.chromium.org/p/chromium/issues/detail?id=1141896 }; }) diff --git a/third_party/nixpkgs/pkgs/applications/networking/browsers/chromium/common.nix b/third_party/nixpkgs/pkgs/applications/networking/browsers/chromium/common.nix index 4341a41914..60aca90a95 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/browsers/chromium/common.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/browsers/chromium/common.nix @@ -5,7 +5,7 @@ , libevent, expat, libjpeg, snappy , libpng, libcap , xdg_utils, yasm, nasm, minizip, libwebp -, libusb1, pciutils, nss, re2, zlib +, libusb1, pciutils, nss, re2 , python2Packages, perl, pkgconfig , nspr, systemd, kerberos @@ -46,8 +46,6 @@ buildFun: with stdenv.lib; -# see http://www.linuxfromscratch.org/blfs/view/cvs/xsoft/chromium.html - let jre = jre8; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731 @@ -63,7 +61,7 @@ let mkGnFlags = let # Serialize Nix types into GN types according to this document: - # https://chromium.googlesource.com/chromium/src/+/master/tools/gn/docs/language.md + # https://source.chromium.org/gn/gn/+/master:docs/language.md mkGnString = value: "\"${escape ["\"" "$" "\\"] value}\""; sanitize = value: if value == true then "true" @@ -75,6 +73,7 @@ let toFlag = key: value: "${key}=${sanitize value}"; in attrs: concatStringsSep " " (attrValues (mapAttrs toFlag attrs)); + # https://source.chromium.org/chromium/chromium/src/+/master:build/linux/unbundle/replace_gn_files.py gnSystemLibraries = [ "ffmpeg" "flac" @@ -85,9 +84,6 @@ let "opus" "snappy" "zlib" - # "re2" # fails with linker errors - # "harfbuzz-ng" # in versions over 63 harfbuzz and freetype are being built together - # so we can't build with one from system and other from source ]; opusWithCustomModes = libopus.override { @@ -99,11 +95,9 @@ let libevent expat libjpeg snappy libpng libcap xdg_utils minizip libwebp - libusb1 re2 zlib + libusb1 re2 ffmpeg libxslt libxml2 nasm - # harfbuzz # in versions over 63 harfbuzz and freetype are being built together - # so we can't build with one from system and other from source ]; # build paths and release info @@ -132,6 +126,7 @@ let }; nativeBuildInputs = [ + llvmPackages.lldClang.bintools ninja which python2Packages.python perl pkgconfig python2Packages.ply python2Packages.jinja2 nodejs gnutar python2Packages.setuptools @@ -154,28 +149,33 @@ let ++ optionals useOzone [ libdrm wayland mesa_drivers libxkbcommon ]; patches = [ - ./patches/no-build-timestamps.patch - ./patches/widevine-79.patch - # Unfortunately, chromium regularly breaks on major updates and - # then needs various patches backported in order to be compiled with GCC. - # Good sources for such patches and other hints: - # - https://gitweb.gentoo.org/repo/gentoo.git/plain/www-client/chromium/ - # - https://git.archlinux.org/svntogit/packages.git/tree/trunk?h=packages/chromium - # - https://github.com/chromium/chromium/search?q=GCC&s=committer-date&type=Commits - # - # ++ optionals (channel == "dev") [ ( githubPatch "" "0000000000000000000000000000000000000000000000000000000000000000" ) ] + ./patches/no-build-timestamps.patch # Optional patch to use SOURCE_DATE_EPOCH in compute_build_timestamp.py (should be upstreamed) + ./patches/widevine-79.patch # For bundling Widevine (DRM), might be replaceable via bundle_widevine_cdm=true in gnFlags # ++ optional (versionRange "68" "72") ( githubPatch "" "0000000000000000000000000000000000000000000000000000000000000000" ) - ] ++ optionals (useVaapi) [ + ] ++ optionals (useVaapi && versionRange "86" "87") [ # Check for enable-accelerated-video-decode on Linux: (githubPatch "54deb9811ca9bd2327def5c05ba6987b8c7a0897" "11jvxjlkzz1hm0pvfyr88j7z3zbwzplyl5idkx92l2lzv4459c8d") ]; postPatch = '' + # remove unused third-party + for lib in ${toString gnSystemLibraries}; do + if [ -d "third_party/$lib" ]; then + find "third_party/$lib" -type f \ + \! -path "third_party/$lib/chromium/*" \ + \! -path "third_party/$lib/google/*" \ + \! -path "third_party/harfbuzz-ng/utils/hb_scoped.h" \ + \! -regex '.*\.\(gn\|gni\|isolate\)' \ + -delete + fi + done + # Required for patchShebangs (unsupported interpreter directive, basename: invalid option -- '*', etc.): - substituteInPlace native_client/SConstruct \ - --replace "#! -*- python -*-" "" - substituteInPlace third_party/harfbuzz-ng/src/src/update-unicode-tables.make \ - --replace "/usr/bin/env -S make -f" "/usr/bin/make -f" + substituteInPlace native_client/SConstruct --replace "#! -*- python -*-" "" + if [ -e third_party/harfbuzz-ng/src/src/update-unicode-tables.make ]; then + substituteInPlace third_party/harfbuzz-ng/src/src/update-unicode-tables.make \ + --replace "/usr/bin/env -S make -f" "/usr/bin/make -f" + fi # We want to be able to specify where the sandbox is via CHROME_DEVEL_SANDBOX substituteInPlace sandbox/linux/suid/client/setuid_sandbox_host.cc \ @@ -203,48 +203,26 @@ let sed -i -e '/libpci_loader.*Load/s!"\(libpci\.so\)!"${pciutils}/lib/\1!' \ gpu/config/gpu_info_collector_linux.cc - sed -i -re 's/([^:])\<(isnan *\()/\1std::\2/g' \ - chrome/browser/ui/webui/engagement/site_engagement_ui.cc - - sed -i -e '/#include/ { - i #include - :l; n; bl - }' gpu/config/gpu_control_list.cc - # Allow to put extensions into the system-path. sed -i -e 's,/usr,/run/current-system/sw,' chrome/common/chrome_paths.cc patchShebangs . # use our own nodejs mkdir -p third_party/node/linux/node-linux-x64/bin - ln -s $(which node) third_party/node/linux/node-linux-x64/bin/node + ln -s "$(command -v node)" third_party/node/linux/node-linux-x64/bin/node + + # Allow building against system libraries in official builds + sed -i 's/OFFICIAL_BUILD/GOOGLE_CHROME_BUILD/' tools/generate_shim_headers/generate_shim_headers.py - # remove unused third-party - # in third_party/crashpad third_party/zlib contains just a header-adapter - for lib in ${toString gnSystemLibraries}; do - find -type f -path "*third_party/$lib/*" \ - \! -path "*third_party/crashpad/crashpad/third_party/zlib/*" \ - \! -path "*third_party/$lib/chromium/*" \ - \! -path "*third_party/$lib/google/*" \ - \! -path "*base/third_party/icu/*" \ - \! -path "*base/third_party/libevent/*" \ - \! -regex '.*\.\(gn\|gni\|isolate\|py\)' \ - -delete - done '' + optionalString stdenv.isAarch64 '' substituteInPlace build/toolchain/linux/BUILD.gn \ --replace 'toolprefix = "aarch64-linux-gnu-"' 'toolprefix = ""' - '' + optionalString stdenv.cc.isClang '' - mkdir -p third_party/llvm-build/Release+Asserts/bin - ln -s ${stdenv.cc}/bin/clang third_party/llvm-build/Release+Asserts/bin/clang - ln -s ${stdenv.cc}/bin/clang++ third_party/llvm-build/Release+Asserts/bin/clang++ - ln -s ${llvmPackages.llvm}/bin/llvm-ar third_party/llvm-build/Release+Asserts/bin/llvm-ar ''; gnFlags = mkGnFlags ({ - use_lld = false; - use_gold = stdenv.buildPlatform.is64bit; # ld.gold outs-of-memory on i686 - gold_path = "${stdenv.cc}/bin"; + custom_toolchain = "//build/toolchain/linux/unbundle:default"; + host_toolchain = "//build/toolchain/linux/unbundle:default"; + is_official_build = true; is_debug = false; proprietary_codecs = false; @@ -303,8 +281,7 @@ let # This is to ensure expansion of $out. libExecPath="${libExecPath}" - python build/linux/unbundle/replace_gn_files.py \ - --system-libraries ${toString gnSystemLibraries} + python build/linux/unbundle/replace_gn_files.py --system-libraries ${toString gnSystemLibraries} ${gnChromium}/bin/gn gen --args=${escapeShellArg gnFlags} out/Release | tee gn-gen-outputs.txt # Fail if `gn gen` contains a WARNING. diff --git a/third_party/nixpkgs/pkgs/applications/networking/browsers/chromium/default.nix b/third_party/nixpkgs/pkgs/applications/networking/browsers/chromium/default.nix index e4bde51222..43e4717f82 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/browsers/chromium/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/browsers/chromium/default.nix @@ -47,6 +47,7 @@ let }); } // lib.optionalAttrs (lib.versionAtLeast upstream-info.version "87") { useOzone = true; # YAY: https://chromium-review.googlesource.com/c/chromium/src/+/2382834 \o/ + useVaapi = !stdenv.isAarch64; # TODO: Might be best to not set use_vaapi anymore (default is fine) gnChromium = gn.overrideAttrs (oldAttrs: { version = "2020-08-17"; src = fetchgit { diff --git a/third_party/nixpkgs/pkgs/applications/networking/browsers/chromium/upstream-info.json b/third_party/nixpkgs/pkgs/applications/networking/browsers/chromium/upstream-info.json index 7523a6653f..5fded39c74 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/browsers/chromium/upstream-info.json +++ b/third_party/nixpkgs/pkgs/applications/networking/browsers/chromium/upstream-info.json @@ -1,17 +1,17 @@ { "stable": { - "version": "86.0.4240.75", - "sha256": "1ddw4p9zfdzhi5hrd8x14k4w326znljzprnpfi2f917rlpnl2ynx", - "sha256bin64": "17isxkd80rccqim6izzl08vw4yr52qsk6djp1rmhhijzg9rsvghz" + "version": "86.0.4240.111", + "sha256": "05y7lwr89awkhvgmwkx3br9j4ap2aypg2wsc0nz8mi7kxc1dnyzj", + "sha256bin64": "10aqiiydw4i3jxnw8xxdgkgcqbfqc67n1fbrg40y54kg0v5dz8l6" }, "beta": { - "version": "87.0.4280.20", - "sha256": "1lqdxy6pm72h8ym5ij713rp055csqn19agy3sp6wnmp3pj688ic8", - "sha256bin64": "0r9wk2kgn7z0jjzpppr799jp5izxvh1ig4mv12iadz4y7dl47kaw" + "version": "87.0.4280.27", + "sha256": "0w0asxj7jlsw69cssfia8km4q9cx1c2mliks2rmhf4jk0hsghasm", + "sha256bin64": "1lsx4mhy8nachfb8c9f3mrx5nqw2bi046dqirb4lnv7y80jjjs1k" }, "dev": { - "version": "88.0.4292.2", - "sha256": "0b8ihgbvdqpbcgw9p9sak8nz599pah94jmysqigs4phl9slvir5d", - "sha256bin64": "13bx19r56m2r1yjy3b84phv96kkckf87n88kpscf867lgwbrc4fc" + "version": "88.0.4298.4", + "sha256": "0ka11gmpkyrmifajaxm66c16hrj3xakdvhjqg04slyp2sv0nlhrl", + "sha256bin64": "0768y31jqbl1znp7yp6mvl5j12xl1nwjkh2l8zdga81q0wz52hh6" } } diff --git a/third_party/nixpkgs/pkgs/applications/networking/browsers/firefox-bin/mozilla.asc b/third_party/nixpkgs/pkgs/applications/networking/browsers/firefox-bin/mozilla.asc new file mode 100644 index 0000000000..dc58eb8d56 Binary files /dev/null and b/third_party/nixpkgs/pkgs/applications/networking/browsers/firefox-bin/mozilla.asc differ diff --git a/third_party/nixpkgs/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix b/third_party/nixpkgs/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix index 57d1b54937..0ae220a75f 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix @@ -1,965 +1,965 @@ { - version = "81.0.2"; + version = "82.0"; sources = [ - { url = "http://archive.mozilla.org/pub/firefox/releases/81.0.2/linux-x86_64/ach/firefox-81.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/82.0/linux-x86_64/ach/firefox-82.0.tar.bz2"; locale = "ach"; arch = "linux-x86_64"; - sha256 = "2027512d879c1606c68adc4705936273ae7416125e0da24e31fb6381884c8bc3"; + sha256 = "beebf265e84b2bd961dcedaf82ed0cb6b89ef9ea37a0ec7ce1e6abfb78c44b23"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/81.0.2/linux-x86_64/af/firefox-81.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/82.0/linux-x86_64/af/firefox-82.0.tar.bz2"; locale = "af"; arch = "linux-x86_64"; - sha256 = "17afbd113ef486b0d584cdf40dfa602a0a489e6674e9e326b311f8adc0537951"; + sha256 = "c58bc5dab361ccc70a94268e1dcb444524145ab9f53a6aa3b186dd806ac111bf"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/81.0.2/linux-x86_64/an/firefox-81.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/82.0/linux-x86_64/an/firefox-82.0.tar.bz2"; locale = "an"; arch = "linux-x86_64"; - sha256 = "d3d6217063881911fb42aaceae4faf51c0a7d5fdad1c79c97238bb05a1498d25"; + sha256 = "75092675363111128ab808211747276c2cadae6a4ea5c8b28807acebb73cf733"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/81.0.2/linux-x86_64/ar/firefox-81.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/82.0/linux-x86_64/ar/firefox-82.0.tar.bz2"; locale = "ar"; arch = "linux-x86_64"; - sha256 = "d47411a35c37b4ade51e83b5e222b6b8e776fc1b7c4be025310a8fc34ce9c357"; + sha256 = "52adca504f18d6adfb02f346622a5b2b7e417cd6f243c566b79a01014efca53f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/81.0.2/linux-x86_64/ast/firefox-81.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/82.0/linux-x86_64/ast/firefox-82.0.tar.bz2"; locale = "ast"; arch = "linux-x86_64"; - sha256 = "43ab6cc595bdb0d821c0a94c5e7d099f7be598c98dc96b1a3b5df5e7403ef7a3"; + sha256 = "fa4133422e8d1969c111e7d066f51710f3b53b7e5e3a88de5dd84b8e6faaea89"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/81.0.2/linux-x86_64/az/firefox-81.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/82.0/linux-x86_64/az/firefox-82.0.tar.bz2"; locale = "az"; arch = "linux-x86_64"; - sha256 = "b326bf5956c540bbfd6e03498cde99462b04a5833b56b9246fdfa48b49737056"; + sha256 = "0adc103451ac0d6671f62f3e1940d8d1fb5a6ed2544d015de9a02d75ffaca02c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/81.0.2/linux-x86_64/be/firefox-81.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/82.0/linux-x86_64/be/firefox-82.0.tar.bz2"; locale = "be"; arch = "linux-x86_64"; - sha256 = "6bcb3e79504c685a440768eae2b07cdd5c6bae488c272e5990229ad942eb56dc"; + sha256 = "df27f72cc733bac439ed3dba89443286dfb2ca3af4efa33db161964c84293223"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/81.0.2/linux-x86_64/bg/firefox-81.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/82.0/linux-x86_64/bg/firefox-82.0.tar.bz2"; locale = "bg"; arch = "linux-x86_64"; - sha256 = "9182efef254942eb23ed1d5eb18babd6ea10f3c7998307e4f86847bce6141088"; + sha256 = "34190a84296246c3aa159067a9d575be628963c5c2e193512b8754524fa94503"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/81.0.2/linux-x86_64/bn/firefox-81.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/82.0/linux-x86_64/bn/firefox-82.0.tar.bz2"; locale = "bn"; arch = "linux-x86_64"; - sha256 = "a1619499d5d994dfc23af432a68722230a7342a06af35fa1af14ac441134a8ae"; + sha256 = "5eadf29b34dad12f373e675d349f093562b7e38a817f7faa76fcad273ababe2d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/81.0.2/linux-x86_64/br/firefox-81.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/82.0/linux-x86_64/br/firefox-82.0.tar.bz2"; locale = "br"; arch = "linux-x86_64"; - sha256 = "ee6efdf5347fee8faaf007b13d442cd848b23d14ddfff0d089d4ac47b679aba9"; + sha256 = "53c6f9a4c5185ebf62c087dbe78163dcd46fe8bd3bf764a133a37116dbdf96a0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/81.0.2/linux-x86_64/bs/firefox-81.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/82.0/linux-x86_64/bs/firefox-82.0.tar.bz2"; locale = "bs"; arch = "linux-x86_64"; - sha256 = "08f44244b8d29551af6ac20b8b3e046ea39d3f0bd69a43533e8c4779488fcb86"; + sha256 = "260419497fa79e176558f0a5ee43e1bf717ec4782742969bbaaea39cba04c908"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/81.0.2/linux-x86_64/ca-valencia/firefox-81.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/82.0/linux-x86_64/ca-valencia/firefox-82.0.tar.bz2"; locale = "ca-valencia"; arch = "linux-x86_64"; - sha256 = "b6c44812577fc2f295732aaf33ebb68f3b588bec85fe9d54310bebb80ae821e3"; + sha256 = "b2de05d651de2096559b9c40c75212baeff759632aabe70fa9c82283b5ae02d2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/81.0.2/linux-x86_64/ca/firefox-81.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/82.0/linux-x86_64/ca/firefox-82.0.tar.bz2"; locale = "ca"; arch = "linux-x86_64"; - sha256 = "6ef86ef2e82bb3ff74b68239681b804fdb8f5f3e89894b9e0860973d7cc85ea8"; + sha256 = "bb3ce2ca6c6d536bdabab8ad549623aaf287a6b7dc708a7888961d8aa72271a1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/81.0.2/linux-x86_64/cak/firefox-81.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/82.0/linux-x86_64/cak/firefox-82.0.tar.bz2"; locale = "cak"; arch = "linux-x86_64"; - sha256 = "b468e0390aac3751a25cb8d2d130242a39e58c50dcdac2e8eb61e5a421d15bf2"; + sha256 = "8c918ef50f2e1db8e5e51420e6dcf6fad0a4f3f4e7054b9f3292a98ee804cfe9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/81.0.2/linux-x86_64/cs/firefox-81.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/82.0/linux-x86_64/cs/firefox-82.0.tar.bz2"; locale = "cs"; arch = "linux-x86_64"; - sha256 = "7d8a3069e54914cf46b990377a0b192969aadfd214e9fd01e0d6bad711b4ea03"; + sha256 = "b8a4557ce44275e471e028c7fdac7259914cea670116991dfffb3a85fd111149"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/81.0.2/linux-x86_64/cy/firefox-81.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/82.0/linux-x86_64/cy/firefox-82.0.tar.bz2"; locale = "cy"; arch = "linux-x86_64"; - sha256 = "c0b8ccb2471594187ef865cea477c364299314672dbd332f795044e988545c52"; + sha256 = "45f3438b6218655c26ef846923af9860b5957f0cd1f3f0407a2aa80c20b54519"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/81.0.2/linux-x86_64/da/firefox-81.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/82.0/linux-x86_64/da/firefox-82.0.tar.bz2"; locale = "da"; arch = "linux-x86_64"; - sha256 = "c7620a8177276045ddaecd4ee6223ce06f8dea52f6a1f530c3e69d8d90e2a794"; + sha256 = "d015f6abed9728bdf06b922ba9edae3272950dc795cef120179ed21ed633b136"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/81.0.2/linux-x86_64/de/firefox-81.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/82.0/linux-x86_64/de/firefox-82.0.tar.bz2"; locale = "de"; arch = "linux-x86_64"; - sha256 = "6ef5723267a6e5668b49111756b6b3f1435f765c4a69fe84e5e5a9a91160188c"; + sha256 = "29748fa89f1b0995f23cddec986379c9ddd89fc158d56591288eedd3345e52ef"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/81.0.2/linux-x86_64/dsb/firefox-81.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/82.0/linux-x86_64/dsb/firefox-82.0.tar.bz2"; locale = "dsb"; arch = "linux-x86_64"; - sha256 = "d92e94a8a8a9b91b273b1be46690b9bf1100d05dc66be4a7148bcd1561079ffe"; + sha256 = "cae1494636a96530e01c58d8a8914c2f2866eee16f96356dc89dd4cf98b67fe6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/81.0.2/linux-x86_64/el/firefox-81.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/82.0/linux-x86_64/el/firefox-82.0.tar.bz2"; locale = "el"; arch = "linux-x86_64"; - sha256 = "5db2868fde7014b576f77afe3a2a003bc877ef1cb223f152f6a938e56e1d56c9"; + sha256 = "28b09aed5ae0f9d7454d4e43955675535b7bcaf6a79d157aec1f3dc3fd6b922f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/81.0.2/linux-x86_64/en-CA/firefox-81.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/82.0/linux-x86_64/en-CA/firefox-82.0.tar.bz2"; locale = "en-CA"; arch = "linux-x86_64"; - sha256 = "38d64b0a790ce2d8b64ea2b4a4968010c265fbf138ab22e78abb332204b78808"; + sha256 = "d9fd41938262b2b43f91898b6509e11095ff851e249f066de4728d1c53edc1e2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/81.0.2/linux-x86_64/en-GB/firefox-81.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/82.0/linux-x86_64/en-GB/firefox-82.0.tar.bz2"; locale = "en-GB"; arch = "linux-x86_64"; - sha256 = "a87201313bcf05887515ef8895fdf12824be3f60202e33cd033da4e68f3f88be"; + sha256 = "45385629837dca1afd1d9e6cf24aa3a656c180350e86740a47896cea612af934"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/81.0.2/linux-x86_64/en-US/firefox-81.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/82.0/linux-x86_64/en-US/firefox-82.0.tar.bz2"; locale = "en-US"; arch = "linux-x86_64"; - sha256 = "fbe58e217adf35f454684658321c3d49287ba9161308615e0e76e479d60ac176"; + sha256 = "4305f43e72aa46ae42882eaa4e436b22c5142a4c9b2dc9f9ccc3292e18a5e39a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/81.0.2/linux-x86_64/eo/firefox-81.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/82.0/linux-x86_64/eo/firefox-82.0.tar.bz2"; locale = "eo"; arch = "linux-x86_64"; - sha256 = "f8dad4e491ed00e28fb2a923e0e8507e16eceb8ae111661e73ba59625d292c12"; + sha256 = "a7a9c9b927b590e6140967dc8988e63534bcecd68cbed7262af77826d4dcb65f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/81.0.2/linux-x86_64/es-AR/firefox-81.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/82.0/linux-x86_64/es-AR/firefox-82.0.tar.bz2"; locale = "es-AR"; arch = "linux-x86_64"; - sha256 = "e34f82a15a91d2aa1f70eb7b2792fcb4eb31fa86c320aeab906b3a80b93822df"; + sha256 = "e675a8d221812e8642f4d67449df2fed72412197c997acda804fa11aa3032ab6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/81.0.2/linux-x86_64/es-CL/firefox-81.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/82.0/linux-x86_64/es-CL/firefox-82.0.tar.bz2"; locale = "es-CL"; arch = "linux-x86_64"; - sha256 = "a2edffed71f6fc8c6ddb4064db344b8f0f913f4aa9ee7533eb9b3632179c24ec"; + sha256 = "63968f8e55e9bc24ef220546aaff53a6a2ee93f395e4af4543515fddfbb8d175"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/81.0.2/linux-x86_64/es-ES/firefox-81.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/82.0/linux-x86_64/es-ES/firefox-82.0.tar.bz2"; locale = "es-ES"; arch = "linux-x86_64"; - sha256 = "590014aa1950faa1ce3a56ce1bd3e3ea3debbe9c7fce54ac3ae58065a90442b3"; + sha256 = "fbc9948bf2e18ec24e1989592b755050177fc2e505610dfff23d775cbc8c394b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/81.0.2/linux-x86_64/es-MX/firefox-81.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/82.0/linux-x86_64/es-MX/firefox-82.0.tar.bz2"; locale = "es-MX"; arch = "linux-x86_64"; - sha256 = "8cc10d2ac6f11c4b23a1645d4f17be6b756278e8c488c227bb112d33659115a5"; + sha256 = "e30cd73dafda4e54a27f6201738ed355fee2c4b7672765362d2d37dfd3aaf316"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/81.0.2/linux-x86_64/et/firefox-81.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/82.0/linux-x86_64/et/firefox-82.0.tar.bz2"; locale = "et"; arch = "linux-x86_64"; - sha256 = "802ee1e69296b55021fd061f626aca173adb2db01b488911ac1faf7dd54b6ccb"; + sha256 = "39b2575e2e8b6799b3d646c357aa119cefbcaaa0f8645437a1e5b9ced78d154b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/81.0.2/linux-x86_64/eu/firefox-81.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/82.0/linux-x86_64/eu/firefox-82.0.tar.bz2"; locale = "eu"; arch = "linux-x86_64"; - sha256 = "90c201828df686d66a0450a44d4b85f6da2d09b56c7a51272b4e6708d6cc01c4"; + sha256 = "b68837bea81a4018eb298ed2ea567f5367165a83e3233064c49b4d77bae30500"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/81.0.2/linux-x86_64/fa/firefox-81.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/82.0/linux-x86_64/fa/firefox-82.0.tar.bz2"; locale = "fa"; arch = "linux-x86_64"; - sha256 = "d4bab27a1f97cc51f43ea990e215cefc360a4af4dc47e95c109817d98d44b8f7"; + sha256 = "28edeeef1bee9b87e7aad6fa76b10bb83eafd90933487389aa7e1c3ca268bb0c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/81.0.2/linux-x86_64/ff/firefox-81.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/82.0/linux-x86_64/ff/firefox-82.0.tar.bz2"; locale = "ff"; arch = "linux-x86_64"; - sha256 = "64b0dedb6508f5e3d30534a0a3c626d85de2dd261a8a9dda9408dac5d127e63a"; + sha256 = "21651607d2b7555996292e31a9fb0245c44e557333eb16c4b8c63f895872e9a8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/81.0.2/linux-x86_64/fi/firefox-81.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/82.0/linux-x86_64/fi/firefox-82.0.tar.bz2"; locale = "fi"; arch = "linux-x86_64"; - sha256 = "48052f288e1416b7e144cbe75f5a1b082410476223d8e786b82a0b97775622d8"; + sha256 = "2138da6e55db8fc9e90736b81fd0aec3f81a8b3882eb7aa78d816afd303f423e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/81.0.2/linux-x86_64/fr/firefox-81.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/82.0/linux-x86_64/fr/firefox-82.0.tar.bz2"; locale = "fr"; arch = "linux-x86_64"; - sha256 = "0113b83bdfc3524e492f42ff8b07f3f8c9c2c195b876f5fb4f085de19e9a74eb"; + sha256 = "ea18177416ca979820721b44cfc735ce7a47a6cdd0480d2f72c5b72dac559967"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/81.0.2/linux-x86_64/fy-NL/firefox-81.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/82.0/linux-x86_64/fy-NL/firefox-82.0.tar.bz2"; locale = "fy-NL"; arch = "linux-x86_64"; - sha256 = "eb18e773b946808e72b0608d6907b4b98abd6daafeed39d7e156f3252f53724b"; + sha256 = "152f3f1cebd0d6b94348bdbab74676faa605155c2020c32aca26c8ef2004dea2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/81.0.2/linux-x86_64/ga-IE/firefox-81.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/82.0/linux-x86_64/ga-IE/firefox-82.0.tar.bz2"; locale = "ga-IE"; arch = "linux-x86_64"; - sha256 = "4bf3dfc73fd8d62f2b9d56bf14695103498df2979f35b4fa6d41f98b5d447529"; + sha256 = "9e125c8c28854bd8ba25088b5b3b9b5aca3370dbb385200efe09c2d747cb78c5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/81.0.2/linux-x86_64/gd/firefox-81.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/82.0/linux-x86_64/gd/firefox-82.0.tar.bz2"; locale = "gd"; arch = "linux-x86_64"; - sha256 = "c91b4c60e138fe63da554959d025b0aa593c09bdcb3e88fd55790016fd54bbf8"; + sha256 = "3568f741bc94e1c600158fc37d699d2b3f72ea5b8dc78c804e734dbd0c8ebd06"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/81.0.2/linux-x86_64/gl/firefox-81.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/82.0/linux-x86_64/gl/firefox-82.0.tar.bz2"; locale = "gl"; arch = "linux-x86_64"; - sha256 = "540131786aa643a3e23021df03d67457793a43d8c03a3e27eb082736975b1277"; + sha256 = "f3b1437772a66728f999ed0827e6cd14f13b08773bab21aa530e04212867c6bc"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/81.0.2/linux-x86_64/gn/firefox-81.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/82.0/linux-x86_64/gn/firefox-82.0.tar.bz2"; locale = "gn"; arch = "linux-x86_64"; - sha256 = "4d9de3289b2135a37fa2dfa456263ba5da657207ff188812c08161af0af9c13c"; + sha256 = "08b6c72f58d47e2442b6bd72c20025d2c23e9a4899a359ab48382e0088b68ac2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/81.0.2/linux-x86_64/gu-IN/firefox-81.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/82.0/linux-x86_64/gu-IN/firefox-82.0.tar.bz2"; locale = "gu-IN"; arch = "linux-x86_64"; - sha256 = "57ede429790fad8bfa2898e432534b87e60add0303efe5bd903aefdf9234d1a4"; + sha256 = "cf8d0967d9b16bdb8b0ed4ab0f572187003e861fe544b4d258a8b757c68733c8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/81.0.2/linux-x86_64/he/firefox-81.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/82.0/linux-x86_64/he/firefox-82.0.tar.bz2"; locale = "he"; arch = "linux-x86_64"; - sha256 = "7c8bf0cf1aadb37683b8da0cfb7f7e70729837daec5276dba5a2aa0fc4ce32b8"; + sha256 = "42698b6833f395124fdd85307985827574a779ca00b71b4d9713e6f1348e93f3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/81.0.2/linux-x86_64/hi-IN/firefox-81.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/82.0/linux-x86_64/hi-IN/firefox-82.0.tar.bz2"; locale = "hi-IN"; arch = "linux-x86_64"; - sha256 = "9485b287fcfc2253b0caa052566f56f16b25cc2c9e425e679236c5d60c73a037"; + sha256 = "141c53b0ac4c9d14c3a8579be7dff6a194fa3926a388387fdf0fa82ae94ddf78"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/81.0.2/linux-x86_64/hr/firefox-81.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/82.0/linux-x86_64/hr/firefox-82.0.tar.bz2"; locale = "hr"; arch = "linux-x86_64"; - sha256 = "414b5d06a4477f35719f91e8a987298dbe01127b4deb1563ecad894d64cf312a"; + sha256 = "1159742531dc262a764a3bcaba7c15d4384846adc2df25b367dd3709dff3e2bc"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/81.0.2/linux-x86_64/hsb/firefox-81.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/82.0/linux-x86_64/hsb/firefox-82.0.tar.bz2"; locale = "hsb"; arch = "linux-x86_64"; - sha256 = "9c2d4430888b79365069371792904eca41304e1ddcb933c27f7a0e65791f97b8"; + sha256 = "c412cb345c588af3f7d462bef0f28e9d47550eb341f667b21ddcd9de3970dbec"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/81.0.2/linux-x86_64/hu/firefox-81.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/82.0/linux-x86_64/hu/firefox-82.0.tar.bz2"; locale = "hu"; arch = "linux-x86_64"; - sha256 = "1d71a42ed1b367fbfa2a055dd0c92d87851a82099f6238829425d4804a9dfd12"; + sha256 = "1fa586fa875235e397479ec1a4f25e25a3b5abbec5ba524ce90caabd9c1d8b4b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/81.0.2/linux-x86_64/hy-AM/firefox-81.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/82.0/linux-x86_64/hy-AM/firefox-82.0.tar.bz2"; locale = "hy-AM"; arch = "linux-x86_64"; - sha256 = "05502981476151c5d3ee598d983e6256b9ff1cd6a6485c98f3e35916ebe5c7f0"; + sha256 = "f50e5258073bfe6f72918853e15c083c64f427aa858ca04a35d4b230ca496da0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/81.0.2/linux-x86_64/ia/firefox-81.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/82.0/linux-x86_64/ia/firefox-82.0.tar.bz2"; locale = "ia"; arch = "linux-x86_64"; - sha256 = "7dc8287a954368e4c1e210ebc73ea1a76655112e2eb574782a8e9d64e8282656"; + sha256 = "523a8c9d5b76efbf7b9525cb83a1ddb3f3b096ce442815a0fec632550a0d848f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/81.0.2/linux-x86_64/id/firefox-81.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/82.0/linux-x86_64/id/firefox-82.0.tar.bz2"; locale = "id"; arch = "linux-x86_64"; - sha256 = "c598207fe42804f6fe91390773622478f4a1f7b5aca97024d30e4125600d28d6"; + sha256 = "394966ef0c7d5d203f37cc41fd2bdbd3569921c17b6b0baeef2c93386f50409a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/81.0.2/linux-x86_64/is/firefox-81.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/82.0/linux-x86_64/is/firefox-82.0.tar.bz2"; locale = "is"; arch = "linux-x86_64"; - sha256 = "19cc1e787f2d04661c93cd70631e450bf47882132aa2faeb8a976b41742351df"; + sha256 = "8dccf799cdc1af733382d9a9f96f3dd4d774a8e481a0a465af788b646c964d81"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/81.0.2/linux-x86_64/it/firefox-81.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/82.0/linux-x86_64/it/firefox-82.0.tar.bz2"; locale = "it"; arch = "linux-x86_64"; - sha256 = "0aae5bedd2b9c1d3466102c9430ea9539c25488d762927b4dce567806add95c9"; + sha256 = "bd9cfba5a4006b8ab1b1c7fb75ea54d92c3e8f88fb33ea203655486c31d40078"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/81.0.2/linux-x86_64/ja/firefox-81.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/82.0/linux-x86_64/ja/firefox-82.0.tar.bz2"; locale = "ja"; arch = "linux-x86_64"; - sha256 = "569062d4b226d31bf241ebaa54713f0b1fa6d79bf8f386f6a2484b30d6e75516"; + sha256 = "c2f4b1361bef84be0b4409147617f701cfe19741ce7d1b70ffff292ab4b4394b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/81.0.2/linux-x86_64/ka/firefox-81.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/82.0/linux-x86_64/ka/firefox-82.0.tar.bz2"; locale = "ka"; arch = "linux-x86_64"; - sha256 = "86b364cdb8369746dea055f199c61a673f2e87ed64b3b93d41aa1fa5e1f31ef9"; + sha256 = "956eea50eb32e150c95a1fad99ee4f9fa05d80919612ac7c276af7d830612594"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/81.0.2/linux-x86_64/kab/firefox-81.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/82.0/linux-x86_64/kab/firefox-82.0.tar.bz2"; locale = "kab"; arch = "linux-x86_64"; - sha256 = "9d493ef56f9cb7ba6c3b92c255351eefb77744733bae0b09434bee06078802f6"; + sha256 = "7d4b30c299083d0fc3b3c0f2efd9bee1d3bd05ca29b3b291de05816304b54e20"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/81.0.2/linux-x86_64/kk/firefox-81.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/82.0/linux-x86_64/kk/firefox-82.0.tar.bz2"; locale = "kk"; arch = "linux-x86_64"; - sha256 = "7a2b9e691cd72b6079c08e35f8b8c01f505e1a7907b92fc0aa1d282987efa0c0"; + sha256 = "8c781741557932663a68f0d3d52e1e5f1fd2a25617645ff8aca986c1ba638bb2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/81.0.2/linux-x86_64/km/firefox-81.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/82.0/linux-x86_64/km/firefox-82.0.tar.bz2"; locale = "km"; arch = "linux-x86_64"; - sha256 = "62e7f5edbe74712387a591bb89e1e0244beb70e4e00bcc8fc661ef11c48cbdc0"; + sha256 = "60e71694edf19046a2c0ac474daa40157d3ff9a974c9924b5278ba889e680c18"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/81.0.2/linux-x86_64/kn/firefox-81.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/82.0/linux-x86_64/kn/firefox-82.0.tar.bz2"; locale = "kn"; arch = "linux-x86_64"; - sha256 = "8b17779e67706e4284d8417124e2c05aad6b5f1a27db671aabcfaaddc644b141"; + sha256 = "2beabb264e3247a35e16a08d428799a62f9d50297e3824f31eb8f5341f85319a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/81.0.2/linux-x86_64/ko/firefox-81.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/82.0/linux-x86_64/ko/firefox-82.0.tar.bz2"; locale = "ko"; arch = "linux-x86_64"; - sha256 = "f63b5fd71b0808d21f344c67d7b7967d1b952f2530dd4c98e522ae85abbbe724"; + sha256 = "d3bc2f79ee0e2a15a56d9c2a29d78daa1ba28abbd2fd7a2eb7f4a8810bdc61bb"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/81.0.2/linux-x86_64/lij/firefox-81.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/82.0/linux-x86_64/lij/firefox-82.0.tar.bz2"; locale = "lij"; arch = "linux-x86_64"; - sha256 = "ff791a959cc134be0a1d9d3c6e275610fe21e4e83fd0d4bfc0629569aa4f235a"; + sha256 = "4d723edcb08c066d4ff5eae520ad27aea85e6287bc37e656a7ccdf3f09d0722b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/81.0.2/linux-x86_64/lt/firefox-81.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/82.0/linux-x86_64/lt/firefox-82.0.tar.bz2"; locale = "lt"; arch = "linux-x86_64"; - sha256 = "fab08be7d08b6cb42a81743da797d7f89c6c6f7977c2140bd332c836ed83c78d"; + sha256 = "56282e57b79c0ed78fe839b4c5d444d6c8ccec001b3f16bd566ec8c2f9f0520c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/81.0.2/linux-x86_64/lv/firefox-81.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/82.0/linux-x86_64/lv/firefox-82.0.tar.bz2"; locale = "lv"; arch = "linux-x86_64"; - sha256 = "2872affb0559ff68f1755b025da984e2b1edafed0a081a2f2aaebeb42a98394e"; + sha256 = "6748371e3a52387dfde06d1a623528a117a686b7252199a63dc166348a0f219b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/81.0.2/linux-x86_64/mk/firefox-81.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/82.0/linux-x86_64/mk/firefox-82.0.tar.bz2"; locale = "mk"; arch = "linux-x86_64"; - sha256 = "5515928977539457db6a0e619486eaec66866b3b5bdd92731e7df2671cbcf437"; + sha256 = "eaa8fde559b53b533d0b7275b5b79fba9cb42d31118a281f1b7fe17cc0f0e3c7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/81.0.2/linux-x86_64/mr/firefox-81.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/82.0/linux-x86_64/mr/firefox-82.0.tar.bz2"; locale = "mr"; arch = "linux-x86_64"; - sha256 = "67de1cae2a3238a2ba62bb0186abaa866b138274f5a6ece030c0f94a2c33110f"; + sha256 = "674ba4962bd455793b99f07a9f40709220d40a55e6ebd516bc15b54bf04655b7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/81.0.2/linux-x86_64/ms/firefox-81.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/82.0/linux-x86_64/ms/firefox-82.0.tar.bz2"; locale = "ms"; arch = "linux-x86_64"; - sha256 = "33437a4835939be05d051a5403b5496abcd8dea764db4d1ade11b2451aed8524"; + sha256 = "91291fcff394f30b4f60968f183c3125961fb593eef5a9e839024d83d001cdab"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/81.0.2/linux-x86_64/my/firefox-81.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/82.0/linux-x86_64/my/firefox-82.0.tar.bz2"; locale = "my"; arch = "linux-x86_64"; - sha256 = "ec709e861cf45bbacdd9a69df2b5a22b4c4653969539b5359befa4073212a504"; + sha256 = "1634f5d90130dfa27301588856c4f49bce0bb33c047d653bd46e255ce07e2414"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/81.0.2/linux-x86_64/nb-NO/firefox-81.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/82.0/linux-x86_64/nb-NO/firefox-82.0.tar.bz2"; locale = "nb-NO"; arch = "linux-x86_64"; - sha256 = "af41f350b8442f3618fdfb997ea40482f6a5d4b6e0c4cf59e397d37f52f3df0c"; + sha256 = "e35752e9fe37cd3a8518b042f2e287f29aa91213be680b111948e9115e5da523"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/81.0.2/linux-x86_64/ne-NP/firefox-81.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/82.0/linux-x86_64/ne-NP/firefox-82.0.tar.bz2"; locale = "ne-NP"; arch = "linux-x86_64"; - sha256 = "49b42f070ef75a92583a2b74d8bedfd1fd3bdb721f0330504cf1d3e3a1e06ec2"; + sha256 = "17c5d7c04727b775ea544b4e6203e181b4f26d7fd833900fd3dbae853a8dede9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/81.0.2/linux-x86_64/nl/firefox-81.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/82.0/linux-x86_64/nl/firefox-82.0.tar.bz2"; locale = "nl"; arch = "linux-x86_64"; - sha256 = "356fde435cf8c114ef3d5bb16a5e24123d7898bb1de1539ef38d589ac9292489"; + sha256 = "d9ff2809b7d4b1fb30f0c61b5ab7c776bd4096940908afcc25472f4b4f78407c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/81.0.2/linux-x86_64/nn-NO/firefox-81.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/82.0/linux-x86_64/nn-NO/firefox-82.0.tar.bz2"; locale = "nn-NO"; arch = "linux-x86_64"; - sha256 = "c6f403be62dcd65eac4b26349ed8bf4b44e5b43b1d6cd82b15fc327a85c5b18e"; + sha256 = "0da44925c235fb19bd823464046150a57ce710be8f8f2593612e97bd0bd3d591"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/81.0.2/linux-x86_64/oc/firefox-81.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/82.0/linux-x86_64/oc/firefox-82.0.tar.bz2"; locale = "oc"; arch = "linux-x86_64"; - sha256 = "d6200285fcb916467b1b05e85e595dfa5e94f0f0a20d71824ecefdf12b215790"; + sha256 = "62a0679bfbdf27055924753661b20b2a022ba60e50bcbcca89ea7ec28394d3c0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/81.0.2/linux-x86_64/pa-IN/firefox-81.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/82.0/linux-x86_64/pa-IN/firefox-82.0.tar.bz2"; locale = "pa-IN"; arch = "linux-x86_64"; - sha256 = "7e22a7d4815012a58de31322a532205d0d8276629a3ffa5d8d2066ef3ca2ef64"; + sha256 = "f3f51aaeec650043cf70d2dccddd18ef8d184b61061a42b2d5ca4b06e891c8e1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/81.0.2/linux-x86_64/pl/firefox-81.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/82.0/linux-x86_64/pl/firefox-82.0.tar.bz2"; locale = "pl"; arch = "linux-x86_64"; - sha256 = "35385afc9b365042b498bb30ff330a8ff5556f8cc3c0195f485022f9306cdc8a"; + sha256 = "a1a6ec0eebab8905dc53e58d781369ebce792f1a34e8702c7d9bea082238a1ff"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/81.0.2/linux-x86_64/pt-BR/firefox-81.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/82.0/linux-x86_64/pt-BR/firefox-82.0.tar.bz2"; locale = "pt-BR"; arch = "linux-x86_64"; - sha256 = "ad117ed17bee468026d03bc0311ca8298f62f94eaa7a15f1dea58d9cac16f439"; + sha256 = "76a3ee37676ad9260dfe8d434fde3eafe4d9615568056164058344bfec11bcaa"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/81.0.2/linux-x86_64/pt-PT/firefox-81.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/82.0/linux-x86_64/pt-PT/firefox-82.0.tar.bz2"; locale = "pt-PT"; arch = "linux-x86_64"; - sha256 = "8f609c2fe5ffda723275405a938ab8329b30ca33850246c9d2410db08af66b1b"; + sha256 = "6d0a39416ea8fa33b53f6aa886bff4cf35f0eeacd622c0572abf1b62ab067fb1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/81.0.2/linux-x86_64/rm/firefox-81.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/82.0/linux-x86_64/rm/firefox-82.0.tar.bz2"; locale = "rm"; arch = "linux-x86_64"; - sha256 = "8130961cacbb7c1139b978cafd29bf1f281a94284f37afb66243a0ee65622eaf"; + sha256 = "cf66f96c69b89879ec2ee51050640f5e18aabc3c1ef14f6ee8479f4f12ff2d96"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/81.0.2/linux-x86_64/ro/firefox-81.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/82.0/linux-x86_64/ro/firefox-82.0.tar.bz2"; locale = "ro"; arch = "linux-x86_64"; - sha256 = "8c4c45960a7ba85ae70f205f91035bab549ea5074f884477d7eb30ca8af5e4ef"; + sha256 = "d4a70b102a860cc7f1556eb63d03ad64bebc5e0f22be5fb1ac3d833527b38964"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/81.0.2/linux-x86_64/ru/firefox-81.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/82.0/linux-x86_64/ru/firefox-82.0.tar.bz2"; locale = "ru"; arch = "linux-x86_64"; - sha256 = "1706cd12f77a650e7ea7ed6d377ca4e772ae3fb7330a81673a39731853ae0b1f"; + sha256 = "e57613ab5c57551721cad739b025a9c998fe79f3a354ec626dc9bc5f88943550"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/81.0.2/linux-x86_64/si/firefox-81.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/82.0/linux-x86_64/si/firefox-82.0.tar.bz2"; locale = "si"; arch = "linux-x86_64"; - sha256 = "cd400af9646bbb08e54069f9748fbec82242c4f9ae973c974bc3499be76a7074"; + sha256 = "9565b8bfdf98c0e8b04c7fc6af23af2b04fee815ce6faab3188756e7b30985b5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/81.0.2/linux-x86_64/sk/firefox-81.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/82.0/linux-x86_64/sk/firefox-82.0.tar.bz2"; locale = "sk"; arch = "linux-x86_64"; - sha256 = "6ecdf6b3b1ce634cd048452de8e5e6128cb3d474199dfbd5fe1f66a40825c05d"; + sha256 = "05e190e6ced4d275a93da20e9922a631628db467e4a5dcf7c94cb7d728ffcbef"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/81.0.2/linux-x86_64/sl/firefox-81.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/82.0/linux-x86_64/sl/firefox-82.0.tar.bz2"; locale = "sl"; arch = "linux-x86_64"; - sha256 = "a77a56f8b35ac4bfaf81ed9c3846ee392b4a9198b469320e9978fb5c1243db0d"; + sha256 = "6fa4092cfa0d20f01a0e746a2adec4a31091579de08c5adaba186743cadaf04e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/81.0.2/linux-x86_64/son/firefox-81.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/82.0/linux-x86_64/son/firefox-82.0.tar.bz2"; locale = "son"; arch = "linux-x86_64"; - sha256 = "0c04af05d6ec3f2423fc18a2315708a64db5e39008aa8f50c487b3e54193dbe5"; + sha256 = "4ad179b62c19de8171299301a312c4b4aec4805c4d255308d8a2ec840cc3058b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/81.0.2/linux-x86_64/sq/firefox-81.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/82.0/linux-x86_64/sq/firefox-82.0.tar.bz2"; locale = "sq"; arch = "linux-x86_64"; - sha256 = "479e7da75628821986e3840848a739666830fa37e692b53245bf164357a76528"; + sha256 = "0dab51efdbb69e6cbb1aeca8fae9d82709238b54bc40141335ff790f7ca91ff6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/81.0.2/linux-x86_64/sr/firefox-81.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/82.0/linux-x86_64/sr/firefox-82.0.tar.bz2"; locale = "sr"; arch = "linux-x86_64"; - sha256 = "5a272d8ab250abc196c244af90e566039d7a351ce1b8503a8b69a6b804526544"; + sha256 = "59523733a24aa0bab201560711a8a47cc684e8027eb5c06f814b0d59c6a985ad"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/81.0.2/linux-x86_64/sv-SE/firefox-81.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/82.0/linux-x86_64/sv-SE/firefox-82.0.tar.bz2"; locale = "sv-SE"; arch = "linux-x86_64"; - sha256 = "5c48c2eb6b737df23f16e761c2db7a344ef0898b05fc16ac73d9430a8d7b4350"; + sha256 = "53cbef7e2eba73d2ad27ec6ed717f1c69c71281d4e33a1d7e721ec30c372663b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/81.0.2/linux-x86_64/ta/firefox-81.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/82.0/linux-x86_64/ta/firefox-82.0.tar.bz2"; locale = "ta"; arch = "linux-x86_64"; - sha256 = "d54572f034c437c1fb3ea3148488574b32bb66e6cd0f0d83fdb0565c2876569c"; + sha256 = "7d866f79b6e80c76c2ddfdca477962f1b37dc3eeacd5270a90e4a0a0ee461cf2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/81.0.2/linux-x86_64/te/firefox-81.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/82.0/linux-x86_64/te/firefox-82.0.tar.bz2"; locale = "te"; arch = "linux-x86_64"; - sha256 = "7672b53550f83100a247bfccd4905675e6572e5fc09fc9d3caa97998cc9ea65c"; + sha256 = "846fadf4e10bc6f89db7b9a3ad06c17a85695779cd5f1c06414d6f4baef52921"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/81.0.2/linux-x86_64/th/firefox-81.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/82.0/linux-x86_64/th/firefox-82.0.tar.bz2"; locale = "th"; arch = "linux-x86_64"; - sha256 = "8c5cfbed931ac2777742f34563a873090d4dd14cd512641c2ae2d1acac440bef"; + sha256 = "e2087d50eb61ba597a67af0cc3460ed3ac7e8af218b374e4c5294463aac8ce44"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/81.0.2/linux-x86_64/tl/firefox-81.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/82.0/linux-x86_64/tl/firefox-82.0.tar.bz2"; locale = "tl"; arch = "linux-x86_64"; - sha256 = "1b1b5cc2e47bf3d5940f7ce16f732f449856a3b98ed728a655db6835ec8d1f31"; + sha256 = "60a05602462133f36d29942dc5123aa0c71b1aaf2ab142efff6f7abc9cadcad6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/81.0.2/linux-x86_64/tr/firefox-81.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/82.0/linux-x86_64/tr/firefox-82.0.tar.bz2"; locale = "tr"; arch = "linux-x86_64"; - sha256 = "b71b7a3d25446cba4404d8310996e23f32c6801a60e9e427eac586e3ce09cff3"; + sha256 = "5cfc8cc8945f4a177af80df37653a61f310f413cd4ab3e5df55ed4457d7318b8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/81.0.2/linux-x86_64/trs/firefox-81.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/82.0/linux-x86_64/trs/firefox-82.0.tar.bz2"; locale = "trs"; arch = "linux-x86_64"; - sha256 = "b71df436eda4dd757de7b044b333fadfdbfeb180990c45fc3ad310c2a325f851"; + sha256 = "2cf90e62d2e1272aaa8d7acfb7ac51b35e9a3aef23f12aea2213146db324ac66"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/81.0.2/linux-x86_64/uk/firefox-81.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/82.0/linux-x86_64/uk/firefox-82.0.tar.bz2"; locale = "uk"; arch = "linux-x86_64"; - sha256 = "5fbea5aab96db69ebcc01040e86205bc212b7a0c8e539620001e2f95fdd4c060"; + sha256 = "bf0503793d0887754b2c4b87b92c4dcf111d8f5fcc27a288af3686fce2201366"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/81.0.2/linux-x86_64/ur/firefox-81.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/82.0/linux-x86_64/ur/firefox-82.0.tar.bz2"; locale = "ur"; arch = "linux-x86_64"; - sha256 = "de3de8a70d155283f68baaceda50309312a2737acdae1c306604203a587a047e"; + sha256 = "015e0e28477896710481a925c4bec0ceefd0c9f39179a13441b673031854ab1e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/81.0.2/linux-x86_64/uz/firefox-81.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/82.0/linux-x86_64/uz/firefox-82.0.tar.bz2"; locale = "uz"; arch = "linux-x86_64"; - sha256 = "faf6887af27095f12e9927226cb1d82a76caac0d61a6515e96ee2e6a4cda54b5"; + sha256 = "0c372b3f8d98f41f2a69a62ffefa6181bb9d7d1a74c7a60a2603ee3a8883d635"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/81.0.2/linux-x86_64/vi/firefox-81.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/82.0/linux-x86_64/vi/firefox-82.0.tar.bz2"; locale = "vi"; arch = "linux-x86_64"; - sha256 = "010d1032acd48a36048ab1c90c854a1f617fd58b0e039fbcb510c13f9e8f6497"; + sha256 = "96b1a4aa05e054a7ec78bf314d151385b2a7a6f6ea3225993242ba798772e100"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/81.0.2/linux-x86_64/xh/firefox-81.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/82.0/linux-x86_64/xh/firefox-82.0.tar.bz2"; locale = "xh"; arch = "linux-x86_64"; - sha256 = "de6b89dd029b4636bb660cc0bb5f64dc6430f93e2321ea3fa8f6a309ca70b0da"; + sha256 = "68d69dc60b730b5ffe7a54943bc9404d0915b3730f840711a3c078bc8b71396a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/81.0.2/linux-x86_64/zh-CN/firefox-81.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/82.0/linux-x86_64/zh-CN/firefox-82.0.tar.bz2"; locale = "zh-CN"; arch = "linux-x86_64"; - sha256 = "a9d53780dc73f7bb435ed4d32d2322401fb6038756a0a0dcea5bbb1815c74cda"; + sha256 = "b21aedfb3eb7cb8fac85fa9d9f8741ff182ada6635bbb669ec95c0cefc0edb5a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/81.0.2/linux-x86_64/zh-TW/firefox-81.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/82.0/linux-x86_64/zh-TW/firefox-82.0.tar.bz2"; locale = "zh-TW"; arch = "linux-x86_64"; - sha256 = "d7a24a82720421a691e3bbdd69353d3159b5e6f1b78d056802a19e1bff892096"; + sha256 = "81963acd1e8a92ab416fe4dae6f1c14f554d6d6a83fcd1d5021e5796bf5d7a98"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/81.0.2/linux-i686/ach/firefox-81.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/82.0/linux-i686/ach/firefox-82.0.tar.bz2"; locale = "ach"; arch = "linux-i686"; - sha256 = "92bcb64a683b40a136f62210c328f679b3d1a4672826121d60aada840721aa75"; + sha256 = "12b85628724e5c5acc545ba462b7f916d775dedde3eeb4141799f0f3d65ba6c2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/81.0.2/linux-i686/af/firefox-81.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/82.0/linux-i686/af/firefox-82.0.tar.bz2"; locale = "af"; arch = "linux-i686"; - sha256 = "83d5bc7fcdd6ec58c62ed59a724e30ff0b1efa52efe2284b5fc4c81f94a95b4c"; + sha256 = "66f1e12cbabfcaa3c51e68d06b213dcdf29292e981b18ace9ce6df9bfe3f9dd8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/81.0.2/linux-i686/an/firefox-81.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/82.0/linux-i686/an/firefox-82.0.tar.bz2"; locale = "an"; arch = "linux-i686"; - sha256 = "1a1164b4cd7a14475e3542940369cd3d539d006425f8ad2695245e8a5ac76f07"; + sha256 = "6b61f6db8cd323371f8a4949ff455c79374a2efa0c327611128aaa397a02a025"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/81.0.2/linux-i686/ar/firefox-81.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/82.0/linux-i686/ar/firefox-82.0.tar.bz2"; locale = "ar"; arch = "linux-i686"; - sha256 = "ae16a97f8372cfe86aadceeaf06a5ef89f6fec141e4490fc93201a63e139a372"; + sha256 = "180633af5e8cfd13d832c9268d4b0eb44b2292b549d3d1093364db9967fc3e82"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/81.0.2/linux-i686/ast/firefox-81.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/82.0/linux-i686/ast/firefox-82.0.tar.bz2"; locale = "ast"; arch = "linux-i686"; - sha256 = "ff011971da1d18eaeeca9925ad10c30c82199cde00fc34904a058285ee8ec4fb"; + sha256 = "aa95f2894bbaf61fd74bcfb00218f73e77b83250c25b472e9938ce0e94403583"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/81.0.2/linux-i686/az/firefox-81.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/82.0/linux-i686/az/firefox-82.0.tar.bz2"; locale = "az"; arch = "linux-i686"; - sha256 = "c858bc1382ba22fb8874f5e409c2571389f0f582df61c228791c0e4524fc2d9b"; + sha256 = "3c42220f655d6d8785b0763d5d829744d0e579acff44cd146ec85378ef2800a9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/81.0.2/linux-i686/be/firefox-81.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/82.0/linux-i686/be/firefox-82.0.tar.bz2"; locale = "be"; arch = "linux-i686"; - sha256 = "e6372d667659c032f27b5cedf4304b72cde1d56b90ca2f69cbf1871efe1b5053"; + sha256 = "02fd047e0808ccdcaf484ab6fcc6d306ce97c6a401be4a0071eb310f31ccd45c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/81.0.2/linux-i686/bg/firefox-81.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/82.0/linux-i686/bg/firefox-82.0.tar.bz2"; locale = "bg"; arch = "linux-i686"; - sha256 = "522be0fd41e182cacf8370ce55e3d4081ebe65b5697232bd37b0e3969d59ecf9"; + sha256 = "556fbaef8fac39cebf0152e0c5945c6179aa013a724c4903b5553c12518913ca"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/81.0.2/linux-i686/bn/firefox-81.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/82.0/linux-i686/bn/firefox-82.0.tar.bz2"; locale = "bn"; arch = "linux-i686"; - sha256 = "a96512ca0ae0e850e4db268adfa89dff04b9ad4132e45d62cf2e479482c6ab74"; + sha256 = "3a30215151a6e937a1555f28333b2763e5bcb825e4159267c4897f666206737f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/81.0.2/linux-i686/br/firefox-81.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/82.0/linux-i686/br/firefox-82.0.tar.bz2"; locale = "br"; arch = "linux-i686"; - sha256 = "4c2c91fa2b05d6c0fa8c123121654b4a860bfa3c14cbfe0c7a72437aaecd0a02"; + sha256 = "9db07dc18e3925f20d1cdd668eb26dc279f7ee38bd71e0085e47ca9400938974"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/81.0.2/linux-i686/bs/firefox-81.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/82.0/linux-i686/bs/firefox-82.0.tar.bz2"; locale = "bs"; arch = "linux-i686"; - sha256 = "02aa8954d864744069f99a434731b7d5b848657eb9ae3c88f7b7593896dc6a33"; + sha256 = "7ad72fb89ac7ae6f453e5476759319b3e46a814a5ea3b74fa95350a20aeec2a1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/81.0.2/linux-i686/ca-valencia/firefox-81.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/82.0/linux-i686/ca-valencia/firefox-82.0.tar.bz2"; locale = "ca-valencia"; arch = "linux-i686"; - sha256 = "d29036dd836772f12b01bde9c9183455241951ecd37dbb1737a3a6a411329ec0"; + sha256 = "73f45df139c85e6b583fe0f5c5e429631154d02c7de5832e85366fceccec2854"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/81.0.2/linux-i686/ca/firefox-81.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/82.0/linux-i686/ca/firefox-82.0.tar.bz2"; locale = "ca"; arch = "linux-i686"; - sha256 = "e0a79f1fffcc321dc5cc25df1eef7f2ec789b50ccdaf9abe2cfae45c4bfb1c28"; + sha256 = "53f64671ca7527147f91fe2ec72053420866ec15f7d8f6175d88cde75f574514"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/81.0.2/linux-i686/cak/firefox-81.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/82.0/linux-i686/cak/firefox-82.0.tar.bz2"; locale = "cak"; arch = "linux-i686"; - sha256 = "49afbe55a259abccd5d90645d54b756033570b0db0e897b61a6bad096e173c5f"; + sha256 = "93471086769bbdedf2a6a7a63ed2fecaa785c9c1f337bb1e726462976604dfff"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/81.0.2/linux-i686/cs/firefox-81.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/82.0/linux-i686/cs/firefox-82.0.tar.bz2"; locale = "cs"; arch = "linux-i686"; - sha256 = "c24226556fab58ed16374fde899aae586e06fa8d258c68cd29100dd4febe406a"; + sha256 = "e9e1d7f0a0a5766d0ef1ec8f9eb747fcd28333425d139fa1f78891142f1aa91c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/81.0.2/linux-i686/cy/firefox-81.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/82.0/linux-i686/cy/firefox-82.0.tar.bz2"; locale = "cy"; arch = "linux-i686"; - sha256 = "bbc097cbef8995f847988ca8d5280c10b8486a2622845b3df59c8bfcf6ad89fa"; + sha256 = "60caa6cb482ff870572551605e1b644d79901f1852b0bcd7ba64f926eb923bfe"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/81.0.2/linux-i686/da/firefox-81.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/82.0/linux-i686/da/firefox-82.0.tar.bz2"; locale = "da"; arch = "linux-i686"; - sha256 = "90d4acb222bc315ab5912ef5b084a9b90680eeff582efea5400805b7bd09b79f"; + sha256 = "726f620abbf287fb03d68127a7985e52a8e4ee176994bc7b0e8d10e7f3dd42a1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/81.0.2/linux-i686/de/firefox-81.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/82.0/linux-i686/de/firefox-82.0.tar.bz2"; locale = "de"; arch = "linux-i686"; - sha256 = "a38be4018216205b8a6ddfdc3308803dc177bbfc70eb3564f32a379ba44174be"; + sha256 = "ebc0cffa8a0300165a39ee1fdfaf4c404d2204683117c6b5d7ae708a4a495053"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/81.0.2/linux-i686/dsb/firefox-81.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/82.0/linux-i686/dsb/firefox-82.0.tar.bz2"; locale = "dsb"; arch = "linux-i686"; - sha256 = "cfd51d887a50b857040d788c15155aff6b70ec7dfb587c7f57d6373d34ad85c0"; + sha256 = "e296964d066ab5799b0974c1841f36352040d9f6ad769e730f801a0b77eaaed8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/81.0.2/linux-i686/el/firefox-81.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/82.0/linux-i686/el/firefox-82.0.tar.bz2"; locale = "el"; arch = "linux-i686"; - sha256 = "3a612c94e13e1a3b374921faa1be57b1a61cb50dfc6437e4798615c6a4a80389"; + sha256 = "f1282eff07c147d33b114a76335cb4c6bfddc66518d2749d65d5613899a3cda3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/81.0.2/linux-i686/en-CA/firefox-81.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/82.0/linux-i686/en-CA/firefox-82.0.tar.bz2"; locale = "en-CA"; arch = "linux-i686"; - sha256 = "4804e454ca39369d6d8d067a3eb3e3351aa5cf84742c1e9b76bb895cbcc516ee"; + sha256 = "51ab497caf7a529e8b430280b8015ab3b8a5df3486ef81f3ffe721d1f0c2d752"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/81.0.2/linux-i686/en-GB/firefox-81.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/82.0/linux-i686/en-GB/firefox-82.0.tar.bz2"; locale = "en-GB"; arch = "linux-i686"; - sha256 = "273d14182a3b1e912977c002c9eaf760389f8b90bd08c538920fbf551e16d30b"; + sha256 = "1a4f64d190155f3b090828261ec2ce0f61e4b3b2662a3f445291ee201c0fdfe0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/81.0.2/linux-i686/en-US/firefox-81.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/82.0/linux-i686/en-US/firefox-82.0.tar.bz2"; locale = "en-US"; arch = "linux-i686"; - sha256 = "d12c5d96d5883a9f0dc0ecca65b771bdee61c4994366474d61228d7005d78365"; + sha256 = "2039a8e94fcda9bcad97d62059579d64744da522c7d65beac0edcbd2e128a06f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/81.0.2/linux-i686/eo/firefox-81.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/82.0/linux-i686/eo/firefox-82.0.tar.bz2"; locale = "eo"; arch = "linux-i686"; - sha256 = "9169838db0397ec2d35d76ec7ab96bad4a6072dac5272ba13661ac2588ad6358"; + sha256 = "1abf7e1a14264220bf83b998c71ae8d1cb7e5187c09a9ae2be1424761760955b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/81.0.2/linux-i686/es-AR/firefox-81.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/82.0/linux-i686/es-AR/firefox-82.0.tar.bz2"; locale = "es-AR"; arch = "linux-i686"; - sha256 = "a6d14c7062bb00b1aaf6d4118c07fa46d05b8bf39de914fdeaa5a6ce97c781fe"; + sha256 = "83bc86693bbb7dfaeae244c1120f5426b85b13f56756f299e3e3c902a0700851"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/81.0.2/linux-i686/es-CL/firefox-81.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/82.0/linux-i686/es-CL/firefox-82.0.tar.bz2"; locale = "es-CL"; arch = "linux-i686"; - sha256 = "1927ed60ccadba49b0d7ec1a49f78b565249eb1c9ea3c89da88074fd8f16c685"; + sha256 = "b2ff29fe620aaa62e9b20ae1576574b2e4c7893eb664fb7c6f722a80093d81bf"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/81.0.2/linux-i686/es-ES/firefox-81.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/82.0/linux-i686/es-ES/firefox-82.0.tar.bz2"; locale = "es-ES"; arch = "linux-i686"; - sha256 = "f69768413a153852ce77cd71ad332598a6b63ba779d7fd19f1b4a5bbf9d6d390"; + sha256 = "47f526244e2d7426d7a9d2faa1e114032bd43309c480a21523645c415ac54a17"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/81.0.2/linux-i686/es-MX/firefox-81.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/82.0/linux-i686/es-MX/firefox-82.0.tar.bz2"; locale = "es-MX"; arch = "linux-i686"; - sha256 = "3beecb997cd5e37a7460c4a9c73ec398b14d249af43588ce00eebd9677575c3f"; + sha256 = "f2f7f4e251574d11ea69854d0f5a9f7b078aa220d5fb1ef8275e25e4e75389a6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/81.0.2/linux-i686/et/firefox-81.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/82.0/linux-i686/et/firefox-82.0.tar.bz2"; locale = "et"; arch = "linux-i686"; - sha256 = "ace910037d8aac53cb62c0a815ca63ae99c041fa33401b32190c483fdde4285c"; + sha256 = "88ac5af23fa85690fe992ff457f79c991d4802e54a5a3a73682b3b1c6d444856"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/81.0.2/linux-i686/eu/firefox-81.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/82.0/linux-i686/eu/firefox-82.0.tar.bz2"; locale = "eu"; arch = "linux-i686"; - sha256 = "8dd80e914dab07934140847f0d28e6c3b2c42153843bac891a3d1fce977bcda1"; + sha256 = "2fa7483b6be6503a5aa584895d6b177b51f94c344e0869638f6dc065437d69ff"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/81.0.2/linux-i686/fa/firefox-81.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/82.0/linux-i686/fa/firefox-82.0.tar.bz2"; locale = "fa"; arch = "linux-i686"; - sha256 = "5ff9612d84d88e53eb130baa87e31472f8c1dfd17fb9b5456dcd559f8449c256"; + sha256 = "f9cf6f19e3faf9c206a4286224089855aa2fad94bb99250855925e167aa65943"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/81.0.2/linux-i686/ff/firefox-81.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/82.0/linux-i686/ff/firefox-82.0.tar.bz2"; locale = "ff"; arch = "linux-i686"; - sha256 = "23cff8a74feead954a55111e7a09d43b33baea6b5c74625dd1a34986f7ecbb89"; + sha256 = "b6171880f459eed455cab78fbf9a695168f23bb26c361099cd23f682a99704c6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/81.0.2/linux-i686/fi/firefox-81.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/82.0/linux-i686/fi/firefox-82.0.tar.bz2"; locale = "fi"; arch = "linux-i686"; - sha256 = "02bad588cc7b4d79e763f02e8cef17704d1137d94a22f2de61c7ae2b1f74b9d7"; + sha256 = "6f5d5eaa2e4a60122a18b998932645f6abe7542e04298d13cf5004804de12bb8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/81.0.2/linux-i686/fr/firefox-81.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/82.0/linux-i686/fr/firefox-82.0.tar.bz2"; locale = "fr"; arch = "linux-i686"; - sha256 = "f33ee5fa5744b01ee7ea86645b3b70636cc3df1101572a5a7e19522df575ea70"; + sha256 = "1d239e0c59c17c3e8de5f88df643a2b59b55a1816f8d2779c115311c6729bf89"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/81.0.2/linux-i686/fy-NL/firefox-81.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/82.0/linux-i686/fy-NL/firefox-82.0.tar.bz2"; locale = "fy-NL"; arch = "linux-i686"; - sha256 = "5b32c0bdd3d697f2d0b01d41cb235fb92a422c96e0f2fde1eec1879971a1f7ea"; + sha256 = "7307baffe92d133f2b3b957c8592d7ef18e1129aebadb9c1a26b8f462ecb9b84"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/81.0.2/linux-i686/ga-IE/firefox-81.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/82.0/linux-i686/ga-IE/firefox-82.0.tar.bz2"; locale = "ga-IE"; arch = "linux-i686"; - sha256 = "bd9b2707e1f5ebcc299582e3ebf770dd5393a1c0e577bcb907d569ecde712ca6"; + sha256 = "1ae40826795c01e45921cee1293990a227f219ed20398b77cb8cf382207ed0d2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/81.0.2/linux-i686/gd/firefox-81.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/82.0/linux-i686/gd/firefox-82.0.tar.bz2"; locale = "gd"; arch = "linux-i686"; - sha256 = "c1c9a076dd1a92f13a099caf13682ec2ad120b8db9ea401bf45bf59d4a2e90f5"; + sha256 = "108f11cade989829a103e67090f03dec890b371004fe047215fe2feda8217a7b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/81.0.2/linux-i686/gl/firefox-81.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/82.0/linux-i686/gl/firefox-82.0.tar.bz2"; locale = "gl"; arch = "linux-i686"; - sha256 = "ecf0f9769e011b85c6b4e4d3e639a1e8fa0953eb7b9c8e86910047d23383dd6d"; + sha256 = "3be9987167773e448d194bcde682242576968ca04cdba2b3728e454b965a9b21"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/81.0.2/linux-i686/gn/firefox-81.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/82.0/linux-i686/gn/firefox-82.0.tar.bz2"; locale = "gn"; arch = "linux-i686"; - sha256 = "ac05412736fa6067ad7c038f1721708eae224a4e1538ec4b8132cc647a32c91e"; + sha256 = "be87dc9ecfe75423c59fd189896a508040f5f962828855f50a01fb4a46a6beb1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/81.0.2/linux-i686/gu-IN/firefox-81.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/82.0/linux-i686/gu-IN/firefox-82.0.tar.bz2"; locale = "gu-IN"; arch = "linux-i686"; - sha256 = "885a2d79e09f74302a5312ef96420f35453340253e8e998ab37db1f6cef37921"; + sha256 = "c2b1290375af17d0d63dfa90b006025dd8f9e7b35628caa782c849826df2fb53"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/81.0.2/linux-i686/he/firefox-81.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/82.0/linux-i686/he/firefox-82.0.tar.bz2"; locale = "he"; arch = "linux-i686"; - sha256 = "0b5fdb4085809abd26687e265a7f0296c4ac9d77d7701741ff05055cca793946"; + sha256 = "9579aa350b3cc6c0814c24361a5b7a7b3ec75245f050ad994ab20e850b520f41"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/81.0.2/linux-i686/hi-IN/firefox-81.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/82.0/linux-i686/hi-IN/firefox-82.0.tar.bz2"; locale = "hi-IN"; arch = "linux-i686"; - sha256 = "d920fddfd6c92c190ae9625b6dc27decf6678d5083a9ffccb16eeadc918d42d4"; + sha256 = "25a037775d64ceaa137fde2367e26f846e755f98edaf0fd04526b4afc80b17cb"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/81.0.2/linux-i686/hr/firefox-81.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/82.0/linux-i686/hr/firefox-82.0.tar.bz2"; locale = "hr"; arch = "linux-i686"; - sha256 = "382eb132cc009b6616d1bd437b552cd138b9cc9f138c316166b032becd938cc3"; + sha256 = "c84de35ed70512cd608de909ce887f0bbf79d5894a82facd94af478b1cc54764"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/81.0.2/linux-i686/hsb/firefox-81.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/82.0/linux-i686/hsb/firefox-82.0.tar.bz2"; locale = "hsb"; arch = "linux-i686"; - sha256 = "f33a2bd9be104af88cab4445f8767bbf507166135a3ce7b7d890ff0ab08bc4bd"; + sha256 = "2d5ce7160c14b3770d19c3d32a068c1a08623ac2c3b0036d5f18ba7645463fbb"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/81.0.2/linux-i686/hu/firefox-81.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/82.0/linux-i686/hu/firefox-82.0.tar.bz2"; locale = "hu"; arch = "linux-i686"; - sha256 = "01163f584fcb6a30c736d0d7178760465444a2575ab0844613bc735828b29827"; + sha256 = "bf0fa325c588eacb758697ed13a4aba6416ce35f6cae31891ff4b5ea0296e094"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/81.0.2/linux-i686/hy-AM/firefox-81.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/82.0/linux-i686/hy-AM/firefox-82.0.tar.bz2"; locale = "hy-AM"; arch = "linux-i686"; - sha256 = "56c1537bbcfef3d8ad97e0b7da1e1043e19970cfab7e07a885227ec49ba59dd2"; + sha256 = "f45b28645f8dc656d291cbea9e969cca090014f1c4d508f2a0d8f500ce949066"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/81.0.2/linux-i686/ia/firefox-81.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/82.0/linux-i686/ia/firefox-82.0.tar.bz2"; locale = "ia"; arch = "linux-i686"; - sha256 = "dd883589df0819fc306357547cae94fd34c1ef7e9339fdd5376504c20974cf36"; + sha256 = "ac1ee6f6450f62fd4e0de61366b83a0fc8d7b7be5731591e83c4393ba2a6e9f6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/81.0.2/linux-i686/id/firefox-81.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/82.0/linux-i686/id/firefox-82.0.tar.bz2"; locale = "id"; arch = "linux-i686"; - sha256 = "ab9f57b1e501ddc8d5c4fe024cca69ce15f90b3229b9e76b75ee1cb7be8c5e90"; + sha256 = "8117c5e493362fba30de0cb27cd5a8ef7ab9b31655701b44c9ab06a6b73af60a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/81.0.2/linux-i686/is/firefox-81.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/82.0/linux-i686/is/firefox-82.0.tar.bz2"; locale = "is"; arch = "linux-i686"; - sha256 = "bde7a8f240f19a66cd7ccb26fce683e5c24311e9bb2fc41997a21b5ee5e7657f"; + sha256 = "118b2dac91511e0e68a7dee939f586a9d9b31cc117d6295053a6125fe7e3bf57"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/81.0.2/linux-i686/it/firefox-81.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/82.0/linux-i686/it/firefox-82.0.tar.bz2"; locale = "it"; arch = "linux-i686"; - sha256 = "a87a6924935472bca4d64944e7a5fd3545051a5dc00fe7a5e0d6fb2a92c79500"; + sha256 = "8680148fda005fd63ce5af1230060f7510a4b7b096da1f5dd864b9824990faff"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/81.0.2/linux-i686/ja/firefox-81.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/82.0/linux-i686/ja/firefox-82.0.tar.bz2"; locale = "ja"; arch = "linux-i686"; - sha256 = "871fe1476cf80f47725fc12a9bbd83dc9d13b7b4de87760c222053ba5a19f110"; + sha256 = "eedf01ce82bce136c03a62de3437b42e52280e87c8491133116926ec7481b7a0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/81.0.2/linux-i686/ka/firefox-81.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/82.0/linux-i686/ka/firefox-82.0.tar.bz2"; locale = "ka"; arch = "linux-i686"; - sha256 = "bed625be2113058fff0584e90ea89121420e08da234a93c5b57cc652d262fab2"; + sha256 = "63c060cb338ee1a0bec05fa8b3749f21503dd3d78548b5673fa4b44b64ef0536"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/81.0.2/linux-i686/kab/firefox-81.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/82.0/linux-i686/kab/firefox-82.0.tar.bz2"; locale = "kab"; arch = "linux-i686"; - sha256 = "0b591ee502c5cf52099891727b22a8f356663e941db796884e91f821e4d7925e"; + sha256 = "ba10887d808f197cffa458ba50d3cc7696be176dd088747a50adf676a0d1d666"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/81.0.2/linux-i686/kk/firefox-81.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/82.0/linux-i686/kk/firefox-82.0.tar.bz2"; locale = "kk"; arch = "linux-i686"; - sha256 = "dfbbe55d2e73cc42a83bcacaa35b83ffd2e2ff89cd26790e1b608e1980f8f7b5"; + sha256 = "c93f19c29f0a47854ec1b90e8e4e5e77a08f5c2a3589fd3753c9aa6ceb6d515e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/81.0.2/linux-i686/km/firefox-81.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/82.0/linux-i686/km/firefox-82.0.tar.bz2"; locale = "km"; arch = "linux-i686"; - sha256 = "f782024da8726a8869f34eb36d0a4a7401b9d9c2ec28a3c6906a9b21f4f32c3e"; + sha256 = "7066bcd6a37faaf5db2ff5eca5c1049cdd4a9a1c034133de866b7d9d97913c03"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/81.0.2/linux-i686/kn/firefox-81.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/82.0/linux-i686/kn/firefox-82.0.tar.bz2"; locale = "kn"; arch = "linux-i686"; - sha256 = "59276eaab00aea65992c316d258a68a3ff7bf6091fc3ab177b7e4f606b0bb78f"; + sha256 = "04d941f96c92525298e391a38ef24ee2d31411bd9f3d36ca2f667e3d400513e3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/81.0.2/linux-i686/ko/firefox-81.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/82.0/linux-i686/ko/firefox-82.0.tar.bz2"; locale = "ko"; arch = "linux-i686"; - sha256 = "b19e167a77285fcf700bf37d5299c0a9e925ec12b6e60d2810ea40acdbd025ae"; + sha256 = "b8fbf8316f2a3d93303ce52f63a08d7604ba8143d7bfbed6782912ab19609436"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/81.0.2/linux-i686/lij/firefox-81.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/82.0/linux-i686/lij/firefox-82.0.tar.bz2"; locale = "lij"; arch = "linux-i686"; - sha256 = "5db02844a49ffe997b47ed5bbccc43d2ccc9a4b4840c2df5ddd1d393995b820a"; + sha256 = "a655f743a2397f808fe514e0e86f6297c3a8ff113bdd360249309d449ff5444c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/81.0.2/linux-i686/lt/firefox-81.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/82.0/linux-i686/lt/firefox-82.0.tar.bz2"; locale = "lt"; arch = "linux-i686"; - sha256 = "cd72be1796eb92d61eab18adf1825fd319c5960b503f6e7fcf67dbbe02cc8c14"; + sha256 = "dd4f654d1c8dfaf0a318c5633865649a8298fa92fb71b7c66ed9369710df2ea8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/81.0.2/linux-i686/lv/firefox-81.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/82.0/linux-i686/lv/firefox-82.0.tar.bz2"; locale = "lv"; arch = "linux-i686"; - sha256 = "87f8d21918c1bf73940ee4ff095a454144421cbbdc78004677bd8d0b8b72c667"; + sha256 = "820f1c5d3da3ae84b0a0c80dca3210ee61024a23141fb2111b5e609843aeb55d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/81.0.2/linux-i686/mk/firefox-81.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/82.0/linux-i686/mk/firefox-82.0.tar.bz2"; locale = "mk"; arch = "linux-i686"; - sha256 = "63a6f39666c18417b34b48109b5a618aca896f48c3538b03495f56bed3769d5d"; + sha256 = "51991978ac9db66b157b6921941219ed6f2be3ed2ec9a1fd74933117a5708743"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/81.0.2/linux-i686/mr/firefox-81.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/82.0/linux-i686/mr/firefox-82.0.tar.bz2"; locale = "mr"; arch = "linux-i686"; - sha256 = "7dd84ad66b3b35a9c492456195d438b4f2c242df11df1820fdc5ddb4ff4cd082"; + sha256 = "1012cc8a38bb7a3250d2328af5c3afef05b8316137ecea20e3941bb1428a4d4f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/81.0.2/linux-i686/ms/firefox-81.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/82.0/linux-i686/ms/firefox-82.0.tar.bz2"; locale = "ms"; arch = "linux-i686"; - sha256 = "bfbd38c3cf2c611a7f7237bdf0a5a47bec27eb1e1ca160d5068e75c00a76180e"; + sha256 = "584504c48e0f0f28ba8b6dc5341743293b7f1795ea5c1c9a31c348c76cc62313"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/81.0.2/linux-i686/my/firefox-81.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/82.0/linux-i686/my/firefox-82.0.tar.bz2"; locale = "my"; arch = "linux-i686"; - sha256 = "b91368c19dea8b6d7b363e119d80254275a1d52b9e09519a04d65098e60a5258"; + sha256 = "5c4aa84945631ddb576f1a75120d5ccba9ec6d37f2ca7fa74fd673bfd3d4bd5b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/81.0.2/linux-i686/nb-NO/firefox-81.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/82.0/linux-i686/nb-NO/firefox-82.0.tar.bz2"; locale = "nb-NO"; arch = "linux-i686"; - sha256 = "bc78d4ad99fb475d99e4cab0d6a8821c40ee830346db8ded300b69b8a1265e02"; + sha256 = "d35d5cdf2b5ebb145c1c54a5e0d95501a38783a207d47e01eec4cf85a64541b5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/81.0.2/linux-i686/ne-NP/firefox-81.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/82.0/linux-i686/ne-NP/firefox-82.0.tar.bz2"; locale = "ne-NP"; arch = "linux-i686"; - sha256 = "607ec769d3454f4a4affc32d71105e7b8d900bdb7371a975760197e188d291dd"; + sha256 = "af2f8135a7913914752a0f759c98a078823c6824a76625a6be4077563dafd3f2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/81.0.2/linux-i686/nl/firefox-81.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/82.0/linux-i686/nl/firefox-82.0.tar.bz2"; locale = "nl"; arch = "linux-i686"; - sha256 = "4735ccd0cb2992d41fdd5e7280749db2027bb3d55b6aa9ebce2c1e9dc43af056"; + sha256 = "beac8d7493bca8319c04f36d8e60985ebefa8af716db9aedf253d7b1bca496d2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/81.0.2/linux-i686/nn-NO/firefox-81.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/82.0/linux-i686/nn-NO/firefox-82.0.tar.bz2"; locale = "nn-NO"; arch = "linux-i686"; - sha256 = "e95f876e30ba2e97f1567b085c47a960463c7c07bf2921f3f463f8fbd7bb05d3"; + sha256 = "62e2abdda830a869247220edc5d623dd40d463d96458980f2b1aa70352f45dc8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/81.0.2/linux-i686/oc/firefox-81.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/82.0/linux-i686/oc/firefox-82.0.tar.bz2"; locale = "oc"; arch = "linux-i686"; - sha256 = "730084b39df6915a98f5357973f7ceeca59761bcf29c909c6585f9199eb6191f"; + sha256 = "d670d46d4641e4b89b3e9fd09e226ebc9822d43c8611020e410c0a239ee6d3d6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/81.0.2/linux-i686/pa-IN/firefox-81.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/82.0/linux-i686/pa-IN/firefox-82.0.tar.bz2"; locale = "pa-IN"; arch = "linux-i686"; - sha256 = "7d068491ecece10331c56b5679fe5de69bdb7acce62f4d3292271202804a354d"; + sha256 = "244fd49efcb7579813b493904e63a889eaa832fa326b2da3fd4e5988bcee0294"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/81.0.2/linux-i686/pl/firefox-81.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/82.0/linux-i686/pl/firefox-82.0.tar.bz2"; locale = "pl"; arch = "linux-i686"; - sha256 = "ab6da3187d8f87cdb9ed42796ffb9d14c5d2710690694592c64e1eb249a995d3"; + sha256 = "31c4cbc76456d9e0d76ab98c997049d17940cc5f461941c72ba85e07b0859516"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/81.0.2/linux-i686/pt-BR/firefox-81.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/82.0/linux-i686/pt-BR/firefox-82.0.tar.bz2"; locale = "pt-BR"; arch = "linux-i686"; - sha256 = "34bed98380ea05205e5a83801004f694463bd505e400c596ff9183c89070b2fe"; + sha256 = "8c73c44493d265291f253ae7e739613a1cec1e82678021f3ee1738990eb101bd"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/81.0.2/linux-i686/pt-PT/firefox-81.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/82.0/linux-i686/pt-PT/firefox-82.0.tar.bz2"; locale = "pt-PT"; arch = "linux-i686"; - sha256 = "d1bcf96d674d52828baf8452dc620aeeaa5c5ad04b8f26fa74da3a2dd6d778ad"; + sha256 = "934e69f1c07b69c59c3e680ec7ab6d5e8bcf54e5a1e4bc32ef5782c15222544c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/81.0.2/linux-i686/rm/firefox-81.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/82.0/linux-i686/rm/firefox-82.0.tar.bz2"; locale = "rm"; arch = "linux-i686"; - sha256 = "25796de47983159ba7f95847b66d6f382492f8b00f0e7bc16476712daada071f"; + sha256 = "a825c9319954997f285370b4f13e20fe1b0eda62621b71570b2d7606e5a5668c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/81.0.2/linux-i686/ro/firefox-81.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/82.0/linux-i686/ro/firefox-82.0.tar.bz2"; locale = "ro"; arch = "linux-i686"; - sha256 = "6a454aa97f70e4ec91755caad76fc4f21f13d66faf26190404cc2a2ef8b837a1"; + sha256 = "df1de4c7dd186bd8b6558c6c4e902a1721ad3f73a40dd5163b82e98323931436"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/81.0.2/linux-i686/ru/firefox-81.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/82.0/linux-i686/ru/firefox-82.0.tar.bz2"; locale = "ru"; arch = "linux-i686"; - sha256 = "2e1f6b8ea95b4a98d9880bdb1f61ccad792e4fe3517dd780a52c5eed5b72adad"; + sha256 = "4c02fa376103c6fb69f2610045a5f922a6a305b11f92899e9d7f42725cfe9ad2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/81.0.2/linux-i686/si/firefox-81.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/82.0/linux-i686/si/firefox-82.0.tar.bz2"; locale = "si"; arch = "linux-i686"; - sha256 = "c75763f6d6bca7f86be911039a9efd686d8fb011bfcccdac056e2a12243947f4"; + sha256 = "bc429d437ede468610dfb4f807d7107a6a0f60b32c425d61cf13cbfb4f1aceed"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/81.0.2/linux-i686/sk/firefox-81.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/82.0/linux-i686/sk/firefox-82.0.tar.bz2"; locale = "sk"; arch = "linux-i686"; - sha256 = "0968c66cde907b5e61ce70b1dc1244687069dfde28921a9043d0ccd55182aca7"; + sha256 = "6e6620e108c4e6c0acafec1921ec4d99912dd0ca4d36d62cc5bef6127ca04c33"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/81.0.2/linux-i686/sl/firefox-81.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/82.0/linux-i686/sl/firefox-82.0.tar.bz2"; locale = "sl"; arch = "linux-i686"; - sha256 = "cc585166dbbf6baf0dbe2b9ceda53671738436c43d2af55a0672c37eb942add6"; + sha256 = "7aa6392e83496ebfba7b5ea4576aab2d28088c88558d88af74a588954bc5af20"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/81.0.2/linux-i686/son/firefox-81.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/82.0/linux-i686/son/firefox-82.0.tar.bz2"; locale = "son"; arch = "linux-i686"; - sha256 = "911d5fe53e9aa4937f3a697ee1e57b53b87e1ed92a6231086653e03ffd864411"; + sha256 = "3134725ede0ba297dc895b3682cc6ecf73931c0779a0fc979166f2ed652b6d4e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/81.0.2/linux-i686/sq/firefox-81.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/82.0/linux-i686/sq/firefox-82.0.tar.bz2"; locale = "sq"; arch = "linux-i686"; - sha256 = "d7ba2423fc741867add3d76c5b13768f0415f001f8f947c664610c06cd7736b2"; + sha256 = "33d3a6bcdcfb199360770c677849e064d3727f3629b34f9913faccd5f173c6bb"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/81.0.2/linux-i686/sr/firefox-81.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/82.0/linux-i686/sr/firefox-82.0.tar.bz2"; locale = "sr"; arch = "linux-i686"; - sha256 = "456e1cdc8d8c0a0fdf39730ff2a812f8bd7a2b61d94312494fadf1d4957bd593"; + sha256 = "b9ea179cc648bfb7688e5b21a0a5d128bd0247171b9e9114459a4ed7fe352281"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/81.0.2/linux-i686/sv-SE/firefox-81.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/82.0/linux-i686/sv-SE/firefox-82.0.tar.bz2"; locale = "sv-SE"; arch = "linux-i686"; - sha256 = "040f71f4cf9ca2d01c1c0dfe4a44389f41da0e2a595a827fe88e36a0013cc979"; + sha256 = "18227f53b7317262270f4ed973b080649d3011ea52ab434d56a09e91d750c8e3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/81.0.2/linux-i686/ta/firefox-81.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/82.0/linux-i686/ta/firefox-82.0.tar.bz2"; locale = "ta"; arch = "linux-i686"; - sha256 = "488cf25e731096c5ee1458f11adbe0c4b3cf3a665437827f2b27d79e5ca805dd"; + sha256 = "8c70c66802d6966e04462f934bfe16c94007209b4b6ecccbfe1cc044cd3c19d0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/81.0.2/linux-i686/te/firefox-81.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/82.0/linux-i686/te/firefox-82.0.tar.bz2"; locale = "te"; arch = "linux-i686"; - sha256 = "c79f19c5c2ec4e48a257bb98d4121fd95f284f97f7af4212adbb2663964b1c53"; + sha256 = "c36cd994a88688e3af5360f24bdc6a69960723bc2dd196f3d42ab8d6099abbfb"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/81.0.2/linux-i686/th/firefox-81.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/82.0/linux-i686/th/firefox-82.0.tar.bz2"; locale = "th"; arch = "linux-i686"; - sha256 = "4e27f5646e4d62ad70ebfc93a9603c3527ef570307ec4a8408f03bc9f72c662a"; + sha256 = "2ded98d2d5957ee42c665a1789ae4fbc549af60a08adf1e51baf7022db5f03cb"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/81.0.2/linux-i686/tl/firefox-81.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/82.0/linux-i686/tl/firefox-82.0.tar.bz2"; locale = "tl"; arch = "linux-i686"; - sha256 = "71c81c3b5f77364367aad6e004d4d455b01e7d3bbb21cd9c3e5fd7dfdb661f36"; + sha256 = "14135d1ae961084d7979bb3ee13fa50bb2f59d8ea9fe18400084aedcd6ca5388"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/81.0.2/linux-i686/tr/firefox-81.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/82.0/linux-i686/tr/firefox-82.0.tar.bz2"; locale = "tr"; arch = "linux-i686"; - sha256 = "3257a340958e658be49f4f2982e8feb8e932532a251e98b236406d370d873275"; + sha256 = "4ac2f0a8729427e508f9aaf3c6606145b84ea47009724a1d07c3182fbeb4678b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/81.0.2/linux-i686/trs/firefox-81.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/82.0/linux-i686/trs/firefox-82.0.tar.bz2"; locale = "trs"; arch = "linux-i686"; - sha256 = "914af864af7d51d31abdbec4a1112828d51ffd83ee6a39bbf9f5ec0223ae4ef9"; + sha256 = "c7bf44d74cead7b7a5d44bb16331a113d8fb630c0bfa9740045ecc5d6858a099"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/81.0.2/linux-i686/uk/firefox-81.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/82.0/linux-i686/uk/firefox-82.0.tar.bz2"; locale = "uk"; arch = "linux-i686"; - sha256 = "7cff7f0f3d6b586c19d9370e78e6e0ab50a99af62b40de7a44318f5ca929db59"; + sha256 = "7a796554c241f21c16573f20b2b1907a4f7af4cccf441739b9826e2140f640cf"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/81.0.2/linux-i686/ur/firefox-81.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/82.0/linux-i686/ur/firefox-82.0.tar.bz2"; locale = "ur"; arch = "linux-i686"; - sha256 = "b1d17f6434fb7b44576c29e6d1b2c2b3944e27fc8b3aaecf9739c4a653ecd865"; + sha256 = "8d5bdda725bad1479c32a18504fb584ac290f94e994b4c00a0686bb09bfb6913"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/81.0.2/linux-i686/uz/firefox-81.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/82.0/linux-i686/uz/firefox-82.0.tar.bz2"; locale = "uz"; arch = "linux-i686"; - sha256 = "3cdd2f764c88fe4a85bd32728f4ff47eb452e14c506f38f891added89fd45a0a"; + sha256 = "699bf3bd19bc7f4f213791ef2bd7ce8db0693928be611b952c6c8b34861efae1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/81.0.2/linux-i686/vi/firefox-81.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/82.0/linux-i686/vi/firefox-82.0.tar.bz2"; locale = "vi"; arch = "linux-i686"; - sha256 = "ce2a5cac99bb86adc793ac6c980432a3c1c1bd6150df856088b0cc49cd8b618c"; + sha256 = "731e97ab6e96cf3da549b1cd954fbd4c48112ba12792bf1b94f9ce5628505c47"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/81.0.2/linux-i686/xh/firefox-81.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/82.0/linux-i686/xh/firefox-82.0.tar.bz2"; locale = "xh"; arch = "linux-i686"; - sha256 = "a943db84bba8823112738999cb31dafd20d076de62bc44ac9e2b8f2a793ab283"; + sha256 = "0078f3303b80aa63b1f664c49255077632729a5461b74a875e8cfb0ce3a23bb9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/81.0.2/linux-i686/zh-CN/firefox-81.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/82.0/linux-i686/zh-CN/firefox-82.0.tar.bz2"; locale = "zh-CN"; arch = "linux-i686"; - sha256 = "23a2662b2844e45cacb038f8fcc1a2647d1b03df6d7ff346c8600c08f6772dcb"; + sha256 = "fe9cb3a43e12c64aa12e40e8f52651e1c4ef09a52bbb51a3492acf8a535172c1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/81.0.2/linux-i686/zh-TW/firefox-81.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/82.0/linux-i686/zh-TW/firefox-82.0.tar.bz2"; locale = "zh-TW"; arch = "linux-i686"; - sha256 = "dfb5d0725fe50346dc551c407d38574a696e8f10373de73d47252ec283d1b256"; + sha256 = "020b7887120b134c127d444b59a5ce052fffd7653fffacaec9b0e4902e86158a"; } ]; } diff --git a/third_party/nixpkgs/pkgs/applications/networking/browsers/firefox-bin/update.nix b/third_party/nixpkgs/pkgs/applications/networking/browsers/firefox-bin/update.nix index 03815a7033..018bf04cb5 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/browsers/firefox-bin/update.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/browsers/firefox-bin/update.nix @@ -23,8 +23,10 @@ in writeScript "update-${name}" '' set -eux pushd ${basePath} + HOME=`mktemp -d` export GNUPGHOME=`mktemp -d` - gpg --keyserver hkps://gpg.mozilla.org --recv-keys 14F26682D0916CDD81E37B6D61B7B526D98F0353 + + gpg --import ${./mozilla.asc} tmpfile=`mktemp` url=${baseUrl} @@ -53,7 +55,7 @@ in writeScript "update-${name}" '' # this is a list of sha256 and tarballs for both arches # Upstream files contains python repr strings like b'somehash', hence the sed dance - shasums=`cat $HOME/shasums | sed -E s/"b'([a-f0-9]{64})'?(.*)"/'\1\2'/` + shasums=`cat $HOME/shasums | sed -E s/"b'([a-f0-9]{64})'?(.*)"/'\1\2'/ | grep tar.bz2` cat > $tmpfile < $out/share/applications/nyxt.desktop + for i in 16 32 128 256 512; do + mkdir -p "$out/share/icons/hicolor/''${i}x''${i}/apps/" + cp -f $src/lib/common-lisp/nyxt/assets/nyxt_''${i}x''${i}.png "$out/share/icons/hicolor/''${i}x''${i}/apps/nyxt.png" + done + + mkdir -p $out/bin && makeWrapper $src/bin/nyxt $out/bin/nyxt \ + --prefix GST_PLUGIN_SYSTEM_PATH_1_0 : "${GST_PLUGIN_SYSTEM_PATH_1_0}" \ + --argv0 nyxt "''${gappsWrapperArgs[@]}" + ''; + + checkPhase = '' + $out/bin/nyxt -h + ''; + + meta = with stdenv.lib; { + description = "Infinitely extensible web-browser (with Lisp development files using WebKitGTK platform port)"; + homepage = "https://nyxt.atlas.engineer"; + license = licenses.bsd3; + maintainers = with maintainers; [ lewo ]; + platforms = [ "x86_64-linux" ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix b/third_party/nixpkgs/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix index 52f2d51fb6..d362e4c9b2 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix @@ -91,19 +91,19 @@ let fteLibPath = makeLibraryPath [ stdenv.cc.cc gmp ]; # Upstream source - version = "10.0.1"; + version = "10.0.2"; lang = "en-US"; srcs = { x86_64-linux = fetchurl { url = "https://dist.torproject.org/torbrowser/${version}/tor-browser-linux64-${version}_${lang}.tar.xz"; - sha256 = "0c71dl1afl9dwpry2vshlf87pl1gfb7wrccxgqxf7mlkcir8xjcq"; + sha256 = "sha256-JBJDMC44VSh1ekXPxsVvFk5nOB8Ro4UGtD32pG1weP8="; }; i686-linux = fetchurl { url = "https://dist.torproject.org/torbrowser/${version}/tor-browser-linux32-${version}_${lang}.tar.xz"; - sha256 = "1cf9z2li4ip0xpfn892icq4415dvp60ncdwfkfpih82jlvyxnhi1"; + sha256 = "sha256-EanW2Q8TtCPY5FSp8zfgBXMte9+RfKE24fu8ROtArK0="; }; }; in diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/argo/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/argo/default.nix index b370381b90..49b45308ce 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/argo/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/argo/default.nix @@ -19,13 +19,13 @@ let in buildGoModule rec { pname = "argo"; - version = "2.11.5"; + version = "2.11.6"; src = fetchFromGitHub { owner = "argoproj"; repo = "argo"; rev = "v${version}"; - sha256 = "0p72v6bb2hbw2xndrzr13zkc91i1jcd67x4qgai136hp9mv97bk3"; + sha256 = "1vlz1f4hyzgz1x9xgzlmpnbjba8xyhpx9ybia0pwilfg7mwfq92r"; }; vendorSha256 = "1ca0ssvbi4vrsn9ljc783hnh9bmf5p8nr1lz5wm8g3gbrrrf1ray"; diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/helmsman/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/helmsman/default.nix index 19c7234e11..d4f1e82d51 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/helmsman/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/helmsman/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "helmsman"; - version = "3.4.4"; + version = "3.4.6"; src = fetchFromGitHub { owner = "Praqma"; repo = "helmsman"; rev = "v${version}"; - sha256 = "01vjghak2szif0p82kall5jw7mbfh4fg7fcjkblmic7l0vlqhfac"; + sha256 = "018bkl6q6q8njv9qy87affs0g6c716vmhcqv2czv8qz454hn7i5h"; }; vendorSha256 = "05vnysr5r3hbayss1pyifgp989kjw81h95iack8ady62k6ys5njl"; diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/kops/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/kops/default.nix index baf10e273f..a81c33a84b 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/kops/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/kops/default.nix @@ -64,8 +64,8 @@ rec { }; kops_1_18 = mkKops rec { - version = "1.18.1"; - sha256 = "0jw23vmq2v9czxyansggq4fapz1bcaclmxpw6na4dsn8zcssz320"; + version = "1.18.2"; + sha256 = "17na83j6sfhk69w9ssvicc0xd1904z952ad3zzbpha50lcy6nlhp"; rev = "v${version}"; }; } diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/minikube/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/minikube/default.nix index ff6e152a5f..299c1fb523 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/minikube/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/minikube/default.nix @@ -11,9 +11,9 @@ buildGoModule rec { pname = "minikube"; - version = "1.14.0"; + version = "1.14.1"; - vendorSha256 = "03imagmsfj9rv5g2sybpdx9y7vdwag3mrsjibgsbq3jhf7r1ib3g"; + vendorSha256 = "057mlmja3mygfdf0cp0bcm0chq7s30bjcs5hqacwl6c79ivrjf89"; doCheck = false; @@ -21,7 +21,7 @@ buildGoModule rec { owner = "kubernetes"; repo = "minikube"; rev = "v${version}"; - sha256 = "1nwpgfgw3vg8zy3mvjja13vdj12mys4crdm8cfimv9g3ka08dqpx"; + sha256 = "000i30qsjx1h2x6b8vb5piq9lhjrz5hj9wza7gxsrzsf2z9rhryg"; }; nativeBuildInputs = [ go-bindata installShellFiles pkg-config which ]; diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/sonobuoy/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/sonobuoy/default.nix index 32dbced0a4..c111f7eccf 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/sonobuoy/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/sonobuoy/default.nix @@ -1,13 +1,13 @@ -{ lib, buildGoPackage, fetchFromGitHub }: +{ lib, buildGoModule, fetchFromGitHub }: # SHA of ${version} for the tool's help output -let rev = "c9c2a461cd3397909fe6e45ff71836347ef89fd8"; +let rev = "e03f9ee353717ccc5f58c902633553e34b2fe46a"; in -buildGoPackage rec { +buildGoModule rec { pname = "sonobuoy"; - version = "0.16.1"; + version = "0.19.0"; - goPackagePath = "github.com/heptio/sonobuoy"; + goPackagePath = "github.com/vmware-tanzu/sonobuoy"; buildFlagsArray = let t = goPackagePath; @@ -19,12 +19,16 @@ buildGoPackage rec { ''; src = fetchFromGitHub { - sha256 = "14qc5a7jbr403wjpk6pgpb94i72yx647sg9srz07q6drq650kyfv"; + sha256 = "1gw58a30akidk15wk8kk7f8lsyqr1q180j6fzr4462ahwxdbjgkr"; rev = "v${version}"; repo = "sonobuoy"; owner = "vmware-tanzu"; }; + vendorSha256 = "1kxzd4czv8992y7y47la5jjrbhk76sxcj3v5sx0k4xplgki7np6i"; + + subPackages = [ "." ]; + meta = with lib; { description = '' Diagnostic tool that makes it easier to understand the @@ -38,6 +42,6 @@ buildGoPackage rec { homepage = "https://sonobuoy.io"; license = licenses.asl20; - maintainers = with maintainers; [ carlosdagos saschagrunert ]; + maintainers = with maintainers; [ carlosdagos saschagrunert wilsonehusin ]; }; } diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/tektoncd-cli/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/tektoncd-cli/default.nix new file mode 100644 index 0000000000..1e2a21d466 --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/tektoncd-cli/default.nix @@ -0,0 +1,47 @@ +{ lib, buildGoModule, fetchFromGitHub, installShellFiles }: + +buildGoModule rec { + pname = "tektoncd-cli"; + version = "0.13.1"; + + src = fetchFromGitHub { + owner = "tektoncd"; + repo = "cli"; + rev = "v${version}"; + sha256 = "0cjih8h64wwdp022pn70xqxafdk34z2y2ipxb86dlf2zdrf9xv53"; + }; + + vendorSha256 = null; + + doCheck = false; + + nativeBuildInputs = [ installShellFiles ]; + + buildPhase = '' + make bin/tkn + ''; + + installPhase = '' + install bin/tkn -Dt $out/bin + + mkdir -p "$out/share/man/man1" + cp docs/man/man1/* "$out/share/man/man1" + + # TODO: Move to enhanced installShellCompletion when merged: PR #83630 + $out/bin/tkn completion bash > tkn.bash + $out/bin/tkn completion zsh > _tkn + installShellCompletion tkn.bash --zsh _tkn + ''; + + meta = with lib; { + description = "The Tekton Pipelines cli project provides a CLI for interacting with Tekton"; + homepage = "https://tekton.dev"; + longDescription = '' + The Tekton Pipelines cli project provides a CLI for interacting with Tekton! + For your convenience, it is recommended that you install the Tekton CLI, tkn, together with the core component of Tekton, Tekton Pipelines. + ''; + license = licenses.asl20; + maintainers = with maintainers; [ jk mstrangfeld ]; + platforms = platforms.linux ++ platforms.darwin; + }; +} diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/terraform-providers/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/terraform-providers/default.nix index 73fc6df024..24c6dd21cd 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/terraform-providers/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/terraform-providers/default.nix @@ -149,6 +149,16 @@ let ''; }); + # provider was moved to the `vultr` organization, but kept the old references: + # https://github.com/vultr/terraform-provider-vultr/pull/67 + # this override should be removed as soon as new version (>1.4.1) is released. + vultr = automated-providers.vultr.overrideAttrs (attrs: { + prePatch = attrs.prePatch or "" + '' + substituteInPlace go.mod --replace terraform-providers/terraform-provider-vultr vultr/terraform-provider-vultr + substituteInPlace main.go --replace terraform-providers/terraform-provider-vultr vultr/terraform-provider-vultr + ''; + }); + # Packages that don't fit the default model ansible = callPackage ./ansible {}; elasticsearch = callPackage ./elasticsearch {}; diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/terraform-providers/providers.json b/third_party/nixpkgs/pkgs/applications/networking/cluster/terraform-providers/providers.json index c49f4cd2b1..bd7c50dba2 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -328,9 +328,9 @@ "github": { "owner": "terraform-providers", "repo": "terraform-provider-github", - "rev": "v2.8.0", - "sha256": "11aw9wqnayl786hvbgnb9ijijaipaggj18vkn5y0kcj2v4dwq4wg", - "version": "2.8.0" + "rev": "v3.1.0", + "sha256": "1xl4fd1lfbn1vnrdmg2xljnv8hy6rmf0iv7g8pzbnzbvj2pi7w3b", + "version": "3.1.0" }, "gitlab": { "owner": "terraform-providers", @@ -1014,11 +1014,11 @@ "version": "0.1.0" }, "vultr": { - "owner": "terraform-providers", + "owner": "vultr", "repo": "terraform-provider-vultr", - "rev": "v1.3.0", - "sha256": "0swc2fvp83d6w0cqvyxs346c756wr48xbn8m8jqkmma5s4ab2y4k", - "version": "1.3.0" + "rev": "v1.4.1", + "sha256": "1jx9p4bwpa5zxig6gfk4akfsnbivvyhwcw8id2ch2ga9a67pwald", + "version": "1.4.1" }, "wavefront": { "owner": "terraform-providers", diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/terraform/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/terraform/default.nix index 6153eaa145..b73f24ed47 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/terraform/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/terraform/default.nix @@ -157,8 +157,8 @@ in rec { }); terraform_0_13 = pluggable (generic { - version = "0.13.4"; - sha256 = "1yvcz14q82v9jq4b9knn6wgnhlhrsz2ncvxv4lh9y1avn56chsqc"; + version = "0.13.5"; + sha256 = "1fnydzm5h65pdy2gkq403sllx05cvpldkdzdpcy124ywljb4x9d8"; patches = [ ./provider-path.patch ]; passthru = { inherit plugins; }; }); diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/terragrunt/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/terragrunt/default.nix index 0281a72113..e3f2adacfb 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/terragrunt/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/terragrunt/default.nix @@ -1,17 +1,17 @@ -{ stdenv, lib, buildGoModule, fetchFromGitHub, terraform, makeWrapper }: +{ lib, buildGoModule, fetchFromGitHub, makeWrapper, terraform }: buildGoModule rec { pname = "terragrunt"; - version = "0.25.4"; + version = "0.25.5"; src = fetchFromGitHub { owner = "gruntwork-io"; repo = pname; rev = "v${version}"; - sha256 = "1c8rfx7sks8j74f3jjsl5azkhi7jvcfp8lmd9z553nal4fy8ksb6"; + sha256 = "19rsnhws4cvssxjmm22j746jck0wzrhwi24hnlwxkdaaw92yd36l"; }; - vendorSha256 = "0f466qn5vp74mwx9s4rcbw1x793w8hr5dcf2c12sgshya1bxs4nl"; + vendorSha256 = "0l85jx02dj9qvxs8l0ln5fln8vssi0fisblm5i1scz9x4a1jqg9n"; doCheck = false; @@ -24,10 +24,10 @@ buildGoModule rec { --set TERRAGRUNT_TFPATH ${lib.getBin terraform.full}/bin/terraform ''; - meta = with stdenv.lib; { + meta = with lib; { description = "A thin wrapper for Terraform that supports locking for Terraform state and enforces best practices"; homepage = "https://github.com/gruntwork-io/terragrunt/"; license = licenses.mit; - maintainers = with maintainers; [ peterhoeg ]; + maintainers = with maintainers; [ peterhoeg jk ]; }; } diff --git a/third_party/nixpkgs/pkgs/applications/networking/google-drive-ocamlfuse/default.nix b/third_party/nixpkgs/pkgs/applications/networking/google-drive-ocamlfuse/default.nix index ac6ad4f22f..b9b1c1f54a 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/google-drive-ocamlfuse/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/google-drive-ocamlfuse/default.nix @@ -1,25 +1,27 @@ -{ stdenv, buildDunePackage, fetchFromGitHub -, ocamlfuse, gapi_ocaml, ocaml_sqlite3 +{ lib, buildDunePackage, fetchFromGitHub +, ocaml_extlib, ocamlfuse, gapi_ocaml, ocaml_sqlite3 }: buildDunePackage rec { pname = "google-drive-ocamlfuse"; - version = "0.7.21"; + version = "0.7.22"; + + useDune2 = true; src = fetchFromGitHub { owner = "astrada"; repo = "google-drive-ocamlfuse"; rev = "v${version}"; - sha256 = "0by3qnjrr1mbxyl2n99zggx8dxnqlicsq2b2hhhxb2d0k8qn47sw"; + sha256 = "027j1r2iy8vnbqs8bv893f0909yk5312ki5p3zh2pdz6s865h750"; }; - buildInputs = [ ocamlfuse gapi_ocaml ocaml_sqlite3 ]; + buildInputs = [ ocaml_extlib ocamlfuse gapi_ocaml ocaml_sqlite3 ]; meta = { - homepage = "http://gdfuse.forge.ocamlcore.org/"; + inherit (src.meta) homepage; description = "A FUSE-based file system backed by Google Drive, written in OCaml"; - license = stdenv.lib.licenses.mit; - platforms = stdenv.lib.platforms.linux; - maintainers = with stdenv.lib.maintainers; [ obadz ]; + license = lib.licenses.mit; + platforms = lib.platforms.linux; + maintainers = with lib.maintainers; [ obadz ]; }; } diff --git a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/bitlbee-facebook/default.nix b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/bitlbee-facebook/default.nix index 07e7b74a43..1a8110acac 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/bitlbee-facebook/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/bitlbee-facebook/default.nix @@ -3,13 +3,13 @@ with stdenv.lib; stdenv.mkDerivation rec { pname = "bitlbee-facebook"; - version = "1.2.0"; + version = "1.2.1"; src = fetchFromGitHub { rev = "v${version}"; owner = "bitlbee"; repo = "bitlbee-facebook"; - sha256 = "11068zhb1v55b1x0nhjc4f3p0glccxpcyk5c1630hfdzkj7vyqhn"; + sha256 = "1yjhjhk3jzjip13lq009vlg84lm2lzwhac5jy0aq3vkcz6rp94rc"; }; nativeBuildInputs = [ autoconf automake libtool pkgconfig ]; diff --git a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/element/element-desktop-package.json b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/element/element-desktop-package.json index 287c864d39..05f7af3324 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/element/element-desktop-package.json +++ b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/element/element-desktop-package.json @@ -2,7 +2,7 @@ "name": "element-desktop", "productName": "Element", "main": "src/electron-main.js", - "version": "1.7.9", + "version": "1.7.10", "description": "A feature-rich client for Matrix.org", "author": "Element", "repository": { diff --git a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/element/element-desktop.nix b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/element/element-desktop.nix index 5b537b2b7b..cb5e598c12 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/element/element-desktop.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/element/element-desktop.nix @@ -8,12 +8,12 @@ let executableName = "element-desktop"; - version = "1.7.9"; + version = "1.7.10"; src = fetchFromGitHub { owner = "vector-im"; repo = "riot-desktop"; rev = "v${version}"; - sha256 = "0hk9y6zzabfdi35fqzl9987d98a6k74fi0mzmhhvhvvpj8i1ldrn"; + sha256 = "06ygqfhbsld4s274kakb6a5nx75jki44r8lwk3n0pi5mnkn626gl"; }; electron = electron_9; diff --git a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/element/element-web.nix b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/element/element-web.nix index 25e62423ea..a71bc08637 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/element/element-web.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/element/element-web.nix @@ -12,11 +12,11 @@ let in stdenv.mkDerivation rec { pname = "element-web"; - version = "1.7.9"; + version = "1.7.10"; src = fetchurl { url = "https://github.com/vector-im/riot-web/releases/download/v${version}/riot-v${version}.tar.gz"; - sha256 = "00ch486npqgrwmgfd7bsi6wb9ac6dpv08n13lygn45gha37l1kx1"; + sha256 = "1xcvydjpdp6cy5g0da5yaa49gjxsmf4hsyi2q4l3p8qvs4qajn0r"; }; installPhase = '' diff --git a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix index 69b3357b7d..5603ff13b1 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix @@ -25,7 +25,7 @@ let else ""); in stdenv.mkDerivation rec { pname = "signal-desktop"; - version = "1.37.1"; # Please backport all updates to the stable channel. + version = "1.37.2"; # Please backport all updates to the stable channel. # All releases have a limited lifetime and "expire" 90 days after the release. # When releases "expire" the application becomes unusable until an update is # applied. The expiration date for the current release can be extracted with: @@ -35,7 +35,7 @@ in stdenv.mkDerivation rec { src = fetchurl { url = "https://updates.signal.org/desktop/apt/pool/main/s/signal-desktop/signal-desktop_${version}_amd64.deb"; - sha256 = "0zj068wkgb0k7iq4ld0lb06vk2zlsvv5pf0csr4zkzkq0hgzx33s"; + sha256 = "0n4g2fh1ibw6fl5vbnnchx2vafasqrq8rl9w0ch7lai665zkxsk3"; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/skypeforlinux/default.nix b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/skypeforlinux/default.nix index bc5fa0e1f1..b7aa2d845b 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/skypeforlinux/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/skypeforlinux/default.nix @@ -7,7 +7,7 @@ let # Please keep the version x.y.0.z and do not update to x.y.76.z because the # source of the latter disappears much faster. - version = "8.64.0.81"; + version = "8.65.0.78"; rpath = stdenv.lib.makeLibraryPath [ alsaLib @@ -65,7 +65,7 @@ let "https://mirror.cs.uchicago.edu/skype/pool/main/s/skypeforlinux/skypeforlinux_${version}_amd64.deb" "https://web.archive.org/web/https://repo.skype.com/deb/pool/main/s/skypeforlinux/skypeforlinux_${version}_amd64.deb" ]; - sha256 = "0p6sp45kabm97p3hp3wp087b3k42m26ji99kzhpsz3n9vzjiczjh"; + sha256 = "04qcpz3w2clpa23axh0xx68rm792d2l029r3wy1hfzbxd51z09lh"; } else throw "Skype for linux is not supported on ${stdenv.hostPlatform.system}"; diff --git a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/ssh-chat/default.nix b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/ssh-chat/default.nix index 5806a26910..e964c654c7 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/ssh-chat/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/ssh-chat/default.nix @@ -2,7 +2,7 @@ buildGoPackage rec { pname = "ssh-chat"; - version = "1.9"; + version = "1.10"; goPackagePath = "github.com/shazow/ssh-chat"; @@ -10,7 +10,7 @@ buildGoPackage rec { owner = "shazow"; repo = "ssh-chat"; rev = "v${version}"; - sha256 = "04yszan6a7x9498s80xymf7wd10530yjrxcdw4czbplyhjdigxlg"; + sha256 = "e4COAyheY+mE5zltR1Ms2OJ3I8iG/N1CZ6D7I9PDW5U="; }; goDeps = ./deps.nix; diff --git a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix index a1a1103b4f..379922ee58 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix @@ -1,5 +1,5 @@ { mkDerivation, lib, fetchurl, callPackage -, pkgconfig, cmake, ninja, python3, wrapGAppsHook, wrapQtAppsHook +, pkgconfig, cmake, ninja, python3, wrapGAppsHook, wrapQtAppsHook, removeReferencesTo , qtbase, qtimageformats, gtk3, libsForQt5, enchant2, lz4, xxHash , dee, ffmpeg, openalSoft, minizip, libopus, alsaLib, libpulseaudio, range-v3 , tl-expected, hunspell @@ -22,12 +22,12 @@ let in mkDerivation rec { pname = "telegram-desktop"; - version = "2.4.3"; + version = "2.4.4"; # Telegram-Desktop with submodules src = fetchurl { url = "https://github.com/telegramdesktop/tdesktop/releases/download/v${version}/tdesktop-${version}-full.tar.gz"; - sha256 = "15a8pnz4wf3464n8dvfzr9ck0vmhlx16ya1y889y3crjagm4ipjn"; + sha256 = "09lhikaybf57rki62miqcaxxrdg1ni2rj9aj4w9mrbzdv849fyc8"; }; postPatch = '' @@ -41,7 +41,7 @@ in mkDerivation rec { dontWrapGApps = true; dontWrapQtApps = true; - nativeBuildInputs = [ pkgconfig cmake ninja python3 wrapGAppsHook wrapQtAppsHook ]; + nativeBuildInputs = [ pkgconfig cmake ninja python3 wrapGAppsHook wrapQtAppsHook removeReferencesTo ]; buildInputs = [ qtbase qtimageformats gtk3 libsForQt5.libdbusmenu enchant2 lz4 xxHash @@ -81,8 +81,7 @@ in mkDerivation rec { postFixup = '' # Nuke refs to `tg_owt` which is introduced by `__FILE__` in headers. - sed -E "s|($NIX_STORE/)[a-z0-9]{32}(-${tg_owt.name})|\1eeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee\2|g" \ - --in-place $out/bin/telegram-desktop + remove-references-to -t ${tg_owt} $out/bin/telegram-desktop # This is necessary to run Telegram in a pure environment. # We also use gappsWrapperArgs from wrapGAppsHook. diff --git a/third_party/nixpkgs/pkgs/applications/networking/mailreaders/alpine/default.nix b/third_party/nixpkgs/pkgs/applications/networking/mailreaders/alpine/default.nix index a85e4e4d04..83c2f3ca7a 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/mailreaders/alpine/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/mailreaders/alpine/default.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { pname = "alpine"; - version = "2.23"; + version = "2.24"; src = fetchurl { url = "http://alpine.x10host.com/alpine/release/src/${pname}-${version}.tar.xz"; - sha256 = "0yqzm56lqgg8v66m09vqxjvpclli4pql5xj8zg7mynq0bhhn2fkr"; + sha256 = "1vxw19nx10y7nx01d9i6gah2f3y5r2idbq56l13bdqi91bx9y6k5"; }; buildInputs = [ diff --git a/third_party/nixpkgs/pkgs/applications/networking/mailreaders/inboxer/default.nix b/third_party/nixpkgs/pkgs/applications/networking/mailreaders/inboxer/default.nix index 189ac1e6aa..a11e576369 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/mailreaders/inboxer/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/mailreaders/inboxer/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, binutils, patchelf, makeWrapper -, expat, xorg, gdk-pixbuf, glib, gnome2, cairo, atk, freetype +, expat, xorg, gdk-pixbuf, glib, gnome2, cairo, atk, freetype, pango , fontconfig, dbus, nss, nspr, gtk2-x11, alsaLib, cups, libpulseaudio, udev }: stdenv.mkDerivation rec { @@ -51,7 +51,7 @@ stdenv.mkDerivation rec { xorg.libxcb gdk-pixbuf glib - gnome2.pango + pango gnome2.GConf expat stdenv.cc.cc.lib diff --git a/third_party/nixpkgs/pkgs/applications/networking/mailreaders/thunderbird-bin/release_sources.nix b/third_party/nixpkgs/pkgs/applications/networking/mailreaders/thunderbird-bin/release_sources.nix index da4445ff32..3ffd171295 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/mailreaders/thunderbird-bin/release_sources.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/mailreaders/thunderbird-bin/release_sources.nix @@ -1,665 +1,665 @@ { - version = "78.3.3"; + version = "78.4.0"; sources = [ - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.3.3/linux-x86_64/af/thunderbird-78.3.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.0/linux-x86_64/af/thunderbird-78.4.0.tar.bz2"; locale = "af"; arch = "linux-x86_64"; - sha256 = "a642dc83f38dd55cf53b2c1bab5047b4ab22d8ba81c94cd7b8569b73665fd2c3"; + sha256 = "589fe4c9a7ceffb4d027f493e0b074647bb958a62046deef5b8268fd43e6aae9"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.3.3/linux-x86_64/ar/thunderbird-78.3.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.0/linux-x86_64/ar/thunderbird-78.4.0.tar.bz2"; locale = "ar"; arch = "linux-x86_64"; - sha256 = "a137ad7aacb57196350e82b80aa8316c77e55c3ee1c45daa025ef2006320a7fd"; + sha256 = "b94d46899a7458f9c94849db71975e0028004bf93d5b0695a454fbac24a41ec6"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.3.3/linux-x86_64/ast/thunderbird-78.3.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.0/linux-x86_64/ast/thunderbird-78.4.0.tar.bz2"; locale = "ast"; arch = "linux-x86_64"; - sha256 = "8120fed1e1228d8dbf332cfa46152714bd9b52c898b02794d6c81a4f46dae360"; + sha256 = "c6057f5e2937a05f84decc3c2f26de4555314c627210a961882773b2c745ddbf"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.3.3/linux-x86_64/be/thunderbird-78.3.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.0/linux-x86_64/be/thunderbird-78.4.0.tar.bz2"; locale = "be"; arch = "linux-x86_64"; - sha256 = "20a36150e399a8471ff1cda2b31db79218afc4eacda04b432e946708b93e9c08"; + sha256 = "94d7bd38e35745f4829abe6cf3ada8e947a2df881dcb1e5f6ef823bbd6e0aa75"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.3.3/linux-x86_64/bg/thunderbird-78.3.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.0/linux-x86_64/bg/thunderbird-78.4.0.tar.bz2"; locale = "bg"; arch = "linux-x86_64"; - sha256 = "b322427574e3d3e8e96fc7550ac68b54ca57ea5568b0e159304b5a5436529253"; + sha256 = "d482c6a6873ddb34dc49002b8ecac94e82579fde7d24514500f2de28fc777e18"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.3.3/linux-x86_64/br/thunderbird-78.3.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.0/linux-x86_64/br/thunderbird-78.4.0.tar.bz2"; locale = "br"; arch = "linux-x86_64"; - sha256 = "1dd56ad96720503f4b7250efba31d8364ca747233f47450f6446f003b34319dc"; + sha256 = "18fc5e174942874ecc41838451aec780485a263584121decfb9f9607ee35322c"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.3.3/linux-x86_64/ca/thunderbird-78.3.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.0/linux-x86_64/ca/thunderbird-78.4.0.tar.bz2"; locale = "ca"; arch = "linux-x86_64"; - sha256 = "1d1481f9bd01a849f0c6efc15c08a9536aad205d89b0e09facd55a0eb937e8df"; + sha256 = "269762ee175f69ecc9ffdeab2ad66788d24d2b9ba1e8d05f74ff222848077735"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.3.3/linux-x86_64/cak/thunderbird-78.3.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.0/linux-x86_64/cak/thunderbird-78.4.0.tar.bz2"; locale = "cak"; arch = "linux-x86_64"; - sha256 = "c94547846047671ad7478d3475d2fcffb4c3939a38cfcaa843e56b59ff8a40dc"; + sha256 = "735baa9541d1dfad828db27a2cba54caa681973f792c0712300e4f952803dbfb"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.3.3/linux-x86_64/cs/thunderbird-78.3.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.0/linux-x86_64/cs/thunderbird-78.4.0.tar.bz2"; locale = "cs"; arch = "linux-x86_64"; - sha256 = "a0dcc3a38b0b698c727ebb10a5c388789be407ba314d9266b3edacfa0a0598c8"; + sha256 = "04763e1461106c76b51c31522de9bd6376d531c9f93e79d4a4c00d5bacb9de29"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.3.3/linux-x86_64/cy/thunderbird-78.3.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.0/linux-x86_64/cy/thunderbird-78.4.0.tar.bz2"; locale = "cy"; arch = "linux-x86_64"; - sha256 = "e61cb6c0c075437c3c78a5d67ce45953d313ca12cb8379494f376772e1fa2d34"; + sha256 = "974885f8e17be1b744f65c0e392747921508d7e0f286ab9fa20580cc205a56ee"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.3.3/linux-x86_64/da/thunderbird-78.3.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.0/linux-x86_64/da/thunderbird-78.4.0.tar.bz2"; locale = "da"; arch = "linux-x86_64"; - sha256 = "7f6494ccd41603208acdfcb5f9ae5055de5ffb4216b775b5dfeb1814e499a88b"; + sha256 = "f0e13b8952478b5ebc46552405421b796d645fbb0a16aa759a045b48fd43739d"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.3.3/linux-x86_64/de/thunderbird-78.3.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.0/linux-x86_64/de/thunderbird-78.4.0.tar.bz2"; locale = "de"; arch = "linux-x86_64"; - sha256 = "37b7853bdbde0ee0c16aece73c986ca59f1575e43f0f14358c574c9c01db44f9"; + sha256 = "735eb8e1d318e09d9dca6560074960cf9ce2fcd5a720754608886f6e51e87266"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.3.3/linux-x86_64/dsb/thunderbird-78.3.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.0/linux-x86_64/dsb/thunderbird-78.4.0.tar.bz2"; locale = "dsb"; arch = "linux-x86_64"; - sha256 = "2c4ff1f46de1cb7efd0543e41a249884e0446833512e68517976b7c6b77bcead"; + sha256 = "b1b5fad405049cc62784dbb6e938cce6492df3b620c25a0987a594a88d0caaa1"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.3.3/linux-x86_64/el/thunderbird-78.3.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.0/linux-x86_64/el/thunderbird-78.4.0.tar.bz2"; locale = "el"; arch = "linux-x86_64"; - sha256 = "23c5e014271a05d5de832568e1231061d9901369605501961cb2a667ec307a96"; + sha256 = "1bb01c5fa05d3dae7d1216a0b3e01354655e96f728f63b8213d1ac4ca08e5b8e"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.3.3/linux-x86_64/en-CA/thunderbird-78.3.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.0/linux-x86_64/en-CA/thunderbird-78.4.0.tar.bz2"; locale = "en-CA"; arch = "linux-x86_64"; - sha256 = "a7e202a4b935d2e06131e436d140a42d5e50e4459cb18ae84624de2bd91df8a2"; + sha256 = "cc7280af5ca21c82ae8e4fbcceac117b1b3c2a2e95db418cd60322161eeaa0ba"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.3.3/linux-x86_64/en-GB/thunderbird-78.3.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.0/linux-x86_64/en-GB/thunderbird-78.4.0.tar.bz2"; locale = "en-GB"; arch = "linux-x86_64"; - sha256 = "8f4c43a542d7d7b0bb795b30601dadc77018a5e0e98086ec6761a8fe6414144b"; + sha256 = "6bf5112867c3493df18880858e483b684946b657bd10960f55a0e55bc364d8a5"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.3.3/linux-x86_64/en-US/thunderbird-78.3.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.0/linux-x86_64/en-US/thunderbird-78.4.0.tar.bz2"; locale = "en-US"; arch = "linux-x86_64"; - sha256 = "55e3e805837f05323f505676d7247a39fa09a1c9a0a613baa185d33ecea6c3b8"; + sha256 = "24780daa2b17799f263a6c16b770b0e6710d14f7f1f502f4868fe48d81ca8e48"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.3.3/linux-x86_64/es-AR/thunderbird-78.3.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.0/linux-x86_64/es-AR/thunderbird-78.4.0.tar.bz2"; locale = "es-AR"; arch = "linux-x86_64"; - sha256 = "51d5614601acedf0591cee675ffd06df80bb9bb2a8da3f4bfd149e559a1ee8e6"; + sha256 = "ac6e82b950f6cd0d7a964815c58a28f602580813ce29cb33bfcde36205d06def"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.3.3/linux-x86_64/es-ES/thunderbird-78.3.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.0/linux-x86_64/es-ES/thunderbird-78.4.0.tar.bz2"; locale = "es-ES"; arch = "linux-x86_64"; - sha256 = "f08e880fcc6fe5207e71e86a41342c337f0bac7d7d443a5adfbeec6cc981a3fe"; + sha256 = "67a03e3c7b00d5e0953ae9eae031ddb42337e23ff9e65ed7c0b759e1c2fa4426"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.3.3/linux-x86_64/et/thunderbird-78.3.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.0/linux-x86_64/et/thunderbird-78.4.0.tar.bz2"; locale = "et"; arch = "linux-x86_64"; - sha256 = "28ec37c6fb53376c78bfaa5439700641775478938c038001189a083303db1324"; + sha256 = "fe5af4823e15422da39c49c3fed60fe460ad23b7c78f6b4fc85ce247a09cd0a8"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.3.3/linux-x86_64/eu/thunderbird-78.3.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.0/linux-x86_64/eu/thunderbird-78.4.0.tar.bz2"; locale = "eu"; arch = "linux-x86_64"; - sha256 = "9b8e992641b174f3cc544ae9b59f661613b42b45c97502711415a628b7d4afb2"; + sha256 = "94699170301daed68a6d8554816c37cc8c51d72fbd1642cc5a066ae4d5a394b2"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.3.3/linux-x86_64/fa/thunderbird-78.3.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.0/linux-x86_64/fa/thunderbird-78.4.0.tar.bz2"; locale = "fa"; arch = "linux-x86_64"; - sha256 = "c9d92164ae10fe4897c4f442ddce2445dd503663a8bca340e493fd117da34304"; + sha256 = "fd22c75cb11bf3fe1a3d2faec1cb7a2332131ac62324bffdd51cc8f03e95a372"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.3.3/linux-x86_64/fi/thunderbird-78.3.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.0/linux-x86_64/fi/thunderbird-78.4.0.tar.bz2"; locale = "fi"; arch = "linux-x86_64"; - sha256 = "e7b4565ba860a247deeaf0d02e2fed669db8289feb3ca3b163f1ffbe85ae67ed"; + sha256 = "df3632903e77b9eb5fda1ff1d8a155b1f3c4861a8821efeb1fef4d39878a9349"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.3.3/linux-x86_64/fr/thunderbird-78.3.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.0/linux-x86_64/fr/thunderbird-78.4.0.tar.bz2"; locale = "fr"; arch = "linux-x86_64"; - sha256 = "e1a886d5fcab0754587e789cf63d1ffeff795fdad9358f7b22d43864707dc964"; + sha256 = "5100b9facddae8451550fa0a65b9bd345066e7e465916ed3728b40cc9ac06e65"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.3.3/linux-x86_64/fy-NL/thunderbird-78.3.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.0/linux-x86_64/fy-NL/thunderbird-78.4.0.tar.bz2"; locale = "fy-NL"; arch = "linux-x86_64"; - sha256 = "e567acb14c4a8c5b78122dcab5f43754557185008482fa588e392c3328dc7485"; + sha256 = "40c7fe9bea5b5edc5a3e62f7d1cf18ae036544c0172954440d036086f90ee119"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.3.3/linux-x86_64/ga-IE/thunderbird-78.3.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.0/linux-x86_64/ga-IE/thunderbird-78.4.0.tar.bz2"; locale = "ga-IE"; arch = "linux-x86_64"; - sha256 = "92c74b4273c8d6de3867d8469e5e6dedb95e4d83759b47d1e2d09e3036b3ba45"; + sha256 = "4ec2f91ba73d3a7ab99d69af2a7d99cfb2280c3872fd4dcd7436ae9362586d06"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.3.3/linux-x86_64/gd/thunderbird-78.3.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.0/linux-x86_64/gd/thunderbird-78.4.0.tar.bz2"; locale = "gd"; arch = "linux-x86_64"; - sha256 = "ccbc85607347ea85fe115cea8733201583525ab07da8048cb4a7d86a011b6775"; + sha256 = "f6d168939a0157c2d450c43d818005e3b9a59e8caad5796492e8078947234b29"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.3.3/linux-x86_64/gl/thunderbird-78.3.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.0/linux-x86_64/gl/thunderbird-78.4.0.tar.bz2"; locale = "gl"; arch = "linux-x86_64"; - sha256 = "cae949d4530db73b874d867a002ea47029b84e6e1030da86f331c3975e14b111"; + sha256 = "2fb6b4995f722e82503bf88fbb3b5275faa4d392bfa5832735ac1d40bbe3ee38"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.3.3/linux-x86_64/he/thunderbird-78.3.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.0/linux-x86_64/he/thunderbird-78.4.0.tar.bz2"; locale = "he"; arch = "linux-x86_64"; - sha256 = "fe81e4be62635672dc042e4efec8ff32110be136038f8378bacd56580f60ab0d"; + sha256 = "70f0bf4db60ad4f1656f0aca1575fadce3a697634f60353bc3d63e3336225d2f"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.3.3/linux-x86_64/hr/thunderbird-78.3.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.0/linux-x86_64/hr/thunderbird-78.4.0.tar.bz2"; locale = "hr"; arch = "linux-x86_64"; - sha256 = "0be0751d775a2f470dab7a86f94ab09504005c66a1bd9a82c3ee1fc235281047"; + sha256 = "d37ac64cd63a4cd66fff1bd30ee3643be75cb977581f2182a95c27a16607f3a0"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.3.3/linux-x86_64/hsb/thunderbird-78.3.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.0/linux-x86_64/hsb/thunderbird-78.4.0.tar.bz2"; locale = "hsb"; arch = "linux-x86_64"; - sha256 = "a60f0858f4189c4e9ce4d739c6e2def435c3192a2d5a289feb82b97636b04f87"; + sha256 = "85e823db225258e9f74e04c61faa89e7c9553445900083f22b7aceb22ef3d901"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.3.3/linux-x86_64/hu/thunderbird-78.3.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.0/linux-x86_64/hu/thunderbird-78.4.0.tar.bz2"; locale = "hu"; arch = "linux-x86_64"; - sha256 = "f9aa36e5d171deaacef4c222f60de72408812fa84266115bcedcad478b9d382c"; + sha256 = "da897b48a2e4a5a3734016ef18c503864792d5c0943bcb2644c272c1a7c63f16"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.3.3/linux-x86_64/hy-AM/thunderbird-78.3.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.0/linux-x86_64/hy-AM/thunderbird-78.4.0.tar.bz2"; locale = "hy-AM"; arch = "linux-x86_64"; - sha256 = "3022f9193b737ca4450faa9c2c786827d3dfe802bda7606961d26acf0ba7e49d"; + sha256 = "dbe1276b14b5864be5fc2de3708ea320d2dcc80eb654e9bad56950f818903484"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.3.3/linux-x86_64/id/thunderbird-78.3.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.0/linux-x86_64/id/thunderbird-78.4.0.tar.bz2"; locale = "id"; arch = "linux-x86_64"; - sha256 = "fb68c5e4c4f1dc2dc5f9cbb298041b97cb14ebf43211298e53605ff70d6ee65a"; + sha256 = "86c7be9b6385ef437323069a7e2497b3a18a552af9d9c4523789be4ee2e07b22"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.3.3/linux-x86_64/is/thunderbird-78.3.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.0/linux-x86_64/is/thunderbird-78.4.0.tar.bz2"; locale = "is"; arch = "linux-x86_64"; - sha256 = "b4b253125dd0f619728f1125046386eb585fcd3ad8e47f397c916f61d92d2bfb"; + sha256 = "8e062c75b579d52d1a887d2165bcd3eb1d0c4e435dffc05d0d76d4404dd061eb"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.3.3/linux-x86_64/it/thunderbird-78.3.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.0/linux-x86_64/it/thunderbird-78.4.0.tar.bz2"; locale = "it"; arch = "linux-x86_64"; - sha256 = "087511af2ed5f7c134496fee5800e4c16c41d17584753050b116b24528a99312"; + sha256 = "932de1926441066a472d5e68b933fd4035f2e858fdabd4b9d4e71ee6e64202a3"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.3.3/linux-x86_64/ja/thunderbird-78.3.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.0/linux-x86_64/ja/thunderbird-78.4.0.tar.bz2"; locale = "ja"; arch = "linux-x86_64"; - sha256 = "cd5ddb58cd48b56e8da3f6e6ac25bef0997ef708ccc718992e5d29446ea08203"; + sha256 = "2bacdb192fda85f10f747a8c8a2ef3bc60345075c1ba33947594fcc66eb35e5a"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.3.3/linux-x86_64/ka/thunderbird-78.3.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.0/linux-x86_64/ka/thunderbird-78.4.0.tar.bz2"; locale = "ka"; arch = "linux-x86_64"; - sha256 = "25df99025726aca57bece1b96f76e5eb3774309a166fc8d1fe81871ee7724a68"; + sha256 = "110d71951f0f3235ab63c02e8d979b2777de4abd4906409b96107fac1f6d7466"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.3.3/linux-x86_64/kab/thunderbird-78.3.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.0/linux-x86_64/kab/thunderbird-78.4.0.tar.bz2"; locale = "kab"; arch = "linux-x86_64"; - sha256 = "eb7cac8ac58e5f62c139a36ce7effcb8ad897246f373d72ba8cd43620cb97dd6"; + sha256 = "f765a32900f0100f03aac4cdce7f33abb44e53911011cef6f6db8f9dddd11124"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.3.3/linux-x86_64/kk/thunderbird-78.3.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.0/linux-x86_64/kk/thunderbird-78.4.0.tar.bz2"; locale = "kk"; arch = "linux-x86_64"; - sha256 = "ea7d5ad95853710ea6461b6f9a534ef56a6e9ee4f286684980f772d197f42a91"; + sha256 = "9af2ab317e0736e0dbab419f5061a6a5c83e521d15f38911455a2d57f6bae945"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.3.3/linux-x86_64/ko/thunderbird-78.3.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.0/linux-x86_64/ko/thunderbird-78.4.0.tar.bz2"; locale = "ko"; arch = "linux-x86_64"; - sha256 = "120dff4112d22747f37df0eb03e59ac7216d2465bd99696adc64cde830b1e2f4"; + sha256 = "06669829857f1c49acf7a58f6a7f0e5a4d8e4ce93703cde0d36525f5bb9697cb"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.3.3/linux-x86_64/lt/thunderbird-78.3.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.0/linux-x86_64/lt/thunderbird-78.4.0.tar.bz2"; locale = "lt"; arch = "linux-x86_64"; - sha256 = "e5b953f0d6de1fbca8e0a6cebcad4a4b5957fec15c2cccb9d858ee6801a29a5b"; + sha256 = "f85e547d17b6bae2597d4b780b14f9076d70dc7c63ae85427b54c01f0c559b72"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.3.3/linux-x86_64/ms/thunderbird-78.3.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.0/linux-x86_64/ms/thunderbird-78.4.0.tar.bz2"; locale = "ms"; arch = "linux-x86_64"; - sha256 = "9ec86e3ad8792d0e8beed849ce6b70d8e68120bdd41a7123de353ef016825133"; + sha256 = "e21639c89686480be875a0514c1b1d99fefca6b79da80a5406f37a63e316348d"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.3.3/linux-x86_64/nb-NO/thunderbird-78.3.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.0/linux-x86_64/nb-NO/thunderbird-78.4.0.tar.bz2"; locale = "nb-NO"; arch = "linux-x86_64"; - sha256 = "ff332ff05f5766aea7fd2de10279efc8f4034a76d956c6ebb48bf17a58a540f5"; + sha256 = "652d43cabbab6ab158b3d3ab70cf83d8ed3ae3524232aa340d17c248dc5fa869"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.3.3/linux-x86_64/nl/thunderbird-78.3.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.0/linux-x86_64/nl/thunderbird-78.4.0.tar.bz2"; locale = "nl"; arch = "linux-x86_64"; - sha256 = "f02c004e2a682d75e93dd7faec28dd6a1b0438a0a31bd27a609b86831c2f2553"; + sha256 = "2c5f173545ef0ddd0c93c921931850e9a7f457575188a91d243245236fe09384"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.3.3/linux-x86_64/nn-NO/thunderbird-78.3.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.0/linux-x86_64/nn-NO/thunderbird-78.4.0.tar.bz2"; locale = "nn-NO"; arch = "linux-x86_64"; - sha256 = "af6c359be91b979eb07e839aec52f9285a11669192b6f66777cea097d712725c"; + sha256 = "f89082f26cb871befb4f8c82c31a9d1cdd5587d20ad3a9a1e78515f947ce4271"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.3.3/linux-x86_64/pa-IN/thunderbird-78.3.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.0/linux-x86_64/pa-IN/thunderbird-78.4.0.tar.bz2"; locale = "pa-IN"; arch = "linux-x86_64"; - sha256 = "dc83cbd154c38366fa8200ae338694b18703bc3d7a5faba598e5dbd03d418675"; + sha256 = "75d7f3bbe88ef2bab33e62834a765f814f75a28e2277afef2517a91be98201ba"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.3.3/linux-x86_64/pl/thunderbird-78.3.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.0/linux-x86_64/pl/thunderbird-78.4.0.tar.bz2"; locale = "pl"; arch = "linux-x86_64"; - sha256 = "f04cf6ebd659f1d4746c66a96c14c627a3b46e285187203d5aec93493695e453"; + sha256 = "c016668ef5f80043eb3e3eff6c8d2327adc3ed86375e81318fb8a4a9fc4689bb"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.3.3/linux-x86_64/pt-BR/thunderbird-78.3.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.0/linux-x86_64/pt-BR/thunderbird-78.4.0.tar.bz2"; locale = "pt-BR"; arch = "linux-x86_64"; - sha256 = "891bd1ad7dc66d30cbde9c06bde9d923ddca5aa24d6efd4b3f4c28dac269596f"; + sha256 = "637a97f3b584e315ebec350a08fa54d17cde8825385736a2bc4ca1937dd552f3"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.3.3/linux-x86_64/pt-PT/thunderbird-78.3.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.0/linux-x86_64/pt-PT/thunderbird-78.4.0.tar.bz2"; locale = "pt-PT"; arch = "linux-x86_64"; - sha256 = "3784e501e2220d336586d4c8b537a2244161caeee0f789ae4f6e8e1848593b1b"; + sha256 = "9719af4fc96ecc0e01f8ad4829f8a94004cdeb518d10f12deb41073f6b0d6f32"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.3.3/linux-x86_64/rm/thunderbird-78.3.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.0/linux-x86_64/rm/thunderbird-78.4.0.tar.bz2"; locale = "rm"; arch = "linux-x86_64"; - sha256 = "987db718e4b877a0bffbd224b473a9151408d686325846334ac14c0474ab874f"; + sha256 = "d3467e689f512a3032f9dd8b022af58bf7d61dcdcb1c69317629f0c0b37aa2d4"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.3.3/linux-x86_64/ro/thunderbird-78.3.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.0/linux-x86_64/ro/thunderbird-78.4.0.tar.bz2"; locale = "ro"; arch = "linux-x86_64"; - sha256 = "c370d2a175f98404f1190ef29b11adae8b1f23b7b7df275d09b2de7c585feff2"; + sha256 = "25985053e562792ffdc5757f201d6171cd7f30199eae7ae2f50cf39b5090feeb"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.3.3/linux-x86_64/ru/thunderbird-78.3.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.0/linux-x86_64/ru/thunderbird-78.4.0.tar.bz2"; locale = "ru"; arch = "linux-x86_64"; - sha256 = "2c586a3773f191b3b3719ce1a2a8983578dd3e064fc796e03910a3ac92e8b089"; + sha256 = "2c0769be95e0a21471197a1f1b979bd36b9793f4242f7ac329c7fe0fe88fc5a3"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.3.3/linux-x86_64/si/thunderbird-78.3.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.0/linux-x86_64/si/thunderbird-78.4.0.tar.bz2"; locale = "si"; arch = "linux-x86_64"; - sha256 = "709cf31ef4d3b2810960a36744e27455c0177b8e53135ee0ebb4955d8817447d"; + sha256 = "2a6d7e47e92166ac1636495e5cbd1849285576cdd812d650767130730002aa6c"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.3.3/linux-x86_64/sk/thunderbird-78.3.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.0/linux-x86_64/sk/thunderbird-78.4.0.tar.bz2"; locale = "sk"; arch = "linux-x86_64"; - sha256 = "edf16e67e7ada73999d2c5236a46e34571aa49b0d48d65f298e130f224784266"; + sha256 = "5d0de7356dd46a9ac1cb98254167fa7be34b6897e5ea69ca093e71a850d53363"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.3.3/linux-x86_64/sl/thunderbird-78.3.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.0/linux-x86_64/sl/thunderbird-78.4.0.tar.bz2"; locale = "sl"; arch = "linux-x86_64"; - sha256 = "7ba5a046419edc9d29b5abbd351e0e5031005f17596c403456eaf416abebdb20"; + sha256 = "8c7e69e7fbe49ba34277e8cb7cbf45eeade086eb460a92e243698824cdf3d5ce"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.3.3/linux-x86_64/sq/thunderbird-78.3.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.0/linux-x86_64/sq/thunderbird-78.4.0.tar.bz2"; locale = "sq"; arch = "linux-x86_64"; - sha256 = "bc301525c4c18d335d1b5b35b6cf35dd1547bbe20d0cd06e40a9063f2f94dc65"; + sha256 = "95cfe7b956bb590c790c156f22ac3c5cdc1dd3e4d7b64422583597fc9ccd8c28"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.3.3/linux-x86_64/sr/thunderbird-78.3.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.0/linux-x86_64/sr/thunderbird-78.4.0.tar.bz2"; locale = "sr"; arch = "linux-x86_64"; - sha256 = "b86b6b3562b3ac011dffb2002511f08b8ef73beec71ea48522a591bb94719b10"; + sha256 = "82573f011da92f7d93d6cf0a700c9eae31a46c6d09671afa63afa533f063e5bd"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.3.3/linux-x86_64/sv-SE/thunderbird-78.3.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.0/linux-x86_64/sv-SE/thunderbird-78.4.0.tar.bz2"; locale = "sv-SE"; arch = "linux-x86_64"; - sha256 = "7b6ad4bcc267259e19bb7ba575fbd22adf11a2528cbc41e99e4e8bc4772a4f59"; + sha256 = "5fda7b6e8095bc456e684887a82cb2adcc14fdfdd9f14731f2bdf2789eac4930"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.3.3/linux-x86_64/th/thunderbird-78.3.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.0/linux-x86_64/th/thunderbird-78.4.0.tar.bz2"; locale = "th"; arch = "linux-x86_64"; - sha256 = "d4ca26f98c37400d64bccf5a429224b7a390f6ccb871773f26cff45ba16be351"; + sha256 = "0e33b43cb7fdb2ae4c30480e264e00651181f2034af42d7a3ac2bfb57c148896"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.3.3/linux-x86_64/tr/thunderbird-78.3.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.0/linux-x86_64/tr/thunderbird-78.4.0.tar.bz2"; locale = "tr"; arch = "linux-x86_64"; - sha256 = "6caf949accdbd28aa74a85265f00cfa1ee25f0f69adbd2f8bac246ee06cef5f5"; + sha256 = "05019602190a28ecefbdc5100b40409d3d6288f076d589136724d07e111bf324"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.3.3/linux-x86_64/uk/thunderbird-78.3.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.0/linux-x86_64/uk/thunderbird-78.4.0.tar.bz2"; locale = "uk"; arch = "linux-x86_64"; - sha256 = "13ad9c6edfeab5ed31dc8a8b5ff70b5c5dff53d81edab0b861e029ebe1a8f83e"; + sha256 = "2940500895c734857b258550b85f846e9eb5be68b6faaf808ed7a9867c423d14"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.3.3/linux-x86_64/uz/thunderbird-78.3.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.0/linux-x86_64/uz/thunderbird-78.4.0.tar.bz2"; locale = "uz"; arch = "linux-x86_64"; - sha256 = "727b93cce07a953075d7e9343383d0f941b41d5429f7a29506b447ac0028b1e6"; + sha256 = "de82b265c6e19495abc70c36f377cef705137f352da0aa7d01aa874e2a9f1f70"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.3.3/linux-x86_64/vi/thunderbird-78.3.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.0/linux-x86_64/vi/thunderbird-78.4.0.tar.bz2"; locale = "vi"; arch = "linux-x86_64"; - sha256 = "05e8d37df89bb1e0990dfbe5ad14bc09bb775414486558c9b67a32820366e232"; + sha256 = "cf02606c0eff0b941c1c2ef654e250d5d6a8cb7deda752468e779af1b616c0e1"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.3.3/linux-x86_64/zh-CN/thunderbird-78.3.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.0/linux-x86_64/zh-CN/thunderbird-78.4.0.tar.bz2"; locale = "zh-CN"; arch = "linux-x86_64"; - sha256 = "d3fa9e85dbaae95ad4ecc14c21cc9219a4164020da1eb8c5e1c7eff1370359f2"; + sha256 = "54a1a869a746ff3af8d5ec27b11f1d3a0efeb49480043fbf776e9646b5be944d"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.3.3/linux-x86_64/zh-TW/thunderbird-78.3.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.0/linux-x86_64/zh-TW/thunderbird-78.4.0.tar.bz2"; locale = "zh-TW"; arch = "linux-x86_64"; - sha256 = "61cf2496619348d3b65eae1c57d0321d400e3954896660c3b8fa051a7ff95987"; + sha256 = "0c9530adcb5029ae570a8d25d790f243c0a3d6ad7701ed071fad326d3718bea3"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.3.3/linux-i686/af/thunderbird-78.3.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.0/linux-i686/af/thunderbird-78.4.0.tar.bz2"; locale = "af"; arch = "linux-i686"; - sha256 = "7ce3be03f99ba651ad25cfff575a3829b8f1b0d450ab2c8b183e587b7c15f055"; + sha256 = "29b39333cfd9919830cecf1b0043faf4dd829c36554fdcbcff6a8dbf11882060"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.3.3/linux-i686/ar/thunderbird-78.3.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.0/linux-i686/ar/thunderbird-78.4.0.tar.bz2"; locale = "ar"; arch = "linux-i686"; - sha256 = "b8c635bc7c7373feb798c48b2ab89fa827d3702c9067f15b4b5ba7bb3aa8429c"; + sha256 = "49896345d391f22f262592e055b2bc5fc1852d5fe1f9812392ef09b9f329afee"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.3.3/linux-i686/ast/thunderbird-78.3.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.0/linux-i686/ast/thunderbird-78.4.0.tar.bz2"; locale = "ast"; arch = "linux-i686"; - sha256 = "02626410221bf43a24525e6a651b23c53eb0b069a8a69273ed23068cb0d1a467"; + sha256 = "71a952590eec188661f8cf95f62efb2c9f2465aadec361c990bb62481938b128"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.3.3/linux-i686/be/thunderbird-78.3.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.0/linux-i686/be/thunderbird-78.4.0.tar.bz2"; locale = "be"; arch = "linux-i686"; - sha256 = "030dff95d44586d6ce9e11096b3edc13fa90eaceb277e878b7484e37e38463cf"; + sha256 = "d99a81043f6c158376c960d0dbd60f6d2e73ee1e6a015aee55ff42786e58fc21"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.3.3/linux-i686/bg/thunderbird-78.3.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.0/linux-i686/bg/thunderbird-78.4.0.tar.bz2"; locale = "bg"; arch = "linux-i686"; - sha256 = "5eef3e57d0a24524724aa2985755592a508469817e3265814b56bb21528bbfb7"; + sha256 = "1226b669b2b2e7c890a1de0a628e663069c2279369587a8b819756584be2ba0d"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.3.3/linux-i686/br/thunderbird-78.3.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.0/linux-i686/br/thunderbird-78.4.0.tar.bz2"; locale = "br"; arch = "linux-i686"; - sha256 = "c0f3b827c9708961ee86016a8d404aed5d56c624da1a8feb9a1906d179a6da2a"; + sha256 = "2f656a4269f37dd8513cf2f0b799d97225ffe55b00e778dbeedac66bf7b00d47"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.3.3/linux-i686/ca/thunderbird-78.3.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.0/linux-i686/ca/thunderbird-78.4.0.tar.bz2"; locale = "ca"; arch = "linux-i686"; - sha256 = "004c84c2a16ae5d7dbd9905cdb009aacc50b18b0c4fe003d36d0fa3e2cde625f"; + sha256 = "34dcc816776f2da32bf7412a802a8d3d7a0b31afcfb1811c617f1295ced05adc"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.3.3/linux-i686/cak/thunderbird-78.3.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.0/linux-i686/cak/thunderbird-78.4.0.tar.bz2"; locale = "cak"; arch = "linux-i686"; - sha256 = "8c867abd694cc5acb1d1a9f94833a3501cde91e61c003489c31c6db2e6b25653"; + sha256 = "f9fb448edc5238b69fe3c08c665a30320e5662c1df78101ba4807d371a6a15d4"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.3.3/linux-i686/cs/thunderbird-78.3.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.0/linux-i686/cs/thunderbird-78.4.0.tar.bz2"; locale = "cs"; arch = "linux-i686"; - sha256 = "ca4410121056173fa5f9634a8387036c27cd32891d4aa4e06e9c84e07517cbad"; + sha256 = "156c36781f43fbaa3eb5d1d32ca7d6b3c9573261757dc9c78e8cf0be24a6c717"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.3.3/linux-i686/cy/thunderbird-78.3.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.0/linux-i686/cy/thunderbird-78.4.0.tar.bz2"; locale = "cy"; arch = "linux-i686"; - sha256 = "062cc8337bf13a12d0cf18aec5c375797184164869693a6aa5fb69a08b031275"; + sha256 = "0e48e453cddf00929e189546f0dd478e273dcd8bc891fe875f553825f0b4fcc4"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.3.3/linux-i686/da/thunderbird-78.3.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.0/linux-i686/da/thunderbird-78.4.0.tar.bz2"; locale = "da"; arch = "linux-i686"; - sha256 = "a448476dfc290ecb166ffe32b3fbbcaeadcda4ecafc0ccb9adbc81b3267f1068"; + sha256 = "e614911f79a2a86055e6914aa0f4922979eebe4229b26b18f6ff31cc6bb49c89"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.3.3/linux-i686/de/thunderbird-78.3.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.0/linux-i686/de/thunderbird-78.4.0.tar.bz2"; locale = "de"; arch = "linux-i686"; - sha256 = "bac802b70a9abc140ec494ffe4afa6a59a1658e98f9f53508d8575a74a0102be"; + sha256 = "a8c916da07945657672b5b71a722485fa7117dd912896bc9eec8b9b82dfcc48b"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.3.3/linux-i686/dsb/thunderbird-78.3.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.0/linux-i686/dsb/thunderbird-78.4.0.tar.bz2"; locale = "dsb"; arch = "linux-i686"; - sha256 = "c0f9c14c499d5776ef39e205fcc31e46e0abdb2a92dde19f079c3e3c26b4b7c1"; + sha256 = "0b3ac7ec984e26b66cd3c5df733c3cac6b83f4388cd65344dc40310651798c05"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.3.3/linux-i686/el/thunderbird-78.3.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.0/linux-i686/el/thunderbird-78.4.0.tar.bz2"; locale = "el"; arch = "linux-i686"; - sha256 = "af740bb9846b93f599eb6d0a4bfa8f9d0772decd4c9c8a4b03711955a36ad9c2"; + sha256 = "dbfd90c1810dcad51bda6a7d2de6a132f428a5c6151c107cd09a98a48b2ce98d"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.3.3/linux-i686/en-CA/thunderbird-78.3.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.0/linux-i686/en-CA/thunderbird-78.4.0.tar.bz2"; locale = "en-CA"; arch = "linux-i686"; - sha256 = "97eb22adcb2632a5006c3e72f3bef46474f17053efd97dc45f73dda2172c9b37"; + sha256 = "3ccd8193d486596ebd70e3e1803563a3a8d59ca25c29eeaaeab78ab78cb0e72c"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.3.3/linux-i686/en-GB/thunderbird-78.3.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.0/linux-i686/en-GB/thunderbird-78.4.0.tar.bz2"; locale = "en-GB"; arch = "linux-i686"; - sha256 = "03a0fa5ac70e7642e940526a78292cfa3e6bb5d8c5c2c2e3a4b9b0c2884ad29f"; + sha256 = "6d74ef15e0196a2b07302f40bc3992acc8ffc94ff7d90433a00d766a0840226a"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.3.3/linux-i686/en-US/thunderbird-78.3.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.0/linux-i686/en-US/thunderbird-78.4.0.tar.bz2"; locale = "en-US"; arch = "linux-i686"; - sha256 = "62d17d3d74d6176dad6a2be7fa02c922514af1cfefe8c1157a7f1c12fa4fab5b"; + sha256 = "718e57f9b1d7f1ca5c52dfa8aa109f8cdda279cfb6dea649add651b6637fc6bc"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.3.3/linux-i686/es-AR/thunderbird-78.3.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.0/linux-i686/es-AR/thunderbird-78.4.0.tar.bz2"; locale = "es-AR"; arch = "linux-i686"; - sha256 = "49f206c595621e8549df9bd7479fabb64271faf9e506b31cfbf706fff8ad85f6"; + sha256 = "26dea055b9c6ea2b8f7e15b0c93cd3d880c83bd1c9f23f8d572a92659740986a"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.3.3/linux-i686/es-ES/thunderbird-78.3.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.0/linux-i686/es-ES/thunderbird-78.4.0.tar.bz2"; locale = "es-ES"; arch = "linux-i686"; - sha256 = "3bb611a6fd8345188e2a62a311875ba241adaef5310d9c3f317f30bde08c711b"; + sha256 = "90d115cb34ae852332e5bd792067c66f1bad920721da68f59b38a2a86a8a0105"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.3.3/linux-i686/et/thunderbird-78.3.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.0/linux-i686/et/thunderbird-78.4.0.tar.bz2"; locale = "et"; arch = "linux-i686"; - sha256 = "f06ace36c5932083dd9e9d64f77fa3323e02ba486556d0649abf970ec6a59480"; + sha256 = "a82aed816b1ea065e21120a8e6e0345c477b90f9c672c04cee9d15ffed85ef28"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.3.3/linux-i686/eu/thunderbird-78.3.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.0/linux-i686/eu/thunderbird-78.4.0.tar.bz2"; locale = "eu"; arch = "linux-i686"; - sha256 = "4da5fd79155b56598ec09128f0467e2f88bc750fae5326b6ce589785c1fc0441"; + sha256 = "7f1bf5742159e15fd566827db713421778262377a8da9ac269fc6af635f1b20b"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.3.3/linux-i686/fa/thunderbird-78.3.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.0/linux-i686/fa/thunderbird-78.4.0.tar.bz2"; locale = "fa"; arch = "linux-i686"; - sha256 = "cb9adbfc5744760d8c27db7e23515cf54db3dd55e8c6e4d3b135f4f8d60b8b62"; + sha256 = "25d97499486a7c3d38c4686f7ff5daf930694f6614d3d556af85c3cb99193403"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.3.3/linux-i686/fi/thunderbird-78.3.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.0/linux-i686/fi/thunderbird-78.4.0.tar.bz2"; locale = "fi"; arch = "linux-i686"; - sha256 = "2a39070dc7a1d3764d6e8f07e12b7ba074a6d85636c992f3c0dd1d29a656426d"; + sha256 = "5531179571b0306ae2c1d5f4af40047ea9a5fdf65137bc7c255ee7f5dae2bab6"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.3.3/linux-i686/fr/thunderbird-78.3.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.0/linux-i686/fr/thunderbird-78.4.0.tar.bz2"; locale = "fr"; arch = "linux-i686"; - sha256 = "40566a4acd38477e8f31215a67dc2c5351bf3319ac65af8bc8787404599723b3"; + sha256 = "12e33246e17aebac0547801d5d4e23db0523ff260b5345b8f0a19fc5cf44f2b5"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.3.3/linux-i686/fy-NL/thunderbird-78.3.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.0/linux-i686/fy-NL/thunderbird-78.4.0.tar.bz2"; locale = "fy-NL"; arch = "linux-i686"; - sha256 = "3ba4f77702bc697d3eb00ff5cff2143b6e9a378323206911bbf67cc3d0409433"; + sha256 = "50c6dff9614b113ea57d4c75dd0768a8524743a7b9f462f84f27f10daadbc1f5"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.3.3/linux-i686/ga-IE/thunderbird-78.3.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.0/linux-i686/ga-IE/thunderbird-78.4.0.tar.bz2"; locale = "ga-IE"; arch = "linux-i686"; - sha256 = "b8810ed163ed67f60b51357fdf7992156b98035ba928eea9fb2fcdc7469a770e"; + sha256 = "6c6229aa064098560b13369a0d11133156d47193a8f8b2fdc241fbcba3cb3f9c"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.3.3/linux-i686/gd/thunderbird-78.3.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.0/linux-i686/gd/thunderbird-78.4.0.tar.bz2"; locale = "gd"; arch = "linux-i686"; - sha256 = "1243430ba38be3035de56b7350474fed96fb15832f50e08ff8c7881c05bf2446"; + sha256 = "6e5f686d98b02bc97e14f5788eac7b93e5e2652e9feaab0906cb026a883b1485"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.3.3/linux-i686/gl/thunderbird-78.3.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.0/linux-i686/gl/thunderbird-78.4.0.tar.bz2"; locale = "gl"; arch = "linux-i686"; - sha256 = "9f0181332f05e6d90d461e92a752e5609b1a704792c6ddc91321b27922431dff"; + sha256 = "2ccde2411bb2c3e4b492b4cacbe8d756dc22c2164fbe7364bc2381c1ff582f75"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.3.3/linux-i686/he/thunderbird-78.3.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.0/linux-i686/he/thunderbird-78.4.0.tar.bz2"; locale = "he"; arch = "linux-i686"; - sha256 = "90c3472b0f193610d759a6d75c874e1d1b6715e10a55ef45f1c1e9e934e989a9"; + sha256 = "30fe226741e47f86f07c5acbb8fe3d2aa2fb7102fb4743189f12612c817415c1"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.3.3/linux-i686/hr/thunderbird-78.3.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.0/linux-i686/hr/thunderbird-78.4.0.tar.bz2"; locale = "hr"; arch = "linux-i686"; - sha256 = "b4978b367afc43461f350477154dcada653a3488e3b5c9759d25364c42358e60"; + sha256 = "4230396816f72ce2784bab21fa2fe731ea378f1ceeace609e0423e2b5e7ea83e"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.3.3/linux-i686/hsb/thunderbird-78.3.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.0/linux-i686/hsb/thunderbird-78.4.0.tar.bz2"; locale = "hsb"; arch = "linux-i686"; - sha256 = "ef4820baf88b8921f3407735f2f7896132a414dc26802226ec280792ba8b2d33"; + sha256 = "155a4e98c597f7876ab44276ab8814ab185a5a59e1fdb743260bef2f78b27e4a"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.3.3/linux-i686/hu/thunderbird-78.3.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.0/linux-i686/hu/thunderbird-78.4.0.tar.bz2"; locale = "hu"; arch = "linux-i686"; - sha256 = "befc910899b68f4db3b4216c5ead51afc8ae8fbbf3c3808642db0594762ed7d1"; + sha256 = "bb0b46dc74b926e9d13c4bd8b0371d730ce03aeffa5c41689eeb797ae1ce4382"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.3.3/linux-i686/hy-AM/thunderbird-78.3.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.0/linux-i686/hy-AM/thunderbird-78.4.0.tar.bz2"; locale = "hy-AM"; arch = "linux-i686"; - sha256 = "3c84ae5e47f84c09fa7dac6422f03e0a38c1aa7e6dc262210b94b19fdab25636"; + sha256 = "7ee0ee79ac2143fe3ce8930c3916f201910d6d7a40437fdc49a8c617d49871d8"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.3.3/linux-i686/id/thunderbird-78.3.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.0/linux-i686/id/thunderbird-78.4.0.tar.bz2"; locale = "id"; arch = "linux-i686"; - sha256 = "43a5d1ce7bd75626a17675d03a9860ff0860219debf5b8ee8de264a5bd7ac9f8"; + sha256 = "e1a4072dfdccfdf35401e9a58e77cbff2277703ff2c78a52fc0df801bca8f91a"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.3.3/linux-i686/is/thunderbird-78.3.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.0/linux-i686/is/thunderbird-78.4.0.tar.bz2"; locale = "is"; arch = "linux-i686"; - sha256 = "0542a2bcb64a0cfd9c4e04c62cbca4c7989dc91a18c5640e2d42621dd4fedebc"; + sha256 = "d4d63add23724c58fd92d992165748f7002540f73df591914540f6361dc0089b"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.3.3/linux-i686/it/thunderbird-78.3.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.0/linux-i686/it/thunderbird-78.4.0.tar.bz2"; locale = "it"; arch = "linux-i686"; - sha256 = "2aef696961f7a5aa432e19e3cb0ae7acc1c01aefb3158054f189d5d0331d6cbe"; + sha256 = "28ec9beacfb8b27b80e1f1deba83d81324a2d3baa0d9572a41a94f920c8c60aa"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.3.3/linux-i686/ja/thunderbird-78.3.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.0/linux-i686/ja/thunderbird-78.4.0.tar.bz2"; locale = "ja"; arch = "linux-i686"; - sha256 = "49cf422fe2c59ae86f3d3cd717fdaa60aad7074aab0855c2ce01a6cbde2068e2"; + sha256 = "ad1f9e091cfd66683964f8d683653b3134068174daf24fe061aad00d0c864176"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.3.3/linux-i686/ka/thunderbird-78.3.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.0/linux-i686/ka/thunderbird-78.4.0.tar.bz2"; locale = "ka"; arch = "linux-i686"; - sha256 = "65e02ab7f90c8a7a6d1b02d94e4c8649500619113fdb3a5b8f364945c92426d0"; + sha256 = "9074e7b2eb10943f6b87e79be9ec9ae706eeb4300c85ffe456bb34f11798b81a"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.3.3/linux-i686/kab/thunderbird-78.3.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.0/linux-i686/kab/thunderbird-78.4.0.tar.bz2"; locale = "kab"; arch = "linux-i686"; - sha256 = "844bad3b89d0331af8ae7bc83839ccc7d4a9c50f338be0d1f46cf69183124982"; + sha256 = "7b7d17a26dc9914d46de8959c08d56ed92b263d3eae383ca71d45a1b37a9650f"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.3.3/linux-i686/kk/thunderbird-78.3.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.0/linux-i686/kk/thunderbird-78.4.0.tar.bz2"; locale = "kk"; arch = "linux-i686"; - sha256 = "293fc3240cdfaa41efe198e34e495e2c6acb3cac8d074d49e3e5994b1eaf6975"; + sha256 = "b38db92efa1b4bc1067eeee7eaf7307d6e86e6c6d3f4dd1b81496768c981d5af"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.3.3/linux-i686/ko/thunderbird-78.3.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.0/linux-i686/ko/thunderbird-78.4.0.tar.bz2"; locale = "ko"; arch = "linux-i686"; - sha256 = "a25aa2bced2d34158fff3071d44295447c0b84dcd6835ad245aa1a9235a3cf4c"; + sha256 = "951a2e6e2cae525618646f8f054d127b32a535028930eeb3be7dfd2720c4ccea"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.3.3/linux-i686/lt/thunderbird-78.3.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.0/linux-i686/lt/thunderbird-78.4.0.tar.bz2"; locale = "lt"; arch = "linux-i686"; - sha256 = "37475df136aa833c75f8e2436f7898d9b0937ea728995c1f433c6fe90460a2ac"; + sha256 = "5e76866c25f63aa283e54c871e1014a10e4ecdb8182ca6bc3ac1d16a344ae8f8"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.3.3/linux-i686/ms/thunderbird-78.3.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.0/linux-i686/ms/thunderbird-78.4.0.tar.bz2"; locale = "ms"; arch = "linux-i686"; - sha256 = "3a827222a53dd5ce567a485687084aa48f484e9ac4aa347cc71c8fa53fcf90c2"; + sha256 = "74e28f4ed81a233bd8aa721515667b31e83f7a6d6bad0aaef421f1f1e4b0c4c9"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.3.3/linux-i686/nb-NO/thunderbird-78.3.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.0/linux-i686/nb-NO/thunderbird-78.4.0.tar.bz2"; locale = "nb-NO"; arch = "linux-i686"; - sha256 = "5258e957474ecfc63dac04d1dcc43781c09fa6b358fabf1ea90808097d878670"; + sha256 = "4cfa6097b0879de04314773d96d3e03aee3b7e1680e97cee3dbb6fca9e4010ca"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.3.3/linux-i686/nl/thunderbird-78.3.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.0/linux-i686/nl/thunderbird-78.4.0.tar.bz2"; locale = "nl"; arch = "linux-i686"; - sha256 = "30450f1d2c53679d8aed8ee3bd986eadf31969e9f3ef5bf2ebf8bdaf5987220a"; + sha256 = "e097065367e8bcaa331803c779ff71e43dfa7dcc5b516fd5d73f60b1c614c7a0"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.3.3/linux-i686/nn-NO/thunderbird-78.3.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.0/linux-i686/nn-NO/thunderbird-78.4.0.tar.bz2"; locale = "nn-NO"; arch = "linux-i686"; - sha256 = "48e3bb7d281359537e1fa781431c82130a5ca66bebfa6401598054365055bb8a"; + sha256 = "e3bc6a3754f13db3dc5f70c3fd9b70b4250be494a47c7d20546dccb57b914ae5"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.3.3/linux-i686/pa-IN/thunderbird-78.3.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.0/linux-i686/pa-IN/thunderbird-78.4.0.tar.bz2"; locale = "pa-IN"; arch = "linux-i686"; - sha256 = "b2a215dfc8cb5026c7696ca7e2ad99d49bb5bcc24bb4b54627cd6e989b7cf420"; + sha256 = "80a785335bd49d5d0e8c669a7d548c0e077c413c184eb50133aaf5790fe1148a"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.3.3/linux-i686/pl/thunderbird-78.3.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.0/linux-i686/pl/thunderbird-78.4.0.tar.bz2"; locale = "pl"; arch = "linux-i686"; - sha256 = "74d4c9177cededc4db647df7d10e9e80b7e0312d75742dd547f332ec3c4f4d83"; + sha256 = "bc20f221babef7c3a3992d57ab5a3afcad12faa0263ff8978c96a1267af54c28"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.3.3/linux-i686/pt-BR/thunderbird-78.3.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.0/linux-i686/pt-BR/thunderbird-78.4.0.tar.bz2"; locale = "pt-BR"; arch = "linux-i686"; - sha256 = "3468210c606502a26238b0a9f48e9ab68e37848d3e76a43115cf1dcabb3c7e92"; + sha256 = "6dd040a2046c418d51bd7103d93a50b58e3345de5ed0c8917c0a8a8c7bf87c7c"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.3.3/linux-i686/pt-PT/thunderbird-78.3.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.0/linux-i686/pt-PT/thunderbird-78.4.0.tar.bz2"; locale = "pt-PT"; arch = "linux-i686"; - sha256 = "6343712151c93614da79f2de7adc0775e9f97958a8692bbf9fff6e0138f9ead6"; + sha256 = "45f67266e6af96dccae07d6db4f5d62c3d6d26e1a76e4951f08591c664122359"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.3.3/linux-i686/rm/thunderbird-78.3.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.0/linux-i686/rm/thunderbird-78.4.0.tar.bz2"; locale = "rm"; arch = "linux-i686"; - sha256 = "fb8c3e00b95f40f59cd32d5dc7799872d787aa7c8e25b86c8d8a9d24f17ac282"; + sha256 = "1d53a7290332375212c0d58af23265d59502bce1a6a4629b56bc86d048be65a9"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.3.3/linux-i686/ro/thunderbird-78.3.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.0/linux-i686/ro/thunderbird-78.4.0.tar.bz2"; locale = "ro"; arch = "linux-i686"; - sha256 = "f55814c30f01d676240da7f5193a518aaf3b968500387ed4d0a6e2730ef6f404"; + sha256 = "de3e5496ce5b8c4dff6fcbcf2b8a47b0c81d026fb5334e2668b8f9fc293c5216"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.3.3/linux-i686/ru/thunderbird-78.3.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.0/linux-i686/ru/thunderbird-78.4.0.tar.bz2"; locale = "ru"; arch = "linux-i686"; - sha256 = "9944e8969685e16d858d2935ab5466a034f11bcae140c5e749d3255e94f203e4"; + sha256 = "838b9a02684541ef7df67a23b9966282ff9d8b12b64dfcbcfea8e8381b24951a"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.3.3/linux-i686/si/thunderbird-78.3.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.0/linux-i686/si/thunderbird-78.4.0.tar.bz2"; locale = "si"; arch = "linux-i686"; - sha256 = "97f0558bdc3f22474632f2bd4ba904ea4c460e993c78d347746613e889365b76"; + sha256 = "202f815bdf7538d50f4770e601d10c8a1ffddb042a3c7dfd1a1b65e9b5dc5ec6"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.3.3/linux-i686/sk/thunderbird-78.3.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.0/linux-i686/sk/thunderbird-78.4.0.tar.bz2"; locale = "sk"; arch = "linux-i686"; - sha256 = "801d923a1359ae95f3fe242765e4e13cf8ec24c6643eee16fb3c528207d234bb"; + sha256 = "44c5aa3723919798493e7f43c927ac48891eecf94a69c79b86be107984e9e068"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.3.3/linux-i686/sl/thunderbird-78.3.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.0/linux-i686/sl/thunderbird-78.4.0.tar.bz2"; locale = "sl"; arch = "linux-i686"; - sha256 = "5182e97f255533a625f21f5add3207150eabb19fb3d42258b82a1a7c5c52558f"; + sha256 = "2d5125d9625f916788265db46ee1fb47ace3b6099dae26ecb734aecf36160949"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.3.3/linux-i686/sq/thunderbird-78.3.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.0/linux-i686/sq/thunderbird-78.4.0.tar.bz2"; locale = "sq"; arch = "linux-i686"; - sha256 = "1f5f5bf222194e9f8a5bf8c022ff9f19c6b6039243e2943a121d0b9aab1d6fe1"; + sha256 = "2aa337b0fd8ccfe86feadef605ca863499f21c3ca7f194121064fc060d5a3de7"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.3.3/linux-i686/sr/thunderbird-78.3.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.0/linux-i686/sr/thunderbird-78.4.0.tar.bz2"; locale = "sr"; arch = "linux-i686"; - sha256 = "96ad96eaeb4ae9ba928253657e628d2209b0db069dac793df65baf61c4e37d8d"; + sha256 = "fe690670c6702ed63684eac68a3f3f29f12bd27af7d34c63af768e0362a1eb11"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.3.3/linux-i686/sv-SE/thunderbird-78.3.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.0/linux-i686/sv-SE/thunderbird-78.4.0.tar.bz2"; locale = "sv-SE"; arch = "linux-i686"; - sha256 = "3d6a37dd60452d33ccf92533b759bf90133f4f422f4ca44484a209ae268edfd4"; + sha256 = "74525ce44ca330e8fd29785842992c62cf3b5494675ec9a8148ea14d945fcaae"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.3.3/linux-i686/th/thunderbird-78.3.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.0/linux-i686/th/thunderbird-78.4.0.tar.bz2"; locale = "th"; arch = "linux-i686"; - sha256 = "239807db003aa49f4b7aba49a69d16ad052ff98e7fb4853b4c9792cfde3cac75"; + sha256 = "0503e2ed79dae95302bf2d9d8055589ed1ca511c16c35a9b84445548a7a306d4"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.3.3/linux-i686/tr/thunderbird-78.3.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.0/linux-i686/tr/thunderbird-78.4.0.tar.bz2"; locale = "tr"; arch = "linux-i686"; - sha256 = "2f63ca26d2d5e64d33c8825668bb86c3fb66c2c4eedf64ce1d9f8fc09cbb74c9"; + sha256 = "c4b14f4f22549c66f5f445a2ad5826d0e90332c9d76783851078625245625bbb"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.3.3/linux-i686/uk/thunderbird-78.3.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.0/linux-i686/uk/thunderbird-78.4.0.tar.bz2"; locale = "uk"; arch = "linux-i686"; - sha256 = "a758f2ac93b8b863a6b88f533717314fc98fa8242491580da6fc909e336d10bd"; + sha256 = "cf06114027f9bf14ef506fe37e6a7ef6a1cbdb201cde061a754c82d9b3ef0c39"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.3.3/linux-i686/uz/thunderbird-78.3.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.0/linux-i686/uz/thunderbird-78.4.0.tar.bz2"; locale = "uz"; arch = "linux-i686"; - sha256 = "816211a8990820627a1e661ad7cfd4a35ed19d1e0a467e4f062cb9df1e251621"; + sha256 = "c805d88694b105412f05dd840e038edfef90b4a48b5a79b0bac5b5575d50a14a"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.3.3/linux-i686/vi/thunderbird-78.3.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.0/linux-i686/vi/thunderbird-78.4.0.tar.bz2"; locale = "vi"; arch = "linux-i686"; - sha256 = "bd73132366caf23b21bfebf6fa66c93f9a5c66ef10ae663737babe71f2183952"; + sha256 = "ca30574d981964eed7c3a100dd76f90c518a24d7dcde74f0790ede4a0a8d3285"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.3.3/linux-i686/zh-CN/thunderbird-78.3.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.0/linux-i686/zh-CN/thunderbird-78.4.0.tar.bz2"; locale = "zh-CN"; arch = "linux-i686"; - sha256 = "b7e1fdca9a331b00ca8a0c089f840253065c8ecd5b3c670386ae9a91a0ed499c"; + sha256 = "6cb1566d330e36b03e86bcfe96ad887fee511ba314167d235facba6c47871688"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.3.3/linux-i686/zh-TW/thunderbird-78.3.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.0/linux-i686/zh-TW/thunderbird-78.4.0.tar.bz2"; locale = "zh-TW"; arch = "linux-i686"; - sha256 = "6923adebb0c8022de19df9c1fca174a94e942b2d14da4bedd9d812f160b6c1aa"; + sha256 = "7af0d92565a54bef6c962dd8b9b100198e2cac8d47ede749bade87c30d5ee37b"; } ]; } diff --git a/third_party/nixpkgs/pkgs/applications/networking/mailreaders/thunderbird/default.nix b/third_party/nixpkgs/pkgs/applications/networking/mailreaders/thunderbird/default.nix index b5602b5aee..7494c11380 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/mailreaders/thunderbird/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/mailreaders/thunderbird/default.nix @@ -70,13 +70,13 @@ assert waylandSupport -> gtk3Support == true; stdenv.mkDerivation rec { pname = "thunderbird"; - version = "78.3.3"; + version = "78.4.0"; src = fetchurl { url = "mirror://mozilla/thunderbird/releases/${version}/source/thunderbird-${version}.source.tar.xz"; sha512 = - "0w5njyhxm7lmrygj4q3sh1hddgr389j4cxpjfdx856819vb8ldgv1qcnfd8has2f29wqymzbgx9i6sjb4hp6k44kbxdmwp0zmi5rwpg"; + "04b6n3gsan0a5abh371ws3c3rry4dcb3c6rbqmcxkzrdjg2xr5vn6xhlg3dgl3l01p0hp1xqpckj8g5yb2dq2x07xgg1hnyhs9aadh5"; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/applications/networking/mumble/default.nix b/third_party/nixpkgs/pkgs/applications/networking/mumble/default.nix index c205f18e36..fd2fb4a8fb 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/mumble/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/mumble/default.nix @@ -133,14 +133,14 @@ let } source; source = rec { - version = "1.3.2"; + version = "1.3.3"; # Needs submodules src = fetchFromGitHub { owner = "mumble-voip"; repo = "mumble"; rev = version; - sha256 = "1ljn7h7dr9iyhvq7rdh0prl7hzn9d2hhnxv0ni6dha6f7d9qbfy6"; + sha256 = "1jaq5bl5gdpzd4pskpcd2j93g2w320znn4s8ck8f4jz5f46da1bj"; fetchSubmodules = true; }; }; diff --git a/third_party/nixpkgs/pkgs/applications/networking/sync/rsync/default.nix b/third_party/nixpkgs/pkgs/applications/networking/sync/rsync/default.nix index 2728d8484e..7f384846c9 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/sync/rsync/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/sync/rsync/default.nix @@ -35,7 +35,15 @@ stdenv.mkDerivation rec { ++ stdenv.lib.optional enableXXHash xxHash; nativeBuildInputs = [perl]; - configureFlags = ["--with-nobody-group=nogroup"]; + configureFlags = ["--with-nobody-group=nogroup"] + # Work around issue with cross-compilation: + # configure.sh: error: cannot run test program while cross compiling + # Remove once 3.2.4 or more recent is released. + # The following PR should fix the cross-compilation issue. + # Test using `nix-build -A pkgsCross.aarch64-multiplatform.rsync`. + # https://github.com/WayneD/rsync/commit/b7fab6f285ff0ff3816b109a8c3131b6ded0b484 + ++ stdenv.lib.optional (stdenv.hostPlatform != stdenv.buildPlatform) "--enable-simd=no" + ; passthru.tests = { inherit (nixosTests) rsyncd; }; diff --git a/third_party/nixpkgs/pkgs/applications/office/fava/default.nix b/third_party/nixpkgs/pkgs/applications/office/fava/default.nix index b33d978ee0..d6b404f9db 100644 --- a/third_party/nixpkgs/pkgs/applications/office/fava/default.nix +++ b/third_party/nixpkgs/pkgs/applications/office/fava/default.nix @@ -5,11 +5,11 @@ let in buildPythonApplication rec { pname = "fava"; - version = "1.15"; + version = "1.16"; src = fetchPypi { inherit pname version; - sha256 = "037fhimfjiqay28wg7hd5sm7r0935ynw9d905iszn965ihr1qsgz"; + sha256 = "436b6f9441a638f8028729c2a39c28433f7878c2af6ddb9bfccaeea9ea3086e1"; }; checkInputs = [ python3.pkgs.pytest ]; diff --git a/third_party/nixpkgs/pkgs/applications/office/paperless/python-modules/default.nix b/third_party/nixpkgs/pkgs/applications/office/paperless/python-modules/default.nix index 40a496312f..4c5510ebb7 100644 --- a/third_party/nixpkgs/pkgs/applications/office/paperless/python-modules/default.nix +++ b/third_party/nixpkgs/pkgs/applications/office/paperless/python-modules/default.nix @@ -1,6 +1,6 @@ pyPkgs: fetchFromGitHub: { - django_2_0 = pyPkgs.django_2_2.overridePythonAttrs (old: rec { + django_2_0 = pyPkgs.django_2.overridePythonAttrs (old: rec { version = "2.0.12"; src = pyPkgs.fetchPypi { inherit (old) pname; diff --git a/third_party/nixpkgs/pkgs/applications/radio/rtl-sdr/default.nix b/third_party/nixpkgs/pkgs/applications/radio/rtl-sdr/default.nix index 8fb5154ff7..7e044296b0 100644 --- a/third_party/nixpkgs/pkgs/applications/radio/rtl-sdr/default.nix +++ b/third_party/nixpkgs/pkgs/applications/radio/rtl-sdr/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchgit, cmake, pkgconfig, libusb1 }: +{ stdenv, fetchgit, fetchpatch, cmake, pkgconfig, libusb1 }: stdenv.mkDerivation rec { pname = "rtl-sdr"; @@ -10,6 +10,12 @@ stdenv.mkDerivation rec { sha256 = "0lmvsnb4xw4hmz6zs0z5ilsah5hjz29g1s0050n59fllskqr3b8k"; }; + patches = [ (fetchpatch { + name = "hardened-udev-rules.patch"; + url = "https://osmocom.org/projects/rtl-sdr/repository/revisions/b2814731563be4d5a0a68554ece6454a2c63af12/diff?format=diff"; + sha256 = "0ns740s2rys4glq4la4bh0sxfv1mn61yfjns2yllhx70rsb2fqrn"; + }) ]; + nativeBuildInputs = [ pkgconfig cmake ]; buildInputs = [ libusb1 ]; diff --git a/third_party/nixpkgs/pkgs/applications/radio/urh/default.nix b/third_party/nixpkgs/pkgs/applications/radio/urh/default.nix index 730b679ba6..008697211f 100644 --- a/third_party/nixpkgs/pkgs/applications/radio/urh/default.nix +++ b/third_party/nixpkgs/pkgs/applications/radio/urh/default.nix @@ -5,13 +5,13 @@ python3Packages.buildPythonApplication rec { pname = "urh"; - version = "2.8.8"; + version = "2.8.9"; src = fetchFromGitHub { owner = "jopohl"; repo = pname; rev = "v${version}"; - sha256 = "0knymy85n9kxj364jpxjc4v9c238b00nl40rafi1ripkqx36bsfv"; + sha256 = "0axzqyljbmpc4c9bnqmdrrz5la5r9qynp49fig645xyxs87vq6b0"; }; nativeBuildInputs = [ qt5.wrapQtAppsHook ]; diff --git a/third_party/nixpkgs/pkgs/applications/science/electronics/nanovna-saver/default.nix b/third_party/nixpkgs/pkgs/applications/science/electronics/nanovna-saver/default.nix new file mode 100644 index 0000000000..62bda91e50 --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/science/electronics/nanovna-saver/default.nix @@ -0,0 +1,51 @@ +{ lib, mkDerivationWith, wrapQtAppsHook, python3Packages, fetchFromGitHub +, qtbase }: + +let + version = "0.3.7"; + pname = "nanovna-saver"; + +in mkDerivationWith python3Packages.buildPythonApplication { + inherit pname version; + + src = fetchFromGitHub { + owner = "NanoVNA-Saver"; + repo = pname; + rev = "v${version}"; + sha256 = "0c22ckyypg91gfb2sdc684msw28nnb6r8cq3b362gafvv00a35mi"; + }; + + nativeBuildInputs = [ wrapQtAppsHook ]; + + propagatedBuildInputs = with python3Packages; [ + cython + scipy_1_4 + pyqt5 + pyserial + numpy + ]; + + doCheck = false; + + dontWrapGApps = true; + dontWrapQtApps = true; + + postFixup = '' + wrapProgram $out/bin/NanoVNASaver \ + "''${gappsWrapperArgs[@]}" \ + "''${qtWrapperArgs[@]}" + ''; + + meta = with lib; { + homepage = "https://github.com/NanoVNA-Saver/nanovna-saver"; + description = + "A tool for reading, displaying and saving data from the NanoVNA"; + longDescription = '' + A multiplatform tool to save Touchstone files from the NanoVNA, sweep + frequency spans in segments to gain more than 101 data points, and + generally display and analyze the resulting data. + ''; + license = licenses.gpl3Only; + maintainers = with maintainers; [ zaninime ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/applications/science/electronics/openhantek6022/default.nix b/third_party/nixpkgs/pkgs/applications/science/electronics/openhantek6022/default.nix index ad8fa3c7a7..acdac346fd 100644 --- a/third_party/nixpkgs/pkgs/applications/science/electronics/openhantek6022/default.nix +++ b/third_party/nixpkgs/pkgs/applications/science/electronics/openhantek6022/default.nix @@ -2,13 +2,13 @@ mkDerivation rec { pname = "openhantek6022"; - version = "3.1.2"; + version = "3.1.3"; src = fetchFromGitHub { owner = "OpenHantek"; repo = "OpenHantek6022"; rev = version; - sha256 = "104j7d3i5y6jd20c2z3l10sr6sgdy8iki3g9mlwhddnr8x6nzc03"; + sha256 = "1n4l8ks5808d99zj1vj0ck0v1lb9s7iv3ahww7ximbf9iha39pbm"; }; nativeBuildInputs = [ cmake makeWrapper ]; diff --git a/third_party/nixpkgs/pkgs/applications/science/logic/cryptoverif/default.nix b/third_party/nixpkgs/pkgs/applications/science/logic/cryptoverif/default.nix index 6877060d36..28295ea289 100644 --- a/third_party/nixpkgs/pkgs/applications/science/logic/cryptoverif/default.nix +++ b/third_party/nixpkgs/pkgs/applications/science/logic/cryptoverif/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "cryptoverif"; - version = "2.01pl1"; + version = "2.03pl1"; src = fetchurl { url = "http://prosecco.gforge.inria.fr/personal/bblanche/cryptoverif/cryptoverif${version}.tar.gz"; - sha256 = "1bkmrv3wsy8mwhrxd3z3br9zgv37c2w6443rm4s9jl0aphcgnbiw"; + sha256 = "0q7qa1qm7mbky3m36445gdmgmkb9mrhrdsk7mmwn8fzw0rfc6z00"; }; buildInputs = [ ocaml ]; diff --git a/third_party/nixpkgs/pkgs/applications/science/math/R/default.nix b/third_party/nixpkgs/pkgs/applications/science/math/R/default.nix index 717b240c1c..25ee66e8f7 100644 --- a/third_party/nixpkgs/pkgs/applications/science/math/R/default.nix +++ b/third_party/nixpkgs/pkgs/applications/science/math/R/default.nix @@ -12,11 +12,11 @@ assert (!blas.isILP64) && (!lapack.isILP64); stdenv.mkDerivation rec { - name = "R-4.0.2"; + name = "R-4.0.3"; src = fetchurl { url = "https://cran.r-project.org/src/base/R-4/${name}.tar.gz"; - sha256 = "0xdy3dy2bzdiba8z94hjykyra8si8a5q15s0bri7c26scjrymg6k"; + sha256 = "03cypg2qf7v9mq9mr9alz9w5y9m5kdgwbc97bp26pyymg253m609"; }; dontUseImakeConfigure = true; diff --git a/third_party/nixpkgs/pkgs/applications/science/math/rofi-calc/default.nix b/third_party/nixpkgs/pkgs/applications/science/math/rofi-calc/default.nix index 40b2711ff6..ebf2d2f047 100644 --- a/third_party/nixpkgs/pkgs/applications/science/math/rofi-calc/default.nix +++ b/third_party/nixpkgs/pkgs/applications/science/math/rofi-calc/default.nix @@ -12,13 +12,13 @@ stdenv.mkDerivation rec { pname = "rofi-calc"; - version = "1.8"; + version = "1.9"; src = fetchFromGitHub { owner = "svenstaro"; repo = pname; rev = "v${version}"; - sha256 = "0vwb9c3xvd2cms6cw8j8parg7w4bsxvvrd1wgggr8sz2p8rrvy5p"; + sha256 = "ZGY4ZtAG/ZnEnC80modZBV4RdRQElbkjeoKCEFVrncE="; }; nativeBuildInputs = [ @@ -48,7 +48,7 @@ stdenv.mkDerivation rec { homepage = "https://github.com/svenstaro/rofi-calc"; license = licenses.mit; maintainers = with maintainers; [ luc65r albakham ]; - platforms = [ "x86_64-linux" "x86_64-darwin" ]; + platforms = with platforms; linux; }; } diff --git a/third_party/nixpkgs/pkgs/applications/system/glances/default.nix b/third_party/nixpkgs/pkgs/applications/system/glances/default.nix index 6b77914539..b0bd5cc8b1 100644 --- a/third_party/nixpkgs/pkgs/applications/system/glances/default.nix +++ b/third_party/nixpkgs/pkgs/applications/system/glances/default.nix @@ -4,6 +4,7 @@ , bottle, pysnmp , hddtemp , netifaces # IP module +, py-cpuinfo }: buildPythonApplication rec { @@ -41,6 +42,7 @@ buildPythonApplication rec { psutil pysnmp setuptools + py-cpuinfo ] ++ lib.optional stdenv.isLinux hddtemp; preConfigure = '' diff --git a/third_party/nixpkgs/pkgs/applications/version-management/git-and-tools/git-absorb/default.nix b/third_party/nixpkgs/pkgs/applications/version-management/git-and-tools/git-absorb/default.nix index 1870340313..46a6f81741 100644 --- a/third_party/nixpkgs/pkgs/applications/version-management/git-and-tools/git-absorb/default.nix +++ b/third_party/nixpkgs/pkgs/applications/version-management/git-and-tools/git-absorb/default.nix @@ -2,20 +2,20 @@ rustPlatform.buildRustPackage rec { pname = "git-absorb"; - version = "0.6.4"; + version = "0.6.5"; src = fetchFromGitHub { owner = "tummychow"; repo = pname; rev = "refs/tags/${version}"; - sha256 = "01hf9hbrigqn4qcz6jmprp7by9nh55k1r2d11g7sil5fpw6m2j9k"; + sha256 = "12ih0gm07ddi86jy612f029nzav345v57pjajyy9lw017g6n6mjb"; }; nativeBuildInputs = [ installShellFiles ]; buildInputs = stdenv.lib.optionals stdenv.isDarwin [ libiconv Security ]; - cargoSha256 = "04dkfjb6pxqaalw2y6yli9q58g8x8ppfmibivpvqifk8r8dhkdqp"; + cargoSha256 = "0x2zcw0bpwqimvbb5xj8xawvl4jcvk5lj0y2mm5ncbdapzyqdsb2"; postInstall = '' installManPage Documentation/git-absorb.1 diff --git a/third_party/nixpkgs/pkgs/applications/version-management/git-and-tools/gitstatus/default.nix b/third_party/nixpkgs/pkgs/applications/version-management/git-and-tools/gitstatus/default.nix index 5b7dbc521f..47d095b0f1 100644 --- a/third_party/nixpkgs/pkgs/applications/version-management/git-and-tools/gitstatus/default.nix +++ b/third_party/nixpkgs/pkgs/applications/version-management/git-and-tools/gitstatus/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "gitstatus"; - version = "1.3.0"; + version = "1.3.1"; src = fetchFromGitHub { owner = "romkatv"; repo = "gitstatus"; rev = "v${version}"; - sha256 = "0zan1sa8c24hpqwj66y9srd4n15f4nk64fc5jrd4smgfgn22wph8"; + sha256 = "03zaywncds7pjrl07rvdf3fh39gnp2zfvgsf0afqwv317sgmgpzf"; }; buildInputs = [ (callPackage ./romkatv_libgit2.nix {}) ]; diff --git a/third_party/nixpkgs/pkgs/applications/version-management/git-and-tools/gitstatus/romkatv_libgit2.nix b/third_party/nixpkgs/pkgs/applications/version-management/git-and-tools/gitstatus/romkatv_libgit2.nix index 2f99c88a37..9c74fa3575 100644 --- a/third_party/nixpkgs/pkgs/applications/version-management/git-and-tools/gitstatus/romkatv_libgit2.nix +++ b/third_party/nixpkgs/pkgs/applications/version-management/git-and-tools/gitstatus/romkatv_libgit2.nix @@ -16,7 +16,7 @@ libgit2.overrideAttrs (oldAttrs: { src = fetchFromGitHub { owner = "romkatv"; repo = "libgit2"; - rev = "tag-005f77dca6dbe8788e55139fa1199fc94cc04f9a"; - sha256 = "1h5bnisk4ljdpfzlv8g41m8js9841xyjhfywc5cn8pmyv58c50il"; + rev = "tag-82cefe2b42300224ad3c148f8b1a569757cc617a"; + sha256 = "1vhnqynqyxizzkq1h5dfjm75f0jm5637jh0gypwqqz2yjqrscza0"; }; }) diff --git a/third_party/nixpkgs/pkgs/applications/version-management/p4/default.nix b/third_party/nixpkgs/pkgs/applications/version-management/p4/default.nix index 3a397b5bf8..fd369601c6 100644 --- a/third_party/nixpkgs/pkgs/applications/version-management/p4/default.nix +++ b/third_party/nixpkgs/pkgs/applications/version-management/p4/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "p4"; - version = "2020.1.1991450"; + version = "2020.1.2007551"; src = fetchurl { url = "https://cdist2.perforce.com/perforce/r20.1/bin.linux26x86_64/helix-core-server.tgz"; - sha256 = "0nhcxhwx3scx6vf7i2bc8j0b1l57lmq9bfy1cfbfbqasd3an721k"; + sha256 = "0ly9b838zrpp6841fzapizdd3xmria55bwfrh2j29qwxiwzqj80y"; }; sourceRoot = "."; diff --git a/third_party/nixpkgs/pkgs/applications/video/kodi/default.nix b/third_party/nixpkgs/pkgs/applications/video/kodi/default.nix index 56788ae4f1..fcbb546a1f 100644 --- a/third_party/nixpkgs/pkgs/applications/video/kodi/default.nix +++ b/third_party/nixpkgs/pkgs/applications/video/kodi/default.nix @@ -3,7 +3,7 @@ , libgcrypt, libgpgerror, libunistring , boost, avahi, lame, autoreconfHook , gettext, pcre-cpp, yajl, fribidi, which -, openssl, gperf, tinyxml2, taglib, libssh, swig, jre +, openssl, gperf, tinyxml2, taglib, libssh, swig, jre_headless , libxml2, systemd , alsaLib, libGLU, libGL, glew, fontconfig, freetype, ftgl , libjpeg, libpng, libtiff @@ -211,7 +211,7 @@ in stdenv.mkDerivation { which pkgconfig gnumake autoconf automake libtool # still needed for some components. Check if that is the case with 19.0 - jre yasm gettext python2Packages.python flatbuffers + jre_headless yasm gettext python2Packages.python flatbuffers # for TexturePacker giflib zlib libpng libjpeg lzo diff --git a/third_party/nixpkgs/pkgs/applications/video/lightworks/default.nix b/third_party/nixpkgs/pkgs/applications/video/lightworks/default.nix index da413915e3..97e5e67aae 100644 --- a/third_party/nixpkgs/pkgs/applications/video/lightworks/default.nix +++ b/third_party/nixpkgs/pkgs/applications/video/lightworks/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, dpkg, makeWrapper, buildFHSUserEnv -, gtk3, gdk-pixbuf, cairo, libjpeg_original, glib, gnome2, libGLU +, gtk3, gdk-pixbuf, cairo, libjpeg_original, glib, pango, libGLU , nvidia_cg_toolkit, zlib, openssl, portaudio }: let @@ -10,7 +10,7 @@ let cairo libjpeg_original glib - gnome2.pango + pango libGLU nvidia_cg_toolkit zlib diff --git a/third_party/nixpkgs/pkgs/applications/video/obs-studio/wlrobs.nix b/third_party/nixpkgs/pkgs/applications/video/obs-studio/wlrobs.nix index 99486a9ccc..14bc80dd38 100644 --- a/third_party/nixpkgs/pkgs/applications/video/obs-studio/wlrobs.nix +++ b/third_party/nixpkgs/pkgs/applications/video/obs-studio/wlrobs.nix @@ -7,7 +7,7 @@ # ln -s ~/.nix-profile/share/obs/obs-plugins/wlrobs/bin/64bit/libwlrobs.so ~/.config/obs-studio/plugins/wlrobs/bin/64bit { stdenv, fetchhg, wayland, obs-studio , meson, ninja, pkgconfig, libX11 -, dmabufSupport ? false, libdrm ? null, libGL ? null}: +, dmabufSupport ? false, libdrm ? null, libGL ? null, lib}: assert dmabufSupport -> libdrm != null && libGL != null; @@ -29,7 +29,7 @@ stdenv.mkDerivation { ''; mesonFlags = [ - "-Duse_dmabuf=${if dmabufSupport then "true" else "false"}" + "-Duse_dmabuf=${lib.boolToString dmabufSupport}" ]; meta = with stdenv.lib; { diff --git a/third_party/nixpkgs/pkgs/applications/video/pitivi/default.nix b/third_party/nixpkgs/pkgs/applications/video/pitivi/default.nix index b1c1dd285e..ee07a5c7cc 100644 --- a/third_party/nixpkgs/pkgs/applications/video/pitivi/default.nix +++ b/third_party/nixpkgs/pkgs/applications/video/pitivi/default.nix @@ -147,6 +147,12 @@ in python3Packages.buildPythonApplication rec { mv data/org.pitivi.Pitivi-mime.xml data/org.pitivi.Pitivi-mime.xml.in ''; + # Fixes error + # Couldn’t recognize the image file format for file ".../share/pitivi/pixmaps/asset-proxied.svg" + # at startup, see https://github.com/NixOS/nixpkgs/issues/56943 + # and https://github.com/NixOS/nixpkgs/issues/89691#issuecomment-714398705. + strictDeps = false; + passthru = { updateScript = gnome3.updateScript { packageName = "pitivi"; diff --git a/third_party/nixpkgs/pkgs/applications/video/streamlink-twitch-gui/bin.nix b/third_party/nixpkgs/pkgs/applications/video/streamlink-twitch-gui/bin.nix index 251f495b7e..1c955a36f3 100644 --- a/third_party/nixpkgs/pkgs/applications/video/streamlink-twitch-gui/bin.nix +++ b/third_party/nixpkgs/pkgs/applications/video/streamlink-twitch-gui/bin.nix @@ -1,6 +1,6 @@ { autoPatchelfHook, fetchurl, lib, makeDesktopItem, makeWrapper, stdenv, wrapGAppsHook , at-spi2-core, atk, alsaLib, cairo, cups, dbus, expat, gcc-unwrapped -, gdk-pixbuf, glib, gnome2, gtk3-x11, libudev0-shim, libuuid, nss, nspr, xorg +, gdk-pixbuf, glib, pango, gtk3-x11, libudev0-shim, libuuid, nss, nspr, xorg , streamlink }: let @@ -40,7 +40,7 @@ stdenv.mkDerivation rec { gcc-unwrapped gdk-pixbuf glib - gnome2.pango + pango gtk3-x11 nss nspr diff --git a/third_party/nixpkgs/pkgs/applications/virtualization/docker/default.nix b/third_party/nixpkgs/pkgs/applications/virtualization/docker/default.nix index a1d48b0588..3dbfd8f5bb 100644 --- a/third_party/nixpkgs/pkgs/applications/virtualization/docker/default.nix +++ b/third_party/nixpkgs/pkgs/applications/virtualization/docker/default.nix @@ -33,7 +33,7 @@ rec { name = "docker-containerd-${version}"; inherit version; src = fetchFromGitHub { - owner = "docker"; + owner = "containerd"; repo = "containerd"; rev = containerdRev; sha256 = containerdSha256; diff --git a/third_party/nixpkgs/pkgs/applications/virtualization/open-vm-tools/default.nix b/third_party/nixpkgs/pkgs/applications/virtualization/open-vm-tools/default.nix index df9a89293f..033fe79368 100644 --- a/third_party/nixpkgs/pkgs/applications/virtualization/open-vm-tools/default.nix +++ b/third_party/nixpkgs/pkgs/applications/virtualization/open-vm-tools/default.nix @@ -1,18 +1,18 @@ { stdenv, lib, fetchFromGitHub, makeWrapper, autoreconfHook, - fuse, libmspack, openssl, pam, xercesc, icu, libdnet, procps, + fuse, libmspack, openssl, pam, xercesc, icu, libdnet, procps, libtirpc, rpcsvc-proto, libX11, libXext, libXinerama, libXi, libXrender, libXrandr, libXtst, pkgconfig, glib, gdk-pixbuf-xlib, gtk3, gtkmm3, iproute, dbus, systemd, which, withX ? true }: stdenv.mkDerivation rec { pname = "open-vm-tools"; - version = "11.1.0"; + version = "11.1.5"; src = fetchFromGitHub { owner = "vmware"; repo = "open-vm-tools"; rev = "stable-${version}"; - sha256 = "1wyiz8j5b22ajrr1fh9cn55lsgd5g13q0i8wvk2a0yw0vaw1883s"; + sha256 = "0i8p28hd5wgiay4lgmd9fid5ickwygy6w3xpfzzy8v9z04xc5bg7"; }; sourceRoot = "${src.name}/open-vm-tools"; @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { outputs = [ "out" "dev" ]; nativeBuildInputs = [ autoreconfHook makeWrapper pkgconfig ]; - buildInputs = [ fuse glib icu libdnet libmspack openssl pam procps xercesc ] + buildInputs = [ fuse glib icu libdnet libmspack libtirpc openssl pam procps rpcsvc-proto xercesc ] ++ lib.optionals withX [ gdk-pixbuf-xlib gtk3 gtkmm3 libX11 libXext libXinerama libXi libXrender libXrandr libXtst ]; patches = [ diff --git a/third_party/nixpkgs/pkgs/applications/window-managers/qtile/default.nix b/third_party/nixpkgs/pkgs/applications/window-managers/qtile/default.nix index eccf5c163a..280ec06765 100644 --- a/third_party/nixpkgs/pkgs/applications/window-managers/qtile/default.nix +++ b/third_party/nixpkgs/pkgs/applications/window-managers/qtile/default.nix @@ -34,7 +34,18 @@ python37Packages.buildPythonApplication rec { nativeBuildInputs = [ pkgconfig ]; buildInputs = [ glib libxcb cairo pango python37Packages.xcffib ]; - pythonPath = with python37Packages; [ xcffib cairocffi-xcffib setuptools setuptools_scm ]; + pythonPath = with python37Packages; [ + xcffib + cairocffi-xcffib + setuptools + setuptools_scm + dateutil + dbus-python + mpd2 + psutil + pyxdg + pygobject3 + ]; postInstall = '' wrapProgram $out/bin/qtile \ diff --git a/third_party/nixpkgs/pkgs/data/fonts/jetbrains-mono/default.nix b/third_party/nixpkgs/pkgs/data/fonts/jetbrains-mono/default.nix index b198486327..e3ac0a1f32 100644 --- a/third_party/nixpkgs/pkgs/data/fonts/jetbrains-mono/default.nix +++ b/third_party/nixpkgs/pkgs/data/fonts/jetbrains-mono/default.nix @@ -1,20 +1,18 @@ { lib, fetchzip }: let - version = "2.002"; + version = "2.200"; in fetchzip { name = "JetBrainsMono-${version}"; url = "https://github.com/JetBrains/JetBrainsMono/releases/download/v${version}/JetBrainsMono-${version}.zip"; - sha256 = "018lhxi9m8aprls6cnpndzdg5snijwzm22m2pxxi6zcqxrcxh8vb"; + sha256 = "16v914ph9sgdz3w56yz9f26zpj2lpxjb6ppnphxlmbllh68z1fh4"; postFetch = '' mkdir -p $out/share/fonts unzip -j $downloadedFile \*.ttf -d $out/share/fonts/truetype - unzip -j $downloadedFile \*.eot -d $out/share/fonts/eot - unzip -j $downloadedFile \*.woff -d $out/share/fonts/woff unzip -j $downloadedFile \*.woff2 -d $out/share/fonts/woff2 ''; diff --git a/third_party/nixpkgs/pkgs/data/fonts/joypixels/default.nix b/third_party/nixpkgs/pkgs/data/fonts/joypixels/default.nix index 1b107f9cb8..c19a55400f 100644 --- a/third_party/nixpkgs/pkgs/data/fonts/joypixels/default.nix +++ b/third_party/nixpkgs/pkgs/data/fonts/joypixels/default.nix @@ -1,24 +1,103 @@ -{ stdenv, fetchurl }: +{ stdenv +, fetchurl +, config +, acceptLicense ? config.joypixels.acceptLicense or false +}: + +let + inherit (stdenv.hostPlatform.parsed) kernel; + + systemSpecific = { + darwin = rec { + systemTag = "nix-darwin"; + capitalized = systemTag; + fontFile = "JoyPixels-SBIX.ttf"; + }; + }.${kernel.name} or rec { + systemTag = "nixos"; + capitalized = "NixOS"; + fontFile = "joypixels-android.ttf"; + }; + + joypixels-free-license = with systemSpecific; { + spdxId = "LicenseRef-JoyPixels-Free-6.0"; + fullName = "JoyPixels Free License Agreement 6.0"; + url = "https://cdn.joypixels.com/distributions/${systemTag}/license/free-license.pdf"; + free = false; + }; + + joypixels-license-appendix = with systemSpecific; { + spdxId = "LicenseRef-JoyPixels-NixOS-Appendix"; + fullName = "JoyPixels ${capitalized} License Appendix"; + url = "https://cdn.joypixels.com/distributions/${systemTag}/appendix/joypixels-license-appendix.pdf"; + free = false; + }; + + throwLicense = throw '' + Use of the JoyPixels font requires acceptance of the license. + - ${joypixels-free-license.fullName} [1] + - ${joypixels-license-appendix.fullName} [2] + + You can express acceptance by setting acceptLicense to true in your + configuration. Note that this is not a free license so it requires allowing + unfree licenses. + + configuration.nix: + nixpkgs.config.allowUnfree = true; + nixpkgs.config.joypixels.acceptLicense = true; + + config.nix: + allowUnfree = true; + joypixels.acceptLicense = true; + + [1]: ${joypixels-free-license.url} + [2]: ${joypixels-license-appendix.url} + ''; + +in stdenv.mkDerivation rec { pname = "joypixels"; version = "6.0.0"; - src = fetchurl { - url = "https://cdn.joypixels.com/arch-linux/font/${version}/joypixels-android.ttf"; - sha256 = "1vxqsqs93g4jyp01r47lrpcm0fmib2n1vysx32ksmfxmprimb75s"; - }; + src = assert !acceptLicense -> throwLicense; + with systemSpecific; fetchurl { + name = fontFile; + url = "https://cdn.joypixels.com/distributions/${systemTag}/font/${version}/${fontFile}"; + sha256 = { + darwin = "1s1dibgpv4lc9cwbgykgwjxxhg2rbn5g9fyd10r6apj9xhfn8cyn"; + }.${kernel.name} or "1vxqsqs93g4jyp01r47lrpcm0fmib2n1vysx32ksmfxmprimb75s"; + }; dontUnpack = true; - installPhase = '' - install -Dm644 $src $out/share/fonts/truetype/joypixels.ttf + installPhase = with systemSpecific; '' + runHook preInstall + + install -Dm644 $src $out/share/fonts/truetype/${fontFile} + + runHook postInstall ''; meta = with stdenv.lib; { - description = "Emoji as a Service (formerly EmojiOne)"; - homepage = "https://www.joypixels.com/"; - license = licenses.unfree; - maintainers = with maintainers; [ jtojnar ]; + description = "The finest emoji you can use legally (formerly EmojiOne)"; + longDescription = '' + New for 2020! JoyPixels 6.0 includes 3,342 originally crafted icon + designs and is 100% Unicode 13 compatible. We offer the largest selection + of files ranging from png, svg, iconjar, sprites, and fonts. + ''; + homepage = "https://www.joypixels.com/fonts"; + license = + let + free-license = joypixels-free-license; + appendix = joypixels-license-appendix; + in with systemSpecific; { + spdxId = "LicenseRef-JoyPixels-Free-6.0-with-${capitalized}-Appendix"; + fullName = "${free-license.fullName} with ${appendix.fullName}"; + url = free-license.url; + appendixUrl = appendix.url; + free = false; + }; + maintainers = with maintainers; [ toonn jtojnar ]; }; } diff --git a/third_party/nixpkgs/pkgs/data/fonts/julia-mono/default.nix b/third_party/nixpkgs/pkgs/data/fonts/julia-mono/default.nix index 4856931036..8774913c83 100644 --- a/third_party/nixpkgs/pkgs/data/fonts/julia-mono/default.nix +++ b/third_party/nixpkgs/pkgs/data/fonts/julia-mono/default.nix @@ -5,7 +5,7 @@ let in fetchzip { name = "JuliaMono-${version}"; url = "https://github.com/cormullion/juliamono/releases/download/v${version}/JuliaMono.zip"; - sha256 = "1v4a9qbvjlszamvqrj0g65z1nhahfmf1fzkgjwzkmsrdqn909dic"; + sha256 = "sha256-/MVT6n842sSiuPZNYxN3q1vn6yvMvmcTEDyvAd2GikA="; postFetch = '' mkdir -p $out/share/fonts/truetype diff --git a/third_party/nixpkgs/pkgs/data/fonts/open-sans/default.nix b/third_party/nixpkgs/pkgs/data/fonts/open-sans/default.nix index e92f758025..ecca50537f 100644 --- a/third_party/nixpkgs/pkgs/data/fonts/open-sans/default.nix +++ b/third_party/nixpkgs/pkgs/data/fonts/open-sans/default.nix @@ -9,7 +9,7 @@ in fetchFromGitLab { domain = "salsa.debian.org"; owner = "fonts-team"; repo = "fonts-open-sans"; - rev = "debian%2F1.11-1"; # URL-encoded form of "debian/1.11-1" tag + rev = "debian/1.11-1"; postFetch = '' tar xf $downloadedFile --strip=1 mkdir -p $out/share/fonts/truetype diff --git a/third_party/nixpkgs/pkgs/data/misc/hackage/default.nix b/third_party/nixpkgs/pkgs/data/misc/hackage/default.nix index d390445f31..c9950d9fcd 100644 --- a/third_party/nixpkgs/pkgs/data/misc/hackage/default.nix +++ b/third_party/nixpkgs/pkgs/data/misc/hackage/default.nix @@ -1,6 +1,6 @@ { fetchurl }: fetchurl { - url = "https://github.com/commercialhaskell/all-cabal-hashes/archive/cc32e957fbe01d248c9a0e99253fadb37fd3adfa.tar.gz"; - sha256 = "121n26r3sm55ycwh6m71n4823c5af3hfpc497g4prf1j2n4yh2dl"; + url = "https://github.com/commercialhaskell/all-cabal-hashes/archive/197a82b352062bfeeefd4b62bfec19dd51a3728d.tar.gz"; + sha256 = "11c9a67j421vf6a7vvh280gsmssf49rxqnamdp1n9iljkhlfh5z1"; } diff --git a/third_party/nixpkgs/pkgs/data/themes/matcha/default.nix b/third_party/nixpkgs/pkgs/data/themes/matcha/default.nix index bc07766955..7ed6acb280 100644 --- a/third_party/nixpkgs/pkgs/data/themes/matcha/default.nix +++ b/third_party/nixpkgs/pkgs/data/themes/matcha/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "matcha-gtk-theme"; - version = "2020-10-05"; + version = "2020-10-23"; src = fetchFromGitHub { owner = "vinceliuice"; repo = pname; rev = version; - sha256 = "0pkgpipffwxphn16p6r911mbhqhjyk60svirxzm2phlhxl0ddwpj"; + sha256 = "125wcvr457lbs8zxp8r18q7gzagp0wbg518iynzmbax8gsjds8w3"; }; buildInputs = [ gdk-pixbuf librsvg ]; diff --git a/third_party/nixpkgs/pkgs/desktops/cinnamon/cinnamon-desktop/default.nix b/third_party/nixpkgs/pkgs/desktops/cinnamon/cinnamon-desktop/default.nix index cdb8e6a381..71eb54ea20 100644 --- a/third_party/nixpkgs/pkgs/desktops/cinnamon/cinnamon-desktop/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/cinnamon/cinnamon-desktop/default.nix @@ -17,13 +17,13 @@ stdenv.mkDerivation rec { pname = "cinnamon-desktop"; - version = "4.6.1"; + version = "4.6.4"; src = fetchFromGitHub { owner = "linuxmint"; repo = pname; rev = version; - sha256 = "0299m41vy4kcsi74z793ligvqj8nyy3fbzh6xz89jd8l3p9kgrz8"; + sha256 = "08z5hgc6dwdp9fczm75axwh8q9665iz4y2lxp92xp62r3k0v9fvd"; }; outputs = [ "out" "dev" ]; diff --git a/third_party/nixpkgs/pkgs/desktops/cinnamon/cinnamon-menus/default.nix b/third_party/nixpkgs/pkgs/desktops/cinnamon/cinnamon-menus/default.nix index bae9615fb9..9edc136870 100644 --- a/third_party/nixpkgs/pkgs/desktops/cinnamon/cinnamon-menus/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/cinnamon/cinnamon-menus/default.nix @@ -10,13 +10,13 @@ stdenv.mkDerivation rec { pname = "cinnamon-menus"; - version = "4.6.0"; + version = "4.6.1"; src = fetchFromGitHub { owner = "linuxmint"; repo = pname; rev = version; - sha256 = "00jzb3fd96ydi15lrnwnjai12wvka5zlandn9xc61s8iim48lplq"; + sha256 = "1qdaql4mknhzvl2qi1pyw4c820lqb7lg07gblh0wzfk4f7h8hddx"; }; buildInputs = [ diff --git a/third_party/nixpkgs/pkgs/desktops/cinnamon/cinnamon-session/default.nix b/third_party/nixpkgs/pkgs/desktops/cinnamon/cinnamon-session/default.nix index 9e14209596..4e9c09f4d7 100644 --- a/third_party/nixpkgs/pkgs/desktops/cinnamon/cinnamon-session/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/cinnamon/cinnamon-session/default.nix @@ -27,13 +27,13 @@ stdenv.mkDerivation rec { pname = "cinnamon-session"; - version = "4.6.1"; + version = "4.6.2"; src = fetchFromGitHub { owner = "linuxmint"; repo = pname; rev = version; - sha256 = "13qqi3zqybz00czh0g5nqjx5iwna54cxd7mk9wkp30kj6raa4qca"; + sha256 = "133vpgs0dqr16pvx5wyxhfcargn9wl14z0q99m2pn93hf6zycmsv"; }; patches = [ diff --git a/third_party/nixpkgs/pkgs/desktops/cinnamon/cinnamon-settings-daemon/default.nix b/third_party/nixpkgs/pkgs/desktops/cinnamon/cinnamon-settings-daemon/default.nix index 418107673a..4788af8973 100644 --- a/third_party/nixpkgs/pkgs/desktops/cinnamon/cinnamon-settings-daemon/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/cinnamon/cinnamon-settings-daemon/default.nix @@ -28,6 +28,7 @@ , fontconfig , tzdata , nss +, libgudev }: stdenv.mkDerivation rec { @@ -83,6 +84,7 @@ stdenv.mkDerivation rec { xorg.libXfixes fontconfig nss + libgudev ]; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/desktops/cinnamon/cjs/default.nix b/third_party/nixpkgs/pkgs/desktops/cinnamon/cjs/default.nix index a810bdcc03..6471d06cd5 100644 --- a/third_party/nixpkgs/pkgs/desktops/cinnamon/cjs/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/cinnamon/cjs/default.nix @@ -27,14 +27,14 @@ }: stdenv.mkDerivation rec { - pname = "cjs"; - version = "4.6.0-gjs-1.66.0"; + pname = "cjs-unstable"; + version = "2020-10-19"; src = fetchFromGitHub { - owner = "leigh123linux"; - repo = pname; - rev = "gjs-1.66.0"; - sha256 = "1pccz7h8mwljziflhn04gmfnbl99pvcj1byz1c6zn947v5gqskj1"; + owner = "linuxmint"; + repo = "cjs"; + rev = "befc11adb5ba10681464e6fa81b1a79f108ce61c"; + hash = "sha256-F2t8uKV2r29NxX2+3mYp5x1bug2lwihJZTK1dSS8rPg="; }; outputs = [ "out" "dev" ]; diff --git a/third_party/nixpkgs/pkgs/desktops/enlightenment/evisum/default.nix b/third_party/nixpkgs/pkgs/desktops/enlightenment/evisum/default.nix index 7b97d871e6..fef15ce79f 100644 --- a/third_party/nixpkgs/pkgs/desktops/enlightenment/evisum/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/enlightenment/evisum/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "evisum"; - version = "0.5.6"; + version = "0.5.7"; src = fetchurl { url = "https://download.enlightenment.org/rel/apps/${pname}/${pname}-${version}.tar.xz"; - sha256 = "1l8pym7738kncvic5ga03sj9d5igigvmcxa9lbg47z2yvdjwzv97"; + sha256 = "0pm63n3rls8vkjv3awq0f3zlqk33ddql3g0rl2bc46n48g2mcmbd"; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/desktops/gnome-3/extensions/material-shell/default.nix b/third_party/nixpkgs/pkgs/desktops/gnome-3/extensions/material-shell/default.nix index 36de0e0a66..87869f27d4 100644 --- a/third_party/nixpkgs/pkgs/desktops/gnome-3/extensions/material-shell/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/gnome-3/extensions/material-shell/default.nix @@ -1,25 +1,16 @@ -{ stdenv, lib, fetchFromGitHub, gnome3, fetchpatch }: +{ stdenv, lib, fetchFromGitHub, gnome3 }: stdenv.mkDerivation rec { pname = "gnome-shell-extension-material-shell"; - version = "7"; + version = "8"; src = fetchFromGitHub { owner = "material-shell"; repo = "material-shell"; rev = version; - sha256 = "076cv1l5qr5x71przjwvbzx0m91n4z0byc2gc3r48l8vsr2d0hwf"; + sha256 = "08zc6xl2b7k7l5l6afr40ii3gnxxbysan3cqv2s9g614rbsmc62r"; }; - patches = [ - # Fix for https://github.com/material-shell/material-shell/issues/284 - # (Remove this patch when updating to version >= 8) - (fetchpatch { - url = "https://github.com/material-shell/material-shell/commit/fc27489a1ec503a4a5c7cb2f4e1eefa84a7ea2f1.patch"; - sha256 = "0x2skg955c4jqgwbkfhk7plm8bh1qnk66cdds796bzkp3hb5syw8"; - }) - ]; - # This package has a Makefile, but it's used for building a zip for # publication to extensions.gnome.org. Disable the build phase so # installing doesn't build an unnecessary release. diff --git a/third_party/nixpkgs/pkgs/desktops/gnome-3/games/iagno/default.nix b/third_party/nixpkgs/pkgs/desktops/gnome-3/games/iagno/default.nix index 0263de1c9b..06831ecd0a 100644 --- a/third_party/nixpkgs/pkgs/desktops/gnome-3/games/iagno/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/gnome-3/games/iagno/default.nix @@ -1,6 +1,20 @@ -{ stdenv, fetchurl, pkgconfig, gtk3, gnome3, gdk-pixbuf, librsvg, wrapGAppsHook -, itstool, gsound, libxml2 -, meson, ninja, python3, vala, desktop-file-utils +{ stdenv +, fetchurl +, fetchpatch +, pkg-config +, gtk3 +, gnome3 +, gdk-pixbuf +, librsvg +, wrapGAppsHook +, itstool +, gsound +, libxml2 +, meson +, ninja +, python3 +, vala +, desktop-file-utils }: stdenv.mkDerivation rec { @@ -12,13 +26,34 @@ stdenv.mkDerivation rec { sha256 = "1fh2cvyqbz8saf2wij0bz2r9bja2k4gy6fqvbvig4gv0lx66gl29"; }; - nativeBuildInputs = [ - meson ninja python3 vala desktop-file-utils - pkgconfig wrapGAppsHook itstool libxml2 + patches = [ + # Fix build with Meson 0.55 + # https://gitlab.gnome.org/GNOME/iagno/-/issues/16 + (fetchpatch { + url = "https://gitlab.gnome.org/GNOME/iagno/commit/0100bab269f2102f24a6e41202b931da1b6e8dc5.patch"; + sha256 = "ZW75s+bV45ivwA+SKUN7ejSvnXYEo/kYQjDVvFBA/sg="; + }) ]; - buildInputs = [ gtk3 gnome3.adwaita-icon-theme gdk-pixbuf librsvg gsound ]; - enableParallelBuilding = true; + nativeBuildInputs = [ + meson + ninja + python3 + vala + desktop-file-utils + pkg-config + wrapGAppsHook + itstool + libxml2 + ]; + + buildInputs = [ + gtk3 + gnome3.adwaita-icon-theme + gdk-pixbuf + librsvg + gsound + ]; passthru = { updateScript = gnome3.updateScript { @@ -31,7 +66,7 @@ stdenv.mkDerivation rec { homepage = "https://wiki.gnome.org/Apps/Iagno"; description = "Computer version of the game Reversi, more popularly called Othello"; maintainers = teams.gnome.members; - license = licenses.gpl2; + license = licenses.gpl3Plus; platforms = platforms.linux; }; } diff --git a/third_party/nixpkgs/pkgs/desktops/pantheon/apps/switchboard-plugs/about/default.nix b/third_party/nixpkgs/pkgs/desktops/pantheon/apps/switchboard-plugs/about/default.nix index 86db11a3dc..f174c41abc 100644 --- a/third_party/nixpkgs/pkgs/desktops/pantheon/apps/switchboard-plugs/about/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/pantheon/apps/switchboard-plugs/about/default.nix @@ -1,5 +1,6 @@ { stdenv , fetchFromGitHub +, fetchpatch , nix-update-script , pantheon , substituteAll @@ -47,6 +48,20 @@ stdenv.mkDerivation rec { ]; patches = [ + # Get OS Info from GLib.Environment + # https://github.com/elementary/switchboard-plug-about/pull/128 + (fetchpatch { + url = "https://github.com/elementary/switchboard-plug-about/commit/5ed29988e3a895b2df66e5529df0f12a94d5517c.patch"; + sha256 = "1ipDxnpDZjpSEzZdtOeNe5U+QOXiB5M+hC3yDAsl/rQ="; + }) + + # Use Pretty Name + # https://github.com/elementary/switchboard-plug-about/pull/134 + (fetchpatch { + url = "https://github.com/elementary/switchboard-plug-about/commit/653d131dc8fac10ae7523f2bf6b179ffffa9c0fd.patch"; + sha256 = "AsM49Dc9/yn2tG6fqjfedeOlDXUu+iEoyNUmNYLH+zE="; + }) + (substituteAll { src = ./fix-paths.patch; inherit pciutils; diff --git a/third_party/nixpkgs/pkgs/desktops/pantheon/apps/switchboard/wrapper.nix b/third_party/nixpkgs/pkgs/desktops/pantheon/apps/switchboard/wrapper.nix index 67f4105ff3..7953105951 100644 --- a/third_party/nixpkgs/pkgs/desktops/pantheon/apps/switchboard/wrapper.nix +++ b/third_party/nixpkgs/pkgs/desktops/pantheon/apps/switchboard/wrapper.nix @@ -8,15 +8,18 @@ , plugs # Only useful to disable for development testing. , useDefaultPlugs ? true +, testName ? null }: let selectedPlugs = if plugs == null then switchboardPlugs else plugs ++ (lib.optionals useDefaultPlugs switchboardPlugs); + + testingName = lib.optionalString (testName != null) "${testName}-"; in stdenv.mkDerivation rec { - name = "${switchboard.name}-with-plugs"; + name = "${testingName}${switchboard.name}-with-plugs"; src = null; diff --git a/third_party/nixpkgs/pkgs/desktops/pantheon/desktop/wingpanel-indicators/bluetooth/default.nix b/third_party/nixpkgs/pkgs/desktops/pantheon/desktop/wingpanel-indicators/bluetooth/default.nix index 51c87d5f34..995577b80d 100644 --- a/third_party/nixpkgs/pkgs/desktops/pantheon/desktop/wingpanel-indicators/bluetooth/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/pantheon/desktop/wingpanel-indicators/bluetooth/default.nix @@ -18,13 +18,13 @@ stdenv.mkDerivation rec { pname = "wingpanel-indicator-bluetooth"; - version = "2.1.5"; + version = "unstable-2020-10-01"; src = fetchFromGitHub { owner = "elementary"; repo = pname; - rev = version; - sha256 = "sha256-txEjChutJCse/WjgQEfo+MSeeGWdpHUABGCsAqK6i3o="; + rev = "2b59d646ea0d66ae45dafc851374f24dcd98c064"; + sha256 = "sha256-selp70P+7RhbdHF6iiNmcNbMf/c+B9zZ6nlxwRSZGn4="; }; passthru = { diff --git a/third_party/nixpkgs/pkgs/desktops/pantheon/desktop/wingpanel-indicators/session/default.nix b/third_party/nixpkgs/pkgs/desktops/pantheon/desktop/wingpanel-indicators/session/default.nix index 4812e2bc91..914db6cc8a 100644 --- a/third_party/nixpkgs/pkgs/desktops/pantheon/desktop/wingpanel-indicators/session/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/pantheon/desktop/wingpanel-indicators/session/default.nix @@ -16,28 +16,15 @@ stdenv.mkDerivation rec { pname = "wingpanel-indicator-session"; - version = "2.2.8"; + version = "unstable-2020-09-13"; src = fetchFromGitHub { owner = "elementary"; repo = pname; - rev = version; - sha256 = "sha256-iBbYOeGlv2lUFSK1qcd+4UJlCP/KCtdkx6i73jq6Ngo="; + rev = "e65c95f46adbfd598ad61933394d7bc3c5998278"; + sha256 = "sha256-QKOfgAc6pDQYpETrFunZB6+rF1P8XIf0pjft/t9aWW0="; }; - patches = [ - # build failure in vala 0.48.7 - # https://github.com/elementary/gala/pull/869#issuecomment-657147695 - (fetchpatch { - url = "https://github.com/elementary/wingpanel-indicator-session/commit/ead6971c708eed8b844bd9acd7eed2ab8a97e803.patch"; - sha256 = "1v7w7zdia82d38ycr5zhckaxgf7gr15hsv05cv5khlki8frryn2x"; - }) - (fetchpatch { - url = "https://github.com/elementary/wingpanel-indicator-session/commit/85347e676054635ac878fc542bd057398ca70d3e.patch"; - sha256 = "1vw4zx0qbhxmfzqhdcmwdp4fxvij7n3f5lwcplf5v3k9qsr3wm0n"; - }) - ]; - passthru = { updateScript = nix-update-script { attrPath = "pantheon.${pname}"; diff --git a/third_party/nixpkgs/pkgs/desktops/xfce/panel-plugins/xfce4-netload-plugin/default.nix b/third_party/nixpkgs/pkgs/desktops/xfce/panel-plugins/xfce4-netload-plugin/default.nix index 8d25822017..4ee50a07a3 100644 --- a/third_party/nixpkgs/pkgs/desktops/xfce/panel-plugins/xfce4-netload-plugin/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/xfce/panel-plugins/xfce4-netload-plugin/default.nix @@ -11,6 +11,6 @@ mkXfceDerivation { buildInputs = [ gtk3 libxfce4ui libxfce4util xfce4-panel xfconf ]; meta = { - description = "Battery plugin for Xfce panel"; + description = "Internet load speed plugin for Xfce4 panel"; }; } diff --git a/third_party/nixpkgs/pkgs/development/compilers/chez/default.nix b/third_party/nixpkgs/pkgs/development/compilers/chez/default.nix index 864ccc5a74..550f754639 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/chez/default.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/chez/default.nix @@ -5,13 +5,13 @@ stdenv.mkDerivation rec { pname = "chez-scheme"; - version = "9.5.2"; + version = "9.5.4"; src = fetchFromGitHub { owner = "cisco"; repo = "ChezScheme"; rev = "refs/tags/v${version}"; - sha256 = "1gsjmsvsj31q5l9bjvm869y7bakrvl41yq94vyqdx8zwcr1bmpjf"; + sha256 = "065dir19cqpn0d1bk9w49wnwzn6qfrgvcqw8da2fdhkafhfcb1bj"; fetchSubmodules = true; }; diff --git a/third_party/nixpkgs/pkgs/development/compilers/dtc/default.nix b/third_party/nixpkgs/pkgs/development/compilers/dtc/default.nix index b7fcbe1c61..0a694e29ee 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/dtc/default.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/dtc/default.nix @@ -13,7 +13,6 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ flex bison pkgconfig which ] ++ lib.optionals pythonSupport [ python swig ]; - buildInputs = lib.optionals pythonSupport [ python ]; postPatch = '' patchShebangs pylibfdt/ diff --git a/third_party/nixpkgs/pkgs/development/compilers/ecl/default.nix b/third_party/nixpkgs/pkgs/development/compilers/ecl/default.nix index 65f6884cd5..0b37dcf64f 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/ecl/default.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/ecl/default.nix @@ -1,5 +1,6 @@ {stdenv, fetchurl , libtool, autoconf, automake +, texinfo , gmp, mpfr, libffi, makeWrapper , noUnicode ? false , gcc @@ -10,14 +11,13 @@ let s = # Generated upstream information rec { baseName="ecl"; - version="16.1.3"; + version="20.4.24"; name="${baseName}-${version}"; - hash="0m0j24w5d5a9dwwqyrg0d35c0nys16ijb4r0nyk87yp82v38b9bn"; - url="https://common-lisp.net/project/ecl/static/files/release/ecl-16.1.3.tgz"; - sha256="0m0j24w5d5a9dwwqyrg0d35c0nys16ijb4r0nyk87yp82v38b9bn"; + url="https://common-lisp.net/project/ecl/static/files/release/${name}.tgz"; + sha256="01qgdmr54wkj854f69qdm9sybrvd6gd21dpx4askdaaqybnkh237"; }; buildInputs = [ - libtool autoconf automake makeWrapper + libtool autoconf automake texinfo makeWrapper ]; propagatedBuildInputs = [ libffi gmp mpfr gcc @@ -36,7 +36,6 @@ stdenv.mkDerivation { }; patches = [ - ./libffi-3.3-abi.patch ]; configureFlags = [ diff --git a/third_party/nixpkgs/pkgs/development/compilers/ecl/libffi-3.3-abi.patch b/third_party/nixpkgs/pkgs/development/compilers/ecl/libffi-3.3-abi.patch deleted file mode 100644 index 0a2b5f4dd5..0000000000 --- a/third_party/nixpkgs/pkgs/development/compilers/ecl/libffi-3.3-abi.patch +++ /dev/null @@ -1,15 +0,0 @@ -diff --git a/src/c/ffi.d b/src/c/ffi.d -index 8174977a..caa69f39 100644 ---- a/src/c/ffi.d -+++ b/src/c/ffi.d -@@ -133,8 +133,8 @@ static struct { - #elif defined(X86_WIN64) - {@':win64', FFI_WIN64}, - #elif defined(X86_ANY) || defined(X86) || defined(X86_64) -- {@':cdecl', FFI_SYSV}, -- {@':sysv', FFI_SYSV}, -+ {@':cdecl', FFI_UNIX64}, -+ {@':sysv', FFI_UNIX64}, - {@':unix64', FFI_UNIX64}, - #endif - }; diff --git a/third_party/nixpkgs/pkgs/development/compilers/eql/default.nix b/third_party/nixpkgs/pkgs/development/compilers/eql/default.nix index aac6191268..ce42c10211 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/eql/default.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/eql/default.nix @@ -15,6 +15,9 @@ stdenv.mkDerivation rec { postPatch = '' sed -re 's@[(]in-home "gui/.command-history"[)]@(concatenate '"'"'string (ext:getenv "HOME") "/.eql-gui-command-history")@' -i gui/gui.lisp + + # cl_def_c_function was renamed to ecl_def_c_function in ECL 20.4.24. + find . -type f -exec sed -e 's/\scl_def_c_function(/ ecl_def_c_function(/' -i {} \; ''; buildPhase = '' diff --git a/third_party/nixpkgs/pkgs/development/compilers/flutter/flutter.nix b/third_party/nixpkgs/pkgs/development/compilers/flutter/flutter.nix index fad2a646a1..e9b60253cd 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/flutter/flutter.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/flutter/flutter.nix @@ -110,8 +110,7 @@ in runCommand drvName { allowSubstitutes = false; passthru = { unwrapped = flutter; }; meta = with stdenv.lib; { - description = - "Flutter is Google's SDK for building mobile, web and desktop with Dart."; + description = "Flutter is Google's SDK for building mobile, web and desktop with Dart"; longDescription = '' Flutter is Google’s UI toolkit for building beautiful, natively compiled applications for mobile, web, and desktop from a single codebase. diff --git a/third_party/nixpkgs/pkgs/development/compilers/miranda/default.nix b/third_party/nixpkgs/pkgs/development/compilers/miranda/default.nix index c3cb854cdf..55d3976858 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/miranda/default.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/miranda/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchzip, fetchpatch, gcc }: +{ stdenv, lib, fetchzip, fetchpatch }: stdenv.mkDerivation rec { pname = "miranda"; diff --git a/third_party/nixpkgs/pkgs/development/compilers/mlkit/default.nix b/third_party/nixpkgs/pkgs/development/compilers/mlkit/default.nix index 6fa5814525..ecb3362e77 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/mlkit/default.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/mlkit/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "mlkit"; - version = "4.5.0"; + version = "4.5.1"; src = fetchFromGitHub { owner = "melsman"; repo = "mlkit"; rev = "v${version}"; - sha256 = "0fc0y40qphn02857fv2dvhwzzsvgixzchx9i6i0x80xfv7z68fbh"; + sha256 = "1zigigp168737vjrw5vijgyw4k1bgz4sr7j3rwlibw52snsh4y1c"; }; nativeBuildInputs = [ autoreconfHook mlton ]; diff --git a/third_party/nixpkgs/pkgs/development/compilers/sbcl/2.0.0.nix b/third_party/nixpkgs/pkgs/development/compilers/sbcl/2.0.9.nix similarity index 97% rename from third_party/nixpkgs/pkgs/development/compilers/sbcl/2.0.0.nix rename to third_party/nixpkgs/pkgs/development/compilers/sbcl/2.0.9.nix index 6df98a9a60..148ecccf13 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/sbcl/2.0.0.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/sbcl/2.0.9.nix @@ -11,11 +11,11 @@ stdenv.mkDerivation rec { pname = "sbcl"; - version = "2.0.0"; + version = "2.0.9"; src = fetchurl { url = "mirror://sourceforge/project/sbcl/sbcl/${version}/${pname}-${version}-source.tar.bz2"; - sha256 = "1krgd69cirp4ili2pfsh1a0mfvq722jbknlvmf17qhsxh1b94dlh"; + sha256 = "sha256:17wvrcwgp45z9b6arik31fjnz7908qhr5ackxq1y0gqi1hsh1xy4"; }; buildInputs = [texinfo]; diff --git a/third_party/nixpkgs/pkgs/development/compilers/sbcl/default.nix b/third_party/nixpkgs/pkgs/development/compilers/sbcl/default.nix index d4a00f57b6..3c7fca3c4b 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/sbcl/default.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/sbcl/default.nix @@ -11,11 +11,11 @@ stdenv.mkDerivation rec { pname = "sbcl"; - version = "2.0.2"; + version = "2.0.8"; src = fetchurl { url = "mirror://sourceforge/project/sbcl/sbcl/${version}/${pname}-${version}-source.tar.bz2"; - sha256 = "07pyzdjnhcpqwvr3rrk4i18maqdywbq1qj93fnpx1h4b7dp08r28"; + sha256 = "sha256:1xwrwvps7drrpyw3wg5h3g2qajmkwqs9gz0fdw1ns9adp7vld390"; }; buildInputs = [texinfo]; diff --git a/third_party/nixpkgs/pkgs/development/compilers/zulu/8.nix b/third_party/nixpkgs/pkgs/development/compilers/zulu/8.nix index 8df1c05d8b..bea32475f9 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/zulu/8.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/zulu/8.nix @@ -1,6 +1,6 @@ { stdenv, lib, fetchurl, unzip, makeWrapper, setJavaClassPath , zulu, glib, libxml2, libav_0_8, ffmpeg_3, libxslt, libGL, alsaLib -, fontconfig, freetype, gnome2, cairo, gdk-pixbuf, atk, xorg +, fontconfig, freetype, pango, gtk2, cairo, gdk-pixbuf, atk, xorg , swingSupport ? true }: let @@ -16,8 +16,8 @@ let libraries = [ stdenv.cc.libc glib libxml2 libav_0_8 ffmpeg_3 libxslt libGL - xorg.libXxf86vm alsaLib fontconfig freetype gnome2.pango - gnome2.gtk cairo gdk-pixbuf atk + xorg.libXxf86vm alsaLib fontconfig freetype pango + gtk2 cairo gdk-pixbuf atk ] ++ (lib.optionals swingSupport (with xorg; [ xorg.libX11 xorg.libXext xorg.libXtst xorg.libXi xorg.libXp xorg.libXt xorg.libXrender stdenv.cc.cc diff --git a/third_party/nixpkgs/pkgs/development/compilers/zulu/default.nix b/third_party/nixpkgs/pkgs/development/compilers/zulu/default.nix index 151a9e5f1d..73e7bd7d33 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/zulu/default.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/zulu/default.nix @@ -1,6 +1,6 @@ { stdenv, lib, fetchurl, unzip, makeWrapper, setJavaClassPath , zulu, glib, libxml2, libav_0_8, ffmpeg_3, libxslt, libGL, alsaLib -, fontconfig, freetype, gnome2, cairo, gdk-pixbuf, atk, xorg, zlib +, fontconfig, freetype, pango, gtk2, cairo, gdk-pixbuf, atk, xorg, zlib , swingSupport ? true }: let @@ -16,8 +16,8 @@ let libraries = [ stdenv.cc.libc glib libxml2 libav_0_8 ffmpeg_3 libxslt libGL - xorg.libXxf86vm alsaLib fontconfig freetype gnome2.pango - gnome2.gtk cairo gdk-pixbuf atk zlib + xorg.libXxf86vm alsaLib fontconfig freetype pango + gtk2 cairo gdk-pixbuf atk zlib ] ++ (lib.optionals swingSupport (with xorg; [ xorg.libX11 xorg.libXext xorg.libXtst xorg.libXi xorg.libXp xorg.libXt xorg.libXrender stdenv.cc.cc diff --git a/third_party/nixpkgs/pkgs/development/go-modules/generic/default.nix b/third_party/nixpkgs/pkgs/development/go-modules/generic/default.nix index 7db4992d1d..9efaa86083 100644 --- a/third_party/nixpkgs/pkgs/development/go-modules/generic/default.nix +++ b/third_party/nixpkgs/pkgs/development/go-modules/generic/default.nix @@ -47,7 +47,7 @@ let removeExpr = refs: ''remove-references-to ${lib.concatMapStrings (ref: " -t ${ref}") refs}''; - deleteFlag = if deleteVendor then "true" else "false"; + deleteFlag = lib.boolToString deleteVendor; vendCommand = if runVend then "${vend}/bin/vend" else "false"; diff --git a/third_party/nixpkgs/pkgs/development/haskell-modules/configuration-common.nix b/third_party/nixpkgs/pkgs/development/haskell-modules/configuration-common.nix index 43753f147d..26cbf7f78c 100644 --- a/third_party/nixpkgs/pkgs/development/haskell-modules/configuration-common.nix +++ b/third_party/nixpkgs/pkgs/development/haskell-modules/configuration-common.nix @@ -392,7 +392,9 @@ self: super: { tickle = dontCheck super.tickle; tpdb = dontCheck super.tpdb; translatable-intset = dontCheck super.translatable-intset; - trifecta = if pkgs.stdenv.hostPlatform.isAarch64 then dontCheck super.trifecta else super.trifecta; # affected by this bug https://gitlab.haskell.org/ghc/ghc/-/issues/15275#note_295461 + # Aarch64 affected by this bug https://gitlab.haskell.org/ghc/ghc/-/issues/15275#note_295461 + # Darwin https://hydra.nixos.org/build/129070963/nixlog/1 + trifecta = if (pkgs.stdenv.hostPlatform.isAarch64 || pkgs.stdenv.isDarwin) then dontCheck super.trifecta else super.trifecta; ua-parser = dontCheck super.ua-parser; unagi-chan = dontCheck super.unagi-chan; wai-logger = dontCheck super.wai-logger; @@ -940,7 +942,7 @@ self: super: { dhall-json = generateOptparseApplicativeCompletions ["dhall-to-json" "dhall-to-yaml"] super.dhall-json; dhall-nix = generateOptparseApplicativeCompletion "dhall-to-nix" ( super.dhall-nix.overrideScope (self: super: { - dhall = super.dhall_1_35_0; + dhall = super.dhall_1_36_0; repline = self.repline_0_4_0_0; haskeline = self.haskeline_0_8_1_0; })); @@ -1230,6 +1232,7 @@ self: super: { hie-bios = dontCheck super.hie-bios_0_7_1; lsp-test = dontCheck self.lsp-test_0_11_0_7; })); + implicit-hie-cradle = super.implicit-hie-cradle.override { hie-bios = dontCheck super.hie-bios_0_7_1; }; # hasn‘t bumped upper bounds # upstream: https://github.com/obsidiansystems/which/pull/6 @@ -1322,10 +1325,6 @@ self: super: { # Upstream issue: https://github.com/kowainik/trial/issues/62 trial = doJailbreak super.trial; - # 2020-06-24: Tests are broken in hackage distribution. - # See: https://github.com/kowainik/stan/issues/316 - stan = dontCheck super.stan; - # 2020-06-24: Tests are broken in hackage distribution. # See: https://github.com/robstewart57/rdf4h/issues/39 rdf4h = dontCheck super.rdf4h; @@ -1464,8 +1463,8 @@ self: super: { cryptonite = doDistribute self.cryptonite_0_27; # We want the latest version of Pandoc. - skylighting = doDistribute super.skylighting_0_10_0_2; - skylighting-core = doDistribute super.skylighting-core_0_10_0_2; + skylighting = doDistribute super.skylighting_0_10_0_3; + skylighting-core = doDistribute super.skylighting-core_0_10_0_3; hslua = doDistribute self.hslua_1_1_2; jira-wiki-markup = doDistribute self.jira-wiki-markup_1_3_2; pandoc = doDistribute self.pandoc_2_11_0_2; @@ -1481,6 +1480,9 @@ self: super: { # stack-2.5.1 needs a more current version of pantry to compile pantry = self.pantry_0_5_1_3; + # Too tight version bounds, see https://github.com/haskell-hvr/microaeson/pull/4 + microaeson = doJailbreak super.microaeson; + # haskell-language-server needs a more current version of pantry to compile } // (let inherit (self) hls-ghcide hls-brittany; diff --git a/third_party/nixpkgs/pkgs/development/haskell-modules/configuration-ghc-8.10.x.nix b/third_party/nixpkgs/pkgs/development/haskell-modules/configuration-ghc-8.10.x.nix index 71680074b7..047c5ba481 100644 --- a/third_party/nixpkgs/pkgs/development/haskell-modules/configuration-ghc-8.10.x.nix +++ b/third_party/nixpkgs/pkgs/development/haskell-modules/configuration-ghc-8.10.x.nix @@ -66,7 +66,7 @@ self: super: { unliftio-core = doJailbreak super.unliftio-core; # Use the latest version to fix the build. - dhall = self.dhall_1_35_0; + dhall = self.dhall_1_36_0; lens = self.lens_4_19_2; optics = self.optics_0_3; optics-core = self.optics-core_0_3_0_1; diff --git a/third_party/nixpkgs/pkgs/development/haskell-modules/configuration-ghc-9.0.x.nix b/third_party/nixpkgs/pkgs/development/haskell-modules/configuration-ghc-9.0.x.nix index 2a3a0b3bc1..88f935c3b6 100644 --- a/third_party/nixpkgs/pkgs/development/haskell-modules/configuration-ghc-9.0.x.nix +++ b/third_party/nixpkgs/pkgs/development/haskell-modules/configuration-ghc-9.0.x.nix @@ -43,4 +43,72 @@ self: super: { unix = null; xhtml = null; + # Take the 3.4.x release candidate. + cabal-install = assert super.cabal-install.version == "3.2.0.0"; + overrideCabal super.cabal-install (drv: { + postUnpack = "sourceRoot+=/cabal-install; echo source root reset to $sourceRoot"; + version = "cabal-install-3.4.0.0-rc4"; + editedCabalFile = null; + src = pkgs.fetchgit { + url = "git://github.com/haskell/cabal.git"; + rev = "cabal-install-3.4.0.0-rc4"; + sha256 = "049hllk1d8jid9yg70hmcsdgb0n7hm24p39vavllaahfb0qfimrk"; + }; + }); + + # Jailbreaks & Version Updates + async = doJailbreak super.async; + ChasingBottoms = markBrokenVersion "1.3.1.9" super.ChasingBottoms; + dec = doJailbreak super.dec; + ed25519 = doJailbreak super.ed25519; + hashable = overrideCabal (doJailbreak (dontCheck super.hashable)) (drv: { postPatch = "sed -i -e 's,integer-gmp .*<1.1,integer-gmp < 2,' hashable.cabal"; }); + hashable-time = doJailbreak super.hashable-time; + integer-logarithms = overrideCabal (doJailbreak super.integer-logarithms) (drv: { postPatch = "sed -i -e 's,integer-gmp <1.1,integer-gmp < 2,' integer-logarithms.cabal"; }); + lukko = doJailbreak super.lukko; + parallel = doJailbreak super.parallel; + primitive = doJailbreak super.primitive_0_7_1_0; + regex-posix = doJailbreak super.regex-posix; + resolv = doJailbreak super.resolv; + singleton-bool = doJailbreak super.singleton-bool; + split = doJailbreak super.split; + splitmix = self.splitmix_0_1_0_3; + tar = doJailbreak super.tar; + th-abstraction = self.th-abstraction_0_4_0_0; + time-compat = doJailbreak super.time-compat; + vector = doJailbreak (dontCheck super.vector); + zlib = doJailbreak super.zlib; + + # Apply patches from head.hackage. + alex = appendPatch (dontCheck super.alex) (pkgs.fetchpatch { + url = "https://gitlab.haskell.org/ghc/head.hackage/-/raw/master/patches/alex-3.2.5.patch"; + sha256 = "0q8x49k3jjwyspcmidwr6b84s4y43jbf4wqfxfm6wz8x2dxx6nwh"; + }); + doctest = appendPatch (dontCheck (doJailbreak super.doctest_0_17)) (pkgs.fetchpatch { + url = "https://gitlab.haskell.org/ghc/head.hackage/-/raw/master/patches/doctest-0.17.patch"; + sha256 = "16s2jcbk9hsww38i2wzxghbf0zpp5dc35hp6rd2n7d4z5xfavp62"; + }); + generic-deriving = appendPatch (doJailbreak super.generic-deriving) (pkgs.fetchpatch { + url = "https://gitlab.haskell.org/ghc/head.hackage/-/raw/master/patches/generic-deriving-1.13.1.patch"; + sha256 = "0z85kiwhi5p2wiqwyym0y8q8qrcifp125x5vm0n4482lz41kmqds"; + }); + language-haskell-extract = appendPatch (doJailbreak super.language-haskell-extract) (pkgs.fetchpatch { + url = "https://gitlab.haskell.org/ghc/head.hackage/-/raw/master/patches/language-haskell-extract-0.2.4.patch"; + sha256 = "0rgzrq0513nlc1vw7nw4km4bcwn4ivxcgi33jly4a7n3c1r32v1f"; + }); + QuickCheck = appendPatch super.QuickCheck_2_14_1 (pkgs.fetchpatch { + url = "https://gitlab.haskell.org/ghc/head.hackage/-/raw/master/patches/QuickCheck-2.14.1.patch"; + sha256 = "0n89nx95w353h4dzala57gb0y7hx4wbkv5igs89dza50p7ybq9an"; + }); + regex-base = appendPatch (doJailbreak super.regex-base) (pkgs.fetchpatch { + url = "https://gitlab.haskell.org/ghc/head.hackage/-/raw/master/patches/regex-base-0.94.0.0.patch"; + sha256 = "0k5fglbl7nnhn8400c4cpnflxcbj9p3xi5prl9jfmszr31jwdy5d"; + }); + syb = appendPatch (dontCheck super.syb) (pkgs.fetchpatch { + url = "https://gitlab.haskell.org/ghc/head.hackage/-/raw/master/patches/syb-0.7.1.patch"; + sha256 = "1407r8xv6bfnmpbw7glfh4smi76a2fc9pkq300c3d9f575708zqr"; + }); + + # The test suite depends on ChasingBottoms, which is broken with ghc-9.0.x. + unordered-containers = dontCheck super.unordered-containers; + } diff --git a/third_party/nixpkgs/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/third_party/nixpkgs/pkgs/development/haskell-modules/configuration-hackage2nix.yaml index 2082da2061..8a2e787038 100644 --- a/third_party/nixpkgs/pkgs/development/haskell-modules/configuration-hackage2nix.yaml +++ b/third_party/nixpkgs/pkgs/development/haskell-modules/configuration-hackage2nix.yaml @@ -75,7 +75,7 @@ default-package-overrides: # haskell-language-server 0.5.0.0 doesn't accept newer versions - fourmolu ==0.2.* - refinery ==0.2.* - # LTS Haskell 16.18 + # LTS Haskell 16.19 - abstract-deque ==0.3 - abstract-par ==0.3.3 - AC-Angle ==1.0 @@ -83,7 +83,7 @@ default-package-overrides: - ace ==0.6 - action-permutations ==0.0.0.1 - active ==0.2.0.14 - - ad ==4.4 + - ad ==4.4.1 - adjunctions ==4.4 - adler32 ==0.1.2.0 - advent-of-code-api ==0.2.7.0 @@ -91,7 +91,7 @@ default-package-overrides: - aeson-attoparsec ==0.0.0 - aeson-better-errors ==0.9.1.0 - aeson-casing ==0.2.0.0 - - aeson-combinators ==0.0.2.1 + - aeson-combinators ==0.0.3.0 - aeson-compat ==0.3.9 - aeson-default ==0.9.1.0 - aeson-diff ==1.1.0.9 @@ -301,7 +301,7 @@ default-package-overrides: - bech32 ==1.0.2 - bech32-th ==1.0.2 - bench ==1.0.12 - - benchpress ==0.2.2.14 + - benchpress ==0.2.2.15 - between ==0.11.0.0 - bibtex ==0.1.0.6 - bifunctors ==5.5.7 @@ -492,7 +492,7 @@ default-package-overrides: - concurrent-split ==0.0.1.1 - concurrent-supply ==0.1.8 - cond ==0.4.1.1 - - conduit ==1.3.2.1 + - conduit ==1.3.3 - conduit-algorithms ==0.0.11.0 - conduit-combinators ==1.3.0 - conduit-concurrent-map ==0.1.1 @@ -522,7 +522,7 @@ default-package-overrides: - convertible ==1.1.1.0 - cookie ==0.4.5 - core-data ==0.2.1.8 - - core-program ==0.2.4.5 + - core-program ==0.2.5.0 - core-text ==0.2.3.6 - countable ==1.0 - cpio-conduit ==0.7.0 @@ -606,7 +606,7 @@ default-package-overrides: - data-or ==1.0.0.5 - data-ordlist ==0.4.7.0 - data-ref ==0.0.2 - - data-reify ==0.6.2 + - data-reify ==0.6.3 - data-serializer ==0.3.4.1 - data-textual ==0.3.0.3 - data-tree-print ==0.1.0.2 @@ -623,7 +623,7 @@ default-package-overrides: - declarative ==0.5.3 - deepseq-generics ==0.2.0.0 - deepseq-instances ==0.1.0.1 - - deferred-folds ==0.9.10.1 + - deferred-folds ==0.9.11 - dejafu ==2.3.0.1 - dense-linear-algebra ==0.1.0.0 - depq ==0.4.1.0 @@ -1030,10 +1030,10 @@ default-package-overrides: - hedgehog-fakedata ==0.0.1.3 - hedgehog-fn ==1.0 - hedgehog-quickcheck ==0.1.1 - - hedis ==0.12.14 + - hedis ==0.12.15 - here ==1.2.13 - heredoc ==0.2.0.0 - - heterocephalus ==1.0.5.3 + - heterocephalus ==1.0.5.4 - hexml ==0.3.4 - hexml-lens ==0.2.1 - hexpat ==0.20.13 @@ -1091,9 +1091,9 @@ default-package-overrides: - HSlippyMap ==3.0.1 - hslogger ==1.3.1.0 - hslua ==1.0.3.2 - - hslua-aeson ==1.0.3 + - hslua-aeson ==1.0.3.1 - hslua-module-doclayout ==0.1.0 - - hslua-module-system ==0.2.2 + - hslua-module-system ==0.2.2.1 - hslua-module-text ==0.2.1 - HsOpenSSL ==0.11.4.20 - hsp ==0.10.0 @@ -1212,7 +1212,7 @@ default-package-overrides: - influxdb ==1.7.1.6 - ini ==0.4.1 - inj ==1.0 - - inline-c ==0.9.1.2 + - inline-c ==0.9.1.3 - inline-c-cpp ==0.4.0.2 - inliterate ==0.1.0 - insert-ordered-containers ==0.2.3.1 @@ -1651,7 +1651,7 @@ default-package-overrides: - password-instances ==2.0.0.1 - path ==0.7.0 - path-extra ==0.2.0 - - path-io ==1.6.0 + - path-io ==1.6.1 - path-pieces ==0.2.1 - path-text-utf8 ==0.0.1.6 - pathtype ==0.8.1.1 @@ -1858,7 +1858,7 @@ default-package-overrides: - regex-compat ==0.95.2.0 - regex-compat-tdfa ==0.95.1.4 - regex-pcre ==0.95.0.0 - - regex-pcre-builtin ==0.95.1.2.8.43 + - regex-pcre-builtin ==0.95.1.3.8.43 - regex-posix ==0.96.0.0 - regex-tdfa ==1.3.1.0 - regex-with-pcre ==1.1.0.0 @@ -2099,7 +2099,7 @@ default-package-overrides: - storablevector ==0.2.13.1 - stratosphere ==0.53.0 - streaming ==0.2.3.0 - - streaming-bytestring ==0.1.6 + - streaming-bytestring ==0.1.7 - streaming-commons ==0.2.2.1 - streamly ==0.7.2 - streamly-bytestring ==0.1.2 @@ -2162,7 +2162,7 @@ default-package-overrides: - tar-conduit ==0.3.2 - tardis ==0.4.1.0 - tasty ==1.2.3 - - tasty-ant-xml ==1.1.6 + - tasty-ant-xml ==1.1.7 - tasty-dejafu ==2.0.0.6 - tasty-discover ==4.2.2 - tasty-expected-failure ==0.11.1.2 @@ -2172,7 +2172,7 @@ default-package-overrides: - tasty-hunit ==0.10.0.2 - tasty-kat ==0.0.3 - tasty-leancheck ==0.0.1 - - tasty-lua ==0.2.3 + - tasty-lua ==0.2.3.1 - tasty-program ==1.0.5 - tasty-quickcheck ==0.10.1.1 - tasty-rerun ==1.1.17 @@ -2303,7 +2303,7 @@ default-package-overrides: - type-equality ==1 - type-errors ==0.2.0.0 - type-errors-pretty ==0.0.1.1 - - type-fun ==0.1.1 + - type-fun ==0.1.2 - type-hint ==0.1 - type-level-integers ==0.0.1 - type-level-kv-list ==1.1.0 @@ -2330,7 +2330,7 @@ default-package-overrides: - unexceptionalio-trans ==0.5.1 - unicode ==0.0.1.1 - unicode-show ==0.1.0.4 - - unicode-transforms ==0.3.7 + - unicode-transforms ==0.3.7.1 - unification-fd ==0.10.0.1 - union-find ==0.2 - uniplate ==1.6.12 @@ -2361,7 +2361,7 @@ default-package-overrides: - urbit-hob ==0.3.3 - uri-bytestring ==0.3.2.2 - uri-bytestring-aeson ==0.1.0.8 - - uri-encode ==1.5.0.6 + - uri-encode ==1.5.0.7 - url ==2.1.3 - users ==0.5.0.0 - utf8-conversions ==0.1.0.4 @@ -2501,7 +2501,7 @@ default-package-overrides: - xturtle ==0.2.0.0 - xxhash-ffi ==0.2.0.0 - yaml ==0.11.5.0 - - yamlparse-applicative ==0.1.0.1 + - yamlparse-applicative ==0.1.0.2 - yesod ==1.6.1.0 - yesod-auth ==1.6.10 - yesod-auth-fb ==1.10.1 @@ -2877,6 +2877,7 @@ broken-packages: - AC-VanillaArray - AC-Vector - AC-Vector-Fancy + - acc - accelerate - accelerate-arithmetic - accelerate-fftw @@ -2946,6 +2947,7 @@ broken-packages: - aern2-mp - aern2-real - aeson-applicative + - aeson-commit - aeson-decode - aeson-diff-generic - aeson-filthy @@ -3052,6 +3054,9 @@ broken-packages: - aop-prelude - aosd - apart + - apecs-gloss + - apecs-physics + - apecs-physics-gloss - apecs-stm - apelsin - api-builder @@ -3094,6 +3099,7 @@ broken-packages: - arbor-monad-metric-datadog - arbor-postgres - arbtt + - arch-hs - archive-libarchive - archive-tar-bytestring - archiver @@ -3274,6 +3280,7 @@ broken-packages: - Bang - bank-holiday-usa - banwords + - barbies-th - barchart - barcodes-code128 - barecheck @@ -3281,6 +3288,7 @@ broken-packages: - barrie - barrier - barrier-monad + - base-compat-migrate - base-encoding - base-feature-macros - base-generics @@ -3507,6 +3515,7 @@ broken-packages: - blunt - bno055-haskell - bogre-banana + - boilerplate - bolt - boltzmann-brain - bond @@ -3553,6 +3562,7 @@ broken-packages: - brotli-conduit - brotli-streams - browscap + - bsd-sysctl - bson - bson-generic - bson-generics @@ -3567,6 +3577,7 @@ broken-packages: - BufferedSocket - buffet - buffon + - bugsnag-haskell - bugzilla - build - buildable @@ -3615,6 +3626,7 @@ broken-packages: - c10k - c2ats - cabal-audit + - cabal-auto-expose - cabal-bundle-clib - cabal-cache - cabal-cargs @@ -3631,6 +3643,7 @@ broken-packages: - cabal-install-bundle - cabal-install-ghc72 - cabal-install-ghc74 + - cabal-install-parsers - cabal-meta - cabal-mon - cabal-nirvana @@ -3655,6 +3668,7 @@ broken-packages: - cabin - cabocha - cached + - caching - cacophony - cafeteria-prelude - caffegraph @@ -3789,6 +3803,7 @@ broken-packages: - chessIO - chevalier-common - chiasma + - chiphunk - chitauri - Chitra - choose @@ -3854,6 +3869,7 @@ broken-packages: - clckwrks-plugin-mailinglist - clckwrks-plugin-media - clckwrks-plugin-page + - clckwrks-plugin-redirect - clckwrks-theme-bootstrap - clckwrks-theme-clckwrks - clckwrks-theme-geo-bootstrap @@ -4043,6 +4059,7 @@ broken-packages: - confide - config-parser - config-select + - config-value-getopt - ConfigFileTH - Configger - configifier @@ -4229,6 +4246,7 @@ broken-packages: - cuboid - cuckoo - cudd + - curl-runnings - currency-codes - currency-convert - curry-frontend @@ -4446,6 +4464,8 @@ broken-packages: - dhall-check - dhall-docs - dhall-fly + - dhall-nix + - dhall-nixpkgs - dhall-text - dhall-to-cabal - dhall-yaml @@ -4497,6 +4517,7 @@ broken-packages: - dingo-core - dingo-example - dingo-widgets + - diohsc - diophantine - diplomacy - diplomacy-server @@ -4508,6 +4529,7 @@ broken-packages: - directed-cubical - direm - dirfiles + - dirichlet - dirtree - discogs-haskell - discord-gateway @@ -4846,6 +4868,7 @@ broken-packages: - exference - exherbo-cabal - exif + - exiftool - exinst - exinst-aeson - exinst-bytes @@ -5042,6 +5065,7 @@ broken-packages: - flaccuraterip - flamethrower - flamingra + - flashblast - flat - flat-maybe - flatbuffers @@ -5050,6 +5074,7 @@ broken-packages: - flexiwrap - flexiwrap-smallcheck - flickr + - flink-statefulfun - Flippi - flite - float-binstring @@ -5208,6 +5233,7 @@ broken-packages: - funsat - funspection - fused-effects-exceptions + - fused-effects-mwc-random - fused-effects-optics - fused-effects-random - fused-effects-readline @@ -5215,6 +5241,7 @@ broken-packages: - fused-effects-th - fusion - fusion-plugin + - futhark - futun - future - fuzzy-time-gen @@ -5369,6 +5396,7 @@ broken-packages: - gi-gtk-declarative-app-simple - gi-gtk-hs - gi-gtkosxapplication + - gi-gtksheet - gi-handy - gi-poppler - gi-wnck @@ -5550,6 +5578,8 @@ broken-packages: - graphicstools - graphmod-plugin - graphql + - graphql-client + - graphql-engine - graphql-utils - graphql-w-persistent - graphted @@ -5620,6 +5650,7 @@ broken-packages: - haar - habit - hablo + - hablog - HABQT - Hach - hack-contrib @@ -5710,6 +5741,7 @@ broken-packages: - halma-gui - halma-telegram-bot - halves + - ham - HaMinitel - hampp - hamsql @@ -5819,6 +5851,7 @@ broken-packages: - haskell-bitmex-client - haskell-bitmex-rest - haskell-brainfuck + - haskell-ci - haskell-cnc - haskell-coffee - haskell-compression @@ -6054,6 +6087,7 @@ broken-packages: - hdph-closure - hdr-histogram - HDRUtils + - headed-megaparsec - headergen - heapsort - heart-app @@ -6615,7 +6649,9 @@ broken-packages: - http-client-request-modifiers - http-client-session - http-client-streams + - http-client-websockets - http-conduit-browser + - http-conduit-downloader - http-directory - http-dispatch - http-enumerator @@ -6860,6 +6896,7 @@ broken-packages: - instapaper-sender - instinct - int-multimap + - intcode - integer-pure - integreat - intel-aes @@ -6953,6 +6990,7 @@ broken-packages: - ixmonad - ixshader - iyql + - j - j2hs - jack-bindings - JackMiniMix @@ -7032,6 +7070,7 @@ broken-packages: - JSONb - jsonextfilter - JsonGrammar + - jsonifier - jsonresume - jsonrpc-conduit - jsons-to-schema @@ -7124,6 +7163,7 @@ broken-packages: - kit - kmeans-par - kmeans-vector + - kmonad - kmp-dfa - knead - knead-arithmetic @@ -7134,6 +7174,7 @@ broken-packages: - korfu - kqueue - kraken + - krank - krapsh - Kriens - krpc @@ -7336,6 +7377,7 @@ broken-packages: - libhbb - libinfluxdb - libjenkins + - libjwt-typed - liblastfm - liblawless - liblinear-enumerator @@ -7509,6 +7551,7 @@ broken-packages: - loopy - lord - lorem + - lorentz - loris - loshadka - lostcities @@ -7521,6 +7564,7 @@ broken-packages: - ls-usb - lscabal - LslPlus + - lsp - lsystem - ltext - lti13 @@ -7609,6 +7653,7 @@ broken-packages: - mangopay - manifold-random - manifolds + - Map - map-exts - mapalgebra - Mapping @@ -7729,7 +7774,6 @@ broken-packages: - Michelangelo - miconix-test - micro-recursion-schemes - - microaeson - microbase - microformats2-parser - microformats2-types @@ -7782,6 +7826,7 @@ broken-packages: - mlist - mltool - mm2 + - mmsyn4 - mmtf - mmtl - mmtl-base @@ -7883,6 +7928,7 @@ broken-packages: - moo - morfette - morfeusz + - morley - morpheus-graphql-cli - morpheus-graphql-client - morphisms-functors @@ -8029,6 +8075,9 @@ broken-packages: - nagios-plugin-ekg - nakadi-client - named-lock + - named-servant + - named-servant-client + - named-servant-server - namelist - nano-hmac - nano-md5 @@ -8186,7 +8235,9 @@ broken-packages: - NoSlow - not-gloss-examples - notcpp + - nothunks - notifications-tray-icon + - notmuch - notmuch-haskell - notmuch-web - NoTrace @@ -8210,6 +8261,7 @@ broken-packages: - numeric-ranges - numerical - numhask-array + - numhask-free - numhask-hedgehog - numhask-histogram - numhask-prelude @@ -8279,6 +8331,8 @@ broken-packages: - op - opaleye-classy - opaleye-sqlite + - open-adt + - open-adt-tutorial - open-haddock - open-pandoc - open-signals @@ -8314,6 +8368,7 @@ broken-packages: - Operads - operate-do - operational-extra + - oplang - opml-conduit - opn - optima @@ -8343,6 +8398,7 @@ broken-packages: - origami - orizentic - OrPatterns + - orthotope - osc - oscpacking - oset @@ -8523,6 +8579,9 @@ broken-packages: - perfecthash - perhaps - periodic + - periodic-client + - periodic-client-exe + - periodic-server - perm - permutation - permutations @@ -8840,6 +8899,7 @@ broken-packages: - proj4-hs-bindings - project-m36 - projectile + - prolens - prolog - prolog-graph - prolog-graph-lib @@ -8878,6 +8938,7 @@ broken-packages: - pseudo-trie - PTQ - ptr + - ptr-poker - publicsuffixlistcreate - publish - pubnub @@ -8915,6 +8976,7 @@ broken-packages: - puzzle-draw - puzzle-draw-cmdline - pvd + - PyF - pyffi - pyfi - python-pickle @@ -8923,6 +8985,7 @@ broken-packages: - qd - qd-vec - qed + - qhs - qhull-simple - qif - QIO @@ -9082,6 +9145,7 @@ broken-packages: - readpyc - readshp - really-simple-xml-parser + - reanimate - reasonable-lens - record - record-aeson @@ -9105,6 +9169,7 @@ broken-packages: - reenact - Ref - ref + - ref-extras - ref-mtl - refcount - Referees @@ -9295,10 +9360,12 @@ broken-packages: - rng-utils - rob - robin + - roboservant - robots-txt - roc-cluster - roc-cluster-demo - rock + - rocksdb-haskell - rocksdb-query - roku-api - rollbar @@ -9447,6 +9514,7 @@ broken-packages: - scotty-binding-play - scotty-blaze - scotty-fay + - scotty-form - scotty-format - scotty-hastache - scotty-haxl @@ -9524,6 +9592,7 @@ broken-packages: - serv-wai - servant-aeson-specs - servant-auth-cookie + - servant-auth-docs - servant-auth-hmac - servant-auth-token - servant-auth-token-acid @@ -9532,6 +9601,7 @@ broken-packages: - servant-auth-token-persistent - servant-auth-token-rocksdb - servant-avro + - servant-client-js - servant-client-namedargs - servant-csharp - servant-db @@ -9558,6 +9628,7 @@ broken-packages: - servant-matrix-param - servant-namedargs - servant-nix + - servant-openapi3 - servant-pandoc - servant-pool - servant-postgresql @@ -9624,6 +9695,7 @@ broken-packages: - shake-cabal-build - shake-dhall - shake-extras + - shake-futhark - shake-minify - shake-pack - shake-path @@ -9675,8 +9747,10 @@ broken-packages: - sifflet - sifflet-lib - sigma-ij + - signable - signals - signed-multiset + - silkscreen - silvi - simd - simgi @@ -10002,7 +10076,6 @@ broken-packages: - stackage-types - stackage-upload - stackage2nix - - stan - standalone-derive-topdown - standalone-haddock - starling @@ -10041,7 +10114,9 @@ broken-packages: - stgi - STL - STLinkUSB + - stm-actor - stm-chunked-queues + - stm-containers - stm-firehose - stm-promise - stm-stats @@ -10742,6 +10817,7 @@ broken-packages: - Updater - uploadcare - upskirt + - urbit-airlock - ureader - urembed - uri @@ -10794,6 +10870,7 @@ broken-packages: - uuid-aeson - uuid-bytes - uuid-crypto + - uusi - uvector - uvector-algorithms - uxadt @@ -10908,6 +10985,7 @@ broken-packages: - vty-menu - vty-ui - vty-ui-extras + - vulkan-utils - waargonaut - wacom-daemon - waddle @@ -10991,9 +11069,11 @@ broken-packages: - web3 - webapi - webapp + - webauthn - WebBits - WebBits-Html - WebBits-multiplate + - webby - webcloud - WebCont - webcrank @@ -11057,6 +11137,7 @@ broken-packages: - word2vec-model - WordAlignment - wordify + - wordn - WordNet - WordNet-ghc74 - wordpass @@ -11160,6 +11241,7 @@ broken-packages: - xmonad-bluetilebranch - xmonad-contrib-bluetilebranch - xmonad-contrib-gpl + - xmonad-dbus - xmonad-eval - xmonad-vanessa - xmonad-windownames @@ -11338,6 +11420,8 @@ broken-packages: - yu-utils - yuuko - yxdb-utils + - Z-Data + - Z-IO - z3-encoding - z85 - zabt diff --git a/third_party/nixpkgs/pkgs/development/haskell-modules/configuration-nix.nix b/third_party/nixpkgs/pkgs/development/haskell-modules/configuration-nix.nix index 2158386629..a74b1eb05c 100644 --- a/third_party/nixpkgs/pkgs/development/haskell-modules/configuration-nix.nix +++ b/third_party/nixpkgs/pkgs/development/haskell-modules/configuration-nix.nix @@ -542,6 +542,7 @@ self: super: builtins.intersectAttrs super { # Break infinite recursion cycle between QuickCheck and splitmix. splitmix = dontCheck super.splitmix; + splitmix_0_1_0_3 = dontCheck super.splitmix_0_1_0_3; # Break infinite recursion cycle between tasty and clock. clock = dontCheck super.clock; @@ -730,6 +731,7 @@ self: super: builtins.intersectAttrs super { # break infinite recursion with base-orphans primitive = dontCheck super.primitive; + primitive_0_7_1_0 = dontCheck super.primitive_0_7_1_0; cut-the-crap = let path = pkgs.stdenv.lib.makeBinPath [ pkgs.ffmpeg_3 pkgs.youtube-dl ]; diff --git a/third_party/nixpkgs/pkgs/development/haskell-modules/generic-builder.nix b/third_party/nixpkgs/pkgs/development/haskell-modules/generic-builder.nix index afb0087a02..a221ce38c8 100644 --- a/third_party/nixpkgs/pkgs/development/haskell-modules/generic-builder.nix +++ b/third_party/nixpkgs/pkgs/development/haskell-modules/generic-builder.nix @@ -64,6 +64,7 @@ in , patches ? null, patchPhase ? null, prePatch ? "", postPatch ? "" , preConfigure ? null, postConfigure ? null , preBuild ? null, postBuild ? null +, preHaddock ? null, postHaddock ? null , installPhase ? null, preInstall ? null, postInstall ? null , checkPhase ? null, preCheck ? null, postCheck ? null , preFixup ? null, postFixup ? null @@ -658,6 +659,8 @@ stdenv.mkDerivation ({ // optionalAttrs (args ? checkPhase) { inherit checkPhase; } // optionalAttrs (args ? preCheck) { inherit preCheck; } // optionalAttrs (args ? postCheck) { inherit postCheck; } +// optionalAttrs (args ? preHaddock) { inherit preHaddock; } +// optionalAttrs (args ? postHaddock) { inherit postHaddock; } // optionalAttrs (args ? preInstall) { inherit preInstall; } // optionalAttrs (args ? installPhase) { inherit installPhase; } // optionalAttrs (args ? postInstall) { inherit postInstall; } diff --git a/third_party/nixpkgs/pkgs/development/haskell-modules/hackage-packages.nix b/third_party/nixpkgs/pkgs/development/haskell-modules/hackage-packages.nix index 74c6e3b92f..f48e90b187 100644 --- a/third_party/nixpkgs/pkgs/development/haskell-modules/hackage-packages.nix +++ b/third_party/nixpkgs/pkgs/development/haskell-modules/hackage-packages.nix @@ -6592,14 +6592,16 @@ self: { ({ mkDerivation, base, base-compat, GLUT, OpenGL, random }: mkDerivation { pname = "FunGEn"; - version = "1.0.1"; - sha256 = "1bal6v1ps8ha5hkz12i20vwypvbcb6s9ykr8yylh4w4ddnsdgh3r"; + version = "1.1.1"; + sha256 = "167bf5p4qcb9wj89x5i5zjjx1f7pmi6s5xbbh43ljhp1f25s9147"; + revision = "1"; + editedCabalFile = "0rgqkr95d2bssmnm4rrkrla7380vgr3isljs8jqglfjy660cynq3"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; libraryHaskellDepends = [ base base-compat GLUT OpenGL random ]; executableHaskellDepends = [ base GLUT OpenGL random ]; - description = "A lightweight, cross-platform, OpenGL/GLUT-based game engine"; + description = "A lightweight, cross-platform, OpenGL-based game engine"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; broken = true; @@ -8067,8 +8069,8 @@ self: { }: mkDerivation { pname = "HDBC-postgresql"; - version = "2.3.2.7"; - sha256 = "0mfx172lrhwxx6gbqfqji8m14llng76x0mxksm3s556kakvv1cgg"; + version = "2.3.2.8"; + sha256 = "0c76di7a134xhw5pmzdjasgyqxj6gkjkj45mr4mwfrchgdg4cvil"; isLibrary = true; isExecutable = true; setupHaskellDepends = [ base Cabal ]; @@ -13257,6 +13259,8 @@ self: { testHaskellDepends = [ base smallcheck tasty tasty-smallcheck ]; description = "Class of key-value maps"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "MapWith" = callPackage @@ -16332,6 +16336,8 @@ self: { ]; description = "Quasiquotations for a python like interpolated string formater"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "QIO" = callPackage @@ -21882,8 +21888,8 @@ self: { }: mkDerivation { pname = "Z-Data"; - version = "0.1.7.1"; - sha256 = "1yz2bh7mvhc8v4rjzx5wc89x10xnhp0hn40y8n9id982c256vfgm"; + version = "0.1.8.0"; + sha256 = "1yzavy7y8rdpazxmxfa0b9nw7ijrvafcwi5yv74kkj5m626hcizl"; libraryHaskellDepends = [ base case-insensitive deepseq ghc-prim hashable integer-gmp primitive QuickCheck scientific tagged template-haskell @@ -21896,19 +21902,22 @@ self: { ]; description = "Array, vector and text"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "Z-IO" = callPackage ({ mkDerivation, base, bytestring, exceptions, hashable, hspec , hspec-discover, HUnit, primitive, QuickCheck - , quickcheck-instances, scientific, stm, time, word8, Z-Data, zlib + , quickcheck-instances, scientific, stm, time, unix-time, word8 + , Z-Data, zlib }: mkDerivation { pname = "Z-IO"; - version = "0.1.5.2"; - sha256 = "05dkfbnj1kry6c32xdiv1fdlxd2a2z7ma4zk5gisnx5kmshyw75p"; + version = "0.1.6.1"; + sha256 = "1cd84n434i2l13xziys0rm7wx5iqw2xqydf96yj6fwkaysh3hrps"; libraryHaskellDepends = [ - base exceptions primitive stm time Z-Data + base exceptions primitive stm time unix-time Z-Data ]; libraryToolDepends = [ hspec-discover ]; testHaskellDepends = [ @@ -21917,6 +21926,8 @@ self: { ]; description = "Simple and high performance IO toolkit for Haskell"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "ZEBEDDE" = callPackage @@ -22284,6 +22295,8 @@ self: { benchmarkHaskellDepends = [ criterion rerebase ]; description = "Sequence optimized for monoidal construction and folding"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "accelerate" = callPackage @@ -23821,28 +23834,6 @@ self: { }) {}; "ad" = callPackage - ({ mkDerivation, array, base, Cabal, cabal-doctest, comonad - , containers, criterion, data-reify, directory, doctest, erf - , filepath, free, nats, reflection, semigroups, transformers - }: - mkDerivation { - pname = "ad"; - version = "4.4"; - sha256 = "1v7m5nk9aa0sfqfqmv15dq87s2nl7i3v1d5xx0xla9ydhlqizy4x"; - revision = "1"; - editedCabalFile = "1l9515avbn8hc1yc3x9mqxjrl6idjcf4a9wl4m3607n4anc62hlc"; - setupHaskellDepends = [ base Cabal cabal-doctest ]; - libraryHaskellDepends = [ - array base comonad containers data-reify erf free nats reflection - semigroups transformers - ]; - testHaskellDepends = [ base directory doctest filepath ]; - benchmarkHaskellDepends = [ base criterion erf ]; - description = "Automatic Differentiation"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "ad_4_4_1" = callPackage ({ mkDerivation, array, base, Cabal, cabal-doctest, comonad , containers, criterion, data-reify, directory, doctest, erf , filepath, free, nats, reflection, semigroups, transformers @@ -23860,7 +23851,6 @@ self: { benchmarkHaskellDepends = [ base criterion erf ]; description = "Automatic Differentiation"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "adaptive-containers" = callPackage @@ -24415,26 +24405,6 @@ self: { }) {}; "aeson-combinators" = callPackage - ({ mkDerivation, aeson, base, bytestring, containers, fail, hspec - , scientific, text, time, time-compat, unordered-containers - , utf8-string, uuid-types, vector, void - }: - mkDerivation { - pname = "aeson-combinators"; - version = "0.0.2.1"; - sha256 = "1a087940jpbnc2rc7cs4xj6kq1wv7b5ibhaimj7f6jglrn9xjgf0"; - libraryHaskellDepends = [ - aeson base bytestring containers fail scientific text time - time-compat unordered-containers uuid-types vector void - ]; - testHaskellDepends = [ - aeson base bytestring hspec text utf8-string - ]; - description = "Aeson combinators for dead simple JSON decoding"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "aeson-combinators_0_0_3_0" = callPackage ({ mkDerivation, aeson, base, bytestring, containers, doctest, fail , hspec, scientific, text, time, time-compat, unordered-containers , utf8-string, uuid-types, vector, void @@ -24452,7 +24422,6 @@ self: { ]; description = "Aeson combinators for dead simple JSON decoding"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "aeson-commit" = callPackage @@ -24470,6 +24439,8 @@ self: { ]; description = "Parse Aeson data with commitment"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "aeson-compat" = callPackage @@ -24704,8 +24675,8 @@ self: { }: mkDerivation { pname = "aeson-gadt-th"; - version = "0.2.2"; - sha256 = "1nk0897569cldp7fhzc51mj8f93dx3nwk0fxy2pr41wmrbqrxw1k"; + version = "0.2.4"; + sha256 = "0nl9p7q7bfggm7nk8jmqb53qzdr5qwgscpnxy4r7hjvmd4cx6nrm"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -26125,16 +26096,17 @@ self: { }) {}; "alfred-margaret" = callPackage - ({ mkDerivation, base, containers, deepseq, hashable, hspec + ({ mkDerivation, aeson, base, containers, deepseq, hashable, hspec , hspec-expectations, primitive, QuickCheck, quickcheck-instances - , text, vector + , text, unordered-containers, vector }: mkDerivation { pname = "alfred-margaret"; - version = "1.0.0.0"; - sha256 = "0dapvcxwwd6ylyqxfjf58jink2rh9i6k1lw1ii6j8jb28qfvy400"; + version = "1.1.1.0"; + sha256 = "1z3plc2a6qnlx1cpb3icw44h3lbspaq2n7djl4pljhb4dm5bflbq"; libraryHaskellDepends = [ - base containers deepseq hashable primitive text vector + aeson base containers deepseq hashable primitive text + unordered-containers vector ]; testHaskellDepends = [ base deepseq hspec hspec-expectations QuickCheck @@ -30296,8 +30268,8 @@ self: { }: mkDerivation { pname = "antiope-athena"; - version = "7.5.1"; - sha256 = "03yy4l5czchq9djxh0yg40vlnynly2wsl5rcj91231n575ndqbij"; + version = "7.5.3"; + sha256 = "0v8qk3v4i8f0bc8mw67km6bly37widk5v94d6paizpkn014c3y0m"; libraryHaskellDepends = [ amazonka amazonka-athena amazonka-core base lens resourcet text unliftio-core @@ -30315,8 +30287,8 @@ self: { ({ mkDerivation, aeson, antiope-s3, avro, base, bytestring, text }: mkDerivation { pname = "antiope-contract"; - version = "7.5.1"; - sha256 = "006i6z7hzz6kkss18wyk2pwmib9ip2z2qwc1r0y3ni1j6kaghbh0"; + version = "7.5.3"; + sha256 = "18ifdaq6z5x3x3fbfbaf86x9wcb4dlgdbdi652a7dyh5kap29a3j"; libraryHaskellDepends = [ aeson antiope-s3 avro base bytestring text ]; @@ -30350,6 +30322,33 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "antiope-core_7_5_3" = callPackage + ({ mkDerivation, aeson, aeson-lens, amazonka, amazonka-core, base + , bytestring, exceptions, generic-lens, hedgehog, hspec + , hspec-discover, http-client, http-types, hw-hspec-hedgehog, lens + , mtl, resourcet, scientific, text, transformers, unliftio-core + }: + mkDerivation { + pname = "antiope-core"; + version = "7.5.3"; + sha256 = "1bzyahw9i098riqlmhymbk0zjg4iz95r0c4mpsrc811wyqdi7f65"; + libraryHaskellDepends = [ + aeson amazonka amazonka-core base bytestring exceptions + generic-lens http-client http-types lens mtl resourcet text + transformers unliftio-core + ]; + testHaskellDepends = [ + aeson aeson-lens amazonka amazonka-core base bytestring exceptions + generic-lens hedgehog hspec http-client http-types + hw-hspec-hedgehog lens mtl resourcet scientific text transformers + unliftio-core + ]; + testToolDepends = [ hspec-discover ]; + description = "Please see the README on Github at "; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "antiope-dynamodb" = callPackage ({ mkDerivation, aeson, amazonka, amazonka-core, amazonka-dynamodb , antiope-core, base, generic-lens, hspec-discover, lens, text @@ -30374,6 +30373,30 @@ self: { broken = true; }) {}; + "antiope-dynamodb_7_5_3" = callPackage + ({ mkDerivation, aeson, amazonka, amazonka-core, amazonka-dynamodb + , antiope-core, base, generic-lens, hspec-discover, lens, text + , unliftio-core, unordered-containers + }: + mkDerivation { + pname = "antiope-dynamodb"; + version = "7.5.3"; + sha256 = "1j9g36c33virrnsqxrggnx2283nw9bp0i256vgq4z92h1z76kfz0"; + libraryHaskellDepends = [ + aeson amazonka amazonka-core amazonka-dynamodb antiope-core base + generic-lens lens text unliftio-core unordered-containers + ]; + testHaskellDepends = [ + amazonka amazonka-core amazonka-dynamodb antiope-core base + generic-lens lens text unliftio-core unordered-containers + ]; + testToolDepends = [ hspec-discover ]; + description = "Please see the README on Github at "; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; + }) {}; + "antiope-es" = callPackage ({ mkDerivation, aeson, amazonka, amazonka-core , amazonka-elasticsearch, base, bytestring, hspec, hspec-discover @@ -30381,8 +30404,8 @@ self: { }: mkDerivation { pname = "antiope-es"; - version = "7.5.1"; - sha256 = "1ww4bfwqbyrmzb84wy78yqzp3snbq3xlxvhs7vl3ik71bn99abyr"; + version = "7.5.3"; + sha256 = "0w6l22psj5q2p3chvxikywf5ix20sw7qlqgk24rm0ss6ybsfmk2k"; libraryHaskellDepends = [ aeson amazonka amazonka-core amazonka-elasticsearch base bytestring json-stream lens thyme unordered-containers vector @@ -30417,6 +30440,31 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "antiope-messages_7_5_3" = callPackage + ({ mkDerivation, aeson, amazonka, amazonka-core, base, bytestring + , generic-lens, hedgehog, hspec, hspec-discover, hw-hspec-hedgehog + , lens, lens-aeson, monad-loops, network-uri, scientific, text + , unliftio-core + }: + mkDerivation { + pname = "antiope-messages"; + version = "7.5.3"; + sha256 = "1kajbd0f81jamk7cg97zkm9z89m0zlsfklhbfarg3rgiaq28ss2v"; + libraryHaskellDepends = [ + aeson amazonka amazonka-core base bytestring generic-lens lens + lens-aeson monad-loops network-uri text unliftio-core + ]; + testHaskellDepends = [ + aeson amazonka amazonka-core base bytestring generic-lens hedgehog + hspec hw-hspec-hedgehog lens lens-aeson monad-loops network-uri + scientific text unliftio-core + ]; + testToolDepends = [ hspec-discover ]; + description = "Please see the README on Github at "; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "antiope-optparse-applicative" = callPackage ({ mkDerivation, aeson, amazonka, amazonka-core, amazonka-s3, base , hedgehog, hspec, hspec-discover, hw-hspec-hedgehog @@ -30424,8 +30472,8 @@ self: { }: mkDerivation { pname = "antiope-optparse-applicative"; - version = "7.5.1"; - sha256 = "0zmsb9ng46p0plch2q8lh5awbkx7vhg9xl3na1czdk0mdh2hdhxz"; + version = "7.5.3"; + sha256 = "1cmgzkfqszqrngfrpj064cpmkw97pxrmcni3352qyzzicnakww56"; libraryHaskellDepends = [ amazonka amazonka-core amazonka-s3 base optparse-applicative text ]; @@ -30466,6 +30514,35 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "antiope-s3_7_5_3" = callPackage + ({ mkDerivation, aeson, amazonka, amazonka-core, amazonka-s3 + , antiope-core, antiope-messages, attoparsec, base, bytestring + , conduit, conduit-extra, deepseq, dlist, exceptions, generic-lens + , hedgehog, hspec, hspec-discover, http-types, hw-hspec-hedgehog + , lens, mtl, network-uri, resourcet, text, time, unliftio-core + }: + mkDerivation { + pname = "antiope-s3"; + version = "7.5.3"; + sha256 = "1wwh17vzrbg20jmbgf9xdx8vn5qkx8azzczzlyb2s2k3ldlh8s0c"; + libraryHaskellDepends = [ + aeson amazonka amazonka-core amazonka-s3 antiope-core + antiope-messages attoparsec base bytestring conduit conduit-extra + deepseq dlist exceptions generic-lens http-types lens mtl + network-uri resourcet text time unliftio-core + ]; + testHaskellDepends = [ + aeson amazonka amazonka-core amazonka-s3 antiope-core attoparsec + base bytestring conduit conduit-extra exceptions generic-lens + hedgehog hspec http-types hw-hspec-hedgehog lens mtl network-uri + resourcet text time unliftio-core + ]; + testToolDepends = [ hspec-discover ]; + description = "Please see the README on Github at "; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "antiope-shell" = callPackage ({ mkDerivation, aeson, amazonka, amazonka-core, amazonka-s3 , antiope-core, antiope-messages, antiope-s3, attoparsec, base @@ -30476,8 +30553,8 @@ self: { }: mkDerivation { pname = "antiope-shell"; - version = "7.5.1"; - sha256 = "1c68d84ykdamzgybryr474xh826j9b5mh4gn6q3aiapzl5bhh7ym"; + version = "7.5.3"; + sha256 = "1cbvym7ip9vflwjas9fi8izbb6qdrjqq3c8pd7f0ab8a5i7qmbqh"; libraryHaskellDepends = [ aeson amazonka amazonka-core amazonka-s3 antiope-core antiope-messages antiope-s3 attoparsec base bytestring exceptions @@ -30518,6 +30595,30 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "antiope-sns_7_5_3" = callPackage + ({ mkDerivation, aeson, amazonka, amazonka-core, amazonka-sns, base + , bytestring, generic-lens, hedgehog, hspec, hspec-discover + , hw-hspec-hedgehog, lens, text, time, unliftio-core + }: + mkDerivation { + pname = "antiope-sns"; + version = "7.5.3"; + sha256 = "01saqspi2033y423nyw4k0km3ggmypp3zzhkr7ha51r717bj6sii"; + libraryHaskellDepends = [ + aeson amazonka amazonka-core amazonka-sns base bytestring + generic-lens lens text time unliftio-core + ]; + testHaskellDepends = [ + aeson amazonka amazonka-core amazonka-sns base bytestring + generic-lens hedgehog hspec hw-hspec-hedgehog lens text time + unliftio-core + ]; + testToolDepends = [ hspec-discover ]; + description = "Please see the README on Github at "; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "antiope-sqs" = callPackage ({ mkDerivation, aeson, amazonka, amazonka-core, amazonka-sqs, base , bytestring, conduit, generic-lens, hedgehog, hspec @@ -30544,6 +30645,33 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "antiope-sqs_7_5_3" = callPackage + ({ mkDerivation, aeson, amazonka, amazonka-core, amazonka-sqs, base + , bytestring, conduit, generic-lens, hedgehog, hspec + , hspec-discover, hw-hspec-hedgehog, lens, lens-aeson, monad-loops + , mtl, network-uri, split, text, time, unliftio-core + , unordered-containers + }: + mkDerivation { + pname = "antiope-sqs"; + version = "7.5.3"; + sha256 = "18wz0ajnh5hib7srwksbwsyqrnp4slzcd2i30p98gnh1plqgbx5p"; + libraryHaskellDepends = [ + aeson amazonka amazonka-core amazonka-sqs base bytestring conduit + generic-lens lens lens-aeson monad-loops mtl network-uri split text + unliftio-core unordered-containers + ]; + testHaskellDepends = [ + aeson amazonka amazonka-core amazonka-sqs base bytestring conduit + generic-lens hedgehog hspec hw-hspec-hedgehog lens lens-aeson + monad-loops mtl network-uri text time unliftio-core + ]; + testToolDepends = [ hspec-discover ]; + description = "Please see the README on Github at "; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "antiope-swf" = callPackage ({ mkDerivation, amazonka-swf, base, hedgehog, hspec , hspec-discover, hw-hspec-hedgehog, lens, text @@ -30825,6 +30953,8 @@ self: { ]; description = "Simple gloss renderer for apecs"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "apecs-physics" = callPackage @@ -30841,6 +30971,8 @@ self: { ]; description = "2D physics for apecs"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "apecs-physics-gloss" = callPackage @@ -30852,6 +30984,8 @@ self: { libraryHaskellDepends = [ apecs apecs-physics base gloss ]; description = "Gloss rendering for apecs-physics"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "apecs-stm" = callPackage @@ -32102,6 +32236,8 @@ self: { pname = "arbor-postgres"; version = "0.0.5"; sha256 = "0vn3jv60pphjjmhjwn1il3sh886dgdxs47gdiqfrii12hv8rsi21"; + revision = "1"; + editedCabalFile = "0954zfh8rnajywcjipd614axbpqq1r04v2nrrmgyjb3f6bk1y8k9"; libraryHaskellDepends = [ base bytestring generic-lens lens network-uri optparse-applicative postgresql-simple text @@ -32203,6 +32339,8 @@ self: { ]; description = "Distribute hackage packages to archlinux"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "archive" = callPackage @@ -33068,12 +33206,12 @@ self: { }) {}; "arrow-list" = callPackage - ({ mkDerivation, base, containers, mtl }: + ({ mkDerivation, base, containers, fail, mtl }: mkDerivation { pname = "arrow-list"; - version = "0.7"; - sha256 = "1n6m77hdkpjd12r0b8fwxiz3jz0j86cplgsk27m2raj86vr3dy1k"; - libraryHaskellDepends = [ base containers mtl ]; + version = "0.7.1"; + sha256 = "11rzpq8mml00amb0hd09bwwhpn199jr8mxp0454ljkpbgqc5jm9s"; + libraryHaskellDepends = [ base containers fail mtl ]; description = "List arrows for Haskell"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -34923,8 +35061,8 @@ self: { }: mkDerivation { pname = "attoparsec-data"; - version = "1.0.5"; - sha256 = "0wis420lq3bynwjb86sphlhw50d1q9mpm2fnrvpd9a768m1qwiba"; + version = "1.0.5.1"; + sha256 = "1fn28rg79w5kkv3lrmqjcff8fhn1kc2b84vnblr0xqbfdjdbzgp6"; libraryHaskellDepends = [ attoparsec attoparsec-time base bytestring scientific text time uuid @@ -36374,8 +36512,8 @@ self: { }: mkDerivation { pname = "aws-lambda-haskell-runtime"; - version = "3.0.4"; - sha256 = "1rbgi7f1vymh8q6b074z64jlww5gssbzhpam8k8lcgp0zlvm13n1"; + version = "3.0.5"; + sha256 = "07p0lz2hj17n97f2ps59axb4c6416g45m6wcd3hk7jybd6ja8qpr"; libraryHaskellDepends = [ aeson base bytestring case-insensitive http-client http-types path path-io safe-exceptions-checked template-haskell text @@ -36969,13 +37107,13 @@ self: { , free, hashable, hspec, hspec-expectations, lens, monad-control , mtl, neat-interpolation, optparse-applicative, parallel, parsec , posix-pty, pretty, pretty-show, process, QuickCheck, random - , shake, syb, tagged, template, text, time, transformers, unix - , unordered-containers, vector, yaml + , shake, syb, tagged, template, temporary, text, time, transformers + , unix, unordered-containers, vector, yaml }: mkDerivation { pname = "b9"; - version = "3.1.0"; - sha256 = "1jggx5ph7js5r9jck6y2ghlb2il2winz0wg1y01vkp6dc1jpqjd7"; + version = "3.2.0"; + sha256 = "00zsrvqj46a9f7fa8g64xrlmzbwy8gca2bsgvnkv0chzbgn26pjk"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -36984,8 +37122,8 @@ self: { exceptions extensible-effects filepath free hashable hspec hspec-expectations lens monad-control mtl neat-interpolation optparse-applicative parallel parsec posix-pty pretty pretty-show - process QuickCheck random shake syb tagged template text time - transformers unix unordered-containers vector yaml + process QuickCheck random shake syb tagged template temporary text + time transformers unix unordered-containers vector yaml ]; executableHaskellDepends = [ aeson base binary bytestring containers directory @@ -37516,6 +37654,8 @@ self: { testHaskellDepends = [ barbies base ]; description = "Create strippable HKD via TH"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "barbly" = callPackage @@ -37717,6 +37857,8 @@ self: { doHaddock = false; description = "Helps migrating projects to base-compat(-batteries)"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "base-encoding" = callPackage @@ -38991,8 +39133,8 @@ self: { }: mkDerivation { pname = "beam-core"; - version = "0.8.0.0"; - sha256 = "1l71xvmny0nf6fdhsffvfj764h4d97icgc291kfqz25n511b74r8"; + version = "0.9.0.0"; + sha256 = "0ixaxjmgg162ff7srvwmkv5lp1kfb0b6wmrpaz97rsmlpa5vf6ji"; libraryHaskellDepends = [ aeson base bytestring containers dlist free ghc-prim hashable microlens mtl network-uri scientific tagged text time vector @@ -39015,8 +39157,8 @@ self: { }: mkDerivation { pname = "beam-migrate"; - version = "0.4.0.1"; - sha256 = "12c5yibargwrw9z806bik7rly9njq0qa60gsqlh8pbzaaji5fknf"; + version = "0.5.0.0"; + sha256 = "0xrmb5nmn5ffzgcpsjilagz5ppm283kfjvvbnsvpvnh6p6i0xc99"; libraryHaskellDepends = [ aeson base beam-core bytestring containers deepseq dependent-map dependent-sum free ghc-prim hashable haskell-src-exts microlens mtl @@ -39067,16 +39209,16 @@ self: { "beam-postgres" = callPackage ({ mkDerivation, aeson, attoparsec, base, beam-core, beam-migrate - , bytestring, case-insensitive, conduit, directory, filepath, free - , hashable, haskell-src-exts, hedgehog, lifted-base, monad-control - , mtl, network-uri, postgresql-libpq, postgresql-simple, process - , scientific, tagged, tasty, tasty-hunit, temporary, text, time + , bytestring, case-insensitive, conduit, free, hashable + , haskell-src-exts, hedgehog, lifted-base, monad-control, mtl + , network-uri, postgresql-libpq, postgresql-simple, scientific + , tagged, tasty, tasty-hunit, text, time, tmp-postgres , unordered-containers, uuid, uuid-types, vector }: mkDerivation { pname = "beam-postgres"; - version = "0.4.0.0"; - sha256 = "0dxnp6zsyy30vrlv15iw4qwyzwawg468zqqsjnzk9h3g9k9xzj3v"; + version = "0.5.0.0"; + sha256 = "03dd9qzw3b2rqva2pn4iaq5lswn8gb7lrlsa6nmc0bfn1w9i4a7k"; libraryHaskellDepends = [ aeson attoparsec base beam-core beam-migrate bytestring case-insensitive conduit free hashable haskell-src-exts lifted-base @@ -39084,8 +39226,8 @@ self: { scientific tagged text time unordered-containers uuid-types vector ]; testHaskellDepends = [ - base beam-core beam-migrate bytestring directory filepath hedgehog - postgresql-simple process tasty tasty-hunit temporary text uuid + aeson base beam-core beam-migrate bytestring hedgehog + postgresql-simple tasty tasty-hunit text tmp-postgres uuid vector ]; description = "Connection layer between beam and postgres"; license = stdenv.lib.licenses.mit; @@ -39096,16 +39238,21 @@ self: { "beam-sqlite" = callPackage ({ mkDerivation, aeson, attoparsec, base, beam-core, beam-migrate , bytestring, dlist, free, hashable, mtl, network-uri, scientific - , sqlite-simple, text, time, unix + , sqlite-simple, tasty, tasty-expected-failure, tasty-hunit, text + , time, unix }: mkDerivation { pname = "beam-sqlite"; - version = "0.4.0.0"; - sha256 = "09va580nv05xavcrqw9drh86xgqgzl98bvh707xjn1d6wh3miizw"; + version = "0.5.0.0"; + sha256 = "1ng67jspdwp4prfzp9lzhl1g26q9bfpmxpwv0q392y8wwrq6zxrj"; libraryHaskellDepends = [ aeson attoparsec base beam-core beam-migrate bytestring dlist free hashable mtl network-uri scientific sqlite-simple text time unix ]; + testHaskellDepends = [ + base beam-core beam-migrate sqlite-simple tasty + tasty-expected-failure tasty-hunit text time + ]; description = "Beam driver for SQLite"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; @@ -39431,22 +39578,6 @@ self: { }) {}; "benchpress" = callPackage - ({ mkDerivation, base, bytestring, mtl, time }: - mkDerivation { - pname = "benchpress"; - version = "0.2.2.14"; - sha256 = "02d4ndwz0xyvfa5j1a4564sfn6fmpf4757dfxr6k20z5vgcdbqih"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ base mtl time ]; - executableHaskellDepends = [ base bytestring time ]; - description = "Micro-benchmarking with detailed statistics"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; - }) {}; - - "benchpress_0_2_2_15" = callPackage ({ mkDerivation, base, bytestring, mtl, time }: mkDerivation { pname = "benchpress"; @@ -40760,16 +40891,17 @@ self: { }) {}; "binaryen" = callPackage - ({ mkDerivation, base, binaryen }: + ({ mkDerivation, base }: mkDerivation { pname = "binaryen"; - version = "0.0.4.0"; - sha256 = "1kgvzn5m2pq7ncid27n68p9axrdganna08wlp8csg9c22jixg7rg"; + version = "0.0.5.0"; + sha256 = "0n3w222k1jbijqgjy1kngwx4hjny7qzw3w2gx82qxycbmm1sb1qg"; libraryHaskellDepends = [ base ]; - librarySystemDepends = [ binaryen ]; + testHaskellDepends = [ base ]; + doHaddock = false; description = "Haskell bindings to binaryen"; license = stdenv.lib.licenses.bsd3; - }) {inherit (pkgs) binaryen;}; + }) {}; "bind-marshal" = callPackage ({ mkDerivation, base, bytestring, containers, deepseq, ghc-prim @@ -44264,6 +44396,8 @@ self: { testToolDepends = [ tasty-discover ]; description = "Generate Haskell boilerplate"; license = stdenv.lib.licenses.gpl3Plus; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "bolt" = callPackage @@ -45973,6 +46107,8 @@ self: { libraryHaskellDepends = [ base ]; description = "Access to the BSD sysctl(3) interface"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "bson" = callPackage @@ -46278,19 +46414,21 @@ self: { "buffet" = callPackage ({ mkDerivation, aeson, aeson-pretty, base, bytestring, cassava , containers, directory, filepath, language-docker, mustache - , optparse-applicative, parsec, random, split, tasty, tasty-hunit - , text, typed-process, unordered-containers, vector, yaml + , optparse-applicative, parsec, prettyprinter, random, split, tasty + , tasty-hunit, text, typed-process, unordered-containers, vector + , yaml }: mkDerivation { pname = "buffet"; - version = "0.4.0"; - sha256 = "04q4k7bfbh41jg869w71wv4idlxbpf48cz2sg5m3ds66wknnhqwq"; + version = "0.5.0"; + sha256 = "0xi5hr51fwksc9983qzgji6p9lhxqfkhnczs6hamddj9glanf183"; isLibrary = false; isExecutable = true; libraryHaskellDepends = [ aeson aeson-pretty base bytestring cassava containers directory filepath language-docker mustache optparse-applicative parsec - random split text typed-process unordered-containers vector yaml + prettyprinter random split text typed-process unordered-containers + vector yaml ]; executableHaskellDepends = [ base ]; testHaskellDepends = [ @@ -46351,12 +46489,12 @@ self: { , case-insensitive, containers, doctest, Glob, hspec, http-client , http-client-tls, http-conduit, http-types, iproute, network , parsec, template-haskell, text, th-lift-instances, time - , ua-parser, unliftio, wai + , ua-parser, unliftio, wai, yaml }: mkDerivation { pname = "bugsnag-haskell"; - version = "0.0.3.1"; - sha256 = "0ka4sj415pn2r2f037hyxw3fwsjzad9g67llm4yx1d3b15zzdxx9"; + version = "0.0.4.0"; + sha256 = "1vmbyyya221f6nkk6j1wxscwcxmh10f0hwsy9ib460d59vf607ym"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -46365,10 +46503,12 @@ self: { template-haskell text th-lift-instances time ua-parser wai ]; testHaskellDepends = [ - aeson aeson-qq base doctest hspec text time unliftio + aeson aeson-qq base doctest hspec text time unliftio yaml ]; description = "Bugsnag error reporter for Haskell"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "bugsnag-hs" = callPackage @@ -48174,6 +48314,8 @@ self: { libraryHaskellDepends = [ base Cabal directory extra filepath ]; description = "Build time library that autodetects exposed modules"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "cabal-bounds" = callPackage @@ -48761,24 +48903,25 @@ self: { }: mkDerivation { pname = "cabal-install-parsers"; - version = "0.3.0.1"; - sha256 = "1skv3psqs26m68n5xqsw4jil2f3dz5yv8hmskl58sg0q22mjbspm"; - revision = "1"; - editedCabalFile = "1q89viamcwb49qi8as9pdscsi2a0pkjpfj275ch4rx0qj0vwkr67"; + version = "0.4"; + sha256 = "12z9gz1afra0fqd79j1r9fsdc7k8r6v1saw14l42kd2dqxdjqwcf"; libraryHaskellDepends = [ aeson base base16-bytestring binary binary-instances bytestring Cabal containers cryptohash-sha256 deepseq directory filepath lukko network-uri parsec pretty tar text time transformers ]; testHaskellDepends = [ - ansi-terminal base bytestring Cabal containers directory filepath - pretty tasty tasty-golden tasty-hunit tree-diff + ansi-terminal base base16-bytestring bytestring Cabal containers + directory filepath pretty tar tasty tasty-golden tasty-hunit + tree-diff ]; benchmarkHaskellDepends = [ base bytestring Cabal containers criterion directory filepath ]; description = "Utilities to work with cabal-install files"; license = "GPL-2.0-or-later AND BSD-3-Clause"; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "cabal-lenses" = callPackage @@ -48893,8 +49036,8 @@ self: { }: mkDerivation { pname = "cabal-plan"; - version = "0.7.1.0"; - sha256 = "01hd6wl80j6njlg3h4rxsf5izyx49bs6v1j5756g2pyxc9h4hrs4"; + version = "0.7.2.0"; + sha256 = "118g2ywzgjny57c2iysnj5f7rlriwic3f0k9c54f6bvkc0a3sfi3"; configureFlags = [ "-fexe" ]; isLibrary = true; isExecutable = true; @@ -49274,6 +49417,8 @@ self: { pname = "cabal2spec"; version = "2.6.2"; sha256 = "0x1r01fk5mch76zindalvmlkfaca4y1x89zw2dm0d46fncsfgdrv"; + revision = "1"; + editedCabalFile = "196j1fga9cqlc0nbxbgl0c3g0ic8sf618whps95zzp58lac9dqak"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base Cabal filepath time ]; @@ -49541,6 +49686,8 @@ self: { ]; description = "Cache combinators"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "cachix" = callPackage @@ -50080,8 +50227,8 @@ self: { }: mkDerivation { pname = "call-alloy"; - version = "0.2.0.5"; - sha256 = "1qgvrvb9la7nsx04ql8qvlsavalyimbsc7j6pdc14pmyqnrh3y60"; + version = "0.2.1.0"; + sha256 = "0k75fcrn2r4yk59i8r7qwirg0b9vwga9gmibmj4lznqg44yy2bhi"; libraryHaskellDepends = [ base bytestring containers directory file-embed filepath hashable lens mtl process split trifecta unix @@ -50903,6 +51050,8 @@ self: { pname = "casa-types"; version = "0.0.1"; sha256 = "0f8c4a43rh6zr5cwingxyjfpisipy4x4xc0lpasfjaj4vhjgwqkp"; + revision = "1"; + editedCabalFile = "101hhpwc7nhg2laywv2jnqa3jsjkvbvc30i6cs4srvdv2n87jlcb"; libraryHaskellDepends = [ aeson attoparsec base base16-bytestring bytestring hashable path-pieces persistent text @@ -53473,8 +53622,8 @@ self: { }: mkDerivation { pname = "chessIO"; - version = "0.3.1.2"; - sha256 = "0x79cgngxbrk43f28pprqq85n54cg2i2chhpycdcnkx16iva5bbf"; + version = "0.4.0.0"; + sha256 = "0166hrzpw9hcbcgckyf966nvjyf6caa1h3sdi923m9y32924p65v"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -53593,6 +53742,8 @@ self: { libraryToolDepends = [ c2hs ]; description = "Haskell bindings for Chipmunk2D physics engine"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "chitauri" = callPackage @@ -54144,8 +54295,8 @@ self: { }: mkDerivation { pname = "churros"; - version = "0.1.2.0"; - sha256 = "0djfcvr81gl6lcz8pb3v0432jh49v8phwp513ca1fz1i75a2nx43"; + version = "0.1.5.0"; + sha256 = "05fb9vmx18dypfw6303y74cbag9vv187w6z402dv4vff35ya4bvh"; libraryHaskellDepends = [ async base containers random stm time unagi-chan ]; @@ -54582,8 +54733,8 @@ self: { }: mkDerivation { pname = "citeproc"; - version = "0.1.0.2"; - sha256 = "184d633d186sa9rshh8im6xxars0x26623sym9pw2h2h709xsg4n"; + version = "0.1.0.3"; + sha256 = "10zkkn00b2rm1lfnwdpmbxp82vmzbh69ivsda40kh0x2d8r1rzxp"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -55535,6 +55686,32 @@ self: { broken = true; }) {}; + "clckwrks-plugin-redirect" = callPackage + ({ mkDerivation, acid-state, aeson, attoparsec, base, clckwrks + , containers, filepath, happstack-hsp, happstack-server, hsp + , hsx2hs, ixset, mtl, old-locale, random, reform, reform-happstack + , reform-hsp, safecopy, template-haskell, text, uuid, uuid-orphans + , web-plugins, web-routes, web-routes-happstack, web-routes-th + }: + mkDerivation { + pname = "clckwrks-plugin-redirect"; + version = "0.0.1"; + sha256 = "1946m4fxdj8kr7n1q39j2q9j6srdz97srq0fifnk7mil23lw2vyj"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + acid-state aeson attoparsec base clckwrks containers filepath + happstack-hsp happstack-server hsp hsx2hs ixset mtl old-locale + random reform reform-happstack reform-hsp safecopy template-haskell + text uuid uuid-orphans web-plugins web-routes web-routes-happstack + web-routes-th + ]; + description = "support redirects for CMS/Blogging in clckwrks"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; + }) {}; + "clckwrks-theme-bootstrap" = callPackage ({ mkDerivation, base, clckwrks, happstack-authenticate, hsp , hsx-jmacro, hsx2hs, jmacro, mtl, text, web-plugins @@ -57115,8 +57292,8 @@ self: { }: mkDerivation { pname = "cobot-io"; - version = "0.1.3.7"; - sha256 = "04861j2g4pa05p788inkyvgwqjn1c6jsalkrlmin8j3nd0gw2ggq"; + version = "0.1.3.8"; + sha256 = "1x3ikycb9v9hmn1j57sddnr50kb3kvnch6w09fsyqzzmbnfc6nys"; libraryHaskellDepends = [ array attoparsec base binary bytestring containers data-msgpack deepseq http-conduit hyraxAbif lens linear mtl split text vector @@ -60492,34 +60669,6 @@ self: { }) {}; "conduit" = callPackage - ({ mkDerivation, base, bytestring, containers, deepseq, directory - , exceptions, filepath, gauge, hspec, kan-extensions - , mono-traversable, mtl, mwc-random, primitive, QuickCheck - , resourcet, safe, silently, split, text, transformers, unix - , unliftio, unliftio-core, vector - }: - mkDerivation { - pname = "conduit"; - version = "1.3.2.1"; - sha256 = "0kyl1zspkp14vrgxgc2zpy9rd9h6aa7m9f385sgshysnhbc7hbg5"; - libraryHaskellDepends = [ - base bytestring directory exceptions filepath mono-traversable mtl - primitive resourcet text transformers unix unliftio-core vector - ]; - testHaskellDepends = [ - base bytestring containers directory exceptions filepath hspec - mono-traversable mtl QuickCheck resourcet safe silently split text - transformers unliftio vector - ]; - benchmarkHaskellDepends = [ - base containers deepseq gauge hspec kan-extensions mwc-random - transformers vector - ]; - description = "Streaming data processing library"; - license = stdenv.lib.licenses.mit; - }) {}; - - "conduit_1_3_3" = callPackage ({ mkDerivation, base, bytestring, containers, deepseq, directory , exceptions, filepath, gauge, hspec, kan-extensions , mono-traversable, mtl, mwc-random, primitive, QuickCheck @@ -60545,7 +60694,6 @@ self: { ]; description = "Streaming data processing library"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "conduit-algorithms" = callPackage @@ -61448,6 +61596,8 @@ self: { libraryHaskellDepends = [ base config-value text ]; description = "Interface between config-value and System.GetOpt"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "configifier" = callPackage @@ -63489,8 +63639,8 @@ self: { }: mkDerivation { pname = "core-program"; - version = "0.2.4.5"; - sha256 = "1a2zjdywmgniwcj649f43hri55bh30vz2s00r3yqj3gvhhighi86"; + version = "0.2.5.0"; + sha256 = "0bgzlyxcmnn7bscw04v9rljny9wjhcg066nbqk47aphdd6b716dj"; libraryHaskellDepends = [ async base bytestring chronologique core-data core-text directory exceptions filepath fsnotify hashable hourglass mtl prettyprinter @@ -66818,6 +66968,8 @@ self: { ]; description = "A framework for declaratively writing curl based API tests"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "curlhs" = callPackage @@ -67576,17 +67728,17 @@ self: { , filepath, FindBin, hashable, haskeline, html, http-conduit , http-types, HUnit, leancheck, memory, mmap, monad-control, mtl , network, network-uri, old-time, parsec, process, QuickCheck - , regex-applicative, regex-compat-tdfa, sandi, split, stm - , system-fileio, system-filepath, tar, temporary, terminfo - , test-framework, test-framework-hunit, test-framework-leancheck + , regex-applicative, regex-compat-tdfa, stm, system-fileio + , system-filepath, tar, temporary, terminfo, test-framework + , test-framework-hunit, test-framework-leancheck , test-framework-quickcheck2, text, time, transformers , transformers-base, unix, unix-compat, utf8-string, vector , zip-archive, zlib }: mkDerivation { pname = "darcs"; - version = "2.16.2"; - sha256 = "1nsmaai4l5zas4v1vk92nvh721dykcxrpd4c2v9bh3wi3n2m45qn"; + version = "2.16.3"; + sha256 = "1bf11ndz6k7fx9bb31l4l6dqfkrld3gxsrrqggcg7d57wa3yw9c9"; configureFlags = [ "-fforce-char8-encoding" "-flibrary" ]; isLibrary = true; isExecutable = true; @@ -67596,16 +67748,16 @@ self: { conduit constraints containers cryptonite data-ordlist directory fgl filepath hashable haskeline html http-conduit http-types memory mmap mtl network network-uri old-time parsec process - regex-applicative regex-compat-tdfa sandi stm tar temporary - terminfo text time transformers unix unix-compat utf8-string vector - zip-archive zlib + regex-applicative regex-compat-tdfa stm tar temporary terminfo text + time transformers unix unix-compat utf8-string vector zip-archive + zlib ]; executableHaskellDepends = [ base ]; testHaskellDepends = [ array async base bytestring cmdargs constraints containers directory exceptions filepath FindBin HUnit leancheck monad-control - mtl process QuickCheck split system-fileio system-filepath - test-framework test-framework-hunit test-framework-leancheck + mtl process QuickCheck system-fileio system-filepath test-framework + test-framework-hunit test-framework-leancheck test-framework-quickcheck2 text time transformers transformers-base unix-compat vector zip-archive ]; @@ -69364,22 +69516,6 @@ self: { }) {}; "data-reify" = callPackage - ({ mkDerivation, base, containers, hashable, unordered-containers - }: - mkDerivation { - pname = "data-reify"; - version = "0.6.2"; - sha256 = "19mljyx1v86plnwqm5y1livw5qd8cc9z5k1kfchqiiwj1vsq660v"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - base containers hashable unordered-containers - ]; - description = "Reify a recursive data structure into an explicit graph"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "data-reify_0_6_3" = callPackage ({ mkDerivation, base, base-compat, containers, hashable, hspec , hspec-discover, unordered-containers }: @@ -69396,7 +69532,6 @@ self: { testToolDepends = [ hspec-discover ]; description = "Reify a recursive data structure into an explicit graph"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "data-reify-cse" = callPackage @@ -71568,28 +71703,6 @@ self: { }) {}; "deferred-folds" = callPackage - ({ mkDerivation, base, bytestring, containers, foldl, hashable - , primitive, QuickCheck, quickcheck-instances, rerebase, tasty - , tasty-hunit, tasty-quickcheck, transformers, unordered-containers - , vector - }: - mkDerivation { - pname = "deferred-folds"; - version = "0.9.10.1"; - sha256 = "15lwcc7i7wmi1gkkmak677qw0fnz4a4ldnv842xaimfi64753shv"; - libraryHaskellDepends = [ - base bytestring containers foldl hashable primitive transformers - unordered-containers vector - ]; - testHaskellDepends = [ - QuickCheck quickcheck-instances rerebase tasty tasty-hunit - tasty-quickcheck - ]; - description = "Abstractions over deferred folds"; - license = stdenv.lib.licenses.mit; - }) {}; - - "deferred-folds_0_9_11" = callPackage ({ mkDerivation, base, bytestring, containers, foldl, hashable , primitive, QuickCheck, quickcheck-instances, rerebase, tasty , tasty-hunit, tasty-quickcheck, transformers, unordered-containers @@ -71609,7 +71722,6 @@ self: { ]; description = "Abstractions over deferred folds"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "definitive-base" = callPackage @@ -73171,7 +73283,7 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "dhall_1_35_0" = callPackage + "dhall_1_36_0" = callPackage ({ mkDerivation, aeson, aeson-pretty, ansi-terminal, atomic-write , base, bytestring, case-insensitive, cborg, cborg-json, containers , contravariant, cryptonite, data-fix, deepseq, Diff, directory @@ -73190,10 +73302,8 @@ self: { }: mkDerivation { pname = "dhall"; - version = "1.35.0"; - sha256 = "19h0afgxqq9da1apx4xx9p4p0f2r6miivc4l1dkhbbvfk2r5wkw3"; - revision = "2"; - editedCabalFile = "0jfgmh4mh7v2srwvz76zpffhgnrqx9fgrhn2hdsfgrzh95zjx0my"; + version = "1.36.0"; + sha256 = "014bdxmrcxzc2yrk838fxbz521714fk3a7c6idb9065wrfzch1wj"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -73212,11 +73322,12 @@ self: { executableHaskellDepends = [ base ]; testHaskellDepends = [ base bytestring cborg containers data-fix deepseq directory doctest - either filepath foldl generic-random lens-family-core megaparsec - mockery prettyprinter QuickCheck quickcheck-instances scientific - serialise special-values spoon tasty tasty-expected-failure - tasty-hunit tasty-quickcheck tasty-silver template-haskell text - transformers turtle unordered-containers vector + either filepath foldl generic-random http-client http-client-tls + lens-family-core megaparsec mockery prettyprinter QuickCheck + quickcheck-instances scientific serialise special-values spoon + tasty tasty-expected-failure tasty-hunit tasty-quickcheck + tasty-silver template-haskell text transformers turtle + unordered-containers vector ]; benchmarkHaskellDepends = [ base bytestring containers directory gauge text @@ -73250,16 +73361,14 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "dhall-bash_1_0_33" = callPackage + "dhall-bash_1_0_34" = callPackage ({ mkDerivation, base, bytestring, containers, dhall , neat-interpolation, optparse-generic, shell-escape, text }: mkDerivation { pname = "dhall-bash"; - version = "1.0.33"; - sha256 = "0b920cscim2mqcav0yy4s00gcgjqfybvbmfvnnbvarxswknw8z1v"; - revision = "1"; - editedCabalFile = "1r01himc5n19q9675i6i27yrfrx9l362ycsnvk48mcbrbmv1z5lf"; + version = "1.0.34"; + sha256 = "1p1zylrjk80lh8rxpw2z3wyvk9x7q65lwyfwfacx8rrbgzx54riy"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -73302,8 +73411,8 @@ self: { }: mkDerivation { pname = "dhall-docs"; - version = "1.0.1"; - sha256 = "0632l4h72zrddknhha8lz53ynzbdrhb11mvj09qfmr4b1rd01amz"; + version = "1.0.2"; + sha256 = "17l8vwj02lbkqy8p4j7rhmwidrxx1ln375cv8lgwwx4n0fgvmgfc"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -73389,7 +73498,7 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "dhall-json_1_7_2" = callPackage + "dhall-json_1_7_3" = callPackage ({ mkDerivation, aeson, aeson-pretty, aeson-yaml, ansi-terminal , base, bytestring, containers, dhall, exceptions, filepath , lens-family-core, optparse-applicative, prettyprinter @@ -73398,8 +73507,8 @@ self: { }: mkDerivation { pname = "dhall-json"; - version = "1.7.2"; - sha256 = "189mpnh2fnm1gwc1lvqa3wy9wk2wh8jj3216dvidik545008yvcj"; + version = "1.7.3"; + sha256 = "0as1n4qy0rynmj1y7h39l1lazqarwgizbzsn0g7apixzzdfm53kx"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -73467,7 +73576,7 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "dhall-lsp-server_1_0_10" = callPackage + "dhall-lsp-server_1_0_11" = callPackage ({ mkDerivation, aeson, aeson-pretty, base, bytestring, containers , data-default, dhall, dhall-json, directory, doctest, filepath , haskell-lsp, haskell-lsp-types, hslogger, lens, lens-family-core @@ -73477,8 +73586,8 @@ self: { }: mkDerivation { pname = "dhall-lsp-server"; - version = "1.0.10"; - sha256 = "0z6b3yq8fijxycabwrbqn2z94lb2ak2fmajlxgawyd1723cl2wsb"; + version = "1.0.11"; + sha256 = "0xp4mbk26p22xs5f2bz493yi9ijbiiz1jwmc462yk1bxxz5lbx5n"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -73503,10 +73612,8 @@ self: { }: mkDerivation { pname = "dhall-nix"; - version = "1.1.17"; - sha256 = "1c696f0if218pbmir4rmkb6shcgk9acw5g1iwcb2mslshmncbyfd"; - revision = "1"; - editedCabalFile = "0vdni3cmx3p6a0p587avja4zg6278fmdfv6jh5h4wfx0b7z1sphg"; + version = "1.1.18"; + sha256 = "0d947iz98mkmz7chxcp2402kid711na7xwwx8xzh8jg5lh41sm7w"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -73518,6 +73625,8 @@ self: { ]; description = "Dhall to Nix compiler"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "dhall-nixpkgs" = callPackage @@ -73528,8 +73637,8 @@ self: { }: mkDerivation { pname = "dhall-nixpkgs"; - version = "1.0.1"; - sha256 = "1dw3bygs3da7yfcm5h376ppswv3dcny42yqjy7fabyzw72d4586z"; + version = "1.0.2"; + sha256 = "1r76zbqk2pc5pryrbdj425j6bb86x28pqfkav3kw9kr4703afhni"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -73539,6 +73648,8 @@ self: { ]; description = "Convert Dhall projects to Nix packages"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "dhall-text" = callPackage @@ -73622,7 +73733,7 @@ self: { broken = true; }) {}; - "dhall-yaml_1_2_2" = callPackage + "dhall-yaml_1_2_3" = callPackage ({ mkDerivation, aeson, ansi-terminal, base, bytestring, dhall , dhall-json, exceptions, HsYAML, HsYAML-aeson , optparse-applicative, prettyprinter, prettyprinter-ansi-terminal @@ -73630,8 +73741,8 @@ self: { }: mkDerivation { pname = "dhall-yaml"; - version = "1.2.2"; - sha256 = "1mswyac77p0zpjdfr86x4ddwlnvqz0ibf98hr8q0zm1a9ibds982"; + version = "1.2.3"; + sha256 = "1n42brr1yifb4pyl26960rsm8b1wzw0hvv6mmq8m5ml5av61ymf3"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -75291,6 +75402,8 @@ self: { ]; description = "Gemini client"; license = stdenv.lib.licenses.gpl3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "diophantine" = callPackage @@ -75600,6 +75713,27 @@ self: { broken = true; }) {}; + "dirichlet" = callPackage + ({ mkDerivation, base, hspec, hspec-discover, log-domain + , math-functions, mwc-random, primitive, vector + }: + mkDerivation { + pname = "dirichlet"; + version = "0.1.0.0"; + sha256 = "173mw8706fjrqdjwrjfcb8g140hp4xdjbpvhvq71f8lj8527b9ia"; + libraryHaskellDepends = [ + base log-domain math-functions mwc-random primitive vector + ]; + testHaskellDepends = [ + base hspec hspec-discover log-domain mwc-random vector + ]; + testToolDepends = [ hspec-discover ]; + description = "Multivariate dirichlet distribution"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; + }) {}; + "dirstream" = callPackage ({ mkDerivation, base, directory, pipes, pipes-safe, system-fileio , system-filepath, unix @@ -78907,6 +79041,34 @@ self: { broken = true; }) {}; + "dropbox" = callPackage + ({ mkDerivation, aeson, aeson-qq, base, hspec, hspec-core + , http-api-data, http-client-tls, servant, servant-auth + , servant-auth-client, servant-client, servant-client-core, text + }: + mkDerivation { + pname = "dropbox"; + version = "0.0.4"; + sha256 = "1syfzlgjph7nn2231sn0cm3q0f32inc5r9zc95f8kl43qa003zrz"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson base http-api-data http-client-tls servant servant-auth + servant-auth-client servant-client servant-client-core text + ]; + executableHaskellDepends = [ + aeson base http-api-data http-client-tls servant servant-auth + servant-auth-client servant-client servant-client-core text + ]; + testHaskellDepends = [ + aeson aeson-qq base hspec hspec-core http-api-data http-client-tls + servant servant-auth servant-auth-client servant-client + servant-client-core text + ]; + description = "Dropbox API client"; + license = stdenv.lib.licenses.mit; + }) {}; + "dropbox-sdk" = callPackage ({ mkDerivation, base, blaze-builder, bytestring, case-insensitive , certificate, conduit, HTTP, http-conduit, http-types, json @@ -79122,6 +79284,28 @@ self: { broken = true; }) {}; + "dsv" = callPackage + ({ mkDerivation, attoparsec, base, bytestring, cassava, containers + , doctest, foldl, hedgehog, pipes, pipes-bytestring, pipes-safe + , safe-exceptions, template-haskell, text, validation, vector + }: + mkDerivation { + pname = "dsv"; + version = "1.0.0.0"; + sha256 = "0fjfpa8qfaiy7wxmq9lsacxywrsqahl8s8wamxfiai7mzq2201gn"; + enableSeparateDataOutput = true; + libraryHaskellDepends = [ + attoparsec base bytestring cassava containers foldl pipes + pipes-bytestring pipes-safe template-haskell text validation vector + ]; + testHaskellDepends = [ + base bytestring containers doctest foldl hedgehog safe-exceptions + text vector + ]; + description = "DSV (delimiter-separated values)"; + license = stdenv.lib.licenses.mit; + }) {}; + "dtab" = callPackage ({ mkDerivation, alex, array, base, binary, bytestring, containers , data-binary-ieee754, happy, pretty, transformers @@ -81053,17 +81237,21 @@ self: { }) {}; "effet" = callPackage - ({ mkDerivation, base, containers, monad-control, template-haskell - , transformers, transformers-base + ({ mkDerivation, base, containers, hspec, monad-control + , template-haskell, transformers, transformers-base }: mkDerivation { pname = "effet"; - version = "0.3.0.1"; - sha256 = "18cmgap4a3qnglmysh2l8pmag0vx8nqrrzx52zn9zrb54l1ldgm2"; + version = "0.3.0.2"; + sha256 = "1yy8hpq74bp4ffz7b5h7j9ja6akizl7d3b9n7n42c0iwlzr1hi4s"; libraryHaskellDepends = [ base containers monad-control template-haskell transformers transformers-base ]; + testHaskellDepends = [ + base containers hspec monad-control template-haskell transformers + transformers-base + ]; description = "An Effect System based on Type Classes"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -85263,8 +85451,8 @@ self: { }: mkDerivation { pname = "eve"; - version = "0.1.8"; - sha256 = "1bhv9mh61f69xff5y8nagri1flc3m87sxx3b17kbxi5d2hhzsaqz"; + version = "0.1.9.0"; + sha256 = "06b2qybglsww0f7wpy2fnmr3l9r5a0aikybd23cjl6ribq86l8y9"; libraryHaskellDepends = [ base containers data-default free lens mtl ]; @@ -86270,6 +86458,8 @@ self: { ]; description = "Haskell bindings to ExifTool"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "exigo-schema" = callPackage @@ -88311,6 +88501,8 @@ self: { pname = "fastsum"; version = "0.1.1.1"; sha256 = "0j9jd068xgk7nn2ilgdkv1pxngflqqgxz1pnhdssgiih04v8zw5l"; + revision = "1"; + editedCabalFile = "0mmdkpgxlc6fsl5pq8kgdh41h08m86s0y4wnan293h3c74q1xd6x"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -91490,31 +91682,37 @@ self: { }) {}; "flashblast" = callPackage - ({ mkDerivation, attoparsec, base, composite-base, dhall - , formatting, lucid, megaparsec, path, path-dhall-instance - , path-utils, polysemy, polysemy-video, replace-megaparsec, rio - , semialign, subtitleParser, these, turtle, unliftio-path, vinyl + ({ mkDerivation, aeson, attoparsec, base, co-log-polysemy + , co-log-polysemy-formatting, composite-base, dhall, formatting + , http-conduit, lucid, megaparsec, path, path-dhall-instance + , path-utils, polysemy, polysemy-plugin, polysemy-video + , polysemy-zoo, replace-megaparsec, rio, semialign, subtitleParser + , temporary, these, turtle, unliftio-path, vinyl }: mkDerivation { pname = "flashblast"; - version = "0.0.1.1"; - sha256 = "0syqfjg373sq3326nxqaq4zipb342df8av78cm63j78mnl7xjq0x"; + version = "0.0.4.0"; + sha256 = "13n90wkmj69lkyvsw34dhr173m8qfdclkygnh7v5xwdrk5fgpb5s"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - attoparsec base composite-base dhall formatting lucid megaparsec - path path-dhall-instance path-utils polysemy polysemy-video - replace-megaparsec rio semialign subtitleParser these turtle - unliftio-path vinyl + aeson attoparsec base co-log-polysemy co-log-polysemy-formatting + composite-base dhall formatting http-conduit lucid megaparsec path + path-dhall-instance path-utils polysemy polysemy-plugin + polysemy-video polysemy-zoo replace-megaparsec rio semialign + subtitleParser temporary these turtle unliftio-path vinyl ]; executableHaskellDepends = [ - attoparsec base composite-base dhall formatting lucid megaparsec - path path-dhall-instance path-utils polysemy polysemy-video - replace-megaparsec rio semialign subtitleParser these turtle - unliftio-path vinyl + aeson attoparsec base co-log-polysemy co-log-polysemy-formatting + composite-base dhall formatting http-conduit lucid megaparsec path + path-dhall-instance path-utils polysemy polysemy-plugin + polysemy-video polysemy-zoo replace-megaparsec rio semialign + subtitleParser temporary these turtle unliftio-path vinyl ]; description = "Generate language learning flashcards from video"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "flat" = callPackage @@ -91797,6 +91995,8 @@ self: { libraryToolDepends = [ proto-lens-protoc ]; description = "Flink stateful functions SDK"; license = stdenv.lib.licenses.mpl20; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "flip-cmd" = callPackage @@ -92611,6 +92811,24 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "focus_1_0_1_4" = callPackage + ({ mkDerivation, base, QuickCheck, quickcheck-instances, rerebase + , tasty, tasty-hunit, tasty-quickcheck, transformers + }: + mkDerivation { + pname = "focus"; + version = "1.0.1.4"; + sha256 = "1knaiwnxcl2hrx4b3k954rd5v995gxa48db1z9mp58s646ymlmfl"; + libraryHaskellDepends = [ base transformers ]; + testHaskellDepends = [ + QuickCheck quickcheck-instances rerebase tasty tasty-hunit + tasty-quickcheck + ]; + description = "A general abstraction for manipulating elements of container data structures"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "focuslist" = callPackage ({ mkDerivation, base, Cabal, cabal-doctest, containers, doctest , genvalidity-containers, genvalidity-hspec, hedgehog, lens @@ -96203,6 +96421,8 @@ self: { benchmarkHaskellDepends = [ base fused-effects-random gauge ]; description = "High-quality random number generation as an effect"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "fused-effects-optics" = callPackage @@ -96361,6 +96581,8 @@ self: { pname = "futhark"; version = "0.18.1"; sha256 = "12nbksr3qywqg88cj4yy5z9qnn24cdxjg8ym70bxym8a8m52928c"; + revision = "1"; + editedCabalFile = "0598rwva6svavwka9m6vr1raz1x8wvn9bfvcc7j8kvdh6m6y9w4m"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -96381,6 +96603,8 @@ self: { ]; description = "An optimising compiler for a functional, array-oriented language"; license = stdenv.lib.licenses.isc; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "futhask" = callPackage @@ -97068,12 +97292,12 @@ self: { }) {}; "gasp" = callPackage - ({ mkDerivation, base, binary, containers, mtl }: + ({ mkDerivation, base, binary, containers, mtl, QuickCheck }: mkDerivation { pname = "gasp"; - version = "1.2.0.0"; - sha256 = "0dq867kgil7xp7wqk8ylmx9ninxrqwc375g5l13iskvyz1li7474"; - libraryHaskellDepends = [ base binary containers mtl ]; + version = "1.3.0.0"; + sha256 = "0dhna3mj7mdyk1n0x3barpn5g4hkjl9fnbr403xym1dm8rl7r7hg"; + libraryHaskellDepends = [ base binary containers mtl QuickCheck ]; description = "A framework of algebraic classes"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -99857,20 +100081,20 @@ self: { ({ mkDerivation, base, blaze-svg, bytestring, containers , diagrams-lib, diagrams-svg, filepath, ghc-events, hashable, lens , mtl, optparse-applicative, parsec, regex-base, regex-pcre-builtin - , SVGFonts, template-haskell, th-lift, transformers - , unordered-containers + , SVGFonts, template-haskell, text, th-lift, th-lift-instances + , transformers, unordered-containers }: mkDerivation { pname = "ghc-events-analyze"; - version = "0.2.7"; - sha256 = "01395ncya596fw6il2ddlziwcygvahswx0q9fjy7j7v7jqgzva3x"; + version = "0.2.8"; + sha256 = "1aam80l76dy76b8wbkjnbmxkmbgvczs591yjnbb9rm5bv9ggcb29"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ base blaze-svg bytestring containers diagrams-lib diagrams-svg filepath ghc-events hashable lens mtl optparse-applicative parsec - regex-base regex-pcre-builtin SVGFonts template-haskell th-lift - transformers unordered-containers + regex-base regex-pcre-builtin SVGFonts template-haskell text + th-lift th-lift-instances transformers unordered-containers ]; description = "Analyze and visualize event logs"; license = stdenv.lib.licenses.bsd3; @@ -102413,6 +102637,8 @@ self: { libraryPkgconfigDepends = [ gtksheet ]; description = "GtkSheet bindings"; license = stdenv.lib.licenses.lgpl21; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {gtksheet = null;}; "gi-gtksource" = callPackage @@ -108339,8 +108565,8 @@ self: { }: mkDerivation { pname = "gopro-plus"; - version = "0.3.1.1"; - sha256 = "0gjdz5c165hk4nbynp3s633kzivq62y3riz45w0l0k2qrirpkd14"; + version = "0.4.1.0"; + sha256 = "1xim8kr58nnpfh1sj66p73alm1l8wwxqafx5b77wc51dwrjyz1p8"; libraryHaskellDepends = [ aeson base bytestring containers exceptions filepath generic-deriving lens lens-aeson mtl random retry text time @@ -108594,8 +108820,8 @@ self: { }: mkDerivation { pname = "gotta-go-fast"; - version = "0.3.0.0"; - sha256 = "067jmp0p21bw7mpsrlpawphjmlq9f85lsfiihp37pvs8sxb36lg9"; + version = "0.3.0.6"; + sha256 = "1cv8l54wg2gsbk7wr0zmw47k9v8vs5dzj4k1wp5b17p3wp92s1av"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -109547,6 +109773,8 @@ self: { ]; description = "A client for Haskell programs to query a GraphQL API"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "graphql-utils" = callPackage @@ -112130,6 +112358,8 @@ self: { executableHaskellDepends = [ base optparse-applicative text ]; description = "A blog system"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "hacanon-light" = callPackage @@ -113289,6 +113519,35 @@ self: { license = stdenv.lib.licenses.gpl3; }) {}; + "hadolint_1_18_2" = callPackage + ({ mkDerivation, aeson, async, base, bytestring, containers + , directory, filepath, gitrev, hspec, HsYAML, HUnit + , language-docker, megaparsec, mtl, optparse-applicative, parallel + , ShellCheck, split, text, void + }: + mkDerivation { + pname = "hadolint"; + version = "1.18.2"; + sha256 = "0ifcnpbc667x7cl44fkdj4j968zpyz57jh8b5givqdnmvw9x8wf5"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson async base bytestring containers directory filepath HsYAML + language-docker megaparsec mtl parallel ShellCheck split text void + ]; + executableHaskellDepends = [ + base containers gitrev language-docker megaparsec + optparse-applicative text + ]; + testHaskellDepends = [ + aeson base bytestring hspec HsYAML HUnit language-docker megaparsec + ShellCheck split text + ]; + description = "Dockerfile Linter JavaScript API"; + license = stdenv.lib.licenses.gpl3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "hadoop-formats" = callPackage ({ mkDerivation, attoparsec, base, bytestring, filepath, snappy , text, vector @@ -114552,6 +114811,8 @@ self: { ]; testHaskellDepends = [ base bytestring ]; license = "GPL"; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "hamid" = callPackage @@ -115641,6 +115902,35 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "happstack-server_7_7_0" = callPackage + ({ mkDerivation, base, base64-bytestring, blaze-html, bytestring + , containers, directory, exceptions, extensible-exceptions + , filepath, hslogger, html, HUnit, monad-control, mtl, network + , network-bsd, network-uri, old-locale, parsec, process, semigroups + , sendfile, syb, system-filepath, text, threads, time, transformers + , transformers-base, transformers-compat, unix, utf8-string, xhtml + , zlib + }: + mkDerivation { + pname = "happstack-server"; + version = "7.7.0"; + sha256 = "0jyjnksgwvasnhwwn8scqms1kja4hzlbpn0lmyr6yng5n4989d0x"; + libraryHaskellDepends = [ + base base64-bytestring blaze-html bytestring containers directory + exceptions extensible-exceptions filepath hslogger html + monad-control mtl network network-bsd network-uri old-locale parsec + process semigroups sendfile syb system-filepath text threads time + transformers transformers-base transformers-compat unix utf8-string + xhtml zlib + ]; + testHaskellDepends = [ + base bytestring containers HUnit parsec zlib + ]; + description = "Web related tools and services"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "happstack-server-tls" = callPackage ({ mkDerivation, base, bytestring, extensible-exceptions , happstack-server, hslogger, HsOpenSSL, network, openssl, sendfile @@ -115648,8 +115938,8 @@ self: { }: mkDerivation { pname = "happstack-server-tls"; - version = "7.2.1"; - sha256 = "1cihzjxl1v5sgmaxn8qny8b9yzm7p1gccgy1iaa3dk2jpl07a2dp"; + version = "7.2.1.1"; + sha256 = "0bply7dxz2046h0v0ydkicjvl491k0llapf2shxjqnskjjr5rqnk"; libraryHaskellDepends = [ base bytestring extensible-exceptions happstack-server hslogger HsOpenSSL network sendfile time unix @@ -117315,6 +117605,8 @@ self: { doHaddock = false; description = "Cabal package script generator for Travis-CI"; license = stdenv.lib.licenses.gpl3Plus; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "haskell-cnc" = callPackage @@ -117512,8 +117804,8 @@ self: { ({ mkDerivation, base, syb, template-haskell }: mkDerivation { pname = "haskell-exp-parser"; - version = "0.1.3"; - sha256 = "0cswfpdw6sgmd0fhdpyfi2nk0mhvl8xpv4zfkl9l3wdk5ipbcxdf"; + version = "0.1.4"; + sha256 = "0adz1bazcayyhlwpcqn7nn73pv1mwmagslq0b3mjpgr9wg8lx2ys"; libraryHaskellDepends = [ base template-haskell ]; testHaskellDepends = [ base syb template-haskell ]; description = "Simple parser parser from Haskell to TemplateHaskell expressions"; @@ -119992,7 +120284,7 @@ self: { license = stdenv.lib.licenses.publicDomain; }) {}; - "haskoin-core_0_15_0" = callPackage + "haskoin-core_0_17_0" = callPackage ({ mkDerivation, aeson, array, base, base16-bytestring, bytestring , cereal, conduit, containers, cryptonite, deepseq, entropy , hashable, hspec, hspec-discover, HUnit, lens, lens-aeson, memory @@ -120002,8 +120294,8 @@ self: { }: mkDerivation { pname = "haskoin-core"; - version = "0.15.0"; - sha256 = "1mvhp7khbjf3wxvgwgdxgbl8ylb4vhgiirq50dwi62p65w75xw1v"; + version = "0.17.0"; + sha256 = "0zsi5390ig611clahj3p2l3h3w7b3lzl3dfiqliihanivlnrmkag"; libraryHaskellDepends = [ aeson array base base16-bytestring bytestring cereal conduit containers cryptonite deepseq entropy hashable hspec memory mtl @@ -120080,7 +120372,7 @@ self: { broken = true; }) {}; - "haskoin-node_0_16_0" = callPackage + "haskoin-node_0_17_0" = callPackage ({ mkDerivation, base, base64, bytestring, cereal, conduit , conduit-extra, containers, data-default, hashable, haskoin-core , hspec, hspec-discover, HUnit, monad-logger, mtl, network, nqe @@ -120090,8 +120382,8 @@ self: { }: mkDerivation { pname = "haskoin-node"; - version = "0.16.0"; - sha256 = "0az8lv5xkbhfff9hq3r0kndz2hp3q6f1h6za85qj8v5755za61c8"; + version = "0.17.0"; + sha256 = "0lgphbjam3ml9j1q39ddv2cwz35vfvmbnxsf570s91ja86lyfbhy"; libraryHaskellDepends = [ base bytestring cereal conduit conduit-extra containers data-default hashable haskoin-core monad-logger mtl network nqe @@ -120171,8 +120463,8 @@ self: { }: mkDerivation { pname = "haskoin-store"; - version = "0.37.5"; - sha256 = "0ac1znif59fzcxcl3nmvrv6v49rzlcgsv138zgjnk7zxarp8alyg"; + version = "0.38.0"; + sha256 = "0hw14mxlz6pbf9694vknypq6q60n8qglixx6sp1h43nqpmc52q8q"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -120213,8 +120505,8 @@ self: { }: mkDerivation { pname = "haskoin-store-data"; - version = "0.37.5"; - sha256 = "1p8hsnwr0h0sbnwg1kwbal36q4bh3s0daz1a5n2c8xal5xdkbdra"; + version = "0.38.0"; + sha256 = "05218mbwdzz61c0d4fwj9pyr69zb4jc9fir2mp7bjfyrnymb08f5"; libraryHaskellDepends = [ aeson base bytestring cereal containers data-default deepseq hashable haskoin-core http-client http-types lens mtl network @@ -121989,24 +122281,24 @@ self: { "haxl" = callPackage ({ mkDerivation, aeson, base, binary, bytestring, containers - , deepseq, exceptions, filepath, ghc-prim, hashable, HUnit, pretty - , stm, test-framework, test-framework-hunit, text, time - , transformers, unordered-containers, vector + , deepseq, exceptions, filepath, ghc-prim, hashable, hashtables + , HUnit, pretty, stm, test-framework, test-framework-hunit, text + , time, transformers, unordered-containers, vector }: mkDerivation { pname = "haxl"; - version = "2.1.2.0"; - sha256 = "1lwm9rs9r0qs32n3nw49j3sz41qzq2wxv0a9gpiziaw0sjlk00jy"; + version = "2.3.0.0"; + sha256 = "149k26iaas3sb9qyagzjkb0n86k34nf0r06fyvvqyap1w476fd3c"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ aeson base binary bytestring containers deepseq exceptions filepath - ghc-prim hashable pretty stm text time transformers + ghc-prim hashable hashtables pretty stm text time transformers unordered-containers vector ]; testHaskellDepends = [ aeson base binary bytestring containers deepseq filepath hashable - HUnit test-framework test-framework-hunit text time + hashtables HUnit test-framework test-framework-hunit text time unordered-containers ]; description = "A Haskell library for efficient, concurrent, and concise data access"; @@ -123241,6 +123533,8 @@ self: { ]; description = "More informative parser"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "headergen" = callPackage @@ -123856,31 +124150,6 @@ self: { }) {}; "hedis" = callPackage - ({ mkDerivation, async, base, bytestring, bytestring-lexing - , deepseq, doctest, errors, exceptions, HTTP, HUnit, mtl, network - , network-uri, resource-pool, scanner, stm, test-framework - , test-framework-hunit, text, time, tls, unordered-containers - , vector - }: - mkDerivation { - pname = "hedis"; - version = "0.12.14"; - sha256 = "14qd248ccijakksbaj72nwz8dx8qg4bifla3p0vsm6v96xb2qjbw"; - libraryHaskellDepends = [ - async base bytestring bytestring-lexing deepseq errors exceptions - HTTP mtl network network-uri resource-pool scanner stm text time - tls unordered-containers vector - ]; - testHaskellDepends = [ - async base bytestring doctest HUnit mtl stm test-framework - test-framework-hunit text time - ]; - benchmarkHaskellDepends = [ base mtl time ]; - description = "Client library for the Redis datastore: supports full command set, pipelining"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "hedis_0_12_15" = callPackage ({ mkDerivation, async, base, bytestring, bytestring-lexing , deepseq, doctest, errors, exceptions, HTTP, HUnit, mtl, network , network-uri, resource-pool, scanner, stm, test-framework @@ -123903,7 +124172,6 @@ self: { benchmarkHaskellDepends = [ base mtl time ]; description = "Client library for the Redis datastore: supports full command set, pipelining"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hedis-config" = callPackage @@ -125052,24 +125320,6 @@ self: { }) {}; "heterocephalus" = callPackage - ({ mkDerivation, base, blaze-html, blaze-markup, containers, dlist - , doctest, Glob, mtl, parsec, shakespeare, template-haskell, text - , transformers - }: - mkDerivation { - pname = "heterocephalus"; - version = "1.0.5.3"; - sha256 = "0kvrv15xm6igd6nkyfij1h982jqpbf61pzinv8jdb4fcjqwf08s7"; - libraryHaskellDepends = [ - base blaze-html blaze-markup containers dlist mtl parsec - shakespeare template-haskell text transformers - ]; - testHaskellDepends = [ base doctest Glob ]; - description = "A type-safe template engine for working with popular front end development tools"; - license = stdenv.lib.licenses.mit; - }) {}; - - "heterocephalus_1_0_5_4" = callPackage ({ mkDerivation, base, blaze-html, blaze-markup, containers, dlist , doctest, Glob, mtl, parsec, shakespeare, template-haskell, text , transformers @@ -125085,7 +125335,6 @@ self: { testHaskellDepends = [ base doctest Glob ]; description = "A type-safe template engine for working with front end development tools"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "heterogeneous-list-literals" = callPackage @@ -135372,8 +135621,8 @@ self: { }: mkDerivation { pname = "hslua-aeson"; - version = "1.0.3"; - sha256 = "0qqcf9km39bmw29d2s5zw91rxgmmm8nqfnfs5hkhmsgh5kvaal5h"; + version = "1.0.3.1"; + sha256 = "0kvsk0lfhg29dy5qlays9xbd5h9as01mcdbdx2ingx94br6d3h5r"; libraryHaskellDepends = [ aeson base hashable hslua scientific text unordered-containers vector @@ -135420,24 +135669,6 @@ self: { }) {}; "hslua-module-system" = callPackage - ({ mkDerivation, base, containers, directory, exceptions, hslua - , tasty, tasty-hunit, tasty-lua, temporary, text - }: - mkDerivation { - pname = "hslua-module-system"; - version = "0.2.2"; - sha256 = "0swl20v40kkh67vn6546a0afjcsq56x3ww854x3pwypxz1p6dyri"; - libraryHaskellDepends = [ - base containers directory exceptions hslua temporary - ]; - testHaskellDepends = [ - base hslua tasty tasty-hunit tasty-lua text - ]; - description = "Lua module wrapper around Haskell's System module"; - license = stdenv.lib.licenses.mit; - }) {}; - - "hslua-module-system_0_2_2_1" = callPackage ({ mkDerivation, base, containers, directory, exceptions, hslua , tasty, tasty-hunit, tasty-lua, temporary, text }: @@ -135453,7 +135684,6 @@ self: { ]; description = "Lua module wrapper around Haskell's System module"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hslua-module-text" = callPackage @@ -138604,6 +138834,8 @@ self: { ]; description = "Glue code for http-client and websockets"; license = stdenv.lib.licenses.cc0; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "http-common" = callPackage @@ -138725,6 +138957,8 @@ self: { ]; description = "HTTP downloader tailored for web-crawler needs"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "http-date" = callPackage @@ -140821,10 +141055,8 @@ self: { }: mkDerivation { pname = "hw-json"; - version = "1.3.2.1"; - sha256 = "11lf4nxnkk8l25a44g1pkr9j1w03l69gqjgli5yfj6k68lzml7bf"; - revision = "2"; - editedCabalFile = "0ks3aj2xdphq9sp5vsblyz13fmwl5cb402awqy3pz3d21g8fl4sn"; + version = "1.3.2.2"; + sha256 = "03h5zv94ndsz4vh0jql8rg8pl95rbf8xkyzvr3r55i3kpmb85sbg"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -145805,31 +146037,6 @@ self: { }) {}; "inline-c" = callPackage - ({ mkDerivation, ansi-wl-pprint, base, bytestring, containers - , hashable, hspec, mtl, parsec, parsers, QuickCheck, raw-strings-qq - , regex-posix, split, template-haskell, transformers - , unordered-containers, vector - }: - mkDerivation { - pname = "inline-c"; - version = "0.9.1.2"; - sha256 = "1lvsjjxnjwfnqlq4i5mz2xizpx052nq25wjgm47302akpjzpym6n"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - ansi-wl-pprint base bytestring containers hashable mtl parsec - parsers template-haskell transformers unordered-containers vector - ]; - testHaskellDepends = [ - ansi-wl-pprint base containers hashable hspec parsers QuickCheck - raw-strings-qq regex-posix split template-haskell transformers - unordered-containers vector - ]; - description = "Write Haskell source files including C code inline. No FFI required."; - license = stdenv.lib.licenses.mit; - }) {}; - - "inline-c_0_9_1_3" = callPackage ({ mkDerivation, ansi-wl-pprint, base, bytestring, containers , hashable, hspec, mtl, parsec, parsers, QuickCheck, raw-strings-qq , regex-posix, split, template-haskell, transformers @@ -145852,7 +146059,6 @@ self: { ]; description = "Write Haskell source files including C code inline. No FFI required."; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "inline-c-cpp_0_1_0_0" = callPackage @@ -146358,6 +146564,8 @@ self: { testHaskellDepends = [ base containers doctest primitive ]; description = "Advent of Code 2019 intcode interpreter"; license = stdenv.lib.licenses.isc; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "integer-gmp_1_0_3_0" = callPackage @@ -149397,6 +149605,8 @@ self: { testHaskellDepends = [ base bytestring repa tasty tasty-hunit ]; description = "J in Haskell"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "j2hs" = callPackage @@ -150326,12 +150536,16 @@ self: { }) {}; "joint" = callPackage - ({ mkDerivation, base, transformers }: + ({ mkDerivation, adjunctions, base, comonad, distributive + , transformers + }: mkDerivation { pname = "joint"; - version = "0.1.7"; - sha256 = "193ygi06hfn1smdhh7fz74lz2gffcvg66cxp6qlvi7m3rbhm1f1l"; - libraryHaskellDepends = [ base transformers ]; + version = "0.1.8"; + sha256 = "174i51nlck81h9pc9jgmd0yj3d6xpvza0i4a8y4f1fpnz1zrqxg5"; + libraryHaskellDepends = [ + adjunctions base comonad distributive transformers + ]; description = "Trying to compose non-composable"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -151660,21 +151874,25 @@ self: { }) {}; "jsonifier" = callPackage - ({ mkDerivation, aeson, base, bytestring, gauge, hedgehog - , numeric-limits, ptr-poker, rerebase, scientific, text + ({ mkDerivation, aeson, base, buffer-builder, bytestring, gauge + , hedgehog, numeric-limits, ptr-poker, rerebase, scientific, text , text-builder }: mkDerivation { pname = "jsonifier"; - version = "0.1.0.2"; - sha256 = "1vm7qp38wkv2l3wi32kv2hcbzpzk7yf9xffh09ani395dggw94hx"; + version = "0.1.0.4"; + sha256 = "1fkjib6v9kk5vbw0sh5cb0wr0m3mxf878lcbj3jc0xyalpvz07ni"; libraryHaskellDepends = [ base bytestring ptr-poker scientific text ]; testHaskellDepends = [ aeson hedgehog numeric-limits rerebase ]; - benchmarkHaskellDepends = [ aeson gauge rerebase text-builder ]; + benchmarkHaskellDepends = [ + aeson buffer-builder gauge rerebase text-builder + ]; description = "Fast and simple JSON encoding toolkit"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "jsonpath" = callPackage @@ -153225,6 +153443,18 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "keep-alive" = callPackage + ({ mkDerivation, base }: + mkDerivation { + pname = "keep-alive"; + version = "0.1.1.0"; + sha256 = "1h1x28adh7y561pmmbw064vyz9qx013spkcr8pwg9hjcnzn03yvw"; + libraryHaskellDepends = [ base ]; + testHaskellDepends = [ base ]; + description = "TCP keep alive implementation"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "keera-callbacks" = callPackage ({ mkDerivation, base, mtl }: mkDerivation { @@ -154204,6 +154434,8 @@ self: { executableHaskellDepends = [ base ]; description = "Advanced keyboard remapping utility"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "kmp-dfa" = callPackage @@ -154510,6 +154742,8 @@ self: { ]; description = "Krank checks your code source comments for important markers"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "krapsh" = callPackage @@ -156291,6 +156525,28 @@ self: { license = stdenv.lib.licenses.gpl3; }) {}; + "language-docker_9_1_2" = callPackage + ({ mkDerivation, base, bytestring, containers, data-default-class + , hspec, HUnit, megaparsec, prettyprinter, QuickCheck, split, text + , time + }: + mkDerivation { + pname = "language-docker"; + version = "9.1.2"; + sha256 = "014rb5jf650fhsmc02v4xc60w7v1261ri1w9ig6dw0xjdgxalvbs"; + libraryHaskellDepends = [ + base bytestring containers data-default-class megaparsec + prettyprinter split text time + ]; + testHaskellDepends = [ + base bytestring containers data-default-class hspec HUnit + megaparsec prettyprinter QuickCheck split text time + ]; + description = "Dockerfile parser, pretty-printer and embedded DSL"; + license = stdenv.lib.licenses.gpl3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "language-dockerfile" = callPackage ({ mkDerivation, aeson, base, bytestring, directory, filepath, free , Glob, hspec, HUnit, mtl, parsec, pretty, process, QuickCheck @@ -158976,14 +159232,15 @@ self: { }: mkDerivation { pname = "lens-filesystem"; - version = "0.0.0.0"; - sha256 = "0295n9hfdq72c1knx170ccfyi93wp09szahb2q5jym0mcryvdls8"; + version = "0.1.0.1"; + sha256 = "0rx5b49ka3281nnwvfmkdnfrv56kvfkl2h45nf54rdgxj11b7v28"; libraryHaskellDepends = [ base directory filepath lens lens-action ]; testHaskellDepends = [ base directory filepath hspec lens lens-action ]; + description = "Lens interface for your filesystem; still a bit experimental"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; broken = true; @@ -159387,6 +159644,28 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "less-arbitrary" = callPackage + ({ mkDerivation, base, containers, generic-arbitrary, hashable, mtl + , QuickCheck, quickcheck-classes, quickcheck-instances, random + , scientific, text, transformers, unordered-containers, vector + }: + mkDerivation { + pname = "less-arbitrary"; + version = "0.1.0.1"; + sha256 = "1hbiwyk49qqqdfglydywj02ycymdb486nv5cp8710gfwh75i29xw"; + libraryHaskellDepends = [ + base containers generic-arbitrary hashable mtl QuickCheck random + scientific text transformers unordered-containers vector + ]; + testHaskellDepends = [ + base containers generic-arbitrary hashable mtl QuickCheck + quickcheck-classes quickcheck-instances random scientific text + transformers unordered-containers vector + ]; + description = "Linear time testing with variant of Arbitrary class that always terminates"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "level-monad" = callPackage ({ mkDerivation, base, fmlist }: mkDerivation { @@ -160006,6 +160285,8 @@ self: { ]; description = "A Haskell implementation of JSON Web Token (JWT)"; license = stdenv.lib.licenses.mpl20; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "liblastfm" = callPackage @@ -162964,19 +163245,20 @@ self: { broken = true; }) {}; - "little-logger_0_2_0" = callPackage + "little-logger_0_3_1" = callPackage ({ mkDerivation, base, co-log, co-log-core, microlens, mtl, tasty - , tasty-hunit, text + , tasty-hunit, text, unliftio-core }: mkDerivation { pname = "little-logger"; - version = "0.2.0"; - sha256 = "0bzfd0s67g074vp274jq83fdl8z2m87qjkslkxvl29bdlrl3w17b"; + version = "0.3.1"; + sha256 = "0iqnidlv7r2kw6764aq3dlvxbmvm1c7qk8jkgbhbpm5g07k97c68"; libraryHaskellDepends = [ - base co-log co-log-core microlens mtl text + base co-log co-log-core microlens mtl text unliftio-core ]; testHaskellDepends = [ base co-log co-log-core microlens mtl tasty tasty-hunit text + unliftio-core ]; description = "Basic logging based on co-log"; license = stdenv.lib.licenses.bsd3; @@ -165161,6 +165443,8 @@ self: { ]; description = "EDSL for the Michelson Language"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "loris" = callPackage @@ -165284,8 +165568,8 @@ self: { }: mkDerivation { pname = "lp-diagrams"; - version = "2.1.2"; - sha256 = "0q0qzij6j0nv01hhrd417swyyf5vhgi2m83bmk98dvrd0309l9xl"; + version = "2.1.4"; + sha256 = "035kaj2cawpkd5xry3wkl8slzga4qxklvjw91g9lh179zzpq6skj"; libraryHaskellDepends = [ base containers gasp graphviz labeled-tree lens mtl parsek polynomials-bernstein process reflection text typography-geometry @@ -165429,6 +165713,8 @@ self: { testToolDepends = [ hspec-discover ]; description = "Haskell library for the Microsoft Language Server Protocol"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "lsp-test" = callPackage @@ -171600,8 +171886,6 @@ self: { ]; description = "A tiny JSON library with light dependency footprint"; license = stdenv.lib.licenses.gpl3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "microbase" = callPackage @@ -172697,6 +172981,44 @@ self: { license = stdenv.lib.licenses.asl20; }) {}; + "minio-hs_1_5_3" = callPackage + ({ mkDerivation, aeson, base, base64-bytestring, binary, bytestring + , case-insensitive, conduit, conduit-extra, connection, cryptonite + , cryptonite-conduit, digest, directory, exceptions, filepath + , http-client, http-client-tls, http-conduit, http-types, ini + , memory, protolude, QuickCheck, raw-strings-qq, resourcet, retry + , tasty, tasty-hunit, tasty-quickcheck, tasty-smallcheck, text + , time, transformers, unliftio, unliftio-core, unordered-containers + , xml-conduit + }: + mkDerivation { + pname = "minio-hs"; + version = "1.5.3"; + sha256 = "0nbrvkj8dn9m2i60iqk2wmf7fnj8bv4n65r4wxpimwb06yrvrfj2"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson base base64-bytestring binary bytestring case-insensitive + conduit conduit-extra connection cryptonite cryptonite-conduit + digest directory exceptions filepath http-client http-client-tls + http-conduit http-types ini memory protolude raw-strings-qq + resourcet retry text time transformers unliftio unliftio-core + unordered-containers xml-conduit + ]; + testHaskellDepends = [ + aeson base base64-bytestring binary bytestring case-insensitive + conduit conduit-extra connection cryptonite cryptonite-conduit + digest directory exceptions filepath http-client http-client-tls + http-conduit http-types ini memory protolude QuickCheck + raw-strings-qq resourcet retry tasty tasty-hunit tasty-quickcheck + tasty-smallcheck text time transformers unliftio unliftio-core + unordered-containers xml-conduit + ]; + description = "A MinIO Haskell Library for Amazon S3 compatible cloud storage"; + license = stdenv.lib.licenses.asl20; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "minions" = callPackage ({ mkDerivation, ansi-terminal, base, MissingH, process, time }: mkDerivation { @@ -173257,17 +173579,18 @@ self: { "miv" = callPackage ({ mkDerivation, aeson, async, base, concurrent-output, directory , filepath, ghc-prim, hashable, hspec, monad-parallel, process - , text, time, unix-compat, unordered-containers, xdg-basedir, yaml + , SafeSemaphore, text, time, unix-compat, unordered-containers + , xdg-basedir, yaml }: mkDerivation { pname = "miv"; - version = "0.4.2"; - sha256 = "0yhfinygsb2fnjspg87fx447kajrbldhddm24vxl41741xmwjl8a"; + version = "0.4.3"; + sha256 = "0i2ikjr36qdr2i92bapx2p4lq4jvfmzh12b2nslhqq4xnf2fs2ib"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ aeson async base concurrent-output directory filepath ghc-prim - hashable monad-parallel process text time unix-compat + hashable monad-parallel process SafeSemaphore text time unix-compat unordered-containers xdg-basedir yaml ]; testHaskellDepends = [ @@ -173593,6 +173916,8 @@ self: { ]; description = "The \"glue\" between electronic tables and GraphViz"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "mmsyn5" = callPackage @@ -176521,6 +176846,8 @@ self: { ]; description = "Developer tools for the Michelson Language"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "morley-prelude" = callPackage @@ -177936,8 +178263,8 @@ self: { }: mkDerivation { pname = "mu-avro"; - version = "0.4.0.0"; - sha256 = "08hkw54llgyc7gmr3srx0im6im3x23cc0fkgmfv541ak6sq7by3h"; + version = "0.4.0.1"; + sha256 = "1nbslmb30yys61a5sn8nv7lczcagi4jidrfyw2wfqagkgj3afsyq"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -178688,8 +179015,8 @@ self: { ({ mkDerivation, base, bytestring, parsec, stringsearch }: mkDerivation { pname = "multipart"; - version = "0.2.0"; - sha256 = "1rw668hxj04zpkfwhjqbd0ph0wy9k2khsrbsni9sxi2px49vnmym"; + version = "0.2.1"; + sha256 = "0p6n4knxpjv70nbl6cmd6x7gkdjsjqp4ya7fz00bfrqp7jvhlivn"; libraryHaskellDepends = [ base bytestring parsec stringsearch ]; description = "Parsers for the HTTP multipart format"; license = stdenv.lib.licenses.bsd3; @@ -180688,6 +181015,8 @@ self: { sha256 = "0ixpm43sgir02a9y8i7rvalxh6h7vlcwgi2hmis0lq0w8pmw5m53"; libraryHaskellDepends = [ base named servant ]; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "named-servant-client" = callPackage @@ -180703,6 +181032,8 @@ self: { ]; description = "client support for named-servant"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "named-servant-server" = callPackage @@ -180718,6 +181049,8 @@ self: { ]; description = "server support for named-servant"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "named-sop" = callPackage @@ -184138,8 +184471,8 @@ self: { }: mkDerivation { pname = "ngx-export-tools"; - version = "0.4.8.0"; - sha256 = "1jw6ny4qnckxyvszislqy079bh6vnq9q0f4wig8n1diljs057waj"; + version = "0.4.9.0"; + sha256 = "0z1b3vzq11ifx3n8pmwary138ccqsfafzpl1nf27094rvr1ijjyn"; libraryHaskellDepends = [ aeson base binary bytestring ngx-export safe template-haskell ]; @@ -184156,8 +184489,8 @@ self: { }: mkDerivation { pname = "ngx-export-tools-extra"; - version = "0.5.5.1"; - sha256 = "0x3c1r0ddbk740182gwv43s2zxr6aj9k6y4npv7vi0fwyxjcqgkj"; + version = "0.5.6.0"; + sha256 = "08a13v1fx7lad7wdibij79vdcbqn10lcb2n6lhzq70097f8a06vm"; libraryHaskellDepends = [ aeson ansi-wl-pprint array base base64 binary bytestring case-insensitive containers ede enclosed-exceptions http-client @@ -184589,8 +184922,8 @@ self: { }: mkDerivation { pname = "nix-thunk"; - version = "0.1.0.0"; - sha256 = "0jg3j78dwq31g18fkmcbn4d8vlmdb0vpnicac2kmg0dwrw64v2gb"; + version = "0.2.0.0"; + sha256 = "1bkdcq4qvgnavpkvfvy6il691wwpw6lyba0hhxzjxbm132q46v2y"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -184602,7 +184935,7 @@ self: { executableHaskellDepends = [ base cli-extras optparse-applicative text ]; - description = "Virtual vendorization with Nix"; + description = "Lightweight dependency management with Nix"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; broken = true; @@ -185613,6 +185946,8 @@ self: { ]; description = "Examine values for unexpected thunks"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "notifications-tray-icon" = callPackage @@ -185659,6 +185994,8 @@ self: { libraryToolDepends = [ c2hs ]; description = "Haskell binding to Notmuch, the mail indexer"; license = stdenv.lib.licenses.gpl3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {inherit (pkgs) notmuch; inherit (pkgs) talloc;}; "notmuch-haskell" = callPackage @@ -186459,6 +186796,8 @@ self: { testHaskellDepends = [ base doctest numhask ]; description = "See readme.md"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "numhask-hedgehog" = callPackage @@ -186539,8 +186878,8 @@ self: { }: mkDerivation { pname = "numhask-space"; - version = "0.6.0"; - sha256 = "0zm64spljv7pvl68b60y7hr46fa82i44j7yk8q6i33nhr78qv7wy"; + version = "0.6.1"; + sha256 = "0kqq2p0j7p7my33lw0alcc6il3chvsaj75cm1py0wa681jfmzxcv"; libraryHaskellDepends = [ adjunctions base containers distributive numhask semigroupoids tdigest text time @@ -188286,6 +188625,8 @@ self: { ]; description = "Open algebraic data types"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "open-adt-tutorial" = callPackage @@ -188305,6 +188646,8 @@ self: { executableHaskellDepends = [ base ]; description = "Open algebraic data type examples"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "open-browser" = callPackage @@ -189586,6 +189929,8 @@ self: { ]; description = "Compiler for OpLang, an esoteric programming language"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "opml" = callPackage @@ -190400,15 +190745,15 @@ self: { }) {}; "ordinal" = callPackage - ({ mkDerivation, base, containers, hspec, hspec-discover - , QuickCheck, regex, template-haskell, text, vector + ({ mkDerivation, base, containers, data-default, hspec + , hspec-discover, QuickCheck, regex, template-haskell, text, vector }: mkDerivation { pname = "ordinal"; - version = "0.2.0.0"; - sha256 = "01ja268zk5pwdjzl5msiycy41zkg66apchjg5g2x4642qmn0rsxd"; + version = "0.3.1.0"; + sha256 = "16y8a4xrrna6cwzy8lvvykdb9jgk5qswrwd8dn7iqgmhqck271x8"; libraryHaskellDepends = [ - base containers regex template-haskell text vector + base containers data-default regex template-haskell text vector ]; testHaskellDepends = [ base hspec QuickCheck text ]; testToolDepends = [ hspec-discover ]; @@ -190720,6 +191065,8 @@ self: { ]; description = "Multidimensional arrays inspired by APL"; license = stdenv.lib.licenses.asl20; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "os-release" = callPackage @@ -192404,8 +192751,8 @@ self: { ({ mkDerivation }: mkDerivation { pname = "pandora"; - version = "0.3.0"; - sha256 = "1k9b714rb9cgapn0vgwymrq7ma1lmq6klmlv37c6gqmb1c5k7ijh"; + version = "0.3.1"; + sha256 = "0b6xh5fzxw5v9hh1xjksh2bwzmlnv7wra5l1s9gzfwl623xgh445"; description = "A box of patterns and paradigms"; license = stdenv.lib.licenses.mit; }) {}; @@ -193917,8 +194264,8 @@ self: { ({ mkDerivation, base }: mkDerivation { pname = "parsek"; - version = "1.0.2.0"; - sha256 = "05hi14wn6pzhknahyvjkw4cg9qfy20krig2pkx00r4s095zmpqza"; + version = "1.0.4.0"; + sha256 = "090yhbbh2i5lwfwrfml0n54ziy8mz3mgmwnykr4ab06w1ylc2zh4"; libraryHaskellDepends = [ base ]; description = "Parallel Parsing Processes"; license = stdenv.lib.licenses.gpl3; @@ -194715,10 +195062,8 @@ self: { }: mkDerivation { pname = "path-io"; - version = "1.6.0"; - sha256 = "0hcdxxwkhdhm59p6x74k1fsgsrqfa100c83cslm1h9ln0anj1r3k"; - revision = "3"; - editedCabalFile = "0rd7svl3jxzqnf8l2h4f7xwlv8av67y85bwmr40954disq714l74"; + version = "1.6.1"; + sha256 = "1qbnjwx72idbqwi5gkhnphf2phdszdf6y1aqf77y17kks3992vmn"; libraryHaskellDepends = [ base containers directory dlist exceptions filepath path temporary time transformers unix-compat @@ -194731,6 +195076,27 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "path-io_1_6_2" = callPackage + ({ mkDerivation, base, containers, directory, dlist, exceptions + , filepath, hspec, path, temporary, time, transformers, unix-compat + }: + mkDerivation { + pname = "path-io"; + version = "1.6.2"; + sha256 = "11mrs0awd343far3rmcphdli65g737haxg7fwx3pl04fgdxfbpdq"; + libraryHaskellDepends = [ + base containers directory dlist exceptions filepath path temporary + time transformers unix-compat + ]; + testHaskellDepends = [ + base directory exceptions filepath hspec path transformers + unix-compat + ]; + description = "Interface to ‘directory’ package for users of ‘path’"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "path-like" = callPackage ({ mkDerivation, base, path }: mkDerivation { @@ -196311,6 +196677,8 @@ self: { ]; description = "Periodic task system haskell client"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "periodic-client-exe" = callPackage @@ -196335,6 +196703,8 @@ self: { ]; description = "Periodic task system haskell client executables"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "periodic-common" = callPackage @@ -196391,6 +196761,8 @@ self: { ]; description = "Periodic task system haskell server"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "perm" = callPackage @@ -197951,8 +198323,8 @@ self: { ({ mkDerivation, base }: mkDerivation { pname = "phonetic-languages-rhythmicity"; - version = "0.1.0.1"; - sha256 = "1qrypqbc9fhnscgxiqr79l25pgphj6wnaw8g4vqpzn3cgw9v70s4"; + version = "0.1.2.0"; + sha256 = "1ljblyk0m1fs3n2gj72w6gs62dxjk5gsn8x6p7fwlwhvaa316wm3"; libraryHaskellDepends = [ base ]; description = "Allows to estimate the rhythmicity metrices for the text (usually, the Ukrainian poetic one)"; license = stdenv.lib.licenses.mit; @@ -201772,8 +202144,8 @@ self: { }: mkDerivation { pname = "polysemy-video"; - version = "0.1.0.1"; - sha256 = "0gpq4105lw24ddp7i4hqc9dnhn9pph4s3p37idfhrmkbyf52y8k8"; + version = "0.1.1.0"; + sha256 = "1f8fzhxjg3cpqb8sdrdl8mx9dwas5l32aw98s5m2p4xv1amnjl39"; libraryHaskellDepends = [ base formatting path path-utils polysemy text turtle ]; @@ -202853,8 +203225,8 @@ self: { }: mkDerivation { pname = "postgres-websockets"; - version = "0.9.0.0"; - sha256 = "1c7has1vyp8i3my5126m8ciimcyyv4prav94wpl861gz7npdqxym"; + version = "0.10.0.0"; + sha256 = "1rhpv9dams24iy9wpj0v69blr2109xprz7yj1y0ng9cw3bnsrldm"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -207015,6 +207387,8 @@ self: { ]; description = "Profunctor-based lightweight implementation of optics"; license = stdenv.lib.licenses.mpl20; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "prolog" = callPackage @@ -207095,16 +207469,16 @@ self: { }) {}; "prolude" = callPackage - ({ mkDerivation, aeson, base, bytestring, mongoDB, safe-exceptions - , scientific, text, time, vector + ({ mkDerivation, aeson, base, bytestring, containers, mongoDB + , safe-exceptions, scientific, text, time, vector }: mkDerivation { pname = "prolude"; - version = "0.0.0.2"; - sha256 = "01md9n18kwsm2myr1wfv16z404c4d92iz4g7nhixrkl6dvgq8fyc"; + version = "0.0.0.4"; + sha256 = "147kn423jxc4rcb4vbsj7av8pxdz8lgcgblbmrvq821h26vgc1ai"; libraryHaskellDepends = [ - aeson base bytestring mongoDB safe-exceptions scientific text time - vector + aeson base bytestring containers mongoDB safe-exceptions scientific + text time vector ]; description = "ITProTV's custom prelude"; license = stdenv.lib.licenses.mit; @@ -208396,13 +208770,15 @@ self: { }: mkDerivation { pname = "ptr-poker"; - version = "0.1.1"; - sha256 = "09dklmyarwn4s3lp2l2i1641cs57r6jamqkbyn6qb91nl0f46z52"; + version = "0.1.1.2"; + sha256 = "06h267z01cvk2sck7ycbi8vssg4985nh7cxx2mw92hiqj1kqp0gp"; libraryHaskellDepends = [ base bytestring scientific text ]; testHaskellDepends = [ hedgehog numeric-limits rerebase ]; benchmarkHaskellDepends = [ gauge rerebase ]; description = "Pointer poking action construction and composition toolkit"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "pub" = callPackage @@ -209511,6 +209887,25 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "pvar_1_0_0_0" = callPackage + ({ mkDerivation, async, base, deepseq, genvalidity, hspec + , primitive, QuickCheck + }: + mkDerivation { + pname = "pvar"; + version = "1.0.0.0"; + sha256 = "0f28wb89zlddgmh0302x73lphmd6kmx1829yh6kwsz7a6asq79ln"; + revision = "1"; + editedCabalFile = "0r3r7w9x31pimrzmp5fjabgcx8caxf1g0mk9izksw2wnn1anhjix"; + libraryHaskellDepends = [ base deepseq primitive ]; + testHaskellDepends = [ + async base deepseq genvalidity hspec primitive QuickCheck + ]; + description = "Mutable variable with primitive values"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "pvd" = callPackage ({ mkDerivation, array, base, Codec-Image-DevIL, containers , haskell98, libdevil, mtl, network, stm, X11 @@ -209800,6 +210195,8 @@ self: { ]; description = "Command line tool qhs, SQL queries on CSV and TSV files"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "qhull-simple" = callPackage @@ -211046,8 +211443,8 @@ self: { }: mkDerivation { pname = "quickjs-hs"; - version = "0.1.2.2"; - sha256 = "1zis42hsvljrqli9469n9k0h44i79a9v9qcd10agq1gylkhgsmkr"; + version = "0.1.2.3"; + sha256 = "1azd2173hwij0z2qxn4k6fi7bkiyaar0q751z15byhbdzil7pf1d"; libraryHaskellDepends = [ aeson base bytestring containers exceptions inline-c mtl scientific string-conv text time transformers unliftio-core @@ -214410,6 +214807,8 @@ self: { ]; description = "Animation library based on SVGs"; license = stdenv.lib.licenses.publicDomain; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "reanimate_1_1_1_0" = callPackage @@ -214448,6 +214847,7 @@ self: { description = "Animation library based on SVGs"; license = stdenv.lib.licenses.publicDomain; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "reanimate-svg" = callPackage @@ -215303,6 +215703,8 @@ self: { ]; description = "Extra stuff for mutable references"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "ref-fd" = callPackage @@ -216644,8 +217046,8 @@ self: { }: mkDerivation { pname = "regex-pcre-builtin"; - version = "0.95.1.2.8.43"; - sha256 = "1bxn8d3g9w1a5q5vcz744yx019d2rd79i07qcjq4jqkjafni1bml"; + version = "0.95.1.3.8.43"; + sha256 = "0n1sbsjch0n5cgv2lhw2yfaxb611mckyg0jpz2kcbyj5hcrvzv3c"; libraryHaskellDepends = [ array base bytestring containers regex-base text ]; @@ -218606,7 +219008,7 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "req_3_6_0" = callPackage + "req_3_7_0" = callPackage ({ mkDerivation, aeson, authenticate-oauth, base, blaze-builder , bytestring, case-insensitive, connection, exceptions, hspec , hspec-core, hspec-discover, http-api-data, http-client @@ -218616,10 +219018,8 @@ self: { }: mkDerivation { pname = "req"; - version = "3.6.0"; - sha256 = "1ks9iqnnsa8m65ndyblyndb95fc4r4xachq1zrik04adxrdj3b50"; - revision = "1"; - editedCabalFile = "1vr4926n5ac8h4i71q0hqwgf78l7f572wal22ndys3dscvg4a7f1"; + version = "3.7.0"; + sha256 = "1ajak1845dx5vzc7mb5wyh6rilggnm0y5bh93f955zby1mr3mhi1"; enableSeparateDataOutput = true; libraryHaskellDepends = [ aeson authenticate-oauth base blaze-builder bytestring @@ -221067,6 +221467,8 @@ self: { ]; description = "Automatic session-aware servant testing"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "robot" = callPackage @@ -221205,6 +221607,8 @@ self: { ]; description = "Haskell bindings to RocksDB"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {inherit (pkgs) rocksdb;}; "rocksdb-haskell-jprupp" = callPackage @@ -225440,6 +225844,8 @@ self: { ]; description = "Html form validation using `ditto`"; license = stdenv.lib.licenses.gpl2; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "scotty-format" = callPackage @@ -226710,12 +227116,12 @@ self: { }) {}; "selections" = callPackage - ({ mkDerivation, base, bifunctors, comonad, profunctors }: + ({ mkDerivation, base }: mkDerivation { pname = "selections"; - version = "0.2.0.0"; - sha256 = "000hdwdp56pc67j1iw0mc6m74dfim67g16ib4yr7vyilq8rfccb0"; - libraryHaskellDepends = [ base bifunctors comonad profunctors ]; + version = "0.3.0.0"; + sha256 = "0vl7rqrz0p5m7iwymaw3b8l2kbaikwhmkhq82hq79581vj99fdpw"; + libraryHaskellDepends = [ base ]; description = "Combinators for operating with selections over an underlying functor"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -228159,6 +228565,8 @@ self: { testToolDepends = [ hspec-discover ]; description = "servant-docs/servant-auth compatibility"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "servant-auth-hmac" = callPackage @@ -228694,6 +229102,8 @@ self: { ]; description = "A servant client for frontend JavaScript"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "servant-client-namedargs" = callPackage @@ -229722,6 +230132,8 @@ self: { testToolDepends = [ hspec-discover ]; description = "Generate a Swagger/OpenAPI/OAS 3.0 specification for your servant API."; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "servant-options" = callPackage @@ -232175,6 +232587,8 @@ self: { ]; description = "Dependency tracking for Futhark"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "shake-google-closure-compiler" = callPackage @@ -233768,6 +234182,8 @@ self: { ]; description = "Deterministic serialisation and signatures with proto-lens support"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "signable-haskell-protoc" = callPackage @@ -233867,11 +234283,13 @@ self: { ({ mkDerivation, base, prettyprinter }: mkDerivation { pname = "silkscreen"; - version = "0.0.0.2"; - sha256 = "0839minsb7n7170xw3qh62sszggh4ap95v06s3d4l7a76s42bmic"; + version = "0.0.0.3"; + sha256 = "0gmp71cipwc0ymydckhvw9g8q3j4pm8cq2la2rbvm0rr9z7c2l40"; libraryHaskellDepends = [ base prettyprinter ]; description = "Prettyprinting transformers"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "silvi" = callPackage @@ -235849,14 +236267,14 @@ self: { license = stdenv.lib.licenses.gpl2; }) {}; - "skylighting_0_10_0_2" = callPackage + "skylighting_0_10_0_3" = callPackage ({ mkDerivation, base, binary, blaze-html, bytestring, containers , directory, filepath, pretty-show, skylighting-core, text }: mkDerivation { pname = "skylighting"; - version = "0.10.0.2"; - sha256 = "0m2z4hmv2m6h6kmvn8n3fskwyhq6pj28bjfvs61qg9pnga3xbf26"; + version = "0.10.0.3"; + sha256 = "1fzcvhkzrzf0rlic61fjbz7n9vfxjyc45kn57pw48qdl77shqhga"; configureFlags = [ "-fexecutable" ]; isLibrary = true; isExecutable = true; @@ -235904,7 +236322,7 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "skylighting-core_0_10_0_2" = callPackage + "skylighting-core_0_10_0_3" = callPackage ({ mkDerivation, aeson, ansi-terminal, attoparsec, base , base64-bytestring, binary, blaze-html, bytestring , case-insensitive, colour, containers, criterion, Diff, directory @@ -235914,8 +236332,8 @@ self: { }: mkDerivation { pname = "skylighting-core"; - version = "0.10.0.2"; - sha256 = "07gdvmz8lvqkzzgnxakx015g2ijmqd2jmni1phz6x79xf9q7s5vw"; + version = "0.10.0.3"; + sha256 = "1c2r0gsy4c5l6m3w0i3zzv1fvaaqzn2636sd0mmzd9a8ncsgyzf6"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -240819,17 +241237,17 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "splitmix_0_1_0_1" = callPackage + "splitmix_0_1_0_3" = callPackage ({ mkDerivation, async, base, base-compat, base-compat-batteries , bytestring, clock, containers, criterion, deepseq, HUnit , math-functions, process, random, test-framework - , test-framework-hunit, tf-random, time, vector + , test-framework-hunit, tf-random, vector }: mkDerivation { pname = "splitmix"; - version = "0.1.0.1"; - sha256 = "0ahr3zxx0n9pjxpldrphqx5rhanar6alq3km7qvszipa8r46jjsd"; - libraryHaskellDepends = [ base deepseq time ]; + version = "0.1.0.3"; + sha256 = "0das5n44dhlcv5i233iakx37d17kidqvhrvp6w9nd7hc015ry026"; + libraryHaskellDepends = [ base deepseq ]; testHaskellDepends = [ async base base-compat base-compat-batteries bytestring containers deepseq HUnit math-functions process random test-framework @@ -241980,6 +242398,8 @@ self: { pname = "stack"; version = "2.5.1"; sha256 = "1ffbgs5wgdcvvwbg3pkpgih5dqcbw8mpjj2p49fd8f79cfxmjq20"; + revision = "1"; + editedCabalFile = "0k5hapiyq2qv8sn2l2j5sh6w9b8493apwwsbrhpym5m1llxrv29p"; configureFlags = [ "-fdisable-git-info" "-fhide-dependency-versions" "-fsupported-build" @@ -242911,8 +243331,6 @@ self: { doHaddock = false; description = "Haskell STatic ANalyser"; license = stdenv.lib.licenses.mpl20; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "standalone-derive-topdown" = callPackage @@ -243988,6 +244406,8 @@ self: { testHaskellDepends = [ base hspec mtl stm stm-queue ]; description = "A simplistic actor model based on STM"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "stm-channelize" = callPackage @@ -244061,8 +244481,8 @@ self: { }: mkDerivation { pname = "stm-containers"; - version = "1.1.0.4"; - sha256 = "0mcn4v9gjkqp27xcwvqphiqnaj4grvxpsflhq0rwqp5ymnzlccyl"; + version = "1.2"; + sha256 = "0yhpnxj7v880fy7vgjz5idpqfg2sm4dflp13k7fs0bqqlfv9hkbc"; libraryHaskellDepends = [ base deferred-folds focus hashable list-t stm-hamt transformers ]; @@ -244072,6 +244492,8 @@ self: { ]; description = "Containers for STM"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "stm-delay" = callPackage @@ -244218,8 +244640,8 @@ self: { }: mkDerivation { pname = "stm-queue"; - version = "0.1.2.0"; - sha256 = "06l5gavmf4x6vp54p1h27nnm5nnw6f8p82v5np93b25inc67vz4h"; + version = "0.1.2.1"; + sha256 = "0by8jga1wrzzasa442fi61nl5kv88vbl2030gidmgzrzbgf0q8yc"; libraryHaskellDepends = [ base stm ]; testHaskellDepends = [ async base hspec stm ]; benchmarkHaskellDepends = [ @@ -245069,27 +245491,6 @@ self: { }) {}; "streaming-bytestring" = callPackage - ({ mkDerivation, base, bytestring, deepseq, exceptions, mmorph, mtl - , resourcet, smallcheck, streaming, tasty, tasty-smallcheck - , transformers, transformers-base - }: - mkDerivation { - pname = "streaming-bytestring"; - version = "0.1.6"; - sha256 = "1lsklavhk6wcsgjr2rcwkkv827gnd9spv4zwz5i5zf3njvy27my1"; - libraryHaskellDepends = [ - base bytestring deepseq exceptions mmorph mtl resourcet streaming - transformers transformers-base - ]; - testHaskellDepends = [ - base bytestring smallcheck streaming tasty tasty-smallcheck - transformers - ]; - description = "effectful byte steams, or: bytestring io done right"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "streaming-bytestring_0_1_7" = callPackage ({ mkDerivation, base, bytestring, deepseq, exceptions, mmorph, mtl , resourcet, smallcheck, streaming, tasty, tasty-hunit , tasty-smallcheck, transformers, transformers-base @@ -245108,7 +245509,6 @@ self: { ]; description = "Fast, effectful byte streams"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "streaming-cassava" = callPackage @@ -248471,8 +248871,8 @@ self: { }: mkDerivation { pname = "sweet-egison"; - version = "0.1.1.2"; - sha256 = "0cf4wq7lmp5y40niwvlmj5l2bvjl16vbv2dx03m86mg1n16jb30y"; + version = "0.1.1.3"; + sha256 = "0b2rvfgj7l10plgri5ia3l07ip71c9c3259k78z140i57pfjlfh7"; libraryHaskellDepends = [ backtracking base egison-pattern-src egison-pattern-src-th-mode haskell-src-exts haskell-src-meta logict template-haskell @@ -251490,23 +251890,6 @@ self: { }) {}; "tasty-ant-xml" = callPackage - ({ mkDerivation, base, containers, directory, filepath - , generic-deriving, ghc-prim, mtl, stm, tagged, tasty, transformers - , xml - }: - mkDerivation { - pname = "tasty-ant-xml"; - version = "1.1.6"; - sha256 = "13qqpl1prr9dda87dp45mqybay24n8rhxxgvpc9j34kh72g8j5qw"; - libraryHaskellDepends = [ - base containers directory filepath generic-deriving ghc-prim mtl - stm tagged tasty transformers xml - ]; - description = "Render tasty output to XML for Jenkins"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "tasty-ant-xml_1_1_7" = callPackage ({ mkDerivation, base, containers, directory, filepath , generic-deriving, ghc-prim, mtl, stm, tagged, tasty, transformers , xml @@ -251521,7 +251904,6 @@ self: { ]; description = "Render tasty output to XML for Jenkins"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "tasty-auto" = callPackage @@ -251969,24 +252351,6 @@ self: { }) {}; "tasty-lua" = callPackage - ({ mkDerivation, base, bytestring, directory, file-embed, filepath - , hslua, tasty, tasty-hunit, text - }: - mkDerivation { - pname = "tasty-lua"; - version = "0.2.3"; - sha256 = "0kpmp51wyqbjv3nsrnybpms7flsl2bznqp8gf27zv2f5kraa77vk"; - libraryHaskellDepends = [ - base bytestring file-embed hslua tasty text - ]; - testHaskellDepends = [ - base directory filepath hslua tasty tasty-hunit - ]; - description = "Write tests in Lua, integrate into tasty"; - license = stdenv.lib.licenses.mit; - }) {}; - - "tasty-lua_0_2_3_1" = callPackage ({ mkDerivation, base, bytestring, directory, file-embed, filepath , hslua, tasty, tasty-hunit, text }: @@ -252002,7 +252366,6 @@ self: { ]; description = "Write tests in Lua, integrate into tasty"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "tasty-mgolden" = callPackage @@ -263877,18 +264240,6 @@ self: { }) {}; "type-fun" = callPackage - ({ mkDerivation, base }: - mkDerivation { - pname = "type-fun"; - version = "0.1.1"; - sha256 = "18axaln9ahrn6023pk4ig79d2qimmflikf608vgka4hhi91cfpnz"; - libraryHaskellDepends = [ base ]; - testHaskellDepends = [ base ]; - description = "Collection of widely reimplemented type families"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "type-fun_0_1_2" = callPackage ({ mkDerivation, base }: mkDerivation { pname = "type-fun"; @@ -263898,7 +264249,6 @@ self: { testHaskellDepends = [ base ]; description = "Collection of widely reimplemented type families"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "type-functions" = callPackage @@ -265016,8 +265366,8 @@ self: { }: mkDerivation { pname = "tz"; - version = "0.1.3.4"; - sha256 = "11sg11alwlibnl62bd9s3gvhha8c523625cn6y4x10avv6jv320y"; + version = "0.1.3.5"; + sha256 = "1svqcpcpy5mydkmf42a78khxa053jxbvrbdh5jzprh2b7g0dpvlb"; libraryHaskellDepends = [ base binary bytestring containers data-default deepseq template-haskell time tzdata vector @@ -265055,6 +265405,28 @@ self: { license = stdenv.lib.licenses.asl20; }) {}; + "tzdata_0_2_20201021_0" = callPackage + ({ mkDerivation, base, bytestring, containers, deepseq, HUnit + , test-framework, test-framework-hunit, test-framework-th, unix + , vector + }: + mkDerivation { + pname = "tzdata"; + version = "0.2.20201021.0"; + sha256 = "0bkd7k0q8dflp21hzf71kbqyk0jq279z7sgwlq1pdzs2ggmnrwm9"; + enableSeparateDataOutput = true; + libraryHaskellDepends = [ + base bytestring containers deepseq vector + ]; + testHaskellDepends = [ + base bytestring HUnit test-framework test-framework-hunit + test-framework-th unix + ]; + description = "Time zone database (as files and as a module)"; + license = stdenv.lib.licenses.asl20; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "u2f" = callPackage ({ mkDerivation, aeson, asn1-encoding, asn1-types, base , base64-bytestring, binary, bytestring, cryptohash, cryptonite @@ -265477,6 +265849,17 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "ukrainian-phonetics-basic" = callPackage + ({ mkDerivation, base, bytestring, mmsyn2, mmsyn5, vector }: + mkDerivation { + pname = "ukrainian-phonetics-basic"; + version = "0.1.1.0"; + sha256 = "0k7lv4lzmkjyfk5r664gmdaqbj08s1kp7n4w8lw7kn7fmxvwkraf"; + libraryHaskellDepends = [ base bytestring mmsyn2 mmsyn5 vector ]; + description = "A library to work with the basic Ukrainian phonetics and syllable segmentation"; + license = stdenv.lib.licenses.mit; + }) {}; + "ulid" = callPackage ({ mkDerivation, base, binary, bytestring, crypto-api, deepseq , format-numbers, hashable, hspec, random, text, time @@ -265597,17 +265980,18 @@ self: { "unbeliever" = callPackage ({ mkDerivation, base, bytestring, core-data, core-program - , core-text, fingertree, gauge, hashable, hspec, safe-exceptions - , text, text-short + , core-text, fingertree, gauge, hashable, hspec, prettyprinter + , safe-exceptions, text, text-short, unordered-containers }: mkDerivation { pname = "unbeliever"; - version = "0.10.0.6"; - sha256 = "08rw2krphvs2z0ic19mfwlz3fcmpnbwbpvp7ks22pasi2zy45sb2"; + version = "0.10.0.7"; + sha256 = "17yjw8lgwm93hhf4rk0npj35h77jfig3ziampdmg5cjhyy2h4sd7"; libraryHaskellDepends = [ base core-data core-program core-text ]; testHaskellDepends = [ base bytestring core-data core-program core-text fingertree - hashable hspec safe-exceptions text text-short + hashable hspec prettyprinter safe-exceptions text text-short + unordered-containers ]; benchmarkHaskellDepends = [ base bytestring core-data core-program core-text gauge text @@ -266180,28 +266564,6 @@ self: { }) {}; "unicode-transforms" = callPackage - ({ mkDerivation, base, bytestring, deepseq, filepath, gauge - , getopt-generics, ghc-prim, hspec, path, path-io, QuickCheck - , split, text - }: - mkDerivation { - pname = "unicode-transforms"; - version = "0.3.7"; - sha256 = "0pgxb4znvr39n0f7y5q0bdajc4l96zsih0a43n90qjlhj9084rp8"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ base bytestring ghc-prim text ]; - testHaskellDepends = [ - base deepseq getopt-generics hspec QuickCheck split text - ]; - benchmarkHaskellDepends = [ - base deepseq filepath gauge path path-io text - ]; - description = "Unicode normalization"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "unicode-transforms_0_3_7_1" = callPackage ({ mkDerivation, base, bytestring, deepseq, filepath, gauge , getopt-generics, ghc-prim, hspec, path, path-io, QuickCheck , split, text @@ -266221,7 +266583,6 @@ self: { ]; description = "Unicode normalization"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "unicode-tricks" = callPackage @@ -266564,8 +266925,8 @@ self: { }) {}; "uniqueness-periods-vector-examples" = callPackage - ({ mkDerivation, base, lists-flines, mmsyn6ukr, parallel - , phonetic-languages-ukrainian, print-info + ({ mkDerivation, base, bytestring, lists-flines, mmsyn6ukr + , parallel, phonetic-languages-ukrainian, print-info , uniqueness-periods-vector, uniqueness-periods-vector-common , uniqueness-periods-vector-filters , uniqueness-periods-vector-general @@ -266574,8 +266935,8 @@ self: { }: mkDerivation { pname = "uniqueness-periods-vector-examples"; - version = "0.12.3.1"; - sha256 = "18k9my22zn2x6nf2adnwf340jnixzdkyyx2j24nqvcryxx9kagsi"; + version = "0.13.1.0"; + sha256 = "0z6jglwli11845x4nlk8b3wk4d6j6i1m7jr3vhgri64g34qj1767"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -266584,8 +266945,8 @@ self: { uniqueness-periods-vector-properties vector ]; executableHaskellDepends = [ - base lists-flines mmsyn6ukr parallel phonetic-languages-ukrainian - print-info uniqueness-periods-vector + base bytestring lists-flines mmsyn6ukr parallel + phonetic-languages-ukrainian print-info uniqueness-periods-vector uniqueness-periods-vector-common uniqueness-periods-vector-filters uniqueness-periods-vector-general uniqueness-periods-vector-properties @@ -267934,6 +268295,24 @@ self: { broken = true; }) {}; + "urbit-airlock" = callPackage + ({ mkDerivation, aeson, base, bytestring, conduit, conduit-extra + , http-client, modern-uri, req, req-conduit, text, uuid + }: + mkDerivation { + pname = "urbit-airlock"; + version = "0.1.0.0"; + sha256 = "1w6mkdx999jxr2c9004cp1n550wjnhj9gvi76nhq5bcibnl62jqw"; + libraryHaskellDepends = [ + aeson base bytestring conduit conduit-extra http-client modern-uri + req req-conduit text uuid + ]; + description = "Talk to Urbit from Haskell"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; + }) {}; + "urbit-hob" = callPackage ({ mkDerivation, base, bytestring, criterion, deepseq, hspec , hspec-core, murmur3, QuickCheck, text, vector @@ -268074,8 +268453,8 @@ self: { }: mkDerivation { pname = "uri-encode"; - version = "1.5.0.6"; - sha256 = "1w74dqvcl0s26p1s7rszmfj3zphv4bcflpp54iq1kxsrqpd1bbv8"; + version = "1.5.0.7"; + sha256 = "0lj2h701af12539p957rw24bxr07mfqd5r4h52i42f43ax165767"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -269266,6 +269645,8 @@ self: { ]; description = "A program removing all version constraints of dependencies in .cabal file"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "uvector" = callPackage @@ -271190,6 +271571,27 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "versions_4_0_1" = callPackage + ({ mkDerivation, base, deepseq, hashable, megaparsec, microlens + , parser-combinators, QuickCheck, tasty, tasty-hunit + , tasty-quickcheck, text + }: + mkDerivation { + pname = "versions"; + version = "4.0.1"; + sha256 = "1s8bnxq3asq4wwgbsfvhkl6yih1sic9v8ylimcxwnvmdlh5ks58a"; + libraryHaskellDepends = [ + base deepseq hashable megaparsec parser-combinators text + ]; + testHaskellDepends = [ + base megaparsec microlens QuickCheck tasty tasty-hunit + tasty-quickcheck text + ]; + description = "Types and parsers for software version numbers"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "vflow-types" = callPackage ({ mkDerivation, aeson, base, bytestring, ip, json-alt , json-autotype, neat-interpolation, QuickCheck, quickcheck-classes @@ -272296,6 +272698,8 @@ self: { ]; description = "Utils for the vulkan package"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "waargonaut" = callPackage @@ -275335,6 +275739,8 @@ self: { ]; description = "Web Authentication API"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "webby" = callPackage @@ -275345,8 +275751,8 @@ self: { }: mkDerivation { pname = "webby"; - version = "1.0.0"; - sha256 = "0pz80i94cqk2w07135mw7lmh7yvc3vn8pikav5l8pvq3hcfmhk0g"; + version = "1.0.1"; + sha256 = "00sdw1ly5848f4yq64j4an8w1c83gwry6n8bp7z7csh1y0lz4mm3"; libraryHaskellDepends = [ aeson base binary bytestring formatting http-api-data http-types relude resourcet text unliftio unliftio-core unordered-containers @@ -275359,6 +275765,8 @@ self: { ]; description = "A super-simple web server framework"; license = stdenv.lib.licenses.asl20; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "webcloud" = callPackage @@ -277558,6 +277966,8 @@ self: { doHaddock = false; description = "arbitrary bit size Words"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "wordpass" = callPackage @@ -280586,6 +280996,8 @@ self: { executableHaskellDepends = [ base dbus utf8-string ]; testHaskellDepends = [ base dbus utf8-string ]; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "xmonad-entryhelper" = callPackage @@ -281827,33 +282239,6 @@ self: { }) {}; "yamlparse-applicative" = callPackage - ({ mkDerivation, aeson, base, bytestring, containers - , genvalidity-aeson, genvalidity-containers, genvalidity-hspec - , genvalidity-scientific, genvalidity-text - , genvalidity-unordered-containers, hspec, optparse-applicative - , path, path-io, prettyprinter, QuickCheck, scientific, text - , unordered-containers, validity, validity-text, vector, yaml - }: - mkDerivation { - pname = "yamlparse-applicative"; - version = "0.1.0.1"; - sha256 = "089s5f3i3yz833g7q2rd55v9hn93cdzprhniymw37qdmhv5jw960"; - libraryHaskellDepends = [ - aeson base bytestring containers optparse-applicative path path-io - prettyprinter scientific text unordered-containers validity - validity-text vector yaml - ]; - testHaskellDepends = [ - aeson base containers genvalidity-aeson genvalidity-containers - genvalidity-hspec genvalidity-scientific genvalidity-text - genvalidity-unordered-containers hspec QuickCheck scientific text - unordered-containers - ]; - description = "Declaritive configuration parsing with free docs"; - license = stdenv.lib.licenses.mit; - }) {}; - - "yamlparse-applicative_0_1_0_2" = callPackage ({ mkDerivation, aeson, base, bytestring, containers , genvalidity-aeson, genvalidity-containers, genvalidity-hspec , genvalidity-scientific, genvalidity-text @@ -281878,7 +282263,6 @@ self: { ]; description = "Declaritive configuration parsing with free docs"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "yampa-canvas" = callPackage @@ -282313,6 +282697,8 @@ self: { pname = "yeamer"; version = "0.1.0.5"; sha256 = "0c8yrh43h9qhhdiz0dnrh00frfz0cymzzz9k723jnp03b8994srq"; + revision = "1"; + editedCabalFile = "0ivw54131s99kblah7n0flccb9h6qfiz55ifs2cwjwxxmrs9xi1n"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -283244,6 +283630,44 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "yesod-core_1_6_18_5" = callPackage + ({ mkDerivation, aeson, async, auto-update, base, blaze-html + , blaze-markup, bytestring, case-insensitive, cereal, clientsession + , conduit, conduit-extra, containers, cookie, deepseq, fast-logger + , gauge, hspec, hspec-expectations, http-types, HUnit, memory + , monad-logger, mtl, network, parsec, path-pieces, primitive + , random, resourcet, shakespeare, streaming-commons + , template-haskell, text, time, transformers, unix-compat, unliftio + , unordered-containers, vector, wai, wai-extra, wai-logger, warp + , word8 + }: + mkDerivation { + pname = "yesod-core"; + version = "1.6.18.5"; + sha256 = "11f51x3slqnan07fp2bxswd3y994wccqg48gakdk272i2bcg2vfq"; + libraryHaskellDepends = [ + aeson auto-update base blaze-html blaze-markup bytestring + case-insensitive cereal clientsession conduit conduit-extra + containers cookie deepseq fast-logger http-types memory + monad-logger mtl parsec path-pieces primitive random resourcet + shakespeare template-haskell text time transformers unix-compat + unliftio unordered-containers vector wai wai-extra wai-logger warp + word8 + ]; + testHaskellDepends = [ + async base bytestring clientsession conduit conduit-extra + containers cookie hspec hspec-expectations http-types HUnit network + path-pieces random resourcet shakespeare streaming-commons + template-haskell text transformers unliftio wai wai-extra warp + ]; + benchmarkHaskellDepends = [ + base blaze-html bytestring gauge shakespeare text + ]; + description = "Creation of type-safe, RESTful web applications"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "yesod-crud" = callPackage ({ mkDerivation, base, classy-prelude, containers, MissingH , monad-control, persistent, random, safe, stm, uuid, yesod-core diff --git a/third_party/nixpkgs/pkgs/development/interpreters/duktape/default.nix b/third_party/nixpkgs/pkgs/development/interpreters/duktape/default.nix index 53cbbad8e5..8dbfee2064 100644 --- a/third_party/nixpkgs/pkgs/development/interpreters/duktape/default.nix +++ b/third_party/nixpkgs/pkgs/development/interpreters/duktape/default.nix @@ -2,10 +2,10 @@ stdenv.mkDerivation rec { pname = "duktape"; - version = "2.5.0"; + version = "2.6.0"; src = fetchurl { url = "http://duktape.org/duktape-${version}.tar.xz"; - sha256 = "05ln6b2a0s8ynz28armwqs2r5zjyi3cxi0dx6ahnxlqw19b13m43"; + sha256 = "19szwxzvl2g65fw95ggvb8h0ma5bd9vvnnccn59hwnc4dida1x4n"; }; buildPhase = '' diff --git a/third_party/nixpkgs/pkgs/development/interpreters/guile/default.nix b/third_party/nixpkgs/pkgs/development/interpreters/guile/default.nix index 68df200835..52a3488d05 100644 --- a/third_party/nixpkgs/pkgs/development/interpreters/guile/default.nix +++ b/third_party/nixpkgs/pkgs/development/interpreters/guile/default.nix @@ -38,7 +38,13 @@ libtool libunistring ]; - enableParallelBuilding = true; + # According to Bernhard M. Wiedemann on + # #reproducible-builds on irc.oftc.net, (2020-01-29): they had to + # build Guile without parallel builds to make it reproducible. + # + # re: https://issues.guix.gnu.org/issue/20272 + # re: https://build.opensuse.org/request/show/732638 + enableParallelBuilding = false; patches = [ ./eai_system.patch @@ -109,4 +115,3 @@ ''; }; }) - diff --git a/third_party/nixpkgs/pkgs/development/interpreters/perl/default.nix b/third_party/nixpkgs/pkgs/development/interpreters/perl/default.nix index 576d72f9d1..77dc53cf8b 100644 --- a/third_party/nixpkgs/pkgs/development/interpreters/perl/default.nix +++ b/third_party/nixpkgs/pkgs/development/interpreters/perl/default.nix @@ -174,11 +174,11 @@ let priority = 6; # in `buildEnv' (including the one inside `perl.withPackages') the library files will have priority over files in `perl` }; } // optionalAttrs (stdenv.buildPlatform != stdenv.hostPlatform) rec { - crossVersion = "f59d2b6a179760230d925550db78b93c410433e4"; # Sept 22, 2020 + crossVersion = "65e06e238ccb949e8399bdebc6d7fd798c34127b"; # Oct 21, 2020 perl-cross-src = fetchurl { url = "https://github.com/arsv/perl-cross/archive/${crossVersion}.tar.gz"; - sha256 = "1r07waq4ik4gf32c046f27pglwcy5rv9b6whj6497xbxfmaa5562"; + sha256 = "1rk9kbvkj7cl3bvv6cph20f0hcb6y9ijgcd4rxj7aq98fxzvyhxx"; }; depsBuildBuild = [ buildPackages.stdenv.cc makeWrapper ]; @@ -214,7 +214,7 @@ in { perldevel = common { perl = pkgs.perldevel; buildPerl = buildPackages.perldevel; - version = "5.33.2"; - sha256 = "0zrb3d744argzy5idmafk92iprq9qbhzqbg4xj5w2i80sgg41212"; + version = "5.33.3"; + sha256 = "1k9pyy8d3wx8cpp5ss7hjwf9sxgga5gd0x2nq3vnqblkxfna0jsg"; }; } diff --git a/third_party/nixpkgs/pkgs/development/interpreters/ruby/default.nix b/third_party/nixpkgs/pkgs/development/interpreters/ruby/default.nix index 02d0f02c34..7b36b04d11 100644 --- a/third_party/nixpkgs/pkgs/development/interpreters/ruby/default.nix +++ b/third_party/nixpkgs/pkgs/development/interpreters/ruby/default.nix @@ -125,6 +125,10 @@ let "--with-out-ext=tk" # on yosemite, "generating encdb.h" will hang for a very long time without this flag "--with-setjmp-type=setjmp" + # silence linker warnings after upgrading darwin.cctools to 949.0.1, + # which ruby treats as problem with LDFLAGS + # https://github.com/NixOS/nixpkgs/issues/101330 + "LDFLAGS=-Wl,-w" ] ++ op (stdenv.hostPlatform != stdenv.buildPlatform) "--with-baseruby=${buildRuby}"; diff --git a/third_party/nixpkgs/pkgs/development/libraries/CGAL/default.nix b/third_party/nixpkgs/pkgs/development/libraries/CGAL/default.nix index 97ddab1a32..6824cb7f18 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/CGAL/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/CGAL/default.nix @@ -8,13 +8,13 @@ stdenv.mkDerivation rec { pname = "cgal"; - version = "5.0.3"; + version = "5.1"; src = fetchFromGitHub { owner = "CGAL"; repo = "releases"; rev = "CGAL-${version}"; - sha256 = "1p22dwrzzvbmrfjr6m3dac55nq8pp0b9afp3vz6239yp3gf2fcws"; + sha256 = "0rcv86hn5aqna7vr9nfk4np778qjr7l3742v58w6qw0z4y6l1km0"; }; # note: optional component libCGAL_ImageIO would need zlib and opengl; diff --git a/third_party/nixpkgs/pkgs/development/libraries/agda/agda-categories/default.nix b/third_party/nixpkgs/pkgs/development/libraries/agda/agda-categories/default.nix index 13ca6c52d7..f2215b9b98 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/agda/agda-categories/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/agda/agda-categories/default.nix @@ -1,14 +1,14 @@ { lib, mkDerivation, fetchFromGitHub, standard-library }: mkDerivation rec { - version = "0.1.3.1"; + version = "0.1.4"; pname = "agda-categories"; src = fetchFromGitHub { owner = "agda"; repo = "agda-categories"; rev = "v${version}"; - sha256 = "08mc20qaz9vp5rhi60rh8wvjkg5aby3bgwwdhfnxha1663qf1q24"; + sha256 = "0n6y9xarqhj95i4h56klx10gy0fyckxbfwgiissfknpfq6l0m7r6"; }; buildInputs = [ standard-library ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/agda/generic/default.nix b/third_party/nixpkgs/pkgs/development/libraries/agda/generic/default.nix index 1287e08bda..08a1d8e12e 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/agda/generic/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/agda/generic/default.nix @@ -2,13 +2,13 @@ mkDerivation rec { pname = "generic"; - version = "0.1"; + version = "0.1.0.1"; src = fetchFromGitHub { repo = "Generic"; owner = "effectfully"; rev = "v${version}"; - sha256 = "121121rg3daaqp91845fbyws6g28hyj1ywmh12n54r3nicb35g5q"; + sha256 = "07l44yzx1jly20kmkmkjk8q493bn6x7i3xxpz6mhadkqlxyhmc8s"; }; buildInputs = [ @@ -17,7 +17,7 @@ mkDerivation rec { preBuild = '' echo "module Everything where" > Everything.agda - find src -name '*.agda' | sed -e 's/src\///;s/\//./g;s/\.agda$//;s/^/import /' >> Everything.agda + find src -name '*.agda' | sed -e 's/src\///;s/\//./g;s/\.agda$//;s/^/import /' >> Everything.agda ''; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/development/libraries/agda/standard-library/default.nix b/third_party/nixpkgs/pkgs/development/libraries/agda/standard-library/default.nix index 4bff585ac3..e43e1bad3b 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/agda/standard-library/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/agda/standard-library/default.nix @@ -2,13 +2,13 @@ mkDerivation rec { pname = "standard-library"; - version = "1.3"; + version = "1.4"; src = fetchFromGitHub { repo = "agda-stdlib"; owner = "agda"; rev = "v${version}"; - sha256 = "18kl20z3bjfgx5m3nvrdj5776qmpi7jl2p12pqybsls2lf86m0d5"; + sha256 = "1asjbisb7pfkgzqy7gf9b23z63bba8l8p1wqfd6ff5ddgqwj3dhp"; }; nativeBuildInputs = [ (ghcWithPackages (self : [ self.filemanip ])) ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/amdvlk/default.nix b/third_party/nixpkgs/pkgs/development/libraries/amdvlk/default.nix index c4a0a460f8..3e8c9a24a6 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/amdvlk/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/amdvlk/default.nix @@ -21,13 +21,13 @@ let in stdenv.mkDerivation rec { pname = "amdvlk"; - version = "2020.Q3.6"; + version = "2020.Q4.1"; src = fetchRepoProject { name = "${pname}-src"; manifest = "https://github.com/GPUOpen-Drivers/AMDVLK.git"; rev = "refs/tags/v-${version}"; - sha256 = "05bvxxgaz94y85g1sq0jzjxd4j8vgdfan04q2fzmfcw3h6p7syjy"; + sha256 = "UxUsXngsMbLNSmg0a7gqCqw30ckZ8IlDrSZMMnKHlh4="; }; buildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/libraries/armadillo/default.nix b/third_party/nixpkgs/pkgs/development/libraries/armadillo/default.nix index a4d359b985..169777f2b4 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/armadillo/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/armadillo/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "armadillo"; - version = "9.900.3"; + version = "10.1.0"; src = fetchurl { url = "mirror://sourceforge/arma/armadillo-${version}.tar.xz"; - sha256 = "02pwhf3y2qq50dswjvfcijaw938d1zi1hxr17msv2x1ahlvff5fn"; + sha256 = "15c3amyrk496v0s6r2pn8dw4v82f4ld347nbv5qdzd6injsg3qvj"; }; nativeBuildInputs = [ cmake ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/arrow-cpp/default.nix b/third_party/nixpkgs/pkgs/development/libraries/arrow-cpp/default.nix index 695cd13685..1d9a528b4c 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/arrow-cpp/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/arrow-cpp/default.nix @@ -7,25 +7,25 @@ let arrow-testing = fetchFromGitHub { owner = "apache"; repo = "arrow-testing"; - rev = "f552c4dcd2ae3d14048abd20919748cce5276ade"; - sha256 = "1smaidk5k2q6xdav7qp74ak34vvwv5qyfqw0szi573awsrsrahr8"; + rev = "860376d4e586a3ac34ec93089889da624ead6c2a"; + sha256 = "16k3lz4ji4y3qcjhr765q14jwwlac8iqscwndwd8ll3zr0vy69b0"; }; parquet-testing = fetchFromGitHub { owner = "apache"; repo = "parquet-testing"; - rev = "bcd9ebcf9204a346df47204fe21b85c8d0498816"; - sha256 = "0m16pqzbvxiaradq088q5ai6fwnz9srbap996397znwppvva479b"; + rev = "d914f9d289488c7db1759d7a88a4a1b8f062c7dd"; + sha256 = "0xj3ynck2wv6l70xnmvs13bz1jycqjrl5k4lwhhwgag338048als"; }; in stdenv.mkDerivation rec { pname = "arrow-cpp"; - version = "1.0.1"; + version = "2.0.0"; src = fetchurl { url = "mirror://apache/arrow/arrow-${version}/apache-arrow-${version}.tar.gz"; - sha256 = "0p67dni8dwqbwq96gfdq3pyk799id6dgdl9h7cpp9icsjsmad70l"; + sha256 = "1ghzqw0rx4rxa2d7i76y3szisv0bd9cl7vzadbc41cvvhk6440xy"; }; sourceRoot = "apache-arrow-${version}/cpp"; @@ -43,26 +43,13 @@ in stdenv.mkDerivation rec { # ./cpp/cmake_modules/ThirdpartyToolchain.cmake # ./cpp/thirdparty/versions.txt url = - "https://github.com/microsoft/mimalloc/archive/v1.6.3.tar.gz"; - sha256 = "0pia8b4acv1w8qzcpc9i1a2fasnn3rmp996k0l87p2di0lbls0w5"; + "https://github.com/microsoft/mimalloc/archive/v1.6.4.tar.gz"; + sha256 = "1b8av0974q70alcmaw5cwzbn6n9blnpmj721ik1qwmbbwwd6nqgs"; }; patches = [ # patch to fix python-test ./darwin.patch - # Properly exported static targets. Remove at the next version bump. - (fetchpatch { - url = "https://github.com/apache/arrow/commit/b040600b39a4f803b704934252665f9440dd1276.patch"; - sha256 = "1mvw29ybcsz77zprmsk41blxmrj8ywayg7ghf6xkkf98907ws8m8"; - includes = [ "*.cmake" ]; - stripLen = 1; - }) - (fetchpatch { - url = "https://github.com/apache/arrow/commit/81d3f2657b17436d6d5a6af9aaf6f36c3f5e4ac9.patch"; - sha256 = "18fmzr5f79hvx2qpyfgvvl98p4zgzfxrmrd1d2basp0w0da1ciqs"; - includes = [ "*CMakeLists.txt" "*.cmake" "*.cmake.in" ]; - stripLen = 1; - }) ]; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/libraries/aspell/dictionaries.nix b/third_party/nixpkgs/pkgs/development/libraries/aspell/dictionaries.nix index 32405d6a52..bc2a189a88 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/aspell/dictionaries.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/aspell/dictionaries.nix @@ -132,15 +132,15 @@ let # drop comments aspell-affix() { words-only \ - | grep -v '#' \ + | grep -a -v '#' \ | aspell-create "$@" } # Hack: drop comments and words with affixes aspell-plain() { words-only \ - | grep -v '#' \ - | grep -v '/' \ + | grep -a -v '#' \ + | grep -a -v '/' \ | aspell-create "$@" } diff --git a/third_party/nixpkgs/pkgs/development/libraries/belcard/default.nix b/third_party/nixpkgs/pkgs/development/libraries/belcard/default.nix index 11de048891..34b0560f3f 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/belcard/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/belcard/default.nix @@ -7,7 +7,7 @@ stdenv.mkDerivation rec { pname = "belcard"; - version = "4.3.1"; + version = "4.4.0"; src = fetchFromGitLab { domain = "gitlab.linphone.org"; @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { group = "BC"; repo = pname; rev = version; - sha256 = "1w6rbp53cwxr00clp957458x27cgc2y9ylwa5mp812qva7zadmfw"; + sha256 = "16x2xp8d0a115132zhy1kpxkyj86ia7vrsnpjdg78fnbvmvysc8m"; }; buildInputs = [ bctoolbox belr ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/boxfort/default.nix b/third_party/nixpkgs/pkgs/development/libraries/boxfort/default.nix index fb6e735c46..9a4e2c2335 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/boxfort/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/boxfort/default.nix @@ -1,36 +1,25 @@ -{ stdenv, fetchFromGitHub, cmake, pkg-config, gettext, libcsptr, dyncall -, nanomsg, python37Packages }: +{ stdenv, fetchFromGitHub, meson, ninja, python37Packages }: stdenv.mkDerivation rec { - version = "unstable-2019-09-19"; + version = "unstable-2019-10-09"; pname = "boxfort"; src = fetchFromGitHub { owner = "Snaipe"; repo = "BoxFort"; - rev = "926bd4ce968592dbbba97ec1bb9aeca3edf29b0d"; - sha256 = "0mzy4f8qij6ckn5578y3l4rni2470pdkjy5xww7ak99l1kh3p3v6"; + rev = "356f047db08b7344ea7980576b705e65b9fc8772"; + sha256 = "1p0llz7n0p5gzpvqszmra9p88vnr0j88sp5ixhgbfz89bswg62ss"; }; - enableParallelBuilding = true; + nativeBuildInputs = [ meson ninja ]; - nativeBuildInputs = [ cmake pkg-config ]; - - buildInputs = [ - dyncall - gettext - libcsptr - nanomsg - ]; + preConfigure = '' + patchShebangs ci/isdir.py + ''; checkInputs = with python37Packages; [ cram ]; - cmakeFlags = [ "-DBXF_FORK_RESILIENCE=OFF" ]; - doCheck = true; - preCheck = '' - export LD_LIBRARY_PATH=`pwd`''${LD_LIBRARY_PATH:+:}$LD_LIBRARY_PATH - ''; outputs = [ "dev" "out" ]; @@ -38,10 +27,7 @@ stdenv.mkDerivation rec { description = "Convenient & cross-platform sandboxing C library"; homepage = "https://github.com/Snaipe/BoxFort"; license = licenses.mit; - maintainers = with maintainers; [ - thesola10 - Yumasi - ]; + maintainers = with maintainers; [ thesola10 Yumasi ]; platforms = platforms.unix; }; } diff --git a/third_party/nixpkgs/pkgs/development/libraries/ctypes_sh/default.nix b/third_party/nixpkgs/pkgs/development/libraries/ctypes_sh/default.nix index 1e12afd95c..d82296c3e6 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/ctypes_sh/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/ctypes_sh/default.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { pname = "ctypes.sh"; - version = "1.1"; + version = "1.2"; src = fetchFromGitHub { owner = "taviso"; repo = pname; rev = "v${version}"; - sha256 = "07rqbdxw33h92mllh0srymjjx52mddafs3jyzqpsflq3v0l0dk37"; + sha256 = "1wafyfhwd7nf7xdici0djpwgykizaz7jlarn0r1b4spnpjx1zbx4"; }; nativeBuildInputs = [ autoreconfHook pkgconfig ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/gdk-pixbuf/default.nix b/third_party/nixpkgs/pkgs/development/libraries/gdk-pixbuf/default.nix index 08b8f70b2d..1f4bc5c12a 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/gdk-pixbuf/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/gdk-pixbuf/default.nix @@ -21,6 +21,7 @@ , doCheck ? false , makeWrapper , fetchpatch +, lib }: stdenv.mkDerivation rec { @@ -74,7 +75,7 @@ stdenv.mkDerivation rec { mesonFlags = [ "-Ddocs=true" "-Dx11=false" # use gdk-pixbuf-xlib - "-Dgir=${if gobject-introspection != null then "true" else "false"}" + "-Dgir=${lib.boolToString (gobject-introspection != null)}" "-Dgio_sniffing=false" ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/geoclue/default.nix b/third_party/nixpkgs/pkgs/development/libraries/geoclue/default.nix index da76c6dfed..74d778c5c5 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/geoclue/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/geoclue/default.nix @@ -39,7 +39,7 @@ stdenv.mkDerivation rec { mesonFlags = [ "-Dsystemd-system-unit-dir=${placeholder "out"}/etc/systemd/system" - "-Ddemo-agent=${if withDemoAgent then "true" else "false"}" + "-Ddemo-agent=${boolToString withDemoAgent}" "--sysconfdir=/etc" "-Dsysconfdir_install=${placeholder "out"}/etc" "-Ddbus-srv-user=geoclue" diff --git a/third_party/nixpkgs/pkgs/development/libraries/glib/default.nix b/third_party/nixpkgs/pkgs/development/libraries/glib/default.nix index 88848deec4..df19b9fc88 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/glib/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/glib/default.nix @@ -108,7 +108,7 @@ stdenv.mkDerivation rec { mesonFlags = [ # Avoid the need for gobject introspection binaries in PATH in cross-compiling case. # Instead we just copy them over from the native output. - "-Dgtk_doc=${if stdenv.hostPlatform == stdenv.buildPlatform then "true" else "false"}" + "-Dgtk_doc=${boolToString (stdenv.hostPlatform == stdenv.buildPlatform)}" "-Dnls=enabled" "-Ddevbindir=${placeholder ''dev''}/bin" ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/igraph/default.nix b/third_party/nixpkgs/pkgs/development/libraries/igraph/default.nix index 6a55359e16..70b3d7e767 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/igraph/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/igraph/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { pname = "igraph"; - version = "0.8.2"; + version = "0.8.3"; src = fetchFromGitHub { owner = "igraph"; repo = pname; rev = version; - sha256 = "015yh9s19lmxm7l1ld8adlsqh1lrmzicl801saixdwl9w05hfva4"; + sha256 = "05k5ws1qgbfkxf6y923r61m42gy45l9awqqbfjqgrb3ricfr4wha"; }; nativeBuildInputs = [ pkgconfig autoreconfHook ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/intel-media-driver/default.nix b/third_party/nixpkgs/pkgs/development/libraries/intel-media-driver/default.nix index c43787c29d..cb8c0a1cb1 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/intel-media-driver/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/intel-media-driver/default.nix @@ -5,13 +5,13 @@ stdenv.mkDerivation rec { pname = "intel-media-driver"; - version = "20.2.0"; + version = "20.3.0"; src = fetchFromGitHub { owner = "intel"; repo = "media-driver"; rev = "intel-media-${version}"; - sha256 = "02a9wm7cz0nkpyfwic4a0dfm9bx1d2sybgh5rv0c618pl41mla33"; + sha256 = "0dy30g32iqyygap3cm1idbhwnm1p3qvf2j2nzcr9n5im287h5gcr"; }; cmakeFlags = [ diff --git a/third_party/nixpkgs/pkgs/development/libraries/libcec/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libcec/default.nix index a1c2967dde..792d899333 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libcec/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libcec/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, cmake, pkgconfig, udev, libcec_platform, libraspberrypi ? null }: -let version = "4.0.5"; in +let version = "4.0.7"; in stdenv.mkDerivation { pname = "libcec"; @@ -8,7 +8,7 @@ stdenv.mkDerivation { src = fetchurl { url = "https://github.com/Pulse-Eight/libcec/archive/libcec-${version}.tar.gz"; - sha256 = "0hvp33mq0kg544hw20aq3vy5lxf5zid6gxm3qdga7wxw1r1lkmz4"; + sha256 = "0nii8qh3qrn92g8x3canj4glb2bjn6gc1p3f6hfp59ckd4vjrndw"; }; nativeBuildInputs = [ pkgconfig cmake ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/liberfa/default.nix b/third_party/nixpkgs/pkgs/development/libraries/liberfa/default.nix index 097b0b85e3..a1ca15536d 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/liberfa/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/liberfa/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { pname = "erfa"; - version = "1.7.0"; + version = "1.7.1"; buildInputs = [ autoreconfHook ]; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { owner = "liberfa"; repo = "erfa"; rev = "v${version}"; - sha256 = "1z4k2phrw6wwi0kax6ac80jk9c036gi7pmhmg6gaf3lk81k6xz2r"; + sha256 = "0j7v9y7jsw9vjmhdpksq44ah2af10b9gl1vfm8riw178lvf246wg"; }; configureFlags = [ "--enable-shared" ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/libfishsound/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libfishsound/default.nix index 3843f4a97c..23d828033e 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libfishsound/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libfishsound/default.nix @@ -14,7 +14,8 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { homepage = "https://xiph.org/fishsound/"; - description = ''libfishsound by itself is designed to handle raw codec streams from a lower level layer such as UDP datagrams. When these codecs are used in files, they are commonly encapsulated in Ogg to produce Ogg FLAC, Speex and Ogg Vorbis files. + description = "A simple programming interface for decoding and encoding audio data using Xiph.org codecs (FLAC, Speex and Vorbis)"; + longDescription = ''libfishsound by itself is designed to handle raw codec streams from a lower level layer such as UDP datagrams. When these codecs are used in files, they are commonly encapsulated in Ogg to produce Ogg FLAC, Speex and Ogg Vorbis files. libfishsound is a wrapper around the existing codec libraries and provides a consistent, higher-level programming interface. It has been designed for use in a wide variety of applications; it has no direct dependencies on Ogg encapsulation, though it is most commonly used in conjunction with liboggz to decode or encode FLAC, Speex or Vorbis audio tracks in Ogg files, including Ogg Theora and Annodex. diff --git a/third_party/nixpkgs/pkgs/development/libraries/libmediainfo/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libmediainfo/default.nix index e6650db85c..31d64101e6 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libmediainfo/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libmediainfo/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, autoreconfHook, pkgconfig, libzen, zlib }: stdenv.mkDerivation rec { - version = "20.08"; + version = "20.09"; pname = "libmediainfo"; src = fetchurl { url = "https://mediaarea.net/download/source/libmediainfo/${version}/libmediainfo_${version}.tar.xz"; - sha256 = "19n8h9jq42b6r3dbag77fzwfksfywszmzpi636w87fvc1nqldlqj"; + sha256 = "15ni9pnch6688m72swwax109a7mg4a08yx75qknrx7qa6dbyhz6h"; }; nativeBuildInputs = [ autoreconfHook pkgconfig ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/libnetfilter_queue/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libnetfilter_queue/default.nix index 55e07c03b2..7a07961662 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libnetfilter_queue/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libnetfilter_queue/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, pkgconfig, libmnl, libnfnetlink }: stdenv.mkDerivation rec { - version = "1.0.4"; + version = "1.0.5"; pname = "libnetfilter_queue"; src = fetchurl { url = "https://www.netfilter.org/projects/libnetfilter_queue/files/${pname}-${version}.tar.bz2"; - sha256 = "0w7s6g8bikch1m4hnxdakpkwgrkw64ikb6wb4v4zvgyiywrk5yai"; + sha256 = "1xdra6i4p8jkv943ygjw646qx8df27f7p5852kc06vjx608krzzr"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/libpsl/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libpsl/default.nix index fdc352869f..fb9e5b12bc 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libpsl/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libpsl/default.nix @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { lzip pkgconfig python3 - valgrind + (stdenv.lib.optionalString (!stdenv.isDarwin) valgrind) libxslt ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/libquotient/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libquotient/default.nix index 9ece2c13bd..c1cd3ca8d5 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libquotient/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libquotient/default.nix @@ -2,13 +2,13 @@ mkDerivation rec { pname = "libquotient"; - version = "0.5.3.2"; + version = "0.6.0"; src = fetchFromGitHub { owner = "quotient-im"; repo = "libQuotient"; rev = version; - sha256 = "0gkwr3yw6k2m0j8cc085b5p2q788rf5nhp1p5hc5d55pc7mci2qs"; + sha256 = "1wpjrihi2gci3kwq9b3i3avd6bk3x7g22r0n6hvlphapkaf1ig6y"; }; buildInputs = [ qtbase qtmultimedia ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/libraw/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libraw/default.nix index b190d36acb..f59f63c38a 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libraw/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libraw/default.nix @@ -1,25 +1,29 @@ -{ stdenv, fetchurl, lcms2, pkgconfig }: +{ stdenv, fetchFromGitHub, autoreconfHook, lcms2, pkgconfig }: stdenv.mkDerivation rec { pname = "libraw"; - version = "0.20.0"; + version = "0.20.2"; - src = fetchurl { - url = "https://www.libraw.org/data/LibRaw-${version}.tar.gz"; - sha256 = "18wlsvj6c1rv036ph3695kknpgzc3lk2ikgshy8417yfl8ykh2hz"; + src = fetchFromGitHub { + owner = "LibRaw"; + repo = "LibRaw"; + rev = version; + sha256 = "16nm4r2l5501c9zvz25pzajq5id592jhn068scjxhr8np2cblybc"; }; outputs = [ "out" "lib" "dev" "doc" ]; propagatedBuildInputs = [ lcms2 ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ autoreconfHook pkgconfig ]; - meta = { + enableParallelBuilding = true; + + meta = with stdenv.lib; { description = "Library for reading RAW files obtained from digital photo cameras (CRW/CR2, NEF, RAF, DNG, and others)"; homepage = "https://www.libraw.org/"; - license = stdenv.lib.licenses.gpl2Plus; - platforms = stdenv.lib.platforms.unix; + license = licenses.gpl2Plus; + platforms = platforms.unix; }; } diff --git a/third_party/nixpkgs/pkgs/development/libraries/libsoup/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libsoup/default.nix index a497661725..9f4a5bac25 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libsoup/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libsoup/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, glib, libxml2, meson, ninja, pkgconfig, gnome3 , gnomeSupport ? true, sqlite, glib-networking, gobject-introspection, vala -, libpsl, python3, brotli }: +, libpsl, python3, brotli, lib }: stdenv.mkDerivation rec { pname = "libsoup"; @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { "-Dtls_check=false" # glib-networking is a runtime dependency, not a compile-time dependency "-Dgssapi=disabled" "-Dvapi=enabled" - "-Dgnome=${if gnomeSupport then "true" else "false"}" + "-Dgnome=${lib.boolToString gnomeSupport}" "-Dntlm=disabled" ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/mesa/default.nix b/third_party/nixpkgs/pkgs/development/libraries/mesa/default.nix index 9fda8091ce..aeeb0514fa 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/mesa/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/mesa/default.nix @@ -129,7 +129,7 @@ stdenv.mkDerivation { "-Domx-libs-path=${placeholder "drivers"}/lib/bellagio" "-Dva-libs-path=${placeholder "drivers"}/lib/dri" "-Dd3d-drivers-path=${placeholder "drivers"}/lib/d3d" - "-Dgallium-nine=${if enableGalliumNine then "true" else "false"}" # Direct3D in Wine + "-Dgallium-nine=${boolToString enableGalliumNine}" # Direct3D in Wine "-Dosmesa=${if enableOSMesa then "gallium" else "none"}" # used by wine ] ++ optionals stdenv.isLinux [ "-Dglvnd=true" @@ -229,7 +229,7 @@ stdenv.mkDerivation { inherit (libglvnd) driverLink; }; - meta = with stdenv.lib; { + meta = { description = "An open source 3D graphics library"; longDescription = '' The Mesa project began as an open-source implementation of the OpenGL diff --git a/third_party/nixpkgs/pkgs/development/libraries/noise-suppression-for-voice/default.nix b/third_party/nixpkgs/pkgs/development/libraries/noise-suppression-for-voice/default.nix new file mode 100644 index 0000000000..27b77a3bd3 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/libraries/noise-suppression-for-voice/default.nix @@ -0,0 +1,26 @@ +{ stdenv, fetchFromGitHub, cmake }: + +stdenv.mkDerivation rec { + pname = "noise-suppression-for-voice-unstable"; + version = "2020-10-10"; + + src = fetchFromGitHub { + owner = "werman"; + repo = "noise-suppression-for-voice"; + rev = "15bac8f34018184d7d4de1b3b2ba98c433705f6c"; + sha256 = "11pwisbcks7g0mdgcrrv49v3ci1l6m26bbb7f67xz4pr1hai5dwc"; + }; + + nativeBuildInputs = [ cmake ]; + + meta = with stdenv.lib; { + description = "A real-time noise suppression plugin for voice"; + longDescription = '' +The plugin is meant to suppress a wide range of noise origins (from original paper): computer fans, office, crowd, airplane, car, train, construction. + ''; + homepage = "https://github.com/werman/noise-suppression-for-voice"; + license = licenses.gpl3; + maintainers = [ maintainers.henrikolsson ]; + platforms = platforms.all; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/libraries/openscenegraph/default.nix b/third_party/nixpkgs/pkgs/development/libraries/openscenegraph/default.nix index 4ded4770fc..e2a52a9333 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/openscenegraph/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/openscenegraph/default.nix @@ -1,6 +1,7 @@ { stdenv, lib, fetchFromGitHub, cmake, pkgconfig, doxygen, libX11, libXinerama, libXrandr, libGLU, libGL, glib, ilmbase, libxml2, pcre, zlib, + AGL, Carbon, Cocoa, Foundation, jpegSupport ? true, libjpeg, exrSupport ? false, openexr, gifSupport ? true, giflib, @@ -60,6 +61,7 @@ stdenv.mkDerivation rec { ++ lib.optional sdlSupport SDL2 ++ lib.optionals restSupport [ asio boost ] ++ lib.optionals withExamples [ fltk wxGTK ] + ++ lib.optionals stdenv.isDarwin [ AGL Carbon Cocoa Foundation ] ; cmakeFlags = lib.optional (!withApps) "-DBUILD_OSG_APPLICATIONS=OFF" ++ lib.optional withExamples "-DBUILD_OSG_EXAMPLES=ON"; @@ -68,7 +70,7 @@ stdenv.mkDerivation rec { description = "A 3D graphics toolkit"; homepage = "http://www.openscenegraph.org/"; maintainers = with maintainers; [ aanderse raskin ]; - platforms = platforms.linux; + platforms = with platforms; linux ++ darwin; license = "OpenSceneGraph Public License - free LGPL-based license"; }; } diff --git a/third_party/nixpkgs/pkgs/development/libraries/pdal/default.nix b/third_party/nixpkgs/pkgs/development/libraries/pdal/default.nix index 4fbf5df077..4405d3812b 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/pdal/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/pdal/default.nix @@ -3,7 +3,7 @@ , fetchpatch , cmake , pkg-config -# , openscenegraph +, openscenegraph , curl , gdal , hdf5-cpp @@ -20,34 +20,22 @@ stdenv.mkDerivation rec { pname = "pdal"; - version = "2.1.0"; + version = "2.2.0"; src = fetchFromGitHub { owner = "PDAL"; repo = "PDAL"; rev = version; - sha256 = "0zb3zjqgmjjryb648c1hmwh1nfa7893bjzbqpmr6shjxvzgnj9p6"; + sha256 = "1i7nbfvv60jjlf3iq7a7xci4dycmg2wrd35dqvjwl6hpfynpb6wz"; }; - patches = [ - # Fix duplicate paths like - # /nix/store/7iafqfmjdlxqim922618wg87cclrpznr-PDAL-2.1.0//nix/store/7iafqfmjdlxqim922618wg87cclrpznr-PDAL-2.1.0/lib - # similar to https://github.com/NixOS/nixpkgs/pull/82654. - # TODO Remove on release > 2.1.0 - (fetchpatch { - name = "pdal-Fixup-install-config.patch"; - url = "https://github.com/PDAL/PDAL/commit/2f887ef624db50c6e20f091f34bb5d3e65b5c5c8.patch"; - sha256 = "0pdw9v5ypq7w9i7qzgal110hjb9nqi386jvy3x2h4vf1dyalzid8"; - }) - ]; - nativeBuildInputs = [ cmake pkg-config ]; buildInputs = [ - # openscenegraph + openscenegraph curl gdal hdf5-cpp @@ -68,11 +56,6 @@ stdenv.mkDerivation rec { "-DBUILD_PLUGIN_PGPOINTCLOUD=ON" "-DBUILD_PLUGIN_TILEDB=ON" - # Plugins that can probably be made working relatively easily: - # As of writing, seems to be incompatible (build error): - # error: no matching function for call to 'osg::TriangleFunctor::operator()(const Vec3&, const Vec3&, const Vec3&)' - "-DBUILD_PLUGIN_OPENSCENEGRAPH=OFF" # requires OpenGL - # Plugins can probably not be made work easily: "-DBUILD_PLUGIN_CPD=OFF" "-DBUILD_PLUGIN_FBX=OFF" # Autodesk FBX SDK is gratis+proprietary; not packaged in nixpkgs diff --git a/third_party/nixpkgs/pkgs/development/libraries/pipewire/alsa-profiles-use-libdir.patch b/third_party/nixpkgs/pkgs/development/libraries/pipewire/alsa-profiles-use-libdir.patch new file mode 100644 index 0000000000..c657d12f7d --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/libraries/pipewire/alsa-profiles-use-libdir.patch @@ -0,0 +1,13 @@ +diff --git a/meson.build b/meson.build +index ffee41b4..f3e4ec74 100644 +--- a/meson.build ++++ b/meson.build +@@ -53,7 +53,7 @@ endif + + spa_plugindir = join_paths(pipewire_libdir, spa_name) + +-alsadatadir = join_paths(pipewire_datadir, 'alsa-card-profile', 'mixer') ++alsadatadir = join_paths(pipewire_libdir, '..', 'share', 'alsa-card-profile', 'mixer') + + pipewire_headers_dir = join_paths(pipewire_name, 'pipewire') + diff --git a/third_party/nixpkgs/pkgs/development/libraries/pipewire/default.nix b/third_party/nixpkgs/pkgs/development/libraries/pipewire/default.nix index cb5073f50c..d8a58e6a8e 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/pipewire/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/pipewire/default.nix @@ -1,89 +1,146 @@ { stdenv +, lib , fetchFromGitLab , fetchpatch +, removeReferencesTo , meson , ninja +, systemd , pkgconfig , doxygen , graphviz , valgrind , glib , dbus -, gst_all_1 , alsaLib -, ffmpeg_3 , libjack2 , udev , libva -, xorg -, sbc -, SDL2 , libsndfile -, bluez , vulkan-headers , vulkan-loader , libpulseaudio , makeFontsConf +, callPackage +, nixosTests +, gstreamerSupport ? true, gst_all_1 ? null +, ffmpegSupport ? true, ffmpeg ? null +, bluezSupport ? true, bluez ? null, sbc ? null +, nativeHspSupport ? true +, ofonoSupport ? true +, hsphfpdSupport ? false }: let fontsConf = makeFontsConf { fontDirectories = []; }; + + mesonBool = b: if b then "true" else "false"; in stdenv.mkDerivation rec { pname = "pipewire"; - version = "0.3.7"; + version = "0.3.13"; - outputs = [ "out" "lib" "dev" "doc" ]; + outputs = [ + "out" + "lib" + "pulse" + "jack" + "dev" + "doc" + "installedTests" + ]; src = fetchFromGitLab { domain = "gitlab.freedesktop.org"; owner = "pipewire"; repo = "pipewire"; rev = version; - sha256 = "04l66p0wj553gp2zf3vwwh6jbr1vkf6wrq4za9zlm9dn144am4j2"; + sha256 = "19j5kmb7iaivkq2agfzncfm2qms41ckqi0ddxvhpc91ihwprdc5w"; }; + patches = [ + # Break up a dependency cycle between outputs. + ./alsa-profiles-use-libdir.patch + # Move installed tests into their own output. + ./installed-tests-path.patch + + # TODO Remove this on next update + # Fixes rpath referencecs. + (fetchpatch { + url = "https://gitlab.freedesktop.org/pipewire/pipewire/commit/2e3556fa128b778be62a7ffad5fbe78393035825.diff"; + sha256 = "039yysb8j1aiqml54rxnaqfmzqz1b6m8sv5w3vz52grvav3kyr1l"; + }) + ]; + nativeBuildInputs = [ doxygen graphviz meson ninja pkgconfig - valgrind + removeReferencesTo ]; buildInputs = [ - SDL2 alsaLib - bluez dbus - ffmpeg_3 glib - gst_all_1.gst-plugins-base - gst_all_1.gstreamer libjack2 libpulseaudio libsndfile - libva - sbc udev vulkan-headers vulkan-loader - xorg.libX11 - ]; + valgrind + systemd + ] ++ lib.optionals gstreamerSupport [ gst_all_1.gst-plugins-base gst_all_1.gstreamer ] + ++ lib.optional ffmpegSupport ffmpeg + ++ lib.optionals bluezSupport [ bluez sbc ]; mesonFlags = [ "-Ddocs=true" "-Dman=false" # we don't have xmltoman - "-Dgstreamer=true" + "-Dexamples=true" # only needed for `pipewire-media-session` + "-Dudevrulesdir=lib/udev/rules.d" + "-Dinstalled_tests=true" + "-Dinstalled_test_prefix=${placeholder "installedTests"}" + "-Dlibpulse-path=${placeholder "pulse"}/lib" + "-Dlibjack-path=${placeholder "jack"}/lib" + "-Dgstreamer=${mesonBool gstreamerSupport}" + "-Dffmpeg=${mesonBool ffmpegSupport}" + "-Dbluez5=${mesonBool bluezSupport}" + "-Dbluez5-backend-native=${mesonBool nativeHspSupport}" + "-Dbluez5-backend-ofono=${mesonBool ofonoSupport}" + "-Dbluez5-backend-hsphfpd=${mesonBool hsphfpdSupport}" ]; FONTCONFIG_FILE = fontsConf; # Fontconfig error: Cannot load default config file doCheck = true; + # Pulseaudio asserts lead to dev references. + # TODO This should be fixed in the pulseaudio sources instead. + preFixup = '' + remove-references-to -t ${libpulseaudio.dev} "$(readlink -f $pulse/lib/libpulse.so)" + ''; + + passthru.tests = { + installedTests = nixosTests.installed-tests.pipewire; + + # This ensures that all the paths used by the NixOS module are found. + test-paths = callPackage ./test-paths.nix { + paths-out = [ + "share/alsa/alsa.conf.d/50-pipewire.conf" + ]; + paths-lib = [ + "lib/alsa-lib/libasound_module_pcm_pipewire.so" + "share/alsa-card-profile/mixer" + ]; + }; + }; + meta = with stdenv.lib; { description = "Server and user space API to deal with multimedia pipelines"; homepage = "https://pipewire.org/"; diff --git a/third_party/nixpkgs/pkgs/development/libraries/pipewire/installed-tests-path.patch b/third_party/nixpkgs/pkgs/development/libraries/pipewire/installed-tests-path.patch new file mode 100644 index 0000000000..2a92711626 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/libraries/pipewire/installed-tests-path.patch @@ -0,0 +1,29 @@ +diff --git a/meson.build b/meson.build +index ffee41b4..bab6f019 100644 +--- a/meson.build ++++ b/meson.build +@@ -318,8 +318,8 @@ alsa_dep = (get_option('pipewire-alsa') + ? dependency('alsa', version : '>=1.1.7') + : dependency('', required: false)) + +-installed_tests_metadir = join_paths(pipewire_datadir, 'installed-tests', pipewire_name) +-installed_tests_execdir = join_paths(pipewire_libexecdir, 'installed-tests', pipewire_name) ++installed_tests_metadir = join_paths(get_option('installed_test_prefix'), 'share', 'installed-tests', pipewire_name) ++installed_tests_execdir = join_paths(get_option('installed_test_prefix'), 'libexec', 'installed-tests', pipewire_name) + installed_tests_enabled = get_option('installed_tests') + installed_tests_template = files('template.test.in') + +diff --git a/meson_options.txt b/meson_options.txt +index f03033c3..32df6c53 100644 +--- a/meson_options.txt ++++ b/meson_options.txt +@@ -18,6 +18,9 @@ option('installed_tests', + description: 'Install manual and automated test executables', + type: 'boolean', + value: false) ++option('installed_test_prefix', ++ description: 'Prefix for installed tests', ++ type: 'string') + option('gstreamer', + description: 'Build GStreamer plugins', + type: 'boolean', diff --git a/third_party/nixpkgs/pkgs/development/libraries/pipewire/test-paths.nix b/third_party/nixpkgs/pkgs/development/libraries/pipewire/test-paths.nix new file mode 100644 index 0000000000..0ae6937419 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/libraries/pipewire/test-paths.nix @@ -0,0 +1,23 @@ +{ lib, runCommand, pipewire, paths-out, paths-lib }: + +let + check-path = output: path: '' + if [[ ! -f "${output}/${path}" && ! -d "${output}/${path}" ]]; then + printf "Missing: %s\n" "${output}/${path}" | tee -a $out + error=error + else + printf "Found: %s\n" "${output}/${path}" | tee -a $out + fi + ''; + + check-output = output: lib.concatMapStringsSep "\n" (check-path output); +in runCommand "pipewire-test-paths" { } '' + touch $out + + ${check-output pipewire.lib paths-lib} + ${check-output pipewire paths-out} + + if [[ -n "$error" ]]; then + exit 1 + fi +'' diff --git a/third_party/nixpkgs/pkgs/development/libraries/redkite/default.nix b/third_party/nixpkgs/pkgs/development/libraries/redkite/default.nix index be6bf0d7fa..b520265835 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/redkite/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/redkite/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "redkite"; - version = "1.0.3"; + version = "1.1.0"; src = fetchFromGitLab { owner = "iurie-sw"; repo = pname; rev = "v${version}"; - sha256 = "1m2db7c791fi33snkjwnvlxapmf879g5r8azlkx7sr6vp2s0jq2k"; + sha256 = "0bim1ifyslwvaf885klmf9hpszqq5k9bm2y4l7gcgl6cljfzi04y"; }; nativeBuildInputs = [ cmake ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/rocksdb/default.nix b/third_party/nixpkgs/pkgs/development/libraries/rocksdb/default.nix index 3e97c3f343..0cb36fd026 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/rocksdb/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/rocksdb/default.nix @@ -8,40 +8,33 @@ , snappy , zlib , zstd +, enableJemalloc ? false, jemalloc , enableLite ? false , enableShared ? true }: stdenv.mkDerivation rec { pname = "rocksdb"; - version = "6.10.2"; + version = "6.12.7"; src = fetchFromGitHub { owner = "facebook"; repo = pname; rev = "v${version}"; - sha256 = "1f2wqb6px812ijcivq3rsknqgkv01wblc6sd8wavhrw8qljgr3s1"; + sha256 = "0cpi0v691xsh20hj5x2y2z7dmjvhd3brr0swszv0xqjg2q0f7zdb"; }; nativeBuildInputs = [ cmake ninja ]; - buildInputs = [ bzip2 lz4 snappy zlib zstd ]; + propagatedBuildInputs = [ bzip2 lz4 snappy zlib zstd ]; - patches = [ - # Without this change private dependencies are exported. - # Can be removed after the next release. - # https://github.com/facebook/rocksdb/pull/6790 - (fetchpatch { - url = "https://github.com/facebook/rocksdb/commit/07204837ce8d66e1e6e4893178f3fd040f9c1044.patch"; - sha256 = "17097ybkhy0i089zzkpvcj65c7g5skvjvdzi1k09x4i1d719wm39"; - }) - ]; + buildInputs = stdenv.lib.optional enableJemalloc jemalloc; NIX_CFLAGS_COMPILE = stdenv.lib.optionalString stdenv.cc.isGNU "-Wno-error=deprecated-copy -Wno-error=pessimizing-move"; cmakeFlags = [ "-DPORTABLE=1" - "-DWITH_JEMALLOC=0" + "-DWITH_JEMALLOC=${if enableJemalloc then "1" else "0"}" "-DWITH_JNI=0" "-DWITH_BENCHMARK_TOOLS=0" "-DWITH_TESTS=1" diff --git a/third_party/nixpkgs/pkgs/development/libraries/socket_wrapper/default.nix b/third_party/nixpkgs/pkgs/development/libraries/socket_wrapper/default.nix index e6095ca82c..188405365c 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/socket_wrapper/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/socket_wrapper/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, cmake, pkgconfig }: stdenv.mkDerivation rec { - name = "socket_wrapper-1.2.4"; + name = "socket_wrapper-1.2.5"; src = fetchurl { url = "mirror://samba/cwrap/${name}.tar.gz"; - sha256 = "07m0g5sxjl15h8h95ppf42mkilp9h1xc9camryg8l9bw8b2v8m4a"; + sha256 = "1wb3gq0rj5h92mhq6f1hb2qy4ypkxvn8y87ag88c7gc71nkpa1fx"; }; nativeBuildInputs = [ cmake pkgconfig ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/srt/default.nix b/third_party/nixpkgs/pkgs/development/libraries/srt/default.nix index 32c3135cd4..6947c674a9 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/srt/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/srt/default.nix @@ -4,13 +4,13 @@ with stdenv.lib; stdenv.mkDerivation rec { pname = "srt"; - version = "1.4.1"; + version = "1.4.2"; src = fetchFromGitHub { owner = "Haivision"; repo = "srt"; rev = "v${version}"; - sha256 = "01xaq44j95kbgqfl41pnybvqy0yq6wd4wdw88ckylzf0nzp977xz"; + sha256 = "01nx3a35hzq2x0dvp2n2b86phpdy1z83kdraag7aq3hmc7f8iagg"; }; nativeBuildInputs = [ cmake ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/v8/default.nix b/third_party/nixpkgs/pkgs/development/libraries/v8/default.nix index 60e856e61d..e6696626cb 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/v8/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/v8/default.nix @@ -80,7 +80,7 @@ stdenv.mkDerivation rec { gnFlags = [ "use_custom_libcxx=false" - "is_clang=${if stdenv.cc.isClang then "true" else "false"}" + "is_clang=${lib.boolToString stdenv.cc.isClang}" "use_sysroot=false" # "use_system_icu=true" "is_component_build=false" diff --git a/third_party/nixpkgs/pkgs/development/libraries/x265/default.nix b/third_party/nixpkgs/pkgs/development/libraries/x265/default.nix index ad43ac96d7..9d501f47c3 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/x265/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/x265/default.nix @@ -79,7 +79,7 @@ stdenv.mkDerivation rec { "-DENABLE_SHARED=ON" "-DHIGH_BIT_DEPTH=OFF" "-DENABLE_HDR10_PLUS=OFF" - ] ++ stdenv.lib.optionals is64bit [ + ] ++ stdenv.lib.optionals (is64bit && !(stdenv.isAarch64 && stdenv.isLinux)) [ "-DEXTRA_LIB=${libx265-10}/lib/libx265.a;${libx265-12}/lib/libx265.a" "-DLINKED_10BIT=ON" "-DLINKED_12BIT=ON" diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules/README.txt b/third_party/nixpkgs/pkgs/development/lisp-modules/README.txt index c55fb9b1a7..08452d979a 100644 --- a/third_party/nixpkgs/pkgs/development/lisp-modules/README.txt +++ b/third_party/nixpkgs/pkgs/development/lisp-modules/README.txt @@ -1,7 +1,15 @@ Want to add a package? There are 3 simple steps! 1. Add the needed system names to quicklisp-to-nix-systems.txt. 2. cd ; nix-shell --run 'quicklisp-to-nix .' + You might want to specify also the --cacheSystemInfoDir and --cacheFaslDir + parameters to preserve some data between runs. For example, it is very + useful when you add new packages with native dependencies and fail to + specify the native dependencies correctly the first time. + (Might be nice to ensure the cache directories exist) 3. Add native libraries and whatever else is needed to quicklisp-to-nix-overrides.nix. +4. Sometimes there are problems with loading implementation-provided systems. + In this case you might need to add more systems in the implementation's (so + SBCL's) entry into *implementation-systems* in quicklisp-to-nix/system-info.lisp To update to a more recent quicklisp dist modify lispPackages.quicklisp to have a more recent distinfo. diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules/clwrapper/cl-wrapper.sh b/third_party/nixpkgs/pkgs/development/lisp-modules/clwrapper/cl-wrapper.sh index 9836bbe564..828920c5ac 100755 --- a/third_party/nixpkgs/pkgs/development/lisp-modules/clwrapper/cl-wrapper.sh +++ b/third_party/nixpkgs/pkgs/development/lisp-modules/clwrapper/cl-wrapper.sh @@ -95,8 +95,8 @@ nix_lisp_run_single_form(){ nix_lisp_build_system(){ NIX_LISP_FINAL_PARAMETERS=( "$NIX_LISP_EXEC_CODE" "(progn - (asdf:make :$1) - (loop for s in (list $(for i in $3; do echo ":$i"; done)) do (asdf:make s)))" + (asdf:load-system :$1) + (loop for s in (list $(for i in $3; do echo ":$i"; done)) do (asdf:load-system s)))" "$NIX_LISP_EXEC_CODE" "(progn (setf (asdf/system:component-entry-point (asdf:find-system :$1)) ${2:-nil}) #+cffi(setf cffi:*foreign-library-directories* @@ -106,15 +106,19 @@ nix_lisp_build_system(){ :separator \":\") for l in sb-alien::*shared-objects* for ns := (sb-alien::shared-object-namestring l) + do (format *error-output* \"Searching alien object ~s in ~s~%\" + ns libpath) do (and (> (length ns) 0) (not (equal (elt ns 0) \"/\")) (let* ((prefix (find-if (lambda (s) (probe-file (format nil \"~a/~a\" s ns))) libpath)) (fullpath (and prefix (format nil \"~a/~a\" prefix ns)))) (when fullpath + (format *error-output* \"Found: ~s~%\" fullpath) (setf (sb-alien::shared-object-namestring l) fullpath (sb-alien::shared-object-pathname l) (probe-file fullpath))))) ) + $4 (asdf:perform (quote asdf:program-op) :$1) )") } diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules/lisp-packages.nix b/third_party/nixpkgs/pkgs/development/lisp-modules/lisp-packages.nix index e6840e93bf..f8338e48e1 100644 --- a/third_party/nixpkgs/pkgs/development/lisp-modules/lisp-packages.nix +++ b/third_party/nixpkgs/pkgs/development/lisp-modules/lisp-packages.nix @@ -24,8 +24,8 @@ let lispPackages = rec { quicklispdist = pkgs.fetchurl { # Will usually be replaced with a fresh version anyway, but needs to be # a valid distinfo.txt - url = "https://beta.quicklisp.org/dist/quicklisp/2019-12-27/distinfo.txt"; - sha256 = "0fz0k7ydmddxvxyid0nkifap21n6bxap602qhqsac2dxglv3i4cs"; + url = "https://beta.quicklisp.org/dist/quicklisp/2020-10-16/distinfo.txt"; + sha256 = "sha256:090xjcnyqcv8az9n1a7m0f6vzz2nwcncy95ha7ixb7fnd2rj1n65"; }; buildPhase = '' true; ''; postInstall = '' @@ -77,5 +77,130 @@ let lispPackages = rec { ''; dontStrip = true; }; + + clx-truetype = buildLispPackage rec { + baseName = "clx-truetype"; + version = ''20160825-git''; + + buildSystems = [ "clx-truetype" ]; + parasites = [ "clx-truetype-test" ]; + + description = ''clx-truetype is pure common lisp solution for antialiased TrueType font rendering using CLX and XRender extension.''; + deps = with pkgs.lispPackages; [ + alexandria bordeaux-threads cl-aa cl-fad cl-paths cl-paths-ttf cl-store + cl-vectors clx trivial-features zpb-ttf + ]; + src = pkgs.fetchurl { + url = ''http://beta.quicklisp.org/archive/clx-truetype/2016-08-25/clx-truetype-20160825-git.tgz''; + sha256 = ''0ndy067rg9w6636gxwlpnw7f3ck9nrnjb03444pprik9r3c9in67''; + }; + + packageName = "clx-truetype"; + + asdFilesToKeep = ["clx-truetype.asd"]; + }; + cluffer = buildLispPackage rec { + baseName = "cluffer"; + version = "2018-09-24"; + + buildSystems = [ "cluffer-base" "cluffer-simple-buffer" "cluffer-simple-line" "cluffer-standard-buffer" "cluffer-standard-line" "cluffer" ]; + parasites = [ "cluffer-test" ]; + + description = "General purpose text-editor buffer"; + deps = with pkgs.lispPackages; [ + acclimation clump + ]; + src = pkgs.fetchFromGitHub { + owner = "robert-strandh"; + repo = "cluffer"; + rev = "4aad29c276a58a593064e79972ee4d77cae0af4a"; + sha256 = "1bcg13g7qb3dr8z50aihdjqa6miz5ivlc9wsj2csgv1km1mak2kj"; + # date = 2018-09-24T04:45:36+02:00; + }; + + packageName = "cluffer"; + + asdFilesToKeep = [ "cluffer.asd" "cluffer-base.asd" "cluffer-simple-buffer.asd" "cluffer-simple-line.asd" "cluffer-standard-buffer.asd" "cluffer-standard-line.asd" ]; + }; + nyxt = pkgs.lispPackages.buildLispPackage rec { + baseName = "nyxt"; + version = "2020-10-23"; + + buildSystems = [ "nyxt" "nyxt-ext" ]; + + description = "Browser"; + + overrides = x: { + postInstall = '' + echo "Building nyxt binary" + NIX_LISP_PRELAUNCH_HOOK=' + nix_lisp_build_system nyxt/gtk-application \ + "(asdf/system:component-entry-point (asdf:find-system :nyxt/gtk-application))" \ + "" "(format *error-output* \"Alien objects:~%~s~%\" sb-alien::*shared-objects*)" + ' "$out/bin/nyxt-lisp-launcher.sh" + cp "$out/lib/common-lisp/nyxt/nyxt" "$out/bin/" + ''; + }; + + deps = with pkgs.lispPackages; [ + alexandria + bordeaux-threads + chanl + cl-annot + cl-ansi-text + cl-containers + cl-css + cl-json + cl-markup + cl-ppcre + cl-ppcre-unicode + cl-prevalence + cl-webkit2 + closer-mop + cluffer + dbus + dexador + enchant + fset + hu_dot_dwim_dot_defclass-star + ironclad + local-time + log4cl + lparallel + mk-string-metrics + osicat + parenscript + plump + prove-asdf + quri + serapeum + sqlite + str + swank + trivia + trivial-clipboard + trivial-features + trivial-package-local-nicknames + trivial-types + unix-opts + ]; + src = pkgs.fetchFromGitHub { + owner = "atlas-engineer"; + repo = "nyxt"; + rev = "f744af5233b3636460ce71650de2b0c7dcb9fa8e"; + sha256 = "1m4jic7nbm2jmxlm8k0zqg62z91g2f2s86by086brgfw056idjmz"; + # date = 2020-10-23T19:06:04+02:00; + }; + + packageName = "nyxt"; + + asdFilesToKeep = [ "nyxt.asd" "nyxt-ext.asd" ]; + + propagatedBuildInputs = [ + pkgs.libressl.out + pkgs.webkitgtk + pkgs.sbcl + ]; + }; }; in lispPackages diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/_3bmd-ext-code-blocks.nix b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/_3bmd-ext-code-blocks.nix new file mode 100644 index 0000000000..6c08e0e1c9 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/_3bmd-ext-code-blocks.nix @@ -0,0 +1,34 @@ +args @ { fetchurl, ... }: +rec { + baseName = ''_3bmd-ext-code-blocks''; + version = ''3bmd-20200925-git''; + + description = ''extension to 3bmd implementing github style ``` delimited code blocks, with support for syntax highlighting using colorize, pygments, or chroma''; + + deps = [ args."_3bmd" args."alexandria" args."colorize" args."esrap" args."html-encode" args."split-sequence" ]; + + src = fetchurl { + url = ''http://beta.quicklisp.org/archive/3bmd/2020-09-25/3bmd-20200925-git.tgz''; + sha256 = ''0sk4b0xma4vv6ssiskbz7h5bw8v8glm34mbv3llqywb50b9ks4fw''; + }; + + packageName = "3bmd-ext-code-blocks"; + + asdFilesToKeep = ["3bmd-ext-code-blocks.asd"]; + overrides = x: x; +} +/* (SYSTEM 3bmd-ext-code-blocks DESCRIPTION + extension to 3bmd implementing github style ``` delimited code blocks, with support for syntax highlighting using colorize, pygments, or chroma + SHA256 0sk4b0xma4vv6ssiskbz7h5bw8v8glm34mbv3llqywb50b9ks4fw URL + http://beta.quicklisp.org/archive/3bmd/2020-09-25/3bmd-20200925-git.tgz MD5 + 3b2c0b2094e473234742d150ac84abdd NAME 3bmd-ext-code-blocks FILENAME + _3bmd-ext-code-blocks DEPS + ((NAME 3bmd FILENAME _3bmd) (NAME alexandria FILENAME alexandria) + (NAME colorize FILENAME colorize) (NAME esrap FILENAME esrap) + (NAME html-encode FILENAME html-encode) + (NAME split-sequence FILENAME split-sequence)) + DEPENDENCIES (3bmd alexandria colorize esrap html-encode split-sequence) + VERSION 3bmd-20200925-git SIBLINGS + (3bmd-ext-definition-lists 3bmd-ext-math 3bmd-ext-tables + 3bmd-ext-wiki-links 3bmd-youtube-tests 3bmd-youtube 3bmd) + PARASITES NIL) */ diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/_3bmd.nix b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/_3bmd.nix index a5fddd417f..dd1959893f 100644 --- a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/_3bmd.nix +++ b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/_3bmd.nix @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: rec { baseName = ''_3bmd''; - version = ''20171019-git''; + version = ''20200925-git''; description = ''markdown processor in CL using esrap parser.''; deps = [ args."alexandria" args."esrap" args."split-sequence" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/3bmd/2017-10-19/3bmd-20171019-git.tgz''; - sha256 = ''1lrh1ypn9wrjcayi9vc706knac1vsxlrzlsxq73apdc7jx4wzywz''; + url = ''http://beta.quicklisp.org/archive/3bmd/2020-09-25/3bmd-20200925-git.tgz''; + sha256 = ''0sk4b0xma4vv6ssiskbz7h5bw8v8glm34mbv3llqywb50b9ks4fw''; }; packageName = "3bmd"; @@ -18,13 +18,13 @@ rec { overrides = x: x; } /* (SYSTEM 3bmd DESCRIPTION markdown processor in CL using esrap parser. SHA256 - 1lrh1ypn9wrjcayi9vc706knac1vsxlrzlsxq73apdc7jx4wzywz URL - http://beta.quicklisp.org/archive/3bmd/2017-10-19/3bmd-20171019-git.tgz MD5 - d691962a511f2edc15f4fc228ecdf546 NAME 3bmd FILENAME _3bmd DEPS + 0sk4b0xma4vv6ssiskbz7h5bw8v8glm34mbv3llqywb50b9ks4fw URL + http://beta.quicklisp.org/archive/3bmd/2020-09-25/3bmd-20200925-git.tgz MD5 + 3b2c0b2094e473234742d150ac84abdd NAME 3bmd FILENAME _3bmd DEPS ((NAME alexandria FILENAME alexandria) (NAME esrap FILENAME esrap) (NAME split-sequence FILENAME split-sequence)) - DEPENDENCIES (alexandria esrap split-sequence) VERSION 20171019-git + DEPENDENCIES (alexandria esrap split-sequence) VERSION 20200925-git SIBLINGS - (3bmd-ext-code-blocks 3bmd-ext-definition-lists 3bmd-ext-tables - 3bmd-ext-wiki-links 3bmd-youtube-tests 3bmd-youtube) + (3bmd-ext-code-blocks 3bmd-ext-definition-lists 3bmd-ext-math + 3bmd-ext-tables 3bmd-ext-wiki-links 3bmd-youtube-tests 3bmd-youtube) PARASITES NIL) */ diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/abnf.nix b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/abnf.nix deleted file mode 100644 index cbfcb6f436..0000000000 --- a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/abnf.nix +++ /dev/null @@ -1,27 +0,0 @@ -args @ { fetchurl, ... }: -{ - baseName = ''abnf''; - version = ''cl-20150608-git''; - - description = ''ABNF Parser Generator, per RFC2234''; - - deps = [ args."alexandria" args."cl-ppcre" args."esrap" ]; - - src = fetchurl { - url = ''http://beta.quicklisp.org/archive/cl-abnf/2015-06-08/cl-abnf-20150608-git.tgz''; - sha256 = ''00x95h7v5q7azvr9wrpcfcwsq3sdipjr1hgq9a9lbimp8gfbz687''; - }; - - packageName = "abnf"; - - asdFilesToKeep = ["abnf.asd"]; - overrides = x: x; -} -/* (SYSTEM abnf DESCRIPTION ABNF Parser Generator, per RFC2234 SHA256 - 00x95h7v5q7azvr9wrpcfcwsq3sdipjr1hgq9a9lbimp8gfbz687 URL - http://beta.quicklisp.org/archive/cl-abnf/2015-06-08/cl-abnf-20150608-git.tgz - MD5 311c2b17e49666dac1c2bb45256be708 NAME abnf FILENAME abnf DEPS - ((NAME alexandria FILENAME alexandria) (NAME cl-ppcre FILENAME cl-ppcre) - (NAME esrap FILENAME esrap)) - DEPENDENCIES (alexandria cl-ppcre esrap) VERSION cl-20150608-git SIBLINGS - NIL PARASITES NIL) */ diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/access.nix b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/access.nix new file mode 100644 index 0000000000..deb0c7f89c --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/access.nix @@ -0,0 +1,39 @@ +args @ { fetchurl, ... }: +rec { + baseName = ''access''; + version = ''20151218-git''; + + parasites = [ "access-test" ]; + + description = ''A library providing functions that unify data-structure access for Common Lisp: + access and (setf access)''; + + deps = [ args."alexandria" args."anaphora" args."cl-interpol" args."cl-ppcre" args."cl-unicode" args."closer-mop" args."flexi-streams" args."iterate" args."lisp-unit2" args."named-readtables" ]; + + src = fetchurl { + url = ''http://beta.quicklisp.org/archive/access/2015-12-18/access-20151218-git.tgz''; + sha256 = ''0f4257cxd1rpp46wm2qbnk0ynlc3dli9ib4qbn45hglh8zy7snfl''; + }; + + packageName = "access"; + + asdFilesToKeep = ["access.asd"]; + overrides = x: x; +} +/* (SYSTEM access DESCRIPTION + A library providing functions that unify data-structure access for Common Lisp: + access and (setf access) + SHA256 0f4257cxd1rpp46wm2qbnk0ynlc3dli9ib4qbn45hglh8zy7snfl URL + http://beta.quicklisp.org/archive/access/2015-12-18/access-20151218-git.tgz + MD5 a6f1eb4a1823b04c6db4fa2dc16d648f NAME access FILENAME access DEPS + ((NAME alexandria FILENAME alexandria) (NAME anaphora FILENAME anaphora) + (NAME cl-interpol FILENAME cl-interpol) (NAME cl-ppcre FILENAME cl-ppcre) + (NAME cl-unicode FILENAME cl-unicode) + (NAME closer-mop FILENAME closer-mop) + (NAME flexi-streams FILENAME flexi-streams) + (NAME iterate FILENAME iterate) (NAME lisp-unit2 FILENAME lisp-unit2) + (NAME named-readtables FILENAME named-readtables)) + DEPENDENCIES + (alexandria anaphora cl-interpol cl-ppcre cl-unicode closer-mop + flexi-streams iterate lisp-unit2 named-readtables) + VERSION 20151218-git SIBLINGS NIL PARASITES (access-test)) */ diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/acclimation.nix b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/acclimation.nix new file mode 100644 index 0000000000..f93506505a --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/acclimation.nix @@ -0,0 +1,25 @@ +args @ { fetchurl, ... }: +rec { + baseName = ''acclimation''; + version = ''20200925-git''; + + description = ''Library supporting internationalization''; + + deps = [ ]; + + src = fetchurl { + url = ''http://beta.quicklisp.org/archive/acclimation/2020-09-25/acclimation-20200925-git.tgz''; + sha256 = ''11vw1h5zxicj5qxb1smiyjxafw8xk0isnzcf5g0lqis3y9ssqxbw''; + }; + + packageName = "acclimation"; + + asdFilesToKeep = ["acclimation.asd"]; + overrides = x: x; +} +/* (SYSTEM acclimation DESCRIPTION Library supporting internationalization + SHA256 11vw1h5zxicj5qxb1smiyjxafw8xk0isnzcf5g0lqis3y9ssqxbw URL + http://beta.quicklisp.org/archive/acclimation/2020-09-25/acclimation-20200925-git.tgz + MD5 8ce10864baef6fb0e11c78e2ee0b0ddb NAME acclimation FILENAME acclimation + DEPS NIL DEPENDENCIES NIL VERSION 20200925-git SIBLINGS + (acclimation-temperature) PARASITES NIL) */ diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/alexandria.nix b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/alexandria.nix index 1bbd82ba53..7f257bc4ba 100644 --- a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/alexandria.nix +++ b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/alexandria.nix @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: rec { baseName = ''alexandria''; - version = ''20191227-git''; + version = ''20200925-git''; description = ''Alexandria is a collection of portable public domain utilities.''; deps = [ ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/alexandria/2019-12-27/alexandria-20191227-git.tgz''; - sha256 = ''1vq19i7mcx3dk8vd8l92ld33birs9qhwcs7hbwwphvrwsrxbnd89''; + url = ''http://beta.quicklisp.org/archive/alexandria/2020-09-25/alexandria-20200925-git.tgz''; + sha256 = ''1cpvnzfs807ah07hrk8kplim6ryzqs4r35ym03cpky5xdl8c89fl''; }; packageName = "alexandria"; @@ -19,8 +19,8 @@ rec { } /* (SYSTEM alexandria DESCRIPTION Alexandria is a collection of portable public domain utilities. SHA256 - 1vq19i7mcx3dk8vd8l92ld33birs9qhwcs7hbwwphvrwsrxbnd89 URL - http://beta.quicklisp.org/archive/alexandria/2019-12-27/alexandria-20191227-git.tgz - MD5 634105318a9c82a2a2729d0305c91667 NAME alexandria FILENAME alexandria - DEPS NIL DEPENDENCIES NIL VERSION 20191227-git SIBLINGS (alexandria-tests) + 1cpvnzfs807ah07hrk8kplim6ryzqs4r35ym03cpky5xdl8c89fl URL + http://beta.quicklisp.org/archive/alexandria/2020-09-25/alexandria-20200925-git.tgz + MD5 59c8237a854de6f4f93328cd5747cd14 NAME alexandria FILENAME alexandria + DEPS NIL DEPENDENCIES NIL VERSION 20200925-git SIBLINGS (alexandria-tests) PARASITES NIL) */ diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/arnesi.nix b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/arnesi.nix new file mode 100644 index 0000000000..97ae196c0f --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/arnesi.nix @@ -0,0 +1,34 @@ +args @ { fetchurl, ... }: +rec { + baseName = ''arnesi''; + version = ''20170403-git''; + + parasites = [ "arnesi/cl-ppcre-extras" "arnesi/slime-extras" ]; + + description = ''A bag-of-tools utilities library used to aid in implementing the bese.it toolkit''; + + deps = [ args."alexandria" args."cl-ppcre" args."closer-mop" args."collectors" args."iterate" args."swank" args."symbol-munger" ]; + + src = fetchurl { + url = ''http://beta.quicklisp.org/archive/arnesi/2017-04-03/arnesi-20170403-git.tgz''; + sha256 = ''01kirjpgv5pgbcdxjrnw3ld4jw7wrqm3rgqnxwac4gxaphr2s6q4''; + }; + + packageName = "arnesi"; + + asdFilesToKeep = ["arnesi.asd"]; + overrides = x: x; +} +/* (SYSTEM arnesi DESCRIPTION + A bag-of-tools utilities library used to aid in implementing the bese.it toolkit + SHA256 01kirjpgv5pgbcdxjrnw3ld4jw7wrqm3rgqnxwac4gxaphr2s6q4 URL + http://beta.quicklisp.org/archive/arnesi/2017-04-03/arnesi-20170403-git.tgz + MD5 bbb34e1a646b2cc489766690c741d964 NAME arnesi FILENAME arnesi DEPS + ((NAME alexandria FILENAME alexandria) (NAME cl-ppcre FILENAME cl-ppcre) + (NAME closer-mop FILENAME closer-mop) + (NAME collectors FILENAME collectors) (NAME iterate FILENAME iterate) + (NAME swank FILENAME swank) (NAME symbol-munger FILENAME symbol-munger)) + DEPENDENCIES + (alexandria cl-ppcre closer-mop collectors iterate swank symbol-munger) + VERSION 20170403-git SIBLINGS NIL PARASITES + (arnesi/cl-ppcre-extras arnesi/slime-extras)) */ diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/asdf-finalizers.nix b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/asdf-finalizers.nix deleted file mode 100644 index 482752f2c7..0000000000 --- a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/asdf-finalizers.nix +++ /dev/null @@ -1,26 +0,0 @@ -{ fetchurl, ... }: -{ - baseName = ''asdf-finalizers''; - version = ''20170403-git''; - - description = ''Enforced calling of finalizers for Lisp code''; - - deps = [ ]; - - src = fetchurl { - url = ''http://beta.quicklisp.org/archive/asdf-finalizers/2017-04-03/asdf-finalizers-20170403-git.tgz''; - sha256 = ''1w2ka0123icbjba7ngdd6h93j72g236h6jw4bsmvsak69fj0ybxj''; - }; - - packageName = "asdf-finalizers"; - - asdFilesToKeep = ["asdf-finalizers.asd"]; - overrides = x: x; -} -/* (SYSTEM asdf-finalizers DESCRIPTION - Enforced calling of finalizers for Lisp code SHA256 - 1w2ka0123icbjba7ngdd6h93j72g236h6jw4bsmvsak69fj0ybxj URL - http://beta.quicklisp.org/archive/asdf-finalizers/2017-04-03/asdf-finalizers-20170403-git.tgz - MD5 a9e3c960e6b6fdbd69640b520ef8044b NAME asdf-finalizers FILENAME - asdf-finalizers DEPS NIL DEPENDENCIES NIL VERSION 20170403-git SIBLINGS - (asdf-finalizers-test list-of) PARASITES NIL) */ diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/babel-streams.nix b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/babel-streams.nix deleted file mode 100644 index 5251cbc920..0000000000 --- a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/babel-streams.nix +++ /dev/null @@ -1,30 +0,0 @@ -args @ { fetchurl, ... }: -{ - baseName = ''babel-streams''; - version = ''babel-20171227-git''; - - description = ''Some useful streams based on Babel's encoding code''; - - deps = [ args."alexandria" args."babel" args."trivial-features" args."trivial-gray-streams" ]; - - src = fetchurl { - url = ''http://beta.quicklisp.org/archive/babel/2017-12-27/babel-20171227-git.tgz''; - sha256 = ''166y6j9ma1vxzy5bcwnbi37zwgn2zssx5x1q7zr63kyj2caiw2rf''; - }; - - packageName = "babel-streams"; - - asdFilesToKeep = ["babel-streams.asd"]; - overrides = x: x; -} -/* (SYSTEM babel-streams DESCRIPTION - Some useful streams based on Babel's encoding code SHA256 - 166y6j9ma1vxzy5bcwnbi37zwgn2zssx5x1q7zr63kyj2caiw2rf URL - http://beta.quicklisp.org/archive/babel/2017-12-27/babel-20171227-git.tgz - MD5 8ea39f73873847907a8bb67f99f16ecd NAME babel-streams FILENAME - babel-streams DEPS - ((NAME alexandria FILENAME alexandria) (NAME babel FILENAME babel) - (NAME trivial-features FILENAME trivial-features) - (NAME trivial-gray-streams FILENAME trivial-gray-streams)) - DEPENDENCIES (alexandria babel trivial-features trivial-gray-streams) - VERSION babel-20171227-git SIBLINGS (babel-tests babel) PARASITES NIL) */ diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/babel.nix b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/babel.nix index 661a337da8..5a362fc1f0 100644 --- a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/babel.nix +++ b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/babel.nix @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: rec { baseName = ''babel''; - version = ''20191130-git''; + version = ''20200925-git''; description = ''Babel, a charset conversion library.''; deps = [ args."alexandria" args."trivial-features" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/babel/2019-11-30/babel-20191130-git.tgz''; - sha256 = ''0rnb7waq3fi51g2fxrazkyr2fmksqp0syjhni005vzzlbykmkavd''; + url = ''http://beta.quicklisp.org/archive/babel/2020-09-25/babel-20200925-git.tgz''; + sha256 = ''1hpjm2whw7zla9igzj50y3nibii0mfg2a6y6nslaf5vpkni88jfi''; }; packageName = "babel"; @@ -18,10 +18,10 @@ rec { overrides = x: x; } /* (SYSTEM babel DESCRIPTION Babel, a charset conversion library. SHA256 - 0rnb7waq3fi51g2fxrazkyr2fmksqp0syjhni005vzzlbykmkavd URL - http://beta.quicklisp.org/archive/babel/2019-11-30/babel-20191130-git.tgz - MD5 80087c99fe351d24e56bb279a62effeb NAME babel FILENAME babel DEPS + 1hpjm2whw7zla9igzj50y3nibii0mfg2a6y6nslaf5vpkni88jfi URL + http://beta.quicklisp.org/archive/babel/2020-09-25/babel-20200925-git.tgz + MD5 7f64d3be80bcba19d9caeaede5dea6d8 NAME babel FILENAME babel DEPS ((NAME alexandria FILENAME alexandria) (NAME trivial-features FILENAME trivial-features)) - DEPENDENCIES (alexandria trivial-features) VERSION 20191130-git SIBLINGS + DEPENDENCIES (alexandria trivial-features) VERSION 20200925-git SIBLINGS (babel-streams babel-tests) PARASITES NIL) */ diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/bordeaux-threads.nix b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/bordeaux-threads.nix index d53e238df8..cef514715e 100644 --- a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/bordeaux-threads.nix +++ b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/bordeaux-threads.nix @@ -1,7 +1,7 @@ args @ { fetchurl, ... }: rec { baseName = ''bordeaux-threads''; - version = ''v0.8.7''; + version = ''v0.8.8''; parasites = [ "bordeaux-threads/test" ]; @@ -10,8 +10,8 @@ rec { deps = [ args."alexandria" args."fiveam" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/bordeaux-threads/2019-11-30/bordeaux-threads-v0.8.7.tgz''; - sha256 = ''1an8fgam16nyhfninm0gl8k666f93k9j7kwmg43g8qcimyaj3l6w''; + url = ''http://beta.quicklisp.org/archive/bordeaux-threads/2020-06-10/bordeaux-threads-v0.8.8.tgz''; + sha256 = ''1ppb7lvr796k1j4hi0jnp717v9zxy6vq4f5cyzgn7svg1ic6l0pp''; }; packageName = "bordeaux-threads"; @@ -21,10 +21,10 @@ rec { } /* (SYSTEM bordeaux-threads DESCRIPTION Bordeaux Threads makes writing portable multi-threaded apps simple. SHA256 - 1an8fgam16nyhfninm0gl8k666f93k9j7kwmg43g8qcimyaj3l6w URL - http://beta.quicklisp.org/archive/bordeaux-threads/2019-11-30/bordeaux-threads-v0.8.7.tgz - MD5 071b427dd047999ffe038a2ef848ac13 NAME bordeaux-threads FILENAME + 1ppb7lvr796k1j4hi0jnp717v9zxy6vq4f5cyzgn7svg1ic6l0pp URL + http://beta.quicklisp.org/archive/bordeaux-threads/2020-06-10/bordeaux-threads-v0.8.8.tgz + MD5 1922316721bcaa10142ed07c31b178e5 NAME bordeaux-threads FILENAME bordeaux-threads DEPS ((NAME alexandria FILENAME alexandria) (NAME fiveam FILENAME fiveam)) - DEPENDENCIES (alexandria fiveam) VERSION v0.8.7 SIBLINGS NIL PARASITES + DEPENDENCIES (alexandria fiveam) VERSION v0.8.8 SIBLINGS NIL PARASITES (bordeaux-threads/test)) */ diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/caveman.nix b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/caveman.nix index 30b21ee93d..c90021bbee 100644 --- a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/caveman.nix +++ b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/caveman.nix @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: rec { baseName = ''caveman''; - version = ''20190813-git''; + version = ''20200325-git''; description = ''Web Application Framework for Common Lisp''; - deps = [ args."alexandria" args."anaphora" args."babel" args."bordeaux-threads" args."cffi" args."cffi-grovel" args."cffi-toolchain" args."chipz" args."chunga" args."circular-streams" args."cl_plus_ssl" args."cl-annot" args."cl-ansi-text" args."cl-base64" args."cl-colors" args."cl-cookie" args."cl-emb" args."cl-fad" args."cl-ppcre" args."cl-project" args."cl-reexport" args."cl-syntax" args."cl-syntax-annot" args."cl-utilities" args."clack" args."clack-handler-hunchentoot" args."clack-socket" args."clack-test" args."clack-v1-compat" args."dexador" args."dissect" args."do-urlencode" args."fast-http" args."fast-io" args."flexi-streams" args."http-body" args."hunchentoot" args."ironclad" args."jonathan" args."lack" args."lack-component" args."lack-middleware-backtrace" args."lack-util" args."let-plus" args."local-time" args."map-set" args."marshal" args."md5" args."myway" args."named-readtables" args."nibbles" args."proc-parse" args."prove" args."quri" args."rfc2388" args."rove" args."smart-buffer" args."split-sequence" args."static-vectors" args."trivial-backtrace" args."trivial-features" args."trivial-garbage" args."trivial-gray-streams" args."trivial-mimes" args."trivial-types" args."usocket" args."xsubseq" ]; + deps = [ args."alexandria" args."anaphora" args."babel" args."bordeaux-threads" args."cffi" args."cffi-grovel" args."cffi-toolchain" args."chipz" args."chunga" args."circular-streams" args."cl_plus_ssl" args."cl-annot" args."cl-ansi-text" args."cl-base64" args."cl-colors" args."cl-colors2" args."cl-cookie" args."cl-emb" args."cl-fad" args."cl-ppcre" args."cl-project" args."cl-reexport" args."cl-syntax" args."cl-syntax-annot" args."cl-utilities" args."clack" args."clack-handler-hunchentoot" args."clack-socket" args."clack-test" args."clack-v1-compat" args."dexador" args."dissect" args."do-urlencode" args."fast-http" args."fast-io" args."flexi-streams" args."http-body" args."hunchentoot" args."ironclad" args."jonathan" args."lack" args."lack-component" args."lack-middleware-backtrace" args."lack-util" args."let-plus" args."local-time" args."map-set" args."marshal" args."md5" args."myway" args."named-readtables" args."proc-parse" args."prove" args."quri" args."rfc2388" args."rove" args."smart-buffer" args."split-sequence" args."static-vectors" args."trivial-backtrace" args."trivial-features" args."trivial-garbage" args."trivial-gray-streams" args."trivial-mimes" args."trivial-types" args."usocket" args."xsubseq" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/caveman/2019-08-13/caveman-20190813-git.tgz''; - sha256 = ''017b3g3vm28awv8s68rwkwri7yq31a6lgdd7114ziis2a9fq9hyd''; + url = ''http://beta.quicklisp.org/archive/caveman/2020-03-25/caveman-20200325-git.tgz''; + sha256 = ''0s134lamlyll4ad0380rj0hkiy9gakly7cb6sjr1yg2yd6ydz1py''; }; packageName = "caveman"; @@ -18,9 +18,9 @@ rec { overrides = x: x; } /* (SYSTEM caveman DESCRIPTION Web Application Framework for Common Lisp SHA256 - 017b3g3vm28awv8s68rwkwri7yq31a6lgdd7114ziis2a9fq9hyd URL - http://beta.quicklisp.org/archive/caveman/2019-08-13/caveman-20190813-git.tgz - MD5 09d7223fd528757eaf1285dd99105ed6 NAME caveman FILENAME caveman DEPS + 0s134lamlyll4ad0380rj0hkiy9gakly7cb6sjr1yg2yd6ydz1py URL + http://beta.quicklisp.org/archive/caveman/2020-03-25/caveman-20200325-git.tgz + MD5 32a7cbce26c77f885a497117c8e94a13 NAME caveman FILENAME caveman DEPS ((NAME alexandria FILENAME alexandria) (NAME anaphora FILENAME anaphora) (NAME babel FILENAME babel) (NAME bordeaux-threads FILENAME bordeaux-threads) @@ -31,9 +31,9 @@ rec { (NAME cl+ssl FILENAME cl_plus_ssl) (NAME cl-annot FILENAME cl-annot) (NAME cl-ansi-text FILENAME cl-ansi-text) (NAME cl-base64 FILENAME cl-base64) (NAME cl-colors FILENAME cl-colors) - (NAME cl-cookie FILENAME cl-cookie) (NAME cl-emb FILENAME cl-emb) - (NAME cl-fad FILENAME cl-fad) (NAME cl-ppcre FILENAME cl-ppcre) - (NAME cl-project FILENAME cl-project) + (NAME cl-colors2 FILENAME cl-colors2) (NAME cl-cookie FILENAME cl-cookie) + (NAME cl-emb FILENAME cl-emb) (NAME cl-fad FILENAME cl-fad) + (NAME cl-ppcre FILENAME cl-ppcre) (NAME cl-project FILENAME cl-project) (NAME cl-reexport FILENAME cl-reexport) (NAME cl-syntax FILENAME cl-syntax) (NAME cl-syntax-annot FILENAME cl-syntax-annot) @@ -56,10 +56,9 @@ rec { (NAME marshal FILENAME marshal) (NAME md5 FILENAME md5) (NAME myway FILENAME myway) (NAME named-readtables FILENAME named-readtables) - (NAME nibbles FILENAME nibbles) (NAME proc-parse FILENAME proc-parse) - (NAME prove FILENAME prove) (NAME quri FILENAME quri) - (NAME rfc2388 FILENAME rfc2388) (NAME rove FILENAME rove) - (NAME smart-buffer FILENAME smart-buffer) + (NAME proc-parse FILENAME proc-parse) (NAME prove FILENAME prove) + (NAME quri FILENAME quri) (NAME rfc2388 FILENAME rfc2388) + (NAME rove FILENAME rove) (NAME smart-buffer FILENAME smart-buffer) (NAME split-sequence FILENAME split-sequence) (NAME static-vectors FILENAME static-vectors) (NAME trivial-backtrace FILENAME trivial-backtrace) @@ -72,16 +71,16 @@ rec { DEPENDENCIES (alexandria anaphora babel bordeaux-threads cffi cffi-grovel cffi-toolchain chipz chunga circular-streams cl+ssl cl-annot cl-ansi-text cl-base64 - cl-colors cl-cookie cl-emb cl-fad cl-ppcre cl-project cl-reexport - cl-syntax cl-syntax-annot cl-utilities clack clack-handler-hunchentoot - clack-socket clack-test clack-v1-compat dexador dissect do-urlencode - fast-http fast-io flexi-streams http-body hunchentoot ironclad jonathan - lack lack-component lack-middleware-backtrace lack-util let-plus - local-time map-set marshal md5 myway named-readtables nibbles proc-parse + cl-colors cl-colors2 cl-cookie cl-emb cl-fad cl-ppcre cl-project + cl-reexport cl-syntax cl-syntax-annot cl-utilities clack + clack-handler-hunchentoot clack-socket clack-test clack-v1-compat dexador + dissect do-urlencode fast-http fast-io flexi-streams http-body hunchentoot + ironclad jonathan lack lack-component lack-middleware-backtrace lack-util + let-plus local-time map-set marshal md5 myway named-readtables proc-parse prove quri rfc2388 rove smart-buffer split-sequence static-vectors trivial-backtrace trivial-features trivial-garbage trivial-gray-streams trivial-mimes trivial-types usocket xsubseq) - VERSION 20190813-git SIBLINGS + VERSION 20200325-git SIBLINGS (caveman-middleware-dbimanager caveman-test caveman2-db caveman2-test caveman2) PARASITES NIL) */ diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cffi-grovel.nix b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cffi-grovel.nix index a7d22ac129..e4d6546e90 100644 --- a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cffi-grovel.nix +++ b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cffi-grovel.nix @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: rec { baseName = ''cffi-grovel''; - version = ''cffi_0.20.1''; + version = ''cffi_0.23.0''; description = ''The CFFI Groveller''; deps = [ args."alexandria" args."babel" args."cffi" args."cffi-toolchain" args."trivial-features" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/cffi/2019-07-10/cffi_0.20.1.tgz''; - sha256 = ''0ppcwc61ww1igmkwpvzpr9hzsl8wpf8acxlamq5r0604iz07qhka''; + url = ''http://beta.quicklisp.org/archive/cffi/2020-07-15/cffi_0.23.0.tgz''; + sha256 = ''1szpbg5m5fjq7bpkblflpnwmgz3ncsvp1y43g3jzwlk7yfxrwxck''; }; packageName = "cffi-grovel"; @@ -18,13 +18,13 @@ rec { overrides = x: x; } /* (SYSTEM cffi-grovel DESCRIPTION The CFFI Groveller SHA256 - 0ppcwc61ww1igmkwpvzpr9hzsl8wpf8acxlamq5r0604iz07qhka URL - http://beta.quicklisp.org/archive/cffi/2019-07-10/cffi_0.20.1.tgz MD5 - b8a8337465a7b4c1be05270b777ce14f NAME cffi-grovel FILENAME cffi-grovel DEPS + 1szpbg5m5fjq7bpkblflpnwmgz3ncsvp1y43g3jzwlk7yfxrwxck URL + http://beta.quicklisp.org/archive/cffi/2020-07-15/cffi_0.23.0.tgz MD5 + a43e3c440fc4f20494e6d2347887c963 NAME cffi-grovel FILENAME cffi-grovel DEPS ((NAME alexandria FILENAME alexandria) (NAME babel FILENAME babel) (NAME cffi FILENAME cffi) (NAME cffi-toolchain FILENAME cffi-toolchain) (NAME trivial-features FILENAME trivial-features)) DEPENDENCIES (alexandria babel cffi cffi-toolchain trivial-features) - VERSION cffi_0.20.1 SIBLINGS + VERSION cffi_0.23.0 SIBLINGS (cffi-examples cffi-libffi cffi-tests cffi-toolchain cffi-uffi-compat cffi) PARASITES NIL) */ diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cffi-toolchain.nix b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cffi-toolchain.nix index 3d24638060..ad5ecb7acc 100644 --- a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cffi-toolchain.nix +++ b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cffi-toolchain.nix @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: rec { baseName = ''cffi-toolchain''; - version = ''cffi_0.20.1''; + version = ''cffi_0.23.0''; description = ''The CFFI toolchain''; deps = [ args."alexandria" args."babel" args."cffi" args."trivial-features" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/cffi/2019-07-10/cffi_0.20.1.tgz''; - sha256 = ''0ppcwc61ww1igmkwpvzpr9hzsl8wpf8acxlamq5r0604iz07qhka''; + url = ''http://beta.quicklisp.org/archive/cffi/2020-07-15/cffi_0.23.0.tgz''; + sha256 = ''1szpbg5m5fjq7bpkblflpnwmgz3ncsvp1y43g3jzwlk7yfxrwxck''; }; packageName = "cffi-toolchain"; @@ -18,14 +18,14 @@ rec { overrides = x: x; } /* (SYSTEM cffi-toolchain DESCRIPTION The CFFI toolchain SHA256 - 0ppcwc61ww1igmkwpvzpr9hzsl8wpf8acxlamq5r0604iz07qhka URL - http://beta.quicklisp.org/archive/cffi/2019-07-10/cffi_0.20.1.tgz MD5 - b8a8337465a7b4c1be05270b777ce14f NAME cffi-toolchain FILENAME + 1szpbg5m5fjq7bpkblflpnwmgz3ncsvp1y43g3jzwlk7yfxrwxck URL + http://beta.quicklisp.org/archive/cffi/2020-07-15/cffi_0.23.0.tgz MD5 + a43e3c440fc4f20494e6d2347887c963 NAME cffi-toolchain FILENAME cffi-toolchain DEPS ((NAME alexandria FILENAME alexandria) (NAME babel FILENAME babel) (NAME cffi FILENAME cffi) (NAME trivial-features FILENAME trivial-features)) - DEPENDENCIES (alexandria babel cffi trivial-features) VERSION cffi_0.20.1 + DEPENDENCIES (alexandria babel cffi trivial-features) VERSION cffi_0.23.0 SIBLINGS (cffi-examples cffi-grovel cffi-libffi cffi-tests cffi-uffi-compat cffi) PARASITES NIL) */ diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cffi.nix b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cffi.nix index b83b146119..e234301f1f 100644 --- a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cffi.nix +++ b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cffi.nix @@ -1,7 +1,7 @@ args @ { fetchurl, ... }: rec { baseName = ''cffi''; - version = ''cffi_0.20.1''; + version = ''cffi_0.23.0''; parasites = [ "cffi/c2ffi" "cffi/c2ffi-generator" ]; @@ -10,8 +10,8 @@ rec { deps = [ args."alexandria" args."babel" args."cl-json" args."cl-ppcre" args."trivial-features" args."uiop" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/cffi/2019-07-10/cffi_0.20.1.tgz''; - sha256 = ''0ppcwc61ww1igmkwpvzpr9hzsl8wpf8acxlamq5r0604iz07qhka''; + url = ''http://beta.quicklisp.org/archive/cffi/2020-07-15/cffi_0.23.0.tgz''; + sha256 = ''1szpbg5m5fjq7bpkblflpnwmgz3ncsvp1y43g3jzwlk7yfxrwxck''; }; packageName = "cffi"; @@ -20,15 +20,15 @@ rec { overrides = x: x; } /* (SYSTEM cffi DESCRIPTION The Common Foreign Function Interface SHA256 - 0ppcwc61ww1igmkwpvzpr9hzsl8wpf8acxlamq5r0604iz07qhka URL - http://beta.quicklisp.org/archive/cffi/2019-07-10/cffi_0.20.1.tgz MD5 - b8a8337465a7b4c1be05270b777ce14f NAME cffi FILENAME cffi DEPS + 1szpbg5m5fjq7bpkblflpnwmgz3ncsvp1y43g3jzwlk7yfxrwxck URL + http://beta.quicklisp.org/archive/cffi/2020-07-15/cffi_0.23.0.tgz MD5 + a43e3c440fc4f20494e6d2347887c963 NAME cffi FILENAME cffi DEPS ((NAME alexandria FILENAME alexandria) (NAME babel FILENAME babel) (NAME cl-json FILENAME cl-json) (NAME cl-ppcre FILENAME cl-ppcre) (NAME trivial-features FILENAME trivial-features) (NAME uiop FILENAME uiop)) DEPENDENCIES (alexandria babel cl-json cl-ppcre trivial-features uiop) - VERSION cffi_0.20.1 SIBLINGS + VERSION cffi_0.23.0 SIBLINGS (cffi-examples cffi-grovel cffi-libffi cffi-tests cffi-toolchain cffi-uffi-compat) PARASITES (cffi/c2ffi cffi/c2ffi-generator)) */ diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/chanl.nix b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/chanl.nix new file mode 100644 index 0000000000..b0dea4fbd2 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/chanl.nix @@ -0,0 +1,31 @@ +args @ { fetchurl, ... }: +rec { + baseName = ''chanl''; + version = ''20201016-git''; + + parasites = [ "chanl/examples" "chanl/tests" ]; + + description = ''Communicating Sequential Process support for Common Lisp''; + + deps = [ args."alexandria" args."bordeaux-threads" args."fiveam" ]; + + src = fetchurl { + url = ''http://beta.quicklisp.org/archive/chanl/2020-10-16/chanl-20201016-git.tgz''; + sha256 = ''13kmk6q20kkwy8z3fy0sv57076xf5nls3qx31yp47vaxhn9p11a1''; + }; + + packageName = "chanl"; + + asdFilesToKeep = ["chanl.asd"]; + overrides = x: x; +} +/* (SYSTEM chanl DESCRIPTION + Communicating Sequential Process support for Common Lisp SHA256 + 13kmk6q20kkwy8z3fy0sv57076xf5nls3qx31yp47vaxhn9p11a1 URL + http://beta.quicklisp.org/archive/chanl/2020-10-16/chanl-20201016-git.tgz + MD5 7870137f4c905f64290634ae3d0aa3fd NAME chanl FILENAME chanl DEPS + ((NAME alexandria FILENAME alexandria) + (NAME bordeaux-threads FILENAME bordeaux-threads) + (NAME fiveam FILENAME fiveam)) + DEPENDENCIES (alexandria bordeaux-threads fiveam) VERSION 20201016-git + SIBLINGS NIL PARASITES (chanl/examples chanl/tests)) */ diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/chunga.nix b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/chunga.nix index 41520bf41f..644daa8af9 100644 --- a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/chunga.nix +++ b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/chunga.nix @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: rec { baseName = ''chunga''; - version = ''20180131-git''; + version = ''20200427-git''; description = ''System lacks description''; deps = [ args."trivial-gray-streams" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/chunga/2018-01-31/chunga-20180131-git.tgz''; - sha256 = ''0crlv6n6al7j9b40dpfjd13870ih5hzwra29xxfg3zg2zy2kdnrq''; + url = ''http://beta.quicklisp.org/archive/chunga/2020-04-27/chunga-20200427-git.tgz''; + sha256 = ''0p6dlnan6raincd682brcjbklyvmkfkhz0yzp2bkfw67s9615bkk''; }; packageName = "chunga"; @@ -18,8 +18,8 @@ rec { overrides = x: x; } /* (SYSTEM chunga DESCRIPTION System lacks description SHA256 - 0crlv6n6al7j9b40dpfjd13870ih5hzwra29xxfg3zg2zy2kdnrq URL - http://beta.quicklisp.org/archive/chunga/2018-01-31/chunga-20180131-git.tgz - MD5 044b684535b11b1eee1cf939bec6e14a NAME chunga FILENAME chunga DEPS + 0p6dlnan6raincd682brcjbklyvmkfkhz0yzp2bkfw67s9615bkk URL + http://beta.quicklisp.org/archive/chunga/2020-04-27/chunga-20200427-git.tgz + MD5 ec31aa63a1b594a197ad45e5e65c4cc4 NAME chunga FILENAME chunga DEPS ((NAME trivial-gray-streams FILENAME trivial-gray-streams)) DEPENDENCIES - (trivial-gray-streams) VERSION 20180131-git SIBLINGS NIL PARASITES NIL) */ + (trivial-gray-streams) VERSION 20200427-git SIBLINGS NIL PARASITES NIL) */ diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-ansi-text.nix b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-ansi-text.nix index 9b053c920e..33f696f361 100644 --- a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-ansi-text.nix +++ b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-ansi-text.nix @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: rec { baseName = ''cl-ansi-text''; - version = ''20150804-git''; + version = ''20200218-git''; description = ''ANSI control string characters, focused on color''; - deps = [ args."alexandria" args."anaphora" args."cl-colors" args."let-plus" ]; + deps = [ args."alexandria" args."cl-colors2" args."cl-ppcre" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/cl-ansi-text/2015-08-04/cl-ansi-text-20150804-git.tgz''; - sha256 = ''112w7qg8yp28qyc2b5c7km457krr3xksxyps1icmgdpqf9ccpn2i''; + url = ''http://beta.quicklisp.org/archive/cl-ansi-text/2020-02-18/cl-ansi-text-20200218-git.tgz''; + sha256 = ''1yn657rka3pcg3p5g9czbpk0f0rv81dbq1gknid1b24zg7krks5r''; }; packageName = "cl-ansi-text"; @@ -19,11 +19,11 @@ rec { } /* (SYSTEM cl-ansi-text DESCRIPTION ANSI control string characters, focused on color SHA256 - 112w7qg8yp28qyc2b5c7km457krr3xksxyps1icmgdpqf9ccpn2i URL - http://beta.quicklisp.org/archive/cl-ansi-text/2015-08-04/cl-ansi-text-20150804-git.tgz - MD5 70aa38b40377a5e89a7f22bb68b3f796 NAME cl-ansi-text FILENAME + 1yn657rka3pcg3p5g9czbpk0f0rv81dbq1gknid1b24zg7krks5r URL + http://beta.quicklisp.org/archive/cl-ansi-text/2020-02-18/cl-ansi-text-20200218-git.tgz + MD5 2fccf2a06d73237ab421d9e62a2c6bd2 NAME cl-ansi-text FILENAME cl-ansi-text DEPS - ((NAME alexandria FILENAME alexandria) (NAME anaphora FILENAME anaphora) - (NAME cl-colors FILENAME cl-colors) (NAME let-plus FILENAME let-plus)) - DEPENDENCIES (alexandria anaphora cl-colors let-plus) VERSION 20150804-git - SIBLINGS (cl-ansi-text-test) PARASITES NIL) */ + ((NAME alexandria FILENAME alexandria) + (NAME cl-colors2 FILENAME cl-colors2) (NAME cl-ppcre FILENAME cl-ppcre)) + DEPENDENCIES (alexandria cl-colors2 cl-ppcre) VERSION 20200218-git SIBLINGS + (cl-ansi-text.test) PARASITES NIL) */ diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-async-repl.nix b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-async-repl.nix index 401ad78aa0..83d32317b5 100644 --- a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-async-repl.nix +++ b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-async-repl.nix @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: rec { baseName = ''cl-async-repl''; - version = ''cl-async-20191130-git''; + version = ''cl-async-20200610-git''; description = ''REPL integration for CL-ASYNC.''; deps = [ args."alexandria" args."babel" args."bordeaux-threads" args."cffi" args."cffi-grovel" args."cffi-toolchain" args."cl-async" args."cl-async-base" args."cl-async-util" args."cl-libuv" args."cl-ppcre" args."fast-io" args."static-vectors" args."trivial-features" args."trivial-gray-streams" args."vom" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/cl-async/2019-11-30/cl-async-20191130-git.tgz''; - sha256 = ''01kadvflif18f4i2l8iwx9jpg9543hrxagv4ad4q1k9500078vv2''; + url = ''http://beta.quicklisp.org/archive/cl-async/2020-06-10/cl-async-20200610-git.tgz''; + sha256 = ''10fyd36i5zlnxh69y1l7098b3h94l4hqwl0zhv0nshcs4sa7l37h''; }; packageName = "cl-async-repl"; @@ -18,9 +18,9 @@ rec { overrides = x: x; } /* (SYSTEM cl-async-repl DESCRIPTION REPL integration for CL-ASYNC. SHA256 - 01kadvflif18f4i2l8iwx9jpg9543hrxagv4ad4q1k9500078vv2 URL - http://beta.quicklisp.org/archive/cl-async/2019-11-30/cl-async-20191130-git.tgz - MD5 3850bc827b4c41b6047b962e3892bcb2 NAME cl-async-repl FILENAME + 10fyd36i5zlnxh69y1l7098b3h94l4hqwl0zhv0nshcs4sa7l37h URL + http://beta.quicklisp.org/archive/cl-async/2020-06-10/cl-async-20200610-git.tgz + MD5 4bf419e7ed94249648eb9d0013e7d360 NAME cl-async-repl FILENAME cl-async-repl DEPS ((NAME alexandria FILENAME alexandria) (NAME babel FILENAME babel) (NAME bordeaux-threads FILENAME bordeaux-threads) @@ -39,5 +39,5 @@ rec { (alexandria babel bordeaux-threads cffi cffi-grovel cffi-toolchain cl-async cl-async-base cl-async-util cl-libuv cl-ppcre fast-io static-vectors trivial-features trivial-gray-streams vom) - VERSION cl-async-20191130-git SIBLINGS + VERSION cl-async-20200610-git SIBLINGS (cl-async-ssl cl-async-test cl-async) PARASITES NIL) */ diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-async-ssl.nix b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-async-ssl.nix index 73bbce5709..606a4ffc21 100644 --- a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-async-ssl.nix +++ b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-async-ssl.nix @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: rec { baseName = ''cl-async-ssl''; - version = ''cl-async-20191130-git''; + version = ''cl-async-20200610-git''; description = ''SSL Wrapper around cl-async socket implementation.''; deps = [ args."alexandria" args."babel" args."bordeaux-threads" args."cffi" args."cffi-grovel" args."cffi-toolchain" args."cl-async" args."cl-async-base" args."cl-async-util" args."cl-libuv" args."cl-ppcre" args."fast-io" args."static-vectors" args."trivial-features" args."trivial-gray-streams" args."vom" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/cl-async/2019-11-30/cl-async-20191130-git.tgz''; - sha256 = ''01kadvflif18f4i2l8iwx9jpg9543hrxagv4ad4q1k9500078vv2''; + url = ''http://beta.quicklisp.org/archive/cl-async/2020-06-10/cl-async-20200610-git.tgz''; + sha256 = ''10fyd36i5zlnxh69y1l7098b3h94l4hqwl0zhv0nshcs4sa7l37h''; }; packageName = "cl-async-ssl"; @@ -19,9 +19,9 @@ rec { } /* (SYSTEM cl-async-ssl DESCRIPTION SSL Wrapper around cl-async socket implementation. SHA256 - 01kadvflif18f4i2l8iwx9jpg9543hrxagv4ad4q1k9500078vv2 URL - http://beta.quicklisp.org/archive/cl-async/2019-11-30/cl-async-20191130-git.tgz - MD5 3850bc827b4c41b6047b962e3892bcb2 NAME cl-async-ssl FILENAME + 10fyd36i5zlnxh69y1l7098b3h94l4hqwl0zhv0nshcs4sa7l37h URL + http://beta.quicklisp.org/archive/cl-async/2020-06-10/cl-async-20200610-git.tgz + MD5 4bf419e7ed94249648eb9d0013e7d360 NAME cl-async-ssl FILENAME cl-async-ssl DEPS ((NAME alexandria FILENAME alexandria) (NAME babel FILENAME babel) (NAME bordeaux-threads FILENAME bordeaux-threads) @@ -40,5 +40,5 @@ rec { (alexandria babel bordeaux-threads cffi cffi-grovel cffi-toolchain cl-async cl-async-base cl-async-util cl-libuv cl-ppcre fast-io static-vectors trivial-features trivial-gray-streams vom) - VERSION cl-async-20191130-git SIBLINGS + VERSION cl-async-20200610-git SIBLINGS (cl-async-repl cl-async-test cl-async) PARASITES NIL) */ diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-async.nix b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-async.nix index 1346431f6f..f2ad6b509d 100644 --- a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-async.nix +++ b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-async.nix @@ -1,7 +1,7 @@ args @ { fetchurl, ... }: rec { baseName = ''cl-async''; - version = ''20191130-git''; + version = ''20200610-git''; parasites = [ "cl-async-base" "cl-async-util" ]; @@ -10,8 +10,8 @@ rec { deps = [ args."alexandria" args."babel" args."bordeaux-threads" args."cffi" args."cffi-grovel" args."cffi-toolchain" args."cl-libuv" args."cl-ppcre" args."fast-io" args."static-vectors" args."trivial-features" args."trivial-gray-streams" args."uiop" args."vom" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/cl-async/2019-11-30/cl-async-20191130-git.tgz''; - sha256 = ''01kadvflif18f4i2l8iwx9jpg9543hrxagv4ad4q1k9500078vv2''; + url = ''http://beta.quicklisp.org/archive/cl-async/2020-06-10/cl-async-20200610-git.tgz''; + sha256 = ''10fyd36i5zlnxh69y1l7098b3h94l4hqwl0zhv0nshcs4sa7l37h''; }; packageName = "cl-async"; @@ -20,9 +20,9 @@ rec { overrides = x: x; } /* (SYSTEM cl-async DESCRIPTION Asynchronous operations for Common Lisp. SHA256 - 01kadvflif18f4i2l8iwx9jpg9543hrxagv4ad4q1k9500078vv2 URL - http://beta.quicklisp.org/archive/cl-async/2019-11-30/cl-async-20191130-git.tgz - MD5 3850bc827b4c41b6047b962e3892bcb2 NAME cl-async FILENAME cl-async DEPS + 10fyd36i5zlnxh69y1l7098b3h94l4hqwl0zhv0nshcs4sa7l37h URL + http://beta.quicklisp.org/archive/cl-async/2020-06-10/cl-async-20200610-git.tgz + MD5 4bf419e7ed94249648eb9d0013e7d360 NAME cl-async FILENAME cl-async DEPS ((NAME alexandria FILENAME alexandria) (NAME babel FILENAME babel) (NAME bordeaux-threads FILENAME bordeaux-threads) (NAME cffi FILENAME cffi) (NAME cffi-grovel FILENAME cffi-grovel) @@ -37,5 +37,5 @@ rec { (alexandria babel bordeaux-threads cffi cffi-grovel cffi-toolchain cl-libuv cl-ppcre fast-io static-vectors trivial-features trivial-gray-streams uiop vom) - VERSION 20191130-git SIBLINGS (cl-async-repl cl-async-ssl cl-async-test) + VERSION 20200610-git SIBLINGS (cl-async-repl cl-async-ssl cl-async-test) PARASITES (cl-async-base cl-async-util)) */ diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-base64.nix b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-base64.nix index a4a9a9261f..15843d1c2f 100644 --- a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-base64.nix +++ b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-base64.nix @@ -1,17 +1,17 @@ args @ { fetchurl, ... }: rec { baseName = ''cl-base64''; - version = ''20150923-git''; + version = ''20201016-git''; - parasites = [ "cl-base64-tests" ]; + parasites = [ "cl-base64/test" ]; description = ''Base64 encoding and decoding with URI support.''; deps = [ args."kmrcl" args."ptester" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/cl-base64/2015-09-23/cl-base64-20150923-git.tgz''; - sha256 = ''0haip5x0091r9xa8gdzr21s0rk432998nbxxfys35lhnyc1vgyhp''; + url = ''http://beta.quicklisp.org/archive/cl-base64/2020-10-16/cl-base64-20201016-git.tgz''; + sha256 = ''1wd2sgvfrivrbzlhs1vgj762jqz7sk171ssli6gl1kfwbnphzx9z''; }; packageName = "cl-base64"; @@ -20,9 +20,9 @@ rec { overrides = x: x; } /* (SYSTEM cl-base64 DESCRIPTION Base64 encoding and decoding with URI support. - SHA256 0haip5x0091r9xa8gdzr21s0rk432998nbxxfys35lhnyc1vgyhp URL - http://beta.quicklisp.org/archive/cl-base64/2015-09-23/cl-base64-20150923-git.tgz - MD5 560d0601eaa86901611f1484257b9a57 NAME cl-base64 FILENAME cl-base64 DEPS + SHA256 1wd2sgvfrivrbzlhs1vgj762jqz7sk171ssli6gl1kfwbnphzx9z URL + http://beta.quicklisp.org/archive/cl-base64/2020-10-16/cl-base64-20201016-git.tgz + MD5 f556f7c61f785c84abdc1beb63c906ae NAME cl-base64 FILENAME cl-base64 DEPS ((NAME kmrcl FILENAME kmrcl) (NAME ptester FILENAME ptester)) DEPENDENCIES - (kmrcl ptester) VERSION 20150923-git SIBLINGS NIL PARASITES - (cl-base64-tests)) */ + (kmrcl ptester) VERSION 20201016-git SIBLINGS NIL PARASITES + (cl-base64/test)) */ diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-cffi-gtk-cairo.nix b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-cffi-gtk-cairo.nix new file mode 100644 index 0000000000..d240e3e842 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-cffi-gtk-cairo.nix @@ -0,0 +1,39 @@ +args @ { fetchurl, ... }: +rec { + baseName = ''cl-cffi-gtk-cairo''; + version = ''cl-cffi-gtk-20201016-git''; + + description = ''A Lisp binding to Cairo''; + + deps = [ args."alexandria" args."babel" args."bordeaux-threads" args."cffi" args."cl-cffi-gtk-glib" args."iterate" args."trivial-features" ]; + + src = fetchurl { + url = ''http://beta.quicklisp.org/archive/cl-cffi-gtk/2020-10-16/cl-cffi-gtk-20201016-git.tgz''; + sha256 = ''1m91597nwwrps32awvk57k3h4jjq603ja0kf395n2jxvckfz0a55''; + }; + + packageName = "cl-cffi-gtk-cairo"; + + asdFilesToKeep = ["cl-cffi-gtk-cairo.asd"]; + overrides = x: x; +} +/* (SYSTEM cl-cffi-gtk-cairo DESCRIPTION A Lisp binding to Cairo SHA256 + 1m91597nwwrps32awvk57k3h4jjq603ja0kf395n2jxvckfz0a55 URL + http://beta.quicklisp.org/archive/cl-cffi-gtk/2020-10-16/cl-cffi-gtk-20201016-git.tgz + MD5 7eef130d69af506c68b2d98271215fbd NAME cl-cffi-gtk-cairo FILENAME + cl-cffi-gtk-cairo DEPS + ((NAME alexandria FILENAME alexandria) (NAME babel FILENAME babel) + (NAME bordeaux-threads FILENAME bordeaux-threads) + (NAME cffi FILENAME cffi) + (NAME cl-cffi-gtk-glib FILENAME cl-cffi-gtk-glib) + (NAME iterate FILENAME iterate) + (NAME trivial-features FILENAME trivial-features)) + DEPENDENCIES + (alexandria babel bordeaux-threads cffi cl-cffi-gtk-glib iterate + trivial-features) + VERSION cl-cffi-gtk-20201016-git SIBLINGS + (cl-cffi-gtk-demo-cairo cl-cffi-gtk-demo-glib cl-cffi-gtk-demo-gobject + cl-cffi-gtk-example-gtk cl-cffi-gtk-opengl-demo cl-cffi-gtk-gdk-pixbuf + cl-cffi-gtk-gdk cl-cffi-gtk-gio cl-cffi-gtk-glib cl-cffi-gtk-gobject + cl-cffi-gtk cl-cffi-gtk-pango) + PARASITES NIL) */ diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-cffi-gtk-gdk-pixbuf.nix b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-cffi-gtk-gdk-pixbuf.nix new file mode 100644 index 0000000000..0c2d3abc28 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-cffi-gtk-gdk-pixbuf.nix @@ -0,0 +1,41 @@ +args @ { fetchurl, ... }: +rec { + baseName = ''cl-cffi-gtk-gdk-pixbuf''; + version = ''cl-cffi-gtk-20201016-git''; + + description = ''A Lisp binding to GDK Pixbuf 2''; + + deps = [ args."alexandria" args."babel" args."bordeaux-threads" args."cffi" args."cl-cffi-gtk-glib" args."cl-cffi-gtk-gobject" args."closer-mop" args."iterate" args."trivial-features" args."trivial-garbage" ]; + + src = fetchurl { + url = ''http://beta.quicklisp.org/archive/cl-cffi-gtk/2020-10-16/cl-cffi-gtk-20201016-git.tgz''; + sha256 = ''1m91597nwwrps32awvk57k3h4jjq603ja0kf395n2jxvckfz0a55''; + }; + + packageName = "cl-cffi-gtk-gdk-pixbuf"; + + asdFilesToKeep = ["cl-cffi-gtk-gdk-pixbuf.asd"]; + overrides = x: x; +} +/* (SYSTEM cl-cffi-gtk-gdk-pixbuf DESCRIPTION A Lisp binding to GDK Pixbuf 2 + SHA256 1m91597nwwrps32awvk57k3h4jjq603ja0kf395n2jxvckfz0a55 URL + http://beta.quicklisp.org/archive/cl-cffi-gtk/2020-10-16/cl-cffi-gtk-20201016-git.tgz + MD5 7eef130d69af506c68b2d98271215fbd NAME cl-cffi-gtk-gdk-pixbuf FILENAME + cl-cffi-gtk-gdk-pixbuf DEPS + ((NAME alexandria FILENAME alexandria) (NAME babel FILENAME babel) + (NAME bordeaux-threads FILENAME bordeaux-threads) + (NAME cffi FILENAME cffi) + (NAME cl-cffi-gtk-glib FILENAME cl-cffi-gtk-glib) + (NAME cl-cffi-gtk-gobject FILENAME cl-cffi-gtk-gobject) + (NAME closer-mop FILENAME closer-mop) (NAME iterate FILENAME iterate) + (NAME trivial-features FILENAME trivial-features) + (NAME trivial-garbage FILENAME trivial-garbage)) + DEPENDENCIES + (alexandria babel bordeaux-threads cffi cl-cffi-gtk-glib + cl-cffi-gtk-gobject closer-mop iterate trivial-features trivial-garbage) + VERSION cl-cffi-gtk-20201016-git SIBLINGS + (cl-cffi-gtk-cairo cl-cffi-gtk-demo-cairo cl-cffi-gtk-demo-glib + cl-cffi-gtk-demo-gobject cl-cffi-gtk-example-gtk cl-cffi-gtk-opengl-demo + cl-cffi-gtk-gdk cl-cffi-gtk-gio cl-cffi-gtk-glib cl-cffi-gtk-gobject + cl-cffi-gtk cl-cffi-gtk-pango) + PARASITES NIL) */ diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-cffi-gtk-gdk.nix b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-cffi-gtk-gdk.nix new file mode 100644 index 0000000000..748cc9a0d6 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-cffi-gtk-gdk.nix @@ -0,0 +1,47 @@ +args @ { fetchurl, ... }: +rec { + baseName = ''cl-cffi-gtk-gdk''; + version = ''cl-cffi-gtk-20201016-git''; + + description = ''A Lisp binding to GDK 3''; + + deps = [ args."alexandria" args."babel" args."bordeaux-threads" args."cffi" args."cl-cffi-gtk-cairo" args."cl-cffi-gtk-gdk-pixbuf" args."cl-cffi-gtk-gio" args."cl-cffi-gtk-glib" args."cl-cffi-gtk-gobject" args."cl-cffi-gtk-pango" args."closer-mop" args."iterate" args."trivial-features" args."trivial-garbage" ]; + + src = fetchurl { + url = ''http://beta.quicklisp.org/archive/cl-cffi-gtk/2020-10-16/cl-cffi-gtk-20201016-git.tgz''; + sha256 = ''1m91597nwwrps32awvk57k3h4jjq603ja0kf395n2jxvckfz0a55''; + }; + + packageName = "cl-cffi-gtk-gdk"; + + asdFilesToKeep = ["cl-cffi-gtk-gdk.asd"]; + overrides = x: x; +} +/* (SYSTEM cl-cffi-gtk-gdk DESCRIPTION A Lisp binding to GDK 3 SHA256 + 1m91597nwwrps32awvk57k3h4jjq603ja0kf395n2jxvckfz0a55 URL + http://beta.quicklisp.org/archive/cl-cffi-gtk/2020-10-16/cl-cffi-gtk-20201016-git.tgz + MD5 7eef130d69af506c68b2d98271215fbd NAME cl-cffi-gtk-gdk FILENAME + cl-cffi-gtk-gdk DEPS + ((NAME alexandria FILENAME alexandria) (NAME babel FILENAME babel) + (NAME bordeaux-threads FILENAME bordeaux-threads) + (NAME cffi FILENAME cffi) + (NAME cl-cffi-gtk-cairo FILENAME cl-cffi-gtk-cairo) + (NAME cl-cffi-gtk-gdk-pixbuf FILENAME cl-cffi-gtk-gdk-pixbuf) + (NAME cl-cffi-gtk-gio FILENAME cl-cffi-gtk-gio) + (NAME cl-cffi-gtk-glib FILENAME cl-cffi-gtk-glib) + (NAME cl-cffi-gtk-gobject FILENAME cl-cffi-gtk-gobject) + (NAME cl-cffi-gtk-pango FILENAME cl-cffi-gtk-pango) + (NAME closer-mop FILENAME closer-mop) (NAME iterate FILENAME iterate) + (NAME trivial-features FILENAME trivial-features) + (NAME trivial-garbage FILENAME trivial-garbage)) + DEPENDENCIES + (alexandria babel bordeaux-threads cffi cl-cffi-gtk-cairo + cl-cffi-gtk-gdk-pixbuf cl-cffi-gtk-gio cl-cffi-gtk-glib + cl-cffi-gtk-gobject cl-cffi-gtk-pango closer-mop iterate trivial-features + trivial-garbage) + VERSION cl-cffi-gtk-20201016-git SIBLINGS + (cl-cffi-gtk-cairo cl-cffi-gtk-demo-cairo cl-cffi-gtk-demo-glib + cl-cffi-gtk-demo-gobject cl-cffi-gtk-example-gtk cl-cffi-gtk-opengl-demo + cl-cffi-gtk-gdk-pixbuf cl-cffi-gtk-gio cl-cffi-gtk-glib + cl-cffi-gtk-gobject cl-cffi-gtk cl-cffi-gtk-pango) + PARASITES NIL) */ diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-cffi-gtk-gio.nix b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-cffi-gtk-gio.nix new file mode 100644 index 0000000000..af53a59458 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-cffi-gtk-gio.nix @@ -0,0 +1,41 @@ +args @ { fetchurl, ... }: +rec { + baseName = ''cl-cffi-gtk-gio''; + version = ''cl-cffi-gtk-20201016-git''; + + description = ''A Lisp binding to GIO 2''; + + deps = [ args."alexandria" args."babel" args."bordeaux-threads" args."cffi" args."cl-cffi-gtk-glib" args."cl-cffi-gtk-gobject" args."closer-mop" args."iterate" args."trivial-features" args."trivial-garbage" ]; + + src = fetchurl { + url = ''http://beta.quicklisp.org/archive/cl-cffi-gtk/2020-10-16/cl-cffi-gtk-20201016-git.tgz''; + sha256 = ''1m91597nwwrps32awvk57k3h4jjq603ja0kf395n2jxvckfz0a55''; + }; + + packageName = "cl-cffi-gtk-gio"; + + asdFilesToKeep = ["cl-cffi-gtk-gio.asd"]; + overrides = x: x; +} +/* (SYSTEM cl-cffi-gtk-gio DESCRIPTION A Lisp binding to GIO 2 SHA256 + 1m91597nwwrps32awvk57k3h4jjq603ja0kf395n2jxvckfz0a55 URL + http://beta.quicklisp.org/archive/cl-cffi-gtk/2020-10-16/cl-cffi-gtk-20201016-git.tgz + MD5 7eef130d69af506c68b2d98271215fbd NAME cl-cffi-gtk-gio FILENAME + cl-cffi-gtk-gio DEPS + ((NAME alexandria FILENAME alexandria) (NAME babel FILENAME babel) + (NAME bordeaux-threads FILENAME bordeaux-threads) + (NAME cffi FILENAME cffi) + (NAME cl-cffi-gtk-glib FILENAME cl-cffi-gtk-glib) + (NAME cl-cffi-gtk-gobject FILENAME cl-cffi-gtk-gobject) + (NAME closer-mop FILENAME closer-mop) (NAME iterate FILENAME iterate) + (NAME trivial-features FILENAME trivial-features) + (NAME trivial-garbage FILENAME trivial-garbage)) + DEPENDENCIES + (alexandria babel bordeaux-threads cffi cl-cffi-gtk-glib + cl-cffi-gtk-gobject closer-mop iterate trivial-features trivial-garbage) + VERSION cl-cffi-gtk-20201016-git SIBLINGS + (cl-cffi-gtk-cairo cl-cffi-gtk-demo-cairo cl-cffi-gtk-demo-glib + cl-cffi-gtk-demo-gobject cl-cffi-gtk-example-gtk cl-cffi-gtk-opengl-demo + cl-cffi-gtk-gdk-pixbuf cl-cffi-gtk-gdk cl-cffi-gtk-glib + cl-cffi-gtk-gobject cl-cffi-gtk cl-cffi-gtk-pango) + PARASITES NIL) */ diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-cffi-gtk-glib.nix b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-cffi-gtk-glib.nix new file mode 100644 index 0000000000..4ad75bf507 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-cffi-gtk-glib.nix @@ -0,0 +1,36 @@ +args @ { fetchurl, ... }: +rec { + baseName = ''cl-cffi-gtk-glib''; + version = ''cl-cffi-gtk-20201016-git''; + + description = ''A Lisp binding to GLib 2''; + + deps = [ args."alexandria" args."babel" args."bordeaux-threads" args."cffi" args."iterate" args."trivial-features" ]; + + src = fetchurl { + url = ''http://beta.quicklisp.org/archive/cl-cffi-gtk/2020-10-16/cl-cffi-gtk-20201016-git.tgz''; + sha256 = ''1m91597nwwrps32awvk57k3h4jjq603ja0kf395n2jxvckfz0a55''; + }; + + packageName = "cl-cffi-gtk-glib"; + + asdFilesToKeep = ["cl-cffi-gtk-glib.asd"]; + overrides = x: x; +} +/* (SYSTEM cl-cffi-gtk-glib DESCRIPTION A Lisp binding to GLib 2 SHA256 + 1m91597nwwrps32awvk57k3h4jjq603ja0kf395n2jxvckfz0a55 URL + http://beta.quicklisp.org/archive/cl-cffi-gtk/2020-10-16/cl-cffi-gtk-20201016-git.tgz + MD5 7eef130d69af506c68b2d98271215fbd NAME cl-cffi-gtk-glib FILENAME + cl-cffi-gtk-glib DEPS + ((NAME alexandria FILENAME alexandria) (NAME babel FILENAME babel) + (NAME bordeaux-threads FILENAME bordeaux-threads) + (NAME cffi FILENAME cffi) (NAME iterate FILENAME iterate) + (NAME trivial-features FILENAME trivial-features)) + DEPENDENCIES + (alexandria babel bordeaux-threads cffi iterate trivial-features) VERSION + cl-cffi-gtk-20201016-git SIBLINGS + (cl-cffi-gtk-cairo cl-cffi-gtk-demo-cairo cl-cffi-gtk-demo-glib + cl-cffi-gtk-demo-gobject cl-cffi-gtk-example-gtk cl-cffi-gtk-opengl-demo + cl-cffi-gtk-gdk-pixbuf cl-cffi-gtk-gdk cl-cffi-gtk-gio cl-cffi-gtk-gobject + cl-cffi-gtk cl-cffi-gtk-pango) + PARASITES NIL) */ diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-cffi-gtk-gobject.nix b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-cffi-gtk-gobject.nix new file mode 100644 index 0000000000..c2e2deef00 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-cffi-gtk-gobject.nix @@ -0,0 +1,40 @@ +args @ { fetchurl, ... }: +rec { + baseName = ''cl-cffi-gtk-gobject''; + version = ''cl-cffi-gtk-20201016-git''; + + description = ''A Lisp binding GObject 2''; + + deps = [ args."alexandria" args."babel" args."bordeaux-threads" args."cffi" args."cl-cffi-gtk-glib" args."closer-mop" args."iterate" args."trivial-features" args."trivial-garbage" ]; + + src = fetchurl { + url = ''http://beta.quicklisp.org/archive/cl-cffi-gtk/2020-10-16/cl-cffi-gtk-20201016-git.tgz''; + sha256 = ''1m91597nwwrps32awvk57k3h4jjq603ja0kf395n2jxvckfz0a55''; + }; + + packageName = "cl-cffi-gtk-gobject"; + + asdFilesToKeep = ["cl-cffi-gtk-gobject.asd"]; + overrides = x: x; +} +/* (SYSTEM cl-cffi-gtk-gobject DESCRIPTION A Lisp binding GObject 2 SHA256 + 1m91597nwwrps32awvk57k3h4jjq603ja0kf395n2jxvckfz0a55 URL + http://beta.quicklisp.org/archive/cl-cffi-gtk/2020-10-16/cl-cffi-gtk-20201016-git.tgz + MD5 7eef130d69af506c68b2d98271215fbd NAME cl-cffi-gtk-gobject FILENAME + cl-cffi-gtk-gobject DEPS + ((NAME alexandria FILENAME alexandria) (NAME babel FILENAME babel) + (NAME bordeaux-threads FILENAME bordeaux-threads) + (NAME cffi FILENAME cffi) + (NAME cl-cffi-gtk-glib FILENAME cl-cffi-gtk-glib) + (NAME closer-mop FILENAME closer-mop) (NAME iterate FILENAME iterate) + (NAME trivial-features FILENAME trivial-features) + (NAME trivial-garbage FILENAME trivial-garbage)) + DEPENDENCIES + (alexandria babel bordeaux-threads cffi cl-cffi-gtk-glib closer-mop iterate + trivial-features trivial-garbage) + VERSION cl-cffi-gtk-20201016-git SIBLINGS + (cl-cffi-gtk-cairo cl-cffi-gtk-demo-cairo cl-cffi-gtk-demo-glib + cl-cffi-gtk-demo-gobject cl-cffi-gtk-example-gtk cl-cffi-gtk-opengl-demo + cl-cffi-gtk-gdk-pixbuf cl-cffi-gtk-gdk cl-cffi-gtk-gio cl-cffi-gtk-glib + cl-cffi-gtk cl-cffi-gtk-pango) + PARASITES NIL) */ diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-cffi-gtk-pango.nix b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-cffi-gtk-pango.nix new file mode 100644 index 0000000000..896528cf16 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-cffi-gtk-pango.nix @@ -0,0 +1,42 @@ +args @ { fetchurl, ... }: +rec { + baseName = ''cl-cffi-gtk-pango''; + version = ''cl-cffi-gtk-20201016-git''; + + description = ''A Lisp binding to Pango''; + + deps = [ args."alexandria" args."babel" args."bordeaux-threads" args."cffi" args."cl-cffi-gtk-cairo" args."cl-cffi-gtk-glib" args."cl-cffi-gtk-gobject" args."closer-mop" args."iterate" args."trivial-features" args."trivial-garbage" ]; + + src = fetchurl { + url = ''http://beta.quicklisp.org/archive/cl-cffi-gtk/2020-10-16/cl-cffi-gtk-20201016-git.tgz''; + sha256 = ''1m91597nwwrps32awvk57k3h4jjq603ja0kf395n2jxvckfz0a55''; + }; + + packageName = "cl-cffi-gtk-pango"; + + asdFilesToKeep = ["cl-cffi-gtk-pango.asd"]; + overrides = x: x; +} +/* (SYSTEM cl-cffi-gtk-pango DESCRIPTION A Lisp binding to Pango SHA256 + 1m91597nwwrps32awvk57k3h4jjq603ja0kf395n2jxvckfz0a55 URL + http://beta.quicklisp.org/archive/cl-cffi-gtk/2020-10-16/cl-cffi-gtk-20201016-git.tgz + MD5 7eef130d69af506c68b2d98271215fbd NAME cl-cffi-gtk-pango FILENAME + cl-cffi-gtk-pango DEPS + ((NAME alexandria FILENAME alexandria) (NAME babel FILENAME babel) + (NAME bordeaux-threads FILENAME bordeaux-threads) + (NAME cffi FILENAME cffi) + (NAME cl-cffi-gtk-cairo FILENAME cl-cffi-gtk-cairo) + (NAME cl-cffi-gtk-glib FILENAME cl-cffi-gtk-glib) + (NAME cl-cffi-gtk-gobject FILENAME cl-cffi-gtk-gobject) + (NAME closer-mop FILENAME closer-mop) (NAME iterate FILENAME iterate) + (NAME trivial-features FILENAME trivial-features) + (NAME trivial-garbage FILENAME trivial-garbage)) + DEPENDENCIES + (alexandria babel bordeaux-threads cffi cl-cffi-gtk-cairo cl-cffi-gtk-glib + cl-cffi-gtk-gobject closer-mop iterate trivial-features trivial-garbage) + VERSION cl-cffi-gtk-20201016-git SIBLINGS + (cl-cffi-gtk-cairo cl-cffi-gtk-demo-cairo cl-cffi-gtk-demo-glib + cl-cffi-gtk-demo-gobject cl-cffi-gtk-example-gtk cl-cffi-gtk-opengl-demo + cl-cffi-gtk-gdk-pixbuf cl-cffi-gtk-gdk cl-cffi-gtk-gio cl-cffi-gtk-glib + cl-cffi-gtk-gobject cl-cffi-gtk) + PARASITES NIL) */ diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-cffi-gtk.nix b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-cffi-gtk.nix new file mode 100644 index 0000000000..7055aec512 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-cffi-gtk.nix @@ -0,0 +1,48 @@ +args @ { fetchurl, ... }: +rec { + baseName = ''cl-cffi-gtk''; + version = ''20201016-git''; + + description = ''A Lisp binding to GTK 3''; + + deps = [ args."alexandria" args."babel" args."bordeaux-threads" args."cffi" args."cl-cffi-gtk-cairo" args."cl-cffi-gtk-gdk" args."cl-cffi-gtk-gdk-pixbuf" args."cl-cffi-gtk-gio" args."cl-cffi-gtk-glib" args."cl-cffi-gtk-gobject" args."cl-cffi-gtk-pango" args."closer-mop" args."iterate" args."trivial-features" args."trivial-garbage" ]; + + src = fetchurl { + url = ''http://beta.quicklisp.org/archive/cl-cffi-gtk/2020-10-16/cl-cffi-gtk-20201016-git.tgz''; + sha256 = ''1m91597nwwrps32awvk57k3h4jjq603ja0kf395n2jxvckfz0a55''; + }; + + packageName = "cl-cffi-gtk"; + + asdFilesToKeep = ["cl-cffi-gtk.asd"]; + overrides = x: x; +} +/* (SYSTEM cl-cffi-gtk DESCRIPTION A Lisp binding to GTK 3 SHA256 + 1m91597nwwrps32awvk57k3h4jjq603ja0kf395n2jxvckfz0a55 URL + http://beta.quicklisp.org/archive/cl-cffi-gtk/2020-10-16/cl-cffi-gtk-20201016-git.tgz + MD5 7eef130d69af506c68b2d98271215fbd NAME cl-cffi-gtk FILENAME cl-cffi-gtk + DEPS + ((NAME alexandria FILENAME alexandria) (NAME babel FILENAME babel) + (NAME bordeaux-threads FILENAME bordeaux-threads) + (NAME cffi FILENAME cffi) + (NAME cl-cffi-gtk-cairo FILENAME cl-cffi-gtk-cairo) + (NAME cl-cffi-gtk-gdk FILENAME cl-cffi-gtk-gdk) + (NAME cl-cffi-gtk-gdk-pixbuf FILENAME cl-cffi-gtk-gdk-pixbuf) + (NAME cl-cffi-gtk-gio FILENAME cl-cffi-gtk-gio) + (NAME cl-cffi-gtk-glib FILENAME cl-cffi-gtk-glib) + (NAME cl-cffi-gtk-gobject FILENAME cl-cffi-gtk-gobject) + (NAME cl-cffi-gtk-pango FILENAME cl-cffi-gtk-pango) + (NAME closer-mop FILENAME closer-mop) (NAME iterate FILENAME iterate) + (NAME trivial-features FILENAME trivial-features) + (NAME trivial-garbage FILENAME trivial-garbage)) + DEPENDENCIES + (alexandria babel bordeaux-threads cffi cl-cffi-gtk-cairo cl-cffi-gtk-gdk + cl-cffi-gtk-gdk-pixbuf cl-cffi-gtk-gio cl-cffi-gtk-glib + cl-cffi-gtk-gobject cl-cffi-gtk-pango closer-mop iterate trivial-features + trivial-garbage) + VERSION 20201016-git SIBLINGS + (cl-cffi-gtk-cairo cl-cffi-gtk-demo-cairo cl-cffi-gtk-demo-glib + cl-cffi-gtk-demo-gobject cl-cffi-gtk-example-gtk cl-cffi-gtk-opengl-demo + cl-cffi-gtk-gdk-pixbuf cl-cffi-gtk-gdk cl-cffi-gtk-gio cl-cffi-gtk-glib + cl-cffi-gtk-gobject cl-cffi-gtk-pango) + PARASITES NIL) */ diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-colors2.nix b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-colors2.nix new file mode 100644 index 0000000000..519f43ff32 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-colors2.nix @@ -0,0 +1,30 @@ +args @ { fetchurl, ... }: +rec { + baseName = ''cl-colors2''; + version = ''20200218-git''; + + parasites = [ "cl-colors2/tests" ]; + + description = ''Simple color library for Common Lisp''; + + deps = [ args."alexandria" args."cl-ppcre" args."clunit2" ]; + + src = fetchurl { + url = ''http://beta.quicklisp.org/archive/cl-colors2/2020-02-18/cl-colors2-20200218-git.tgz''; + sha256 = ''0rpf8j232qv254zhkvkz3ja20al1kswvcqhvvv0r2ag6dks56j29''; + }; + + packageName = "cl-colors2"; + + asdFilesToKeep = ["cl-colors2.asd"]; + overrides = x: x; +} +/* (SYSTEM cl-colors2 DESCRIPTION Simple color library for Common Lisp SHA256 + 0rpf8j232qv254zhkvkz3ja20al1kswvcqhvvv0r2ag6dks56j29 URL + http://beta.quicklisp.org/archive/cl-colors2/2020-02-18/cl-colors2-20200218-git.tgz + MD5 054283564f17af46a09e259ff509b656 NAME cl-colors2 FILENAME cl-colors2 + DEPS + ((NAME alexandria FILENAME alexandria) (NAME cl-ppcre FILENAME cl-ppcre) + (NAME clunit2 FILENAME clunit2)) + DEPENDENCIES (alexandria cl-ppcre clunit2) VERSION 20200218-git SIBLINGS + NIL PARASITES (cl-colors2/tests)) */ diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-containers.nix b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-containers.nix index 9b558402ce..bd0483b452 100644 --- a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-containers.nix +++ b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-containers.nix @@ -1,7 +1,7 @@ args @ { fetchurl, ... }: -{ +rec { baseName = ''cl-containers''; - version = ''20170403-git''; + version = ''20200427-git''; parasites = [ "cl-containers/with-moptilities" "cl-containers/with-utilities" ]; @@ -10,8 +10,8 @@ args @ { fetchurl, ... }: deps = [ args."asdf-system-connections" args."metatilities-base" args."moptilities" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/cl-containers/2017-04-03/cl-containers-20170403-git.tgz''; - sha256 = ''0wlwbz5xv3468iszvmfxnj924mdwx0lyzmhsggiq7iq7ip8wbbxg''; + url = ''http://beta.quicklisp.org/archive/cl-containers/2020-04-27/cl-containers-20200427-git.tgz''; + sha256 = ''0llaymnlss0dhwyqgr2s38w1hjb2as1x1nn57qcvdphnm7qs50fy''; }; packageName = "cl-containers"; @@ -21,13 +21,13 @@ args @ { fetchurl, ... }: } /* (SYSTEM cl-containers DESCRIPTION A generic container library for Common Lisp SHA256 - 0wlwbz5xv3468iszvmfxnj924mdwx0lyzmhsggiq7iq7ip8wbbxg URL - http://beta.quicklisp.org/archive/cl-containers/2017-04-03/cl-containers-20170403-git.tgz - MD5 17123cd2b018cd3eb048eceef78be3f8 NAME cl-containers FILENAME + 0llaymnlss0dhwyqgr2s38w1hjb2as1x1nn57qcvdphnm7qs50fy URL + http://beta.quicklisp.org/archive/cl-containers/2020-04-27/cl-containers-20200427-git.tgz + MD5 bb0e03a581e9b617dd166a3f511eaf6a NAME cl-containers FILENAME cl-containers DEPS ((NAME asdf-system-connections FILENAME asdf-system-connections) (NAME metatilities-base FILENAME metatilities-base) (NAME moptilities FILENAME moptilities)) DEPENDENCIES (asdf-system-connections metatilities-base moptilities) - VERSION 20170403-git SIBLINGS (cl-containers-test) PARASITES + VERSION 20200427-git SIBLINGS (cl-containers-test) PARASITES (cl-containers/with-moptilities cl-containers/with-utilities)) */ diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-cookie.nix b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-cookie.nix index 5a03d4df4f..ddc3611d50 100644 --- a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-cookie.nix +++ b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-cookie.nix @@ -5,7 +5,7 @@ rec { description = ''HTTP cookie manager''; - deps = [ args."alexandria" args."babel" args."bordeaux-threads" args."cl-fad" args."cl-ppcre" args."cl-utilities" args."local-time" args."proc-parse" args."quri" args."split-sequence" args."trivial-features" ]; + deps = [ args."alexandria" args."babel" args."cl-ppcre" args."cl-utilities" args."local-time" args."proc-parse" args."quri" args."split-sequence" args."trivial-features" ]; src = fetchurl { url = ''http://beta.quicklisp.org/archive/cl-cookie/2019-10-07/cl-cookie-20191007-git.tgz''; @@ -22,14 +22,13 @@ rec { http://beta.quicklisp.org/archive/cl-cookie/2019-10-07/cl-cookie-20191007-git.tgz MD5 37595a6705fdd77415b859aea90d30bc NAME cl-cookie FILENAME cl-cookie DEPS ((NAME alexandria FILENAME alexandria) (NAME babel FILENAME babel) - (NAME bordeaux-threads FILENAME bordeaux-threads) - (NAME cl-fad FILENAME cl-fad) (NAME cl-ppcre FILENAME cl-ppcre) + (NAME cl-ppcre FILENAME cl-ppcre) (NAME cl-utilities FILENAME cl-utilities) (NAME local-time FILENAME local-time) (NAME proc-parse FILENAME proc-parse) (NAME quri FILENAME quri) (NAME split-sequence FILENAME split-sequence) (NAME trivial-features FILENAME trivial-features)) DEPENDENCIES - (alexandria babel bordeaux-threads cl-fad cl-ppcre cl-utilities local-time - proc-parse quri split-sequence trivial-features) + (alexandria babel cl-ppcre cl-utilities local-time proc-parse quri + split-sequence trivial-features) VERSION 20191007-git SIBLINGS (cl-cookie-test) PARASITES NIL) */ diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-csv.nix b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-csv.nix index 1f20b17672..051ffabfc5 100644 --- a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-csv.nix +++ b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-csv.nix @@ -1,17 +1,17 @@ args @ { fetchurl, ... }: rec { baseName = ''cl-csv''; - version = ''20180831-git''; + version = ''20201016-git''; - parasites = [ "cl-csv/test" ]; + parasites = [ "cl-csv/speed-test" "cl-csv/test" ]; description = ''Facilities for reading and writing CSV format files''; deps = [ args."alexandria" args."cl-interpol" args."cl-ppcre" args."cl-unicode" args."flexi-streams" args."iterate" args."lisp-unit2" args."named-readtables" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/cl-csv/2018-08-31/cl-csv-20180831-git.tgz''; - sha256 = ''0cy2pnzm3c6hmimp0kl5nz03rw6nzgy37i1ifpg9grmd3wipm9fd''; + url = ''http://beta.quicklisp.org/archive/cl-csv/2020-10-16/cl-csv-20201016-git.tgz''; + sha256 = ''1w12ads26v5sgcmy6rjm6ys9lml7l6rz86w776s2an2maci9kzmf''; }; packageName = "cl-csv"; @@ -21,9 +21,9 @@ rec { } /* (SYSTEM cl-csv DESCRIPTION Facilities for reading and writing CSV format files SHA256 - 0cy2pnzm3c6hmimp0kl5nz03rw6nzgy37i1ifpg9grmd3wipm9fd URL - http://beta.quicklisp.org/archive/cl-csv/2018-08-31/cl-csv-20180831-git.tgz - MD5 4bd0ef366dea9d48c4581ed73a208cf3 NAME cl-csv FILENAME cl-csv DEPS + 1w12ads26v5sgcmy6rjm6ys9lml7l6rz86w776s2an2maci9kzmf URL + http://beta.quicklisp.org/archive/cl-csv/2020-10-16/cl-csv-20201016-git.tgz + MD5 3e067784236ab620857fe738dafedb4b NAME cl-csv FILENAME cl-csv DEPS ((NAME alexandria FILENAME alexandria) (NAME cl-interpol FILENAME cl-interpol) (NAME cl-ppcre FILENAME cl-ppcre) (NAME cl-unicode FILENAME cl-unicode) @@ -33,5 +33,5 @@ rec { DEPENDENCIES (alexandria cl-interpol cl-ppcre cl-unicode flexi-streams iterate lisp-unit2 named-readtables) - VERSION 20180831-git SIBLINGS (cl-csv-clsql cl-csv-data-table) PARASITES - (cl-csv/test)) */ + VERSION 20201016-git SIBLINGS (cl-csv-clsql cl-csv-data-table) PARASITES + (cl-csv/speed-test cl-csv/test)) */ diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-dbi.nix b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-dbi.nix index 186d321f83..c5d0f114e1 100644 --- a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-dbi.nix +++ b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-dbi.nix @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: rec { baseName = ''cl-dbi''; - version = ''20191007-git''; + version = ''20200610-git''; description = ''System lacks description''; - deps = [ args."alexandria" args."bordeaux-threads" args."cl-annot" args."cl-syntax" args."cl-syntax-annot" args."closer-mop" args."dbi" args."named-readtables" args."split-sequence" args."trivial-types" ]; + deps = [ args."alexandria" args."bordeaux-threads" args."closer-mop" args."dbi" args."split-sequence" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/cl-dbi/2019-10-07/cl-dbi-20191007-git.tgz''; - sha256 = ''0xsg0xqq88wsx6wf8nllfd0mk356bw2qw3c5c31rfj41wz5vpx35''; + url = ''http://beta.quicklisp.org/archive/cl-dbi/2020-06-10/cl-dbi-20200610-git.tgz''; + sha256 = ''1d7hwywcqzqwmr5b42c0mmjq3v3xxd4cwb4fn5k1wd7j6pr0bkas''; }; packageName = "cl-dbi"; @@ -18,19 +18,13 @@ rec { overrides = x: x; } /* (SYSTEM cl-dbi DESCRIPTION System lacks description SHA256 - 0xsg0xqq88wsx6wf8nllfd0mk356bw2qw3c5c31rfj41wz5vpx35 URL - http://beta.quicklisp.org/archive/cl-dbi/2019-10-07/cl-dbi-20191007-git.tgz - MD5 bf524c4000468d12627fa419ae412abb NAME cl-dbi FILENAME cl-dbi DEPS + 1d7hwywcqzqwmr5b42c0mmjq3v3xxd4cwb4fn5k1wd7j6pr0bkas URL + http://beta.quicklisp.org/archive/cl-dbi/2020-06-10/cl-dbi-20200610-git.tgz + MD5 2caeb911b23327e054986211d6bfea55 NAME cl-dbi FILENAME cl-dbi DEPS ((NAME alexandria FILENAME alexandria) (NAME bordeaux-threads FILENAME bordeaux-threads) - (NAME cl-annot FILENAME cl-annot) (NAME cl-syntax FILENAME cl-syntax) - (NAME cl-syntax-annot FILENAME cl-syntax-annot) (NAME closer-mop FILENAME closer-mop) (NAME dbi FILENAME dbi) - (NAME named-readtables FILENAME named-readtables) - (NAME split-sequence FILENAME split-sequence) - (NAME trivial-types FILENAME trivial-types)) - DEPENDENCIES - (alexandria bordeaux-threads cl-annot cl-syntax cl-syntax-annot closer-mop - dbi named-readtables split-sequence trivial-types) - VERSION 20191007-git SIBLINGS + (NAME split-sequence FILENAME split-sequence)) + DEPENDENCIES (alexandria bordeaux-threads closer-mop dbi split-sequence) + VERSION 20200610-git SIBLINGS (dbd-mysql dbd-postgres dbd-sqlite3 dbi-test dbi) PARASITES NIL) */ diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-dot.nix b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-dot.nix new file mode 100644 index 0000000000..53cf2214ed --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-dot.nix @@ -0,0 +1,25 @@ +args @ { fetchurl, ... }: +rec { + baseName = ''cl-dot''; + version = ''20200925-git''; + + description = ''Generate Dot Output from Arbitrary Lisp Data''; + + deps = [ args."uiop" ]; + + src = fetchurl { + url = ''http://beta.quicklisp.org/archive/cl-dot/2020-09-25/cl-dot-20200925-git.tgz''; + sha256 = ''01vx4yzasmgswrlyagjr2cz76g906jsijdwikdf8wvxyyq77gkla''; + }; + + packageName = "cl-dot"; + + asdFilesToKeep = ["cl-dot.asd"]; + overrides = x: x; +} +/* (SYSTEM cl-dot DESCRIPTION Generate Dot Output from Arbitrary Lisp Data + SHA256 01vx4yzasmgswrlyagjr2cz76g906jsijdwikdf8wvxyyq77gkla URL + http://beta.quicklisp.org/archive/cl-dot/2020-09-25/cl-dot-20200925-git.tgz + MD5 35c68f431f188d4c1c7604b4b1af220f NAME cl-dot FILENAME cl-dot DEPS + ((NAME uiop FILENAME uiop)) DEPENDENCIES (uiop) VERSION 20200925-git + SIBLINGS NIL PARASITES NIL) */ diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-fad.nix b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-fad.nix index fd715a17ce..12d7a7ae27 100644 --- a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-fad.nix +++ b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-fad.nix @@ -1,7 +1,7 @@ args @ { fetchurl, ... }: rec { baseName = ''cl-fad''; - version = ''20190813-git''; + version = ''20200610-git''; parasites = [ "cl-fad-test" ]; @@ -10,8 +10,8 @@ rec { deps = [ args."alexandria" args."bordeaux-threads" args."cl-ppcre" args."unit-test" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/cl-fad/2019-08-13/cl-fad-20190813-git.tgz''; - sha256 = ''0kixjb6cqpcmlac5mh4qjlnhjbww32f3pn89g0cnwvz952y8nlng''; + url = ''http://beta.quicklisp.org/archive/cl-fad/2020-06-10/cl-fad-20200610-git.tgz''; + sha256 = ''08d0q2jpjz4djz20w8m86rfkili8g0vdbkkmvn8c88qmvcr79k5x''; }; packageName = "cl-fad"; @@ -20,11 +20,11 @@ rec { overrides = x: x; } /* (SYSTEM cl-fad DESCRIPTION Portable pathname library SHA256 - 0kixjb6cqpcmlac5mh4qjlnhjbww32f3pn89g0cnwvz952y8nlng URL - http://beta.quicklisp.org/archive/cl-fad/2019-08-13/cl-fad-20190813-git.tgz - MD5 7d0405b44fefccb8a807527249ee2700 NAME cl-fad FILENAME cl-fad DEPS + 08d0q2jpjz4djz20w8m86rfkili8g0vdbkkmvn8c88qmvcr79k5x URL + http://beta.quicklisp.org/archive/cl-fad/2020-06-10/cl-fad-20200610-git.tgz + MD5 3229249f64a5ca0f32ce9448e4f554ea NAME cl-fad FILENAME cl-fad DEPS ((NAME alexandria FILENAME alexandria) (NAME bordeaux-threads FILENAME bordeaux-threads) (NAME cl-ppcre FILENAME cl-ppcre) (NAME unit-test FILENAME unit-test)) DEPENDENCIES (alexandria bordeaux-threads cl-ppcre unit-test) VERSION - 20190813-git SIBLINGS NIL PARASITES (cl-fad-test)) */ + 20200610-git SIBLINGS NIL PARASITES (cl-fad-test)) */ diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-fuse.nix b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-fuse.nix index a581c5a268..b0a549096b 100644 --- a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-fuse.nix +++ b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-fuse.nix @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: rec { baseName = ''cl-fuse''; - version = ''20191227-git''; + version = ''20200925-git''; description = ''CFFI bindings to FUSE (Filesystem in user space)''; deps = [ args."alexandria" args."babel" args."bordeaux-threads" args."cffi" args."cffi-grovel" args."cffi-toolchain" args."cl-utilities" args."iterate" args."trivial-backtrace" args."trivial-features" args."trivial-utf-8" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/cl-fuse/2019-12-27/cl-fuse-20191227-git.tgz''; - sha256 = ''1yvzixbbwmi87w9zwc1nf2xngxrb3a2q3sp4l2g3751hbd4i0m38''; + url = ''http://beta.quicklisp.org/archive/cl-fuse/2020-09-25/cl-fuse-20200925-git.tgz''; + sha256 = ''1c5cn0l0md77asw804qssylcbbphw81mfpbijydd0s25q6xga7dp''; }; packageName = "cl-fuse"; @@ -18,9 +18,9 @@ rec { overrides = x: x; } /* (SYSTEM cl-fuse DESCRIPTION CFFI bindings to FUSE (Filesystem in user space) - SHA256 1yvzixbbwmi87w9zwc1nf2xngxrb3a2q3sp4l2g3751hbd4i0m38 URL - http://beta.quicklisp.org/archive/cl-fuse/2019-12-27/cl-fuse-20191227-git.tgz - MD5 3c6f85db7797a2890d8303d11595100d NAME cl-fuse FILENAME cl-fuse DEPS + SHA256 1c5cn0l0md77asw804qssylcbbphw81mfpbijydd0s25q6xga7dp URL + http://beta.quicklisp.org/archive/cl-fuse/2020-09-25/cl-fuse-20200925-git.tgz + MD5 0342ea914801f40d804629170a435e54 NAME cl-fuse FILENAME cl-fuse DEPS ((NAME alexandria FILENAME alexandria) (NAME babel FILENAME babel) (NAME bordeaux-threads FILENAME bordeaux-threads) (NAME cffi FILENAME cffi) (NAME cffi-grovel FILENAME cffi-grovel) @@ -32,4 +32,4 @@ rec { DEPENDENCIES (alexandria babel bordeaux-threads cffi cffi-grovel cffi-toolchain cl-utilities iterate trivial-backtrace trivial-features trivial-utf-8) - VERSION 20191227-git SIBLINGS NIL PARASITES NIL) */ + VERSION 20200925-git SIBLINGS NIL PARASITES NIL) */ diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-html-parse.nix b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-html-parse.nix index 61a35f2b58..6cd859c2ca 100644 --- a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-html-parse.nix +++ b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-html-parse.nix @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: rec { baseName = ''cl-html-parse''; - version = ''20161031-git''; + version = ''20200925-git''; description = ''HTML Parser''; deps = [ ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/cl-html-parse/2016-10-31/cl-html-parse-20161031-git.tgz''; - sha256 = ''0i0nl630p9l6rqylydhfqrlqhl5sfq94a9wglx0dajk8gkkqjbnb''; + url = ''http://beta.quicklisp.org/archive/cl-html-parse/2020-09-25/cl-html-parse-20200925-git.tgz''; + sha256 = ''14pfd4gwjb8ywr79dqrcznw6h8a1il3g5b6cm5x9aiyr49zdv15f''; }; packageName = "cl-html-parse"; @@ -18,8 +18,8 @@ rec { overrides = x: x; } /* (SYSTEM cl-html-parse DESCRIPTION HTML Parser SHA256 - 0i0nl630p9l6rqylydhfqrlqhl5sfq94a9wglx0dajk8gkkqjbnb URL - http://beta.quicklisp.org/archive/cl-html-parse/2016-10-31/cl-html-parse-20161031-git.tgz - MD5 7fe933c461eaf2dd442da189d6827a72 NAME cl-html-parse FILENAME - cl-html-parse DEPS NIL DEPENDENCIES NIL VERSION 20161031-git SIBLINGS NIL + 14pfd4gwjb8ywr79dqrcznw6h8a1il3g5b6cm5x9aiyr49zdv15f URL + http://beta.quicklisp.org/archive/cl-html-parse/2020-09-25/cl-html-parse-20200925-git.tgz + MD5 3333eedf037a48900c663fceae3e4cfd NAME cl-html-parse FILENAME + cl-html-parse DEPS NIL DEPENDENCIES NIL VERSION 20200925-git SIBLINGS NIL PARASITES NIL) */ diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-interpol.nix b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-interpol.nix index b0be8c775a..50ad66faa2 100644 --- a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-interpol.nix +++ b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-interpol.nix @@ -1,7 +1,7 @@ args @ { fetchurl, ... }: rec { baseName = ''cl-interpol''; - version = ''20180711-git''; + version = ''20200715-git''; parasites = [ "cl-interpol-test" ]; @@ -10,8 +10,8 @@ rec { deps = [ args."cl-ppcre" args."cl-unicode" args."flexi-streams" args."named-readtables" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/cl-interpol/2018-07-11/cl-interpol-20180711-git.tgz''; - sha256 = ''1s88m5kci9y9h3ycvqm0xjzbkbd8zhm9rxp2a674hmgrjfqras0r''; + url = ''http://beta.quicklisp.org/archive/cl-interpol/2020-07-15/cl-interpol-20200715-git.tgz''; + sha256 = ''0qbmpgnlg9y6ykwahmw1q8b058krmcq47w3gx75xz920im46wvmw''; }; packageName = "cl-interpol"; @@ -20,12 +20,12 @@ rec { overrides = x: x; } /* (SYSTEM cl-interpol DESCRIPTION System lacks description SHA256 - 1s88m5kci9y9h3ycvqm0xjzbkbd8zhm9rxp2a674hmgrjfqras0r URL - http://beta.quicklisp.org/archive/cl-interpol/2018-07-11/cl-interpol-20180711-git.tgz - MD5 b2d6893ef703c5b6e5736fa33ba0794e NAME cl-interpol FILENAME cl-interpol + 0qbmpgnlg9y6ykwahmw1q8b058krmcq47w3gx75xz920im46wvmw URL + http://beta.quicklisp.org/archive/cl-interpol/2020-07-15/cl-interpol-20200715-git.tgz + MD5 24a2c8907e35e0a276c37c4b1999681c NAME cl-interpol FILENAME cl-interpol DEPS ((NAME cl-ppcre FILENAME cl-ppcre) (NAME cl-unicode FILENAME cl-unicode) (NAME flexi-streams FILENAME flexi-streams) (NAME named-readtables FILENAME named-readtables)) DEPENDENCIES (cl-ppcre cl-unicode flexi-streams named-readtables) VERSION - 20180711-git SIBLINGS NIL PARASITES (cl-interpol-test)) */ + 20200715-git SIBLINGS NIL PARASITES (cl-interpol-test)) */ diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-libuv.nix b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-libuv.nix index 36d1567342..ad4780cebe 100644 --- a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-libuv.nix +++ b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-libuv.nix @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: rec { baseName = ''cl-libuv''; - version = ''20190107-git''; + version = ''20200610-git''; description = ''Low-level libuv bindings for Common Lisp.''; deps = [ args."alexandria" args."babel" args."cffi" args."cffi-grovel" args."cffi-toolchain" args."trivial-features" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/cl-libuv/2019-01-07/cl-libuv-20190107-git.tgz''; - sha256 = ''1cfr29i5j78qy7ax2fs1z4nqyz3kx9121rlpdika12n1zvnhrcm8''; + url = ''http://beta.quicklisp.org/archive/cl-libuv/2020-06-10/cl-libuv-20200610-git.tgz''; + sha256 = ''1ywk1z1ibyk3z0irg5azjrjk3x08ixv30fx4qa0p500fmbfhha19''; }; packageName = "cl-libuv"; @@ -18,13 +18,13 @@ rec { overrides = x: x; } /* (SYSTEM cl-libuv DESCRIPTION Low-level libuv bindings for Common Lisp. - SHA256 1cfr29i5j78qy7ax2fs1z4nqyz3kx9121rlpdika12n1zvnhrcm8 URL - http://beta.quicklisp.org/archive/cl-libuv/2019-01-07/cl-libuv-20190107-git.tgz - MD5 c09c505dc45812cc773454ffc6fdbd38 NAME cl-libuv FILENAME cl-libuv DEPS + SHA256 1ywk1z1ibyk3z0irg5azjrjk3x08ixv30fx4qa0p500fmbfhha19 URL + http://beta.quicklisp.org/archive/cl-libuv/2020-06-10/cl-libuv-20200610-git.tgz + MD5 e6b3f8ffa7b8fb642350f09d1afa7f38 NAME cl-libuv FILENAME cl-libuv DEPS ((NAME alexandria FILENAME alexandria) (NAME babel FILENAME babel) (NAME cffi FILENAME cffi) (NAME cffi-grovel FILENAME cffi-grovel) (NAME cffi-toolchain FILENAME cffi-toolchain) (NAME trivial-features FILENAME trivial-features)) DEPENDENCIES (alexandria babel cffi cffi-grovel cffi-toolchain trivial-features) VERSION - 20190107-git SIBLINGS NIL PARASITES NIL) */ + 20200610-git SIBLINGS NIL PARASITES NIL) */ diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-locale.nix b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-locale.nix new file mode 100644 index 0000000000..f0d727a633 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-locale.nix @@ -0,0 +1,37 @@ +args @ { fetchurl, ... }: +rec { + baseName = ''cl-locale''; + version = ''20151031-git''; + + description = ''Simple i18n library for Common Lisp''; + + deps = [ args."alexandria" args."anaphora" args."arnesi" args."cl-annot" args."cl-syntax" args."cl-syntax-annot" args."closer-mop" args."collectors" args."iterate" args."named-readtables" args."symbol-munger" args."trivial-types" ]; + + src = fetchurl { + url = ''http://beta.quicklisp.org/archive/cl-locale/2015-10-31/cl-locale-20151031-git.tgz''; + sha256 = ''14j4xazrx2v5cj4q4irfwra0ksvl2l0s7073fimpwc0xqjfsnjpg''; + }; + + packageName = "cl-locale"; + + asdFilesToKeep = ["cl-locale.asd"]; + overrides = x: x; +} +/* (SYSTEM cl-locale DESCRIPTION Simple i18n library for Common Lisp SHA256 + 14j4xazrx2v5cj4q4irfwra0ksvl2l0s7073fimpwc0xqjfsnjpg URL + http://beta.quicklisp.org/archive/cl-locale/2015-10-31/cl-locale-20151031-git.tgz + MD5 7a8fb3678938af6dc5c9fd6431428aff NAME cl-locale FILENAME cl-locale DEPS + ((NAME alexandria FILENAME alexandria) (NAME anaphora FILENAME anaphora) + (NAME arnesi FILENAME arnesi) (NAME cl-annot FILENAME cl-annot) + (NAME cl-syntax FILENAME cl-syntax) + (NAME cl-syntax-annot FILENAME cl-syntax-annot) + (NAME closer-mop FILENAME closer-mop) + (NAME collectors FILENAME collectors) (NAME iterate FILENAME iterate) + (NAME named-readtables FILENAME named-readtables) + (NAME symbol-munger FILENAME symbol-munger) + (NAME trivial-types FILENAME trivial-types)) + DEPENDENCIES + (alexandria anaphora arnesi cl-annot cl-syntax cl-syntax-annot closer-mop + collectors iterate named-readtables symbol-munger trivial-types) + VERSION 20151031-git SIBLINGS (cl-locale-syntax cl-locale-test) PARASITES + NIL) */ diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-log.nix b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-log.nix deleted file mode 100644 index 9c623c2278..0000000000 --- a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-log.nix +++ /dev/null @@ -1,24 +0,0 @@ -{ fetchurl, ... }: -{ - baseName = ''cl-log''; - version = ''cl-log.1.0.1''; - - description = ''CL-LOG - a general purpose logging utility''; - - deps = [ ]; - - src = fetchurl { - url = ''http://beta.quicklisp.org/archive/cl-log/2013-01-28/cl-log.1.0.1.tgz''; - sha256 = ''0wdbq0x6xn21qp3zd49giss3viv8wbs3ga8bg2grfnmzwfwl0y2d''; - }; - - packageName = "cl-log"; - - asdFilesToKeep = ["cl-log.asd"]; - overrides = x: x; -} -/* (SYSTEM cl-log DESCRIPTION CL-LOG - a general purpose logging utility SHA256 - 0wdbq0x6xn21qp3zd49giss3viv8wbs3ga8bg2grfnmzwfwl0y2d URL - http://beta.quicklisp.org/archive/cl-log/2013-01-28/cl-log.1.0.1.tgz MD5 - fb960933eb748c14adc3ccb376ac8066 NAME cl-log FILENAME cl-log DEPS NIL - DEPENDENCIES NIL VERSION cl-log.1.0.1 SIBLINGS (cl-log-test) PARASITES NIL) */ diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-markdown.nix b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-markdown.nix deleted file mode 100644 index 0f3d0c126f..0000000000 --- a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-markdown.nix +++ /dev/null @@ -1,36 +0,0 @@ -args @ { fetchurl, ... }: -{ - baseName = ''cl-markdown''; - version = ''20101006-darcs''; - - description = ''''; - - deps = [ args."anaphora" args."asdf-system-connections" args."cl-containers" args."cl-ppcre" args."dynamic-classes" args."metabang-bind" args."metatilities-base" ]; - - src = fetchurl { - url = ''http://beta.quicklisp.org/archive/cl-markdown/2010-10-06/cl-markdown-20101006-darcs.tgz''; - sha256 = ''1hrv7szhmhxgbadwrmf6wx4kwkbg3dnabbsz4hfffzjgprwac79w''; - }; - - packageName = "cl-markdown"; - - asdFilesToKeep = ["cl-markdown.asd"]; - overrides = x: x; -} -/* (SYSTEM cl-markdown DESCRIPTION NIL SHA256 - 1hrv7szhmhxgbadwrmf6wx4kwkbg3dnabbsz4hfffzjgprwac79w URL - http://beta.quicklisp.org/archive/cl-markdown/2010-10-06/cl-markdown-20101006-darcs.tgz - MD5 3e748529531ad1dcbee5443fe24b6300 NAME cl-markdown FILENAME cl-markdown - DEPS - ((NAME anaphora FILENAME anaphora) - (NAME asdf-system-connections FILENAME asdf-system-connections) - (NAME cl-containers FILENAME cl-containers) - (NAME cl-ppcre FILENAME cl-ppcre) - (NAME dynamic-classes FILENAME dynamic-classes) - (NAME metabang-bind FILENAME metabang-bind) - (NAME metatilities-base FILENAME metatilities-base)) - DEPENDENCIES - (anaphora asdf-system-connections cl-containers cl-ppcre dynamic-classes - metabang-bind metatilities-base) - VERSION 20101006-darcs SIBLINGS (cl-markdown-comparisons cl-markdown-test) - PARASITES NIL) */ diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-mysql.nix b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-mysql.nix index 1590f2536e..97b714d8b6 100644 --- a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-mysql.nix +++ b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-mysql.nix @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: rec { baseName = ''cl-mysql''; - version = ''20171019-git''; + version = ''20200610-git''; description = ''Common Lisp MySQL library bindings''; deps = [ args."alexandria" args."babel" args."cffi" args."trivial-features" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/cl-mysql/2017-10-19/cl-mysql-20171019-git.tgz''; - sha256 = ''1ga44gkwg6lm225gqpacpqpr6bpswszmw1ba9jhvjpjm09zinyc5''; + url = ''http://beta.quicklisp.org/archive/cl-mysql/2020-06-10/cl-mysql-20200610-git.tgz''; + sha256 = ''0fzyqzz01zn9fy8v766lib3dghg9yq5wawa0hcmxslms7knzxz7w''; }; packageName = "cl-mysql"; @@ -18,11 +18,11 @@ rec { overrides = x: x; } /* (SYSTEM cl-mysql DESCRIPTION Common Lisp MySQL library bindings SHA256 - 1ga44gkwg6lm225gqpacpqpr6bpswszmw1ba9jhvjpjm09zinyc5 URL - http://beta.quicklisp.org/archive/cl-mysql/2017-10-19/cl-mysql-20171019-git.tgz - MD5 e1021da4d35cbb584d4df4f0d7e2bbb9 NAME cl-mysql FILENAME cl-mysql DEPS + 0fzyqzz01zn9fy8v766lib3dghg9yq5wawa0hcmxslms7knzxz7w URL + http://beta.quicklisp.org/archive/cl-mysql/2020-06-10/cl-mysql-20200610-git.tgz + MD5 05d5ed6b48edbafd258e189d7868822e NAME cl-mysql FILENAME cl-mysql DEPS ((NAME alexandria FILENAME alexandria) (NAME babel FILENAME babel) (NAME cffi FILENAME cffi) (NAME trivial-features FILENAME trivial-features)) - DEPENDENCIES (alexandria babel cffi trivial-features) VERSION 20171019-git + DEPENDENCIES (alexandria babel cffi trivial-features) VERSION 20200610-git SIBLINGS (cl-mysql-test) PARASITES NIL) */ diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-postgres.nix b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-postgres.nix index 9ef0248157..85212e6132 100644 --- a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-postgres.nix +++ b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-postgres.nix @@ -1,17 +1,17 @@ args @ { fetchurl, ... }: rec { baseName = ''cl-postgres''; - version = ''postmodern-20191227-git''; + version = ''postmodern-20201016-git''; - parasites = [ "cl-postgres/tests" ]; + parasites = [ "cl-postgres/simple-date-tests" "cl-postgres/tests" ]; description = ''Low-level client library for PostgreSQL''; - deps = [ args."fiveam" args."md5" args."split-sequence" args."usocket" ]; + deps = [ args."alexandria" args."bordeaux-threads" args."cl-base64" args."cl-ppcre" args."fiveam" args."ironclad" args."md5" args."simple-date" args."simple-date_slash_postgres-glue" args."split-sequence" args."uax-15" args."usocket" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/postmodern/2019-12-27/postmodern-20191227-git.tgz''; - sha256 = ''1p44aphx7y0lh018pk2r9w006vinc5yrfrp1m9l9648p2jxiw1c4''; + url = ''http://beta.quicklisp.org/archive/postmodern/2020-10-16/postmodern-20201016-git.tgz''; + sha256 = ''1svaiksbqcaq8sh7q6sj9kzazdfl360zqr2nzhwbgy4xnaj4vf3n''; }; packageName = "cl-postgres"; @@ -20,13 +20,20 @@ rec { overrides = x: x; } /* (SYSTEM cl-postgres DESCRIPTION Low-level client library for PostgreSQL - SHA256 1p44aphx7y0lh018pk2r9w006vinc5yrfrp1m9l9648p2jxiw1c4 URL - http://beta.quicklisp.org/archive/postmodern/2019-12-27/postmodern-20191227-git.tgz - MD5 67b909de432e6414e7832eed18f9ad18 NAME cl-postgres FILENAME cl-postgres + SHA256 1svaiksbqcaq8sh7q6sj9kzazdfl360zqr2nzhwbgy4xnaj4vf3n URL + http://beta.quicklisp.org/archive/postmodern/2020-10-16/postmodern-20201016-git.tgz + MD5 f61e827d7e7ba023f6fbc7c2667de4c8 NAME cl-postgres FILENAME cl-postgres DEPS - ((NAME fiveam FILENAME fiveam) (NAME md5 FILENAME md5) + ((NAME alexandria FILENAME alexandria) + (NAME bordeaux-threads FILENAME bordeaux-threads) + (NAME cl-base64 FILENAME cl-base64) (NAME cl-ppcre FILENAME cl-ppcre) + (NAME fiveam FILENAME fiveam) (NAME ironclad FILENAME ironclad) + (NAME md5 FILENAME md5) (NAME simple-date FILENAME simple-date) + (NAME simple-date/postgres-glue FILENAME simple-date_slash_postgres-glue) (NAME split-sequence FILENAME split-sequence) - (NAME usocket FILENAME usocket)) - DEPENDENCIES (fiveam md5 split-sequence usocket) VERSION - postmodern-20191227-git SIBLINGS (postmodern s-sql simple-date) PARASITES - (cl-postgres/tests)) */ + (NAME uax-15 FILENAME uax-15) (NAME usocket FILENAME usocket)) + DEPENDENCIES + (alexandria bordeaux-threads cl-base64 cl-ppcre fiveam ironclad md5 + simple-date simple-date/postgres-glue split-sequence uax-15 usocket) + VERSION postmodern-20201016-git SIBLINGS (postmodern s-sql simple-date) + PARASITES (cl-postgres/simple-date-tests cl-postgres/tests)) */ diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-ppcre-template.nix b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-ppcre-template.nix index 4c97f03870..3856d777c5 100644 --- a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-ppcre-template.nix +++ b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-ppcre-template.nix @@ -1,7 +1,7 @@ args @ { fetchurl, ... }: rec { baseName = ''cl-ppcre-template''; - version = ''cl-unification-20190107-git''; + version = ''cl-unification-20200925-git''; description = ''A system used to conditionally load the CL-PPCRE Template. @@ -12,8 +12,8 @@ REGULAR-EXPRESSION-TEMPLATE.''; deps = [ args."cl-ppcre" args."cl-unification" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/cl-unification/2019-01-07/cl-unification-20190107-git.tgz''; - sha256 = ''0mp40wh58afnpqx9i9wg5x364g35rkd6c9d5hb9g6pdxadqx0cfv''; + url = ''http://beta.quicklisp.org/archive/cl-unification/2020-09-25/cl-unification-20200925-git.tgz''; + sha256 = ''05i1bmbabfgym9v28cbl37yr0r1m4a4k4a844z6wlq6qf45vzais''; }; packageName = "cl-ppcre-template"; @@ -27,12 +27,12 @@ REGULAR-EXPRESSION-TEMPLATE.''; This system is not required and it is handled only if CL-PPCRE is available. If it is, then the library provides the REGULAR-EXPRESSION-TEMPLATE. - SHA256 0mp40wh58afnpqx9i9wg5x364g35rkd6c9d5hb9g6pdxadqx0cfv URL - http://beta.quicklisp.org/archive/cl-unification/2019-01-07/cl-unification-20190107-git.tgz - MD5 a7a12789cc48e571b0871d55cef11b7f NAME cl-ppcre-template FILENAME + SHA256 05i1bmbabfgym9v28cbl37yr0r1m4a4k4a844z6wlq6qf45vzais URL + http://beta.quicklisp.org/archive/cl-unification/2020-09-25/cl-unification-20200925-git.tgz + MD5 90588d566c2e12dac3530b65384a87ab NAME cl-ppcre-template FILENAME cl-ppcre-template DEPS ((NAME cl-ppcre FILENAME cl-ppcre) (NAME cl-unification FILENAME cl-unification)) - DEPENDENCIES (cl-ppcre cl-unification) VERSION cl-unification-20190107-git + DEPENDENCIES (cl-ppcre cl-unification) VERSION cl-unification-20200925-git SIBLINGS (cl-unification-lib cl-unification-test cl-unification) PARASITES NIL) */ diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-prevalence.nix b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-prevalence.nix index c6afca1d8c..ddfc92b2cb 100644 --- a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-prevalence.nix +++ b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-prevalence.nix @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: rec { baseName = ''cl-prevalence''; - version = ''20191130-git''; + version = ''20200715-git''; description = ''Common Lisp Prevalence Package''; - deps = [ args."s-sysdeps" args."s-xml" ]; + deps = [ args."alexandria" args."bordeaux-threads" args."s-sysdeps" args."s-xml" args."split-sequence" args."usocket" args."usocket-server" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/cl-prevalence/2019-11-30/cl-prevalence-20191130-git.tgz''; - sha256 = ''01pk77nhyv89zd9sf78i0gch9swxlaw3sqnjdnx4329ww6qv2sg4''; + url = ''http://beta.quicklisp.org/archive/cl-prevalence/2020-07-15/cl-prevalence-20200715-git.tgz''; + sha256 = ''1m2wrqnly9i35kjk2wydwywjmwkbh3a3f4ds7wl63q8kpn8g0ibd''; }; packageName = "cl-prevalence"; @@ -18,10 +18,17 @@ rec { overrides = x: x; } /* (SYSTEM cl-prevalence DESCRIPTION Common Lisp Prevalence Package SHA256 - 01pk77nhyv89zd9sf78i0gch9swxlaw3sqnjdnx4329ww6qv2sg4 URL - http://beta.quicklisp.org/archive/cl-prevalence/2019-11-30/cl-prevalence-20191130-git.tgz - MD5 7615cb79ec797a5520941aedc3101390 NAME cl-prevalence FILENAME + 1m2wrqnly9i35kjk2wydwywjmwkbh3a3f4ds7wl63q8kpn8g0ibd URL + http://beta.quicklisp.org/archive/cl-prevalence/2020-07-15/cl-prevalence-20200715-git.tgz + MD5 d01b70db724ac8408b072ac39bbd8837 NAME cl-prevalence FILENAME cl-prevalence DEPS - ((NAME s-sysdeps FILENAME s-sysdeps) (NAME s-xml FILENAME s-xml)) - DEPENDENCIES (s-sysdeps s-xml) VERSION 20191130-git SIBLINGS - (cl-prevalence-test) PARASITES NIL) */ + ((NAME alexandria FILENAME alexandria) + (NAME bordeaux-threads FILENAME bordeaux-threads) + (NAME s-sysdeps FILENAME s-sysdeps) (NAME s-xml FILENAME s-xml) + (NAME split-sequence FILENAME split-sequence) + (NAME usocket FILENAME usocket) + (NAME usocket-server FILENAME usocket-server)) + DEPENDENCIES + (alexandria bordeaux-threads s-sysdeps s-xml split-sequence usocket + usocket-server) + VERSION 20200715-git SIBLINGS (cl-prevalence-test) PARASITES NIL) */ diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-project.nix b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-project.nix index 496a0bd4e5..e88b9efe36 100644 --- a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-project.nix +++ b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-project.nix @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: rec { baseName = ''cl-project''; - version = ''20190521-git''; + version = ''20200715-git''; description = ''Generate a skeleton for modern project''; - deps = [ args."alexandria" args."anaphora" args."bordeaux-threads" args."cl-ansi-text" args."cl-colors" args."cl-emb" args."cl-fad" args."cl-ppcre" args."let-plus" args."local-time" args."prove" args."uiop" ]; + deps = [ args."alexandria" args."anaphora" args."cl-ansi-text" args."cl-colors" args."cl-colors2" args."cl-emb" args."cl-ppcre" args."let-plus" args."local-time" args."prove" args."uiop" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/cl-project/2019-05-21/cl-project-20190521-git.tgz''; - sha256 = ''1wm1php6bdyy1gy76vfxlmh1lm7snqg1mhpzhkcmqrrmz0jx0gnf''; + url = ''http://beta.quicklisp.org/archive/cl-project/2020-07-15/cl-project-20200715-git.tgz''; + sha256 = ''044rx97wc839a8q2wv271s07bnsasl6x5fx4gr5pvy34jbrhp306''; }; packageName = "cl-project"; @@ -18,18 +18,17 @@ rec { overrides = x: x; } /* (SYSTEM cl-project DESCRIPTION Generate a skeleton for modern project SHA256 - 1wm1php6bdyy1gy76vfxlmh1lm7snqg1mhpzhkcmqrrmz0jx0gnf URL - http://beta.quicklisp.org/archive/cl-project/2019-05-21/cl-project-20190521-git.tgz - MD5 1468189ff8880f43034c44adc317274f NAME cl-project FILENAME cl-project + 044rx97wc839a8q2wv271s07bnsasl6x5fx4gr5pvy34jbrhp306 URL + http://beta.quicklisp.org/archive/cl-project/2020-07-15/cl-project-20200715-git.tgz + MD5 12b436050ad0106cf292707ae39d8572 NAME cl-project FILENAME cl-project DEPS ((NAME alexandria FILENAME alexandria) (NAME anaphora FILENAME anaphora) - (NAME bordeaux-threads FILENAME bordeaux-threads) (NAME cl-ansi-text FILENAME cl-ansi-text) - (NAME cl-colors FILENAME cl-colors) (NAME cl-emb FILENAME cl-emb) - (NAME cl-fad FILENAME cl-fad) (NAME cl-ppcre FILENAME cl-ppcre) + (NAME cl-colors FILENAME cl-colors) (NAME cl-colors2 FILENAME cl-colors2) + (NAME cl-emb FILENAME cl-emb) (NAME cl-ppcre FILENAME cl-ppcre) (NAME let-plus FILENAME let-plus) (NAME local-time FILENAME local-time) (NAME prove FILENAME prove) (NAME uiop FILENAME uiop)) DEPENDENCIES - (alexandria anaphora bordeaux-threads cl-ansi-text cl-colors cl-emb cl-fad - cl-ppcre let-plus local-time prove uiop) - VERSION 20190521-git SIBLINGS (cl-project-test) PARASITES NIL) */ + (alexandria anaphora cl-ansi-text cl-colors cl-colors2 cl-emb cl-ppcre + let-plus local-time prove uiop) + VERSION 20200715-git SIBLINGS (cl-project-test) PARASITES NIL) */ diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-protobufs.nix b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-protobufs.nix index 046f910a86..7339fcdffe 100644 --- a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-protobufs.nix +++ b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-protobufs.nix @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: rec { baseName = ''cl-protobufs''; - version = ''20180328-git''; + version = ''20200325-git''; description = ''Protobufs for Common Lisp''; deps = [ args."alexandria" args."babel" args."closer-mop" args."trivial-features" args."trivial-garbage" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/cl-protobufs/2018-03-28/cl-protobufs-20180328-git.tgz''; - sha256 = ''0pkm5mphs2yks8v1i8wxq92ywm6fx9lasybrx8rccrd7dm156nzj''; + url = ''http://beta.quicklisp.org/archive/cl-protobufs/2020-03-25/cl-protobufs-20200325-git.tgz''; + sha256 = ''1sgvp038bvd3mq2f0xh4wawf8h21jmw449yjyahidh1zfqdibpin''; }; packageName = "cl-protobufs"; @@ -18,13 +18,13 @@ rec { overrides = x: x; } /* (SYSTEM cl-protobufs DESCRIPTION Protobufs for Common Lisp SHA256 - 0pkm5mphs2yks8v1i8wxq92ywm6fx9lasybrx8rccrd7dm156nzj URL - http://beta.quicklisp.org/archive/cl-protobufs/2018-03-28/cl-protobufs-20180328-git.tgz - MD5 6573322beb8f27653f0c9b418c5f5b92 NAME cl-protobufs FILENAME + 1sgvp038bvd3mq2f0xh4wawf8h21jmw449yjyahidh1zfqdibpin URL + http://beta.quicklisp.org/archive/cl-protobufs/2020-03-25/cl-protobufs-20200325-git.tgz + MD5 9fb9af8bd53796b3cf8f358762095899 NAME cl-protobufs FILENAME cl-protobufs DEPS ((NAME alexandria FILENAME alexandria) (NAME babel FILENAME babel) (NAME closer-mop FILENAME closer-mop) (NAME trivial-features FILENAME trivial-features) (NAME trivial-garbage FILENAME trivial-garbage)) DEPENDENCIES (alexandria babel closer-mop trivial-features trivial-garbage) - VERSION 20180328-git SIBLINGS (cl-protobufs-tests) PARASITES NIL) */ + VERSION 20200325-git SIBLINGS (cl-protobufs-tests) PARASITES NIL) */ diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-qprint.nix b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-qprint.nix new file mode 100644 index 0000000000..1ccf6af5cb --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-qprint.nix @@ -0,0 +1,28 @@ +args @ { fetchurl, ... }: +rec { + baseName = ''cl-qprint''; + version = ''20150804-git''; + + description = ''Encode and decode quoted-printable encoded strings.''; + + deps = [ args."flexi-streams" args."trivial-gray-streams" ]; + + src = fetchurl { + url = ''http://beta.quicklisp.org/archive/cl-qprint/2015-08-04/cl-qprint-20150804-git.tgz''; + sha256 = ''042nq9airkc4yaqzpmly5iszmkbwfn38wsgi9k361ldf1y54lq28''; + }; + + packageName = "cl-qprint"; + + asdFilesToKeep = ["cl-qprint.asd"]; + overrides = x: x; +} +/* (SYSTEM cl-qprint DESCRIPTION + Encode and decode quoted-printable encoded strings. SHA256 + 042nq9airkc4yaqzpmly5iszmkbwfn38wsgi9k361ldf1y54lq28 URL + http://beta.quicklisp.org/archive/cl-qprint/2015-08-04/cl-qprint-20150804-git.tgz + MD5 74376a69e0b078724c94cc268f69e0f7 NAME cl-qprint FILENAME cl-qprint DEPS + ((NAME flexi-streams FILENAME flexi-streams) + (NAME trivial-gray-streams FILENAME trivial-gray-streams)) + DEPENDENCIES (flexi-streams trivial-gray-streams) VERSION 20150804-git + SIBLINGS NIL PARASITES NIL) */ diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-slice.nix b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-slice.nix new file mode 100644 index 0000000000..2c4fd03f94 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-slice.nix @@ -0,0 +1,29 @@ +args @ { fetchurl, ... }: +rec { + baseName = ''cl-slice''; + version = ''20171130-git''; + + parasites = [ "cl-slice-tests" ]; + + description = ''DSL for array slices in Common Lisp.''; + + deps = [ args."alexandria" args."anaphora" args."clunit" args."let-plus" ]; + + src = fetchurl { + url = ''http://beta.quicklisp.org/archive/cl-slice/2017-11-30/cl-slice-20171130-git.tgz''; + sha256 = ''0nay95qsnck40kdxjgjdii5rcgrdhf880pg9ajmbxilgw84xb2zn''; + }; + + packageName = "cl-slice"; + + asdFilesToKeep = ["cl-slice.asd"]; + overrides = x: x; +} +/* (SYSTEM cl-slice DESCRIPTION DSL for array slices in Common Lisp. SHA256 + 0nay95qsnck40kdxjgjdii5rcgrdhf880pg9ajmbxilgw84xb2zn URL + http://beta.quicklisp.org/archive/cl-slice/2017-11-30/cl-slice-20171130-git.tgz + MD5 b83a7a9aa503dc01cba43cf1e494e67d NAME cl-slice FILENAME cl-slice DEPS + ((NAME alexandria FILENAME alexandria) (NAME anaphora FILENAME anaphora) + (NAME clunit FILENAME clunit) (NAME let-plus FILENAME let-plus)) + DEPENDENCIES (alexandria anaphora clunit let-plus) VERSION 20171130-git + SIBLINGS NIL PARASITES (cl-slice-tests)) */ diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-store.nix b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-store.nix index a160cef9e0..d97bd34f27 100644 --- a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-store.nix +++ b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-store.nix @@ -1,7 +1,7 @@ args @ { fetchurl, ... }: rec { baseName = ''cl-store''; - version = ''20191130-git''; + version = ''20200925-git''; parasites = [ "cl-store-tests" ]; @@ -10,8 +10,8 @@ rec { deps = [ args."rt" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/cl-store/2019-11-30/cl-store-20191130-git.tgz''; - sha256 = ''1pybx08w486d3bmn8fc6zxvxyprc3da24kk3wxhkrgh0fi1vmcbc''; + url = ''http://beta.quicklisp.org/archive/cl-store/2020-09-25/cl-store-20200925-git.tgz''; + sha256 = ''0vqlrci1634jgfg6c1dzwvx58qjjwbcbwdbpm7xxw2s823xl9jf3''; }; packageName = "cl-store"; @@ -20,8 +20,8 @@ rec { overrides = x: x; } /* (SYSTEM cl-store DESCRIPTION Serialization package SHA256 - 1pybx08w486d3bmn8fc6zxvxyprc3da24kk3wxhkrgh0fi1vmcbc URL - http://beta.quicklisp.org/archive/cl-store/2019-11-30/cl-store-20191130-git.tgz - MD5 d6052274cd0c6a86bfc2de1e4a8a0886 NAME cl-store FILENAME cl-store DEPS - ((NAME rt FILENAME rt)) DEPENDENCIES (rt) VERSION 20191130-git SIBLINGS NIL + 0vqlrci1634jgfg6c1dzwvx58qjjwbcbwdbpm7xxw2s823xl9jf3 URL + http://beta.quicklisp.org/archive/cl-store/2020-09-25/cl-store-20200925-git.tgz + MD5 828a6f3035c5ef869618f6848c47efd7 NAME cl-store FILENAME cl-store DEPS + ((NAME rt FILENAME rt)) DEPENDENCIES (rt) VERSION 20200925-git SIBLINGS NIL PARASITES (cl-store-tests)) */ diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-test-more.nix b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-test-more.nix index 56d9b36326..419994fb24 100644 --- a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-test-more.nix +++ b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-test-more.nix @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: rec { baseName = ''cl-test-more''; - version = ''prove-20171130-git''; + version = ''prove-20200218-git''; description = ''System lacks description''; - deps = [ args."alexandria" args."anaphora" args."cl-ansi-text" args."cl-colors" args."cl-ppcre" args."let-plus" args."prove" ]; + deps = [ args."alexandria" args."anaphora" args."cl-ansi-text" args."cl-colors" args."cl-colors2" args."cl-ppcre" args."let-plus" args."prove" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/prove/2017-11-30/prove-20171130-git.tgz''; - sha256 = ''13dmnnlk3r9fxxcvk6sqq8m0ifv9y80zgp1wg63nv1ykwdi7kyar''; + url = ''http://beta.quicklisp.org/archive/prove/2020-02-18/prove-20200218-git.tgz''; + sha256 = ''1sv3zyam9sdmyis5lyv0khvw82q7bcpsycpj9b3bsv9isb4j30zn''; }; packageName = "cl-test-more"; @@ -18,15 +18,17 @@ rec { overrides = x: x; } /* (SYSTEM cl-test-more DESCRIPTION System lacks description SHA256 - 13dmnnlk3r9fxxcvk6sqq8m0ifv9y80zgp1wg63nv1ykwdi7kyar URL - http://beta.quicklisp.org/archive/prove/2017-11-30/prove-20171130-git.tgz - MD5 630df4367537f799570be40242f8ed52 NAME cl-test-more FILENAME + 1sv3zyam9sdmyis5lyv0khvw82q7bcpsycpj9b3bsv9isb4j30zn URL + http://beta.quicklisp.org/archive/prove/2020-02-18/prove-20200218-git.tgz + MD5 85780b65e84c17a78d658364b8c4d11b NAME cl-test-more FILENAME cl-test-more DEPS ((NAME alexandria FILENAME alexandria) (NAME anaphora FILENAME anaphora) (NAME cl-ansi-text FILENAME cl-ansi-text) - (NAME cl-colors FILENAME cl-colors) (NAME cl-ppcre FILENAME cl-ppcre) - (NAME let-plus FILENAME let-plus) (NAME prove FILENAME prove)) + (NAME cl-colors FILENAME cl-colors) (NAME cl-colors2 FILENAME cl-colors2) + (NAME cl-ppcre FILENAME cl-ppcre) (NAME let-plus FILENAME let-plus) + (NAME prove FILENAME prove)) DEPENDENCIES - (alexandria anaphora cl-ansi-text cl-colors cl-ppcre let-plus prove) - VERSION prove-20171130-git SIBLINGS (prove-asdf prove-test prove) PARASITES + (alexandria anaphora cl-ansi-text cl-colors cl-colors2 cl-ppcre let-plus + prove) + VERSION prove-20200218-git SIBLINGS (prove-asdf prove-test prove) PARASITES NIL) */ diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-unification.nix b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-unification.nix index dbdd53a934..38903abe98 100644 --- a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-unification.nix +++ b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-unification.nix @@ -1,7 +1,7 @@ args @ { fetchurl, ... }: rec { baseName = ''cl-unification''; - version = ''20190107-git''; + version = ''20200925-git''; description = ''The CL-UNIFICATION system. @@ -10,8 +10,8 @@ The system contains the definitions for the 'unification' machinery.''; deps = [ ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/cl-unification/2019-01-07/cl-unification-20190107-git.tgz''; - sha256 = ''0mp40wh58afnpqx9i9wg5x364g35rkd6c9d5hb9g6pdxadqx0cfv''; + url = ''http://beta.quicklisp.org/archive/cl-unification/2020-09-25/cl-unification-20200925-git.tgz''; + sha256 = ''05i1bmbabfgym9v28cbl37yr0r1m4a4k4a844z6wlq6qf45vzais''; }; packageName = "cl-unification"; @@ -22,8 +22,8 @@ The system contains the definitions for the 'unification' machinery.''; /* (SYSTEM cl-unification DESCRIPTION The CL-UNIFICATION system. The system contains the definitions for the 'unification' machinery. - SHA256 0mp40wh58afnpqx9i9wg5x364g35rkd6c9d5hb9g6pdxadqx0cfv URL - http://beta.quicklisp.org/archive/cl-unification/2019-01-07/cl-unification-20190107-git.tgz - MD5 a7a12789cc48e571b0871d55cef11b7f NAME cl-unification FILENAME - cl-unification DEPS NIL DEPENDENCIES NIL VERSION 20190107-git SIBLINGS + SHA256 05i1bmbabfgym9v28cbl37yr0r1m4a4k4a844z6wlq6qf45vzais URL + http://beta.quicklisp.org/archive/cl-unification/2020-09-25/cl-unification-20200925-git.tgz + MD5 90588d566c2e12dac3530b65384a87ab NAME cl-unification FILENAME + cl-unification DEPS NIL DEPENDENCIES NIL VERSION 20200925-git SIBLINGS (cl-unification-lib cl-unification-test cl-ppcre-template) PARASITES NIL) */ diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-webkit2.nix b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-webkit2.nix new file mode 100644 index 0000000000..01a2732a7e --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-webkit2.nix @@ -0,0 +1,43 @@ +args @ { fetchurl, ... }: +rec { + baseName = ''cl-webkit2''; + version = ''cl-webkit-20201016-git''; + + description = ''An FFI binding to WebKit2GTK+''; + + deps = [ args."alexandria" args."babel" args."bordeaux-threads" args."cffi" args."cl-cffi-gtk" args."cl-cffi-gtk-cairo" args."cl-cffi-gtk-gdk" args."cl-cffi-gtk-gdk-pixbuf" args."cl-cffi-gtk-gio" args."cl-cffi-gtk-glib" args."cl-cffi-gtk-gobject" args."cl-cffi-gtk-pango" args."closer-mop" args."iterate" args."trivial-features" args."trivial-garbage" ]; + + src = fetchurl { + url = ''http://beta.quicklisp.org/archive/cl-webkit/2020-10-16/cl-webkit-20201016-git.tgz''; + sha256 = ''15xykhjz3j7ad3m853x1hriv3mz6zsgaqdnlc3wk664ka0f7k0vh''; + }; + + packageName = "cl-webkit2"; + + asdFilesToKeep = ["cl-webkit2.asd"]; + overrides = x: x; +} +/* (SYSTEM cl-webkit2 DESCRIPTION An FFI binding to WebKit2GTK+ SHA256 + 15xykhjz3j7ad3m853x1hriv3mz6zsgaqdnlc3wk664ka0f7k0vh URL + http://beta.quicklisp.org/archive/cl-webkit/2020-10-16/cl-webkit-20201016-git.tgz + MD5 d7b482185cf5a403d5211626560d2f66 NAME cl-webkit2 FILENAME cl-webkit2 + DEPS + ((NAME alexandria FILENAME alexandria) (NAME babel FILENAME babel) + (NAME bordeaux-threads FILENAME bordeaux-threads) + (NAME cffi FILENAME cffi) (NAME cl-cffi-gtk FILENAME cl-cffi-gtk) + (NAME cl-cffi-gtk-cairo FILENAME cl-cffi-gtk-cairo) + (NAME cl-cffi-gtk-gdk FILENAME cl-cffi-gtk-gdk) + (NAME cl-cffi-gtk-gdk-pixbuf FILENAME cl-cffi-gtk-gdk-pixbuf) + (NAME cl-cffi-gtk-gio FILENAME cl-cffi-gtk-gio) + (NAME cl-cffi-gtk-glib FILENAME cl-cffi-gtk-glib) + (NAME cl-cffi-gtk-gobject FILENAME cl-cffi-gtk-gobject) + (NAME cl-cffi-gtk-pango FILENAME cl-cffi-gtk-pango) + (NAME closer-mop FILENAME closer-mop) (NAME iterate FILENAME iterate) + (NAME trivial-features FILENAME trivial-features) + (NAME trivial-garbage FILENAME trivial-garbage)) + DEPENDENCIES + (alexandria babel bordeaux-threads cffi cl-cffi-gtk cl-cffi-gtk-cairo + cl-cffi-gtk-gdk cl-cffi-gtk-gdk-pixbuf cl-cffi-gtk-gio cl-cffi-gtk-glib + cl-cffi-gtk-gobject cl-cffi-gtk-pango closer-mop iterate trivial-features + trivial-garbage) + VERSION cl-webkit-20201016-git SIBLINGS NIL PARASITES NIL) */ diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl_plus_ssl.nix b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl_plus_ssl.nix index 4c9ff159d9..5a1ae8550a 100644 --- a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl_plus_ssl.nix +++ b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl_plus_ssl.nix @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: rec { baseName = ''cl_plus_ssl''; - version = ''cl+ssl-20191130-git''; + version = ''cl+ssl-20200610-git''; description = ''Common Lisp interface to OpenSSL.''; deps = [ args."alexandria" args."babel" args."bordeaux-threads" args."cffi" args."flexi-streams" args."trivial-features" args."trivial-garbage" args."trivial-gray-streams" args."uiop" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/cl+ssl/2019-11-30/cl+ssl-20191130-git.tgz''; - sha256 = ''073ba82xb0jsqlmhv46g7n31j0k2ahw6bw02a51qg77l7wxnms23''; + url = ''http://beta.quicklisp.org/archive/cl+ssl/2020-06-10/cl+ssl-20200610-git.tgz''; + sha256 = ''1kijg8vlwcxraknp4gadf3n5zjchkgg8axr94v3kas9rb717r6ql''; }; packageName = "cl+ssl"; @@ -18,9 +18,9 @@ rec { overrides = x: x; } /* (SYSTEM cl+ssl DESCRIPTION Common Lisp interface to OpenSSL. SHA256 - 073ba82xb0jsqlmhv46g7n31j0k2ahw6bw02a51qg77l7wxnms23 URL - http://beta.quicklisp.org/archive/cl+ssl/2019-11-30/cl+ssl-20191130-git.tgz - MD5 995aaef02ec5112a0de78b2533691629 NAME cl+ssl FILENAME cl_plus_ssl DEPS + 1kijg8vlwcxraknp4gadf3n5zjchkgg8axr94v3kas9rb717r6ql URL + http://beta.quicklisp.org/archive/cl+ssl/2020-06-10/cl+ssl-20200610-git.tgz + MD5 e6f124e4900191b354827312dfc8df3d NAME cl+ssl FILENAME cl_plus_ssl DEPS ((NAME alexandria FILENAME alexandria) (NAME babel FILENAME babel) (NAME bordeaux-threads FILENAME bordeaux-threads) (NAME cffi FILENAME cffi) (NAME flexi-streams FILENAME flexi-streams) @@ -31,4 +31,4 @@ rec { DEPENDENCIES (alexandria babel bordeaux-threads cffi flexi-streams trivial-features trivial-garbage trivial-gray-streams uiop) - VERSION cl+ssl-20191130-git SIBLINGS (cl+ssl.test) PARASITES NIL) */ + VERSION cl+ssl-20200610-git SIBLINGS (cl+ssl.test) PARASITES NIL) */ diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/clack-test.nix b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/clack-test.nix index 6350dcdece..64e6a69462 100644 --- a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/clack-test.nix +++ b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/clack-test.nix @@ -5,7 +5,7 @@ rec { description = ''Testing Clack Applications.''; - deps = [ args."alexandria" args."babel" args."bordeaux-threads" args."cffi" args."cffi-grovel" args."cffi-toolchain" args."chipz" args."chunga" args."cl_plus_ssl" args."cl-annot" args."cl-base64" args."cl-cookie" args."cl-fad" args."cl-ppcre" args."cl-reexport" args."cl-syntax" args."cl-syntax-annot" args."cl-utilities" args."clack" args."clack-handler-hunchentoot" args."clack-socket" args."dexador" args."dissect" args."fast-http" args."fast-io" args."flexi-streams" args."http-body" args."hunchentoot" args."ironclad" args."jonathan" args."lack" args."lack-component" args."lack-middleware-backtrace" args."lack-util" args."local-time" args."md5" args."named-readtables" args."nibbles" args."proc-parse" args."quri" args."rfc2388" args."rove" args."smart-buffer" args."split-sequence" args."static-vectors" args."trivial-backtrace" args."trivial-features" args."trivial-garbage" args."trivial-gray-streams" args."trivial-mimes" args."trivial-types" args."usocket" args."xsubseq" ]; + deps = [ args."alexandria" args."babel" args."bordeaux-threads" args."cffi" args."cffi-grovel" args."cffi-toolchain" args."chipz" args."chunga" args."cl_plus_ssl" args."cl-annot" args."cl-base64" args."cl-cookie" args."cl-fad" args."cl-ppcre" args."cl-reexport" args."cl-syntax" args."cl-syntax-annot" args."cl-utilities" args."clack" args."clack-handler-hunchentoot" args."clack-socket" args."dexador" args."dissect" args."fast-http" args."fast-io" args."flexi-streams" args."http-body" args."hunchentoot" args."ironclad" args."jonathan" args."lack" args."lack-component" args."lack-middleware-backtrace" args."lack-util" args."local-time" args."md5" args."named-readtables" args."proc-parse" args."quri" args."rfc2388" args."rove" args."smart-buffer" args."split-sequence" args."static-vectors" args."trivial-backtrace" args."trivial-features" args."trivial-garbage" args."trivial-gray-streams" args."trivial-mimes" args."trivial-types" args."usocket" args."xsubseq" ]; src = fetchurl { url = ''http://beta.quicklisp.org/archive/clack/2019-10-07/clack-20191007-git.tgz''; @@ -45,9 +45,9 @@ rec { (NAME lack-middleware-backtrace FILENAME lack-middleware-backtrace) (NAME lack-util FILENAME lack-util) (NAME local-time FILENAME local-time) (NAME md5 FILENAME md5) (NAME named-readtables FILENAME named-readtables) - (NAME nibbles FILENAME nibbles) (NAME proc-parse FILENAME proc-parse) - (NAME quri FILENAME quri) (NAME rfc2388 FILENAME rfc2388) - (NAME rove FILENAME rove) (NAME smart-buffer FILENAME smart-buffer) + (NAME proc-parse FILENAME proc-parse) (NAME quri FILENAME quri) + (NAME rfc2388 FILENAME rfc2388) (NAME rove FILENAME rove) + (NAME smart-buffer FILENAME smart-buffer) (NAME split-sequence FILENAME split-sequence) (NAME static-vectors FILENAME static-vectors) (NAME trivial-backtrace FILENAME trivial-backtrace) @@ -64,9 +64,9 @@ rec { clack-socket dexador dissect fast-http fast-io flexi-streams http-body hunchentoot ironclad jonathan lack lack-component lack-middleware-backtrace lack-util local-time md5 named-readtables - nibbles proc-parse quri rfc2388 rove smart-buffer split-sequence - static-vectors trivial-backtrace trivial-features trivial-garbage - trivial-gray-streams trivial-mimes trivial-types usocket xsubseq) + proc-parse quri rfc2388 rove smart-buffer split-sequence static-vectors + trivial-backtrace trivial-features trivial-garbage trivial-gray-streams + trivial-mimes trivial-types usocket xsubseq) VERSION clack-20191007-git SIBLINGS (clack-handler-fcgi clack-handler-hunchentoot clack-handler-toot clack-handler-wookie clack-socket clack-v1-compat clack diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/clack-v1-compat.nix b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/clack-v1-compat.nix index fbc02f04da..d52c21e7c0 100644 --- a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/clack-v1-compat.nix +++ b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/clack-v1-compat.nix @@ -5,7 +5,7 @@ rec { description = ''System lacks description''; - deps = [ args."alexandria" args."babel" args."bordeaux-threads" args."cffi" args."cffi-grovel" args."cffi-toolchain" args."chipz" args."chunga" args."circular-streams" args."cl_plus_ssl" args."cl-annot" args."cl-base64" args."cl-cookie" args."cl-fad" args."cl-ppcre" args."cl-reexport" args."cl-syntax" args."cl-syntax-annot" args."cl-utilities" args."clack" args."clack-handler-hunchentoot" args."clack-socket" args."clack-test" args."dexador" args."dissect" args."fast-http" args."fast-io" args."flexi-streams" args."http-body" args."hunchentoot" args."ironclad" args."jonathan" args."lack" args."lack-component" args."lack-middleware-backtrace" args."lack-util" args."local-time" args."marshal" args."md5" args."named-readtables" args."nibbles" args."proc-parse" args."quri" args."rfc2388" args."rove" args."smart-buffer" args."split-sequence" args."static-vectors" args."trivial-backtrace" args."trivial-features" args."trivial-garbage" args."trivial-gray-streams" args."trivial-mimes" args."trivial-types" args."uiop" args."usocket" args."xsubseq" ]; + deps = [ args."alexandria" args."babel" args."bordeaux-threads" args."cffi" args."cffi-grovel" args."cffi-toolchain" args."chipz" args."chunga" args."circular-streams" args."cl_plus_ssl" args."cl-annot" args."cl-base64" args."cl-cookie" args."cl-fad" args."cl-ppcre" args."cl-reexport" args."cl-syntax" args."cl-syntax-annot" args."cl-utilities" args."clack" args."clack-handler-hunchentoot" args."clack-socket" args."clack-test" args."dexador" args."dissect" args."fast-http" args."fast-io" args."flexi-streams" args."http-body" args."hunchentoot" args."ironclad" args."jonathan" args."lack" args."lack-component" args."lack-middleware-backtrace" args."lack-util" args."local-time" args."marshal" args."md5" args."named-readtables" args."proc-parse" args."quri" args."rfc2388" args."rove" args."smart-buffer" args."split-sequence" args."static-vectors" args."trivial-backtrace" args."trivial-features" args."trivial-garbage" args."trivial-gray-streams" args."trivial-mimes" args."trivial-types" args."uiop" args."usocket" args."xsubseq" ]; src = fetchurl { url = ''http://beta.quicklisp.org/archive/clack/2019-10-07/clack-20191007-git.tgz''; @@ -49,9 +49,9 @@ rec { (NAME lack-util FILENAME lack-util) (NAME local-time FILENAME local-time) (NAME marshal FILENAME marshal) (NAME md5 FILENAME md5) (NAME named-readtables FILENAME named-readtables) - (NAME nibbles FILENAME nibbles) (NAME proc-parse FILENAME proc-parse) - (NAME quri FILENAME quri) (NAME rfc2388 FILENAME rfc2388) - (NAME rove FILENAME rove) (NAME smart-buffer FILENAME smart-buffer) + (NAME proc-parse FILENAME proc-parse) (NAME quri FILENAME quri) + (NAME rfc2388 FILENAME rfc2388) (NAME rove FILENAME rove) + (NAME smart-buffer FILENAME smart-buffer) (NAME split-sequence FILENAME split-sequence) (NAME static-vectors FILENAME static-vectors) (NAME trivial-backtrace FILENAME trivial-backtrace) @@ -68,7 +68,7 @@ rec { clack-handler-hunchentoot clack-socket clack-test dexador dissect fast-http fast-io flexi-streams http-body hunchentoot ironclad jonathan lack lack-component lack-middleware-backtrace lack-util local-time marshal - md5 named-readtables nibbles proc-parse quri rfc2388 rove smart-buffer + md5 named-readtables proc-parse quri rfc2388 rove smart-buffer split-sequence static-vectors trivial-backtrace trivial-features trivial-garbage trivial-gray-streams trivial-mimes trivial-types uiop usocket xsubseq) diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/clack.nix b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/clack.nix index 327dc5ace6..1453232cb6 100644 --- a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/clack.nix +++ b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/clack.nix @@ -5,7 +5,7 @@ rec { description = ''Web application environment for Common Lisp''; - deps = [ args."alexandria" args."bordeaux-threads" args."ironclad" args."lack" args."lack-component" args."lack-middleware-backtrace" args."lack-util" args."nibbles" args."uiop" ]; + deps = [ args."alexandria" args."bordeaux-threads" args."ironclad" args."lack" args."lack-component" args."lack-middleware-backtrace" args."lack-util" args."uiop" ]; src = fetchurl { url = ''http://beta.quicklisp.org/archive/clack/2019-10-07/clack-20191007-git.tgz''; @@ -26,11 +26,10 @@ rec { (NAME ironclad FILENAME ironclad) (NAME lack FILENAME lack) (NAME lack-component FILENAME lack-component) (NAME lack-middleware-backtrace FILENAME lack-middleware-backtrace) - (NAME lack-util FILENAME lack-util) (NAME nibbles FILENAME nibbles) - (NAME uiop FILENAME uiop)) + (NAME lack-util FILENAME lack-util) (NAME uiop FILENAME uiop)) DEPENDENCIES (alexandria bordeaux-threads ironclad lack lack-component - lack-middleware-backtrace lack-util nibbles uiop) + lack-middleware-backtrace lack-util uiop) VERSION 20191007-git SIBLINGS (clack-handler-fcgi clack-handler-hunchentoot clack-handler-toot clack-handler-wookie clack-socket clack-test clack-v1-compat diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/closer-mop.nix b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/closer-mop.nix index 26a8f1b534..a942542e33 100644 --- a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/closer-mop.nix +++ b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/closer-mop.nix @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: rec { baseName = ''closer-mop''; - version = ''20191227-git''; + version = ''20201016-git''; description = ''Closer to MOP is a compatibility layer that rectifies many of the absent or incorrect CLOS MOP features across a broad range of Common Lisp implementations.''; deps = [ ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/closer-mop/2019-12-27/closer-mop-20191227-git.tgz''; - sha256 = ''12qkaadpbj946ln17xp5cjahd9jkbwv9j51rvk3q9kqmsm0r1r9l''; + url = ''http://beta.quicklisp.org/archive/closer-mop/2020-10-16/closer-mop-20201016-git.tgz''; + sha256 = ''1fccvxzrrfdiwjx9cdia7idp8xym1y86bf7zcyxvmpkdcvgdsdcd''; }; packageName = "closer-mop"; @@ -19,7 +19,7 @@ rec { } /* (SYSTEM closer-mop DESCRIPTION Closer to MOP is a compatibility layer that rectifies many of the absent or incorrect CLOS MOP features across a broad range of Common Lisp implementations. - SHA256 12qkaadpbj946ln17xp5cjahd9jkbwv9j51rvk3q9kqmsm0r1r9l URL - http://beta.quicklisp.org/archive/closer-mop/2019-12-27/closer-mop-20191227-git.tgz - MD5 67dda2ff56690bb8eec6131983605031 NAME closer-mop FILENAME closer-mop - DEPS NIL DEPENDENCIES NIL VERSION 20191227-git SIBLINGS NIL PARASITES NIL) */ + SHA256 1fccvxzrrfdiwjx9cdia7idp8xym1y86bf7zcyxvmpkdcvgdsdcd URL + http://beta.quicklisp.org/archive/closer-mop/2020-10-16/closer-mop-20201016-git.tgz + MD5 aca5b5432a782075906efd5aa948b748 NAME closer-mop FILENAME closer-mop + DEPS NIL DEPENDENCIES NIL VERSION 20201016-git SIBLINGS NIL PARASITES NIL) */ diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/clsql-postgresql-socket.nix b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/clsql-postgresql-socket.nix index 9f4abb8e47..cbe9caf93c 100644 --- a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/clsql-postgresql-socket.nix +++ b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/clsql-postgresql-socket.nix @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: rec { baseName = ''clsql-postgresql-socket''; - version = ''clsql-20160208-git''; + version = ''clsql-20201016-git''; description = ''Common Lisp SQL PostgreSQL Socket Driver''; deps = [ args."clsql" args."md5" args."uffi" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/clsql/2016-02-08/clsql-20160208-git.tgz''; - sha256 = ''0hc97rlfpanp6c1ziis47mrq2fgxbk0h51bhczn8k9xin2qbhhgn''; + url = ''http://beta.quicklisp.org/archive/clsql/2020-10-16/clsql-20201016-git.tgz''; + sha256 = ''0wzjxcm7df4fipvj5qsqlllai92hkzd4cvlaghvaikcah9r63hv8''; }; packageName = "clsql-postgresql-socket"; @@ -19,13 +19,13 @@ rec { } /* (SYSTEM clsql-postgresql-socket DESCRIPTION Common Lisp SQL PostgreSQL Socket Driver SHA256 - 0hc97rlfpanp6c1ziis47mrq2fgxbk0h51bhczn8k9xin2qbhhgn URL - http://beta.quicklisp.org/archive/clsql/2016-02-08/clsql-20160208-git.tgz - MD5 d1da7688361337a7de4fe7452c225a06 NAME clsql-postgresql-socket FILENAME + 0wzjxcm7df4fipvj5qsqlllai92hkzd4cvlaghvaikcah9r63hv8 URL + http://beta.quicklisp.org/archive/clsql/2020-10-16/clsql-20201016-git.tgz + MD5 bfa0842f9875113aed8e82eca58dab9e NAME clsql-postgresql-socket FILENAME clsql-postgresql-socket DEPS ((NAME clsql FILENAME clsql) (NAME md5 FILENAME md5) (NAME uffi FILENAME uffi)) - DEPENDENCIES (clsql md5 uffi) VERSION clsql-20160208-git SIBLINGS + DEPENDENCIES (clsql md5 uffi) VERSION clsql-20201016-git SIBLINGS (clsql-aodbc clsql-cffi clsql-mysql clsql-odbc clsql-postgresql-socket3 clsql-postgresql clsql-sqlite clsql-sqlite3 clsql-tests clsql-uffi clsql) PARASITES NIL) */ diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/clsql-postgresql.nix b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/clsql-postgresql.nix index add3a15d27..9e449d5555 100644 --- a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/clsql-postgresql.nix +++ b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/clsql-postgresql.nix @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: rec { baseName = ''clsql-postgresql''; - version = ''clsql-20160208-git''; + version = ''clsql-20201016-git''; description = ''Common Lisp PostgreSQL API Driver''; deps = [ args."clsql" args."clsql-uffi" args."uffi" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/clsql/2016-02-08/clsql-20160208-git.tgz''; - sha256 = ''0hc97rlfpanp6c1ziis47mrq2fgxbk0h51bhczn8k9xin2qbhhgn''; + url = ''http://beta.quicklisp.org/archive/clsql/2020-10-16/clsql-20201016-git.tgz''; + sha256 = ''0wzjxcm7df4fipvj5qsqlllai92hkzd4cvlaghvaikcah9r63hv8''; }; packageName = "clsql-postgresql"; @@ -18,13 +18,13 @@ rec { overrides = x: x; } /* (SYSTEM clsql-postgresql DESCRIPTION Common Lisp PostgreSQL API Driver - SHA256 0hc97rlfpanp6c1ziis47mrq2fgxbk0h51bhczn8k9xin2qbhhgn URL - http://beta.quicklisp.org/archive/clsql/2016-02-08/clsql-20160208-git.tgz - MD5 d1da7688361337a7de4fe7452c225a06 NAME clsql-postgresql FILENAME + SHA256 0wzjxcm7df4fipvj5qsqlllai92hkzd4cvlaghvaikcah9r63hv8 URL + http://beta.quicklisp.org/archive/clsql/2020-10-16/clsql-20201016-git.tgz + MD5 bfa0842f9875113aed8e82eca58dab9e NAME clsql-postgresql FILENAME clsql-postgresql DEPS ((NAME clsql FILENAME clsql) (NAME clsql-uffi FILENAME clsql-uffi) (NAME uffi FILENAME uffi)) - DEPENDENCIES (clsql clsql-uffi uffi) VERSION clsql-20160208-git SIBLINGS + DEPENDENCIES (clsql clsql-uffi uffi) VERSION clsql-20201016-git SIBLINGS (clsql-aodbc clsql-cffi clsql-mysql clsql-odbc clsql-postgresql-socket clsql-postgresql-socket3 clsql-sqlite clsql-sqlite3 clsql-tests clsql-uffi clsql) diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/clsql-sqlite3.nix b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/clsql-sqlite3.nix index 653adb3d12..1756cea10b 100644 --- a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/clsql-sqlite3.nix +++ b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/clsql-sqlite3.nix @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: rec { baseName = ''clsql-sqlite3''; - version = ''clsql-20160208-git''; + version = ''clsql-20201016-git''; description = ''Common Lisp Sqlite3 Driver''; deps = [ args."clsql" args."clsql-uffi" args."uffi" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/clsql/2016-02-08/clsql-20160208-git.tgz''; - sha256 = ''0hc97rlfpanp6c1ziis47mrq2fgxbk0h51bhczn8k9xin2qbhhgn''; + url = ''http://beta.quicklisp.org/archive/clsql/2020-10-16/clsql-20201016-git.tgz''; + sha256 = ''0wzjxcm7df4fipvj5qsqlllai92hkzd4cvlaghvaikcah9r63hv8''; }; packageName = "clsql-sqlite3"; @@ -18,13 +18,13 @@ rec { overrides = x: x; } /* (SYSTEM clsql-sqlite3 DESCRIPTION Common Lisp Sqlite3 Driver SHA256 - 0hc97rlfpanp6c1ziis47mrq2fgxbk0h51bhczn8k9xin2qbhhgn URL - http://beta.quicklisp.org/archive/clsql/2016-02-08/clsql-20160208-git.tgz - MD5 d1da7688361337a7de4fe7452c225a06 NAME clsql-sqlite3 FILENAME + 0wzjxcm7df4fipvj5qsqlllai92hkzd4cvlaghvaikcah9r63hv8 URL + http://beta.quicklisp.org/archive/clsql/2020-10-16/clsql-20201016-git.tgz + MD5 bfa0842f9875113aed8e82eca58dab9e NAME clsql-sqlite3 FILENAME clsql-sqlite3 DEPS ((NAME clsql FILENAME clsql) (NAME clsql-uffi FILENAME clsql-uffi) (NAME uffi FILENAME uffi)) - DEPENDENCIES (clsql clsql-uffi uffi) VERSION clsql-20160208-git SIBLINGS + DEPENDENCIES (clsql clsql-uffi uffi) VERSION clsql-20201016-git SIBLINGS (clsql-aodbc clsql-cffi clsql-mysql clsql-odbc clsql-postgresql-socket clsql-postgresql-socket3 clsql-postgresql clsql-sqlite clsql-tests clsql-uffi clsql) diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/clsql-uffi.nix b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/clsql-uffi.nix index 8243a33758..4139989120 100644 --- a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/clsql-uffi.nix +++ b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/clsql-uffi.nix @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: rec { baseName = ''clsql-uffi''; - version = ''clsql-20160208-git''; + version = ''clsql-20201016-git''; description = ''Common UFFI Helper functions for Common Lisp SQL Interface Library''; deps = [ args."clsql" args."uffi" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/clsql/2016-02-08/clsql-20160208-git.tgz''; - sha256 = ''0hc97rlfpanp6c1ziis47mrq2fgxbk0h51bhczn8k9xin2qbhhgn''; + url = ''http://beta.quicklisp.org/archive/clsql/2020-10-16/clsql-20201016-git.tgz''; + sha256 = ''0wzjxcm7df4fipvj5qsqlllai92hkzd4cvlaghvaikcah9r63hv8''; }; packageName = "clsql-uffi"; @@ -19,11 +19,11 @@ rec { } /* (SYSTEM clsql-uffi DESCRIPTION Common UFFI Helper functions for Common Lisp SQL Interface Library SHA256 - 0hc97rlfpanp6c1ziis47mrq2fgxbk0h51bhczn8k9xin2qbhhgn URL - http://beta.quicklisp.org/archive/clsql/2016-02-08/clsql-20160208-git.tgz - MD5 d1da7688361337a7de4fe7452c225a06 NAME clsql-uffi FILENAME clsql-uffi + 0wzjxcm7df4fipvj5qsqlllai92hkzd4cvlaghvaikcah9r63hv8 URL + http://beta.quicklisp.org/archive/clsql/2020-10-16/clsql-20201016-git.tgz + MD5 bfa0842f9875113aed8e82eca58dab9e NAME clsql-uffi FILENAME clsql-uffi DEPS ((NAME clsql FILENAME clsql) (NAME uffi FILENAME uffi)) DEPENDENCIES - (clsql uffi) VERSION clsql-20160208-git SIBLINGS + (clsql uffi) VERSION clsql-20201016-git SIBLINGS (clsql-aodbc clsql-cffi clsql-mysql clsql-odbc clsql-postgresql-socket clsql-postgresql-socket3 clsql-postgresql clsql-sqlite clsql-sqlite3 clsql-tests clsql) diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/clsql.nix b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/clsql.nix index 74b8442c0c..6a202f7efa 100644 --- a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/clsql.nix +++ b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/clsql.nix @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: rec { baseName = ''clsql''; - version = ''20160208-git''; + version = ''20201016-git''; description = ''Common Lisp SQL Interface library''; deps = [ args."uffi" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/clsql/2016-02-08/clsql-20160208-git.tgz''; - sha256 = ''0hc97rlfpanp6c1ziis47mrq2fgxbk0h51bhczn8k9xin2qbhhgn''; + url = ''http://beta.quicklisp.org/archive/clsql/2020-10-16/clsql-20201016-git.tgz''; + sha256 = ''0wzjxcm7df4fipvj5qsqlllai92hkzd4cvlaghvaikcah9r63hv8''; }; packageName = "clsql"; @@ -18,10 +18,10 @@ rec { overrides = x: x; } /* (SYSTEM clsql DESCRIPTION Common Lisp SQL Interface library SHA256 - 0hc97rlfpanp6c1ziis47mrq2fgxbk0h51bhczn8k9xin2qbhhgn URL - http://beta.quicklisp.org/archive/clsql/2016-02-08/clsql-20160208-git.tgz - MD5 d1da7688361337a7de4fe7452c225a06 NAME clsql FILENAME clsql DEPS - ((NAME uffi FILENAME uffi)) DEPENDENCIES (uffi) VERSION 20160208-git + 0wzjxcm7df4fipvj5qsqlllai92hkzd4cvlaghvaikcah9r63hv8 URL + http://beta.quicklisp.org/archive/clsql/2020-10-16/clsql-20201016-git.tgz + MD5 bfa0842f9875113aed8e82eca58dab9e NAME clsql FILENAME clsql DEPS + ((NAME uffi FILENAME uffi)) DEPENDENCIES (uffi) VERSION 20201016-git SIBLINGS (clsql-aodbc clsql-cffi clsql-mysql clsql-odbc clsql-postgresql-socket clsql-postgresql-socket3 clsql-postgresql clsql-sqlite clsql-sqlite3 diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/clump-2-3-tree.nix b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/clump-2-3-tree.nix new file mode 100644 index 0000000000..10ab18a8ca --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/clump-2-3-tree.nix @@ -0,0 +1,26 @@ +args @ { fetchurl, ... }: +rec { + baseName = ''clump-2-3-tree''; + version = ''clump-20160825-git''; + + description = ''System lacks description''; + + deps = [ args."acclimation" ]; + + src = fetchurl { + url = ''http://beta.quicklisp.org/archive/clump/2016-08-25/clump-20160825-git.tgz''; + sha256 = ''1mngxmwklpi52inihkp4akzdi7y32609spfi70yamwgzc1wijbrl''; + }; + + packageName = "clump-2-3-tree"; + + asdFilesToKeep = ["clump-2-3-tree.asd"]; + overrides = x: x; +} +/* (SYSTEM clump-2-3-tree DESCRIPTION System lacks description SHA256 + 1mngxmwklpi52inihkp4akzdi7y32609spfi70yamwgzc1wijbrl URL + http://beta.quicklisp.org/archive/clump/2016-08-25/clump-20160825-git.tgz + MD5 5132d2800138d435ef69f7e68b025c8f NAME clump-2-3-tree FILENAME + clump-2-3-tree DEPS ((NAME acclimation FILENAME acclimation)) DEPENDENCIES + (acclimation) VERSION clump-20160825-git SIBLINGS + (clump-binary-tree clump-test clump) PARASITES NIL) */ diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/clump-binary-tree.nix b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/clump-binary-tree.nix new file mode 100644 index 0000000000..ad28447154 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/clump-binary-tree.nix @@ -0,0 +1,26 @@ +args @ { fetchurl, ... }: +rec { + baseName = ''clump-binary-tree''; + version = ''clump-20160825-git''; + + description = ''System lacks description''; + + deps = [ args."acclimation" ]; + + src = fetchurl { + url = ''http://beta.quicklisp.org/archive/clump/2016-08-25/clump-20160825-git.tgz''; + sha256 = ''1mngxmwklpi52inihkp4akzdi7y32609spfi70yamwgzc1wijbrl''; + }; + + packageName = "clump-binary-tree"; + + asdFilesToKeep = ["clump-binary-tree.asd"]; + overrides = x: x; +} +/* (SYSTEM clump-binary-tree DESCRIPTION System lacks description SHA256 + 1mngxmwklpi52inihkp4akzdi7y32609spfi70yamwgzc1wijbrl URL + http://beta.quicklisp.org/archive/clump/2016-08-25/clump-20160825-git.tgz + MD5 5132d2800138d435ef69f7e68b025c8f NAME clump-binary-tree FILENAME + clump-binary-tree DEPS ((NAME acclimation FILENAME acclimation)) + DEPENDENCIES (acclimation) VERSION clump-20160825-git SIBLINGS + (clump-2-3-tree clump-test clump) PARASITES NIL) */ diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/clump.nix b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/clump.nix new file mode 100644 index 0000000000..476cacb6f3 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/clump.nix @@ -0,0 +1,29 @@ +args @ { fetchurl, ... }: +rec { + baseName = ''clump''; + version = ''20160825-git''; + + description = ''Library for operations on different kinds of trees''; + + deps = [ args."acclimation" args."clump-2-3-tree" args."clump-binary-tree" ]; + + src = fetchurl { + url = ''http://beta.quicklisp.org/archive/clump/2016-08-25/clump-20160825-git.tgz''; + sha256 = ''1mngxmwklpi52inihkp4akzdi7y32609spfi70yamwgzc1wijbrl''; + }; + + packageName = "clump"; + + asdFilesToKeep = ["clump.asd"]; + overrides = x: x; +} +/* (SYSTEM clump DESCRIPTION Library for operations on different kinds of trees + SHA256 1mngxmwklpi52inihkp4akzdi7y32609spfi70yamwgzc1wijbrl URL + http://beta.quicklisp.org/archive/clump/2016-08-25/clump-20160825-git.tgz + MD5 5132d2800138d435ef69f7e68b025c8f NAME clump FILENAME clump DEPS + ((NAME acclimation FILENAME acclimation) + (NAME clump-2-3-tree FILENAME clump-2-3-tree) + (NAME clump-binary-tree FILENAME clump-binary-tree)) + DEPENDENCIES (acclimation clump-2-3-tree clump-binary-tree) VERSION + 20160825-git SIBLINGS (clump-2-3-tree clump-binary-tree clump-test) + PARASITES NIL) */ diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/clunit.nix b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/clunit.nix new file mode 100644 index 0000000000..7ab00c0344 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/clunit.nix @@ -0,0 +1,24 @@ +args @ { fetchurl, ... }: +rec { + baseName = ''clunit''; + version = ''20171019-git''; + + description = ''CLUnit is a Common Lisp unit testing framework.''; + + deps = [ ]; + + src = fetchurl { + url = ''http://beta.quicklisp.org/archive/clunit/2017-10-19/clunit-20171019-git.tgz''; + sha256 = ''1rapyh0fbjnksj8j3y6imzya1kw80882w18j0fv9iq1hlp718zs5''; + }; + + packageName = "clunit"; + + asdFilesToKeep = ["clunit.asd"]; + overrides = x: x; +} +/* (SYSTEM clunit DESCRIPTION CLUnit is a Common Lisp unit testing framework. + SHA256 1rapyh0fbjnksj8j3y6imzya1kw80882w18j0fv9iq1hlp718zs5 URL + http://beta.quicklisp.org/archive/clunit/2017-10-19/clunit-20171019-git.tgz + MD5 389017f2f05a6287078ddacd0471817e NAME clunit FILENAME clunit DEPS NIL + DEPENDENCIES NIL VERSION 20171019-git SIBLINGS NIL PARASITES NIL) */ diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/clunit2.nix b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/clunit2.nix new file mode 100644 index 0000000000..6a143073b5 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/clunit2.nix @@ -0,0 +1,24 @@ +args @ { fetchurl, ... }: +rec { + baseName = ''clunit2''; + version = ''20201016-git''; + + description = ''CLUnit is a Common Lisp unit testing framework.''; + + deps = [ ]; + + src = fetchurl { + url = ''http://beta.quicklisp.org/archive/clunit2/2020-10-16/clunit2-20201016-git.tgz''; + sha256 = ''1mj3c125drq9a3pxrh0r8q3gqgq68yk7qi0zbqh4mkpavl1aspdp''; + }; + + packageName = "clunit2"; + + asdFilesToKeep = ["clunit2.asd"]; + overrides = x: x; +} +/* (SYSTEM clunit2 DESCRIPTION CLUnit is a Common Lisp unit testing framework. + SHA256 1mj3c125drq9a3pxrh0r8q3gqgq68yk7qi0zbqh4mkpavl1aspdp URL + http://beta.quicklisp.org/archive/clunit2/2020-10-16/clunit2-20201016-git.tgz + MD5 7f977b33550c689d1d2cf2c8a4610896 NAME clunit2 FILENAME clunit2 DEPS NIL + DEPENDENCIES NIL VERSION 20201016-git SIBLINGS NIL PARASITES NIL) */ diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/clx-truetype.nix b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/clx-truetype.nix deleted file mode 100644 index 303d43a964..0000000000 --- a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/clx-truetype.nix +++ /dev/null @@ -1,39 +0,0 @@ -args @ { fetchurl, ... }: -rec { - baseName = ''clx-truetype''; - version = ''20160825-git''; - - parasites = [ "clx-truetype-test" ]; - - description = ''clx-truetype is pure common lisp solution for antialiased TrueType font rendering using CLX and XRender extension.''; - - deps = [ args."alexandria" args."bordeaux-threads" args."cl-aa" args."cl-fad" args."cl-paths" args."cl-paths-ttf" args."cl-store" args."cl-vectors" args."clx" args."trivial-features" args."zpb-ttf" ]; - - src = fetchurl { - url = ''http://beta.quicklisp.org/archive/clx-truetype/2016-08-25/clx-truetype-20160825-git.tgz''; - sha256 = ''0ndy067rg9w6636gxwlpnw7f3ck9nrnjb03444pprik9r3c9in67''; - }; - - packageName = "clx-truetype"; - - asdFilesToKeep = ["clx-truetype.asd"]; - overrides = x: x; -} -/* (SYSTEM clx-truetype DESCRIPTION - clx-truetype is pure common lisp solution for antialiased TrueType font rendering using CLX and XRender extension. - SHA256 0ndy067rg9w6636gxwlpnw7f3ck9nrnjb03444pprik9r3c9in67 URL - http://beta.quicklisp.org/archive/clx-truetype/2016-08-25/clx-truetype-20160825-git.tgz - MD5 7c9dedb21d52dedf727de741ac6d9c60 NAME clx-truetype FILENAME - clx-truetype DEPS - ((NAME alexandria FILENAME alexandria) - (NAME bordeaux-threads FILENAME bordeaux-threads) - (NAME cl-aa FILENAME cl-aa) (NAME cl-fad FILENAME cl-fad) - (NAME cl-paths FILENAME cl-paths) - (NAME cl-paths-ttf FILENAME cl-paths-ttf) - (NAME cl-store FILENAME cl-store) (NAME cl-vectors FILENAME cl-vectors) - (NAME clx FILENAME clx) (NAME trivial-features FILENAME trivial-features) - (NAME zpb-ttf FILENAME zpb-ttf)) - DEPENDENCIES - (alexandria bordeaux-threads cl-aa cl-fad cl-paths cl-paths-ttf cl-store - cl-vectors clx trivial-features zpb-ttf) - VERSION 20160825-git SIBLINGS NIL PARASITES (clx-truetype-test)) */ diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/clx.nix b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/clx.nix index 8f721b60f4..856d541155 100644 --- a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/clx.nix +++ b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/clx.nix @@ -1,7 +1,7 @@ args @ { fetchurl, ... }: rec { baseName = ''clx''; - version = ''20191130-git''; + version = ''20200715-git''; parasites = [ "clx/test" ]; @@ -10,8 +10,8 @@ rec { deps = [ args."fiasco" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/clx/2019-11-30/clx-20191130-git.tgz''; - sha256 = ''1fyh34hrx4p4kf5mijrmgl66hy7yjh9y43ilxck5q378291yk8dj''; + url = ''http://beta.quicklisp.org/archive/clx/2020-07-15/clx-20200715-git.tgz''; + sha256 = ''1fvx6m3imvkkd0z5a3jmm2v6mkrndwsidhykrs229rqx343zg8ra''; }; packageName = "clx"; @@ -21,8 +21,8 @@ rec { } /* (SYSTEM clx DESCRIPTION An implementation of the X Window System protocol in Lisp. SHA256 - 1fyh34hrx4p4kf5mijrmgl66hy7yjh9y43ilxck5q378291yk8dj URL - http://beta.quicklisp.org/archive/clx/2019-11-30/clx-20191130-git.tgz MD5 - 61e86a60727732df62c9fa383535fc89 NAME clx FILENAME clx DEPS - ((NAME fiasco FILENAME fiasco)) DEPENDENCIES (fiasco) VERSION 20191130-git + 1fvx6m3imvkkd0z5a3jmm2v6mkrndwsidhykrs229rqx343zg8ra URL + http://beta.quicklisp.org/archive/clx/2020-07-15/clx-20200715-git.tgz MD5 + c0e08c88e78587bdbbbea188848dc39d NAME clx FILENAME clx DEPS + ((NAME fiasco FILENAME fiasco)) DEPENDENCIES (fiasco) VERSION 20200715-git SIBLINGS NIL PARASITES (clx/test)) */ diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/colorize.nix b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/colorize.nix new file mode 100644 index 0000000000..9084d6a309 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/colorize.nix @@ -0,0 +1,28 @@ +args @ { fetchurl, ... }: +rec { + baseName = ''colorize''; + version = ''20180228-git''; + + description = ''A Syntax highlighting library''; + + deps = [ args."alexandria" args."html-encode" args."split-sequence" ]; + + src = fetchurl { + url = ''http://beta.quicklisp.org/archive/colorize/2018-02-28/colorize-20180228-git.tgz''; + sha256 = ''1g0xbryavsf17zy9iy0sbqsb4lyva04h93sbaj3iwv12w50fwz2h''; + }; + + packageName = "colorize"; + + asdFilesToKeep = ["colorize.asd"]; + overrides = x: x; +} +/* (SYSTEM colorize DESCRIPTION A Syntax highlighting library SHA256 + 1g0xbryavsf17zy9iy0sbqsb4lyva04h93sbaj3iwv12w50fwz2h URL + http://beta.quicklisp.org/archive/colorize/2018-02-28/colorize-20180228-git.tgz + MD5 1bc08c8f76b747e4d254669a205dc611 NAME colorize FILENAME colorize DEPS + ((NAME alexandria FILENAME alexandria) + (NAME html-encode FILENAME html-encode) + (NAME split-sequence FILENAME split-sequence)) + DEPENDENCIES (alexandria html-encode split-sequence) VERSION 20180228-git + SIBLINGS NIL PARASITES NIL) */ diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/command-line-arguments.nix b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/command-line-arguments.nix index fdedf9735e..ed4e48cd83 100644 --- a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/command-line-arguments.nix +++ b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/command-line-arguments.nix @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: rec { baseName = ''command-line-arguments''; - version = ''20191227-git''; + version = ''20200325-git''; description = ''small library to deal with command-line arguments''; deps = [ ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/command-line-arguments/2019-12-27/command-line-arguments-20191227-git.tgz''; - sha256 = ''1846v22mdi8qfavp9wcp7spic6gcmlrbd6g3l0f3crssqza0asgf''; + url = ''http://beta.quicklisp.org/archive/command-line-arguments/2020-03-25/command-line-arguments-20200325-git.tgz''; + sha256 = ''0ny0c0aw3mfjpmf31pnd9zfnylqh8ji2yi636w1f352c13z2w5sz''; }; packageName = "command-line-arguments"; @@ -19,8 +19,8 @@ rec { } /* (SYSTEM command-line-arguments DESCRIPTION small library to deal with command-line arguments SHA256 - 1846v22mdi8qfavp9wcp7spic6gcmlrbd6g3l0f3crssqza0asgf URL - http://beta.quicklisp.org/archive/command-line-arguments/2019-12-27/command-line-arguments-20191227-git.tgz - MD5 3ed82e1536b55fc0b7abc79626631aab NAME command-line-arguments FILENAME - command-line-arguments DEPS NIL DEPENDENCIES NIL VERSION 20191227-git + 0ny0c0aw3mfjpmf31pnd9zfnylqh8ji2yi636w1f352c13z2w5sz URL + http://beta.quicklisp.org/archive/command-line-arguments/2020-03-25/command-line-arguments-20200325-git.tgz + MD5 5a860667bc3feef212028b90c9e026f8 NAME command-line-arguments FILENAME + command-line-arguments DEPS NIL DEPENDENCIES NIL VERSION 20200325-git SIBLINGS NIL PARASITES NIL) */ diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cxml-stp.nix b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cxml-stp.nix index ebae32962f..2816b45108 100644 --- a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cxml-stp.nix +++ b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cxml-stp.nix @@ -1,17 +1,17 @@ args @ { fetchurl, ... }: rec { baseName = ''cxml-stp''; - version = ''20190521-git''; + version = ''20200325-git''; parasites = [ "cxml-stp/test" ]; description = ''System lacks description''; - deps = [ args."alexandria" args."babel" args."cl-ppcre" args."closure-common" args."cxml" args."parse-number" args."puri" args."rt" args."trivial-features" args."trivial-gray-streams" args."xpath" args."xpath_slash_test" args."yacc" ]; + deps = [ args."alexandria" args."babel" args."cl-ppcre" args."closure-common" args."cxml" args."cxml_slash_test" args."parse-number" args."puri" args."rt" args."trivial-features" args."trivial-gray-streams" args."xpath" args."xpath_slash_test" args."yacc" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/cxml-stp/2019-05-21/cxml-stp-20190521-git.tgz''; - sha256 = ''1lgqw1w65yra0lyy41finj19y1z6yqkvkyzgvagb7s54cnzafz21''; + url = ''http://beta.quicklisp.org/archive/cxml-stp/2020-03-25/cxml-stp-20200325-git.tgz''; + sha256 = ''1y26bksmysvxifqx4lslpbsdvmcqkf7di36a3yyqnjgrb5r0jv1n''; }; packageName = "cxml-stp"; @@ -20,18 +20,19 @@ rec { overrides = x: x; } /* (SYSTEM cxml-stp DESCRIPTION System lacks description SHA256 - 1lgqw1w65yra0lyy41finj19y1z6yqkvkyzgvagb7s54cnzafz21 URL - http://beta.quicklisp.org/archive/cxml-stp/2019-05-21/cxml-stp-20190521-git.tgz - MD5 9e0c99bd2b547e07b23305a5ff72aff6 NAME cxml-stp FILENAME cxml-stp DEPS + 1y26bksmysvxifqx4lslpbsdvmcqkf7di36a3yyqnjgrb5r0jv1n URL + http://beta.quicklisp.org/archive/cxml-stp/2020-03-25/cxml-stp-20200325-git.tgz + MD5 5622b4aae55e448473f1ba14fa3a5f4c NAME cxml-stp FILENAME cxml-stp DEPS ((NAME alexandria FILENAME alexandria) (NAME babel FILENAME babel) (NAME cl-ppcre FILENAME cl-ppcre) (NAME closure-common FILENAME closure-common) (NAME cxml FILENAME cxml) + (NAME cxml/test FILENAME cxml_slash_test) (NAME parse-number FILENAME parse-number) (NAME puri FILENAME puri) (NAME rt FILENAME rt) (NAME trivial-features FILENAME trivial-features) (NAME trivial-gray-streams FILENAME trivial-gray-streams) (NAME xpath FILENAME xpath) (NAME xpath/test FILENAME xpath_slash_test) (NAME yacc FILENAME yacc)) DEPENDENCIES - (alexandria babel cl-ppcre closure-common cxml parse-number puri rt - trivial-features trivial-gray-streams xpath xpath/test yacc) - VERSION 20190521-git SIBLINGS NIL PARASITES (cxml-stp/test)) */ + (alexandria babel cl-ppcre closure-common cxml cxml/test parse-number puri + rt trivial-features trivial-gray-streams xpath xpath/test yacc) + VERSION 20200325-git SIBLINGS NIL PARASITES (cxml-stp/test)) */ diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cxml.nix b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cxml.nix index 68a019fa02..8f5e05048c 100644 --- a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cxml.nix +++ b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cxml.nix @@ -1,7 +1,7 @@ args @ { fetchurl, ... }: rec { baseName = ''cxml''; - version = ''20181018-git''; + version = ''20200610-git''; parasites = [ "cxml/dom" "cxml/klacks" "cxml/test" "cxml/xml" ]; @@ -10,8 +10,8 @@ rec { deps = [ args."alexandria" args."babel" args."closure-common" args."puri" args."trivial-features" args."trivial-gray-streams" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/cxml/2018-10-18/cxml-20181018-git.tgz''; - sha256 = ''1s7nfq5zfpxsrayhn0gg3x8fj47mld00qm3cpv5whdqj3wd3krmn''; + url = ''http://beta.quicklisp.org/archive/cxml/2020-06-10/cxml-20200610-git.tgz''; + sha256 = ''0545rh4mfxqx2yn9b48s0hzd5w80kars7hpykbg0lgf7ys5218mq''; }; packageName = "cxml"; @@ -20,9 +20,9 @@ rec { overrides = x: x; } /* (SYSTEM cxml DESCRIPTION Closure XML - a Common Lisp XML parser SHA256 - 1s7nfq5zfpxsrayhn0gg3x8fj47mld00qm3cpv5whdqj3wd3krmn URL - http://beta.quicklisp.org/archive/cxml/2018-10-18/cxml-20181018-git.tgz MD5 - 33c5546de7099d65fdb2fbb716fd3de8 NAME cxml FILENAME cxml DEPS + 0545rh4mfxqx2yn9b48s0hzd5w80kars7hpykbg0lgf7ys5218mq URL + http://beta.quicklisp.org/archive/cxml/2020-06-10/cxml-20200610-git.tgz MD5 + 0b6f34edb79f7b63cc5855f18d0d66f0 NAME cxml FILENAME cxml DEPS ((NAME alexandria FILENAME alexandria) (NAME babel FILENAME babel) (NAME closure-common FILENAME closure-common) (NAME puri FILENAME puri) (NAME trivial-features FILENAME trivial-features) @@ -30,5 +30,5 @@ rec { DEPENDENCIES (alexandria babel closure-common puri trivial-features trivial-gray-streams) - VERSION 20181018-git SIBLINGS (cxml-dom cxml-klacks cxml-test) PARASITES + VERSION 20200610-git SIBLINGS (cxml-dom cxml-klacks cxml-test) PARASITES (cxml/dom cxml/klacks cxml/test cxml/xml)) */ diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/db3.nix b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/db3.nix deleted file mode 100644 index 1f0b4f9f71..0000000000 --- a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/db3.nix +++ /dev/null @@ -1,24 +0,0 @@ -{ fetchurl, ... }: -{ - baseName = ''db3''; - version = ''cl-20150302-git''; - - description = ''DB3 file reader''; - - deps = [ ]; - - src = fetchurl { - url = ''http://beta.quicklisp.org/archive/cl-db3/2015-03-02/cl-db3-20150302-git.tgz''; - sha256 = ''0mwdpb7cdvxdcbyg3ags6xzwhblai170q3p20njs3v73s30dbzxi''; - }; - - packageName = "db3"; - - asdFilesToKeep = ["db3.asd"]; - overrides = x: x; -} -/* (SYSTEM db3 DESCRIPTION DB3 file reader SHA256 - 0mwdpb7cdvxdcbyg3ags6xzwhblai170q3p20njs3v73s30dbzxi URL - http://beta.quicklisp.org/archive/cl-db3/2015-03-02/cl-db3-20150302-git.tgz - MD5 578896a3f60f474742f240b703f8c5f5 NAME db3 FILENAME db3 DEPS NIL - DEPENDENCIES NIL VERSION cl-20150302-git SIBLINGS NIL PARASITES NIL) */ diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/dbd-mysql.nix b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/dbd-mysql.nix index 850e780696..9dcea72f39 100644 --- a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/dbd-mysql.nix +++ b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/dbd-mysql.nix @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: rec { baseName = ''dbd-mysql''; - version = ''cl-dbi-20191007-git''; + version = ''cl-dbi-20200610-git''; description = ''Database driver for MySQL.''; - deps = [ args."alexandria" args."babel" args."bordeaux-threads" args."cffi" args."cl-annot" args."cl-mysql" args."cl-syntax" args."cl-syntax-annot" args."closer-mop" args."dbi" args."named-readtables" args."split-sequence" args."trivial-features" args."trivial-types" ]; + deps = [ args."alexandria" args."babel" args."bordeaux-threads" args."cffi" args."cl-mysql" args."closer-mop" args."dbi" args."split-sequence" args."trivial-features" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/cl-dbi/2019-10-07/cl-dbi-20191007-git.tgz''; - sha256 = ''0xsg0xqq88wsx6wf8nllfd0mk356bw2qw3c5c31rfj41wz5vpx35''; + url = ''http://beta.quicklisp.org/archive/cl-dbi/2020-06-10/cl-dbi-20200610-git.tgz''; + sha256 = ''1d7hwywcqzqwmr5b42c0mmjq3v3xxd4cwb4fn5k1wd7j6pr0bkas''; }; packageName = "dbd-mysql"; @@ -18,22 +18,17 @@ rec { overrides = x: x; } /* (SYSTEM dbd-mysql DESCRIPTION Database driver for MySQL. SHA256 - 0xsg0xqq88wsx6wf8nllfd0mk356bw2qw3c5c31rfj41wz5vpx35 URL - http://beta.quicklisp.org/archive/cl-dbi/2019-10-07/cl-dbi-20191007-git.tgz - MD5 bf524c4000468d12627fa419ae412abb NAME dbd-mysql FILENAME dbd-mysql DEPS + 1d7hwywcqzqwmr5b42c0mmjq3v3xxd4cwb4fn5k1wd7j6pr0bkas URL + http://beta.quicklisp.org/archive/cl-dbi/2020-06-10/cl-dbi-20200610-git.tgz + MD5 2caeb911b23327e054986211d6bfea55 NAME dbd-mysql FILENAME dbd-mysql DEPS ((NAME alexandria FILENAME alexandria) (NAME babel FILENAME babel) (NAME bordeaux-threads FILENAME bordeaux-threads) - (NAME cffi FILENAME cffi) (NAME cl-annot FILENAME cl-annot) - (NAME cl-mysql FILENAME cl-mysql) (NAME cl-syntax FILENAME cl-syntax) - (NAME cl-syntax-annot FILENAME cl-syntax-annot) + (NAME cffi FILENAME cffi) (NAME cl-mysql FILENAME cl-mysql) (NAME closer-mop FILENAME closer-mop) (NAME dbi FILENAME dbi) - (NAME named-readtables FILENAME named-readtables) (NAME split-sequence FILENAME split-sequence) - (NAME trivial-features FILENAME trivial-features) - (NAME trivial-types FILENAME trivial-types)) + (NAME trivial-features FILENAME trivial-features)) DEPENDENCIES - (alexandria babel bordeaux-threads cffi cl-annot cl-mysql cl-syntax - cl-syntax-annot closer-mop dbi named-readtables split-sequence - trivial-features trivial-types) - VERSION cl-dbi-20191007-git SIBLINGS + (alexandria babel bordeaux-threads cffi cl-mysql closer-mop dbi + split-sequence trivial-features) + VERSION cl-dbi-20200610-git SIBLINGS (cl-dbi dbd-postgres dbd-sqlite3 dbi-test dbi) PARASITES NIL) */ diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/dbd-postgres.nix b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/dbd-postgres.nix index 9dcecf8cfd..5a7b261f72 100644 --- a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/dbd-postgres.nix +++ b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/dbd-postgres.nix @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: rec { baseName = ''dbd-postgres''; - version = ''cl-dbi-20191007-git''; + version = ''cl-dbi-20200610-git''; description = ''Database driver for PostgreSQL.''; - deps = [ args."alexandria" args."bordeaux-threads" args."cl-annot" args."cl-postgres" args."cl-syntax" args."cl-syntax-annot" args."closer-mop" args."dbi" args."md5" args."named-readtables" args."split-sequence" args."trivial-garbage" args."trivial-types" args."usocket" ]; + deps = [ args."alexandria" args."bordeaux-threads" args."cl-base64" args."cl-postgres" args."cl-ppcre" args."closer-mop" args."dbi" args."ironclad" args."md5" args."split-sequence" args."trivial-garbage" args."uax-15" args."usocket" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/cl-dbi/2019-10-07/cl-dbi-20191007-git.tgz''; - sha256 = ''0xsg0xqq88wsx6wf8nllfd0mk356bw2qw3c5c31rfj41wz5vpx35''; + url = ''http://beta.quicklisp.org/archive/cl-dbi/2020-06-10/cl-dbi-20200610-git.tgz''; + sha256 = ''1d7hwywcqzqwmr5b42c0mmjq3v3xxd4cwb4fn5k1wd7j6pr0bkas''; }; packageName = "dbd-postgres"; @@ -18,24 +18,21 @@ rec { overrides = x: x; } /* (SYSTEM dbd-postgres DESCRIPTION Database driver for PostgreSQL. SHA256 - 0xsg0xqq88wsx6wf8nllfd0mk356bw2qw3c5c31rfj41wz5vpx35 URL - http://beta.quicklisp.org/archive/cl-dbi/2019-10-07/cl-dbi-20191007-git.tgz - MD5 bf524c4000468d12627fa419ae412abb NAME dbd-postgres FILENAME + 1d7hwywcqzqwmr5b42c0mmjq3v3xxd4cwb4fn5k1wd7j6pr0bkas URL + http://beta.quicklisp.org/archive/cl-dbi/2020-06-10/cl-dbi-20200610-git.tgz + MD5 2caeb911b23327e054986211d6bfea55 NAME dbd-postgres FILENAME dbd-postgres DEPS ((NAME alexandria FILENAME alexandria) (NAME bordeaux-threads FILENAME bordeaux-threads) - (NAME cl-annot FILENAME cl-annot) (NAME cl-postgres FILENAME cl-postgres) - (NAME cl-syntax FILENAME cl-syntax) - (NAME cl-syntax-annot FILENAME cl-syntax-annot) + (NAME cl-base64 FILENAME cl-base64) + (NAME cl-postgres FILENAME cl-postgres) (NAME cl-ppcre FILENAME cl-ppcre) (NAME closer-mop FILENAME closer-mop) (NAME dbi FILENAME dbi) - (NAME md5 FILENAME md5) (NAME named-readtables FILENAME named-readtables) + (NAME ironclad FILENAME ironclad) (NAME md5 FILENAME md5) (NAME split-sequence FILENAME split-sequence) (NAME trivial-garbage FILENAME trivial-garbage) - (NAME trivial-types FILENAME trivial-types) - (NAME usocket FILENAME usocket)) + (NAME uax-15 FILENAME uax-15) (NAME usocket FILENAME usocket)) DEPENDENCIES - (alexandria bordeaux-threads cl-annot cl-postgres cl-syntax cl-syntax-annot - closer-mop dbi md5 named-readtables split-sequence trivial-garbage - trivial-types usocket) - VERSION cl-dbi-20191007-git SIBLINGS + (alexandria bordeaux-threads cl-base64 cl-postgres cl-ppcre closer-mop dbi + ironclad md5 split-sequence trivial-garbage uax-15 usocket) + VERSION cl-dbi-20200610-git SIBLINGS (cl-dbi dbd-mysql dbd-sqlite3 dbi-test dbi) PARASITES NIL) */ diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/dbd-sqlite3.nix b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/dbd-sqlite3.nix index d367a52c1c..5566e80754 100644 --- a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/dbd-sqlite3.nix +++ b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/dbd-sqlite3.nix @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: rec { baseName = ''dbd-sqlite3''; - version = ''cl-dbi-20191007-git''; + version = ''cl-dbi-20200610-git''; description = ''Database driver for SQLite3.''; - deps = [ args."alexandria" args."babel" args."bordeaux-threads" args."cffi" args."cl-annot" args."cl-syntax" args."cl-syntax-annot" args."closer-mop" args."dbi" args."iterate" args."named-readtables" args."split-sequence" args."sqlite" args."trivial-features" args."trivial-garbage" args."trivial-types" args."uiop" ]; + deps = [ args."alexandria" args."babel" args."bordeaux-threads" args."cffi" args."closer-mop" args."dbi" args."iterate" args."split-sequence" args."sqlite" args."trivial-features" args."trivial-garbage" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/cl-dbi/2019-10-07/cl-dbi-20191007-git.tgz''; - sha256 = ''0xsg0xqq88wsx6wf8nllfd0mk356bw2qw3c5c31rfj41wz5vpx35''; + url = ''http://beta.quicklisp.org/archive/cl-dbi/2020-06-10/cl-dbi-20200610-git.tgz''; + sha256 = ''1d7hwywcqzqwmr5b42c0mmjq3v3xxd4cwb4fn5k1wd7j6pr0bkas''; }; packageName = "dbd-sqlite3"; @@ -18,26 +18,20 @@ rec { overrides = x: x; } /* (SYSTEM dbd-sqlite3 DESCRIPTION Database driver for SQLite3. SHA256 - 0xsg0xqq88wsx6wf8nllfd0mk356bw2qw3c5c31rfj41wz5vpx35 URL - http://beta.quicklisp.org/archive/cl-dbi/2019-10-07/cl-dbi-20191007-git.tgz - MD5 bf524c4000468d12627fa419ae412abb NAME dbd-sqlite3 FILENAME dbd-sqlite3 + 1d7hwywcqzqwmr5b42c0mmjq3v3xxd4cwb4fn5k1wd7j6pr0bkas URL + http://beta.quicklisp.org/archive/cl-dbi/2020-06-10/cl-dbi-20200610-git.tgz + MD5 2caeb911b23327e054986211d6bfea55 NAME dbd-sqlite3 FILENAME dbd-sqlite3 DEPS ((NAME alexandria FILENAME alexandria) (NAME babel FILENAME babel) (NAME bordeaux-threads FILENAME bordeaux-threads) - (NAME cffi FILENAME cffi) (NAME cl-annot FILENAME cl-annot) - (NAME cl-syntax FILENAME cl-syntax) - (NAME cl-syntax-annot FILENAME cl-syntax-annot) - (NAME closer-mop FILENAME closer-mop) (NAME dbi FILENAME dbi) - (NAME iterate FILENAME iterate) - (NAME named-readtables FILENAME named-readtables) + (NAME cffi FILENAME cffi) (NAME closer-mop FILENAME closer-mop) + (NAME dbi FILENAME dbi) (NAME iterate FILENAME iterate) (NAME split-sequence FILENAME split-sequence) (NAME sqlite FILENAME sqlite) (NAME trivial-features FILENAME trivial-features) - (NAME trivial-garbage FILENAME trivial-garbage) - (NAME trivial-types FILENAME trivial-types) (NAME uiop FILENAME uiop)) + (NAME trivial-garbage FILENAME trivial-garbage)) DEPENDENCIES - (alexandria babel bordeaux-threads cffi cl-annot cl-syntax cl-syntax-annot - closer-mop dbi iterate named-readtables split-sequence sqlite - trivial-features trivial-garbage trivial-types uiop) - VERSION cl-dbi-20191007-git SIBLINGS + (alexandria babel bordeaux-threads cffi closer-mop dbi iterate + split-sequence sqlite trivial-features trivial-garbage) + VERSION cl-dbi-20200610-git SIBLINGS (cl-dbi dbd-mysql dbd-postgres dbi-test dbi) PARASITES NIL) */ diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/dbi-test.nix b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/dbi-test.nix new file mode 100644 index 0000000000..889afc1231 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/dbi-test.nix @@ -0,0 +1,35 @@ +args @ { fetchurl, ... }: +rec { + baseName = ''dbi-test''; + version = ''cl-dbi-20200610-git''; + + description = ''System lacks description''; + + deps = [ args."alexandria" args."bordeaux-threads" args."closer-mop" args."dbi" args."dissect" args."rove" args."split-sequence" args."trivial-gray-streams" args."trivial-types" ]; + + src = fetchurl { + url = ''http://beta.quicklisp.org/archive/cl-dbi/2020-06-10/cl-dbi-20200610-git.tgz''; + sha256 = ''1d7hwywcqzqwmr5b42c0mmjq3v3xxd4cwb4fn5k1wd7j6pr0bkas''; + }; + + packageName = "dbi-test"; + + asdFilesToKeep = ["dbi-test.asd"]; + overrides = x: x; +} +/* (SYSTEM dbi-test DESCRIPTION System lacks description SHA256 + 1d7hwywcqzqwmr5b42c0mmjq3v3xxd4cwb4fn5k1wd7j6pr0bkas URL + http://beta.quicklisp.org/archive/cl-dbi/2020-06-10/cl-dbi-20200610-git.tgz + MD5 2caeb911b23327e054986211d6bfea55 NAME dbi-test FILENAME dbi-test DEPS + ((NAME alexandria FILENAME alexandria) + (NAME bordeaux-threads FILENAME bordeaux-threads) + (NAME closer-mop FILENAME closer-mop) (NAME dbi FILENAME dbi) + (NAME dissect FILENAME dissect) (NAME rove FILENAME rove) + (NAME split-sequence FILENAME split-sequence) + (NAME trivial-gray-streams FILENAME trivial-gray-streams) + (NAME trivial-types FILENAME trivial-types)) + DEPENDENCIES + (alexandria bordeaux-threads closer-mop dbi dissect rove split-sequence + trivial-gray-streams trivial-types) + VERSION cl-dbi-20200610-git SIBLINGS + (cl-dbi dbd-mysql dbd-postgres dbd-sqlite3 dbi) PARASITES NIL) */ diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/dbi.nix b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/dbi.nix index b4d14d8274..75fab11cf4 100644 --- a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/dbi.nix +++ b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/dbi.nix @@ -1,15 +1,17 @@ args @ { fetchurl, ... }: rec { baseName = ''dbi''; - version = ''cl-20191007-git''; + version = ''cl-20200610-git''; + + parasites = [ "dbi/test" ]; description = ''Database independent interface for Common Lisp''; - deps = [ args."alexandria" args."bordeaux-threads" args."cl-annot" args."cl-syntax" args."cl-syntax-annot" args."closer-mop" args."named-readtables" args."split-sequence" args."trivial-types" ]; + deps = [ args."alexandria" args."bordeaux-threads" args."cl-mysql" args."cl-postgres" args."closer-mop" args."dbd-mysql" args."dbd-postgres" args."dbd-sqlite3" args."dbi-test" args."rove" args."split-sequence" args."sqlite" args."trivial-garbage" args."trivial-types" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/cl-dbi/2019-10-07/cl-dbi-20191007-git.tgz''; - sha256 = ''0xsg0xqq88wsx6wf8nllfd0mk356bw2qw3c5c31rfj41wz5vpx35''; + url = ''http://beta.quicklisp.org/archive/cl-dbi/2020-06-10/cl-dbi-20200610-git.tgz''; + sha256 = ''1d7hwywcqzqwmr5b42c0mmjq3v3xxd4cwb4fn5k1wd7j6pr0bkas''; }; packageName = "dbi"; @@ -18,19 +20,22 @@ rec { overrides = x: x; } /* (SYSTEM dbi DESCRIPTION Database independent interface for Common Lisp - SHA256 0xsg0xqq88wsx6wf8nllfd0mk356bw2qw3c5c31rfj41wz5vpx35 URL - http://beta.quicklisp.org/archive/cl-dbi/2019-10-07/cl-dbi-20191007-git.tgz - MD5 bf524c4000468d12627fa419ae412abb NAME dbi FILENAME dbi DEPS + SHA256 1d7hwywcqzqwmr5b42c0mmjq3v3xxd4cwb4fn5k1wd7j6pr0bkas URL + http://beta.quicklisp.org/archive/cl-dbi/2020-06-10/cl-dbi-20200610-git.tgz + MD5 2caeb911b23327e054986211d6bfea55 NAME dbi FILENAME dbi DEPS ((NAME alexandria FILENAME alexandria) (NAME bordeaux-threads FILENAME bordeaux-threads) - (NAME cl-annot FILENAME cl-annot) (NAME cl-syntax FILENAME cl-syntax) - (NAME cl-syntax-annot FILENAME cl-syntax-annot) - (NAME closer-mop FILENAME closer-mop) - (NAME named-readtables FILENAME named-readtables) - (NAME split-sequence FILENAME split-sequence) + (NAME cl-mysql FILENAME cl-mysql) (NAME cl-postgres FILENAME cl-postgres) + (NAME closer-mop FILENAME closer-mop) (NAME dbd-mysql FILENAME dbd-mysql) + (NAME dbd-postgres FILENAME dbd-postgres) + (NAME dbd-sqlite3 FILENAME dbd-sqlite3) (NAME dbi-test FILENAME dbi-test) + (NAME rove FILENAME rove) (NAME split-sequence FILENAME split-sequence) + (NAME sqlite FILENAME sqlite) + (NAME trivial-garbage FILENAME trivial-garbage) (NAME trivial-types FILENAME trivial-types)) DEPENDENCIES - (alexandria bordeaux-threads cl-annot cl-syntax cl-syntax-annot closer-mop - named-readtables split-sequence trivial-types) - VERSION cl-20191007-git SIBLINGS - (cl-dbi dbd-mysql dbd-postgres dbd-sqlite3 dbi-test) PARASITES NIL) */ + (alexandria bordeaux-threads cl-mysql cl-postgres closer-mop dbd-mysql + dbd-postgres dbd-sqlite3 dbi-test rove split-sequence sqlite + trivial-garbage trivial-types) + VERSION cl-20200610-git SIBLINGS + (cl-dbi dbd-mysql dbd-postgres dbd-sqlite3 dbi-test) PARASITES (dbi/test)) */ diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/dbus.nix b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/dbus.nix index 5043ff2e26..1ea512d0ab 100644 --- a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/dbus.nix +++ b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/dbus.nix @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: rec { baseName = ''dbus''; - version = ''20190521-git''; + version = ''20200610-git''; description = ''A D-BUS client library for Common Lisp''; deps = [ args."alexandria" args."asdf-package-system" args."babel" args."cl-xmlspam" args."flexi-streams" args."ieee-floats" args."iolib" args."ironclad" args."trivial-garbage" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/dbus/2019-05-21/dbus-20190521-git.tgz''; - sha256 = ''0g4hsygy52rylhi19kxxhv9dbbirl6hdisgqw89whdxb9py6ifqq''; + url = ''http://beta.quicklisp.org/archive/dbus/2020-06-10/dbus-20200610-git.tgz''; + sha256 = ''1njwjf1z9xngsfmlddmbcan49vcjqvvxfkhbi62xcxwbn9rgqn79''; }; packageName = "dbus"; @@ -18,9 +18,9 @@ rec { overrides = x: x; } /* (SYSTEM dbus DESCRIPTION A D-BUS client library for Common Lisp SHA256 - 0g4hsygy52rylhi19kxxhv9dbbirl6hdisgqw89whdxb9py6ifqq URL - http://beta.quicklisp.org/archive/dbus/2019-05-21/dbus-20190521-git.tgz MD5 - 59e7ab92086503e4185273ec3f3ba3fc NAME dbus FILENAME dbus DEPS + 1njwjf1z9xngsfmlddmbcan49vcjqvvxfkhbi62xcxwbn9rgqn79 URL + http://beta.quicklisp.org/archive/dbus/2020-06-10/dbus-20200610-git.tgz MD5 + 421fb481812b2da62fa5ee424f607b12 NAME dbus FILENAME dbus DEPS ((NAME alexandria FILENAME alexandria) (NAME asdf-package-system FILENAME asdf-package-system) (NAME babel FILENAME babel) (NAME cl-xmlspam FILENAME cl-xmlspam) @@ -31,4 +31,4 @@ rec { DEPENDENCIES (alexandria asdf-package-system babel cl-xmlspam flexi-streams ieee-floats iolib ironclad trivial-garbage) - VERSION 20190521-git SIBLINGS NIL PARASITES NIL) */ + VERSION 20200610-git SIBLINGS NIL PARASITES NIL) */ diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/dexador.nix b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/dexador.nix index 6e043269f8..1fb2381ffc 100644 --- a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/dexador.nix +++ b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/dexador.nix @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: rec { baseName = ''dexador''; - version = ''20191007-git''; + version = ''20200427-git''; description = ''Yet another HTTP client for Common Lisp''; - deps = [ args."alexandria" args."babel" args."bordeaux-threads" args."cffi" args."cffi-grovel" args."cffi-toolchain" args."chipz" args."chunga" args."cl_plus_ssl" args."cl-base64" args."cl-cookie" args."cl-fad" args."cl-ppcre" args."cl-reexport" args."cl-utilities" args."fast-http" args."fast-io" args."flexi-streams" args."local-time" args."proc-parse" args."quri" args."smart-buffer" args."split-sequence" args."static-vectors" args."trivial-features" args."trivial-garbage" args."trivial-gray-streams" args."trivial-mimes" args."usocket" args."xsubseq" ]; + deps = [ args."alexandria" args."babel" args."bordeaux-threads" args."cffi" args."cffi-grovel" args."cffi-toolchain" args."chipz" args."chunga" args."cl_plus_ssl" args."cl-base64" args."cl-cookie" args."cl-ppcre" args."cl-reexport" args."cl-utilities" args."fast-http" args."fast-io" args."flexi-streams" args."local-time" args."proc-parse" args."quri" args."smart-buffer" args."split-sequence" args."static-vectors" args."trivial-features" args."trivial-garbage" args."trivial-gray-streams" args."trivial-mimes" args."usocket" args."xsubseq" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/dexador/2019-10-07/dexador-20191007-git.tgz''; - sha256 = ''1q0anlgbg5gbk9ifynnn6dd894d9hvjsrd45jjklkjabhywgizk7''; + url = ''http://beta.quicklisp.org/archive/dexador/2020-04-27/dexador-20200427-git.tgz''; + sha256 = ''0qy8x47ni270dzwscy86nkwfzn491w2jqwyg57dm6w8lkjzwpgld''; }; packageName = "dexador"; @@ -18,17 +18,16 @@ rec { overrides = x: x; } /* (SYSTEM dexador DESCRIPTION Yet another HTTP client for Common Lisp SHA256 - 1q0anlgbg5gbk9ifynnn6dd894d9hvjsrd45jjklkjabhywgizk7 URL - http://beta.quicklisp.org/archive/dexador/2019-10-07/dexador-20191007-git.tgz - MD5 aa1c435f809a794610fe599987cb73a8 NAME dexador FILENAME dexador DEPS + 0qy8x47ni270dzwscy86nkwfzn491w2jqwyg57dm6w8lkjzwpgld URL + http://beta.quicklisp.org/archive/dexador/2020-04-27/dexador-20200427-git.tgz + MD5 1c418ff2381f1fe128cde8c121effecb NAME dexador FILENAME dexador DEPS ((NAME alexandria FILENAME alexandria) (NAME babel FILENAME babel) (NAME bordeaux-threads FILENAME bordeaux-threads) (NAME cffi FILENAME cffi) (NAME cffi-grovel FILENAME cffi-grovel) (NAME cffi-toolchain FILENAME cffi-toolchain) (NAME chipz FILENAME chipz) (NAME chunga FILENAME chunga) (NAME cl+ssl FILENAME cl_plus_ssl) (NAME cl-base64 FILENAME cl-base64) (NAME cl-cookie FILENAME cl-cookie) - (NAME cl-fad FILENAME cl-fad) (NAME cl-ppcre FILENAME cl-ppcre) - (NAME cl-reexport FILENAME cl-reexport) + (NAME cl-ppcre FILENAME cl-ppcre) (NAME cl-reexport FILENAME cl-reexport) (NAME cl-utilities FILENAME cl-utilities) (NAME fast-http FILENAME fast-http) (NAME fast-io FILENAME fast-io) (NAME flexi-streams FILENAME flexi-streams) @@ -44,8 +43,8 @@ rec { (NAME usocket FILENAME usocket) (NAME xsubseq FILENAME xsubseq)) DEPENDENCIES (alexandria babel bordeaux-threads cffi cffi-grovel cffi-toolchain chipz - chunga cl+ssl cl-base64 cl-cookie cl-fad cl-ppcre cl-reexport cl-utilities + chunga cl+ssl cl-base64 cl-cookie cl-ppcre cl-reexport cl-utilities fast-http fast-io flexi-streams local-time proc-parse quri smart-buffer split-sequence static-vectors trivial-features trivial-garbage trivial-gray-streams trivial-mimes usocket xsubseq) - VERSION 20191007-git SIBLINGS (dexador-test) PARASITES NIL) */ + VERSION 20200427-git SIBLINGS (dexador-test) PARASITES NIL) */ diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/dissect.nix b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/dissect.nix index c6ab6ac38e..2df2c14c12 100644 --- a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/dissect.nix +++ b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/dissect.nix @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: rec { baseName = ''dissect''; - version = ''20190710-git''; + version = ''20200427-git''; description = ''A lib for introspecting the call stack and active restarts.''; deps = [ ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/dissect/2019-07-10/dissect-20190710-git.tgz''; - sha256 = ''15h653gbi9iybns0ll8rhjr7diwwnq4g9wf51f6d9846nl1v424b''; + url = ''http://beta.quicklisp.org/archive/dissect/2020-04-27/dissect-20200427-git.tgz''; + sha256 = ''1d7sri20jma9r105lxv0sx2q60kb8zp7bf023kain3rnyqr74v8a''; }; packageName = "dissect"; @@ -19,7 +19,7 @@ rec { } /* (SYSTEM dissect DESCRIPTION A lib for introspecting the call stack and active restarts. SHA256 - 15h653gbi9iybns0ll8rhjr7diwwnq4g9wf51f6d9846nl1v424b URL - http://beta.quicklisp.org/archive/dissect/2019-07-10/dissect-20190710-git.tgz - MD5 fb0e90e86fe4c184c08d19c1ef61d4e4 NAME dissect FILENAME dissect DEPS NIL - DEPENDENCIES NIL VERSION 20190710-git SIBLINGS NIL PARASITES NIL) */ + 1d7sri20jma9r105lxv0sx2q60kb8zp7bf023kain3rnyqr74v8a URL + http://beta.quicklisp.org/archive/dissect/2020-04-27/dissect-20200427-git.tgz + MD5 2cce2469353cac86ee3c0358b9b99f3d NAME dissect FILENAME dissect DEPS NIL + DEPENDENCIES NIL VERSION 20200427-git SIBLINGS NIL PARASITES NIL) */ diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/djula.nix b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/djula.nix new file mode 100644 index 0000000000..1b919e63a5 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/djula.nix @@ -0,0 +1,53 @@ +args @ { fetchurl, ... }: +rec { + baseName = ''djula''; + version = ''20201016-git''; + + description = ''An implementation of Django templates for Common Lisp.''; + + deps = [ args."access" args."alexandria" args."anaphora" args."arnesi" args."babel" args."cl-annot" args."cl-interpol" args."cl-locale" args."cl-ppcre" args."cl-slice" args."cl-syntax" args."cl-syntax-annot" args."cl-unicode" args."closer-mop" args."collectors" args."flexi-streams" args."gettext" args."iterate" args."let-plus" args."local-time" args."named-readtables" args."parser-combinators" args."split-sequence" args."symbol-munger" args."trivial-backtrace" args."trivial-features" args."trivial-gray-streams" args."trivial-types" args."yacc" ]; + + src = fetchurl { + url = ''http://beta.quicklisp.org/archive/djula/2020-10-16/djula-20201016-git.tgz''; + sha256 = ''09j9wmvs3vgx291p11dclrpwx0dqknazzadikg2320nv7a29zgiy''; + }; + + packageName = "djula"; + + asdFilesToKeep = ["djula.asd"]; + overrides = x: x; +} +/* (SYSTEM djula DESCRIPTION + An implementation of Django templates for Common Lisp. SHA256 + 09j9wmvs3vgx291p11dclrpwx0dqknazzadikg2320nv7a29zgiy URL + http://beta.quicklisp.org/archive/djula/2020-10-16/djula-20201016-git.tgz + MD5 524843c7ff05d01dcb19a10eb793e967 NAME djula FILENAME djula DEPS + ((NAME access FILENAME access) (NAME alexandria FILENAME alexandria) + (NAME anaphora FILENAME anaphora) (NAME arnesi FILENAME arnesi) + (NAME babel FILENAME babel) (NAME cl-annot FILENAME cl-annot) + (NAME cl-interpol FILENAME cl-interpol) + (NAME cl-locale FILENAME cl-locale) (NAME cl-ppcre FILENAME cl-ppcre) + (NAME cl-slice FILENAME cl-slice) (NAME cl-syntax FILENAME cl-syntax) + (NAME cl-syntax-annot FILENAME cl-syntax-annot) + (NAME cl-unicode FILENAME cl-unicode) + (NAME closer-mop FILENAME closer-mop) + (NAME collectors FILENAME collectors) + (NAME flexi-streams FILENAME flexi-streams) + (NAME gettext FILENAME gettext) (NAME iterate FILENAME iterate) + (NAME let-plus FILENAME let-plus) (NAME local-time FILENAME local-time) + (NAME named-readtables FILENAME named-readtables) + (NAME parser-combinators FILENAME parser-combinators) + (NAME split-sequence FILENAME split-sequence) + (NAME symbol-munger FILENAME symbol-munger) + (NAME trivial-backtrace FILENAME trivial-backtrace) + (NAME trivial-features FILENAME trivial-features) + (NAME trivial-gray-streams FILENAME trivial-gray-streams) + (NAME trivial-types FILENAME trivial-types) (NAME yacc FILENAME yacc)) + DEPENDENCIES + (access alexandria anaphora arnesi babel cl-annot cl-interpol cl-locale + cl-ppcre cl-slice cl-syntax cl-syntax-annot cl-unicode closer-mop + collectors flexi-streams gettext iterate let-plus local-time + named-readtables parser-combinators split-sequence symbol-munger + trivial-backtrace trivial-features trivial-gray-streams trivial-types + yacc) + VERSION 20201016-git SIBLINGS (djula-demo djula-test) PARASITES NIL) */ diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/dynamic-classes.nix b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/dynamic-classes.nix deleted file mode 100644 index 8c31820457..0000000000 --- a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/dynamic-classes.nix +++ /dev/null @@ -1,26 +0,0 @@ -args @ { fetchurl, ... }: -{ - baseName = ''dynamic-classes''; - version = ''20130128-git''; - - description = ''''; - - deps = [ args."metatilities-base" ]; - - src = fetchurl { - url = ''http://beta.quicklisp.org/archive/dynamic-classes/2013-01-28/dynamic-classes-20130128-git.tgz''; - sha256 = ''0i2b9k8f8jgn86kz503z267w0zv4gdqajzw755xwhqfaknix74sa''; - }; - - packageName = "dynamic-classes"; - - asdFilesToKeep = ["dynamic-classes.asd"]; - overrides = x: x; -} -/* (SYSTEM dynamic-classes DESCRIPTION NIL SHA256 - 0i2b9k8f8jgn86kz503z267w0zv4gdqajzw755xwhqfaknix74sa URL - http://beta.quicklisp.org/archive/dynamic-classes/2013-01-28/dynamic-classes-20130128-git.tgz - MD5 a6ed01c4f21df2b6a142328b24ac7ba3 NAME dynamic-classes FILENAME - dynamic-classes DEPS ((NAME metatilities-base FILENAME metatilities-base)) - DEPENDENCIES (metatilities-base) VERSION 20130128-git SIBLINGS - (dynamic-classes-test) PARASITES NIL) */ diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/enchant.nix b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/enchant.nix new file mode 100644 index 0000000000..a5e44cefa4 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/enchant.nix @@ -0,0 +1,29 @@ +args @ { fetchurl, ... }: +rec { + baseName = ''enchant''; + version = ''cl-20190521-git''; + + description = ''Programming interface for Enchant spell-checker library''; + + deps = [ args."alexandria" args."babel" args."cffi" args."trivial-features" ]; + + src = fetchurl { + url = ''http://beta.quicklisp.org/archive/cl-enchant/2019-05-21/cl-enchant-20190521-git.tgz''; + sha256 = ''16ag48fr74m536an8fak5z0lfjdb265gv1ajai1lqg0vq2l5mr14''; + }; + + packageName = "enchant"; + + asdFilesToKeep = ["enchant.asd"]; + overrides = x: x; +} +/* (SYSTEM enchant DESCRIPTION + Programming interface for Enchant spell-checker library SHA256 + 16ag48fr74m536an8fak5z0lfjdb265gv1ajai1lqg0vq2l5mr14 URL + http://beta.quicklisp.org/archive/cl-enchant/2019-05-21/cl-enchant-20190521-git.tgz + MD5 2a868c280fd5a74f9c298c384567e31b NAME enchant FILENAME enchant DEPS + ((NAME alexandria FILENAME alexandria) (NAME babel FILENAME babel) + (NAME cffi FILENAME cffi) + (NAME trivial-features FILENAME trivial-features)) + DEPENDENCIES (alexandria babel cffi trivial-features) VERSION + cl-20190521-git SIBLINGS (enchant-autoload) PARASITES NIL) */ diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/eos.nix b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/eos.nix deleted file mode 100644 index aa2b01e6bc..0000000000 --- a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/eos.nix +++ /dev/null @@ -1,26 +0,0 @@ -{ fetchurl, ... }: -{ - baseName = ''eos''; - version = ''20150608-git''; - - parasites = [ "eos-tests" ]; - - description = ''UNMAINTAINED fork of 5AM, a test framework''; - - deps = [ ]; - - src = fetchurl { - url = ''http://beta.quicklisp.org/archive/eos/2015-06-08/eos-20150608-git.tgz''; - sha256 = ''0fhcvg59p13h1d5h8fnssa8hn3lh19lzysazvrbxyfizfibyydr8''; - }; - - packageName = "eos"; - - asdFilesToKeep = ["eos.asd"]; - overrides = x: x; -} -/* (SYSTEM eos DESCRIPTION UNMAINTAINED fork of 5AM, a test framework SHA256 - 0fhcvg59p13h1d5h8fnssa8hn3lh19lzysazvrbxyfizfibyydr8 URL - http://beta.quicklisp.org/archive/eos/2015-06-08/eos-20150608-git.tgz MD5 - 94f6a72534171ff6adcc823c31e3d53f NAME eos FILENAME eos DEPS NIL - DEPENDENCIES NIL VERSION 20150608-git SIBLINGS NIL PARASITES (eos-tests)) */ diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/esrap.nix b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/esrap.nix index 5ea7943aaf..946c71a2f5 100644 --- a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/esrap.nix +++ b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/esrap.nix @@ -1,7 +1,7 @@ args @ { fetchurl, ... }: rec { baseName = ''esrap''; - version = ''20191227-git''; + version = ''20200325-git''; parasites = [ "esrap/tests" ]; @@ -10,8 +10,8 @@ rec { deps = [ args."alexandria" args."fiveam" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/esrap/2019-12-27/esrap-20191227-git.tgz''; - sha256 = ''0614lb8iyraihx2m81manlyd3x89snsn9a1mihlil85piswdbiv8''; + url = ''http://beta.quicklisp.org/archive/esrap/2020-03-25/esrap-20200325-git.tgz''; + sha256 = ''1pwgjsm19nxx8d4iwbn3x7g08r6qyq1vmp9m83m87r53597b3a68''; }; packageName = "esrap"; @@ -21,9 +21,9 @@ rec { } /* (SYSTEM esrap DESCRIPTION A Packrat / Parsing Grammar / TDPL parser for Common Lisp. SHA256 - 0614lb8iyraihx2m81manlyd3x89snsn9a1mihlil85piswdbiv8 URL - http://beta.quicklisp.org/archive/esrap/2019-12-27/esrap-20191227-git.tgz - MD5 8dd58ffc605bba6eec614bdea573978b NAME esrap FILENAME esrap DEPS + 1pwgjsm19nxx8d4iwbn3x7g08r6qyq1vmp9m83m87r53597b3a68 URL + http://beta.quicklisp.org/archive/esrap/2020-03-25/esrap-20200325-git.tgz + MD5 bcc4e07536153072edf1d57f871bc142 NAME esrap FILENAME esrap DEPS ((NAME alexandria FILENAME alexandria) (NAME fiveam FILENAME fiveam)) - DEPENDENCIES (alexandria fiveam) VERSION 20191227-git SIBLINGS NIL + DEPENDENCIES (alexandria fiveam) VERSION 20200325-git SIBLINGS NIL PARASITES (esrap/tests)) */ diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/fare-csv.nix b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/fare-csv.nix new file mode 100644 index 0000000000..67d75b89db --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/fare-csv.nix @@ -0,0 +1,24 @@ +args @ { fetchurl, ... }: +rec { + baseName = ''fare-csv''; + version = ''20171227-git''; + + description = ''Robust CSV parser and printer''; + + deps = [ ]; + + src = fetchurl { + url = ''http://beta.quicklisp.org/archive/fare-csv/2017-12-27/fare-csv-20171227-git.tgz''; + sha256 = ''1hkzg05kq2c4xihsfx4wk1k6mmjq2fw40id8vy0315rpa47a5i7x''; + }; + + packageName = "fare-csv"; + + asdFilesToKeep = ["fare-csv.asd"]; + overrides = x: x; +} +/* (SYSTEM fare-csv DESCRIPTION Robust CSV parser and printer SHA256 + 1hkzg05kq2c4xihsfx4wk1k6mmjq2fw40id8vy0315rpa47a5i7x URL + http://beta.quicklisp.org/archive/fare-csv/2017-12-27/fare-csv-20171227-git.tgz + MD5 1d73aaac9fcd86cc5ddb72019722bc2a NAME fare-csv FILENAME fare-csv DEPS + NIL DEPENDENCIES NIL VERSION 20171227-git SIBLINGS NIL PARASITES NIL) */ diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/fare-mop.nix b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/fare-mop.nix new file mode 100644 index 0000000000..a5cec39c15 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/fare-mop.nix @@ -0,0 +1,28 @@ +args @ { fetchurl, ... }: +rec { + baseName = ''fare-mop''; + version = ''20151218-git''; + + description = ''Utilities using the MOP; notably make informative pretty-printing trivial''; + + deps = [ args."closer-mop" args."fare-utils" ]; + + src = fetchurl { + url = ''http://beta.quicklisp.org/archive/fare-mop/2015-12-18/fare-mop-20151218-git.tgz''; + sha256 = ''0bvrwqvacy114xsblrk2w28qk6b484a3p0w14mzl264b3wjrdna9''; + }; + + packageName = "fare-mop"; + + asdFilesToKeep = ["fare-mop.asd"]; + overrides = x: x; +} +/* (SYSTEM fare-mop DESCRIPTION + Utilities using the MOP; notably make informative pretty-printing trivial + SHA256 0bvrwqvacy114xsblrk2w28qk6b484a3p0w14mzl264b3wjrdna9 URL + http://beta.quicklisp.org/archive/fare-mop/2015-12-18/fare-mop-20151218-git.tgz + MD5 4721ff62e2ac2c55079cdd4f2a0f6d4a NAME fare-mop FILENAME fare-mop DEPS + ((NAME closer-mop FILENAME closer-mop) + (NAME fare-utils FILENAME fare-utils)) + DEPENDENCIES (closer-mop fare-utils) VERSION 20151218-git SIBLINGS NIL + PARASITES NIL) */ diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/fare-quasiquote-extras.nix b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/fare-quasiquote-extras.nix index 5247b16978..ff03567a1a 100644 --- a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/fare-quasiquote-extras.nix +++ b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/fare-quasiquote-extras.nix @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: rec { baseName = ''fare-quasiquote-extras''; - version = ''fare-quasiquote-20190521-git''; + version = ''fare-quasiquote-20200925-git''; description = ''fare-quasiquote plus extras''; - deps = [ args."alexandria" args."closer-mop" args."fare-quasiquote" args."fare-quasiquote-optima" args."fare-quasiquote-readtable" args."fare-utils" args."named-readtables" args."optima" ]; + deps = [ args."alexandria" args."closer-mop" args."fare-quasiquote" args."fare-quasiquote-optima" args."fare-quasiquote-readtable" args."fare-utils" args."lisp-namespace" args."named-readtables" args."trivia_dot_level0" args."trivia_dot_level1" args."trivia_dot_level2" args."trivia_dot_quasiquote" args."trivia_dot_trivial" args."trivial-cltl2" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/fare-quasiquote/2019-05-21/fare-quasiquote-20190521-git.tgz''; - sha256 = ''1skrj68dnmihckip1vyc31xysbdsw9ihb7imks73cickkvv6yjfj''; + url = ''http://beta.quicklisp.org/archive/fare-quasiquote/2020-09-25/fare-quasiquote-20200925-git.tgz''; + sha256 = ''0k25kx4gvr046bcnv5mqxbb4483v9p2lk7dvzjkgj2cxrvczmj8b''; }; packageName = "fare-quasiquote-extras"; @@ -18,9 +18,9 @@ rec { overrides = x: x; } /* (SYSTEM fare-quasiquote-extras DESCRIPTION fare-quasiquote plus extras - SHA256 1skrj68dnmihckip1vyc31xysbdsw9ihb7imks73cickkvv6yjfj URL - http://beta.quicklisp.org/archive/fare-quasiquote/2019-05-21/fare-quasiquote-20190521-git.tgz - MD5 e08c24d35a485a74642bd0c7c06662d6 NAME fare-quasiquote-extras FILENAME + SHA256 0k25kx4gvr046bcnv5mqxbb4483v9p2lk7dvzjkgj2cxrvczmj8b URL + http://beta.quicklisp.org/archive/fare-quasiquote/2020-09-25/fare-quasiquote-20200925-git.tgz + MD5 7af0a97c445d88acacecfc851496adb3 NAME fare-quasiquote-extras FILENAME fare-quasiquote-extras DEPS ((NAME alexandria FILENAME alexandria) (NAME closer-mop FILENAME closer-mop) @@ -28,12 +28,19 @@ rec { (NAME fare-quasiquote-optima FILENAME fare-quasiquote-optima) (NAME fare-quasiquote-readtable FILENAME fare-quasiquote-readtable) (NAME fare-utils FILENAME fare-utils) + (NAME lisp-namespace FILENAME lisp-namespace) (NAME named-readtables FILENAME named-readtables) - (NAME optima FILENAME optima)) + (NAME trivia.level0 FILENAME trivia_dot_level0) + (NAME trivia.level1 FILENAME trivia_dot_level1) + (NAME trivia.level2 FILENAME trivia_dot_level2) + (NAME trivia.quasiquote FILENAME trivia_dot_quasiquote) + (NAME trivia.trivial FILENAME trivia_dot_trivial) + (NAME trivial-cltl2 FILENAME trivial-cltl2)) DEPENDENCIES (alexandria closer-mop fare-quasiquote fare-quasiquote-optima - fare-quasiquote-readtable fare-utils named-readtables optima) - VERSION fare-quasiquote-20190521-git SIBLINGS - (fare-quasiquote-optima fare-quasiquote-readtable fare-quasiquote-test - fare-quasiquote) + fare-quasiquote-readtable fare-utils lisp-namespace named-readtables + trivia.level0 trivia.level1 trivia.level2 trivia.quasiquote trivia.trivial + trivial-cltl2) + VERSION fare-quasiquote-20200925-git SIBLINGS + (fare-quasiquote-optima fare-quasiquote-readtable fare-quasiquote) PARASITES NIL) */ diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/fare-quasiquote-optima.nix b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/fare-quasiquote-optima.nix index da6c194790..2f1ef3e5b1 100644 --- a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/fare-quasiquote-optima.nix +++ b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/fare-quasiquote-optima.nix @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: rec { baseName = ''fare-quasiquote-optima''; - version = ''fare-quasiquote-20190521-git''; + version = ''fare-quasiquote-20200925-git''; description = ''fare-quasiquote extension for optima''; - deps = [ args."alexandria" args."closer-mop" args."fare-quasiquote" args."fare-utils" args."optima" ]; + deps = [ args."alexandria" args."closer-mop" args."fare-quasiquote" args."fare-quasiquote-readtable" args."fare-utils" args."lisp-namespace" args."named-readtables" args."trivia_dot_level0" args."trivia_dot_level1" args."trivia_dot_level2" args."trivia_dot_quasiquote" args."trivia_dot_trivial" args."trivial-cltl2" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/fare-quasiquote/2019-05-21/fare-quasiquote-20190521-git.tgz''; - sha256 = ''1skrj68dnmihckip1vyc31xysbdsw9ihb7imks73cickkvv6yjfj''; + url = ''http://beta.quicklisp.org/archive/fare-quasiquote/2020-09-25/fare-quasiquote-20200925-git.tgz''; + sha256 = ''0k25kx4gvr046bcnv5mqxbb4483v9p2lk7dvzjkgj2cxrvczmj8b''; }; packageName = "fare-quasiquote-optima"; @@ -19,16 +19,27 @@ rec { } /* (SYSTEM fare-quasiquote-optima DESCRIPTION fare-quasiquote extension for optima SHA256 - 1skrj68dnmihckip1vyc31xysbdsw9ihb7imks73cickkvv6yjfj URL - http://beta.quicklisp.org/archive/fare-quasiquote/2019-05-21/fare-quasiquote-20190521-git.tgz - MD5 e08c24d35a485a74642bd0c7c06662d6 NAME fare-quasiquote-optima FILENAME + 0k25kx4gvr046bcnv5mqxbb4483v9p2lk7dvzjkgj2cxrvczmj8b URL + http://beta.quicklisp.org/archive/fare-quasiquote/2020-09-25/fare-quasiquote-20200925-git.tgz + MD5 7af0a97c445d88acacecfc851496adb3 NAME fare-quasiquote-optima FILENAME fare-quasiquote-optima DEPS ((NAME alexandria FILENAME alexandria) (NAME closer-mop FILENAME closer-mop) (NAME fare-quasiquote FILENAME fare-quasiquote) - (NAME fare-utils FILENAME fare-utils) (NAME optima FILENAME optima)) - DEPENDENCIES (alexandria closer-mop fare-quasiquote fare-utils optima) - VERSION fare-quasiquote-20190521-git SIBLINGS - (fare-quasiquote-extras fare-quasiquote-readtable fare-quasiquote-test - fare-quasiquote) + (NAME fare-quasiquote-readtable FILENAME fare-quasiquote-readtable) + (NAME fare-utils FILENAME fare-utils) + (NAME lisp-namespace FILENAME lisp-namespace) + (NAME named-readtables FILENAME named-readtables) + (NAME trivia.level0 FILENAME trivia_dot_level0) + (NAME trivia.level1 FILENAME trivia_dot_level1) + (NAME trivia.level2 FILENAME trivia_dot_level2) + (NAME trivia.quasiquote FILENAME trivia_dot_quasiquote) + (NAME trivia.trivial FILENAME trivia_dot_trivial) + (NAME trivial-cltl2 FILENAME trivial-cltl2)) + DEPENDENCIES + (alexandria closer-mop fare-quasiquote fare-quasiquote-readtable fare-utils + lisp-namespace named-readtables trivia.level0 trivia.level1 trivia.level2 + trivia.quasiquote trivia.trivial trivial-cltl2) + VERSION fare-quasiquote-20200925-git SIBLINGS + (fare-quasiquote-extras fare-quasiquote-readtable fare-quasiquote) PARASITES NIL) */ diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/fare-quasiquote-readtable.nix b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/fare-quasiquote-readtable.nix index 4af3c19fa6..7d332085e2 100644 --- a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/fare-quasiquote-readtable.nix +++ b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/fare-quasiquote-readtable.nix @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: rec { baseName = ''fare-quasiquote-readtable''; - version = ''fare-quasiquote-20190521-git''; + version = ''fare-quasiquote-20200925-git''; description = ''Using fare-quasiquote with named-readtable''; deps = [ args."fare-quasiquote" args."fare-utils" args."named-readtables" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/fare-quasiquote/2019-05-21/fare-quasiquote-20190521-git.tgz''; - sha256 = ''1skrj68dnmihckip1vyc31xysbdsw9ihb7imks73cickkvv6yjfj''; + url = ''http://beta.quicklisp.org/archive/fare-quasiquote/2020-09-25/fare-quasiquote-20200925-git.tgz''; + sha256 = ''0k25kx4gvr046bcnv5mqxbb4483v9p2lk7dvzjkgj2cxrvczmj8b''; }; packageName = "fare-quasiquote-readtable"; @@ -19,15 +19,14 @@ rec { } /* (SYSTEM fare-quasiquote-readtable DESCRIPTION Using fare-quasiquote with named-readtable SHA256 - 1skrj68dnmihckip1vyc31xysbdsw9ihb7imks73cickkvv6yjfj URL - http://beta.quicklisp.org/archive/fare-quasiquote/2019-05-21/fare-quasiquote-20190521-git.tgz - MD5 e08c24d35a485a74642bd0c7c06662d6 NAME fare-quasiquote-readtable + 0k25kx4gvr046bcnv5mqxbb4483v9p2lk7dvzjkgj2cxrvczmj8b URL + http://beta.quicklisp.org/archive/fare-quasiquote/2020-09-25/fare-quasiquote-20200925-git.tgz + MD5 7af0a97c445d88acacecfc851496adb3 NAME fare-quasiquote-readtable FILENAME fare-quasiquote-readtable DEPS ((NAME fare-quasiquote FILENAME fare-quasiquote) (NAME fare-utils FILENAME fare-utils) (NAME named-readtables FILENAME named-readtables)) DEPENDENCIES (fare-quasiquote fare-utils named-readtables) VERSION - fare-quasiquote-20190521-git SIBLINGS - (fare-quasiquote-extras fare-quasiquote-optima fare-quasiquote-test - fare-quasiquote) - PARASITES NIL) */ + fare-quasiquote-20200925-git SIBLINGS + (fare-quasiquote-extras fare-quasiquote-optima fare-quasiquote) PARASITES + NIL) */ diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/fare-quasiquote.nix b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/fare-quasiquote.nix index fe31fcd5d3..d5b282e289 100644 --- a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/fare-quasiquote.nix +++ b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/fare-quasiquote.nix @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: rec { baseName = ''fare-quasiquote''; - version = ''20190521-git''; + version = ''20200925-git''; description = ''Portable, matchable implementation of quasiquote''; deps = [ args."fare-utils" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/fare-quasiquote/2019-05-21/fare-quasiquote-20190521-git.tgz''; - sha256 = ''1skrj68dnmihckip1vyc31xysbdsw9ihb7imks73cickkvv6yjfj''; + url = ''http://beta.quicklisp.org/archive/fare-quasiquote/2020-09-25/fare-quasiquote-20200925-git.tgz''; + sha256 = ''0k25kx4gvr046bcnv5mqxbb4483v9p2lk7dvzjkgj2cxrvczmj8b''; }; packageName = "fare-quasiquote"; @@ -19,11 +19,10 @@ rec { } /* (SYSTEM fare-quasiquote DESCRIPTION Portable, matchable implementation of quasiquote SHA256 - 1skrj68dnmihckip1vyc31xysbdsw9ihb7imks73cickkvv6yjfj URL - http://beta.quicklisp.org/archive/fare-quasiquote/2019-05-21/fare-quasiquote-20190521-git.tgz - MD5 e08c24d35a485a74642bd0c7c06662d6 NAME fare-quasiquote FILENAME + 0k25kx4gvr046bcnv5mqxbb4483v9p2lk7dvzjkgj2cxrvczmj8b URL + http://beta.quicklisp.org/archive/fare-quasiquote/2020-09-25/fare-quasiquote-20200925-git.tgz + MD5 7af0a97c445d88acacecfc851496adb3 NAME fare-quasiquote FILENAME fare-quasiquote DEPS ((NAME fare-utils FILENAME fare-utils)) DEPENDENCIES - (fare-utils) VERSION 20190521-git SIBLINGS - (fare-quasiquote-extras fare-quasiquote-optima fare-quasiquote-readtable - fare-quasiquote-test) + (fare-utils) VERSION 20200925-git SIBLINGS + (fare-quasiquote-extras fare-quasiquote-optima fare-quasiquote-readtable) PARASITES NIL) */ diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/fast-io.nix b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/fast-io.nix index 89bed83acd..9d7999b750 100644 --- a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/fast-io.nix +++ b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/fast-io.nix @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: rec { baseName = ''fast-io''; - version = ''20171023-git''; + version = ''20200925-git''; description = ''Alternative I/O mechanism to a stream or vector''; deps = [ args."alexandria" args."babel" args."cffi" args."cffi-grovel" args."cffi-toolchain" args."static-vectors" args."trivial-features" args."trivial-gray-streams" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/fast-io/2017-10-23/fast-io-20171023-git.tgz''; - sha256 = ''09w4awnvw772s24ivgzx2irhy701nrsxbim6ip5rc70rfzbff8sl''; + url = ''http://beta.quicklisp.org/archive/fast-io/2020-09-25/fast-io-20200925-git.tgz''; + sha256 = ''1rgyr6y20fp3jqnx5snpjf9lngzalip2a28l04ssypwagmhaa975''; }; packageName = "fast-io"; @@ -18,9 +18,9 @@ rec { overrides = x: x; } /* (SYSTEM fast-io DESCRIPTION Alternative I/O mechanism to a stream or vector - SHA256 09w4awnvw772s24ivgzx2irhy701nrsxbim6ip5rc70rfzbff8sl URL - http://beta.quicklisp.org/archive/fast-io/2017-10-23/fast-io-20171023-git.tgz - MD5 89105f8277f3bf3709fae1b789e3d5ad NAME fast-io FILENAME fast-io DEPS + SHA256 1rgyr6y20fp3jqnx5snpjf9lngzalip2a28l04ssypwagmhaa975 URL + http://beta.quicklisp.org/archive/fast-io/2020-09-25/fast-io-20200925-git.tgz + MD5 aa948bd29b8733f08e79a60226243117 NAME fast-io FILENAME fast-io DEPS ((NAME alexandria FILENAME alexandria) (NAME babel FILENAME babel) (NAME cffi FILENAME cffi) (NAME cffi-grovel FILENAME cffi-grovel) (NAME cffi-toolchain FILENAME cffi-toolchain) @@ -30,4 +30,4 @@ rec { DEPENDENCIES (alexandria babel cffi cffi-grovel cffi-toolchain static-vectors trivial-features trivial-gray-streams) - VERSION 20171023-git SIBLINGS (fast-io-test) PARASITES NIL) */ + VERSION 20200925-git SIBLINGS (fast-io-test) PARASITES NIL) */ diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/fiasco.nix b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/fiasco.nix index 1e7e0db5ec..68e5e00085 100644 --- a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/fiasco.nix +++ b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/fiasco.nix @@ -1,7 +1,7 @@ args @ { fetchurl, ... }: rec { baseName = ''fiasco''; - version = ''20191130-git''; + version = ''20200610-git''; parasites = [ "fiasco-self-tests" ]; @@ -10,8 +10,8 @@ rec { deps = [ args."alexandria" args."trivial-gray-streams" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/fiasco/2019-11-30/fiasco-20191130-git.tgz''; - sha256 = ''0jpxzrac8kzb34b9n5zyh3wcz0wghxd7pq8xwxp87yg6c3927sl0''; + url = ''http://beta.quicklisp.org/archive/fiasco/2020-06-10/fiasco-20200610-git.tgz''; + sha256 = ''1wb0ibw6ka9fbsb40zjipn7vh3jbzyfsvcc9gq19nqhbqa8gy9r4''; }; packageName = "fiasco"; @@ -21,10 +21,10 @@ rec { } /* (SYSTEM fiasco DESCRIPTION A Common Lisp test framework that treasures your failures, logical continuation of Stefil. - SHA256 0jpxzrac8kzb34b9n5zyh3wcz0wghxd7pq8xwxp87yg6c3927sl0 URL - http://beta.quicklisp.org/archive/fiasco/2019-11-30/fiasco-20191130-git.tgz - MD5 235809b661c89fed1c4ca4ba3e4f3606 NAME fiasco FILENAME fiasco DEPS + SHA256 1wb0ibw6ka9fbsb40zjipn7vh3jbzyfsvcc9gq19nqhbqa8gy9r4 URL + http://beta.quicklisp.org/archive/fiasco/2020-06-10/fiasco-20200610-git.tgz + MD5 c5a84e4a0a8afe45729cd6e39af772ac NAME fiasco FILENAME fiasco DEPS ((NAME alexandria FILENAME alexandria) (NAME trivial-gray-streams FILENAME trivial-gray-streams)) - DEPENDENCIES (alexandria trivial-gray-streams) VERSION 20191130-git + DEPENDENCIES (alexandria trivial-gray-streams) VERSION 20200610-git SIBLINGS NIL PARASITES (fiasco-self-tests)) */ diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/fiveam.nix b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/fiveam.nix index be9648a0da..45af193422 100644 --- a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/fiveam.nix +++ b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/fiveam.nix @@ -1,7 +1,7 @@ args @ { fetchurl, ... }: rec { baseName = ''fiveam''; - version = ''v1.4.1''; + version = ''20200925-git''; parasites = [ "fiveam/test" ]; @@ -10,8 +10,8 @@ rec { deps = [ args."alexandria" args."net_dot_didierverna_dot_asdf-flv" args."trivial-backtrace" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/fiveam/2018-02-28/fiveam-v1.4.1.tgz''; - sha256 = ''06y82y58x0haj20pkbqvm1rv19adafyvf01q56v73yhzs94nb7f3''; + url = ''http://beta.quicklisp.org/archive/fiveam/2020-09-25/fiveam-20200925-git.tgz''; + sha256 = ''0j9dzjs4prlx33f5idbcic4amx2mcgnjcyrpc3dd4b7lrw426l0d''; }; packageName = "fiveam"; @@ -20,11 +20,11 @@ rec { overrides = x: x; } /* (SYSTEM fiveam DESCRIPTION A simple regression testing framework SHA256 - 06y82y58x0haj20pkbqvm1rv19adafyvf01q56v73yhzs94nb7f3 URL - http://beta.quicklisp.org/archive/fiveam/2018-02-28/fiveam-v1.4.1.tgz MD5 - 7f182f8a4c12b98671e1707ae0f140b7 NAME fiveam FILENAME fiveam DEPS + 0j9dzjs4prlx33f5idbcic4amx2mcgnjcyrpc3dd4b7lrw426l0d URL + http://beta.quicklisp.org/archive/fiveam/2020-09-25/fiveam-20200925-git.tgz + MD5 858ecfdf7821630ad11e6859100d4650 NAME fiveam FILENAME fiveam DEPS ((NAME alexandria FILENAME alexandria) (NAME net.didierverna.asdf-flv FILENAME net_dot_didierverna_dot_asdf-flv) (NAME trivial-backtrace FILENAME trivial-backtrace)) DEPENDENCIES (alexandria net.didierverna.asdf-flv trivial-backtrace) - VERSION v1.4.1 SIBLINGS NIL PARASITES (fiveam/test)) */ + VERSION 20200925-git SIBLINGS NIL PARASITES (fiveam/test)) */ diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/flexi-streams.nix b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/flexi-streams.nix index d9b25bebdd..a1828981c0 100644 --- a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/flexi-streams.nix +++ b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/flexi-streams.nix @@ -1,7 +1,7 @@ args @ { fetchurl, ... }: rec { baseName = ''flexi-streams''; - version = ''20190107-git''; + version = ''20200925-git''; parasites = [ "flexi-streams-test" ]; @@ -10,8 +10,8 @@ rec { deps = [ args."trivial-gray-streams" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/flexi-streams/2019-01-07/flexi-streams-20190107-git.tgz''; - sha256 = ''1fqkkvspsdzvrr2rkp6i631m7bwx06j68s19cjzpmnhr9zn696i5''; + url = ''http://beta.quicklisp.org/archive/flexi-streams/2020-09-25/flexi-streams-20200925-git.tgz''; + sha256 = ''1hmsryfkjnk4gdv803s3hpp71fpdybfl1jb5hgngxpd5lsrq0gb2''; }; packageName = "flexi-streams"; @@ -20,10 +20,10 @@ rec { overrides = x: x; } /* (SYSTEM flexi-streams DESCRIPTION Flexible bivalent streams for Common Lisp - SHA256 1fqkkvspsdzvrr2rkp6i631m7bwx06j68s19cjzpmnhr9zn696i5 URL - http://beta.quicklisp.org/archive/flexi-streams/2019-01-07/flexi-streams-20190107-git.tgz - MD5 b59014f9f9f0d1b94f161e36e64a35c2 NAME flexi-streams FILENAME + SHA256 1hmsryfkjnk4gdv803s3hpp71fpdybfl1jb5hgngxpd5lsrq0gb2 URL + http://beta.quicklisp.org/archive/flexi-streams/2020-09-25/flexi-streams-20200925-git.tgz + MD5 0d7bd1e542fe0a0d9728c45f70a95e36 NAME flexi-streams FILENAME flexi-streams DEPS ((NAME trivial-gray-streams FILENAME trivial-gray-streams)) DEPENDENCIES - (trivial-gray-streams) VERSION 20190107-git SIBLINGS NIL PARASITES + (trivial-gray-streams) VERSION 20200925-git SIBLINGS NIL PARASITES (flexi-streams-test)) */ diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/fset.nix b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/fset.nix index d901df215a..12e168e44f 100644 --- a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/fset.nix +++ b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/fset.nix @@ -1,17 +1,19 @@ args @ { fetchurl, ... }: rec { baseName = ''fset''; - version = ''20171019-git''; + version = ''20200925-git''; + + parasites = [ "fset/test" ]; description = ''A functional set-theoretic collections library. See: http://www.ergy.com/FSet.html ''; - deps = [ args."misc-extensions" args."mt19937" ]; + deps = [ args."misc-extensions" args."mt19937" args."named-readtables" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/fset/2017-10-19/fset-20171019-git.tgz''; - sha256 = ''07qxbj40kmjknmvvb47prj81mpi6j39150iw57hlrzdhlndvilwg''; + url = ''http://beta.quicklisp.org/archive/fset/2020-09-25/fset-20200925-git.tgz''; + sha256 = ''19fr6ds1a493b0kbsligpn7i771r1yfshbbkdp0hxs4l792l05wv''; }; packageName = "fset"; @@ -22,10 +24,11 @@ See: http://www.ergy.com/FSet.html /* (SYSTEM fset DESCRIPTION A functional set-theoretic collections library. See: http://www.ergy.com/FSet.html - SHA256 07qxbj40kmjknmvvb47prj81mpi6j39150iw57hlrzdhlndvilwg URL - http://beta.quicklisp.org/archive/fset/2017-10-19/fset-20171019-git.tgz MD5 - dc8de5917c513302dd0e135e6c133978 NAME fset FILENAME fset DEPS + SHA256 19fr6ds1a493b0kbsligpn7i771r1yfshbbkdp0hxs4l792l05wv URL + http://beta.quicklisp.org/archive/fset/2020-09-25/fset-20200925-git.tgz MD5 + 481e7207099c061459db68813e7bf70c NAME fset FILENAME fset DEPS ((NAME misc-extensions FILENAME misc-extensions) - (NAME mt19937 FILENAME mt19937)) - DEPENDENCIES (misc-extensions mt19937) VERSION 20171019-git SIBLINGS NIL - PARASITES NIL) */ + (NAME mt19937 FILENAME mt19937) + (NAME named-readtables FILENAME named-readtables)) + DEPENDENCIES (misc-extensions mt19937 named-readtables) VERSION + 20200925-git SIBLINGS NIL PARASITES (fset/test)) */ diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/garbage-pools.nix b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/garbage-pools.nix deleted file mode 100644 index e961aecf85..0000000000 --- a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/garbage-pools.nix +++ /dev/null @@ -1,25 +0,0 @@ -{ fetchurl, ... }: -{ - baseName = ''garbage-pools''; - version = ''20130720-git''; - - description = ''''; - - deps = [ ]; - - src = fetchurl { - url = ''http://beta.quicklisp.org/archive/garbage-pools/2013-07-20/garbage-pools-20130720-git.tgz''; - sha256 = ''1idnba1pxayn0k5yzqp9lswg7ywjhavi59lrdnphfqajjpyi9w05''; - }; - - packageName = "garbage-pools"; - - asdFilesToKeep = ["garbage-pools.asd"]; - overrides = x: x; -} -/* (SYSTEM garbage-pools DESCRIPTION NIL SHA256 - 1idnba1pxayn0k5yzqp9lswg7ywjhavi59lrdnphfqajjpyi9w05 URL - http://beta.quicklisp.org/archive/garbage-pools/2013-07-20/garbage-pools-20130720-git.tgz - MD5 f691e2ddf6ba22b3451c24b61d4ee8b6 NAME garbage-pools FILENAME - garbage-pools DEPS NIL DEPENDENCIES NIL VERSION 20130720-git SIBLINGS - (garbage-pools-test) PARASITES NIL) */ diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/gettext.nix b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/gettext.nix new file mode 100644 index 0000000000..ffc517973d --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/gettext.nix @@ -0,0 +1,30 @@ +args @ { fetchurl, ... }: +rec { + baseName = ''gettext''; + version = ''20171130-git''; + + description = ''An pure Common Lisp implementation of gettext runtime. gettext is an internationalization and localization (i18n) system commonly used for writing multilingual programs on Unix-like computer operating systems.''; + + deps = [ args."flexi-streams" args."split-sequence" args."trivial-gray-streams" args."yacc" ]; + + src = fetchurl { + url = ''http://beta.quicklisp.org/archive/gettext/2017-11-30/gettext-20171130-git.tgz''; + sha256 = ''0nb8i66sb5qmpnk6rk2adlr87m322bra0xpirp63872mybd3y6yd''; + }; + + packageName = "gettext"; + + asdFilesToKeep = ["gettext.asd"]; + overrides = x: x; +} +/* (SYSTEM gettext DESCRIPTION + An pure Common Lisp implementation of gettext runtime. gettext is an internationalization and localization (i18n) system commonly used for writing multilingual programs on Unix-like computer operating systems. + SHA256 0nb8i66sb5qmpnk6rk2adlr87m322bra0xpirp63872mybd3y6yd URL + http://beta.quicklisp.org/archive/gettext/2017-11-30/gettext-20171130-git.tgz + MD5 d162cb5310db5011c82ef6343fd280ed NAME gettext FILENAME gettext DEPS + ((NAME flexi-streams FILENAME flexi-streams) + (NAME split-sequence FILENAME split-sequence) + (NAME trivial-gray-streams FILENAME trivial-gray-streams) + (NAME yacc FILENAME yacc)) + DEPENDENCIES (flexi-streams split-sequence trivial-gray-streams yacc) + VERSION 20171130-git SIBLINGS (gettext-example gettext-tests) PARASITES NIL) */ diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/html-encode.nix b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/html-encode.nix new file mode 100644 index 0000000000..9f4672644f --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/html-encode.nix @@ -0,0 +1,25 @@ +args @ { fetchurl, ... }: +rec { + baseName = ''html-encode''; + version = ''1.2''; + + description = ''A library for encoding text in various web-savvy encodings.''; + + deps = [ ]; + + src = fetchurl { + url = ''http://beta.quicklisp.org/archive/html-encode/2010-10-06/html-encode-1.2.tgz''; + sha256 = ''06mf8wn95yf5swhmzk4vp0xr4ylfl33dgfknkabbkd8n6jns8gcf''; + }; + + packageName = "html-encode"; + + asdFilesToKeep = ["html-encode.asd"]; + overrides = x: x; +} +/* (SYSTEM html-encode DESCRIPTION + A library for encoding text in various web-savvy encodings. SHA256 + 06mf8wn95yf5swhmzk4vp0xr4ylfl33dgfknkabbkd8n6jns8gcf URL + http://beta.quicklisp.org/archive/html-encode/2010-10-06/html-encode-1.2.tgz + MD5 67f22483fe6d270b8830f78f285a1016 NAME html-encode FILENAME html-encode + DEPS NIL DEPENDENCIES NIL VERSION 1.2 SIBLINGS NIL PARASITES NIL) */ diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/hu_dot_dwim_dot_asdf.nix b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/hu_dot_dwim_dot_asdf.nix index 1f2700608e..074e2ac967 100644 --- a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/hu_dot_dwim_dot_asdf.nix +++ b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/hu_dot_dwim_dot_asdf.nix @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: rec { baseName = ''hu_dot_dwim_dot_asdf''; - version = ''20190521-darcs''; + version = ''20200925-darcs''; description = ''Various ASDF extensions such as attached test and documentation system, explicit development support, etc.''; deps = [ args."uiop" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/hu.dwim.asdf/2019-05-21/hu.dwim.asdf-20190521-darcs.tgz''; - sha256 = ''0rsbv71vyszy8w35yjwb5h6zcmknjq223hkzir79y72qdsc6sabn''; + url = ''http://beta.quicklisp.org/archive/hu.dwim.asdf/2020-09-25/hu.dwim.asdf-20200925-darcs.tgz''; + sha256 = ''1812gk65x8yy8s817zhzga52zvdlagws4sw6a8f6zk7yaaa6br8h''; }; packageName = "hu.dwim.asdf"; @@ -19,8 +19,8 @@ rec { } /* (SYSTEM hu.dwim.asdf DESCRIPTION Various ASDF extensions such as attached test and documentation system, explicit development support, etc. - SHA256 0rsbv71vyszy8w35yjwb5h6zcmknjq223hkzir79y72qdsc6sabn URL - http://beta.quicklisp.org/archive/hu.dwim.asdf/2019-05-21/hu.dwim.asdf-20190521-darcs.tgz - MD5 b359bf05f587196eba172803b5594318 NAME hu.dwim.asdf FILENAME + SHA256 1812gk65x8yy8s817zhzga52zvdlagws4sw6a8f6zk7yaaa6br8h URL + http://beta.quicklisp.org/archive/hu.dwim.asdf/2020-09-25/hu.dwim.asdf-20200925-darcs.tgz + MD5 feec747077117dd9850db77ed1919c21 NAME hu.dwim.asdf FILENAME hu_dot_dwim_dot_asdf DEPS ((NAME uiop FILENAME uiop)) DEPENDENCIES (uiop) - VERSION 20190521-darcs SIBLINGS (hu.dwim.asdf.documentation) PARASITES NIL) */ + VERSION 20200925-darcs SIBLINGS (hu.dwim.asdf.documentation) PARASITES NIL) */ diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/hu_dot_dwim_dot_defclass-star.nix b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/hu_dot_dwim_dot_defclass-star.nix new file mode 100644 index 0000000000..a554ef8d68 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/hu_dot_dwim_dot_defclass-star.nix @@ -0,0 +1,31 @@ +args @ { fetchurl, ... }: +rec { + baseName = ''hu_dot_dwim_dot_defclass-star''; + version = ''20150709-darcs''; + + description = ''Simplify class like definitions with defclass* and friends.''; + + deps = [ args."hu_dot_dwim_dot_asdf" ]; + + src = fetchurl { + url = ''http://beta.quicklisp.org/archive/hu.dwim.defclass-star/2015-07-09/hu.dwim.defclass-star-20150709-darcs.tgz''; + sha256 = ''032982lyp0hm0ssxlyh572whi2hr4j1nqkyqlllaj373v0dbs3vs''; + }; + + packageName = "hu.dwim.defclass-star"; + + asdFilesToKeep = ["hu.dwim.defclass-star.asd"]; + overrides = x: x; +} +/* (SYSTEM hu.dwim.defclass-star DESCRIPTION + Simplify class like definitions with defclass* and friends. SHA256 + 032982lyp0hm0ssxlyh572whi2hr4j1nqkyqlllaj373v0dbs3vs URL + http://beta.quicklisp.org/archive/hu.dwim.defclass-star/2015-07-09/hu.dwim.defclass-star-20150709-darcs.tgz + MD5 e37f386dca8f789fb2e303a1914f0415 NAME hu.dwim.defclass-star FILENAME + hu_dot_dwim_dot_defclass-star DEPS + ((NAME hu.dwim.asdf FILENAME hu_dot_dwim_dot_asdf)) DEPENDENCIES + (hu.dwim.asdf) VERSION 20150709-darcs SIBLINGS + (hu.dwim.defclass-star+contextl hu.dwim.defclass-star+hu.dwim.def+contextl + hu.dwim.defclass-star+hu.dwim.def hu.dwim.defclass-star+swank + hu.dwim.defclass-star.documentation hu.dwim.defclass-star.test) + PARASITES NIL) */ diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/hu_dot_dwim_dot_stefil.nix b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/hu_dot_dwim_dot_stefil.nix index 51f4a2d069..d49a382a3a 100644 --- a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/hu_dot_dwim_dot_stefil.nix +++ b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/hu_dot_dwim_dot_stefil.nix @@ -1,17 +1,17 @@ args @ { fetchurl, ... }: rec { baseName = ''hu_dot_dwim_dot_stefil''; - version = ''20170403-darcs''; + version = ''20200218-darcs''; parasites = [ "hu.dwim.stefil/test" ]; description = ''A Simple Test Framework In Lisp.''; - deps = [ args."alexandria" args."hu_dot_dwim_dot_asdf" ]; + deps = [ args."alexandria" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/hu.dwim.stefil/2017-04-03/hu.dwim.stefil-20170403-darcs.tgz''; - sha256 = ''1irrsb0xfc5bx49aqs4ak0xzpjbjhxi9igx5x392gb5pzsak2r9n''; + url = ''http://beta.quicklisp.org/archive/hu.dwim.stefil/2020-02-18/hu.dwim.stefil-20200218-darcs.tgz''; + sha256 = ''16p25pq9fhk0dny6r43yl9z24g6qm6dag9zf2cila9v9jh3r76qf''; }; packageName = "hu.dwim.stefil"; @@ -20,13 +20,11 @@ rec { overrides = x: x; } /* (SYSTEM hu.dwim.stefil DESCRIPTION A Simple Test Framework In Lisp. SHA256 - 1irrsb0xfc5bx49aqs4ak0xzpjbjhxi9igx5x392gb5pzsak2r9n URL - http://beta.quicklisp.org/archive/hu.dwim.stefil/2017-04-03/hu.dwim.stefil-20170403-darcs.tgz - MD5 ea8be76a360b1df297a8bbd50be0d8a1 NAME hu.dwim.stefil FILENAME - hu_dot_dwim_dot_stefil DEPS - ((NAME alexandria FILENAME alexandria) - (NAME hu.dwim.asdf FILENAME hu_dot_dwim_dot_asdf)) - DEPENDENCIES (alexandria hu.dwim.asdf) VERSION 20170403-darcs SIBLINGS + 16p25pq9fhk0dny6r43yl9z24g6qm6dag9zf2cila9v9jh3r76qf URL + http://beta.quicklisp.org/archive/hu.dwim.stefil/2020-02-18/hu.dwim.stefil-20200218-darcs.tgz + MD5 3e87e0973f8373e342b75b13c802cc53 NAME hu.dwim.stefil FILENAME + hu_dot_dwim_dot_stefil DEPS ((NAME alexandria FILENAME alexandria)) + DEPENDENCIES (alexandria) VERSION 20200218-darcs SIBLINGS (hu.dwim.stefil+hu.dwim.def+swank hu.dwim.stefil+hu.dwim.def hu.dwim.stefil+swank) PARASITES (hu.dwim.stefil/test)) */ diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/hunchentoot.nix b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/hunchentoot.nix index e822fb4871..d874120e7d 100644 --- a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/hunchentoot.nix +++ b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/hunchentoot.nix @@ -1,7 +1,7 @@ args @ { fetchurl, ... }: rec { baseName = ''hunchentoot''; - version = ''v1.2.38''; + version = ''v1.3.0''; parasites = [ "hunchentoot-test" ]; @@ -13,8 +13,8 @@ rec { deps = [ args."alexandria" args."babel" args."bordeaux-threads" args."cffi" args."chunga" args."cl_plus_ssl" args."cl-base64" args."cl-fad" args."cl-ppcre" args."cl-who" args."drakma" args."flexi-streams" args."md5" args."rfc2388" args."split-sequence" args."trivial-backtrace" args."trivial-features" args."trivial-garbage" args."trivial-gray-streams" args."usocket" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/hunchentoot/2017-12-27/hunchentoot-v1.2.38.tgz''; - sha256 = ''1d3gnqbk2s3g9q51sx8mcsp2rmbvcfanbnljsf19npgfmz1ypsgd''; + url = ''http://beta.quicklisp.org/archive/hunchentoot/2020-06-10/hunchentoot-v1.3.0.tgz''; + sha256 = ''08znpi5lq2dhgv6mhvabk3w4ggrg31dbv4k6gmshr18xd2lq43i8''; }; packageName = "hunchentoot"; @@ -27,9 +27,9 @@ rec { BORDEAUX-THREADS. It supports HTTP 1.1, serves static files, has a simple framework for user-defined handlers and can be extended through subclassing. - SHA256 1d3gnqbk2s3g9q51sx8mcsp2rmbvcfanbnljsf19npgfmz1ypsgd URL - http://beta.quicklisp.org/archive/hunchentoot/2017-12-27/hunchentoot-v1.2.38.tgz - MD5 878a7833eb34a53231011b78e998e2fa NAME hunchentoot FILENAME hunchentoot + SHA256 08znpi5lq2dhgv6mhvabk3w4ggrg31dbv4k6gmshr18xd2lq43i8 URL + http://beta.quicklisp.org/archive/hunchentoot/2020-06-10/hunchentoot-v1.3.0.tgz + MD5 b1bb0c8df41a0ffaba4309e5084930fe NAME hunchentoot FILENAME hunchentoot DEPS ((NAME alexandria FILENAME alexandria) (NAME babel FILENAME babel) (NAME bordeaux-threads FILENAME bordeaux-threads) @@ -50,4 +50,4 @@ rec { cl-ppcre cl-who drakma flexi-streams md5 rfc2388 split-sequence trivial-backtrace trivial-features trivial-garbage trivial-gray-streams usocket) - VERSION v1.2.38 SIBLINGS NIL PARASITES (hunchentoot-test)) */ + VERSION v1.3.0 SIBLINGS NIL PARASITES (hunchentoot-test)) */ diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/inferior-shell.nix b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/inferior-shell.nix new file mode 100644 index 0000000000..2072945f26 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/inferior-shell.nix @@ -0,0 +1,54 @@ +args @ { fetchurl, ... }: +rec { + baseName = ''inferior-shell''; + version = ''20200925-git''; + + parasites = [ "inferior-shell/test" ]; + + description = ''spawn local or remote processes and shell pipes''; + + deps = [ args."alexandria" args."closer-mop" args."fare-mop" args."fare-quasiquote" args."fare-quasiquote-extras" args."fare-quasiquote-optima" args."fare-quasiquote-readtable" args."fare-utils" args."hu_dot_dwim_dot_stefil" args."introspect-environment" args."iterate" args."lisp-namespace" args."named-readtables" args."trivia" args."trivia_dot_balland2006" args."trivia_dot_level0" args."trivia_dot_level1" args."trivia_dot_level2" args."trivia_dot_quasiquote" args."trivia_dot_trivial" args."trivial-cltl2" args."type-i" ]; + + src = fetchurl { + url = ''http://beta.quicklisp.org/archive/inferior-shell/2020-09-25/inferior-shell-20200925-git.tgz''; + sha256 = ''1hykybcmdpcjk0irl4f1lmqc4aawpp1zfvh27qp6mldsibra7l80''; + }; + + packageName = "inferior-shell"; + + asdFilesToKeep = ["inferior-shell.asd"]; + overrides = x: x; +} +/* (SYSTEM inferior-shell DESCRIPTION + spawn local or remote processes and shell pipes SHA256 + 1hykybcmdpcjk0irl4f1lmqc4aawpp1zfvh27qp6mldsibra7l80 URL + http://beta.quicklisp.org/archive/inferior-shell/2020-09-25/inferior-shell-20200925-git.tgz + MD5 7ca5f15446ef80715758610a930bccba NAME inferior-shell FILENAME + inferior-shell DEPS + ((NAME alexandria FILENAME alexandria) + (NAME closer-mop FILENAME closer-mop) (NAME fare-mop FILENAME fare-mop) + (NAME fare-quasiquote FILENAME fare-quasiquote) + (NAME fare-quasiquote-extras FILENAME fare-quasiquote-extras) + (NAME fare-quasiquote-optima FILENAME fare-quasiquote-optima) + (NAME fare-quasiquote-readtable FILENAME fare-quasiquote-readtable) + (NAME fare-utils FILENAME fare-utils) + (NAME hu.dwim.stefil FILENAME hu_dot_dwim_dot_stefil) + (NAME introspect-environment FILENAME introspect-environment) + (NAME iterate FILENAME iterate) + (NAME lisp-namespace FILENAME lisp-namespace) + (NAME named-readtables FILENAME named-readtables) + (NAME trivia FILENAME trivia) + (NAME trivia.balland2006 FILENAME trivia_dot_balland2006) + (NAME trivia.level0 FILENAME trivia_dot_level0) + (NAME trivia.level1 FILENAME trivia_dot_level1) + (NAME trivia.level2 FILENAME trivia_dot_level2) + (NAME trivia.quasiquote FILENAME trivia_dot_quasiquote) + (NAME trivia.trivial FILENAME trivia_dot_trivial) + (NAME trivial-cltl2 FILENAME trivial-cltl2) (NAME type-i FILENAME type-i)) + DEPENDENCIES + (alexandria closer-mop fare-mop fare-quasiquote fare-quasiquote-extras + fare-quasiquote-optima fare-quasiquote-readtable fare-utils hu.dwim.stefil + introspect-environment iterate lisp-namespace named-readtables trivia + trivia.balland2006 trivia.level0 trivia.level1 trivia.level2 + trivia.quasiquote trivia.trivial trivial-cltl2 type-i) + VERSION 20200925-git SIBLINGS NIL PARASITES (inferior-shell/test)) */ diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/introspect-environment.nix b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/introspect-environment.nix index 1677e5adcd..68024ad2a5 100644 --- a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/introspect-environment.nix +++ b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/introspect-environment.nix @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: rec { baseName = ''introspect-environment''; - version = ''20151031-git''; + version = ''20200715-git''; description = ''Small interface to portable but nonstandard introspection of CL environments.''; deps = [ ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/introspect-environment/2015-10-31/introspect-environment-20151031-git.tgz''; - sha256 = ''0npydsmksbm3nisy9whnivmmhgdira74plmncmaklp7yhqsvwc30''; + url = ''http://beta.quicklisp.org/archive/introspect-environment/2020-07-15/introspect-environment-20200715-git.tgz''; + sha256 = ''1m2vqpbrvjb0mkmi2n5rg3j0dr68hyv23lbw6s474hylx02nw5ns''; }; packageName = "introspect-environment"; @@ -19,8 +19,8 @@ rec { } /* (SYSTEM introspect-environment DESCRIPTION Small interface to portable but nonstandard introspection of CL environments. - SHA256 0npydsmksbm3nisy9whnivmmhgdira74plmncmaklp7yhqsvwc30 URL - http://beta.quicklisp.org/archive/introspect-environment/2015-10-31/introspect-environment-20151031-git.tgz - MD5 3c61088583f11791530edb2e18f5d6f0 NAME introspect-environment FILENAME - introspect-environment DEPS NIL DEPENDENCIES NIL VERSION 20151031-git + SHA256 1m2vqpbrvjb0mkmi2n5rg3j0dr68hyv23lbw6s474hylx02nw5ns URL + http://beta.quicklisp.org/archive/introspect-environment/2020-07-15/introspect-environment-20200715-git.tgz + MD5 d129641b18376741e7106bd13e476cb8 NAME introspect-environment FILENAME + introspect-environment DEPS NIL DEPENDENCIES NIL VERSION 20200715-git SIBLINGS (introspect-environment-test) PARASITES NIL) */ diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/ironclad.nix b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/ironclad.nix index 0c4d3d758a..84298e8182 100644 --- a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/ironclad.nix +++ b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/ironclad.nix @@ -1,17 +1,17 @@ args @ { fetchurl, ... }: rec { baseName = ''ironclad''; - version = ''v0.47''; + version = ''v0.51''; parasites = [ "ironclad/tests" ]; description = ''A cryptographic toolkit written in pure Common Lisp''; - deps = [ args."alexandria" args."bordeaux-threads" args."nibbles" args."rt" ]; + deps = [ args."alexandria" args."bordeaux-threads" args."rt" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/ironclad/2019-10-07/ironclad-v0.47.tgz''; - sha256 = ''1aczr4678jxz9kvzvwfdbgdbqhihsbj1nz6j2qflc9sdr6hx24rk''; + url = ''http://beta.quicklisp.org/archive/ironclad/2020-09-25/ironclad-v0.51.tgz''; + sha256 = ''0zfazyvg91fxr9gm195qwwf1y5qdci7i1cwzpv0fggxhylpkswrn''; }; packageName = "ironclad"; @@ -21,11 +21,10 @@ rec { } /* (SYSTEM ironclad DESCRIPTION A cryptographic toolkit written in pure Common Lisp SHA256 - 1aczr4678jxz9kvzvwfdbgdbqhihsbj1nz6j2qflc9sdr6hx24rk URL - http://beta.quicklisp.org/archive/ironclad/2019-10-07/ironclad-v0.47.tgz - MD5 b82d370b037422fcaf8953857f03b5f6 NAME ironclad FILENAME ironclad DEPS + 0zfazyvg91fxr9gm195qwwf1y5qdci7i1cwzpv0fggxhylpkswrn URL + http://beta.quicklisp.org/archive/ironclad/2020-09-25/ironclad-v0.51.tgz + MD5 23b0b6a654bceca511e100fdc976e107 NAME ironclad FILENAME ironclad DEPS ((NAME alexandria FILENAME alexandria) - (NAME bordeaux-threads FILENAME bordeaux-threads) - (NAME nibbles FILENAME nibbles) (NAME rt FILENAME rt)) - DEPENDENCIES (alexandria bordeaux-threads nibbles rt) VERSION v0.47 - SIBLINGS (ironclad-text) PARASITES (ironclad/tests)) */ + (NAME bordeaux-threads FILENAME bordeaux-threads) (NAME rt FILENAME rt)) + DEPENDENCIES (alexandria bordeaux-threads rt) VERSION v0.51 SIBLINGS + (ironclad-text) PARASITES (ironclad/tests)) */ diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/iterate.nix b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/iterate.nix index f276ec7273..e3e1fa689a 100644 --- a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/iterate.nix +++ b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/iterate.nix @@ -1,7 +1,7 @@ args @ { fetchurl, ... }: rec { baseName = ''iterate''; - version = ''20180228-git''; + version = ''20200610-git''; parasites = [ "iterate/tests" ]; @@ -10,8 +10,8 @@ rec { deps = [ ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/iterate/2018-02-28/iterate-20180228-git.tgz''; - sha256 = ''0bz5dspx778v2fdfbi5x8v8r56mmda8svhp3immjkrpzc21rc7ib''; + url = ''http://beta.quicklisp.org/archive/iterate/2020-06-10/iterate-20200610-git.tgz''; + sha256 = ''0xz3v321b8zgjsgak432frs0gmpr2n24sf5gq97qnqvwqfn4infb''; }; packageName = "iterate"; @@ -21,8 +21,8 @@ rec { } /* (SYSTEM iterate DESCRIPTION Jonathan Amsterdam's iterator/gatherer/accumulator facility SHA256 - 0bz5dspx778v2fdfbi5x8v8r56mmda8svhp3immjkrpzc21rc7ib URL - http://beta.quicklisp.org/archive/iterate/2018-02-28/iterate-20180228-git.tgz - MD5 ee3b198b0f9674c11e5283e56f57ed78 NAME iterate FILENAME iterate DEPS NIL - DEPENDENCIES NIL VERSION 20180228-git SIBLINGS NIL PARASITES + 0xz3v321b8zgjsgak432frs0gmpr2n24sf5gq97qnqvwqfn4infb URL + http://beta.quicklisp.org/archive/iterate/2020-06-10/iterate-20200610-git.tgz + MD5 289e02704d6312910d07601bc563f0a5 NAME iterate FILENAME iterate DEPS NIL + DEPENDENCIES NIL VERSION 20200610-git SIBLINGS NIL PARASITES (iterate/tests)) */ diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/ixf.nix b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/ixf.nix deleted file mode 100644 index 9d219f4c19..0000000000 --- a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/ixf.nix +++ /dev/null @@ -1,34 +0,0 @@ -args @ { fetchurl, ... }: -{ - baseName = ''ixf''; - version = ''cl-20180228-git''; - - description = ''Tools to handle IBM PC version of IXF file format''; - - deps = [ args."alexandria" args."babel" args."bordeaux-threads" args."cl-fad" args."cl-ppcre" args."ieee-floats" args."local-time" args."md5" args."split-sequence" args."trivial-features" ]; - - src = fetchurl { - url = ''http://beta.quicklisp.org/archive/cl-ixf/2018-02-28/cl-ixf-20180228-git.tgz''; - sha256 = ''1yqlzyl51kj5fjfg064fc9606zha5b2xdjapfivr2vqz4azs1nvs''; - }; - - packageName = "ixf"; - - asdFilesToKeep = ["ixf.asd"]; - overrides = x: x; -} -/* (SYSTEM ixf DESCRIPTION Tools to handle IBM PC version of IXF file format - SHA256 1yqlzyl51kj5fjfg064fc9606zha5b2xdjapfivr2vqz4azs1nvs URL - http://beta.quicklisp.org/archive/cl-ixf/2018-02-28/cl-ixf-20180228-git.tgz - MD5 23732795aa317d24c1a40cc321a0e394 NAME ixf FILENAME ixf DEPS - ((NAME alexandria FILENAME alexandria) (NAME babel FILENAME babel) - (NAME bordeaux-threads FILENAME bordeaux-threads) - (NAME cl-fad FILENAME cl-fad) (NAME cl-ppcre FILENAME cl-ppcre) - (NAME ieee-floats FILENAME ieee-floats) - (NAME local-time FILENAME local-time) (NAME md5 FILENAME md5) - (NAME split-sequence FILENAME split-sequence) - (NAME trivial-features FILENAME trivial-features)) - DEPENDENCIES - (alexandria babel bordeaux-threads cl-fad cl-ppcre ieee-floats local-time - md5 split-sequence trivial-features) - VERSION cl-20180228-git SIBLINGS NIL PARASITES NIL) */ diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/jonathan.nix b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/jonathan.nix index 702eb2d05b..a29a02c5e6 100644 --- a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/jonathan.nix +++ b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/jonathan.nix @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: rec { baseName = ''jonathan''; - version = ''20190202-git''; + version = ''20200925-git''; description = ''High performance JSON encoder and decoder. Currently support: SBCL, CCL.''; deps = [ args."alexandria" args."babel" args."cffi" args."cffi-grovel" args."cffi-toolchain" args."cl-annot" args."cl-ppcre" args."cl-syntax" args."cl-syntax-annot" args."fast-io" args."named-readtables" args."proc-parse" args."static-vectors" args."trivial-features" args."trivial-gray-streams" args."trivial-types" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/jonathan/2019-02-02/jonathan-20190202-git.tgz''; - sha256 = ''1p70ji0mwx11q5iy792lxpcbx7mzh4az88vgkq39yx1ffwvpxvwl''; + url = ''http://beta.quicklisp.org/archive/jonathan/2020-09-25/jonathan-20200925-git.tgz''; + sha256 = ''1y5v3g351nsy7px0frdr2asmcy0lyfbj73ic1f5yf4q65hrgvryx''; }; packageName = "jonathan"; @@ -19,9 +19,9 @@ rec { } /* (SYSTEM jonathan DESCRIPTION High performance JSON encoder and decoder. Currently support: SBCL, CCL. - SHA256 1p70ji0mwx11q5iy792lxpcbx7mzh4az88vgkq39yx1ffwvpxvwl URL - http://beta.quicklisp.org/archive/jonathan/2019-02-02/jonathan-20190202-git.tgz - MD5 bf340574fc901706ba2dcdc57e1e78ad NAME jonathan FILENAME jonathan DEPS + SHA256 1y5v3g351nsy7px0frdr2asmcy0lyfbj73ic1f5yf4q65hrgvryx URL + http://beta.quicklisp.org/archive/jonathan/2020-09-25/jonathan-20200925-git.tgz + MD5 27cad3c107544f587f9f33295c10d81e NAME jonathan FILENAME jonathan DEPS ((NAME alexandria FILENAME alexandria) (NAME babel FILENAME babel) (NAME cffi FILENAME cffi) (NAME cffi-grovel FILENAME cffi-grovel) (NAME cffi-toolchain FILENAME cffi-toolchain) @@ -39,4 +39,4 @@ rec { (alexandria babel cffi cffi-grovel cffi-toolchain cl-annot cl-ppcre cl-syntax cl-syntax-annot fast-io named-readtables proc-parse static-vectors trivial-features trivial-gray-streams trivial-types) - VERSION 20190202-git SIBLINGS (jonathan-test) PARASITES NIL) */ + VERSION 20200925-git SIBLINGS (jonathan-test) PARASITES NIL) */ diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/kmrcl.nix b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/kmrcl.nix index e44004a9cf..49bc7d4cab 100644 --- a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/kmrcl.nix +++ b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/kmrcl.nix @@ -1,15 +1,17 @@ args @ { fetchurl, ... }: rec { baseName = ''kmrcl''; - version = ''20150923-git''; + version = ''20201016-git''; + + parasites = [ "kmrcl/test" ]; description = ''System lacks description''; - deps = [ ]; + deps = [ args."rt" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/kmrcl/2015-09-23/kmrcl-20150923-git.tgz''; - sha256 = ''0sx7p16pp5i4qr569p2265ky6rd65gyjp21k348a6c3fs2yn0r2g''; + url = ''http://beta.quicklisp.org/archive/kmrcl/2020-10-16/kmrcl-20201016-git.tgz''; + sha256 = ''0i0k61385hrzbg15qs1wprz6sis7mx2abxv1hqcc2f53rqm9b2hf''; }; packageName = "kmrcl"; @@ -18,7 +20,8 @@ rec { overrides = x: x; } /* (SYSTEM kmrcl DESCRIPTION System lacks description SHA256 - 0sx7p16pp5i4qr569p2265ky6rd65gyjp21k348a6c3fs2yn0r2g URL - http://beta.quicklisp.org/archive/kmrcl/2015-09-23/kmrcl-20150923-git.tgz - MD5 0cd15d3ed3e7d56528dd3243d1a5c9b1 NAME kmrcl FILENAME kmrcl DEPS NIL - DEPENDENCIES NIL VERSION 20150923-git SIBLINGS (kmrcl-tests) PARASITES NIL) */ + 0i0k61385hrzbg15qs1wprz6sis7mx2abxv1hqcc2f53rqm9b2hf URL + http://beta.quicklisp.org/archive/kmrcl/2020-10-16/kmrcl-20201016-git.tgz + MD5 f86bc410907f748c3c453469702755b8 NAME kmrcl FILENAME kmrcl DEPS + ((NAME rt FILENAME rt)) DEPENDENCIES (rt) VERSION 20201016-git SIBLINGS NIL + PARASITES (kmrcl/test)) */ diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/lack-component.nix b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/lack-component.nix index fa3f977560..0260d37f0b 100644 --- a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/lack-component.nix +++ b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/lack-component.nix @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: rec { baseName = ''lack-component''; - version = ''lack-20191007-git''; + version = ''lack-20201016-git''; description = ''System lacks description''; deps = [ ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/lack/2019-10-07/lack-20191007-git.tgz''; - sha256 = ''1pjvsk1hc0n6aki393mg2z0dd0xwbkm4pmdph78jlk683158an5s''; + url = ''http://beta.quicklisp.org/archive/lack/2020-10-16/lack-20201016-git.tgz''; + sha256 = ''124c3k8116m5gc0rp4vvkqcvz35lglrbwdq4i929hbq65xyx5gan''; }; packageName = "lack-component"; @@ -18,10 +18,10 @@ rec { overrides = x: x; } /* (SYSTEM lack-component DESCRIPTION System lacks description SHA256 - 1pjvsk1hc0n6aki393mg2z0dd0xwbkm4pmdph78jlk683158an5s URL - http://beta.quicklisp.org/archive/lack/2019-10-07/lack-20191007-git.tgz MD5 - bce7a6b5aefb5bfd3fbeb782dda7748f NAME lack-component FILENAME - lack-component DEPS NIL DEPENDENCIES NIL VERSION lack-20191007-git SIBLINGS + 124c3k8116m5gc0rp4vvkqcvz35lglrbwdq4i929hbq65xyx5gan URL + http://beta.quicklisp.org/archive/lack/2020-10-16/lack-20201016-git.tgz MD5 + 8a056801bd99fdd70cdfaf33129f6aeb NAME lack-component FILENAME + lack-component DEPS NIL DEPENDENCIES NIL VERSION lack-20201016-git SIBLINGS (lack-middleware-accesslog lack-middleware-auth-basic lack-middleware-backtrace lack-middleware-csrf lack-middleware-mount lack-middleware-session lack-middleware-static lack-request lack-response diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/lack-middleware-backtrace.nix b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/lack-middleware-backtrace.nix index 84ca1d6b66..610950054f 100644 --- a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/lack-middleware-backtrace.nix +++ b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/lack-middleware-backtrace.nix @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: rec { baseName = ''lack-middleware-backtrace''; - version = ''lack-20191007-git''; + version = ''lack-20201016-git''; description = ''System lacks description''; deps = [ args."uiop" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/lack/2019-10-07/lack-20191007-git.tgz''; - sha256 = ''1pjvsk1hc0n6aki393mg2z0dd0xwbkm4pmdph78jlk683158an5s''; + url = ''http://beta.quicklisp.org/archive/lack/2020-10-16/lack-20201016-git.tgz''; + sha256 = ''124c3k8116m5gc0rp4vvkqcvz35lglrbwdq4i929hbq65xyx5gan''; }; packageName = "lack-middleware-backtrace"; @@ -18,11 +18,11 @@ rec { overrides = x: x; } /* (SYSTEM lack-middleware-backtrace DESCRIPTION System lacks description - SHA256 1pjvsk1hc0n6aki393mg2z0dd0xwbkm4pmdph78jlk683158an5s URL - http://beta.quicklisp.org/archive/lack/2019-10-07/lack-20191007-git.tgz MD5 - bce7a6b5aefb5bfd3fbeb782dda7748f NAME lack-middleware-backtrace FILENAME + SHA256 124c3k8116m5gc0rp4vvkqcvz35lglrbwdq4i929hbq65xyx5gan URL + http://beta.quicklisp.org/archive/lack/2020-10-16/lack-20201016-git.tgz MD5 + 8a056801bd99fdd70cdfaf33129f6aeb NAME lack-middleware-backtrace FILENAME lack-middleware-backtrace DEPS ((NAME uiop FILENAME uiop)) DEPENDENCIES - (uiop) VERSION lack-20191007-git SIBLINGS + (uiop) VERSION lack-20201016-git SIBLINGS (lack-component lack-middleware-accesslog lack-middleware-auth-basic lack-middleware-csrf lack-middleware-mount lack-middleware-session lack-middleware-static lack-request lack-response lack-session-store-dbi diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/lack-util.nix b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/lack-util.nix index 1c2d2a1f6a..1af4ec3f43 100644 --- a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/lack-util.nix +++ b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/lack-util.nix @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: rec { baseName = ''lack-util''; - version = ''lack-20191007-git''; + version = ''lack-20201016-git''; description = ''System lacks description''; - deps = [ args."alexandria" args."bordeaux-threads" args."ironclad" args."nibbles" ]; + deps = [ args."alexandria" args."bordeaux-threads" args."ironclad" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/lack/2019-10-07/lack-20191007-git.tgz''; - sha256 = ''1pjvsk1hc0n6aki393mg2z0dd0xwbkm4pmdph78jlk683158an5s''; + url = ''http://beta.quicklisp.org/archive/lack/2020-10-16/lack-20201016-git.tgz''; + sha256 = ''124c3k8116m5gc0rp4vvkqcvz35lglrbwdq4i929hbq65xyx5gan''; }; packageName = "lack-util"; @@ -18,14 +18,14 @@ rec { overrides = x: x; } /* (SYSTEM lack-util DESCRIPTION System lacks description SHA256 - 1pjvsk1hc0n6aki393mg2z0dd0xwbkm4pmdph78jlk683158an5s URL - http://beta.quicklisp.org/archive/lack/2019-10-07/lack-20191007-git.tgz MD5 - bce7a6b5aefb5bfd3fbeb782dda7748f NAME lack-util FILENAME lack-util DEPS + 124c3k8116m5gc0rp4vvkqcvz35lglrbwdq4i929hbq65xyx5gan URL + http://beta.quicklisp.org/archive/lack/2020-10-16/lack-20201016-git.tgz MD5 + 8a056801bd99fdd70cdfaf33129f6aeb NAME lack-util FILENAME lack-util DEPS ((NAME alexandria FILENAME alexandria) (NAME bordeaux-threads FILENAME bordeaux-threads) - (NAME ironclad FILENAME ironclad) (NAME nibbles FILENAME nibbles)) - DEPENDENCIES (alexandria bordeaux-threads ironclad nibbles) VERSION - lack-20191007-git SIBLINGS + (NAME ironclad FILENAME ironclad)) + DEPENDENCIES (alexandria bordeaux-threads ironclad) VERSION + lack-20201016-git SIBLINGS (lack-component lack-middleware-accesslog lack-middleware-auth-basic lack-middleware-backtrace lack-middleware-csrf lack-middleware-mount lack-middleware-session lack-middleware-static lack-request lack-response diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/lack.nix b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/lack.nix index 2dbe5defe8..a85fab15c4 100644 --- a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/lack.nix +++ b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/lack.nix @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: rec { baseName = ''lack''; - version = ''20191007-git''; + version = ''20201016-git''; description = ''A minimal Clack''; - deps = [ args."alexandria" args."bordeaux-threads" args."ironclad" args."lack-component" args."lack-util" args."nibbles" ]; + deps = [ args."alexandria" args."bordeaux-threads" args."ironclad" args."lack-component" args."lack-util" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/lack/2019-10-07/lack-20191007-git.tgz''; - sha256 = ''1pjvsk1hc0n6aki393mg2z0dd0xwbkm4pmdph78jlk683158an5s''; + url = ''http://beta.quicklisp.org/archive/lack/2020-10-16/lack-20201016-git.tgz''; + sha256 = ''124c3k8116m5gc0rp4vvkqcvz35lglrbwdq4i929hbq65xyx5gan''; }; packageName = "lack"; @@ -18,17 +18,17 @@ rec { overrides = x: x; } /* (SYSTEM lack DESCRIPTION A minimal Clack SHA256 - 1pjvsk1hc0n6aki393mg2z0dd0xwbkm4pmdph78jlk683158an5s URL - http://beta.quicklisp.org/archive/lack/2019-10-07/lack-20191007-git.tgz MD5 - bce7a6b5aefb5bfd3fbeb782dda7748f NAME lack FILENAME lack DEPS + 124c3k8116m5gc0rp4vvkqcvz35lglrbwdq4i929hbq65xyx5gan URL + http://beta.quicklisp.org/archive/lack/2020-10-16/lack-20201016-git.tgz MD5 + 8a056801bd99fdd70cdfaf33129f6aeb NAME lack FILENAME lack DEPS ((NAME alexandria FILENAME alexandria) (NAME bordeaux-threads FILENAME bordeaux-threads) (NAME ironclad FILENAME ironclad) (NAME lack-component FILENAME lack-component) - (NAME lack-util FILENAME lack-util) (NAME nibbles FILENAME nibbles)) + (NAME lack-util FILENAME lack-util)) DEPENDENCIES - (alexandria bordeaux-threads ironclad lack-component lack-util nibbles) - VERSION 20191007-git SIBLINGS + (alexandria bordeaux-threads ironclad lack-component lack-util) VERSION + 20201016-git SIBLINGS (lack-component lack-middleware-accesslog lack-middleware-auth-basic lack-middleware-backtrace lack-middleware-csrf lack-middleware-mount lack-middleware-session lack-middleware-static lack-request lack-response diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/list-of.nix b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/list-of.nix deleted file mode 100644 index 4eb30ef013..0000000000 --- a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/list-of.nix +++ /dev/null @@ -1,26 +0,0 @@ -args @ { fetchurl, ... }: -{ - baseName = ''list-of''; - version = ''asdf-finalizers-20170403-git''; - - description = ''magic list-of deftype''; - - deps = [ args."asdf-finalizers" ]; - - src = fetchurl { - url = ''http://beta.quicklisp.org/archive/asdf-finalizers/2017-04-03/asdf-finalizers-20170403-git.tgz''; - sha256 = ''1w2ka0123icbjba7ngdd6h93j72g236h6jw4bsmvsak69fj0ybxj''; - }; - - packageName = "list-of"; - - asdFilesToKeep = ["list-of.asd"]; - overrides = x: x; -} -/* (SYSTEM list-of DESCRIPTION magic list-of deftype SHA256 - 1w2ka0123icbjba7ngdd6h93j72g236h6jw4bsmvsak69fj0ybxj URL - http://beta.quicklisp.org/archive/asdf-finalizers/2017-04-03/asdf-finalizers-20170403-git.tgz - MD5 a9e3c960e6b6fdbd69640b520ef8044b NAME list-of FILENAME list-of DEPS - ((NAME asdf-finalizers FILENAME asdf-finalizers)) DEPENDENCIES - (asdf-finalizers) VERSION asdf-finalizers-20170403-git SIBLINGS - (asdf-finalizers-test asdf-finalizers) PARASITES NIL) */ diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/local-time.nix b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/local-time.nix index 5ffa27fcca..c7d2f061f4 100644 --- a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/local-time.nix +++ b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/local-time.nix @@ -1,17 +1,17 @@ args @ { fetchurl, ... }: rec { baseName = ''local-time''; - version = ''20190710-git''; + version = ''20200925-git''; parasites = [ "local-time/test" ]; description = ''A library for manipulating dates and times, based on a paper by Erik Naggum''; - deps = [ args."alexandria" args."bordeaux-threads" args."cl-fad" args."stefil" ]; + deps = [ args."stefil" args."uiop" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/local-time/2019-07-10/local-time-20190710-git.tgz''; - sha256 = ''1f6l5g4frb2cyqdyyr64wdhp3fralshm43q7rigsrcz2vx5y75jk''; + url = ''http://beta.quicklisp.org/archive/local-time/2020-09-25/local-time-20200925-git.tgz''; + sha256 = ''0rr2bs93vhj7ngplw85572jfx8250fr2iki8y9spxmfz1sldm12f''; }; packageName = "local-time"; @@ -21,12 +21,9 @@ rec { } /* (SYSTEM local-time DESCRIPTION A library for manipulating dates and times, based on a paper by Erik Naggum - SHA256 1f6l5g4frb2cyqdyyr64wdhp3fralshm43q7rigsrcz2vx5y75jk URL - http://beta.quicklisp.org/archive/local-time/2019-07-10/local-time-20190710-git.tgz - MD5 ff315f40d1f955210c78aa0804a117f2 NAME local-time FILENAME local-time - DEPS - ((NAME alexandria FILENAME alexandria) - (NAME bordeaux-threads FILENAME bordeaux-threads) - (NAME cl-fad FILENAME cl-fad) (NAME stefil FILENAME stefil)) - DEPENDENCIES (alexandria bordeaux-threads cl-fad stefil) VERSION - 20190710-git SIBLINGS (cl-postgres+local-time) PARASITES (local-time/test)) */ + SHA256 0rr2bs93vhj7ngplw85572jfx8250fr2iki8y9spxmfz1sldm12f URL + http://beta.quicklisp.org/archive/local-time/2020-09-25/local-time-20200925-git.tgz + MD5 81f29e965b234a498840ff38d0002048 NAME local-time FILENAME local-time + DEPS ((NAME stefil FILENAME stefil) (NAME uiop FILENAME uiop)) DEPENDENCIES + (stefil uiop) VERSION 20200925-git SIBLINGS (cl-postgres+local-time) + PARASITES (local-time/test)) */ diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/log4cl.nix b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/log4cl.nix index 23412435fc..222178b155 100644 --- a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/log4cl.nix +++ b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/log4cl.nix @@ -1,7 +1,7 @@ args @ { fetchurl, ... }: rec { baseName = ''log4cl''; - version = ''20191007-git''; + version = ''20200925-git''; parasites = [ "log4cl/syslog" "log4cl/test" ]; @@ -10,8 +10,8 @@ rec { deps = [ args."alexandria" args."bordeaux-threads" args."stefil" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/log4cl/2019-10-07/log4cl-20191007-git.tgz''; - sha256 = ''0i4i4ahw13fzka8ixasv292y59ljyzl4i6k6gmkrhxxbm6cdq1na''; + url = ''http://beta.quicklisp.org/archive/log4cl/2020-09-25/log4cl-20200925-git.tgz''; + sha256 = ''1z98ly71hsbd46i0dqqv2s3cm9y8bi0pl3yg8a168vz629c6mdrf''; }; packageName = "log4cl"; @@ -20,11 +20,11 @@ rec { overrides = x: x; } /* (SYSTEM log4cl DESCRIPTION System lacks description SHA256 - 0i4i4ahw13fzka8ixasv292y59ljyzl4i6k6gmkrhxxbm6cdq1na URL - http://beta.quicklisp.org/archive/log4cl/2019-10-07/log4cl-20191007-git.tgz - MD5 11cdcd9da0ede86092886a055b186861 NAME log4cl FILENAME log4cl DEPS + 1z98ly71hsbd46i0dqqv2s3cm9y8bi0pl3yg8a168vz629c6mdrf URL + http://beta.quicklisp.org/archive/log4cl/2020-09-25/log4cl-20200925-git.tgz + MD5 80b347666af496142581e9e0c029d181 NAME log4cl FILENAME log4cl DEPS ((NAME alexandria FILENAME alexandria) (NAME bordeaux-threads FILENAME bordeaux-threads) (NAME stefil FILENAME stefil)) - DEPENDENCIES (alexandria bordeaux-threads stefil) VERSION 20191007-git + DEPENDENCIES (alexandria bordeaux-threads stefil) VERSION 20200925-git SIBLINGS (log4cl-examples log4slime) PARASITES (log4cl/syslog log4cl/test)) */ diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/lquery.nix b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/lquery.nix index f64e9ee6a3..cf27f8ceaa 100644 --- a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/lquery.nix +++ b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/lquery.nix @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: rec { baseName = ''lquery''; - version = ''20190710-git''; + version = ''20200715-git''; description = ''A library to allow jQuery-like HTML/DOM manipulation.''; deps = [ args."array-utils" args."clss" args."documentation-utils" args."form-fiddle" args."plump" args."trivial-indent" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/lquery/2019-07-10/lquery-20190710-git.tgz''; - sha256 = ''17kgp8xrygg2d7pfzqram3iv3rry91yfgjs1ym37ac8r5gqrmfsw''; + url = ''http://beta.quicklisp.org/archive/lquery/2020-07-15/lquery-20200715-git.tgz''; + sha256 = ''1akj9yzz71733yfbqq9jig0zkx8brphzh35d8zzic0469idd3rcd''; }; packageName = "lquery"; @@ -19,13 +19,13 @@ rec { } /* (SYSTEM lquery DESCRIPTION A library to allow jQuery-like HTML/DOM manipulation. SHA256 - 17kgp8xrygg2d7pfzqram3iv3rry91yfgjs1ym37ac8r5gqrmfsw URL - http://beta.quicklisp.org/archive/lquery/2019-07-10/lquery-20190710-git.tgz - MD5 987e9e505ff230c7bfc425bdf58fb717 NAME lquery FILENAME lquery DEPS + 1akj9yzz71733yfbqq9jig0zkx8brphzh35d8zzic0469idd3rcd URL + http://beta.quicklisp.org/archive/lquery/2020-07-15/lquery-20200715-git.tgz + MD5 38e282ac02c6a1ce9bc28bd9c1deee34 NAME lquery FILENAME lquery DEPS ((NAME array-utils FILENAME array-utils) (NAME clss FILENAME clss) (NAME documentation-utils FILENAME documentation-utils) (NAME form-fiddle FILENAME form-fiddle) (NAME plump FILENAME plump) (NAME trivial-indent FILENAME trivial-indent)) DEPENDENCIES (array-utils clss documentation-utils form-fiddle plump trivial-indent) - VERSION 20190710-git SIBLINGS (lquery-test) PARASITES NIL) */ + VERSION 20200715-git SIBLINGS (lquery-test) PARASITES NIL) */ diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/marshal.nix b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/marshal.nix index 4f6842606b..414dee98b7 100644 --- a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/marshal.nix +++ b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/marshal.nix @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: rec { baseName = ''marshal''; - version = ''cl-20180328-git''; + version = ''cl-20201016-git''; description = ''marshal: Simple (de)serialization of Lisp datastructures.''; deps = [ ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/cl-marshal/2018-03-28/cl-marshal-20180328-git.tgz''; - sha256 = ''09qmrq9lv9jlb2cnac80qd9b20swy598sfkhvngs3vcjl5xmmdhd''; + url = ''http://beta.quicklisp.org/archive/cl-marshal/2020-10-16/cl-marshal-20201016-git.tgz''; + sha256 = ''03j52yhgpc2myypgy07213l20rznxvf6m3sfbzy2wyapcmv7nxnz''; }; packageName = "marshal"; @@ -19,8 +19,8 @@ rec { } /* (SYSTEM marshal DESCRIPTION marshal: Simple (de)serialization of Lisp datastructures. SHA256 - 09qmrq9lv9jlb2cnac80qd9b20swy598sfkhvngs3vcjl5xmmdhd URL - http://beta.quicklisp.org/archive/cl-marshal/2018-03-28/cl-marshal-20180328-git.tgz - MD5 2d13dd2a276f1e63965498d10d9406ce NAME marshal FILENAME marshal DEPS NIL - DEPENDENCIES NIL VERSION cl-20180328-git SIBLINGS (marshal-tests) PARASITES + 03j52yhgpc2myypgy07213l20rznxvf6m3sfbzy2wyapcmv7nxnz URL + http://beta.quicklisp.org/archive/cl-marshal/2020-10-16/cl-marshal-20201016-git.tgz + MD5 243a2c3a5f1243ffb1639bca32a0aff0 NAME marshal FILENAME marshal DEPS NIL + DEPENDENCIES NIL VERSION cl-20201016-git SIBLINGS (marshal-tests) PARASITES NIL) */ diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/metabang-bind.nix b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/metabang-bind.nix index 86242c09da..6e0339bf9f 100644 --- a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/metabang-bind.nix +++ b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/metabang-bind.nix @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: rec { baseName = ''metabang-bind''; - version = ''20191130-git''; + version = ''20200218-git''; description = ''Bind is a macro that generalizes multiple-value-bind, let, let*, destructuring-bind, structure and slot accessors, and a whole lot more.''; deps = [ ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/metabang-bind/2019-11-30/metabang-bind-20191130-git.tgz''; - sha256 = ''0w4hk94wpfxxznl2xvasnwla7v9i8hrixa1b0r5ngph3n0hq48ci''; + url = ''http://beta.quicklisp.org/archive/metabang-bind/2020-02-18/metabang-bind-20200218-git.tgz''; + sha256 = ''0mfjzfsv8v6i9ahwldfzznl29i42cmh5srmpgq64ar1vp6bdn1hq''; }; packageName = "metabang-bind"; @@ -19,8 +19,8 @@ rec { } /* (SYSTEM metabang-bind DESCRIPTION Bind is a macro that generalizes multiple-value-bind, let, let*, destructuring-bind, structure and slot accessors, and a whole lot more. - SHA256 0w4hk94wpfxxznl2xvasnwla7v9i8hrixa1b0r5ngph3n0hq48ci URL - http://beta.quicklisp.org/archive/metabang-bind/2019-11-30/metabang-bind-20191130-git.tgz - MD5 b0845abb1eadb83e33e91c8d4ad88d2f NAME metabang-bind FILENAME - metabang-bind DEPS NIL DEPENDENCIES NIL VERSION 20191130-git SIBLINGS + SHA256 0mfjzfsv8v6i9ahwldfzznl29i42cmh5srmpgq64ar1vp6bdn1hq URL + http://beta.quicklisp.org/archive/metabang-bind/2020-02-18/metabang-bind-20200218-git.tgz + MD5 25ee72526862a9d794f7b0fc1826029e NAME metabang-bind FILENAME + metabang-bind DEPS NIL DEPENDENCIES NIL VERSION 20200218-git SIBLINGS (metabang-bind-test) PARASITES NIL) */ diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/metatilities-base.nix b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/metatilities-base.nix index c45a3eff38..1cac240883 100644 --- a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/metatilities-base.nix +++ b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/metatilities-base.nix @@ -1,15 +1,15 @@ -{ fetchurl, ... }: -{ +args @ { fetchurl, ... }: +rec { baseName = ''metatilities-base''; - version = ''20170403-git''; + version = ''20191227-git''; description = ''These are metabang.com's Common Lisp basic utilities.''; deps = [ ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/metatilities-base/2017-04-03/metatilities-base-20170403-git.tgz''; - sha256 = ''14c1kzpg6ydnqca95rprzmhr09kk1jp2m8hpyn5vj2v68cvqm7br''; + url = ''http://beta.quicklisp.org/archive/metatilities-base/2019-12-27/metatilities-base-20191227-git.tgz''; + sha256 = ''1mal51p7mknya2ljcwl3wdjvnirw5vvzic6qcnci7qhmfrb1awil''; }; packageName = "metatilities-base"; @@ -19,8 +19,8 @@ } /* (SYSTEM metatilities-base DESCRIPTION These are metabang.com's Common Lisp basic utilities. SHA256 - 14c1kzpg6ydnqca95rprzmhr09kk1jp2m8hpyn5vj2v68cvqm7br URL - http://beta.quicklisp.org/archive/metatilities-base/2017-04-03/metatilities-base-20170403-git.tgz - MD5 8a3f429862a368e63b8fde731e9ab28a NAME metatilities-base FILENAME - metatilities-base DEPS NIL DEPENDENCIES NIL VERSION 20170403-git SIBLINGS + 1mal51p7mknya2ljcwl3wdjvnirw5vvzic6qcnci7qhmfrb1awil URL + http://beta.quicklisp.org/archive/metatilities-base/2019-12-27/metatilities-base-20191227-git.tgz + MD5 7968829ca353c4a42784a151317029f1 NAME metatilities-base FILENAME + metatilities-base DEPS NIL DEPENDENCIES NIL VERSION 20191227-git SIBLINGS (metatilities-base-test) PARASITES NIL) */ diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/mgl-pax.nix b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/mgl-pax.nix new file mode 100644 index 0000000000..0271bf98cf --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/mgl-pax.nix @@ -0,0 +1,43 @@ +args @ { fetchurl, ... }: +rec { + baseName = ''mgl-pax''; + version = ''20201016-git''; + + parasites = [ "mgl-pax/test" ]; + + description = ''Exploratory programming tool and documentation + generator.''; + + deps = [ args."_3bmd" args."_3bmd-ext-code-blocks" args."alexandria" args."babel" args."bordeaux-threads" args."cl-fad" args."colorize" args."esrap" args."html-encode" args."ironclad" args."named-readtables" args."pythonic-string-reader" args."split-sequence" args."swank" args."trivial-features" ]; + + src = fetchurl { + url = ''http://beta.quicklisp.org/archive/mgl-pax/2020-10-16/mgl-pax-20201016-git.tgz''; + sha256 = ''0n48fw4a21sqy491bfi9fygrjl9psrryw00iha40dxy2ww86s6li''; + }; + + packageName = "mgl-pax"; + + asdFilesToKeep = ["mgl-pax.asd"]; + overrides = x: x; +} +/* (SYSTEM mgl-pax DESCRIPTION Exploratory programming tool and documentation + generator. + SHA256 0n48fw4a21sqy491bfi9fygrjl9psrryw00iha40dxy2ww86s6li URL + http://beta.quicklisp.org/archive/mgl-pax/2020-10-16/mgl-pax-20201016-git.tgz + MD5 131fc5e8d8b86dc769917e468f502727 NAME mgl-pax FILENAME mgl-pax DEPS + ((NAME 3bmd FILENAME _3bmd) + (NAME 3bmd-ext-code-blocks FILENAME _3bmd-ext-code-blocks) + (NAME alexandria FILENAME alexandria) (NAME babel FILENAME babel) + (NAME bordeaux-threads FILENAME bordeaux-threads) + (NAME cl-fad FILENAME cl-fad) (NAME colorize FILENAME colorize) + (NAME esrap FILENAME esrap) (NAME html-encode FILENAME html-encode) + (NAME ironclad FILENAME ironclad) + (NAME named-readtables FILENAME named-readtables) + (NAME pythonic-string-reader FILENAME pythonic-string-reader) + (NAME split-sequence FILENAME split-sequence) (NAME swank FILENAME swank) + (NAME trivial-features FILENAME trivial-features)) + DEPENDENCIES + (3bmd 3bmd-ext-code-blocks alexandria babel bordeaux-threads cl-fad + colorize esrap html-encode ironclad named-readtables + pythonic-string-reader split-sequence swank trivial-features) + VERSION 20201016-git SIBLINGS NIL PARASITES (mgl-pax/test)) */ diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/moptilities.nix b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/moptilities.nix index adb1ad27c4..1f2dd20ee4 100644 --- a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/moptilities.nix +++ b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/moptilities.nix @@ -1,5 +1,5 @@ args @ { fetchurl, ... }: -{ +rec { baseName = ''moptilities''; version = ''20170403-git''; diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/more-conditions.nix b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/more-conditions.nix new file mode 100644 index 0000000000..9a014c4160 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/more-conditions.nix @@ -0,0 +1,34 @@ +args @ { fetchurl, ... }: +rec { + baseName = ''more-conditions''; + version = ''20180831-git''; + + parasites = [ "more-conditions/test" ]; + + description = ''This system provides some generic condition classes in + conjunction with support functions and macros.''; + + deps = [ args."alexandria" args."closer-mop" args."fiveam" args."let-plus" ]; + + src = fetchurl { + url = ''http://beta.quicklisp.org/archive/more-conditions/2018-08-31/more-conditions-20180831-git.tgz''; + sha256 = ''0wa989kv3sl977g9szxkx52fdnww6aj2a9i77363f90iq02vj97x''; + }; + + packageName = "more-conditions"; + + asdFilesToKeep = ["more-conditions.asd"]; + overrides = x: x; +} +/* (SYSTEM more-conditions DESCRIPTION + This system provides some generic condition classes in + conjunction with support functions and macros. + SHA256 0wa989kv3sl977g9szxkx52fdnww6aj2a9i77363f90iq02vj97x URL + http://beta.quicklisp.org/archive/more-conditions/2018-08-31/more-conditions-20180831-git.tgz + MD5 c4797bd3c6c50fba02a6e8164ddafe28 NAME more-conditions FILENAME + more-conditions DEPS + ((NAME alexandria FILENAME alexandria) + (NAME closer-mop FILENAME closer-mop) (NAME fiveam FILENAME fiveam) + (NAME let-plus FILENAME let-plus)) + DEPENDENCIES (alexandria closer-mop fiveam let-plus) VERSION 20180831-git + SIBLINGS NIL PARASITES (more-conditions/test)) */ diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/mssql.nix b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/mssql.nix deleted file mode 100644 index 974a63c1a7..0000000000 --- a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/mssql.nix +++ /dev/null @@ -1,30 +0,0 @@ -args @ { fetchurl, ... }: -{ - baseName = ''mssql''; - version = ''cl-20180228-git''; - - description = ''''; - - deps = [ args."alexandria" args."babel" args."cffi" args."garbage-pools" args."iterate" args."parse-number" args."trivial-features" ]; - - src = fetchurl { - url = ''http://beta.quicklisp.org/archive/cl-mssql/2018-02-28/cl-mssql-20180228-git.tgz''; - sha256 = ''1f9vq78xx4vv1898cigkf09mzimknc6ry6qrkys3xj167vyqhwm0''; - }; - - packageName = "mssql"; - - asdFilesToKeep = ["mssql.asd"]; - overrides = x: x; -} -/* (SYSTEM mssql DESCRIPTION NIL SHA256 - 1f9vq78xx4vv1898cigkf09mzimknc6ry6qrkys3xj167vyqhwm0 URL - http://beta.quicklisp.org/archive/cl-mssql/2018-02-28/cl-mssql-20180228-git.tgz - MD5 03a269f5221948393643432fc6de9d5d NAME mssql FILENAME mssql DEPS - ((NAME alexandria FILENAME alexandria) (NAME babel FILENAME babel) - (NAME cffi FILENAME cffi) (NAME garbage-pools FILENAME garbage-pools) - (NAME iterate FILENAME iterate) (NAME parse-number FILENAME parse-number) - (NAME trivial-features FILENAME trivial-features)) - DEPENDENCIES - (alexandria babel cffi garbage-pools iterate parse-number trivial-features) - VERSION cl-20180228-git SIBLINGS NIL PARASITES NIL) */ diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/myway.nix b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/myway.nix index 068d0eba69..415b508713 100644 --- a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/myway.nix +++ b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/myway.nix @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: rec { baseName = ''myway''; - version = ''20181018-git''; + version = ''20200325-git''; description = ''Sinatra-compatible routing library.''; deps = [ args."alexandria" args."babel" args."cl-ppcre" args."cl-utilities" args."map-set" args."quri" args."split-sequence" args."trivial-features" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/myway/2018-10-18/myway-20181018-git.tgz''; - sha256 = ''0ffd92mmir2k6i4771ppqvb3xhqlk2yh5znx7i391vq5ji3k5jij''; + url = ''http://beta.quicklisp.org/archive/myway/2020-03-25/myway-20200325-git.tgz''; + sha256 = ''07r0mq9n0gmm7n20mkpsnmjvcr4gj9nckpnh1c2mddrb3sag8n15''; }; packageName = "myway"; @@ -18,9 +18,9 @@ rec { overrides = x: x; } /* (SYSTEM myway DESCRIPTION Sinatra-compatible routing library. SHA256 - 0ffd92mmir2k6i4771ppqvb3xhqlk2yh5znx7i391vq5ji3k5jij URL - http://beta.quicklisp.org/archive/myway/2018-10-18/myway-20181018-git.tgz - MD5 88adecdaec89ceb262559d443512e545 NAME myway FILENAME myway DEPS + 07r0mq9n0gmm7n20mkpsnmjvcr4gj9nckpnh1c2mddrb3sag8n15 URL + http://beta.quicklisp.org/archive/myway/2020-03-25/myway-20200325-git.tgz + MD5 af1fe34c2106303504c7908b25c3b9ce NAME myway FILENAME myway DEPS ((NAME alexandria FILENAME alexandria) (NAME babel FILENAME babel) (NAME cl-ppcre FILENAME cl-ppcre) (NAME cl-utilities FILENAME cl-utilities) (NAME map-set FILENAME map-set) @@ -29,4 +29,4 @@ rec { DEPENDENCIES (alexandria babel cl-ppcre cl-utilities map-set quri split-sequence trivial-features) - VERSION 20181018-git SIBLINGS (myway-test) PARASITES NIL) */ + VERSION 20200325-git SIBLINGS (myway-test) PARASITES NIL) */ diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/named-readtables.nix b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/named-readtables.nix index 82d06b1c93..3504443d45 100644 --- a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/named-readtables.nix +++ b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/named-readtables.nix @@ -1,7 +1,7 @@ args @ { fetchurl, ... }: rec { baseName = ''named-readtables''; - version = ''20180131-git''; + version = ''20200925-git''; parasites = [ "named-readtables/test" ]; @@ -11,8 +11,8 @@ rec { deps = [ ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/named-readtables/2018-01-31/named-readtables-20180131-git.tgz''; - sha256 = ''1fhygm2q75m6my6appxmx097l7zlr3qxbgzbpa2mf9pr1qzwrgg5''; + url = ''http://beta.quicklisp.org/archive/named-readtables/2020-09-25/named-readtables-20200925-git.tgz''; + sha256 = ''0klbvv2syv8a8agacxdjrmmhibvhgfbxxwv6k4hx0ifk6n5iazxl''; }; packageName = "named-readtables"; @@ -23,8 +23,8 @@ rec { /* (SYSTEM named-readtables DESCRIPTION Library that creates a namespace for named readtable akin to the namespace of packages. - SHA256 1fhygm2q75m6my6appxmx097l7zlr3qxbgzbpa2mf9pr1qzwrgg5 URL - http://beta.quicklisp.org/archive/named-readtables/2018-01-31/named-readtables-20180131-git.tgz - MD5 46db18ba947dc0aba14c76471604448d NAME named-readtables FILENAME - named-readtables DEPS NIL DEPENDENCIES NIL VERSION 20180131-git SIBLINGS + SHA256 0klbvv2syv8a8agacxdjrmmhibvhgfbxxwv6k4hx0ifk6n5iazxl URL + http://beta.quicklisp.org/archive/named-readtables/2020-09-25/named-readtables-20200925-git.tgz + MD5 b17873ea600fb6847537c2c584761c29 NAME named-readtables FILENAME + named-readtables DEPS NIL DEPENDENCIES NIL VERSION 20200925-git SIBLINGS NIL PARASITES (named-readtables/test)) */ diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/net-telent-date.nix b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/net-telent-date.nix new file mode 100644 index 0000000000..a9c4927956 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/net-telent-date.nix @@ -0,0 +1,25 @@ +args @ { fetchurl, ... }: +rec { + baseName = ''net-telent-date''; + version = ''net-telent-date_0.42''; + + description = ''System lacks description''; + + deps = [ ]; + + src = fetchurl { + url = ''http://beta.quicklisp.org/archive/net-telent-date/2010-10-06/net-telent-date_0.42.tgz''; + sha256 = ''06vdlddwi6kx999n1093chwgw0ksbys4j4w9i9zqvw768wxp4li1''; + }; + + packageName = "net-telent-date"; + + asdFilesToKeep = ["net-telent-date.asd"]; + overrides = x: x; +} +/* (SYSTEM net-telent-date DESCRIPTION System lacks description SHA256 + 06vdlddwi6kx999n1093chwgw0ksbys4j4w9i9zqvw768wxp4li1 URL + http://beta.quicklisp.org/archive/net-telent-date/2010-10-06/net-telent-date_0.42.tgz + MD5 6fedf40113b2462f7bd273d07950066b NAME net-telent-date FILENAME + net-telent-date DEPS NIL DEPENDENCIES NIL VERSION net-telent-date_0.42 + SIBLINGS NIL PARASITES NIL) */ diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/nibbles.nix b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/nibbles.nix index ea6adac9e9..75ea9b5522 100644 --- a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/nibbles.nix +++ b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/nibbles.nix @@ -1,7 +1,7 @@ args @ { fetchurl, ... }: rec { baseName = ''nibbles''; - version = ''20180831-git''; + version = ''20200925-git''; parasites = [ "nibbles/tests" ]; @@ -10,8 +10,8 @@ rec { deps = [ args."rt" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/nibbles/2018-08-31/nibbles-20180831-git.tgz''; - sha256 = ''0z25f2z54pnz1s35prqvnl42bv0xqh50y94bds1jwfv0wvfq27la''; + url = ''http://beta.quicklisp.org/archive/nibbles/2020-09-25/nibbles-20200925-git.tgz''; + sha256 = ''14k9hg8kmzwcb9b5aiwqhimc0zmcs3xp8q29sck8zklf8ziqaqb4''; }; packageName = "nibbles"; @@ -21,8 +21,8 @@ rec { } /* (SYSTEM nibbles DESCRIPTION A library for accessing octet-addressed blocks of data in big- and little-endian orders - SHA256 0z25f2z54pnz1s35prqvnl42bv0xqh50y94bds1jwfv0wvfq27la URL - http://beta.quicklisp.org/archive/nibbles/2018-08-31/nibbles-20180831-git.tgz - MD5 4badf1f066a59c3c270d40be1116ecd5 NAME nibbles FILENAME nibbles DEPS - ((NAME rt FILENAME rt)) DEPENDENCIES (rt) VERSION 20180831-git SIBLINGS NIL + SHA256 14k9hg8kmzwcb9b5aiwqhimc0zmcs3xp8q29sck8zklf8ziqaqb4 URL + http://beta.quicklisp.org/archive/nibbles/2020-09-25/nibbles-20200925-git.tgz + MD5 2e6275cac23e28e24a25201d7d6e4ae2 NAME nibbles FILENAME nibbles DEPS + ((NAME rt FILENAME rt)) DEPENDENCIES (rt) VERSION 20200925-git SIBLINGS NIL PARASITES (nibbles/tests)) */ diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/osicat.nix b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/osicat.nix new file mode 100644 index 0000000000..cb05bef0a1 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/osicat.nix @@ -0,0 +1,32 @@ +args @ { fetchurl, ... }: +rec { + baseName = ''osicat''; + version = ''20200925-git''; + + parasites = [ "osicat/tests" ]; + + description = ''A lightweight operating system interface''; + + deps = [ args."alexandria" args."babel" args."cffi" args."cffi-grovel" args."cffi-toolchain" args."rt" args."trivial-features" ]; + + src = fetchurl { + url = ''http://beta.quicklisp.org/archive/osicat/2020-09-25/osicat-20200925-git.tgz''; + sha256 = ''191ncd5arfx6i9cw3iny4a473wsrr3dpv2lwb9jr02p6qpmqwysk''; + }; + + packageName = "osicat"; + + asdFilesToKeep = ["osicat.asd"]; + overrides = x: x; +} +/* (SYSTEM osicat DESCRIPTION A lightweight operating system interface SHA256 + 191ncd5arfx6i9cw3iny4a473wsrr3dpv2lwb9jr02p6qpmqwysk URL + http://beta.quicklisp.org/archive/osicat/2020-09-25/osicat-20200925-git.tgz + MD5 5d0a254f2b8041a71fa6fa90eabaed70 NAME osicat FILENAME osicat DEPS + ((NAME alexandria FILENAME alexandria) (NAME babel FILENAME babel) + (NAME cffi FILENAME cffi) (NAME cffi-grovel FILENAME cffi-grovel) + (NAME cffi-toolchain FILENAME cffi-toolchain) (NAME rt FILENAME rt) + (NAME trivial-features FILENAME trivial-features)) + DEPENDENCIES + (alexandria babel cffi cffi-grovel cffi-toolchain rt trivial-features) + VERSION 20200925-git SIBLINGS NIL PARASITES (osicat/tests)) */ diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/parser-combinators.nix b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/parser-combinators.nix new file mode 100644 index 0000000000..5105ec9923 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/parser-combinators.nix @@ -0,0 +1,30 @@ +args @ { fetchurl, ... }: +rec { + baseName = ''parser-combinators''; + version = ''cl-20131111-git''; + + description = ''An implementation of parser combinators for Common Lisp''; + + deps = [ args."alexandria" args."iterate" ]; + + src = fetchurl { + url = ''http://beta.quicklisp.org/archive/cl-parser-combinators/2013-11-11/cl-parser-combinators-20131111-git.tgz''; + sha256 = ''0wg1a7favbwqcxyqcy2zxi4l11qsp4ar9fvddmx960grf2d72lds''; + }; + + packageName = "parser-combinators"; + + asdFilesToKeep = ["parser-combinators.asd"]; + overrides = x: x; +} +/* (SYSTEM parser-combinators DESCRIPTION + An implementation of parser combinators for Common Lisp SHA256 + 0wg1a7favbwqcxyqcy2zxi4l11qsp4ar9fvddmx960grf2d72lds URL + http://beta.quicklisp.org/archive/cl-parser-combinators/2013-11-11/cl-parser-combinators-20131111-git.tgz + MD5 25ad9b1459901738a6394422a41b8fec NAME parser-combinators FILENAME + parser-combinators DEPS + ((NAME alexandria FILENAME alexandria) (NAME iterate FILENAME iterate)) + DEPENDENCIES (alexandria iterate) VERSION cl-20131111-git SIBLINGS + (parser-combinators-cl-ppcre parser-combinators-debug + parser-combinators-tests) + PARASITES NIL) */ diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/parser_dot_common-rules.nix b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/parser_dot_common-rules.nix new file mode 100644 index 0000000000..ee6532261c --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/parser_dot_common-rules.nix @@ -0,0 +1,34 @@ +args @ { fetchurl, ... }: +rec { + baseName = ''parser_dot_common-rules''; + version = ''20200715-git''; + + parasites = [ "parser.common-rules/test" ]; + + description = ''Provides common parsing rules that are useful in many grammars.''; + + deps = [ args."alexandria" args."anaphora" args."esrap" args."fiveam" args."let-plus" args."split-sequence" ]; + + src = fetchurl { + url = ''http://beta.quicklisp.org/archive/parser.common-rules/2020-07-15/parser.common-rules-20200715-git.tgz''; + sha256 = ''17nw0shhb8079b26ldwpfxggkzs6ysfqm4s4nr1rfhba9mkvxdxy''; + }; + + packageName = "parser.common-rules"; + + asdFilesToKeep = ["parser.common-rules.asd"]; + overrides = x: x; +} +/* (SYSTEM parser.common-rules DESCRIPTION + Provides common parsing rules that are useful in many grammars. SHA256 + 17nw0shhb8079b26ldwpfxggkzs6ysfqm4s4nr1rfhba9mkvxdxy URL + http://beta.quicklisp.org/archive/parser.common-rules/2020-07-15/parser.common-rules-20200715-git.tgz + MD5 6391d962ae6fc13cc57312de013504c5 NAME parser.common-rules FILENAME + parser_dot_common-rules DEPS + ((NAME alexandria FILENAME alexandria) (NAME anaphora FILENAME anaphora) + (NAME esrap FILENAME esrap) (NAME fiveam FILENAME fiveam) + (NAME let-plus FILENAME let-plus) + (NAME split-sequence FILENAME split-sequence)) + DEPENDENCIES (alexandria anaphora esrap fiveam let-plus split-sequence) + VERSION 20200715-git SIBLINGS (parser.common-rules.operators) PARASITES + (parser.common-rules/test)) */ diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/pgloader.nix b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/pgloader.nix deleted file mode 100644 index f0b5fb23d6..0000000000 --- a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/pgloader.nix +++ /dev/null @@ -1,76 +0,0 @@ -args @ { fetchurl, ... }: -{ - baseName = ''pgloader''; - version = ''v3.4.1''; - - description = ''Load data into PostgreSQL''; - - deps = [ args."abnf" args."alexandria" args."anaphora" args."asdf-finalizers" args."asdf-system-connections" args."babel" args."bordeaux-threads" args."cffi" args."chipz" args."chunga" args."cl_plus_ssl" args."cl-base64" args."cl-containers" args."cl-csv" args."cl-fad" args."cl-interpol" args."cl-log" args."cl-markdown" args."cl-postgres" args."cl-ppcre" args."cl-unicode" args."cl-utilities" args."closer-mop" args."command-line-arguments" args."db3" args."drakma" args."dynamic-classes" args."esrap" args."flexi-streams" args."garbage-pools" args."ieee-floats" args."ironclad" args."iterate" args."ixf" args."list-of" args."local-time" args."lparallel" args."md5" args."metabang-bind" args."metatilities-base" args."mssql" args."nibbles" args."parse-number" args."postmodern" args."puri" args."py-configparser" args."qmynd" args."quri" args."s-sql" args."salza2" args."simple-date" args."split-sequence" args."sqlite" args."trivial-backtrace" args."trivial-features" args."trivial-garbage" args."trivial-gray-streams" args."trivial-utf-8" args."uiop" args."usocket" args."uuid" ]; - - src = fetchurl { - url = ''http://beta.quicklisp.org/archive/pgloader/2017-08-30/pgloader-v3.4.1.tgz''; - sha256 = ''1z6p7dz1ir9cg4gl1vkvbc1f7pv1yfv1jgwjkw29v57fdg4faz9v''; - }; - - packageName = "pgloader"; - - asdFilesToKeep = ["pgloader.asd"]; - overrides = x: x; -} -/* (SYSTEM pgloader DESCRIPTION Load data into PostgreSQL SHA256 - 1z6p7dz1ir9cg4gl1vkvbc1f7pv1yfv1jgwjkw29v57fdg4faz9v URL - http://beta.quicklisp.org/archive/pgloader/2017-08-30/pgloader-v3.4.1.tgz - MD5 6741f8e7d2d416942d5c4a1971576d33 NAME pgloader FILENAME pgloader DEPS - ((NAME abnf FILENAME abnf) (NAME alexandria FILENAME alexandria) - (NAME anaphora FILENAME anaphora) - (NAME asdf-finalizers FILENAME asdf-finalizers) - (NAME asdf-system-connections FILENAME asdf-system-connections) - (NAME babel FILENAME babel) - (NAME bordeaux-threads FILENAME bordeaux-threads) - (NAME cffi FILENAME cffi) (NAME chipz FILENAME chipz) - (NAME chunga FILENAME chunga) (NAME cl+ssl FILENAME cl_plus_ssl) - (NAME cl-base64 FILENAME cl-base64) - (NAME cl-containers FILENAME cl-containers) (NAME cl-csv FILENAME cl-csv) - (NAME cl-fad FILENAME cl-fad) (NAME cl-interpol FILENAME cl-interpol) - (NAME cl-log FILENAME cl-log) (NAME cl-markdown FILENAME cl-markdown) - (NAME cl-postgres FILENAME cl-postgres) (NAME cl-ppcre FILENAME cl-ppcre) - (NAME cl-unicode FILENAME cl-unicode) - (NAME cl-utilities FILENAME cl-utilities) - (NAME closer-mop FILENAME closer-mop) - (NAME command-line-arguments FILENAME command-line-arguments) - (NAME db3 FILENAME db3) (NAME drakma FILENAME drakma) - (NAME dynamic-classes FILENAME dynamic-classes) - (NAME esrap FILENAME esrap) (NAME flexi-streams FILENAME flexi-streams) - (NAME garbage-pools FILENAME garbage-pools) - (NAME ieee-floats FILENAME ieee-floats) (NAME ironclad FILENAME ironclad) - (NAME iterate FILENAME iterate) (NAME ixf FILENAME ixf) - (NAME list-of FILENAME list-of) (NAME local-time FILENAME local-time) - (NAME lparallel FILENAME lparallel) (NAME md5 FILENAME md5) - (NAME metabang-bind FILENAME metabang-bind) - (NAME metatilities-base FILENAME metatilities-base) - (NAME mssql FILENAME mssql) (NAME nibbles FILENAME nibbles) - (NAME parse-number FILENAME parse-number) - (NAME postmodern FILENAME postmodern) (NAME puri FILENAME puri) - (NAME py-configparser FILENAME py-configparser) - (NAME qmynd FILENAME qmynd) (NAME quri FILENAME quri) - (NAME s-sql FILENAME s-sql) (NAME salza2 FILENAME salza2) - (NAME simple-date FILENAME simple-date) - (NAME split-sequence FILENAME split-sequence) - (NAME sqlite FILENAME sqlite) - (NAME trivial-backtrace FILENAME trivial-backtrace) - (NAME trivial-features FILENAME trivial-features) - (NAME trivial-garbage FILENAME trivial-garbage) - (NAME trivial-gray-streams FILENAME trivial-gray-streams) - (NAME trivial-utf-8 FILENAME trivial-utf-8) (NAME uiop FILENAME uiop) - (NAME usocket FILENAME usocket) (NAME uuid FILENAME uuid)) - DEPENDENCIES - (abnf alexandria anaphora asdf-finalizers asdf-system-connections babel - bordeaux-threads cffi chipz chunga cl+ssl cl-base64 cl-containers cl-csv - cl-fad cl-interpol cl-log cl-markdown cl-postgres cl-ppcre cl-unicode - cl-utilities closer-mop command-line-arguments db3 drakma dynamic-classes - esrap flexi-streams garbage-pools ieee-floats ironclad iterate ixf list-of - local-time lparallel md5 metabang-bind metatilities-base mssql nibbles - parse-number postmodern puri py-configparser qmynd quri s-sql salza2 - simple-date split-sequence sqlite trivial-backtrace trivial-features - trivial-garbage trivial-gray-streams trivial-utf-8 uiop usocket uuid) - VERSION v3.4.1 SIBLINGS NIL PARASITES NIL) */ diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/plump-dom.nix b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/plump-dom.nix deleted file mode 100644 index e4fd9f0c4d..0000000000 --- a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/plump-dom.nix +++ /dev/null @@ -1,26 +0,0 @@ -args @ { fetchurl, ... }: -{ - baseName = ''plump-dom''; - version = ''plump-20170725-git''; - - description = ''A DOM for use with the Plump parser.''; - - deps = [ args."array-utils" ]; - - src = fetchurl { - url = ''http://beta.quicklisp.org/archive/plump/2017-07-25/plump-20170725-git.tgz''; - sha256 = ''118ashy1sqi666k18fqjkkzzqcak1f1aq93vm2hiadbdvrwn9s72''; - }; - - packageName = "plump-dom"; - - asdFilesToKeep = ["plump-dom.asd"]; - overrides = x: x; -} -/* (SYSTEM plump-dom DESCRIPTION A DOM for use with the Plump parser. SHA256 - 118ashy1sqi666k18fqjkkzzqcak1f1aq93vm2hiadbdvrwn9s72 URL - http://beta.quicklisp.org/archive/plump/2017-07-25/plump-20170725-git.tgz - MD5 e5e92dd177711a14753ee86961710458 NAME plump-dom FILENAME plump-dom DEPS - ((NAME array-utils FILENAME array-utils)) DEPENDENCIES (array-utils) - VERSION plump-20170725-git SIBLINGS (plump-lexer plump-parser plump) - PARASITES NIL) */ diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/plump-lexer.nix b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/plump-lexer.nix deleted file mode 100644 index 16cd9d5f06..0000000000 --- a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/plump-lexer.nix +++ /dev/null @@ -1,26 +0,0 @@ -{ fetchurl, ... }: -{ - baseName = ''plump-lexer''; - version = ''plump-20170725-git''; - - description = ''A very simple toolkit to help with lexing used mainly in Plump.''; - - deps = [ ]; - - src = fetchurl { - url = ''http://beta.quicklisp.org/archive/plump/2017-07-25/plump-20170725-git.tgz''; - sha256 = ''118ashy1sqi666k18fqjkkzzqcak1f1aq93vm2hiadbdvrwn9s72''; - }; - - packageName = "plump-lexer"; - - asdFilesToKeep = ["plump-lexer.asd"]; - overrides = x: x; -} -/* (SYSTEM plump-lexer DESCRIPTION - A very simple toolkit to help with lexing used mainly in Plump. SHA256 - 118ashy1sqi666k18fqjkkzzqcak1f1aq93vm2hiadbdvrwn9s72 URL - http://beta.quicklisp.org/archive/plump/2017-07-25/plump-20170725-git.tgz - MD5 e5e92dd177711a14753ee86961710458 NAME plump-lexer FILENAME plump-lexer - DEPS NIL DEPENDENCIES NIL VERSION plump-20170725-git SIBLINGS - (plump-dom plump-parser plump) PARASITES NIL) */ diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/plump-parser.nix b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/plump-parser.nix deleted file mode 100644 index cb06b039ab..0000000000 --- a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/plump-parser.nix +++ /dev/null @@ -1,30 +0,0 @@ -args @ { fetchurl, ... }: -{ - baseName = ''plump-parser''; - version = ''plump-20170725-git''; - - description = ''Plump's core parser component.''; - - deps = [ args."array-utils" args."plump-dom" args."plump-lexer" args."trivial-indent" ]; - - src = fetchurl { - url = ''http://beta.quicklisp.org/archive/plump/2017-07-25/plump-20170725-git.tgz''; - sha256 = ''118ashy1sqi666k18fqjkkzzqcak1f1aq93vm2hiadbdvrwn9s72''; - }; - - packageName = "plump-parser"; - - asdFilesToKeep = ["plump-parser.asd"]; - overrides = x: x; -} -/* (SYSTEM plump-parser DESCRIPTION Plump's core parser component. SHA256 - 118ashy1sqi666k18fqjkkzzqcak1f1aq93vm2hiadbdvrwn9s72 URL - http://beta.quicklisp.org/archive/plump/2017-07-25/plump-20170725-git.tgz - MD5 e5e92dd177711a14753ee86961710458 NAME plump-parser FILENAME - plump-parser DEPS - ((NAME array-utils FILENAME array-utils) - (NAME plump-dom FILENAME plump-dom) - (NAME plump-lexer FILENAME plump-lexer) - (NAME trivial-indent FILENAME trivial-indent)) - DEPENDENCIES (array-utils plump-dom plump-lexer trivial-indent) VERSION - plump-20170725-git SIBLINGS (plump-dom plump-lexer plump) PARASITES NIL) */ diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/plump.nix b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/plump.nix index 8757c704c8..5490b882c8 100644 --- a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/plump.nix +++ b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/plump.nix @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: rec { baseName = ''plump''; - version = ''20190710-git''; + version = ''20200427-git''; description = ''An XML / XHTML / HTML parser that aims to be as lenient as possible.''; deps = [ args."array-utils" args."documentation-utils" args."trivial-indent" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/plump/2019-07-10/plump-20190710-git.tgz''; - sha256 = ''1in8c86a1ss8h02bsr3yb0clqgbvqh0bh5gy4y01yfckixbxh5fi''; + url = ''http://beta.quicklisp.org/archive/plump/2020-04-27/plump-20200427-git.tgz''; + sha256 = ''0l5bi503djjkhrih94h5jbihlm60h267qm2ycq9m9fldp4fjrjic''; }; packageName = "plump"; @@ -19,11 +19,11 @@ rec { } /* (SYSTEM plump DESCRIPTION An XML / XHTML / HTML parser that aims to be as lenient as possible. SHA256 - 1in8c86a1ss8h02bsr3yb0clqgbvqh0bh5gy4y01yfckixbxh5fi URL - http://beta.quicklisp.org/archive/plump/2019-07-10/plump-20190710-git.tgz - MD5 e3276779e368758274156c9477f0b22a NAME plump FILENAME plump DEPS + 0l5bi503djjkhrih94h5jbihlm60h267qm2ycq9m9fldp4fjrjic URL + http://beta.quicklisp.org/archive/plump/2020-04-27/plump-20200427-git.tgz + MD5 f9244ce58ee5cf5044092369e534f3b7 NAME plump FILENAME plump DEPS ((NAME array-utils FILENAME array-utils) (NAME documentation-utils FILENAME documentation-utils) (NAME trivial-indent FILENAME trivial-indent)) DEPENDENCIES (array-utils documentation-utils trivial-indent) VERSION - 20190710-git SIBLINGS (plump-dom plump-lexer plump-parser) PARASITES NIL) */ + 20200427-git SIBLINGS (plump-dom plump-lexer plump-parser) PARASITES NIL) */ diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/postmodern.nix b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/postmodern.nix index ed09e3805c..7dc27566bc 100644 --- a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/postmodern.nix +++ b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/postmodern.nix @@ -1,17 +1,17 @@ args @ { fetchurl, ... }: -{ +rec { baseName = ''postmodern''; - version = ''20180430-git''; + version = ''20201016-git''; parasites = [ "postmodern/tests" ]; description = ''PostgreSQL programming API''; - deps = [ args."alexandria" args."bordeaux-threads" args."cl-postgres" args."cl-postgres_slash_tests" args."closer-mop" args."fiveam" args."md5" args."s-sql" args."s-sql_slash_tests" args."simple-date" args."simple-date_slash_postgres-glue" args."split-sequence" args."usocket" ]; + deps = [ args."alexandria" args."bordeaux-threads" args."cl-base64" args."cl-postgres" args."cl-postgres_slash_tests" args."cl-ppcre" args."cl-unicode" args."closer-mop" args."fiveam" args."flexi-streams" args."global-vars" args."ironclad" args."md5" args."s-sql" args."s-sql_slash_tests" args."simple-date" args."simple-date_slash_postgres-glue" args."split-sequence" args."uax-15" args."usocket" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/postmodern/2018-04-30/postmodern-20180430-git.tgz''; - sha256 = ''0b6w8f5ihbk036v1fclyskns615xhnib9q3cjn0ql6r6sk3nca7f''; + url = ''http://beta.quicklisp.org/archive/postmodern/2020-10-16/postmodern-20201016-git.tgz''; + sha256 = ''1svaiksbqcaq8sh7q6sj9kzazdfl360zqr2nzhwbgy4xnaj4vf3n''; }; packageName = "postmodern"; @@ -20,24 +20,29 @@ args @ { fetchurl, ... }: overrides = x: x; } /* (SYSTEM postmodern DESCRIPTION PostgreSQL programming API SHA256 - 0b6w8f5ihbk036v1fclyskns615xhnib9q3cjn0ql6r6sk3nca7f URL - http://beta.quicklisp.org/archive/postmodern/2018-04-30/postmodern-20180430-git.tgz - MD5 9ca2a4ccf4ea7dbcd14d69cb355a8214 NAME postmodern FILENAME postmodern + 1svaiksbqcaq8sh7q6sj9kzazdfl360zqr2nzhwbgy4xnaj4vf3n URL + http://beta.quicklisp.org/archive/postmodern/2020-10-16/postmodern-20201016-git.tgz + MD5 f61e827d7e7ba023f6fbc7c2667de4c8 NAME postmodern FILENAME postmodern DEPS ((NAME alexandria FILENAME alexandria) (NAME bordeaux-threads FILENAME bordeaux-threads) + (NAME cl-base64 FILENAME cl-base64) (NAME cl-postgres FILENAME cl-postgres) (NAME cl-postgres/tests FILENAME cl-postgres_slash_tests) + (NAME cl-ppcre FILENAME cl-ppcre) (NAME cl-unicode FILENAME cl-unicode) (NAME closer-mop FILENAME closer-mop) (NAME fiveam FILENAME fiveam) + (NAME flexi-streams FILENAME flexi-streams) + (NAME global-vars FILENAME global-vars) (NAME ironclad FILENAME ironclad) (NAME md5 FILENAME md5) (NAME s-sql FILENAME s-sql) (NAME s-sql/tests FILENAME s-sql_slash_tests) (NAME simple-date FILENAME simple-date) (NAME simple-date/postgres-glue FILENAME simple-date_slash_postgres-glue) (NAME split-sequence FILENAME split-sequence) - (NAME usocket FILENAME usocket)) + (NAME uax-15 FILENAME uax-15) (NAME usocket FILENAME usocket)) DEPENDENCIES - (alexandria bordeaux-threads cl-postgres cl-postgres/tests closer-mop - fiveam md5 s-sql s-sql/tests simple-date simple-date/postgres-glue - split-sequence usocket) - VERSION 20180430-git SIBLINGS (cl-postgres s-sql simple-date) PARASITES + (alexandria bordeaux-threads cl-base64 cl-postgres cl-postgres/tests + cl-ppcre cl-unicode closer-mop fiveam flexi-streams global-vars ironclad + md5 s-sql s-sql/tests simple-date simple-date/postgres-glue split-sequence + uax-15 usocket) + VERSION 20201016-git SIBLINGS (cl-postgres s-sql simple-date) PARASITES (postmodern/tests)) */ diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/prove-asdf.nix b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/prove-asdf.nix index 583b30f976..21babe8f01 100644 --- a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/prove-asdf.nix +++ b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/prove-asdf.nix @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: rec { baseName = ''prove-asdf''; - version = ''prove-20171130-git''; + version = ''prove-20200218-git''; description = ''System lacks description''; deps = [ ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/prove/2017-11-30/prove-20171130-git.tgz''; - sha256 = ''13dmnnlk3r9fxxcvk6sqq8m0ifv9y80zgp1wg63nv1ykwdi7kyar''; + url = ''http://beta.quicklisp.org/archive/prove/2020-02-18/prove-20200218-git.tgz''; + sha256 = ''1sv3zyam9sdmyis5lyv0khvw82q7bcpsycpj9b3bsv9isb4j30zn''; }; packageName = "prove-asdf"; @@ -18,8 +18,8 @@ rec { overrides = x: x; } /* (SYSTEM prove-asdf DESCRIPTION System lacks description SHA256 - 13dmnnlk3r9fxxcvk6sqq8m0ifv9y80zgp1wg63nv1ykwdi7kyar URL - http://beta.quicklisp.org/archive/prove/2017-11-30/prove-20171130-git.tgz - MD5 630df4367537f799570be40242f8ed52 NAME prove-asdf FILENAME prove-asdf - DEPS NIL DEPENDENCIES NIL VERSION prove-20171130-git SIBLINGS + 1sv3zyam9sdmyis5lyv0khvw82q7bcpsycpj9b3bsv9isb4j30zn URL + http://beta.quicklisp.org/archive/prove/2020-02-18/prove-20200218-git.tgz + MD5 85780b65e84c17a78d658364b8c4d11b NAME prove-asdf FILENAME prove-asdf + DEPS NIL DEPENDENCIES NIL VERSION prove-20200218-git SIBLINGS (cl-test-more prove-test prove) PARASITES NIL) */ diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/prove.nix b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/prove.nix index 065c81e11a..c3aa1dcaaf 100644 --- a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/prove.nix +++ b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/prove.nix @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: rec { baseName = ''prove''; - version = ''20171130-git''; + version = ''20200218-git''; description = ''System lacks description''; - deps = [ args."alexandria" args."anaphora" args."cl-ansi-text" args."cl-colors" args."cl-ppcre" args."let-plus" args."uiop" ]; + deps = [ args."alexandria" args."anaphora" args."cl-ansi-text" args."cl-colors" args."cl-colors2" args."cl-ppcre" args."let-plus" args."uiop" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/prove/2017-11-30/prove-20171130-git.tgz''; - sha256 = ''13dmnnlk3r9fxxcvk6sqq8m0ifv9y80zgp1wg63nv1ykwdi7kyar''; + url = ''http://beta.quicklisp.org/archive/prove/2020-02-18/prove-20200218-git.tgz''; + sha256 = ''1sv3zyam9sdmyis5lyv0khvw82q7bcpsycpj9b3bsv9isb4j30zn''; }; packageName = "prove"; @@ -18,13 +18,16 @@ rec { overrides = x: x; } /* (SYSTEM prove DESCRIPTION System lacks description SHA256 - 13dmnnlk3r9fxxcvk6sqq8m0ifv9y80zgp1wg63nv1ykwdi7kyar URL - http://beta.quicklisp.org/archive/prove/2017-11-30/prove-20171130-git.tgz - MD5 630df4367537f799570be40242f8ed52 NAME prove FILENAME prove DEPS + 1sv3zyam9sdmyis5lyv0khvw82q7bcpsycpj9b3bsv9isb4j30zn URL + http://beta.quicklisp.org/archive/prove/2020-02-18/prove-20200218-git.tgz + MD5 85780b65e84c17a78d658364b8c4d11b NAME prove FILENAME prove DEPS ((NAME alexandria FILENAME alexandria) (NAME anaphora FILENAME anaphora) (NAME cl-ansi-text FILENAME cl-ansi-text) - (NAME cl-colors FILENAME cl-colors) (NAME cl-ppcre FILENAME cl-ppcre) - (NAME let-plus FILENAME let-plus) (NAME uiop FILENAME uiop)) + (NAME cl-colors FILENAME cl-colors) (NAME cl-colors2 FILENAME cl-colors2) + (NAME cl-ppcre FILENAME cl-ppcre) (NAME let-plus FILENAME let-plus) + (NAME uiop FILENAME uiop)) DEPENDENCIES - (alexandria anaphora cl-ansi-text cl-colors cl-ppcre let-plus uiop) VERSION - 20171130-git SIBLINGS (cl-test-more prove-asdf prove-test) PARASITES NIL) */ + (alexandria anaphora cl-ansi-text cl-colors cl-colors2 cl-ppcre let-plus + uiop) + VERSION 20200218-git SIBLINGS (cl-test-more prove-asdf prove-test) + PARASITES NIL) */ diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/puri.nix b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/puri.nix index 4f69467839..e45802c194 100644 --- a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/puri.nix +++ b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/puri.nix @@ -1,17 +1,17 @@ args @ { fetchurl, ... }: rec { baseName = ''puri''; - version = ''20180228-git''; + version = ''20201016-git''; - parasites = [ "puri-tests" ]; + parasites = [ "puri/test" ]; description = ''Portable Universal Resource Indentifier Library''; deps = [ args."ptester" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/puri/2018-02-28/puri-20180228-git.tgz''; - sha256 = ''1s4r5adrjy5asry45xbcbklxhdjydvf6n55z897nvyw33bigrnbz''; + url = ''http://beta.quicklisp.org/archive/puri/2020-10-16/puri-20201016-git.tgz''; + sha256 = ''16h7gip6d0564s9yba3jg0rjzndmysv531hcrngvi3j3sandjfzx''; }; packageName = "puri"; @@ -20,8 +20,8 @@ rec { overrides = x: x; } /* (SYSTEM puri DESCRIPTION Portable Universal Resource Indentifier Library - SHA256 1s4r5adrjy5asry45xbcbklxhdjydvf6n55z897nvyw33bigrnbz URL - http://beta.quicklisp.org/archive/puri/2018-02-28/puri-20180228-git.tgz MD5 - 0c43ad5d862ed0d18ef84d8e2a42f67f NAME puri FILENAME puri DEPS + SHA256 16h7gip6d0564s9yba3jg0rjzndmysv531hcrngvi3j3sandjfzx URL + http://beta.quicklisp.org/archive/puri/2020-10-16/puri-20201016-git.tgz MD5 + 890c61df1d7204b2d681bf146c43e711 NAME puri FILENAME puri DEPS ((NAME ptester FILENAME ptester)) DEPENDENCIES (ptester) VERSION - 20180228-git SIBLINGS NIL PARASITES (puri-tests)) */ + 20201016-git SIBLINGS NIL PARASITES (puri/test)) */ diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/py-configparser.nix b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/py-configparser.nix deleted file mode 100644 index 741929484d..0000000000 --- a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/py-configparser.nix +++ /dev/null @@ -1,26 +0,0 @@ -args @ { fetchurl, ... }: -{ - baseName = ''py-configparser''; - version = ''20170830-svn''; - - description = ''Common Lisp implementation of the Python ConfigParser module''; - - deps = [ args."parse-number" ]; - - src = fetchurl { - url = ''http://beta.quicklisp.org/archive/py-configparser/2017-08-30/py-configparser-20170830-svn.tgz''; - sha256 = ''0lf062m6nrq61cxafi7jyfh3ianml1qqqzdfd5pm1wzakl2jqp9j''; - }; - - packageName = "py-configparser"; - - asdFilesToKeep = ["py-configparser.asd"]; - overrides = x: x; -} -/* (SYSTEM py-configparser DESCRIPTION - Common Lisp implementation of the Python ConfigParser module SHA256 - 0lf062m6nrq61cxafi7jyfh3ianml1qqqzdfd5pm1wzakl2jqp9j URL - http://beta.quicklisp.org/archive/py-configparser/2017-08-30/py-configparser-20170830-svn.tgz - MD5 b6a9fc2a9c70760d6683cafe656f9e90 NAME py-configparser FILENAME - py-configparser DEPS ((NAME parse-number FILENAME parse-number)) - DEPENDENCIES (parse-number) VERSION 20170830-svn SIBLINGS NIL PARASITES NIL) */ diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/pythonic-string-reader.nix b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/pythonic-string-reader.nix new file mode 100644 index 0000000000..ae810d3479 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/pythonic-string-reader.nix @@ -0,0 +1,29 @@ +args @ { fetchurl, ... }: +rec { + baseName = ''pythonic-string-reader''; + version = ''20180711-git''; + + description = ''A simple and unintrusive read table modification that allows for +simple string literal definition that doesn't require escaping characters.''; + + deps = [ args."named-readtables" ]; + + src = fetchurl { + url = ''http://beta.quicklisp.org/archive/pythonic-string-reader/2018-07-11/pythonic-string-reader-20180711-git.tgz''; + sha256 = ''0gr6sbkmfwca9r0xa5vczjm4s9psbrqy5hvijkp5g42b0b7x5myx''; + }; + + packageName = "pythonic-string-reader"; + + asdFilesToKeep = ["pythonic-string-reader.asd"]; + overrides = x: x; +} +/* (SYSTEM pythonic-string-reader DESCRIPTION + A simple and unintrusive read table modification that allows for +simple string literal definition that doesn't require escaping characters. + SHA256 0gr6sbkmfwca9r0xa5vczjm4s9psbrqy5hvijkp5g42b0b7x5myx URL + http://beta.quicklisp.org/archive/pythonic-string-reader/2018-07-11/pythonic-string-reader-20180711-git.tgz + MD5 8156636895b1148fad6e7bcedeb6b556 NAME pythonic-string-reader FILENAME + pythonic-string-reader DEPS + ((NAME named-readtables FILENAME named-readtables)) DEPENDENCIES + (named-readtables) VERSION 20180711-git SIBLINGS NIL PARASITES NIL) */ diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/qmynd.nix b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/qmynd.nix deleted file mode 100644 index 03d9600593..0000000000 --- a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/qmynd.nix +++ /dev/null @@ -1,42 +0,0 @@ -args @ { fetchurl, ... }: -{ - baseName = ''qmynd''; - version = ''20180131-git''; - - description = ''MySQL Native Driver''; - - deps = [ args."alexandria" args."asdf-finalizers" args."babel" args."bordeaux-threads" args."cffi" args."chipz" args."cl_plus_ssl" args."flexi-streams" args."ironclad" args."list-of" args."nibbles" args."salza2" args."split-sequence" args."trivial-features" args."trivial-garbage" args."trivial-gray-streams" args."usocket" ]; - - src = fetchurl { - url = ''http://beta.quicklisp.org/archive/qmynd/2018-01-31/qmynd-20180131-git.tgz''; - sha256 = ''1ripapyrpzp36wsb2xf8w63nf0cjc13xh6xx296p8wgi01jwm61c''; - }; - - packageName = "qmynd"; - - asdFilesToKeep = ["qmynd.asd"]; - overrides = x: x; -} -/* (SYSTEM qmynd DESCRIPTION MySQL Native Driver SHA256 - 1ripapyrpzp36wsb2xf8w63nf0cjc13xh6xx296p8wgi01jwm61c URL - http://beta.quicklisp.org/archive/qmynd/2018-01-31/qmynd-20180131-git.tgz - MD5 60177d28b1945234fd72760007194b3e NAME qmynd FILENAME qmynd DEPS - ((NAME alexandria FILENAME alexandria) - (NAME asdf-finalizers FILENAME asdf-finalizers) - (NAME babel FILENAME babel) - (NAME bordeaux-threads FILENAME bordeaux-threads) - (NAME cffi FILENAME cffi) (NAME chipz FILENAME chipz) - (NAME cl+ssl FILENAME cl_plus_ssl) - (NAME flexi-streams FILENAME flexi-streams) - (NAME ironclad FILENAME ironclad) (NAME list-of FILENAME list-of) - (NAME nibbles FILENAME nibbles) (NAME salza2 FILENAME salza2) - (NAME split-sequence FILENAME split-sequence) - (NAME trivial-features FILENAME trivial-features) - (NAME trivial-garbage FILENAME trivial-garbage) - (NAME trivial-gray-streams FILENAME trivial-gray-streams) - (NAME usocket FILENAME usocket)) - DEPENDENCIES - (alexandria asdf-finalizers babel bordeaux-threads cffi chipz cl+ssl - flexi-streams ironclad list-of nibbles salza2 split-sequence - trivial-features trivial-garbage trivial-gray-streams usocket) - VERSION 20180131-git SIBLINGS (qmynd-test) PARASITES NIL) */ diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/query-fs.nix b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/query-fs.nix index 3666dda9bf..06957e45f8 100644 --- a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/query-fs.nix +++ b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/query-fs.nix @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: rec { baseName = ''query-fs''; - version = ''20190521-git''; + version = ''20200610-git''; description = ''High-level virtual FS using CL-Fuse-Meta-FS to represent results of queries''; deps = [ args."alexandria" args."babel" args."bordeaux-threads" args."cffi" args."cffi-grovel" args."cffi-toolchain" args."cl-fuse" args."cl-fuse-meta-fs" args."cl-ppcre" args."cl-utilities" args."command-line-arguments" args."iterate" args."pcall" args."pcall-queue" args."trivial-backtrace" args."trivial-features" args."trivial-utf-8" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/query-fs/2019-05-21/query-fs-20190521-git.tgz''; - sha256 = ''1zz917yjjnjx09cl27793056262nz1jhikdaj1mxhgzm3w6ywf39''; + url = ''http://beta.quicklisp.org/archive/query-fs/2020-06-10/query-fs-20200610-git.tgz''; + sha256 = ''1kcq2xs5dqwbhapknrynanwqn3c9h4cpi7hf362il2p6v6y4r413''; }; packageName = "query-fs"; @@ -19,9 +19,9 @@ rec { } /* (SYSTEM query-fs DESCRIPTION High-level virtual FS using CL-Fuse-Meta-FS to represent results of queries - SHA256 1zz917yjjnjx09cl27793056262nz1jhikdaj1mxhgzm3w6ywf39 URL - http://beta.quicklisp.org/archive/query-fs/2019-05-21/query-fs-20190521-git.tgz - MD5 1108c91b69007c6ab35b42d70d4dd7a2 NAME query-fs FILENAME query-fs DEPS + SHA256 1kcq2xs5dqwbhapknrynanwqn3c9h4cpi7hf362il2p6v6y4r413 URL + http://beta.quicklisp.org/archive/query-fs/2020-06-10/query-fs-20200610-git.tgz + MD5 d30cbd09a2f326c95057b2c6537d5cdb NAME query-fs FILENAME query-fs DEPS ((NAME alexandria FILENAME alexandria) (NAME babel FILENAME babel) (NAME bordeaux-threads FILENAME bordeaux-threads) (NAME cffi FILENAME cffi) (NAME cffi-grovel FILENAME cffi-grovel) @@ -40,4 +40,4 @@ rec { (alexandria babel bordeaux-threads cffi cffi-grovel cffi-toolchain cl-fuse cl-fuse-meta-fs cl-ppcre cl-utilities command-line-arguments iterate pcall pcall-queue trivial-backtrace trivial-features trivial-utf-8) - VERSION 20190521-git SIBLINGS NIL PARASITES NIL) */ + VERSION 20200610-git SIBLINGS NIL PARASITES NIL) */ diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/quri.nix b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/quri.nix index 08d83d1bb2..1972f6b8d4 100644 --- a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/quri.nix +++ b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/quri.nix @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: rec { baseName = ''quri''; - version = ''20191130-git''; + version = ''20200610-git''; description = ''Yet another URI library for Common Lisp''; deps = [ args."alexandria" args."babel" args."cl-utilities" args."split-sequence" args."trivial-features" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/quri/2019-11-30/quri-20191130-git.tgz''; - sha256 = ''00j71xf4c81w4lby22w2nm508djj36z4v4g3k5qsw16ylf92pkbs''; + url = ''http://beta.quicklisp.org/archive/quri/2020-06-10/quri-20200610-git.tgz''; + sha256 = ''1qv8x1m6m70jczvydfq9ws5zw3jw6y74s607vfrqaf0ck5rrwsk6''; }; packageName = "quri"; @@ -18,13 +18,13 @@ rec { overrides = x: x; } /* (SYSTEM quri DESCRIPTION Yet another URI library for Common Lisp SHA256 - 00j71xf4c81w4lby22w2nm508djj36z4v4g3k5qsw16ylf92pkbs URL - http://beta.quicklisp.org/archive/quri/2019-11-30/quri-20191130-git.tgz MD5 - 4a3e8d2ebe459ea731738650c2c5bf56 NAME quri FILENAME quri DEPS + 1qv8x1m6m70jczvydfq9ws5zw3jw6y74s607vfrqaf0ck5rrwsk6 URL + http://beta.quicklisp.org/archive/quri/2020-06-10/quri-20200610-git.tgz MD5 + 409b559ce780952f1349b2abeaf47235 NAME quri FILENAME quri DEPS ((NAME alexandria FILENAME alexandria) (NAME babel FILENAME babel) (NAME cl-utilities FILENAME cl-utilities) (NAME split-sequence FILENAME split-sequence) (NAME trivial-features FILENAME trivial-features)) DEPENDENCIES (alexandria babel cl-utilities split-sequence trivial-features) VERSION - 20191130-git SIBLINGS (quri-test) PARASITES NIL) */ + 20200610-git SIBLINGS (quri-test) PARASITES NIL) */ diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/rove.nix b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/rove.nix index 53a1d41a7b..b3fc3b0cd2 100644 --- a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/rove.nix +++ b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/rove.nix @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: rec { baseName = ''rove''; - version = ''20191007-git''; + version = ''20200325-git''; description = ''Yet another testing framework intended to be a successor of Prove''; deps = [ args."bordeaux-threads" args."dissect" args."trivial-gray-streams" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/rove/2019-10-07/rove-20191007-git.tgz''; - sha256 = ''0ngklk69rn13qgsy9h07sqfqzyl1wqsfrp7izx6whgs62bm0vixa''; + url = ''http://beta.quicklisp.org/archive/rove/2020-03-25/rove-20200325-git.tgz''; + sha256 = ''0zn8d3408rgy2nibia5hdfbf80ix1fgssywx01izx7z99l5x50z5''; }; packageName = "rove"; @@ -19,11 +19,11 @@ rec { } /* (SYSTEM rove DESCRIPTION Yet another testing framework intended to be a successor of Prove SHA256 - 0ngklk69rn13qgsy9h07sqfqzyl1wqsfrp7izx6whgs62bm0vixa URL - http://beta.quicklisp.org/archive/rove/2019-10-07/rove-20191007-git.tgz MD5 - 7ce5d3b0b423f8b68665bbcc51cf18a1 NAME rove FILENAME rove DEPS + 0zn8d3408rgy2nibia5hdfbf80ix1fgssywx01izx7z99l5x50z5 URL + http://beta.quicklisp.org/archive/rove/2020-03-25/rove-20200325-git.tgz MD5 + 7954cb65830d62142babecebf20d0226 NAME rove FILENAME rove DEPS ((NAME bordeaux-threads FILENAME bordeaux-threads) (NAME dissect FILENAME dissect) (NAME trivial-gray-streams FILENAME trivial-gray-streams)) DEPENDENCIES (bordeaux-threads dissect trivial-gray-streams) VERSION - 20191007-git SIBLINGS NIL PARASITES NIL) */ + 20200325-git SIBLINGS NIL PARASITES NIL) */ diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/s-sql.nix b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/s-sql.nix index 92fa577945..1f896dc415 100644 --- a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/s-sql.nix +++ b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/s-sql.nix @@ -1,17 +1,17 @@ args @ { fetchurl, ... }: -{ +rec { baseName = ''s-sql''; - version = ''postmodern-20180430-git''; + version = ''postmodern-20201016-git''; parasites = [ "s-sql/tests" ]; - description = ''''; + description = ''Lispy DSL for SQL''; - deps = [ args."bordeaux-threads" args."cl-postgres" args."cl-postgres_slash_tests" args."closer-mop" args."fiveam" args."md5" args."postmodern" args."split-sequence" args."usocket" ]; + deps = [ args."alexandria" args."bordeaux-threads" args."cl-base64" args."cl-postgres" args."cl-postgres_slash_tests" args."cl-ppcre" args."cl-unicode" args."closer-mop" args."fiveam" args."global-vars" args."ironclad" args."md5" args."postmodern" args."split-sequence" args."uax-15" args."usocket" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/postmodern/2018-04-30/postmodern-20180430-git.tgz''; - sha256 = ''0b6w8f5ihbk036v1fclyskns615xhnib9q3cjn0ql6r6sk3nca7f''; + url = ''http://beta.quicklisp.org/archive/postmodern/2020-10-16/postmodern-20201016-git.tgz''; + sha256 = ''1svaiksbqcaq8sh7q6sj9kzazdfl360zqr2nzhwbgy4xnaj4vf3n''; }; packageName = "s-sql"; @@ -19,19 +19,24 @@ args @ { fetchurl, ... }: asdFilesToKeep = ["s-sql.asd"]; overrides = x: x; } -/* (SYSTEM s-sql DESCRIPTION NIL SHA256 - 0b6w8f5ihbk036v1fclyskns615xhnib9q3cjn0ql6r6sk3nca7f URL - http://beta.quicklisp.org/archive/postmodern/2018-04-30/postmodern-20180430-git.tgz - MD5 9ca2a4ccf4ea7dbcd14d69cb355a8214 NAME s-sql FILENAME s-sql DEPS - ((NAME bordeaux-threads FILENAME bordeaux-threads) +/* (SYSTEM s-sql DESCRIPTION Lispy DSL for SQL SHA256 + 1svaiksbqcaq8sh7q6sj9kzazdfl360zqr2nzhwbgy4xnaj4vf3n URL + http://beta.quicklisp.org/archive/postmodern/2020-10-16/postmodern-20201016-git.tgz + MD5 f61e827d7e7ba023f6fbc7c2667de4c8 NAME s-sql FILENAME s-sql DEPS + ((NAME alexandria FILENAME alexandria) + (NAME bordeaux-threads FILENAME bordeaux-threads) + (NAME cl-base64 FILENAME cl-base64) (NAME cl-postgres FILENAME cl-postgres) (NAME cl-postgres/tests FILENAME cl-postgres_slash_tests) + (NAME cl-ppcre FILENAME cl-ppcre) (NAME cl-unicode FILENAME cl-unicode) (NAME closer-mop FILENAME closer-mop) (NAME fiveam FILENAME fiveam) + (NAME global-vars FILENAME global-vars) (NAME ironclad FILENAME ironclad) (NAME md5 FILENAME md5) (NAME postmodern FILENAME postmodern) (NAME split-sequence FILENAME split-sequence) - (NAME usocket FILENAME usocket)) + (NAME uax-15 FILENAME uax-15) (NAME usocket FILENAME usocket)) DEPENDENCIES - (bordeaux-threads cl-postgres cl-postgres/tests closer-mop fiveam md5 - postmodern split-sequence usocket) - VERSION postmodern-20180430-git SIBLINGS + (alexandria bordeaux-threads cl-base64 cl-postgres cl-postgres/tests + cl-ppcre cl-unicode closer-mop fiveam global-vars ironclad md5 postmodern + split-sequence uax-15 usocket) + VERSION postmodern-20201016-git SIBLINGS (cl-postgres postmodern simple-date) PARASITES (s-sql/tests)) */ diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/s-sysdeps.nix b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/s-sysdeps.nix index 1c28ec6e2a..b35f44067d 100644 --- a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/s-sysdeps.nix +++ b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/s-sysdeps.nix @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: rec { baseName = ''s-sysdeps''; - version = ''20130128-git''; + version = ''20200427-git''; description = ''An abstraction layer over platform dependent functionality''; - deps = [ ]; + deps = [ args."alexandria" args."bordeaux-threads" args."split-sequence" args."usocket" args."usocket-server" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/s-sysdeps/2013-01-28/s-sysdeps-20130128-git.tgz''; - sha256 = ''048q0mzypnm284bvv7036d4z7bv7rdcqks5l372s74kq279l2y00''; + url = ''http://beta.quicklisp.org/archive/s-sysdeps/2020-04-27/s-sysdeps-20200427-git.tgz''; + sha256 = ''04dhi0mibqz4i1jly9i6lrd9lf93i25k2f0hba1sqis3x6sm38zy''; }; packageName = "s-sysdeps"; @@ -19,7 +19,14 @@ rec { } /* (SYSTEM s-sysdeps DESCRIPTION An abstraction layer over platform dependent functionality SHA256 - 048q0mzypnm284bvv7036d4z7bv7rdcqks5l372s74kq279l2y00 URL - http://beta.quicklisp.org/archive/s-sysdeps/2013-01-28/s-sysdeps-20130128-git.tgz - MD5 2fe61fadafd62ef9597e17b4783889ef NAME s-sysdeps FILENAME s-sysdeps DEPS - NIL DEPENDENCIES NIL VERSION 20130128-git SIBLINGS NIL PARASITES NIL) */ + 04dhi0mibqz4i1jly9i6lrd9lf93i25k2f0hba1sqis3x6sm38zy URL + http://beta.quicklisp.org/archive/s-sysdeps/2020-04-27/s-sysdeps-20200427-git.tgz + MD5 2dc062fc985cd3063ef3eddfc544e578 NAME s-sysdeps FILENAME s-sysdeps DEPS + ((NAME alexandria FILENAME alexandria) + (NAME bordeaux-threads FILENAME bordeaux-threads) + (NAME split-sequence FILENAME split-sequence) + (NAME usocket FILENAME usocket) + (NAME usocket-server FILENAME usocket-server)) + DEPENDENCIES + (alexandria bordeaux-threads split-sequence usocket usocket-server) VERSION + 20200427-git SIBLINGS NIL PARASITES NIL) */ diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/serapeum.nix b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/serapeum.nix index b67bf001b2..85d85463c3 100644 --- a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/serapeum.nix +++ b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/serapeum.nix @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: rec { baseName = ''serapeum''; - version = ''20191227-git''; + version = ''20201016-git''; description = ''Utilities beyond Alexandria.''; - deps = [ args."alexandria" args."bordeaux-threads" args."closer-mop" args."fare-quasiquote" args."fare-quasiquote-extras" args."fare-quasiquote-optima" args."fare-quasiquote-readtable" args."fare-utils" args."global-vars" args."introspect-environment" args."iterate" args."lisp-namespace" args."named-readtables" args."optima" args."parse-declarations-1_dot_0" args."parse-number" args."split-sequence" args."string-case" args."trivia" args."trivia_dot_balland2006" args."trivia_dot_level0" args."trivia_dot_level1" args."trivia_dot_level2" args."trivia_dot_quasiquote" args."trivia_dot_trivial" args."trivial-cltl2" args."trivial-file-size" args."trivial-garbage" args."trivial-macroexpand-all" args."type-i" args."uiop" ]; + deps = [ args."alexandria" args."bordeaux-threads" args."closer-mop" args."fare-quasiquote" args."fare-quasiquote-extras" args."fare-quasiquote-optima" args."fare-quasiquote-readtable" args."fare-utils" args."global-vars" args."introspect-environment" args."iterate" args."lisp-namespace" args."named-readtables" args."parse-declarations-1_dot_0" args."parse-number" args."split-sequence" args."string-case" args."trivia" args."trivia_dot_balland2006" args."trivia_dot_level0" args."trivia_dot_level1" args."trivia_dot_level2" args."trivia_dot_quasiquote" args."trivia_dot_trivial" args."trivial-cltl2" args."trivial-file-size" args."trivial-garbage" args."trivial-macroexpand-all" args."type-i" args."uiop" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/serapeum/2019-12-27/serapeum-20191227-git.tgz''; - sha256 = ''1d1yyzj1m0fqlr6dvq7njmkl1zdkj00jbd09l281971qwhfhmarr''; + url = ''http://beta.quicklisp.org/archive/serapeum/2020-10-16/serapeum-20201016-git.tgz''; + sha256 = ''0rbxa0r75jxkhisyjwjh7zn7m1450k58sc9g68bgkj0fsjvr44sq''; }; packageName = "serapeum"; @@ -18,9 +18,9 @@ rec { overrides = x: x; } /* (SYSTEM serapeum DESCRIPTION Utilities beyond Alexandria. SHA256 - 1d1yyzj1m0fqlr6dvq7njmkl1zdkj00jbd09l281971qwhfhmarr URL - http://beta.quicklisp.org/archive/serapeum/2019-12-27/serapeum-20191227-git.tgz - MD5 dabf40eb6c6af7509da66450790cbf4e NAME serapeum FILENAME serapeum DEPS + 0rbxa0r75jxkhisyjwjh7zn7m1450k58sc9g68bgkj0fsjvr44sq URL + http://beta.quicklisp.org/archive/serapeum/2020-10-16/serapeum-20201016-git.tgz + MD5 1281652013f4ef5a67ffd5c6e8d44fe9 NAME serapeum FILENAME serapeum DEPS ((NAME alexandria FILENAME alexandria) (NAME bordeaux-threads FILENAME bordeaux-threads) (NAME closer-mop FILENAME closer-mop) @@ -34,7 +34,6 @@ rec { (NAME iterate FILENAME iterate) (NAME lisp-namespace FILENAME lisp-namespace) (NAME named-readtables FILENAME named-readtables) - (NAME optima FILENAME optima) (NAME parse-declarations-1.0 FILENAME parse-declarations-1_dot_0) (NAME parse-number FILENAME parse-number) (NAME split-sequence FILENAME split-sequence) @@ -54,8 +53,8 @@ rec { (alexandria bordeaux-threads closer-mop fare-quasiquote fare-quasiquote-extras fare-quasiquote-optima fare-quasiquote-readtable fare-utils global-vars introspect-environment iterate lisp-namespace - named-readtables optima parse-declarations-1.0 parse-number split-sequence + named-readtables parse-declarations-1.0 parse-number split-sequence string-case trivia trivia.balland2006 trivia.level0 trivia.level1 trivia.level2 trivia.quasiquote trivia.trivial trivial-cltl2 trivial-file-size trivial-garbage trivial-macroexpand-all type-i uiop) - VERSION 20191227-git SIBLINGS NIL PARASITES NIL) */ + VERSION 20201016-git SIBLINGS NIL PARASITES NIL) */ diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/simple-date-time.nix b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/simple-date-time.nix new file mode 100644 index 0000000000..1f2759cf38 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/simple-date-time.nix @@ -0,0 +1,25 @@ +args @ { fetchurl, ... }: +rec { + baseName = ''simple-date-time''; + version = ''20160421-git''; + + description = ''date and time library for common lisp''; + + deps = [ args."cl-ppcre" ]; + + src = fetchurl { + url = ''http://beta.quicklisp.org/archive/simple-date-time/2016-04-21/simple-date-time-20160421-git.tgz''; + sha256 = ''1db9n7pspxkqkzz12829a1lp7v4ghrnlb7g3wh04yz6m224d3i4h''; + }; + + packageName = "simple-date-time"; + + asdFilesToKeep = ["simple-date-time.asd"]; + overrides = x: x; +} +/* (SYSTEM simple-date-time DESCRIPTION date and time library for common lisp + SHA256 1db9n7pspxkqkzz12829a1lp7v4ghrnlb7g3wh04yz6m224d3i4h URL + http://beta.quicklisp.org/archive/simple-date-time/2016-04-21/simple-date-time-20160421-git.tgz + MD5 a5b1e4af539646723dafacbc8cf732a0 NAME simple-date-time FILENAME + simple-date-time DEPS ((NAME cl-ppcre FILENAME cl-ppcre)) DEPENDENCIES + (cl-ppcre) VERSION 20160421-git SIBLINGS NIL PARASITES NIL) */ diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/simple-date.nix b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/simple-date.nix index ccf102aaad..55671ce133 100644 --- a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/simple-date.nix +++ b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/simple-date.nix @@ -1,17 +1,17 @@ args @ { fetchurl, ... }: rec { baseName = ''simple-date''; - version = ''postmodern-20191227-git''; + version = ''postmodern-20201016-git''; - parasites = [ "simple-date/postgres-glue" "simple-date/tests" ]; + parasites = [ "simple-date/tests" ]; - description = ''System lacks description''; + description = ''Simple date library that can be used with postmodern''; - deps = [ args."cl-postgres" args."fiveam" args."md5" args."usocket" ]; + deps = [ args."fiveam" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/postmodern/2019-12-27/postmodern-20191227-git.tgz''; - sha256 = ''1p44aphx7y0lh018pk2r9w006vinc5yrfrp1m9l9648p2jxiw1c4''; + url = ''http://beta.quicklisp.org/archive/postmodern/2020-10-16/postmodern-20201016-git.tgz''; + sha256 = ''1svaiksbqcaq8sh7q6sj9kzazdfl360zqr2nzhwbgy4xnaj4vf3n''; }; packageName = "simple-date"; @@ -19,13 +19,11 @@ rec { asdFilesToKeep = ["simple-date.asd"]; overrides = x: x; } -/* (SYSTEM simple-date DESCRIPTION System lacks description SHA256 - 1p44aphx7y0lh018pk2r9w006vinc5yrfrp1m9l9648p2jxiw1c4 URL - http://beta.quicklisp.org/archive/postmodern/2019-12-27/postmodern-20191227-git.tgz - MD5 67b909de432e6414e7832eed18f9ad18 NAME simple-date FILENAME simple-date - DEPS - ((NAME cl-postgres FILENAME cl-postgres) (NAME fiveam FILENAME fiveam) - (NAME md5 FILENAME md5) (NAME usocket FILENAME usocket)) - DEPENDENCIES (cl-postgres fiveam md5 usocket) VERSION - postmodern-20191227-git SIBLINGS (cl-postgres postmodern s-sql) PARASITES - (simple-date/postgres-glue simple-date/tests)) */ +/* (SYSTEM simple-date DESCRIPTION + Simple date library that can be used with postmodern SHA256 + 1svaiksbqcaq8sh7q6sj9kzazdfl360zqr2nzhwbgy4xnaj4vf3n URL + http://beta.quicklisp.org/archive/postmodern/2020-10-16/postmodern-20201016-git.tgz + MD5 f61e827d7e7ba023f6fbc7c2667de4c8 NAME simple-date FILENAME simple-date + DEPS ((NAME fiveam FILENAME fiveam)) DEPENDENCIES (fiveam) VERSION + postmodern-20201016-git SIBLINGS (cl-postgres postmodern s-sql) PARASITES + (simple-date/tests)) */ diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/simple-tasks.nix b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/simple-tasks.nix new file mode 100644 index 0000000000..55d35ba8c0 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/simple-tasks.nix @@ -0,0 +1,30 @@ +args @ { fetchurl, ... }: +rec { + baseName = ''simple-tasks''; + version = ''20190710-git''; + + description = ''A very simple task scheduling framework.''; + + deps = [ args."alexandria" args."array-utils" args."bordeaux-threads" args."dissect" ]; + + src = fetchurl { + url = ''http://beta.quicklisp.org/archive/simple-tasks/2019-07-10/simple-tasks-20190710-git.tgz''; + sha256 = ''12y5phnbj9s2fsrz1ab6xj857zf1fv8kjk7jj2mdjs6k2d8gk8v3''; + }; + + packageName = "simple-tasks"; + + asdFilesToKeep = ["simple-tasks.asd"]; + overrides = x: x; +} +/* (SYSTEM simple-tasks DESCRIPTION A very simple task scheduling framework. + SHA256 12y5phnbj9s2fsrz1ab6xj857zf1fv8kjk7jj2mdjs6k2d8gk8v3 URL + http://beta.quicklisp.org/archive/simple-tasks/2019-07-10/simple-tasks-20190710-git.tgz + MD5 8e88a9a762bc8691f92217d256baa55e NAME simple-tasks FILENAME + simple-tasks DEPS + ((NAME alexandria FILENAME alexandria) + (NAME array-utils FILENAME array-utils) + (NAME bordeaux-threads FILENAME bordeaux-threads) + (NAME dissect FILENAME dissect)) + DEPENDENCIES (alexandria array-utils bordeaux-threads dissect) VERSION + 20190710-git SIBLINGS NIL PARASITES NIL) */ diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/static-vectors.nix b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/static-vectors.nix index 7dc242858c..7a84f07771 100644 --- a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/static-vectors.nix +++ b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/static-vectors.nix @@ -1,7 +1,7 @@ args @ { fetchurl, ... }: rec { baseName = ''static-vectors''; - version = ''v1.8.4''; + version = ''v1.8.6''; parasites = [ "static-vectors/test" ]; @@ -10,8 +10,8 @@ rec { deps = [ args."alexandria" args."babel" args."cffi" args."cffi-grovel" args."cffi-toolchain" args."fiveam" args."trivial-features" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/static-vectors/2019-11-30/static-vectors-v1.8.4.tgz''; - sha256 = ''07z3nrsf5ds5iqilpi8awfk5flgy0k58znnn94xlx82hznw4hwxp''; + url = ''http://beta.quicklisp.org/archive/static-vectors/2020-06-10/static-vectors-v1.8.6.tgz''; + sha256 = ''0s549cxd8a8ix6jl4dfxj2nh01nl9f4hgnlmb88w7iixanxn58mc''; }; packageName = "static-vectors"; @@ -21,9 +21,9 @@ rec { } /* (SYSTEM static-vectors DESCRIPTION Create vectors allocated in static memory. SHA256 - 07z3nrsf5ds5iqilpi8awfk5flgy0k58znnn94xlx82hznw4hwxp URL - http://beta.quicklisp.org/archive/static-vectors/2019-11-30/static-vectors-v1.8.4.tgz - MD5 401085c3ec0edc3ab47409e5a4b534c7 NAME static-vectors FILENAME + 0s549cxd8a8ix6jl4dfxj2nh01nl9f4hgnlmb88w7iixanxn58mc URL + http://beta.quicklisp.org/archive/static-vectors/2020-06-10/static-vectors-v1.8.6.tgz + MD5 c817377fc6807d9c7bee6bd8996068b5 NAME static-vectors FILENAME static-vectors DEPS ((NAME alexandria FILENAME alexandria) (NAME babel FILENAME babel) (NAME cffi FILENAME cffi) (NAME cffi-grovel FILENAME cffi-grovel) @@ -32,4 +32,4 @@ rec { (NAME trivial-features FILENAME trivial-features)) DEPENDENCIES (alexandria babel cffi cffi-grovel cffi-toolchain fiveam trivial-features) - VERSION v1.8.4 SIBLINGS NIL PARASITES (static-vectors/test)) */ + VERSION v1.8.6 SIBLINGS NIL PARASITES (static-vectors/test)) */ diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/str.nix b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/str.nix index bb54244383..1109c9da04 100644 --- a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/str.nix +++ b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/str.nix @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: rec { baseName = ''str''; - version = ''cl-20191227-git''; + version = ''cl-20200925-git''; description = ''Modern, consistent and terse Common Lisp string manipulation library.''; deps = [ args."cl-change-case" args."cl-ppcre" args."cl-ppcre-unicode" args."cl-unicode" args."flexi-streams" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/cl-str/2019-12-27/cl-str-20191227-git.tgz''; - sha256 = ''0dakksvrd6s96szwhwd89i0hy9mjff2vck30bdnvb6prkwg2c2g6''; + url = ''http://beta.quicklisp.org/archive/cl-str/2020-09-25/cl-str-20200925-git.tgz''; + sha256 = ''06k81x80vjw7qd8gca6lnm5k5ws40c6kl99s7m4z72v7jxwa9ykn''; }; packageName = "str"; @@ -19,9 +19,9 @@ rec { } /* (SYSTEM str DESCRIPTION Modern, consistent and terse Common Lisp string manipulation library. - SHA256 0dakksvrd6s96szwhwd89i0hy9mjff2vck30bdnvb6prkwg2c2g6 URL - http://beta.quicklisp.org/archive/cl-str/2019-12-27/cl-str-20191227-git.tgz - MD5 b2800b32209061b274432c7e699d92b4 NAME str FILENAME str DEPS + SHA256 06k81x80vjw7qd8gca6lnm5k5ws40c6kl99s7m4z72v7jxwa9ykn URL + http://beta.quicklisp.org/archive/cl-str/2020-09-25/cl-str-20200925-git.tgz + MD5 885f94c2be768818ca2fd5e5d562b789 NAME str FILENAME str DEPS ((NAME cl-change-case FILENAME cl-change-case) (NAME cl-ppcre FILENAME cl-ppcre) (NAME cl-ppcre-unicode FILENAME cl-ppcre-unicode) @@ -29,4 +29,4 @@ rec { (NAME flexi-streams FILENAME flexi-streams)) DEPENDENCIES (cl-change-case cl-ppcre cl-ppcre-unicode cl-unicode flexi-streams) VERSION - cl-20191227-git SIBLINGS (str.test) PARASITES NIL) */ + cl-20200925-git SIBLINGS (str.test) PARASITES NIL) */ diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/stumpwm.nix b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/stumpwm.nix index a90e497d44..2ad15d1bd1 100644 --- a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/stumpwm.nix +++ b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/stumpwm.nix @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: rec { baseName = ''stumpwm''; - version = ''20191227-git''; + version = ''20201016-git''; description = ''A tiling, keyboard driven window manager''; deps = [ args."alexandria" args."cl-ppcre" args."clx" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/stumpwm/2019-12-27/stumpwm-20191227-git.tgz''; - sha256 = ''1dlw4y1mpsmgx7r0mdiccvnv56xpbq0rigyb2n04kq4hkp7zj6rm''; + url = ''http://beta.quicklisp.org/archive/stumpwm/2020-10-16/stumpwm-20201016-git.tgz''; + sha256 = ''06lc1d9y83x0ckqd9pls7a1dyriz650mpv1rigncr02qsj3aqpp2''; }; packageName = "stumpwm"; @@ -18,10 +18,10 @@ rec { overrides = x: x; } /* (SYSTEM stumpwm DESCRIPTION A tiling, keyboard driven window manager SHA256 - 1dlw4y1mpsmgx7r0mdiccvnv56xpbq0rigyb2n04kq4hkp7zj6rm URL - http://beta.quicklisp.org/archive/stumpwm/2019-12-27/stumpwm-20191227-git.tgz - MD5 247f56ddbdc8bdf4cf087a467ddce6f6 NAME stumpwm FILENAME stumpwm DEPS + 06lc1d9y83x0ckqd9pls7a1dyriz650mpv1rigncr02qsj3aqpp2 URL + http://beta.quicklisp.org/archive/stumpwm/2020-10-16/stumpwm-20201016-git.tgz + MD5 fe99208b03be907ad75b0ed388e171c3 NAME stumpwm FILENAME stumpwm DEPS ((NAME alexandria FILENAME alexandria) (NAME cl-ppcre FILENAME cl-ppcre) (NAME clx FILENAME clx)) - DEPENDENCIES (alexandria cl-ppcre clx) VERSION 20191227-git SIBLINGS + DEPENDENCIES (alexandria cl-ppcre clx) VERSION 20201016-git SIBLINGS (stumpwm-tests) PARASITES NIL) */ diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/swank.nix b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/swank.nix index 50b815425d..69deb9044c 100644 --- a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/swank.nix +++ b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/swank.nix @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: rec { baseName = ''swank''; - version = ''slime-v2.24''; + version = ''slime-v2.26''; description = ''System lacks description''; deps = [ ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/slime/2019-07-10/slime-v2.24.tgz''; - sha256 = ''0gsq3i5818iwfbh710lf96kb66q3ap3qvvkcj06zyfh30n50x1g6''; + url = ''http://beta.quicklisp.org/archive/slime/2020-09-25/slime-v2.26.tgz''; + sha256 = ''0zba4vm73g9zamhqkqcb0prm51kf4clixm2rjz89mq180qa7rrqc''; }; packageName = "swank"; @@ -18,7 +18,7 @@ rec { overrides = x: x; } /* (SYSTEM swank DESCRIPTION System lacks description SHA256 - 0gsq3i5818iwfbh710lf96kb66q3ap3qvvkcj06zyfh30n50x1g6 URL - http://beta.quicklisp.org/archive/slime/2019-07-10/slime-v2.24.tgz MD5 - 05f421f7a9dffa4ba206c548524ef1c0 NAME swank FILENAME swank DEPS NIL - DEPENDENCIES NIL VERSION slime-v2.24 SIBLINGS NIL PARASITES NIL) */ + 0zba4vm73g9zamhqkqcb0prm51kf4clixm2rjz89mq180qa7rrqc URL + http://beta.quicklisp.org/archive/slime/2020-09-25/slime-v2.26.tgz MD5 + 8f18fbb04ca96733f683c863b44af484 NAME swank FILENAME swank DEPS NIL + DEPENDENCIES NIL VERSION slime-v2.26 SIBLINGS NIL PARASITES NIL) */ diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivia.nix b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivia.nix index 3051d3cd5a..141937219c 100644 --- a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivia.nix +++ b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivia.nix @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: rec { baseName = ''trivia''; - version = ''20191227-git''; + version = ''20200925-git''; description = ''NON-optimized pattern matcher compatible with OPTIMA, with extensible optimizer interface and clean codebase''; deps = [ args."alexandria" args."closer-mop" args."introspect-environment" args."iterate" args."lisp-namespace" args."trivia_dot_balland2006" args."trivia_dot_level0" args."trivia_dot_level1" args."trivia_dot_level2" args."trivia_dot_trivial" args."trivial-cltl2" args."type-i" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/trivia/2019-12-27/trivia-20191227-git.tgz''; - sha256 = ''1hn6klc2jlh2qhlc4zr9fi02kqlyfyh5bkcgirql1m06g4j8qi4q''; + url = ''http://beta.quicklisp.org/archive/trivia/2020-09-25/trivia-20200925-git.tgz''; + sha256 = ''192306pdx50nikph36swipdy2xz1jqrr8p9c3bi91m8qws75wi4z''; }; packageName = "trivia"; @@ -19,9 +19,9 @@ rec { } /* (SYSTEM trivia DESCRIPTION NON-optimized pattern matcher compatible with OPTIMA, with extensible optimizer interface and clean codebase - SHA256 1hn6klc2jlh2qhlc4zr9fi02kqlyfyh5bkcgirql1m06g4j8qi4q URL - http://beta.quicklisp.org/archive/trivia/2019-12-27/trivia-20191227-git.tgz - MD5 645f0e0fcf57ab37ebd4f0a1b7b05854 NAME trivia FILENAME trivia DEPS + SHA256 192306pdx50nikph36swipdy2xz1jqrr8p9c3bi91m8qws75wi4z URL + http://beta.quicklisp.org/archive/trivia/2020-09-25/trivia-20200925-git.tgz + MD5 c6546ecf272e52e051a9d3946242511b NAME trivia FILENAME trivia DEPS ((NAME alexandria FILENAME alexandria) (NAME closer-mop FILENAME closer-mop) (NAME introspect-environment FILENAME introspect-environment) @@ -37,7 +37,7 @@ rec { (alexandria closer-mop introspect-environment iterate lisp-namespace trivia.balland2006 trivia.level0 trivia.level1 trivia.level2 trivia.trivial trivial-cltl2 type-i) - VERSION 20191227-git SIBLINGS + VERSION 20200925-git SIBLINGS (trivia.balland2006 trivia.benchmark trivia.cffi trivia.level0 trivia.level1 trivia.level2 trivia.ppcre trivia.quasiquote trivia.test trivia.trivial) diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivia_dot_balland2006.nix b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivia_dot_balland2006.nix index 1559589c9c..6b5e161a21 100644 --- a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivia_dot_balland2006.nix +++ b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivia_dot_balland2006.nix @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: rec { baseName = ''trivia_dot_balland2006''; - version = ''trivia-20191227-git''; + version = ''trivia-20200925-git''; description = ''Optimizer for Trivia based on (Balland 2006)''; deps = [ args."alexandria" args."closer-mop" args."introspect-environment" args."iterate" args."lisp-namespace" args."trivia_dot_level0" args."trivia_dot_level1" args."trivia_dot_level2" args."trivia_dot_trivial" args."trivial-cltl2" args."type-i" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/trivia/2019-12-27/trivia-20191227-git.tgz''; - sha256 = ''1hn6klc2jlh2qhlc4zr9fi02kqlyfyh5bkcgirql1m06g4j8qi4q''; + url = ''http://beta.quicklisp.org/archive/trivia/2020-09-25/trivia-20200925-git.tgz''; + sha256 = ''192306pdx50nikph36swipdy2xz1jqrr8p9c3bi91m8qws75wi4z''; }; packageName = "trivia.balland2006"; @@ -19,9 +19,9 @@ rec { } /* (SYSTEM trivia.balland2006 DESCRIPTION Optimizer for Trivia based on (Balland 2006) SHA256 - 1hn6klc2jlh2qhlc4zr9fi02kqlyfyh5bkcgirql1m06g4j8qi4q URL - http://beta.quicklisp.org/archive/trivia/2019-12-27/trivia-20191227-git.tgz - MD5 645f0e0fcf57ab37ebd4f0a1b7b05854 NAME trivia.balland2006 FILENAME + 192306pdx50nikph36swipdy2xz1jqrr8p9c3bi91m8qws75wi4z URL + http://beta.quicklisp.org/archive/trivia/2020-09-25/trivia-20200925-git.tgz + MD5 c6546ecf272e52e051a9d3946242511b NAME trivia.balland2006 FILENAME trivia_dot_balland2006 DEPS ((NAME alexandria FILENAME alexandria) (NAME closer-mop FILENAME closer-mop) @@ -37,7 +37,7 @@ rec { (alexandria closer-mop introspect-environment iterate lisp-namespace trivia.level0 trivia.level1 trivia.level2 trivia.trivial trivial-cltl2 type-i) - VERSION trivia-20191227-git SIBLINGS + VERSION trivia-20200925-git SIBLINGS (trivia trivia.benchmark trivia.cffi trivia.level0 trivia.level1 trivia.level2 trivia.ppcre trivia.quasiquote trivia.test trivia.trivial) PARASITES NIL) */ diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivia_dot_level0.nix b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivia_dot_level0.nix index 7d38ca2f2d..1c883c07ab 100644 --- a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivia_dot_level0.nix +++ b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivia_dot_level0.nix @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: rec { baseName = ''trivia_dot_level0''; - version = ''trivia-20191227-git''; + version = ''trivia-20200925-git''; description = ''Bootstrapping Pattern Matching Library for implementing Trivia''; deps = [ args."alexandria" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/trivia/2019-12-27/trivia-20191227-git.tgz''; - sha256 = ''1hn6klc2jlh2qhlc4zr9fi02kqlyfyh5bkcgirql1m06g4j8qi4q''; + url = ''http://beta.quicklisp.org/archive/trivia/2020-09-25/trivia-20200925-git.tgz''; + sha256 = ''192306pdx50nikph36swipdy2xz1jqrr8p9c3bi91m8qws75wi4z''; }; packageName = "trivia.level0"; @@ -19,11 +19,11 @@ rec { } /* (SYSTEM trivia.level0 DESCRIPTION Bootstrapping Pattern Matching Library for implementing Trivia SHA256 - 1hn6klc2jlh2qhlc4zr9fi02kqlyfyh5bkcgirql1m06g4j8qi4q URL - http://beta.quicklisp.org/archive/trivia/2019-12-27/trivia-20191227-git.tgz - MD5 645f0e0fcf57ab37ebd4f0a1b7b05854 NAME trivia.level0 FILENAME + 192306pdx50nikph36swipdy2xz1jqrr8p9c3bi91m8qws75wi4z URL + http://beta.quicklisp.org/archive/trivia/2020-09-25/trivia-20200925-git.tgz + MD5 c6546ecf272e52e051a9d3946242511b NAME trivia.level0 FILENAME trivia_dot_level0 DEPS ((NAME alexandria FILENAME alexandria)) DEPENDENCIES - (alexandria) VERSION trivia-20191227-git SIBLINGS + (alexandria) VERSION trivia-20200925-git SIBLINGS (trivia trivia.balland2006 trivia.benchmark trivia.cffi trivia.level1 trivia.level2 trivia.ppcre trivia.quasiquote trivia.test trivia.trivial) PARASITES NIL) */ diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivia_dot_level1.nix b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivia_dot_level1.nix index 66c38c0d10..1e9394d644 100644 --- a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivia_dot_level1.nix +++ b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivia_dot_level1.nix @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: rec { baseName = ''trivia_dot_level1''; - version = ''trivia-20191227-git''; + version = ''trivia-20200925-git''; description = ''Core patterns of Trivia''; deps = [ args."alexandria" args."trivia_dot_level0" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/trivia/2019-12-27/trivia-20191227-git.tgz''; - sha256 = ''1hn6klc2jlh2qhlc4zr9fi02kqlyfyh5bkcgirql1m06g4j8qi4q''; + url = ''http://beta.quicklisp.org/archive/trivia/2020-09-25/trivia-20200925-git.tgz''; + sha256 = ''192306pdx50nikph36swipdy2xz1jqrr8p9c3bi91m8qws75wi4z''; }; packageName = "trivia.level1"; @@ -18,13 +18,13 @@ rec { overrides = x: x; } /* (SYSTEM trivia.level1 DESCRIPTION Core patterns of Trivia SHA256 - 1hn6klc2jlh2qhlc4zr9fi02kqlyfyh5bkcgirql1m06g4j8qi4q URL - http://beta.quicklisp.org/archive/trivia/2019-12-27/trivia-20191227-git.tgz - MD5 645f0e0fcf57ab37ebd4f0a1b7b05854 NAME trivia.level1 FILENAME + 192306pdx50nikph36swipdy2xz1jqrr8p9c3bi91m8qws75wi4z URL + http://beta.quicklisp.org/archive/trivia/2020-09-25/trivia-20200925-git.tgz + MD5 c6546ecf272e52e051a9d3946242511b NAME trivia.level1 FILENAME trivia_dot_level1 DEPS ((NAME alexandria FILENAME alexandria) (NAME trivia.level0 FILENAME trivia_dot_level0)) - DEPENDENCIES (alexandria trivia.level0) VERSION trivia-20191227-git + DEPENDENCIES (alexandria trivia.level0) VERSION trivia-20200925-git SIBLINGS (trivia trivia.balland2006 trivia.benchmark trivia.cffi trivia.level0 trivia.level2 trivia.ppcre trivia.quasiquote trivia.test trivia.trivial) diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivia_dot_level2.nix b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivia_dot_level2.nix index 1df169d4ab..75ee2bd8ee 100644 --- a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivia_dot_level2.nix +++ b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivia_dot_level2.nix @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: rec { baseName = ''trivia_dot_level2''; - version = ''trivia-20191227-git''; + version = ''trivia-20200925-git''; description = ''NON-optimized pattern matcher compatible with OPTIMA, with extensible optimizer interface and clean codebase''; deps = [ args."alexandria" args."closer-mop" args."lisp-namespace" args."trivia_dot_level0" args."trivia_dot_level1" args."trivial-cltl2" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/trivia/2019-12-27/trivia-20191227-git.tgz''; - sha256 = ''1hn6klc2jlh2qhlc4zr9fi02kqlyfyh5bkcgirql1m06g4j8qi4q''; + url = ''http://beta.quicklisp.org/archive/trivia/2020-09-25/trivia-20200925-git.tgz''; + sha256 = ''192306pdx50nikph36swipdy2xz1jqrr8p9c3bi91m8qws75wi4z''; }; packageName = "trivia.level2"; @@ -19,9 +19,9 @@ rec { } /* (SYSTEM trivia.level2 DESCRIPTION NON-optimized pattern matcher compatible with OPTIMA, with extensible optimizer interface and clean codebase - SHA256 1hn6klc2jlh2qhlc4zr9fi02kqlyfyh5bkcgirql1m06g4j8qi4q URL - http://beta.quicklisp.org/archive/trivia/2019-12-27/trivia-20191227-git.tgz - MD5 645f0e0fcf57ab37ebd4f0a1b7b05854 NAME trivia.level2 FILENAME + SHA256 192306pdx50nikph36swipdy2xz1jqrr8p9c3bi91m8qws75wi4z URL + http://beta.quicklisp.org/archive/trivia/2020-09-25/trivia-20200925-git.tgz + MD5 c6546ecf272e52e051a9d3946242511b NAME trivia.level2 FILENAME trivia_dot_level2 DEPS ((NAME alexandria FILENAME alexandria) (NAME closer-mop FILENAME closer-mop) @@ -32,7 +32,7 @@ rec { DEPENDENCIES (alexandria closer-mop lisp-namespace trivia.level0 trivia.level1 trivial-cltl2) - VERSION trivia-20191227-git SIBLINGS + VERSION trivia-20200925-git SIBLINGS (trivia trivia.balland2006 trivia.benchmark trivia.cffi trivia.level0 trivia.level1 trivia.ppcre trivia.quasiquote trivia.test trivia.trivial) PARASITES NIL) */ diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivia_dot_quasiquote.nix b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivia_dot_quasiquote.nix index 9150c2b3d0..07ad7a56c2 100644 --- a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivia_dot_quasiquote.nix +++ b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivia_dot_quasiquote.nix @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: rec { baseName = ''trivia_dot_quasiquote''; - version = ''trivia-20191227-git''; + version = ''trivia-20200925-git''; description = ''fare-quasiquote extension for trivia''; deps = [ args."alexandria" args."closer-mop" args."fare-quasiquote" args."fare-quasiquote-readtable" args."fare-utils" args."lisp-namespace" args."named-readtables" args."trivia_dot_level0" args."trivia_dot_level1" args."trivia_dot_level2" args."trivia_dot_trivial" args."trivial-cltl2" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/trivia/2019-12-27/trivia-20191227-git.tgz''; - sha256 = ''1hn6klc2jlh2qhlc4zr9fi02kqlyfyh5bkcgirql1m06g4j8qi4q''; + url = ''http://beta.quicklisp.org/archive/trivia/2020-09-25/trivia-20200925-git.tgz''; + sha256 = ''192306pdx50nikph36swipdy2xz1jqrr8p9c3bi91m8qws75wi4z''; }; packageName = "trivia.quasiquote"; @@ -18,9 +18,9 @@ rec { overrides = x: x; } /* (SYSTEM trivia.quasiquote DESCRIPTION fare-quasiquote extension for trivia - SHA256 1hn6klc2jlh2qhlc4zr9fi02kqlyfyh5bkcgirql1m06g4j8qi4q URL - http://beta.quicklisp.org/archive/trivia/2019-12-27/trivia-20191227-git.tgz - MD5 645f0e0fcf57ab37ebd4f0a1b7b05854 NAME trivia.quasiquote FILENAME + SHA256 192306pdx50nikph36swipdy2xz1jqrr8p9c3bi91m8qws75wi4z URL + http://beta.quicklisp.org/archive/trivia/2020-09-25/trivia-20200925-git.tgz + MD5 c6546ecf272e52e051a9d3946242511b NAME trivia.quasiquote FILENAME trivia_dot_quasiquote DEPS ((NAME alexandria FILENAME alexandria) (NAME closer-mop FILENAME closer-mop) @@ -38,7 +38,7 @@ rec { (alexandria closer-mop fare-quasiquote fare-quasiquote-readtable fare-utils lisp-namespace named-readtables trivia.level0 trivia.level1 trivia.level2 trivia.trivial trivial-cltl2) - VERSION trivia-20191227-git SIBLINGS + VERSION trivia-20200925-git SIBLINGS (trivia trivia.balland2006 trivia.benchmark trivia.cffi trivia.level0 trivia.level1 trivia.level2 trivia.ppcre trivia.test trivia.trivial) PARASITES NIL) */ diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivia_dot_trivial.nix b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivia_dot_trivial.nix index 9d8a1a3acb..e2b8add6df 100644 --- a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivia_dot_trivial.nix +++ b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivia_dot_trivial.nix @@ -1,7 +1,7 @@ args @ { fetchurl, ... }: rec { baseName = ''trivia_dot_trivial''; - version = ''trivia-20191227-git''; + version = ''trivia-20200925-git''; description = ''Base level system of Trivia with a trivial optimizer. Systems that intend to enhance Trivia should depend on this package, not the TRIVIA system, @@ -10,8 +10,8 @@ rec { deps = [ args."alexandria" args."closer-mop" args."lisp-namespace" args."trivia_dot_level0" args."trivia_dot_level1" args."trivia_dot_level2" args."trivial-cltl2" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/trivia/2019-12-27/trivia-20191227-git.tgz''; - sha256 = ''1hn6klc2jlh2qhlc4zr9fi02kqlyfyh5bkcgirql1m06g4j8qi4q''; + url = ''http://beta.quicklisp.org/archive/trivia/2020-09-25/trivia-20200925-git.tgz''; + sha256 = ''192306pdx50nikph36swipdy2xz1jqrr8p9c3bi91m8qws75wi4z''; }; packageName = "trivia.trivial"; @@ -23,9 +23,9 @@ rec { Base level system of Trivia with a trivial optimizer. Systems that intend to enhance Trivia should depend on this package, not the TRIVIA system, in order to avoid the circular dependency. - SHA256 1hn6klc2jlh2qhlc4zr9fi02kqlyfyh5bkcgirql1m06g4j8qi4q URL - http://beta.quicklisp.org/archive/trivia/2019-12-27/trivia-20191227-git.tgz - MD5 645f0e0fcf57ab37ebd4f0a1b7b05854 NAME trivia.trivial FILENAME + SHA256 192306pdx50nikph36swipdy2xz1jqrr8p9c3bi91m8qws75wi4z URL + http://beta.quicklisp.org/archive/trivia/2020-09-25/trivia-20200925-git.tgz + MD5 c6546ecf272e52e051a9d3946242511b NAME trivia.trivial FILENAME trivia_dot_trivial DEPS ((NAME alexandria FILENAME alexandria) (NAME closer-mop FILENAME closer-mop) @@ -37,7 +37,7 @@ rec { DEPENDENCIES (alexandria closer-mop lisp-namespace trivia.level0 trivia.level1 trivia.level2 trivial-cltl2) - VERSION trivia-20191227-git SIBLINGS + VERSION trivia-20200925-git SIBLINGS (trivia trivia.balland2006 trivia.benchmark trivia.cffi trivia.level0 trivia.level1 trivia.level2 trivia.ppcre trivia.quasiquote trivia.test) PARASITES NIL) */ diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-backtrace.nix b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-backtrace.nix index 683f87357f..2d2bc4110d 100644 --- a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-backtrace.nix +++ b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-backtrace.nix @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: rec { baseName = ''trivial-backtrace''; - version = ''20190710-git''; + version = ''20200610-git''; description = ''trivial-backtrace''; deps = [ ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/trivial-backtrace/2019-07-10/trivial-backtrace-20190710-git.tgz''; - sha256 = ''01pzn5ki3w5sgp270rqg6y982zw4p72x5zqcdjgn8hp7lk2a9g9x''; + url = ''http://beta.quicklisp.org/archive/trivial-backtrace/2020-06-10/trivial-backtrace-20200610-git.tgz''; + sha256 = ''0slz2chal6vpiqx9zmjh4cnihhw794rq3267s7kz7livpiv52rks''; }; packageName = "trivial-backtrace"; @@ -18,8 +18,8 @@ rec { overrides = x: x; } /* (SYSTEM trivial-backtrace DESCRIPTION trivial-backtrace SHA256 - 01pzn5ki3w5sgp270rqg6y982zw4p72x5zqcdjgn8hp7lk2a9g9x URL - http://beta.quicklisp.org/archive/trivial-backtrace/2019-07-10/trivial-backtrace-20190710-git.tgz - MD5 e9035ed00321b24278cbf5449a1aebed NAME trivial-backtrace FILENAME - trivial-backtrace DEPS NIL DEPENDENCIES NIL VERSION 20190710-git SIBLINGS + 0slz2chal6vpiqx9zmjh4cnihhw794rq3267s7kz7livpiv52rks URL + http://beta.quicklisp.org/archive/trivial-backtrace/2020-06-10/trivial-backtrace-20200610-git.tgz + MD5 1d9a7cc7c5840e4eba84c89648908525 NAME trivial-backtrace FILENAME + trivial-backtrace DEPS NIL DEPENDENCIES NIL VERSION 20200610-git SIBLINGS (trivial-backtrace-test) PARASITES NIL) */ diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-clipboard.nix b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-clipboard.nix index 16d265d465..3e21ceab87 100644 --- a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-clipboard.nix +++ b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-clipboard.nix @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: rec { baseName = ''trivial-clipboard''; - version = ''20190202-git''; + version = ''20200925-git''; description = ''trivial-clipboard let access system clipboard.''; deps = [ args."uiop" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/trivial-clipboard/2019-02-02/trivial-clipboard-20190202-git.tgz''; - sha256 = ''06ic4lqampxnycz5s0frn7f8fqjpp8mlrnsnlh77gldxlh02pwq1''; + url = ''http://beta.quicklisp.org/archive/trivial-clipboard/2020-09-25/trivial-clipboard-20200925-git.tgz''; + sha256 = ''1aksag9nfklkg0bshd7dxfip4dj9gl3x0cbisgd2c143k2csb1yc''; }; packageName = "trivial-clipboard"; @@ -19,8 +19,8 @@ rec { } /* (SYSTEM trivial-clipboard DESCRIPTION trivial-clipboard let access system clipboard. SHA256 - 06ic4lqampxnycz5s0frn7f8fqjpp8mlrnsnlh77gldxlh02pwq1 URL - http://beta.quicklisp.org/archive/trivial-clipboard/2019-02-02/trivial-clipboard-20190202-git.tgz - MD5 d9b9ee3754e10888ce243172681a0db2 NAME trivial-clipboard FILENAME + 1aksag9nfklkg0bshd7dxfip4dj9gl3x0cbisgd2c143k2csb1yc URL + http://beta.quicklisp.org/archive/trivial-clipboard/2020-09-25/trivial-clipboard-20200925-git.tgz + MD5 4098d356666a3a3a1ff6a45b10e28354 NAME trivial-clipboard FILENAME trivial-clipboard DEPS ((NAME uiop FILENAME uiop)) DEPENDENCIES (uiop) - VERSION 20190202-git SIBLINGS (trivial-clipboard-test) PARASITES NIL) */ + VERSION 20200925-git SIBLINGS (trivial-clipboard-test) PARASITES NIL) */ diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-cltl2.nix b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-cltl2.nix index a524203047..278ad5b0ac 100644 --- a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-cltl2.nix +++ b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-cltl2.nix @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: rec { baseName = ''trivial-cltl2''; - version = ''20190710-git''; + version = ''20200325-git''; description = ''Compatibility package exporting CLtL2 functionality''; deps = [ ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/trivial-cltl2/2019-07-10/trivial-cltl2-20190710-git.tgz''; - sha256 = ''1qaxwgws8ji6dyh30ff608zpdrplifgkhfdhfnn0367d3rvy11jb''; + url = ''http://beta.quicklisp.org/archive/trivial-cltl2/2020-03-25/trivial-cltl2-20200325-git.tgz''; + sha256 = ''0hahi36v47alsvamg62d0cgay8l0razcgxl089ifj6sqy7s8iwys''; }; packageName = "trivial-cltl2"; @@ -19,8 +19,8 @@ rec { } /* (SYSTEM trivial-cltl2 DESCRIPTION Compatibility package exporting CLtL2 functionality SHA256 - 1qaxwgws8ji6dyh30ff608zpdrplifgkhfdhfnn0367d3rvy11jb URL - http://beta.quicklisp.org/archive/trivial-cltl2/2019-07-10/trivial-cltl2-20190710-git.tgz - MD5 8114f96b9770a9f0e0a94933918dc171 NAME trivial-cltl2 FILENAME - trivial-cltl2 DEPS NIL DEPENDENCIES NIL VERSION 20190710-git SIBLINGS NIL + 0hahi36v47alsvamg62d0cgay8l0razcgxl089ifj6sqy7s8iwys URL + http://beta.quicklisp.org/archive/trivial-cltl2/2020-03-25/trivial-cltl2-20200325-git.tgz + MD5 aa18140b9840365ceb9a6cddbdbdd67b NAME trivial-cltl2 FILENAME + trivial-cltl2 DEPS NIL DEPENDENCIES NIL VERSION 20200325-git SIBLINGS NIL PARASITES NIL) */ diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-features.nix b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-features.nix index 82d0e4513a..53669a4675 100644 --- a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-features.nix +++ b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-features.nix @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: rec { baseName = ''trivial-features''; - version = ''20190710-git''; + version = ''20200715-git''; description = ''Ensures consistent *FEATURES* across multiple CLs.''; deps = [ ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/trivial-features/2019-07-10/trivial-features-20190710-git.tgz''; - sha256 = ''04i2vhhij8pwy46zih1dkm8ldy8qqgrncxxqd4y1sgiq3airg3dy''; + url = ''http://beta.quicklisp.org/archive/trivial-features/2020-07-15/trivial-features-20200715-git.tgz''; + sha256 = ''0h0xxkp7vciq5yj6a1b5k76h7mzqgb5f9v25nssijgp738nmkni2''; }; packageName = "trivial-features"; @@ -19,8 +19,8 @@ rec { } /* (SYSTEM trivial-features DESCRIPTION Ensures consistent *FEATURES* across multiple CLs. SHA256 - 04i2vhhij8pwy46zih1dkm8ldy8qqgrncxxqd4y1sgiq3airg3dy URL - http://beta.quicklisp.org/archive/trivial-features/2019-07-10/trivial-features-20190710-git.tgz - MD5 3907b044e00a812ebae989134fe57c55 NAME trivial-features FILENAME - trivial-features DEPS NIL DEPENDENCIES NIL VERSION 20190710-git SIBLINGS + 0h0xxkp7vciq5yj6a1b5k76h7mzqgb5f9v25nssijgp738nmkni2 URL + http://beta.quicklisp.org/archive/trivial-features/2020-07-15/trivial-features-20200715-git.tgz + MD5 bb88b3e55713474bad3ef90f215f3560 NAME trivial-features FILENAME + trivial-features DEPS NIL DEPENDENCIES NIL VERSION 20200715-git SIBLINGS (trivial-features-tests) PARASITES NIL) */ diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-file-size.nix b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-file-size.nix index 5b92cf9ec5..892e1d49d5 100644 --- a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-file-size.nix +++ b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-file-size.nix @@ -1,7 +1,7 @@ args @ { fetchurl, ... }: rec { baseName = ''trivial-file-size''; - version = ''20180131-git''; + version = ''20200427-git''; parasites = [ "trivial-file-size/tests" ]; @@ -10,8 +10,8 @@ rec { deps = [ args."fiveam" args."uiop" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/trivial-file-size/2018-01-31/trivial-file-size-20180131-git.tgz''; - sha256 = ''1dhbj764rxw8ndr2l06g5lszzvxis8fjbp71i3l2y9zmdm0k5zrd''; + url = ''http://beta.quicklisp.org/archive/trivial-file-size/2020-04-27/trivial-file-size-20200427-git.tgz''; + sha256 = ''1vspkgygrldbjb4gdm1fsn04j50rwil41x0fvvm4fxm84rwrscsa''; }; packageName = "trivial-file-size"; @@ -20,10 +20,10 @@ rec { overrides = x: x; } /* (SYSTEM trivial-file-size DESCRIPTION Stat a file's size. SHA256 - 1dhbj764rxw8ndr2l06g5lszzvxis8fjbp71i3l2y9zmdm0k5zrd URL - http://beta.quicklisp.org/archive/trivial-file-size/2018-01-31/trivial-file-size-20180131-git.tgz - MD5 ac921679334dd8bd12f927f0bd806f4b NAME trivial-file-size FILENAME + 1vspkgygrldbjb4gdm1fsn04j50rwil41x0fvvm4fxm84rwrscsa URL + http://beta.quicklisp.org/archive/trivial-file-size/2020-04-27/trivial-file-size-20200427-git.tgz + MD5 1e1952c60c1711869cd6b87b9bc25b52 NAME trivial-file-size FILENAME trivial-file-size DEPS ((NAME fiveam FILENAME fiveam) (NAME uiop FILENAME uiop)) DEPENDENCIES - (fiveam uiop) VERSION 20180131-git SIBLINGS NIL PARASITES + (fiveam uiop) VERSION 20200427-git SIBLINGS NIL PARASITES (trivial-file-size/tests)) */ diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-garbage.nix b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-garbage.nix index c629bb3548..ce1f75522a 100644 --- a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-garbage.nix +++ b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-garbage.nix @@ -1,7 +1,7 @@ args @ { fetchurl, ... }: rec { baseName = ''trivial-garbage''; - version = ''20190521-git''; + version = ''20200925-git''; parasites = [ "trivial-garbage/tests" ]; @@ -10,8 +10,8 @@ rec { deps = [ args."rt" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/trivial-garbage/2019-05-21/trivial-garbage-20190521-git.tgz''; - sha256 = ''0yhb7rkrbcfgghwvbw13nvmr86v19ka6qb53j8n89c7r270d8fdl''; + url = ''http://beta.quicklisp.org/archive/trivial-garbage/2020-09-25/trivial-garbage-20200925-git.tgz''; + sha256 = ''00iw2iw6qzji9b2gwy798l54jdk185sxh1k7m2qd9srs8s730k83''; }; packageName = "trivial-garbage"; @@ -21,8 +21,8 @@ rec { } /* (SYSTEM trivial-garbage DESCRIPTION Portable finalizers, weak hash-tables and weak pointers. SHA256 - 0yhb7rkrbcfgghwvbw13nvmr86v19ka6qb53j8n89c7r270d8fdl URL - http://beta.quicklisp.org/archive/trivial-garbage/2019-05-21/trivial-garbage-20190521-git.tgz - MD5 38fb70797069d4402c6b0fe91f4ca5a8 NAME trivial-garbage FILENAME + 00iw2iw6qzji9b2gwy798l54jdk185sxh1k7m2qd9srs8s730k83 URL + http://beta.quicklisp.org/archive/trivial-garbage/2020-09-25/trivial-garbage-20200925-git.tgz + MD5 9d748d1d549f419ce474f35906707420 NAME trivial-garbage FILENAME trivial-garbage DEPS ((NAME rt FILENAME rt)) DEPENDENCIES (rt) VERSION - 20190521-git SIBLINGS NIL PARASITES (trivial-garbage/tests)) */ + 20200925-git SIBLINGS NIL PARASITES (trivial-garbage/tests)) */ diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-gray-streams.nix b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-gray-streams.nix index 2aee236ac0..acefb69218 100644 --- a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-gray-streams.nix +++ b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-gray-streams.nix @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: rec { baseName = ''trivial-gray-streams''; - version = ''20181018-git''; + version = ''20200925-git''; description = ''Compatibility layer for Gray Streams (see http://www.cliki.net/Gray%20streams).''; deps = [ ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/trivial-gray-streams/2018-10-18/trivial-gray-streams-20181018-git.tgz''; - sha256 = ''0a1dmf7m9zbv3p6f5mzb413cy4fz9ahaykqp3ik1a98ivy0i74iv''; + url = ''http://beta.quicklisp.org/archive/trivial-gray-streams/2020-09-25/trivial-gray-streams-20200925-git.tgz''; + sha256 = ''1mg31fwjixd04lfqbpzjan3cny1i478xm1a9l3p0i9m4dv4g2k2b''; }; packageName = "trivial-gray-streams"; @@ -19,8 +19,8 @@ rec { } /* (SYSTEM trivial-gray-streams DESCRIPTION Compatibility layer for Gray Streams (see http://www.cliki.net/Gray%20streams). - SHA256 0a1dmf7m9zbv3p6f5mzb413cy4fz9ahaykqp3ik1a98ivy0i74iv URL - http://beta.quicklisp.org/archive/trivial-gray-streams/2018-10-18/trivial-gray-streams-20181018-git.tgz - MD5 0a9f564079dc41ce10d7869d82cc0952 NAME trivial-gray-streams FILENAME - trivial-gray-streams DEPS NIL DEPENDENCIES NIL VERSION 20181018-git + SHA256 1mg31fwjixd04lfqbpzjan3cny1i478xm1a9l3p0i9m4dv4g2k2b URL + http://beta.quicklisp.org/archive/trivial-gray-streams/2020-09-25/trivial-gray-streams-20200925-git.tgz + MD5 123581593fc46fdbf1d631cf8f07e0dd NAME trivial-gray-streams FILENAME + trivial-gray-streams DEPS NIL DEPENDENCIES NIL VERSION 20200925-git SIBLINGS (trivial-gray-streams-test) PARASITES NIL) */ diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-main-thread.nix b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-main-thread.nix new file mode 100644 index 0000000000..dc0de9da62 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-main-thread.nix @@ -0,0 +1,34 @@ +args @ { fetchurl, ... }: +rec { + baseName = ''trivial-main-thread''; + version = ''20190710-git''; + + description = ''Compatibility library to run things in the main thread.''; + + deps = [ args."alexandria" args."array-utils" args."bordeaux-threads" args."dissect" args."simple-tasks" args."trivial-features" ]; + + src = fetchurl { + url = ''http://beta.quicklisp.org/archive/trivial-main-thread/2019-07-10/trivial-main-thread-20190710-git.tgz''; + sha256 = ''1zj12rc29rrff5grmi7sjxfzdv78khbb4sg43hy2cb33hykpvg2h''; + }; + + packageName = "trivial-main-thread"; + + asdFilesToKeep = ["trivial-main-thread.asd"]; + overrides = x: x; +} +/* (SYSTEM trivial-main-thread DESCRIPTION + Compatibility library to run things in the main thread. SHA256 + 1zj12rc29rrff5grmi7sjxfzdv78khbb4sg43hy2cb33hykpvg2h URL + http://beta.quicklisp.org/archive/trivial-main-thread/2019-07-10/trivial-main-thread-20190710-git.tgz + MD5 ab95906f1831aa5b40f271eebdfe11a3 NAME trivial-main-thread FILENAME + trivial-main-thread DEPS + ((NAME alexandria FILENAME alexandria) + (NAME array-utils FILENAME array-utils) + (NAME bordeaux-threads FILENAME bordeaux-threads) + (NAME dissect FILENAME dissect) (NAME simple-tasks FILENAME simple-tasks) + (NAME trivial-features FILENAME trivial-features)) + DEPENDENCIES + (alexandria array-utils bordeaux-threads dissect simple-tasks + trivial-features) + VERSION 20190710-git SIBLINGS NIL PARASITES NIL) */ diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-mimes.nix b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-mimes.nix index f02d9e0dc2..2e2888444e 100644 --- a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-mimes.nix +++ b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-mimes.nix @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: rec { baseName = ''trivial-mimes''; - version = ''20190710-git''; + version = ''20200715-git''; description = ''Tiny library to detect mime types in files.''; deps = [ ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/trivial-mimes/2019-07-10/trivial-mimes-20190710-git.tgz''; - sha256 = ''0z6m26gs0ilqs183xb4a5acpka9md10szbbdpm5xzjrhl15nb4jn''; + url = ''http://beta.quicklisp.org/archive/trivial-mimes/2020-07-15/trivial-mimes-20200715-git.tgz''; + sha256 = ''10mk1v5ad0m3bg5pl7lqhh827jvg5jb896807vmi8wznwk7zaif1''; }; packageName = "trivial-mimes"; @@ -19,8 +19,8 @@ rec { } /* (SYSTEM trivial-mimes DESCRIPTION Tiny library to detect mime types in files. SHA256 - 0z6m26gs0ilqs183xb4a5acpka9md10szbbdpm5xzjrhl15nb4jn URL - http://beta.quicklisp.org/archive/trivial-mimes/2019-07-10/trivial-mimes-20190710-git.tgz - MD5 b7fa1cb9382a2a562343c6ca87b1b4ac NAME trivial-mimes FILENAME - trivial-mimes DEPS NIL DEPENDENCIES NIL VERSION 20190710-git SIBLINGS NIL + 10mk1v5ad0m3bg5pl7lqhh827jvg5jb896807vmi8wznwk7zaif1 URL + http://beta.quicklisp.org/archive/trivial-mimes/2020-07-15/trivial-mimes-20200715-git.tgz + MD5 6f400805470232e87b3f69b9239b2b55 NAME trivial-mimes FILENAME + trivial-mimes DEPS NIL DEPENDENCIES NIL VERSION 20200715-git SIBLINGS NIL PARASITES NIL) */ diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-package-local-nicknames.nix b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-package-local-nicknames.nix new file mode 100644 index 0000000000..9cd37f8072 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-package-local-nicknames.nix @@ -0,0 +1,26 @@ +args @ { fetchurl, ... }: +rec { + baseName = ''trivial-package-local-nicknames''; + version = ''20200610-git''; + + description = ''Portability library for package-local nicknames''; + + deps = [ ]; + + src = fetchurl { + url = ''http://beta.quicklisp.org/archive/trivial-package-local-nicknames/2020-06-10/trivial-package-local-nicknames-20200610-git.tgz''; + sha256 = ''1wabkcwz0v144rb2w3rvxlcj264indfnvlyigk1wds7nq0c8lwk5''; + }; + + packageName = "trivial-package-local-nicknames"; + + asdFilesToKeep = ["trivial-package-local-nicknames.asd"]; + overrides = x: x; +} +/* (SYSTEM trivial-package-local-nicknames DESCRIPTION + Portability library for package-local nicknames SHA256 + 1wabkcwz0v144rb2w3rvxlcj264indfnvlyigk1wds7nq0c8lwk5 URL + http://beta.quicklisp.org/archive/trivial-package-local-nicknames/2020-06-10/trivial-package-local-nicknames-20200610-git.tgz + MD5 b3620521d3400ad5910878139bc86fcc NAME trivial-package-local-nicknames + FILENAME trivial-package-local-nicknames DEPS NIL DEPENDENCIES NIL VERSION + 20200610-git SIBLINGS NIL PARASITES NIL) */ diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-utf-8.nix b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-utf-8.nix index 00a484f11b..e01eac48a2 100644 --- a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-utf-8.nix +++ b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-utf-8.nix @@ -1,17 +1,17 @@ args @ { fetchurl, ... }: rec { baseName = ''trivial-utf-8''; - version = ''20111001-darcs''; + version = ''20200925-git''; - parasites = [ "trivial-utf-8-tests" ]; + parasites = [ "trivial-utf-8/doc" "trivial-utf-8/tests" ]; - description = ''System lacks description''; + description = ''A small library for doing UTF-8-based input and output.''; - deps = [ ]; + deps = [ args."mgl-pax" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/trivial-utf-8/2011-10-01/trivial-utf-8-20111001-darcs.tgz''; - sha256 = ''1lmg185s6w3rzsz3xa41k5w9xw32bi288ifhrxincy8iv92w65wb''; + url = ''http://beta.quicklisp.org/archive/trivial-utf-8/2020-09-25/trivial-utf-8-20200925-git.tgz''; + sha256 = ''06v9jif4f5xyl5jd7ldg69ds7cypf72xl7nda5q55fssmgcydi1b''; }; packageName = "trivial-utf-8"; @@ -19,9 +19,11 @@ rec { asdFilesToKeep = ["trivial-utf-8.asd"]; overrides = x: x; } -/* (SYSTEM trivial-utf-8 DESCRIPTION System lacks description SHA256 - 1lmg185s6w3rzsz3xa41k5w9xw32bi288ifhrxincy8iv92w65wb URL - http://beta.quicklisp.org/archive/trivial-utf-8/2011-10-01/trivial-utf-8-20111001-darcs.tgz - MD5 0206c4ba7a6c0b9b23762f244aca6614 NAME trivial-utf-8 FILENAME - trivial-utf-8 DEPS NIL DEPENDENCIES NIL VERSION 20111001-darcs SIBLINGS NIL - PARASITES (trivial-utf-8-tests)) */ +/* (SYSTEM trivial-utf-8 DESCRIPTION + A small library for doing UTF-8-based input and output. SHA256 + 06v9jif4f5xyl5jd7ldg69ds7cypf72xl7nda5q55fssmgcydi1b URL + http://beta.quicklisp.org/archive/trivial-utf-8/2020-09-25/trivial-utf-8-20200925-git.tgz + MD5 799ece1f87cc4a83e81e598bc6b1dd1d NAME trivial-utf-8 FILENAME + trivial-utf-8 DEPS ((NAME mgl-pax FILENAME mgl-pax)) DEPENDENCIES (mgl-pax) + VERSION 20200925-git SIBLINGS NIL PARASITES + (trivial-utf-8/doc trivial-utf-8/tests)) */ diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/uax-15.nix b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/uax-15.nix new file mode 100644 index 0000000000..a2980a9d40 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/uax-15.nix @@ -0,0 +1,30 @@ +args @ { fetchurl, ... }: +rec { + baseName = ''uax-15''; + version = ''20200325-git''; + + parasites = [ "uax-15/tests" ]; + + description = ''Common lisp implementation of Unicode normalization functions :nfc, :nfd, :nfkc and :nfkd (Uax-15)''; + + deps = [ args."cl-ppcre" args."fiveam" args."split-sequence" args."uiop" ]; + + src = fetchurl { + url = ''http://beta.quicklisp.org/archive/uax-15/2020-03-25/uax-15-20200325-git.tgz''; + sha256 = ''0nld8a95fy0nfni8g663786cz5q3x63bxymx0jlaknb6lfibb6pc''; + }; + + packageName = "uax-15"; + + asdFilesToKeep = ["uax-15.asd"]; + overrides = x: x; +} +/* (SYSTEM uax-15 DESCRIPTION + Common lisp implementation of Unicode normalization functions :nfc, :nfd, :nfkc and :nfkd (Uax-15) + SHA256 0nld8a95fy0nfni8g663786cz5q3x63bxymx0jlaknb6lfibb6pc URL + http://beta.quicklisp.org/archive/uax-15/2020-03-25/uax-15-20200325-git.tgz + MD5 95b8883fa0e85189f701a40c292b8828 NAME uax-15 FILENAME uax-15 DEPS + ((NAME cl-ppcre FILENAME cl-ppcre) (NAME fiveam FILENAME fiveam) + (NAME split-sequence FILENAME split-sequence) (NAME uiop FILENAME uiop)) + DEPENDENCIES (cl-ppcre fiveam split-sequence uiop) VERSION 20200325-git + SIBLINGS NIL PARASITES (uax-15/tests)) */ diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/uiop.nix b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/uiop.nix index 18f1b74edb..ab96b03225 100644 --- a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/uiop.nix +++ b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/uiop.nix @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: rec { baseName = ''uiop''; - version = ''3.3.3''; + version = ''3.3.4''; description = ''System lacks description''; deps = [ ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/uiop/2019-05-21/uiop-3.3.3.tgz''; - sha256 = ''1r89bqjmz1919l3wlmd32p416jzpacy3glkhiwnf1crkja27iagm''; + url = ''http://beta.quicklisp.org/archive/uiop/2020-02-18/uiop-3.3.4.tgz''; + sha256 = ''0n0fp55ivwi6gzhaywdkngnk2snpp9nn3mz5rq3pnrwldi9q7aav''; }; packageName = "uiop"; @@ -18,7 +18,7 @@ rec { overrides = x: x; } /* (SYSTEM uiop DESCRIPTION System lacks description SHA256 - 1r89bqjmz1919l3wlmd32p416jzpacy3glkhiwnf1crkja27iagm URL - http://beta.quicklisp.org/archive/uiop/2019-05-21/uiop-3.3.3.tgz MD5 - 64d561117f048ad8621eff7a6173d65e NAME uiop FILENAME uiop DEPS NIL - DEPENDENCIES NIL VERSION 3.3.3 SIBLINGS (asdf-driver) PARASITES NIL) */ + 0n0fp55ivwi6gzhaywdkngnk2snpp9nn3mz5rq3pnrwldi9q7aav URL + http://beta.quicklisp.org/archive/uiop/2020-02-18/uiop-3.3.4.tgz MD5 + b13a79a5aede43c97428c1cac86d6c2e NAME uiop FILENAME uiop DEPS NIL + DEPENDENCIES NIL VERSION 3.3.4 SIBLINGS (asdf-driver) PARASITES NIL) */ diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/unix-options.nix b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/unix-options.nix new file mode 100644 index 0000000000..7243d5a17e --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/unix-options.nix @@ -0,0 +1,25 @@ +args @ { fetchurl, ... }: +rec { + baseName = ''unix-options''; + version = ''20151031-git''; + + description = ''Easy to use command line option parser''; + + deps = [ ]; + + src = fetchurl { + url = ''http://beta.quicklisp.org/archive/unix-options/2015-10-31/unix-options-20151031-git.tgz''; + sha256 = ''0c9vbvvyx5qwvns87624gzxjcbdkbkcwssg29cxjfv3ci3qwqcd5''; + }; + + packageName = "unix-options"; + + asdFilesToKeep = ["unix-options.asd"]; + overrides = x: x; +} +/* (SYSTEM unix-options DESCRIPTION Easy to use command line option parser + SHA256 0c9vbvvyx5qwvns87624gzxjcbdkbkcwssg29cxjfv3ci3qwqcd5 URL + http://beta.quicklisp.org/archive/unix-options/2015-10-31/unix-options-20151031-git.tgz + MD5 3bbdeafbef3e7a2e94b9756bf173f636 NAME unix-options FILENAME + unix-options DEPS NIL DEPENDENCIES NIL VERSION 20151031-git SIBLINGS NIL + PARASITES NIL) */ diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/unix-opts.nix b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/unix-opts.nix index 4af27c449a..8475b8e4ff 100644 --- a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/unix-opts.nix +++ b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/unix-opts.nix @@ -1,15 +1,17 @@ args @ { fetchurl, ... }: rec { baseName = ''unix-opts''; - version = ''20180430-git''; + version = ''20200925-git''; + + parasites = [ "unix-opts/tests" ]; description = ''minimalistic parser of command line arguments''; deps = [ ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/unix-opts/2018-04-30/unix-opts-20180430-git.tgz''; - sha256 = ''05glzp47kn022jkbbvhnygaibrqnpr44q19lwhm20h4nkpkj3968''; + url = ''http://beta.quicklisp.org/archive/unix-opts/2020-09-25/unix-opts-20200925-git.tgz''; + sha256 = ''0y7bg825l8my7kpk4iwx0n8wn7rgy7bir60kb0s55g3x0nx5vx35''; }; packageName = "unix-opts"; @@ -18,8 +20,8 @@ rec { overrides = x: x; } /* (SYSTEM unix-opts DESCRIPTION minimalistic parser of command line arguments - SHA256 05glzp47kn022jkbbvhnygaibrqnpr44q19lwhm20h4nkpkj3968 URL - http://beta.quicklisp.org/archive/unix-opts/2018-04-30/unix-opts-20180430-git.tgz - MD5 2875ea0a1f5c49ef2697bb1046c4c4e5 NAME unix-opts FILENAME unix-opts DEPS - NIL DEPENDENCIES NIL VERSION 20180430-git SIBLINGS (unix-opts-tests) - PARASITES NIL) */ + SHA256 0y7bg825l8my7kpk4iwx0n8wn7rgy7bir60kb0s55g3x0nx5vx35 URL + http://beta.quicklisp.org/archive/unix-opts/2020-09-25/unix-opts-20200925-git.tgz + MD5 cdde0f71cfa437636d20509b4072df0c NAME unix-opts FILENAME unix-opts DEPS + NIL DEPENDENCIES NIL VERSION 20200925-git SIBLINGS NIL PARASITES + (unix-opts/tests)) */ diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/usocket-server.nix b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/usocket-server.nix new file mode 100644 index 0000000000..04a09a8ab4 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/usocket-server.nix @@ -0,0 +1,31 @@ +args @ { fetchurl, ... }: +rec { + baseName = ''usocket-server''; + version = ''usocket-0.8.3''; + + description = ''Universal socket library for Common Lisp (server side)''; + + deps = [ args."alexandria" args."bordeaux-threads" args."split-sequence" args."usocket" ]; + + src = fetchurl { + url = ''http://beta.quicklisp.org/archive/usocket/2019-12-27/usocket-0.8.3.tgz''; + sha256 = ''19gl72r9jqms8slzn7i7bww2cqng9mhiqqhhccadlrx2xv6d3lm7''; + }; + + packageName = "usocket-server"; + + asdFilesToKeep = ["usocket-server.asd"]; + overrides = x: x; +} +/* (SYSTEM usocket-server DESCRIPTION + Universal socket library for Common Lisp (server side) SHA256 + 19gl72r9jqms8slzn7i7bww2cqng9mhiqqhhccadlrx2xv6d3lm7 URL + http://beta.quicklisp.org/archive/usocket/2019-12-27/usocket-0.8.3.tgz MD5 + b1103034f32565487ab3b6eb92c0ca2b NAME usocket-server FILENAME + usocket-server DEPS + ((NAME alexandria FILENAME alexandria) + (NAME bordeaux-threads FILENAME bordeaux-threads) + (NAME split-sequence FILENAME split-sequence) + (NAME usocket FILENAME usocket)) + DEPENDENCIES (alexandria bordeaux-threads split-sequence usocket) VERSION + usocket-0.8.3 SIBLINGS (usocket-test usocket) PARASITES NIL) */ diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/utilities_dot_print-items.nix b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/utilities_dot_print-items.nix new file mode 100644 index 0000000000..b672d0c2ec --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/utilities_dot_print-items.nix @@ -0,0 +1,30 @@ +args @ { fetchurl, ... }: +rec { + baseName = ''utilities_dot_print-items''; + version = ''20190813-git''; + + parasites = [ "utilities.print-items/test" ]; + + description = ''A protocol for flexible and composable printing.''; + + deps = [ args."alexandria" args."fiveam" ]; + + src = fetchurl { + url = ''http://beta.quicklisp.org/archive/utilities.print-items/2019-08-13/utilities.print-items-20190813-git.tgz''; + sha256 = ''12l4kzz621qfcg8p5qzyxp4n4hh9wdlpiziykwb4c80g32rdwkc2''; + }; + + packageName = "utilities.print-items"; + + asdFilesToKeep = ["utilities.print-items.asd"]; + overrides = x: x; +} +/* (SYSTEM utilities.print-items DESCRIPTION + A protocol for flexible and composable printing. SHA256 + 12l4kzz621qfcg8p5qzyxp4n4hh9wdlpiziykwb4c80g32rdwkc2 URL + http://beta.quicklisp.org/archive/utilities.print-items/2019-08-13/utilities.print-items-20190813-git.tgz + MD5 0f26580bb5d3587ed1815f70976b2a0a NAME utilities.print-items FILENAME + utilities_dot_print-items DEPS + ((NAME alexandria FILENAME alexandria) (NAME fiveam FILENAME fiveam)) + DEPENDENCIES (alexandria fiveam) VERSION 20190813-git SIBLINGS NIL + PARASITES (utilities.print-items/test)) */ diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/utilities_dot_print-tree.nix b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/utilities_dot_print-tree.nix new file mode 100644 index 0000000000..80ff6d9ff7 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/utilities_dot_print-tree.nix @@ -0,0 +1,31 @@ +args @ { fetchurl, ... }: +rec { + baseName = ''utilities_dot_print-tree''; + version = ''20200325-git''; + + parasites = [ "utilities.print-tree/test" ]; + + description = ''This system provides simple facilities for printing tree structures.''; + + deps = [ args."alexandria" args."fiveam" args."uiop" ]; + + src = fetchurl { + url = ''http://beta.quicklisp.org/archive/utilities.print-tree/2020-03-25/utilities.print-tree-20200325-git.tgz''; + sha256 = ''1nam8g2ppzkzpkwwhmil9y68is43ljpvc7hd64zxp4zsaqab5dww''; + }; + + packageName = "utilities.print-tree"; + + asdFilesToKeep = ["utilities.print-tree.asd"]; + overrides = x: x; +} +/* (SYSTEM utilities.print-tree DESCRIPTION + This system provides simple facilities for printing tree structures. SHA256 + 1nam8g2ppzkzpkwwhmil9y68is43ljpvc7hd64zxp4zsaqab5dww URL + http://beta.quicklisp.org/archive/utilities.print-tree/2020-03-25/utilities.print-tree-20200325-git.tgz + MD5 618bf5b42c415a44a1566f4f96a2c69a NAME utilities.print-tree FILENAME + utilities_dot_print-tree DEPS + ((NAME alexandria FILENAME alexandria) (NAME fiveam FILENAME fiveam) + (NAME uiop FILENAME uiop)) + DEPENDENCIES (alexandria fiveam uiop) VERSION 20200325-git SIBLINGS NIL + PARASITES (utilities.print-tree/test)) */ diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/uuid.nix b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/uuid.nix index bfd8451462..43ae799961 100644 --- a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/uuid.nix +++ b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/uuid.nix @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: -{ +rec { baseName = ''uuid''; - version = ''20130813-git''; + version = ''20200715-git''; description = ''UUID Generation''; - deps = [ args."ironclad" args."nibbles" args."trivial-utf-8" ]; + deps = [ args."alexandria" args."bordeaux-threads" args."ironclad" args."trivial-utf-8" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/uuid/2013-08-13/uuid-20130813-git.tgz''; - sha256 = ''1ph88gizpkxqigfrkgmq0vd3qkgpxd9zjy6qyr0ic4xdyyymg1hf''; + url = ''http://beta.quicklisp.org/archive/uuid/2020-07-15/uuid-20200715-git.tgz''; + sha256 = ''1ymir6hgax1vbbcgyprnwbsx224ih03a55v10l35xridwyzhzrx0''; }; packageName = "uuid"; @@ -18,10 +18,12 @@ args @ { fetchurl, ... }: overrides = x: x; } /* (SYSTEM uuid DESCRIPTION UUID Generation SHA256 - 1ph88gizpkxqigfrkgmq0vd3qkgpxd9zjy6qyr0ic4xdyyymg1hf URL - http://beta.quicklisp.org/archive/uuid/2013-08-13/uuid-20130813-git.tgz MD5 - e9029d9437573ec2ffa2b474adf95daf NAME uuid FILENAME uuid DEPS - ((NAME ironclad FILENAME ironclad) (NAME nibbles FILENAME nibbles) + 1ymir6hgax1vbbcgyprnwbsx224ih03a55v10l35xridwyzhzrx0 URL + http://beta.quicklisp.org/archive/uuid/2020-07-15/uuid-20200715-git.tgz MD5 + e550de5e4e0f8cc9dc92aff0b488a991 NAME uuid FILENAME uuid DEPS + ((NAME alexandria FILENAME alexandria) + (NAME bordeaux-threads FILENAME bordeaux-threads) + (NAME ironclad FILENAME ironclad) (NAME trivial-utf-8 FILENAME trivial-utf-8)) - DEPENDENCIES (ironclad nibbles trivial-utf-8) VERSION 20130813-git SIBLINGS - NIL PARASITES NIL) */ + DEPENDENCIES (alexandria bordeaux-threads ironclad trivial-utf-8) VERSION + 20200715-git SIBLINGS NIL PARASITES NIL) */ diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/woo.nix b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/woo.nix index ecb0ba3762..78c2e30d7e 100644 --- a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/woo.nix +++ b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/woo.nix @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: rec { baseName = ''woo''; - version = ''20191130-git''; + version = ''20200427-git''; description = ''An asynchronous HTTP server written in Common Lisp''; deps = [ args."alexandria" args."babel" args."bordeaux-threads" args."cffi" args."cffi-grovel" args."cffi-toolchain" args."cl-utilities" args."clack-socket" args."fast-http" args."fast-io" args."flexi-streams" args."lev" args."proc-parse" args."quri" args."smart-buffer" args."split-sequence" args."static-vectors" args."swap-bytes" args."trivial-features" args."trivial-gray-streams" args."trivial-utf-8" args."vom" args."xsubseq" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/woo/2019-11-30/woo-20191130-git.tgz''; - sha256 = ''18pw094i6damqsjx0v9jymvib0dhlr5s5bly1dphfnvfz5czs6j2''; + url = ''http://beta.quicklisp.org/archive/woo/2020-04-27/woo-20200427-git.tgz''; + sha256 = ''1mmgwgf9n74zab96x1n4faij30l2vk19xy74fcp0xnpj4lrp7v29''; }; packageName = "woo"; @@ -18,9 +18,9 @@ rec { overrides = x: x; } /* (SYSTEM woo DESCRIPTION An asynchronous HTTP server written in Common Lisp - SHA256 18pw094i6damqsjx0v9jymvib0dhlr5s5bly1dphfnvfz5czs6j2 URL - http://beta.quicklisp.org/archive/woo/2019-11-30/woo-20191130-git.tgz MD5 - a876d194ed1ccb7439e3f3b6da63760e NAME woo FILENAME woo DEPS + SHA256 1mmgwgf9n74zab96x1n4faij30l2vk19xy74fcp0xnpj4lrp7v29 URL + http://beta.quicklisp.org/archive/woo/2020-04-27/woo-20200427-git.tgz MD5 + 9bbd96692e37dd61195f8bd57a654c65 NAME woo FILENAME woo DEPS ((NAME alexandria FILENAME alexandria) (NAME babel FILENAME babel) (NAME bordeaux-threads FILENAME bordeaux-threads) (NAME cffi FILENAME cffi) (NAME cffi-grovel FILENAME cffi-grovel) @@ -43,4 +43,4 @@ rec { cl-utilities clack-socket fast-http fast-io flexi-streams lev proc-parse quri smart-buffer split-sequence static-vectors swap-bytes trivial-features trivial-gray-streams trivial-utf-8 vom xsubseq) - VERSION 20191130-git SIBLINGS (clack-handler-woo woo-test) PARASITES NIL) */ + VERSION 20200427-git SIBLINGS (clack-handler-woo woo-test) PARASITES NIL) */ diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/xml_dot_location.nix b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/xml_dot_location.nix new file mode 100644 index 0000000000..35854cd6b9 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/xml_dot_location.nix @@ -0,0 +1,47 @@ +args @ { fetchurl, ... }: +rec { + baseName = ''xml_dot_location''; + version = ''20200325-git''; + + parasites = [ "xml.location/test" ]; + + description = ''This system provides a convenient interface for + manipulating XML data. It is inspired by the xmltio library.''; + + deps = [ args."alexandria" args."anaphora" args."babel" args."cl-ppcre" args."closer-mop" args."closure-common" args."cxml" args."cxml-stp" args."iterate" args."let-plus" args."lift" args."more-conditions" args."parse-number" args."puri" args."split-sequence" args."trivial-features" args."trivial-gray-streams" args."xpath" args."yacc" ]; + + src = fetchurl { + url = ''http://beta.quicklisp.org/archive/xml.location/2020-03-25/xml.location-20200325-git.tgz''; + sha256 = ''0wfccj1p1al0w9pc5rhxpsvm3wb2lr5fc4cfjyg751pwsasjikwx''; + }; + + packageName = "xml.location"; + + asdFilesToKeep = ["xml.location.asd"]; + overrides = x: x; +} +/* (SYSTEM xml.location DESCRIPTION + This system provides a convenient interface for + manipulating XML data. It is inspired by the xmltio library. + SHA256 0wfccj1p1al0w9pc5rhxpsvm3wb2lr5fc4cfjyg751pwsasjikwx URL + http://beta.quicklisp.org/archive/xml.location/2020-03-25/xml.location-20200325-git.tgz + MD5 90cf4fd2450ba562c7f9657391dacb1d NAME xml.location FILENAME + xml_dot_location DEPS + ((NAME alexandria FILENAME alexandria) (NAME anaphora FILENAME anaphora) + (NAME babel FILENAME babel) (NAME cl-ppcre FILENAME cl-ppcre) + (NAME closer-mop FILENAME closer-mop) + (NAME closure-common FILENAME closure-common) (NAME cxml FILENAME cxml) + (NAME cxml-stp FILENAME cxml-stp) (NAME iterate FILENAME iterate) + (NAME let-plus FILENAME let-plus) (NAME lift FILENAME lift) + (NAME more-conditions FILENAME more-conditions) + (NAME parse-number FILENAME parse-number) (NAME puri FILENAME puri) + (NAME split-sequence FILENAME split-sequence) + (NAME trivial-features FILENAME trivial-features) + (NAME trivial-gray-streams FILENAME trivial-gray-streams) + (NAME xpath FILENAME xpath) (NAME yacc FILENAME yacc)) + DEPENDENCIES + (alexandria anaphora babel cl-ppcre closer-mop closure-common cxml cxml-stp + iterate let-plus lift more-conditions parse-number puri split-sequence + trivial-features trivial-gray-streams xpath yacc) + VERSION 20200325-git SIBLINGS (xml.location-and-local-time) PARASITES + (xml.location/test)) */ diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-overrides.nix b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-overrides.nix index 909ddc5d1a..96d5867a3b 100644 --- a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-overrides.nix +++ b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-overrides.nix @@ -32,9 +32,9 @@ in ''; preInstall = '' type gcc - mkdir -p "$out/lib/common-lisp/" + mkdir -p "$out/lib/common-lisp/" cp -r . "$out/lib/common-lisp/cl-fuse/" - "gcc" "-x" "c" "$out/lib/common-lisp/cl-fuse/fuse-launcher.c-minus" "-fPIC" "--shared" "-lfuse" "-o" "$out/lib/common-lisp/cl-fuse/libfuse-launcher.so" + "gcc" "-x" "c" "$out/lib/common-lisp/cl-fuse/fuse-launcher.c-minus" "-fPIC" "--shared" "-lfuse" "-o" "$out/lib/common-lisp/cl-fuse/libfuse-launcher.so" ''; }; }; @@ -105,18 +105,6 @@ $out/lib/common-lisp/query-fs" ''; }; }; - serapeum = x: { - overrides = y: (x.overrides y) //{ - # Override src until quicklisp catches up to 65837f8 (see serapeum - # issue #42) - src = pkgs.fetchFromGitHub { - owner = "ruricolist"; - repo = "serapeum"; - rev = "65837f8a0d65b36369ec8d000fff5c29a395b5fe"; - sha256 = "0clwf81r2lvk1rbfvk91s9zmbkas9imf57ilqclw12mxaxlfsnbw"; - }; - }; - }; sqlite = x: { propagatedBuildInputs = [pkgs.sqlite]; overrides = y: (x.overrides y) // { @@ -134,15 +122,15 @@ $out/lib/common-lisp/query-fs" @@ -155,7 +155,7 @@ ,(unique-dir-name))) (user-homedir-pathname))) - + -(defvar *fasl-directory* (default-fasl-dir) +(defvar *fasl-directory* #P"$out/lib/common-lisp/swank/fasl/" "The directory where fasl files should be placed.") - + (defun binary-pathname (src-pathname binary-dir) @@ -277,12 +277,7 @@ (contrib-dir src-dir)))) - + (defun delete-stale-contrib-fasl-files (swank-files contrib-files fasl-dir) - (let ((newest (reduce #'max (mapcar #'file-write-date swank-files)))) - (dolist (src contrib-files) @@ -151,7 +139,7 @@ $out/lib/common-lisp/query-fs" - (<= (file-write-date fasl) newest)) - (delete-file fasl)))))) + (declare (ignore swank-files contrib-files fasl-dir))) - + (defun compile-contribs (&key (src-dir (contrib-dir *source-directory*)) (fasl-dir (contrib-dir *fasl-directory*)) EOD @@ -159,9 +147,6 @@ $out/lib/common-lisp/query-fs" }; }; uiop = x: { - parasites = (x.parasites or []) ++ [ - "uiop/version" - ]; overrides = y: (x.overrides y) // { postInstall = ((x.overrides y).postInstall or "") + '' cp -r "${pkgs.asdf}/lib/common-lisp/asdf/uiop/contrib" "$out/lib/common-lisp/uiop" @@ -200,9 +185,18 @@ $out/lib/common-lisp/query-fs" parasites = pkgs.lib.filter (x: x!= "buildnode-test") x.parasites; }; postmodern = x: { - overrides = y : (x.overrides y) // { - meta.broken = true; # 2018-04-10 - }; + asdFilesToKeep = (x.asdFilesToKeep or []) ++ ["postmodern.asd" "simple-date.asd"]; + parasites = (pkgs.lib.filter (x: x!= "postmodern/tests") x.parasites) ++ + ["simple-date/postgres-glue"]; + deps = pkgs.lib.filter + (x: x.name != quicklisp-to-nix-packages.simple-date.name) + x.deps; + }; + s-sql = x: { + parasites = pkgs.lib.filter (x: x!= "s-sql/tests") x.parasites; + deps = pkgs.lib.filter + (x: x.name != quicklisp-to-nix-packages.postmodern.name) + x.deps; }; split-sequence = x: { overrides = y: (x.overrides y) // { @@ -218,4 +212,23 @@ $out/lib/common-lisp/query-fs" ''; }; }; + dbi = x: { + parasites = []; + deps = pkgs.lib.filter + (x: + ( + x.name != quicklisp-to-nix-packages.dbd-mysql.name && + x.name != quicklisp-to-nix-packages.dbd-postgres.name && + x.name != quicklisp-to-nix-packages.dbd-sqlite3.name && + x.name != quicklisp-to-nix-packages.dbi-test.name && + true)) + x.deps; + }; + cl-cffi-gtk-glib = addNativeLibs [pkgs.glib]; + cl-cffi-gtk-gdk-pixbuf = addNativeLibs [pkgs.gdk_pixbuf]; + cl-cffi-gtk-cairo = addNativeLibs [pkgs.cairo]; + cl-cffi-gtk-pango = addNativeLibs [pkgs.pango]; + cl-cffi-gtk-gdk = addNativeLibs [pkgs.gtk3]; + cl-cffi-gtk-gtk3 = addNativeLibs [pkgs.gtk3]; + cl-webkit2 = addNativeLibs [pkgs.webkitgtk]; } diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-systems.txt b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-systems.txt index 4df1884efd..52d626888a 100644 --- a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-systems.txt +++ b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-systems.txt @@ -1,6 +1,9 @@ -cl-prevalence 3bmd +access +acclimation alexandria +anaphora +arnesi array-utils asdf-system-connections babel @@ -9,119 +12,163 @@ bordeaux-threads caveman cffi cffi-grovel +chanl chipz +chunga circular-streams -cl+ssl +clack +clack-v1-compat +cl-annot cl-ansi-text cl-async cl-async-base cl-async-repl cl-async-ssl cl-base64 +cl-cffi-gtk cl-cli cl-colors +cl-containers cl-cookie cl-css cl-csv cl-dbi +cl-dot cl-emb +cl-fad cl-fuse cl-fuse-meta-fs cl-hooks -cl-html-parse cl-html5-parser +cl-html-parse +cl-interpol cl-jpeg cl-json cl-l10n cl-libuv +cl-locale cl-mysql +closer-mop +closure-common +closure-html +cl-paths-ttf cl-pdf cl-ppcre cl-ppcre-template cl-ppcre-unicode +cl-prevalence cl-protobufs +cl-qprint cl-reexport +cl-slice cl-smtp -cl-syntax-annot -cl-syntax-anonfun -cl-syntax-markup -cl-test-more -cl-typesetting -cl-unicode -cl-unification -cl-utilities -cl-vectors -cl-who -clack -clack-v1-compat -closer-mop -closure-html clsql clsql-postgresql clsql-postgresql-socket clsql-sqlite3 clss +cl+ssl +cl-store +cl-syntax +cl-syntax-annot +cl-syntax-anonfun +cl-syntax-markup +cl-test-more +cl-typesetting +clump +cl-unicode +cl-unification +cl-utilities +cl-vectors +cl-webkit2 +cl-who clx -clx-truetype +collectors command-line-arguments css-lite css-selectors css-selectors-simple-tree css-selectors-stp cxml +cxml-stp dbd-mysql dbd-postgres dbd-sqlite3 dbus dexador +djula documentation-utils drakma +enchant esrap esrap-peg external-program +fare-csv +fare-mop +fare-quasiquote +fare-utils fast-http fast-io fiveam flexi-streams form-fiddle fset +gettext http-body hu.dwim.asdf +hu.dwim.defclass-star hunchentoot idna ieee-floats +inferior-shell iolib ironclad iterate +jonathan lack let-plus lev lfarm-client lfarm-server lfarm-ssl +lift lisp-namespace local-time log4cl lparallel lquery marshal +md5 +metabang-bind +metatilities-base misc-extensions mk-string-metrics +moptilities +more-conditions mt19937 +named-readtables +net-telent-date nibbles optima +osicat parenscript +parse-number +parser-combinators +parser.common-rules pcall plump +postmodern proc-parse prove -prove prove-asdf +puri query-fs quri +rfc2388 salza2 serapeum simple-date +simple-date-time smart-buffer split-sequence sqlite @@ -130,20 +177,31 @@ str stumpwm swank swap-bytes +symbol-munger trivia trivial-backtrace trivial-clipboard +trivial-features +trivial-garbage +trivial-gray-streams trivial-indent +trivial-main-thread trivial-mimes +trivial-package-local-nicknames trivial-types trivial-utf-8 uffi +unix-options unix-opts usocket +utilities.print-items +utilities.print-tree +uuid woo wookie xembed xkeyboard +xml.location xmls xsubseq yason diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix.nix b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix.nix index 2e23385175..11244ec84a 100644 --- a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix.nix +++ b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix.nix @@ -6,14 +6,105 @@ let quicklisp-to-nix-packages = rec { buildLispPackage = callPackage ./define-package.nix; qlOverrides = callPackage ./quicklisp-to-nix-overrides.nix {}; - "xpath_slash_test" = quicklisp-to-nix-packages."xpath"; - - - "unit-test" = buildLispPackage + "pythonic-string-reader" = buildLispPackage ((f: x: (x // (f x))) - (qlOverrides."unit-test" or (x: {})) - (import ./quicklisp-to-nix-output/unit-test.nix { + (qlOverrides."pythonic-string-reader" or (x: {})) + (import ./quicklisp-to-nix-output/pythonic-string-reader.nix { inherit fetchurl; + "named-readtables" = quicklisp-to-nix-packages."named-readtables"; + })); + + + "html-encode" = buildLispPackage + ((f: x: (x // (f x))) + (qlOverrides."html-encode" or (x: {})) + (import ./quicklisp-to-nix-output/html-encode.nix { + inherit fetchurl; + })); + + + "colorize" = buildLispPackage + ((f: x: (x // (f x))) + (qlOverrides."colorize" or (x: {})) + (import ./quicklisp-to-nix-output/colorize.nix { + inherit fetchurl; + "alexandria" = quicklisp-to-nix-packages."alexandria"; + "html-encode" = quicklisp-to-nix-packages."html-encode"; + "split-sequence" = quicklisp-to-nix-packages."split-sequence"; + })); + + + "_3bmd-ext-code-blocks" = buildLispPackage + ((f: x: (x // (f x))) + (qlOverrides."_3bmd-ext-code-blocks" or (x: {})) + (import ./quicklisp-to-nix-output/_3bmd-ext-code-blocks.nix { + inherit fetchurl; + "_3bmd" = quicklisp-to-nix-packages."_3bmd"; + "alexandria" = quicklisp-to-nix-packages."alexandria"; + "colorize" = quicklisp-to-nix-packages."colorize"; + "esrap" = quicklisp-to-nix-packages."esrap"; + "html-encode" = quicklisp-to-nix-packages."html-encode"; + "split-sequence" = quicklisp-to-nix-packages."split-sequence"; + })); + + + "dbi-test" = buildLispPackage + ((f: x: (x // (f x))) + (qlOverrides."dbi-test" or (x: {})) + (import ./quicklisp-to-nix-output/dbi-test.nix { + inherit fetchurl; + "alexandria" = quicklisp-to-nix-packages."alexandria"; + "bordeaux-threads" = quicklisp-to-nix-packages."bordeaux-threads"; + "closer-mop" = quicklisp-to-nix-packages."closer-mop"; + "dbi" = quicklisp-to-nix-packages."dbi"; + "dissect" = quicklisp-to-nix-packages."dissect"; + "rove" = quicklisp-to-nix-packages."rove"; + "split-sequence" = quicklisp-to-nix-packages."split-sequence"; + "trivial-gray-streams" = quicklisp-to-nix-packages."trivial-gray-streams"; + "trivial-types" = quicklisp-to-nix-packages."trivial-types"; + })); + + + "clunit2" = buildLispPackage + ((f: x: (x // (f x))) + (qlOverrides."clunit2" or (x: {})) + (import ./quicklisp-to-nix-output/clunit2.nix { + inherit fetchurl; + })); + + + "mgl-pax" = buildLispPackage + ((f: x: (x // (f x))) + (qlOverrides."mgl-pax" or (x: {})) + (import ./quicklisp-to-nix-output/mgl-pax.nix { + inherit fetchurl; + "_3bmd" = quicklisp-to-nix-packages."_3bmd"; + "_3bmd-ext-code-blocks" = quicklisp-to-nix-packages."_3bmd-ext-code-blocks"; + "alexandria" = quicklisp-to-nix-packages."alexandria"; + "babel" = quicklisp-to-nix-packages."babel"; + "bordeaux-threads" = quicklisp-to-nix-packages."bordeaux-threads"; + "cl-fad" = quicklisp-to-nix-packages."cl-fad"; + "colorize" = quicklisp-to-nix-packages."colorize"; + "esrap" = quicklisp-to-nix-packages."esrap"; + "html-encode" = quicklisp-to-nix-packages."html-encode"; + "ironclad" = quicklisp-to-nix-packages."ironclad"; + "named-readtables" = quicklisp-to-nix-packages."named-readtables"; + "pythonic-string-reader" = quicklisp-to-nix-packages."pythonic-string-reader"; + "split-sequence" = quicklisp-to-nix-packages."split-sequence"; + "swank" = quicklisp-to-nix-packages."swank"; + "trivial-features" = quicklisp-to-nix-packages."trivial-features"; + })); + + + "simple-tasks" = buildLispPackage + ((f: x: (x // (f x))) + (qlOverrides."simple-tasks" or (x: {})) + (import ./quicklisp-to-nix-output/simple-tasks.nix { + inherit fetchurl; + "alexandria" = quicklisp-to-nix-packages."alexandria"; + "array-utils" = quicklisp-to-nix-packages."array-utils"; + "bordeaux-threads" = quicklisp-to-nix-packages."bordeaux-threads"; + "dissect" = quicklisp-to-nix-packages."dissect"; })); @@ -29,23 +120,6 @@ let quicklisp-to-nix-packages = rec { })); - "type-i" = buildLispPackage - ((f: x: (x // (f x))) - (qlOverrides."type-i" or (x: {})) - (import ./quicklisp-to-nix-output/type-i.nix { - inherit fetchurl; - "alexandria" = quicklisp-to-nix-packages."alexandria"; - "closer-mop" = quicklisp-to-nix-packages."closer-mop"; - "introspect-environment" = quicklisp-to-nix-packages."introspect-environment"; - "lisp-namespace" = quicklisp-to-nix-packages."lisp-namespace"; - "trivia_dot_level0" = quicklisp-to-nix-packages."trivia_dot_level0"; - "trivia_dot_level1" = quicklisp-to-nix-packages."trivia_dot_level1"; - "trivia_dot_level2" = quicklisp-to-nix-packages."trivia_dot_level2"; - "trivia_dot_trivial" = quicklisp-to-nix-packages."trivia_dot_trivial"; - "trivial-cltl2" = quicklisp-to-nix-packages."trivial-cltl2"; - })); - - "trivial-macroexpand-all" = buildLispPackage ((f: x: (x // (f x))) (qlOverrides."trivial-macroexpand-all" or (x: {})) @@ -64,6 +138,160 @@ let quicklisp-to-nix-packages = rec { })); + "parse-declarations-1_dot_0" = buildLispPackage + ((f: x: (x // (f x))) + (qlOverrides."parse-declarations-1_dot_0" or (x: {})) + (import ./quicklisp-to-nix-output/parse-declarations-1_dot_0.nix { + inherit fetchurl; + })); + + + "simple-date_slash_postgres-glue" = quicklisp-to-nix-packages."simple-date"; + + + "s-sql_slash_tests" = quicklisp-to-nix-packages."s-sql"; + + + "s-sql" = buildLispPackage + ((f: x: (x // (f x))) + (qlOverrides."s-sql" or (x: {})) + (import ./quicklisp-to-nix-output/s-sql.nix { + inherit fetchurl; + "alexandria" = quicklisp-to-nix-packages."alexandria"; + "bordeaux-threads" = quicklisp-to-nix-packages."bordeaux-threads"; + "cl-base64" = quicklisp-to-nix-packages."cl-base64"; + "cl-postgres" = quicklisp-to-nix-packages."cl-postgres"; + "cl-postgres_slash_tests" = quicklisp-to-nix-packages."cl-postgres_slash_tests"; + "cl-ppcre" = quicklisp-to-nix-packages."cl-ppcre"; + "cl-unicode" = quicklisp-to-nix-packages."cl-unicode"; + "closer-mop" = quicklisp-to-nix-packages."closer-mop"; + "fiveam" = quicklisp-to-nix-packages."fiveam"; + "global-vars" = quicklisp-to-nix-packages."global-vars"; + "ironclad" = quicklisp-to-nix-packages."ironclad"; + "md5" = quicklisp-to-nix-packages."md5"; + "postmodern" = quicklisp-to-nix-packages."postmodern"; + "split-sequence" = quicklisp-to-nix-packages."split-sequence"; + "uax-15" = quicklisp-to-nix-packages."uax-15"; + "usocket" = quicklisp-to-nix-packages."usocket"; + })); + + + "global-vars" = buildLispPackage + ((f: x: (x // (f x))) + (qlOverrides."global-vars" or (x: {})) + (import ./quicklisp-to-nix-output/global-vars.nix { + inherit fetchurl; + })); + + + "cl-postgres_slash_tests" = quicklisp-to-nix-packages."cl-postgres"; + + + "stefil" = buildLispPackage + ((f: x: (x // (f x))) + (qlOverrides."stefil" or (x: {})) + (import ./quicklisp-to-nix-output/stefil.nix { + inherit fetchurl; + "alexandria" = quicklisp-to-nix-packages."alexandria"; + "iterate" = quicklisp-to-nix-packages."iterate"; + "metabang-bind" = quicklisp-to-nix-packages."metabang-bind"; + "swank" = quicklisp-to-nix-packages."swank"; + })); + + + "lfarm-common" = buildLispPackage + ((f: x: (x // (f x))) + (qlOverrides."lfarm-common" or (x: {})) + (import ./quicklisp-to-nix-output/lfarm-common.nix { + inherit fetchurl; + "alexandria" = quicklisp-to-nix-packages."alexandria"; + "bordeaux-threads" = quicklisp-to-nix-packages."bordeaux-threads"; + "cl-store" = quicklisp-to-nix-packages."cl-store"; + "flexi-streams" = quicklisp-to-nix-packages."flexi-streams"; + "split-sequence" = quicklisp-to-nix-packages."split-sequence"; + "trivial-gray-streams" = quicklisp-to-nix-packages."trivial-gray-streams"; + "usocket" = quicklisp-to-nix-packages."usocket"; + })); + + + "iolib_dot_grovel" = buildLispPackage + ((f: x: (x // (f x))) + (qlOverrides."iolib_dot_grovel" or (x: {})) + (import ./quicklisp-to-nix-output/iolib_dot_grovel.nix { + inherit fetchurl; + "alexandria" = quicklisp-to-nix-packages."alexandria"; + "babel" = quicklisp-to-nix-packages."babel"; + "cffi" = quicklisp-to-nix-packages."cffi"; + "iolib_dot_asdf" = quicklisp-to-nix-packages."iolib_dot_asdf"; + "iolib_dot_base" = quicklisp-to-nix-packages."iolib_dot_base"; + "iolib_dot_common-lisp" = quicklisp-to-nix-packages."iolib_dot_common-lisp"; + "iolib_dot_conf" = quicklisp-to-nix-packages."iolib_dot_conf"; + "split-sequence" = quicklisp-to-nix-packages."split-sequence"; + "trivial-features" = quicklisp-to-nix-packages."trivial-features"; + "uiop" = quicklisp-to-nix-packages."uiop"; + })); + + + "iolib_dot_conf" = buildLispPackage + ((f: x: (x // (f x))) + (qlOverrides."iolib_dot_conf" or (x: {})) + (import ./quicklisp-to-nix-output/iolib_dot_conf.nix { + inherit fetchurl; + "alexandria" = quicklisp-to-nix-packages."alexandria"; + "iolib_dot_asdf" = quicklisp-to-nix-packages."iolib_dot_asdf"; + })); + + + "iolib_dot_common-lisp" = buildLispPackage + ((f: x: (x // (f x))) + (qlOverrides."iolib_dot_common-lisp" or (x: {})) + (import ./quicklisp-to-nix-output/iolib_dot_common-lisp.nix { + inherit fetchurl; + "alexandria" = quicklisp-to-nix-packages."alexandria"; + "iolib_dot_asdf" = quicklisp-to-nix-packages."iolib_dot_asdf"; + "iolib_dot_conf" = quicklisp-to-nix-packages."iolib_dot_conf"; + })); + + + "iolib_dot_base" = buildLispPackage + ((f: x: (x // (f x))) + (qlOverrides."iolib_dot_base" or (x: {})) + (import ./quicklisp-to-nix-output/iolib_dot_base.nix { + inherit fetchurl; + "alexandria" = quicklisp-to-nix-packages."alexandria"; + "iolib_dot_asdf" = quicklisp-to-nix-packages."iolib_dot_asdf"; + "iolib_dot_common-lisp" = quicklisp-to-nix-packages."iolib_dot_common-lisp"; + "iolib_dot_conf" = quicklisp-to-nix-packages."iolib_dot_conf"; + "split-sequence" = quicklisp-to-nix-packages."split-sequence"; + })); + + + "iolib_dot_asdf" = buildLispPackage + ((f: x: (x // (f x))) + (qlOverrides."iolib_dot_asdf" or (x: {})) + (import ./quicklisp-to-nix-output/iolib_dot_asdf.nix { + inherit fetchurl; + "alexandria" = quicklisp-to-nix-packages."alexandria"; + })); + + + "type-i" = buildLispPackage + ((f: x: (x // (f x))) + (qlOverrides."type-i" or (x: {})) + (import ./quicklisp-to-nix-output/type-i.nix { + inherit fetchurl; + "alexandria" = quicklisp-to-nix-packages."alexandria"; + "closer-mop" = quicklisp-to-nix-packages."closer-mop"; + "introspect-environment" = quicklisp-to-nix-packages."introspect-environment"; + "lisp-namespace" = quicklisp-to-nix-packages."lisp-namespace"; + "trivia_dot_level0" = quicklisp-to-nix-packages."trivia_dot_level0"; + "trivia_dot_level1" = quicklisp-to-nix-packages."trivia_dot_level1"; + "trivia_dot_level2" = quicklisp-to-nix-packages."trivia_dot_level2"; + "trivia_dot_trivial" = quicklisp-to-nix-packages."trivia_dot_trivial"; + "trivial-cltl2" = quicklisp-to-nix-packages."trivial-cltl2"; + })); + + "trivial-cltl2" = buildLispPackage ((f: x: (x // (f x))) (qlOverrides."trivial-cltl2" or (x: {})) @@ -159,14 +387,6 @@ let quicklisp-to-nix-packages = rec { })); - "parse-declarations-1_dot_0" = buildLispPackage - ((f: x: (x // (f x))) - (qlOverrides."parse-declarations-1_dot_0" or (x: {})) - (import ./quicklisp-to-nix-output/parse-declarations-1_dot_0.nix { - inherit fetchurl; - })); - - "introspect-environment" = buildLispPackage ((f: x: (x // (f x))) (qlOverrides."introspect-environment" or (x: {})) @@ -175,22 +395,6 @@ let quicklisp-to-nix-packages = rec { })); - "global-vars" = buildLispPackage - ((f: x: (x // (f x))) - (qlOverrides."global-vars" or (x: {})) - (import ./quicklisp-to-nix-output/global-vars.nix { - inherit fetchurl; - })); - - - "fare-utils" = buildLispPackage - ((f: x: (x // (f x))) - (qlOverrides."fare-utils" or (x: {})) - (import ./quicklisp-to-nix-output/fare-utils.nix { - inherit fetchurl; - })); - - "fare-quasiquote-readtable" = buildLispPackage ((f: x: (x // (f x))) (qlOverrides."fare-quasiquote-readtable" or (x: {})) @@ -210,8 +414,16 @@ let quicklisp-to-nix-packages = rec { "alexandria" = quicklisp-to-nix-packages."alexandria"; "closer-mop" = quicklisp-to-nix-packages."closer-mop"; "fare-quasiquote" = quicklisp-to-nix-packages."fare-quasiquote"; + "fare-quasiquote-readtable" = quicklisp-to-nix-packages."fare-quasiquote-readtable"; "fare-utils" = quicklisp-to-nix-packages."fare-utils"; - "optima" = quicklisp-to-nix-packages."optima"; + "lisp-namespace" = quicklisp-to-nix-packages."lisp-namespace"; + "named-readtables" = quicklisp-to-nix-packages."named-readtables"; + "trivia_dot_level0" = quicklisp-to-nix-packages."trivia_dot_level0"; + "trivia_dot_level1" = quicklisp-to-nix-packages."trivia_dot_level1"; + "trivia_dot_level2" = quicklisp-to-nix-packages."trivia_dot_level2"; + "trivia_dot_quasiquote" = quicklisp-to-nix-packages."trivia_dot_quasiquote"; + "trivia_dot_trivial" = quicklisp-to-nix-packages."trivia_dot_trivial"; + "trivial-cltl2" = quicklisp-to-nix-packages."trivial-cltl2"; })); @@ -226,113 +438,14 @@ let quicklisp-to-nix-packages = rec { "fare-quasiquote-optima" = quicklisp-to-nix-packages."fare-quasiquote-optima"; "fare-quasiquote-readtable" = quicklisp-to-nix-packages."fare-quasiquote-readtable"; "fare-utils" = quicklisp-to-nix-packages."fare-utils"; + "lisp-namespace" = quicklisp-to-nix-packages."lisp-namespace"; "named-readtables" = quicklisp-to-nix-packages."named-readtables"; - "optima" = quicklisp-to-nix-packages."optima"; - })); - - - "fare-quasiquote" = buildLispPackage - ((f: x: (x // (f x))) - (qlOverrides."fare-quasiquote" or (x: {})) - (import ./quicklisp-to-nix-output/fare-quasiquote.nix { - inherit fetchurl; - "fare-utils" = quicklisp-to-nix-packages."fare-utils"; - })); - - - "stefil" = buildLispPackage - ((f: x: (x // (f x))) - (qlOverrides."stefil" or (x: {})) - (import ./quicklisp-to-nix-output/stefil.nix { - inherit fetchurl; - "alexandria" = quicklisp-to-nix-packages."alexandria"; - "iterate" = quicklisp-to-nix-packages."iterate"; - "metabang-bind" = quicklisp-to-nix-packages."metabang-bind"; - "swank" = quicklisp-to-nix-packages."swank"; - })); - - - "lfarm-common" = buildLispPackage - ((f: x: (x // (f x))) - (qlOverrides."lfarm-common" or (x: {})) - (import ./quicklisp-to-nix-output/lfarm-common.nix { - inherit fetchurl; - "alexandria" = quicklisp-to-nix-packages."alexandria"; - "bordeaux-threads" = quicklisp-to-nix-packages."bordeaux-threads"; - "cl-store" = quicklisp-to-nix-packages."cl-store"; - "flexi-streams" = quicklisp-to-nix-packages."flexi-streams"; - "split-sequence" = quicklisp-to-nix-packages."split-sequence"; - "trivial-gray-streams" = quicklisp-to-nix-packages."trivial-gray-streams"; - "usocket" = quicklisp-to-nix-packages."usocket"; - })); - - - "rt" = buildLispPackage - ((f: x: (x // (f x))) - (qlOverrides."rt" or (x: {})) - (import ./quicklisp-to-nix-output/rt.nix { - inherit fetchurl; - })); - - - "iolib_dot_grovel" = buildLispPackage - ((f: x: (x // (f x))) - (qlOverrides."iolib_dot_grovel" or (x: {})) - (import ./quicklisp-to-nix-output/iolib_dot_grovel.nix { - inherit fetchurl; - "alexandria" = quicklisp-to-nix-packages."alexandria"; - "babel" = quicklisp-to-nix-packages."babel"; - "cffi" = quicklisp-to-nix-packages."cffi"; - "iolib_dot_asdf" = quicklisp-to-nix-packages."iolib_dot_asdf"; - "iolib_dot_base" = quicklisp-to-nix-packages."iolib_dot_base"; - "iolib_dot_common-lisp" = quicklisp-to-nix-packages."iolib_dot_common-lisp"; - "iolib_dot_conf" = quicklisp-to-nix-packages."iolib_dot_conf"; - "split-sequence" = quicklisp-to-nix-packages."split-sequence"; - "trivial-features" = quicklisp-to-nix-packages."trivial-features"; - "uiop" = quicklisp-to-nix-packages."uiop"; - })); - - - "iolib_dot_conf" = buildLispPackage - ((f: x: (x // (f x))) - (qlOverrides."iolib_dot_conf" or (x: {})) - (import ./quicklisp-to-nix-output/iolib_dot_conf.nix { - inherit fetchurl; - "alexandria" = quicklisp-to-nix-packages."alexandria"; - "iolib_dot_asdf" = quicklisp-to-nix-packages."iolib_dot_asdf"; - })); - - - "iolib_dot_common-lisp" = buildLispPackage - ((f: x: (x // (f x))) - (qlOverrides."iolib_dot_common-lisp" or (x: {})) - (import ./quicklisp-to-nix-output/iolib_dot_common-lisp.nix { - inherit fetchurl; - "alexandria" = quicklisp-to-nix-packages."alexandria"; - "iolib_dot_asdf" = quicklisp-to-nix-packages."iolib_dot_asdf"; - "iolib_dot_conf" = quicklisp-to-nix-packages."iolib_dot_conf"; - })); - - - "iolib_dot_base" = buildLispPackage - ((f: x: (x // (f x))) - (qlOverrides."iolib_dot_base" or (x: {})) - (import ./quicklisp-to-nix-output/iolib_dot_base.nix { - inherit fetchurl; - "alexandria" = quicklisp-to-nix-packages."alexandria"; - "iolib_dot_asdf" = quicklisp-to-nix-packages."iolib_dot_asdf"; - "iolib_dot_common-lisp" = quicklisp-to-nix-packages."iolib_dot_common-lisp"; - "iolib_dot_conf" = quicklisp-to-nix-packages."iolib_dot_conf"; - "split-sequence" = quicklisp-to-nix-packages."split-sequence"; - })); - - - "iolib_dot_asdf" = buildLispPackage - ((f: x: (x // (f x))) - (qlOverrides."iolib_dot_asdf" or (x: {})) - (import ./quicklisp-to-nix-output/iolib_dot_asdf.nix { - inherit fetchurl; - "alexandria" = quicklisp-to-nix-packages."alexandria"; + "trivia_dot_level0" = quicklisp-to-nix-packages."trivia_dot_level0"; + "trivia_dot_level1" = quicklisp-to-nix-packages."trivia_dot_level1"; + "trivia_dot_level2" = quicklisp-to-nix-packages."trivia_dot_level2"; + "trivia_dot_quasiquote" = quicklisp-to-nix-packages."trivia_dot_quasiquote"; + "trivia_dot_trivial" = quicklisp-to-nix-packages."trivia_dot_trivial"; + "trivial-cltl2" = quicklisp-to-nix-packages."trivial-cltl2"; })); @@ -368,18 +481,44 @@ let quicklisp-to-nix-packages = rec { })); + "uax-15" = buildLispPackage + ((f: x: (x // (f x))) + (qlOverrides."uax-15" or (x: {})) + (import ./quicklisp-to-nix-output/uax-15.nix { + inherit fetchurl; + "cl-ppcre" = quicklisp-to-nix-packages."cl-ppcre"; + "fiveam" = quicklisp-to-nix-packages."fiveam"; + "split-sequence" = quicklisp-to-nix-packages."split-sequence"; + "uiop" = quicklisp-to-nix-packages."uiop"; + })); + + "cl-postgres" = buildLispPackage ((f: x: (x // (f x))) (qlOverrides."cl-postgres" or (x: {})) (import ./quicklisp-to-nix-output/cl-postgres.nix { inherit fetchurl; + "alexandria" = quicklisp-to-nix-packages."alexandria"; + "bordeaux-threads" = quicklisp-to-nix-packages."bordeaux-threads"; + "cl-base64" = quicklisp-to-nix-packages."cl-base64"; + "cl-ppcre" = quicklisp-to-nix-packages."cl-ppcre"; "fiveam" = quicklisp-to-nix-packages."fiveam"; + "ironclad" = quicklisp-to-nix-packages."ironclad"; "md5" = quicklisp-to-nix-packages."md5"; + "simple-date" = quicklisp-to-nix-packages."simple-date"; + "simple-date_slash_postgres-glue" = quicklisp-to-nix-packages."simple-date_slash_postgres-glue"; "split-sequence" = quicklisp-to-nix-packages."split-sequence"; + "uax-15" = quicklisp-to-nix-packages."uax-15"; "usocket" = quicklisp-to-nix-packages."usocket"; })); + "xpath_slash_test" = quicklisp-to-nix-packages."xpath"; + + + "cxml_slash_test" = quicklisp-to-nix-packages."cxml"; + + "xpath" = buildLispPackage ((f: x: (x // (f x))) (qlOverrides."xpath" or (x: {})) @@ -398,27 +537,6 @@ let quicklisp-to-nix-packages = rec { })); - "cxml-stp" = buildLispPackage - ((f: x: (x // (f x))) - (qlOverrides."cxml-stp" or (x: {})) - (import ./quicklisp-to-nix-output/cxml-stp.nix { - inherit fetchurl; - "alexandria" = quicklisp-to-nix-packages."alexandria"; - "babel" = quicklisp-to-nix-packages."babel"; - "cl-ppcre" = quicklisp-to-nix-packages."cl-ppcre"; - "closure-common" = quicklisp-to-nix-packages."closure-common"; - "cxml" = quicklisp-to-nix-packages."cxml"; - "parse-number" = quicklisp-to-nix-packages."parse-number"; - "puri" = quicklisp-to-nix-packages."puri"; - "rt" = quicklisp-to-nix-packages."rt"; - "trivial-features" = quicklisp-to-nix-packages."trivial-features"; - "trivial-gray-streams" = quicklisp-to-nix-packages."trivial-gray-streams"; - "xpath" = quicklisp-to-nix-packages."xpath"; - "xpath_slash_test" = quicklisp-to-nix-packages."xpath_slash_test"; - "yacc" = quicklisp-to-nix-packages."yacc"; - })); - - "yacc" = buildLispPackage ((f: x: (x // (f x))) (qlOverrides."yacc" or (x: {})) @@ -427,29 +545,6 @@ let quicklisp-to-nix-packages = rec { })); - "symbol-munger" = buildLispPackage - ((f: x: (x // (f x))) - (qlOverrides."symbol-munger" or (x: {})) - (import ./quicklisp-to-nix-output/symbol-munger.nix { - inherit fetchurl; - "alexandria" = quicklisp-to-nix-packages."alexandria"; - "iterate" = quicklisp-to-nix-packages."iterate"; - })); - - - "collectors" = buildLispPackage - ((f: x: (x // (f x))) - (qlOverrides."collectors" or (x: {})) - (import ./quicklisp-to-nix-output/collectors.nix { - inherit fetchurl; - "alexandria" = quicklisp-to-nix-packages."alexandria"; - "closer-mop" = quicklisp-to-nix-packages."closer-mop"; - "iterate" = quicklisp-to-nix-packages."iterate"; - "lisp-unit2" = quicklisp-to-nix-packages."lisp-unit2"; - "symbol-munger" = quicklisp-to-nix-packages."symbol-munger"; - })); - - "buildnode-xhtml" = buildLispPackage ((f: x: (x // (f x))) (qlOverrides."buildnode-xhtml" or (x: {})) @@ -507,25 +602,6 @@ let quicklisp-to-nix-packages = rec { })); - "cl-store" = buildLispPackage - ((f: x: (x // (f x))) - (qlOverrides."cl-store" or (x: {})) - (import ./quicklisp-to-nix-output/cl-store.nix { - inherit fetchurl; - "rt" = quicklisp-to-nix-packages."rt"; - })); - - - "cl-paths-ttf" = buildLispPackage - ((f: x: (x // (f x))) - (qlOverrides."cl-paths-ttf" or (x: {})) - (import ./quicklisp-to-nix-output/cl-paths-ttf.nix { - inherit fetchurl; - "cl-paths" = quicklisp-to-nix-packages."cl-paths"; - "zpb-ttf" = quicklisp-to-nix-packages."zpb-ttf"; - })); - - "fiasco" = buildLispPackage ((f: x: (x // (f x))) (qlOverrides."fiasco" or (x: {})) @@ -536,24 +612,6 @@ let quicklisp-to-nix-packages = rec { })); - "clsql-uffi" = buildLispPackage - ((f: x: (x // (f x))) - (qlOverrides."clsql-uffi" or (x: {})) - (import ./quicklisp-to-nix-output/clsql-uffi.nix { - inherit fetchurl; - "clsql" = quicklisp-to-nix-packages."clsql"; - "uffi" = quicklisp-to-nix-packages."uffi"; - })); - - - "cl-paths" = buildLispPackage - ((f: x: (x // (f x))) - (qlOverrides."cl-paths" or (x: {})) - (import ./quicklisp-to-nix-output/cl-paths.nix { - inherit fetchurl; - })); - - "cl-aa" = buildLispPackage ((f: x: (x // (f x))) (qlOverrides."cl-aa" or (x: {})) @@ -562,6 +620,24 @@ let quicklisp-to-nix-packages = rec { })); + "clump-binary-tree" = buildLispPackage + ((f: x: (x // (f x))) + (qlOverrides."clump-binary-tree" or (x: {})) + (import ./quicklisp-to-nix-output/clump-binary-tree.nix { + inherit fetchurl; + "acclimation" = quicklisp-to-nix-packages."acclimation"; + })); + + + "clump-2-3-tree" = buildLispPackage + ((f: x: (x // (f x))) + (qlOverrides."clump-2-3-tree" or (x: {})) + (import ./quicklisp-to-nix-output/clump-2-3-tree.nix { + inherit fetchurl; + "acclimation" = quicklisp-to-nix-packages."acclimation"; + })); + + "cl-markup" = buildLispPackage ((f: x: (x // (f x))) (qlOverrides."cl-markup" or (x: {})) @@ -578,6 +654,57 @@ let quicklisp-to-nix-packages = rec { })); + "clsql-uffi" = buildLispPackage + ((f: x: (x // (f x))) + (qlOverrides."clsql-uffi" or (x: {})) + (import ./quicklisp-to-nix-output/clsql-uffi.nix { + inherit fetchurl; + "clsql" = quicklisp-to-nix-packages."clsql"; + "uffi" = quicklisp-to-nix-packages."uffi"; + })); + + + "clunit" = buildLispPackage + ((f: x: (x // (f x))) + (qlOverrides."clunit" or (x: {})) + (import ./quicklisp-to-nix-output/clunit.nix { + inherit fetchurl; + })); + + + "usocket-server" = buildLispPackage + ((f: x: (x // (f x))) + (qlOverrides."usocket-server" or (x: {})) + (import ./quicklisp-to-nix-output/usocket-server.nix { + inherit fetchurl; + "alexandria" = quicklisp-to-nix-packages."alexandria"; + "bordeaux-threads" = quicklisp-to-nix-packages."bordeaux-threads"; + "split-sequence" = quicklisp-to-nix-packages."split-sequence"; + "usocket" = quicklisp-to-nix-packages."usocket"; + })); + + + "s-xml" = buildLispPackage + ((f: x: (x // (f x))) + (qlOverrides."s-xml" or (x: {})) + (import ./quicklisp-to-nix-output/s-xml.nix { + inherit fetchurl; + })); + + + "s-sysdeps" = buildLispPackage + ((f: x: (x // (f x))) + (qlOverrides."s-sysdeps" or (x: {})) + (import ./quicklisp-to-nix-output/s-sysdeps.nix { + inherit fetchurl; + "alexandria" = quicklisp-to-nix-packages."alexandria"; + "bordeaux-threads" = quicklisp-to-nix-packages."bordeaux-threads"; + "split-sequence" = quicklisp-to-nix-packages."split-sequence"; + "usocket" = quicklisp-to-nix-packages."usocket"; + "usocket-server" = quicklisp-to-nix-packages."usocket-server"; + })); + + "cl-ppcre-test" = quicklisp-to-nix-packages."cl-ppcre"; @@ -589,27 +716,10 @@ let quicklisp-to-nix-packages = rec { })); - "puri" = buildLispPackage + "cl-paths" = buildLispPackage ((f: x: (x // (f x))) - (qlOverrides."puri" or (x: {})) - (import ./quicklisp-to-nix-output/puri.nix { - inherit fetchurl; - "ptester" = quicklisp-to-nix-packages."ptester"; - })); - - - "parse-number" = buildLispPackage - ((f: x: (x // (f x))) - (qlOverrides."parse-number" or (x: {})) - (import ./quicklisp-to-nix-output/parse-number.nix { - inherit fetchurl; - })); - - - "metabang-bind" = buildLispPackage - ((f: x: (x // (f x))) - (qlOverrides."metabang-bind" or (x: {})) - (import ./quicklisp-to-nix-output/metabang-bind.nix { + (qlOverrides."cl-paths" or (x: {})) + (import ./quicklisp-to-nix-output/cl-paths.nix { inherit fetchurl; })); @@ -620,19 +730,6 @@ let quicklisp-to-nix-packages = rec { (import ./quicklisp-to-nix-output/hu_dot_dwim_dot_stefil.nix { inherit fetchurl; "alexandria" = quicklisp-to-nix-packages."alexandria"; - "hu_dot_dwim_dot_asdf" = quicklisp-to-nix-packages."hu_dot_dwim_dot_asdf"; - })); - - - "closure-common" = buildLispPackage - ((f: x: (x // (f x))) - (qlOverrides."closure-common" or (x: {})) - (import ./quicklisp-to-nix-output/closure-common.nix { - inherit fetchurl; - "alexandria" = quicklisp-to-nix-packages."alexandria"; - "babel" = quicklisp-to-nix-packages."babel"; - "trivial-features" = quicklisp-to-nix-packages."trivial-features"; - "trivial-gray-streams" = quicklisp-to-nix-packages."trivial-gray-streams"; })); @@ -662,6 +759,14 @@ let quicklisp-to-nix-packages = rec { })); + "unit-test" = buildLispPackage + ((f: x: (x // (f x))) + (qlOverrides."unit-test" or (x: {})) + (import ./quicklisp-to-nix-output/unit-test.nix { + inherit fetchurl; + })); + + "dbi" = buildLispPackage ((f: x: (x // (f x))) (qlOverrides."dbi" or (x: {})) @@ -669,49 +774,141 @@ let quicklisp-to-nix-packages = rec { inherit fetchurl; "alexandria" = quicklisp-to-nix-packages."alexandria"; "bordeaux-threads" = quicklisp-to-nix-packages."bordeaux-threads"; - "cl-annot" = quicklisp-to-nix-packages."cl-annot"; - "cl-syntax" = quicklisp-to-nix-packages."cl-syntax"; - "cl-syntax-annot" = quicklisp-to-nix-packages."cl-syntax-annot"; + "cl-mysql" = quicklisp-to-nix-packages."cl-mysql"; + "cl-postgres" = quicklisp-to-nix-packages."cl-postgres"; "closer-mop" = quicklisp-to-nix-packages."closer-mop"; - "named-readtables" = quicklisp-to-nix-packages."named-readtables"; + "dbd-mysql" = quicklisp-to-nix-packages."dbd-mysql"; + "dbd-postgres" = quicklisp-to-nix-packages."dbd-postgres"; + "dbd-sqlite3" = quicklisp-to-nix-packages."dbd-sqlite3"; + "dbi-test" = quicklisp-to-nix-packages."dbi-test"; + "rove" = quicklisp-to-nix-packages."rove"; "split-sequence" = quicklisp-to-nix-packages."split-sequence"; + "sqlite" = quicklisp-to-nix-packages."sqlite"; + "trivial-garbage" = quicklisp-to-nix-packages."trivial-garbage"; "trivial-types" = quicklisp-to-nix-packages."trivial-types"; })); - "lisp-unit2" = buildLispPackage + "cl-cffi-gtk-pango" = buildLispPackage ((f: x: (x // (f x))) - (qlOverrides."lisp-unit2" or (x: {})) - (import ./quicklisp-to-nix-output/lisp-unit2.nix { + (qlOverrides."cl-cffi-gtk-pango" or (x: {})) + (import ./quicklisp-to-nix-output/cl-cffi-gtk-pango.nix { inherit fetchurl; "alexandria" = quicklisp-to-nix-packages."alexandria"; - "cl-interpol" = quicklisp-to-nix-packages."cl-interpol"; - "cl-ppcre" = quicklisp-to-nix-packages."cl-ppcre"; - "cl-unicode" = quicklisp-to-nix-packages."cl-unicode"; - "flexi-streams" = quicklisp-to-nix-packages."flexi-streams"; + "babel" = quicklisp-to-nix-packages."babel"; + "bordeaux-threads" = quicklisp-to-nix-packages."bordeaux-threads"; + "cffi" = quicklisp-to-nix-packages."cffi"; + "cl-cffi-gtk-cairo" = quicklisp-to-nix-packages."cl-cffi-gtk-cairo"; + "cl-cffi-gtk-glib" = quicklisp-to-nix-packages."cl-cffi-gtk-glib"; + "cl-cffi-gtk-gobject" = quicklisp-to-nix-packages."cl-cffi-gtk-gobject"; + "closer-mop" = quicklisp-to-nix-packages."closer-mop"; "iterate" = quicklisp-to-nix-packages."iterate"; - "named-readtables" = quicklisp-to-nix-packages."named-readtables"; - "symbol-munger" = quicklisp-to-nix-packages."symbol-munger"; + "trivial-features" = quicklisp-to-nix-packages."trivial-features"; + "trivial-garbage" = quicklisp-to-nix-packages."trivial-garbage"; })); - "cl-interpol" = buildLispPackage + "cl-cffi-gtk-gobject" = buildLispPackage ((f: x: (x // (f x))) - (qlOverrides."cl-interpol" or (x: {})) - (import ./quicklisp-to-nix-output/cl-interpol.nix { + (qlOverrides."cl-cffi-gtk-gobject" or (x: {})) + (import ./quicklisp-to-nix-output/cl-cffi-gtk-gobject.nix { inherit fetchurl; - "cl-ppcre" = quicklisp-to-nix-packages."cl-ppcre"; - "cl-unicode" = quicklisp-to-nix-packages."cl-unicode"; - "flexi-streams" = quicklisp-to-nix-packages."flexi-streams"; - "named-readtables" = quicklisp-to-nix-packages."named-readtables"; + "alexandria" = quicklisp-to-nix-packages."alexandria"; + "babel" = quicklisp-to-nix-packages."babel"; + "bordeaux-threads" = quicklisp-to-nix-packages."bordeaux-threads"; + "cffi" = quicklisp-to-nix-packages."cffi"; + "cl-cffi-gtk-glib" = quicklisp-to-nix-packages."cl-cffi-gtk-glib"; + "closer-mop" = quicklisp-to-nix-packages."closer-mop"; + "iterate" = quicklisp-to-nix-packages."iterate"; + "trivial-features" = quicklisp-to-nix-packages."trivial-features"; + "trivial-garbage" = quicklisp-to-nix-packages."trivial-garbage"; })); - "lift" = buildLispPackage + "cl-cffi-gtk-glib" = buildLispPackage ((f: x: (x // (f x))) - (qlOverrides."lift" or (x: {})) - (import ./quicklisp-to-nix-output/lift.nix { + (qlOverrides."cl-cffi-gtk-glib" or (x: {})) + (import ./quicklisp-to-nix-output/cl-cffi-gtk-glib.nix { inherit fetchurl; + "alexandria" = quicklisp-to-nix-packages."alexandria"; + "babel" = quicklisp-to-nix-packages."babel"; + "bordeaux-threads" = quicklisp-to-nix-packages."bordeaux-threads"; + "cffi" = quicklisp-to-nix-packages."cffi"; + "iterate" = quicklisp-to-nix-packages."iterate"; + "trivial-features" = quicklisp-to-nix-packages."trivial-features"; + })); + + + "cl-cffi-gtk-gio" = buildLispPackage + ((f: x: (x // (f x))) + (qlOverrides."cl-cffi-gtk-gio" or (x: {})) + (import ./quicklisp-to-nix-output/cl-cffi-gtk-gio.nix { + inherit fetchurl; + "alexandria" = quicklisp-to-nix-packages."alexandria"; + "babel" = quicklisp-to-nix-packages."babel"; + "bordeaux-threads" = quicklisp-to-nix-packages."bordeaux-threads"; + "cffi" = quicklisp-to-nix-packages."cffi"; + "cl-cffi-gtk-glib" = quicklisp-to-nix-packages."cl-cffi-gtk-glib"; + "cl-cffi-gtk-gobject" = quicklisp-to-nix-packages."cl-cffi-gtk-gobject"; + "closer-mop" = quicklisp-to-nix-packages."closer-mop"; + "iterate" = quicklisp-to-nix-packages."iterate"; + "trivial-features" = quicklisp-to-nix-packages."trivial-features"; + "trivial-garbage" = quicklisp-to-nix-packages."trivial-garbage"; + })); + + + "cl-cffi-gtk-gdk-pixbuf" = buildLispPackage + ((f: x: (x // (f x))) + (qlOverrides."cl-cffi-gtk-gdk-pixbuf" or (x: {})) + (import ./quicklisp-to-nix-output/cl-cffi-gtk-gdk-pixbuf.nix { + inherit fetchurl; + "alexandria" = quicklisp-to-nix-packages."alexandria"; + "babel" = quicklisp-to-nix-packages."babel"; + "bordeaux-threads" = quicklisp-to-nix-packages."bordeaux-threads"; + "cffi" = quicklisp-to-nix-packages."cffi"; + "cl-cffi-gtk-glib" = quicklisp-to-nix-packages."cl-cffi-gtk-glib"; + "cl-cffi-gtk-gobject" = quicklisp-to-nix-packages."cl-cffi-gtk-gobject"; + "closer-mop" = quicklisp-to-nix-packages."closer-mop"; + "iterate" = quicklisp-to-nix-packages."iterate"; + "trivial-features" = quicklisp-to-nix-packages."trivial-features"; + "trivial-garbage" = quicklisp-to-nix-packages."trivial-garbage"; + })); + + + "cl-cffi-gtk-gdk" = buildLispPackage + ((f: x: (x // (f x))) + (qlOverrides."cl-cffi-gtk-gdk" or (x: {})) + (import ./quicklisp-to-nix-output/cl-cffi-gtk-gdk.nix { + inherit fetchurl; + "alexandria" = quicklisp-to-nix-packages."alexandria"; + "babel" = quicklisp-to-nix-packages."babel"; + "bordeaux-threads" = quicklisp-to-nix-packages."bordeaux-threads"; + "cffi" = quicklisp-to-nix-packages."cffi"; + "cl-cffi-gtk-cairo" = quicklisp-to-nix-packages."cl-cffi-gtk-cairo"; + "cl-cffi-gtk-gdk-pixbuf" = quicklisp-to-nix-packages."cl-cffi-gtk-gdk-pixbuf"; + "cl-cffi-gtk-gio" = quicklisp-to-nix-packages."cl-cffi-gtk-gio"; + "cl-cffi-gtk-glib" = quicklisp-to-nix-packages."cl-cffi-gtk-glib"; + "cl-cffi-gtk-gobject" = quicklisp-to-nix-packages."cl-cffi-gtk-gobject"; + "cl-cffi-gtk-pango" = quicklisp-to-nix-packages."cl-cffi-gtk-pango"; + "closer-mop" = quicklisp-to-nix-packages."closer-mop"; + "iterate" = quicklisp-to-nix-packages."iterate"; + "trivial-features" = quicklisp-to-nix-packages."trivial-features"; + "trivial-garbage" = quicklisp-to-nix-packages."trivial-garbage"; + })); + + + "cl-cffi-gtk-cairo" = buildLispPackage + ((f: x: (x // (f x))) + (qlOverrides."cl-cffi-gtk-cairo" or (x: {})) + (import ./quicklisp-to-nix-output/cl-cffi-gtk-cairo.nix { + inherit fetchurl; + "alexandria" = quicklisp-to-nix-packages."alexandria"; + "babel" = quicklisp-to-nix-packages."babel"; + "bordeaux-threads" = quicklisp-to-nix-packages."bordeaux-threads"; + "cffi" = quicklisp-to-nix-packages."cffi"; + "cl-cffi-gtk-glib" = quicklisp-to-nix-packages."cl-cffi-gtk-glib"; + "iterate" = quicklisp-to-nix-packages."iterate"; + "trivial-features" = quicklisp-to-nix-packages."trivial-features"; })); @@ -728,6 +925,7 @@ let quicklisp-to-nix-packages = rec { (qlOverrides."kmrcl" or (x: {})) (import ./quicklisp-to-nix-output/kmrcl.nix { inherit fetchurl; + "rt" = quicklisp-to-nix-packages."rt"; })); @@ -742,23 +940,6 @@ let quicklisp-to-nix-packages = rec { })); - "trivial-gray-streams" = buildLispPackage - ((f: x: (x // (f x))) - (qlOverrides."trivial-gray-streams" or (x: {})) - (import ./quicklisp-to-nix-output/trivial-gray-streams.nix { - inherit fetchurl; - })); - - - "trivial-garbage" = buildLispPackage - ((f: x: (x // (f x))) - (qlOverrides."trivial-garbage" or (x: {})) - (import ./quicklisp-to-nix-output/trivial-garbage.nix { - inherit fetchurl; - "rt" = quicklisp-to-nix-packages."rt"; - })); - - "rove" = buildLispPackage ((f: x: (x // (f x))) (qlOverrides."rove" or (x: {})) @@ -770,22 +951,6 @@ let quicklisp-to-nix-packages = rec { })); - "rfc2388" = buildLispPackage - ((f: x: (x // (f x))) - (qlOverrides."rfc2388" or (x: {})) - (import ./quicklisp-to-nix-output/rfc2388.nix { - inherit fetchurl; - })); - - - "named-readtables" = buildLispPackage - ((f: x: (x // (f x))) - (qlOverrides."named-readtables" or (x: {})) - (import ./quicklisp-to-nix-output/named-readtables.nix { - inherit fetchurl; - })); - - "myway" = buildLispPackage ((f: x: (x // (f x))) (qlOverrides."myway" or (x: {})) @@ -802,14 +967,6 @@ let quicklisp-to-nix-packages = rec { })); - "md5" = buildLispPackage - ((f: x: (x // (f x))) - (qlOverrides."md5" or (x: {})) - (import ./quicklisp-to-nix-output/md5.nix { - inherit fetchurl; - })); - - "map-set" = buildLispPackage ((f: x: (x // (f x))) (qlOverrides."map-set" or (x: {})) @@ -826,7 +983,6 @@ let quicklisp-to-nix-packages = rec { "alexandria" = quicklisp-to-nix-packages."alexandria"; "bordeaux-threads" = quicklisp-to-nix-packages."bordeaux-threads"; "ironclad" = quicklisp-to-nix-packages."ironclad"; - "nibbles" = quicklisp-to-nix-packages."nibbles"; })); @@ -847,30 +1003,6 @@ let quicklisp-to-nix-packages = rec { })); - "jonathan" = buildLispPackage - ((f: x: (x // (f x))) - (qlOverrides."jonathan" or (x: {})) - (import ./quicklisp-to-nix-output/jonathan.nix { - inherit fetchurl; - "alexandria" = quicklisp-to-nix-packages."alexandria"; - "babel" = quicklisp-to-nix-packages."babel"; - "cffi" = quicklisp-to-nix-packages."cffi"; - "cffi-grovel" = quicklisp-to-nix-packages."cffi-grovel"; - "cffi-toolchain" = quicklisp-to-nix-packages."cffi-toolchain"; - "cl-annot" = quicklisp-to-nix-packages."cl-annot"; - "cl-ppcre" = quicklisp-to-nix-packages."cl-ppcre"; - "cl-syntax" = quicklisp-to-nix-packages."cl-syntax"; - "cl-syntax-annot" = quicklisp-to-nix-packages."cl-syntax-annot"; - "fast-io" = quicklisp-to-nix-packages."fast-io"; - "named-readtables" = quicklisp-to-nix-packages."named-readtables"; - "proc-parse" = quicklisp-to-nix-packages."proc-parse"; - "static-vectors" = quicklisp-to-nix-packages."static-vectors"; - "trivial-features" = quicklisp-to-nix-packages."trivial-features"; - "trivial-gray-streams" = quicklisp-to-nix-packages."trivial-gray-streams"; - "trivial-types" = quicklisp-to-nix-packages."trivial-types"; - })); - - "do-urlencode" = buildLispPackage ((f: x: (x // (f x))) (qlOverrides."do-urlencode" or (x: {})) @@ -932,7 +1064,6 @@ let quicklisp-to-nix-packages = rec { "local-time" = quicklisp-to-nix-packages."local-time"; "md5" = quicklisp-to-nix-packages."md5"; "named-readtables" = quicklisp-to-nix-packages."named-readtables"; - "nibbles" = quicklisp-to-nix-packages."nibbles"; "proc-parse" = quicklisp-to-nix-packages."proc-parse"; "quri" = quicklisp-to-nix-packages."quri"; "rfc2388" = quicklisp-to-nix-packages."rfc2388"; @@ -987,16 +1118,6 @@ let quicklisp-to-nix-packages = rec { })); - "cl-syntax" = buildLispPackage - ((f: x: (x // (f x))) - (qlOverrides."cl-syntax" or (x: {})) - (import ./quicklisp-to-nix-output/cl-syntax.nix { - inherit fetchurl; - "named-readtables" = quicklisp-to-nix-packages."named-readtables"; - "trivial-types" = quicklisp-to-nix-packages."trivial-types"; - })); - - "cl-project" = buildLispPackage ((f: x: (x // (f x))) (qlOverrides."cl-project" or (x: {})) @@ -1004,11 +1125,10 @@ let quicklisp-to-nix-packages = rec { inherit fetchurl; "alexandria" = quicklisp-to-nix-packages."alexandria"; "anaphora" = quicklisp-to-nix-packages."anaphora"; - "bordeaux-threads" = quicklisp-to-nix-packages."bordeaux-threads"; "cl-ansi-text" = quicklisp-to-nix-packages."cl-ansi-text"; "cl-colors" = quicklisp-to-nix-packages."cl-colors"; + "cl-colors2" = quicklisp-to-nix-packages."cl-colors2"; "cl-emb" = quicklisp-to-nix-packages."cl-emb"; - "cl-fad" = quicklisp-to-nix-packages."cl-fad"; "cl-ppcre" = quicklisp-to-nix-packages."cl-ppcre"; "let-plus" = quicklisp-to-nix-packages."let-plus"; "local-time" = quicklisp-to-nix-packages."local-time"; @@ -1017,33 +1137,14 @@ let quicklisp-to-nix-packages = rec { })); - "cl-fad" = buildLispPackage + "cl-colors2" = buildLispPackage ((f: x: (x // (f x))) - (qlOverrides."cl-fad" or (x: {})) - (import ./quicklisp-to-nix-output/cl-fad.nix { + (qlOverrides."cl-colors2" or (x: {})) + (import ./quicklisp-to-nix-output/cl-colors2.nix { inherit fetchurl; "alexandria" = quicklisp-to-nix-packages."alexandria"; - "bordeaux-threads" = quicklisp-to-nix-packages."bordeaux-threads"; "cl-ppcre" = quicklisp-to-nix-packages."cl-ppcre"; - "unit-test" = quicklisp-to-nix-packages."unit-test"; - })); - - - "cl-annot" = buildLispPackage - ((f: x: (x // (f x))) - (qlOverrides."cl-annot" or (x: {})) - (import ./quicklisp-to-nix-output/cl-annot.nix { - inherit fetchurl; - "alexandria" = quicklisp-to-nix-packages."alexandria"; - })); - - - "chunga" = buildLispPackage - ((f: x: (x // (f x))) - (qlOverrides."chunga" or (x: {})) - (import ./quicklisp-to-nix-output/chunga.nix { - inherit fetchurl; - "trivial-gray-streams" = quicklisp-to-nix-packages."trivial-gray-streams"; + "clunit2" = quicklisp-to-nix-packages."clunit2"; })); @@ -1059,15 +1160,6 @@ let quicklisp-to-nix-packages = rec { })); - "anaphora" = buildLispPackage - ((f: x: (x // (f x))) - (qlOverrides."anaphora" or (x: {})) - (import ./quicklisp-to-nix-output/anaphora.nix { - inherit fetchurl; - "rt" = quicklisp-to-nix-packages."rt"; - })); - - "vom" = buildLispPackage ((f: x: (x // (f x))) (qlOverrides."vom" or (x: {})) @@ -1076,27 +1168,27 @@ let quicklisp-to-nix-packages = rec { })); - "trivial-features" = buildLispPackage + "rt" = buildLispPackage ((f: x: (x // (f x))) - (qlOverrides."trivial-features" or (x: {})) - (import ./quicklisp-to-nix-output/trivial-features.nix { + (qlOverrides."rt" or (x: {})) + (import ./quicklisp-to-nix-output/rt.nix { inherit fetchurl; })); - "s-xml" = buildLispPackage + "lisp-unit2" = buildLispPackage ((f: x: (x // (f x))) - (qlOverrides."s-xml" or (x: {})) - (import ./quicklisp-to-nix-output/s-xml.nix { - inherit fetchurl; - })); - - - "s-sysdeps" = buildLispPackage - ((f: x: (x // (f x))) - (qlOverrides."s-sysdeps" or (x: {})) - (import ./quicklisp-to-nix-output/s-sysdeps.nix { + (qlOverrides."lisp-unit2" or (x: {})) + (import ./quicklisp-to-nix-output/lisp-unit2.nix { inherit fetchurl; + "alexandria" = quicklisp-to-nix-packages."alexandria"; + "cl-interpol" = quicklisp-to-nix-packages."cl-interpol"; + "cl-ppcre" = quicklisp-to-nix-packages."cl-ppcre"; + "cl-unicode" = quicklisp-to-nix-packages."cl-unicode"; + "flexi-streams" = quicklisp-to-nix-packages."flexi-streams"; + "iterate" = quicklisp-to-nix-packages."iterate"; + "named-readtables" = quicklisp-to-nix-packages."named-readtables"; + "symbol-munger" = quicklisp-to-nix-packages."symbol-munger"; })); @@ -1127,6 +1219,33 @@ let quicklisp-to-nix-packages = rec { })); + "xml_dot_location" = buildLispPackage + ((f: x: (x // (f x))) + (qlOverrides."xml_dot_location" or (x: {})) + (import ./quicklisp-to-nix-output/xml_dot_location.nix { + inherit fetchurl; + "alexandria" = quicklisp-to-nix-packages."alexandria"; + "anaphora" = quicklisp-to-nix-packages."anaphora"; + "babel" = quicklisp-to-nix-packages."babel"; + "cl-ppcre" = quicklisp-to-nix-packages."cl-ppcre"; + "closer-mop" = quicklisp-to-nix-packages."closer-mop"; + "closure-common" = quicklisp-to-nix-packages."closure-common"; + "cxml" = quicklisp-to-nix-packages."cxml"; + "cxml-stp" = quicklisp-to-nix-packages."cxml-stp"; + "iterate" = quicklisp-to-nix-packages."iterate"; + "let-plus" = quicklisp-to-nix-packages."let-plus"; + "lift" = quicklisp-to-nix-packages."lift"; + "more-conditions" = quicklisp-to-nix-packages."more-conditions"; + "parse-number" = quicklisp-to-nix-packages."parse-number"; + "puri" = quicklisp-to-nix-packages."puri"; + "split-sequence" = quicklisp-to-nix-packages."split-sequence"; + "trivial-features" = quicklisp-to-nix-packages."trivial-features"; + "trivial-gray-streams" = quicklisp-to-nix-packages."trivial-gray-streams"; + "xpath" = quicklisp-to-nix-packages."xpath"; + "yacc" = quicklisp-to-nix-packages."yacc"; + })); + + "xkeyboard" = buildLispPackage ((f: x: (x // (f x))) (qlOverrides."xkeyboard" or (x: {})) @@ -1213,6 +1332,39 @@ let quicklisp-to-nix-packages = rec { })); + "uuid" = buildLispPackage + ((f: x: (x // (f x))) + (qlOverrides."uuid" or (x: {})) + (import ./quicklisp-to-nix-output/uuid.nix { + inherit fetchurl; + "alexandria" = quicklisp-to-nix-packages."alexandria"; + "bordeaux-threads" = quicklisp-to-nix-packages."bordeaux-threads"; + "ironclad" = quicklisp-to-nix-packages."ironclad"; + "trivial-utf-8" = quicklisp-to-nix-packages."trivial-utf-8"; + })); + + + "utilities_dot_print-tree" = buildLispPackage + ((f: x: (x // (f x))) + (qlOverrides."utilities_dot_print-tree" or (x: {})) + (import ./quicklisp-to-nix-output/utilities_dot_print-tree.nix { + inherit fetchurl; + "alexandria" = quicklisp-to-nix-packages."alexandria"; + "fiveam" = quicklisp-to-nix-packages."fiveam"; + "uiop" = quicklisp-to-nix-packages."uiop"; + })); + + + "utilities_dot_print-items" = buildLispPackage + ((f: x: (x // (f x))) + (qlOverrides."utilities_dot_print-items" or (x: {})) + (import ./quicklisp-to-nix-output/utilities_dot_print-items.nix { + inherit fetchurl; + "alexandria" = quicklisp-to-nix-packages."alexandria"; + "fiveam" = quicklisp-to-nix-packages."fiveam"; + })); + + "usocket" = buildLispPackage ((f: x: (x // (f x))) (qlOverrides."usocket" or (x: {})) @@ -1230,6 +1382,14 @@ let quicklisp-to-nix-packages = rec { })); + "unix-options" = buildLispPackage + ((f: x: (x // (f x))) + (qlOverrides."unix-options" or (x: {})) + (import ./quicklisp-to-nix-output/unix-options.nix { + inherit fetchurl; + })); + + "uffi" = buildLispPackage ((f: x: (x // (f x))) (qlOverrides."uffi" or (x: {})) @@ -1243,6 +1403,7 @@ let quicklisp-to-nix-packages = rec { (qlOverrides."trivial-utf-8" or (x: {})) (import ./quicklisp-to-nix-output/trivial-utf-8.nix { inherit fetchurl; + "mgl-pax" = quicklisp-to-nix-packages."mgl-pax"; })); @@ -1254,6 +1415,14 @@ let quicklisp-to-nix-packages = rec { })); + "trivial-package-local-nicknames" = buildLispPackage + ((f: x: (x // (f x))) + (qlOverrides."trivial-package-local-nicknames" or (x: {})) + (import ./quicklisp-to-nix-output/trivial-package-local-nicknames.nix { + inherit fetchurl; + })); + + "trivial-mimes" = buildLispPackage ((f: x: (x // (f x))) (qlOverrides."trivial-mimes" or (x: {})) @@ -1262,6 +1431,20 @@ let quicklisp-to-nix-packages = rec { })); + "trivial-main-thread" = buildLispPackage + ((f: x: (x // (f x))) + (qlOverrides."trivial-main-thread" or (x: {})) + (import ./quicklisp-to-nix-output/trivial-main-thread.nix { + inherit fetchurl; + "alexandria" = quicklisp-to-nix-packages."alexandria"; + "array-utils" = quicklisp-to-nix-packages."array-utils"; + "bordeaux-threads" = quicklisp-to-nix-packages."bordeaux-threads"; + "dissect" = quicklisp-to-nix-packages."dissect"; + "simple-tasks" = quicklisp-to-nix-packages."simple-tasks"; + "trivial-features" = quicklisp-to-nix-packages."trivial-features"; + })); + + "trivial-indent" = buildLispPackage ((f: x: (x // (f x))) (qlOverrides."trivial-indent" or (x: {})) @@ -1270,6 +1453,31 @@ let quicklisp-to-nix-packages = rec { })); + "trivial-gray-streams" = buildLispPackage + ((f: x: (x // (f x))) + (qlOverrides."trivial-gray-streams" or (x: {})) + (import ./quicklisp-to-nix-output/trivial-gray-streams.nix { + inherit fetchurl; + })); + + + "trivial-garbage" = buildLispPackage + ((f: x: (x // (f x))) + (qlOverrides."trivial-garbage" or (x: {})) + (import ./quicklisp-to-nix-output/trivial-garbage.nix { + inherit fetchurl; + "rt" = quicklisp-to-nix-packages."rt"; + })); + + + "trivial-features" = buildLispPackage + ((f: x: (x // (f x))) + (qlOverrides."trivial-features" or (x: {})) + (import ./quicklisp-to-nix-output/trivial-features.nix { + inherit fetchurl; + })); + + "trivial-clipboard" = buildLispPackage ((f: x: (x // (f x))) (qlOverrides."trivial-clipboard" or (x: {})) @@ -1307,6 +1515,16 @@ let quicklisp-to-nix-packages = rec { })); + "symbol-munger" = buildLispPackage + ((f: x: (x // (f x))) + (qlOverrides."symbol-munger" or (x: {})) + (import ./quicklisp-to-nix-output/symbol-munger.nix { + inherit fetchurl; + "alexandria" = quicklisp-to-nix-packages."alexandria"; + "iterate" = quicklisp-to-nix-packages."iterate"; + })); + + "swap-bytes" = buildLispPackage ((f: x: (x // (f x))) (qlOverrides."swap-bytes" or (x: {})) @@ -1398,15 +1616,21 @@ let quicklisp-to-nix-packages = rec { })); + "simple-date-time" = buildLispPackage + ((f: x: (x // (f x))) + (qlOverrides."simple-date-time" or (x: {})) + (import ./quicklisp-to-nix-output/simple-date-time.nix { + inherit fetchurl; + "cl-ppcre" = quicklisp-to-nix-packages."cl-ppcre"; + })); + + "simple-date" = buildLispPackage ((f: x: (x // (f x))) (qlOverrides."simple-date" or (x: {})) (import ./quicklisp-to-nix-output/simple-date.nix { inherit fetchurl; - "cl-postgres" = quicklisp-to-nix-packages."cl-postgres"; "fiveam" = quicklisp-to-nix-packages."fiveam"; - "md5" = quicklisp-to-nix-packages."md5"; - "usocket" = quicklisp-to-nix-packages."usocket"; })); @@ -1428,7 +1652,6 @@ let quicklisp-to-nix-packages = rec { "iterate" = quicklisp-to-nix-packages."iterate"; "lisp-namespace" = quicklisp-to-nix-packages."lisp-namespace"; "named-readtables" = quicklisp-to-nix-packages."named-readtables"; - "optima" = quicklisp-to-nix-packages."optima"; "parse-declarations-1_dot_0" = quicklisp-to-nix-packages."parse-declarations-1_dot_0"; "parse-number" = quicklisp-to-nix-packages."parse-number"; "split-sequence" = quicklisp-to-nix-packages."split-sequence"; @@ -1457,6 +1680,14 @@ let quicklisp-to-nix-packages = rec { })); + "rfc2388" = buildLispPackage + ((f: x: (x // (f x))) + (qlOverrides."rfc2388" or (x: {})) + (import ./quicklisp-to-nix-output/rfc2388.nix { + inherit fetchurl; + })); + + "quri" = buildLispPackage ((f: x: (x // (f x))) (qlOverrides."quri" or (x: {})) @@ -1495,6 +1726,15 @@ let quicklisp-to-nix-packages = rec { })); + "puri" = buildLispPackage + ((f: x: (x // (f x))) + (qlOverrides."puri" or (x: {})) + (import ./quicklisp-to-nix-output/puri.nix { + inherit fetchurl; + "ptester" = quicklisp-to-nix-packages."ptester"; + })); + + "prove-asdf" = buildLispPackage ((f: x: (x // (f x))) (qlOverrides."prove-asdf" or (x: {})) @@ -1512,6 +1752,7 @@ let quicklisp-to-nix-packages = rec { "anaphora" = quicklisp-to-nix-packages."anaphora"; "cl-ansi-text" = quicklisp-to-nix-packages."cl-ansi-text"; "cl-colors" = quicklisp-to-nix-packages."cl-colors"; + "cl-colors2" = quicklisp-to-nix-packages."cl-colors2"; "cl-ppcre" = quicklisp-to-nix-packages."cl-ppcre"; "let-plus" = quicklisp-to-nix-packages."let-plus"; "uiop" = quicklisp-to-nix-packages."uiop"; @@ -1529,6 +1770,34 @@ let quicklisp-to-nix-packages = rec { })); + "postmodern" = buildLispPackage + ((f: x: (x // (f x))) + (qlOverrides."postmodern" or (x: {})) + (import ./quicklisp-to-nix-output/postmodern.nix { + inherit fetchurl; + "alexandria" = quicklisp-to-nix-packages."alexandria"; + "bordeaux-threads" = quicklisp-to-nix-packages."bordeaux-threads"; + "cl-base64" = quicklisp-to-nix-packages."cl-base64"; + "cl-postgres" = quicklisp-to-nix-packages."cl-postgres"; + "cl-postgres_slash_tests" = quicklisp-to-nix-packages."cl-postgres_slash_tests"; + "cl-ppcre" = quicklisp-to-nix-packages."cl-ppcre"; + "cl-unicode" = quicklisp-to-nix-packages."cl-unicode"; + "closer-mop" = quicklisp-to-nix-packages."closer-mop"; + "fiveam" = quicklisp-to-nix-packages."fiveam"; + "flexi-streams" = quicklisp-to-nix-packages."flexi-streams"; + "global-vars" = quicklisp-to-nix-packages."global-vars"; + "ironclad" = quicklisp-to-nix-packages."ironclad"; + "md5" = quicklisp-to-nix-packages."md5"; + "s-sql" = quicklisp-to-nix-packages."s-sql"; + "s-sql_slash_tests" = quicklisp-to-nix-packages."s-sql_slash_tests"; + "simple-date" = quicklisp-to-nix-packages."simple-date"; + "simple-date_slash_postgres-glue" = quicklisp-to-nix-packages."simple-date_slash_postgres-glue"; + "split-sequence" = quicklisp-to-nix-packages."split-sequence"; + "uax-15" = quicklisp-to-nix-packages."uax-15"; + "usocket" = quicklisp-to-nix-packages."usocket"; + })); + + "plump" = buildLispPackage ((f: x: (x // (f x))) (qlOverrides."plump" or (x: {})) @@ -1552,6 +1821,38 @@ let quicklisp-to-nix-packages = rec { })); + "parser_dot_common-rules" = buildLispPackage + ((f: x: (x // (f x))) + (qlOverrides."parser_dot_common-rules" or (x: {})) + (import ./quicklisp-to-nix-output/parser_dot_common-rules.nix { + inherit fetchurl; + "alexandria" = quicklisp-to-nix-packages."alexandria"; + "anaphora" = quicklisp-to-nix-packages."anaphora"; + "esrap" = quicklisp-to-nix-packages."esrap"; + "fiveam" = quicklisp-to-nix-packages."fiveam"; + "let-plus" = quicklisp-to-nix-packages."let-plus"; + "split-sequence" = quicklisp-to-nix-packages."split-sequence"; + })); + + + "parser-combinators" = buildLispPackage + ((f: x: (x // (f x))) + (qlOverrides."parser-combinators" or (x: {})) + (import ./quicklisp-to-nix-output/parser-combinators.nix { + inherit fetchurl; + "alexandria" = quicklisp-to-nix-packages."alexandria"; + "iterate" = quicklisp-to-nix-packages."iterate"; + })); + + + "parse-number" = buildLispPackage + ((f: x: (x // (f x))) + (qlOverrides."parse-number" or (x: {})) + (import ./quicklisp-to-nix-output/parse-number.nix { + inherit fetchurl; + })); + + "parenscript" = buildLispPackage ((f: x: (x // (f x))) (qlOverrides."parenscript" or (x: {})) @@ -1563,6 +1864,21 @@ let quicklisp-to-nix-packages = rec { })); + "osicat" = buildLispPackage + ((f: x: (x // (f x))) + (qlOverrides."osicat" or (x: {})) + (import ./quicklisp-to-nix-output/osicat.nix { + inherit fetchurl; + "alexandria" = quicklisp-to-nix-packages."alexandria"; + "babel" = quicklisp-to-nix-packages."babel"; + "cffi" = quicklisp-to-nix-packages."cffi"; + "cffi-grovel" = quicklisp-to-nix-packages."cffi-grovel"; + "cffi-toolchain" = quicklisp-to-nix-packages."cffi-toolchain"; + "rt" = quicklisp-to-nix-packages."rt"; + "trivial-features" = quicklisp-to-nix-packages."trivial-features"; + })); + + "optima" = buildLispPackage ((f: x: (x // (f x))) (qlOverrides."optima" or (x: {})) @@ -1582,6 +1898,22 @@ let quicklisp-to-nix-packages = rec { })); + "net-telent-date" = buildLispPackage + ((f: x: (x // (f x))) + (qlOverrides."net-telent-date" or (x: {})) + (import ./quicklisp-to-nix-output/net-telent-date.nix { + inherit fetchurl; + })); + + + "named-readtables" = buildLispPackage + ((f: x: (x // (f x))) + (qlOverrides."named-readtables" or (x: {})) + (import ./quicklisp-to-nix-output/named-readtables.nix { + inherit fetchurl; + })); + + "mt19937" = buildLispPackage ((f: x: (x // (f x))) (qlOverrides."mt19937" or (x: {})) @@ -1590,6 +1922,27 @@ let quicklisp-to-nix-packages = rec { })); + "more-conditions" = buildLispPackage + ((f: x: (x // (f x))) + (qlOverrides."more-conditions" or (x: {})) + (import ./quicklisp-to-nix-output/more-conditions.nix { + inherit fetchurl; + "alexandria" = quicklisp-to-nix-packages."alexandria"; + "closer-mop" = quicklisp-to-nix-packages."closer-mop"; + "fiveam" = quicklisp-to-nix-packages."fiveam"; + "let-plus" = quicklisp-to-nix-packages."let-plus"; + })); + + + "moptilities" = buildLispPackage + ((f: x: (x // (f x))) + (qlOverrides."moptilities" or (x: {})) + (import ./quicklisp-to-nix-output/moptilities.nix { + inherit fetchurl; + "closer-mop" = quicklisp-to-nix-packages."closer-mop"; + })); + + "mk-string-metrics" = buildLispPackage ((f: x: (x // (f x))) (qlOverrides."mk-string-metrics" or (x: {})) @@ -1606,6 +1959,30 @@ let quicklisp-to-nix-packages = rec { })); + "metatilities-base" = buildLispPackage + ((f: x: (x // (f x))) + (qlOverrides."metatilities-base" or (x: {})) + (import ./quicklisp-to-nix-output/metatilities-base.nix { + inherit fetchurl; + })); + + + "metabang-bind" = buildLispPackage + ((f: x: (x // (f x))) + (qlOverrides."metabang-bind" or (x: {})) + (import ./quicklisp-to-nix-output/metabang-bind.nix { + inherit fetchurl; + })); + + + "md5" = buildLispPackage + ((f: x: (x // (f x))) + (qlOverrides."md5" or (x: {})) + (import ./quicklisp-to-nix-output/md5.nix { + inherit fetchurl; + })); + + "marshal" = buildLispPackage ((f: x: (x // (f x))) (qlOverrides."marshal" or (x: {})) @@ -1654,10 +2031,8 @@ let quicklisp-to-nix-packages = rec { (qlOverrides."local-time" or (x: {})) (import ./quicklisp-to-nix-output/local-time.nix { inherit fetchurl; - "alexandria" = quicklisp-to-nix-packages."alexandria"; - "bordeaux-threads" = quicklisp-to-nix-packages."bordeaux-threads"; - "cl-fad" = quicklisp-to-nix-packages."cl-fad"; "stefil" = quicklisp-to-nix-packages."stefil"; + "uiop" = quicklisp-to-nix-packages."uiop"; })); @@ -1670,6 +2045,14 @@ let quicklisp-to-nix-packages = rec { })); + "lift" = buildLispPackage + ((f: x: (x // (f x))) + (qlOverrides."lift" or (x: {})) + (import ./quicklisp-to-nix-output/lift.nix { + inherit fetchurl; + })); + + "lfarm-ssl" = buildLispPackage ((f: x: (x // (f x))) (qlOverrides."lfarm-ssl" or (x: {})) @@ -1757,7 +2140,30 @@ let quicklisp-to-nix-packages = rec { "ironclad" = quicklisp-to-nix-packages."ironclad"; "lack-component" = quicklisp-to-nix-packages."lack-component"; "lack-util" = quicklisp-to-nix-packages."lack-util"; - "nibbles" = quicklisp-to-nix-packages."nibbles"; + })); + + + "jonathan" = buildLispPackage + ((f: x: (x // (f x))) + (qlOverrides."jonathan" or (x: {})) + (import ./quicklisp-to-nix-output/jonathan.nix { + inherit fetchurl; + "alexandria" = quicklisp-to-nix-packages."alexandria"; + "babel" = quicklisp-to-nix-packages."babel"; + "cffi" = quicklisp-to-nix-packages."cffi"; + "cffi-grovel" = quicklisp-to-nix-packages."cffi-grovel"; + "cffi-toolchain" = quicklisp-to-nix-packages."cffi-toolchain"; + "cl-annot" = quicklisp-to-nix-packages."cl-annot"; + "cl-ppcre" = quicklisp-to-nix-packages."cl-ppcre"; + "cl-syntax" = quicklisp-to-nix-packages."cl-syntax"; + "cl-syntax-annot" = quicklisp-to-nix-packages."cl-syntax-annot"; + "fast-io" = quicklisp-to-nix-packages."fast-io"; + "named-readtables" = quicklisp-to-nix-packages."named-readtables"; + "proc-parse" = quicklisp-to-nix-packages."proc-parse"; + "static-vectors" = quicklisp-to-nix-packages."static-vectors"; + "trivial-features" = quicklisp-to-nix-packages."trivial-features"; + "trivial-gray-streams" = quicklisp-to-nix-packages."trivial-gray-streams"; + "trivial-types" = quicklisp-to-nix-packages."trivial-types"; })); @@ -1776,7 +2182,6 @@ let quicklisp-to-nix-packages = rec { inherit fetchurl; "alexandria" = quicklisp-to-nix-packages."alexandria"; "bordeaux-threads" = quicklisp-to-nix-packages."bordeaux-threads"; - "nibbles" = quicklisp-to-nix-packages."nibbles"; "rt" = quicklisp-to-nix-packages."rt"; })); @@ -1802,6 +2207,36 @@ let quicklisp-to-nix-packages = rec { })); + "inferior-shell" = buildLispPackage + ((f: x: (x // (f x))) + (qlOverrides."inferior-shell" or (x: {})) + (import ./quicklisp-to-nix-output/inferior-shell.nix { + inherit fetchurl; + "alexandria" = quicklisp-to-nix-packages."alexandria"; + "closer-mop" = quicklisp-to-nix-packages."closer-mop"; + "fare-mop" = quicklisp-to-nix-packages."fare-mop"; + "fare-quasiquote" = quicklisp-to-nix-packages."fare-quasiquote"; + "fare-quasiquote-extras" = quicklisp-to-nix-packages."fare-quasiquote-extras"; + "fare-quasiquote-optima" = quicklisp-to-nix-packages."fare-quasiquote-optima"; + "fare-quasiquote-readtable" = quicklisp-to-nix-packages."fare-quasiquote-readtable"; + "fare-utils" = quicklisp-to-nix-packages."fare-utils"; + "hu_dot_dwim_dot_stefil" = quicklisp-to-nix-packages."hu_dot_dwim_dot_stefil"; + "introspect-environment" = quicklisp-to-nix-packages."introspect-environment"; + "iterate" = quicklisp-to-nix-packages."iterate"; + "lisp-namespace" = quicklisp-to-nix-packages."lisp-namespace"; + "named-readtables" = quicklisp-to-nix-packages."named-readtables"; + "trivia" = quicklisp-to-nix-packages."trivia"; + "trivia_dot_balland2006" = quicklisp-to-nix-packages."trivia_dot_balland2006"; + "trivia_dot_level0" = quicklisp-to-nix-packages."trivia_dot_level0"; + "trivia_dot_level1" = quicklisp-to-nix-packages."trivia_dot_level1"; + "trivia_dot_level2" = quicklisp-to-nix-packages."trivia_dot_level2"; + "trivia_dot_quasiquote" = quicklisp-to-nix-packages."trivia_dot_quasiquote"; + "trivia_dot_trivial" = quicklisp-to-nix-packages."trivia_dot_trivial"; + "trivial-cltl2" = quicklisp-to-nix-packages."trivial-cltl2"; + "type-i" = quicklisp-to-nix-packages."type-i"; + })); + + "ieee-floats" = buildLispPackage ((f: x: (x // (f x))) (qlOverrides."ieee-floats" or (x: {})) @@ -1848,6 +2283,15 @@ let quicklisp-to-nix-packages = rec { })); + "hu_dot_dwim_dot_defclass-star" = buildLispPackage + ((f: x: (x // (f x))) + (qlOverrides."hu_dot_dwim_dot_defclass-star" or (x: {})) + (import ./quicklisp-to-nix-output/hu_dot_dwim_dot_defclass-star.nix { + inherit fetchurl; + "hu_dot_dwim_dot_asdf" = quicklisp-to-nix-packages."hu_dot_dwim_dot_asdf"; + })); + + "hu_dot_dwim_dot_asdf" = buildLispPackage ((f: x: (x // (f x))) (qlOverrides."hu_dot_dwim_dot_asdf" or (x: {})) @@ -1889,6 +2333,18 @@ let quicklisp-to-nix-packages = rec { })); + "gettext" = buildLispPackage + ((f: x: (x // (f x))) + (qlOverrides."gettext" or (x: {})) + (import ./quicklisp-to-nix-output/gettext.nix { + inherit fetchurl; + "flexi-streams" = quicklisp-to-nix-packages."flexi-streams"; + "split-sequence" = quicklisp-to-nix-packages."split-sequence"; + "trivial-gray-streams" = quicklisp-to-nix-packages."trivial-gray-streams"; + "yacc" = quicklisp-to-nix-packages."yacc"; + })); + + "fset" = buildLispPackage ((f: x: (x // (f x))) (qlOverrides."fset" or (x: {})) @@ -1896,6 +2352,7 @@ let quicklisp-to-nix-packages = rec { inherit fetchurl; "misc-extensions" = quicklisp-to-nix-packages."misc-extensions"; "mt19937" = quicklisp-to-nix-packages."mt19937"; + "named-readtables" = quicklisp-to-nix-packages."named-readtables"; })); @@ -1962,6 +2419,41 @@ let quicklisp-to-nix-packages = rec { })); + "fare-utils" = buildLispPackage + ((f: x: (x // (f x))) + (qlOverrides."fare-utils" or (x: {})) + (import ./quicklisp-to-nix-output/fare-utils.nix { + inherit fetchurl; + })); + + + "fare-quasiquote" = buildLispPackage + ((f: x: (x // (f x))) + (qlOverrides."fare-quasiquote" or (x: {})) + (import ./quicklisp-to-nix-output/fare-quasiquote.nix { + inherit fetchurl; + "fare-utils" = quicklisp-to-nix-packages."fare-utils"; + })); + + + "fare-mop" = buildLispPackage + ((f: x: (x // (f x))) + (qlOverrides."fare-mop" or (x: {})) + (import ./quicklisp-to-nix-output/fare-mop.nix { + inherit fetchurl; + "closer-mop" = quicklisp-to-nix-packages."closer-mop"; + "fare-utils" = quicklisp-to-nix-packages."fare-utils"; + })); + + + "fare-csv" = buildLispPackage + ((f: x: (x // (f x))) + (qlOverrides."fare-csv" or (x: {})) + (import ./quicklisp-to-nix-output/fare-csv.nix { + inherit fetchurl; + })); + + "external-program" = buildLispPackage ((f: x: (x // (f x))) (qlOverrides."external-program" or (x: {})) @@ -1994,6 +2486,18 @@ let quicklisp-to-nix-packages = rec { })); + "enchant" = buildLispPackage + ((f: x: (x // (f x))) + (qlOverrides."enchant" or (x: {})) + (import ./quicklisp-to-nix-output/enchant.nix { + inherit fetchurl; + "alexandria" = quicklisp-to-nix-packages."alexandria"; + "babel" = quicklisp-to-nix-packages."babel"; + "cffi" = quicklisp-to-nix-packages."cffi"; + "trivial-features" = quicklisp-to-nix-packages."trivial-features"; + })); + + "drakma" = buildLispPackage ((f: x: (x // (f x))) (qlOverrides."drakma" or (x: {})) @@ -2027,6 +2531,43 @@ let quicklisp-to-nix-packages = rec { })); + "djula" = buildLispPackage + ((f: x: (x // (f x))) + (qlOverrides."djula" or (x: {})) + (import ./quicklisp-to-nix-output/djula.nix { + inherit fetchurl; + "access" = quicklisp-to-nix-packages."access"; + "alexandria" = quicklisp-to-nix-packages."alexandria"; + "anaphora" = quicklisp-to-nix-packages."anaphora"; + "arnesi" = quicklisp-to-nix-packages."arnesi"; + "babel" = quicklisp-to-nix-packages."babel"; + "cl-annot" = quicklisp-to-nix-packages."cl-annot"; + "cl-interpol" = quicklisp-to-nix-packages."cl-interpol"; + "cl-locale" = quicklisp-to-nix-packages."cl-locale"; + "cl-ppcre" = quicklisp-to-nix-packages."cl-ppcre"; + "cl-slice" = quicklisp-to-nix-packages."cl-slice"; + "cl-syntax" = quicklisp-to-nix-packages."cl-syntax"; + "cl-syntax-annot" = quicklisp-to-nix-packages."cl-syntax-annot"; + "cl-unicode" = quicklisp-to-nix-packages."cl-unicode"; + "closer-mop" = quicklisp-to-nix-packages."closer-mop"; + "collectors" = quicklisp-to-nix-packages."collectors"; + "flexi-streams" = quicklisp-to-nix-packages."flexi-streams"; + "gettext" = quicklisp-to-nix-packages."gettext"; + "iterate" = quicklisp-to-nix-packages."iterate"; + "let-plus" = quicklisp-to-nix-packages."let-plus"; + "local-time" = quicklisp-to-nix-packages."local-time"; + "named-readtables" = quicklisp-to-nix-packages."named-readtables"; + "parser-combinators" = quicklisp-to-nix-packages."parser-combinators"; + "split-sequence" = quicklisp-to-nix-packages."split-sequence"; + "symbol-munger" = quicklisp-to-nix-packages."symbol-munger"; + "trivial-backtrace" = quicklisp-to-nix-packages."trivial-backtrace"; + "trivial-features" = quicklisp-to-nix-packages."trivial-features"; + "trivial-gray-streams" = quicklisp-to-nix-packages."trivial-gray-streams"; + "trivial-types" = quicklisp-to-nix-packages."trivial-types"; + "yacc" = quicklisp-to-nix-packages."yacc"; + })); + + "dexador" = buildLispPackage ((f: x: (x // (f x))) (qlOverrides."dexador" or (x: {})) @@ -2043,7 +2584,6 @@ let quicklisp-to-nix-packages = rec { "cl_plus_ssl" = quicklisp-to-nix-packages."cl_plus_ssl"; "cl-base64" = quicklisp-to-nix-packages."cl-base64"; "cl-cookie" = quicklisp-to-nix-packages."cl-cookie"; - "cl-fad" = quicklisp-to-nix-packages."cl-fad"; "cl-ppcre" = quicklisp-to-nix-packages."cl-ppcre"; "cl-reexport" = quicklisp-to-nix-packages."cl-reexport"; "cl-utilities" = quicklisp-to-nix-packages."cl-utilities"; @@ -2091,19 +2631,13 @@ let quicklisp-to-nix-packages = rec { "babel" = quicklisp-to-nix-packages."babel"; "bordeaux-threads" = quicklisp-to-nix-packages."bordeaux-threads"; "cffi" = quicklisp-to-nix-packages."cffi"; - "cl-annot" = quicklisp-to-nix-packages."cl-annot"; - "cl-syntax" = quicklisp-to-nix-packages."cl-syntax"; - "cl-syntax-annot" = quicklisp-to-nix-packages."cl-syntax-annot"; "closer-mop" = quicklisp-to-nix-packages."closer-mop"; "dbi" = quicklisp-to-nix-packages."dbi"; "iterate" = quicklisp-to-nix-packages."iterate"; - "named-readtables" = quicklisp-to-nix-packages."named-readtables"; "split-sequence" = quicklisp-to-nix-packages."split-sequence"; "sqlite" = quicklisp-to-nix-packages."sqlite"; "trivial-features" = quicklisp-to-nix-packages."trivial-features"; "trivial-garbage" = quicklisp-to-nix-packages."trivial-garbage"; - "trivial-types" = quicklisp-to-nix-packages."trivial-types"; - "uiop" = quicklisp-to-nix-packages."uiop"; })); @@ -2114,17 +2648,16 @@ let quicklisp-to-nix-packages = rec { inherit fetchurl; "alexandria" = quicklisp-to-nix-packages."alexandria"; "bordeaux-threads" = quicklisp-to-nix-packages."bordeaux-threads"; - "cl-annot" = quicklisp-to-nix-packages."cl-annot"; + "cl-base64" = quicklisp-to-nix-packages."cl-base64"; "cl-postgres" = quicklisp-to-nix-packages."cl-postgres"; - "cl-syntax" = quicklisp-to-nix-packages."cl-syntax"; - "cl-syntax-annot" = quicklisp-to-nix-packages."cl-syntax-annot"; + "cl-ppcre" = quicklisp-to-nix-packages."cl-ppcre"; "closer-mop" = quicklisp-to-nix-packages."closer-mop"; "dbi" = quicklisp-to-nix-packages."dbi"; + "ironclad" = quicklisp-to-nix-packages."ironclad"; "md5" = quicklisp-to-nix-packages."md5"; - "named-readtables" = quicklisp-to-nix-packages."named-readtables"; "split-sequence" = quicklisp-to-nix-packages."split-sequence"; "trivial-garbage" = quicklisp-to-nix-packages."trivial-garbage"; - "trivial-types" = quicklisp-to-nix-packages."trivial-types"; + "uax-15" = quicklisp-to-nix-packages."uax-15"; "usocket" = quicklisp-to-nix-packages."usocket"; })); @@ -2138,16 +2671,33 @@ let quicklisp-to-nix-packages = rec { "babel" = quicklisp-to-nix-packages."babel"; "bordeaux-threads" = quicklisp-to-nix-packages."bordeaux-threads"; "cffi" = quicklisp-to-nix-packages."cffi"; - "cl-annot" = quicklisp-to-nix-packages."cl-annot"; "cl-mysql" = quicklisp-to-nix-packages."cl-mysql"; - "cl-syntax" = quicklisp-to-nix-packages."cl-syntax"; - "cl-syntax-annot" = quicklisp-to-nix-packages."cl-syntax-annot"; "closer-mop" = quicklisp-to-nix-packages."closer-mop"; "dbi" = quicklisp-to-nix-packages."dbi"; - "named-readtables" = quicklisp-to-nix-packages."named-readtables"; "split-sequence" = quicklisp-to-nix-packages."split-sequence"; "trivial-features" = quicklisp-to-nix-packages."trivial-features"; - "trivial-types" = quicklisp-to-nix-packages."trivial-types"; + })); + + + "cxml-stp" = buildLispPackage + ((f: x: (x // (f x))) + (qlOverrides."cxml-stp" or (x: {})) + (import ./quicklisp-to-nix-output/cxml-stp.nix { + inherit fetchurl; + "alexandria" = quicklisp-to-nix-packages."alexandria"; + "babel" = quicklisp-to-nix-packages."babel"; + "cl-ppcre" = quicklisp-to-nix-packages."cl-ppcre"; + "closure-common" = quicklisp-to-nix-packages."closure-common"; + "cxml" = quicklisp-to-nix-packages."cxml"; + "cxml_slash_test" = quicklisp-to-nix-packages."cxml_slash_test"; + "parse-number" = quicklisp-to-nix-packages."parse-number"; + "puri" = quicklisp-to-nix-packages."puri"; + "rt" = quicklisp-to-nix-packages."rt"; + "trivial-features" = quicklisp-to-nix-packages."trivial-features"; + "trivial-gray-streams" = quicklisp-to-nix-packages."trivial-gray-streams"; + "xpath" = quicklisp-to-nix-packages."xpath"; + "xpath_slash_test" = quicklisp-to-nix-packages."xpath_slash_test"; + "yacc" = quicklisp-to-nix-packages."yacc"; })); @@ -2277,22 +2827,16 @@ let quicklisp-to-nix-packages = rec { })); - "clx-truetype" = buildLispPackage + "collectors" = buildLispPackage ((f: x: (x // (f x))) - (qlOverrides."clx-truetype" or (x: {})) - (import ./quicklisp-to-nix-output/clx-truetype.nix { + (qlOverrides."collectors" or (x: {})) + (import ./quicklisp-to-nix-output/collectors.nix { inherit fetchurl; "alexandria" = quicklisp-to-nix-packages."alexandria"; - "bordeaux-threads" = quicklisp-to-nix-packages."bordeaux-threads"; - "cl-aa" = quicklisp-to-nix-packages."cl-aa"; - "cl-fad" = quicklisp-to-nix-packages."cl-fad"; - "cl-paths" = quicklisp-to-nix-packages."cl-paths"; - "cl-paths-ttf" = quicklisp-to-nix-packages."cl-paths-ttf"; - "cl-store" = quicklisp-to-nix-packages."cl-store"; - "cl-vectors" = quicklisp-to-nix-packages."cl-vectors"; - "clx" = quicklisp-to-nix-packages."clx"; - "trivial-features" = quicklisp-to-nix-packages."trivial-features"; - "zpb-ttf" = quicklisp-to-nix-packages."zpb-ttf"; + "closer-mop" = quicklisp-to-nix-packages."closer-mop"; + "iterate" = quicklisp-to-nix-packages."iterate"; + "lisp-unit2" = quicklisp-to-nix-packages."lisp-unit2"; + "symbol-munger" = quicklisp-to-nix-packages."symbol-munger"; })); @@ -2305,6 +2849,186 @@ let quicklisp-to-nix-packages = rec { })); + "cl-who" = buildLispPackage + ((f: x: (x // (f x))) + (qlOverrides."cl-who" or (x: {})) + (import ./quicklisp-to-nix-output/cl-who.nix { + inherit fetchurl; + "flexi-streams" = quicklisp-to-nix-packages."flexi-streams"; + })); + + + "cl-webkit2" = buildLispPackage + ((f: x: (x // (f x))) + (qlOverrides."cl-webkit2" or (x: {})) + (import ./quicklisp-to-nix-output/cl-webkit2.nix { + inherit fetchurl; + "alexandria" = quicklisp-to-nix-packages."alexandria"; + "babel" = quicklisp-to-nix-packages."babel"; + "bordeaux-threads" = quicklisp-to-nix-packages."bordeaux-threads"; + "cffi" = quicklisp-to-nix-packages."cffi"; + "cl-cffi-gtk" = quicklisp-to-nix-packages."cl-cffi-gtk"; + "cl-cffi-gtk-cairo" = quicklisp-to-nix-packages."cl-cffi-gtk-cairo"; + "cl-cffi-gtk-gdk" = quicklisp-to-nix-packages."cl-cffi-gtk-gdk"; + "cl-cffi-gtk-gdk-pixbuf" = quicklisp-to-nix-packages."cl-cffi-gtk-gdk-pixbuf"; + "cl-cffi-gtk-gio" = quicklisp-to-nix-packages."cl-cffi-gtk-gio"; + "cl-cffi-gtk-glib" = quicklisp-to-nix-packages."cl-cffi-gtk-glib"; + "cl-cffi-gtk-gobject" = quicklisp-to-nix-packages."cl-cffi-gtk-gobject"; + "cl-cffi-gtk-pango" = quicklisp-to-nix-packages."cl-cffi-gtk-pango"; + "closer-mop" = quicklisp-to-nix-packages."closer-mop"; + "iterate" = quicklisp-to-nix-packages."iterate"; + "trivial-features" = quicklisp-to-nix-packages."trivial-features"; + "trivial-garbage" = quicklisp-to-nix-packages."trivial-garbage"; + })); + + + "cl-vectors" = buildLispPackage + ((f: x: (x // (f x))) + (qlOverrides."cl-vectors" or (x: {})) + (import ./quicklisp-to-nix-output/cl-vectors.nix { + inherit fetchurl; + "cl-aa" = quicklisp-to-nix-packages."cl-aa"; + "cl-paths" = quicklisp-to-nix-packages."cl-paths"; + })); + + + "cl-utilities" = buildLispPackage + ((f: x: (x // (f x))) + (qlOverrides."cl-utilities" or (x: {})) + (import ./quicklisp-to-nix-output/cl-utilities.nix { + inherit fetchurl; + })); + + + "cl-unification" = buildLispPackage + ((f: x: (x // (f x))) + (qlOverrides."cl-unification" or (x: {})) + (import ./quicklisp-to-nix-output/cl-unification.nix { + inherit fetchurl; + })); + + + "cl-unicode" = buildLispPackage + ((f: x: (x // (f x))) + (qlOverrides."cl-unicode" or (x: {})) + (import ./quicklisp-to-nix-output/cl-unicode.nix { + inherit fetchurl; + "cl-ppcre" = quicklisp-to-nix-packages."cl-ppcre"; + "flexi-streams" = quicklisp-to-nix-packages."flexi-streams"; + })); + + + "clump" = buildLispPackage + ((f: x: (x // (f x))) + (qlOverrides."clump" or (x: {})) + (import ./quicklisp-to-nix-output/clump.nix { + inherit fetchurl; + "acclimation" = quicklisp-to-nix-packages."acclimation"; + "clump-2-3-tree" = quicklisp-to-nix-packages."clump-2-3-tree"; + "clump-binary-tree" = quicklisp-to-nix-packages."clump-binary-tree"; + })); + + + "cl-typesetting" = buildLispPackage + ((f: x: (x // (f x))) + (qlOverrides."cl-typesetting" or (x: {})) + (import ./quicklisp-to-nix-output/cl-typesetting.nix { + inherit fetchurl; + "cl-pdf" = quicklisp-to-nix-packages."cl-pdf"; + "iterate" = quicklisp-to-nix-packages."iterate"; + "zpb-ttf" = quicklisp-to-nix-packages."zpb-ttf"; + })); + + + "cl-test-more" = buildLispPackage + ((f: x: (x // (f x))) + (qlOverrides."cl-test-more" or (x: {})) + (import ./quicklisp-to-nix-output/cl-test-more.nix { + inherit fetchurl; + "alexandria" = quicklisp-to-nix-packages."alexandria"; + "anaphora" = quicklisp-to-nix-packages."anaphora"; + "cl-ansi-text" = quicklisp-to-nix-packages."cl-ansi-text"; + "cl-colors" = quicklisp-to-nix-packages."cl-colors"; + "cl-colors2" = quicklisp-to-nix-packages."cl-colors2"; + "cl-ppcre" = quicklisp-to-nix-packages."cl-ppcre"; + "let-plus" = quicklisp-to-nix-packages."let-plus"; + "prove" = quicklisp-to-nix-packages."prove"; + })); + + + "cl-syntax-markup" = buildLispPackage + ((f: x: (x // (f x))) + (qlOverrides."cl-syntax-markup" or (x: {})) + (import ./quicklisp-to-nix-output/cl-syntax-markup.nix { + inherit fetchurl; + "cl-markup" = quicklisp-to-nix-packages."cl-markup"; + "cl-syntax" = quicklisp-to-nix-packages."cl-syntax"; + "named-readtables" = quicklisp-to-nix-packages."named-readtables"; + "trivial-types" = quicklisp-to-nix-packages."trivial-types"; + })); + + + "cl-syntax-anonfun" = buildLispPackage + ((f: x: (x // (f x))) + (qlOverrides."cl-syntax-anonfun" or (x: {})) + (import ./quicklisp-to-nix-output/cl-syntax-anonfun.nix { + inherit fetchurl; + "cl-anonfun" = quicklisp-to-nix-packages."cl-anonfun"; + "cl-syntax" = quicklisp-to-nix-packages."cl-syntax"; + "named-readtables" = quicklisp-to-nix-packages."named-readtables"; + "trivial-types" = quicklisp-to-nix-packages."trivial-types"; + })); + + + "cl-syntax-annot" = buildLispPackage + ((f: x: (x // (f x))) + (qlOverrides."cl-syntax-annot" or (x: {})) + (import ./quicklisp-to-nix-output/cl-syntax-annot.nix { + inherit fetchurl; + "alexandria" = quicklisp-to-nix-packages."alexandria"; + "cl-annot" = quicklisp-to-nix-packages."cl-annot"; + "cl-syntax" = quicklisp-to-nix-packages."cl-syntax"; + "named-readtables" = quicklisp-to-nix-packages."named-readtables"; + "trivial-types" = quicklisp-to-nix-packages."trivial-types"; + })); + + + "cl-syntax" = buildLispPackage + ((f: x: (x // (f x))) + (qlOverrides."cl-syntax" or (x: {})) + (import ./quicklisp-to-nix-output/cl-syntax.nix { + inherit fetchurl; + "named-readtables" = quicklisp-to-nix-packages."named-readtables"; + "trivial-types" = quicklisp-to-nix-packages."trivial-types"; + })); + + + "cl-store" = buildLispPackage + ((f: x: (x // (f x))) + (qlOverrides."cl-store" or (x: {})) + (import ./quicklisp-to-nix-output/cl-store.nix { + inherit fetchurl; + "rt" = quicklisp-to-nix-packages."rt"; + })); + + + "cl_plus_ssl" = buildLispPackage + ((f: x: (x // (f x))) + (qlOverrides."cl_plus_ssl" or (x: {})) + (import ./quicklisp-to-nix-output/cl_plus_ssl.nix { + inherit fetchurl; + "alexandria" = quicklisp-to-nix-packages."alexandria"; + "babel" = quicklisp-to-nix-packages."babel"; + "bordeaux-threads" = quicklisp-to-nix-packages."bordeaux-threads"; + "cffi" = quicklisp-to-nix-packages."cffi"; + "flexi-streams" = quicklisp-to-nix-packages."flexi-streams"; + "trivial-features" = quicklisp-to-nix-packages."trivial-features"; + "trivial-garbage" = quicklisp-to-nix-packages."trivial-garbage"; + "trivial-gray-streams" = quicklisp-to-nix-packages."trivial-gray-streams"; + "uiop" = quicklisp-to-nix-packages."uiop"; + })); + + "clss" = buildLispPackage ((f: x: (x // (f x))) (qlOverrides."clss" or (x: {})) @@ -2359,218 +3083,6 @@ let quicklisp-to-nix-packages = rec { })); - "closure-html" = buildLispPackage - ((f: x: (x // (f x))) - (qlOverrides."closure-html" or (x: {})) - (import ./quicklisp-to-nix-output/closure-html.nix { - inherit fetchurl; - "alexandria" = quicklisp-to-nix-packages."alexandria"; - "babel" = quicklisp-to-nix-packages."babel"; - "closure-common" = quicklisp-to-nix-packages."closure-common"; - "flexi-streams" = quicklisp-to-nix-packages."flexi-streams"; - "trivial-features" = quicklisp-to-nix-packages."trivial-features"; - "trivial-gray-streams" = quicklisp-to-nix-packages."trivial-gray-streams"; - })); - - - "closer-mop" = buildLispPackage - ((f: x: (x // (f x))) - (qlOverrides."closer-mop" or (x: {})) - (import ./quicklisp-to-nix-output/closer-mop.nix { - inherit fetchurl; - })); - - - "clack-v1-compat" = buildLispPackage - ((f: x: (x // (f x))) - (qlOverrides."clack-v1-compat" or (x: {})) - (import ./quicklisp-to-nix-output/clack-v1-compat.nix { - inherit fetchurl; - "alexandria" = quicklisp-to-nix-packages."alexandria"; - "babel" = quicklisp-to-nix-packages."babel"; - "bordeaux-threads" = quicklisp-to-nix-packages."bordeaux-threads"; - "cffi" = quicklisp-to-nix-packages."cffi"; - "cffi-grovel" = quicklisp-to-nix-packages."cffi-grovel"; - "cffi-toolchain" = quicklisp-to-nix-packages."cffi-toolchain"; - "chipz" = quicklisp-to-nix-packages."chipz"; - "chunga" = quicklisp-to-nix-packages."chunga"; - "circular-streams" = quicklisp-to-nix-packages."circular-streams"; - "cl_plus_ssl" = quicklisp-to-nix-packages."cl_plus_ssl"; - "cl-annot" = quicklisp-to-nix-packages."cl-annot"; - "cl-base64" = quicklisp-to-nix-packages."cl-base64"; - "cl-cookie" = quicklisp-to-nix-packages."cl-cookie"; - "cl-fad" = quicklisp-to-nix-packages."cl-fad"; - "cl-ppcre" = quicklisp-to-nix-packages."cl-ppcre"; - "cl-reexport" = quicklisp-to-nix-packages."cl-reexport"; - "cl-syntax" = quicklisp-to-nix-packages."cl-syntax"; - "cl-syntax-annot" = quicklisp-to-nix-packages."cl-syntax-annot"; - "cl-utilities" = quicklisp-to-nix-packages."cl-utilities"; - "clack" = quicklisp-to-nix-packages."clack"; - "clack-handler-hunchentoot" = quicklisp-to-nix-packages."clack-handler-hunchentoot"; - "clack-socket" = quicklisp-to-nix-packages."clack-socket"; - "clack-test" = quicklisp-to-nix-packages."clack-test"; - "dexador" = quicklisp-to-nix-packages."dexador"; - "dissect" = quicklisp-to-nix-packages."dissect"; - "fast-http" = quicklisp-to-nix-packages."fast-http"; - "fast-io" = quicklisp-to-nix-packages."fast-io"; - "flexi-streams" = quicklisp-to-nix-packages."flexi-streams"; - "http-body" = quicklisp-to-nix-packages."http-body"; - "hunchentoot" = quicklisp-to-nix-packages."hunchentoot"; - "ironclad" = quicklisp-to-nix-packages."ironclad"; - "jonathan" = quicklisp-to-nix-packages."jonathan"; - "lack" = quicklisp-to-nix-packages."lack"; - "lack-component" = quicklisp-to-nix-packages."lack-component"; - "lack-middleware-backtrace" = quicklisp-to-nix-packages."lack-middleware-backtrace"; - "lack-util" = quicklisp-to-nix-packages."lack-util"; - "local-time" = quicklisp-to-nix-packages."local-time"; - "marshal" = quicklisp-to-nix-packages."marshal"; - "md5" = quicklisp-to-nix-packages."md5"; - "named-readtables" = quicklisp-to-nix-packages."named-readtables"; - "nibbles" = quicklisp-to-nix-packages."nibbles"; - "proc-parse" = quicklisp-to-nix-packages."proc-parse"; - "quri" = quicklisp-to-nix-packages."quri"; - "rfc2388" = quicklisp-to-nix-packages."rfc2388"; - "rove" = quicklisp-to-nix-packages."rove"; - "smart-buffer" = quicklisp-to-nix-packages."smart-buffer"; - "split-sequence" = quicklisp-to-nix-packages."split-sequence"; - "static-vectors" = quicklisp-to-nix-packages."static-vectors"; - "trivial-backtrace" = quicklisp-to-nix-packages."trivial-backtrace"; - "trivial-features" = quicklisp-to-nix-packages."trivial-features"; - "trivial-garbage" = quicklisp-to-nix-packages."trivial-garbage"; - "trivial-gray-streams" = quicklisp-to-nix-packages."trivial-gray-streams"; - "trivial-mimes" = quicklisp-to-nix-packages."trivial-mimes"; - "trivial-types" = quicklisp-to-nix-packages."trivial-types"; - "uiop" = quicklisp-to-nix-packages."uiop"; - "usocket" = quicklisp-to-nix-packages."usocket"; - "xsubseq" = quicklisp-to-nix-packages."xsubseq"; - })); - - - "clack" = buildLispPackage - ((f: x: (x // (f x))) - (qlOverrides."clack" or (x: {})) - (import ./quicklisp-to-nix-output/clack.nix { - inherit fetchurl; - "alexandria" = quicklisp-to-nix-packages."alexandria"; - "bordeaux-threads" = quicklisp-to-nix-packages."bordeaux-threads"; - "ironclad" = quicklisp-to-nix-packages."ironclad"; - "lack" = quicklisp-to-nix-packages."lack"; - "lack-component" = quicklisp-to-nix-packages."lack-component"; - "lack-middleware-backtrace" = quicklisp-to-nix-packages."lack-middleware-backtrace"; - "lack-util" = quicklisp-to-nix-packages."lack-util"; - "nibbles" = quicklisp-to-nix-packages."nibbles"; - "uiop" = quicklisp-to-nix-packages."uiop"; - })); - - - "cl-who" = buildLispPackage - ((f: x: (x // (f x))) - (qlOverrides."cl-who" or (x: {})) - (import ./quicklisp-to-nix-output/cl-who.nix { - inherit fetchurl; - "flexi-streams" = quicklisp-to-nix-packages."flexi-streams"; - })); - - - "cl-vectors" = buildLispPackage - ((f: x: (x // (f x))) - (qlOverrides."cl-vectors" or (x: {})) - (import ./quicklisp-to-nix-output/cl-vectors.nix { - inherit fetchurl; - "cl-aa" = quicklisp-to-nix-packages."cl-aa"; - "cl-paths" = quicklisp-to-nix-packages."cl-paths"; - })); - - - "cl-utilities" = buildLispPackage - ((f: x: (x // (f x))) - (qlOverrides."cl-utilities" or (x: {})) - (import ./quicklisp-to-nix-output/cl-utilities.nix { - inherit fetchurl; - })); - - - "cl-unification" = buildLispPackage - ((f: x: (x // (f x))) - (qlOverrides."cl-unification" or (x: {})) - (import ./quicklisp-to-nix-output/cl-unification.nix { - inherit fetchurl; - })); - - - "cl-unicode" = buildLispPackage - ((f: x: (x // (f x))) - (qlOverrides."cl-unicode" or (x: {})) - (import ./quicklisp-to-nix-output/cl-unicode.nix { - inherit fetchurl; - "cl-ppcre" = quicklisp-to-nix-packages."cl-ppcre"; - "flexi-streams" = quicklisp-to-nix-packages."flexi-streams"; - })); - - - "cl-typesetting" = buildLispPackage - ((f: x: (x // (f x))) - (qlOverrides."cl-typesetting" or (x: {})) - (import ./quicklisp-to-nix-output/cl-typesetting.nix { - inherit fetchurl; - "cl-pdf" = quicklisp-to-nix-packages."cl-pdf"; - "iterate" = quicklisp-to-nix-packages."iterate"; - "zpb-ttf" = quicklisp-to-nix-packages."zpb-ttf"; - })); - - - "cl-test-more" = buildLispPackage - ((f: x: (x // (f x))) - (qlOverrides."cl-test-more" or (x: {})) - (import ./quicklisp-to-nix-output/cl-test-more.nix { - inherit fetchurl; - "alexandria" = quicklisp-to-nix-packages."alexandria"; - "anaphora" = quicklisp-to-nix-packages."anaphora"; - "cl-ansi-text" = quicklisp-to-nix-packages."cl-ansi-text"; - "cl-colors" = quicklisp-to-nix-packages."cl-colors"; - "cl-ppcre" = quicklisp-to-nix-packages."cl-ppcre"; - "let-plus" = quicklisp-to-nix-packages."let-plus"; - "prove" = quicklisp-to-nix-packages."prove"; - })); - - - "cl-syntax-markup" = buildLispPackage - ((f: x: (x // (f x))) - (qlOverrides."cl-syntax-markup" or (x: {})) - (import ./quicklisp-to-nix-output/cl-syntax-markup.nix { - inherit fetchurl; - "cl-markup" = quicklisp-to-nix-packages."cl-markup"; - "cl-syntax" = quicklisp-to-nix-packages."cl-syntax"; - "named-readtables" = quicklisp-to-nix-packages."named-readtables"; - "trivial-types" = quicklisp-to-nix-packages."trivial-types"; - })); - - - "cl-syntax-anonfun" = buildLispPackage - ((f: x: (x // (f x))) - (qlOverrides."cl-syntax-anonfun" or (x: {})) - (import ./quicklisp-to-nix-output/cl-syntax-anonfun.nix { - inherit fetchurl; - "cl-anonfun" = quicklisp-to-nix-packages."cl-anonfun"; - "cl-syntax" = quicklisp-to-nix-packages."cl-syntax"; - "named-readtables" = quicklisp-to-nix-packages."named-readtables"; - "trivial-types" = quicklisp-to-nix-packages."trivial-types"; - })); - - - "cl-syntax-annot" = buildLispPackage - ((f: x: (x // (f x))) - (qlOverrides."cl-syntax-annot" or (x: {})) - (import ./quicklisp-to-nix-output/cl-syntax-annot.nix { - inherit fetchurl; - "alexandria" = quicklisp-to-nix-packages."alexandria"; - "cl-annot" = quicklisp-to-nix-packages."cl-annot"; - "cl-syntax" = quicklisp-to-nix-packages."cl-syntax"; - "named-readtables" = quicklisp-to-nix-packages."named-readtables"; - "trivial-types" = quicklisp-to-nix-packages."trivial-types"; - })); - - "cl-smtp" = buildLispPackage ((f: x: (x // (f x))) (qlOverrides."cl-smtp" or (x: {})) @@ -2591,6 +3103,18 @@ let quicklisp-to-nix-packages = rec { })); + "cl-slice" = buildLispPackage + ((f: x: (x // (f x))) + (qlOverrides."cl-slice" or (x: {})) + (import ./quicklisp-to-nix-output/cl-slice.nix { + inherit fetchurl; + "alexandria" = quicklisp-to-nix-packages."alexandria"; + "anaphora" = quicklisp-to-nix-packages."anaphora"; + "clunit" = quicklisp-to-nix-packages."clunit"; + "let-plus" = quicklisp-to-nix-packages."let-plus"; + })); + + "cl-reexport" = buildLispPackage ((f: x: (x // (f x))) (qlOverrides."cl-reexport" or (x: {})) @@ -2600,6 +3124,16 @@ let quicklisp-to-nix-packages = rec { })); + "cl-qprint" = buildLispPackage + ((f: x: (x // (f x))) + (qlOverrides."cl-qprint" or (x: {})) + (import ./quicklisp-to-nix-output/cl-qprint.nix { + inherit fetchurl; + "flexi-streams" = quicklisp-to-nix-packages."flexi-streams"; + "trivial-gray-streams" = quicklisp-to-nix-packages."trivial-gray-streams"; + })); + + "cl-protobufs" = buildLispPackage ((f: x: (x // (f x))) (qlOverrides."cl-protobufs" or (x: {})) @@ -2613,6 +3147,21 @@ let quicklisp-to-nix-packages = rec { })); + "cl-prevalence" = buildLispPackage + ((f: x: (x // (f x))) + (qlOverrides."cl-prevalence" or (x: {})) + (import ./quicklisp-to-nix-output/cl-prevalence.nix { + inherit fetchurl; + "alexandria" = quicklisp-to-nix-packages."alexandria"; + "bordeaux-threads" = quicklisp-to-nix-packages."bordeaux-threads"; + "s-sysdeps" = quicklisp-to-nix-packages."s-sysdeps"; + "s-xml" = quicklisp-to-nix-packages."s-xml"; + "split-sequence" = quicklisp-to-nix-packages."split-sequence"; + "usocket" = quicklisp-to-nix-packages."usocket"; + "usocket-server" = quicklisp-to-nix-packages."usocket-server"; + })); + + "cl-ppcre-unicode" = buildLispPackage ((f: x: (x // (f x))) (qlOverrides."cl-ppcre-unicode" or (x: {})) @@ -2655,6 +3204,50 @@ let quicklisp-to-nix-packages = rec { })); + "cl-paths-ttf" = buildLispPackage + ((f: x: (x // (f x))) + (qlOverrides."cl-paths-ttf" or (x: {})) + (import ./quicklisp-to-nix-output/cl-paths-ttf.nix { + inherit fetchurl; + "cl-paths" = quicklisp-to-nix-packages."cl-paths"; + "zpb-ttf" = quicklisp-to-nix-packages."zpb-ttf"; + })); + + + "closure-html" = buildLispPackage + ((f: x: (x // (f x))) + (qlOverrides."closure-html" or (x: {})) + (import ./quicklisp-to-nix-output/closure-html.nix { + inherit fetchurl; + "alexandria" = quicklisp-to-nix-packages."alexandria"; + "babel" = quicklisp-to-nix-packages."babel"; + "closure-common" = quicklisp-to-nix-packages."closure-common"; + "flexi-streams" = quicklisp-to-nix-packages."flexi-streams"; + "trivial-features" = quicklisp-to-nix-packages."trivial-features"; + "trivial-gray-streams" = quicklisp-to-nix-packages."trivial-gray-streams"; + })); + + + "closure-common" = buildLispPackage + ((f: x: (x // (f x))) + (qlOverrides."closure-common" or (x: {})) + (import ./quicklisp-to-nix-output/closure-common.nix { + inherit fetchurl; + "alexandria" = quicklisp-to-nix-packages."alexandria"; + "babel" = quicklisp-to-nix-packages."babel"; + "trivial-features" = quicklisp-to-nix-packages."trivial-features"; + "trivial-gray-streams" = quicklisp-to-nix-packages."trivial-gray-streams"; + })); + + + "closer-mop" = buildLispPackage + ((f: x: (x // (f x))) + (qlOverrides."closer-mop" or (x: {})) + (import ./quicklisp-to-nix-output/closer-mop.nix { + inherit fetchurl; + })); + + "cl-mysql" = buildLispPackage ((f: x: (x // (f x))) (qlOverrides."cl-mysql" or (x: {})) @@ -2667,6 +3260,26 @@ let quicklisp-to-nix-packages = rec { })); + "cl-locale" = buildLispPackage + ((f: x: (x // (f x))) + (qlOverrides."cl-locale" or (x: {})) + (import ./quicklisp-to-nix-output/cl-locale.nix { + inherit fetchurl; + "alexandria" = quicklisp-to-nix-packages."alexandria"; + "anaphora" = quicklisp-to-nix-packages."anaphora"; + "arnesi" = quicklisp-to-nix-packages."arnesi"; + "cl-annot" = quicklisp-to-nix-packages."cl-annot"; + "cl-syntax" = quicklisp-to-nix-packages."cl-syntax"; + "cl-syntax-annot" = quicklisp-to-nix-packages."cl-syntax-annot"; + "closer-mop" = quicklisp-to-nix-packages."closer-mop"; + "collectors" = quicklisp-to-nix-packages."collectors"; + "iterate" = quicklisp-to-nix-packages."iterate"; + "named-readtables" = quicklisp-to-nix-packages."named-readtables"; + "symbol-munger" = quicklisp-to-nix-packages."symbol-munger"; + "trivial-types" = quicklisp-to-nix-packages."trivial-types"; + })); + + "cl-libuv" = buildLispPackage ((f: x: (x // (f x))) (qlOverrides."cl-libuv" or (x: {})) @@ -2724,6 +3337,26 @@ let quicklisp-to-nix-packages = rec { })); + "cl-interpol" = buildLispPackage + ((f: x: (x // (f x))) + (qlOverrides."cl-interpol" or (x: {})) + (import ./quicklisp-to-nix-output/cl-interpol.nix { + inherit fetchurl; + "cl-ppcre" = quicklisp-to-nix-packages."cl-ppcre"; + "cl-unicode" = quicklisp-to-nix-packages."cl-unicode"; + "flexi-streams" = quicklisp-to-nix-packages."flexi-streams"; + "named-readtables" = quicklisp-to-nix-packages."named-readtables"; + })); + + + "cl-html-parse" = buildLispPackage + ((f: x: (x // (f x))) + (qlOverrides."cl-html-parse" or (x: {})) + (import ./quicklisp-to-nix-output/cl-html-parse.nix { + inherit fetchurl; + })); + + "cl-html5-parser" = buildLispPackage ((f: x: (x // (f x))) (qlOverrides."cl-html5-parser" or (x: {})) @@ -2736,14 +3369,6 @@ let quicklisp-to-nix-packages = rec { })); - "cl-html-parse" = buildLispPackage - ((f: x: (x // (f x))) - (qlOverrides."cl-html-parse" or (x: {})) - (import ./quicklisp-to-nix-output/cl-html-parse.nix { - inherit fetchurl; - })); - - "cl-hooks" = buildLispPackage ((f: x: (x // (f x))) (qlOverrides."cl-hooks" or (x: {})) @@ -2799,6 +3424,18 @@ let quicklisp-to-nix-packages = rec { })); + "cl-fad" = buildLispPackage + ((f: x: (x // (f x))) + (qlOverrides."cl-fad" or (x: {})) + (import ./quicklisp-to-nix-output/cl-fad.nix { + inherit fetchurl; + "alexandria" = quicklisp-to-nix-packages."alexandria"; + "bordeaux-threads" = quicklisp-to-nix-packages."bordeaux-threads"; + "cl-ppcre" = quicklisp-to-nix-packages."cl-ppcre"; + "unit-test" = quicklisp-to-nix-packages."unit-test"; + })); + + "cl-emb" = buildLispPackage ((f: x: (x // (f x))) (qlOverrides."cl-emb" or (x: {})) @@ -2808,6 +3445,15 @@ let quicklisp-to-nix-packages = rec { })); + "cl-dot" = buildLispPackage + ((f: x: (x // (f x))) + (qlOverrides."cl-dot" or (x: {})) + (import ./quicklisp-to-nix-output/cl-dot.nix { + inherit fetchurl; + "uiop" = quicklisp-to-nix-packages."uiop"; + })); + + "cl-dbi" = buildLispPackage ((f: x: (x // (f x))) (qlOverrides."cl-dbi" or (x: {})) @@ -2815,14 +3461,9 @@ let quicklisp-to-nix-packages = rec { inherit fetchurl; "alexandria" = quicklisp-to-nix-packages."alexandria"; "bordeaux-threads" = quicklisp-to-nix-packages."bordeaux-threads"; - "cl-annot" = quicklisp-to-nix-packages."cl-annot"; - "cl-syntax" = quicklisp-to-nix-packages."cl-syntax"; - "cl-syntax-annot" = quicklisp-to-nix-packages."cl-syntax-annot"; "closer-mop" = quicklisp-to-nix-packages."closer-mop"; "dbi" = quicklisp-to-nix-packages."dbi"; - "named-readtables" = quicklisp-to-nix-packages."named-readtables"; "split-sequence" = quicklisp-to-nix-packages."split-sequence"; - "trivial-types" = quicklisp-to-nix-packages."trivial-types"; })); @@ -2857,8 +3498,6 @@ let quicklisp-to-nix-packages = rec { inherit fetchurl; "alexandria" = quicklisp-to-nix-packages."alexandria"; "babel" = quicklisp-to-nix-packages."babel"; - "bordeaux-threads" = quicklisp-to-nix-packages."bordeaux-threads"; - "cl-fad" = quicklisp-to-nix-packages."cl-fad"; "cl-ppcre" = quicklisp-to-nix-packages."cl-ppcre"; "cl-utilities" = quicklisp-to-nix-packages."cl-utilities"; "local-time" = quicklisp-to-nix-packages."local-time"; @@ -2869,6 +3508,17 @@ let quicklisp-to-nix-packages = rec { })); + "cl-containers" = buildLispPackage + ((f: x: (x // (f x))) + (qlOverrides."cl-containers" or (x: {})) + (import ./quicklisp-to-nix-output/cl-containers.nix { + inherit fetchurl; + "asdf-system-connections" = quicklisp-to-nix-packages."asdf-system-connections"; + "metatilities-base" = quicklisp-to-nix-packages."metatilities-base"; + "moptilities" = quicklisp-to-nix-packages."moptilities"; + })); + + "cl-colors" = buildLispPackage ((f: x: (x // (f x))) (qlOverrides."cl-colors" or (x: {})) @@ -2890,6 +3540,29 @@ let quicklisp-to-nix-packages = rec { })); + "cl-cffi-gtk" = buildLispPackage + ((f: x: (x // (f x))) + (qlOverrides."cl-cffi-gtk" or (x: {})) + (import ./quicklisp-to-nix-output/cl-cffi-gtk.nix { + inherit fetchurl; + "alexandria" = quicklisp-to-nix-packages."alexandria"; + "babel" = quicklisp-to-nix-packages."babel"; + "bordeaux-threads" = quicklisp-to-nix-packages."bordeaux-threads"; + "cffi" = quicklisp-to-nix-packages."cffi"; + "cl-cffi-gtk-cairo" = quicklisp-to-nix-packages."cl-cffi-gtk-cairo"; + "cl-cffi-gtk-gdk" = quicklisp-to-nix-packages."cl-cffi-gtk-gdk"; + "cl-cffi-gtk-gdk-pixbuf" = quicklisp-to-nix-packages."cl-cffi-gtk-gdk-pixbuf"; + "cl-cffi-gtk-gio" = quicklisp-to-nix-packages."cl-cffi-gtk-gio"; + "cl-cffi-gtk-glib" = quicklisp-to-nix-packages."cl-cffi-gtk-glib"; + "cl-cffi-gtk-gobject" = quicklisp-to-nix-packages."cl-cffi-gtk-gobject"; + "cl-cffi-gtk-pango" = quicklisp-to-nix-packages."cl-cffi-gtk-pango"; + "closer-mop" = quicklisp-to-nix-packages."closer-mop"; + "iterate" = quicklisp-to-nix-packages."iterate"; + "trivial-features" = quicklisp-to-nix-packages."trivial-features"; + "trivial-garbage" = quicklisp-to-nix-packages."trivial-garbage"; + })); + + "cl-base64" = buildLispPackage ((f: x: (x // (f x))) (qlOverrides."cl-base64" or (x: {})) @@ -2979,25 +3652,96 @@ let quicklisp-to-nix-packages = rec { (import ./quicklisp-to-nix-output/cl-ansi-text.nix { inherit fetchurl; "alexandria" = quicklisp-to-nix-packages."alexandria"; - "anaphora" = quicklisp-to-nix-packages."anaphora"; - "cl-colors" = quicklisp-to-nix-packages."cl-colors"; - "let-plus" = quicklisp-to-nix-packages."let-plus"; + "cl-colors2" = quicklisp-to-nix-packages."cl-colors2"; + "cl-ppcre" = quicklisp-to-nix-packages."cl-ppcre"; })); - "cl_plus_ssl" = buildLispPackage + "cl-annot" = buildLispPackage ((f: x: (x // (f x))) - (qlOverrides."cl_plus_ssl" or (x: {})) - (import ./quicklisp-to-nix-output/cl_plus_ssl.nix { + (qlOverrides."cl-annot" or (x: {})) + (import ./quicklisp-to-nix-output/cl-annot.nix { + inherit fetchurl; + "alexandria" = quicklisp-to-nix-packages."alexandria"; + })); + + + "clack-v1-compat" = buildLispPackage + ((f: x: (x // (f x))) + (qlOverrides."clack-v1-compat" or (x: {})) + (import ./quicklisp-to-nix-output/clack-v1-compat.nix { inherit fetchurl; "alexandria" = quicklisp-to-nix-packages."alexandria"; "babel" = quicklisp-to-nix-packages."babel"; "bordeaux-threads" = quicklisp-to-nix-packages."bordeaux-threads"; "cffi" = quicklisp-to-nix-packages."cffi"; + "cffi-grovel" = quicklisp-to-nix-packages."cffi-grovel"; + "cffi-toolchain" = quicklisp-to-nix-packages."cffi-toolchain"; + "chipz" = quicklisp-to-nix-packages."chipz"; + "chunga" = quicklisp-to-nix-packages."chunga"; + "circular-streams" = quicklisp-to-nix-packages."circular-streams"; + "cl_plus_ssl" = quicklisp-to-nix-packages."cl_plus_ssl"; + "cl-annot" = quicklisp-to-nix-packages."cl-annot"; + "cl-base64" = quicklisp-to-nix-packages."cl-base64"; + "cl-cookie" = quicklisp-to-nix-packages."cl-cookie"; + "cl-fad" = quicklisp-to-nix-packages."cl-fad"; + "cl-ppcre" = quicklisp-to-nix-packages."cl-ppcre"; + "cl-reexport" = quicklisp-to-nix-packages."cl-reexport"; + "cl-syntax" = quicklisp-to-nix-packages."cl-syntax"; + "cl-syntax-annot" = quicklisp-to-nix-packages."cl-syntax-annot"; + "cl-utilities" = quicklisp-to-nix-packages."cl-utilities"; + "clack" = quicklisp-to-nix-packages."clack"; + "clack-handler-hunchentoot" = quicklisp-to-nix-packages."clack-handler-hunchentoot"; + "clack-socket" = quicklisp-to-nix-packages."clack-socket"; + "clack-test" = quicklisp-to-nix-packages."clack-test"; + "dexador" = quicklisp-to-nix-packages."dexador"; + "dissect" = quicklisp-to-nix-packages."dissect"; + "fast-http" = quicklisp-to-nix-packages."fast-http"; + "fast-io" = quicklisp-to-nix-packages."fast-io"; "flexi-streams" = quicklisp-to-nix-packages."flexi-streams"; + "http-body" = quicklisp-to-nix-packages."http-body"; + "hunchentoot" = quicklisp-to-nix-packages."hunchentoot"; + "ironclad" = quicklisp-to-nix-packages."ironclad"; + "jonathan" = quicklisp-to-nix-packages."jonathan"; + "lack" = quicklisp-to-nix-packages."lack"; + "lack-component" = quicklisp-to-nix-packages."lack-component"; + "lack-middleware-backtrace" = quicklisp-to-nix-packages."lack-middleware-backtrace"; + "lack-util" = quicklisp-to-nix-packages."lack-util"; + "local-time" = quicklisp-to-nix-packages."local-time"; + "marshal" = quicklisp-to-nix-packages."marshal"; + "md5" = quicklisp-to-nix-packages."md5"; + "named-readtables" = quicklisp-to-nix-packages."named-readtables"; + "proc-parse" = quicklisp-to-nix-packages."proc-parse"; + "quri" = quicklisp-to-nix-packages."quri"; + "rfc2388" = quicklisp-to-nix-packages."rfc2388"; + "rove" = quicklisp-to-nix-packages."rove"; + "smart-buffer" = quicklisp-to-nix-packages."smart-buffer"; + "split-sequence" = quicklisp-to-nix-packages."split-sequence"; + "static-vectors" = quicklisp-to-nix-packages."static-vectors"; + "trivial-backtrace" = quicklisp-to-nix-packages."trivial-backtrace"; "trivial-features" = quicklisp-to-nix-packages."trivial-features"; "trivial-garbage" = quicklisp-to-nix-packages."trivial-garbage"; "trivial-gray-streams" = quicklisp-to-nix-packages."trivial-gray-streams"; + "trivial-mimes" = quicklisp-to-nix-packages."trivial-mimes"; + "trivial-types" = quicklisp-to-nix-packages."trivial-types"; + "uiop" = quicklisp-to-nix-packages."uiop"; + "usocket" = quicklisp-to-nix-packages."usocket"; + "xsubseq" = quicklisp-to-nix-packages."xsubseq"; + })); + + + "clack" = buildLispPackage + ((f: x: (x // (f x))) + (qlOverrides."clack" or (x: {})) + (import ./quicklisp-to-nix-output/clack.nix { + inherit fetchurl; + "alexandria" = quicklisp-to-nix-packages."alexandria"; + "bordeaux-threads" = quicklisp-to-nix-packages."bordeaux-threads"; + "ironclad" = quicklisp-to-nix-packages."ironclad"; + "lack" = quicklisp-to-nix-packages."lack"; + "lack-component" = quicklisp-to-nix-packages."lack-component"; + "lack-middleware-backtrace" = quicklisp-to-nix-packages."lack-middleware-backtrace"; + "lack-util" = quicklisp-to-nix-packages."lack-util"; "uiop" = quicklisp-to-nix-packages."uiop"; })); @@ -3019,6 +3763,15 @@ let quicklisp-to-nix-packages = rec { })); + "chunga" = buildLispPackage + ((f: x: (x // (f x))) + (qlOverrides."chunga" or (x: {})) + (import ./quicklisp-to-nix-output/chunga.nix { + inherit fetchurl; + "trivial-gray-streams" = quicklisp-to-nix-packages."trivial-gray-streams"; + })); + + "chipz" = buildLispPackage ((f: x: (x // (f x))) (qlOverrides."chipz" or (x: {})) @@ -3027,6 +3780,17 @@ let quicklisp-to-nix-packages = rec { })); + "chanl" = buildLispPackage + ((f: x: (x // (f x))) + (qlOverrides."chanl" or (x: {})) + (import ./quicklisp-to-nix-output/chanl.nix { + inherit fetchurl; + "alexandria" = quicklisp-to-nix-packages."alexandria"; + "bordeaux-threads" = quicklisp-to-nix-packages."bordeaux-threads"; + "fiveam" = quicklisp-to-nix-packages."fiveam"; + })); + + "cffi-grovel" = buildLispPackage ((f: x: (x // (f x))) (qlOverrides."cffi-grovel" or (x: {})) @@ -3074,6 +3838,7 @@ let quicklisp-to-nix-packages = rec { "cl-ansi-text" = quicklisp-to-nix-packages."cl-ansi-text"; "cl-base64" = quicklisp-to-nix-packages."cl-base64"; "cl-colors" = quicklisp-to-nix-packages."cl-colors"; + "cl-colors2" = quicklisp-to-nix-packages."cl-colors2"; "cl-cookie" = quicklisp-to-nix-packages."cl-cookie"; "cl-emb" = quicklisp-to-nix-packages."cl-emb"; "cl-fad" = quicklisp-to-nix-packages."cl-fad"; @@ -3109,7 +3874,6 @@ let quicklisp-to-nix-packages = rec { "md5" = quicklisp-to-nix-packages."md5"; "myway" = quicklisp-to-nix-packages."myway"; "named-readtables" = quicklisp-to-nix-packages."named-readtables"; - "nibbles" = quicklisp-to-nix-packages."nibbles"; "proc-parse" = quicklisp-to-nix-packages."proc-parse"; "prove" = quicklisp-to-nix-packages."prove"; "quri" = quicklisp-to-nix-packages."quri"; @@ -3174,6 +3938,30 @@ let quicklisp-to-nix-packages = rec { })); + "arnesi" = buildLispPackage + ((f: x: (x // (f x))) + (qlOverrides."arnesi" or (x: {})) + (import ./quicklisp-to-nix-output/arnesi.nix { + inherit fetchurl; + "alexandria" = quicklisp-to-nix-packages."alexandria"; + "cl-ppcre" = quicklisp-to-nix-packages."cl-ppcre"; + "closer-mop" = quicklisp-to-nix-packages."closer-mop"; + "collectors" = quicklisp-to-nix-packages."collectors"; + "iterate" = quicklisp-to-nix-packages."iterate"; + "swank" = quicklisp-to-nix-packages."swank"; + "symbol-munger" = quicklisp-to-nix-packages."symbol-munger"; + })); + + + "anaphora" = buildLispPackage + ((f: x: (x // (f x))) + (qlOverrides."anaphora" or (x: {})) + (import ./quicklisp-to-nix-output/anaphora.nix { + inherit fetchurl; + "rt" = quicklisp-to-nix-packages."rt"; + })); + + "alexandria" = buildLispPackage ((f: x: (x // (f x))) (qlOverrides."alexandria" or (x: {})) @@ -3182,6 +3970,32 @@ let quicklisp-to-nix-packages = rec { })); + "acclimation" = buildLispPackage + ((f: x: (x // (f x))) + (qlOverrides."acclimation" or (x: {})) + (import ./quicklisp-to-nix-output/acclimation.nix { + inherit fetchurl; + })); + + + "access" = buildLispPackage + ((f: x: (x // (f x))) + (qlOverrides."access" or (x: {})) + (import ./quicklisp-to-nix-output/access.nix { + inherit fetchurl; + "alexandria" = quicklisp-to-nix-packages."alexandria"; + "anaphora" = quicklisp-to-nix-packages."anaphora"; + "cl-interpol" = quicklisp-to-nix-packages."cl-interpol"; + "cl-ppcre" = quicklisp-to-nix-packages."cl-ppcre"; + "cl-unicode" = quicklisp-to-nix-packages."cl-unicode"; + "closer-mop" = quicklisp-to-nix-packages."closer-mop"; + "flexi-streams" = quicklisp-to-nix-packages."flexi-streams"; + "iterate" = quicklisp-to-nix-packages."iterate"; + "lisp-unit2" = quicklisp-to-nix-packages."lisp-unit2"; + "named-readtables" = quicklisp-to-nix-packages."named-readtables"; + })); + + "_3bmd" = buildLispPackage ((f: x: (x // (f x))) (qlOverrides."_3bmd" or (x: {})) @@ -3193,16 +4007,6 @@ let quicklisp-to-nix-packages = rec { })); - "cl-prevalence" = buildLispPackage - ((f: x: (x // (f x))) - (qlOverrides."cl-prevalence" or (x: {})) - (import ./quicklisp-to-nix-output/cl-prevalence.nix { - inherit fetchurl; - "s-sysdeps" = quicklisp-to-nix-packages."s-sysdeps"; - "s-xml" = quicklisp-to-nix-packages."s-xml"; - })); - - }; in quicklisp-to-nix-packages diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix/system-info.lisp b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix/system-info.lisp index 0f7941a011..fecae71024 100644 --- a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix/system-info.lisp +++ b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix/system-info.lisp @@ -7,11 +7,20 @@ (:export #:dump-image)) (in-package :ql-to-nix-system-info) +(eval-when (:compile-toplevel :load-toplevel :execute) + (defparameter *implementation-systems* + (append + #+sbcl(list :sb-posix :sb-bsd-sockets :sb-rotate-byte :sb-cltl2 + :sb-introspect :sb-rt :sb-concurrency))) + (mapcar (function require) *implementation-systems*)) + (declaim (optimize (debug 3) (speed 0) (space 0) (compilation-speed 0) (safety 3))) ;; This file cannot have any dependencies beyond quicklisp and asdf. ;; Otherwise, we'll miss some dependencies! +;; (Implementation-provided dependencies are special, though) + ;; We can't load quicklisp until runtime (at which point we'll create ;; an isolated quicklisp installation). These wrapper functions are ;; nicer than funcalling intern'd symbols every time we want to talk @@ -441,6 +450,8 @@ Run with --debug and/or --verbose for more info. (when cache-dir (setf cache-dir (pathname-as-directory (parse-namestring cache-dir)))) + (mapcar (function require) *implementation-systems*) + (with-quicklisp (dir) (:cache-dir (or cache-dir :temp)) (declare (ignore dir)) diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp.sh b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp.sh index 30d1441946..1d9c3c5bc5 100644 --- a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp.sh +++ b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp.sh @@ -63,7 +63,7 @@ case "$op" in mv "$NIX_QUICKLISP_DIR/quicklisp"{,-old-$(date +%Y%m%d-%H%M%S)} fi - ln -sfT "@out@/lib/common-lisp/quicklisp/quicklisp" "$NIX_QUICKLISP_DIR/quicklisp" + cp -rfT "@out@/lib/common-lisp/quicklisp/quicklisp" "$NIX_QUICKLISP_DIR/quicklisp" "@clwrapper@/bin/common-lisp.sh" "$NIX_LISP_EXEC_CODE" \ "(load \"$NIX_QUICKLISP_DIR/setup.lisp\")" "$NIX_LISP_EXEC_CODE" \ diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules/shell.nix b/third_party/nixpkgs/pkgs/development/lisp-modules/shell.nix index 4a1f9ded56..0201491f4c 100644 --- a/third_party/nixpkgs/pkgs/development/lisp-modules/shell.nix +++ b/third_party/nixpkgs/pkgs/development/lisp-modules/shell.nix @@ -11,6 +11,6 @@ self = rec { lispPackages.quicklisp-to-nix lispPackages.quicklisp-to-nix-system-info ]; CPATH = "${libfixposix}/include"; - LD_LIBRARY_PATH = "${openssl.out}/lib:${fuse}/lib:${libuv}/lib:${libev}/lib:${libmysqlclient}/lib:${libmysqlclient}/lib/mysql:${postgresql.lib}/lib:${sqlite.out}/lib:${libfixposix}/lib:${freetds}/lib:${openssl_lib_marked}/lib"; + LD_LIBRARY_PATH = "${openssl.out}/lib:${fuse}/lib:${libuv}/lib:${libev}/lib:${libmysqlclient}/lib:${libmysqlclient}/lib/mysql:${postgresql.lib}/lib:${sqlite.out}/lib:${libfixposix}/lib:${freetds}/lib:${openssl_lib_marked}/lib:${glib.out}/lib:${gdk_pixbuf}/lib:${cairo}/lib:${pango.out}/lib:${gtk3}/lib:${webkitgtk}/lib"; }; in stdenv.mkDerivation self diff --git a/third_party/nixpkgs/pkgs/development/misc/haskell/hasura/graphql-engine/default.nix b/third_party/nixpkgs/pkgs/development/misc/haskell/hasura/graphql-engine/default.nix index 0bd68afae4..055459514e 100644 --- a/third_party/nixpkgs/pkgs/development/misc/haskell/hasura/graphql-engine/default.nix +++ b/third_party/nixpkgs/pkgs/development/misc/haskell/hasura/graphql-engine/default.nix @@ -70,4 +70,6 @@ mkDerivation { description = "GraphQL API over Postgres"; license = stdenv.lib.licenses.asl20; maintainers = with stdenv.lib.maintainers; [ offline ]; + hydraPlatforms = []; + broken = true; } diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/janestreet/0.13.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/janestreet/0.13.nix index 009fa99048..175651f696 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/janestreet/0.13.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/janestreet/0.13.nix @@ -484,6 +484,20 @@ rec { propagatedBuildInputs = [ async expect_test_helpers_kernel ]; }; + posixat = janePackage { + pname = "posixat"; + hash = "122fmd6v7fhiiivkxra539b5w3p5xkkd8mcjzvyb2msyq5zc6xa2"; + propagatedBuildInputs = [ ppx_optcomp ppx_sexp_conv ]; + meta.description = "Binding to the posix *at functions"; + }; + + shexp = janePackage { + pname = "shexp"; + hash = "0zdcyix0gdn4xmvbjzhbig63xw9jnw8ixj3ngs6g4k2vk77rs0gk"; + propagatedBuildInputs = [ posixat spawn ]; + meta.description = "Process library and s-expression based shell"; + }; + ### Packages at version 0.11, with dependencies at version 0.12 configurator = janePackage { diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/mirage-bootvar-unix/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/mirage-bootvar-unix/default.nix new file mode 100644 index 0000000000..9b9a1ae185 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/mirage-bootvar-unix/default.nix @@ -0,0 +1,22 @@ +{ lib, fetchurl, buildDunePackage +, lwt, parse-argv +}: + +buildDunePackage rec { + pname = "mirage-bootvar-unix"; + version = "0.1.0"; + + src = fetchurl { + url = "https://github.com/mirage/mirage-bootvar-unix/releases/download/${version}/mirage-bootvar-unix-${version}.tbz"; + sha256 = "0r92s6y7nxg0ci330a7p0hii4if51iq0sixn20cnm5j4a2clprbf"; + }; + + propagatedBuildInputs = [ lwt parse-argv ]; + + meta = { + description = "Unix implementation of MirageOS Bootvar interface"; + homepage = "https://github.com/mirage/mirage-bootvar-unix"; + license = lib.licenses.isc; + maintainers = [ lib.maintainers.vbgl ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/mirage-crypto/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/mirage-crypto/default.nix index e178e066a3..66da69fee2 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/mirage-crypto/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/mirage-crypto/default.nix @@ -4,11 +4,11 @@ buildDunePackage rec { minimumOCamlVersion = "4.08"; pname = "mirage-crypto"; - version = "0.8.5"; + version = "0.8.6"; src = fetchurl { url = "https://github.com/mirage/mirage-crypto/releases/download/v${version}/mirage-crypto-v${version}.tbz"; - sha256 = "0l6q0z5ghhy0djfscb2i2xg4dpmxs4xkwh16kc473cmb4hsxsmyk"; + sha256 = "1fghg89lpm1iks6nk1jhqcimpvb52jih0ys9bxbn2f343l0njbkq"; }; useDune2 = true; diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/mirage-fs/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/mirage-fs/default.nix new file mode 100644 index 0000000000..d8cfddff31 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/mirage-fs/default.nix @@ -0,0 +1,24 @@ +{ lib, fetchurl, buildDunePackage +, cstruct, fmt, lwt, mirage-device, mirage-kv +}: + +buildDunePackage rec { + pname = "mirage-fs"; + version = "3.0.1"; + + useDune2 = true; + + src = fetchurl { + url = "https://github.com/mirage/mirage-fs/releases/download/v${version}/mirage-fs-v${version}.tbz"; + sha256 = "0px18bgk528vr7iw78r0j3z4sdcz684sfcj47ibbly2adbvd64yk"; + }; + + propagatedBuildInputs = [ cstruct fmt lwt mirage-device mirage-kv ]; + + meta = { + description = "MirageOS signatures for filesystem devices"; + homepage = "https://github.com/mirage/mirage-fs"; + license = lib.licenses.isc; + maintainers = [ lib.maintainers.vbgl ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/mirage-kv/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/mirage-kv/default.nix new file mode 100644 index 0000000000..20d83e1664 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/mirage-kv/default.nix @@ -0,0 +1,28 @@ +{ lib, fetchurl, buildDunePackage +, fmt, mirage-device +, alcotest +}: + +buildDunePackage rec { + pname = "mirage-kv"; + version = "3.0.1"; + + useDune2 = true; + + src = fetchurl { + url = "https://github.com/mirage/mirage-kv/releases/download/v${version}/mirage-kv-v${version}.tbz"; + sha256 = "1n736sjvdd8rkbc2b5jm9sn0w6hvhjycma5328r0l03v24vk5cki"; + }; + + propagatedBuildInputs = [ fmt mirage-device ]; + + doCheck = true; + checkInputs = [ alcotest ]; + + meta = { + description = "MirageOS signatures for key/value devices"; + homepage = "https://github.com/mirage/mirage-kv"; + license = lib.licenses.isc; + maintainers = [ lib.maintainers.vbgl ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/mirage-net/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/mirage-net/default.nix new file mode 100644 index 0000000000..a29727d7ee --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/mirage-net/default.nix @@ -0,0 +1,24 @@ +{ lib, fetchurl, buildDunePackage +, cstruct, fmt, lwt, macaddr, mirage-device +}: + +buildDunePackage rec { + pname = "mirage-net"; + version = "3.0.1"; + + useDune2 = true; + + src = fetchurl { + url = "https://github.com/mirage/mirage-net/releases/download/v${version}/mirage-net-v${version}.tbz"; + sha256 = "0yfvl0fgs7xy5i7kkparaa7a315a2h7kb1z24fmmnwnyaji57dg3"; + }; + + propagatedBuildInputs = [ cstruct fmt lwt macaddr mirage-device ]; + + meta = { + description = "Network signatures for MirageOS"; + homepage = "https://github.com/mirage/mirage-net"; + license = lib.licenses.isc; + maintainers = [ lib.maintainers.vbgl ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/mirage/runtime.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/mirage/runtime.nix index 816e85d3c9..b3f308979f 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/mirage/runtime.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/mirage/runtime.nix @@ -3,13 +3,13 @@ buildDunePackage rec { pname = "mirage-runtime"; - version = "3.8.1"; + version = "3.9.0"; - minimumOCamlVersion = "4.06"; + minimumOCamlVersion = "4.08"; src = fetchurl { url = "https://github.com/mirage/mirage/releases/download/v${version}/mirage-v${version}.tbz"; - sha256 = "1sx9df041jb2rdrsibybifhml6h6kpzw9d2bw6vvv0ml500070ww"; + sha256 = "1hznh49v1jlkwww6xi9f2f4yjzlh9qfvdrrdzvddnwsh3g00flla"; }; propagatedBuildInputs = [ ipaddr functoria-runtime fmt logs ocaml_lwt ]; diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/ocsigen-start/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/ocsigen-start/default.nix index 637c06e98d..5939e61645 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/ocsigen-start/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/ocsigen-start/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, ocaml, findlib, ocsigen-toolkit, pgocaml_ppx, macaque, safepass, yojson +{ stdenv, fetchFromGitHub, ocaml, findlib, ocsigen-toolkit, pgocaml_ppx, safepass, yojson , cohttp-lwt-unix , resource-pooling }: @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { ''; createFindlibDestdir = true; - + src = fetchFromGitHub { owner = "ocsigen"; repo = "ocsigen-start"; diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/parse-argv/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/parse-argv/default.nix new file mode 100644 index 0000000000..64cc7c0c6b --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/parse-argv/default.nix @@ -0,0 +1,28 @@ +{ lib, fetchurl, buildDunePackage, ocaml +, astring +, ounit +}: + +buildDunePackage rec { + pname = "parse-argv"; + version = "0.2.0"; + + minimumOCamlVersion = "4.03"; + + src = fetchurl { + url = "https://github.com/mirage/parse-argv/releases/download/v${version}/parse-argv-v${version}.tbz"; + sha256 = "06dl04fcmwpkydzni2fzwrhk0bqypd55mgxfax9v82x65xrgj5gw"; + }; + + propagatedBuildInputs = [ astring ]; + + doCheck = lib.versionAtLeast ocaml.version "4.04"; + checkInputs = [ ounit ]; + + meta = { + description = "Process strings into sets of command-line arguments"; + homepage = "https://github.com/mirage/parse-argv"; + license = lib.licenses.isc; + maintainers = [ lib.maintainers.vbgl ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/pgocaml/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/pgocaml/default.nix index 8896675f63..d0dcb5b489 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/pgocaml/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/pgocaml/default.nix @@ -1,22 +1,21 @@ { lib, fetchFromGitHub, buildDunePackage -, calendar, csv, hex, re +, calendar, csv, hex, ppx_deriving, ppx_sexp_conv, re, rresult, sexplib }: buildDunePackage rec { pname = "pgocaml"; - version = "4.0"; + version = "4.2.2"; src = fetchFromGitHub { owner = "darioteixeira"; repo = "pgocaml"; - rev = "v${version}"; - sha256 = "1s8c5prr7jb9k76bz990m836czm6k8rv5bvp6s2zg9ra0w19w90j"; + rev = version; + sha256 = "1rdypc83nap9j2ml9r6n1pzgf79gk1yffwyi6fmcrl7zmy01cg0n"; }; - minimumOCamlVersion = "4.05"; + minimumOCamlVersion = "4.07"; + useDune2 = true; - preConfigure = "patchShebangs src/genconfig.sh"; - - propagatedBuildInputs = [ calendar csv hex re ]; + propagatedBuildInputs = [ calendar csv hex ppx_deriving ppx_sexp_conv re rresult sexplib ]; meta = with lib; { description = "An interface to PostgreSQL databases for OCaml applications"; diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/pgocaml/ppx.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/pgocaml/ppx.nix index f8bc4a40e7..35c19622f8 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/pgocaml/ppx.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/pgocaml/ppx.nix @@ -1,8 +1,8 @@ -{ buildDunePackage, pgocaml, ppx_tools, ppx_tools_versioned, rresult }: +{ buildDunePackage, pgocaml, ppx_optcomp, ppx_tools, ppx_tools_versioned, rresult }: buildDunePackage { pname = "pgocaml_ppx"; - inherit (pgocaml) src version meta; + inherit (pgocaml) src version useDune2 meta; - propagatedBuildInputs = [ pgocaml ppx_tools ppx_tools_versioned rresult ]; + propagatedBuildInputs = [ pgocaml ppx_optcomp ppx_tools ppx_tools_versioned rresult ]; } diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/safepass/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/safepass/default.nix index 884bcdebba..04c494403b 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/safepass/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/safepass/default.nix @@ -1,33 +1,21 @@ -{ stdenv, fetchurl, ocaml, findlib, ocamlbuild }: +{ lib, fetchFromGitHub, buildDunePackage }: -let param = - if stdenv.lib.versionAtLeast ocaml.version "4.02" - then { - version = "2.0"; - url = "http://forge.ocamlcore.org/frs/download.php/1615/ocaml-safepass-2.0.tgz"; - sha256 = "1zxx3wcyzhxxvm5w9c21y7hpa11h67paaaz9mfsyiqk6fs6hcvmw"; - } else { - version = "1.3"; - url = "http://forge.ocamlcore.org/frs/download.php/1432/ocaml-safepass-1.3.tgz"; - sha256 = "0lb8xbpyc5d1zml7s7mmcr6y2ipwdp7qz73lkv9asy7dyi6cj15g"; +buildDunePackage rec { + pname = "safepass"; + version = "3.0"; + + src = fetchFromGitHub { + owner = "darioteixeira"; + repo = "ocaml-safepass"; + rev = "v${version}"; + sha256 = "0i127gs9x23wzwa1q3dxa2j6hby07hvxdg1c98fc3j09rg6vy2bs"; }; -in - -stdenv.mkDerivation { - name = "ocaml${ocaml.version}-safepass-${param.version}"; - src = fetchurl { - inherit (param) url sha256; - }; - - buildInputs = [ ocaml findlib ocamlbuild ]; - - createFindlibDestdir = true; meta = { - homepage = "http://ocaml-safepass.forge.ocamlcore.org/"; + inherit (src.meta) homepage; description = "An OCaml library offering facilities for the safe storage of user passwords"; - license = stdenv.lib.licenses.lgpl21; - platforms = ocaml.meta.platforms or []; - maintainers = with stdenv.lib.maintainers; [ vbgl ]; + license = lib.licenses.lgpl21; + maintainers = with lib.maintainers; [ vbgl ]; }; + } diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/sqlite3/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/sqlite3/default.nix index 2cc02abbb4..660282ad13 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/sqlite3/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/sqlite3/default.nix @@ -2,12 +2,12 @@ buildDunePackage rec { pname = "sqlite3"; - version = "5.0.1"; + version = "5.0.2"; minimumOCamlVersion = "4.05"; src = fetchurl { url = "https://github.com/mmottl/sqlite3-ocaml/releases/download/${version}/sqlite3-${version}.tbz"; - sha256 = "0iymkszrs6qwak0vadfzc8yd8jfwn06zl08ggb4jr2mgk2c8mmsn"; + sha256 = "0sba74n0jvzxibrclhbpqscil36yfw7i9jj9q562yhza6rax9p82"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/uchar/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/uchar/default.nix index 819d8527b2..fb56cca0f0 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/uchar/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/uchar/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, ocaml, findlib, ocamlbuild, opaline, withShared ? true }: +{ stdenv, fetchurl, ocaml, findlib, ocamlbuild, opaline, withShared ? true, lib }: stdenv.mkDerivation { name = "ocaml${ocaml.version}-uchar-0.0.2"; @@ -10,7 +10,7 @@ stdenv.mkDerivation { nativeBuildInputs = [ ocaml ocamlbuild findlib ]; buildInputs = [ findlib ocaml ocamlbuild ]; - buildPhase = "ocaml pkg/build.ml native=true native-dynlink=${if withShared then "true" else "false"}"; + buildPhase = "ocaml pkg/build.ml native=true native-dynlink=${lib.boolToString withShared}"; installPhase = "${opaline}/bin/opaline -libdir $OCAMLFIND_DESTDIR"; configurePlatforms = []; diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/yaml/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/yaml/default.nix index 3179075535..c8b2b614e8 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/yaml/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/yaml/default.nix @@ -1,17 +1,21 @@ { lib, fetchurl, buildDunePackage +, dune-configurator , ppx_sexp_conv , bos, ctypes, fmt, logs, rresult, sexplib }: buildDunePackage rec { pname = "yaml"; - version = "2.0.1"; + version = "2.1.0"; + + useDune2 = true; src = fetchurl { url = "https://github.com/avsm/ocaml-yaml/releases/download/v${version}/yaml-v${version}.tbz"; - sha256 = "1r8jj572h416g2zliwmxj2j9hkv73nxnpfb9gmbj9gixg24lskx0"; + sha256 = "03g8vsh5jgi1cm5q78v15slgnzifp91fp7n4v1i7pa8yk0bkh585"; }; + buildInputs = [ dune-configurator ]; propagatedBuildInputs = [ bos ctypes fmt logs ppx_sexp_conv rresult sexplib ]; meta = { diff --git a/third_party/nixpkgs/pkgs/development/php-packages/ast/default.nix b/third_party/nixpkgs/pkgs/development/php-packages/ast/default.nix index 9df099734a..fb609b9f04 100644 --- a/third_party/nixpkgs/pkgs/development/php-packages/ast/default.nix +++ b/third_party/nixpkgs/pkgs/development/php-packages/ast/default.nix @@ -3,8 +3,8 @@ buildPecl { pname = "ast"; - version = "1.0.5"; - sha256 = "16c5isldm4csjbcvz1qk2mmrhgvh24sxsp6w6f5a37xpa3vciawp"; + version = "1.0.10"; + sha256 = "13s5r1szd80g1mqickghdd38mvjkwss221322mmbrykcfgp4fs30"; meta.maintainers = lib.teams.php.members; } diff --git a/third_party/nixpkgs/pkgs/development/php-packages/composer/2.0.nix b/third_party/nixpkgs/pkgs/development/php-packages/composer/2.0.nix index ac9fd52719..8321681de5 100644 --- a/third_party/nixpkgs/pkgs/development/php-packages/composer/2.0.nix +++ b/third_party/nixpkgs/pkgs/development/php-packages/composer/2.0.nix @@ -1,14 +1,14 @@ { mkDerivation, fetchurl, pkgs, lib, php }: let pname = "composer"; - version = "2.0.0-RC1"; + version = "2.0.0"; in mkDerivation { inherit pname version; src = fetchurl { url = "https://getcomposer.org/download/${version}/composer.phar"; - sha256 = "0wzr360gaa59cbjpa3vw9yrpc55a4fmdv68q0rn7vj0mjnz60fhd"; + sha256 = "11fjplbrscnw0fs5hmw4bmszg5a87ig189175407i1ip5fm5g5hk"; }; dontUnpack = true; diff --git a/third_party/nixpkgs/pkgs/development/php-packages/composer/default.nix b/third_party/nixpkgs/pkgs/development/php-packages/composer/default.nix index 4f6cbe4c7d..37c983507c 100644 --- a/third_party/nixpkgs/pkgs/development/php-packages/composer/default.nix +++ b/third_party/nixpkgs/pkgs/development/php-packages/composer/default.nix @@ -1,14 +1,14 @@ { mkDerivation, fetchurl, pkgs, lib, php }: let pname = "composer"; - version = "1.10.13"; + version = "1.10.15"; in mkDerivation { inherit pname version; src = fetchurl { url = "https://getcomposer.org/download/${version}/composer.phar"; - sha256 = "13vhfdlkmpvmk1h30f1i688xk7sdgfj0b82am32jgpa8zmf499sw"; + sha256 = "1shsxsrc2kq74s1jbq3njn9wzidcz7ak66n9vyz8z8d0hqpg37d6"; }; dontUnpack = true; diff --git a/third_party/nixpkgs/pkgs/development/php-packages/couchbase/default.nix b/third_party/nixpkgs/pkgs/development/php-packages/couchbase/default.nix index a46bbea817..abe4b7efde 100644 --- a/third_party/nixpkgs/pkgs/development/php-packages/couchbase/default.nix +++ b/third_party/nixpkgs/pkgs/development/php-packages/couchbase/default.nix @@ -1,7 +1,7 @@ { buildPecl, lib, pkgs, php }: let pname = "couchbase"; - version = "2.6.1"; + version = "2.6.2"; in buildPecl { inherit pname version; @@ -10,7 +10,7 @@ buildPecl { owner = "couchbase"; repo = "php-couchbase"; rev = "v${version}"; - sha256 = "0jdzgcvab1vpxai23brmmvizjjq2d2dik9aklz6bzspfb512qjd6"; + sha256 = "0ymrymnz91qg9b2ns044qg46wc65dffhxx402wpx1b5cj2vr4ma3"; }; configureFlags = [ "--with-couchbase" ]; diff --git a/third_party/nixpkgs/pkgs/development/php-packages/event/default.nix b/third_party/nixpkgs/pkgs/development/php-packages/event/default.nix index bf90d680c4..47b99234fa 100644 --- a/third_party/nixpkgs/pkgs/development/php-packages/event/default.nix +++ b/third_party/nixpkgs/pkgs/development/php-packages/event/default.nix @@ -1,11 +1,9 @@ { buildPecl, lib, pkgs, php }: -let -in buildPecl { pname = "event"; - version = "2.5.3"; - sha256 = "12liry5ldvgwp1v1a6zgfq8w6iyyxmsdj4c71bp157nnf58cb8hb"; + version = "2.5.7"; + sha256 = "0jkzcm5mmbg101jc7p3aws9qb6l6xbxkfff82mrf7s5fn7xd44im"; configureFlags = [ "--with-event-libevent-dir=${pkgs.libevent.dev}" diff --git a/third_party/nixpkgs/pkgs/development/php-packages/igbinary/default.nix b/third_party/nixpkgs/pkgs/development/php-packages/igbinary/default.nix index e9c6de2e5b..442311a528 100644 --- a/third_party/nixpkgs/pkgs/development/php-packages/igbinary/default.nix +++ b/third_party/nixpkgs/pkgs/development/php-packages/igbinary/default.nix @@ -3,8 +3,8 @@ buildPecl { pname = "igbinary"; - version = "3.0.1"; - sha256 = "1w8jmf1qpggdvq0ndfi86n7i7cqgh1s8q6hys2lijvi37rzn0nar"; + version = "3.1.6"; + sha256 = "1spx6581ly2r8pn9b632bi8429sy762v04ramrlnf7469pf8ggxr"; configureFlags = [ "--enable-igbinary" ]; makeFlags = [ "phpincludedir=$(dev)/include" ]; diff --git a/third_party/nixpkgs/pkgs/development/php-packages/mailparse/default.nix b/third_party/nixpkgs/pkgs/development/php-packages/mailparse/default.nix index 4ec6f77df4..820bbbdbad 100644 --- a/third_party/nixpkgs/pkgs/development/php-packages/mailparse/default.nix +++ b/third_party/nixpkgs/pkgs/development/php-packages/mailparse/default.nix @@ -3,8 +3,8 @@ buildPecl { pname = "mailparse"; - version = "3.0.3"; - sha256 = "00nk14jbdbln93mx3ag691avc11ff94hkadrcv5pn51c6ihsxbmz"; + version = "3.1.1"; + sha256 = "02nfjbgyjbr48rw6r46gd713hkxh7nghg2rcbr726zhzz182c3y7"; internalDeps = [ php.extensions.mbstring ]; postConfigure = '' diff --git a/third_party/nixpkgs/pkgs/development/php-packages/mongodb/default.nix b/third_party/nixpkgs/pkgs/development/php-packages/mongodb/default.nix index dd8fa9a6c2..9802242e5b 100644 --- a/third_party/nixpkgs/pkgs/development/php-packages/mongodb/default.nix +++ b/third_party/nixpkgs/pkgs/development/php-packages/mongodb/default.nix @@ -3,8 +3,8 @@ buildPecl { pname = "mongodb"; - version = "1.6.1"; - sha256 = "1j1w4n33347j9kwvxwsrix3gvjbiqcn1s5v59pp64s536cci8q0m"; + version = "1.8.1"; + sha256 = "0xxrll17c7nz146g9gww4cg41xc3qg41n73syb06546q9skqabyl"; nativeBuildInputs = [ pkgs.pkgconfig ]; buildInputs = with pkgs; [ diff --git a/third_party/nixpkgs/pkgs/development/php-packages/phpcbf/default.nix b/third_party/nixpkgs/pkgs/development/php-packages/phpcbf/default.nix index 265c33b4ea..b58ba42a5d 100644 --- a/third_party/nixpkgs/pkgs/development/php-packages/phpcbf/default.nix +++ b/third_party/nixpkgs/pkgs/development/php-packages/phpcbf/default.nix @@ -1,14 +1,14 @@ { mkDerivation, fetchurl, pkgs, lib, php }: let pname = "phpcbf"; - version = "3.5.5"; + version = "3.5.8"; in mkDerivation { inherit pname version; src = fetchurl { url = "https://github.com/squizlabs/PHP_CodeSniffer/releases/download/${version}/phpcbf.phar"; - sha256 = "0hgagn70gl46migm6zpwcr39dxal07f5cdpnasrafgz5vq0gwr3g"; + sha256 = "15ci30yvw3p9zlmzsk9s4mxzb3wax3gl9p55slhf1bzwn1xxwyb0"; }; phases = [ "installPhase" ]; diff --git a/third_party/nixpkgs/pkgs/development/php-packages/phpcs/default.nix b/third_party/nixpkgs/pkgs/development/php-packages/phpcs/default.nix index 9b3d8c2bd1..0e8557c04e 100644 --- a/third_party/nixpkgs/pkgs/development/php-packages/phpcs/default.nix +++ b/third_party/nixpkgs/pkgs/development/php-packages/phpcs/default.nix @@ -1,14 +1,14 @@ { mkDerivation, fetchurl, pkgs, lib, php }: let pname = "phpcs"; - version = "3.5.5"; + version = "3.5.8"; in mkDerivation { inherit pname version; src = fetchurl { url = "https://github.com/squizlabs/PHP_CodeSniffer/releases/download/${version}/phpcs.phar"; - sha256 = "0jl038l55cmzn5ml61qkv4z1w4ri0h3v7h00pcb04xhz3gznlbsa"; + sha256 = "037mdnpbgd9xaj556pf14h02a4a6f5zzdg58p2z1sivxcygf8aka"; }; phases = [ "installPhase" ]; diff --git a/third_party/nixpkgs/pkgs/development/php-packages/phpstan/default.nix b/third_party/nixpkgs/pkgs/development/php-packages/phpstan/default.nix index 870f716a78..ef17aa9f98 100644 --- a/third_party/nixpkgs/pkgs/development/php-packages/phpstan/default.nix +++ b/third_party/nixpkgs/pkgs/development/php-packages/phpstan/default.nix @@ -1,14 +1,14 @@ { mkDerivation, fetchurl, pkgs, lib, php }: let pname = "phpstan"; - version = "0.12.49"; + version = "0.12.51"; in mkDerivation { inherit pname version; src = pkgs.fetchurl { url = "https://github.com/phpstan/phpstan/releases/download/${version}/phpstan.phar"; - sha256 = "140r07c3vxkyrfzg2m97ndnxh8vlkhv0dy06yw0lxgg63hv9lhma"; + sha256 = "0pfy14c0r64hdzlq5x1w225za2566s8vhh4hnfasmfh52s7v77p4"; }; phases = [ "installPhase" ]; diff --git a/third_party/nixpkgs/pkgs/development/php-packages/protobuf/default.nix b/third_party/nixpkgs/pkgs/development/php-packages/protobuf/default.nix index d577f84828..f5f0d7ac3e 100644 --- a/third_party/nixpkgs/pkgs/development/php-packages/protobuf/default.nix +++ b/third_party/nixpkgs/pkgs/development/php-packages/protobuf/default.nix @@ -3,8 +3,8 @@ buildPecl { pname = "protobuf"; - version = "3.11.2"; - sha256 = "0bhdykdyk58ywqj940zb7jyvrlgdr6hdb4s8kn79fz3p0i79l9hz"; + version = "3.13.0.1"; + sha256 = "0vzxwisa8g3xgzcwa5b6cx6nyf41gkm71rxiisnnz1axz4q0hzqf"; buildInputs = [ pcre' ]; diff --git a/third_party/nixpkgs/pkgs/development/php-packages/psysh/default.nix b/third_party/nixpkgs/pkgs/development/php-packages/psysh/default.nix index f871bbb5ba..4c5f703d02 100644 --- a/third_party/nixpkgs/pkgs/development/php-packages/psysh/default.nix +++ b/third_party/nixpkgs/pkgs/development/php-packages/psysh/default.nix @@ -1,14 +1,14 @@ { mkDerivation, fetchurl, pkgs, lib, php }: let pname = "psysh"; - version = "0.10.3"; + version = "0.10.4"; in mkDerivation { inherit pname version; src = fetchurl { url = "https://github.com/bobthecow/psysh/releases/download/v${version}/psysh-v${version}.tar.gz"; - sha256 = "0glply451fy0g7zbasyp350qvmk2aglrlcrcdd7w0igylgwfkg71"; + sha256 = "005xh5rz12bsy9yvzzr69zpr0p7v4sh6cafhpinpfrvbwfq068f1"; }; phases = [ "installPhase" ]; diff --git a/third_party/nixpkgs/pkgs/development/php-packages/redis/default.nix b/third_party/nixpkgs/pkgs/development/php-packages/redis/default.nix index 6e322aecf2..41ff8f3868 100644 --- a/third_party/nixpkgs/pkgs/development/php-packages/redis/default.nix +++ b/third_party/nixpkgs/pkgs/development/php-packages/redis/default.nix @@ -3,8 +3,8 @@ buildPecl { pname = "redis"; - version = "5.1.1"; - sha256 = "1041zv91fkda73w4c3pj6zdvwjgb3q7mxg6mwnq9gisl80mrs732"; + version = "5.3.2"; + sha256 = "1cfsbxf3q3im0cmalgk76jpz581zr92z03c1viy93jxb53k2vsgl"; internalDeps = with php.extensions; [ json diff --git a/third_party/nixpkgs/pkgs/development/php-packages/xdebug/default.nix b/third_party/nixpkgs/pkgs/development/php-packages/xdebug/default.nix index 731e0bc0ba..76a55f70f0 100644 --- a/third_party/nixpkgs/pkgs/development/php-packages/xdebug/default.nix +++ b/third_party/nixpkgs/pkgs/development/php-packages/xdebug/default.nix @@ -3,8 +3,8 @@ buildPecl { pname = "xdebug"; - version = "2.8.1"; - sha256 = "080mwr7m72rf0jsig5074dgq2n86hhs7rdbfg6yvnm959sby72w3"; + version = "2.9.8"; + sha256 = "12igfrdfisqfmfqpc321g93pm2w1y7h24bclmxjrjv6rb36bcmgm"; doCheck = true; checkTarget = "test"; diff --git a/third_party/nixpkgs/pkgs/development/php-packages/yaml/default.nix b/third_party/nixpkgs/pkgs/development/php-packages/yaml/default.nix index 8ce5c34757..603fd3ddd5 100644 --- a/third_party/nixpkgs/pkgs/development/php-packages/yaml/default.nix +++ b/third_party/nixpkgs/pkgs/development/php-packages/yaml/default.nix @@ -3,8 +3,8 @@ buildPecl { pname = "yaml"; - version = "2.0.4"; - sha256 = "1036zhc5yskdfymyk8jhwc34kvkvsn5kaf50336153v4dqwb11lp"; + version = "2.1.0"; + sha256 = "0rmn2irzny24ivzc09ss46s2s48i0zy2cww7ikphljqbfx6zdjss"; configureFlags = [ "--with-yaml=${pkgs.libyaml}" ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/apprise/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/apprise/default.nix index 1c140266b9..4dac5602b3 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/apprise/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/apprise/default.nix @@ -1,6 +1,6 @@ { lib, buildPythonPackage, fetchPypi , Babel, requests, requests_oauthlib, six, click, markdown, pyyaml -, pytestrunner, coverage, flake8, mock, pytest, pytestcov, tox +, pytestrunner, coverage, flake8, mock, pytest, pytestcov, tox, gntp, sleekxmpp }: buildPythonPackage rec { @@ -19,7 +19,7 @@ buildPythonPackage rec { ]; checkInputs = [ - pytestrunner coverage flake8 mock pytest pytestcov tox + pytestrunner coverage flake8 mock pytest pytestcov tox gntp sleekxmpp ]; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/development/python-modules/baron/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/baron/default.nix new file mode 100644 index 0000000000..8a04befc6d --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/baron/default.nix @@ -0,0 +1,24 @@ +{ lib, fetchPypi, buildPythonPackage, rply, pytestCheckHook, isPy3k }: + +buildPythonPackage rec { + pname = "baron"; + version = "0.9"; + + src = fetchPypi { + inherit pname version; + sha256 = "0fib74nkqnl1i2zzlhbbfpw3whwc4951p9x61r2xrxhwp4r9yn5h"; + }; + + propagatedBuildInputs = [ rply ]; + + checkInputs = [ pytestCheckHook ]; + + doCheck = isPy3k; + + meta = with lib; { + homepage = "https://github.com/gristlabs/asttokens"; + description = "Abstraction on top of baron, a FST for python to make writing refactoring code a realistic task"; + license = licenses.lgpl3Plus; + maintainers = with maintainers; [ marius851000 ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/binwalk/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/binwalk/default.nix index 0970cc1824..c6fbbc13c4 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/binwalk/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/binwalk/default.nix @@ -11,6 +11,8 @@ , cabextract , cramfsprogs , cramfsswap +, sasquatch +, squashfsTools , lzma , matplotlib , nose @@ -32,7 +34,7 @@ buildPythonPackage { sha256 = "1bxgj569fzwv6jhcbl864nmlsi9x1k1r20aywjxc8b9b1zgqrlvc"; }; - propagatedBuildInputs = [ zlib xz ncompress gzip bzip2 gnutar p7zip cabextract cramfsswap cramfsprogs lzma pycrypto ] + propagatedBuildInputs = [ zlib xz ncompress gzip bzip2 gnutar p7zip cabextract cramfsswap cramfsprogs sasquatch squashfsTools lzma pycrypto ] ++ stdenv.lib.optionals visualizationSupport [ matplotlib pyqtgraph ]; # setup.py only installs version.py during install, not test diff --git a/third_party/nixpkgs/pkgs/development/python-modules/chalice/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/chalice/default.nix index f586e92f95..619c059d38 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/chalice/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/chalice/default.nix @@ -22,11 +22,11 @@ buildPythonPackage rec { pname = "chalice"; - version = "1.21.1"; + version = "1.21.2"; src = fetchPypi { inherit pname version; - sha256 = "562218c5d257607fba3440e0a1d09bdac81a11536c432ad2af1e2d46f1735df4"; + sha256 = "72efc25672ce7535c0e26bbe7157d7bd31ab12ed3f5221a64367548ca2daa265"; }; checkInputs = [ watchdog pytest hypothesis mock ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/css-parser/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/css-parser/default.nix index cba0c87870..3874300cde 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/css-parser/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/css-parser/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "css-parser"; - version = "1.0.4"; + version = "1.0.5"; src = fetchPypi { inherit pname version; - sha256 = "c7ab355512ae51334ba6791a7e4d553f87bef17ba2026f1cc9bf3b17a7779d44"; + sha256 = "665b7965bef0c9b86955be7a3383ca44e519b46affc7c6bca5002cbdbd0bf19f"; }; # Test suite not included in tarball yet diff --git a/third_party/nixpkgs/pkgs/development/python-modules/dask/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/dask/default.nix index 2a088706f6..59ea588851 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/dask/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/dask/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "dask"; - version = "2.22.0"; + version = "2.25.0"; disabled = pythonOlder "3.5"; @@ -24,7 +24,7 @@ buildPythonPackage rec { owner = "dask"; repo = pname; rev = version; - sha256 = "08nvxj81cz9x92dh2gbmm4imkr8cfljfi2hxkballv2ygwcbzg8g"; + sha256 = "1irp6s577yyjvrvkg00hh1wnl8vrv7pbnbr09mk67z9y7s6xhiw3"; }; checkInputs = [ @@ -70,7 +70,8 @@ buildPythonPackage rec { meta = { description = "Minimal task scheduling abstraction"; - homepage = "https://github.com/ContinuumIO/dask/"; + homepage = "https://dask.org/"; + changelog = "https://docs.dask.org/en/latest/changelog.html"; license = lib.licenses.bsd3; maintainers = with lib.maintainers; [ fridh ]; }; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/django-oauth-toolkit/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/django-oauth-toolkit/default.nix index 700fc3ae4e..83f1049a2e 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/django-oauth-toolkit/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/django-oauth-toolkit/default.nix @@ -1,5 +1,5 @@ { stdenv, buildPythonPackage, fetchFromGitHub -, django_2_2, requests, oauthlib +, django, requests, oauthlib }: buildPythonPackage rec { @@ -13,7 +13,7 @@ buildPythonPackage rec { sha256 = "1zbksxrcxlqnapmlvx4rgvpqc4plgnq0xnf45cjwzwi1626zs8g6"; }; - propagatedBuildInputs = [ django_2_2 requests oauthlib ]; + propagatedBuildInputs = [ django requests oauthlib ]; # django.core.exceptions.ImproperlyConfigured: Requested setting OAUTH2_PROVIDER, but settings are not configured. You must either define the environment variable DJANGO_SETTINGS_MODULE or call settings.configure() before accessing settings doCheck = false; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/django/2_2.nix b/third_party/nixpkgs/pkgs/development/python-modules/django/2.nix similarity index 100% rename from third_party/nixpkgs/pkgs/development/python-modules/django/2_2.nix rename to third_party/nixpkgs/pkgs/development/python-modules/django/2.nix diff --git a/third_party/nixpkgs/pkgs/development/python-modules/django/3.nix b/third_party/nixpkgs/pkgs/development/python-modules/django/3.nix new file mode 100644 index 0000000000..0648552b6f --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/django/3.nix @@ -0,0 +1,48 @@ +{ stdenv +, buildPythonPackage +, fetchPypi +, substituteAll +, geos +, gdal +, asgiref +, pytz +, sqlparse +, pythonOlder +, withGdal ? false +}: + +buildPythonPackage rec { + pname = "Django"; + version = "3.1.2"; + + disabled = pythonOlder "3.7"; + + src = fetchPypi { + inherit pname version; + sha256 = "a2127ad0150ec6966655bedf15dbbff9697cc86d61653db2da1afa506c0b04cc"; + }; + + patches = stdenv.lib.optional withGdal + (substituteAll { + src = ./django_3_set_geos_gdal_lib.patch; + geos = geos; + gdal = gdal; + extension = stdenv.hostPlatform.extensions.sharedLibrary; + }); + + propagatedBuildInputs = [ + asgiref + pytz + sqlparse + ]; + + # too complicated to setup + doCheck = false; + + meta = with stdenv.lib; { + description = "A high-level Python Web framework"; + homepage = "https://www.djangoproject.com/"; + license = licenses.bsd3; + maintainers = with maintainers; [ georgewhewell lsix ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/django/django_3_set_geos_gdal_lib.patch b/third_party/nixpkgs/pkgs/development/python-modules/django/django_3_set_geos_gdal_lib.patch new file mode 100644 index 0000000000..6b853f8d85 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/django/django_3_set_geos_gdal_lib.patch @@ -0,0 +1,24 @@ +diff -Nur a/django/contrib/gis/gdal/libgdal.py b/django/contrib/gis/gdal/libgdal.py +--- a/django/contrib/gis/gdal/libgdal.py 2020-07-09 22:34:05.330568948 +0100 ++++ b/django/contrib/gis/gdal/libgdal.py 2020-07-09 22:35:08.679095615 +0100 +@@ -14,7 +14,7 @@ + from django.conf import settings + lib_path = settings.GDAL_LIBRARY_PATH + except (AttributeError, ImportError, ImproperlyConfigured, OSError): +- lib_path = None ++ lib_path = "@gdal@/lib/libgdal@extension@" + + if lib_path: + lib_names = None +diff -Nur a/django/contrib/gis/geos/libgeos.py b/django/contrib/gis/geos/libgeos.py +--- a/django/contrib/gis/geos/libgeos.py 2020-07-09 22:34:05.331568941 +0100 ++++ b/django/contrib/gis/geos/libgeos.py 2020-07-09 22:36:24.863526276 +0100 +@@ -24,7 +24,7 @@ + from django.conf import settings + lib_path = settings.GEOS_LIBRARY_PATH + except (AttributeError, ImportError, ImproperlyConfigured, OSError): +- lib_path = None ++ lib_path = "@geos@/lib/libgeos_c@extension@" + + # Setting the appropriate names for the GEOS-C library. + if lib_path: diff --git a/third_party/nixpkgs/pkgs/development/python-modules/flowlogs_reader/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/flowlogs_reader/default.nix index 44f347edb8..717e3a3291 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/flowlogs_reader/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/flowlogs_reader/default.nix @@ -11,12 +11,12 @@ buildPythonPackage rec { pname = "flowlogs_reader"; - version = "2.2.1"; + version = "2.3.0"; disabled = isPy27; src = fetchPypi { inherit pname version; - sha256 = "7c24156a3d6887b641ceb37b57d91805bee6c3352e8a3ca97a3274217ead9294"; + sha256 = "19118ff77925c66a6782152066d86bc8d5c6ed60189b642263fb0c6eb7cb22ef"; }; propagatedBuildInputs = [ botocore boto3 docutils ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/ftputil/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/ftputil/default.nix index fb1bf7549f..f38f5d7409 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/ftputil/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/ftputil/default.nix @@ -1,4 +1,4 @@ -{ lib, buildPythonPackage, fetchPypi, pythonOlder, pytest, freezegun }: +{ stdenv, lib, buildPythonPackage, fetchPypi, pythonOlder, pytest, freezegun }: buildPythonPackage rec { version = "4.0.0"; @@ -18,12 +18,15 @@ buildPythonPackage rec { py.test test \ -k "not test_public_servers and not test_real_ftp \ and not test_set_parser and not test_repr \ - and not test_conditional_upload and not test_conditional_download_with_older_target" - ''; + and not test_conditional_upload and not test_conditional_download_with_older_target \ + '' + # need until https://ftputil.sschwarzer.net/trac/ticket/140#ticket is fixed + + lib.optionalString stdenv.isDarwin ''and not test_error_message_reuse'' + + ''"''; meta = with lib; { description = "High-level FTP client library (virtual file system and more)"; - homepage = "http://ftputil.sschwarzer.net/"; - license = licenses.bsd2; # "Modified BSD license, says pypi" + homepage = "http://ftputil.sschwarzer.net/"; + license = licenses.bsd2; # "Modified BSD license, says pypi" }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/gntp/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/gntp/default.nix new file mode 100644 index 0000000000..cde1f9bb8c --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/gntp/default.nix @@ -0,0 +1,23 @@ +{ lib, buildPythonPackage, fetchPypi, nose }: + +buildPythonPackage rec { + pname = "gntp"; + version = "1.0.3"; + + src = fetchPypi { + inherit pname version; + sha256 = "1q6scs8lp84v0aph6b5c9jhv51rhq2vmzpdd38db92ybkq0g597l"; + }; + + pythonImportsCheck = [ "gntp" "gntp.notifier" ]; + + # requires a growler service to be running + doCheck = false; + + meta = with lib; { + homepage = "https://github.com/kfdm/gntp/"; + description = "Python library for working with the Growl Notification Transport Protocol"; + license = licenses.mit; + maintainers = [ maintainers.jfroche ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/google-api-python-client/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/google-api-python-client/default.nix index 3ff530831b..b074774f62 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/google-api-python-client/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/google-api-python-client/default.nix @@ -4,11 +4,11 @@ buildPythonPackage rec { pname = "google-api-python-client"; - version = "1.12.3"; + version = "1.12.5"; src = fetchPypi { inherit pname version; - sha256 = "844ef76bda585ea0ea2d5e7f8f9a0eb10d6e2eba66c4fea0210ec7843941cb1a"; + sha256 = "0a989wynp0m1pj8qpa0mr8v8zxhazasc738nyb15wkhn1m4wv4hq"; }; # No tests included in archive diff --git a/third_party/nixpkgs/pkgs/development/python-modules/google_cloud_storage/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/google_cloud_storage/default.nix index 91e7beeb12..7a92e73104 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/google_cloud_storage/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/google_cloud_storage/default.nix @@ -11,11 +11,11 @@ buildPythonPackage rec { pname = "google-cloud-storage"; - version = "1.31.2"; + version = "1.32.0"; src = fetchPypi { inherit pname version; - sha256 = "74bbb5b2d0b249de4a52f561435d0c3570ddc19b249653ae588ec0abcc3c81e6"; + sha256 = "da12b7bd79bbe978a7945a44b600604fbc10ece2935d31f243e751f99135e34f"; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/graspy/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/graspologic/default.nix similarity index 84% rename from third_party/nixpkgs/pkgs/development/python-modules/graspy/default.nix rename to third_party/nixpkgs/pkgs/development/python-modules/graspologic/default.nix index 0281e6a973..4fd6ccf19c 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/graspy/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/graspologic/default.nix @@ -14,14 +14,14 @@ }: buildPythonPackage rec { - pname = "graspy"; + pname = "graspologic"; version = "0.3"; disabled = isPy27; src = fetchFromGitHub { - owner = "neurodata"; - repo = pname; + owner = "microsoft"; + repo = "graspologic"; rev = "v${version}"; sha256 = "0lab76qiryxvwl6zrcikhnxil1xywl0wkkm2vzi4v9mdzpa7w29r"; }; @@ -43,7 +43,7 @@ buildPythonPackage rec { meta = with lib; { homepage = "https://graspy.neurodata.io"; description = "A package for graph statistical algorithms"; - license = licenses.asl20; + license = licenses.asl20; # changing to `licenses.mit` in next release maintainers = with maintainers; [ bcdarwin ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/imdbpy/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/imdbpy/default.nix new file mode 100644 index 0000000000..dea62f0800 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/imdbpy/default.nix @@ -0,0 +1,25 @@ +{ lib, buildPythonPackage, fetchPypi, lxml, sqlalchemy }: + +buildPythonPackage rec { + pname = "IMDbPY"; + version = "2020.9.25"; + + src = fetchPypi { + inherit pname version; + sha256 = "1p3j9j1jcgbw4626cvgpryhvczy9gzlg0laz6lflgq17m129gin2"; + }; + + patches = [ ./sql_error.patch ]; # Already fixed in master, but not yet in the current release. This can be removed upon the next version update + + propagatedBuildInputs = [ lxml sqlalchemy ]; + + doCheck = false; # Tests require networking, and https://github.com/alberanid/imdbpy/issues/240 + pythonImportsCheck = [ "imdb" ]; + + meta = with lib; { + homepage = "https://imdbpy.github.io/"; + description = "A Python package for retrieving and managing the data of the IMDb database"; + maintainers = [ maintainers.ivar ]; + license = licenses.gpl2Only; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/imdbpy/sql_error.patch b/third_party/nixpkgs/pkgs/development/python-modules/imdbpy/sql_error.patch new file mode 100644 index 0000000000..10770f4f11 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/imdbpy/sql_error.patch @@ -0,0 +1,39 @@ +diff --git a/imdb/parser/sql/__init__.py b/imdb/parser/sql/__init__.py +index cd4a3e3..3fcfdd4 100644 +--- a/imdb/parser/sql/__init__.py ++++ b/imdb/parser/sql/__init__.py +@@ -557,7 +557,6 @@ class IMDbSqlAccessSystem(IMDbBase): + """The class used to access IMDb's data through a SQL database.""" + + accessSystem = 'sql' +- _sql_logger = logging.getLogger('imdbpy.parser.sql') + + def __init__(self, uri, adultSearch=True, *arguments, **keywords): + """Initialize the access system.""" +@@ -582,7 +581,7 @@ class IMDbSqlAccessSystem(IMDbBase): + except ImportError as e: + raise IMDbError('unable to import SQLAlchemy') + # Set the connection to the database. +- self._sql_logger.debug('connecting to %s', uri) ++ logger.debug('connecting to %s', uri) + try: + self._connection = setConnection(uri, DB_TABLES) + except AssertionError as e: +@@ -593,7 +592,7 @@ class IMDbSqlAccessSystem(IMDbBase): + # Maps some IDs to the corresponding strings. + self._kind = {} + self._kindRev = {} +- self._sql_logger.debug('reading constants from the database') ++ logger.debug('reading constants from the database') + try: + for kt in KindType.select(): + self._kind[kt.id] = kt.kind +@@ -1616,7 +1615,7 @@ class IMDbSqlAccessSystem(IMDbBase): + return + if not hasattr(self, '_connection'): + return +- self._sql_logger.debug('closing connection to the database') ++ logger.debug('closing connection to the database') + try: + self._connection.close() + except: diff --git a/third_party/nixpkgs/pkgs/development/python-modules/jupyterlab-git/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/jupyterlab-git/default.nix index aeeb75b4c5..35fd7b8b8d 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/jupyterlab-git/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/jupyterlab-git/default.nix @@ -10,12 +10,12 @@ buildPythonPackage rec { pname = "jupyterlab_git"; - version = "0.22.1"; + version = "0.22.2"; disabled = pythonOlder "3.5"; src = fetchPypi { inherit pname version; - sha256 = "e0fe2503d08dc00cda781b1ff89eb10c0decb45b5f8983b4970525b8f108dc02"; + sha256 = "9966a569428e67cc1688fbc2e05f51b0ceeefd8dfe30737e78a501ce3105103d"; }; propagatedBuildInputs = [ notebook nbdime git ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/myfitnesspal/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/myfitnesspal/default.nix index 53e5f82534..0638ce5d1e 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/myfitnesspal/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/myfitnesspal/default.nix @@ -1,6 +1,9 @@ { lib, fetchPypi, buildPythonPackage -, blessed, keyring, keyrings-alt, lxml, measurement, python-dateutil, requests, six -, mock, nose }: +, blessed, keyring, keyrings-alt, lxml, measurement, python-dateutil, requests, six, rich +, pytestCheckHook, mock, nose }: + +# TODO: Define this package in "all-packages.nix" using "toPythonApplication". +# This currently errors out, complaining about not being able to find "etree" from "lxml" even though "lxml" is defined in "propagatedBuildInputs". buildPythonPackage rec { pname = "myfitnesspal"; @@ -11,14 +14,18 @@ buildPythonPackage rec { sha256 = "c2275e91c794a3569a76c47c78cf2ff04d7f569a98558227e899ead7b30af0d6"; }; - # Remove overly restrictive version constraints on keyring and keyrings.alt + # Remove overly restrictive version constraints postPatch = '' sed -i 's/keyring>=.*/keyring/' requirements.txt sed -i 's/keyrings.alt>=.*/keyrings.alt/' requirements.txt + sed -i 's/rich>=.*/rich/' requirements.txt ''; - checkInputs = [ mock nose ]; - propagatedBuildInputs = [ blessed keyring keyrings-alt lxml measurement python-dateutil requests six ]; + propagatedBuildInputs = [ blessed keyring keyrings-alt lxml measurement python-dateutil requests six rich ]; + + # Integration tests require an account to be set + disabledTests = [ "test_integration" ]; + checkInputs = [ pytestCheckHook mock nose ]; meta = with lib; { description = "Access your meal tracking data stored in MyFitnessPal programatically"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/nbclient/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/nbclient/default.nix index aa7a1ce390..168818caf6 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/nbclient/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/nbclient/default.nix @@ -5,12 +5,12 @@ buildPythonPackage rec { pname = "nbclient"; - version = "0.5.0"; + version = "0.5.1"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "8ad52d27ba144fca1402db014857e53c5a864a2f407be66ca9d74c3a56d6591d"; + sha256 = "01e2d726d16eaf2cde6db74a87e2451453547e8832d142f73f72fddcd4fe0250"; }; checkInputs = [ pytest xmltodict nbconvert ipywidgets ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/patool/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/patool/default.nix new file mode 100644 index 0000000000..1420597a1f --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/patool/default.nix @@ -0,0 +1,57 @@ +{ stdenv, lib, buildPythonPackage, fetchFromGitHub, pytestCheckHook, p7zip, + unzip, cabextract, zip, zopfli, lzip, zpaq, gnutar, gnugrep, diffutils, file, + gzip, bzip2, xz}: + +# unrar is unfree, as well as 7z with unrar support, not including it (patool doesn't support unar) + +let + compression-utilities = [ + p7zip + unzip + gnutar + cabextract + zip + zopfli + lzip + zpaq + gzip + gnugrep + diffutils + bzip2 + file + xz + ]; +in +buildPythonPackage rec { + pname = "patool"; + version = "1.12"; + + #pypi doesn't have test data + src = fetchFromGitHub { + owner = "wummel"; + repo = pname; + rev = "upstream/${version}"; + sha256 = "0v4r77sm3yzh7y1whfwxmp01cchd82jbhvbg9zsyd2yb944imzjy"; + }; + + prePatch = '' + substituteInPlace patoolib/util.py \ + --replace "path = None" 'path = append_to_path(os.environ["PATH"], "${lib.makeBinPath compression-utilities}")' + ''; + + checkInputs = [ pytestCheckHook ] ++ compression-utilities; + + disabledTests = [ + "test_unzip" + "test_unzip_file" + "test_zip" + "test_zip_file" + ]; + + meta = with lib; { + description = "portable archive file manager"; + homepage = "https://wummel.github.io/patool/"; + license = licenses.gpl3; + maintainers = with maintainers; [ marius851000 ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pinboard/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pinboard/default.nix new file mode 100644 index 0000000000..af144e0a86 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/pinboard/default.nix @@ -0,0 +1,23 @@ +{ lib, buildPythonPackage, fetchFromGitHub }: + +buildPythonPackage rec { + pname = "pinboard"; + version = "2.1.8"; + + src = fetchFromGitHub { + owner = "lionheart"; + repo = pname; + rev = version; + sha256 = "0ppc3vwv48ahqx6n5c7d7066zhi31cjdik0ma9chq6fscq2idgdf"; + }; + + # tests require an API key + doCheck = false; + + meta = with lib; { + description = "A Python wrapper for Pinboard.in"; + maintainers = with maintainers; [ djanatyn ]; + license = licenses.asl20; + homepage = "http://github.com/lionheart/pinboard.py"; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/protobuf/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/protobuf/default.nix index 7f66549893..ab95eeb51f 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/protobuf/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/protobuf/default.nix @@ -1,11 +1,11 @@ -{ stdenv, fetchpatch, python, buildPythonPackage, isPy37 +{ buildPackages, stdenv, fetchpatch, python, buildPythonPackage, isPy37 , protobuf, google_apputils, pyext, libcxx, isPy27 , disabled, doCheck ? true }: with stdenv.lib; buildPythonPackage { - inherit (protobuf) name src version; + inherit (protobuf) pname src version; inherit disabled; doCheck = doCheck && !isPy27; # setuptools>=41.4 no longer collects correctly on python2 @@ -15,8 +15,10 @@ buildPythonPackage { ++ optional (versionOlder protobuf.version "2.7.0") "-std=c++98" ); + outputs = [ "out" "dev" ]; + propagatedBuildInputs = [ google_apputils ]; - propagatedNativeBuildInputs = [ protobuf ]; # For protoc. + propagatedNativeBuildInputs = [ buildPackages.protobuf ]; # For protoc. nativeBuildInputs = [ google_apputils pyext ]; buildInputs = [ protobuf ]; @@ -43,9 +45,9 @@ buildPythonPackage { preBuild = '' # Workaround for https://github.com/google/protobuf/issues/2895 - ${python.interpreter} setup.py build + ${python.pythonForBuild.interpreter} setup.py build '' + optionalString (versionAtLeast protobuf.version "2.6.0") '' - ${python.interpreter} setup.py build_ext --cpp_implementation + ${python.pythonForBuild.interpreter} setup.py build_ext --cpp_implementation ''; installFlags = optional (versionAtLeast protobuf.version "2.6.0") diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pwntools/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pwntools/default.nix index 623140546e..fa4e4cc941 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pwntools/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pwntools/default.nix @@ -24,12 +24,12 @@ }: buildPythonPackage rec { - version = "4.2.1"; + version = "4.2.2"; pname = "pwntools"; src = fetchPypi { inherit pname version; - sha256 = "1fh7sq9wrcfvn44qryln9cyg99pilvyq9bp80758lgdd6ss6hdqd"; + sha256 = "0iv802v67x2fy35q7m27j6xnz94l3w509z8c1286schgav1dw7f4"; }; # Upstream has set an upper bound on unicorn because of https://github.com/Gallopsled/pwntools/issues/1538, diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pygmt/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pygmt/default.nix new file mode 100644 index 0000000000..378419cc83 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/pygmt/default.nix @@ -0,0 +1,45 @@ +{ lib +, pythonOlder +, buildPythonPackage +, fetchFromGitHub +, gmt +, numpy +, netcdf4 +, pandas +, packaging +, xarray +}: + +buildPythonPackage rec { + pname = "pygmt"; + version = "0.2.0"; + + disabled = pythonOlder "3.6"; + + src = fetchFromGitHub { + owner = "GenericMappingTools"; + repo = "pygmt"; + rev = "v${version}"; + sha256 = "1yx1n6mxfmwg69ls5560nm6d3jxyghv27981iplz7m7990bbp468"; + }; + + postPatch = '' + substituteInPlace pygmt/clib/loading.py \ + --replace "env.get(\"GMT_LIBRARY_PATH\", \"\")" "env.get(\"GMT_LIBRARY_PATH\", \"${gmt}/lib\")" + ''; + + propagatedBuildInputs = [ numpy netcdf4 pandas packaging xarray ]; + + doCheck = false; # requires network access + + postBuild = "export HOME=$TMP"; + + pythonImportsCheck = [ "pygmt" ]; + + meta = with lib; { + description = "A Python interface for the Generic Mapping Tools"; + homepage = "https://github.com/GenericMappingTools/pygmt"; + license = licenses.bsd3; + maintainers = with maintainers; [ sikmir ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pyobjc/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyobjc/default.nix index d66425fa36..a9acf1e558 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pyobjc/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pyobjc/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { meta = { description = "A bridge between the Python and Objective-C programming languages"; license = stdenv.lib.licenses.mit; - maintainers = with stdenv.lib.maintainers; [ sauyon ]; + maintainers = with stdenv.lib.maintainers; [ ]; homepage = "https://pythonhosted.org/pyobjc/"; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pyotp/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyotp/default.nix index 1a3d674779..310ad95808 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pyotp/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pyotp/default.nix @@ -1,14 +1,17 @@ -{ lib, buildPythonPackage, fetchPypi }: +{ lib, buildPythonPackage, fetchPypi, isPy27 }: buildPythonPackage rec { pname = "pyotp"; version = "2.4.0"; + disabled = isPy27; src = fetchPypi { inherit pname version; sha256 = "01eceab573181188fe038d001e42777884a7f5367203080ef5bda0e30fe82d28"; }; + pythonImportsCheck = [ "pyotp" ]; + meta = with lib; { description = "Python One Time Password Library"; homepage = "https://github.com/pyotp/pyotp"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pypblib/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pypblib/default.nix new file mode 100644 index 0000000000..4cf8d5fc7b --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/pypblib/default.nix @@ -0,0 +1,20 @@ +{ lib, buildPythonPackage, fetchPypi }: + +buildPythonPackage rec { + pname = "pypblib"; + version = "0.0.4"; + + src = fetchPypi { + inherit pname version; + sha256 = "0qlhykm9flj6cv3v0b9q40gy21yz0lnp0wxlxvb3ijkpy45r7pbi"; + }; + + pythonImportsCheck = [ "pypblib" ]; + + meta = with lib; { + homepage = "https://pypi.org/project/pypblib/"; + description = "PBLib Python3 Bindings"; + license = licenses.mit; + maintainers = [ maintainers.marius851000 ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pyside/shiboken.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyside/shiboken.nix index c5561525db..b0c3368e07 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pyside/shiboken.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pyside/shiboken.nix @@ -1,22 +1,37 @@ -{ lib, fetchurl, cmake, buildPythonPackage, libxml2, libxslt, pysideApiextractor, pysideGeneratorrunner, python, sphinx, qt4, isPy3k, isPy35, isPy36, isPy37 }: +{ lib, fetchFromGitHub, buildPythonPackage +, cmake +, isPy35 +, isPy36 +, isPy37 +, isPy3k +, libxml2 +, libxslt +, pkg-config +, pysideApiextractor +, pysideGeneratorrunner +, python +, qt4 +, sphinx +}: -# This derivation provides a Python module and should therefore be called via `python-packages.nix`. -# Python 3.5 is not supported: https://github.com/PySide/Shiboken/issues/77 buildPythonPackage rec { pname = "pyside-shiboken"; version = "1.2.4"; - format = "other"; + disabled = !isPy3k; - src = fetchurl { - url = "https://github.com/PySide/Shiboken/archive/${version}.tar.gz"; - sha256 = "1536f73a3353296d97a25e24f9554edf3e6a48126886f8d21282c3645ecb96a4"; + src = fetchFromGitHub { + owner = "PySide"; + repo = "Shiboken"; + rev = version; + sha256 = "0x2lyg52m6a0vn0665pgd1z1qrydglyfxxcggw6xzngpnngb6v5v"; }; - enableParallelBuilding = true; - nativeBuildInputs = [ cmake libxml2 libxslt pysideApiextractor pysideGeneratorrunner python sphinx qt4 ]; + nativeBuildInputs = [ cmake pkg-config pysideApiextractor pysideGeneratorrunner sphinx qt4 ]; + + buildInputs = [ python libxml2 libxslt ]; preConfigure = '' echo "preConfigure: Fixing shiboken_generator install target." @@ -27,7 +42,11 @@ buildPythonPackage rec { # gcc6 patch was also sent upstream: https://github.com/pyside/Shiboken/pull/86 patches = [ ./gcc6.patch ] ++ (lib.optional (isPy35 || isPy36 || isPy37) ./shiboken_py35.patch); - cmakeFlags = lib.optional isPy3k "-DUSE_PYTHON3=TRUE"; + cmakeFlags = lib.optionals isPy3k [ + "-DUSE_PYTHON3=TRUE" + "-DPYTHON3_INCLUDE_DIR=${lib.getDev python}/include/${python.libPrefix}" + "-DPYTHON3_LIBRARY=${lib.getLib python}/lib" + ]; meta = { description = "Plugin (front-end) for pyside-generatorrunner, that generates bindings for C++ libraries using CPython source code"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pystray/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pystray/default.nix index cd9259e33c..6b4bdb59f1 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pystray/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pystray/default.nix @@ -26,6 +26,7 @@ buildPythonPackage rec { homepage = "https://github.com/moses-palmer/pystray"; description = "This library allows you to create a system tray icon"; license = licenses.lgpl3; + platforms = platforms.linux; maintainers = with maintainers; [ jojosch ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/python-rtmidi/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/python-rtmidi/default.nix index c2cced8350..2b65a658f9 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/python-rtmidi/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/python-rtmidi/default.nix @@ -4,12 +4,12 @@ buildPythonPackage rec { pname = "python-rtmidi"; - version = "1.4.5"; + version = "1.4.6"; disabled = isPy27; src = fetchPypi { inherit pname version; - sha256 = "3dd1909d0f44f03a4191131f1829cac2ee6a94f5a4be2a9606354748e594e704"; + sha256 = "1aqhsl9w3h0rwf3mhr8parjbxm2sb6sn5mac6725cvm535pqqyhz"; }; nativeBuildInputs = [ pkg-config ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/python-sat/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/python-sat/default.nix new file mode 100644 index 0000000000..ea3d1bfb44 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/python-sat/default.nix @@ -0,0 +1,24 @@ +{ buildPythonPackage, fetchFromGitHub, lib, six, pypblib, pytestCheckHook }: + +buildPythonPackage rec { + pname = "python-sat"; + version = "0.1.6.dev6"; + + src = fetchFromGitHub { + owner = "pysathq"; + repo = "pysat"; + rev = version; + sha256 = "1gckxhqkvzyw7pmwg8xzxq146jysqy0s23l5mjc3awm6swdij66y"; + }; + + propagatedBuildInputs = [ six pypblib ]; + + checkInputs = [ pytestCheckHook ]; + + meta = with lib; { + description = "Toolkit to provide interface for various SAT (without optional dependancy py-aiger-cnf)"; + homepage = "https://github.com/pysathq/pysat"; + license = licenses.mit; + maintainers = [ maintainers.marius851000 ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/redbaron/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/redbaron/default.nix new file mode 100644 index 0000000000..841d6a31fb --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/redbaron/default.nix @@ -0,0 +1,27 @@ +{ lib, fetchPypi, buildPythonPackage, baron, pytestCheckHook }: + +buildPythonPackage rec { + pname = "redbaron"; + version = "0.9.2"; + + src = fetchPypi { + inherit pname version; + sha256 = "0bqkq0wn20cc3qrcd1ifq74p4m570j345bkq4axl08kbr8whfba7"; + }; + + propagatedBuildInputs = [ baron ]; + + preCheck = '' + rm -rf tests/__pycache__ + rm tests/test_bounding_box.py + ''; #error about fixtures + + checkInputs = [ pytestCheckHook ]; + + meta = with lib; { + homepage = "https://github.com/gristlabs/asttokens"; + description = "Abstraction on top of baron, a FST for python to make writing refactoring code a realistic task"; + license = licenses.lgpl3Plus; + maintainers = with maintainers; [ marius851000 ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/rich/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/rich/default.nix index 71166b86f1..6284ed7b64 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/rich/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/rich/default.nix @@ -14,14 +14,14 @@ buildPythonPackage rec { pname = "rich"; - version = "8.0.0"; + version = "9.1.0"; # tests not included in pypi tarball src = fetchFromGitHub { owner = "willmcgugan"; repo = pname; rev = "v${version}"; - sha256 = "0hv27b22x7dbx1i7nzsd8y8fymmvdak2hcx9242jwk4c1a7jr151"; + sha256 = "18iha0fs8vm0j11k39yxj26h8qxrp27ijhx6h1yyizbygmr5b5nk"; }; format = "pyproject"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/scrapy-fake-useragent/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/scrapy-fake-useragent/default.nix index a9199614f4..b2de4e9a99 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/scrapy-fake-useragent/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/scrapy-fake-useragent/default.nix @@ -19,6 +19,6 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Random User-Agent middleware based on fake-useragent"; homepage = "https://github.com/alecxe/scrapy-fake-useragent"; - license = licenses.bsd3; + license = licenses.mit; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/shapely/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/shapely/default.nix index d895f00285..d4d52a9bf0 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/shapely/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/shapely/default.nix @@ -5,11 +5,11 @@ buildPythonPackage rec { pname = "Shapely"; - version = "1.7.0"; + version = "1.7.1"; src = fetchPypi { inherit pname version; - sha256 = "07lmrihj6pa7f99m97hbf2anqlhhwippcdz03bqkyihnlkhry6p2"; + sha256 = "0adiz4jwmwxk7k1awqifb1a9bj5x4nx4gglb5dz9liam21674h8n"; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/shapely/library-paths.patch b/third_party/nixpkgs/pkgs/development/python-modules/shapely/library-paths.patch index 4081936abe..319eb8a72d 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/shapely/library-paths.patch +++ b/third_party/nixpkgs/pkgs/development/python-modules/shapely/library-paths.patch @@ -2,7 +2,7 @@ diff --git a/shapely/geos.py b/shapely/geos.py index d5a67d2..19b7ffc 100644 --- a/shapely/geos.py +++ b/shapely/geos.py -@@ -61,123 +61,11 @@ def load_dll(libname, fallbacks=None, mode=DEFAULT_MODE): +@@ -61,127 +61,10 @@ def load_dll(libname, fallbacks=None, mode=DEFAULT_MODE): "Could not find lib {} or load any of its variants {}.".format( libname, fallbacks or [])) @@ -80,7 +80,11 @@ index d5a67d2..19b7ffc 100644 - ] - _lgeos = load_dll('geos_c', fallbacks=alt_paths) - -- free = load_dll('c').free +- # ctypes.CDLL(None) internally calls dlopen(NULL), and as the dlopen +- # manpage says, "If filename is NULL, then the returned handle is for the +- # main program". This way we can let the linker do the work to figure out +- # which libc Python is actually using. +- free = CDLL(None).free - free.argtypes = [c_void_p] - free.restype = None - @@ -112,7 +116,7 @@ index d5a67d2..19b7ffc 100644 - except WindowsError: - # XXX: See http://trac.gispython.org/projects/PCL/ticket/149 - pass - +- -elif sys.platform == 'sunos5': - _lgeos = load_dll('geos_c', fallbacks=['libgeos_c.so.1', 'libgeos_c.so']) - free = CDLL('libc.so.1').free diff --git a/third_party/nixpkgs/pkgs/development/python-modules/trimesh/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/trimesh/default.nix index ed9e1e06e3..3afb2de58c 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/trimesh/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/trimesh/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "trimesh"; - version = "3.8.11"; + version = "3.8.12"; src = fetchPypi { inherit pname version; - sha256 = "790b4804227825a985189e0788cf57dbfcf1ee39f30f767176722ad572da27de"; + sha256 = "932670e753abdec162d1d9c661920db871236de782890ad88577b2af0d824c7f"; }; propagatedBuildInputs = [ numpy ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/yamale/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/yamale/default.nix index d6fb713185..9b2c7b116c 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/yamale/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/yamale/default.nix @@ -30,7 +30,7 @@ buildPythonPackage rec { ]; meta = with lib; { - description = "A schema and validator for YAML."; + description = "A schema and validator for YAML"; homepage = "https://github.com/23andMe/Yamale"; license = licenses.mit; maintainers = with maintainers; [ rtburns-jpl ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/yappi/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/yappi/default.nix index e0be34a2d3..b96d4efd44 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/yappi/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/yappi/default.nix @@ -1,18 +1,22 @@ -{ lib, buildPythonPackage, fetchPypi, isPy27, nose }: +{ lib, buildPythonPackage, fetchFromGitHub, gevent, isPy27, python }: buildPythonPackage rec { pname = "yappi"; - version = "1.2.5"; + version = "1.3.0"; disabled = isPy27; # invalid syntax - src = fetchPypi { - inherit pname version; - sha256 = "ad5fa4caf2859e480ffc4ec3e85615a6f7dea852c8f035f2db723f824ed4ba11"; + src = fetchFromGitHub { + owner = "sumerc"; + repo = pname; + rev = "30f94024a0e2e4fa21c220de6a0dc97b4cb2c319"; + sha256 = "1kvwl3y3c2hivf9y2x1q1s8a2y724iwqd1krq6ryvsbg3inyh8qw"; }; patches = [ ./tests.patch ]; - - checkInputs = [ nose ]; + checkInputs = [ gevent ]; + checkPhase = '' + ${python.interpreter} run_tests.py + ''; meta = with lib; { homepage = "https://github.com/sumerc/yappi"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/yappi/tests.patch b/third_party/nixpkgs/pkgs/development/python-modules/yappi/tests.patch index bff4b28295..96419e01a2 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/yappi/tests.patch +++ b/third_party/nixpkgs/pkgs/development/python-modules/yappi/tests.patch @@ -1,12 +1,14 @@ --- a/tests/test_functionality.py +++ b/tests/test_functionality.py -@@ -74,2 +74,3 @@ class BasicUsage(utils.YappiUnitTestCase): - -+ @_unittest.skip('wall-clock-time-sensitive') - def test_get_clock(self): +@@ -262,1 +262,2 @@ class BasicUsage(utils.YappiUnitTestCase): ++ @unittest.skip('wall-clock-time-sensitive') + def test_get_clock(self): +@@ -363,2 +363,3 @@ class BasicUsage(utils.YappiUnitTestCase): + @unittest.skipIf(os.name == "nt", "do not run on Windows") ++ @unittest.skip('broken-path') + def test_run_as_script(self): --- a/tests/test_hooks.py +++ b/tests/test_hooks.py -@@ -124,2 +124,3 @@ class ContextIdCallbackTest(utils.YappiUnitTestCase): - +@@ -127,1 +127,2 @@ class ContextIdCallbackTest(utils.YappiUnitTestCase): + @unittest.skip('wall-clock-time-sensitive') def test_pause_resume(self): diff --git a/third_party/nixpkgs/pkgs/development/r-modules/default.nix b/third_party/nixpkgs/pkgs/development/r-modules/default.nix index 6e98ef83e0..dad01337f4 100644 --- a/third_party/nixpkgs/pkgs/development/r-modules/default.nix +++ b/third_party/nixpkgs/pkgs/development/r-modules/default.nix @@ -797,6 +797,9 @@ let }); openssl = old.openssl.overrideDerivation (attrs: { + preConfigure = '' + patchShebangs configure + ''; PKGCONFIG_CFLAGS = "-I${pkgs.openssl.dev}/include"; PKGCONFIG_LIBS = "-Wl,-rpath,${pkgs.openssl.out}/lib -L${pkgs.openssl.out}/lib -lssl -lcrypto"; }); diff --git a/third_party/nixpkgs/pkgs/development/tools/analysis/cppcheck/default.nix b/third_party/nixpkgs/pkgs/development/tools/analysis/cppcheck/default.nix index 8e2c28336c..8858ac59ae 100644 --- a/third_party/nixpkgs/pkgs/development/tools/analysis/cppcheck/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/analysis/cppcheck/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "cppcheck"; - version = "2.1"; + version = "2.2"; src = fetchurl { url = "mirror://sourceforge/${pname}/${pname}-${version}.tar.bz2"; - sha256 = "1xx5i6z9a36h7k4ipikrk2zidk7jcjv8ryqyq2m5hnwy0gpyw9mb"; + sha256 = "1dcf053cqci2ha3yy817y02yz9mhrkgddcbnn6gj82j6k87a4rq4"; }; buildInputs = [ pcre ] ++ stdenv.lib.optionals withZ3 [ z3 ]; diff --git a/third_party/nixpkgs/pkgs/development/tools/analysis/valgrind/default.nix b/third_party/nixpkgs/pkgs/development/tools/analysis/valgrind/default.nix index 2e485b3ed6..60d3a7c5eb 100644 --- a/third_party/nixpkgs/pkgs/development/tools/analysis/valgrind/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/analysis/valgrind/default.nix @@ -86,5 +86,6 @@ stdenv.mkDerivation rec { "riscv32-linux" "riscv64-linux" "alpha-linux" ]; + broken = stdenv.isDarwin; # https://hydra.nixos.org/build/128521440/nixlog/2 }; } diff --git a/third_party/nixpkgs/pkgs/development/tools/bazelisk/default.nix b/third_party/nixpkgs/pkgs/development/tools/bazelisk/default.nix index 26a0dd8667..eba096644a 100644 --- a/third_party/nixpkgs/pkgs/development/tools/bazelisk/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/bazelisk/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "bazelisk"; - version = "1.7.2"; + version = "1.7.3"; src = fetchFromGitHub { owner = "bazelbuild"; repo = pname; rev = "v${version}"; - sha256 = "0psqhv2cm2xwjyivaza2s6x780q6yjn1nsjdy538zjky22dazqq4"; + sha256 = "0l4y8z44hwd6rnhnyk6l9abrvk342w72bah9k9zz6caa5i4xz2vz"; }; vendorSha256 = "116wy1a7gmi2w8why9hszhcybfvpwp4iq62vshb25cdcma6q4mjh"; diff --git a/third_party/nixpkgs/pkgs/development/tools/build-managers/gradle/default.nix b/third_party/nixpkgs/pkgs/development/tools/build-managers/gradle/default.nix index 73e9bc7b56..d06282739a 100644 --- a/third_party/nixpkgs/pkgs/development/tools/build-managers/gradle/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/build-managers/gradle/default.nix @@ -51,15 +51,15 @@ rec { }; }; - gradle_latest = gradle_6_6; + gradle_latest = gradle_6_7; - gradle_6_6 = gradleGen rec { - name = "gradle-6.6"; - nativeVersion = "0.22-milestone-4"; + gradle_6_7 = gradleGen rec { + name = "gradle-6.7"; + nativeVersion = "0.22-milestone-8"; src = fetchurl { url = "https://services.gradle.org/distributions/${name}-bin.zip"; - sha256 = "09a0fnz6fn8yaxm3q3iwyjm3nnaz7k8i1xlpc7sm414py043by76"; + sha256 = "1i6zm55wzy13wvvmf3804b0rs47yrqqablf4gpf374ls05cpgmca"; }; }; diff --git a/third_party/nixpkgs/pkgs/development/tools/buildah/default.nix b/third_party/nixpkgs/pkgs/development/tools/buildah/default.nix index 666437126a..5f4f2a4792 100644 --- a/third_party/nixpkgs/pkgs/development/tools/buildah/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/buildah/default.nix @@ -14,13 +14,13 @@ buildGoModule rec { pname = "buildah"; - version = "1.16.4"; + version = "1.16.5"; src = fetchFromGitHub { owner = "containers"; repo = "buildah"; rev = "v${version}"; - sha256 = "1i7v4chbgl15n3vn1liinjd4lxaxk9q2lyi1l2ak7iazx9px6cn9"; + sha256 = "1d2k7n1d9mpkyjy7hp1svl34ssai62df3mp5awsill092dlwn8p2"; }; outputs = [ "out" "man" ]; diff --git a/third_party/nixpkgs/pkgs/development/tools/continuous-integration/gitlab-runner/default.nix b/third_party/nixpkgs/pkgs/development/tools/continuous-integration/gitlab-runner/default.nix index b59a456172..3547da41f0 100644 --- a/third_party/nixpkgs/pkgs/development/tools/continuous-integration/gitlab-runner/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/continuous-integration/gitlab-runner/default.nix @@ -1,16 +1,16 @@ { lib, buildGoPackage, fetchFromGitLab, fetchurl }: let - version = "13.4.1"; + version = "13.5.0"; # Gitlab runner embeds some docker images these are prebuilt for arm and x86_64 docker_x86_64 = fetchurl { url = "https://gitlab-runner-downloads.s3.amazonaws.com/v${version}/helper-images/prebuilt-x86_64.tar.xz"; - sha256 = "0yc4yfqhh51p0nz0sl2qfp48n431qgp23wn3aqq3jg4fh9578prb"; + sha256 = "1cahv98hhwcc0czg7c86sqk0r6kw3gxnx8j6mqp1zm19aa30sabk"; }; docker_arm = fetchurl { url = "https://gitlab-runner-downloads.s3.amazonaws.com/v${version}/helper-images/prebuilt-arm.tar.xz"; - sha256 = "1n50izz21dmd14qm6y9fsgwf5f0r9829dv79mvlqxmh1q87acm93"; + sha256 = "1wk7xn8jap8699cpgqkpgxmd908qjxlsfjswknrha1n8y2c5bjgx"; }; in buildGoPackage rec { @@ -30,7 +30,7 @@ buildGoPackage rec { owner = "gitlab-org"; repo = "gitlab-runner"; rev = "v${version}"; - sha256 = "10k3xn3fapwx52s3r3pk972k1s7793cgja7g1fvm06pic8l7q05g"; + sha256 = "0qfzdbhj68lq5pa1hvb703yx9grh3hvnnw6jb4bj4fckncd3avgm"; }; patches = [ ./fix-shell-path.patch ]; diff --git a/third_party/nixpkgs/pkgs/development/tools/coursier/default.nix b/third_party/nixpkgs/pkgs/development/tools/coursier/default.nix index b3ae0328c4..ac2338b4c1 100644 --- a/third_party/nixpkgs/pkgs/development/tools/coursier/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/coursier/default.nix @@ -3,16 +3,16 @@ let zshCompletion = version: fetchurl { url = "https://raw.githubusercontent.com/coursier/coursier/v${version}/modules/cli/src/main/resources/completions/zsh"; - sha256 = "1mn6cdmf59nkz5012wgd3gd6hpk2w4629sk8z95230ky8487dac3"; + sha256 = "0afxzrk9w1qinfsz55jjrxydw0fcv6p722g1q955dl7f6xbab1jh"; }; in stdenv.mkDerivation rec { pname = "coursier"; - version = "2.0.3"; + version = "2.0.5"; src = fetchurl { url = "https://github.com/coursier/coursier/releases/download/v${version}/coursier"; - sha256 = "0jvccyiqrq1iws2q9m3vivzw08jl0p77n9qbf22hgb3zhspfdnyx"; + sha256 = "1j614pw8i2mfgrv3jb5q3ifrxkrb7apj13zdrbnvnh4bzwlg5jb2"; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/third_party/nixpkgs/pkgs/development/tools/database/ephemeralpg/default.nix b/third_party/nixpkgs/pkgs/development/tools/database/ephemeralpg/default.nix index 53f3c1df62..b2599cce43 100644 --- a/third_party/nixpkgs/pkgs/development/tools/database/ephemeralpg/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/database/ephemeralpg/default.nix @@ -1,10 +1,10 @@ { stdenv, fetchurl, postgresql, getopt, makeWrapper }: stdenv.mkDerivation rec { pname = "ephemeralpg"; - version = "3.0"; + version = "3.1"; src = fetchurl { url = "http://ephemeralpg.org/code/${pname}-${version}.tar.gz"; - sha256 = "1j0g7g114ma7y7sadbng5p1ss1zsm9zpicm77qspym6565733vvh"; + sha256 = "1ap22ki8yz6agd0qybcjgs4b9izw1rwwcgpxn3jah2ccfyax34s6"; }; buildInputs = [ makeWrapper ]; installPhase = '' @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { wrapProgram $out/bin/pg_tmp --prefix PATH : ${stdenv.lib.makeBinPath [ postgresql getopt ]} ''; meta = with stdenv.lib; { - description = ''Run tests on an isolated, temporary PostgreSQL database.''; + description = "Run tests on an isolated, temporary PostgreSQL database"; license = licenses.isc; homepage = "http://ephemeralpg.org/"; platforms = platforms.all; diff --git a/third_party/nixpkgs/pkgs/development/tools/gllvm/default.nix b/third_party/nixpkgs/pkgs/development/tools/gllvm/default.nix index 7c4213b4cc..58416e30a8 100644 --- a/third_party/nixpkgs/pkgs/development/tools/gllvm/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/gllvm/default.nix @@ -2,7 +2,7 @@ buildGoPackage rec { pname = "gllvm"; - version = "1.2.7"; + version = "1.2.8"; goPackagePath = "github.com/SRI-CSL/gllvm"; @@ -10,7 +10,7 @@ buildGoPackage rec { owner = "SRI-CSL"; repo = "gllvm"; rev = "v${version}"; - sha256 = "13cmmgbcdfgyxnxqfrn4m6vf0bhpday8lmrr3sm6rk48g77cq203"; + sha256 = "090ghg7ivf6snkabba00pn8a9x5wj8dgpdq7qjhmw1lpijd0mq0y"; }; meta = with stdenv.lib; { diff --git a/third_party/nixpkgs/pkgs/development/tools/gopls/default.nix b/third_party/nixpkgs/pkgs/development/tools/gopls/default.nix index e04789eb41..6658296971 100644 --- a/third_party/nixpkgs/pkgs/development/tools/gopls/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/gopls/default.nix @@ -1,25 +1,24 @@ -{ stdenv, go, buildGoModule, fetchgit }: +{ stdenv, buildGoModule, fetchgit }: buildGoModule rec { pname = "gopls"; - version = "0.4.1"; + version = "0.5.1"; src = fetchgit { rev = "gopls/v${version}"; url = "https://go.googlesource.com/tools"; - sha256 = "18migk7arxm8ysfzidl7mdr069fxym9bfi6zisj7dliczw0qnkzv"; + sha256 = "1vnidc8kaisdyprylsibddpdksm84c6qr528768yvi93crdmddls"; }; modRoot = "gopls"; - vendorSha256 = "1jaav6c5vybgks5hc164is0i7h097c5l75s7w3wi5a3zyzkbiyny"; + vendorSha256 = "048qs6ygav8al3sz9vwf6fqaahkr8wr3dj1yd2jhr7c5h30n4rs2"; - # Only build gopls, and not the integration tests or documentation generator. - subPackages = [ "." ]; + doCheck = false; meta = with stdenv.lib; { description = "Official language server for the Go language"; homepage = "https://github.com/golang/tools/tree/master/gopls"; license = licenses.bsd3; - maintainers = with maintainers; [ mic92 ]; + maintainers = with maintainers; [ mic92 zimbatm ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/tools/kind/default.nix b/third_party/nixpkgs/pkgs/development/tools/kind/default.nix index 6ea2c87f88..55f0a0e9f3 100644 --- a/third_party/nixpkgs/pkgs/development/tools/kind/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/kind/default.nix @@ -4,16 +4,16 @@ with stdenv.lib; buildGoModule rec { pname = "kind"; - version = "0.8.1"; + version = "0.9.0"; src = fetchFromGitHub { rev = "v${version}"; owner = "kubernetes-sigs"; repo = "kind"; - sha256 = "0r301nqvycik8fwlghq0cymmq4rm7xp8haj39i2nynxyw8zk6zym"; + sha256 = "1kyjmlp1kmr3lwylnya6w392j1qpqgbvcacwpnz3ifyh3pbv32qr"; }; - vendorSha256 = "1qvbm8v8yah6r6cw1cvdw79yiwxb2amzdkkzvzbwigy0j4bvn9mi"; + vendorSha256 = "04fmqh6lhvvzpvf1l2xk1r8687k5jx2lb5199rgmjbfnjgsa0q2d"; doCheck = false; @@ -21,7 +21,7 @@ buildGoModule rec { nativeBuildInputs = [ installShellFiles ]; postInstall = '' - for shell in bash zsh; do + for shell in bash fish zsh; do $out/bin/kind completion $shell > kind.$shell installShellCompletion kind.$shell done diff --git a/third_party/nixpkgs/pkgs/development/tools/misc/hydra/common.nix b/third_party/nixpkgs/pkgs/development/tools/misc/hydra/common.nix index 4e9daab9bf..4af9fe0458 100644 --- a/third_party/nixpkgs/pkgs/development/tools/misc/hydra/common.nix +++ b/third_party/nixpkgs/pkgs/development/tools/misc/hydra/common.nix @@ -66,6 +66,7 @@ let TextDiff TextTable XMLSimple + YAML nix nix.perl-bindings git diff --git a/third_party/nixpkgs/pkgs/development/tools/misc/hydra/default.nix b/third_party/nixpkgs/pkgs/development/tools/misc/hydra/default.nix index a6b0383d54..7aa1e05a88 100644 --- a/third_party/nixpkgs/pkgs/development/tools/misc/hydra/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/misc/hydra/default.nix @@ -1,40 +1,17 @@ { fetchFromGitHub, nixStable, callPackage, nixFlakes, nixosTests }: { - # Package for phase-1 of the db migration for Hydra. - # https://github.com/NixOS/hydra/pull/711 - hydra-migration = callPackage ./common.nix { - version = "2020-02-10"; - src = fetchFromGitHub { - owner = "NixOS"; - repo = "hydra"; - rev = "add4f610ce6f206fb44702b5a894d877b3a30e3a"; - sha256 = "1d8hdgjx2ys0zmixi2ydmimdq7ml20h1ji4amwawcyw59kssh6l3"; - }; - nix = nixStable; - migration = true; - - tests = { - db-migration = nixosTests.hydra-db-migration.mig; - basic = nixosTests.hydra.hydra-migration; - }; - }; - - # Hydra from latest master branch. Contains breaking changes, - # so when having an older version, `pkgs.hydra-migration` should be deployed first. - hydra-unstable = callPackage ./common.nix { - version = "2020-09-02"; + version = "2020-10-20"; src = fetchFromGitHub { owner = "NixOS"; repo = "hydra"; - rev = "e707990e2d6afab203c7ef1d769d49c564eff151"; - sha256 = "0iilf953f6s58szzyd1hzc9b2b2yw8lhbsb8xrb08szpfz7ifwqa"; + rev = "79d34ed7c93af2daf32cf44ee0e3e0768f13f97c"; + sha256 = "1lql899430137l6ghnhyz0ivkayy83fdr087ck2wq3gf1jv8pccj"; }; nix = nixFlakes; tests = { - db-migration = nixosTests.hydra-db-migration.mig; basic = nixosTests.hydra.hydra-unstable; }; }; diff --git a/third_party/nixpkgs/pkgs/development/tools/misc/iozone/default.nix b/third_party/nixpkgs/pkgs/development/tools/misc/iozone/default.nix index e6beeca1d7..93e2673be6 100644 --- a/third_party/nixpkgs/pkgs/development/tools/misc/iozone/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/misc/iozone/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, gnuplot }: +{ stdenv, lib, fetchurl, gnuplot }: let target = if stdenv.hostPlatform.system == "i686-linux" then @@ -13,11 +13,12 @@ let in stdenv.mkDerivation rec { - name = "iozone-3.471"; + pname = "iozone"; + version = "3.490"; src = fetchurl { - url = "http://www.iozone.org/src/current/iozone3_471.tar"; - sha256 = "0w63b3d4ws1sm52lpdd08sl7n4ay438dl3wy0q9la12iq81rglid"; + url = "http://www.iozone.org/src/current/iozone${lib.replaceStrings ["."] ["_"] version}.tar"; + sha256 = "1vagmm2k2bzlpahl2a2arpfmk3cd5nzhxi842a8mdag2b8iv9bay"; }; license = fetchurl { diff --git a/third_party/nixpkgs/pkgs/development/tools/rust/cargo-bloat/default.nix b/third_party/nixpkgs/pkgs/development/tools/rust/cargo-bloat/default.nix index 8374e06535..51d19f5ad6 100644 --- a/third_party/nixpkgs/pkgs/development/tools/rust/cargo-bloat/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/rust/cargo-bloat/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "cargo-bloat"; - version = "0.9.3"; + version = "0.10.0"; src = fetchFromGitHub { owner = "RazrFalcon"; repo = pname; rev = "v${version}"; - sha256 = "04h9yyna47cgn2d232v2fpbgki9gg4lykpmx46ncpsq4g6azl1a9"; + sha256 = "0bqzzh8vfqm7dpnb0fv4calnhsg9p3c5j06ycvg621p4zp4fydh2"; }; - cargoSha256 = "0lzc2nwz9lpwxv704k40d1416qnf3wy3g6ad8w8xbkfc6ydcaa4l"; + cargoSha256 = "1323lcl8fa21pgx3jhwl4w9f8qz3jjxb5qdvib9jdzqxnnw320xs"; meta = with lib; { description = "A tool and Cargo subcommand that helps you find out what takes most of the space in your executable"; diff --git a/third_party/nixpkgs/pkgs/development/tools/rust/cbindgen/default.nix b/third_party/nixpkgs/pkgs/development/tools/rust/cbindgen/default.nix index 62b9a61664..dc04f4cb11 100644 --- a/third_party/nixpkgs/pkgs/development/tools/rust/cbindgen/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/rust/cbindgen/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "rust-cbindgen"; - version = "0.14.4"; + version = "0.15.0"; src = fetchFromGitHub { owner = "eqrion"; repo = "cbindgen"; rev = "v${version}"; - sha256 = "06bis9kk3r0gishzmsq5wk3vv8r78ggk4m800562q2yhnhc37lfd"; + sha256 = "19bwllrajks286wl4zc5axgh4m9qqxdnc5024c30hyk0xnjffd0c"; }; - cargoSha256 = "0x8lxlik4n8rmlydcp0vqyiqwqm98cgwvw3h5hm2zviv8v0y8jnr"; + cargoSha256 = "1lzzckzcgj496chbfd6lhwxcangv0krx8m5k2jwffnb9mfgac7hx"; buildInputs = stdenv.lib.optional stdenv.isDarwin Security; diff --git a/third_party/nixpkgs/pkgs/development/web/insomnia/default.nix b/third_party/nixpkgs/pkgs/development/web/insomnia/default.nix index d877aa5331..0640e09934 100644 --- a/third_party/nixpkgs/pkgs/development/web/insomnia/default.nix +++ b/third_party/nixpkgs/pkgs/development/web/insomnia/default.nix @@ -1,5 +1,5 @@ { stdenv, makeWrapper, fetchurl, dpkg, alsaLib, atk, cairo, cups, dbus, expat -, fontconfig, freetype, gdk-pixbuf, glib, gnome2, nspr, nss, gtk3, gtk2 +, fontconfig, freetype, gdk-pixbuf, glib, gnome2, pango, nspr, nss, gtk3, gtk2 , at-spi2-atk, gsettings-desktop-schemas, gobject-introspection, wrapGAppsHook , libX11, libXScrnSaver, libXcomposite, libXcursor, libXdamage, libXext , libXfixes, libXi, libXrandr, libXrender, libXtst, libxcb, nghttp2 @@ -40,7 +40,7 @@ in stdenv.mkDerivation rec { gdk-pixbuf glib gnome2.GConf - gnome2.pango + pango gtk2 gtk3 gsettings-desktop-schemas diff --git a/third_party/nixpkgs/pkgs/development/web/nodejs/v15.nix b/third_party/nixpkgs/pkgs/development/web/nodejs/v15.nix index 97a7ad3223..f115e42d0d 100644 --- a/third_party/nixpkgs/pkgs/development/web/nodejs/v15.nix +++ b/third_party/nixpkgs/pkgs/development/web/nodejs/v15.nix @@ -8,6 +8,6 @@ let in buildNodejs { inherit enableNpm; - version = "15.0.0"; - sha256 = "0yrlzxrqb5j0qyj4qgzfxyvvd7c76hpslkiswj3cjcq70qbql4zn"; + version = "15.0.1"; + sha256 = "03xxnl7q96fmm7lalliwb9kmllz52jqrcsqn9cx9pzhwd1x97l5q"; } diff --git a/third_party/nixpkgs/pkgs/development/web/twitter-bootstrap/default.nix b/third_party/nixpkgs/pkgs/development/web/twitter-bootstrap/default.nix index 336e5af5a4..14fd9a219e 100644 --- a/third_party/nixpkgs/pkgs/development/web/twitter-bootstrap/default.nix +++ b/third_party/nixpkgs/pkgs/development/web/twitter-bootstrap/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "bootstrap"; - version = "4.5.2"; + version = "4.5.3"; src = fetchurl { url = "https://github.com/twbs/bootstrap/releases/download/v${version}/${pname}-${version}-dist.zip"; - sha256 = "03brvh7fir9ylfr0c5b6kvf79bkjny0wxw4r5q8x8h2niycrkazg"; + sha256 = "0w87b0vbwsdb4ag359y5pppxjvqnxk1949mszzn8ay2i5h47mjq6"; }; buildInputs = [ unzip ]; diff --git a/third_party/nixpkgs/pkgs/games/arx-libertatis/default.nix b/third_party/nixpkgs/pkgs/games/arx-libertatis/default.nix index 8b2cf83e50..52935c96cd 100644 --- a/third_party/nixpkgs/pkgs/games/arx-libertatis/default.nix +++ b/third_party/nixpkgs/pkgs/games/arx-libertatis/default.nix @@ -12,13 +12,13 @@ with stdenv.lib; stdenv.mkDerivation { pname = "arx-libertatis"; - version = "2019-07-22"; + version = "2020-10-20"; src = fetchFromGitHub { owner = "arx"; repo = "ArxLibertatis"; - rev = "db77aa26bb8612f711b65e72b1cd8cf6481700c7"; - sha256 = "0c88djyzjna17wjcvkgsfx3011m1rba5xdzdldy1hjmafpqgb4jj"; + rev = "21df2e37664de79e117eff2af164873f05600f4c"; + sha256 = "06plyyh0ddqv1j04m1vclz9j72609pgrp61v8wfjdcln8djm376i"; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/games/chiaki/default.nix b/third_party/nixpkgs/pkgs/games/chiaki/default.nix index be4ec7b73b..27dde97ead 100644 --- a/third_party/nixpkgs/pkgs/games/chiaki/default.nix +++ b/third_party/nixpkgs/pkgs/games/chiaki/default.nix @@ -4,14 +4,14 @@ mkDerivation rec { pname = "chiaki"; - version = "1.2.1"; + version = "1.3.0"; src = fetchFromGitHub { rev = "v${version}"; owner = "thestr4ng3r"; repo = "chiaki"; fetchSubmodules = true; - sha256 = "00lzsbjd1w1bhlblgf7zp112sk8ac09c3bzi5ljxbn02mi0an3qp"; + sha256 = "07w7srxxr8zjp91p5n1sqf4j8lljfrm78lz1m15s2nzlm579015h"; }; nativeBuildInputs = [ @@ -20,6 +20,7 @@ mkDerivation rec { buildInputs = [ ffmpeg libopus qtbase qtmultimedia qtsvg protobuf SDL2 ]; doCheck = true; + installCheckPhase = "$out/bin/chiaki --help"; meta = with lib; { homepage = "https://github.com/thestr4ng3r/chiaki"; diff --git a/third_party/nixpkgs/pkgs/games/easyrpg-player/default.nix b/third_party/nixpkgs/pkgs/games/easyrpg-player/default.nix index 79628d0d2a..f3f039fe78 100644 --- a/third_party/nixpkgs/pkgs/games/easyrpg-player/default.nix +++ b/third_party/nixpkgs/pkgs/games/easyrpg-player/default.nix @@ -5,13 +5,13 @@ stdenv.mkDerivation rec { pname = "easyrpg-player"; - version = "0.6.2.1"; + version = "0.6.2.3"; src = fetchFromGitHub { owner = "EasyRPG"; repo = "Player"; rev = version; - sha256 = "19wpjvlkjmjhdv1dbph6i2da1xx479zhr532x0ili1aphw1j9hi6"; + sha256 = "103ywad12dcfjpf97kyx22smilqrw1f20xcfvjjr4mm3walc2mdp"; }; nativeBuildInputs = [ cmake doxygen pkgconfig ]; diff --git a/third_party/nixpkgs/pkgs/games/enyo-doom/default.nix b/third_party/nixpkgs/pkgs/games/enyo-doom/default.nix index ba07b50a1e..0158dc2b53 100644 --- a/third_party/nixpkgs/pkgs/games/enyo-doom/default.nix +++ b/third_party/nixpkgs/pkgs/games/enyo-doom/default.nix @@ -2,13 +2,13 @@ mkDerivation rec { pname = "enyo-doom"; - version = "1.06.9"; + version = "2.0.2"; src = fetchFromGitLab { owner = "sdcofer70"; repo = "enyo-doom"; rev = version; - sha256 = "0vx5zy47cqrqdgyx31wg56ivva0qqiyww8bp1x32ax99danymjyf"; + sha256 = "1s1vpwrrpb9c7r2b0k1j7dlsfasfzmi6prcwql4mxwixrl7f8ms1"; }; nativeBuildInputs = [ cmake ]; diff --git a/third_party/nixpkgs/pkgs/games/minecraft/default.nix b/third_party/nixpkgs/pkgs/games/minecraft/default.nix index 8052b11fb6..60f89bea0e 100644 --- a/third_party/nixpkgs/pkgs/games/minecraft/default.nix +++ b/third_party/nixpkgs/pkgs/games/minecraft/default.nix @@ -10,7 +10,7 @@ , nss , nspr , fontconfig -, gnome2 +, pango , cairo , expat , alsaLib @@ -59,7 +59,7 @@ let freetype gdk-pixbuf glib - gnome2.pango + pango gtk3-x11 gtk2-x11 nspr diff --git a/third_party/nixpkgs/pkgs/games/portmod/default.nix b/third_party/nixpkgs/pkgs/games/portmod/default.nix new file mode 100644 index 0000000000..07451b8dc2 --- /dev/null +++ b/third_party/nixpkgs/pkgs/games/portmod/default.nix @@ -0,0 +1,98 @@ +{ lib, stdenv, callPackage, python3Packages, fetchFromGitLab, cacert, + rustPlatform, bubblewrap, git, perlPackages, imagemagick7, fetchurl, fetchzip, + jre, makeWrapper, tr-patcher, tes3cmd }: + +let + version = "2.0_beta9"; + + src = fetchFromGitLab { + owner = "portmod"; + repo = "Portmod"; + rev = "v${version}"; + sha256 = "0a598rb0z6gsdyr4n0lc0yc583njjii07p6vxw75xsh7292vxksc"; + }; + + portmod-rust = rustPlatform.buildRustPackage rec { + inherit src version; + pname = "portmod-rust"; + + cargoSha256 = "14p1aywwbkf2pk85sir5g9ni08zam2hid0kaz111718b006nrxh7"; + + nativeBuildInputs = [ python3Packages.python ]; + + doCheck = false; + }; + + bin-programs = [ + bubblewrap + git + python3Packages.virtualenv + tr-patcher + tes3cmd + imagemagick7 + ]; + +in +python3Packages.buildPythonApplication rec { + inherit src version; + + pname = "portmod"; + + SETUPTOOLS_SCM_PRETEND_VERSION = version; + + # build the rust library independantly + prePatch = '' + substituteInPlace setup.py \ + --replace "from setuptools_rust import Binding, RustExtension" "" \ + --replace "RustExtension(\"portmod.portmod\", binding=Binding.PyO3, strip=True)" "" + ''; + + propagatedBuildInputs = with python3Packages; [ + setuptools_scm + setuptools + requests + chardet + colorama + restrictedpython + appdirs + GitPython + progressbar2 + python-sat + redbaron + patool + packaging + ]; + + checkInputs = with python3Packages; [ + pytestCheckHook + ] ++ bin-programs; + + preCheck = '' + cp ${portmod-rust}/lib/libportmod.so portmod/portmod.so + export HOME=$(mktemp -d) + ''; + + # some test require network access + disabledTests = [ + "test_masters_esp" + "test_logging" + "test_execute_network_permissions" + "test_execute_permissions_bleed" + "test_git" + ]; + + # for some reason, installPhase doesn't copy the compiled binary + postInstall = '' + cp ${portmod-rust}/lib/libportmod.so $out/${python3Packages.python.sitePackages}/portmod/portmod.so + + makeWrapperArgs+=("--prefix" "GIT_SSL_CAINFO" ":" "${cacert}/etc/ssl/certs/ca-bundle.crt" \ + "--prefix" "PATH" ":" "${lib.makeBinPath bin-programs }") + ''; + + meta = { + description = "mod manager for openMW based on portage"; + homepage = "https://gitlab.com/portmod/portmod"; + license = lib.licenses.gpl3; + maintainers = with lib.maintainers; [ marius851000 ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/games/pro-office-calculator/default.nix b/third_party/nixpkgs/pkgs/games/pro-office-calculator/default.nix index 7a0e3bec78..35571ff149 100644 --- a/third_party/nixpkgs/pkgs/games/pro-office-calculator/default.nix +++ b/third_party/nixpkgs/pkgs/games/pro-office-calculator/default.nix @@ -15,7 +15,7 @@ mkDerivation rec { nativeBuildInputs = [ cmake ]; meta = with stdenv.lib; { - description = "Just an ordinary calculator. Nothing to see here..."; + description = "A completely normal office calculator"; homepage = "https://proofficecalculator.com/"; maintainers = [ maintainers.pmiddend ]; platforms = platforms.linux; diff --git a/third_party/nixpkgs/pkgs/games/tes3cmd/default.nix b/third_party/nixpkgs/pkgs/games/tes3cmd/default.nix new file mode 100644 index 0000000000..3778aadda9 --- /dev/null +++ b/third_party/nixpkgs/pkgs/games/tes3cmd/default.nix @@ -0,0 +1,28 @@ +{ stdenv, lib, perlPackages, fetchFromGitHub }: + +stdenv.mkDerivation rec { + pname = "tes3cmd"; + version = "0.40-pre-release-2"; + + src = fetchFromGitHub { + owner = "john-moonsugar"; + repo = pname; + rev = "f72e9ed9dd18e8545dd0dc2a4056c250cf505790"; + sha256 = "01zqplp8yb0xnl54963n0zkz66rf3hn2x3i255jlhdhx1c43jba7"; + }; + + buildInputs = [ perlPackages.perl ]; + + installPhase = '' + mkdir -p $out/bin + cp tes3cmd $out/bin/tes3cmd + ''; + + meta = with lib; { + description = "A command line tool for examining and modifying plugins for the Elder Scrolls game Morrowind by Bethesda Softworks"; + homepage = "https://github.com/john-moonsugar/tes3cmd"; + license = licenses.mit; + maintainers = [ maintainers.marius851000 ]; + platforms = platforms.linux; + }; +} diff --git a/third_party/nixpkgs/pkgs/games/tr-patcher/default.nix b/third_party/nixpkgs/pkgs/games/tr-patcher/default.nix new file mode 100644 index 0000000000..68e3eb6089 --- /dev/null +++ b/third_party/nixpkgs/pkgs/games/tr-patcher/default.nix @@ -0,0 +1,36 @@ +{ stdenv, lib, fetchurl, fetchzip, jre, makeWrapper }: + +let +translation-file = fetchurl { + url = "https://gitlab.com/bmwinger/tr-patcher/-/raw/master/lib/Translation.txt?inline=false"; + sha256 = "136zd2s73b4n1w2n34wxi656bm448748nn3y7a64fd89ysg9n7n8"; +}; +in +stdenv.mkDerivation rec { + pname = "tr-patcher"; + version = "1.0.5"; + + # use the pre compiled source, as compilation is a bit complex + src = fetchzip { + url = "https://gitlab.com/bmwinger/tr-patcher/uploads/b57899980b2351c136393f02977c4fab/tr-patcher-shadow.zip"; + sha256 = "0va7nbmlgf3p2nc0z2b9n1285y4q5rpyjr4w93rdnx38wrhinxnw"; + }; + + nativeBuildInputs = [ makeWrapper ]; + + installPhase = '' + install -Dm644 lib/tr-patcher-all.jar $out/lib/tr-patcher.jar + install -Dm644 ${translation-file} $out/lib/Translation.txt + mkdir -p $out/bin + makeWrapper ${jre}/bin/java $out/bin/tr-patcher \ + --add-flags "-jar $out/lib/tr-patcher.jar" + ''; + + meta = with lib; { + description = "Allow to update dependancies of the Tamriel-Data mod for morrowind"; + homepage = "https://gitlab.com/bmwinger/tr-patcher"; + license = licenses.gpl3; + maintainers = [ maintainers.marius851000 ]; + platforms = platforms.linux; + }; +} diff --git a/third_party/nixpkgs/pkgs/misc/emulators/dolphin-emu/master.nix b/third_party/nixpkgs/pkgs/misc/emulators/dolphin-emu/master.nix index 3865a4a706..8ef7b610a2 100644 --- a/third_party/nixpkgs/pkgs/misc/emulators/dolphin-emu/master.nix +++ b/third_party/nixpkgs/pkgs/misc/emulators/dolphin-emu/master.nix @@ -21,13 +21,13 @@ let }; in stdenv.mkDerivation rec { pname = "dolphin-emu"; - version = "5.0-11824"; + version = "5.0-12716"; src = fetchFromGitHub { owner = "dolphin-emu"; repo = "dolphin"; - rev = "1b97f081b8eff9012132a4124537968bdb0e03e0"; - sha256 = "1v96hcn34040vjsw83k8p0r0nb8rrdcz80h4ngirxzm36b3l7w6m"; + rev = "31524288e3b2450eaefff8202c6d26c4ba3f7333"; + sha256 = "0vv3ahk6zdx2hx5diq4jkhl289wjybqcr4lwinrkfiywb83hcabg"; }; enableParallelBuilding = true; diff --git a/third_party/nixpkgs/pkgs/misc/emulators/pcsx2/default.nix b/third_party/nixpkgs/pkgs/misc/emulators/pcsx2/default.nix index af2cca5494..a08ee4f057 100644 --- a/third_party/nixpkgs/pkgs/misc/emulators/pcsx2/default.nix +++ b/third_party/nixpkgs/pkgs/misc/emulators/pcsx2/default.nix @@ -1,21 +1,19 @@ -{ alsaLib, cmake, fetchFromGitHub, glib, gettext, gtk2, harfbuzz, lib, libaio -, libpng, libpcap, libxml2, makeWrapper, perl, pkgconfig, portaudio -, SDL2, soundtouch, stdenv, udev, wxGTK, zlib +{ alsaLib, cmake, fetchFromGitHub, gcc-unwrapped, gettext, glib, gtk3, harfbuzz +, libaio, libpcap, libpng, libxml2, makeWrapper, perl, pkgconfig, portaudio +, SDL2, soundtouch, stdenv, udev, wrapGAppsHook, wxGTK, zlib }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "pcsx2"; - version = "1.6.0"; + version = "unstable-2020-10-10"; src = fetchFromGitHub { owner = "PCSX2"; repo = "pcsx2"; - rev = "v${version}"; - sha256 = "0528kh3275285lvfsykycdhc35c1z8pmccl2s7dfi3va2cp4x8wa"; + rev = "7e2ccd64e8e6049b6059141e8767037463421c33"; + sha256 = "0c7m74ch68p4y9xlld34a9r38kb2py6wlkg4vranc6dicxvi1b3r"; }; - postPatch = "sed '1i#include \"x86intrin.h\"' -i common/src/x86emitter/cpudetect.cpp"; - cmakeFlags = [ "-DCMAKE_INSTALL_PREFIX=${placeholder "out"}" "-DDISABLE_ADVANCE_SIMD=TRUE" @@ -23,31 +21,36 @@ stdenv.mkDerivation rec { "-DDOC_DIR=${placeholder "out"}/share/doc/pcsx2" "-DGAMEINDEX_DIR=${placeholder "out"}/share/pcsx2" "-DGLSL_SHADER_DIR=${placeholder "out"}/share/pcsx2" - "-DwxWidgets_LIBRARIES=${wxGTK}/lib" - "-DwxWidgets_INCLUDE_DIRS=${wxGTK}/include" - "-DwxWidgets_CONFIG_EXECUTABLE=${wxGTK}/bin/wx-config" + "-DGTK3_API=TRUE" "-DPACKAGE_MODE=TRUE" "-DPLUGIN_DIR=${placeholder "out"}/lib/pcsx2" "-DREBUILD_SHADER=TRUE" + "-DUSE_LTO=TRUE" + "-DwxWidgets_CONFIG_EXECUTABLE=${wxGTK}/bin/wx-config" + "-DwxWidgets_INCLUDE_DIRS=${wxGTK}/include" + "-DwxWidgets_LIBRARIES=${wxGTK}/lib" "-DXDG_STD=TRUE" - "-DGTK2_GLIBCONFIG_INCLUDE_DIR=${glib.out}/lib/glib-2.0/include" - "-DGTK2_GDKCONFIG_INCLUDE_DIR=${gtk2.out}/lib/gtk-2.0/include" - "-DGTK2_INCLUDE_DIRS=${gtk2.dev}/include/gtk-2.0" - "-DGTK3_API=FALSE" ]; + postPatch = '' + substituteInPlace cmake/BuildParameters.cmake \ + --replace /usr/bin/gcc-ar ${gcc-unwrapped}/bin/gcc-ar \ + --replace /usr/bin/gcc-nm ${gcc-unwrapped}/bin/gcc-nm \ + --replace /usr/bin/gcc-ranlib ${gcc-unwrapped}/bin/gcc-ranlib + ''; + postFixup = '' wrapProgram $out/bin/PCSX2 \ --set __GL_THREADED_OPTIMIZATIONS 1 ''; - nativeBuildInputs = [ cmake makeWrapper perl pkgconfig ]; + nativeBuildInputs = [ cmake makeWrapper perl pkgconfig wrapGAppsHook ]; buildInputs = [ alsaLib - glib gettext - gtk2 + glib + gtk3 harfbuzz libaio libpcap @@ -71,13 +74,13 @@ stdenv.mkDerivation rec { PC, with many additional features and benefits. ''; homepage = "https://pcsx2.net"; - maintainers = with maintainers; [ hrdinka ]; + maintainers = with maintainers; [ hrdinka samuelgrf ]; # PCSX2's source code is released under LGPLv3+. It However ships # additional data files and code that are licensed differently. # This might be solved in future, for now we should stick with # license.free license = licenses.free; - platforms = platforms.i686; + platforms = platforms.x86; }; } diff --git a/third_party/nixpkgs/pkgs/misc/lightspark/default.nix b/third_party/nixpkgs/pkgs/misc/lightspark/default.nix index 833d8a8299..86177892f4 100644 --- a/third_party/nixpkgs/pkgs/misc/lightspark/default.nix +++ b/third_party/nixpkgs/pkgs/misc/lightspark/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchFromGitHub, pkgconfig, cmake, curl, zlib, ffmpeg_3, glew, pcre -, rtmpdump, cairo, boost, SDL2, SDL2_mixer, libjpeg, gnome2, lzma, nasm +, rtmpdump, cairo, boost, SDL2, SDL2_mixer, libjpeg, pango, lzma, nasm , llvm, glibmm }: @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { buildInputs = [ curl zlib ffmpeg_3 glew pcre rtmpdump cairo boost SDL2 SDL2_mixer libjpeg - gnome2.pango lzma nasm llvm glibmm + pango lzma nasm llvm glibmm ]; enableParallelBuilding = true; diff --git a/third_party/nixpkgs/pkgs/misc/vim-plugins/overrides.nix b/third_party/nixpkgs/pkgs/misc/vim-plugins/overrides.nix index 98c52a5a0a..88e535da5b 100644 --- a/third_party/nixpkgs/pkgs/misc/vim-plugins/overrides.nix +++ b/third_party/nixpkgs/pkgs/misc/vim-plugins/overrides.nix @@ -60,18 +60,19 @@ self: super: { }; LanguageClient-neovim = let - version = "0.1.158"; + version = "0.1.160"; LanguageClient-neovim-src = fetchFromGitHub { owner = "autozimu"; repo = "LanguageClient-neovim"; rev = version; - sha256 = "14xggdgp5qw4yj4gdsgr8s2nxm098m88q8rx6fzd2j20njv308ki"; + sha256 = "143cifahav1pfmpx3j1ihx433jrwxf6z27s0wxndgjkd2plkks58"; }; LanguageClient-neovim-bin = rustPlatform.buildRustPackage { - name = "LanguageClient-neovim-bin"; + pname = "LanguageClient-neovim-bin"; + inherit version; src = LanguageClient-neovim-src; - cargoSha256 = "0nin1gydf6q4mmxljm2xbd1jfl3wpzx3pvlqwspahblv9j2bf5ck"; + cargoSha256 = "0mf94j85awdcqa6cyb89bipny9xg13ldkznjf002fq747f55my2a"; buildInputs = stdenv.lib.optionals stdenv.isDarwin [ CoreServices ]; # FIXME: Use impure version of CoreFoundation because of missing symbols. diff --git a/third_party/nixpkgs/pkgs/misc/vscode-extensions/default.nix b/third_party/nixpkgs/pkgs/misc/vscode-extensions/default.nix index 70c68abe31..53796981e5 100644 --- a/third_party/nixpkgs/pkgs/misc/vscode-extensions/default.nix +++ b/third_party/nixpkgs/pkgs/misc/vscode-extensions/default.nix @@ -10,6 +10,7 @@ in # So an extension's attribute name should be of the form: # "${mktplcRef.publisher}.${mktplcRef.name}". # +stdenv.lib.mapAttrs (_n: stdenv.lib.recurseIntoAttrs) { alanz.vscode-hie-server = buildVscodeMarketplaceExtension { @@ -48,6 +49,26 @@ in }; }; + dhall.dhall-lang = buildVscodeMarketplaceExtension { + mktplcRef = { + name = "dhall-lang"; + publisher = "dhall"; + version = "0.0.4"; + sha256 = "0sa04srhqmngmw71slnrapi2xay0arj42j4gkan8i11n7bfi1xpf"; + }; + meta = { license = stdenv.lib.licenses.mit; }; + }; + + dhall.vscode-dhall-lsp-server = buildVscodeMarketplaceExtension { + mktplcRef = { + name = "vscode-dhall-lsp-server"; + publisher = "dhall"; + version = "0.0.4"; + sha256 = "1zin7s827bpf9yvzpxpr5n6mv0b5rhh3civsqzmj52mdq365d2js"; + }; + meta = { license = stdenv.lib.licenses.mit; }; + }; + formulahendry.auto-close-tag = buildVscodeMarketplaceExtension { mktplcRef = { name = "auto-close-tag"; diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/alsa-utils/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/alsa-utils/default.nix index f4670581de..055927b7a3 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/alsa-utils/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/alsa-utils/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "alsa-utils"; - version = "1.2.3"; + version = "1.2.4"; src = fetchurl { url = "mirror://alsa/utils/${pname}-${version}.tar.bz2"; - sha256 = "1ai1z4kf91b1m3qrpwqkc1af5vm2fkdkknqv95xdwf19q94aw6gz"; + sha256 = "09m4dnn4kplawprd2bl15nwa0b4r1brab3x44ga7f1fyk7aw5zwq"; }; nativeBuildInputs = [ gettext ]; diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/android-udev-rules/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/android-udev-rules/default.nix index 1cfa6b5856..946aa7beea 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/android-udev-rules/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/android-udev-rules/default.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { pname = "android-udev-rules"; - version = "20200410"; + version = "20200613"; src = fetchFromGitHub { owner = "M0Rf30"; repo = "android-udev-rules"; rev = version; - sha256 = "1ik9a0k9gkaw5a80m25pxx5yfiwq34ffb7iqhwicz4lwz5wsw8d3"; + sha256 = "0cf5br8x6iwxc1cifv0i1klw7skgs8hghdx6qlqby68kyqg81bb2"; }; installPhase = '' diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/cpuid/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/cpuid/default.nix index df0017eadc..3f57d0c703 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/cpuid/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/cpuid/default.nix @@ -2,12 +2,12 @@ stdenv.mkDerivation rec { pname = "cpuid"; - version = "20200427"; + version = "20201006"; src = fetchurl { name = "${pname}-${version}.src.tar.gz"; url = "http://etallen.com/cpuid/${pname}-${version}.src.tar.gz"; - sha256 = "1m31238z2ya8f8pzpyklwp0ksf5xicqrw1z941hhhx913wzldaf1"; + sha256 = "19jnkh57f979b78ak5mpxmdvnkgc33r55cw9shgd2hc380b3zi8k"; }; # For pod2man during the build process. diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/dpdk/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/dpdk/default.nix index aacbc3cdfb..efe578c596 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/dpdk/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/dpdk/default.nix @@ -43,7 +43,7 @@ in stdenv.mkDerivation rec { mesonFlags = [ "-Denable_docs=true" - "-Denable_kmods=${if mod then "true" else "false"}" + "-Denable_kmods=${lib.boolToString mod}" ] ++ lib.optional (!shared) "-Ddefault_library=static" ++ lib.optional stdenv.isx86_64 "-Dmachine=nehalem" diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/dstat/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/dstat/default.nix index 2e235e27f3..6d2d8eb75b 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/dstat/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/dstat/default.nix @@ -12,6 +12,8 @@ python2Packages.buildPythonApplication rec { propagatedBuildInputs = with python2Packages; [ python-wifi ]; + patches = [ ./fix_pluginpath.patch ]; + makeFlags = [ "prefix=$(out)" ]; meta = with stdenv.lib; { diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/dstat/fix_pluginpath.patch b/third_party/nixpkgs/pkgs/os-specific/linux/dstat/fix_pluginpath.patch new file mode 100644 index 0000000000..06d7793da4 --- /dev/null +++ b/third_party/nixpkgs/pkgs/os-specific/linux/dstat/fix_pluginpath.patch @@ -0,0 +1,15 @@ +diff --git a/dstat b/dstat +index 3ac7087..c5f089d 100755 +--- a/dstat ++++ b/dstat +@@ -66,9 +66,7 @@ if sys.version_info < (2, 3): + + pluginpath = [ + os.path.expanduser('~/.dstat/'), # home + /.dstat/ +- os.path.abspath(os.path.dirname(sys.argv[0])) + '/plugins/', # binary path + /plugins/ +- '/usr/share/dstat/', +- '/usr/local/share/dstat/', ++ os.path.abspath(os.path.dirname(sys.argv[0])) + '/../share/dstat/', # binary path + /../share/dstat/ + ] + + class Options: diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/hdparm/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/hdparm/default.nix index 99464b67db..8d3a967d68 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/hdparm/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/hdparm/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "hdparm-9.58"; + pname = "hdparm"; + version = "9.58"; src = fetchurl { - url = "mirror://sourceforge/hdparm/${name}.tar.gz"; + url = "mirror://sourceforge/hdparm/hdparm-${version}.tar.gz"; sha256 = "03z1qm8zbgpxagk3994lvp24yqsshjibkwg05v9p3q1w7y48xrws"; - }; preBuild = '' diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/nvme-cli/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/nvme-cli/default.nix index 80a00082b8..b848a86827 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/nvme-cli/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/nvme-cli/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "nvme-cli"; - version = "1.12"; + version = "1.13"; src = fetchFromGitHub { owner = "linux-nvme"; repo = "nvme-cli"; rev = "v${version}"; - sha256 = "0ldky34sn0m5c4hgiip0fkzm465nca69bhxicpd5dg8wxhzxqrp3"; + sha256 = "1d538kp841bjh8h8d9q7inqz56rdcwb3m78zfx8607ddykv7wcqb"; }; nativeBuildInputs = [ pkg-config ]; diff --git a/third_party/nixpkgs/pkgs/servers/atlassian/jira.nix b/third_party/nixpkgs/pkgs/servers/atlassian/jira.nix index ab3746e6e0..d3c7fb9655 100644 --- a/third_party/nixpkgs/pkgs/servers/atlassian/jira.nix +++ b/third_party/nixpkgs/pkgs/servers/atlassian/jira.nix @@ -8,11 +8,11 @@ stdenv.mkDerivation rec { pname = "atlassian-jira"; - version = "8.12.0"; + version = "8.13.0"; src = fetchurl { url = "https://product-downloads.atlassian.com/software/jira/downloads/atlassian-jira-software-${version}.tar.gz"; - sha256 = "149yqj60b35mbvjz7jyh5a3ayh61kvwrz452s0zyb1q3pirj10xq"; + sha256 = "06jq6x24kxwzkwjx05d4q6jyvjpbzqpjlj8arycw8z0w97k83hh9"; }; buildPhase = '' diff --git a/third_party/nixpkgs/pkgs/servers/bazarr/default.nix b/third_party/nixpkgs/pkgs/servers/bazarr/default.nix index 92ca263f46..f220f4002a 100644 --- a/third_party/nixpkgs/pkgs/servers/bazarr/default.nix +++ b/third_party/nixpkgs/pkgs/servers/bazarr/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "bazarr"; - version = "0.9.0.2"; + version = "0.9.0.5"; src = fetchurl { url = "https://github.com/morpheus65535/bazarr/archive/v${version}.tar.gz"; - sha256 = "1lvldklj61hg9h1m0ixaa4zcf4ggdj6wf4myhwwampq4bmr2havj"; + sha256 = "1mm8qghkif48jr7fq28kp7zk5x71zm43isf0a96crpi9qi91sdd5"; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/third_party/nixpkgs/pkgs/servers/caddy/default.nix b/third_party/nixpkgs/pkgs/servers/caddy/default.nix index a4e787db73..37f3f1082e 100644 --- a/third_party/nixpkgs/pkgs/servers/caddy/default.nix +++ b/third_party/nixpkgs/pkgs/servers/caddy/default.nix @@ -2,7 +2,7 @@ buildGoModule rec { pname = "caddy"; - version = "2.2.0"; + version = "2.2.1"; subPackages = [ "cmd/caddy" ]; @@ -10,7 +10,7 @@ buildGoModule rec { owner = "caddyserver"; repo = pname; rev = "v${version}"; - sha256 = "086zgbwb3v11gik2w024p7m7ywkzn0w27y6hrngd4rxylj7jq7c8"; + sha256 = "065kxnyapjk4r07qrr55zs5w72p8rb8mapq3dh9lr1y13b8sgka9"; }; vendorSha256 = "1rm7v03v6rf9fdqrrl639z8a46cdzswjp8rdpygcsndqfznn5w7b"; diff --git a/third_party/nixpkgs/pkgs/servers/computing/storm/default.nix b/third_party/nixpkgs/pkgs/servers/computing/storm/default.nix index b8ae0bc4e8..541e9f6e11 100644 --- a/third_party/nixpkgs/pkgs/servers/computing/storm/default.nix +++ b/third_party/nixpkgs/pkgs/servers/computing/storm/default.nix @@ -7,12 +7,12 @@ stdenv.mkDerivation rec { pname = "apache-storm"; - version = "2.1.0"; + version = "2.2.0"; name = "${pname}-${version}"; src = fetchurl { url = "mirror://apache/storm/${name}/${name}.tar.gz"; - sha256 = "1i3z08rfy7aavshrbrskv9dmlhx1fjgrhhqm0pczfam4vnas8yg2"; + sha256 = "0xc6lfilfkkjyds59b6c770gj21v9srzpln31c9qb3ls6hzic8gn"; }; buildInputs = [ zip unzip ]; diff --git a/third_party/nixpkgs/pkgs/servers/dgraph/default.nix b/third_party/nixpkgs/pkgs/servers/dgraph/default.nix index c1657dbfec..e23a186520 100644 --- a/third_party/nixpkgs/pkgs/servers/dgraph/default.nix +++ b/third_party/nixpkgs/pkgs/servers/dgraph/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "dgraph"; - version = "20.07.0"; + version = "20.07.1"; src = fetchFromGitHub { owner = "dgraph-io"; repo = "dgraph"; rev = "v${version}"; - sha256 = "0jcr3imv6vy40c8zdahsfph5mdxkmp2yqapl5982cf0a61gj7brp"; + sha256 = "0vkkzckk6095vkyl5yqhxqbjmvw7jzars8ymgv2zi55n26qzzvf0"; }; - vendorSha256 = "0fb8ba2slav6jk93qwaw715myanivrpajfjwi654n0psr57vc7gf"; + vendorSha256 = "17bfavirx0lpy6ca86y2gm6kf8m388xbpda65dd2w71csbzbc2mi"; doCheck = false; diff --git a/third_party/nixpkgs/pkgs/servers/dns/powerdns/default.nix b/third_party/nixpkgs/pkgs/servers/dns/powerdns/default.nix index cacd5b7c54..0f9f91ebf8 100644 --- a/third_party/nixpkgs/pkgs/servers/dns/powerdns/default.nix +++ b/third_party/nixpkgs/pkgs/servers/dns/powerdns/default.nix @@ -1,29 +1,28 @@ { stdenv, fetchurl, pkgconfig, nixosTests , boost, libyamlcpp, libsodium, sqlite, protobuf, openssl, systemd -, mysql57, postgresql, lua, openldap, geoip, curl, opendbx, unixODBC +, mysql57, postgresql, lua, openldap, geoip, curl, unixODBC }: stdenv.mkDerivation rec { pname = "powerdns"; - version = "4.2.3"; + version = "4.3.1"; src = fetchurl { url = "https://downloads.powerdns.com/releases/pdns-${version}.tar.bz2"; - sha256 = "1vf03hssk9rfhvhzfc5ca2r4ly67wq0czr0ysvdrk8pnb0yk6yfi"; + sha256 = "0if27znz528sir52y9i4gcfhdsym7yxiwjgffy9lpscf1426q56m"; }; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ boost mysql57.connector-c postgresql lua openldap sqlite protobuf geoip - libyamlcpp libsodium curl opendbx unixODBC openssl systemd + libyamlcpp libsodium curl unixODBC openssl systemd ]; # nix destroy with-modules arguments, when using configureFlags preConfigure = '' configureFlagsArray=( - "--with-modules=bind gmysql geoip godbc gpgsql gsqlite3 ldap lua mydns opendbx pipe random remote" + "--with-modules=bind gmysql geoip godbc gpgsql gsqlite3 ldap lua2 pipe random remote" --with-sqlite3 - --with-socketdir=/var/lib/powerdns --with-libcrypto=${openssl.dev} --with-libsodium --enable-tools diff --git a/third_party/nixpkgs/pkgs/servers/http/couchdb/3.nix b/third_party/nixpkgs/pkgs/servers/http/couchdb/3.nix index 18271e82a8..bb856d7aa0 100644 --- a/third_party/nixpkgs/pkgs/servers/http/couchdb/3.nix +++ b/third_party/nixpkgs/pkgs/servers/http/couchdb/3.nix @@ -3,14 +3,14 @@ stdenv.mkDerivation rec { pname = "couchdb"; - version = "3.1.0"; + version = "3.1.1"; # when updating this, please consider bumping the erlang/OTP version # in all-packages.nix src = fetchurl { url = "mirror://apache/couchdb/source/${version}/apache-${pname}-${version}.tar.gz"; - sha256 = "1vgqj3zsrkdqgnwzji3mqkapnfd6kq466f5xnya0fvzzl6bcfrs8"; + sha256 = "18wcqxrv2bz88xadkqpqznprrxmcmwr0g6k895xrm8rbp9mpdzlg"; }; buildInputs = [ erlang icu openssl spidermonkey_68 (python3.withPackages(ps: with ps; [ requests ]))]; diff --git a/third_party/nixpkgs/pkgs/servers/icingaweb2/default.nix b/third_party/nixpkgs/pkgs/servers/icingaweb2/default.nix index 6414d445a0..eaf16e3880 100644 --- a/third_party/nixpkgs/pkgs/servers/icingaweb2/default.nix +++ b/third_party/nixpkgs/pkgs/servers/icingaweb2/default.nix @@ -1,12 +1,12 @@ { stdenv, lib, fetchFromGitHub, makeWrapper, php }: with lib; stdenv.mkDerivation rec { pname = "icingaweb2"; - version = "2.8.1"; + version = "2.8.2"; src = fetchFromGitHub { owner = "Icinga"; repo = "icingaweb2"; rev = "v${version}"; - sha256 = "1hmw681a2qv578npr389szkxpbhcfqzq9c1wzkbjjm3avnvi37mf"; + sha256 = "1zrni1hzblaangiqm7iqbvg2h9rdc2l3pzzymz52r7mri4qnr4s8"; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/third_party/nixpkgs/pkgs/servers/jackett/default.nix b/third_party/nixpkgs/pkgs/servers/jackett/default.nix index 89bf306fef..3058ef5a4a 100644 --- a/third_party/nixpkgs/pkgs/servers/jackett/default.nix +++ b/third_party/nixpkgs/pkgs/servers/jackett/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "jackett"; - version = "0.16.1757"; + version = "0.16.1883"; src = fetchurl { url = "https://github.com/Jackett/Jackett/releases/download/v${version}/Jackett.Binaries.Mono.tar.gz"; - sha256 = "1scf7sh4cpq0drz6jn60l6163g0dcqvp6ifq5gyj3484zwpxmnsf"; + sha256 = "1l16zzjyvwq6rd4q6dg4m0a81fiw50c7naksa43g3yhv7wg7wfll"; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/third_party/nixpkgs/pkgs/servers/livepeer/default.nix b/third_party/nixpkgs/pkgs/servers/livepeer/default.nix index 60122d6b45..5430c7ddf0 100644 --- a/third_party/nixpkgs/pkgs/servers/livepeer/default.nix +++ b/third_party/nixpkgs/pkgs/servers/livepeer/default.nix @@ -4,16 +4,16 @@ buildGoModule rec { pname = "livepeer"; - version = "0.5.10"; + version = "0.5.11"; runVend = true; - vendorSha256 = "0i5977skw4b209zvdvgvzfnhqb574067mmfk2gf9y590lgnr86f7"; + vendorSha256 = "13cgwpf3v4vlvb0mgdxsdybpghx1cp3fzkdwmq8b193a8dcl8s63"; src = fetchFromGitHub { owner = "livepeer"; repo = "go-livepeer"; rev = "v${version}"; - sha256 = "0qccvnk2yyly7ha9lkcpd6zj5n9xnhdjkl3nllb9xziidsq6p65h"; + sha256 = "12vbnl74z6jk77bnws8a5z5n7bnhkbb4ngzxfir5l3g9zrpsc5p3"; }; # livepeer_cli has a vendoring problem diff --git a/third_party/nixpkgs/pkgs/servers/mail/rspamd/default.nix b/third_party/nixpkgs/pkgs/servers/mail/rspamd/default.nix index 7f54b97a8e..995dbf2e16 100644 --- a/third_party/nixpkgs/pkgs/servers/mail/rspamd/default.nix +++ b/third_party/nixpkgs/pkgs/servers/mail/rspamd/default.nix @@ -4,19 +4,20 @@ , withBlas ? true , withHyperscan ? stdenv.isx86_64 , withLuaJIT ? stdenv.isx86_64 +, nixosTests }: assert withHyperscan -> stdenv.isx86_64; stdenv.mkDerivation rec { pname = "rspamd"; - version = "2.5"; + version = "2.6"; src = fetchFromGitHub { owner = "rspamd"; repo = "rspamd"; rev = version; - sha256 = "01fhh07dddc6v7a5kq6h1z221vl0d4af43cchqkf54ycyxxxw06h"; + sha256 = "0vwa7k2s2bkfb8w78z5izkd6ywjbzqysb0grls898y549hm8ii70"; }; nativeBuildInputs = [ cmake pkgconfig perl ]; @@ -34,6 +35,8 @@ stdenv.mkDerivation rec { "-DENABLE_JEMALLOC=ON" ] ++ lib.optional withHyperscan "-DENABLE_HYPERSCAN=ON"; + passthru.tests.rspamd = nixosTests.rspamd; + meta = with stdenv.lib; { homepage = "https://rspamd.com"; license = licenses.asl20; diff --git a/third_party/nixpkgs/pkgs/servers/monitoring/grafana/default.nix b/third_party/nixpkgs/pkgs/servers/monitoring/grafana/default.nix index 48d58163e4..c29c6cdf08 100644 --- a/third_party/nixpkgs/pkgs/servers/monitoring/grafana/default.nix +++ b/third_party/nixpkgs/pkgs/servers/monitoring/grafana/default.nix @@ -2,7 +2,7 @@ buildGoModule rec { pname = "grafana"; - version = "7.2.1"; + version = "7.2.2"; excludedPackages = [ "release_publisher" ]; @@ -10,15 +10,15 @@ buildGoModule rec { rev = "v${version}"; owner = "grafana"; repo = "grafana"; - sha256 = "0hf5i7190qvcypr1x8j516k2q90n2fhxvaf84m5axzmyb4i4ym0r"; + sha256 = "14i1h0v6bwb3y1xqs71dabriyd7gdgihb8wkf3gpjr4gnsywvsgm"; }; srcStatic = fetchurl { url = "https://dl.grafana.com/oss/release/grafana-${version}.linux-amd64.tar.gz"; - sha256 = "15kys49c4kwzh73ar54v9q3277m4vql2pi8y3pji6jq9gpw0piwr"; + sha256 = "03jf5wnf89a3fawdayl5x5rfyc3dsf9wm5dm1ldz9fqk31biq8ky"; }; - vendorSha256 = "1b33kibvfa1qgalqb9ngxqimcn92cy8sllsc81wc9gmz4giz9mn1"; + vendorSha256 = "03zvhznzdbi61kd0y0ldhx2n9zh3pwg1ias1shqgqyx46c9ysdzm"; postPatch = '' substituteInPlace pkg/cmd/grafana-server/main.go \ diff --git a/third_party/nixpkgs/pkgs/servers/monitoring/prometheus/consul-exporter.nix b/third_party/nixpkgs/pkgs/servers/monitoring/prometheus/consul-exporter.nix index ad6d366a22..20281313d0 100644 --- a/third_party/nixpkgs/pkgs/servers/monitoring/prometheus/consul-exporter.nix +++ b/third_party/nixpkgs/pkgs/servers/monitoring/prometheus/consul-exporter.nix @@ -2,7 +2,7 @@ buildGoPackage rec { pname = "consul_exporter"; - version = "0.6.0"; + version = "0.7.1"; goPackagePath = "github.com/prometheus/consul_exporter"; @@ -10,7 +10,7 @@ buildGoPackage rec { owner = "prometheus"; repo = "consul_exporter"; rev = "v${version}"; - sha256 = "0s30blb4d8zw9f6x7dsnc1rxmxzsaih9w3xxxgr6c9xsm347mj86"; + sha256 = "16ibafcbpiplsh1awcvblzzf2cbr4baf8wiwpdpibgmcwwf9m5ya"; }; meta = with stdenv.lib; { diff --git a/third_party/nixpkgs/pkgs/servers/monitoring/prometheus/rtl_433-exporter.nix b/third_party/nixpkgs/pkgs/servers/monitoring/prometheus/rtl_433-exporter.nix new file mode 100644 index 0000000000..502ce8e0d4 --- /dev/null +++ b/third_party/nixpkgs/pkgs/servers/monitoring/prometheus/rtl_433-exporter.nix @@ -0,0 +1,26 @@ +{ lib, buildGoModule, fetchFromGitHub, bash, nixosTests }: + +buildGoModule rec { + pname = "rtl_433-exporter"; + version = "0.1"; + + src = fetchFromGitHub { + owner = "mhansen"; + repo = "rtl_433_prometheus"; + rev = "v${version}"; + sha256 = "1998gvfa5310bxhi6kfv8bn99369dxph3pwrpp335997b25lc2w2"; + }; + + postPatch = "substituteInPlace rtl_433_prometheus.go --replace /bin/bash ${bash}/bin/bash"; + + vendorSha256 = "03mnmzq72844hzyw7iq5g4gm1ihpqkg4i9dgj2yln1ghwk843hq6"; + + passthru.tests = { inherit (nixosTests.prometheus-exporters) rtl_433; }; + + meta = with lib; { + description = "Prometheus time-series DB exporter for rtl_433 433MHz radio packet decoder"; + homepage = "https://github.com/mhansen/rtl_433_prometheus"; + license = licenses.mit; + maintainers = with maintainers; [ zopieux ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/servers/mpd/default.nix b/third_party/nixpkgs/pkgs/servers/mpd/default.nix index ab93f3d6e1..d994ba99df 100644 --- a/third_party/nixpkgs/pkgs/servers/mpd/default.nix +++ b/third_party/nixpkgs/pkgs/servers/mpd/default.nix @@ -24,7 +24,6 @@ , python3Packages # for sphinx-build # For tests , gtest -, fetchpatch # used to fetch an upstream patch fixing a failing test , zip }: @@ -155,7 +154,8 @@ let mesonAutoFeatures = "disabled"; - outputs = [ "out" "doc" "man" ]; + outputs = [ "out" "doc" ] + ++ lib.optional (builtins.elem "documentation" features_) "man"; mesonFlags = [ "-Dtest=true" diff --git a/third_party/nixpkgs/pkgs/servers/sql/mariadb/default.nix b/third_party/nixpkgs/pkgs/servers/sql/mariadb/default.nix index 3ba4e36731..0b91e2d4fd 100644 --- a/third_party/nixpkgs/pkgs/servers/sql/mariadb/default.nix +++ b/third_party/nixpkgs/pkgs/servers/sql/mariadb/default.nix @@ -23,14 +23,14 @@ mariadb = server // { }; common = rec { # attributes common to both builds - version = "10.4.14"; + version = "10.4.15"; src = fetchurl { urls = [ "https://downloads.mariadb.org/f/mariadb-${version}/source/mariadb-${version}.tar.gz" "https://downloads.mariadb.com/MariaDB/mariadb-${version}/source/mariadb-${version}.tar.gz" ]; - sha256 = "1z469j39chq7d3dp39cljjbzcz0wl1g7rii85x46290jw1cwsbzr"; + sha256 = "0cdfzr768cb7n9ag9gqahr8c6igfn513md67xn4rf98ajmnxg0r7"; name = "mariadb-${version}.tar.gz"; }; diff --git a/third_party/nixpkgs/pkgs/servers/sql/monetdb/default.nix b/third_party/nixpkgs/pkgs/servers/sql/monetdb/default.nix index 9aec724ba6..699fcf8569 100644 --- a/third_party/nixpkgs/pkgs/servers/sql/monetdb/default.nix +++ b/third_party/nixpkgs/pkgs/servers/sql/monetdb/default.nix @@ -1,24 +1,23 @@ -{ stdenv, fetchurl, pkgconfig, file +{ stdenv, fetchurl, cmake, python3 , bison, openssl, readline, bzip2 }: -let - version = "11.37.11"; -in stdenv.mkDerivation { - +stdenv.mkDerivation rec { pname = "monetdb"; - inherit version; + version = "11.39.5"; src = fetchurl { url = "https://dev.monetdb.org/downloads/sources/archive/MonetDB-${version}.tar.bz2"; - sha256 = "0ch4vka64m5fbyah2730rcv7xpgy4hq26vbi8wd8mkadwna7azr5"; + sha256 = "1hdlab2gcj71yw6sb3yvl8s027blcsyvch3n5sgi0a2yz84wj765"; }; postPatch = '' - sed -i "s,/usr/bin/file,${file}/bin/file," configure + substituteInPlace cmake/monetdb-packages.cmake --replace \ + 'get_os_release_info(LINUX_DISTRO LINUX_DISTRO_VERSION)' \ + 'set(LINUX_DISTRO "nixos")' ''; - nativeBuildInputs = [ pkgconfig file ]; + nativeBuildInputs = [ cmake python3 ]; buildInputs = [ bison openssl readline bzip2 ]; meta = with stdenv.lib; { diff --git a/third_party/nixpkgs/pkgs/servers/tailscale/default.nix b/third_party/nixpkgs/pkgs/servers/tailscale/default.nix index 32c0c84dd0..2e14b0fe7f 100644 --- a/third_party/nixpkgs/pkgs/servers/tailscale/default.nix +++ b/third_party/nixpkgs/pkgs/servers/tailscale/default.nix @@ -21,6 +21,13 @@ buildGoModule rec { subPackages = [ "cmd/tailscale" "cmd/tailscaled" ]; + preBuild = '' + export buildFlagsArray=( + -tags="xversion" + -ldflags="-X tailscale.com/version.LONG=${version} -X tailscale.com/version.SHORT=${version}" + ) + ''; + postInstall = '' wrapProgram $out/bin/tailscaled --prefix PATH : ${ lib.makeBinPath [ iproute iptables ] diff --git a/third_party/nixpkgs/pkgs/servers/x11/xorg/default.nix b/third_party/nixpkgs/pkgs/servers/x11/xorg/default.nix index 81ce111eca..efc2cb2acb 100644 --- a/third_party/nixpkgs/pkgs/servers/x11/xorg/default.nix +++ b/third_party/nixpkgs/pkgs/servers/x11/xorg/default.nix @@ -2692,11 +2692,11 @@ lib.makeScope newScope (self: with self; { }) {}; xorgserver = callPackage ({ stdenv, pkgconfig, fetchurl, xorgproto, openssl, libX11, libXau, libXaw, libxcb, xcbutil, xcbutilwm, xcbutilimage, xcbutilkeysyms, xcbutilrenderutil, libXdmcp, libXfixes, libxkbfile, libXmu, libXpm, libXrender, libXres, libXt }: stdenv.mkDerivation { - name = "xorg-server-1.20.8"; + name = "xorg-server-1.20.9"; builder = ./builder.sh; src = fetchurl { - url = "mirror://xorg/individual/xserver/xorg-server-1.20.8.tar.bz2"; - sha256 = "0ih15m7gh1z1ly6z7g82bkni719yisqmbk61a1wgp82bxrmn8yyi"; + url = "mirror://xorg/individual/xserver/xorg-server-1.20.9.tar.bz2"; + sha256 = "0w9mrnffvjgmwi50kln15i8rpdskxv97r78l75wlcmg4vzhg46g2"; }; hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; diff --git a/third_party/nixpkgs/pkgs/servers/x11/xorg/overrides.nix b/third_party/nixpkgs/pkgs/servers/x11/xorg/overrides.nix index 018b44a663..80ea5553ad 100644 --- a/third_party/nixpkgs/pkgs/servers/x11/xorg/overrides.nix +++ b/third_party/nixpkgs/pkgs/servers/x11/xorg/overrides.nix @@ -642,6 +642,16 @@ self: super: propagatedBuildInputs = attrs.propagatedBuildInputs or [] ++ [ libpciaccess epoxy ] ++ commonPropagatedBuildInputs ++ lib.optionals stdenv.isLinux [ udev ]; + # patchPhase is not working, this is a hack but we can remove it in the next xorg-server release + preConfigure = let + # https://gitlab.freedesktop.org/xorg/xserver/-/issues/1067 + headerFix = fetchpatch { + url = "https://gitlab.freedesktop.org/xorg/xserver/-/commit/919f1f46fc67dae93b2b3f278fcbfc77af34ec58.patch"; + sha256 = "0w48rdpl01v0c97n9zdxhf929y76r1f6rqkfs9mfygkz3xcmrfsq"; + }; + in '' + patch -p1 < ${headerFix} + ''; prePatch = stdenv.lib.optionalString stdenv.hostPlatform.isMusl '' export CFLAGS+=" -D__uid_t=uid_t -D__gid_t=gid_t" ''; diff --git a/third_party/nixpkgs/pkgs/servers/x11/xorg/tarballs.list b/third_party/nixpkgs/pkgs/servers/x11/xorg/tarballs.list index ae75b13840..ecc477980b 100644 --- a/third_party/nixpkgs/pkgs/servers/x11/xorg/tarballs.list +++ b/third_party/nixpkgs/pkgs/servers/x11/xorg/tarballs.list @@ -218,4 +218,4 @@ mirror://xorg/individual/util/lndir-1.0.3.tar.bz2 mirror://xorg/individual/util/makedepend-1.0.6.tar.bz2 mirror://xorg/individual/util/util-macros-1.19.2.tar.bz2 mirror://xorg/individual/util/xorg-cf-files-1.0.6.tar.bz2 -mirror://xorg/individual/xserver/xorg-server-1.20.8.tar.bz2 +mirror://xorg/individual/xserver/xorg-server-1.20.9.tar.bz2 diff --git a/third_party/nixpkgs/pkgs/shells/nushell/default.nix b/third_party/nixpkgs/pkgs/shells/nushell/default.nix index c3e6c5b675..d025ed1ddc 100644 --- a/third_party/nixpkgs/pkgs/shells/nushell/default.nix +++ b/third_party/nixpkgs/pkgs/shells/nushell/default.nix @@ -36,11 +36,6 @@ rustPlatform.buildRustPackage rec { cargoBuildFlags = lib.optional withStableFeatures "--features stable"; - # Remove after https://github.com/NixOS/nixpkgs/pull/97000 lands into master - preConfigure = stdenv.lib.optionalString stdenv.isDarwin '' - unset SDKROOT - ''; - checkPhase = '' runHook preCheck echo "Running cargo test" diff --git a/third_party/nixpkgs/pkgs/shells/zsh/zsh-powerlevel10k/default.nix b/third_party/nixpkgs/pkgs/shells/zsh/zsh-powerlevel10k/default.nix index 5d81ceaba1..39cb1f247f 100644 --- a/third_party/nixpkgs/pkgs/shells/zsh/zsh-powerlevel10k/default.nix +++ b/third_party/nixpkgs/pkgs/shells/zsh/zsh-powerlevel10k/default.nix @@ -5,13 +5,13 @@ stdenv.mkDerivation rec { pname = "powerlevel10k"; - version = "1.12.0"; + version = "1.13.0"; src = fetchFromGitHub { owner = "romkatv"; repo = "powerlevel10k"; rev = "v${version}"; - sha256 = "08zg4in70h3kray6lazszzy26gvil9w2cr6xmkbgjsv3k6w3k0jg"; + sha256 = "0w5rv7z47nys3x113mdddpb2pf1d9pmz9myh4xjzrcy4hp4qv421"; }; patches = [ diff --git a/third_party/nixpkgs/pkgs/tools/X11/ckbcomp/default.nix b/third_party/nixpkgs/pkgs/tools/X11/ckbcomp/default.nix index 91e067e7be..7b41791be3 100644 --- a/third_party/nixpkgs/pkgs/tools/X11/ckbcomp/default.nix +++ b/third_party/nixpkgs/pkgs/tools/X11/ckbcomp/default.nix @@ -2,14 +2,14 @@ stdenv.mkDerivation rec { pname = "ckbcomp"; - version = "1.196"; + version = "1.197"; src = fetchFromGitLab { domain = "salsa.debian.org"; owner = "installer-team"; repo = "console-setup"; rev = version; - sha256 = "0c79rycgpna8910as6blw3z3sajzzakz4qlvr6js2yr8zq2d0ylg"; + sha256 = "0m2q30f94vd1wb2zqpiyplpgfchjlm8j41xiyxcqdjzdgqbs7l27"; }; buildInputs = [ perl ]; diff --git a/third_party/nixpkgs/pkgs/tools/X11/wpgtk/default.nix b/third_party/nixpkgs/pkgs/tools/X11/wpgtk/default.nix index 2aa0593599..84d1f379e8 100644 --- a/third_party/nixpkgs/pkgs/tools/X11/wpgtk/default.nix +++ b/third_party/nixpkgs/pkgs/tools/X11/wpgtk/default.nix @@ -3,13 +3,13 @@ python3Packages.buildPythonApplication rec { pname = "wpgtk"; - version = "6.1.0"; + version = "6.1.3"; src = fetchFromGitHub { owner = "deviantfero"; repo = "wpgtk"; rev = version; - sha256 = "06z6qbfd9l3acp3wm28rq4vx3m5cxi4lpxgzc2nxvxmiz8rnnmh1"; + sha256 = "1jv28ygsd6ifjb096w3pm50za6wi62y45ycbizwhv7x56lr6zx1v"; }; buildInputs = [ diff --git a/third_party/nixpkgs/pkgs/tools/admin/chamber/default.nix b/third_party/nixpkgs/pkgs/tools/admin/chamber/default.nix index fb21bda415..7a80ed3718 100644 --- a/third_party/nixpkgs/pkgs/tools/admin/chamber/default.nix +++ b/third_party/nixpkgs/pkgs/tools/admin/chamber/default.nix @@ -20,7 +20,7 @@ buildGoModule rec { meta = with lib; { description = - "Chamber is a tool for managing secrets by storing them in AWS SSM Parameter Store."; + "A tool for managing secrets by storing them in AWS SSM Parameter Store"; homepage = "https://github.com/segmentio/chamber"; license = licenses.mit; maintainers = with maintainers; [ kalekseev ]; diff --git a/third_party/nixpkgs/pkgs/tools/admin/google-cloud-sdk/default.nix b/third_party/nixpkgs/pkgs/tools/admin/google-cloud-sdk/default.nix index e13cb0842d..53cbaf1229 100644 --- a/third_party/nixpkgs/pkgs/tools/admin/google-cloud-sdk/default.nix +++ b/third_party/nixpkgs/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 = "0pvw0mbrx2i3v46lhjnka962gcl4ym0b9hp0xw56hpdd2abc58f6"; + sha256 = "1lkmilj873ia8kigyfmqfjnlpi7jzq3q4m0ip3lr0a111nr3wi4m"; }; x86_64-linux = { url = "${baseUrl}/${name}-linux-x86_64.tar.gz"; - sha256 = "0p5vbg5s3xsi3y7x4s3v3mxcw87x349h6bz6w7xgc141l4g08vh3"; + sha256 = "0q20vaqr9rrzcp57jrskcmbdvqrfpr4lscki85824fdlpklc00ga"; }; }.${system}; in stdenv.mkDerivation rec { pname = "google-cloud-sdk"; - version = "314.0.0"; + version = "315.0.0"; src = fetchurl (sources "${pname}-${version}" stdenv.hostPlatform.system); diff --git a/third_party/nixpkgs/pkgs/tools/admin/salt/default.nix b/third_party/nixpkgs/pkgs/tools/admin/salt/default.nix index 83b69b12fe..3796ec31d6 100644 --- a/third_party/nixpkgs/pkgs/tools/admin/salt/default.nix +++ b/third_party/nixpkgs/pkgs/tools/admin/salt/default.nix @@ -7,11 +7,11 @@ }: python3.pkgs.buildPythonApplication rec { pname = "salt"; - version = "3001.1"; + version = "3002"; src = python3.pkgs.fetchPypi { inherit pname version; - sha256 = "1g2sdcibir0zhldmngv1iyzlhh2adq9dqjc73grap3df5zcv9sz9"; + sha256 = "tiLJ3p/eVx25a/1lmhg76lU90m5xyshWWTh+k3IhquY="; }; propagatedBuildInputs = with python3.pkgs; [ @@ -40,8 +40,9 @@ python3.pkgs.buildPythonApplication rec { meta = with lib; { homepage = "https://saltstack.com/"; + changelog = "https://docs.saltstack.com/en/latest/topics/releases/${version}.html"; description = "Portable, distributed, remote execution and configuration management system"; - maintainers = with maintainers; [ aneeshusa ]; + maintainers = with maintainers; [ Flakebi ]; license = licenses.asl20; }; } diff --git a/third_party/nixpkgs/pkgs/tools/audio/mpd-mpris/default.nix b/third_party/nixpkgs/pkgs/tools/audio/mpd-mpris/default.nix index 79387d9ad1..c66a12dadd 100644 --- a/third_party/nixpkgs/pkgs/tools/audio/mpd-mpris/default.nix +++ b/third_party/nixpkgs/pkgs/tools/audio/mpd-mpris/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "mpd-mpris"; - version = "0.2.4"; + version = "0.3.0"; src = fetchFromGitHub { owner = "natsukagami"; repo = pname; rev = "v${version}"; - sha256 = "1cr5j2z2ynj1hwkjzi5amcg59vmgazsci41v6vpsj119g7psjmzm"; + sha256 = "1kzjbv04b2garb99l64wdq8yksnm4pbhkgyzh89j5j3gb9k55zal"; }; - vendorSha256 = "108yjymp64iqx1b2wqjbkmbm2w199wq46g7hrmqhcziv6f4aqljp"; + vendorSha256 = "1ggrqwd3h602rav1dc3amsf4wxsq8mdq4ijkdsg759sqhpzl6rqs"; doCheck = false; diff --git a/third_party/nixpkgs/pkgs/tools/backup/bacula/default.nix b/third_party/nixpkgs/pkgs/tools/backup/bacula/default.nix index 8bf253a7b1..faae85f3ec 100644 --- a/third_party/nixpkgs/pkgs/tools/backup/bacula/default.nix +++ b/third_party/nixpkgs/pkgs/tools/backup/bacula/default.nix @@ -1,4 +1,6 @@ -{ stdenv, fetchurl, sqlite, postgresql, zlib, acl, ncurses, openssl, readline }: +{ stdenv, fetchurl, sqlite, postgresql, zlib, acl, ncurses, openssl, readline +, CoreFoundation, IOKit +}: stdenv.mkDerivation rec { name = "bacula-9.6.5"; @@ -9,6 +11,10 @@ stdenv.mkDerivation rec { }; buildInputs = [ postgresql sqlite zlib ncurses openssl readline ] + ++ stdenv.lib.optionals stdenv.hostPlatform.isDarwin [ + CoreFoundation + IOKit + ] # acl relies on attr, which I can't get to build on darwin ++ stdenv.lib.optional (!stdenv.isDarwin) acl; diff --git a/third_party/nixpkgs/pkgs/tools/backup/bdsync/default.nix b/third_party/nixpkgs/pkgs/tools/backup/bdsync/default.nix index 53704ce39d..be2e9d0e6f 100644 --- a/third_party/nixpkgs/pkgs/tools/backup/bdsync/default.nix +++ b/third_party/nixpkgs/pkgs/tools/backup/bdsync/default.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { pname = "bdsync"; - version = "0.11.1"; + version = "0.11.2"; src = fetchFromGitHub { - owner = "TargetHolding"; + owner = "rolffokkens"; repo = pname; rev = "v${version}"; - sha256 = "11grdyc6fgw93jvj965awsycqw5qbzsdys7n8farqnmya8qv8gac"; + sha256 = "0kx422cp1bxr62i1mi7dzrpwmys1kdp865rcymdp4knb5rr5864k"; }; nativeBuildInputs = [ pandoc which ]; diff --git a/third_party/nixpkgs/pkgs/tools/backup/bup/default.nix b/third_party/nixpkgs/pkgs/tools/backup/bup/default.nix index ee6ae0a293..0765d8a08c 100644 --- a/third_party/nixpkgs/pkgs/tools/backup/bup/default.nix +++ b/third_party/nixpkgs/pkgs/tools/backup/bup/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchFromGitHub, makeWrapper -, perl, pandoc, python2Packages, git +, perl, pandoc, python3Packages, git , par2cmdline ? null, par2Support ? true }: @@ -22,7 +22,7 @@ stdenv.mkDerivation { buildInputs = [ git - (python2Packages.python.withPackages + (python3Packages.python.withPackages (p: with p; [ setuptools tornado ] ++ stdenv.lib.optionals (!stdenv.isDarwin) [ pyxattr pylibacl fuse ])) ]; diff --git a/third_party/nixpkgs/pkgs/tools/backup/dar/default.nix b/third_party/nixpkgs/pkgs/tools/backup/dar/default.nix index 1f379feece..8689bc9cd8 100644 --- a/third_party/nixpkgs/pkgs/tools/backup/dar/default.nix +++ b/third_party/nixpkgs/pkgs/tools/backup/dar/default.nix @@ -8,12 +8,12 @@ with stdenv.lib; stdenv.mkDerivation rec { - version = "2.6.10"; + version = "2.6.12"; pname = "dar"; src = fetchurl { url = "mirror://sourceforge/dar/${pname}-${version}.tar.gz"; - sha256 = "1ryj4xxar18hshg38j1ljhplypgmfprwqn72k1jwxi28qravg80n"; + sha256 = "0jwgaim2p93skdpjwiz5qgibd3j9965ycqn47wrrjlcvzk93mvyk"; }; outputs = [ "out" "dev" ]; diff --git a/third_party/nixpkgs/pkgs/tools/backup/kopia/default.nix b/third_party/nixpkgs/pkgs/tools/backup/kopia/default.nix index 056f523a2c..47d9dc1b37 100644 --- a/third_party/nixpkgs/pkgs/tools/backup/kopia/default.nix +++ b/third_party/nixpkgs/pkgs/tools/backup/kopia/default.nix @@ -27,6 +27,7 @@ buildGoModule rec { # make 'vendor' writable cp -L -r vendor tmp-vendor rm -rf vendor + chmod -R u+w tmp-vendor mv tmp-vendor vendor # speakeasy hardcodes /bin/stty https://github.com/bgentry/speakeasy/issues/22 diff --git a/third_party/nixpkgs/pkgs/tools/backup/zfs-replicate/default.nix b/third_party/nixpkgs/pkgs/tools/backup/zfs-replicate/default.nix index ff2f606255..782133fd8d 100644 --- a/third_party/nixpkgs/pkgs/tools/backup/zfs-replicate/default.nix +++ b/third_party/nixpkgs/pkgs/tools/backup/zfs-replicate/default.nix @@ -4,11 +4,11 @@ buildPythonApplication rec { pname = "zfs-replicate"; - version = "1.1.14"; + version = "1.2.3"; src = fetchPypi { inherit pname version; - sha256 = "0iqyk6q112ylcqrhrgvgbgqqvaikhwk0sb5kc7kg2wwqdc9rfwys"; + sha256 = "b2cb9d4670a6e12d14a446c10d857862e91af6e4526f607e08b41bde89953bb8"; }; checkInputs = [ diff --git a/third_party/nixpkgs/pkgs/tools/filesystems/mergerfs/default.nix b/third_party/nixpkgs/pkgs/tools/filesystems/mergerfs/default.nix index a7c9421f46..ba7d5456d8 100644 --- a/third_party/nixpkgs/pkgs/tools/filesystems/mergerfs/default.nix +++ b/third_party/nixpkgs/pkgs/tools/filesystems/mergerfs/default.nix @@ -2,25 +2,28 @@ stdenv.mkDerivation rec { pname = "mergerfs"; - version = "2.28.3"; + version = "2.31.0"; src = fetchFromGitHub { owner = "trapexit"; repo = pname; rev = version; - sha256 = "1w6p3svc2yknp6swqg8lax6n9b31lyplb3j7r8nv14hbq4hymylx"; + sha256 = "0j7nbxzv85as76glzk4cf7j6ggfihcjaihp06s0zcar4i7zaiy9z"; }; nativeBuildInputs = [ automake autoconf pkgconfig gettext libtool pandoc which ]; + prePatch = '' + sed -i -e '/chown/d' -e '/chmod/d' libfuse/Makefile + ''; buildInputs = [ attr libiconv ]; preConfigure = '' echo "${version}" > VERSION ''; - makeFlags = [ "PREFIX=${placeholder "out"}" "XATTR_AVAILABLE=1" ]; + makeFlags = [ "DESTDIR=${placeholder "out"}" "XATTR_AVAILABLE=1" "PREFIX=/" "SBINDIR=/bin" ]; enableParallelBuilding = true; postFixup = '' diff --git a/third_party/nixpkgs/pkgs/tools/graphics/dpic/default.nix b/third_party/nixpkgs/pkgs/tools/graphics/dpic/default.nix index 7b7eea3d50..ea65f3dbb5 100644 --- a/third_party/nixpkgs/pkgs/tools/graphics/dpic/default.nix +++ b/third_party/nixpkgs/pkgs/tools/graphics/dpic/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "dpic"; - version = "2020.06.01"; + version = "2020.09.15"; src = fetchurl { url = "https://ece.uwaterloo.ca/~aplevich/dpic/${pname}-${version}.tar.gz"; - sha256 = "1gbkpbjwjaaifxff8amm9b47dynq4l4698snjdgnn4flndw62q88"; + sha256 = "0gmmp4dlir3bn892nm55a3q8cfsj8yg7fp1dixmhsdhsrgmg1b83"; }; # The prefix passed to configure is not used. diff --git a/third_party/nixpkgs/pkgs/tools/graphics/pfstools/default.nix b/third_party/nixpkgs/pkgs/tools/graphics/pfstools/default.nix index 1c437a3f05..f570251374 100644 --- a/third_party/nixpkgs/pkgs/tools/graphics/pfstools/default.nix +++ b/third_party/nixpkgs/pkgs/tools/graphics/pfstools/default.nix @@ -1,9 +1,9 @@ -{ stdenv, fetchurl, cmake, pkgconfig, darwin +{ stdenv, mkDerivation, fetchurl, cmake, pkgconfig, darwin , openexr, zlib, imagemagick, libGLU, libGL, freeglut, fftwFloat -, fftw, gsl, libexif, perl, opencv2, qt5, netpbm +, fftw, gsl, libexif, perl, opencv2, qtbase, netpbm }: -stdenv.mkDerivation rec { +mkDerivation rec { pname = "pfstools"; version = "2.1.0"; @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake pkgconfig ]; buildInputs = [ openexr zlib imagemagick fftwFloat - fftw gsl libexif perl opencv2 qt5.qtbase netpbm + fftw gsl libexif perl opencv2 qtbase netpbm ] ++ (if stdenv.isDarwin then (with darwin.apple_sdk.frameworks; [ OpenGL GLUT ]) else [ diff --git a/third_party/nixpkgs/pkgs/tools/inputmethods/ibus-engines/ibus-hangul/default.nix b/third_party/nixpkgs/pkgs/tools/inputmethods/ibus-engines/ibus-hangul/default.nix index 978ac67558..f6ceece34e 100644 --- a/third_party/nixpkgs/pkgs/tools/inputmethods/ibus-engines/ibus-hangul/default.nix +++ b/third_party/nixpkgs/pkgs/tools/inputmethods/ibus-engines/ibus-hangul/default.nix @@ -13,11 +13,11 @@ stdenv.mkDerivation rec { pname = "ibus-hangul"; - version = "1.5.3"; + version = "1.5.4"; src = fetchurl { url = "https://github.com/choehwanjin/ibus-hangul/releases/download/${version}/${pname}-${version}.tar.gz"; - sha256 = "1400ba2p34vr9q285lqvjm73f6m677cgfdymmjpiwyrjgbbiqrjy"; + sha256 = "1q6g2pnrn5gqn9jqnm3975v9hh60hc5gn9x3zbrdjgy0n3wpxwm9"; }; patches = [ diff --git a/third_party/nixpkgs/pkgs/tools/misc/bandwidth/default.nix b/third_party/nixpkgs/pkgs/tools/misc/bandwidth/default.nix index 5de77aea0e..8cd926c5c2 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/bandwidth/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/bandwidth/default.nix @@ -11,11 +11,11 @@ let in stdenv.mkDerivation rec { pname = "bandwidth"; - version = "1.9.3"; + version = "1.9.4"; src = fetchurl { url = "https://zsmith.co/archives/${pname}-${version}.tar.gz"; - sha256 = "0zpv2qgkbak0llw47qcakhyh2z3zv4d69kasldmpdlpqryd9za84"; + sha256 = "0x798xj3vhiwq2hal0vmf92sq4h7yalp3i6ylqwhnnpv99m2zws4"; }; buildInputs = [ nasm ]; diff --git a/third_party/nixpkgs/pkgs/tools/misc/bat/default.nix b/third_party/nixpkgs/pkgs/tools/misc/bat/default.nix index e5b06521d7..b84ef63edc 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/bat/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/bat/default.nix @@ -26,11 +26,6 @@ rustPlatform.buildRustPackage rec { buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security libiconv ]; - # Remove after https://github.com/NixOS/nixpkgs/pull/97000 lands into master - preConfigure = stdenv.lib.optionalString stdenv.isDarwin '' - unset SDKROOT - ''; - postInstall = '' installManPage $releaseDir/build/bat-*/out/assets/manual/bat.1 installShellCompletion $releaseDir/build/bat-*/out/assets/completions/bat.{fish,zsh} diff --git a/third_party/nixpkgs/pkgs/tools/misc/bdf2psf/default.nix b/third_party/nixpkgs/pkgs/tools/misc/bdf2psf/default.nix index 966e71bb6d..2b3445ac6c 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/bdf2psf/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/bdf2psf/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "bdf2psf"; - version = "1.196"; + version = "1.197"; src = fetchurl { url = "mirror://debian/pool/main/c/console-setup/bdf2psf_${version}_all.deb"; - sha256 = "042ly91525q2qj7985qih4njhjk5ndz8jiz01v860jc38bvw595p"; + sha256 = "023zj08rk8pmvpr8zybxn2ibrl5qsarkn8rb908mxhhlwpp12f7n"; }; nativeBuildInputs = [ dpkg ]; diff --git a/third_party/nixpkgs/pkgs/tools/misc/bdf2sfd/default.nix b/third_party/nixpkgs/pkgs/tools/misc/bdf2sfd/default.nix index e7a9d98aaf..0961649904 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/bdf2sfd/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/bdf2sfd/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "bdf2sfd"; - version = "1.1.3"; + version = "1.1.4"; src = fetchFromGitHub { owner = "fcambus"; repo = pname; rev = version; - sha256 = "0v1kkds35qfyv1h5kxc2m7f2gsprg9c7jzpsm3p4f71qn982wry6"; + sha256 = "1lg3yabnf26lghlrmhpq7hbhydmw85q0k64246b8fwv1dnxc7afd"; }; nativeBuildInputs = [ cmake ]; diff --git a/third_party/nixpkgs/pkgs/tools/misc/birdfont/default.nix b/third_party/nixpkgs/pkgs/tools/misc/birdfont/default.nix index 7cec0cab99..c3361739f0 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/birdfont/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/birdfont/default.nix @@ -4,11 +4,11 @@ gobject-introspection, gsettings-desktop-schemas, wrapGAppsHook }: stdenv.mkDerivation rec { pname = "birdfont"; - version = "2.29.0"; + version = "2.29.1"; src = fetchurl { url = "https://birdfont.org/releases/${pname}-${version}.tar.xz"; - sha256 = "18z3qbrsbfpn00c4xq3ck1mnmvrnqgl9g1s7m4dgc1871fi6sv8w"; + sha256 = "0620bppcbm9pb8l0d4sc56gfwkr97gw4zjirjz5ikk5lj0m801yi"; }; nativeBuildInputs = [ python3 pkgconfig vala_0_44 gobject-introspection wrapGAppsHook ]; diff --git a/third_party/nixpkgs/pkgs/tools/misc/broot/default.nix b/third_party/nixpkgs/pkgs/tools/misc/broot/default.nix index fb0868016d..3027537dd8 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/broot/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/broot/default.nix @@ -5,7 +5,6 @@ , makeWrapper , coreutils , libiconv -, xcbuild , zlib , Security }: @@ -24,7 +23,6 @@ rustPlatform.buildRustPackage rec { nativeBuildInputs = [ makeWrapper installShellFiles - xcbuild # The cc crate attempts to run xcbuild. ]; buildInputs = stdenv.lib.optionals stdenv.isDarwin [ diff --git a/third_party/nixpkgs/pkgs/tools/misc/clex/default.nix b/third_party/nixpkgs/pkgs/tools/misc/clex/default.nix index 7a6a78af59..af21e971fe 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/clex/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/clex/default.nix @@ -2,10 +2,10 @@ stdenv.mkDerivation rec { pname = "clex"; - version = "4.6.patch9"; + version = "4.6.patch10"; src = fetchurl { - sha256 = "1qj5yp8k90wag5sb3zrm2pn90qqx3zbrgf2gqpqpdqmlgffnv1jc"; + sha256 = "03niihqk57px7rm2c84qira5jm5vw8lj5s58dximk0w5gsis4fhw"; url = "${meta.homepage}/download/${pname}-${version}.tar.gz"; }; diff --git a/third_party/nixpkgs/pkgs/tools/misc/debianutils/default.nix b/third_party/nixpkgs/pkgs/tools/misc/debianutils/default.nix index 141df33322..42deec9dc5 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/debianutils/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/debianutils/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "debianutils"; - version = "4.11.1"; + version = "4.11.2"; src = fetchurl { url = "mirror://debian/pool/main/d/${pname}/${pname}_${version}.tar.xz"; - sha256 = "0g4qmzb2ff0rqszzpsal465hcslnpdl4nhghv59qvhamkkqnks4b"; + sha256 = "1pjh2s5f8qp8jaky2x08yvf125np0s48zb2z6f3h6x4vf20hws1v"; }; meta = with stdenv.lib; { diff --git a/third_party/nixpkgs/pkgs/tools/misc/direnv/default.nix b/third_party/nixpkgs/pkgs/tools/misc/direnv/default.nix index e24d8611a4..f0c7aefc69 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/direnv/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/direnv/default.nix @@ -2,7 +2,7 @@ buildGoModule rec { pname = "direnv"; - version = "2.23.0"; + version = "2.23.1"; vendorSha256 = null; @@ -10,7 +10,7 @@ buildGoModule rec { owner = "direnv"; repo = "direnv"; rev = "v${version}"; - sha256 = "0m42mg4z04880dwl3iyppq2nda9v883jaxl8221d0xcpkjfm8hjm"; + sha256 = "02b27imda9pg65z5xw2q398p2281d5d46vgs3i9mrwcfsbpl5s6d"; }; # we have no bash at the moment for windows diff --git a/third_party/nixpkgs/pkgs/tools/misc/gammy/default.nix b/third_party/nixpkgs/pkgs/tools/misc/gammy/default.nix index a5da799502..2fd99fd4a3 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/gammy/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/gammy/default.nix @@ -2,7 +2,7 @@ let pname = "gammy"; - version = "0.9.58a"; + version = "0.9.59"; in stdenv.mkDerivation { @@ -12,7 +12,7 @@ stdenv.mkDerivation { owner = "Fushko"; repo = pname; rev = "v${version}"; - sha256 = "02kwfzh7h2dbsfb6b3qlsc7zga1hq21qvg45wf22vm03mahc28za"; + sha256 = "1iz41larqr6ss5kar1pds6zgcrch6ch34cr0ngd71gcaxal0rb72"; }; nativeBuildInputs = [ qmake wrapQtAppsHook ]; diff --git a/third_party/nixpkgs/pkgs/tools/misc/goaccess/default.nix b/third_party/nixpkgs/pkgs/tools/misc/goaccess/default.nix index 1906c9d566..d14ef9d526 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/goaccess/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/goaccess/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, ncurses, glib, libmaxminddb }: +{ stdenv, fetchurl, pkgconfig, ncurses, glib, libmaxminddb, fetchpatch }: stdenv.mkDerivation rec { version = "1.4"; @@ -9,6 +9,13 @@ stdenv.mkDerivation rec { sha256 = "1gkpjg39f3afdwm9128jqjsfap07p8s027czzlnxfmi5hpzvkyz8"; }; + patches = [ + (fetchpatch { + url = "https://github.com/allinurl/goaccess/commit/514618cdd69453497fbf67913ccb37a0a0b07391.patch"; + sha256 = "11lp7mabfl6ibgzsd9nw10k2xvcm0hrimrwidl06r8dqn2jzjxf6"; + }) + ]; + configureFlags = [ "--enable-geoip=mmdb" "--enable-utf8" diff --git a/third_party/nixpkgs/pkgs/tools/misc/hebcal/default.nix b/third_party/nixpkgs/pkgs/tools/misc/hebcal/default.nix index 96c9584844..049a79fa75 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/hebcal/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/hebcal/default.nix @@ -1,14 +1,14 @@ { stdenv, fetchFromGitHub, autoreconfHook }: stdenv.mkDerivation rec { - version = "4.21"; + version = "4.22"; pname = "hebcal"; src = fetchFromGitHub { owner = "hebcal"; repo = "hebcal"; rev = "v${version}"; - sha256 = "0gqjhl5i0hvnpvsg6cfc2z5ckrs66h3jlrdgim62azn3hh5bday2"; + sha256 = "0bm29n51qi9q4vx4qsz3l9l1wvpvsk138zixfl5f5yz4kngzbx24"; }; nativeBuildInputs = [ autoreconfHook ]; diff --git a/third_party/nixpkgs/pkgs/tools/misc/lsd/default.nix b/third_party/nixpkgs/pkgs/tools/misc/lsd/default.nix index db8c40b6ff..e38da51809 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/lsd/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/lsd/default.nix @@ -22,6 +22,10 @@ rustPlatform.buildRustPackage rec { installShellCompletion $releaseDir/build/lsd-*/out/{_lsd,lsd.{bash,fish}} ''; + checkFlags = stdenv.lib.optionals stdenv.isDarwin [ + "--skip meta::filetype::test::test_socket_type" + ]; + meta = with stdenv.lib; { homepage = "https://github.com/Peltoche/lsd"; description = "The next gen ls command"; diff --git a/third_party/nixpkgs/pkgs/tools/misc/miniserve/default.nix b/third_party/nixpkgs/pkgs/tools/misc/miniserve/default.nix index 71d20c015d..a0fe350a27 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/miniserve/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/miniserve/default.nix @@ -24,11 +24,6 @@ rustPlatform.buildRustPackage rec { nativeBuildInputs = [ pkg-config zlib ]; buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ]; - # Remove after https://github.com/NixOS/nixpkgs/pull/97000 lands into master - preConfigure = stdenv.lib.optionalString stdenv.isDarwin '' - unset SDKROOT - ''; - meta = with stdenv.lib; { description = "For when you really just want to serve some files over HTTP right now!"; homepage = "https://github.com/svenstaro/miniserve"; diff --git a/third_party/nixpkgs/pkgs/tools/misc/mongodb-compass/default.nix b/third_party/nixpkgs/pkgs/tools/misc/mongodb-compass/default.nix index ec6be6eba2..93fca738dc 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/mongodb-compass/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/mongodb-compass/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, dpkg , alsaLib, at-spi2-atk, at-spi2-core, atk, cairo, cups, curl, dbus, expat, fontconfig, freetype, glib -, gnome2, gnome3, libnotify, libsecret, libuuid, libxcb, nspr, nss, systemd, xorg, wrapGAppsHook }: +, gnome2, gdk-pixbuf, gtk3, pango, libnotify, libsecret, libuuid, libxcb, nspr, nss, systemd, xorg, wrapGAppsHook }: let version = "1.22.1"; @@ -19,9 +19,9 @@ let freetype glib gnome2.GConf - gnome2.gdk_pixbuf - gnome3.gtk - gnome2.pango + gdk-pixbuf + gtk3 + pango libnotify libsecret libuuid @@ -60,7 +60,7 @@ in stdenv.mkDerivation { inherit src; - buildInputs = [ dpkg wrapGAppsHook gnome3.gtk ]; + buildInputs = [ dpkg wrapGAppsHook gtk3 ]; dontUnpack = true; buildCommand = '' diff --git a/third_party/nixpkgs/pkgs/tools/misc/ostree/default.nix b/third_party/nixpkgs/pkgs/tools/misc/ostree/default.nix index fd1bfc7f8c..56262d8171 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/ostree/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/ostree/default.nix @@ -39,13 +39,13 @@ let ])); in stdenv.mkDerivation rec { pname = "ostree"; - version = "2020.5"; + version = "2020.7"; outputs = [ "out" "dev" "man" "installedTests" ]; src = fetchurl { url = "https://github.com/ostreedev/ostree/releases/download/v${version}/libostree-${version}.tar.xz"; - sha256 = "1k92177hjalbdpmg45ymwwrni68vh9rs5x9zvy5fzl9lng12fgpb"; + sha256 = "0clriq2ypz1fycd6mpjyrhzid44svzpzw0amnank593h69b216ax"; }; patches = [ diff --git a/third_party/nixpkgs/pkgs/tools/misc/parallel/default.nix b/third_party/nixpkgs/pkgs/tools/misc/parallel/default.nix index e99f2aa12d..2f3ca5afd5 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/parallel/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/parallel/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, stdenv, perl, makeWrapper, procps }: +{ fetchurl, stdenv, perl, makeWrapper, procps, coreutils }: stdenv.mkDerivation rec { name = "parallel-20200822"; @@ -8,6 +8,14 @@ stdenv.mkDerivation rec { sha256 = "02dy46g6f05p7s2qs8h6yg20p1zl3flxxf77n5jw74l3h1m24m4n"; }; + patches = [ + ./fix-max-line-length-allowed.diff + ]; + + postPatch = '' + substituteInPlace src/parallel --subst-var-by coreutils ${coreutils} + ''; + outputs = [ "out" "man" ]; nativeBuildInputs = [ makeWrapper ]; diff --git a/third_party/nixpkgs/pkgs/tools/misc/parallel/fix-max-line-length-allowed.diff b/third_party/nixpkgs/pkgs/tools/misc/parallel/fix-max-line-length-allowed.diff new file mode 100644 index 0000000000..c6d501ecb2 --- /dev/null +++ b/third_party/nixpkgs/pkgs/tools/misc/parallel/fix-max-line-length-allowed.diff @@ -0,0 +1,17 @@ +Correct path to coreutils echo to fix parallel --max-line-length-allowed. + +Author: Bjørn Forsman + +diff --git a/src/parallel b/src/parallel +index a047fd94..9fc5f671 100755 +--- a/src/parallel ++++ b/src/parallel +@@ -11580,7 +11580,7 @@ sub is_acceptable_command_line_length($$) { + $len += length $Global::parallel_env; + } + # Force using non-built-in command +- ::qqx("/bin/echo ".${string}x(($len-length "/bin/echo ")/length $string)); ++ ::qqx("@coreutils@/bin/echo ".${string}x(($len-length "@coreutils@/bin/echo ")/length $string)); + ::debug("init", "$len=$? "); + return not $?; + } diff --git a/third_party/nixpkgs/pkgs/tools/misc/pdd/default.nix b/third_party/nixpkgs/pkgs/tools/misc/pdd/default.nix index f94d2cc273..37f9e2f4ce 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/pdd/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/pdd/default.nix @@ -2,13 +2,13 @@ buildPythonApplication rec { pname = "pdd"; - version = "1.4"; + version = "1.5"; src = fetchFromGitHub { owner = "jarun"; repo = "pdd"; rev = "v${version}"; - sha256 = "1cirb8mmxxadks7az6a3a4sp8djv45cwa9dx0zrarzfmw0x7xb9g"; + sha256 = "1ivzcbm888aibiihw03idp38qbl8mywj1lc1x0q787v0pzqfb4ss"; }; format = "other"; diff --git a/third_party/nixpkgs/pkgs/tools/misc/radeon-profile/default.nix b/third_party/nixpkgs/pkgs/tools/misc/radeon-profile/default.nix index 852c46b6d0..acadda5c54 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/radeon-profile/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/radeon-profile/default.nix @@ -5,7 +5,7 @@ mkDerivation rec { pname = "radeon-profile"; - version = "20190903"; + version = "20200824"; nativeBuildInputs = [ qmake ]; buildInputs = [ qtbase qtcharts libXrandr libdrm ]; @@ -14,7 +14,7 @@ mkDerivation rec { owner = "marazmista"; repo = "radeon-profile"; rev = version; - sha256 = "0ax5417q03xjwi3pn7yyjdb90ssaygdprfgb1pz9nkyk6773ckx5"; + sha256 = "0z6a9w79s5wiy8cvwcdp5wmgf6702d0wzw95f6176yhp4cwy4cq2"; }) + "/radeon-profile"; preConfigure = '' diff --git a/third_party/nixpkgs/pkgs/tools/misc/rpcsvc-proto/default.nix b/third_party/nixpkgs/pkgs/tools/misc/rpcsvc-proto/default.nix index 6406b6b20e..1288517208 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/rpcsvc-proto/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/rpcsvc-proto/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, autoreconfHook }: +{ stdenv, lib, fetchFromGitHub, autoreconfHook, buildPackages }: stdenv.mkDerivation rec { pname = "rpcsvc-proto"; @@ -13,8 +13,14 @@ stdenv.mkDerivation rec { outputs = [ "out" "man" ]; + depsBuildBuild = [ buildPackages.stdenv.cc ]; nativeBuildInputs = [ autoreconfHook ]; + postPatch = lib.optionalString (stdenv.hostPlatform != stdenv.buildPlatform) '' + substituteInPlace rpcsvc/Makefile.am \ + --replace '$(top_builddir)/rpcgen/rpcgen' '${buildPackages.rpcsvc-proto}/bin/rpcgen' + ''; + meta = with stdenv.lib; { homepage = "https://github.com/thkukuk/rpcsvc-proto"; description = "This package contains rpcsvc proto.x files from glibc, which are missing in libtirpc"; diff --git a/third_party/nixpkgs/pkgs/tools/misc/skim/default.nix b/third_party/nixpkgs/pkgs/tools/misc/skim/default.nix index e89cf36613..1c8dc40de1 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/skim/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/skim/default.nix @@ -1,19 +1,17 @@ -{ stdenv, fetchFromGitHub, rustPlatform }: +{ stdenv, fetchCrate, rustPlatform }: rustPlatform.buildRustPackage rec { pname = "skim"; - version = "0.8.2"; + version = "0.9.1"; - src = fetchFromGitHub { - owner = "lotabout"; - repo = pname; - rev = "v${version}"; - sha256 = "0paxrf03rqzahbpr4gnsj62vl09vcxvw248n9wzhjq14dqlwcr9w"; + src = fetchCrate { + inherit pname version; + sha256 = "1r8zf56kb9rhh8nlh8w684srr8jfhndf8742x8byw374my9xn8pb"; }; outputs = [ "out" "vim" ]; - cargoSha256 = "0rxxdad60fpwkb4wx5407ihd89wqpf2ldcnp7nsx17xh4brp1l9r"; + cargoSha256 = "0wjlkyngrc03a92fwmavgj90h0kakww38bfc1wapn2my7p3b6nc1"; postPatch = '' sed -i -e "s|expand(':h:h')|'$out'|" plugin/skim.vim diff --git a/third_party/nixpkgs/pkgs/tools/misc/slurp/default.nix b/third_party/nixpkgs/pkgs/tools/misc/slurp/default.nix index dbec232467..bdbea7367b 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/slurp/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/slurp/default.nix @@ -1,27 +1,28 @@ -{ stdenv, fetchFromGitHub, meson, ninja, pkgconfig -, cairo, wayland, wayland-protocols +{ stdenv, fetchFromGitHub, meson, ninja, pkg-config +, cairo, libxkbcommon, wayland, wayland-protocols , buildDocs ? true, scdoc }: stdenv.mkDerivation rec { pname = "slurp"; - version = "1.2.0"; + version = "1.3.0"; src = fetchFromGitHub { owner = "emersion"; repo = "slurp"; rev = "v${version}"; - sha256 = "0580m6kaiilgsrcj608r837r37sl6a25y7w21p7d6ij20fs3gvg1"; + sha256 = "191yjn909dax8z66ks58wjadrycpbwryirkfjcy99dhq7dijg9fh"; }; nativeBuildInputs = [ meson ninja - pkgconfig + pkg-config ] ++ stdenv.lib.optional buildDocs scdoc; buildInputs = [ cairo + libxkbcommon wayland wayland-protocols ]; diff --git a/third_party/nixpkgs/pkgs/tools/misc/somafm-cli/default.nix b/third_party/nixpkgs/pkgs/tools/misc/somafm-cli/default.nix index 312b402ae6..3ce3f62a9e 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/somafm-cli/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/somafm-cli/default.nix @@ -28,6 +28,7 @@ stdenv.mkDerivation rec { description = "Listen to SomaFM in your terminal via pure bash"; homepage = "https://github.com/rockymadden/somafm-cli"; license = licenses.mit; + platforms = platforms.all; maintainers = with maintainers; [ SuperSandro2000 ]; }; } diff --git a/third_party/nixpkgs/pkgs/tools/misc/sweep-visualizer/default.nix b/third_party/nixpkgs/pkgs/tools/misc/sweep-visualizer/default.nix index 21e6f49df1..fdd3c5f628 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/sweep-visualizer/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/sweep-visualizer/default.nix @@ -1,6 +1,6 @@ { stdenv, lib, makeWrapper, fetchurl, alsaLib, atk, cairo, cups, dbus, expat, fontconfig, freetype, gdk-pixbuf, glib, - gnome2, gtk2-x11, nspr, nss, + gnome2, pango, gtk2-x11, nspr, nss, libX11, libxcb, libXcomposite, libXcursor, libXdamage, libXext, libXfixes, libXi, libXrandr, libXrender, libXScrnSaver, libXtst, libudev0-shim @@ -33,7 +33,7 @@ preFixup = let libPath = lib.makeLibraryPath [ alsaLib atk cairo cups.lib dbus.lib expat fontconfig.lib freetype - gdk-pixbuf glib gnome2.GConf gnome2.pango gtk2-x11 nspr nss stdenv.cc.cc.lib + gdk-pixbuf glib gnome2.GConf pango gtk2-x11 nspr nss stdenv.cc.cc.lib libX11 libxcb libXcomposite libXcursor libXdamage libXext libXfixes libXi libXrandr libXrender libXScrnSaver libXtst ]; diff --git a/third_party/nixpkgs/pkgs/tools/misc/vivid/default.nix b/third_party/nixpkgs/pkgs/tools/misc/vivid/default.nix index 7074628798..35a1d5d2d1 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/vivid/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/vivid/default.nix @@ -13,11 +13,6 @@ rustPlatform.buildRustPackage rec { cargoSha256 = "10xddr5cccc5cmhn4kwi27h3krmgapd7bqcp4rhjlbhdhsw7qxkx"; - # Remove after https://github.com/NixOS/nixpkgs/pull/97000 lands into master - preConfigure = stdenv.lib.optionalString stdenv.isDarwin '' - unset SDKROOT - ''; - meta = with stdenv.lib; { description = "A generator for LS_COLORS with support for multiple color themes"; homepage = "https://github.com/sharkdp/vivid"; diff --git a/third_party/nixpkgs/pkgs/tools/misc/zsh-autoenv/default.nix b/third_party/nixpkgs/pkgs/tools/misc/zsh-autoenv/default.nix index c44837b877..f4295443f6 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/zsh-autoenv/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/zsh-autoenv/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation { cat <