diff --git a/third_party/nixpkgs/.github/labeler.yml b/third_party/nixpkgs/.github/labeler.yml
index 0db6fd7832..77422234ab 100644
--- a/third_party/nixpkgs/.github/labeler.yml
+++ b/third_party/nixpkgs/.github/labeler.yml
@@ -53,6 +53,7 @@
"6.topic: kernel":
- pkgs/build-support/kernel/**/*
+ - pkgs/os-specific/linux/kernel/**/*
"6.topic: lua":
- pkgs/development/interpreters/lua-5/**/*
diff --git a/third_party/nixpkgs/.github/workflows/editorconfig.yml b/third_party/nixpkgs/.github/workflows/editorconfig.yml
index 270728a61c..c20ed3ab76 100644
--- a/third_party/nixpkgs/.github/workflows/editorconfig.yml
+++ b/third_party/nixpkgs/.github/workflows/editorconfig.yml
@@ -25,7 +25,7 @@ jobs:
- name: Fetch editorconfig-checker
if: env.PR_DIFF
env:
- ECC_VERSION: "2.3.1"
+ ECC_VERSION: "2.3.5"
ECC_URL: "https://github.com/editorconfig-checker/editorconfig-checker/releases/download"
run: |
curl -sSf -O -L -C - "$ECC_URL/$ECC_VERSION/ec-linux-amd64.tar.gz" && \
diff --git a/third_party/nixpkgs/doc/builders/images/dockertools.section.md b/third_party/nixpkgs/doc/builders/images/dockertools.section.md
index 40d4dba1b8..23662f9bbf 100644
--- a/third_party/nixpkgs/doc/builders/images/dockertools.section.md
+++ b/third_party/nixpkgs/doc/builders/images/dockertools.section.md
@@ -111,6 +111,12 @@ Create a Docker image with many of the store paths being on their own layer to i
*Default:* the output path's hash
+`fromImage` _optional_
+
+: The repository tarball containing the base image. It must be a valid Docker image, such as one exported by `docker save`.
+
+ *Default:* `null`, which can be seen as equivalent to `FROM scratch` of a `Dockerfile`.
+
`contents` _optional_
: Top level paths in the container. Either a single derivation, or a list of derivations.
diff --git a/third_party/nixpkgs/doc/builders/packages/fuse.section.md b/third_party/nixpkgs/doc/builders/packages/fuse.section.md
new file mode 100644
index 0000000000..5603481115
--- /dev/null
+++ b/third_party/nixpkgs/doc/builders/packages/fuse.section.md
@@ -0,0 +1,19 @@
+# FUSE {#sec-fuse}
+
+Some packages rely on
+[FUSE](https://www.kernel.org/doc/html/latest/filesystems/fuse.html) to provide
+support for additional filesystems not supported by the kernel.
+
+In general, FUSE software are primarily developed for Linux but many of them can
+also run on macOS. Nixpkgs supports FUSE packages on macOS, but it requires
+[macFUSE](https://osxfuse.github.io) to be installed outside of Nix. macFUSE
+currently isn't packaged in Nixpkgs mainly because it includes a kernel
+extension, which isn't supported by Nix outside of NixOS.
+
+If a package fails to run on macOS with an error message similar to the
+following, it's a likely sign that you need to have macFUSE installed.
+
+ dyld: Library not loaded: /usr/local/lib/libfuse.2.dylib
+ Referenced from: /nix/store/w8bi72bssv0bnxhwfw3xr1mvn7myf37x-sshfs-fuse-2.10/bin/sshfs
+ Reason: image not found
+ [1] 92299 abort /nix/store/w8bi72bssv0bnxhwfw3xr1mvn7myf37x-sshfs-fuse-2.10/bin/sshfs
diff --git a/third_party/nixpkgs/doc/builders/packages/index.xml b/third_party/nixpkgs/doc/builders/packages/index.xml
index e1e2fef3f1..9653bae472 100644
--- a/third_party/nixpkgs/doc/builders/packages/index.xml
+++ b/third_party/nixpkgs/doc/builders/packages/index.xml
@@ -12,6 +12,7 @@
+
diff --git a/third_party/nixpkgs/doc/languages-frameworks/python.section.md b/third_party/nixpkgs/doc/languages-frameworks/python.section.md
index 26458c3906..f6d87b14be 100644
--- a/third_party/nixpkgs/doc/languages-frameworks/python.section.md
+++ b/third_party/nixpkgs/doc/languages-frameworks/python.section.md
@@ -638,7 +638,7 @@ are disabled.
#### Using pythonImportsCheck
-Although unit tests are highly prefered to valid correctness of a package. Not
+Although unit tests are highly prefered to validate correctness of a package, not
all packages have test suites that can be ran easily, and some have none at all.
To help ensure the package still works, `pythonImportsCheck` can attempt to import
the listed modules.
@@ -1487,11 +1487,12 @@ If you need to change a package's attribute(s) from `configuration.nix` you coul
nixpkgs.config.packageOverrides = super: {
python = super.python.override {
packageOverrides = python-self: python-super: {
- zerobin = python-super.zerobin.overrideAttrs (oldAttrs: {
- src = super.fetchgit {
- url = "https://github.com/sametmax/0bin";
- rev = "a344dbb18fe7a855d0742b9a1cede7ce423b34ec";
- sha256 = "16d769kmnrpbdr0ph0whyf4yff5df6zi4kmwx7sz1d3r6c8p6xji";
+ twisted = python-super.twisted.overrideAttrs (oldAttrs: {
+ src = super.fetchPipy {
+ pname = "twisted";
+ version = "19.10.0";
+ sha256 = "7394ba7f272ae722a74f3d969dcf599bc4ef093bc392038748a490f1724a515d";
+ extension = "tar.bz2";
};
});
};
@@ -1499,9 +1500,11 @@ If you need to change a package's attribute(s) from `configuration.nix` you coul
};
```
-`pythonPackages.zerobin` is now globally overridden. All packages and also the
-`zerobin` NixOS service use the new definition. Note that `python-super` refers
-to the old package set and `python-self` to the new, overridden version.
+`pythonPackages.twisted` is now globally overridden.
+All packages and also all NixOS services that reference `twisted`
+(such as `services.buildbot-worker`) now use the new definition.
+Note that `python-super` refers to the old package set and `python-self`
+to the new, overridden version.
To modify only a Python package set instead of a whole Python derivation, use
this snippet:
@@ -1509,7 +1512,7 @@ this snippet:
```nix
myPythonPackages = pythonPackages.override {
overrides = self: super: {
- zerobin = ...;
+ twisted = ...;
};
}
```
@@ -1522,11 +1525,12 @@ Use the following overlay template:
self: super: {
python = super.python.override {
packageOverrides = python-self: python-super: {
- zerobin = python-super.zerobin.overrideAttrs (oldAttrs: {
- src = super.fetchgit {
- url = "https://github.com/sametmax/0bin";
- rev = "a344dbb18fe7a855d0742b9a1cede7ce423b34ec";
- sha256 = "16d769kmnrpbdr0ph0whyf4yff5df6zi4kmwx7sz1d3r6c8p6xji";
+ twisted = python-super.twisted.overrideAttrs (oldAttrs: {
+ src = super.fetchPypi {
+ pname = "twisted";
+ version = "19.10.0";
+ sha256 = "7394ba7f272ae722a74f3d969dcf599bc4ef093bc392038748a490f1724a515d";
+ extension = "tar.bz2";
};
});
};
@@ -1551,13 +1555,11 @@ In a `setup.py` or `setup.cfg` it is common to declare dependencies:
### Contributing guidelines
-Following rules are desired to be respected:
+The following rules are desired to be respected:
* Python libraries are called from `python-packages.nix` and packaged with
`buildPythonPackage`. The expression of a library should be in
`pkgs/development/python-modules//default.nix`.
-* Libraries in `pkgs/top-level/python-packages.nix` are sorted
- alphanumerically to avoid merge conflicts and ease locating attributes.
* Python applications live outside of `python-packages.nix` and are packaged
with `buildPythonApplication`.
* Make sure libraries build for all Python interpreters.
@@ -1567,8 +1569,11 @@ Following rules are desired to be respected:
case, when you disable tests, leave a comment explaining why.
* Commit names of Python libraries should reflect that they are Python
libraries, so write for example `pythonPackages.numpy: 1.11 -> 1.12`.
-* Attribute names in `python-packages.nix` should be normalized according to
- [PEP 0503](https://www.python.org/dev/peps/pep-0503/#normalized-names). This
- means that characters should be converted to lowercase and `.` and `_` should
- be replaced by a single `-` (foo-bar-baz instead of Foo__Bar.baz )
-* Attribute names in `python-packages.nix` should be sorted alphanumerically.
+* Attribute names in `python-packages.nix` as well as `pname`s should match the
+ library's name on PyPI, but be normalized according to [PEP
+ 0503](https://www.python.org/dev/peps/pep-0503/#normalized-names). This means
+ that characters should be converted to lowercase and `.` and `_` should be
+ replaced by a single `-` (foo-bar-baz instead of Foo__Bar.baz).
+ If necessary, `pname` has to be given a different value within `fetchPypi`.
+* Attribute names in `python-packages.nix` should be sorted alphanumerically to
+ avoid merge conflicts and ease locating attributes.
diff --git a/third_party/nixpkgs/lib/modules.nix b/third_party/nixpkgs/lib/modules.nix
index 33a0d84a6d..d3f10944e7 100644
--- a/third_party/nixpkgs/lib/modules.nix
+++ b/third_party/nixpkgs/lib/modules.nix
@@ -361,6 +361,17 @@ rec {
*/
byName = attr: f: modules:
foldl' (acc: module:
+ if !(builtins.isAttrs module.${attr}) then
+ throw ''
+ You're trying to declare a value of type `${builtins.typeOf module.${attr}}'
+ rather than an attribute-set for the option
+ `${builtins.concatStringsSep "." prefix}'!
+
+ This usually happens if `${builtins.concatStringsSep "." prefix}' has option
+ definitions inside that are not matched. Please check how to properly define
+ this option by e.g. referring to `man 5 configuration.nix'!
+ ''
+ else
acc // (mapAttrs (n: v:
(acc.${n} or []) ++ f module v
) module.${attr}
diff --git a/third_party/nixpkgs/lib/sources.nix b/third_party/nixpkgs/lib/sources.nix
index 1a3afcae67..1a821f5505 100644
--- a/third_party/nixpkgs/lib/sources.nix
+++ b/third_party/nixpkgs/lib/sources.nix
@@ -138,12 +138,13 @@ rec {
in if m == null
then throw ("File contains no gitdir reference: " + path)
else
- let gitDir = absolutePath (dirOf path) (lib.head m);
- commonDir' = if pathIsRegularFile "${gitDir}/commondir"
- then lib.fileContents "${gitDir}/commondir"
- else gitDir;
- commonDir = absolutePath gitDir commonDir';
- refFile = lib.removePrefix "${commonDir}/" "${gitDir}/${file}";
+ let gitDir = absolutePath (dirOf path) (lib.head m);
+ commonDir'' = if pathIsRegularFile "${gitDir}/commondir"
+ then lib.fileContents "${gitDir}/commondir"
+ else gitDir;
+ commonDir' = lib.removeSuffix "/" commonDir'';
+ commonDir = absolutePath gitDir commonDir';
+ refFile = lib.removePrefix "${commonDir}/" "${gitDir}/${file}";
in readCommitFromFile refFile commonDir
else if pathIsRegularFile fileName
diff --git a/third_party/nixpkgs/lib/tests/modules.sh b/third_party/nixpkgs/lib/tests/modules.sh
index f843d303e4..2eddeec07b 100755
--- a/third_party/nixpkgs/lib/tests/modules.sh
+++ b/third_party/nixpkgs/lib/tests/modules.sh
@@ -169,7 +169,7 @@ checkConfigOutput "foo" config.submodule.foo ./declare-submoduleWith-special.nix
## shorthandOnlyDefines config behaves as expected
checkConfigOutput "true" config.submodule.config ./declare-submoduleWith-shorthand.nix ./define-submoduleWith-shorthand.nix
checkConfigError 'is not of type `boolean' config.submodule.config ./declare-submoduleWith-shorthand.nix ./define-submoduleWith-noshorthand.nix
-checkConfigError 'value is a boolean while a set was expected' config.submodule.config ./declare-submoduleWith-noshorthand.nix ./define-submoduleWith-shorthand.nix
+checkConfigError "You're trying to declare a value of type \`bool'\nrather than an attribute-set for the option" config.submodule.config ./declare-submoduleWith-noshorthand.nix ./define-submoduleWith-shorthand.nix
checkConfigOutput "true" config.submodule.config ./declare-submoduleWith-noshorthand.nix ./define-submoduleWith-noshorthand.nix
## submoduleWith should merge all modules in one swoop
diff --git a/third_party/nixpkgs/maintainers/maintainer-list.nix b/third_party/nixpkgs/maintainers/maintainer-list.nix
index 54c7d5e9e5..fc41ce36bc 100644
--- a/third_party/nixpkgs/maintainers/maintainer-list.nix
+++ b/third_party/nixpkgs/maintainers/maintainer-list.nix
@@ -1036,6 +1036,16 @@
githubId = 75235;
name = "Michael Walker";
};
+ bartuka = {
+ email = "wand@hey.com";
+ github = "wandersoncferreira";
+ githubId = 17708295;
+ name = "Wanderson Ferreira";
+ keys = [{
+ longkeyid = "rsa4096/0x56840A614DBE37AE";
+ fingerprint = "A3E1 C409 B705 50B3 BF41 492B 5684 0A61 4DBE 37AE";
+ }];
+ };
basvandijk = {
email = "v.dijk.bas@gmail.com";
github = "basvandijk";
@@ -2942,7 +2952,7 @@
name = "Adam Copp";
};
ethancedwards8 = {
- email = "ethancarteredwards@gmail.com";
+ email = "ethan@ethancedwards.com";
github = "ethancedwards8";
githubId = 60861925;
name = "Ethan Carter Edwards";
@@ -6905,6 +6915,12 @@
githubId = 16385648;
name = "Niko Pavlinek";
};
+ nixinator = {
+ email = "33lockdown33@protonmail.com";
+ github = "nixinator";
+ githubId = 66913205;
+ name = "Rick Sanchez";
+ };
nixy = {
email = "nixy@nixy.moe";
github = "nixy";
@@ -7609,6 +7625,12 @@
fingerprint = "2CD2 B030 BD22 32EF DF5A 008A 3618 20A4 5DB4 1E9A";
}];
};
+ polendri = {
+ email = "paul@ijj.li";
+ github = "polendri";
+ githubId = 1829032;
+ name = "Paul Hendry";
+ };
polyrod = {
email = "dc1mdp@gmail.com";
github = "polyrod";
@@ -7717,12 +7739,6 @@
githubId = 33375;
name = "Peter Sanford";
};
- pshendry = {
- email = "paul@pshendry.com";
- github = "pshendry";
- githubId = 1829032;
- name = "Paul Hendry";
- };
psibi = {
email = "sibi@psibi.in";
github = "psibi";
@@ -8267,6 +8283,12 @@
fingerprint = "1401 1B63 393D 16C1 AA9C C521 8526 B757 4A53 6236";
}];
};
+ rowanG077 = {
+ email = "goemansrowan@gmail.com";
+ github = "rowanG077";
+ githubId = 7439756;
+ name = "Rowan Goemans";
+ };
royneary = {
email = "christian@ulrich.earth";
github = "royneary";
@@ -8315,6 +8337,12 @@
githubId = 4958190;
name = "Rushmore Mushambi";
};
+ russell = {
+ email = "russell.sim@gmail.com";
+ github = "russell";
+ githubId = 2660;
+ name = "Russell Sim";
+ };
ruuda = {
email = "dev+nix@veniogames.com";
github = "ruuda";
@@ -10186,6 +10214,12 @@
email = "vq@erq.se";
name = "Daniel Nilsson";
};
+ vrinek = {
+ email = "vrinek@hey.com";
+ github = "vrinek";
+ name = "Kostas Karachalios";
+ githubId = 81346;
+ };
vrthra = {
email = "rahul@gopinath.org";
github = "vrthra";
@@ -10412,6 +10446,12 @@
githubId = 36407913;
name = "Uli Baum";
};
+ xfnw = {
+ email = "xfnw+nixos@riseup.net";
+ github = "xfnw";
+ githubId = 66233223;
+ name = "Owen";
+ };
xfix = {
email = "konrad@borowski.pw";
github = "xfix";
@@ -10800,6 +10840,12 @@
githubId = 3674056;
name = "Asad Saeeduddin";
};
+ matthewcroughan = {
+ email = "matt@croughan.sh";
+ github = "matthewcroughan";
+ githubId = 26458780;
+ name = "Matthew Croughan";
+ };
ngerstle = {
name = "Nicholas Gerstle";
email = "ngerstle@gmail.com";
diff --git a/third_party/nixpkgs/maintainers/scripts/pluginupdate.py b/third_party/nixpkgs/maintainers/scripts/pluginupdate.py
index 9ac1ccffb7..00a205313b 100644
--- a/third_party/nixpkgs/maintainers/scripts/pluginupdate.py
+++ b/third_party/nixpkgs/maintainers/scripts/pluginupdate.py
@@ -416,6 +416,7 @@ def rewrite_input(
}
with open(deprecated, "w") as f:
json.dump(deprecations, f, indent=4, sort_keys=True)
+ f.write("\n")
lines = sorted(lines, key=str.casefold)
diff --git a/third_party/nixpkgs/nixos/doc/manual/Makefile b/third_party/nixpkgs/nixos/doc/manual/Makefile
index b86a760057..b2b6481b20 100644
--- a/third_party/nixpkgs/nixos/doc/manual/Makefile
+++ b/third_party/nixpkgs/nixos/doc/manual/Makefile
@@ -1,5 +1,5 @@
.PHONY: all
-all: manual-combined.xml format
+all: manual-combined.xml
.PHONY: debug
debug: generated manual-combined.xml
diff --git a/third_party/nixpkgs/nixos/doc/manual/development/writing-documentation.xml b/third_party/nixpkgs/nixos/doc/manual/development/writing-documentation.xml
index 32e00544ce..89fab66656 100644
--- a/third_party/nixpkgs/nixos/doc/manual/development/writing-documentation.xml
+++ b/third_party/nixpkgs/nixos/doc/manual/development/writing-documentation.xml
@@ -25,7 +25,8 @@
$ cd /path/to/nixpkgs/nixos/doc/manual
-$ make
+$ nix-shell
+nix-shell$ make
diff --git a/third_party/nixpkgs/nixos/doc/manual/release-notes/rl-2105.xml b/third_party/nixpkgs/nixos/doc/manual/release-notes/rl-2105.xml
index 218bb3ae30..b7947293c0 100644
--- a/third_party/nixpkgs/nixos/doc/manual/release-notes/rl-2105.xml
+++ b/third_party/nixpkgs/nixos/doc/manual/release-notes/rl-2105.xml
@@ -720,8 +720,8 @@ environment.systemPackages = [
- Aditionally to the much stricter runtime environmet the
- /dev/urandom mount lines we previously had in the code (that would
+ Additionally to the much stricter runtime environment the
+ /dev/urandom mount lines we previously had in the code (that
randomly failed during the stop-phase) have been removed as systemd will take care of those for us.
@@ -809,7 +809,7 @@ environment.systemPackages = [
Platforms, like stdenv.hostPlatform, no longer have a platform attribute.
- It has been (mostly) flattoned away:
+ It has been (mostly) flattened away:
platform.gcc is now gcc
diff --git a/third_party/nixpkgs/nixos/maintainers/scripts/gce/create-gce.sh b/third_party/nixpkgs/nixos/maintainers/scripts/gce/create-gce.sh
index 77cc64e591..0eec4d0411 100755
--- a/third_party/nixpkgs/nixos/maintainers/scripts/gce/create-gce.sh
+++ b/third_party/nixpkgs/nixos/maintainers/scripts/gce/create-gce.sh
@@ -17,7 +17,19 @@ nix-build '' \
img_path=$(echo gce/*.tar.gz)
img_name=${IMAGE_NAME:-$(basename "$img_path")}
img_id=$(echo "$img_name" | sed 's|.raw.tar.gz$||;s|\.|-|g;s|_|-|g')
+img_family=$(echo "$img_id" | cut -d - -f1-4)
+
if ! gsutil ls "gs://${BUCKET_NAME}/$img_name"; then
gsutil cp "$img_path" "gs://${BUCKET_NAME}/$img_name"
gsutil acl ch -u AllUsers:R "gs://${BUCKET_NAME}/$img_name"
+
+ gcloud compute images create \
+ "$img_id" \
+ --source-uri "gs://${BUCKET_NAME}/$img_name" \
+ --family="$img_family"
+
+ gcloud compute images add-iam-policy-binding \
+ "$img_id" \
+ --member='allAuthenticatedUsers' \
+ --role='roles/compute.imageUser'
fi
diff --git a/third_party/nixpkgs/nixos/modules/misc/ids.nix b/third_party/nixpkgs/nixos/modules/misc/ids.nix
index a0f5ce72f3..1fd56adfe1 100644
--- a/third_party/nixpkgs/nixos/modules/misc/ids.nix
+++ b/third_party/nixpkgs/nixos/modules/misc/ids.nix
@@ -71,7 +71,7 @@ in
#utmp = 29; # unused
# ddclient = 30; # converted to DynamicUser = true
davfs2 = 31;
- #disnix = 33; # module removed
+ disnix = 33;
osgi = 34;
tor = 35;
cups = 36;
@@ -387,7 +387,7 @@ in
utmp = 29;
# ddclient = 30; # converted to DynamicUser = true
davfs2 = 31;
- #disnix = 33; # module removed
+ disnix = 33;
osgi = 34;
tor = 35;
#cups = 36; # unused
diff --git a/third_party/nixpkgs/nixos/modules/module-list.nix b/third_party/nixpkgs/nixos/modules/module-list.nix
index 4a63a09ab8..ca7898687b 100644
--- a/third_party/nixpkgs/nixos/modules/module-list.nix
+++ b/third_party/nixpkgs/nixos/modules/module-list.nix
@@ -461,6 +461,8 @@
./services/misc/devmon.nix
./services/misc/dictd.nix
./services/misc/dwm-status.nix
+ ./services/misc/dysnomia.nix
+ ./services/misc/disnix.nix
./services/misc/docker-registry.nix
./services/misc/domoticz.nix
./services/misc/errbot.nix
@@ -924,6 +926,7 @@
./services/web-apps/selfoss.nix
./services/web-apps/shiori.nix
./services/web-apps/virtlyst.nix
+ ./services/web-apps/wiki-js.nix
./services/web-apps/whitebophir.nix
./services/web-apps/wordpress.nix
./services/web-apps/youtrack.nix
diff --git a/third_party/nixpkgs/nixos/modules/programs/less.nix b/third_party/nixpkgs/nixos/modules/programs/less.nix
index 75b3e707d5..09cb6030e6 100644
--- a/third_party/nixpkgs/nixos/modules/programs/less.nix
+++ b/third_party/nixpkgs/nixos/modules/programs/less.nix
@@ -40,7 +40,7 @@ in
configFile = mkOption {
type = types.nullOr types.path;
default = null;
- example = literalExample "$${pkgs.my-configs}/lesskey";
+ example = literalExample "\${pkgs.my-configs}/lesskey";
description = ''
Path to lesskey configuration file.
diff --git a/third_party/nixpkgs/nixos/modules/security/acme.nix b/third_party/nixpkgs/nixos/modules/security/acme.nix
index 6ea0cfe615..eb3599b924 100644
--- a/third_party/nixpkgs/nixos/modules/security/acme.nix
+++ b/third_party/nixpkgs/nixos/modules/security/acme.nix
@@ -24,7 +24,7 @@ let
Type = "oneshot";
User = "acme";
Group = mkDefault "acme";
- UMask = 0023;
+ UMask = 0022;
StateDirectoryMode = 750;
ProtectSystem = "full";
PrivateTmp = true;
@@ -303,9 +303,15 @@ let
}
${optionalString (data.webroot != null) ''
- # Ensure the webroot exists
- mkdir -p '${data.webroot}/.well-known/acme-challenge'
- chown 'acme:${data.group}' ${data.webroot}/{.well-known,.well-known/acme-challenge}
+ # Ensure the webroot exists. Fixing group is required in case configuration was changed between runs.
+ # Lego will fail if the webroot does not exist at all.
+ (
+ mkdir -p '${data.webroot}/.well-known/acme-challenge' \
+ && chgrp '${data.group}' ${data.webroot}/.well-known/acme-challenge
+ ) || (
+ echo 'Please ensure ${data.webroot}/.well-known/acme-challenge exists and is writable by acme:${data.group}' \
+ && exit 1
+ )
''}
echo '${domainHash}' > domainhash.txt
diff --git a/third_party/nixpkgs/nixos/modules/services/audio/mpd.nix b/third_party/nixpkgs/nixos/modules/services/audio/mpd.nix
index 9f01e29dd0..eee6c5f423 100644
--- a/third_party/nixpkgs/nixos/modules/services/audio/mpd.nix
+++ b/third_party/nixpkgs/nixos/modules/services/audio/mpd.nix
@@ -213,7 +213,9 @@ in {
description = "Music Player Daemon Socket";
wantedBy = [ "sockets.target" ];
listenStreams = [
- "${optionalString (cfg.network.listenAddress != "any") "${cfg.network.listenAddress}:"}${toString cfg.network.port}"
+ (if pkgs.lib.hasPrefix "/" cfg.network.listenAddress
+ then cfg.network.listenAddress
+ else "${optionalString (cfg.network.listenAddress != "any") "${cfg.network.listenAddress}:"}${toString cfg.network.port}")
];
socketConfig = {
Backlog = 5;
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 2206ac522e..0103cd723d 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
@@ -280,6 +280,8 @@ in
keep-outputs = true
keep-derivations = true
+
+ '' + optionalString (versionOlder (getVersion config.nix.package.out) "2.4pre") ''
# The default (`true') slows Nix down a lot since the build farm
# has so many GC roots.
gc-check-reachability = false
diff --git a/third_party/nixpkgs/nixos/modules/services/desktops/geoclue2.nix b/third_party/nixpkgs/nixos/modules/services/desktops/geoclue2.nix
index 6702bd395a..0dc0643afb 100644
--- a/third_party/nixpkgs/nixos/modules/services/desktops/geoclue2.nix
+++ b/third_party/nixpkgs/nixos/modules/services/desktops/geoclue2.nix
@@ -188,7 +188,8 @@ in
systemd.packages = [ package ];
- # we cannot use DynamicUser as we need the the geoclue user to exist for the dbus policy to work
+ # we cannot use DynamicUser as we need the the geoclue user to exist for the
+ # dbus policy to work
users = {
users.geoclue = {
isSystemUser = true;
@@ -217,6 +218,7 @@ in
# we can't be part of a system service, and the agent should
# be okay with the main service coming and going
wantedBy = [ "default.target" ];
+ unitConfig.ConditionUser = "!@system";
serviceConfig = {
Type = "exec";
ExecStart = "${package}/libexec/geoclue-2.0/demos/agent";
diff --git a/third_party/nixpkgs/nixos/modules/services/hardware/tcsd.nix b/third_party/nixpkgs/nixos/modules/services/hardware/tcsd.nix
index 68cb5d791a..0d36bce357 100644
--- a/third_party/nixpkgs/nixos/modules/services/hardware/tcsd.nix
+++ b/third_party/nixpkgs/nixos/modules/services/hardware/tcsd.nix
@@ -119,22 +119,31 @@ in
environment.systemPackages = [ pkgs.trousers ];
-# system.activationScripts.tcsd =
-# ''
-# chown ${cfg.user}:${cfg.group} ${tcsdConf}
-# '';
+ services.udev.extraRules = ''
+ # Give tcsd ownership of all TPM devices
+ KERNEL=="tpm[0-9]*", MODE="0660", OWNER="${cfg.user}", GROUP="${cfg.group}"
+ # Tag TPM devices to create a .device unit for tcsd to depend on
+ ACTION=="add", KERNEL=="tpm[0-9]*", TAG+="systemd"
+ '';
+
+ systemd.tmpfiles.rules = [
+ # Initialise the state directory
+ "d ${cfg.stateDir} 0770 ${cfg.user} ${cfg.group} - -"
+ ];
systemd.services.tcsd = {
- description = "TCSD";
- after = [ "systemd-udev-settle.service" ];
+ description = "Manager for Trusted Computing resources";
+ documentation = [ "man:tcsd(8)" ];
+
+ requires = [ "dev-tpm0.device" ];
+ after = [ "dev-tpm0.device" ];
wantedBy = [ "multi-user.target" ];
- path = [ pkgs.trousers ];
- preStart =
- ''
- mkdir -m 0700 -p ${cfg.stateDir}
- chown -R ${cfg.user}:${cfg.group} ${cfg.stateDir}
- '';
- serviceConfig.ExecStart = "${pkgs.trousers}/sbin/tcsd -f -c ${tcsdConf}";
+
+ serviceConfig = {
+ User = cfg.user;
+ Group = cfg.group;
+ ExecStart = "${pkgs.trousers}/sbin/tcsd -f -c ${tcsdConf}";
+ };
};
users.users = optionalAttrs (cfg.user == "tss") {
diff --git a/third_party/nixpkgs/nixos/modules/services/logging/graylog.nix b/third_party/nixpkgs/nixos/modules/services/logging/graylog.nix
index a889a44d4b..af70d27fcf 100644
--- a/third_party/nixpkgs/nixos/modules/services/logging/graylog.nix
+++ b/third_party/nixpkgs/nixos/modules/services/logging/graylog.nix
@@ -39,7 +39,6 @@ in
type = types.package;
default = pkgs.graylog;
defaultText = "pkgs.graylog";
- example = literalExample "pkgs.graylog";
description = "Graylog package to use.";
};
@@ -138,14 +137,13 @@ in
"d '${cfg.messageJournalDir}' - ${cfg.user} - - -"
];
- systemd.services.graylog = with pkgs; {
+ systemd.services.graylog = {
description = "Graylog Server";
wantedBy = [ "multi-user.target" ];
environment = {
- JAVA_HOME = jre;
GRAYLOG_CONF = "${confFile}";
};
- path = [ pkgs.jre_headless pkgs.which pkgs.procps ];
+ path = [ pkgs.which pkgs.procps ];
preStart = ''
rm -rf /var/lib/graylog/plugins || true
mkdir -p /var/lib/graylog/plugins -m 755
diff --git a/third_party/nixpkgs/nixos/modules/services/misc/disnix.nix b/third_party/nixpkgs/nixos/modules/services/misc/disnix.nix
new file mode 100644
index 0000000000..41483d80a2
--- /dev/null
+++ b/third_party/nixpkgs/nixos/modules/services/misc/disnix.nix
@@ -0,0 +1,98 @@
+# Disnix server
+{ config, lib, pkgs, ... }:
+
+with lib;
+
+let
+
+ cfg = config.services.disnix;
+
+in
+
+{
+
+ ###### interface
+
+ options = {
+
+ services.disnix = {
+
+ enable = mkEnableOption "Disnix";
+
+ enableMultiUser = mkOption {
+ type = types.bool;
+ default = true;
+ description = "Whether to support multi-user mode by enabling the Disnix D-Bus service";
+ };
+
+ useWebServiceInterface = mkEnableOption "the DisnixWebService interface running on Apache Tomcat";
+
+ package = mkOption {
+ type = types.path;
+ description = "The Disnix package";
+ default = pkgs.disnix;
+ defaultText = "pkgs.disnix";
+ };
+
+ enableProfilePath = mkEnableOption "exposing the Disnix profiles in the system's PATH";
+
+ profiles = mkOption {
+ type = types.listOf types.string;
+ default = [ "default" ];
+ example = [ "default" ];
+ description = "Names of the Disnix profiles to expose in the system's PATH";
+ };
+ };
+
+ };
+
+ ###### implementation
+
+ config = mkIf cfg.enable {
+ dysnomia.enable = true;
+
+ environment.systemPackages = [ pkgs.disnix ] ++ optional cfg.useWebServiceInterface pkgs.DisnixWebService;
+ environment.variables.PATH = lib.optionals cfg.enableProfilePath (map (profileName: "/nix/var/nix/profiles/disnix/${profileName}/bin" ) cfg.profiles);
+
+ services.dbus.enable = true;
+ services.dbus.packages = [ pkgs.disnix ];
+
+ services.tomcat.enable = cfg.useWebServiceInterface;
+ services.tomcat.extraGroups = [ "disnix" ];
+ services.tomcat.javaOpts = "${optionalString cfg.useWebServiceInterface "-Djava.library.path=${pkgs.libmatthew_java}/lib/jni"} ";
+ services.tomcat.sharedLibs = optional cfg.useWebServiceInterface "${pkgs.DisnixWebService}/share/java/DisnixConnection.jar"
+ ++ optional cfg.useWebServiceInterface "${pkgs.dbus_java}/share/java/dbus.jar";
+ services.tomcat.webapps = optional cfg.useWebServiceInterface pkgs.DisnixWebService;
+
+ users.groups.disnix.gid = config.ids.gids.disnix;
+
+ systemd.services = {
+ disnix = mkIf cfg.enableMultiUser {
+ description = "Disnix server";
+ wants = [ "dysnomia.target" ];
+ wantedBy = [ "multi-user.target" ];
+ after = [ "dbus.service" ]
+ ++ optional config.services.httpd.enable "httpd.service"
+ ++ optional config.services.mysql.enable "mysql.service"
+ ++ optional config.services.postgresql.enable "postgresql.service"
+ ++ optional config.services.tomcat.enable "tomcat.service"
+ ++ optional config.services.svnserve.enable "svnserve.service"
+ ++ optional config.services.mongodb.enable "mongodb.service"
+ ++ optional config.services.influxdb.enable "influxdb.service";
+
+ restartIfChanged = false;
+
+ path = [ config.nix.package cfg.package config.dysnomia.package "/run/current-system/sw" ];
+
+ environment = {
+ HOME = "/root";
+ }
+ // (if config.environment.variables ? DYSNOMIA_CONTAINERS_PATH then { inherit (config.environment.variables) DYSNOMIA_CONTAINERS_PATH; } else {})
+ // (if config.environment.variables ? DYSNOMIA_MODULES_PATH then { inherit (config.environment.variables) DYSNOMIA_MODULES_PATH; } else {});
+
+ serviceConfig.ExecStart = "${cfg.package}/bin/disnix-service";
+ };
+
+ };
+ };
+}
diff --git a/third_party/nixpkgs/nixos/modules/services/misc/dysnomia.nix b/third_party/nixpkgs/nixos/modules/services/misc/dysnomia.nix
new file mode 100644
index 0000000000..333ba651cd
--- /dev/null
+++ b/third_party/nixpkgs/nixos/modules/services/misc/dysnomia.nix
@@ -0,0 +1,259 @@
+{pkgs, lib, config, ...}:
+
+with lib;
+
+let
+ cfg = config.dysnomia;
+
+ printProperties = properties:
+ concatMapStrings (propertyName:
+ let
+ property = properties.${propertyName};
+ in
+ if isList property then "${propertyName}=(${lib.concatMapStrings (elem: "\"${toString elem}\" ") (properties.${propertyName})})\n"
+ else "${propertyName}=\"${toString property}\"\n"
+ ) (builtins.attrNames properties);
+
+ properties = pkgs.stdenv.mkDerivation {
+ name = "dysnomia-properties";
+ buildCommand = ''
+ cat > $out << "EOF"
+ ${printProperties cfg.properties}
+ EOF
+ '';
+ };
+
+ containersDir = pkgs.stdenv.mkDerivation {
+ name = "dysnomia-containers";
+ buildCommand = ''
+ mkdir -p $out
+ cd $out
+
+ ${concatMapStrings (containerName:
+ let
+ containerProperties = cfg.containers.${containerName};
+ in
+ ''
+ cat > ${containerName} < /etc/systemd-mutable/system/dysnomia.target
+ fi
+ '';
+ };
+}
diff --git a/third_party/nixpkgs/nixos/modules/services/monitoring/zabbix-agent.nix b/third_party/nixpkgs/nixos/modules/services/monitoring/zabbix-agent.nix
index 73eed7aa66..e7dd9e3393 100644
--- a/third_party/nixpkgs/nixos/modules/services/monitoring/zabbix-agent.nix
+++ b/third_party/nixpkgs/nixos/modules/services/monitoring/zabbix-agent.nix
@@ -128,11 +128,16 @@ in
{
LogType = "console";
Server = cfg.server;
- ListenIP = cfg.listen.ip;
ListenPort = cfg.listen.port;
- LoadModule = builtins.attrNames cfg.modules;
}
- (mkIf (cfg.modules != {}) { LoadModulePath = "${moduleEnv}/lib"; })
+ (mkIf (cfg.modules != {}) {
+ LoadModule = builtins.attrNames cfg.modules;
+ LoadModulePath = "${moduleEnv}/lib";
+ })
+
+ # the default value for "ListenIP" is 0.0.0.0 but zabbix agent 2 cannot accept configuration files which
+ # explicitly set "ListenIP" to the default value...
+ (mkIf (cfg.listen.ip != "0.0.0.0") { ListenIP = cfg.listen.ip; })
];
networking.firewall = mkIf cfg.openFirewall {
diff --git a/third_party/nixpkgs/nixos/modules/services/networking/bird.nix b/third_party/nixpkgs/nixos/modules/services/networking/bird.nix
index 4ae35875c0..6d7e7760d9 100644
--- a/third_party/nixpkgs/nixos/modules/services/networking/bird.nix
+++ b/third_party/nixpkgs/nixos/modules/services/networking/bird.nix
@@ -1,7 +1,7 @@
{ config, lib, pkgs, ... }:
let
- inherit (lib) mkEnableOption mkIf mkOption types;
+ inherit (lib) mkEnableOption mkIf mkOption optionalString types;
generic = variant:
let
@@ -26,6 +26,14 @@ let
'';
};
+ checkConfig = mkOption {
+ type = types.bool;
+ default = true;
+ description = ''
+ Whether the config should be checked at build time.
+ Disabling this might become necessary if the config includes files not present during build time.
+ '';
+ };
};
};
@@ -36,7 +44,7 @@ let
environment.etc."bird/${variant}.conf".source = pkgs.writeTextFile {
name = "${variant}.conf";
text = cfg.config;
- checkPhase = ''
+ checkPhase = optionalString cfg.checkConfig ''
${pkg}/bin/${birdBin} -d -p -c $out
'';
};
@@ -50,7 +58,7 @@ let
Type = "forking";
Restart = "on-failure";
ExecStart = "${pkg}/bin/${birdBin} -c /etc/bird/${variant}.conf -u ${variant} -g ${variant}";
- ExecReload = "${pkg}/bin/${birdc} configure";
+ ExecReload = "/bin/sh -c '${pkg}/bin/${birdBin} -c /etc/bird/${variant}.conf -p && ${pkg}/bin/${birdc} configure'";
ExecStop = "${pkg}/bin/${birdc} down";
CapabilityBoundingSet = [ "CAP_CHOWN" "CAP_FOWNER" "CAP_DAC_OVERRIDE" "CAP_SETUID" "CAP_SETGID"
# see bird/sysdep/linux/syspriv.h
diff --git a/third_party/nixpkgs/nixos/modules/services/networking/cjdns.nix b/third_party/nixpkgs/nixos/modules/services/networking/cjdns.nix
index f116d6392e..e9a0e5af1a 100644
--- a/third_party/nixpkgs/nixos/modules/services/networking/cjdns.nix
+++ b/third_party/nixpkgs/nixos/modules/services/networking/cjdns.nix
@@ -245,7 +245,7 @@ in
fi
if [ -z "$CJDNS_ADMIN_PASSWORD" ]; then
- echo "CJDNS_ADMIN_PASSWORD=$(tr -dc A-Za-z0-9 > /etc/cjdns.keys
fi
'';
diff --git a/third_party/nixpkgs/nixos/modules/services/networking/kresd.nix b/third_party/nixpkgs/nixos/modules/services/networking/kresd.nix
index d7208354d4..3f9be6172f 100644
--- a/third_party/nixpkgs/nixos/modules/services/networking/kresd.nix
+++ b/third_party/nixpkgs/nixos/modules/services/networking/kresd.nix
@@ -10,12 +10,12 @@ let
mkListen = kind: addr: let
al_v4 = builtins.match "([0-9.]+):([0-9]+)" addr;
al_v6 = builtins.match "\\[(.+)]:([0-9]+)" addr;
- al_portOnly = builtins.match "()([0-9]+)" addr;
+ al_portOnly = builtins.match "([0-9]+)" addr;
al = findFirst (a: a != null)
(throw "services.kresd.*: incorrect address specification '${addr}'")
[ al_v4 al_v6 al_portOnly ];
port = last al;
- addrSpec = if al_portOnly == null then "'${head al}'" else "{'::', '127.0.0.1'}";
+ addrSpec = if al_portOnly == null then "'${head al}'" else "{'::', '0.0.0.0'}";
in # freebind is set for compatibility with earlier kresd services;
# it could be configurable, for example.
''
@@ -137,10 +137,5 @@ in {
};
# We don't mind running stop phase from wrong version. It seems less racy.
systemd.services."kresd@".stopIfChanged = false;
-
- # Try cleaning up the previously default location of cache file.
- # Note that /var/cache/* should always be safe to remove.
- # TODO: remove later, probably between 20.09 and 21.05
- systemd.tmpfiles.rules = [ "R /var/cache/kresd" ];
};
}
diff --git a/third_party/nixpkgs/nixos/modules/services/networking/wireguard.nix b/third_party/nixpkgs/nixos/modules/services/networking/wireguard.nix
index e07020349c..9f76f7f7cd 100644
--- a/third_party/nixpkgs/nixos/modules/services/networking/wireguard.nix
+++ b/third_party/nixpkgs/nixos/modules/services/networking/wireguard.nix
@@ -238,7 +238,7 @@ let
wantedBy = [ "wireguard-${name}.service" ];
requiredBy = [ "wireguard-${name}.service" ];
before = [ "wireguard-${name}.service" ];
- path = with pkgs; [ wireguard ];
+ path = with pkgs; [ wireguard-tools ];
serviceConfig = {
Type = "oneshot";
diff --git a/third_party/nixpkgs/nixos/modules/services/networking/zerobin.nix b/third_party/nixpkgs/nixos/modules/services/networking/zerobin.nix
index 78de246a81..16db25d623 100644
--- a/third_party/nixpkgs/nixos/modules/services/networking/zerobin.nix
+++ b/third_party/nixpkgs/nixos/modules/services/networking/zerobin.nix
@@ -88,7 +88,7 @@ in
enable = true;
after = [ "network.target" ];
wantedBy = [ "multi-user.target" ];
- serviceConfig.ExecStart = "${pkgs.pythonPackages.zerobin}/bin/zerobin ${cfg.listenAddress} ${toString cfg.listenPort} false ${cfg.user} ${cfg.group} ${zerobin_config}";
+ serviceConfig.ExecStart = "${pkgs.zerobin}/bin/zerobin ${cfg.listenAddress} ${toString cfg.listenPort} false ${cfg.user} ${cfg.group} ${zerobin_config}";
serviceConfig.PrivateTmp="yes";
serviceConfig.User = cfg.user;
serviceConfig.Group = cfg.group;
diff --git a/third_party/nixpkgs/nixos/modules/services/web-apps/hledger-web.nix b/third_party/nixpkgs/nixos/modules/services/web-apps/hledger-web.nix
index 43fc4daa17..a69767194c 100644
--- a/third_party/nixpkgs/nixos/modules/services/web-apps/hledger-web.nix
+++ b/third_party/nixpkgs/nixos/modules/services/web-apps/hledger-web.nix
@@ -26,19 +26,46 @@ in {
'';
};
- capabilities = mkOption {
- type = types.commas;
- default = "view";
+ capabilities = {
+ view = mkOption {
+ type = types.bool;
+ default = true;
+ description = ''
+ Enable the view capability.
+ '';
+ };
+ add = mkOption {
+ type = types.bool;
+ default = false;
+ description = ''
+ Enable the add capability.
+ '';
+ };
+ manage = mkOption {
+ type = types.bool;
+ default = false;
+ description = ''
+ Enable the manage capability.
+ '';
+ };
+ };
+
+ stateDir = mkOption {
+ type = types.path;
+ default = "/var/lib/hledger-web";
description = ''
- Enable the view, add, and/or manage capabilities. E.g. view,add
+ Path the service has access to. If left as the default value this
+ directory will automatically be created before the hledger-web server
+ starts, otherwise the sysadmin is responsible for ensuring the
+ directory exists with appropriate ownership and permissions.
'';
};
- journalFile = mkOption {
- type = types.path;
- example = "/home/hledger/.hledger.journal";
+ journalFiles = mkOption {
+ type = types.listOf types.str;
+ default = [ ".hledger.journal" ];
description = ''
- Input journal file.
+ Paths to journal files relative to .
'';
};
@@ -50,28 +77,66 @@ in {
Base URL, when sharing over a network.
'';
};
+
+ extraOptions = mkOption {
+ type = types.listOf types.str;
+ default = [];
+ example = [ "--forecast" ];
+ description = ''
+ Extra command line arguments to pass to hledger-web.
+ '';
+ };
+
};
config = mkIf cfg.enable {
- systemd.services.hledger-web = {
+
+ users.users.hledger = {
+ name = "hledger";
+ group = "hledger";
+ isSystemUser = true;
+ home = cfg.stateDir;
+ useDefaultShell = true;
+ };
+
+ users.groups.hledger = {};
+
+ systemd.services.hledger-web = let
+ capabilityString = with cfg.capabilities; concatStringsSep "," (
+ (optional view "view")
+ ++ (optional add "add")
+ ++ (optional manage "manage")
+ );
+ serverArgs = with cfg; escapeShellArgs ([
+ "--serve"
+ "--host=${host}"
+ "--port=${toString port}"
+ "--capabilities=${capabilityString}"
+ (optionalString (cfg.baseUrl != null) "--base-url=${cfg.baseUrl}")
+ (optionalString (cfg.serveApi) "--serve-api")
+ ] ++ (map (f: "--file=${stateDir}/${f}") cfg.journalFiles)
+ ++ extraOptions);
+ in {
description = "hledger-web - web-app for the hledger accounting tool.";
documentation = [ https://hledger.org/hledger-web.html ];
wantedBy = [ "multi-user.target" ];
after = [ "networking.target" ];
- serviceConfig = {
- ExecStart = ''
- ${pkgs.hledger-web}/bin/hledger-web \
- --host=${cfg.host} \
- --port=${toString cfg.port} \
- --file=${cfg.journalFile} \
- "--capabilities=${cfg.capabilities}" \
- ${optionalString (cfg.baseUrl != null) "--base-url=${cfg.baseUrl}"} \
- ${optionalString (cfg.serveApi) "--serve-api"}
- '';
- Restart = "always";
- };
+ serviceConfig = mkMerge [
+ {
+ ExecStart = "${pkgs.hledger-web}/bin/hledger-web ${serverArgs}";
+ Restart = "always";
+ WorkingDirectory = cfg.stateDir;
+ User = "hledger";
+ Group = "hledger";
+ PrivateTmp = true;
+ }
+ (mkIf (cfg.stateDir == "/var/lib/hledger-web") {
+ StateDirectory = "hledger-web";
+ })
+ ];
};
+
};
- meta.maintainers = with lib.maintainers; [ marijanp ];
+ meta.maintainers = with lib.maintainers; [ marijanp erictapen ];
}
diff --git a/third_party/nixpkgs/nixos/modules/services/web-apps/mastodon.nix b/third_party/nixpkgs/nixos/modules/services/web-apps/mastodon.nix
index ea7aebc3b1..16e8ae2ec0 100644
--- a/third_party/nixpkgs/nixos/modules/services/web-apps/mastodon.nix
+++ b/third_party/nixpkgs/nixos/modules/services/web-apps/mastodon.nix
@@ -43,8 +43,32 @@ let
LogsDirectoryMode = "0750";
# Access write directories
UMask = "0027";
+ # Capabilities
+ CapabilityBoundingSet = "";
+ # Security
+ NoNewPrivileges = true;
# Sandboxing
+ ProtectSystem = "strict";
+ ProtectHome = true;
PrivateTmp = true;
+ PrivateDevices = true;
+ PrivateUsers = true;
+ ProtectClock = true;
+ ProtectHostname = true;
+ ProtectKernelLogs = true;
+ ProtectKernelModules = true;
+ ProtectKernelTunables = true;
+ ProtectControlGroups = true;
+ RestrictAddressFamilies = [ "AF_UNIX" "AF_INET" "AF_INET6" "AF_NETLINK" ];
+ RestrictNamespaces = true;
+ LockPersonality = true;
+ MemoryDenyWriteExecute = false;
+ RestrictRealtime = true;
+ RestrictSUIDSGID = true;
+ PrivateMounts = true;
+ # System Call Filtering
+ SystemCallArchitectures = "native";
+ SystemCallFilter = "~@clock @cpu-emulation @debug @keyring @module @mount @obsolete @reboot @resources @setuid @swap";
};
envFile = pkgs.writeText "mastodon.env" (lib.concatMapStrings (s: s + "\n") (
diff --git a/third_party/nixpkgs/nixos/modules/services/web-apps/wiki-js.nix b/third_party/nixpkgs/nixos/modules/services/web-apps/wiki-js.nix
new file mode 100644
index 0000000000..1a6259dffe
--- /dev/null
+++ b/third_party/nixpkgs/nixos/modules/services/web-apps/wiki-js.nix
@@ -0,0 +1,139 @@
+{ lib, pkgs, config, ... }:
+
+with lib;
+
+let
+ cfg = config.services.wiki-js;
+
+ format = pkgs.formats.json { };
+
+ configFile = format.generate "wiki-js.yml" cfg.settings;
+in {
+ options.services.wiki-js = {
+ enable = mkEnableOption "wiki-js";
+
+ environmentFile = mkOption {
+ type = types.nullOr types.path;
+ default = null;
+ example = "/root/wiki-js.env";
+ description = ''
+ Environment fiel to inject e.g. secrets into the configuration.
+ '';
+ };
+
+ stateDirectoryName = mkOption {
+ default = "wiki-js";
+ type = types.str;
+ description = ''
+ Name of the directory in /var/lib.
+ '';
+ };
+
+ settings = mkOption {
+ default = {};
+ type = types.submodule {
+ freeformType = format.type;
+ options = {
+ port = mkOption {
+ type = types.port;
+ default = 3000;
+ description = ''
+ TCP port the process should listen to.
+ '';
+ };
+
+ bindIP = mkOption {
+ default = "0.0.0.0";
+ type = types.str;
+ description = ''
+ IPs the service should listen to.
+ '';
+ };
+
+ db = {
+ type = mkOption {
+ default = "postgres";
+ type = types.enum [ "postgres" "mysql" "mariadb" "mssql" ];
+ description = ''
+ Database driver to use for persistence. Please note that sqlite
+ is currently not supported as the build process for it is currently not implemented
+ in pkgs.wiki-js and it's not recommended by upstream for
+ production use.
+ '';
+ };
+ host = mkOption {
+ type = types.str;
+ example = "/run/postgresql";
+ description = ''
+ Hostname or socket-path to connect to.
+ '';
+ };
+ db = mkOption {
+ default = "wiki";
+ type = types.str;
+ description = ''
+ Name of the database to use.
+ '';
+ };
+ };
+
+ logLevel = mkOption {
+ default = "info";
+ type = types.enum [ "error" "warn" "info" "verbose" "debug" "silly" ];
+ description = ''
+ Define how much detail is supposed to be logged at runtime.
+ '';
+ };
+
+ offline = mkEnableOption "offline mode" // {
+ description = ''
+ Disable latest file updates and enable
+ sideloading.
+ '';
+ };
+ };
+ };
+ description = ''
+ Settings to configure wiki-js. This directly
+ corresponds to the upstream
+ configuration options.
+
+ Secrets can be injected via the environment by
+
+ specifying
+ to contain secrets
+ and setting sensitive values to $(ENVIRONMENT_VAR)
+ with this value defined in the environment-file.
+
+ '';
+ };
+ };
+
+ config = mkIf cfg.enable {
+ services.wiki-js.settings.dataPath = "/var/lib/${cfg.stateDirectoryName}";
+ systemd.services.wiki-js = {
+ description = "A modern and powerful wiki app built on Node.js";
+ documentation = [ "https://docs.requarks.io/" ];
+ wantedBy = [ "multi-user.target" ];
+
+ path = with pkgs; [ coreutils ];
+ preStart = ''
+ ln -sf ${configFile} /var/lib/${cfg.stateDirectoryName}/config.yml
+ ln -sf ${pkgs.wiki-js}/server /var/lib/${cfg.stateDirectoryName}
+ ln -sf ${pkgs.wiki-js}/assets /var/lib/${cfg.stateDirectoryName}
+ ln -sf ${pkgs.wiki-js}/package.json /var/lib/${cfg.stateDirectoryName}/package.json
+ '';
+
+ serviceConfig = {
+ EnvironmentFile = mkIf (cfg.environmentFile != null) cfg.environmentFile;
+ StateDirectory = cfg.stateDirectoryName;
+ WorkingDirectory = "/var/lib/${cfg.stateDirectoryName}";
+ DynamicUser = true;
+ PrivateTmp = true;
+ ExecStart = "${pkgs.nodejs}/bin/node ${pkgs.wiki-js}/server";
+ };
+ };
+ };
+
+ meta.maintainers = with maintainers; [ ma27 ];
+}
diff --git a/third_party/nixpkgs/nixos/modules/system/boot/stage-1.nix b/third_party/nixpkgs/nixos/modules/system/boot/stage-1.nix
index 4074f2e023..d606d473d9 100644
--- a/third_party/nixpkgs/nixos/modules/system/boot/stage-1.nix
+++ b/third_party/nixpkgs/nixos/modules/system/boot/stage-1.nix
@@ -386,7 +386,7 @@ let
) config.boot.initrd.secrets)
}
- (cd "$tmp" && find . -print0 | sort -z | cpio -o -H newc -R +0:+0 --reproducible --null) | \
+ (cd "$tmp" && find . -print0 | sort -z | cpio --quiet -o -H newc -R +0:+0 --reproducible --null) | \
${compressorExe} ${lib.escapeShellArgs initialRamdisk.compressorArgs} >> "$1"
'';
diff --git a/third_party/nixpkgs/nixos/modules/tasks/filesystems.nix b/third_party/nixpkgs/nixos/modules/tasks/filesystems.nix
index a9b5b134d8..e468cb8800 100644
--- a/third_party/nixpkgs/nixos/modules/tasks/filesystems.nix
+++ b/third_party/nixpkgs/nixos/modules/tasks/filesystems.nix
@@ -22,8 +22,6 @@ let
# their assertions too
(attrValues config.fileSystems);
- prioOption = prio: optionalString (prio != null) " pri=${toString prio}";
-
specialFSTypes = [ "proc" "sysfs" "tmpfs" "ramfs" "devtmpfs" "devpts" ];
coreFileSystemOpts = { name, config, ... }: {
@@ -240,6 +238,8 @@ in
skipCheck = fs: fs.noCheck || fs.device == "none" || builtins.elem fs.fsType fsToSkipCheck;
# https://wiki.archlinux.org/index.php/fstab#Filepath_spaces
escape = string: builtins.replaceStrings [ " " "\t" ] [ "\\040" "\\011" ] string;
+ swapOptions = sw: "defaults"
+ + optionalString (sw.priority != null) ",pri=${toString sw.priority}";
in ''
# This is a generated file. Do not edit!
#
@@ -262,7 +262,7 @@ in
# Swap devices.
${flip concatMapStrings config.swapDevices (sw:
- "${sw.realDevice} none swap${prioOption sw.priority}\n"
+ "${sw.realDevice} none swap ${swapOptions sw}\n"
)}
'';
diff --git a/third_party/nixpkgs/nixos/modules/virtualisation/gce-images.nix b/third_party/nixpkgs/nixos/modules/virtualisation/gce-images.nix
index 5354d91deb..7b027619a4 100644
--- a/third_party/nixpkgs/nixos/modules/virtualisation/gce-images.nix
+++ b/third_party/nixpkgs/nixos/modules/virtualisation/gce-images.nix
@@ -5,5 +5,13 @@ let self = {
"17.03" = "gs://nixos-cloud-images/nixos-image-17.03.1082.4aab5c5798-x86_64-linux.raw.tar.gz";
"18.03" = "gs://nixos-cloud-images/nixos-image-18.03.132536.fdb5ba4cdf9-x86_64-linux.raw.tar.gz";
"18.09" = "gs://nixos-cloud-images/nixos-image-18.09.1228.a4c4cbb613c-x86_64-linux.raw.tar.gz";
- latest = self."18.09";
+
+ # This format will be handled by the upcoming NixOPS 2.0 release.
+ # The old images based on a GS object are deprecated.
+ "20.09" = {
+ project = "nixos-cloud";
+ name = "nixos-image-20-09-3531-3858fbc08e6-x86-64-linux";
+ };
+
+ latest = self."20.09";
}; in self
diff --git a/third_party/nixpkgs/nixos/modules/virtualisation/nixos-containers.nix b/third_party/nixpkgs/nixos/modules/virtualisation/nixos-containers.nix
index 3754fe6dac..a853917a6d 100644
--- a/third_party/nixpkgs/nixos/modules/virtualisation/nixos-containers.nix
+++ b/third_party/nixpkgs/nixos/modules/virtualisation/nixos-containers.nix
@@ -504,7 +504,7 @@ in
path = mkOption {
type = types.path;
- example = "/nix/var/nix/profiles/containers/webserver";
+ example = "/nix/var/nix/profiles/per-container/webserver";
description = ''
As an alternative to specifying
, you can specify the path to
diff --git a/third_party/nixpkgs/nixos/tests/acme.nix b/third_party/nixpkgs/nixos/tests/acme.nix
index c6d393d919..99dd8ec6fd 100644
--- a/third_party/nixpkgs/nixos/tests/acme.nix
+++ b/third_party/nixpkgs/nixos/tests/acme.nix
@@ -253,7 +253,7 @@ in import ./make-test-python.nix ({ lib, ... }: {
def check_connection(node, domain, retries=3):
- assert retries >= 0
+ assert retries >= 0, f"Failed to connect to https://{domain}"
result = node.succeed(
"openssl s_client -brief -verify 2 -CAfile /tmp/ca.crt"
@@ -262,12 +262,12 @@ in import ./make-test-python.nix ({ lib, ... }: {
for line in result.lower().split("\n"):
if "verification" in line and "error" in line:
- time.sleep(1)
+ time.sleep(3)
return check_connection(node, domain, retries - 1)
def check_connection_key_bits(node, domain, bits, retries=3):
- assert retries >= 0
+ assert retries >= 0, f"Did not find expected number of bits ({bits}) in key"
result = node.succeed(
"openssl s_client -CAfile /tmp/ca.crt"
@@ -277,12 +277,12 @@ in import ./make-test-python.nix ({ lib, ... }: {
print("Key type:", result)
if bits not in result:
- time.sleep(1)
+ time.sleep(3)
return check_connection_key_bits(node, domain, bits, retries - 1)
def check_stapling(node, domain, retries=3):
- assert retries >= 0
+ assert retries >= 0, "OCSP Stapling check failed"
# Pebble doesn't provide a full OCSP responder, so just check the URL
result = node.succeed(
@@ -293,10 +293,23 @@ in import ./make-test-python.nix ({ lib, ... }: {
print("OCSP Responder URL:", result)
if "${caDomain}:4002" not in result.lower():
- time.sleep(1)
+ time.sleep(3)
return check_stapling(node, domain, retries - 1)
+ def download_ca_certs(node, retries=5):
+ assert retries >= 0, "Failed to connect to pebble to download root CA certs"
+
+ exit_code, _ = node.execute("curl https://${caDomain}:15000/roots/0 > /tmp/ca.crt")
+ exit_code_2, _ = node.execute(
+ "curl https://${caDomain}:15000/intermediate-keys/0 >> /tmp/ca.crt"
+ )
+
+ if exit_code + exit_code_2 > 0:
+ time.sleep(3)
+ return download_ca_certs(node, retries - 1)
+
+
client.start()
dnsserver.start()
@@ -313,8 +326,7 @@ in import ./make-test-python.nix ({ lib, ... }: {
acme.wait_for_unit("network-online.target")
acme.wait_for_unit("pebble.service")
- client.succeed("curl https://${caDomain}:15000/roots/0 > /tmp/ca.crt")
- client.succeed("curl https://${caDomain}:15000/intermediate-keys/0 >> /tmp/ca.crt")
+ download_ca_certs(client)
with subtest("Can request certificate with HTTPS-01 challenge"):
webserver.wait_for_unit("acme-finished-a.example.test.target")
@@ -322,6 +334,21 @@ in import ./make-test-python.nix ({ lib, ... }: {
check_issuer(webserver, "a.example.test", "pebble")
check_connection(client, "a.example.test")
+ with subtest("Certificates and accounts have safe + valid permissions"):
+ group = "${nodes.webserver.config.security.acme.certs."a.example.test".group}"
+ webserver.succeed(
+ f"test $(stat -L -c \"%a %U %G\" /var/lib/acme/a.example.test/* | tee /dev/stderr | grep '640 acme {group}' | wc -l) -eq 5"
+ )
+ webserver.succeed(
+ f"test $(stat -L -c \"%a %U %G\" /var/lib/acme/.lego/a.example.test/**/* | tee /dev/stderr | grep '640 acme {group}' | wc -l) -eq 5"
+ )
+ webserver.succeed(
+ f"test $(stat -L -c \"%a %U %G\" /var/lib/acme/a.example.test | tee /dev/stderr | grep '750 acme {group}' | wc -l) -eq 1"
+ )
+ webserver.succeed(
+ f"test $(find /var/lib/acme/accounts -type f -exec stat -L -c \"%a %U %G\" {{}} \\; | tee /dev/stderr | grep -v '600 acme {group}' | wc -l) -eq 0"
+ )
+
with subtest("Can generate valid selfsigned certs"):
webserver.succeed("systemctl clean acme-a.example.test.service --what=state")
webserver.succeed("systemctl start acme-selfsigned-a.example.test.service")
@@ -375,8 +402,15 @@ in import ./make-test-python.nix ({ lib, ... }: {
assert keyhash_old == keyhash_new
with subtest("Can request certificates for vhost + aliases (apache-httpd)"):
- switch_to(webserver, "httpd-aliases")
- webserver.wait_for_unit("acme-finished-c.example.test.target")
+ try:
+ switch_to(webserver, "httpd-aliases")
+ webserver.wait_for_unit("acme-finished-c.example.test.target")
+ except Exception as err:
+ _, output = webserver.execute(
+ "cat /var/log/httpd/*.log && ls -al /var/lib/acme/acme-challenge"
+ )
+ print(output)
+ raise err
check_issuer(webserver, "c.example.test", "pebble")
check_connection(client, "c.example.test")
check_connection(client, "d.example.test")
diff --git a/third_party/nixpkgs/nixos/tests/all-tests.nix b/third_party/nixpkgs/nixos/tests/all-tests.nix
index fb45ec1a31..65c7d84ee6 100644
--- a/third_party/nixpkgs/nixos/tests/all-tests.nix
+++ b/third_party/nixpkgs/nixos/tests/all-tests.nix
@@ -426,6 +426,7 @@ in
virtualbox = handleTestOn ["x86_64-linux"] ./virtualbox.nix {};
vscodium = handleTest ./vscodium.nix {};
wasabibackend = handleTest ./wasabibackend.nix {};
+ wiki-js = handleTest ./wiki-js.nix {};
wireguard = handleTest ./wireguard {};
wordpress = handleTest ./wordpress.nix {};
xandikos = handleTest ./xandikos.nix {};
diff --git a/third_party/nixpkgs/nixos/tests/bitwarden.nix b/third_party/nixpkgs/nixos/tests/bitwarden.nix
index 5345c7245d..3813a1f70f 100644
--- a/third_party/nixpkgs/nixos/tests/bitwarden.nix
+++ b/third_party/nixpkgs/nixos/tests/bitwarden.nix
@@ -113,6 +113,7 @@ let
driver.find_element_by_css_selector('input#masterPasswordRetype').send_keys(
'${userPassword}'
)
+ driver.find_element_by_css_selector('input#acceptPolicies').click()
driver.find_element_by_xpath("//button[contains(., 'Submit')]").click()
diff --git a/third_party/nixpkgs/nixos/tests/docker-tools.nix b/third_party/nixpkgs/nixos/tests/docker-tools.nix
index 1cc554d002..a0e81b613c 100644
--- a/third_party/nixpkgs/nixos/tests/docker-tools.nix
+++ b/third_party/nixpkgs/nixos/tests/docker-tools.nix
@@ -161,12 +161,18 @@ import ./make-test-python.nix ({ pkgs, ... }: {
"docker run --rm ${examples.layered-image.imageName} cat extraCommands",
)
- with subtest("Ensure building an image on top of a layered Docker images work"):
+ with subtest("Ensure images built on top of layered Docker images work"):
docker.succeed(
"docker load --input='${examples.layered-on-top}'",
"docker run --rm ${examples.layered-on-top.imageName}",
)
+ with subtest("Ensure layered images built on top of layered Docker images work"):
+ docker.succeed(
+ "docker load --input='${examples.layered-on-top-layered}'",
+ "docker run --rm ${examples.layered-on-top-layered.imageName}",
+ )
+
def set_of_layers(image_name):
return set(
@@ -205,6 +211,31 @@ import ./make-test-python.nix ({ pkgs, ... }: {
assert "FROM_CHILD=true" in env, "envvars from the child should be preserved"
assert "LAST_LAYER=child" in env, "envvars from the child should take priority"
+ with subtest("Ensure environment variables of layered images are correctly inherited"):
+ docker.succeed(
+ "docker load --input='${examples.environmentVariablesLayered}'"
+ )
+ out = docker.succeed("docker run --rm ${examples.environmentVariablesLayered.imageName} env")
+ env = out.splitlines()
+ assert "FROM_PARENT=true" in env, "envvars from the parent should be preserved"
+ assert "FROM_CHILD=true" in env, "envvars from the child should be preserved"
+ assert "LAST_LAYER=child" in env, "envvars from the child should take priority"
+
+ with subtest(
+ "Ensure inherited environment variables of layered images are correctly resolved"
+ ):
+ # Read environment variables as stored in image config
+ config = docker.succeed(
+ "tar -xOf ${examples.environmentVariablesLayered} manifest.json | ${pkgs.jq}/bin/jq -r .[].Config"
+ ).strip()
+ out = docker.succeed(
+ f"tar -xOf ${examples.environmentVariablesLayered} {config} | ${pkgs.jq}/bin/jq -r '.config.Env | .[]'"
+ )
+ env = out.splitlines()
+ assert (
+ sum(entry.startswith("LAST_LAYER") for entry in env) == 1
+ ), "envvars overridden by child should be unique"
+
with subtest("Ensure image with only 2 layers can be loaded"):
docker.succeed(
"docker load --input='${examples.two-layered-image}'"
@@ -219,6 +250,18 @@ import ./make-test-python.nix ({ pkgs, ... }: {
"docker run bulk-layer ls /bin/hello",
)
+ with subtest(
+ "Ensure the bulk layer with a base image respects the number of maxLayers"
+ ):
+ docker.succeed(
+ "docker load --input='${pkgs.dockerTools.examples.layered-bulk-layer}'",
+ # Ensure the image runs correctly
+ "docker run layered-bulk-layer ls /bin/hello",
+ )
+
+ # Ensure the image has the correct number of layers
+ assert len(set_of_layers("layered-bulk-layer")) == 4
+
with subtest("Ensure correct behavior when no store is needed"):
# This check tests that buildLayeredImage can build images that don't need a store.
docker.succeed(
diff --git a/third_party/nixpkgs/nixos/tests/hledger-web.nix b/third_party/nixpkgs/nixos/tests/hledger-web.nix
index 378d819437..f8919f7d4b 100644
--- a/third_party/nixpkgs/nixos/tests/hledger-web.nix
+++ b/third_party/nixpkgs/nixos/tests/hledger-web.nix
@@ -13,25 +13,22 @@ rec {
name = "hledger-web";
meta.maintainers = with lib.maintainers; [ marijanp ];
- nodes = {
- server = { config, pkgs, ... }: rec {
+ nodes = rec {
+ server = { config, pkgs, ... }: {
services.hledger-web = {
host = "127.0.0.1";
port = 5000;
enable = true;
- journalFile = journal;
+ capabilities.manage = true;
};
- networking.firewall.allowedTCPPorts = [ services.hledger-web.port ];
+ networking.firewall.allowedTCPPorts = [ config.services.hledger-web.port ];
+ systemd.services.hledger-web.preStart = ''
+ ln -s ${journal} /var/lib/hledger-web/.hledger.journal
+ '';
};
- apiserver = { config, pkgs, ... }: rec {
- services.hledger-web = {
- host = "127.0.0.1";
- port = 5000;
- enable = true;
- serveApi = true;
- journalFile = journal;
- };
- networking.firewall.allowedTCPPorts = [ services.hledger-web.port ];
+ apiserver = { ... }: {
+ imports = [ server ];
+ services.hledger-web.serveApi = true;
};
};
@@ -42,7 +39,7 @@ rec {
server.wait_for_open_port(5000)
with subtest("Check if web UI is accessible"):
page = server.succeed("curl -L http://127.0.0.1:5000")
- assert "test.journal" in page
+ assert ".hledger.journal" in page
apiserver.wait_for_unit("hledger-web.service")
apiserver.wait_for_open_port(5000)
diff --git a/third_party/nixpkgs/nixos/tests/wiki-js.nix b/third_party/nixpkgs/nixos/tests/wiki-js.nix
new file mode 100644
index 0000000000..9aa87d1536
--- /dev/null
+++ b/third_party/nixpkgs/nixos/tests/wiki-js.nix
@@ -0,0 +1,152 @@
+import ./make-test-python.nix ({ pkgs, lib, ...} : {
+ name = "wiki-js";
+ meta = with pkgs.lib.maintainers; {
+ maintainers = [ ma27 ];
+ };
+
+ machine = { pkgs, ... }: {
+ virtualisation.memorySize = 2048;
+ services.wiki-js = {
+ enable = true;
+ settings.db.host = "/run/postgresql";
+ settings.db.user = "wiki-js";
+ settings.logLevel = "debug";
+ };
+ services.postgresql = {
+ enable = true;
+ ensureDatabases = [ "wiki" ];
+ ensureUsers = [
+ { name = "wiki-js";
+ ensurePermissions."DATABASE wiki" = "ALL PRIVILEGES";
+ }
+ ];
+ };
+ systemd.services.wiki-js = {
+ requires = [ "postgresql.service" ];
+ after = [ "postgresql.service" ];
+ };
+ environment.systemPackages = with pkgs; [ jq ];
+ };
+
+ testScript = let
+ payloads.finalize = pkgs.writeText "finalize.json" (builtins.toJSON {
+ adminEmail = "webmaster@example.com";
+ adminPassword = "notapassword";
+ adminPasswordConfirm = "notapassword";
+ siteUrl = "http://localhost:3000";
+ telemetry = false;
+ });
+ payloads.login = pkgs.writeText "login.json" (builtins.toJSON [{
+ operationName = null;
+ extensions = {};
+ query = ''
+ mutation ($username: String!, $password: String!, $strategy: String!) {
+ authentication {
+ login(username: $username, password: $password, strategy: $strategy) {
+ responseResult {
+ succeeded
+ errorCode
+ slug
+ message
+ __typename
+ }
+ jwt
+ mustChangePwd
+ mustProvideTFA
+ mustSetupTFA
+ continuationToken
+ redirect
+ tfaQRImage
+ __typename
+ }
+ __typename
+ }
+ }
+ '';
+ variables = {
+ password = "notapassword";
+ strategy = "local";
+ username = "webmaster@example.com";
+ };
+ }]);
+ payloads.content = pkgs.writeText "content.json" (builtins.toJSON [{
+ extensions = {};
+ operationName = null;
+ query = ''
+ mutation ($content: String!, $description: String!, $editor: String!, $isPrivate: Boolean!, $isPublished: Boolean!, $locale: String!, $path: String!, $publishEndDate: Date, $publishStartDate: Date, $scriptCss: String, $scriptJs: String, $tags: [String]!, $title: String!) {
+ pages {
+ create(content: $content, description: $description, editor: $editor, isPrivate: $isPrivate, isPublished: $isPublished, locale: $locale, path: $path, publishEndDate: $publishEndDate, publishStartDate: $publishStartDate, scriptCss: $scriptCss, scriptJs: $scriptJs, tags: $tags, title: $title) {
+ responseResult {
+ succeeded
+ errorCode
+ slug
+ message
+ __typename
+ }
+ page {
+ id
+ updatedAt
+ __typename
+ }
+ __typename
+ }
+ __typename
+ }
+ }
+ '';
+ variables = {
+ content = "# Header\n\nHello world!";
+ description = "";
+ editor = "markdown";
+ isPrivate = false;
+ isPublished = true;
+ locale = "en";
+ path = "home";
+ publishEndDate = "";
+ publishStartDate = "";
+ scriptCss = "";
+ scriptJs = "";
+ tags = [];
+ title = "Hello world";
+ };
+ }]);
+ in ''
+ machine.start()
+ machine.wait_for_unit("multi-user.target")
+ machine.wait_for_open_port(3000)
+
+ machine.succeed("curl -sSf localhost:3000")
+
+ with subtest("Setup"):
+ result = machine.succeed(
+ "set -o pipefail; curl -sSf localhost:3000/finalize -X POST -d "
+ + "@${payloads.finalize} -H 'Content-Type: application/json' "
+ + "| jq .ok | xargs echo"
+ )
+ assert result.strip() == "true", f"Expected true, got {result}"
+
+ # During the setup the service gets restarted, so we use this
+ # to check if the setup is done.
+ machine.wait_until_fails("curl -sSf localhost:3000")
+ machine.wait_until_succeeds("curl -sSf localhost:3000")
+
+ with subtest("Base functionality"):
+ auth = machine.succeed(
+ "set -o pipefail; curl -sSf localhost:3000/graphql -X POST "
+ + "-d @${payloads.login} -H 'Content-Type: application/json' "
+ + "| jq '.[0].data.authentication.login.jwt' | xargs echo"
+ ).strip()
+
+ assert auth
+
+ create = machine.succeed(
+ "set -o pipefail; curl -sSf localhost:3000/graphql -X POST "
+ + "-d @${payloads.content} -H 'Content-Type: application/json' "
+ + f"-H 'Authorization: Bearer {auth}' "
+ + "| jq '.[0].data.pages.create.responseResult.succeeded'|xargs echo"
+ )
+ assert create.strip() == "true", f"Expected true, got {create}"
+
+ machine.shutdown()
+ '';
+})
diff --git a/third_party/nixpkgs/pkgs/applications/audio/aacgain/default.nix b/third_party/nixpkgs/pkgs/applications/audio/aacgain/default.nix
index d4fc3fbe69..0f9b511d45 100644
--- a/third_party/nixpkgs/pkgs/applications/audio/aacgain/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/audio/aacgain/default.nix
@@ -12,6 +12,10 @@ stdenv.mkDerivation {
hardeningDisable = [ "format" ];
+ # -Wnarrowing is enabled by default in recent GCC versions,
+ # causing compilation to fail.
+ NIX_CFLAGS_COMPILE = "-Wno-narrowing";
+
postPatch = ''
(
cd mp4v2
diff --git a/third_party/nixpkgs/pkgs/applications/audio/bitwig-studio/bitwig-studio3.nix b/third_party/nixpkgs/pkgs/applications/audio/bitwig-studio/bitwig-studio3.nix
index 87638ebbe6..4e9762b3e7 100644
--- a/third_party/nixpkgs/pkgs/applications/audio/bitwig-studio/bitwig-studio3.nix
+++ b/third_party/nixpkgs/pkgs/applications/audio/bitwig-studio/bitwig-studio3.nix
@@ -6,11 +6,11 @@
stdenv.mkDerivation rec {
pname = "bitwig-studio";
- version = "3.3.3";
+ version = "3.3.6";
src = fetchurl {
url = "https://downloads.bitwig.com/stable/${version}/${pname}-${version}.deb";
- sha256 = "sha256-NDkGHJDr6TCHEhgSKK7jLYk5RjGEj8+lDYZ4ywvG20g=";
+ sha256 = "10nf29zr0xg9mxmknkc39jh3y9kpxzy5wg1v0s3kkd180lja9zpn";
};
nativeBuildInputs = [ dpkg makeWrapper wrapGAppsHook ];
diff --git a/third_party/nixpkgs/pkgs/applications/audio/clementine/default.nix b/third_party/nixpkgs/pkgs/applications/audio/clementine/default.nix
index e665edabd0..b84b4e6aa9 100644
--- a/third_party/nixpkgs/pkgs/applications/audio/clementine/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/audio/clementine/default.nix
@@ -10,7 +10,7 @@ let
withCD = config.clementine.cd or true;
withCloud = config.clementine.cloud or true;
- # On the update after all 1.4rc, qt5.15 will be supported.
+ # On the update after all 1.4rc, qt5.15 and protobuf 3.15 will be supported.
version = "1.4.0rc1";
src = fetchFromGitHub {
diff --git a/third_party/nixpkgs/pkgs/applications/audio/clerk/default.nix b/third_party/nixpkgs/pkgs/applications/audio/clerk/default.nix
index a2e71b955e..ebcd09ca6a 100644
--- a/third_party/nixpkgs/pkgs/applications/audio/clerk/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/audio/clerk/default.nix
@@ -1,5 +1,5 @@
{ lib, stdenv, fetchFromGitHub, makeWrapper, rofi, mpc_cli, perl,
-util-linux, pythonPackages, libnotify }:
+util-linux, python3Packages, libnotify }:
stdenv.mkDerivation {
name = "clerk-2016-10-14";
@@ -12,10 +12,12 @@ stdenv.mkDerivation {
};
nativeBuildInputs = [ makeWrapper ];
- buildInputs = [ pythonPackages.mpd2 ];
+ buildInputs = [ python3Packages.mpd2 ];
dontBuild = true;
+ strictDeps = true;
+
installPhase = ''
DESTDIR=$out PREFIX=/ make install
wrapProgram $out/bin/clerk \
diff --git a/third_party/nixpkgs/pkgs/applications/audio/ecasound/default.nix b/third_party/nixpkgs/pkgs/applications/audio/ecasound/default.nix
index 0de66b24e7..e2ec9bf8ab 100644
--- a/third_party/nixpkgs/pkgs/applications/audio/ecasound/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/audio/ecasound/default.nix
@@ -48,6 +48,7 @@ stdenv.mkDerivation rec {
strictDeps = true;
+ CXXFLAGS = "-std=c++11";
configureFlags = "--enable-liblilv --with-extra-cppflags=-Dnullptr=0";
postPatch = ''
diff --git a/third_party/nixpkgs/pkgs/applications/audio/helio-workstation/default.nix b/third_party/nixpkgs/pkgs/applications/audio/helio-workstation/default.nix
index e2c19ac156..bb92682b14 100644
--- a/third_party/nixpkgs/pkgs/applications/audio/helio-workstation/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/audio/helio-workstation/default.nix
@@ -5,14 +5,14 @@
stdenv.mkDerivation rec {
pname = "helio-workstation";
- version = "3.3";
+ version = "3.4";
src = fetchFromGitHub {
owner = "helio-fm";
repo = pname;
rev = version;
fetchSubmodules = true;
- sha256 = "sha256-meeNqV1jKUwWc7P3p/LicPsbpzpKKFmQ1wP9DuXc9NY=";
+ sha256 = "sha256-zXsDu/xi7OV6VtnZK9ZJ8uwPeA5uTgNpAQsqe90iwG4=";
};
buildInputs = [
diff --git a/third_party/nixpkgs/pkgs/applications/audio/jamulus/default.nix b/third_party/nixpkgs/pkgs/applications/audio/jamulus/default.nix
index 13b488ce7d..bf054b118e 100644
--- a/third_party/nixpkgs/pkgs/applications/audio/jamulus/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/audio/jamulus/default.nix
@@ -1,14 +1,14 @@
-{ mkDerivation, lib, fetchFromGitHub, fetchpatch, pkg-config, qtscript, qmake, libjack2
+{ mkDerivation, lib, fetchFromGitHub, pkg-config, qtscript, qmake, libjack2
}:
mkDerivation rec {
pname = "jamulus";
- version = "3.6.2";
+ version = "3.7.0";
src = fetchFromGitHub {
- owner = "corrados";
+ owner = "jamulussoftware";
repo = "jamulus";
rev = "r${lib.replaceStrings [ "." ] [ "_" ] version}";
- sha256 = "sha256-b187Q8KXcU32C2hGFqs6R2CqWgmieq6ewQDx+elEgP4=";
+ sha256 = "sha256-8zCPT0jo4ExgmZWxGinumv3JauH4csM9DtuHmOiJQAM=";
};
nativeBuildInputs = [ pkg-config qmake ];
@@ -20,7 +20,7 @@ mkDerivation rec {
description = "Enables musicians to perform real-time jam sessions over the internet";
longDescription = "You also need to enable JACK and should enable several real-time optimizations. See project website for details";
homepage = "https://github.com/corrados/jamulus/wiki";
- license = lib.licenses.gpl2; # linked in git repo, at least
+ license = lib.licenses.gpl2Plus;
platforms = lib.platforms.linux;
maintainers = [ lib.maintainers.seb314 ];
};
diff --git a/third_party/nixpkgs/pkgs/applications/audio/new-session-manager/default.nix b/third_party/nixpkgs/pkgs/applications/audio/new-session-manager/default.nix
index 0badb85f02..eedd193b2c 100644
--- a/third_party/nixpkgs/pkgs/applications/audio/new-session-manager/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/audio/new-session-manager/default.nix
@@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "new-session-manager";
- version = "1.5.0";
+ version = "1.5.1";
src = fetchFromGitHub {
owner = "linuxaudio";
repo = "new-session-manager";
rev = "v${version}";
- sha256 = "sha256-YP5AHoFP8P1o0Y2jAipRcNPxPRuM7COs5tBMm6Eojoc=";
+ sha256 = "sha256-hcw+Fn5s1S786eqmR95RmkFcIaRzWaH38YE9DXVQJU0=";
};
nativeBuildInputs = [ meson pkg-config ninja ];
diff --git a/third_party/nixpkgs/pkgs/applications/audio/openmpt123/default.nix b/third_party/nixpkgs/pkgs/applications/audio/openmpt123/default.nix
index 8e6113a716..7f412d528d 100644
--- a/third_party/nixpkgs/pkgs/applications/audio/openmpt123/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/audio/openmpt123/default.nix
@@ -2,14 +2,14 @@
, usePulseAudio ? config.pulseaudio or false, libpulseaudio }:
let
- version = "0.5.5";
+ version = "0.5.6";
in stdenv.mkDerivation {
pname = "openmpt123";
inherit version;
src = fetchurl {
url = "https://lib.openmpt.org/files/libopenmpt/src/libopenmpt-${version}+release.autotools.tar.gz";
- sha256 = "sha256-8eAUg+vxpoDZ7AMMmvIPXypawPHgZCwYvVWTz6qc62s=";
+ sha256 = "sha256-F96ngrM0wUb0rNlIx8Mf/dKvyJnrNH6+Ab4WBup59Lg=";
};
enableParallelBuilding = true;
diff --git a/third_party/nixpkgs/pkgs/applications/audio/pulseeffects/default.nix b/third_party/nixpkgs/pkgs/applications/audio/pulseeffects/default.nix
index 0ba926fab4..33b15e977e 100644
--- a/third_party/nixpkgs/pkgs/applications/audio/pulseeffects/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/audio/pulseeffects/default.nix
@@ -1,5 +1,6 @@
{ lib, stdenv
, fetchFromGitHub
+, fetchpatch
, meson
, ninja
, pkg-config
@@ -45,13 +46,15 @@ let
];
in stdenv.mkDerivation rec {
pname = "pulseeffects";
- version = "5.0.0";
+ # 5.0.3 crashes. Test carefully before updating.
+ # https://github.com/wwmm/pulseeffects/issues/927
+ version = "5.0.2";
src = fetchFromGitHub {
owner = "wwmm";
repo = "pulseeffects";
rev = "v${version}";
- sha256 = "1zs13bivxlgcb24lz1pgmgy2chcjxnmn4lz7g1n0ygiaaj4c30xj";
+ sha256 = "14ir25q6bws26im6qmj3k6hkfdh5pc6mbvln7wkdwy5dv0vix3cm";
};
nativeBuildInputs = [
@@ -87,6 +90,15 @@ in stdenv.mkDerivation rec {
zita-convolver
];
+ patches = [
+ (fetchpatch {
+ # Fix build failure.
+ # https://github.com/wwmm/pulseeffects/pull/934
+ url = "https://github.com/wwmm/pulseeffects/commit/ab7354a6850d23840b4c9af212dbebf4f31a562f.patch";
+ sha256 = "1hd05xn6sp0xs632mqgwk19hl40kh2f69mx5mgzahysrj057w22c";
+ })
+ ];
+
postPatch = ''
chmod +x meson_post_install.py
patchShebangs meson_post_install.py
@@ -104,6 +116,8 @@ in stdenv.mkDerivation rec {
BOOST_INCLUDEDIR = "${lib.getDev boost}/include";
BOOST_LIBRARYDIR = "${lib.getLib boost}/lib";
+ separateDebugInfo = true;
+
meta = with lib; {
description = "Limiter, compressor, reverberation, equalizer and auto volume effects for Pulseaudio applications";
homepage = "https://github.com/wwmm/pulseeffects";
diff --git a/third_party/nixpkgs/pkgs/applications/audio/qmidinet/default.nix b/third_party/nixpkgs/pkgs/applications/audio/qmidinet/default.nix
index d7b4b83432..ea5430a82a 100644
--- a/third_party/nixpkgs/pkgs/applications/audio/qmidinet/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/audio/qmidinet/default.nix
@@ -1,12 +1,12 @@
{ mkDerivation, lib, fetchurl, pkg-config, qtbase, qttools, alsaLib, libjack2 }:
mkDerivation rec {
- version = "0.6.3";
+ version = "0.9.1";
pname = "qmidinet";
src = fetchurl {
url = "mirror://sourceforge/qmidinet/${pname}-${version}.tar.gz";
- sha256 = "04jbvnf6yp9l0bhl1ym6zqkmaz8c2az3flq7qgflaxzj3isns1p1";
+ sha256 = "sha256-cDgF5hbjy5DzGn4Rlmb76XzRa2wURVwPu2rQRKENxQU=";
};
hardeningDisable = [ "format" ];
diff --git a/third_party/nixpkgs/pkgs/applications/audio/qsynth/default.nix b/third_party/nixpkgs/pkgs/applications/audio/qsynth/default.nix
index f708207cce..417c478e9e 100644
--- a/third_party/nixpkgs/pkgs/applications/audio/qsynth/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/audio/qsynth/default.nix
@@ -4,11 +4,11 @@
mkDerivation rec {
pname = "qsynth";
- version = "0.6.3";
+ version = "0.9.1";
src = fetchurl {
url = "mirror://sourceforge/qsynth/${pname}-${version}.tar.gz";
- sha256 = "0xiqmpzpxjvh32vivfj6h33w0ahmyfjzjb41b6fnf92bbg9k6mqv";
+ sha256 = "sha256-VNcI5QOVacHBcI6psEvhm7+cOTpwr2pMVXmk7nMXNiY=";
};
nativeBuildInputs = [ autoconf pkg-config ];
diff --git a/third_party/nixpkgs/pkgs/applications/audio/sfizz/default.nix b/third_party/nixpkgs/pkgs/applications/audio/sfizz/default.nix
index 85bc9e3542..153e52c82e 100644
--- a/third_party/nixpkgs/pkgs/applications/audio/sfizz/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/audio/sfizz/default.nix
@@ -1,20 +1,49 @@
-{ lib, stdenv, fetchFromGitHub , cmake, libjack2, libsndfile, pkg-config }:
+{ lib, stdenv, fetchFromGitHub
+, libjack2, libsndfile, xorg, freetype, libxkbcommon
+, cairo, glib, gnome3, flac, libogg, libvorbis, libopus
+, cmake, pkg-config
+}:
stdenv.mkDerivation rec {
pname = "sfizz";
- version = "0.4.0";
+ version = "0.5.1";
src = fetchFromGitHub {
owner = "sfztools";
repo = pname;
rev = version;
- sha256 = "0zpmvmh7n0064rxfqxb7z9rnz493k7yq7nl0vxppqnasg97jn5f3";
+ sha256 = "sha256-3RdY5+BPsdk6vctDy24w5aJsVOV9qzSgXs62Pm5UEKs=";
fetchSubmodules = true;
};
+ buildInputs = [
+ libjack2
+ libsndfile
+ flac
+ libogg
+ libvorbis
+ libopus
+ xorg.libX11
+ xorg.libxcb
+ xorg.libXau
+ xorg.libXdmcp
+ xorg.xcbutil
+ xorg.xcbutilcursor
+ xorg.xcbutilrenderutil
+ xorg.xcbutilkeysyms
+ xorg.xcbutilimage
+ libxkbcommon
+ cairo
+ glib
+ gnome3.zenity
+ freetype
+ ];
nativeBuildInputs = [ cmake pkg-config ];
- buildInputs = [ libjack2 libsndfile ];
+ postPatch = ''
+ substituteInPlace editor/external/vstgui4/vstgui/lib/platform/linux/x11fileselector.cpp \
+ --replace '"/usr/bin/zenity' '"${gnome3.zenity}/bin/zenity'
+ '';
cmakeFlags = [
"-DCMAKE_BUILD_TYPE=Release"
diff --git a/third_party/nixpkgs/pkgs/applications/audio/spotify/default.nix b/third_party/nixpkgs/pkgs/applications/audio/spotify/default.nix
index 655a047a3a..69aae9d643 100644
--- a/third_party/nixpkgs/pkgs/applications/audio/spotify/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/audio/spotify/default.nix
@@ -1,7 +1,7 @@
{ fetchurl, lib, stdenv, squashfsTools, xorg, alsaLib, makeWrapper, openssl, freetype
-, glib, pango, cairo, atk, gdk-pixbuf, gtk2, cups, nspr, nss, libpng, libnotify
+, glib, pango, cairo, atk, gdk-pixbuf, gtk3, cups, nspr, nss, libpng, libnotify
, libgcrypt, systemd, fontconfig, dbus, expat, ffmpeg_3, curl, zlib, gnome3
-, at-spi2-atk, at-spi2-core, libpulseaudio, libdrm, mesa
+, at-spi2-atk, at-spi2-core, libpulseaudio, libdrm, mesa, libxkbcommon
}:
let
@@ -10,14 +10,14 @@ let
# If an update breaks things, one of those might have valuable info:
# https://aur.archlinux.org/packages/spotify/
# https://community.spotify.com/t5/Desktop-Linux
- version = "1.1.46.916.g416cacf1";
+ version = "1.1.55.494.gca75f788";
# To get the latest stable revision:
# curl -H 'X-Ubuntu-Series: 16' 'https://api.snapcraft.io/api/v1/snaps/details/spotify?channel=stable' | jq '.download_url,.version,.last_updated'
# To get general information:
# curl -H 'Snap-Device-Series: 16' 'https://api.snapcraft.io/v2/snaps/info/spotify' | jq '.'
# More examples of api usage:
# https://github.com/canonical-websites/snapcraft.io/blob/master/webapp/publisher/snaps/views.py
- rev = "43";
+ rev = "45";
deps = [
alsaLib
@@ -34,12 +34,13 @@ let
freetype
gdk-pixbuf
glib
- gtk2
+ gtk3
libdrm
libgcrypt
libnotify
libpng
libpulseaudio
+ libxkbcommon
mesa
nss
pango
@@ -78,11 +79,10 @@ stdenv.mkDerivation {
# https://community.spotify.com/t5/Desktop-Linux/Redistribute-Spotify-on-Linux-Distributions/td-p/1695334
src = fetchurl {
url = "https://api.snapcraft.io/api/v1/snaps/download/pOBIoZ2LrCB3rDohMxoYGnbN14EHOgD7_${rev}.snap";
- sha512 = "5b3d5d1f52a554c8e775b8aed16ef84e96bf3b61a2b53266e10d3c47e341899310af13cc8513b04424fc14532e36543a6fae677f80a036e3f51c75166d8d53d1";
+ sha512 = "5d61a2d5b26be651620ab5d18d3a204d8d7b09dcec8a733ddc176c44cb43e9176c4350933ebe4498b065ba219113f3226c13bea9659da738fe635f41d01db303";
};
- nativeBuildInputs = [ makeWrapper ];
- buildInputs = [ squashfsTools ];
+ nativeBuildInputs = [ makeWrapper squashfsTools ];
dontStrip = true;
dontPatchELF = true;
diff --git a/third_party/nixpkgs/pkgs/applications/backup/pika-backup/default.nix b/third_party/nixpkgs/pkgs/applications/backup/pika-backup/default.nix
index 51f00d021c..7f7be99f9a 100644
--- a/third_party/nixpkgs/pkgs/applications/backup/pika-backup/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/backup/pika-backup/default.nix
@@ -19,20 +19,20 @@
stdenv.mkDerivation rec {
pname = "pika-backup";
- version = "0.2.1";
+ version = "0.2.2";
src = fetchFromGitLab {
domain = "gitlab.gnome.org";
owner = "World";
repo = "pika-backup";
rev = "v${version}";
- sha256 = "0fm6vwpw0pa98v2yn8p3818rrlv9lk3pmgnal1b2kh52im5ll7m8";
+ sha256 = "16284gv31wdwmb99056962d1gh6xz26ami6synr47nsbbp5l0s6k";
};
cargoDeps = rustPlatform.fetchCargoTarball {
inherit src;
name = "${pname}-${version}";
- sha256 = "1f5s6a0wjrs2spsicirhbvb5xlz9iflwsaqchij9k02hfcsr308y";
+ sha256 = "12ymjwpxx3sdna8w5j9fnwwfk8ynk9ziwl0lkpq68y0vyllln5an";
};
patches = [
diff --git a/third_party/nixpkgs/pkgs/applications/blockchains/btcpayserver/default.nix b/third_party/nixpkgs/pkgs/applications/blockchains/btcpayserver/default.nix
index 52914c1128..61ce54beec 100644
--- a/third_party/nixpkgs/pkgs/applications/blockchains/btcpayserver/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/blockchains/btcpayserver/default.nix
@@ -1,5 +1,5 @@
{ lib, stdenv, fetchFromGitHub, fetchurl, linkFarmFromDrvs, makeWrapper,
- dotnetPackages, dotnetCorePackages, writeScript, bash
+ dotnetPackages, dotnetCorePackages
}:
let
@@ -15,13 +15,13 @@ in
stdenv.mkDerivation rec {
pname = "btcpayserver";
- version = "1.0.6.8";
+ version = "1.0.7.0";
src = fetchFromGitHub {
owner = pname;
repo = pname;
rev = "v${version}";
- sha256 = "1znmix9w7ahzyb933lxzqv6j8j5qycknq3gmnkakj749ksshql1b";
+ sha256 = "1pbq0kik29sx1lwlic7fvhnjhrpnlk94w53wmywqnlpgjscx8x8a";
};
nativeBuildInputs = [ dotnetSdk dotnetPackages.Nuget makeWrapper ];
diff --git a/third_party/nixpkgs/pkgs/applications/blockchains/btcpayserver/deps.nix b/third_party/nixpkgs/pkgs/applications/blockchains/btcpayserver/deps.nix
index 9065ff49cf..b579fc8f7f 100644
--- a/third_party/nixpkgs/pkgs/applications/blockchains/btcpayserver/deps.nix
+++ b/third_party/nixpkgs/pkgs/applications/blockchains/btcpayserver/deps.nix
@@ -19,6 +19,11 @@
version = "3.3.110.10";
sha256 = "1lf1hfbx792dpa1hxgn0a0jrrvldd16hgbxx229dk2qcz5qlnc38";
})
+ (fetchNuGet {
+ name = "BIP78.Sender";
+ version = "0.2.0";
+ sha256 = "0gyynn15rc1x9p2703ffi4jnbpbd0k3wvg839xrk2skmaw8nxamf";
+ })
(fetchNuGet {
name = "BTCPayServer.Hwi";
version = "1.1.3";
@@ -26,38 +31,43 @@
})
(fetchNuGet {
name = "BTCPayServer.Lightning.All";
- version = "1.2.4";
- sha256 = "1f4wgs8ijk1wmppz5lmas7l6m83szz57jyk6ak0dxhccdld9rdaj";
+ version = "1.2.7";
+ sha256 = "0jzmzvlpf6iba2fsc6cyi69vlaim9slqm2sapknmd7drl3gcn2zj";
})
(fetchNuGet {
name = "BTCPayServer.Lightning.Charge";
- version = "1.2.1";
- sha256 = "0iv9frbr6xfxif3pnfd7c87y8mv31nqkdrnhvnaswrx43nv6s272";
+ version = "1.2.3";
+ sha256 = "1rdrwmijx0v4z0xsq4acyvdcj7hv6arfh3hwjy89rqnkkznrzgwv";
})
(fetchNuGet {
name = "BTCPayServer.Lightning.CLightning";
- version = "1.2.1";
- sha256 = "14km69jzmnyqg19w27g6znml4z0xkm8l4j7rj0x36bw67cjmgahv";
+ version = "1.2.3";
+ sha256 = "02197rh03q8d0mv40zf67wp1rd2gbxi5l8krd2rzj84n267bcfvc";
})
(fetchNuGet {
name = "BTCPayServer.Lightning.Common";
version = "1.2.0";
sha256 = "17di8ndkw8z0ci0zk15mcrqpmganwkz9ys2snr2rqpw5mrlhpwa0";
})
+ (fetchNuGet {
+ name = "BTCPayServer.Lightning.Common";
+ version = "1.2.2";
+ sha256 = "07xb7fsqvfjmcawxylriw60i73h0cvfb765aznhp9ffyrmjaql7z";
+ })
(fetchNuGet {
name = "BTCPayServer.Lightning.Eclair";
- version = "1.2.0";
- sha256 = "0w7nwsr0n2hrqak023xa294palsk3r96wlgw2ks8d3p5kxm8kskp";
+ version = "1.2.2";
+ sha256 = "03dymhwxb5s28kb187g5h4aysnz2xzml89p47nmwz9lkg2h4s73h";
})
(fetchNuGet {
name = "BTCPayServer.Lightning.LND";
- version = "1.2.1";
- sha256 = "0ql4qyvz0rms6ls46pi3bgak3r6hj2c5ivnzahiq6cb84pbl61cr";
+ version = "1.2.4";
+ sha256 = "0qnj5rsp6hnybsr58zny9dfbsxksg1674q0z9944jwkzm7pcqyg4";
})
(fetchNuGet {
name = "BTCPayServer.Lightning.Ptarmigan";
- version = "1.2.0";
- sha256 = "1yd6nhlssb9k08p5491knlwwjij9324ildir99sa9cp24rlq5nis";
+ version = "1.2.2";
+ sha256 = "17yl85vqfp7l12bv3f3w1b861hm41i7cfhs78gaq04s4drvcnj6k";
})
(fetchNuGet {
name = "BuildBundlerMinifier";
@@ -79,11 +89,6 @@
version = "15.0.5";
sha256 = "01y8bhsnxghn3flz0pr11vj6wjrpmia8rpdrsp7kjfc1zmhqlgma";
})
- (fetchNuGet {
- name = "DBriize";
- version = "1.0.1.3";
- sha256 = "0rsm68hwq2ky8i6mv3ckdjkj4vjygnkgk3disva0skl3apk833dc";
- })
(fetchNuGet {
name = "DigitalRuby.ExchangeSharp";
version = "0.6.3";
@@ -666,13 +671,8 @@
})
(fetchNuGet {
name = "NBitcoin.Altcoins";
- version = "2.0.21";
- sha256 = "0xmygiwjlia7fbxy63893jb15g6fxggxxr9bbm8znd9bs3jzp2g1";
- })
- (fetchNuGet {
- name = "NBitcoin";
- version = "5.0.33";
- sha256 = "030q609b9lhapq4wfl1w3impjw5m40kz2rg1s9jn3bn8yjfmsi4a";
+ version = "2.0.28";
+ sha256 = "1zfirfmhgigp733km9rqkgz560h5wg88bpba499x49h5j650cnn4";
})
(fetchNuGet {
name = "NBitcoin";
@@ -686,13 +686,13 @@
})
(fetchNuGet {
name = "NBitcoin";
- version = "5.0.60";
- sha256 = "0pin4ldfz5lfxyd47mj1ypyp8lmj0v5nq5zvygdjna956vphd39v";
+ version = "5.0.67";
+ sha256 = "049marx1jwr7srlpqspimrqqgahh53gi2iyp7bpzn5npsbzh9v3h";
})
(fetchNuGet {
name = "NBitcoin";
- version = "5.0.68";
- sha256 = "0k275mbp9wannm10pqj4nv8agjc1f6hsrfhl0m6ax1apv81sfxcd";
+ version = "5.0.73";
+ sha256 = "0vqgcb0ws5fnkrdzqfkyh78041c6q4l22b93rr0006dd4bmqrmg1";
})
(fetchNuGet {
name = "NBitpayClient";
@@ -701,8 +701,8 @@
})
(fetchNuGet {
name = "NBXplorer.Client";
- version = "3.0.19";
- sha256 = "0nahfxdsryf5snjy87770m51v2jcry02lmb10ilsg4h2ig4pjdk4";
+ version = "3.0.20";
+ sha256 = "1mwa6ncmg5r6q7yn6skm9dgqm631c7r7nadcg9mvbw81113h0xxy";
})
(fetchNuGet {
name = "NETStandard.Library";
@@ -729,11 +729,6 @@
version = "10.0.3";
sha256 = "06vy67bkshclpz69kps4vgzc9h2cgg41c8vlqmdbwclfky7c4haq";
})
- (fetchNuGet {
- name = "Newtonsoft.Json";
- version = "11.0.1";
- sha256 = "1z68j07if1xf71lbsrgbia52r812i2dv541sy44ph4dzjjp7pd4m";
- })
(fetchNuGet {
name = "Newtonsoft.Json";
version = "11.0.2";
@@ -921,8 +916,8 @@
})
(fetchNuGet {
name = "Selenium.WebDriver.ChromeDriver";
- version = "87.0.4280.8800";
- sha256 = "1zrizydlhjv81r1fa5g8wzxrx1cxly3ip7pargj48hdx419iblfr";
+ version = "88.0.4324.9600";
+ sha256 = "0jm8dpfp329xsrg69lzq2m6x9yin1m43qgrhs15cz2qx9f02pdx9";
})
(fetchNuGet {
name = "Selenium.WebDriver";
diff --git a/third_party/nixpkgs/pkgs/applications/blockchains/lndmanage.nix b/third_party/nixpkgs/pkgs/applications/blockchains/lndmanage.nix
new file mode 100644
index 0000000000..56db469ff4
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/applications/blockchains/lndmanage.nix
@@ -0,0 +1,44 @@
+{ lib, fetchFromGitHub, python3Packages }:
+
+python3Packages.buildPythonApplication rec {
+ pname = "lndmanage";
+ version = "0.11.0";
+
+ src = fetchFromGitHub {
+ owner = "bitromortac";
+ repo = pname;
+ rev = "v${version}";
+ sha256 = "19sqf7cjslwpfzcdbyq182dx7gnn9hii77sahbnh88v69qxgwzvb";
+ };
+
+ propagatedBuildInputs = with python3Packages; [
+ cycler
+ decorator
+ googleapis-common-protos
+ grpcio
+ grpcio-tools
+ kiwisolver
+ networkx
+ numpy
+ protobuf
+ pyparsing
+ python-dateutil
+ six
+ pygments
+ ];
+
+ preBuild = ''
+ substituteInPlace setup.py --replace '==' '>='
+ '';
+
+ preCheck = ''
+ export HOME=$(mktemp -d)
+ '';
+
+ meta = with lib; {
+ description = "Channel management tool for lightning network daemon (LND) operators";
+ homepage = "https://github.com/bitromortac/lndmanage";
+ license = licenses.mit;
+ maintainers = with maintainers; [ mmilata ];
+ };
+}
diff --git a/third_party/nixpkgs/pkgs/applications/blockchains/openethereum/default.nix b/third_party/nixpkgs/pkgs/applications/blockchains/openethereum/default.nix
index 5dc35e996b..e4d8d72fb4 100644
--- a/third_party/nixpkgs/pkgs/applications/blockchains/openethereum/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/blockchains/openethereum/default.nix
@@ -12,16 +12,16 @@
rustPlatform.buildRustPackage rec {
pname = "openethereum";
- version = "3.1.1";
+ version = "3.2.1";
src = fetchFromGitHub {
owner = "openethereum";
repo = "openethereum";
rev = "v${version}";
- sha256 = "sha256-RUrJuJF0R0mc7XdLyk915fRWtMfzjp5QE6oeWxHfyEQ=";
+ sha256 = "sha256-+bzMo0s+wdp8T/YjPk6mrPSPid1G8WScB8FJhXdL9JQ=";
};
- cargoSha256 = "sha256-b+winsCzU0sXGDX6nUtWq4JrIyTcJ3uva7RlV5VsXfk=";
+ cargoSha256 = "sha256-ibjjJ5zGF6wbO24/RoYKsTYsMNXHb1EdekDwSICPc5g=";
LIBCLANG_PATH = "${llvmPackages.libclang}/lib";
nativeBuildInputs = [
diff --git a/third_party/nixpkgs/pkgs/applications/blockchains/wasabiwallet/default.nix b/third_party/nixpkgs/pkgs/applications/blockchains/wasabiwallet/default.nix
index e24531c373..e86d145bdf 100644
--- a/third_party/nixpkgs/pkgs/applications/blockchains/wasabiwallet/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/blockchains/wasabiwallet/default.nix
@@ -24,11 +24,11 @@ let
in
stdenv.mkDerivation rec {
pname = "wasabiwallet";
- version = "1.1.12.4";
+ version = "1.1.12.5";
src = fetchurl {
url = "https://github.com/zkSNACKs/WalletWasabi/releases/download/v${version}/Wasabi-${version}.tar.gz";
- sha256 = "sha256-1yg0C1lJrLxQEs2GA+XEBUx/JAyc+aW0UWjLhSEy0RI=";
+ sha256 = "sha256-6KIsSsCAyZ6uYSbDBIKdtM4adGOttvJ78obCptcd57s=";
};
dontBuild = true;
diff --git a/third_party/nixpkgs/pkgs/applications/display-managers/sddm/default.nix b/third_party/nixpkgs/pkgs/applications/display-managers/sddm/default.nix
index f43d3ca9be..029501c778 100644
--- a/third_party/nixpkgs/pkgs/applications/display-managers/sddm/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/display-managers/sddm/default.nix
@@ -1,4 +1,4 @@
-{ mkDerivation, lib, fetchFromGitHub
+{ mkDerivation, lib, fetchFromGitHub, fetchpatch
, cmake, extra-cmake-modules, pkg-config, libxcb, libpthreadstubs
, libXdmcp, libXau, qtbase, qtdeclarative, qtquickcontrols2, qttools, pam, systemd
}:
@@ -19,6 +19,12 @@ in mkDerivation {
patches = [
./sddm-ignore-config-mtime.patch
+ # Load `/etc/profile` for `environment.variables` with zsh default shell.
+ # See: https://github.com/sddm/sddm/pull/1382
+ (fetchpatch {
+ url = "https://github.com/sddm/sddm/commit/e1dedeeab6de565e043f26ac16033e613c222ef9.patch";
+ sha256 = "sha256-OPyrUI3bbH+PGDBfoL4Ohb4wIvmy9TeYZhE0JxR/D58=";
+ })
];
postPatch =
diff --git a/third_party/nixpkgs/pkgs/applications/editors/bluefish/default.nix b/third_party/nixpkgs/pkgs/applications/editors/bluefish/default.nix
index 2507cb13d7..59d1f11312 100644
--- a/third_party/nixpkgs/pkgs/applications/editors/bluefish/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/editors/bluefish/default.nix
@@ -1,5 +1,5 @@
{ lib, stdenv, fetchurl, intltool, wrapGAppsHook, pkg-config , gtk, libxml2
-, enchant, gucharmap, python, gnome3
+, enchant, gucharmap, python3, gnome3
}:
stdenv.mkDerivation rec {
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ intltool pkg-config wrapGAppsHook ];
buildInputs = [ gnome3.adwaita-icon-theme gtk libxml2
- enchant gucharmap python ];
+ enchant gucharmap python3 ];
meta = with lib; {
description = "A powerful editor targeted towards programmers and webdevelopers";
diff --git a/third_party/nixpkgs/pkgs/applications/editors/emacs-modes/elpa-generated.nix b/third_party/nixpkgs/pkgs/applications/editors/emacs-modes/elpa-generated.nix
index a389cf539a..857b0562c0 100644
--- a/third_party/nixpkgs/pkgs/applications/editors/emacs-modes/elpa-generated.nix
+++ b/third_party/nixpkgs/pkgs/applications/editors/emacs-modes/elpa-generated.nix
@@ -223,10 +223,10 @@
elpaBuild {
pname = "auctex";
ename = "auctex";
- version = "13.0.4";
+ version = "13.0.5";
src = fetchurl {
- url = "https://elpa.gnu.org/packages/auctex-13.0.4.tar";
- sha256 = "1362dqb8mcaddda9849gqsj6rzlfq18xprddb74j02884xl7hq65";
+ url = "https://elpa.gnu.org/packages/auctex-13.0.5.tar";
+ sha256 = "072wwsqfl8n2gi2inbp0s8k1ydr6fh1zyvc3rgynwzibjjniy319";
};
packageRequires = [ cl-lib emacs ];
meta = {
@@ -2203,10 +2203,10 @@
elpaBuild {
pname = "modus-operandi-theme";
ename = "modus-operandi-theme";
- version = "0.13.1";
+ version = "0.13.2";
src = fetchurl {
- url = "https://elpa.gnu.org/packages/modus-operandi-theme-0.13.1.tar";
- sha256 = "08l9qmhvxiscxn4mfb80x57mk4gfm5r0fs2l9c8i3gfzd4i3h091";
+ url = "https://elpa.gnu.org/packages/modus-operandi-theme-0.13.2.tar";
+ sha256 = "1sw18ijp9rhaf8y8x8z5rmxy23pxd3gaicgmp2zndcfmm54gwsic";
};
packageRequires = [ emacs modus-themes ];
meta = {
@@ -2237,10 +2237,10 @@
elpaBuild {
pname = "modus-vivendi-theme";
ename = "modus-vivendi-theme";
- version = "0.13.1";
+ version = "0.13.2";
src = fetchurl {
- url = "https://elpa.gnu.org/packages/modus-vivendi-theme-0.13.1.tar";
- sha256 = "0xz304zcc872c2zwnlm8ky0m18smf7bffiyj21ygghgclr7kgma1";
+ url = "https://elpa.gnu.org/packages/modus-vivendi-theme-0.13.2.tar";
+ sha256 = "1qn3kzxwf81zc7gprd9wblhb8b8akdkxwajpgk036y8i4cmvmspn";
};
packageRequires = [ emacs modus-themes ];
meta = {
@@ -3252,10 +3252,10 @@
elpaBuild {
pname = "setup";
ename = "setup";
- version = "0.1.1";
+ version = "0.1.2";
src = fetchurl {
- url = "https://elpa.gnu.org/packages/setup-0.1.1.tar";
- sha256 = "0z34m06lxw6xd6bxacm1h5cijamsksk4daf6fbzhd7kqmw3gbgqg";
+ url = "https://elpa.gnu.org/packages/setup-0.1.2.tar";
+ sha256 = "1q29phch4fvmvc255kgvzsnzdqp6kaip7ybpxprd0kkdjs3jrsqv";
};
packageRequires = [ emacs ];
meta = {
diff --git a/third_party/nixpkgs/pkgs/applications/editors/emacs-modes/org-generated.nix b/third_party/nixpkgs/pkgs/applications/editors/emacs-modes/org-generated.nix
index 7ed43a82cc..01ad01f904 100644
--- a/third_party/nixpkgs/pkgs/applications/editors/emacs-modes/org-generated.nix
+++ b/third_party/nixpkgs/pkgs/applications/editors/emacs-modes/org-generated.nix
@@ -4,10 +4,10 @@
elpaBuild {
pname = "org";
ename = "org";
- version = "20210315";
+ version = "20210322";
src = fetchurl {
- url = "https://orgmode.org/elpa/org-20210315.tar";
- sha256 = "128agds82kfmvxshzrs61802vgwlf2dsm79hq9x2bljrnvf8p14l";
+ url = "https://orgmode.org/elpa/org-20210322.tar";
+ sha256 = "0iv54rhwa0972yr1wqzmlkggs5vc6qajz8mmyfhynp65ap088g6v";
};
packageRequires = [];
meta = {
@@ -19,10 +19,10 @@
elpaBuild {
pname = "org-plus-contrib";
ename = "org-plus-contrib";
- version = "20210315";
+ version = "20210322";
src = fetchurl {
- url = "https://orgmode.org/elpa/org-plus-contrib-20210315.tar";
- sha256 = "0dih4690pbbnwlphjnv1kgvsw43pkcgk41xjjiphy9sf7w9gr11j";
+ url = "https://orgmode.org/elpa/org-plus-contrib-20210322.tar";
+ sha256 = "0riswc3ira8hsawm37yypji55z47bw2477kaw3qx7ghz3n62r9nf";
};
packageRequires = [];
meta = {
diff --git a/third_party/nixpkgs/pkgs/applications/editors/emacs-modes/recipes-archive-melpa.json b/third_party/nixpkgs/pkgs/applications/editors/emacs-modes/recipes-archive-melpa.json
index 3b9cb3f528..7703579db8 100644
--- a/third_party/nixpkgs/pkgs/applications/editors/emacs-modes/recipes-archive-melpa.json
+++ b/third_party/nixpkgs/pkgs/applications/editors/emacs-modes/recipes-archive-melpa.json
@@ -1918,8 +1918,8 @@
"annotation",
"eri"
],
- "commit": "232fa59a8e7954d20fbac8aac7f51bcf58c2f299",
- "sha256": "016dk9gf86fm2s6xd016jml895h8zqlyrp1bw7khzq5xliny7d08"
+ "commit": "ecb93230ad9327991e542731756cbe1405c85d5f",
+ "sha256": "1acs54ngr26qw5hbhq7xdw4wspqhhmr97gj6rnwxhz4yx02wxd9w"
},
"stable": {
"version": [
@@ -2442,14 +2442,14 @@
"repo": "seagle0128/all-the-icons-ibuffer",
"unstable": {
"version": [
- 20210218,
- 1006
+ 20210325,
+ 512
],
"deps": [
"all-the-icons"
],
- "commit": "d08e8d4043d8731b81f74421cf0455ba8845113a",
- "sha256": "1sk83c9inm14s0v11ij43ldkskyhwf3lyfm5nq4pa0nbn1dpkvb0"
+ "commit": "5a984b4d7f811e2ad08fdc461a1e89205804b7bd",
+ "sha256": "05bglgqc4q5p9zr6ylllg16crpxcnb6p51xkk5v1nljgi3n9786l"
},
"stable": {
"version": [
@@ -2511,8 +2511,8 @@
"all-the-icons",
"ivy-rich"
],
- "commit": "82877633366139cc858f243b9d7fdff83c1ebe62",
- "sha256": "0jyqgp9hgxy8qc8hdzr6gi8vwxaw7sz9lg297rmqx6i1hnv247aq"
+ "commit": "2efbbf231ea3b3248177051a10c52c151686c4b4",
+ "sha256": "1rrnanmmq07jx83w51b9gpwv2al1xw01xqb6xbpzd4bi2gjlayy5"
},
"stable": {
"version": [
@@ -3104,11 +3104,11 @@
"repo": "bastibe/annotate.el",
"unstable": {
"version": [
- 20210211,
- 1931
+ 20210322,
+ 1739
],
- "commit": "3e0d5f39b24eeded849c1c4903f9a75976732d2b",
- "sha256": "1l1xmb12qfs0rvgvqqnbjn0njdgxiprxx6fd0vzinlpfdfk1f39j"
+ "commit": "54ac759facadacbfea5c1e7c2975e2da6434cdda",
+ "sha256": "18pr4bympwl6c2a1bsk4s8ixg4l7ykcxfh1bk42vvbcqnbmvd7dw"
},
"stable": {
"version": [
@@ -3146,8 +3146,8 @@
20200914,
644
],
- "commit": "232fa59a8e7954d20fbac8aac7f51bcf58c2f299",
- "sha256": "016dk9gf86fm2s6xd016jml895h8zqlyrp1bw7khzq5xliny7d08"
+ "commit": "ecb93230ad9327991e542731756cbe1405c85d5f",
+ "sha256": "1acs54ngr26qw5hbhq7xdw4wspqhhmr97gj6rnwxhz4yx02wxd9w"
},
"stable": {
"version": [
@@ -3775,11 +3775,11 @@
"repo": "motform/arduino-cli-mode",
"unstable": {
"version": [
- 20210119,
- 1200
+ 20210321,
+ 1641
],
- "commit": "10d5cfa1563f314e5b24b151f63b9579992a7ba5",
- "sha256": "0czbp56jg40y33p05l1wvrinjiz795zjk4gyxyvjbra11a8byf84"
+ "commit": "1724860a6a930a539472bb56bc3cae0e317dc055",
+ "sha256": "184phkylr4ax586glx7qx2f8yfdbbjx94vwq698z2yxs4jphni91"
}
},
{
@@ -5454,8 +5454,8 @@
"avy",
"embark"
],
- "commit": "4e3e751725787f18b55defc2fe7d8115adf524fd",
- "sha256": "03qqc5yw7pyz58pdkvypw63ls14pm9gkcfvrf66fidmbi5w4fg54"
+ "commit": "49cd0aff39e7bc9173ec49d1c14d7ab8d9d25355",
+ "sha256": "19ihm3v7ck5rx4wff5hkrrzqbjk9g9vm8j0axvdf77hr6vzjsak8"
},
"stable": {
"version": [
@@ -5498,14 +5498,14 @@
"repo": "mrkkrp/avy-menu",
"unstable": {
"version": [
- 20190713,
- 1348
+ 20210321,
+ 1732
],
"deps": [
"avy"
],
- "commit": "970204989bcd4a4f8223c2fe980a08dc58441045",
- "sha256": "196pwh83p0yrnagpiig8h2mq9xxm7wk9q8x832ffwizip4yni80b"
+ "commit": "2c5e0c08d6cb27c213a8eda5c7033e3ff2aa9661",
+ "sha256": "11sa9a5vh546dpnxmrhxps77c225vkrfqsb6qlsnli2kmp5cxj48"
},
"stable": {
"version": [
@@ -6040,11 +6040,11 @@
"repo": "belak/base16-emacs",
"unstable": {
"version": [
- 20210206,
- 1822
+ 20210320,
+ 519
],
- "commit": "041e442b6ab2b85a254e17bfc776a508e1b66abf",
- "sha256": "1rcw4jsla3fhrb6b5margiwk2i2m0rrf3vp8lxk8vdg9bsy5ikmc"
+ "commit": "0c3aa33520ae4cb467c76ce53d438827df77eb1a",
+ "sha256": "0ibwxwyncyrgbpvhcx523813njdgln34wmqf0x826qv4hh4ai0yw"
},
"stable": {
"version": [
@@ -6377,14 +6377,14 @@
"repo": "tohojo/bbdb-vcard",
"unstable": {
"version": [
- 20201016,
- 1902
+ 20210325,
+ 2208
],
"deps": [
"bbdb"
],
- "commit": "8d2fa496e58ded18f5eb589c1781adaf48a5f73f",
- "sha256": "0ssmr4cyywqhr42fjmk5z3hb1z7ddbbz8y9sc5bzad7wncbybwbv"
+ "commit": "113c66115ce68316e209f51ebce56de8dded3606",
+ "sha256": "1sr5kd2gvw1b4hl147yb60cgx6j730vdnpyr09p7vmpw65hzwlwm"
},
"stable": {
"version": [
@@ -6514,11 +6514,11 @@
"repo": "DamienCassou/beginend",
"unstable": {
"version": [
- 20210319,
- 1039
+ 20210320,
+ 1115
],
- "commit": "94465a6c80827e7db9dc2384932b168a0d8254e4",
- "sha256": "1jnx6fqmj0i4kxpw03znribqj5nlhyprwlmsbi63hjzbd51h83q3"
+ "commit": "18d0bbde367dfe259d697d1c589e3040d69797ee",
+ "sha256": "13gdlaiqi3jnavwrwj5ic9aqycfvbzw8d4v0413nwzag35bz4mpl"
},
"stable": {
"version": [
@@ -7773,8 +7773,8 @@
"repo": "boogie-org/boogie-friends",
"unstable": {
"version": [
- 20210311,
- 620
+ 20210323,
+ 1836
],
"deps": [
"cl-lib",
@@ -7783,8 +7783,8 @@
"flycheck",
"yasnippet"
],
- "commit": "7193bef7d45232bdbd0b42cbd8893c15f68ad0e5",
- "sha256": "1wj5wak9vwq0jp2kvw78g07h9k48qcx7jn61yfn1n9rzyigaxa8a"
+ "commit": "bc5572f796bc3ecafadadcbd93de73052304c856",
+ "sha256": "0x1lw3cx9vx0l9xr9683p2385msny8dkp2w5l6kfa8imbyclpkp2"
}
},
{
@@ -7819,8 +7819,8 @@
"repo": "jyp/boon",
"unstable": {
"version": [
- 20210305,
- 1714
+ 20210323,
+ 1341
],
"deps": [
"dash",
@@ -7828,8 +7828,8 @@
"multiple-cursors",
"pcre2el"
],
- "commit": "948501463dc2c63e133dda3b3ed28f4c81d24d26",
- "sha256": "05q98rzhmkjmqfkhxy6g7qaybvgc6ypxvz5yiajwm8gcwwch2han"
+ "commit": "17a7a9219a5a9b7156f58f7f30227fc2b79b6020",
+ "sha256": "1jcvz9vy5sz9bysrlg2b9d3732zab8hmg8hg5ghwjx5kgxl2yfzh"
},
"stable": {
"version": [
@@ -8047,14 +8047,14 @@
"url": "https://bitbucket.org/MikeWoolley/brf-mode",
"unstable": {
"version": [
- 20200811,
- 1622
+ 20210325,
+ 2154
],
"deps": [
"fringe-helper"
],
- "commit": "4e12ec16d6b896402f8bcdc1cd468d4064a2df6f",
- "sha256": "1pdrpvff6hvhjv512z1vkivd848ar5li4p63jnbvl90hp7kpy7c3"
+ "commit": "733a44bc491d9d28f9eefc2550616e97b1419cee",
+ "sha256": "0dfd3w3g31fjzqvzn57xw3whr60fy8yj8hnga8b4n9698dihw0bn"
},
"stable": {
"version": [
@@ -9408,16 +9408,16 @@
"repo": "chenyanming/calibredb.el",
"unstable": {
"version": [
- 20201225,
- 854
+ 20210321,
+ 944
],
"deps": [
"dash",
"s",
"transient"
],
- "commit": "1f38fc34a8c159846450d18b1ee50cc960349ee7",
- "sha256": "18m8g9scjllckq1c71z2dl1khgjq02d65vjakxbiyp0c049f40mq"
+ "commit": "a3b04c0c37b1e8ceff2472e21a3579e64e944528",
+ "sha256": "04fzskx066v5091467da3plsxkqx3acbaqmk282k8cdaxsnr4ifd"
},
"stable": {
"version": [
@@ -9720,8 +9720,8 @@
"s",
"shut-up"
],
- "commit": "d1ee01ba3c06a62e784c3982ad6f50dbabf5c00f",
- "sha256": "1fbk6b4jpg9sg886dbd66fmmwawrjzdw564d49822s6vnjhgs0wf"
+ "commit": "7ae2d54004b26ebb891f7a011c86cff706acbf1a",
+ "sha256": "1ksw4rcbghjjni7v622cdfd84312fs39xhiyzbk7xmh57clrbx4f"
},
"stable": {
"version": [
@@ -10238,8 +10238,8 @@
20171115,
2108
],
- "commit": "225c5e0cbd4704606eaafecb908bcd8daed4c54f",
- "sha256": "1k8lx2s61kynhdv43czasp27vxb3bh6kmpsd0caxklk5n6m804rj"
+ "commit": "9914e9c951e1598bafb6bce8cf5ad5cbe260d290",
+ "sha256": "1ziq8xq94nys5g95jrng1w33rsmhfi0k3bfbsfh8ifvz2lhd1ai5"
},
"stable": {
"version": [
@@ -10466,14 +10466,14 @@
"repo": "mrkkrp/char-menu",
"unstable": {
"version": [
- 20190713,
- 1343
+ 20210321,
+ 1657
],
"deps": [
"avy-menu"
],
- "commit": "a1ccf5ed786af6e2441037964668d817b9c7362f",
- "sha256": "19yl7gmzalhrhr3spi8vs6wpxpv6m3m1d9564naznswxx19sjcjy"
+ "commit": "d77c4d64fc8acc386a0fb9727d346c838e75f011",
+ "sha256": "11hls33r3lq46griyvpfnwkgwfwa4adfjzd03hcx2dn5ji0x0yxb"
},
"stable": {
"version": [
@@ -10973,8 +10973,8 @@
"repo": "clojure-emacs/cider",
"unstable": {
"version": [
- 20210318,
- 837
+ 20210325,
+ 825
],
"deps": [
"clojure-mode",
@@ -10985,8 +10985,8 @@
"sesman",
"spinner"
],
- "commit": "32835ea157212c500756ab625ddba4844b029c14",
- "sha256": "0h9wwk72gp19fljiv9c18h5qz7ckddqhcvppm9k0vddxy7vhbhv5"
+ "commit": "4278d7cf0b54af5cc84f4a521ee1ed6e81a96adc",
+ "sha256": "1538cfygk1yr8nr5axjqa29jd2n8v6mwk6plgvnrdrp1msspcvm2"
},
"stable": {
"version": [
@@ -11177,14 +11177,14 @@
"repo": "jorgenschaefer/circe",
"unstable": {
"version": [
- 20210111,
- 2141
+ 20210323,
+ 1704
],
"deps": [
"cl-lib"
],
- "commit": "265f36c1e6c8db598742778dc64f9799896f5dc1",
- "sha256": "0vf76rrgkpybi67n14g6gn1a7by7b90gxa8rz2m50xl3vdphnibk"
+ "commit": "e67e2d1149ebf3e79cd2162e78802af3ed5f82da",
+ "sha256": "0jrpa8kndq2v69nr9jva970q0n3662x2g0chg89nd2d3gbv693mw"
},
"stable": {
"version": [
@@ -11684,8 +11684,8 @@
"repo": "clojure-emacs/clj-refactor.el",
"unstable": {
"version": [
- 20210311,
- 1802
+ 20210322,
+ 2122
],
"deps": [
"cider",
@@ -11698,8 +11698,8 @@
"seq",
"yasnippet"
],
- "commit": "2c700d76d46c92b9bb068230b27047321868b1fe",
- "sha256": "1rnjxsgm6fsip9njdmpmdmlga2isi6kh41xdnmwi3m34i1fzl6md"
+ "commit": "9f3e7357117e96135de051b78deabc0a327c7b06",
+ "sha256": "1k9w8bzl92cz0dl7lly6ba3i2vcvdfngqk0abji00pmpgrkla1rk"
},
"stable": {
"version": [
@@ -11946,11 +11946,11 @@
"repo": "clojure-emacs/clojure-mode",
"unstable": {
"version": [
- 20210307,
- 824
+ 20210322,
+ 704
],
- "commit": "b5c913af12ab3f55723fa3f57d373a4984655e8a",
- "sha256": "1yc9cwibwh8kb97jjg1m46npafyvmss7msgma485829ddlaz8ipm"
+ "commit": "a14671e03c867c9d759ee9e59cdc5cecbf271245",
+ "sha256": "1jnqwcspm7c3v33wywvm605hsf6vp29ym3smy2jaq8j5vwywi8k3"
},
"stable": {
"version": [
@@ -11970,14 +11970,14 @@
"repo": "clojure-emacs/clojure-mode",
"unstable": {
"version": [
- 20200922,
- 656
+ 20210322,
+ 704
],
"deps": [
"clojure-mode"
],
- "commit": "b5c913af12ab3f55723fa3f57d373a4984655e8a",
- "sha256": "1yc9cwibwh8kb97jjg1m46npafyvmss7msgma485829ddlaz8ipm"
+ "commit": "a14671e03c867c9d759ee9e59cdc5cecbf271245",
+ "sha256": "1jnqwcspm7c3v33wywvm605hsf6vp29ym3smy2jaq8j5vwywi8k3"
},
"stable": {
"version": [
@@ -12279,8 +12279,8 @@
20210104,
1831
],
- "commit": "9b4390e76be7e46f2031563642f0a1cae5dbf4e8",
- "sha256": "19h3gf7b63b8xblyqrdlizzsjpjsg6xi0spp4fsymlhvxm5j2g1b"
+ "commit": "b22c800604e22a0ffdb13aa5fd4cfb7ee26896a4",
+ "sha256": "1gf0l4jwhm0xf4j1gnnb8158g8cycv2m2ijxbpc5fhwdbcfdfc13"
},
"stable": {
"version": [
@@ -12809,8 +12809,8 @@
20210107,
2111
],
- "commit": "71b72baed2008e38ad1eb6558934e64094351cd7",
- "sha256": "1z39lha9jb1bxr1xlyy5clqqqvnafipx0rf8pdjw9qhbjh4kk2x1"
+ "commit": "1445a556af9da3681ae0e7e7242352e9fe39fe73",
+ "sha256": "1d6wxzw1wf378jzvlzfsdq5gqq2i196lr8dszj4df472vsiw1hqi"
},
"stable": {
"version": [
@@ -13250,11 +13250,11 @@
"repo": "company-mode/company-mode",
"unstable": {
"version": [
- 20210224,
- 2244
+ 20210327,
+ 150
],
- "commit": "88001d794d963049339883216b6606de0a1209ea",
- "sha256": "097s1zan4xg7vrkcapylcbs0a9ky1wbglxf9sz44aslwzrsgvy1p"
+ "commit": "7207cb143829edbcaa2a4b4c0011090747d2207c",
+ "sha256": "017rjccvidcjsc5pbb36hwdssnvpnfm4wjciv75aaq6d5jhj0889"
},
"stable": {
"version": [
@@ -13495,8 +13495,8 @@
"repo": "cpitclaudel/company-coq",
"unstable": {
"version": [
- 20200729,
- 401
+ 20210324,
+ 1603
],
"deps": [
"cl-lib",
@@ -13505,8 +13505,8 @@
"dash",
"yasnippet"
],
- "commit": "4da7b41e25943c0e30171ed25c761c5311999f0d",
- "sha256": "1pmj4bdpnaydqai9lcxkjyik6yhbqjb2xb1wdfxpv1agzazmfyx1"
+ "commit": "7423ee253951a439b2491e1cd2ea8bb876d25cb7",
+ "sha256": "15rd9ga4ydhl6ljzdg26a3kcaqlhaygp67507wrrf8j3801ivks4"
},
"stable": {
"version": [
@@ -14266,8 +14266,8 @@
"company",
"nixos-options"
],
- "commit": "977b9a505ffc8b33b70ec7742f90e469b3168297",
- "sha256": "07vidk3bnby1ch51i67llfdx2q8xc4ax5hvlrc3f72y9gkcpir4x"
+ "commit": "053a2d5110ce05b7f99bcc2ac4804b70cbe87916",
+ "sha256": "05vxac2llww4ba5w0dmf0hza60l5i847hfabs0q5i8kzmw4f8s8z"
},
"stable": {
"version": [
@@ -14473,8 +14473,8 @@
"company",
"prescient"
],
- "commit": "52afa7e90534d59d3cec2ace2a96c232e25e3f7b",
- "sha256": "10pcl4w0y4d99g1ylxqb3qrvfmv091x4h52imf6ysbm4x6gl4r9n"
+ "commit": "8573df977eaceffc6607b7242ff8c0dab02aad65",
+ "sha256": "0kfbcicflg7dj9nzvvkgrxsb6p03a7cq26jfk7h6hsnrajy5y4sc"
},
"stable": {
"version": [
@@ -15446,11 +15446,11 @@
"repo": "minad/consult",
"unstable": {
"version": [
- 20210318,
- 1440
+ 20210323,
+ 1627
],
- "commit": "e7d409c684a34475349e4019c9c54ee08f644cdb",
- "sha256": "1z5qkaaqpz7h9sjfjfr4rvy49gaxfxg82knmplq9x0iyxc31k8b9"
+ "commit": "19540d37783dc34bdb98d7cea24e8bb57090dab4",
+ "sha256": "0vsgxfxb9bhgncxyhrvxpaan4pwca2vwvpr4qjcgqh1bb147rrkr"
},
"stable": {
"version": [
@@ -15476,8 +15476,8 @@
"consult",
"flycheck"
],
- "commit": "e7d409c684a34475349e4019c9c54ee08f644cdb",
- "sha256": "1z5qkaaqpz7h9sjfjfr4rvy49gaxfxg82knmplq9x0iyxc31k8b9"
+ "commit": "19540d37783dc34bdb98d7cea24e8bb57090dab4",
+ "sha256": "0vsgxfxb9bhgncxyhrvxpaan4pwca2vwvpr4qjcgqh1bb147rrkr"
},
"stable": {
"version": [
@@ -15539,8 +15539,8 @@
"espotify",
"marginalia"
],
- "commit": "031e0e63a214dd089478d60e6d900c1a65851678",
- "sha256": "0lmcihysjwmk22yhqmiby1sbj9f67lr6wpdzyz9df8wsmziva26v"
+ "commit": "b70b4737ece5a081411069eb08103ddbbf8e584a",
+ "sha256": "1kplm8rhyp5fssfi8pswafnck96m6zjkyvqjcwil459liy8lpw46"
}
},
{
@@ -15856,15 +15856,15 @@
"repo": "abo-abo/swiper",
"unstable": {
"version": [
- 20210313,
- 1108
+ 20210322,
+ 24
],
"deps": [
"ivy",
"swiper"
],
- "commit": "75002963859101003436c84d1d3a85f9ea5f89fc",
- "sha256": "0pf54qimwjsm6y808vx68zxdfpj0c1kaysy3s7bsi875b99yyd8h"
+ "commit": "47b496544e238041bca5e3c9ca55848648344312",
+ "sha256": "0n26hpffp7lljhwjbr4r470ynaff3swnkxmj7g2rjw78rw2qjmlm"
},
"stable": {
"version": [
@@ -16434,16 +16434,16 @@
"repo": "AdamNiederer/cov",
"unstable": {
"version": [
- 20201214,
- 550
+ 20210320,
+ 1641
],
"deps": [
"elquery",
"f",
"s"
],
- "commit": "2f25d645448d64f2516f8f1181429c35cd214639",
- "sha256": "0prhapqan96hha92sjfkhx3dv7zgxbrc7fcm8kk63z38psnx92zx"
+ "commit": "766b09cbe92cb5b689a36a9c136013a51da95712",
+ "sha256": "1p5b39574dpw0lljhm4l200if65fjpgnnbqsimf31r0y4rm1pr0d"
}
},
{
@@ -16842,8 +16842,8 @@
20210216,
1703
],
- "commit": "fa80bfef81168509ddbd840d95c6671efe91c253",
- "sha256": "12kgzzsnh9bh6aiip53ib28yapajg326xd7g45apjkl8irazr4db"
+ "commit": "cb2e2a435ea9f4fa8c7517b4909af8b62bca8a3e",
+ "sha256": "18dk9623ff2kxfhbdnh4l68n5dfxqgrm6ilmv85dfj685kahd0d3"
},
"stable": {
"version": [
@@ -16973,16 +16973,16 @@
"repo": "emacs-csharp/csharp-mode",
"unstable": {
"version": [
- 20210319,
- 846
+ 20210321,
+ 914
],
"deps": [
"tree-sitter",
"tree-sitter-indent",
"tree-sitter-langs"
],
- "commit": "d942b2762c72a0112f564af173fa66d2e63903cf",
- "sha256": "0g6x85mayjd7cf9b19bsnrbmv32kf75318qx76csa3bqgq309whx"
+ "commit": "f977800161ccdb58d5650a8ca60017c83863d80a",
+ "sha256": "1j173ir1c95jhj5671yah6jmz2qfk3sfspl0naz48s0bs2n5bxcw"
},
"stable": {
"version": [
@@ -17439,11 +17439,11 @@
"repo": "kijimaD/current-word-highlight",
"unstable": {
"version": [
- 20210228,
- 1644
+ 20210323,
+ 1401
],
- "commit": "1d185f88ffe8d5ddc788772c40d37cf7e99a03ba",
- "sha256": "1da11j754pgshfibj7w9wixhbzcjzn1iqifblflz2mqgny3nsisd"
+ "commit": "d860f4e170ffa4cef840da93647f458cc409d554",
+ "sha256": "1mpimgsqkanvgmdvh9zm0vsyf6j4mhsf65p7kx389as82qb7hdy2"
},
"stable": {
"version": [
@@ -17463,11 +17463,11 @@
"repo": "mvarela/Curry-On-theme",
"unstable": {
"version": [
- 20210308,
- 1244
+ 20210322,
+ 1717
],
- "commit": "316fad72466cc5bd120a26cf235e9357117230a0",
- "sha256": "11gkfccrynq3bk8qcbibinai9l497sij4b4zlizdf8qicjymmkd1"
+ "commit": "b53a61d443cc75906d9f97e19f19be71f1e19bc4",
+ "sha256": "1idh5by5fzndaywf86lckz7mxr5kxggbzlgpjjvmahlnma110a1j"
}
},
{
@@ -17651,8 +17651,8 @@
20190111,
2150
],
- "commit": "0ec9be57f5770869cb2fbe36e00bbde405b3b855",
- "sha256": "16qiazp9p24nwaspdyi04jjlvpjpw291c40nvzlnqa2afdk5zwxn"
+ "commit": "8609e0fa7d361f1392823ff6e1a618720cd62df3",
+ "sha256": "101nvcjf6x38fbcg8fhg5xryid3plncmj36i7137gnhsn1r9fsdv"
},
"stable": {
"version": [
@@ -17803,11 +17803,11 @@
"repo": "rails-to-cosmos/danneskjold-theme",
"unstable": {
"version": [
- 20201120,
- 1520
+ 20210325,
+ 935
],
- "commit": "412f5c80f3da1699ae69b878405fd71e65b6358a",
- "sha256": "1icwdkaybs1cpqgvdzvgqickgcpm0ykpr4345jzhc193gfb1iccc"
+ "commit": "ca13f96e5dfa319ceb7b094ee452ddf55b67905c",
+ "sha256": "0cyl8g5gbdypj44yk91sq4frkqahpwkgvnk1i3zda79m453dzg06"
}
},
{
@@ -18229,14 +18229,14 @@
"repo": "emacs-dashboard/emacs-dashboard",
"unstable": {
"version": [
- 20210306,
- 1508
+ 20210325,
+ 757
],
"deps": [
"page-break-lines"
],
- "commit": "1327fc36a0ba3136c7ffd3f1a1dda27f196631e6",
- "sha256": "1zq3h3zgssvydxb9lmlcjn6wb2kri4jk96w43cl48myq27nsj5ri"
+ "commit": "00f1dc84d3fbaf439d23645aa531eee59e28f688",
+ "sha256": "0afn7p79na8351gimmjrj2z4y3slyvsrinm8gx7qphflz2a13m2z"
},
"stable": {
"version": [
@@ -20598,8 +20598,8 @@
20191227,
2028
],
- "commit": "cd052dfef602fe79d8dfbcf9f06e6da74412218b",
- "sha256": "1zhnr4wkb0gifhf1gfssipanifaiixvz6wqlmscxyp7hdm8xjvad"
+ "commit": "4ca32658aebaf2335f0368a0fd08f52eb1aee960",
+ "sha256": "1dwzlxz0q9wqn1az1b0bfl8ywib4nd5grdfqaa06fqd63zlp71pg"
},
"stable": {
"version": [
@@ -21561,11 +21561,11 @@
"repo": "spotify/dockerfile-mode",
"unstable": {
"version": [
- 20210301,
- 52
+ 20210326,
+ 1812
],
- "commit": "07dde72b0e356d772fb65b969bd6decfa166e4d7",
- "sha256": "17hpwhv0mg7ai90sczb6p4i6fwi9s1i3dsbnmk9rf6w6f5y0r1wk"
+ "commit": "3b1374563f62d71aec11ebd33d37109459e54571",
+ "sha256": "1gvsibvg543jby99b7r13x0q4d9n21nl5sh0y2rb7alk0chx3pmx"
},
"stable": {
"version": [
@@ -21771,16 +21771,16 @@
"repo": "seagle0128/doom-modeline",
"unstable": {
"version": [
- 20210308,
- 1212
+ 20210322,
+ 1517
],
"deps": [
"all-the-icons",
"dash",
"shrink-path"
],
- "commit": "0c2f2f0aa2911880b20b2a7e9a5ba20f19be7e24",
- "sha256": "1i367ihnx3vspwx5ly7imj3rmx9f113jmf4i0siklxx0gb7r65n7"
+ "commit": "00bc89b8ded4c452ccf65edce5dce6f9a1e41611",
+ "sha256": "1k5qhxjh7h6hwdjxgjb1vxj9kclpli9wrrv350z5f40l4fwzawlw"
},
"stable": {
"version": [
@@ -21824,14 +21824,14 @@
"repo": "hlissner/emacs-doom-themes",
"unstable": {
"version": [
- 20210302,
- 1549
+ 20210322,
+ 1750
],
"deps": [
"cl-lib"
],
- "commit": "55f01ede533c800e6eb44ef5bdc2fe64d0400425",
- "sha256": "19lhvf6gsvpadmx27lswdnl6y93sywn17d7yjbigva62lmr6yq0w"
+ "commit": "4199e74db170200995ee8dfbb55ffae004d6e219",
+ "sha256": "0vfhnywww560rf0b7h2gc9w4x4738xwq12c8qi9y267110zg62mz"
},
"stable": {
"version": [
@@ -21912,8 +21912,8 @@
20190325,
1917
],
- "commit": "b61df3561ea9bed1848cf69b6bb53f7fdf6916dc",
- "sha256": "063jw3b94l43j31piygjcjzqp2gf828xr3da1hd3qimp25c9fsv6"
+ "commit": "93d9b1ec833a871bde2fd0f78abc269872808048",
+ "sha256": "07sh6sskzx8cxf2z4z1xjnrbr440974024953m0w7rqm0gn4cb28"
},
"stable": {
"version": [
@@ -22473,8 +22473,8 @@
20210213,
757
],
- "commit": "a181b937c20c706f24ba1d17021593b0087ac574",
- "sha256": "0g3s4g3lq42c6ca10idxlybwj3pici2v7r9aifyr5q15n2xgpizq"
+ "commit": "a88ce5bbc996b550071c8df890276eb1b10e778c",
+ "sha256": "1957i1d2lv9jfd8ck22vj0wd59sk5gd04xi5qbvzw1y9dl9xshp7"
},
"stable": {
"version": [
@@ -23783,8 +23783,8 @@
20201122,
25
],
- "commit": "507a694fb778754f3967bf95d9e1c4e446725835",
- "sha256": "1hvir0bxlh9jbd3781pdx72hkrrnai6qg56mskl30vdbjv0byhhh"
+ "commit": "537e2e165984b53b45cf760ea9e4b86794b8a09d",
+ "sha256": "07cnp40rbl2p4mn40cib6mvby1svxqd8kb3dxb3a8idb736nzqrp"
}
},
{
@@ -23992,8 +23992,8 @@
"repo": "joaotavora/eglot",
"unstable": {
"version": [
- 20210319,
- 2010
+ 20210326,
+ 1008
],
"deps": [
"eldoc",
@@ -24002,8 +24002,8 @@
"project",
"xref"
],
- "commit": "b4ffcf26fb392ed83f6c40bc9b62cbe54483119c",
- "sha256": "1lpi249cv61892nl8a0asx6z4dzgyphrh4f5cn9awryyv8x166dx"
+ "commit": "2fbcab293e11e1502a0128ca5f59de0ea7888a75",
+ "sha256": "0fsar0ab0wj74jkbgkbigcg4ia6hg574yvqr2wq2s8lw7m22j8c4"
},
"stable": {
"version": [
@@ -24153,8 +24153,8 @@
"repo": "millejoh/emacs-ipython-notebook",
"unstable": {
"version": [
- 20210317,
- 12
+ 20210322,
+ 1150
],
"deps": [
"anaphora",
@@ -24165,8 +24165,8 @@
"websocket",
"with-editor"
],
- "commit": "147940d5d734b22e8dc6fc24d1d7423766ceed0c",
- "sha256": "1yjdlghgsm4alrfp6nsfq2wi7ym66nbh1gx3dfsm5c1hr22lx9fq"
+ "commit": "142ff5078b3074ce3ac8bf90abd8c38d9733253e",
+ "sha256": "05b4gqxfjap6bhfcxjj6v6kv2bhni5a1mzh9ylril5f81xj323gy"
},
"stable": {
"version": [
@@ -24663,11 +24663,11 @@
"repo": "Mstrodl/elcord",
"unstable": {
"version": [
- 20210316,
- 1921
+ 20210323,
+ 2234
],
- "commit": "d63021046b5ccb129669f1eae60ffc5f48338230",
- "sha256": "1mf98cfnmb58bzwrfcg6v1k02mmzwzkig3h61qx779014ayq7v2h"
+ "commit": "25531186c10b74a10ee24990f9e967296cc70342",
+ "sha256": "14lk3whvj45ilb7mv60dfpxhbw3jsddglz0mq5vhdgy6n8wkcpa9"
}
},
{
@@ -24712,11 +24712,11 @@
"repo": "doublep/eldev",
"unstable": {
"version": [
- 20210228,
- 2242
+ 20210325,
+ 2223
],
- "commit": "47228bf2e4f187dc332301c5e06768b5d36c4392",
- "sha256": "0kly9lw34sl3pmcgck2j058fjnh2hkhz9hd009j6s4lj0a1fbiar"
+ "commit": "a7211e47c1dd543ca5d84b7b85ca205fc6315abe",
+ "sha256": "0806wzrmcl58rp1gs2d3z0dz68h3jigwi0azf8rypz1fp5dkks7j"
},
"stable": {
"version": [
@@ -24862,14 +24862,14 @@
"repo": "davidshepherd7/electric-operator",
"unstable": {
"version": [
- 20201123,
- 836
+ 20210320,
+ 1511
],
"deps": [
"dash"
],
- "commit": "9856ff8e1351086d0d738c1db300af63d6c085ba",
- "sha256": "0wfgz1ry1gqwk941fs4i3z8gq6s53v1fr2lwhsi06hvgs8nxaqgm"
+ "commit": "ecc59d313dd9ddfc4d6a2a3c7a9374aaf214e653",
+ "sha256": "0qy8s0vqaxkksplasang3n9bqnq7q43lfyd0jl39nynlrg8avhpc"
},
"stable": {
"version": [
@@ -25449,14 +25449,14 @@
"repo": "elixir-editors/emacs-elixir",
"unstable": {
"version": [
- 20201216,
- 1838
+ 20210324,
+ 1605
],
"deps": [
"pkg-info"
],
- "commit": "9de08c17d54e190d220aa03cca58bd41497f44b6",
- "sha256": "0v6w2qkw52zrq0wwly0dli7gii2g64194m5169zslfrhk9rymkyp"
+ "commit": "0212b06f079f4965b6032bbbe7f86876575770de",
+ "sha256": "0n9b901kzk95r28a17amx25xyffvxbfrxw62sakrn0q3pbq988s2"
},
"stable": {
"version": [
@@ -25537,8 +25537,8 @@
"reformatter",
"s"
],
- "commit": "188b9c743d8ec99ff7735d2581999d07f43b5bbe",
- "sha256": "0cjjx4mf4lr1rcalzfl52ps91hyc9pvmsgpnfcb6x3akshbjab6x"
+ "commit": "e9fcf9cc2779cf7f5ae7ee4be339164b26755c69",
+ "sha256": "05g3r5hc6slaca8g7n6i6bk9lpq9jsb2kv2q5v8nbz96abqg56zm"
},
"stable": {
"version": [
@@ -25827,11 +25827,11 @@
"repo": "redguardtoo/elpa-mirror",
"unstable": {
"version": [
- 20210304,
- 1432
+ 20210325,
+ 1219
],
- "commit": "893368d222faf94d0be66da8ab581c47e1c04082",
- "sha256": "115wrc8rnslyssh2fwd1mc0a6l942rkjzfv6c4509h95b2xfdp8p"
+ "commit": "2d50b2861ab0ba6a2a518de44823869fb4b14dfc",
+ "sha256": "0x0sfim9l5xl4fysy61w7migf504ynnmnraiwisdxl9bap7iraw9"
},
"stable": {
"version": [
@@ -26524,11 +26524,11 @@
"repo": "oantolin/embark",
"unstable": {
"version": [
- 20210317,
- 1432
+ 20210326,
+ 1428
],
- "commit": "4e3e751725787f18b55defc2fe7d8115adf524fd",
- "sha256": "03qqc5yw7pyz58pdkvypw63ls14pm9gkcfvrf66fidmbi5w4fg54"
+ "commit": "49cd0aff39e7bc9173ec49d1c14d7ab8d9d25355",
+ "sha256": "19ihm3v7ck5rx4wff5hkrrzqbjk9g9vm8j0axvdf77hr6vzjsak8"
},
"stable": {
"version": [
@@ -26554,8 +26554,8 @@
"consult",
"embark"
],
- "commit": "4e3e751725787f18b55defc2fe7d8115adf524fd",
- "sha256": "03qqc5yw7pyz58pdkvypw63ls14pm9gkcfvrf66fidmbi5w4fg54"
+ "commit": "49cd0aff39e7bc9173ec49d1c14d7ab8d9d25355",
+ "sha256": "19ihm3v7ck5rx4wff5hkrrzqbjk9g9vm8j0axvdf77hr6vzjsak8"
},
"stable": {
"version": [
@@ -27333,8 +27333,8 @@
"inheritenv",
"seq"
],
- "commit": "a7c6ca84a2b0617c94594a23a0c05246f14fa4ee",
- "sha256": "1dpwb5plymb13jv44rdxkg0lrc180076rcvricac6xk33pklsmbz"
+ "commit": "110a221f8205655a31fa51bffd45e1e9da056ffc",
+ "sha256": "1zjqkp701nlc0cldqxwj97jflz3imv1nzpq2sqjm4ir45lwp8jci"
},
"stable": {
"version": [
@@ -28098,8 +28098,8 @@
20200914,
644
],
- "commit": "232fa59a8e7954d20fbac8aac7f51bcf58c2f299",
- "sha256": "016dk9gf86fm2s6xd016jml895h8zqlyrp1bw7khzq5xliny7d08"
+ "commit": "ecb93230ad9327991e542731756cbe1405c85d5f",
+ "sha256": "1acs54ngr26qw5hbhq7xdw4wspqhhmr97gj6rnwxhz4yx02wxd9w"
},
"stable": {
"version": [
@@ -28123,8 +28123,8 @@
20210315,
1640
],
- "commit": "ebc70093c3be41cd86da18d2f188ce9648dc287c",
- "sha256": "1gvb5p92gnl0lv48wqgls6jyhyzkd7kckklrsmn325s6vnqx72cd"
+ "commit": "94c9738e10326554af80d128c76e4bded1c7b983",
+ "sha256": "1vyk87yy9vpscrxvcd0f14fvbd200af0fiwgw26fdd5f5j6iz2hk"
},
"stable": {
"version": [
@@ -28873,8 +28873,8 @@
20210224,
126
],
- "commit": "6a0a939ad2b07203e7c66a71b3a348ea06780cff",
- "sha256": "1kjywdafjga5rd2way2vafwb0paz2fb2dkg1i5vlsggwhkl7dn6r"
+ "commit": "b70b4737ece5a081411069eb08103ddbbf8e584a",
+ "sha256": "1kplm8rhyp5fssfi8pswafnck96m6zjkyvqjcwil459liy8lpw46"
}
},
{
@@ -28986,11 +28986,11 @@
"repo": "emacs-ess/ESS",
"unstable": {
"version": [
- 20210318,
- 748
+ 20210326,
+ 1730
],
- "commit": "96ba4876753e7ac592a150f7ee1272747dc693d3",
- "sha256": "0drfgzkdah2gpz7ahacbsqh5i1y4znrjgj4hmlwx4ycpcvvixbrz"
+ "commit": "c101d44bd70a3f51bf546e18e74e98f62f4a3eba",
+ "sha256": "06b056fmkbvsdzf0l7zywghkax3fqszbkywv822qr3hiwb62lc21"
},
"stable": {
"version": [
@@ -29154,15 +29154,15 @@
"repo": "ShuguangSun/ess-view-data",
"unstable": {
"version": [
- 20210315,
- 1643
+ 20210326,
+ 1431
],
"deps": [
"csv-mode",
"ess"
],
- "commit": "b642e2e7f4643eadee14c3599f9af399a2f714fe",
- "sha256": "1dm4w0cj4sc1ybfmvgapwxlnkbywkfqs79gx13381k99ah0wbgji"
+ "commit": "283251e8ac19ac0c0f89a4b0f0eb38482167e52b",
+ "sha256": "0kp94y27csj08868rbiwdfzgjx9q71j7d0whpqhsh27qhc189crq"
},
"stable": {
"version": [
@@ -29215,11 +29215,15 @@
"repo": "tali713/esxml",
"unstable": {
"version": [
- 20201226,
- 2146
+ 20210323,
+ 1102
],
- "commit": "f3d60206eda3cd66bea07c903198d12c4761e326",
- "sha256": "1gyydxm1dja4qn9al7b5g9gm7y75qwbn516migxiy20vdzhvksfx"
+ "deps": [
+ "cl-lib",
+ "kv"
+ ],
+ "commit": "9f96449f6059cb75491dc812ddeb1b6200ec6740",
+ "sha256": "1xzxmgsg0j72sf1vjh9gjswz3c29js0kqhm7r3jrqrh3a5agdnml"
},
"stable": {
"version": [
@@ -29569,15 +29573,15 @@
"repo": "emacs-evil/evil",
"unstable": {
"version": [
- 20210319,
- 1539
+ 20210325,
+ 2108
],
"deps": [
"cl-lib",
"goto-chg"
],
- "commit": "325a822bee6b9f8590e6e77fe73b4d916fcec357",
- "sha256": "0lbzmarhddmsr334d51ia1p64i3wzy3mak586pj3gziv7fcvn06h"
+ "commit": "7eace67fc6d1f992e447f216baf9a8b7be634c1e",
+ "sha256": "13cgja2ss5afrpabz0rlhrh89vaw7dzaf1gh43b3hdbma8gh9li8"
},
"stable": {
"version": [
@@ -29771,15 +29775,15 @@
"repo": "emacs-evil/evil-collection",
"unstable": {
"version": [
- 20210319,
- 1440
+ 20210323,
+ 310
],
"deps": [
"annalist",
"evil"
],
- "commit": "2d3d652cb51eeddc6c63ad9cbf251ecbd2f561d6",
- "sha256": "15vdi5kynm1gczvdp006zyac96n1q25im9pf2q2n244ph9rzgc4v"
+ "commit": "b45ec5b3156d27a18a949e4bf55643107a21abc2",
+ "sha256": "09sxky26kpdxjdc52vpabxq8h88fx9rnarykn1d2a063bpldz2rp"
},
"stable": {
"version": [
@@ -30337,14 +30341,14 @@
"repo": "redguardtoo/evil-matchit",
"unstable": {
"version": [
- 20210201,
- 522
+ 20210325,
+ 123
],
"deps": [
"evil"
],
- "commit": "cdb9b90381ac0a225b01fb99472f5b23b612eb6e",
- "sha256": "0qf3583w082787hsp5ihj84w8k2d0pwpci6a9ig8qk9f4sk66v04"
+ "commit": "8c8c94bea899718f393ad041202a355e6f24ea19",
+ "sha256": "0vygxkvri6363wi3byjd2r23bjyvjkfy58n2kshslaq18z5vylzl"
},
"stable": {
"version": [
@@ -31094,8 +31098,8 @@
"deps": [
"evil"
],
- "commit": "325a822bee6b9f8590e6e77fe73b4d916fcec357",
- "sha256": "0lbzmarhddmsr334d51ia1p64i3wzy3mak586pj3gziv7fcvn06h"
+ "commit": "7eace67fc6d1f992e447f216baf9a8b7be634c1e",
+ "sha256": "13cgja2ss5afrpabz0rlhrh89vaw7dzaf1gh43b3hdbma8gh9li8"
},
"stable": {
"version": [
@@ -31696,8 +31700,8 @@
"deps": [
"cl-lib"
],
- "commit": "d14d6d2966efe5a1409f84a6b9d998268f74761d",
- "sha256": "0jgy17s7gkjpdls8ql8qfpncd5vrwm50i3svmnlqic6ds4mkc7s0"
+ "commit": "bf4bdc8b8911e7a2c04e624b9a343164c3878282",
+ "sha256": "0b19lhidn2kvkc4aaa1x634y2biryq85di1iwxdh8070k4j2yw9s"
},
"stable": {
"version": [
@@ -32385,11 +32389,11 @@
"repo": "WJCFerguson/emacs-faff-theme",
"unstable": {
"version": [
- 20210303,
- 1351
+ 20210324,
+ 1332
],
- "commit": "2db5c559ca7356189083fb698a053bb1fee922a9",
- "sha256": "1gk2dxmxv0sgkng7zgakz0gq9i0zh3wrwzsi785s338vjyypwm3g"
+ "commit": "38cddb422572ca6f7dc004583bb8ba6a99b3315a",
+ "sha256": "19c0n5yjannz7sqwmw65j7clvwx6idnzy5lmc01ayghf3w2ksir2"
},
"stable": {
"version": [
@@ -32860,11 +32864,11 @@
"repo": "technomancy/fennel-mode",
"unstable": {
"version": [
- 20210301,
- 1703
+ 20210322,
+ 1527
],
- "commit": "b0ce628d253e0fcb648144081535bb8569532220",
- "sha256": "0mqfwmqdfm3j4yjcmpwgikblsgfxmj15pagq537ds9yb960myxs1"
+ "commit": "ba14a7ddc21f8bc2b9bc58abd1655abbe12118d7",
+ "sha256": "0lypgn8hppivq3w8jddgbyfs7x67xjkbx2j0is96lfdb0zykp9b9"
},
"stable": {
"version": [
@@ -33182,11 +33186,11 @@
"repo": "redguardtoo/find-file-in-project",
"unstable": {
"version": [
- 20210315,
- 413
+ 20210323,
+ 118
],
- "commit": "50607615352df980dfe99d464f5fd0b3d70a4381",
- "sha256": "120182fjalcamijwxvrfgf72f63k5jy1z9rl4arg80bx2682a0pj"
+ "commit": "595c6ac9d5e5b2dc138b472a40bc85c7f20a56c0",
+ "sha256": "1fqg4jg3x7vrcap46vbncazzjaj6yan57rdmi2n8xbhmw3jcc8z9"
},
"stable": {
"version": [
@@ -33532,11 +33536,11 @@
"repo": "mrkkrp/fix-input",
"unstable": {
"version": [
- 20190713,
- 1349
+ 20210320,
+ 1244
],
- "commit": "7aef6fb29840a2f3c7e3c01eeeb7838a0e702050",
- "sha256": "0hf4x16fr5z5l2ypp41sw78dz5qpi14pphpbh8zdg4ky5sa8d4fd"
+ "commit": "10b3aebc3d4411e6889f3428e8f097c0fbf8585c",
+ "sha256": "0c850rc9nnbvwf1sbp66xk6p246ylrfpqqhh6bcl7lm8b8v0kfzh"
},
"stable": {
"version": [
@@ -33877,15 +33881,15 @@
"repo": "wanderlust/flim",
"unstable": {
"version": [
- 20201117,
- 825
+ 20210324,
+ 1102
],
"deps": [
"apel",
"oauth2"
],
- "commit": "068b35e863be9245e717e79def55f93580188bc8",
- "sha256": "00jkappcri9y9yx35pg1gm1x81qmybkisc06rl4zxi9w76ch4rkk"
+ "commit": "ddf5b6eceb73d7dbf6ff3a2d5281a2957cc2b836",
+ "sha256": "1pf7jg0psirjm2s84hcmjxkhd5s8vlgprn1miykxks2yxkvk01xf"
}
},
{
@@ -34178,8 +34182,8 @@
"repo": "flycheck/flycheck",
"unstable": {
"version": [
- 20210314,
- 2015
+ 20210321,
+ 852
],
"deps": [
"dash",
@@ -34187,8 +34191,8 @@
"pkg-info",
"seq"
],
- "commit": "6e6ac0c50f85170ed47bf1711bc761941b69b325",
- "sha256": "1rp53zpd8mi16r7n66hxy3jv966rr3yw9v3d8dsq9lnnyly9llny"
+ "commit": "f8c679fff349850c80541a31de50009c3c15d4c9",
+ "sha256": "0v0zyq7zn89j036sp8ijxwpb0n435sf444ki618y7mv77k2qflxx"
},
"stable": {
"version": [
@@ -35855,8 +35859,8 @@
"flycheck",
"package-lint"
],
- "commit": "64cf27d69051e02a32e3c517cbfea23f9d2d7557",
- "sha256": "0m2bmdwrj7ccf6ndv089qbbrz1msbcgls0ckbbhzpxxq39as2rpv"
+ "commit": "303f9e0708292937a668e1145f5eaa19d7d374e2",
+ "sha256": "0xav8x3vs7i8kvvhnq86scahjzv6m9mnpiibapflc995wqs4yq02"
},
"stable": {
"version": [
@@ -36286,8 +36290,8 @@
"flycheck",
"relint"
],
- "commit": "86ebb4dac919eda01341b15b9c896742b9d17c30",
- "sha256": "1k638y125xyb0bc5i2zrkypwb770jn1ndky6qak31n4ws41xynbd"
+ "commit": "4d112871b82d5ea6d0d3e4aaacc55a45536707b7",
+ "sha256": "1plqica209q1x8kzyy4iz97bvd8vqxgv1l00mlf946q201ps7yb1"
},
"stable": {
"version": [
@@ -36587,14 +36591,14 @@
"repo": "Wilfred/flycheck-title",
"unstable": {
"version": [
- 20170216,
- 2346
+ 20210321,
+ 558
],
"deps": [
"flycheck"
],
- "commit": "6faea67be8661faf8152217869d16e993cc2bc49",
- "sha256": "08b2cq5bzmq9aa8b8glx5js2nhfpgdsd0r2sgvi0ij937yz8lf37"
+ "commit": "74e4375f372f7b9ce0fdfa34dc74a048376679ae",
+ "sha256": "0ivdv7gsbi3p6nzkyr0dl4iw3846dwys9mrx3pbnf9awzrcihnid"
},
"stable": {
"version": [
@@ -37236,8 +37240,8 @@
"deps": [
"flymake-easy"
],
- "commit": "ae58795f948402e987cda4c15f10354f8ec2d0fd",
- "sha256": "1hr35xxj6w34h7xs13n6sxs69j3z3i0r1qim3hgyiym797xjsa0p"
+ "commit": "03b4e5e7ad11938781257a783e717ab95fe65952",
+ "sha256": "1yayfh4j155fpwybh26w6hvdg1whrd8wmaz8w406s4rqpsw93q92"
},
"stable": {
"version": [
@@ -38661,8 +38665,8 @@
"deps": [
"seq"
],
- "commit": "98e2729b7dfc99607778b07ef03ff994a74c045d",
- "sha256": "09c9rmrs8aazmmiq0v71p7yhcgk7ykr0il188xl8qc39m4rky9mz"
+ "commit": "9b0079c10c73e5f0785a8e727c1240ea9a781a5d",
+ "sha256": "02qxrq582cmcc6wmflh314z724kzxfp2l31h5b71372lck3f0slq"
},
"stable": {
"version": [
@@ -39273,14 +39277,14 @@
"repo": "factor/factor",
"unstable": {
"version": [
- 20200514,
- 1516
+ 20210323,
+ 1426
],
"deps": [
"cl-lib"
],
- "commit": "8f5f6939044b68a97d231b6902ab5ac86744db2a",
- "sha256": "15fnn413rmaav9zi8p5yqvim0wblsljfp6xhgsa68zji5y99lxva"
+ "commit": "5bfeab6c0e13bfefddb98b30b6e60489a1574d8e",
+ "sha256": "193wbn2y0562gm08yaq8dim1y52vvxvz6vxh3gpxgk95zrr0ll1s"
},
"stable": {
"version": [
@@ -39942,6 +39946,24 @@
"sha256": "0j2djjgfd4hd2k60ymgxzpsy52ks6hxpd4rr81z5nh9fdg9axhrs"
}
},
+ {
+ "ename": "geiser-mit",
+ "commit": "a327661f80b577f53ae8874ce9ab499d95c442c8",
+ "sha256": "1zbisdf8mw183qxx7khlfni31lp6airza8q8vvcp5frz277kk9cg",
+ "fetcher": "gitlab",
+ "repo": "emacs-geiser/mit",
+ "unstable": {
+ "version": [
+ 20210308,
+ 257
+ ],
+ "deps": [
+ "geiser"
+ ],
+ "commit": "1caea838ddbbf3d8e0c6f39656f8ff3b445e371a",
+ "sha256": "0r3ycjcrqbfnlci31bzr7l4nqrfklj839k3ba0c19vfga8wyakfq"
+ }
+ },
{
"ename": "gemini-mode",
"commit": "4fd0ef91c2a4259d6e4e8833d687b6aeae14e65a",
@@ -40741,8 +40763,8 @@
"transient",
"with-editor"
],
- "commit": "cb9bb20cfe8e3a50df8669a43611ebc9a516358a",
- "sha256": "1b33fs9h46msk5800l9haf6mccz5jg6w5v8607i2863403hjfn56"
+ "commit": "527842a3b0fd868bd0c193c430a6ad290dd62053",
+ "sha256": "0cxnvi2vkk5nrcd2iir34bv76rsakijsim1rgxxh03xjc7fqyvj3"
},
"stable": {
"version": [
@@ -41724,14 +41746,14 @@
"repo": "TxGVNN/gitlab-pipeline",
"unstable": {
"version": [
- 20200903,
- 201
+ 20210322,
+ 439
],
"deps": [
"ghub"
],
- "commit": "ecb3a2277f6a1c7fed73f9381834724c143c85da",
- "sha256": "1nqrim3fpgf5npzl14sd0h6dlhi925hns2f75l4arrhbcjgcn984"
+ "commit": "089400ac1d411a2b58cf1a64f28911079d5c898f",
+ "sha256": "0zck5488fswqcl7ahknm6nan5al8db73p2jbxnwcv2cxcia81qza"
},
"stable": {
"version": [
@@ -43547,11 +43569,11 @@
"repo": "jcs-elpa/goto-char-preview",
"unstable": {
"version": [
- 20200927,
- 509
+ 20210323,
+ 332
],
- "commit": "6209973933bec4081145dbcb8e3e442cb29a8c52",
- "sha256": "1ckpdgfr7da37fwx9pw0vc8bdcmbpdpygfn8gkwwmz3yjk3021h7"
+ "commit": "6ab5128c028aac3ae070ba8df041b8039487253a",
+ "sha256": "0d8dihhl7cn3afwhn09drymm7c5hsf8v2m6rvpq5z7nkskkjw80v"
},
"stable": {
"version": [
@@ -43634,11 +43656,11 @@
"repo": "jcs-elpa/goto-line-preview",
"unstable": {
"version": [
- 20210113,
- 616
+ 20210323,
+ 422
],
- "commit": "605a182c389b60b11dad0738babc66d227a4ed23",
- "sha256": "1p5bpb5870mkfqgx8dqapx6mvfc6h2g8hzngljd71i3b5idlxx0s"
+ "commit": "c83688ea95b4308145555fea50e953a26d67b1b2",
+ "sha256": "0hi4jikr5hk4v28790mw1rj1myvr1pwldy7wh3n8bajhqdhbr59v"
},
"stable": {
"version": [
@@ -43667,8 +43689,8 @@
"magit-popup",
"s"
],
- "commit": "f49dcf5ec6e16562de30674b36b18e6bdcd47411",
- "sha256": "1slw2pawlcx9zfvsazsir2kj32g30b80c7a0yiqyrd7cv1hjnr8g"
+ "commit": "7ce0a83a88e6cca59d10df0e7824739854558bd2",
+ "sha256": "0jhy8flny9dlddw8fhymxm7s5c9sl3yxnqh8icdwb9vhgq754wcy"
},
"stable": {
"version": [
@@ -44283,8 +44305,8 @@
20200725,
725
],
- "commit": "1aebf9c36ecfd6523e84fe092faa6ff06ce2177d",
- "sha256": "1m86b1x4rkxy1m3q3yj564jihhxcw8ysbfxc38vl75ldnsgvbmy8"
+ "commit": "98d566db769b865f102a0c6802a08ebce8ae5e7f",
+ "sha256": "0dh0a2msrbr31lzrp9b0xrp78g4h02qcsxjjzgmqyb6fqzhbr3kd"
},
"stable": {
"version": [
@@ -45352,11 +45374,11 @@
"repo": "haskell/haskell-mode",
"unstable": {
"version": [
- 20210303,
- 1948
+ 20210325,
+ 2112
],
- "commit": "20f72ccc17c8233dbb7c94ebf52a2a59e7d97730",
- "sha256": "0lgm5hbzbzb9izpsryvhiygq26cg5dpwmkxbvldikj9scw1dp57i"
+ "commit": "1baa12abfa2c81128e5b13d1351f2978a4a54b4f",
+ "sha256": "12lalrjbf018wkc40pqmpc2jrm64avk0smkili4cqkhspcidci8s"
},
"stable": {
"version": [
@@ -45686,16 +45708,16 @@
"repo": "emacs-helm/helm",
"unstable": {
"version": [
- 20210318,
- 1838
+ 20210326,
+ 1959
],
"deps": [
"async",
"helm-core",
"popup"
],
- "commit": "2ca62b0384727338c2a7dd90a591fcac26d86a03",
- "sha256": "0k81bp0b8pdmj16hmip849207s8x8g4hy2mg9821fviafss0sk9j"
+ "commit": "98af298c517148fbb31774a548c85ecdc1bcf8ab",
+ "sha256": "0gdi08krvk648fq4hk2b3aiks6plff9cpixghwsgin6rl3k33h67"
},
"stable": {
"version": [
@@ -45836,14 +45858,14 @@
"repo": "emacs-helm/helm-apt",
"unstable": {
"version": [
- 20200823,
- 1546
+ 20210324,
+ 1929
],
"deps": [
"helm"
],
- "commit": "42923e367f6ccc1c94b1a5c070993e0ad96c9ea3",
- "sha256": "1q5pxd0vjxqrvk0gf0nxbc9b77xidaijkddh6zz3j7fbjmzyrp4x"
+ "commit": "c952b5dc26015bc9c947973df99246212d276b63",
+ "sha256": "0k095s738vv3cgvs1p40ivh68kaslc0xb5kplxp67ic89rg49w9i"
},
"stable": {
"version": [
@@ -46594,14 +46616,14 @@
"repo": "emacs-helm/helm",
"unstable": {
"version": [
- 20210319,
- 1649
+ 20210324,
+ 1445
],
"deps": [
"async"
],
- "commit": "2ca62b0384727338c2a7dd90a591fcac26d86a03",
- "sha256": "0k81bp0b8pdmj16hmip849207s8x8g4hy2mg9821fviafss0sk9j"
+ "commit": "98af298c517148fbb31774a548c85ecdc1bcf8ab",
+ "sha256": "0gdi08krvk648fq4hk2b3aiks6plff9cpixghwsgin6rl3k33h67"
},
"stable": {
"version": [
@@ -48205,14 +48227,14 @@
"repo": "emacs-helm/helm-ls-git",
"unstable": {
"version": [
- 20210317,
- 1205
+ 20210324,
+ 1515
],
"deps": [
"helm"
],
- "commit": "58dbeafb184cf6a10a1ae3078b37310dd82ad2ed",
- "sha256": "1hlqvpb34pq4bmyplm58wsnwfrflp5bf7kzjl8nrsj9fcqr29nbv"
+ "commit": "48696448e52d266f5b2cb5ee1390071dab4d16e8",
+ "sha256": "1nhza9af2xfwq1idk4g69kr4wyyf9samk3vi40jvkfnwap4w3ip4"
},
"stable": {
"version": [
@@ -48521,8 +48543,8 @@
"helm",
"nixos-options"
],
- "commit": "977b9a505ffc8b33b70ec7742f90e469b3168297",
- "sha256": "07vidk3bnby1ch51i67llfdx2q8xc4ax5hvlrc3f72y9gkcpir4x"
+ "commit": "053a2d5110ce05b7f99bcc2ac4804b70cbe87916",
+ "sha256": "05vxac2llww4ba5w0dmf0hza60l5i847hfabs0q5i8kzmw4f8s8z"
},
"stable": {
"version": [
@@ -48608,14 +48630,14 @@
"repo": "emacs-helm/helm-org",
"unstable": {
"version": [
- 20200311,
- 633
+ 20210324,
+ 1927
],
"deps": [
"helm"
],
- "commit": "b7a18dfc17e8b933956d61d68c435eee03a96c24",
- "sha256": "0sbk8c05v28xz7mdpzrlawn5iwf3hkkr1fj8lsi861l4fhjbmcap"
+ "commit": "d67186d3a64e610c03a5f3d583488f018fb032e4",
+ "sha256": "07wsz9hbv83m3k03cxvlr2hxd2lkxx9qpphn9j6axmysi9i5bc8q"
},
"stable": {
"version": [
@@ -48648,8 +48670,8 @@
"org-multi-wiki",
"org-ql"
],
- "commit": "c85bcaafed749de3efa5e1f4d256e7ac9c5678e2",
- "sha256": "14da1rhln69nnjd891x6f6d69vyy4a4lg6cw51gd7h3cy6lcwbl5"
+ "commit": "bf8039aadddaf02569fab473f766071ef7e63563",
+ "sha256": "0hmn9yy2d7wy6zz81ddd96rksmvs9k5529dfqrkrpl4v3bn3g52d"
},
"stable": {
"version": [
@@ -51310,11 +51332,11 @@
"repo": "ideasman42/emacs-hl-block-mode",
"unstable": {
"version": [
- 20201126,
- 818
+ 20210320,
+ 1051
],
- "commit": "05a8c5119c717f53e2e9c279d316f04dd744b9b3",
- "sha256": "11pa6nlpisaba9db0a8iqs86m4ly93cnd8rszd051dg3av8snx67"
+ "commit": "717b4f743c633362a8b28c883c454c5ef3711722",
+ "sha256": "16b1hnxzfygn3pgck5d8m612iwn42bxsx0zhdqrzmjl9sjvvps4h"
}
},
{
@@ -52279,11 +52301,11 @@
"repo": "Riyyi/emacs-hybrid-reverse",
"unstable": {
"version": [
- 20210107,
- 1435
+ 20210325,
+ 2311
],
- "commit": "30072ccf0a49bb47360dce12965db1b1e2f2b57d",
- "sha256": "16p7k3lwlykpgrc2pkbdx7z209bzps9ksizjhgbcfbkn67xpavka"
+ "commit": "81e6651203ef666af4ddc63dc726cfb1443fe16b",
+ "sha256": "0m7k91kwhy8v602li3rfzmcb4qb443w2iv8qh38ncsl0l6bsc982"
}
},
{
@@ -53664,14 +53686,14 @@
"repo": "bmag/imenu-list",
"unstable": {
"version": [
- 20210316,
- 2102
+ 20210325,
+ 1536
],
"deps": [
"cl-lib"
],
- "commit": "b50222378412fbe321622a84cb2b036e084c697a",
- "sha256": "1936dd41fa05ndzf2bwhllvjz97iz0rflkazjipr7dvz5q072wj2"
+ "commit": "b03b86aee6ac30067906dddc385db8188657d023",
+ "sha256": "0vi4cj6cijra3d0khiqc185iqzhkzillbwnhglxi82r4zrzwnyzg"
},
"stable": {
"version": [
@@ -54164,14 +54186,14 @@
"repo": "clojure-emacs/inf-clojure",
"unstable": {
"version": [
- 20210317,
- 1221
+ 20210322,
+ 1421
],
"deps": [
"clojure-mode"
],
- "commit": "3e712d9f489313c4097ccc891abedcfb6e1788d3",
- "sha256": "1bdz8zsv6vixgvq88vc8mlq729rn105wr2mzjl6a2w9b8zkjzs08"
+ "commit": "1e99b8246bb1fe7666d613a9ae566e2a939fc2bb",
+ "sha256": "0bqznd3mn0fd8km5in9k2i87pxcjv6wszdgjp4ajzw742dznkb2f"
},
"stable": {
"version": [
@@ -54483,8 +54505,8 @@
20210204,
354
],
- "commit": "13c0135ddd96519ddeb993ee21163d6e11b4f464",
- "sha256": "1zwj26mxc4md4ar79pfdi8i4v2qr9bdrqjb8ykal524gqm79xsb9"
+ "commit": "7e4c8b0d0a43b6f1c6c4d6dbd2f3bf5ce7f20067",
+ "sha256": "1qc54wx5f1yvap9hxi1k5qqsascxxs9lq317qpzipmbazw7qk7ch"
},
"stable": {
"version": [
@@ -55142,15 +55164,15 @@
"repo": "Sarcasm/irony-mode",
"unstable": {
"version": [
- 20201018,
- 1707
+ 20210321,
+ 1750
],
"deps": [
"cl-lib",
"json"
],
- "commit": "76fd37f9616f5c851106654c8fb5eb98670d351f",
- "sha256": "1kbskyfw04l8cra6phlxblhkn38p5l6mm2xyjdsxxlfhcc0vwi02"
+ "commit": "ec6dce7ee16ffaa9a735204534aa4aa074d14487",
+ "sha256": "0pabzcr06jywa3n4bax8dxxkmb1ffq3cpw1jnxnqpx18h96pfar2"
},
"stable": {
"version": [
@@ -55468,8 +55490,8 @@
20210311,
1638
],
- "commit": "75002963859101003436c84d1d3a85f9ea5f89fc",
- "sha256": "0pf54qimwjsm6y808vx68zxdfpj0c1kaysy3s7bsi875b99yyd8h"
+ "commit": "47b496544e238041bca5e3c9ca55848648344312",
+ "sha256": "0n26hpffp7lljhwjbr4r470ynaff3swnkxmj7g2rjw78rw2qjmlm"
},
"stable": {
"version": [
@@ -55496,8 +55518,8 @@
"avy",
"ivy"
],
- "commit": "75002963859101003436c84d1d3a85f9ea5f89fc",
- "sha256": "0pf54qimwjsm6y808vx68zxdfpj0c1kaysy3s7bsi875b99yyd8h"
+ "commit": "47b496544e238041bca5e3c9ca55848648344312",
+ "sha256": "0n26hpffp7lljhwjbr4r470ynaff3swnkxmj7g2rjw78rw2qjmlm"
},
"stable": {
"version": [
@@ -55864,8 +55886,8 @@
"hydra",
"ivy"
],
- "commit": "75002963859101003436c84d1d3a85f9ea5f89fc",
- "sha256": "0pf54qimwjsm6y808vx68zxdfpj0c1kaysy3s7bsi875b99yyd8h"
+ "commit": "47b496544e238041bca5e3c9ca55848648344312",
+ "sha256": "0n26hpffp7lljhwjbr4r470ynaff3swnkxmj7g2rjw78rw2qjmlm"
},
"stable": {
"version": [
@@ -56070,8 +56092,8 @@
"ivy",
"prescient"
],
- "commit": "52afa7e90534d59d3cec2ace2a96c232e25e3f7b",
- "sha256": "10pcl4w0y4d99g1ylxqb3qrvfmv091x4h52imf6ysbm4x6gl4r9n"
+ "commit": "8573df977eaceffc6607b7242ff8c0dab02aad65",
+ "sha256": "0kfbcicflg7dj9nzvvkgrxsb6p03a7cq26jfk7h6hsnrajy5y4sc"
},
"stable": {
"version": [
@@ -58012,11 +58034,11 @@
"repo": "JuliaEditorSupport/julia-emacs",
"unstable": {
"version": [
- 20200917,
- 713
+ 20210323,
+ 612
],
- "commit": "8ea90c7927f6d87a291cfb0216f34dacf43c722e",
- "sha256": "1ymanbalx41xri5kiqs83a80a72yr9831if6cz2m24pg3g7rwr9c"
+ "commit": "fe6f6f7a80f8d60ecffa5b2cb43667bb9dc11705",
+ "sha256": "0afgdga2p7ipdimvi2xncmqxv87x2khg603iifyylfq26wyxscr7"
},
"stable": {
"version": [
@@ -58123,14 +58145,14 @@
"repo": "shg/julia-vterm.el",
"unstable": {
"version": [
- 20201223,
- 741
+ 20210327,
+ 657
],
"deps": [
"vterm"
],
- "commit": "c051cdc4ba574039b622fce37a5f61685dcc6d89",
- "sha256": "0ixlh640106cdvdnnmr7p6n0c5bg5qzyk9mspylsnlgiws4gz1ff"
+ "commit": "1d70c7f9fb91654e38fc868baf0ef72399f75ded",
+ "sha256": "1zhc71vsc7xjkabqkpv3pbf8hippqiqrd3ng1ws4b9fn1kv68av3"
},
"stable": {
"version": [
@@ -58753,11 +58775,11 @@
"repo": "delaanthonio/kconfig-mode",
"unstable": {
"version": [
- 20200628,
- 1721
+ 20210321,
+ 1106
],
- "commit": "d9fdf751646abe2b75b7bbeb46e7552e0f36f290",
- "sha256": "0dhkggvni5k4rnj2m6lva99hj1925b4w24dh9nv3m9w0x7b49263"
+ "commit": "7d03fa239e6879854c3b26c8e750489eceb58503",
+ "sha256": "0j07h1g8xcs6lq6gyi594zb353x9igi9k9iz8nci8gy79l3n7l3m"
}
},
{
@@ -59324,14 +59346,14 @@
"repo": "mrkkrp/kill-or-bury-alive",
"unstable": {
"version": [
- 20190713,
- 1340
+ 20210320,
+ 1231
],
"deps": [
"cl-lib"
],
- "commit": "7db85a3f3004ff400e24105d1875f4e3a6eec7a6",
- "sha256": "02nv6hzzr60gn24ra88smrwmkfjcb33c987dcgxqv7rzjpdjagnx"
+ "commit": "388067e764bf3922234196e2e9dd9e8f664c634d",
+ "sha256": "0rxzl3rsa45jq8b8bjirsc6yry95zxlyp81v5r4hkvgyxqhcp3c1"
},
"stable": {
"version": [
@@ -59442,8 +59464,8 @@
20210318,
2106
],
- "commit": "3421cedfd83acb9fd0dd15600811662136faa1c6",
- "sha256": "103d32iamgharcjnqagm5w63ssj6365mqcxjdrvzarhgsq2gqx6b"
+ "commit": "09c957050af1c37d381d855ac886fb2aa2896d39",
+ "sha256": "1lfbl1kvnw09qbcsxks14kj9ya1gsahs9wmgznn100d7nqnjwhsc"
},
"stable": {
"version": [
@@ -59502,17 +59524,17 @@
},
{
"ename": "klere-theme",
- "commit": "07a3e348d69738ae59fce3570a61b0cdc565fdb8",
- "sha256": "1lgvk6q2853rpk15i91zf917r8wmrb7bnagp4x02fws49x83hqrs",
- "fetcher": "github",
- "repo": "WammKD/emacs-klere-theme",
+ "commit": "b6f489036d7d3d171f0ff2613e3192f73c956b3d",
+ "sha256": "0hqj3jf5l79gf59llx2qy6ml7r5bdwjnm8c7r0qfhyvrk0lp7smm",
+ "fetcher": "git",
+ "url": "https://codeberg.org/WammKD/emacs-klere-theme.git",
"unstable": {
"version": [
- 20180415,
- 1823
+ 20210320,
+ 1912
],
- "commit": "c064f9e5c44173c239fce239a62c8d5e61827672",
- "sha256": "1rfdk35k1cj1z5gnsckcy93mqgj1amqzb13b89k11bnzc2m6r7zl"
+ "commit": "f9eacacc00455e6c42961ec41f24f864c2a05ace",
+ "sha256": "10a84q8ilzs5b8f8yf2awlyfa8v3s6gr1lz459nlnkq9fflxwdj1"
}
},
{
@@ -59727,8 +59749,8 @@
"repo": "abrochard/kubel",
"unstable": {
"version": [
- 20210222,
- 2212
+ 20210326,
+ 2053
],
"deps": [
"dash",
@@ -59736,8 +59758,8 @@
"transient",
"yaml-mode"
],
- "commit": "0c118987feee05059629073228d966502f5d0e93",
- "sha256": "07k14qr2z1mhshyrr5j5ij8q84bl79rdfmsbhk38nnh0kmhpldvs"
+ "commit": "91d1c8e97e4168fc49548c3449b4a60568c96790",
+ "sha256": "16s6iy3igb40r29x4bpb2x9763pf1fg5cygfdgabjq8xq36slmg8"
},
"stable": {
"version": [
@@ -59769,8 +59791,8 @@
"evil",
"kubel"
],
- "commit": "0c118987feee05059629073228d966502f5d0e93",
- "sha256": "07k14qr2z1mhshyrr5j5ij8q84bl79rdfmsbhk38nnh0kmhpldvs"
+ "commit": "91d1c8e97e4168fc49548c3449b4a60568c96790",
+ "sha256": "16s6iy3igb40r29x4bpb2x9763pf1fg5cygfdgabjq8xq36slmg8"
},
"stable": {
"version": [
@@ -60086,16 +60108,16 @@
"repo": "Deducteam/lambdapi",
"unstable": {
"version": [
- 20210312,
- 1104
+ 20210325,
+ 1344
],
"deps": [
"eglot",
"highlight",
"math-symbol-lists"
],
- "commit": "3f2d0e95362c3ea9ed78f32fcb3d310c2366df12",
- "sha256": "1898ixkcgmcwzfxl4cpjdc9kim5s2a5n2s7hi6xqzccqx2mf4brd"
+ "commit": "5a3c307928438afec317bbb88d56fd67ae89f87c",
+ "sha256": "1y3szymdb8xf6kv6g9hlmf89bcy3r8c1qzf9gh968yml2gqzrfhb"
}
},
{
@@ -60843,11 +60865,11 @@
"repo": "ledger/ledger-mode",
"unstable": {
"version": [
- 20210318,
- 26
+ 20210322,
+ 2306
],
- "commit": "3c53ecc4fd27736560db7a64587e516b26521d61",
- "sha256": "176h5n3azjqyp63map0224m01jrqzmjy4g9cdh00mna5p2n1lbwr"
+ "commit": "32fef097970e66b6cc75ee8233a7edaeee6431df",
+ "sha256": "1yv2lb3wpnck5ig8n4z7nwlksi6frnfjlh6fqslwqnxyz5n3xsr0"
},
"stable": {
"version": [
@@ -61403,8 +61425,8 @@
20210303,
1751
],
- "commit": "46827603dc28320c359ca30364778f24f66ea6f4",
- "sha256": "1jf6cfp26n7k2hr30sh16x7ijd1pig0g4krzmv5dpgw0m5v1ba6f"
+ "commit": "cadaa46a6eafa305e9b176f6decc649708e6fec9",
+ "sha256": "04imm0j7d8f7xcfbha8vhyf66hsq1sv0y3r1i582r91psrzhlai6"
},
"stable": {
"version": [
@@ -62043,14 +62065,14 @@
"repo": "sulami/literate-calc-mode.el",
"unstable": {
"version": [
- 20210227,
- 1744
+ 20210324,
+ 1547
],
"deps": [
"s"
],
- "commit": "55494982d21de36c182b41896e1ed571bda69541",
- "sha256": "06r7d5zgavam9jdnffnb3gznx9k5347dlwc4yj1knhfnphzzvl7a"
+ "commit": "211eec1e8b03503a53fa3eb4528375f36972f759",
+ "sha256": "1kawczbjdvjzyz3fflp1ij0vi9qcrl0yhrv7knx9j1zh187jp7z7"
}
},
{
@@ -62989,16 +63011,16 @@
"repo": "emacs-lsp/lsp-ivy",
"unstable": {
"version": [
- 20201113,
- 2220
+ 20210320,
+ 913
],
"deps": [
"dash",
"ivy",
"lsp-mode"
],
- "commit": "c70ee8b54357c56d1b972393ee53e57a2e545fbb",
- "sha256": "01klra1yr3jk2fhk1s07ziygkfvv5qxgi8v30i8z13v5v4vi5mfx"
+ "commit": "515e5977b3d1f6cb521984f084868f28efd47e72",
+ "sha256": "1m05c80bf7d7kkk58c91c2f3lyln0wh6mvxbyi856fh1clb5gv13"
},
"stable": {
"version": [
@@ -63219,8 +63241,8 @@
"repo": "emacs-lsp/lsp-mode",
"unstable": {
"version": [
- 20210319,
- 1818
+ 20210326,
+ 1728
],
"deps": [
"dash",
@@ -63230,8 +63252,8 @@
"markdown-mode",
"spinner"
],
- "commit": "726ba9b174be01ca84b850428c41b6f3b3dfc9c9",
- "sha256": "15wmb3bapmkvg21dqhv6v3xjx1iaxbzbjxf0las6a87dyb8qz1gn"
+ "commit": "7d72c9e79b17bb96477326bc97a9251bf64eb0fb",
+ "sha256": "0ngz46b1b4zilgbf90ghzcni7qz9qdwhmng4jpdqs3hv9a4n5c15"
},
"stable": {
"version": [
@@ -63537,16 +63559,16 @@
"repo": "emacs-lsp/lsp-ui",
"unstable": {
"version": [
- 20210317,
- 1358
+ 20210326,
+ 507
],
"deps": [
"dash",
"lsp-mode",
"markdown-mode"
],
- "commit": "784e6d4bb72c6ad1338f3c62d88e2e95056f236f",
- "sha256": "04xv0v8l6x57d66rlk4ibs9m59hvliv35ikmiz1dygpdn3ili9zh"
+ "commit": "1dbea9ff206a626d5c2d735e3f8fcdac59827963",
+ "sha256": "175am5hycgxmd4329mnwgcjfpyycxyjip5wl96n297zxnb4m94wb"
},
"stable": {
"version": [
@@ -63885,15 +63907,15 @@
"repo": "nbfalcon/macrostep-geiser",
"unstable": {
"version": [
- 20210222,
- 1552
+ 20210324,
+ 2141
],
"deps": [
"geiser",
"macrostep"
],
- "commit": "4409d0f6834e0429c42e0675365bc58284312ad1",
- "sha256": "02ydl3lfm269bi7dczkqsk6rbcdir759gd0nk7f477aw6x03hgwf"
+ "commit": "8600fca05fd12a2e0ffe63238ddbfcb37c285dac",
+ "sha256": "1912hxbb7mbra91vjw1fnzbb4fd9ri59lc1hcrw196c7a4hzgv0y"
}
},
{
@@ -64009,8 +64031,8 @@
"repo": "magit/magit",
"unstable": {
"version": [
- 20210312,
- 1012
+ 20210326,
+ 329
],
"deps": [
"dash",
@@ -64018,8 +64040,8 @@
"transient",
"with-editor"
],
- "commit": "cb9bb20cfe8e3a50df8669a43611ebc9a516358a",
- "sha256": "1b33fs9h46msk5800l9haf6mccz5jg6w5v8607i2863403hjfn56"
+ "commit": "527842a3b0fd868bd0c193c430a6ad290dd62053",
+ "sha256": "0cxnvi2vkk5nrcd2iir34bv76rsakijsim1rgxxh03xjc7fqyvj3"
},
"stable": {
"version": [
@@ -64365,8 +64387,8 @@
"libgit",
"magit"
],
- "commit": "cb9bb20cfe8e3a50df8669a43611ebc9a516358a",
- "sha256": "1b33fs9h46msk5800l9haf6mccz5jg6w5v8607i2863403hjfn56"
+ "commit": "527842a3b0fd868bd0c193c430a6ad290dd62053",
+ "sha256": "0cxnvi2vkk5nrcd2iir34bv76rsakijsim1rgxxh03xjc7fqyvj3"
}
},
{
@@ -64520,8 +64542,8 @@
"deps": [
"dash"
],
- "commit": "cb9bb20cfe8e3a50df8669a43611ebc9a516358a",
- "sha256": "1b33fs9h46msk5800l9haf6mccz5jg6w5v8607i2863403hjfn56"
+ "commit": "527842a3b0fd868bd0c193c430a6ad290dd62053",
+ "sha256": "0cxnvi2vkk5nrcd2iir34bv76rsakijsim1rgxxh03xjc7fqyvj3"
},
"stable": {
"version": [
@@ -64595,14 +64617,14 @@
"repo": "magit/magit-tbdiff",
"unstable": {
"version": [
- 20200519,
- 418
+ 20210327,
+ 350
],
"deps": [
"magit"
],
- "commit": "8eea04c10d116057d3d4f249e6a184d5ed090263",
- "sha256": "1m2p317xkbhfadba30m8lq01k543368ajbxid1v9627slgkcjf89"
+ "commit": "99cb9c0501f0f1ea7ec3ebf0fb398f3d36cddafb",
+ "sha256": "189c4hrgbrwx44nidf4xv30yyb2y7lid57by0fn9hyi21nbk2gmx"
},
"stable": {
"version": [
@@ -65310,11 +65332,11 @@
"repo": "minad/marginalia",
"unstable": {
"version": [
- 20210317,
- 1054
+ 20210324,
+ 906
],
- "commit": "e741b243b30f6cfe85e568cc551acff9a1e5e74f",
- "sha256": "0piwzxp1zmwp876kyca0xcgyxgn8bn4wh5fnn88dkvdzi8mcgmkh"
+ "commit": "5ce5a0e6d23d92391167a49d994f093764ee0dee",
+ "sha256": "009ki4m5i0lvh9ml2jz93j4sbjab51c4qazz1858mq888hldpwr9"
},
"stable": {
"version": [
@@ -66380,16 +66402,16 @@
"repo": "DogLooksGood/meow",
"unstable": {
"version": [
- 20210319,
- 1657
+ 20210326,
+ 1659
],
"deps": [
"cl-lib",
"dash",
"s"
],
- "commit": "a3dbefc07f897fb09124d8568272a31791657898",
- "sha256": "15969wbd9wqryi2q1f3n21c732m0my5rp9lc3v4xa4w288s1m21a"
+ "commit": "28b9f855f175b390cb00c35a0e55cc50725a0938",
+ "sha256": "12j1l48ahipw1w10kqg54ikfclib8a178cg9q6k9sn2q4v9bx0j6"
}
},
{
@@ -66403,8 +66425,8 @@
20210129,
1443
],
- "commit": "5dae97414e4e4f68a9d71d79362e03416bb6e6ce",
- "sha256": "09c430k88kwvcni1v68ncvnf5pdpp236ij8k6vf5rnm5khki6vj3"
+ "commit": "cc17ed60630fb1831ad950fe62970b1c7a7f4c8b",
+ "sha256": "0mfvxg74h9mcs8pp9p3m498vflnpncvsa514qf36kajmbdbxn0sk"
},
"stable": {
"version": [
@@ -66452,14 +66474,14 @@
"repo": "abrochard/mermaid-mode",
"unstable": {
"version": [
- 20200819,
- 1759
+ 20210327,
+ 7
],
"deps": [
"f"
],
- "commit": "6ec97ab934023a8aa094705bb1c9803fd85d24c1",
- "sha256": "1hhpihmacbam3fgk7pjlzn7hnakz38ksds052nzirvw6a68ynzgk"
+ "commit": "b8847cc15eee1a7e3c7e0eefc91f2296256f84b9",
+ "sha256": "002bv1z8hr5h30dp9m8jq0h8lzi668lj2asx89jigfsrz4z6k4kg"
}
},
{
@@ -66470,11 +66492,11 @@
"repo": "wentasah/meson-mode",
"unstable": {
"version": [
- 20200907,
- 743
+ 20210321,
+ 1136
],
- "commit": "d995dafa388ec03c0113cd1ac46403c20ad18ab0",
- "sha256": "1swipsr9j0r2rpngz0dwykqnbs84j3pspx70dxmqyjm7qqabypnq"
+ "commit": "88717d5256d4cf47a85756dc5e204ea23eec165d",
+ "sha256": "1y8j8qgy6pw80ja4ppzkdrcnq3k6qwzc1i81g7399rkpbj62kd53"
},
"stable": {
"version": [
@@ -67428,14 +67450,14 @@
"repo": "mrkkrp/mmt",
"unstable": {
"version": [
- 20190713,
- 1347
+ 20210321,
+ 1829
],
"deps": [
"cl-lib"
],
- "commit": "d7729563e656a3e8adef6bce60348861ba183c09",
- "sha256": "05f218f0lncgx2bbipjz7db09rrka8fq0qf5qkvbgssagxyl7rav"
+ "commit": "05cdbb643469676b91a44badecf84deccb50f262",
+ "sha256": "09zlqx9xrcj80vdd07yz9gzq5p8mayjlqkrcv7c8vm5wn5dl3gnq"
},
"stable": {
"version": [
@@ -67802,11 +67824,11 @@
"repo": "protesilaos/modus-themes",
"unstable": {
"version": [
- 20210319,
- 543
+ 20210326,
+ 1916
],
- "commit": "121aa48cadd9ab3fd64f5cddc057bdcc94dd7383",
- "sha256": "1aqsh0qbk0rkcfznbbhhja3whl6xygij89kdqlzc4az0kj43l2jq"
+ "commit": "e07461ca01b04a6536961eb538769f9889813852",
+ "sha256": "18gwyy5an1k9pf9n6ccygs4k7nbrv6scp7wyvaabayzxqv50lhsn"
},
"stable": {
"version": [
@@ -67829,8 +67851,8 @@
20210308,
1053
],
- "commit": "d432815230f4e62d3f38a0819621ff227f780522",
- "sha256": "1gfqx0xvxyyf35yngc5sgq7xb42xxv8wzvm36sgg2qqlkgvrh6fz"
+ "commit": "b23975ba57a68f69551424552f484227db8a7b97",
+ "sha256": "0vr02ng574k1xfykxn2j2xhl78x4zsvzcszswqjrlps55bvxkm7b"
},
"stable": {
"version": [
@@ -68158,11 +68180,11 @@
"repo": "takaxp/moom",
"unstable": {
"version": [
- 20210318,
- 1137
+ 20210324,
+ 825
],
- "commit": "9d3170f60dd188bac2d0304daf2a94bec9bfbbd3",
- "sha256": "1fc20zglhv48aiy5vl8y6vlk3nimwgfzajx8pq4n7jga3k7cp0q5"
+ "commit": "f94cf84138a81212ffe856599834f7824a1b6e95",
+ "sha256": "0rdvcv8hwrxxbb9s8sfx5331a08kdk28x8chnnq3pj58pxqvagy3"
},
"stable": {
"version": [
@@ -68493,8 +68515,8 @@
20210306,
1053
],
- "commit": "8ad7b19d89e65ec81c78204986088154d8702309",
- "sha256": "1m4vnwfr04cr3rbg7cny49spz08c09sgm8zpq99r510xn8xxs7vg"
+ "commit": "473a26ccd17304f6c64eaac8c61090659bcdb936",
+ "sha256": "114nimj1q9dn18in2bdzkswkxd3rm0xxzxiix4jv6hzhsm8rznw8"
},
"stable": {
"version": [
@@ -69339,14 +69361,14 @@
"repo": "magnars/multiple-cursors.el",
"unstable": {
"version": [
- 20201215,
- 1559
+ 20210323,
+ 1128
],
"deps": [
"cl-lib"
],
- "commit": "a9d7764f80b241978f3d4e76bc981ef10bab5d70",
- "sha256": "0r5dgzra3wimny5kaqhkfj1723mbwsdjabi26jp77hxkrhx7v905"
+ "commit": "7b13b03c995e13ad86e499d40ec49c4dc281f889",
+ "sha256": "1fysnjbh0dai1bzx4122fp4qhbyn82m8hh3smd0xhwphjwrbnl57"
},
"stable": {
"version": [
@@ -70797,8 +70819,8 @@
20181024,
1439
],
- "commit": "ac0fe07d9e924661c6c443f4a9503d4f4308fb20",
- "sha256": "06ifnn51pqsjx958rj8wwkq3dpw2gsfnqhhlfc27frf9zjk0qdwh"
+ "commit": "8cd25aa78c2ff2ca8b3712f8c3630d1a095856d9",
+ "sha256": "0qq1p2pjpnvhrblbsh80k43ksrzb1nw48gw8srw32vih91pv02x5"
},
"stable": {
"version": [
@@ -70920,15 +70942,15 @@
"repo": "travisbhartwell/nix-emacs",
"unstable": {
"version": [
- 20191126,
- 759
+ 20210325,
+ 1622
],
"deps": [
"dash",
"s"
],
- "commit": "977b9a505ffc8b33b70ec7742f90e469b3168297",
- "sha256": "07vidk3bnby1ch51i67llfdx2q8xc4ax5hvlrc3f72y9gkcpir4x"
+ "commit": "053a2d5110ce05b7f99bcc2ac4804b70cbe87916",
+ "sha256": "05vxac2llww4ba5w0dmf0hza60l5i847hfabs0q5i8kzmw4f8s8z"
}
},
{
@@ -70957,8 +70979,8 @@
20160209,
1841
],
- "commit": "977b9a505ffc8b33b70ec7742f90e469b3168297",
- "sha256": "07vidk3bnby1ch51i67llfdx2q8xc4ax5hvlrc3f72y9gkcpir4x"
+ "commit": "053a2d5110ce05b7f99bcc2ac4804b70cbe87916",
+ "sha256": "05vxac2llww4ba5w0dmf0hza60l5i847hfabs0q5i8kzmw4f8s8z"
},
"stable": {
"version": [
@@ -70987,8 +71009,8 @@
"deps": [
"reformatter"
],
- "commit": "213251f82a69edc033766ec96948e83aeb428cd2",
- "sha256": "1hx13p9rs33j2ajbg0dp6a371hr0dcxbcyzr5xlvkg6gf746lmg8"
+ "commit": "0df268136d14f27770fa5bb3bdb991e987337cf4",
+ "sha256": "137hvv9ry2h5975v06x22bdirdn7ms0gv216wkz6y68897k7hv3p"
},
"stable": {
"version": [
@@ -71502,8 +71524,8 @@
20210205,
1412
],
- "commit": "13efbd0e1c88fcbdb48b4c30c7852c5bf1fbd0b7",
- "sha256": "0xc06vqyqpkbq6hd00vdcwxk74mraxmbswin3j716iyx5j7hk7wc"
+ "commit": "4e209ca99ac8084a357c6fc8d7773f6207cfa16d",
+ "sha256": "07ygvb6skrz0vxvvswjf35qdgps2p8cfhmjxqprkj1x59k7dvwi6"
},
"stable": {
"version": [
@@ -71612,15 +71634,15 @@
"url": "https://depp.brause.cc/nov.el.git",
"unstable": {
"version": [
- 20210228,
- 2125
+ 20210323,
+ 1105
],
"deps": [
"dash",
"esxml"
],
- "commit": "b6138895ace3042ed78140b6f4859e544fbca27e",
- "sha256": "03knl5zch59r1zrk2kvricvirp6rhcdiywny3n9cmbv653gjzyvi"
+ "commit": "b3c7cc28e95fe25ce7b443e5f49e2e45360944a3",
+ "sha256": "0va9xjrq30cv5kb59a4rq5mcm83ggnv774r8spmskff3hj8012wf"
},
"stable": {
"version": [
@@ -73242,8 +73264,8 @@
20201204,
945
],
- "commit": "585b139f3dee1f801edbbf6545891232119c9087",
- "sha256": "15gfvnkqzixwvq4jq8w6y7v7lyd2j8gca62hap3rsh6c41b8ls1p"
+ "commit": "448ac7c1496e2a6e83d63a7bcd9cf4e35bb2b1fb",
+ "sha256": "0rgh3c17h3k5bj897by7v64xbpf9pqpkg1kicka3w4g8gc0mb3v8"
},
"stable": {
"version": [
@@ -74128,11 +74150,11 @@
"repo": "oantolin/orderless",
"unstable": {
"version": [
- 20210227,
- 1543
+ 20210323,
+ 2341
],
- "commit": "9d5b95f40275dc47a57e9d4ee9b9994ee3a4b426",
- "sha256": "0ksjvi257m6ij7dd40rjc106grxi727717w8k58h3i5l6f03w70f"
+ "commit": "44935d8962be5724d8a3a4358ce0a4222450ee26",
+ "sha256": "1f76k6cp0m6r47s91za3sad09vrka41x9vwxh40bi9achwc3538q"
},
"stable": {
"version": [
@@ -75418,28 +75440,28 @@
"repo": "marcIhm/org-id-cleanup",
"unstable": {
"version": [
- 20210226,
- 1636
+ 20210320,
+ 1023
],
"deps": [
"dash",
"org"
],
- "commit": "5f9ac60cedb0be935c2b7ccefd484c0a378bc9d9",
- "sha256": "0xbxfrrbcklhji6j99hvz7j6k6hv60cjvrwnf5kq3af1wy0kiayg"
+ "commit": "0877bd57f95ad96a342505a6ecef0c15977f6bd6",
+ "sha256": "02q343sznbw1ma9zcxnpa7sy37s85ph9phpg479pfz5c51kji09h"
},
"stable": {
"version": [
1,
5,
- 6
+ 7
],
"deps": [
"dash",
"org"
],
- "commit": "f7e6dfb349e5c93a134f1d6badacd504b5b345ef",
- "sha256": "1h65qa0m3p999pbhw9z98pn7bnz1qczsfybp3zr0g66mi7qqbalq"
+ "commit": "0877bd57f95ad96a342505a6ecef0c15977f6bd6",
+ "sha256": "02q343sznbw1ma9zcxnpa7sy37s85ph9phpg479pfz5c51kji09h"
}
},
{
@@ -75474,30 +75496,30 @@
"repo": "marcIhm/org-index",
"unstable": {
"version": [
- 20210226,
- 1635
+ 20210320,
+ 1013
],
"deps": [
"dash",
"org",
"s"
],
- "commit": "1f029b28b817dcdc7d1deb734a087ba08e66c6b5",
- "sha256": "04qcdf3knpxjjp972skdqgdh56bhh8frvljw1zb5wnln6byvqxr3"
+ "commit": "47dda7d3dce11e8ab9a3847f8c6a1cbb8345f861",
+ "sha256": "1s1y0xlin1yx716awzbq6lvzz5c3c5i9qvacgm006bypg8qlmz1a"
},
"stable": {
"version": [
7,
1,
- 5
+ 6
],
"deps": [
"dash",
"org",
"s"
],
- "commit": "c8998d4b81879c757cc2825200543921e0f6b637",
- "sha256": "0cjpvcwfiaanaii91937907nsfadwnnlaq16yx79xk8gcvbrx1fg"
+ "commit": "47dda7d3dce11e8ab9a3847f8c6a1cbb8345f861",
+ "sha256": "1s1y0xlin1yx716awzbq6lvzz5c3c5i9qvacgm006bypg8qlmz1a"
}
},
{
@@ -75557,16 +75579,16 @@
"repo": "ahungry/org-jira",
"unstable": {
"version": [
- 20201119,
- 154
+ 20210325,
+ 424
],
"deps": [
"cl-lib",
"dash",
"request"
],
- "commit": "df45be17fb66490f625b60c99d9954e614885101",
- "sha256": "1hsfkkm3ykdf7n8a6k0mpzilhjpy7vllwrl2s4rfb9mhnaq5yb8y"
+ "commit": "7beb2023c36106aefe1a260a7618e285d52eb0a1",
+ "sha256": "0srn5z0r3g8mjb8pibwipzjm5p3w8dwzldfdmlyli1a6akcinsxv"
},
"stable": {
"version": [
@@ -75591,14 +75613,14 @@
"repo": "bastibe/org-journal",
"unstable": {
"version": [
- 20210204,
- 820
+ 20210326,
+ 1207
],
"deps": [
"org"
],
- "commit": "f4b15499135d43e98244dda4606a5b97462b3f39",
- "sha256": "140wfvj2cygpip75w60difg9gwvh5c53ds6zbysnj5zqsjm4zica"
+ "commit": "043bb9e26f75066dc1787cdc9265daca7a14dd4e",
+ "sha256": "0x4fvxdrllih2n643v3wgq0rl72dyhk11xqi2l1h718iaz4kqi5i"
},
"stable": {
"version": [
@@ -75982,8 +76004,8 @@
"repo": "akirak/org-multi-wiki",
"unstable": {
"version": [
- 20210228,
- 542
+ 20210324,
+ 1820
],
"deps": [
"dash",
@@ -75991,8 +76013,8 @@
"org-ql",
"s"
],
- "commit": "c85bcaafed749de3efa5e1f4d256e7ac9c5678e2",
- "sha256": "14da1rhln69nnjd891x6f6d69vyy4a4lg6cw51gd7h3cy6lcwbl5"
+ "commit": "bf8039aadddaf02569fab473f766071ef7e63563",
+ "sha256": "0hmn9yy2d7wy6zz81ddd96rksmvs9k5529dfqrkrpl4v3bn3g52d"
},
"stable": {
"version": [
@@ -76113,6 +76135,27 @@
"sha256": "18iy03hc7jb7qsfj25f6hmrwli6fyjbf14c1p5bhp5gwk49rm9p1"
}
},
+ {
+ "ename": "org-notifications",
+ "commit": "cd49aa8b5692ce460f3a3e9f6310f82665de4a47",
+ "sha256": "03gbdn1igdhna7kpcvwwf21mkyp94fwv1glsajd1l88r1a9n3dss",
+ "fetcher": "github",
+ "repo": "doppelc/org-notifications",
+ "unstable": {
+ "version": [
+ 20210310,
+ 1149
+ ],
+ "deps": [
+ "alert",
+ "org",
+ "seq",
+ "sound-wav"
+ ],
+ "commit": "41a8a6b57e11a5b676b03925d473066655364808",
+ "sha256": "1fb4jm1zhfllzzrdbasgp1r3ggjs3xa4pfd5papi6mfcz9ypxqsh"
+ }
+ },
{
"ename": "org-octopress",
"commit": "fba6c3c645ba903f636814b5a2bb1baca0b5283b",
@@ -76772,8 +76815,8 @@
"repo": "jkitchin/org-ref",
"unstable": {
"version": [
- 20210315,
- 1730
+ 20210324,
+ 1337
],
"deps": [
"bibtex-completion",
@@ -76788,8 +76831,8 @@
"pdf-tools",
"s"
],
- "commit": "7b0ebdd2e34b3a509c7f043cb9d919a0069491c2",
- "sha256": "1r1p2k9x5sddxr8cf5ds3hqz2xn4zvy9zabgyr63s16cl7hhn2lg"
+ "commit": "3ca9beb744621f007d932deb8a4197467012c23a",
+ "sha256": "1n262rsmil2n7dilf711gs8rciv8gd7wf3vadb0zcbkbn703jbk9"
},
"stable": {
"version": [
@@ -76955,15 +76998,16 @@
"repo": "org-roam/org-roam-bibtex",
"unstable": {
"version": [
- 20210316,
- 840
+ 20210322,
+ 2231
],
"deps": [
"bibtex-completion",
+ "org-ref",
"org-roam"
],
- "commit": "81b6fedf99996a78199067e61935964dea9389ee",
- "sha256": "1xb7nskz73dfa2rgwmf4s3iq10f43zagggia3ddhx109wmy2m9a9"
+ "commit": "ffe0cdbcfd7421c10268fb3437fc5bd6ceadcbd2",
+ "sha256": "1a9k9nxcqzyfip06m59la1rq8siswhg9zys3y6i3iz5wfy5vd0lk"
},
"stable": {
"version": [
@@ -76987,8 +77031,8 @@
"repo": "org-roam/org-roam-server",
"unstable": {
"version": [
- 20210312,
- 1125
+ 20210321,
+ 1040
],
"deps": [
"dash",
@@ -76998,8 +77042,8 @@
"s",
"simple-httpd"
],
- "commit": "a9051e03a2fc3744aa6716ebb529142caa0af2f0",
- "sha256": "0199ri3xabrc7xy746s0f87y6vy9hw90ylw5pj7ha29xvcrfh851"
+ "commit": "2122a61e9e9be205355c7e2c1e4b65986d6985a5",
+ "sha256": "05fh2065hl17vqsph5kgraaq303q2j48aqvll2mdpl666rhdlws8"
},
"stable": {
"version": [
@@ -77335,11 +77379,11 @@
"repo": "bastibe/org-static-blog",
"unstable": {
"version": [
- 20210306,
- 1316
+ 20210321,
+ 2008
],
- "commit": "ea437f80de87ea72deff1d420854bd2c011ef4e5",
- "sha256": "0y6i2cc99x5cl8ylyfarim1pka5cy4zqmv2m4x2s9bsar60nwmii"
+ "commit": "e0265c97dd9d014760eb6280be6c8bb81793cdf5",
+ "sha256": "0g0mwgc5mrwchqj679b8jzxn2j4pfnysyp3xlpx41gk24hakpfqh"
},
"stable": {
"version": [
@@ -78066,30 +78110,30 @@
"repo": "marcIhm/org-working-set",
"unstable": {
"version": [
- 20210226,
- 1635
+ 20210320,
+ 1019
],
"deps": [
"dash",
"org",
"s"
],
- "commit": "866010a4391d12c9c1968a74e396d9b0ffa58d78",
- "sha256": "0s4xkzz39xd4cdfb325h1d3nwpp4nzfzn9w1wjfpgz9n5mrpmhvp"
+ "commit": "f5512304dccc152816f9957f5627c814bcb0f683",
+ "sha256": "0kg2bjwp66fml3836zfr15aadh5d7srg8ai69g0nxk1kmalbxkdv"
},
"stable": {
"version": [
2,
4,
- 3
+ 4
],
"deps": [
"dash",
"org",
"s"
],
- "commit": "8e22ffe59d241a0f43395f2cd88589ffb0c7db23",
- "sha256": "0vcawnrj5ap3h0cy5h1nsiki41scgdhxf83adnvv3lj6gwif1l9a"
+ "commit": "f5512304dccc152816f9957f5627c814bcb0f683",
+ "sha256": "0kg2bjwp66fml3836zfr15aadh5d7srg8ai69g0nxk1kmalbxkdv"
}
},
{
@@ -79304,15 +79348,15 @@
"repo": "jkitchin/ox-clip",
"unstable": {
"version": [
- 20210115,
- 2234
+ 20210323,
+ 2145
],
"deps": [
"htmlize",
"org"
],
- "commit": "38b83ac6a70e9f1bc5cefb79a3b4e5397d11e467",
- "sha256": "140yj6z9bz7i6ap7m9b465ambsczmx43zjp7887qjf77zbnf152b"
+ "commit": "2095537695135c7f1bc19db043925eb7d482907b",
+ "sha256": "0pingsmmdpw9g88rri7rkw8ajp1f982vx9rh97nfn51ppr94ihbw"
}
},
{
@@ -80237,8 +80281,8 @@
"deps": [
"cl-lib"
],
- "commit": "af4f87beb48afc3fb455c58648749e5bfdda1d03",
- "sha256": "1cn61si2dn60pm3q0d0yjlrsfbns2v51zsdfl52rnfmnrhnl3qjl"
+ "commit": "0f13dd6655f6d4ff71b77c6d2c93727e5f43b254",
+ "sha256": "0l4qwz2s63r26y5v02yrpncjdiyspw7pill0bjjlcawvxffykw9i"
},
"stable": {
"version": [
@@ -80275,15 +80319,15 @@
"repo": "purcell/package-lint",
"unstable": {
"version": [
- 20210227,
- 314
+ 20210326,
+ 241
],
"deps": [
"cl-lib",
"let-alist"
],
- "commit": "82282a8f8b89969ad2671d095906e9bc61abbb04",
- "sha256": "0n8s9651rq4jgyid54w1b0fp86903qqf1r1wbkvidagfl062bilz"
+ "commit": "16e589114cc1f2514d95a58d53e1ae7c2ce941b4",
+ "sha256": "03bcnxd39r9k63zwb6gnqrhs0q629izakj2hmhk83hiy1131v7jl"
},
"stable": {
"version": [
@@ -80312,8 +80356,8 @@
"deps": [
"package-lint"
],
- "commit": "82282a8f8b89969ad2671d095906e9bc61abbb04",
- "sha256": "0n8s9651rq4jgyid54w1b0fp86903qqf1r1wbkvidagfl062bilz"
+ "commit": "16e589114cc1f2514d95a58d53e1ae7c2ce941b4",
+ "sha256": "03bcnxd39r9k63zwb6gnqrhs0q629izakj2hmhk83hiy1131v7jl"
},
"stable": {
"version": [
@@ -80481,8 +80525,8 @@
20210104,
2224
],
- "commit": "69caea070379f3324c530e96e06625c3cd097cb9",
- "sha256": "0plfyzmh93x1r3zgfjyx23cc7vi1pcniipclzlms1iwfkl7zsqvp"
+ "commit": "3b8549cd414d4d7ee0168ab9917124133566d3db",
+ "sha256": "1jdr9rl90vs78pjdnxcl2igc1ll97ryxxgbyqxzkhbivixi4v87n"
},
"stable": {
"version": [
@@ -80971,11 +81015,11 @@
"repo": "justinbarclay/parinfer-rust-mode",
"unstable": {
"version": [
- 20210308,
- 2025
+ 20210325,
+ 1714
],
- "commit": "c19374a3cf9ce57a356a044731063040c552df32",
- "sha256": "04mghs7wn6ml8nr75pvqzzrjljv9d5252j4qkcg2llbpvhkya75h"
+ "commit": "f130fa04ec75131686872f24a253d0a1d5522fa4",
+ "sha256": "1i85c00cjvj79i104xswg5xjz7wkvcgar04fgjc9zphrihnp409x"
},
"stable": {
"version": [
@@ -81273,11 +81317,11 @@
"repo": "juergenhoetzel/password-mode",
"unstable": {
"version": [
- 20210214,
- 1905
+ 20210323,
+ 1816
],
- "commit": "ed4a4bedbdd920aad486009932495cb6ab70c3e6",
- "sha256": "1xqsrvnqcfmlncqbys21p8pzwxl064lzgs5qfb2m6w0p9ipblkjw"
+ "commit": "114b721ebbf384b6af6fd46797e83896a9e14aca",
+ "sha256": "1zwc3wk770plfwlywqwiviqv9hiskf3fsl2nv9zp4gmvphzrqvql"
}
},
{
@@ -83020,11 +83064,11 @@
"repo": "kljohann/pikchr-mode",
"unstable": {
"version": [
- 20201212,
- 2228
+ 20210324,
+ 2125
],
- "commit": "dd4bb08f189c96039128dddceba26bfdabd1431b",
- "sha256": "0w964qn9qag4pfwrs9pyv226ivmy1lw4s068hyi9f0jkm2fhd2za"
+ "commit": "5d424c5c97ac854cc44c369e654e4f906fcae3c8",
+ "sha256": "07qjz0mzl6cqgavv5sc9n1v7zq5q6f8is6nn126v0zk6rskp366q"
}
},
{
@@ -84692,11 +84736,11 @@
"repo": "karthink/popper",
"unstable": {
"version": [
- 20210319,
- 31
+ 20210326,
+ 2042
],
- "commit": "89ed8ab2da330ffefa0d32ac34491467fc6be228",
- "sha256": "1n9raivjdsh0nrn0npw2357j72ccqb19mpnmg4cq5qj5q1if2f8v"
+ "commit": "096078acea59df6109906641e9dd44893ed4f6a2",
+ "sha256": "1cvb40ad3zazfqjzwqgz4bnn9a2pl8yi52b0qfd56ccp32b24n91"
}
},
{
@@ -85236,8 +85280,8 @@
20210227,
600
],
- "commit": "52afa7e90534d59d3cec2ace2a96c232e25e3f7b",
- "sha256": "10pcl4w0y4d99g1ylxqb3qrvfmv091x4h52imf6ysbm4x6gl4r9n"
+ "commit": "8573df977eaceffc6607b7242ff8c0dab02aad65",
+ "sha256": "0kfbcicflg7dj9nzvvkgrxsb6p03a7cq26jfk7h6hsnrajy5y4sc"
},
"stable": {
"version": [
@@ -85946,8 +85990,8 @@
"repo": "asok/projectile-rails",
"unstable": {
"version": [
- 20210218,
- 831
+ 20210325,
+ 2120
],
"deps": [
"f",
@@ -85956,8 +86000,8 @@
"projectile",
"rake"
],
- "commit": "8d6b3734958f5dc7a620dc1b44754986d3726f3d",
- "sha256": "03cj0cpmqyxcvqscnjcgcfz5k1ga6knr5jcb5prnv9hfjfqgk3pb"
+ "commit": "f1fe6e8eff485dc560e6ffe7f0b9c46a61509a58",
+ "sha256": "1b9wsn6mm1ajh81f6bmp3ajxch3j05bzslzxjakw93gjg69w74y1"
},
"stable": {
"version": [
@@ -86277,11 +86321,11 @@
"repo": "ProofGeneral/PG",
"unstable": {
"version": [
- 20210317,
- 510
+ 20210321,
+ 2132
],
- "commit": "56ee4ebc97e77da7d61eaa7b00580bf4ef5b87d9",
- "sha256": "0hqmsqb6q2m0gq52lfm64xh8sc9kc48jbqr2w0vd6mp2467afj42"
+ "commit": "f0f0476d07401aba2cf428a71f7ee960cd1b3154",
+ "sha256": "1h6bwk1l3fm34xx8nbwh2s3g8ab5zbnx1givgaf64hf3z7r44xic"
},
"stable": {
"version": [
@@ -86384,8 +86428,8 @@
20200619,
1742
],
- "commit": "617e2556171d5db4f0c13bed56a5010d08fc3b4c",
- "sha256": "0blmqy1jh2c536lwrksrbndmy0za6dxafkww28wkfhs64s9dqwdm"
+ "commit": "aedb8d726c8d2a371d999354d44ca7e1bdbb1e73",
+ "sha256": "1qw9mmkxrv78062zw8bvrhp4nc4mhz8j76j534flvdy5w5cwv38q"
},
"stable": {
"version": [
@@ -86627,14 +86671,14 @@
"repo": "nbfalcon/ptemplate",
"unstable": {
"version": [
- 20210204,
- 1306
+ 20210324,
+ 1446
],
"deps": [
"yasnippet"
],
- "commit": "0d03fe3b2c608ab31bda309ef8e7a7d076bb0069",
- "sha256": "18lb3an90py39lmxk05fw5ppxa3xqrhck2qz27a0zaxvd6y3hqmx"
+ "commit": "b81cc7be8865745c3a60177a244d2a69729ab21b",
+ "sha256": "1j6lgb7knnnydyd1jryai8vlr7i5jc2d7l693yyhs79jdypzss4c"
}
},
{
@@ -86645,14 +86689,14 @@
"repo": "nbfalcon/ptemplate-templates",
"unstable": {
"version": [
- 20210222,
- 1555
+ 20210324,
+ 1443
],
"deps": [
"ptemplate"
],
- "commit": "f65acbb4991470cb5ae513c9f2a8197ead297704",
- "sha256": "094qxh06jibc6kxs2fa5cw1xmj8mf7ykgdw02qpk0rjmczwns9vs"
+ "commit": "3788387973dde3101f9a3f2064572be033c59ad6",
+ "sha256": "17jc7gjawbj7b5v2i2jfxwnjgi023xrr28dyigzv6yw72fzqcnlh"
}
},
{
@@ -86844,8 +86888,8 @@
20210109,
244
],
- "commit": "8410baff69ba934b64d78340c7fd20aa1e67dbfb",
- "sha256": "1gc5rg5rggljmcfz93kz03fy21455nvp7vz79pknqyf8k67aah4h"
+ "commit": "0acd1af446424ba855153161fe07a20f67dc0a89",
+ "sha256": "0rxdsmx8826az4blhnnvqrx7bjky9hwph6gkyrh33sck26xhh3g5"
}
},
{
@@ -87392,8 +87436,8 @@
20200503,
1624
],
- "commit": "cdfc8374b1b0ee88af0463bdbe58299186244d53",
- "sha256": "0657491d55x4r4fir357l372pxz7palj60plsk7hinir3db9q7ri"
+ "commit": "5d5f65727829240ffcb84b7be8c5d1e4dcefa0ed",
+ "sha256": "1j4a7fwbsyjsz0lh7vrw2kyw8khqbaskzqnx03a91br8q3dv0xba"
}
},
{
@@ -87764,8 +87808,8 @@
"f",
"s"
],
- "commit": "e0e5cc882f2f1316268ec461a34d4be8abc313b7",
- "sha256": "0hbvy8wdi5dgxn86j8z54y2fhcvm605xxm6xv054nl6fw2hh2h5h"
+ "commit": "fe75bc17baae314bf8f5e0b12aad3fccfc6c5397",
+ "sha256": "1g5mfn37d01259s2xii2d41027xpif4czxipq4sa7d6sfyq50h7h"
},
"stable": {
"version": [
@@ -88116,11 +88160,11 @@
"repo": "emacsorphanage/quickrun",
"unstable": {
"version": [
- 20201130,
- 952
+ 20210327,
+ 141
],
- "commit": "80087806741a4d7fd5ce0f74c8e27f4779a737d9",
- "sha256": "19i07v4m3rss9ici3j5iayn717kbr8pmxss5iinzgdf4bi1yx293"
+ "commit": "57db985c6d293747dc8c40c4e08b465e148613a8",
+ "sha256": "02fzzfq5z4qabas75ihfbvz9pkz9ya2rblrzck8wk0fswzdq32nw"
},
"stable": {
"version": [
@@ -88278,15 +88322,15 @@
"repo": "greghendershott/racket-mode",
"unstable": {
"version": [
- 20210226,
- 1343
+ 20210326,
+ 1308
],
"deps": [
"faceup",
"pos-tip"
],
- "commit": "48084a44e50a3ecd91e40ac5b58eed297e314f3f",
- "sha256": "18r0pi6g9nfhzj8l306r28al4pfwkn836arvnpbysqxjknxnvqll"
+ "commit": "5115c4786075b39525008755a5fb843c397ca743",
+ "sha256": "0am68bv4wg1lw20k9y83529zkg5d7ql8q9ibgpw1qlx2ll4zxgla"
}
},
{
@@ -89726,8 +89770,8 @@
20200814,
435
],
- "commit": "5aa8c1867950b9b2ba6e583271f9c0d715853c5a",
- "sha256": "1aypb17k408i4lg9v3fnb5q2n8m3iry4ca4c7axjbvax09dawznk"
+ "commit": "576d339aa80f40c6053592988001bdb285c1cf21",
+ "sha256": "1hdr5vr5xzlpj5xyapgbm9drrham6r776lmj8sjqaqrdffgxj8dh"
},
"stable": {
"version": [
@@ -90566,6 +90610,21 @@
"sha256": "15xnz4fi22wsximimwmirlz11v4ksfj8nilyjfw6acd92yrhzg6h"
}
},
+ {
+ "ename": "revert-buffer-all",
+ "commit": "02ff00238a8af45d9e26e0b7b6b19a507ea06f86",
+ "sha256": "1lyxwh3kjlhyi5ln2lmbhyn28fxdd3l58djc9mqbzwdfm81qprsv",
+ "fetcher": "gitlab",
+ "repo": "ideasman42/emacs-revert-buffer-all",
+ "unstable": {
+ "version": [
+ 20210322,
+ 159
+ ],
+ "commit": "14efdbf24ebe0d743ccb3f0d43acae98939c94fd",
+ "sha256": "1kimlfq98a8gym0kb6z8b5mys0gsqz8iywnxrbh5s3ck6s911dn7"
+ }
+ },
{
"ename": "review-mode",
"commit": "f2f9e2667389577d0703874ca69ebe4800ae3e01",
@@ -90797,8 +90856,8 @@
"popup",
"posframe"
],
- "commit": "edcb6278b1a864d28ed96375e18ff77def09feb0",
- "sha256": "1g8ns518yn30838by7nd13k73nz8k6wk580jcsfjqpwjig8vr5as"
+ "commit": "519e6eb3b5e8e668c2835d27f54fcf5776242576",
+ "sha256": "1q0kzdy3nxswsriq4fxr00wmw43x737dd7pnkf9g6v8hd7gsqkzc"
},
"stable": {
"version": [
@@ -91660,11 +91719,11 @@
"repo": "bard/emacs-run-command",
"unstable": {
"version": [
- 20210224,
- 1444
+ 20210323,
+ 1742
],
- "commit": "cb76adf8e41d393090a4a3c6f390bd75288642c3",
- "sha256": "0gkd7yabjdw6si814wzbkr7hi835pah8z6l0kfyhllvqnkp66qsc"
+ "commit": "92b70a1ed0aa9bdbed3915efe47b3ba92fe2cb74",
+ "sha256": "1jvclzlr9lhvb05zdnqw2l3y2m1nca2m5z8m1a7rmq9bk1wwl4pa"
}
},
{
@@ -92298,8 +92357,8 @@
20200830,
301
],
- "commit": "4ebebdaf0dec2f7aaebb6a1c1f6163f503caaa63",
- "sha256": "1vj4rd5mq93sg10cbdcr2yx5i954ng9s369dghw35h9dasblz1pl"
+ "commit": "3413825c2de675c087fbb39f9aeec4145495fad1",
+ "sha256": "036ffrfkdakix7z8ksfw78wk1plqnkcf26acn9sksbxcyk4lbjnk"
}
},
{
@@ -92331,8 +92390,8 @@
20210205,
851
],
- "commit": "402d6df56457e9c512c3d77c7bcb0d04c77715f1",
- "sha256": "018c668i1cv6a22gvvbzgn8111wh9zbk6yr41cj9xb1pwg0y373d"
+ "commit": "1ab5f645606e40db07b813a1600835d1442c060a",
+ "sha256": "1hzlgypb5pp8rpylm8qbbcqya5b0kjgq44m4n2wq6bix77iphsd8"
},
"stable": {
"version": [
@@ -93102,11 +93161,11 @@
"repo": "raxod502/selectrum",
"unstable": {
"version": [
- 20210316,
- 835
+ 20210325,
+ 1415
],
- "commit": "a72109ab3eb3a06d1d8e01629bed06871b2c94d2",
- "sha256": "19z3hicdkr11112snalp657f28wb1n6l1kky7qffd01a71pmd8ia"
+ "commit": "f5a1f6b6c89719f80c29388c2c784d6b4e346081",
+ "sha256": "1p3da5pzmzhbqgcgzkii6hh1klrdfch6fnq4g3pa9mxrnis8v4py"
},
"stable": {
"version": [
@@ -93125,15 +93184,15 @@
"repo": "raxod502/prescient.el",
"unstable": {
"version": [
- 20210311,
- 1613
+ 20210321,
+ 1927
],
"deps": [
"prescient",
"selectrum"
],
- "commit": "52afa7e90534d59d3cec2ace2a96c232e25e3f7b",
- "sha256": "10pcl4w0y4d99g1ylxqb3qrvfmv091x4h52imf6ysbm4x6gl4r9n"
+ "commit": "8573df977eaceffc6607b7242ff8c0dab02aad65",
+ "sha256": "0kfbcicflg7dj9nzvvkgrxsb6p03a7cq26jfk7h6hsnrajy5y4sc"
},
"stable": {
"version": [
@@ -93310,15 +93369,15 @@
"repo": "twlz0ne/separedit.el",
"unstable": {
"version": [
- 20210316,
- 1434
+ 20210323,
+ 905
],
"deps": [
"dash",
"edit-indirect"
],
- "commit": "12db61458b053cee2d57dbf04f725f03487bb895",
- "sha256": "1h7mr10agkvx8v6pvki8klz6b33lls201wn10q1fgg42djcw2skk"
+ "commit": "bebc27121d6d2da900810d552cd5e423ca870bee",
+ "sha256": "1b87pqvx4p8kwmc63scw9n4v1qj2rp0avx32jl5v3lbgbhvsr3zz"
}
},
{
@@ -94038,8 +94097,8 @@
"deps": [
"reformatter"
],
- "commit": "465dc1fcaeed778b504d3d349a30e611368dcc00",
- "sha256": "1gzky5xs63y7xl7j2hs81aja8qq6c5l3vk07hh050flw4yfxyi23"
+ "commit": "49c9e11567874bc4c5c4b3578a6b8f6b1948c691",
+ "sha256": "002y0ci1hh55qhyyp1m6gw5d9ncbcfk9bhk6qg30s3x1g1dhq2bi"
},
"stable": {
"version": [
@@ -94106,8 +94165,8 @@
20210218,
2329
],
- "commit": "051dba16c2d60e7b59143ed5c1d52bceca3b6b37",
- "sha256": "1gj8kdf4k4k139ajihf1klv2wzvfp2lhznbdsv62nfb5nla347ph"
+ "commit": "7da7afc51aec1ab02056512b921e29a8c68615c9",
+ "sha256": "1fcfmzahmamrxrklbwrrig4gv745lpznpbxx5rlmb7wpndf2cpdy"
}
},
{
@@ -94293,15 +94352,15 @@
"repo": "chenyanming/shrface",
"unstable": {
"version": [
- 20210218,
- 115
+ 20210321,
+ 844
],
"deps": [
"language-detection",
"org"
],
- "commit": "3f6807543ffc1da16ede10df8a05d5e4414ba7df",
- "sha256": "053r87s6jxl3hi8f7215hvn4xm6913l9wrjxwafv76gsdyl9cgz7"
+ "commit": "a73268705e3558ee91dc05674c5c3bed7fe28202",
+ "sha256": "1jjs0pclv0ya4d65wzafkvgb7lmg7f13jj0pihs1ch507fyiw3gp"
},
"stable": {
"version": [
@@ -94931,11 +94990,11 @@
"repo": "dawranliou/sketch-themes",
"unstable": {
"version": [
- 20210222,
- 1337
+ 20210325,
+ 1700
],
- "commit": "33b63867db76225e46eda0a8a613813151dc5b62",
- "sha256": "19dlwp27g1sd1hd0wq8s16fqk8v4ll6xwn2hl1a9axkdk97mps27"
+ "commit": "407094c03e934043aa6d70369bf3e1bd841d1c91",
+ "sha256": "1glm8cxd91kq6910rrzgh3xaas67fylvgqxq2ld6gzcgmxzhv8yl"
},
"stable": {
"version": [
@@ -97372,11 +97431,11 @@
"repo": "ideasman42/emacs-spell-fu",
"unstable": {
"version": [
- 20210317,
- 909
+ 20210324,
+ 1207
],
- "commit": "ca8f409788964daeabdeff9c8beb36109900f996",
- "sha256": "1hkzhjnnz1m5lsh2alphr3d234zpbxw44xxhb47l2ws0vr64w50x"
+ "commit": "30c5eea9440915c2795670ecdbf836f3cb9dcc1b",
+ "sha256": "0h2gsq4ms1236nzardhd06b2090v21i0xyljri0lkpj0p3f6p986"
}
},
{
@@ -97805,8 +97864,8 @@
"deps": [
"reformatter"
],
- "commit": "0cdb882874ba0853f4f831a07a85b511258472b2",
- "sha256": "07ka6fqcbvbvzsdmwris89cj3dpg3qcfhmww2h6qs69za3h7mify"
+ "commit": "0351dad6bec06a381484c0c95309d46a7a8acdb4",
+ "sha256": "0hra8lrg4fkqr6x6cq9mbqx8y7fkbccgzxmqfngy8cj2dbcvp9k9"
},
"stable": {
"version": [
@@ -97960,11 +98019,11 @@
"repo": "srfi-explorations/emacs-srfi",
"unstable": {
"version": [
- 20210318,
- 2242
+ 20210325,
+ 445
],
- "commit": "512d51e8b6f912857d484095defd7b89535edfbb",
- "sha256": "0nww5hhzajj4vhps9n1hlyrgj3lifr9lg2dm1s04f2hy84pn9jm1"
+ "commit": "633a0ff419438987f6271ff5a5da26307950a3cd",
+ "sha256": "070p4wyphhm7115afvq7lhxkb69c7l7fz3q5nkwbpjsdp5s8isns"
},
"stable": {
"version": [
@@ -98388,8 +98447,8 @@
20200606,
1308
],
- "commit": "755c709c02e4e091ceb934fd5672db416fc94dbd",
- "sha256": "08fb1qlld0dyi7i1pd5xb1g6z2681nyrqfl1ihq0gr8dal6mc772"
+ "commit": "c0a2d92567d024c2136e9a25ce720fb0b565d31c",
+ "sha256": "192c1j33d6b1j2wdz6js70lql4ysl6d3vjnw3sqzcp22cgjlb2pp"
},
"stable": {
"version": [
@@ -98837,6 +98896,24 @@
"sha256": "1kpq7kpmhgq3vjd62rr4qsc824qcyjxm50m49r7invgnmgd78h4x"
}
},
+ {
+ "ename": "subsonic",
+ "commit": "2aae45d7195a93eab44fc5fec2285a5f9d8187de",
+ "sha256": "19v5qv6pf21f9nddzl3jka75k5x4c81i4ywvy2arqq2nz5avqvlf",
+ "fetcher": "git",
+ "url": "https://git.sr.ht/~amk/subsonic.el",
+ "unstable": {
+ "version": [
+ 20210321,
+ 1937
+ ],
+ "deps": [
+ "transient"
+ ],
+ "commit": "cb7c6c14f00367188a5565fed9c23a857f27a4d0",
+ "sha256": "1k69c0zhfjy90y7hvvlsppjvan5zrif4p48i4ih7wiy47giwicb4"
+ }
+ },
{
"ename": "sudden-death",
"commit": "3f20f389a2d7ddf49ca64d945b41584a7c120faf",
@@ -99462,8 +99539,8 @@
"deps": [
"ivy"
],
- "commit": "75002963859101003436c84d1d3a85f9ea5f89fc",
- "sha256": "0pf54qimwjsm6y808vx68zxdfpj0c1kaysy3s7bsi875b99yyd8h"
+ "commit": "47b496544e238041bca5e3c9ca55848648344312",
+ "sha256": "0n26hpffp7lljhwjbr4r470ynaff3swnkxmj7g2rjw78rw2qjmlm"
},
"stable": {
"version": [
@@ -99778,8 +99855,8 @@
"repo": "countvajhula/symex.el",
"unstable": {
"version": [
- 20210319,
- 329
+ 20210327,
+ 20
],
"deps": [
"evil",
@@ -99789,11 +99866,10 @@
"lispy",
"paredit",
"seq",
- "smartparens",
"undo-tree"
],
- "commit": "d37532a9dcff8ec5a2fdc54f27b517890f972bfb",
- "sha256": "19ffgdvmnys2hby1iwb85kwr74iadnp8mfd0816jlaafjsga7inf"
+ "commit": "a3d6d74089e0fa0031cdef5114393d2f569d68d9",
+ "sha256": "1qfn95mbq92p31g9yw68sf8854v3jk2251xy6asxqv8n9ckkhji9"
},
"stable": {
"version": [
@@ -100186,14 +100262,14 @@
"repo": "fritzgrabo/tab-bar-groups",
"unstable": {
"version": [
- 20210319,
- 2222
+ 20210321,
+ 2129
],
"deps": [
"s"
],
- "commit": "09f2049d5fac5c046e517108ac527d087a7352d8",
- "sha256": "024yxwb40jpfk5bfb3achf0vkbkblnkidy7rymvln2mzym85g77s"
+ "commit": "b83315c9a63ba2f6bbeaaa449a3b78b84a87ec1c",
+ "sha256": "03pc85g5f5ys0s45ccg3z7dni4cxngs3532xf9ng94a421yhxmkr"
}
},
{
@@ -100655,15 +100731,15 @@
"repo": "zevlg/telega.el",
"unstable": {
"version": [
- 20210319,
- 2200
+ 20210326,
+ 1352
],
"deps": [
"rainbow-identifiers",
"visual-fill-column"
],
- "commit": "de153b575d0a6470314efb3cba9b48b14b5f6d57",
- "sha256": "014hzm2dlvzrx15557zhd3h8d0dn6akyprxc81ijc6wfczj8bv6m"
+ "commit": "c047b20cf3c367d06fba097e4c8a58967524d7ab",
+ "sha256": "0h29jscvmyw4s11wkpy538v71c87badz6ac8whs6nk3g04scsv8n"
},
"stable": {
"version": [
@@ -100710,16 +100786,16 @@
"repo": "dbordak/telephone-line",
"unstable": {
"version": [
- 20210211,
- 117
+ 20210322,
+ 2248
],
"deps": [
"cl-generic",
"cl-lib",
"seq"
],
- "commit": "2fbcdb44a9dfa608c44b19e731d15438b4b03d87",
- "sha256": "0y7zak23cri9glysdmx035fvzrcpzr0fzsvjx9vcanlivq94v7fq"
+ "commit": "aebac4658e553902369a3bf465bacc1f07a01106",
+ "sha256": "1kbxhrlg3pddg10zb9h3ky72f6l67nb5cziv17i3d0shx2z0sw17"
},
"stable": {
"version": [
@@ -101254,11 +101330,11 @@
"repo": "TxGVNN/terraform-doc",
"unstable": {
"version": [
- 20200803,
- 1545
+ 20210322,
+ 837
],
- "commit": "d609290021ea7f2d10caadffc9131663838f8ad4",
- "sha256": "1gvydmi37d7jxibn7nfg1rhb6phfn3kgrlmq250g7321g15j1q3v"
+ "commit": "77181c75cbde5954542688659cd4f2352ed29fbe",
+ "sha256": "1bcwja7hm11hxd1nmf1z93hkzcvkkpxavvbivg6j336ygzr1r82g"
},
"stable": {
"version": [
@@ -101556,6 +101632,21 @@
"sha256": "1xrw81n3llyr3191mpnr85grhayhkq5cq6g56p52mc4sahmqbqlg"
}
},
+ {
+ "ename": "theme-anchor",
+ "commit": "74f79dc5db5246a2f70e4d4ad76601be8b5c79d8",
+ "sha256": "15819kkxvhk03yfzd0qp78d5ayc33cm064gy7fdpi0aq28nbw6ba",
+ "fetcher": "github",
+ "repo": "GongYiLiao/theme-anchor",
+ "unstable": {
+ "version": [
+ 20210327,
+ 340
+ ],
+ "commit": "a6f5986a9569a4647fd4e3b6533b50efaf5aa1fd",
+ "sha256": "10fg2si0s5lavk8ljnycb0942fkl3dpkny5n6arir3jd17ypp3sv"
+ }
+ },
{
"ename": "theme-changer",
"commit": "d08b24a2aec1012751054c68f7d55bac1bd1fd11",
@@ -101731,8 +101822,8 @@
20200212,
1903
],
- "commit": "c6b9113fbe9d3510eb49d24f10cd47a249260e01",
- "sha256": "0r7k57lpazrz65ix53cflc94msvw7j68myg6y8x0bz44hf8m5irs"
+ "commit": "3b42e95dc9167a28554991af0d172543475f2003",
+ "sha256": "1gw54kpzqdldivr4kyw08n12mpqkg303wxhc2wqjnn95dhmxql07"
},
"stable": {
"version": [
@@ -101798,8 +101889,8 @@
"deps": [
"haskell-mode"
],
- "commit": "d88a8ece548f932aa17cf09b36fa441135ca0cbd",
- "sha256": "1ga1ybn81w68ma939s73m84ina0xh2f36bkpfxy4j7ahm0h6vlmb"
+ "commit": "f26eb3062cca9369b2a05bd208633e8b4f91c28e",
+ "sha256": "0vx4nfpcan9c6qi9x0z1a03sm33ifrclnvd0rs43fjb6s05xhwwq"
},
"stable": {
"version": [
@@ -101822,8 +101913,8 @@
"repo": "ananthakumaran/tide",
"unstable": {
"version": [
- 20210313,
- 1524
+ 20210323,
+ 1647
],
"deps": [
"cl-lib",
@@ -101832,8 +101923,8 @@
"s",
"typescript-mode"
],
- "commit": "f6ad5e591c4a21a8ed252444cbc0cf6b079d2449",
- "sha256": "1vkvlkgbk1mlfk31gdf13w4lq3nj7pskp5xd40hivirgmck18wd4"
+ "commit": "2a3ac4f38472d66e2d8a6bbe5dadb52bc008acbd",
+ "sha256": "1fj2fghiycnzds2zxfxgj1d9mdzsvs9rvl9bwy2f1vwawqk1m48w"
},
"stable": {
"version": [
@@ -102210,11 +102301,11 @@
"repo": "snosov1/toc-org",
"unstable": {
"version": [
- 20201105,
- 826
+ 20210323,
+ 1256
],
- "commit": "aef220c266f53d36055f74f4a243c6483c563d2a",
- "sha256": "1gknxlypzgmyi30mdii94018mk5z28xqbla4hb5p1ihhl7p32r1p"
+ "commit": "c4c61c5a382f94a3a4537e254243006dec2dcca4",
+ "sha256": "00a2al7ghrlabf65kfj1mk30p2pl37h6ppwlgghbgiy7rwlzkdbm"
},
"stable": {
"version": [
@@ -102677,8 +102768,8 @@
20201101,
1045
],
- "commit": "265f36c1e6c8db598742778dc64f9799896f5dc1",
- "sha256": "0vf76rrgkpybi67n14g6gn1a7by7b90gxa8rz2m50xl3vdphnibk"
+ "commit": "e67e2d1149ebf3e79cd2162e78802af3ed5f82da",
+ "sha256": "0jrpa8kndq2v69nr9jva970q0n3662x2g0chg89nd2d3gbv693mw"
},
"stable": {
"version": [
@@ -103028,26 +103119,26 @@
"repo": "ubolonton/emacs-tree-sitter",
"unstable": {
"version": [
- 20210315,
- 238
+ 20210320,
+ 1052
],
"deps": [
"tsc"
],
- "commit": "174200858b4192b9d5be3f5bcd1b62995151245b",
- "sha256": "1syzz7gq6n3ri1sgr6jdr0lyfwycpjv68iws5rxwjmf9n3gdbyfh"
+ "commit": "3a600d769bd5da95bf46bec58893934370c6c04f",
+ "sha256": "15y0wjnck8rbfhl0xrl71ci7clbcp11lhqil5l8ykprsdjv0c2as"
},
"stable": {
"version": [
0,
15,
- 0
+ 1
],
"deps": [
"tsc"
],
- "commit": "174200858b4192b9d5be3f5bcd1b62995151245b",
- "sha256": "1syzz7gq6n3ri1sgr6jdr0lyfwycpjv68iws5rxwjmf9n3gdbyfh"
+ "commit": "3a600d769bd5da95bf46bec58893934370c6c04f",
+ "sha256": "15y0wjnck8rbfhl0xrl71ci7clbcp11lhqil5l8ykprsdjv0c2as"
}
},
{
@@ -103058,15 +103149,15 @@
"url": "https://codeberg.org/FelipeLema/tree-sitter-indent.el.git",
"unstable": {
"version": [
- 20210215,
- 1506
+ 20210322,
+ 2033
],
"deps": [
"seq",
"tree-sitter"
],
- "commit": "831a48571ccf14b8a8c607504a6e8e9263ff6dd4",
- "sha256": "1dfmlmmf13qzzfpmpc6lgwjhz8hnz5ys2fw4w3rrz6swfaa2vr53"
+ "commit": "18d263720c5a8f7fde0db368c7c36ea70437fc0b",
+ "sha256": "0iwi44309837hx0sl8py175ayn7haannp1sz2d0jk7binka7n4md"
},
"stable": {
"version": [
@@ -103155,8 +103246,8 @@
"repo": "Alexander-Miller/treemacs",
"unstable": {
"version": [
- 20210304,
- 2130
+ 20210324,
+ 2101
],
"deps": [
"ace-window",
@@ -103168,8 +103259,8 @@
"pfuture",
"s"
],
- "commit": "33be5b672b0492a901acd95bb9801a68ae7bdc95",
- "sha256": "0rc0hpg5x39qwwdv05ky7iaq8kz1vzliidl73nyvmkjbjc58aw6c"
+ "commit": "9eaef270de9fde50ef029c12db6d8b89cc4580d8",
+ "sha256": "0w3pr60hlw2v8c552lylpm6ab9qirdv8nrg5cr98zsm16b4likfp"
},
"stable": {
"version": [
@@ -103198,15 +103289,15 @@
"repo": "Alexander-Miller/treemacs",
"unstable": {
"version": [
- 20210309,
- 1844
+ 20210324,
+ 2101
],
"deps": [
"all-the-icons",
"treemacs"
],
- "commit": "33be5b672b0492a901acd95bb9801a68ae7bdc95",
- "sha256": "0rc0hpg5x39qwwdv05ky7iaq8kz1vzliidl73nyvmkjbjc58aw6c"
+ "commit": "9eaef270de9fde50ef029c12db6d8b89cc4580d8",
+ "sha256": "0w3pr60hlw2v8c552lylpm6ab9qirdv8nrg5cr98zsm16b4likfp"
}
},
{
@@ -103224,8 +103315,8 @@
"evil",
"treemacs"
],
- "commit": "33be5b672b0492a901acd95bb9801a68ae7bdc95",
- "sha256": "0rc0hpg5x39qwwdv05ky7iaq8kz1vzliidl73nyvmkjbjc58aw6c"
+ "commit": "9eaef270de9fde50ef029c12db6d8b89cc4580d8",
+ "sha256": "0w3pr60hlw2v8c552lylpm6ab9qirdv8nrg5cr98zsm16b4likfp"
},
"stable": {
"version": [
@@ -103254,8 +103345,8 @@
"deps": [
"treemacs"
],
- "commit": "33be5b672b0492a901acd95bb9801a68ae7bdc95",
- "sha256": "0rc0hpg5x39qwwdv05ky7iaq8kz1vzliidl73nyvmkjbjc58aw6c"
+ "commit": "9eaef270de9fde50ef029c12db6d8b89cc4580d8",
+ "sha256": "0w3pr60hlw2v8c552lylpm6ab9qirdv8nrg5cr98zsm16b4likfp"
},
"stable": {
"version": [
@@ -103286,8 +103377,8 @@
"pfuture",
"treemacs"
],
- "commit": "33be5b672b0492a901acd95bb9801a68ae7bdc95",
- "sha256": "0rc0hpg5x39qwwdv05ky7iaq8kz1vzliidl73nyvmkjbjc58aw6c"
+ "commit": "9eaef270de9fde50ef029c12db6d8b89cc4580d8",
+ "sha256": "0w3pr60hlw2v8c552lylpm6ab9qirdv8nrg5cr98zsm16b4likfp"
},
"stable": {
"version": [
@@ -103319,8 +103410,8 @@
"persp-mode",
"treemacs"
],
- "commit": "33be5b672b0492a901acd95bb9801a68ae7bdc95",
- "sha256": "0rc0hpg5x39qwwdv05ky7iaq8kz1vzliidl73nyvmkjbjc58aw6c"
+ "commit": "9eaef270de9fde50ef029c12db6d8b89cc4580d8",
+ "sha256": "0w3pr60hlw2v8c552lylpm6ab9qirdv8nrg5cr98zsm16b4likfp"
},
"stable": {
"version": [
@@ -103352,8 +103443,8 @@
"perspective",
"treemacs"
],
- "commit": "33be5b672b0492a901acd95bb9801a68ae7bdc95",
- "sha256": "0rc0hpg5x39qwwdv05ky7iaq8kz1vzliidl73nyvmkjbjc58aw6c"
+ "commit": "9eaef270de9fde50ef029c12db6d8b89cc4580d8",
+ "sha256": "0w3pr60hlw2v8c552lylpm6ab9qirdv8nrg5cr98zsm16b4likfp"
}
},
{
@@ -103371,8 +103462,8 @@
"projectile",
"treemacs"
],
- "commit": "33be5b672b0492a901acd95bb9801a68ae7bdc95",
- "sha256": "0rc0hpg5x39qwwdv05ky7iaq8kz1vzliidl73nyvmkjbjc58aw6c"
+ "commit": "9eaef270de9fde50ef029c12db6d8b89cc4580d8",
+ "sha256": "0w3pr60hlw2v8c552lylpm6ab9qirdv8nrg5cr98zsm16b4likfp"
},
"stable": {
"version": [
@@ -103626,20 +103717,20 @@
"repo": "ubolonton/emacs-tree-sitter",
"unstable": {
"version": [
- 20210315,
- 238
+ 20210320,
+ 1052
],
- "commit": "174200858b4192b9d5be3f5bcd1b62995151245b",
- "sha256": "1syzz7gq6n3ri1sgr6jdr0lyfwycpjv68iws5rxwjmf9n3gdbyfh"
+ "commit": "3a600d769bd5da95bf46bec58893934370c6c04f",
+ "sha256": "15y0wjnck8rbfhl0xrl71ci7clbcp11lhqil5l8ykprsdjv0c2as"
},
"stable": {
"version": [
0,
15,
- 0
+ 1
],
- "commit": "174200858b4192b9d5be3f5bcd1b62995151245b",
- "sha256": "1syzz7gq6n3ri1sgr6jdr0lyfwycpjv68iws5rxwjmf9n3gdbyfh"
+ "commit": "3a600d769bd5da95bf46bec58893934370c6c04f",
+ "sha256": "15y0wjnck8rbfhl0xrl71ci7clbcp11lhqil5l8ykprsdjv0c2as"
}
},
{
@@ -103709,14 +103800,14 @@
"repo": "ocaml/tuareg",
"unstable": {
"version": [
- 20200518,
- 1820
+ 20210320,
+ 1929
],
"deps": [
"caml"
],
- "commit": "ccde45bbc292123ec20617f1af7f7e19f7481545",
- "sha256": "1yxv4bnqarilnpg5j7wywall8170hwvm0q4xx06yqjgcn8pq1lac"
+ "commit": "37a673020152ae0dbcaa250118b155d84e448f68",
+ "sha256": "0b9bnfwcnxkwjrdb4vm7y8wznqz4z990pv1s473gs97l7p04b1j9"
},
"stable": {
"version": [
@@ -104448,8 +104539,8 @@
20210106,
220
],
- "commit": "8375d87ec184fbe964189e2f9b7263cdb1396694",
- "sha256": "0pg64nza2mp4xyr69pjq51jsq1aaym0g38g4jzaxr0hh3w0ris1n"
+ "commit": "eef1614c79eb259cb782437a25680246793a924d",
+ "sha256": "0vx0sv8595lbx8x23ly3dg6zb73skp4cxi8l6m2h4l4v8fs6r0fl"
},
"stable": {
"version": [
@@ -106457,11 +106548,11 @@
"repo": "joostkremers/visual-fill-column",
"unstable": {
"version": [
- 20201229,
- 2303
+ 20210323,
+ 2039
],
- "commit": "5b08b9ae9da5b95e42e94e4c9ec01d63e8848ea2",
- "sha256": "1zg69lqg7yxxr4bw5lhcs5r8pljqalxqqbzvv3zrcifx7n24qzi9"
+ "commit": "a93dc5fc64340d8abda1272f67d46d4cc09a4c85",
+ "sha256": "1csybmfm5zgn2jpl9g3cb49vd26ds7x972wxiig3ri4zrmyn7y2l"
},
"stable": {
"version": [
@@ -106723,11 +106814,11 @@
"repo": "ianpan870102/vscode-dark-plus-emacs-theme",
"unstable": {
"version": [
- 20210317,
- 930
+ 20210325,
+ 917
],
- "commit": "d54fc120f0c0b363a8bef159da58786fb51e7b0f",
- "sha256": "1imz2fr9164lsc8f1qji439iz4a643qslmxd9526alxa8gwx2yiz"
+ "commit": "6e7a02b624628d05fd5cfb5f26d044618a00c905",
+ "sha256": "1xdb6pwl8p6rzb7l6qf8nz2rn6ggjg9krimqsl167551bkjri4gw"
},
"stable": {
"version": [
@@ -106762,11 +106853,11 @@
"repo": "akermu/emacs-libvterm",
"unstable": {
"version": [
- 20210313,
- 1359
+ 20210326,
+ 1458
],
- "commit": "98179e129544bdee7d78fc095098971eeb72428d",
- "sha256": "0abh1ydq4rzisgy1wf591r5jj606wh0w9jza7pjzwy30s19qd7bl"
+ "commit": "1bc4516f53955dcbf397cf999f38e67eec835d8c",
+ "sha256": "0lvdr7ifb3cb5ll8pl0lyw4qzg0v1plzl4fg5drn3z6aanznva38"
}
},
{
@@ -106783,8 +106874,8 @@
"deps": [
"vterm"
],
- "commit": "d10239b7bb89b78dddb82f66ac2286bc0b02747b",
- "sha256": "0r9n23wg9cfy10h5f9zqr8jpkvw34f9rylri3nxq870awjab7rqi"
+ "commit": "a0429842e6197a6ec83c0de30701127a4edb9e92",
+ "sha256": "1h0ssi84b0amhdjxjw6xyjb525d67b4jx0qpqk3fr08s9c87z8k9"
}
},
{
@@ -106868,8 +106959,8 @@
"repo": "mihaiolteanu/vuiet",
"unstable": {
"version": [
- 20210216,
- 751
+ 20210323,
+ 911
],
"deps": [
"bind-key",
@@ -106878,8 +106969,8 @@
"s",
"versuri"
],
- "commit": "196683c3860793f2255bd0b3091ac9d538fa3ba7",
- "sha256": "1465fx3h6ylgqg98m08ja0f48xwsxqai1vnigbb1fwlaxg3k23lm"
+ "commit": "16f9d9ee4744f4170ab9eab361783e3e32e3b627",
+ "sha256": "19pfxdg4kmvir6fgn9i4mqqlqk7lq77170kva6avxz12jz36i22r"
},
"stable": {
"version": [
@@ -106997,11 +107088,11 @@
"repo": "emacs-w3m/emacs-w3m",
"unstable": {
"version": [
- 20210226,
- 23
+ 20210321,
+ 2346
],
- "commit": "051dba16c2d60e7b59143ed5c1d52bceca3b6b37",
- "sha256": "1gj8kdf4k4k139ajihf1klv2wzvfp2lhznbdsv62nfb5nla347ph"
+ "commit": "7da7afc51aec1ab02056512b921e29a8c68615c9",
+ "sha256": "1fcfmzahmamrxrklbwrrig4gv745lpznpbxx5rlmb7wpndf2cpdy"
}
},
{
@@ -107800,11 +107891,11 @@
"repo": "jstaursky/weyland-yutani-theme",
"unstable": {
"version": [
- 20210318,
- 1726
+ 20210327,
+ 311
],
- "commit": "1441ff884092de03fa7be97fcfd03eefd4dd4b07",
- "sha256": "0i2idvcck5605miyc938h2y85jvbmd1nky20nmyhrs9q155lifxv"
+ "commit": "782b45736c36dcd48e614167d46ff7fc0edd2a7b",
+ "sha256": "0m6mpwvhvhb02rk2lkylw5w7q9nqm3sqdyzyz5bcqm3layck4pcv"
}
},
{
@@ -107815,11 +107906,11 @@
"repo": "mhayashi1120/Emacs-wgrep",
"unstable": {
"version": [
- 20200217,
- 1030
+ 20210322,
+ 2207
],
- "commit": "f0ef9bfa44db503cdb2f83fcfbd2fa4e2382ef1f",
- "sha256": "1si1nng38ccciy0774gmf4wmz6x199cif357yjqibz1fk31lvk9p"
+ "commit": "f9687c28bbc2e84f87a479b6ce04407bb97cfb23",
+ "sha256": "090k2kznhdmzzd4hrs834mbr8kwady2ks1684kgzqjzvwhv36v6i"
},
"stable": {
"version": [
@@ -107845,8 +107936,8 @@
"deps": [
"wgrep"
],
- "commit": "f0ef9bfa44db503cdb2f83fcfbd2fa4e2382ef1f",
- "sha256": "1si1nng38ccciy0774gmf4wmz6x199cif357yjqibz1fk31lvk9p"
+ "commit": "f9687c28bbc2e84f87a479b6ce04407bb97cfb23",
+ "sha256": "090k2kznhdmzzd4hrs834mbr8kwady2ks1684kgzqjzvwhv36v6i"
},
"stable": {
"version": [
@@ -107875,8 +107966,8 @@
"deps": [
"wgrep"
],
- "commit": "f0ef9bfa44db503cdb2f83fcfbd2fa4e2382ef1f",
- "sha256": "1si1nng38ccciy0774gmf4wmz6x199cif357yjqibz1fk31lvk9p"
+ "commit": "f9687c28bbc2e84f87a479b6ce04407bb97cfb23",
+ "sha256": "090k2kznhdmzzd4hrs834mbr8kwady2ks1684kgzqjzvwhv36v6i"
},
"stable": {
"version": [
@@ -107899,14 +107990,14 @@
"repo": "mhayashi1120/Emacs-wgrep",
"unstable": {
"version": [
- 20200128,
- 109
+ 20210322,
+ 2148
],
"deps": [
"wgrep"
],
- "commit": "f0ef9bfa44db503cdb2f83fcfbd2fa4e2382ef1f",
- "sha256": "1si1nng38ccciy0774gmf4wmz6x199cif357yjqibz1fk31lvk9p"
+ "commit": "f9687c28bbc2e84f87a479b6ce04407bb97cfb23",
+ "sha256": "090k2kznhdmzzd4hrs834mbr8kwady2ks1684kgzqjzvwhv36v6i"
},
"stable": {
"version": [
@@ -107935,8 +108026,8 @@
"deps": [
"wgrep"
],
- "commit": "f0ef9bfa44db503cdb2f83fcfbd2fa4e2382ef1f",
- "sha256": "1si1nng38ccciy0774gmf4wmz6x199cif357yjqibz1fk31lvk9p"
+ "commit": "f9687c28bbc2e84f87a479b6ce04407bb97cfb23",
+ "sha256": "090k2kznhdmzzd4hrs834mbr8kwady2ks1684kgzqjzvwhv36v6i"
},
"stable": {
"version": [
@@ -107974,11 +108065,11 @@
"repo": "justbur/emacs-which-key",
"unstable": {
"version": [
- 20210131,
- 1837
+ 20210324,
+ 1821
],
- "commit": "c0608e812a8d1bc7aefeacdfaeb56a7272eabf44",
- "sha256": "1g07i6hyv9glhk6xq1z9vn81vi2f0byy7dp3rg4gw22sm6f6d1al"
+ "commit": "c632dbf27a77c1c73ce559041b3a78ec5f78b187",
+ "sha256": "1dsr7x0mbw8jmdm26278a9lqmh3mkrkzr24fp6ssf316hh51cc3v"
},
"stable": {
"version": [
@@ -108089,8 +108180,8 @@
20200304,
2227
],
- "commit": "c344cfd78df23980ee48fb85fbc16989b7d4cffe",
- "sha256": "1jwz89j6v8mmdim8knnwjz2ip0cwn5lq6x8nz78xns1ba5fg293b"
+ "commit": "3c5a7161c0dd0caa65e9a61640b06aff101be848",
+ "sha256": "1i4xnl178lbaqnrxxk9qxzz3v0krj4wawh8zyprh2xirgxqspks8"
},
"stable": {
"version": [
@@ -108162,8 +108253,8 @@
"deps": [
"cl-lib"
],
- "commit": "4a1d44ec7b1421913cb39a6e83854329be910e68",
- "sha256": "0az61n9c4mf2l68y67lmp34d678n13s06kpx62r4v5kaar2vhz8i"
+ "commit": "3c1a55103e52c7a3010ee0043af22484d23a441e",
+ "sha256": "0bkfx18jpy8b91yq917va5x2mkrzqlyi6a38bi90zfqhxz5h69g4"
},
"stable": {
"version": [
@@ -108233,8 +108324,8 @@
"makey",
"s"
],
- "commit": "f57b7d182372c33a7e52a785363acf292422c8aa",
- "sha256": "09zak7zqpvlxij4p1raz10wbc9x7qmik0y1xzcj7v2sh14z952iq"
+ "commit": "58a0e556b4b96e1d23082a7ec2e8c0d4183a1a24",
+ "sha256": "0nvyacv711bb56cj9zrja6svzwhmdw22qg1c1bwprnh4nig43a03"
}
},
{
@@ -109088,11 +109179,11 @@
"repo": "pashinin/workgroups2",
"unstable": {
"version": [
- 20201217,
- 1159
+ 20210325,
+ 939
],
- "commit": "c9403c68a7e6491134110d7cacc130c34eae85a0",
- "sha256": "0zkg6b45nc8ap8c8r95r25wyxymnslp3k1x2mmnmj0ivyi0bxjib"
+ "commit": "808248353b7617fd5b307defc3e1e8ccfed45045",
+ "sha256": "1akxxh3400j9rd7zagmhjfrvvg14g4mlzzgbc1y0n2l33k690fz4"
},
"stable": {
"version": [
@@ -109344,6 +109435,21 @@
"sha256": "17316pq7hlfjx7lbmslmjja4bdvg8mra7nsbaa7dsib6anh75kvn"
}
},
+ {
+ "ename": "wwg",
+ "commit": "f2428271e2ad88d1349cf25aa18144491a1b95b8",
+ "sha256": "02wld1rxj6kcmrmcvx2v5ah068hk6c66bv9xs94sysvx3l6za18z",
+ "fetcher": "github",
+ "repo": "ag91/writer-word-goals",
+ "unstable": {
+ "version": [
+ 20210314,
+ 2101
+ ],
+ "commit": "d62ece22ab7c8c46d874f5ae61712aa517b25ce2",
+ "sha256": "16m77snvipr7blwsd12p7biqxqq9hchq3qmd0h79h9kci1990j2r"
+ }
+ },
{
"ename": "wwtime",
"commit": "28f034fbabe9de76e2e4ae44be8c8240b08f0535",
@@ -109999,11 +110105,11 @@
"repo": "ideasman42/emacs-xref-rst",
"unstable": {
"version": [
- 20210110,
- 640
+ 20210320,
+ 1123
],
- "commit": "9f0cd128fd118fbdf9ea64816c38c0d45adb9733",
- "sha256": "0c326d218p8pp1dcs1zz3q2mgvda82c9drh73hgb8n610f2gvd9d"
+ "commit": "f5bcb89e026562abb8da4ea337457d43fed2e71b",
+ "sha256": "0hhhah6aq5wc6jqvf836h8ysmym1jk78acrdf6n486ck537zh5i3"
}
},
{
@@ -110290,6 +110396,21 @@
"sha256": "12dd4ahg9f1493982d49g7sxx0n6ss4xcfhxwzyaqxckwzfranp0"
}
},
+ {
+ "ename": "yaml",
+ "commit": "b96babefbbaf18adcbe7db6065766fd6ba5aa016",
+ "sha256": "057v3magsdhxbb3n9z09cli48f56kzlqyiwwg3009nfvpkf5vm2q",
+ "fetcher": "github",
+ "repo": "zkry/yaml.el",
+ "unstable": {
+ "version": [
+ 20210326,
+ 533
+ ],
+ "commit": "9ebddb55238d746dc5a5d46db04c9f360c140b99",
+ "sha256": "124lv7jjscaq7pgn72gk7zhrl54c27zqnyh8z51mn8j8mbpvf68a"
+ }
+ },
{
"ename": "yaml-imenu",
"commit": "71e7c2df9e34093ad2634d5a56133fa30126fb5c",
@@ -110896,11 +111017,11 @@
"repo": "ryuslash/yoshi-theme",
"unstable": {
"version": [
- 20210216,
- 29
+ 20210324,
+ 1847
],
- "commit": "eb2a38c71a955fa934ac7a907b9924b3755e40c7",
- "sha256": "0zvk10mgy3q10qmigqx2g1vfxvrwzs27lq4gq0qkh7k4qish2zgx"
+ "commit": "4ea0f4d8128951432169b1e6db3dd4ac42492e93",
+ "sha256": "177zh0d6ax9j1fdv569b0adnb873b2913b9pmj26y8ipsbg4iwa6"
},
"stable": {
"version": [
@@ -111304,15 +111425,15 @@
"repo": "EFLS/zetteldeft",
"unstable": {
"version": [
- 20210214,
- 1135
+ 20210326,
+ 942
],
"deps": [
"ace-window",
"deft"
],
- "commit": "8ea36747ff499e82a911c367eba8f7423c6301a4",
- "sha256": "0p0hz0s3fzpig3vinj7wv3vs29ba5rshw4glxrk3q1hlv3hh4q4s"
+ "commit": "293d406203c5c060ceb64874812bc193ac91fb74",
+ "sha256": "08r0ipi6wbqfna4jwpvyp64vkzy3jdrjy0vac43gi2s3cbxl3wmg"
},
"stable": {
"version": [
@@ -111874,15 +111995,15 @@
"repo": "mrkkrp/zzz-to-char",
"unstable": {
"version": [
- 20190713,
- 1344
+ 20210321,
+ 1707
],
"deps": [
"avy",
"cl-lib"
],
- "commit": "b0a50b8cb6925c3184405f81be9ef9be9da69f09",
- "sha256": "003rg7x1vfv946j1m6yalzsgr88wvm3443pqf9yqwnzl2a3djq0g"
+ "commit": "18d26571b91a9c56b6a7e0d2a58188e833ab5d0f",
+ "sha256": "0cl76m06cm0wmb8bx6g6xrxaks2vr6zqpibc9d94gbkr5jzccg9k"
},
"stable": {
"version": [
diff --git a/third_party/nixpkgs/pkgs/applications/editors/ghostwriter/default.nix b/third_party/nixpkgs/pkgs/applications/editors/ghostwriter/default.nix
index 23a81c9cb0..2249009af7 100644
--- a/third_party/nixpkgs/pkgs/applications/editors/ghostwriter/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/editors/ghostwriter/default.nix
@@ -2,13 +2,13 @@
mkDerivation rec {
pname = "ghostwriter";
- version = "2.0.0-rc4";
+ version = "2.0.0-rc5";
src = fetchFromGitHub {
owner = "wereturtle";
repo = pname;
rev = version;
- sha256 = "07547503a209hc0fcg902w3x0s1m899c10nj3gqz3hak0cmrasi3";
+ sha256 = "sha256-Gc0/AHxxJd5Cq3dBQ0Xy2TF78CBmQFYUzm4s7q1aHEE=";
};
nativeBuildInputs = [ qmake pkg-config qttools ];
diff --git a/third_party/nixpkgs/pkgs/applications/editors/kakoune/plugins/generated.nix b/third_party/nixpkgs/pkgs/applications/editors/kakoune/plugins/generated.nix
index 3ea3ea5147..4fada31a0f 100644
--- a/third_party/nixpkgs/pkgs/applications/editors/kakoune/plugins/generated.nix
+++ b/third_party/nixpkgs/pkgs/applications/editors/kakoune/plugins/generated.nix
@@ -29,24 +29,24 @@ let
connect-kak = buildKakounePluginFrom2Nix {
pname = "connect-kak";
- version = "2021-02-13";
+ version = "2021-02-24";
src = fetchFromGitHub {
- owner = "alexherbo2";
+ owner = "kakounedotcom";
repo = "connect.kak";
- rev = "0858c0e50c6ca6d214fb088f052385a242548e83";
- sha256 = "1w4pwybg3v916hcyc49gz0blygv54ivv81x8fxp44ck0sy98idr3";
+ rev = "a536605a208149eed58986bda54f3dda215dfe61";
+ sha256 = "1svw64zk28sn271vjyzvq21zaln13vnx59rxnxah6adq8n5nkr4a";
};
- meta.homepage = "https://github.com/alexherbo2/connect.kak/";
+ meta.homepage = "https://github.com/kakounedotcom/connect.kak/";
};
fzf-kak = buildKakounePluginFrom2Nix {
pname = "fzf-kak";
- version = "2021-01-27";
+ version = "2021-03-15";
src = fetchFromGitHub {
owner = "andreyorst";
repo = "fzf.kak";
- rev = "e10de405e2a98e910d0808059200d206ba80f865";
- sha256 = "1hbsm1k8k0cgv7gxqicvnl22n2lb1plhkanniggk694gll22lq68";
+ rev = "4e6c9a857511fccdbbc835a1c9acb205b6486a4c";
+ sha256 = "0syhhdlsm7vg6hcd2n2acag9g562z49rbb5smh5p2gnplhmp93i0";
};
meta.homepage = "https://github.com/andreyorst/fzf.kak/";
};
@@ -149,26 +149,26 @@ let
powerline-kak = buildKakounePluginFrom2Nix {
pname = "powerline-kak";
- version = "2021-02-15";
+ version = "2021-02-25";
src = fetchFromGitHub {
- owner = "jdugan6240";
+ owner = "andreyorst";
repo = "powerline.kak";
- rev = "322a760daa099d519ff50d14c29b27f3e2af00d1";
- sha256 = "0mb8f8p6g75p05ifp45i0gbq2mib8c8giz7r1xfd0yrwspp4aksc";
+ rev = "64ad98b6c85e63345563671b043960464d51c4b0";
+ sha256 = "09w2sk19qi64hgsyg4gb407vyppnlgk272mqbinz2r3apy6szkl3";
};
- meta.homepage = "https://github.com/jdugan6240/powerline.kak/";
+ meta.homepage = "https://github.com/andreyorst/powerline.kak/";
};
prelude-kak = buildKakounePluginFrom2Nix {
pname = "prelude-kak";
- version = "2020-09-06";
+ version = "2021-02-24";
src = fetchFromGitHub {
- owner = "alexherbo2";
+ owner = "kakounedotcom";
repo = "prelude.kak";
- rev = "f1e0f4d5cb62a36924e3f8ba6824d6aed8c19d23";
+ rev = "5dbdc020c546032885c1fdb463e366cc89fc15ad";
sha256 = "1pncr8azqvl2z9yvzhc68p1s9fld8cvak8yz88zgrp5ypx2cxl8c";
};
- meta.homepage = "https://github.com/alexherbo2/prelude.kak/";
+ meta.homepage = "https://github.com/kakounedotcom/prelude.kak/";
};
replace-mode-kak = buildKakounePluginFrom2Nix {
diff --git a/third_party/nixpkgs/pkgs/applications/editors/kakoune/plugins/kakoune-plugin-names b/third_party/nixpkgs/pkgs/applications/editors/kakoune/plugins/kakoune-plugin-names
index 6cd856cb6c..b187414608 100644
--- a/third_party/nixpkgs/pkgs/applications/editors/kakoune/plugins/kakoune-plugin-names
+++ b/third_party/nixpkgs/pkgs/applications/editors/kakoune/plugins/kakoune-plugin-names
@@ -1,16 +1,16 @@
alexherbo2/auto-pairs.kak
-alexherbo2/connect.kak
-alexherbo2/prelude.kak
alexherbo2/replace-mode.kak
alexherbo2/sleuth.kak
andreyorst/fzf.kak
+andreyorst/powerline.kak
danr/kakoune-easymotion
Delapouite/kakoune-buffers
Delapouite/kakoune-registers
enricozb/tabs.kak@main
greenfork/active-window.kak
-jdugan6240/powerline.kak
kakoune-editor/kakoune-extra-filetypes
+kakounedotcom/connect.kak
+kakounedotcom/prelude.kak
listentolist/kakoune-rainbow
mayjs/openscad.kak
occivink/kakoune-buffer-switcher
diff --git a/third_party/nixpkgs/pkgs/applications/editors/neovim/neovim-qt.nix b/third_party/nixpkgs/pkgs/applications/editors/neovim/neovim-qt.nix
index 505fd41f79..d925ddd2a5 100644
--- a/third_party/nixpkgs/pkgs/applications/editors/neovim/neovim-qt.nix
+++ b/third_party/nixpkgs/pkgs/applications/editors/neovim/neovim-qt.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, mkDerivation, fetchFromGitHub, cmake, doxygen, makeWrapper
+{ lib, mkDerivation, fetchFromGitHub, cmake, doxygen, makeWrapper
, msgpack, neovim, pythonPackages, qtbase }:
mkDerivation rec {
diff --git a/third_party/nixpkgs/pkgs/applications/editors/textadept/11/default.nix b/third_party/nixpkgs/pkgs/applications/editors/textadept/11/default.nix
index ec310639c3..3050599ba5 100644
--- a/third_party/nixpkgs/pkgs/applications/editors/textadept/11/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/editors/textadept/11/default.nix
@@ -1,20 +1,20 @@
-{ lib, stdenv, fetchhg, fetchFromGitHub, fetchurl, gtk2, glib, pkg-config, unzip, ncurses, zip }:
+{ lib, stdenv, fetchFromGitHub, fetchurl, gtk2, glib, pkg-config, unzip, ncurses, zip }:
stdenv.mkDerivation rec {
- version = "11.0_beta";
+ version = "11.1";
pname = "textadept11";
- nativeBuildInputs = [ pkg-config unzip ];
+ nativeBuildInputs = [ pkg-config unzip zip ];
buildInputs = [
- gtk2 ncurses glib zip
+ gtk2 ncurses glib
];
src = fetchFromGitHub {
name = "textadept11";
owner = "orbitalquark";
repo = "textadept";
- rev = "8da5f6b4a13f14b9dd3cb9dc23ad4f7bf41e91c1";
- sha256 = "0v11v3x8g6v696m3l1bm52zy2g9xzz7hlmn912sn30nhcag3raxs";
+ rev = "1df99d561dd2055a01efa9183bb9e1b2ad43babc";
+ sha256 = "0g4bh5dp391vi32aa796vszpbxyl2dm5231v9dwc8l9v0b2786qn";
};
preConfigure =
@@ -40,7 +40,9 @@ stdenv.mkDerivation rec {
'';
makeFlags = [
- "PREFIX=$(out) WGET=true PIXMAPS_DIR=$(out)/share/pixmaps"
+ "PREFIX=$(out)"
+ "WGET=true"
+ "PIXMAPS_DIR=$(out)/share/pixmaps"
];
meta = with lib; {
diff --git a/third_party/nixpkgs/pkgs/applications/editors/textadept/11/deps.nix b/third_party/nixpkgs/pkgs/applications/editors/textadept/11/deps.nix
index 2ab72574bb..b9c7e94ee3 100644
--- a/third_party/nixpkgs/pkgs/applications/editors/textadept/11/deps.nix
+++ b/third_party/nixpkgs/pkgs/applications/editors/textadept/11/deps.nix
@@ -3,13 +3,13 @@
url = "https://www.scintilla.org/scintilla445.tgz";
sha256 = "1v1kyxj7rv5rxadbg8gl8wh1jafpy7zj0wr6dcyxq9209dl6h8ag";
};
- "9e2ffa159299899c9345aea15c17ba1941953871.zip" = {
- url = "https://github.com/orbitalquark/scinterm/archive/9e2ffa159299899c9345aea15c17ba1941953871.zip";
- sha256 = "12h7prgp689w45p4scxd8vvsyw8fkv27g6gvgis55xr44daa6122";
+ "6a774158d8a3c7bc7ea120bc01cdb016fa351a7e.zip" = {
+ url = "https://github.com/orbitalquark/scinterm/archive/6a774158d8a3c7bc7ea120bc01cdb016fa351a7e.zip";
+ sha256 = "083xvpw14dxbyrv4i48q76bmr44hs637qv363n6ibfs8xv1kq7iv";
};
- "scintillua_4.4.5-1.zip" = {
- url = "https://github.com/orbitalquark/scintillua/archive/scintillua_4.4.5-1.zip";
- sha256 = "095wpbid2kvr5xgkhd5bd4sd7ljgk6gd9palrjkmdcwfgsf1lp04";
+ "scintillua_4.4.5-2.zip" = {
+ url = "https://github.com/orbitalquark/scintillua/archive/scintillua_4.4.5-2.zip";
+ sha256 = "1061y2gg78zb2mml8msyarxgdwbf7g8g2v08fr1qqsqi2pbb7mfc";
};
"lua-5.3.5.tar.gz" = {
url = "http://www.lua.org/ftp/lua-5.3.5.tar.gz";
@@ -19,17 +19,17 @@
url = "http://www.inf.puc-rio.br/~roberto/lpeg/lpeg-1.0.2.tar.gz";
sha256 = "1zjzl7acvcdavmcg5l7wi12jd4rh95q9pl5aiww7hv0v0mv6bmj8";
};
- "v1_7_0_2.zip" = {
- url = "https://github.com/keplerproject/luafilesystem/archive/v1_7_0_2.zip";
- sha256 = "0y44ymc7higz5dd2w3c6ib7mwmpr6yvszcl7lm12nf8x3y4snx4i";
+ "v1_8_0.zip" = {
+ url = "https://github.com/keplerproject/luafilesystem/archive/v1_8_0.zip";
+ sha256 = "12p1p5qpdql44y3cc035h8rs8rgdqp6nrnrixlp5544agb5bx9p3";
};
"64587546482a1a6324706d75c80b77d2f87118a4.zip" = {
url = "https://github.com/orbitalquark/gtdialog/archive/64587546482a1a6324706d75c80b77d2f87118a4.zip";
sha256 = "10mglbnn8r1cakqn9h285pwfnh7kfa98v7j8qh83c24n66blyfh9";
};
- "cdk-5.0-20150928.tgz" = {
- url = "http://invisible-mirror.net/archives/cdk/cdk-5.0-20150928.tgz";
- sha256 = "0j74l874y33i26y5kjg3pf1vswyjif8k93pqhi0iqykpbxfsg382";
+ "cdk-5.0-20200923.tgz" = {
+ url = "http://invisible-mirror.net/archives/cdk/cdk-5.0-20200923.tgz";
+ sha256 = "1vdakz119a13d7p7w53hk56fdmbkhv6y9xvdapcfnbnbh3l5szq0";
};
"libtermkey-0.20.tar.gz" = {
url = "http://www.leonerd.org.uk/code/libtermkey/libtermkey-0.20.tar.gz";
diff --git a/third_party/nixpkgs/pkgs/applications/editors/tiled/default.nix b/third_party/nixpkgs/pkgs/applications/editors/tiled/default.nix
index b6222c8a6d..4fbbacf8f1 100644
--- a/third_party/nixpkgs/pkgs/applications/editors/tiled/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/editors/tiled/default.nix
@@ -3,13 +3,13 @@
mkDerivation rec {
pname = "tiled";
- version = "1.4.3";
+ version = "1.5.0";
src = fetchFromGitHub {
owner = "bjorn";
repo = pname;
rev = "v${version}";
- sha256 = "0n8p7bp5pqq72c65av3v7wbazwphh78pw27nqvpiyp9y8k5w4pg0";
+ sha256 = "sha256-Pf9nA5DUAJ+PPNG+oP7RO4/TD8fy4ADsyq625a6cbFk=";
};
nativeBuildInputs = [ pkg-config qmake ];
diff --git a/third_party/nixpkgs/pkgs/applications/editors/vim/configurable.nix b/third_party/nixpkgs/pkgs/applications/editors/vim/configurable.nix
index 734b189d1e..4215b20180 100644
--- a/third_party/nixpkgs/pkgs/applications/editors/vim/configurable.nix
+++ b/third_party/nixpkgs/pkgs/applications/editors/vim/configurable.nix
@@ -75,7 +75,6 @@ in stdenv.mkDerivation rec {
patches = [ ./cflags-prune.diff ] ++ lib.optional ftNixSupport ./ft-nix-support.patch;
configureFlags = [
- "--enable-gui=${guiSupport}"
"--with-features=${features}"
"--disable-xsmp" # XSMP session management
"--disable-xsmp_interact" # XSMP interaction
@@ -95,6 +94,7 @@ in stdenv.mkDerivation rec {
"--disable-carbon_check"
"--disable-gtktest"
]
+ ++ lib.optional (guiSupport == "gtk2" || guiSupport == "gtk3") "--enable-gui=${guiSupport}"
++ lib.optional stdenv.isDarwin
(if darwinSupport then "--enable-darwin" else "--disable-darwin")
++ lib.optionals luaSupport [
@@ -127,8 +127,22 @@ in stdenv.mkDerivation rec {
++ lib.optional (guiSupport == "gtk3") wrapGAppsHook
;
- buildInputs = [ ncurses libX11 libXext libSM libXpm libXt libXaw libXau
- libXmu glib libICE ]
+ buildInputs = [
+ ncurses
+ glib
+ ]
+ # All X related dependencies
+ ++ lib.optionals (guiSupport == "gtk2" || guiSupport == "gtk3") [
+ libSM
+ libICE
+ libX11
+ libXext
+ libXpm
+ libXt
+ libXaw
+ libXau
+ libXmu
+ ]
++ lib.optional (guiSupport == "gtk2") gtk2-x11
++ lib.optional (guiSupport == "gtk3") gtk3-x11
++ lib.optionals darwinSupport [ CoreServices CoreData Cocoa Foundation libobjc ]
diff --git a/third_party/nixpkgs/pkgs/applications/editors/vscode/update-vscode.sh b/third_party/nixpkgs/pkgs/applications/editors/vscode/update-vscode.sh
index d1ae71cd11..68249c20d1 100755
--- a/third_party/nixpkgs/pkgs/applications/editors/vscode/update-vscode.sh
+++ b/third_party/nixpkgs/pkgs/applications/editors/vscode/update-vscode.sh
@@ -19,18 +19,18 @@ fi
VSCODE_VER=$(curl --fail --silent https://api.github.com/repos/Microsoft/vscode/releases/latest | jq --raw-output .tag_name)
sed -i "s/version = \".*\"/version = \"${VSCODE_VER}\"/" "$ROOT/vscode.nix"
-VSCODE_LINUX_URL="https://vscode-update.azurewebsites.net/${VSCODE_VER}/linux-x64/stable"
+VSCODE_LINUX_URL="https://update.code.visualstudio.com/${VSCODE_VER}/linux-x64/stable"
VSCODE_LINUX_SHA256=$(nix-prefetch-url ${VSCODE_LINUX_URL})
sed -i "s/x86_64-linux = \".\{52\}\"/x86_64-linux = \"${VSCODE_LINUX_SHA256}\"/" "$ROOT/vscode.nix"
-VSCODE_DARWIN_URL="https://vscode-update.azurewebsites.net/${VSCODE_VER}/darwin/stable"
+VSCODE_DARWIN_URL="https://update.code.visualstudio.com/${VSCODE_VER}/darwin/stable"
VSCODE_DARWIN_SHA256=$(nix-prefetch-url ${VSCODE_DARWIN_URL})
sed -i "s/x86_64-darwin = \".\{52\}\"/x86_64-darwin = \"${VSCODE_DARWIN_SHA256}\"/" "$ROOT/vscode.nix"
-VSCODE_LINUX_AARCH64_URL="https://vscode-update.azurewebsites.net/${VSCODE_VER}/linux-arm64/stable"
+VSCODE_LINUX_AARCH64_URL="https://update.code.visualstudio.com/${VSCODE_VER}/linux-arm64/stable"
VSCODE_LINUX_AARCH64_SHA256=$(nix-prefetch-url ${VSCODE_LINUX_AARCH64_URL})
sed -i "s/aarch64-linux = \".\{52\}\"/aarch64-linux = \"${VSCODE_LINUX_AARCH64_SHA256}\"/" "$ROOT/vscode.nix"
-VSCODE_LINUX_ARMV7L_URL="https://vscode-update.azurewebsites.net/${VSCODE_VER}/linux-armhf/stable"
+VSCODE_LINUX_ARMV7L_URL="https://update.code.visualstudio.com/${VSCODE_VER}/linux-armhf/stable"
VSCODE_LINUX_ARMV7L_SHA256=$(nix-prefetch-url ${VSCODE_LINUX_ARMV7L_URL})
sed -i "s/armv7l-linux = \".\{52\}\"/armv7l-linux = \"${VSCODE_LINUX_ARMV7L_SHA256}\"/" "$ROOT/vscode.nix"
diff --git a/third_party/nixpkgs/pkgs/applications/editors/vscode/vscode.nix b/third_party/nixpkgs/pkgs/applications/editors/vscode/vscode.nix
index ba03bb65c2..988bcf412e 100644
--- a/third_party/nixpkgs/pkgs/applications/editors/vscode/vscode.nix
+++ b/third_party/nixpkgs/pkgs/applications/editors/vscode/vscode.nix
@@ -13,10 +13,10 @@ let
archive_fmt = if system == "x86_64-darwin" then "zip" else "tar.gz";
sha256 = {
- x86_64-linux = "1px6x99cv8nb8lcy3vgcicr4ar0bfj5rfnc5a1yw8rs5p1qnflgw";
- x86_64-darwin = "0grzivqb2fyvwh0fjh9vr205fjcsrd1iqhkwk3mgv792zfrb7ksf";
- aarch64-linux = "0p0msxgc13kqmpq7wk61igc1qbgmgg9463s44dp4ii3630iyr4lw";
- armv7l-linux = "147lki1wr5nzsg1mq12jmdjq9qr6vbdpmzbpr5nrvq23cak94ff8";
+ x86_64-linux = "0fpa3b807hy3wrb98h5s0p6ljya279bikv2qwq30nvr0f4zn48bk";
+ x86_64-darwin = "0bw7pdzn0a0zr7x8fpwck7v73dq5vh71ja00z11mhjrkjnvmmd9k";
+ aarch64-linux = "04wrqcmyamhwiwcyay1z0q0dvf6g7k3pcs93x7hahy16l65w7s2c";
+ armv7l-linux = "1hkc9i4z021jwjn275w790bppfvi63g0cnwvkssqdh1c94939rhv";
}.${system};
in
callPackage ./generic.nix rec {
@@ -25,7 +25,7 @@ in
# Please backport all compatible updates to the stable release.
# This is important for the extension ecosystem.
- version = "1.54.2";
+ version = "1.54.3";
pname = "vscode";
executableName = "code" + lib.optionalString isInsiders "-insiders";
@@ -34,7 +34,7 @@ in
src = fetchurl {
name = "VSCode_${version}_${plat}.${archive_fmt}";
- url = "https://vscode-update.azurewebsites.net/${version}/${plat}/stable";
+ url = "https://update.code.visualstudio.com/${version}/${plat}/stable";
inherit sha256;
};
diff --git a/third_party/nixpkgs/pkgs/applications/editors/zile/default.nix b/third_party/nixpkgs/pkgs/applications/editors/zile/default.nix
index 7d36a2fd7f..3d0e98602a 100644
--- a/third_party/nixpkgs/pkgs/applications/editors/zile/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/editors/zile/default.nix
@@ -1,20 +1,39 @@
-{ fetchurl, lib, stdenv, glib, libgee, pkg-config, ncurses, boehmgc, perl, help2man, vala }:
+{ lib
+, stdenv
+, fetchurl
+, boehmgc
+, glib
+, help2man
+, libgee
+, ncurses
+, perl
+, pkg-config
+, vala
+}:
stdenv.mkDerivation rec {
- name = "zile-2.6.0.90";
+ pname = "zile";
+ version = "2.6.1";
src = fetchurl {
- url = "mirror://gnu/zile/${name}.tar.gz";
- sha256 = "1bhdwnasmqhy0hi3fqmpzr8xkw5zlqjpmf1cj42h4cg3fnamp6r3";
+ url = "mirror://gnu/zile/${pname}-${version}.tar.gz";
+ hash = "sha256-v7rN33aOORc6J0Z5JP5AmZCj6XvjYyoCl5hl+7mvAnc=";
};
- buildInputs = [ glib libgee ncurses boehmgc vala ];
- nativeBuildInputs = [ perl pkg-config ]
- # `help2man' wants to run Zile, which won't work when the
- # newly-produced binary can't be run at build-time.
- ++ lib.optional
- (stdenv.hostPlatform == stdenv.buildPlatform)
- help2man;
+ buildInputs = [
+ boehmgc
+ glib
+ libgee
+ ncurses
+ ];
+ nativeBuildInputs = [
+ perl
+ pkg-config
+ vala
+ ]
+ # `help2man' wants to run Zile, which won't work when the
+ # newly-produced binary can't be run at build-time.
+ ++ lib.optional (stdenv.hostPlatform == stdenv.buildPlatform) help2man;
# Tests can't be run because most of them rely on the ability to
# fiddle with the terminal.
@@ -24,33 +43,38 @@ stdenv.mkDerivation rec {
gl_cv_func_fstatat_zero_flag="yes";
meta = with lib; {
- description = "Lightweight Emacs clone";
-
- longDescription = ''
- GNU Zile, which is a lightweight Emacs clone. Zile is short
- for Zile Is Lossy Emacs. Zile has been written to be as
- similar as possible to Emacs; every Emacs user should feel at
- home.
-
- Zile has all of Emacs's basic editing features: it is 8-bit
- clean (though it currently lacks Unicode support), and the
- number of editing buffers and windows is only limited by
- available memory and screen space respectively. Registers,
- minibuffer completion and auto fill are available. Function
- and variable names are identical with Emacs's (except those
- containing the word "emacs", which instead contain the word
- "zile"!).
-
- However, all of this is packed into a program which typically
- compiles to about 130Kb.
- '';
-
homepage = "https://www.gnu.org/software/zile/";
+ description = "Zile Implements Lua Editors";
+ longDescription = ''
+ GNU Zile is a text editor development kit, so that you can (relatively)
+ quickly develop your own ideal text editor without reinventing the wheel
+ for many of the common algorithms and data-structures needed to do so.
+ It comes with an example implementation of a lightweight Emacs clone,
+ called Zemacs. Every Emacs user should feel at home with Zemacs. Zemacs is
+ aimed at small footprint systems and quick editing sessions (it starts up
+ and shuts down instantly).
+
+ More editors implemented over the Zile frameworks are forthcoming as the
+ data-structures and interfaces improve: Zz an emacs inspired editor using
+ Lua as an extension language; Zee a minimalist non-modal editor; Zi a
+ lightweight vi clone; and more...
+
+ Zile is a collection of algorithms and data-structures that currently
+ support all basic Emacs-like editing features: it is 8-bit clean (though
+ Unicode support is not ready yet), and the number of editing buffers and
+ windows is only limited by available memoryand screen space
+ respectively. Registers, minibuffer completion and auto fill are
+ available.
+
+ Zemacs implements a subset of Emacs with identical function and variable
+ names, continuing the spirit of the earlier Zile editor implemented in C.
+ GNU Zile, which is a lightweight Emacs clone. Zile is short for Zile Is
+ Lossy Emacs. Zile has been written to be as similar as possible to Emacs;
+ every Emacs user should feel at home.
+ '';
license = licenses.gpl3Plus;
-
- maintainers = with maintainers; [ pSub ];
-
+ maintainers = with maintainers; [ pSub AndersonTorres ];
platforms = platforms.unix;
};
}
diff --git a/third_party/nixpkgs/pkgs/applications/gis/openorienteering-mapper/default.nix b/third_party/nixpkgs/pkgs/applications/gis/openorienteering-mapper/default.nix
index 81e81c8853..21b4cfa94b 100644
--- a/third_party/nixpkgs/pkgs/applications/gis/openorienteering-mapper/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/gis/openorienteering-mapper/default.nix
@@ -1,6 +1,7 @@
{ lib, stdenv
, mkDerivation
, fetchFromGitHub
+, fetchpatch
, substituteAll
, gdal
, cmake
@@ -19,7 +20,7 @@
mkDerivation rec {
pname = "OpenOrienteering-Mapper";
- version = "0.9.4";
+ version = "0.9.5";
buildInputs = [
gdal
@@ -38,14 +39,21 @@ mkDerivation rec {
owner = "OpenOrienteering";
repo = "mapper";
rev = "v${version}";
- sha256 = "13k9dirqm74lknhr8w121zr1hjd9gm1y73cj4rrj98rx44dzmk7b";
+ sha256 = "1w8ikqpgi0ksrzjal5ihfaik4grc5v3gdnnv79j20xkr2p4yn1h5";
};
- patches = (substituteAll {
- # See https://github.com/NixOS/nixpkgs/issues/86054
- src = ./fix-qttranslations-path.diff;
- inherit qttranslations;
- });
+ patches = [
+ # https://github.com/NixOS/nixpkgs/issues/86054
+ (substituteAll {
+ src = ./fix-qttranslations-path.diff;
+ inherit qttranslations;
+ })
+ # https://github.com/OpenOrienteering/mapper/pull/1907
+ (fetchpatch {
+ url = "https://github.com/OpenOrienteering/mapper/commit/bc52aa567e90a58d6963b44d5ae1909f3f841508.patch";
+ sha256 = "1bkckapzccn6k0ri6bgrr0nhis9498fnwj7b32s2ysym8zcg0355";
+ })
+ ];
cmakeFlags = [
# Building the manual and bundling licenses fails
@@ -81,7 +89,8 @@ mkDerivation rec {
and provides a free alternative to the existing proprietary solution.
'';
homepage = "https://www.openorienteering.org/apps/mapper/";
- license = licenses.gpl3;
+ changelog = "https://github.com/OpenOrienteering/mapper/releases/tag/v${version}";
+ license = licenses.gpl3Plus;
platforms = with platforms; linux ++ darwin;
maintainers = with maintainers; [ mpickering sikmir ];
};
diff --git a/third_party/nixpkgs/pkgs/applications/graphics/dia/default.nix b/third_party/nixpkgs/pkgs/applications/graphics/dia/default.nix
index d9de3eb7fc..d07904c859 100644
--- a/third_party/nixpkgs/pkgs/applications/graphics/dia/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/graphics/dia/default.nix
@@ -1,5 +1,5 @@
{ lib, stdenv, fetchgit, autoconf, automake, libtool, gtk2, pkg-config, perlPackages,
-libxml2, gettext, python, libxml2Python, docbook5, docbook_xsl,
+libxml2, gettext, python2, libxml2Python, docbook5, docbook_xsl,
libxslt, intltool, libart_lgpl, withGNOME ? false, libgnomeui,
gtk-mac-integration-gtk2 }:
@@ -18,7 +18,7 @@ stdenv.mkDerivation {
];
buildInputs =
- [ gtk2 libxml2 gettext python libxml2Python docbook5
+ [ gtk2 libxml2 gettext python2 libxml2Python docbook5
libxslt docbook_xsl libart_lgpl ]
++ lib.optional withGNOME libgnomeui
++ lib.optional stdenv.isDarwin gtk-mac-integration-gtk2;
diff --git a/third_party/nixpkgs/pkgs/applications/graphics/lightburn/default.nix b/third_party/nixpkgs/pkgs/applications/graphics/lightburn/default.nix
index e839650af9..8188a3949d 100644
--- a/third_party/nixpkgs/pkgs/applications/graphics/lightburn/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/graphics/lightburn/default.nix
@@ -6,7 +6,7 @@
stdenv.mkDerivation rec {
pname = "lightburn";
- version = "0.9.21";
+ version = "0.9.22";
nativeBuildInputs = [
p7zip
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
src = fetchurl {
url = "https://github.com/LightBurnSoftware/deployment/releases/download/${version}/LightBurn-Linux64-v${version}.7z";
- sha256 = "sha256-Tnv+vfKOdDWIU36T9ZqwdTwuMd2AOGyKBY0IkPfrZlc=";
+ sha256 = "sha256-DOiO36suytukkviqYyLL47DFVzsJt2ZfSnnni95CLaA=";
};
buildInputs = [
diff --git a/third_party/nixpkgs/pkgs/applications/graphics/monado/default.nix b/third_party/nixpkgs/pkgs/applications/graphics/monado/default.nix
index 395ae02842..fe5f99de12 100644
--- a/third_party/nixpkgs/pkgs/applications/graphics/monado/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/graphics/monado/default.nix
@@ -1,6 +1,6 @@
-{ lib, stdenv
+{ lib
+, stdenv
, fetchFromGitLab
-, fetchpatch
, writeText
, cmake
, doxygen
@@ -44,24 +44,16 @@
stdenv.mkDerivation rec {
pname = "monado";
- version = "0.4.1";
+ version = "21.0.0";
src = fetchFromGitLab {
domain = "gitlab.freedesktop.org";
owner = pname;
repo = pname;
rev = "v${version}";
- sha256 = "114aif79dqyn2qg07mkv6lzmqn15k6fdcii818rdf5g4bp7zzzgm";
+ sha256 = "07zxs96i3prjqww1f68496cl2xxqaidx32lpfyy0pn5am4c297zc";
};
- patches = [
- # fix libsurvive autodetection, drop with the next version update
- (fetchpatch {
- url = "https://gitlab.freedesktop.org/monado/monado/-/commit/345e9eab56e2de9e8b07cf72c2a67cf2ebd01e62.patch";
- sha256 = "17c110an6sxc8rn7dfz30rfkbayg64w68licicwc8cqabi6cgrm3";
- })
- ];
-
nativeBuildInputs = [
cmake
doxygen
diff --git a/third_party/nixpkgs/pkgs/applications/graphics/photoflare/default.nix b/third_party/nixpkgs/pkgs/applications/graphics/photoflare/default.nix
index b0719631c0..cc4f4342c6 100644
--- a/third_party/nixpkgs/pkgs/applications/graphics/photoflare/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/graphics/photoflare/default.nix
@@ -3,13 +3,13 @@
mkDerivation rec {
pname = "photoflare";
- version = "1.6.7";
+ version = "1.6.7.1";
src = fetchFromGitHub {
owner = "PhotoFlare";
repo = "photoflare";
rev = "v${version}";
- sha256 = "sha256-Gx3YP29NrNHp0p05a1O4Xb9kqkA6pQLTJZ3/wOx+BWY=";
+ sha256 = "sha256-7b7ICcHuMjOMtyQDkokoHeZrF4G+bOzgRJP4mkns+Zc=";
};
nativeBuildInputs = [ qmake qttools ];
diff --git a/third_party/nixpkgs/pkgs/applications/graphics/yed/default.nix b/third_party/nixpkgs/pkgs/applications/graphics/yed/default.nix
index 8a498fbe7e..d2873f6414 100644
--- a/third_party/nixpkgs/pkgs/applications/graphics/yed/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/graphics/yed/default.nix
@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "yEd";
- version = "3.20.1";
+ version = "3.21.1";
src = fetchzip {
url = "https://www.yworks.com/resources/yed/demo/${pname}-${version}.zip";
- sha256 = "0sd73s700f3gqq5zq1psrqjg6ff2gv49f8vd37v6bv65vdxqxryq";
+ sha256 = "1jw28hkd7p0n660gid8yh5y0kdcz6ycn4hsgjlf0pq48x9kv6w0c";
};
nativeBuildInputs = [ makeWrapper unzip wrapGAppsHook ];
diff --git a/third_party/nixpkgs/pkgs/applications/kde/ffmpegthumbs.nix b/third_party/nixpkgs/pkgs/applications/kde/ffmpegthumbs.nix
index f19ee16098..b8695a3015 100644
--- a/third_party/nixpkgs/pkgs/applications/kde/ffmpegthumbs.nix
+++ b/third_party/nixpkgs/pkgs/applications/kde/ffmpegthumbs.nix
@@ -1,7 +1,7 @@
{
mkDerivation, lib,
extra-cmake-modules,
- ffmpeg_3, kio, taglib
+ ffmpeg_4, kio, taglib
}:
mkDerivation {
@@ -11,5 +11,5 @@ mkDerivation {
maintainers = [ lib.maintainers.ttuegel ];
};
nativeBuildInputs = [ extra-cmake-modules ];
- buildInputs = [ ffmpeg_3 kio taglib ];
+ buildInputs = [ ffmpeg_4 kio taglib ];
}
diff --git a/third_party/nixpkgs/pkgs/applications/kde/libksane.nix b/third_party/nixpkgs/pkgs/applications/kde/libksane.nix
index 33a2ef48f9..79274d4396 100644
--- a/third_party/nixpkgs/pkgs/applications/kde/libksane.nix
+++ b/third_party/nixpkgs/pkgs/applications/kde/libksane.nix
@@ -9,7 +9,7 @@ mkDerivation {
pname = "libksane";
meta = with lib; {
license = licenses.gpl2;
- maintainers = with maintainers; [ pshendry ];
+ maintainers = with maintainers; [ polendri ];
};
nativeBuildInputs = [ extra-cmake-modules ];
buildInputs = [ qtbase ki18n ktextwidgets kwallet kwidgetsaddons sane-backends ];
diff --git a/third_party/nixpkgs/pkgs/applications/misc/1password-gui/default.nix b/third_party/nixpkgs/pkgs/applications/misc/1password-gui/default.nix
index 41fd8683c5..0b3e21cc03 100644
--- a/third_party/nixpkgs/pkgs/applications/misc/1password-gui/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/misc/1password-gui/default.nix
@@ -8,11 +8,11 @@
stdenv.mkDerivation rec {
pname = "1password";
- version = "8.0.28";
+ version = "8.0.30";
src = fetchurl {
url = "https://onepassword.s3.amazonaws.com/linux/appimage/${pname}-${version}.AppImage";
- hash = "sha256-okLeyok/5rihGXaQaUR06dGkpuqqW02qJ6q6VVLtZsE=";
+ hash = "sha256-j+fp/f8nta+OOuOFU4mmUrGYlVmAqdaXO4rLJ0in+m8=";
};
nativeBuildInputs = [ makeWrapper ];
diff --git a/third_party/nixpkgs/pkgs/applications/misc/bashSnippets/default.nix b/third_party/nixpkgs/pkgs/applications/misc/bashSnippets/default.nix
index d50f363798..52d56d5c8f 100644
--- a/third_party/nixpkgs/pkgs/applications/misc/bashSnippets/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/misc/bashSnippets/default.nix
@@ -1,10 +1,10 @@
{ stdenv, lib, fetchFromGitHub, makeWrapper
-, curl, python, bind, iproute, bc, gitMinimal }:
+, curl, python3, bind, iproute, bc, gitMinimal }:
let
version = "1.23.0";
deps = lib.makeBinPath [
curl
- python
+ python3
bind.dnsutils
iproute
bc
@@ -24,11 +24,13 @@ stdenv.mkDerivation {
nativeBuildInputs = [ makeWrapper ];
- patchPhase = ''
+ postPatch = ''
patchShebangs install.sh
substituteInPlace install.sh --replace /usr/local "$out"
'';
+ strictDeps = true;
+
dontBuild = true;
installPhase = ''
diff --git a/third_party/nixpkgs/pkgs/applications/misc/calibre/default.nix b/third_party/nixpkgs/pkgs/applications/misc/calibre/default.nix
index 5d57ff9a5b..f7e9846204 100644
--- a/third_party/nixpkgs/pkgs/applications/misc/calibre/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/misc/calibre/default.nix
@@ -86,6 +86,7 @@ mkDerivation rec {
with python3Packages; [
apsw
beautifulsoup4
+ cchardet
css-parser
cssselect
dateutil
diff --git a/third_party/nixpkgs/pkgs/applications/misc/cherrytree/default.nix b/third_party/nixpkgs/pkgs/applications/misc/cherrytree/default.nix
index c74ac5ffb3..0ce89afa6c 100644
--- a/third_party/nixpkgs/pkgs/applications/misc/cherrytree/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/misc/cherrytree/default.nix
@@ -1,6 +1,6 @@
-{ lib, fetchFromGitHub, pythonPackages, gettext }:
+{ lib, fetchFromGitHub, python2Packages, gettext }:
-pythonPackages.buildPythonApplication rec {
+python2Packages.buildPythonApplication rec {
pname = "cherrytree";
version = "0.39.4";
@@ -14,7 +14,7 @@ pythonPackages.buildPythonApplication rec {
nativeBuildInputs = [ gettext ];
- propagatedBuildInputs = with pythonPackages; [ pygtk dbus-python pygtksourceview ];
+ propagatedBuildInputs = with python2Packages; [ pygtk dbus-python pygtksourceview ];
patches = [ ./subprocess.patch ];
diff --git a/third_party/nixpkgs/pkgs/applications/misc/clight/clightd.nix b/third_party/nixpkgs/pkgs/applications/misc/clight/clightd.nix
index 547e7e0b6d..632a0d5d0e 100644
--- a/third_party/nixpkgs/pkgs/applications/misc/clight/clightd.nix
+++ b/third_party/nixpkgs/pkgs/applications/misc/clight/clightd.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchFromGitHub, fetchpatch
+{ lib, stdenv, fetchFromGitHub
, dbus, cmake, pkg-config
, glib, udev, polkit, libusb1, libjpeg, libmodule
, pcre, libXdmcp, util-linux, libpthreadstubs
@@ -9,42 +9,34 @@
stdenv.mkDerivation rec {
pname = "clightd";
- version = "5.1";
+ version = "5.2";
src = fetchFromGitHub {
owner = "FedeDP";
repo = "Clightd";
rev = version;
- sha256 = "sha256-BEGum0t+FrCTAEQwTsWeYpoIqimTAz+Bv/ZQPQ3fePY=";
+ sha256 = "sha256-bb+PQsWLf4KnbzWUY6B42yHaDQKN9dtyfwSLe8FBaWU=";
};
- patches = [
- # Not needed by next version bump
- (fetchpatch {
- url = "https://github.com/FedeDP/Clightd/commit/a52a2888e3798c572dad359a017cb0d40e7c5fb7.patch";
- sha256 = "sha256-nUzNBia1EvBQxinAfjyKbuldBoHLY1hfMaxgG2lKQWg=";
- })
- ];
-
# dbus-1.pc has datadir=/etc
SYSTEM_BUS_DIR = "${placeholder "out"}/share/dbus-1/system-services";
- # systemd.pc has prefix=${systemd.out}
- MODULE_LOAD_DIR = "${placeholder "out"}/lib/modules-load.d";
# polkit-gobject-1.pc has prefix=${polkit.out}
POLKIT_ACTION_DIR = "${placeholder "out"}/share/polkit-1/actions";
postPatch = ''
- sed -i "s@/etc@$out\0@" CMakeLists.txt
sed -i "s@pkg_get_variable(SYSTEM_BUS_DIR.*@set(SYSTEM_BUS_DIR $SYSTEM_BUS_DIR)@" CMakeLists.txt
- sed -i "s@pkg_get_variable(MODULE_LOAD_DIR.*@set(MODULE_LOAD_DIR $MODULE_LOAD_DIR)@" CMakeLists.txt
sed -i "s@pkg_get_variable(POLKIT_ACTION_DIR.*@set(POLKIT_ACTION_DIR $POLKIT_ACTION_DIR)@" CMakeLists.txt
'';
cmakeFlags = with lib;
- optional enableDdc "-DENABLE_DDC=1"
- ++ optional enableDpms "-DENABLE_DPMS=1"
- ++ optional enableGamma "-DENABLE_GAMMA=1"
- ++ optional enableScreen "-DENABLE_SCREEN=1";
+ [ "-DSYSTEMD_SERVICE_DIR=${placeholder "out"}/lib/systemd/system"
+ "-DDBUS_CONFIG_DIR=${placeholder "out"}/etc/dbus-1/system.d"
+ # systemd.pc has prefix=${systemd.out}
+ "-DMODULE_LOAD_DIR=${placeholder "out"}/lib/modules-load.d"
+ ] ++ optional enableDdc "-DENABLE_DDC=1"
+ ++ optional enableDpms "-DENABLE_DPMS=1"
+ ++ optional enableGamma "-DENABLE_GAMMA=1"
+ ++ optional enableScreen "-DENABLE_SCREEN=1";
nativeBuildInputs = [
dbus
diff --git a/third_party/nixpkgs/pkgs/applications/misc/curabydagoma/default.nix b/third_party/nixpkgs/pkgs/applications/misc/curabydagoma/default.nix
index 821b88f9b2..a8d041de10 100644
--- a/third_party/nixpkgs/pkgs/applications/misc/curabydagoma/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/misc/curabydagoma/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, runtimeShell, lib, fetchurl, python, pythonPackages, unzip }:
+{ stdenv, runtimeShell, lib, fetchurl, python2Packages, unzip }:
# This package uses a precompiled "binary" distribution of CuraByDagoma,
# distributed by the editor.
@@ -13,7 +13,9 @@
# I guess people owning a 3D printer generally don't use i686.
# If, however, someone needs it, we certainly can find a solution.
-stdenv.mkDerivation rec {
+let
+ pythonPackages = python2Packages;
+in stdenv.mkDerivation rec {
pname = "curabydagoma";
# Version is the date, UNIX format
version = "1520506579";
@@ -26,7 +28,7 @@ stdenv.mkDerivation rec {
};
unpackCmd = "unzip $curSrc && tar zxf CuraByDagoma_amd64.tar.gz";
nativeBuildInputs = [ unzip ];
- buildInputs = [ python pythonPackages.pyopengl pythonPackages.wxPython pythonPackages.pyserial pythonPackages.numpy ];
+ buildInputs = [ pythonPackages.python pythonPackages.pyopengl pythonPackages.wxPython pythonPackages.pyserial pythonPackages.numpy ];
# Compile all pyc files because the included pyc files may be older than the
# py files. However, Python doesn't realize that because the packages
@@ -46,7 +48,7 @@ stdenv.mkDerivation rec {
cat > $out/bin/curabydago <
-Date: Sun, 31 May 2020 17:27:05 -0700
-Subject: [PATCH 1/2] Use 'rm' from path in go generate
-
-/bin/rm is less portable. On some distros, like nixos, it doesn't exist
-at all.
----
- main.go | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/main.go b/main.go
-index 62908bb7bb..0527222887 100644
---- a/main.go
-+++ b/main.go
-@@ -1,5 +1,5 @@
- //go:generate go run pkg/codegen/cleanup/main.go
--//go:generate /bin/rm -rf pkg/generated
-+//go:generate rm -rf pkg/generated
- //go:generate go run pkg/codegen/main.go
- //go:generate go fmt pkg/deploy/zz_generated_bindata.go
- //go:generate go fmt pkg/static/zz_generated_bindata.go
---
-2.25.4
-
diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/k9s/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/k9s/default.nix
index 26591ff397..80a58543ae 100644
--- a/third_party/nixpkgs/pkgs/applications/networking/cluster/k9s/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/k9s/default.nix
@@ -2,13 +2,13 @@
buildGoModule rec {
pname = "k9s";
- version = "0.24.3";
+ version = "0.24.5";
src = fetchFromGitHub {
owner = "derailed";
repo = "k9s";
rev = "v${version}";
- sha256 = "sha256-xxWbojMY0je1mkp2TMuIhIsimVKdHvbkTMozlU9RbTQ=";
+ sha256 = "sha256-CAKvu6/U/2krJzY9VnK9wUHSNCpM6rjRzgXAWhC65uw=";
};
buildFlagsArray = ''
@@ -18,7 +18,7 @@ buildGoModule rec {
-X github.com/derailed/k9s/cmd.commit=${src.rev}
'';
- vendorSha256 = "sha256-Q/l/GH6NSZdMMwTJ5spVEGZclnzcWpUW+zOwRXYQjxc=";
+ vendorSha256 = "sha256-WcGIw53QPOVPeRXKMr1rH1R+PZRWf9/asyPyoutD8x4=";
doCheck = false;
diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/kube-score/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/kube-score/default.nix
new file mode 100644
index 0000000000..76bd115a9b
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/kube-score/default.nix
@@ -0,0 +1,22 @@
+{ lib, buildGoModule, fetchFromGitHub }:
+
+buildGoModule rec {
+ pname = "kube-score";
+ version = "1.10.1";
+
+ src = fetchFromGitHub {
+ owner = "zegl";
+ repo = pname;
+ rev = "v${version}";
+ sha256 = "sha256-TYsuSPWTiIlPscul/QO59+lt6sbjJdt7pJuJYO5R9Tc=";
+ };
+
+ vendorSha256 = "sha256-ob7mNheyeTcDWml4gi1SD3Pq+oWtJeySIUg2ZrCj0y0=";
+
+ meta = with lib; {
+ description = "Kubernetes object analysis with recommendations for improved reliability and security";
+ homepage = "https://github.com/zegl/kube-score";
+ license = licenses.mit;
+ maintainers = [ maintainers.j4m3s ];
+ };
+}
diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/kubeconform/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/kubeconform/default.nix
new file mode 100644
index 0000000000..ca5e30154d
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/kubeconform/default.nix
@@ -0,0 +1,22 @@
+{ lib, buildGoModule, fetchFromGitHub }:
+
+buildGoModule rec {
+ pname = "kubeconform";
+ version = "0.4.6";
+
+ src = fetchFromGitHub {
+ owner = "yannh";
+ repo = pname;
+ rev = "v${version}";
+ sha256 = "sha256-lduHYYskEPUimEX54ymOyo5jY7GGBB42YTefDMNS4qo=";
+ };
+
+ vendorSha256 = null;
+
+ meta = with lib; {
+ description = "A FAST Kubernetes manifests validator, with support for Custom Resources!";
+ homepage = "https://github.com/yannh/kubeconform/";
+ license = licenses.asl20;
+ maintainers = [ maintainers.j4m3s ];
+ };
+}
diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/octant/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/octant/default.nix
index 453c1406fd..0e97b541a5 100644
--- a/third_party/nixpkgs/pkgs/applications/networking/cluster/octant/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/octant/default.nix
@@ -15,12 +15,12 @@ let
in
stdenv.mkDerivation rec {
pname = "octant";
- version = "0.17.0";
+ version = "0.18.0";
src = fetchsrc version {
- x86_64-linux = "sha256-kYS8o97HBjNgwmrG4fjsqFWxZy6ATFOhxt6j3KMZbEc=";
- aarch64-linux = "sha256-/Tpna2Y8+PQt+SeOJ9NDweRWGiQXU/sN+Wh/vLYQPwM=";
- x86_64-darwin = "sha256-aOUmnD+l/Cc5qTiHxFLBjCatszmPdUc4YYZ6Oy5DT3U=";
+ x86_64-linux = "sha256-D/pHOXR7XQoJCGqUep1lBAY4239HH35m+evFd21pcK0=";
+ aarch64-linux = "sha256-aL1axz3ebqrKQ3xK2UgDMQ+o6ZKgIvwy6Phici7WT2c=";
+ x86_64-darwin = "sha256-MFxOAAEnLur0LJJNU0SSlO+bH4f18zOfZNA49fKEQEw=";
};
dontConfigure = true;
diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/terraform-docs/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/terraform-docs/default.nix
index 804659e084..752274a562 100644
--- a/third_party/nixpkgs/pkgs/applications/networking/cluster/terraform-docs/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/terraform-docs/default.nix
@@ -1,16 +1,16 @@
{ lib, buildGoModule, fetchFromGitHub }:
buildGoModule rec {
pname = "terraform-docs";
- version = "0.11.2";
+ version = "0.12.0";
src = fetchFromGitHub {
owner = "terraform-docs";
repo = pname;
rev = "v${version}";
- sha256 = "sha256-x2YTd4ZnimTRkFWbwFp4qz6BymD6ESVxBy6YE+QqQ6k=";
+ sha256 = "sha256-6jUYntnMB/LxyZuRkSaOVcrzJOIoucdaY+5GVHwJL8Y=";
};
- vendorSha256 = "sha256-drfhfY03Ao0fqleBdzbAnPsE4kVrJMcUbec0txaEIP0=";
+ vendorSha256 = "sha256-HO2E8i5A/2Xi7Pq+Mqb/2ogK1to8IvZjRuDXfzGvOXk=";
subPackages = [ "." ];
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 8e15238f10..9f5ced1d51 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
@@ -1086,10 +1086,11 @@
"version": "2.3.0"
},
"yandex": {
- "owner": "terraform-providers",
+ "owner": "yandex-cloud",
"repo": "terraform-provider-yandex",
- "rev": "v0.40.0",
- "sha256": "0dymhdrdm00m9xn4xka3zbvjqnckhl06vz5zm6rqivkmw8m2q0mz",
- "version": "0.40.0"
+ "rev": "v0.54.0",
+ "sha256": "0q9m7520zl7q1liri6x849xjp221wbc9l2w6dj19mmgfwspqv02l",
+ "vendorSha256": "0rzldsb8gyhvnsd26wg9byqngzzj64pi86v2hb4i63rlfmnn77xi",
+ "version": "0.54.0"
}
}
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 a74f5df58f..d3aeee6bc6 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_14 = pluggable (generic {
- version = "0.14.8";
- sha256 = "0kpw8w28pfyr136z5d4pxw7g9ch6rk2lfwh3lwz25mngq1lljmn0";
+ version = "0.14.9";
+ sha256 = "0r9d28mbj7h9prr39gm5kd49l7sm8l1ab9rwrkpyhwgr119zf35b";
vendorSha256 = "1d93aqkjdrvabkvix6h1qaxpjzv7w1wa7xa44czdnjs2lapx4smm";
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 c7097f6868..9634e477e8 100644
--- a/third_party/nixpkgs/pkgs/applications/networking/cluster/terragrunt/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/terragrunt/default.nix
@@ -2,13 +2,13 @@
buildGoModule rec {
pname = "terragrunt";
- version = "0.28.15";
+ version = "0.28.16";
src = fetchFromGitHub {
owner = "gruntwork-io";
repo = pname;
rev = "v${version}";
- sha256 = "sha256-PhTFgYoSaGv54uak8QB7p963OBSgo9s1UM9/XBmYC8g=";
+ sha256 = "sha256-xt04gYxInW9UNxPG4kmMagfAQyQ+T0/u7m39grFCdAc=";
};
vendorSha256 = "sha256-vHKqowc3euQQyvgfaTbIgSXOhPcf2nSoteQK0a574Kc=";
diff --git a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/bitlbee/default.nix b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/bitlbee/default.nix
index 1a83a04a1f..c5a718c3a7 100644
--- a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/bitlbee/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/bitlbee/default.nix
@@ -1,4 +1,4 @@
-{ lib, fetchurl, fetchpatch, stdenv, gnutls, glib, pkg-config, check, libotr, python
+{ lib, fetchurl, fetchpatch, stdenv, gnutls, glib, pkg-config, check, libotr, python2
, enableLibPurple ? false, pidgin ? null
, enablePam ? false, pam ? null
}:
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ pkg-config ] ++ optional doCheck check;
- buildInputs = [ gnutls libotr python ]
+ buildInputs = [ gnutls libotr python2 ]
++ optional enableLibPurple pidgin
++ optional enablePam pam;
diff --git a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/blink/default.nix b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/blink/default.nix
index 3ee835610f..805278b4e4 100644
--- a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/blink/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/blink/default.nix
@@ -1,7 +1,7 @@
-{ lib, fetchdarcs, pythonPackages, libvncserver, zlib
+{ lib, fetchdarcs, python2Packages, libvncserver, zlib
, gnutls, libvpx, makeDesktopItem, mkDerivationWith }:
-mkDerivationWith pythonPackages.buildPythonApplication rec {
+mkDerivationWith python2Packages.buildPythonApplication rec {
pname = "blink";
version = "3.2.0";
@@ -17,7 +17,7 @@ mkDerivationWith pythonPackages.buildPythonApplication rec {
sed -i 's|@out@|'"''${out}"'|g' blink/resources.py
'';
- propagatedBuildInputs = with pythonPackages; [
+ propagatedBuildInputs = with python2Packages; [
pyqt5_with_qtwebkit
cjson
sipsimple
@@ -26,7 +26,7 @@ mkDerivationWith pythonPackages.buildPythonApplication rec {
];
buildInputs = [
- pythonPackages.cython
+ python2Packages.cython
zlib
libvncserver
libvpx
diff --git a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/deltachat-electron/default.nix b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/deltachat-electron/default.nix
index 396dec1cd0..0134fac0e2 100644
--- a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/deltachat-electron/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/deltachat-electron/default.nix
@@ -2,12 +2,12 @@
let
pname = "deltachat-electron";
- version = "1.15.3";
+ version = "1.15.5";
name = "${pname}-${version}";
src = fetchurl {
url = "https://download.delta.chat/desktop/v${version}/DeltaChat-${version}.AppImage";
- sha256 = "sha256-cYb0uruuWpNr1jF5WZ48quBZRIVXiHr99mLPLKMOX5M=";
+ sha256 = "sha256-BTGwgC0zSr1tq/X4v/fS/12E7/mGVYQ0m+Bt6o7VL4o=";
};
appimageContents = appimageTools.extract { inherit name src; };
diff --git a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/discord/default.nix b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/discord/default.nix
index c7ddc49554..fe75418ebe 100644
--- a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/discord/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/discord/default.nix
@@ -7,10 +7,10 @@ in {
pname = "discord";
binaryName = "Discord";
desktopName = "Discord";
- version = "0.0.13";
+ version = "0.0.14";
src = fetchurl {
url = "https://dl.discordapp.net/apps/linux/${version}/discord-${version}.tar.gz";
- sha256 = "0d5z6cbj9dg3hjw84pyg75f8dwdvi2mqxb9ic8dfqzk064ssiv7y";
+ sha256 = "1rq490fdl5pinhxk8lkfcfmfq7apj79jzf3m14yql1rc9gpilrf2";
};
};
ptb = callPackage ./base.nix rec {
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 19c499b319..72a5b86c62 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.23",
+ "version": "1.7.24",
"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 30dffe0c16..dcb22815e9 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.23";
+ version = "1.7.24";
src = fetchFromGitHub {
owner = "vector-im";
repo = "element-desktop";
rev = "v${version}";
- sha256 = "0vvjbh81h6sg6dbm9d6ffav0dim9sadvs67jcm702677qgigkc53";
+ sha256 = "sha256-16sqiOwJvKTs6MPmdkuiPhnr1G7ErWCT5ctp5xqZRlk=";
};
in mkYarnPackage rec {
name = "element-desktop-${version}";
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 be3c075db7..1b6d83bd35 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.23";
+ version = "1.7.24";
src = fetchurl {
url = "https://github.com/vector-im/element-web/releases/download/v${version}/element-v${version}.tar.gz";
- sha256 = "10n899gc3qcjy2cskk0whwz60pnvh500x1b57kn22l9bhkg9xkvp";
+ sha256 = "sha256-u6mcO+MMjrr2YujVVcsaA7qsruirmHJz3o8nAPOecSU=";
};
installPhase = ''
diff --git a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/pidgin/default.nix b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/pidgin/default.nix
index 65b9c245a3..edbc28f793 100644
--- a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/pidgin/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/pidgin/default.nix
@@ -29,11 +29,13 @@ let unwrapped = stdenv.mkDerivation rec {
NIX_CFLAGS_COMPILE = "-I${gst_all_1.gst-plugins-base.dev}/include/gstreamer-1.0";
- buildInputs = [
+ buildInputs = let
+ python-with-dbus = python.withPackages (pp: with pp; [ dbus-python ]);
+ in [
aspell startupnotification
gst_all_1.gstreamer gst_all_1.gst-plugins-base gst_all_1.gst-plugins-good
libxml2 nss nspr
- libXScrnSaver ncurses python
+ libXScrnSaver ncurses python-with-dbus
avahi dbus dbus-glib intltool libidn
libICE libXext libSM cyrus_sasl
]
@@ -72,6 +74,15 @@ let unwrapped = stdenv.mkDerivation rec {
--prefix GST_PLUGIN_SYSTEM_PATH_1_0 : "$GST_PLUGIN_SYSTEM_PATH_1_0"
'';
+ doInstallCheck = stdenv.hostPlatform == stdenv.buildPlatform;
+ # In particular, this detects missing python imports in some of the tools.
+ postInstallCheck = ''
+ for f in "''${!outputBin}"/bin/{purple-remote,pidgin}; do
+ echo "Testing: $f --help"
+ "$f" --help
+ done
+ '';
+
meta = with lib; {
description = "Multi-protocol instant messaging client";
homepage = "http://pidgin.im";
diff --git a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/teamspeak/server.nix b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/teamspeak/server.nix
index 3dfbb69e83..e266265291 100644
--- a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/teamspeak/server.nix
+++ b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/teamspeak/server.nix
@@ -4,13 +4,13 @@ let
arch = if stdenv.is64bit then "amd64" else "x86";
in stdenv.mkDerivation rec {
pname = "teamspeak-server";
- version = "3.13.2";
+ version = "3.13.3";
src = fetchurl {
url = "https://files.teamspeak-services.com/releases/server/${version}/teamspeak3-server_linux_${arch}-${version}.tar.bz2";
sha256 = if stdenv.is64bit
- then "1l9i9667wppwxbbnf6kxamnqlbxzkz9ync4rsypfla124b6cidpz"
- else "0qhd05abiycsgc16r1p6y8bfdrl6zji21xaqwdizpr0jb01z335g";
+ then "sha256-+b9S0ekQmXF5KwvVcmHIDpp0iZRO2W1ls8eYhDzjUUw="
+ else "sha256-Qu6xPzbUdqO93j353cfQILlFYqmwFSnFWG9TjniX0+c=";
};
buildInputs = [ stdenv.cc.cc postgresql.lib ];
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 566e62ae7f..4d6e22bd89 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,8 +1,8 @@
-{ mkDerivation, lib, fetchurl, callPackage
+{ mkDerivation, lib, fetchurl, fetchpatch, callPackage
, pkg-config, 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
+, tl-expected, hunspell, glibmm
# Transitive dependencies:
, pcre, xorg, util-linux, libselinux, libsepol, epoxy
, at-spi2-core, libXtst, libthai, libdatrie
@@ -20,15 +20,19 @@ with lib;
let
tg_owt = callPackage ./tg_owt.nix {};
+ tgcalls-gcc10-fix = fetchpatch { # "Fix build on GCC 10, second attempt."
+ url = "https://github.com/TelegramMessenger/tgcalls/commit/eded7cc540123eaf26361958b9a61c65cb2f7cfc.patch";
+ sha256 = "19n1hvn44pp01zc90g93vq2bcr2gdnscaj5il9f82klgh4llvjli";
+ };
in mkDerivation rec {
pname = "telegram-desktop";
- version = "2.6.1";
+ version = "2.7.1";
# Telegram-Desktop with submodules
src = fetchurl {
url = "https://github.com/telegramdesktop/tdesktop/releases/download/v${version}/tdesktop-${version}-full.tar.gz";
- sha256 = "0wwb18wnh9sbfc6h7m8lj8qmc2n2p0zmp2977ddif6k2gi6qr1y7";
+ sha256 = "01fxzcfz3xankmdar55ja55pb9hkvlf1plgpgjpsda9xwqgbxgs1";
};
postPatch = ''
@@ -36,6 +40,7 @@ in mkDerivation rec {
--replace '"libenchant-2.so.2"' '"${enchant2}/lib/libenchant-2.so.2"'
substituteInPlace Telegram/CMakeLists.txt \
--replace '"''${TDESKTOP_LAUNCHER_BASENAME}.appdata.xml"' '"''${TDESKTOP_LAUNCHER_BASENAME}.metainfo.xml"'
+ patch -d Telegram/ThirdParty/tgcalls/ -p1 < "${tgcalls-gcc10-fix}"
'';
# We want to run wrapProgram manually (with additional parameters)
@@ -47,7 +52,7 @@ in mkDerivation rec {
buildInputs = [
qtbase qtimageformats gtk3 libsForQt5.kwayland libsForQt5.libdbusmenu enchant2 lz4 xxHash
dee ffmpeg openalSoft minizip libopus alsaLib libpulseaudio range-v3
- tl-expected hunspell
+ tl-expected hunspell glibmm
tg_owt
# Transitive dependencies:
pcre xorg.libpthreadstubs xorg.libXdmcp util-linux libselinux libsepol epoxy
diff --git a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/telegram/tdesktop/tg_owt.nix b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/telegram/tdesktop/tg_owt.nix
index 7efac01c55..6bd72134e0 100644
--- a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/telegram/tdesktop/tg_owt.nix
+++ b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/telegram/tdesktop/tg_owt.nix
@@ -4,8 +4,8 @@
}:
let
- rev = "a19877363082da634a3c851a4698376504d2eaee";
- sha256 = "03m6fkc3m2wbh821mr3ybsmd7sjllky44mizny96k4b249dkvzx7";
+ rev = "2d804d2c9c5d05324c8ab22f2e6ff8306521b3c3";
+ sha256 = "0kz0i381iwsgcc3yzsq7njx3gkqja4bb9fsgc24vhg0md540qhyn";
in stdenv.mkDerivation {
pname = "tg_owt";
diff --git a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/whatsapp-for-linux/default.nix b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/whatsapp-for-linux/default.nix
new file mode 100644
index 0000000000..7c0f80d223
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/whatsapp-for-linux/default.nix
@@ -0,0 +1,38 @@
+{ fetchFromGitHub, lib, stdenv, gnome3, cmake, pkg-config,
+ libappindicator-gtk3, gst_all_1, pcre }:
+
+stdenv.mkDerivation rec {
+ pname = "whatsapp-for-linux";
+ version = "1.1.5";
+
+ src = fetchFromGitHub {
+ owner = "eneshecan";
+ repo = pname;
+ rev = "v${version}";
+ sha256 = "1gzahls4givd2kbjdwx6yb3jv7a3r1krw40qihiz7hkamkrpaiaz";
+ };
+
+ nativeBuildInputs = [
+ cmake
+ pkg-config
+ ];
+
+ buildInputs = [
+ gnome3.gtkmm
+ gnome3.webkitgtk
+ libappindicator-gtk3
+ gst_all_1.gst-plugins-base
+ gst_all_1.gst-plugins-good
+ gst_all_1.gst-plugins-bad
+ gst_all_1.gst-libav
+ pcre
+ ];
+
+ meta = with lib; {
+ homepage = "https://github.com/eneshecan/whatsapp-for-linux";
+ description = "Whatsapp desktop messaging app";
+ license = licenses.gpl3Only;
+ maintainers = with maintainers; [ bartuka ];
+ platforms = [ "x86_64-linux" ];
+ };
+}
diff --git a/third_party/nixpkgs/pkgs/applications/networking/irc/catgirl/default.nix b/third_party/nixpkgs/pkgs/applications/networking/irc/catgirl/default.nix
new file mode 100644
index 0000000000..871dcc84c1
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/applications/networking/irc/catgirl/default.nix
@@ -0,0 +1,23 @@
+{ ctags, fetchurl, lib, libressl, man, ncurses, pkg-config, stdenv }:
+
+stdenv.mkDerivation rec {
+ pname = "catgirl";
+ version = "1.6";
+
+ src = fetchurl {
+ url = "https://git.causal.agency/catgirl/snapshot/${pname}-${version}.tar.gz";
+ sha256 = "0shg02zidqqmvywqqsaazlgg9rd5lhhrvjx6n0lzmdfaawxywciv";
+ };
+
+ nativeBuildInputs = [ ctags pkg-config ];
+ buildInputs = [ libressl man ncurses ];
+ strictDeps = true;
+
+ meta = with lib; {
+ homepage = "https://git.causal.agency/catgirl/about/";
+ license = licenses.gpl3Plus;
+ description = "A TLS-only terminal IRC client";
+ platforms = platforms.unix;
+ maintainers = with maintainers; [ xfnw ];
+ };
+}
diff --git a/third_party/nixpkgs/pkgs/applications/networking/irc/weechat/scripts/weechat-notify-send/default.nix b/third_party/nixpkgs/pkgs/applications/networking/irc/weechat/scripts/weechat-notify-send/default.nix
index b55266e5f3..78f9fc082e 100644
--- a/third_party/nixpkgs/pkgs/applications/networking/irc/weechat/scripts/weechat-notify-send/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/networking/irc/weechat/scripts/weechat-notify-send/default.nix
@@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
meta = with lib; {
description = "A WeeChat script that sends highlight and message notifications through notify-send";
- homepage = "https://github.com/s3rvac/weechat-notify-srnd";
+ homepage = "https://github.com/s3rvac/weechat-notify-send";
license = licenses.mit;
maintainers = with maintainers; [ tobim ];
};
diff --git a/third_party/nixpkgs/pkgs/applications/networking/mailreaders/evolution/evolution/default.nix b/third_party/nixpkgs/pkgs/applications/networking/mailreaders/evolution/evolution/default.nix
index f6bea3c835..e17507366f 100644
--- a/third_party/nixpkgs/pkgs/applications/networking/mailreaders/evolution/evolution/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/networking/mailreaders/evolution/evolution/default.nix
@@ -10,6 +10,7 @@
, gtk3
, glib
, libnotify
+, libpst
, gspell
, evolution-data-server
, libgdata
@@ -80,6 +81,7 @@ stdenv.mkDerivation rec {
libgweather
libical
libnotify
+ libpst
librsvg
libsecret
nspr
@@ -99,7 +101,6 @@ stdenv.mkDerivation rec {
cmakeFlags = [
"-DENABLE_AUTOAR=OFF"
"-DENABLE_LIBCRYPTUI=OFF"
- "-DENABLE_PST_IMPORT=OFF"
"-DENABLE_YTNEF=OFF"
"-DWITH_SPAMASSASSIN=${spamassassin}/bin/spamassassin"
"-DWITH_SA_LEARN=${spamassassin}/bin/sa-learn"
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 18110dc7a3..e7b5496e91 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.8.1";
+ version = "78.9.0";
sources = [
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.8.1/linux-x86_64/af/thunderbird-78.8.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.9.0/linux-x86_64/af/thunderbird-78.9.0.tar.bz2";
locale = "af";
arch = "linux-x86_64";
- sha256 = "086a23b05a2baf8e8a1b44891017c6fef8c45d4e4802b519ceeda2bf62496649";
+ sha256 = "58bc04e46def73b3530323e56d143db324a5a80f426b37ff396e2e43cf8b0042";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.8.1/linux-x86_64/ar/thunderbird-78.8.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.9.0/linux-x86_64/ar/thunderbird-78.9.0.tar.bz2";
locale = "ar";
arch = "linux-x86_64";
- sha256 = "b5b643119f0d0336d61972d91f20764590d7453cb391165283e00dc980d3bdef";
+ sha256 = "9520899691eb7e4e7dad95ce643da5cb966c1058b3cc952b55bd66d7a09473ef";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.8.1/linux-x86_64/ast/thunderbird-78.8.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.9.0/linux-x86_64/ast/thunderbird-78.9.0.tar.bz2";
locale = "ast";
arch = "linux-x86_64";
- sha256 = "2e219961dc2b33f7680be0a6fbd03c0032fdbb557a3dedaf32773efb6cf7a061";
+ sha256 = "769e7cd3699577a1f69e62492c8058eca635ffaf6acab6ca3a4112301aab751f";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.8.1/linux-x86_64/be/thunderbird-78.8.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.9.0/linux-x86_64/be/thunderbird-78.9.0.tar.bz2";
locale = "be";
arch = "linux-x86_64";
- sha256 = "ce8a7e4f025b6064ff4eef01c634b2b7f52ec0ffa5eb7094f0483c7d6f31b939";
+ sha256 = "c1b35990af2731b52da57b4b6b0e4a7733ea2e8d499e95b3b086dde3bdccb657";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.8.1/linux-x86_64/bg/thunderbird-78.8.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.9.0/linux-x86_64/bg/thunderbird-78.9.0.tar.bz2";
locale = "bg";
arch = "linux-x86_64";
- sha256 = "a7dff0d43d11473d47df6672da8515b5d1393eea581193fdb8b334cfd8c780e8";
+ sha256 = "708709a3acb4689de7870d21c258ccbc03a1fdb92a43164841571e6643bf2988";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.8.1/linux-x86_64/br/thunderbird-78.8.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.9.0/linux-x86_64/br/thunderbird-78.9.0.tar.bz2";
locale = "br";
arch = "linux-x86_64";
- sha256 = "70b0a987b1677fe1b78b4105dc15aea80448e71cde8a2a31f32429111b07c92b";
+ sha256 = "e84f1dea6f550a1827399d0e7f658f376c816d3f7abe962ec58115d36c28c1c5";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.8.1/linux-x86_64/ca/thunderbird-78.8.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.9.0/linux-x86_64/ca/thunderbird-78.9.0.tar.bz2";
locale = "ca";
arch = "linux-x86_64";
- sha256 = "0e311309e7a9b03afd92fb3f38582ad318c10d3342238db42d30504123bca080";
+ sha256 = "8191514f74876406cf6f332a0063032206d1b6f29414941dee3082ce1bc6e711";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.8.1/linux-x86_64/cak/thunderbird-78.8.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.9.0/linux-x86_64/cak/thunderbird-78.9.0.tar.bz2";
locale = "cak";
arch = "linux-x86_64";
- sha256 = "86506acf4c23672469c6bc533019e0a2b4872efcad07468dd3c5a2f1b6ac7dd1";
+ sha256 = "9626ab3117cb4567ba65b24c5800f39fe7dc9c372c60f88ba0906eb72d63ffb0";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.8.1/linux-x86_64/cs/thunderbird-78.8.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.9.0/linux-x86_64/cs/thunderbird-78.9.0.tar.bz2";
locale = "cs";
arch = "linux-x86_64";
- sha256 = "6a63442f96a88c9b80b436eb280a5e67553751c946802bfe81db017eb1a11874";
+ sha256 = "294f60b4efa04fcc9bdea8c4107ac572613d63c742ae9492eb63f5eadcef1448";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.8.1/linux-x86_64/cy/thunderbird-78.8.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.9.0/linux-x86_64/cy/thunderbird-78.9.0.tar.bz2";
locale = "cy";
arch = "linux-x86_64";
- sha256 = "7b70af973f706976b87cac4e48623a3c3dad20538d2bc0bd4cdfd57bf1937f54";
+ sha256 = "865d631746754969d7dd59b096306aaacdb189b967e295676a3a7253a5af8ed3";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.8.1/linux-x86_64/da/thunderbird-78.8.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.9.0/linux-x86_64/da/thunderbird-78.9.0.tar.bz2";
locale = "da";
arch = "linux-x86_64";
- sha256 = "2b3eb2c351b4df91d2520ae4b93687eba47a6f7b6182086345cad0629ffc9538";
+ sha256 = "cb8b05cf1938326a4246f670bc324d83179f3ce1f3d4f3d8de57599da031ec9b";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.8.1/linux-x86_64/de/thunderbird-78.8.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.9.0/linux-x86_64/de/thunderbird-78.9.0.tar.bz2";
locale = "de";
arch = "linux-x86_64";
- sha256 = "ecd00d0713704e323acd7a1a0da88bfc3c92a85a99611f6af1b5425387428af0";
+ sha256 = "9dfc5b4490c8ba926ce30605e3575cf3b471fae1f1808fb5054667c2751956c2";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.8.1/linux-x86_64/dsb/thunderbird-78.8.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.9.0/linux-x86_64/dsb/thunderbird-78.9.0.tar.bz2";
locale = "dsb";
arch = "linux-x86_64";
- sha256 = "8808ff0c67014db313413aea3e8dbe7c0e0501c878572f2db1765d4b8c6ebe3b";
+ sha256 = "1752031e919fc1604c1d70ff5a9036d8752a0de78c0d0539860c45390b09e13f";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.8.1/linux-x86_64/el/thunderbird-78.8.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.9.0/linux-x86_64/el/thunderbird-78.9.0.tar.bz2";
locale = "el";
arch = "linux-x86_64";
- sha256 = "f83554e57ccf5a3c56b6111a928e2e983c07bac131ba8a74e9449250b644fafa";
+ sha256 = "bc2c7b093dd00c352874c7ae6e3d88e455fe9b357caa0e358d51dde120398f41";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.8.1/linux-x86_64/en-CA/thunderbird-78.8.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.9.0/linux-x86_64/en-CA/thunderbird-78.9.0.tar.bz2";
locale = "en-CA";
arch = "linux-x86_64";
- sha256 = "138384402cfedf4d725b5e74f1c3150d078fd422d5440246e841b9ee5c458128";
+ sha256 = "5605286eb97815d5acfadc0a93888a1e8d08e9b8bb5e7b28328c9650f6a9d065";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.8.1/linux-x86_64/en-GB/thunderbird-78.8.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.9.0/linux-x86_64/en-GB/thunderbird-78.9.0.tar.bz2";
locale = "en-GB";
arch = "linux-x86_64";
- sha256 = "9058897455dad34af97f1f3e1ccd517244de9c2f9a51ff3a8d222d8439b5865c";
+ sha256 = "bc0a4c15cb3d4f1891e91a7bc5cde53065cca95fe5c72c18bd39e0bc618b5d01";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.8.1/linux-x86_64/en-US/thunderbird-78.8.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.9.0/linux-x86_64/en-US/thunderbird-78.9.0.tar.bz2";
locale = "en-US";
arch = "linux-x86_64";
- sha256 = "7ab2fdf949a7cfd7abbba7bb2307bad08fdebed24a0446514be89c308af587b7";
+ sha256 = "65e1539602d206cfb78cb7bdf864d251670242d775f62aad25a1a52dcf1e9e55";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.8.1/linux-x86_64/es-AR/thunderbird-78.8.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.9.0/linux-x86_64/es-AR/thunderbird-78.9.0.tar.bz2";
locale = "es-AR";
arch = "linux-x86_64";
- sha256 = "71396deb4b1148a20af83bf7bf62dca00ec43b8cb64b5902f8bf52d861dd861b";
+ sha256 = "e246d1f0fda4091888dcac7c5e8d5367688d86e6f65237e942baee0c2c82136b";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.8.1/linux-x86_64/es-ES/thunderbird-78.8.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.9.0/linux-x86_64/es-ES/thunderbird-78.9.0.tar.bz2";
locale = "es-ES";
arch = "linux-x86_64";
- sha256 = "6dd479e524e4bfa7ab1488d808bfde041c34d2a13de1003f1c2a2ee0db0fc772";
+ sha256 = "a24902cdd4eb9f70b435f52c9244769bc674fc16194a908976c28c8de3d94674";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.8.1/linux-x86_64/et/thunderbird-78.8.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.9.0/linux-x86_64/et/thunderbird-78.9.0.tar.bz2";
locale = "et";
arch = "linux-x86_64";
- sha256 = "259ee045328d21c877ca67223f91e438496e6675cb97d825482a8213b3bbb161";
+ sha256 = "891fb76d3f9044ea44230d72c6b8bd4db63c63c71dc83506e91b31329e1b0c11";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.8.1/linux-x86_64/eu/thunderbird-78.8.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.9.0/linux-x86_64/eu/thunderbird-78.9.0.tar.bz2";
locale = "eu";
arch = "linux-x86_64";
- sha256 = "18a4fadc4a8d167489924042510c06d58c599997e28f652eacc3e4c85841a932";
+ sha256 = "cfe8c0e314dffd57e653204aa5aebe790147f3a1060cc1f95da0045d1c188cd6";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.8.1/linux-x86_64/fa/thunderbird-78.8.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.9.0/linux-x86_64/fa/thunderbird-78.9.0.tar.bz2";
locale = "fa";
arch = "linux-x86_64";
- sha256 = "0b397cd272cd386dc4d0cca7999198098a8cf4dc9088b93b05a7de75de9a9397";
+ sha256 = "66aba0dbc241d954b18da9c94c6c8d7b33dbc8721560a23def882cde249d17ef";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.8.1/linux-x86_64/fi/thunderbird-78.8.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.9.0/linux-x86_64/fi/thunderbird-78.9.0.tar.bz2";
locale = "fi";
arch = "linux-x86_64";
- sha256 = "9f1b5bed03fcf37f0e3a5155c36a691766ab88cb9604821b4f07ee9f25cfbc9c";
+ sha256 = "e05b5be90b40dd61a3686d3fb011745431f915a0d74e08a157668cfa1633d5f2";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.8.1/linux-x86_64/fr/thunderbird-78.8.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.9.0/linux-x86_64/fr/thunderbird-78.9.0.tar.bz2";
locale = "fr";
arch = "linux-x86_64";
- sha256 = "ff806999956ffe547bd987870a804942462276a10f1334df00797e56482dc4a5";
+ sha256 = "f4c80650f755a65c1371aa9bc35da6e1fc54f6c44dd6e6bed1f3ce8ce883656c";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.8.1/linux-x86_64/fy-NL/thunderbird-78.8.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.9.0/linux-x86_64/fy-NL/thunderbird-78.9.0.tar.bz2";
locale = "fy-NL";
arch = "linux-x86_64";
- sha256 = "50f7343fa2fa61fa46e7a05f86479743271bde3021efa27ba948923467fb0170";
+ sha256 = "4ada1d224c11081bc7cf7fec51e6cbef695650cdb9b860320da9a070d01bcaed";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.8.1/linux-x86_64/ga-IE/thunderbird-78.8.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.9.0/linux-x86_64/ga-IE/thunderbird-78.9.0.tar.bz2";
locale = "ga-IE";
arch = "linux-x86_64";
- sha256 = "e2912457c0e390f84f375fde8946c1eca15b036fb4016ca7cd608a9c61eb5060";
+ sha256 = "e2b6437b4b10a636d585dd591c933df370a5b70bc0a447564ab8dbb4df5c22b9";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.8.1/linux-x86_64/gd/thunderbird-78.8.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.9.0/linux-x86_64/gd/thunderbird-78.9.0.tar.bz2";
locale = "gd";
arch = "linux-x86_64";
- sha256 = "c5b2f349c98fa51f5b6dc57cc9d16f408d9659fa979c4ee86b5c51f2c163f8a5";
+ sha256 = "034b5dd31ac4df1ea8f19b52739fa632a53d063a6ca07e4d36194c55452aaef5";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.8.1/linux-x86_64/gl/thunderbird-78.8.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.9.0/linux-x86_64/gl/thunderbird-78.9.0.tar.bz2";
locale = "gl";
arch = "linux-x86_64";
- sha256 = "0580beef930019c5312ba4ed38e6570f4d4b85857d4c002461b07f705e261b3e";
+ sha256 = "1afb41188de30c672d3a15e7b8e8b0690ac8358069824edf7215f99f73333d32";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.8.1/linux-x86_64/he/thunderbird-78.8.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.9.0/linux-x86_64/he/thunderbird-78.9.0.tar.bz2";
locale = "he";
arch = "linux-x86_64";
- sha256 = "d7ddfedb469437e7df9b0ef967e578047ca70b5d45dc5175ca08f5d1b920d5c1";
+ sha256 = "492f33bbc7f6d6e53aaaa3587d22156afb32d0753609818eeefe7ea53bea788b";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.8.1/linux-x86_64/hr/thunderbird-78.8.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.9.0/linux-x86_64/hr/thunderbird-78.9.0.tar.bz2";
locale = "hr";
arch = "linux-x86_64";
- sha256 = "5c9c1535488e987113f356a94ffea5e5005f1eea92fb9eaa530793006d2df8cd";
+ sha256 = "a61743f3661eb8ce93cc58dc80ce5950534dd7c89e067a3460daa4502761e3b2";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.8.1/linux-x86_64/hsb/thunderbird-78.8.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.9.0/linux-x86_64/hsb/thunderbird-78.9.0.tar.bz2";
locale = "hsb";
arch = "linux-x86_64";
- sha256 = "3dfc77687f2ad8f9bd9a452d519172953a44b3574057f871e466d3dfc2e78cc2";
+ sha256 = "cb1d4f8da3071ecd4ce4f9ae43d1e4d7dcd8edbc6dbf4917bcd1730cc5a0477d";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.8.1/linux-x86_64/hu/thunderbird-78.8.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.9.0/linux-x86_64/hu/thunderbird-78.9.0.tar.bz2";
locale = "hu";
arch = "linux-x86_64";
- sha256 = "f043129670231c41cdeb8d742e50873306e34860fb702876105c88a80aef0629";
+ sha256 = "a4ae0452d90d3c5c7778732811d97243b9b4767208239c8a24d4b4d368630d22";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.8.1/linux-x86_64/hy-AM/thunderbird-78.8.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.9.0/linux-x86_64/hy-AM/thunderbird-78.9.0.tar.bz2";
locale = "hy-AM";
arch = "linux-x86_64";
- sha256 = "7c4e3df3c4115e3de684970d68c5a3aad8a5ac1151ce802d4adbb381f5d76529";
+ sha256 = "cab2129d4c4e99592ce6f22d676a03ff1cc5d5bf579a2426d0079e0f86215ade";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.8.1/linux-x86_64/id/thunderbird-78.8.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.9.0/linux-x86_64/id/thunderbird-78.9.0.tar.bz2";
locale = "id";
arch = "linux-x86_64";
- sha256 = "95776b92e84b5f1183129b3a7576542e807f701afbafd6e811522f709b30e933";
+ sha256 = "a1df4c7e0c359cab8b10692bfee5161d3bd44696ee06774985642604304f9b93";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.8.1/linux-x86_64/is/thunderbird-78.8.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.9.0/linux-x86_64/is/thunderbird-78.9.0.tar.bz2";
locale = "is";
arch = "linux-x86_64";
- sha256 = "ac74b9ecc8312aa833ba9db2ff7d017c0891105da5e64580b9af8797fb77ca84";
+ sha256 = "bf6ec8c88f65d565f7dcecb1f3177a5a1e476da62d8aec82d3419e3ed1794798";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.8.1/linux-x86_64/it/thunderbird-78.8.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.9.0/linux-x86_64/it/thunderbird-78.9.0.tar.bz2";
locale = "it";
arch = "linux-x86_64";
- sha256 = "d3409725adfb192951a14569bf1d3c779162fbb1f33c7be944345e3df191ebe3";
+ sha256 = "e028a6fa97dd9d37945137602d45230108fa30d63edea8df8531089724646e19";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.8.1/linux-x86_64/ja/thunderbird-78.8.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.9.0/linux-x86_64/ja/thunderbird-78.9.0.tar.bz2";
locale = "ja";
arch = "linux-x86_64";
- sha256 = "9c7bbe228994d06397cd4490b0e6c667b8ab14b94398ef9b0a0bc135d3c6c392";
+ sha256 = "6435637e0582123c1b941b1c6209aa1bfdec471d3ce76a861c82e876b7637fee";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.8.1/linux-x86_64/ka/thunderbird-78.8.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.9.0/linux-x86_64/ka/thunderbird-78.9.0.tar.bz2";
locale = "ka";
arch = "linux-x86_64";
- sha256 = "39681dd197986b4535b6f08904aa140f5517b3663dd16f055d514be509bea217";
+ sha256 = "8d00d918c42450ac7a451a0a5a7407ecb334b51bd20c3f33871a29c82f338175";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.8.1/linux-x86_64/kab/thunderbird-78.8.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.9.0/linux-x86_64/kab/thunderbird-78.9.0.tar.bz2";
locale = "kab";
arch = "linux-x86_64";
- sha256 = "30f473c45c5d2d60271469ee60174ce10989edea02bfe61503dca4be04f783c6";
+ sha256 = "59af5f436ccf0d0914f800ff6cb31fb341d3d905d3d450ed43a09d8810e50bae";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.8.1/linux-x86_64/kk/thunderbird-78.8.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.9.0/linux-x86_64/kk/thunderbird-78.9.0.tar.bz2";
locale = "kk";
arch = "linux-x86_64";
- sha256 = "b5dc4df14dd5de27a32332af867c233089081d43514d36a6955fb34dc46b0955";
+ sha256 = "70588dd395158e87bdf651a9ed2b1d92cc5792ed6c85160c2b1c2109d52a3ca2";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.8.1/linux-x86_64/ko/thunderbird-78.8.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.9.0/linux-x86_64/ko/thunderbird-78.9.0.tar.bz2";
locale = "ko";
arch = "linux-x86_64";
- sha256 = "b151223ca74a4624912941ca5a33ea620ffadc4840a6b58b0459abc4b9fbcccf";
+ sha256 = "7a3473a4bd51f6931326c30c387546d4b900fd70a837e8d45380afd4597c10e2";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.8.1/linux-x86_64/lt/thunderbird-78.8.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.9.0/linux-x86_64/lt/thunderbird-78.9.0.tar.bz2";
locale = "lt";
arch = "linux-x86_64";
- sha256 = "9405ddf255265811d274bb1c5d05fa5066976d36f1a7e5687a9c4930488ec269";
+ sha256 = "1e36db5d910184872af4e7623c59c79f8e522955c5dd5cba4a689a5bc2d857b0";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.8.1/linux-x86_64/ms/thunderbird-78.8.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.9.0/linux-x86_64/ms/thunderbird-78.9.0.tar.bz2";
locale = "ms";
arch = "linux-x86_64";
- sha256 = "63daf0a4f33b6e04ca92b1b6df187c0fa52fad97863e66356fe6fc592610be0e";
+ sha256 = "058f825e44c24e837081bb05241c1ff47b390132dbd3cdb5b5d4ef51056bb2ab";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.8.1/linux-x86_64/nb-NO/thunderbird-78.8.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.9.0/linux-x86_64/nb-NO/thunderbird-78.9.0.tar.bz2";
locale = "nb-NO";
arch = "linux-x86_64";
- sha256 = "94e855d4d4c7724cae5060f595ddc5c6afbbcce95a47544c4e13131fc5e6fed5";
+ sha256 = "7f6335ff85c29aa634b7909e4b7a2da007f333648a98ad9f3bd8833d00f2f0da";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.8.1/linux-x86_64/nl/thunderbird-78.8.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.9.0/linux-x86_64/nl/thunderbird-78.9.0.tar.bz2";
locale = "nl";
arch = "linux-x86_64";
- sha256 = "d3fef411d76b25d4791814bc2c867df1ff4d6388514026a243715c0b01eb6cc8";
+ sha256 = "0056c1250401f89ab8d9423f23d3148bcf34801b34247d4bc44b89e8edd0552f";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.8.1/linux-x86_64/nn-NO/thunderbird-78.8.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.9.0/linux-x86_64/nn-NO/thunderbird-78.9.0.tar.bz2";
locale = "nn-NO";
arch = "linux-x86_64";
- sha256 = "b144ebaa2ec9a7596c671de0b00a2040b64681cbc92e6ede6f93b8dc85039f73";
+ sha256 = "f63e4305ba814a46edc4316af6ad02acd479306f2f1c02c1b04065ea20baf59f";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.8.1/linux-x86_64/pa-IN/thunderbird-78.8.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.9.0/linux-x86_64/pa-IN/thunderbird-78.9.0.tar.bz2";
locale = "pa-IN";
arch = "linux-x86_64";
- sha256 = "5231448246edb5051015c7f8f6f9c8b2d4373746d5a6dde94a9ebf4c672c60e8";
+ sha256 = "654902d560df0648cd2e9b7b1271d3606071865dd1cc4490741a5777be2c72c3";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.8.1/linux-x86_64/pl/thunderbird-78.8.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.9.0/linux-x86_64/pl/thunderbird-78.9.0.tar.bz2";
locale = "pl";
arch = "linux-x86_64";
- sha256 = "8250c42c98c9f5c8c2b071b0eb31b7b27e019513585bf0154bd9ea5c901a2aa9";
+ sha256 = "62c4352b987bef61f69bb0300c9cc37b95ca5e6fde57a06646b14bef6e58dd78";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.8.1/linux-x86_64/pt-BR/thunderbird-78.8.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.9.0/linux-x86_64/pt-BR/thunderbird-78.9.0.tar.bz2";
locale = "pt-BR";
arch = "linux-x86_64";
- sha256 = "625c7d2d6620c045b153866ee310d8d04fd9998cfc51f5f458de19d7fd7452b7";
+ sha256 = "139606374df552562100c01e8a330fc1f4f9e6dcbc6a39396137d2f069ad0fcd";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.8.1/linux-x86_64/pt-PT/thunderbird-78.8.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.9.0/linux-x86_64/pt-PT/thunderbird-78.9.0.tar.bz2";
locale = "pt-PT";
arch = "linux-x86_64";
- sha256 = "2ead9fe00dd88dbf7245275f2cee002cf3205dd3256303f582635ca33b3aa60e";
+ sha256 = "eb6526b6ee0f768949489ca587c321ed8aabd258296c58e596b7a5413b458ed7";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.8.1/linux-x86_64/rm/thunderbird-78.8.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.9.0/linux-x86_64/rm/thunderbird-78.9.0.tar.bz2";
locale = "rm";
arch = "linux-x86_64";
- sha256 = "b4b40e417a4bb52aed6bbb7f042d5e164ea2e9f4acf8cde680d4f19f37862e1f";
+ sha256 = "36a22f1c8eb1a5c7fb0e9323a3c3eb03f8a63b2b6c62430780bf4508a7236c41";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.8.1/linux-x86_64/ro/thunderbird-78.8.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.9.0/linux-x86_64/ro/thunderbird-78.9.0.tar.bz2";
locale = "ro";
arch = "linux-x86_64";
- sha256 = "cd0e8aa8e6b02cd7a432e2e943e1a61a65f152bdb9902a1f948e514c46cb8304";
+ sha256 = "92ae47ebf2ab176d46e04172206241aeae8a6eebf72b5f32d021782aa1675be8";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.8.1/linux-x86_64/ru/thunderbird-78.8.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.9.0/linux-x86_64/ru/thunderbird-78.9.0.tar.bz2";
locale = "ru";
arch = "linux-x86_64";
- sha256 = "00602137ac0d86bbc08ddac08cb2805daed3d8c2b78b2408b34107bbd61c4e32";
+ sha256 = "97680d44fae135e90368adb75ac27b4f23f1186d1435ba265a80027334f320ec";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.8.1/linux-x86_64/si/thunderbird-78.8.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.9.0/linux-x86_64/si/thunderbird-78.9.0.tar.bz2";
locale = "si";
arch = "linux-x86_64";
- sha256 = "f1ad95430fcba364c0741c03fbbdbad602ad521959685ace7f3056fa801188af";
+ sha256 = "6ddf49c8696deb3ab9ac55453b93116c923ad0025c9c8463b56bdc81e6d00bb9";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.8.1/linux-x86_64/sk/thunderbird-78.8.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.9.0/linux-x86_64/sk/thunderbird-78.9.0.tar.bz2";
locale = "sk";
arch = "linux-x86_64";
- sha256 = "30ebe0eaac08884d10f8cffa77d145600154b6969a212873bb189aea91187d54";
+ sha256 = "5e2be4cab9101a67c61eee16c8c84513b196dd19f6d0dfee3559796a8a031138";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.8.1/linux-x86_64/sl/thunderbird-78.8.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.9.0/linux-x86_64/sl/thunderbird-78.9.0.tar.bz2";
locale = "sl";
arch = "linux-x86_64";
- sha256 = "3f38b1934f6fd66efb97b83c83f76f09c649ef09108fe1a92515752b2d79c890";
+ sha256 = "ab9293a2a5caf948bf2e4b4680b9cf7440e7a272f9f028568e260c40d5a031ce";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.8.1/linux-x86_64/sq/thunderbird-78.8.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.9.0/linux-x86_64/sq/thunderbird-78.9.0.tar.bz2";
locale = "sq";
arch = "linux-x86_64";
- sha256 = "79780bad07999285a3ad37d85b82d7037fe4784b3a83f79f6907c73ad1a7ee55";
+ sha256 = "113171842441b9553e6da58c7ce3e3382fb9aa780892b8ee4436ff9b2bf3dc59";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.8.1/linux-x86_64/sr/thunderbird-78.8.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.9.0/linux-x86_64/sr/thunderbird-78.9.0.tar.bz2";
locale = "sr";
arch = "linux-x86_64";
- sha256 = "68430529f488d89730864a267a20c5f86b1ffa0b473bdf153c43e06a95a81c5d";
+ sha256 = "1b46f1597ab5aec2bca98adf9664cafd72ff51db23722108cbd4c0c89a1a8e70";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.8.1/linux-x86_64/sv-SE/thunderbird-78.8.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.9.0/linux-x86_64/sv-SE/thunderbird-78.9.0.tar.bz2";
locale = "sv-SE";
arch = "linux-x86_64";
- sha256 = "3e2a8112b2da35af3402d0974a70c00ca6cde4cbf43f07141ff7b184d373d444";
+ sha256 = "41284557a6ae1b267eb3c2fdcc4a547834e833f55b5c1ad9c8bd9121c9d39dc1";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.8.1/linux-x86_64/th/thunderbird-78.8.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.9.0/linux-x86_64/th/thunderbird-78.9.0.tar.bz2";
locale = "th";
arch = "linux-x86_64";
- sha256 = "9b94b35004bec519e8bc8fa152c677189fc37e78a3bdedc0d77afb81bffb0c58";
+ sha256 = "99a342f303c3a890ee68514841d563fe493e2459a4d6f6769c42f986e122b7ba";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.8.1/linux-x86_64/tr/thunderbird-78.8.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.9.0/linux-x86_64/tr/thunderbird-78.9.0.tar.bz2";
locale = "tr";
arch = "linux-x86_64";
- sha256 = "b1f0281f5a1a2454a38ccc66510b4de44c19f4300a990f994d5c0ac76b002782";
+ sha256 = "f827b3d8fb60540d00d20d4ec50dbd9e28af3798863fa4ccc1a862a08ebdd18d";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.8.1/linux-x86_64/uk/thunderbird-78.8.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.9.0/linux-x86_64/uk/thunderbird-78.9.0.tar.bz2";
locale = "uk";
arch = "linux-x86_64";
- sha256 = "ae53f162d9016a3f2b3e104c86aefb34ed9e96ce14cc3feb1584ce61617c3b49";
+ sha256 = "d8e30faa9f43308c31504437ae2187d5c1ce00c16cd430f31eaacf8dbed71604";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.8.1/linux-x86_64/uz/thunderbird-78.8.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.9.0/linux-x86_64/uz/thunderbird-78.9.0.tar.bz2";
locale = "uz";
arch = "linux-x86_64";
- sha256 = "6d43cbdac67084253eda88d0cd58440229def6d03904b4e1a8c9b9133ed7bb55";
+ sha256 = "00e3e3a43519fa8136d3cde8527f3e9c44732ef6d5aac9cc2e1f28feaf940a50";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.8.1/linux-x86_64/vi/thunderbird-78.8.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.9.0/linux-x86_64/vi/thunderbird-78.9.0.tar.bz2";
locale = "vi";
arch = "linux-x86_64";
- sha256 = "f29e5e685c3b072ece7ef6cd645b2596025848e9b72b00fbb49378b8f25ef3a9";
+ sha256 = "f16b0fca32c85e648be8c8d4c9ddb6d8fde726f1386d0dd29ec050b39d827fe2";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.8.1/linux-x86_64/zh-CN/thunderbird-78.8.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.9.0/linux-x86_64/zh-CN/thunderbird-78.9.0.tar.bz2";
locale = "zh-CN";
arch = "linux-x86_64";
- sha256 = "e4789a8b85555be1fab438e694562bec0b2022a6955ad098b837c48d3954452c";
+ sha256 = "51007e8318fbf673eb63bf20be8daa35ef8e2d6fee9fd9356dbba98d843dc813";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.8.1/linux-x86_64/zh-TW/thunderbird-78.8.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.9.0/linux-x86_64/zh-TW/thunderbird-78.9.0.tar.bz2";
locale = "zh-TW";
arch = "linux-x86_64";
- sha256 = "7d4246056adf297ac1bf3c7de20d067453e41350b089841d617e2ac6ecaab0ac";
+ sha256 = "ef7a5507b47725ba7bca853c1f5bf20eb36d31fbbc8c912596a5993f7dca57ac";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.8.1/linux-i686/af/thunderbird-78.8.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.9.0/linux-i686/af/thunderbird-78.9.0.tar.bz2";
locale = "af";
arch = "linux-i686";
- sha256 = "1c09247e43ebfd2cd10995e76ff791b6c78d4545ebcfa37959b154e5307e17a7";
+ sha256 = "435ba6c5a5901fe1daa1b19c36f1071086d21e2f321a52afe1db0c03a0044635";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.8.1/linux-i686/ar/thunderbird-78.8.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.9.0/linux-i686/ar/thunderbird-78.9.0.tar.bz2";
locale = "ar";
arch = "linux-i686";
- sha256 = "bd7a46b42a8200f0515be9798bda145f398e2db32357ae8c46c1dc89cc823dd5";
+ sha256 = "4ac307dbe93e69e6dbb629756363900256ec735c1927cad74acb0c5f8e255b92";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.8.1/linux-i686/ast/thunderbird-78.8.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.9.0/linux-i686/ast/thunderbird-78.9.0.tar.bz2";
locale = "ast";
arch = "linux-i686";
- sha256 = "418fc4d19a9d4ce982e534c7be95b79dd2c15311040e2c50e5644f3a5e3cf245";
+ sha256 = "3d9a01438e82350e5a60ee7944226d9a0f46384673ddae01f8f8fe445df40312";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.8.1/linux-i686/be/thunderbird-78.8.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.9.0/linux-i686/be/thunderbird-78.9.0.tar.bz2";
locale = "be";
arch = "linux-i686";
- sha256 = "27b9271c984eb739cc4782050bf5f896da01ced7803dae8e81181ac4a8c0df86";
+ sha256 = "9a5b22648d8c7c05d5f0be0d1f450baadccf791353a23bc1b6889e8911d90c5a";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.8.1/linux-i686/bg/thunderbird-78.8.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.9.0/linux-i686/bg/thunderbird-78.9.0.tar.bz2";
locale = "bg";
arch = "linux-i686";
- sha256 = "b63ca81e05c4a16497339374f297ced5033daa275fd48fe9884d4945f216771a";
+ sha256 = "77cf8d4912c2b5b34fa0235ddbb95cd90bcf83d1d528275b23de08dad59116c5";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.8.1/linux-i686/br/thunderbird-78.8.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.9.0/linux-i686/br/thunderbird-78.9.0.tar.bz2";
locale = "br";
arch = "linux-i686";
- sha256 = "f213c17427b907a21a3c4eb2976eccca91423a1400260b22ea59c588a2e1e9d1";
+ sha256 = "9e7bcb749e0d88efd60e6bed2fc77e39deaf8a82db56c304529d44843657842d";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.8.1/linux-i686/ca/thunderbird-78.8.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.9.0/linux-i686/ca/thunderbird-78.9.0.tar.bz2";
locale = "ca";
arch = "linux-i686";
- sha256 = "8bd818f98c17b8e954883c462064994c469fa805aadf74b6e0915824e1ad929a";
+ sha256 = "0206a127cbf5f9b1c4c4711d4d05591d175c9e96c2354790c220e9587c356aba";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.8.1/linux-i686/cak/thunderbird-78.8.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.9.0/linux-i686/cak/thunderbird-78.9.0.tar.bz2";
locale = "cak";
arch = "linux-i686";
- sha256 = "6213c8b217db157f40e008af10780edef5a02ffdc2442240597a00252f4f58ea";
+ sha256 = "e47d892a90c3b9ec29365cc0173066234e21cd989c4b588e43fecb61b10d1f80";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.8.1/linux-i686/cs/thunderbird-78.8.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.9.0/linux-i686/cs/thunderbird-78.9.0.tar.bz2";
locale = "cs";
arch = "linux-i686";
- sha256 = "22491715bd72408d7c15d8fc137ccc496a0ea075217485a8e31abf73ca09bad7";
+ sha256 = "bdcfb9cf6e3207a41634eb54c472117c33b0df981d900c4dd0dbff0463ebe57a";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.8.1/linux-i686/cy/thunderbird-78.8.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.9.0/linux-i686/cy/thunderbird-78.9.0.tar.bz2";
locale = "cy";
arch = "linux-i686";
- sha256 = "3d4f07b0055d92dcbaaafa139959de7071b2b3d74c49452bbb2556b1ed3ae82e";
+ sha256 = "5b0def675213d882ea653ffd7b5aa62f96000d4aaee8e06ad1fd5984ac99c8c7";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.8.1/linux-i686/da/thunderbird-78.8.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.9.0/linux-i686/da/thunderbird-78.9.0.tar.bz2";
locale = "da";
arch = "linux-i686";
- sha256 = "409779e136c0efb3dff667e50b9ba318937d3e96ac918b8272741ea004ec3f5c";
+ sha256 = "617579da2580a0d9a5a6e64ef7c4b028fde31f82dcf8139104c380e51ec50227";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.8.1/linux-i686/de/thunderbird-78.8.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.9.0/linux-i686/de/thunderbird-78.9.0.tar.bz2";
locale = "de";
arch = "linux-i686";
- sha256 = "ac5ca1fe2247cd4d05862c00592c86dda480108b7a40e284ccc67718a1762f78";
+ sha256 = "5cdee984aa63595fbcb00303f14fd19d124ef9b267d490d5263c7554f4ea0dc7";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.8.1/linux-i686/dsb/thunderbird-78.8.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.9.0/linux-i686/dsb/thunderbird-78.9.0.tar.bz2";
locale = "dsb";
arch = "linux-i686";
- sha256 = "769d47c388ef4dfced4ba770f78eeedcafdc834dc4fa4175eaa92710ddc2e0de";
+ sha256 = "fa05969bcc025056b8ba9c056af0051fed91a967ebf9e21ccab7654aaaa6ba1f";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.8.1/linux-i686/el/thunderbird-78.8.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.9.0/linux-i686/el/thunderbird-78.9.0.tar.bz2";
locale = "el";
arch = "linux-i686";
- sha256 = "1a2daf5b0ccc36acae027da2281998b4333ea4e9981c7106243c68188517f482";
+ sha256 = "03b58dbcabb41c0140c18f1ff31dd32e4d2d006c85af75d73bcd656587e787ed";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.8.1/linux-i686/en-CA/thunderbird-78.8.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.9.0/linux-i686/en-CA/thunderbird-78.9.0.tar.bz2";
locale = "en-CA";
arch = "linux-i686";
- sha256 = "3a55772b7bec93bec83de289b5b36129e8e0d988d54db3d66ffcaf8326786ae3";
+ sha256 = "6cd222aacb8eba184dc3eef308fe7b564c70da2ba6c38e6e4e328e999b7229a4";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.8.1/linux-i686/en-GB/thunderbird-78.8.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.9.0/linux-i686/en-GB/thunderbird-78.9.0.tar.bz2";
locale = "en-GB";
arch = "linux-i686";
- sha256 = "f41b610c6a3f4f5d3e2c648d05ca210cf9bdbb998b94f298f81dd84601c00be9";
+ sha256 = "9d3ca50977bd5c6f8a5bd998549db0dc2ccc6aa5d33c914e93d42e2ae69e8cbd";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.8.1/linux-i686/en-US/thunderbird-78.8.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.9.0/linux-i686/en-US/thunderbird-78.9.0.tar.bz2";
locale = "en-US";
arch = "linux-i686";
- sha256 = "9598fd9175cc0d641387f6ac7f475d970b4f0864872b5d875d170039d6c97b39";
+ sha256 = "84721e190b6b95733a47a16853e1fe1e0c7b0e4693d3b7752aa59583fba92f97";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.8.1/linux-i686/es-AR/thunderbird-78.8.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.9.0/linux-i686/es-AR/thunderbird-78.9.0.tar.bz2";
locale = "es-AR";
arch = "linux-i686";
- sha256 = "603106740e8db3a7c9220897b9146ef53937bd57a60258a04548e1afb41d983c";
+ sha256 = "dcadcd68506406f718871d7576b47086d59ca159a5bc6d878d022141029df2db";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.8.1/linux-i686/es-ES/thunderbird-78.8.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.9.0/linux-i686/es-ES/thunderbird-78.9.0.tar.bz2";
locale = "es-ES";
arch = "linux-i686";
- sha256 = "e0f5f3d6aed26310bfee54099c73a13417be36eb737f6123526e94a5286f6336";
+ sha256 = "46526dd5b4bb123e774d3a3fa8fd88a8982cfb36a252b09fa98aa6cb773ff0d2";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.8.1/linux-i686/et/thunderbird-78.8.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.9.0/linux-i686/et/thunderbird-78.9.0.tar.bz2";
locale = "et";
arch = "linux-i686";
- sha256 = "bc4a1dc96e8ba31d0817f369af4e3e10b672aa854538093ef1d02126bcff24bb";
+ sha256 = "de0b695be00721244ff20b2046bb376342fba7c422980443b217f5d4cfa83d48";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.8.1/linux-i686/eu/thunderbird-78.8.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.9.0/linux-i686/eu/thunderbird-78.9.0.tar.bz2";
locale = "eu";
arch = "linux-i686";
- sha256 = "2c61d117e5fa23d62197f9b2c0512547356b65098eee5fd72285317caca6b51a";
+ sha256 = "543d45e256951cbf21bc61359e99daf2c80789a88641ae2231c1eb0ade133198";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.8.1/linux-i686/fa/thunderbird-78.8.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.9.0/linux-i686/fa/thunderbird-78.9.0.tar.bz2";
locale = "fa";
arch = "linux-i686";
- sha256 = "6b93377b457ec1e0dd343bc4d2193c6bb3030450e76757ac042c67e353075310";
+ sha256 = "6b95ebccf7ccca90c3310923f020ba6f05fa715d64c79acd770a491e15a9938f";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.8.1/linux-i686/fi/thunderbird-78.8.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.9.0/linux-i686/fi/thunderbird-78.9.0.tar.bz2";
locale = "fi";
arch = "linux-i686";
- sha256 = "9e07a2060b821047c494e03d9ab74b8f3aeea322aa1e1bdde080637187f89e05";
+ sha256 = "145c2479a73955f9ffe6ebd2d41eced848770729f218381735aafe5c3cc0b3a6";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.8.1/linux-i686/fr/thunderbird-78.8.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.9.0/linux-i686/fr/thunderbird-78.9.0.tar.bz2";
locale = "fr";
arch = "linux-i686";
- sha256 = "d4ea501f5a42effdb758ca24f2da7bd4ca1d83a8ea6da467fd63cbef96f8b373";
+ sha256 = "9178d90f346d62b6aa0bb4b081b6bebc214d333d6a042c46ee1af7661ffc3b03";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.8.1/linux-i686/fy-NL/thunderbird-78.8.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.9.0/linux-i686/fy-NL/thunderbird-78.9.0.tar.bz2";
locale = "fy-NL";
arch = "linux-i686";
- sha256 = "9aa11144cf22a5db5200628ac5e55a55b83ffda35306cf1909aabac9fe4878c2";
+ sha256 = "fe3574999f0d1fff276fdfd7d432859d495c2b64137d33ee418ef1e4329b1b72";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.8.1/linux-i686/ga-IE/thunderbird-78.8.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.9.0/linux-i686/ga-IE/thunderbird-78.9.0.tar.bz2";
locale = "ga-IE";
arch = "linux-i686";
- sha256 = "15af980b46c8cf80b60a999e2ca3b30c92719638af51d9e82133f58de61d7ed5";
+ sha256 = "1570882cd8345f86de38179713a7f7acb94768c4874e571a20314fb01154e1bf";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.8.1/linux-i686/gd/thunderbird-78.8.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.9.0/linux-i686/gd/thunderbird-78.9.0.tar.bz2";
locale = "gd";
arch = "linux-i686";
- sha256 = "cdeb93b31a1a9521dd7f91081f28c1a64e0e6a218f1c0015ae9c54d73cc91f0d";
+ sha256 = "9405a2a7ce52a48292bf4b6b20f3b1e96c12460a1e44a90ccdc31cdb21acda5e";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.8.1/linux-i686/gl/thunderbird-78.8.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.9.0/linux-i686/gl/thunderbird-78.9.0.tar.bz2";
locale = "gl";
arch = "linux-i686";
- sha256 = "48d973991c0cbb9988339c185d1ea8fda4c6cea6f0667cfaf8f2bdeec4c55a23";
+ sha256 = "930a9a3e06bc28ede54ec43e8bb92cc30329d7f0271629b37ac3753191f7e133";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.8.1/linux-i686/he/thunderbird-78.8.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.9.0/linux-i686/he/thunderbird-78.9.0.tar.bz2";
locale = "he";
arch = "linux-i686";
- sha256 = "c2f50a1fb3e877e3c08927eef96f104f5f970cb7629af21de3344e539617422b";
+ sha256 = "eb08c16b7df47fd501f61049b19f3f8f827870c8681b9230564276bc0cc9ada8";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.8.1/linux-i686/hr/thunderbird-78.8.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.9.0/linux-i686/hr/thunderbird-78.9.0.tar.bz2";
locale = "hr";
arch = "linux-i686";
- sha256 = "ec3596067c8245cd5cef8fc649c3d1fd6d38bb802e2a05947ab9e62b8d393b91";
+ sha256 = "c866290def37d2e16274820d5846bec52afc7c7da1f8df812df930f0c68c6b56";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.8.1/linux-i686/hsb/thunderbird-78.8.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.9.0/linux-i686/hsb/thunderbird-78.9.0.tar.bz2";
locale = "hsb";
arch = "linux-i686";
- sha256 = "0209d678b9353513bcab3c647100c35d772d25b1969bb9970266c09f2db01e05";
+ sha256 = "0df5dc60047e68aadc7a96e194468d42e977c7a90d9faa8c4684f650763825f8";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.8.1/linux-i686/hu/thunderbird-78.8.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.9.0/linux-i686/hu/thunderbird-78.9.0.tar.bz2";
locale = "hu";
arch = "linux-i686";
- sha256 = "817cef3a34c40ed31a59421f89a94de5b7be165cd1bd93fca7b2560cad3e05eb";
+ sha256 = "e76e78c1c77b59eb7a3ffad0da149dcc7f64d6b0305f5a5a607ad2745d224e17";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.8.1/linux-i686/hy-AM/thunderbird-78.8.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.9.0/linux-i686/hy-AM/thunderbird-78.9.0.tar.bz2";
locale = "hy-AM";
arch = "linux-i686";
- sha256 = "ca49953791109563cdc81a3458a5b3dd15ebb49a255752052e927daad199b0fa";
+ sha256 = "0dde11bb6c6ba186925010cee97b59d3c64890b108ef478be5578218954a39cb";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.8.1/linux-i686/id/thunderbird-78.8.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.9.0/linux-i686/id/thunderbird-78.9.0.tar.bz2";
locale = "id";
arch = "linux-i686";
- sha256 = "33fb9d6c721f79e4808f077573828c26b671434b0308db9c33386dbd975c4a53";
+ sha256 = "ceea16b87a7d8b44b187d950f4c9fc5326ed7a550c38e0f41645004a324669a0";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.8.1/linux-i686/is/thunderbird-78.8.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.9.0/linux-i686/is/thunderbird-78.9.0.tar.bz2";
locale = "is";
arch = "linux-i686";
- sha256 = "d498ac95c289612a253962d1988ac9d1526864926c9a4b9cc2985fe1d84ae03d";
+ sha256 = "a98177d8f62b1ffe056ba3c1f2ec9d7b3f47ad8d47459328692e9bee5e1d02d2";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.8.1/linux-i686/it/thunderbird-78.8.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.9.0/linux-i686/it/thunderbird-78.9.0.tar.bz2";
locale = "it";
arch = "linux-i686";
- sha256 = "cff73b132740bf3854977f62afe8076c7c660559cc8a96fbc36c4ffadd46d50e";
+ sha256 = "259b8e4e08828b544ba61541629025d4a711f44dc4c476b3e3971a633301b298";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.8.1/linux-i686/ja/thunderbird-78.8.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.9.0/linux-i686/ja/thunderbird-78.9.0.tar.bz2";
locale = "ja";
arch = "linux-i686";
- sha256 = "d8ffe86ccbc4de40a0909f55b750380454a2f51f450b4c8b49886612a49997fc";
+ sha256 = "6f2511dab5530e58664f386cb65b26d82fe581faee01b1a76cdd29e3ee3a1955";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.8.1/linux-i686/ka/thunderbird-78.8.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.9.0/linux-i686/ka/thunderbird-78.9.0.tar.bz2";
locale = "ka";
arch = "linux-i686";
- sha256 = "1bf02cd11b554b597b6f5facdd07b6ae7826ad24a2f1ceb432bca6fcd0396749";
+ sha256 = "368a85fcb387703df7422d1ce199a499d0e4796f4fdd4775aef27c5b36272fa7";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.8.1/linux-i686/kab/thunderbird-78.8.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.9.0/linux-i686/kab/thunderbird-78.9.0.tar.bz2";
locale = "kab";
arch = "linux-i686";
- sha256 = "aa0295643ee24b0e76d5567c4f43f94ddf4a820cde2bd5be5a6dbc0b2f1c7271";
+ sha256 = "33bfd965c79bd6935516729f3eedd65be2b3f754c9225d6ffdb4af201b0d13a2";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.8.1/linux-i686/kk/thunderbird-78.8.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.9.0/linux-i686/kk/thunderbird-78.9.0.tar.bz2";
locale = "kk";
arch = "linux-i686";
- sha256 = "265e5000114d7f3d204885a5c4eb5ef71780699f185f570da90737001023d4b5";
+ sha256 = "20dfc052f78a58d4fd96a0df22b55559ca43d8792dfda372dfede1cb49c6b185";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.8.1/linux-i686/ko/thunderbird-78.8.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.9.0/linux-i686/ko/thunderbird-78.9.0.tar.bz2";
locale = "ko";
arch = "linux-i686";
- sha256 = "a1622a295ab259400d61e9487f40b7e34c143b81afb1f354647a48cb56425d13";
+ sha256 = "63479eb7fcaea17ea29c98b624c36ac20ff2ab9e42bae1a355c78f05d5f9e313";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.8.1/linux-i686/lt/thunderbird-78.8.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.9.0/linux-i686/lt/thunderbird-78.9.0.tar.bz2";
locale = "lt";
arch = "linux-i686";
- sha256 = "423926d31fac238ec493de6f48d14530cf58bf0829b73505f7ea4138f6bdeb56";
+ sha256 = "2d50db9e0698c991e10a6ec6e627b02d0aca9e18b857aa290e4aab926e8ee88b";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.8.1/linux-i686/ms/thunderbird-78.8.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.9.0/linux-i686/ms/thunderbird-78.9.0.tar.bz2";
locale = "ms";
arch = "linux-i686";
- sha256 = "acdfdeecc6c5ff04c1428185bbe63a6e38b1545daa9e69888b78e2b5ba3b9194";
+ sha256 = "66969627bd536d9a8e8d8717bab010ceb16350425d31ea114bc7e012ba1f0922";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.8.1/linux-i686/nb-NO/thunderbird-78.8.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.9.0/linux-i686/nb-NO/thunderbird-78.9.0.tar.bz2";
locale = "nb-NO";
arch = "linux-i686";
- sha256 = "f62a4f2d2c8e93b58f3a0c35e6885c1e46a8b6ed1fd0414e719c480f99fa2cf8";
+ sha256 = "1db46ff207d356adaf761db2fac7961b20633dc6578ce562154a1bdb308256e3";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.8.1/linux-i686/nl/thunderbird-78.8.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.9.0/linux-i686/nl/thunderbird-78.9.0.tar.bz2";
locale = "nl";
arch = "linux-i686";
- sha256 = "c2dda812534a9155f79fc2249cafd8e77e572cc20bdaf1bbf637bea4daf5e612";
+ sha256 = "0259c04b35bd30b5feb44da31b639938504f1402879205263eb63f7a59153f11";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.8.1/linux-i686/nn-NO/thunderbird-78.8.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.9.0/linux-i686/nn-NO/thunderbird-78.9.0.tar.bz2";
locale = "nn-NO";
arch = "linux-i686";
- sha256 = "84fae5d60ec7223c0404033ad2e2b776c4a9353b55e0256c7ca7122aebc031a2";
+ sha256 = "1de52759f96302447829e0de40319394ac0b1802ec60c0c242cf85c0ca5110c6";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.8.1/linux-i686/pa-IN/thunderbird-78.8.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.9.0/linux-i686/pa-IN/thunderbird-78.9.0.tar.bz2";
locale = "pa-IN";
arch = "linux-i686";
- sha256 = "0fa48cf1ab0d1e23e4d230fb6f78e7f6d07d99360e341c239ea572c201204870";
+ sha256 = "39e0f5794e508dbf02c6aaedaead4173f5ae55d350aa3caeb7a1ad300a69e4e8";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.8.1/linux-i686/pl/thunderbird-78.8.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.9.0/linux-i686/pl/thunderbird-78.9.0.tar.bz2";
locale = "pl";
arch = "linux-i686";
- sha256 = "90fa65f13718539a899dfae11aaaec05b9c1a4f56c8b835436f9401d7c453b01";
+ sha256 = "25bc49f2225c8aca7ea467a240234fa9ec2c7ec34f751537a199f6cbb30b390b";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.8.1/linux-i686/pt-BR/thunderbird-78.8.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.9.0/linux-i686/pt-BR/thunderbird-78.9.0.tar.bz2";
locale = "pt-BR";
arch = "linux-i686";
- sha256 = "f203c40580edbe2fc8645af1477bd1b750a64241702fda3bd0747efb7c44510b";
+ sha256 = "6091c0e84d89312db11a3714027881243db708ce3f28187e86076351786a3d70";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.8.1/linux-i686/pt-PT/thunderbird-78.8.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.9.0/linux-i686/pt-PT/thunderbird-78.9.0.tar.bz2";
locale = "pt-PT";
arch = "linux-i686";
- sha256 = "42b5b7f39b75550e39accb221d0728cf6181e4251d130859c85a139bc4b2267c";
+ sha256 = "45fae3c271d226dee2410f8f97eadb62783291c570bf12cd9f5fe5ab23acae23";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.8.1/linux-i686/rm/thunderbird-78.8.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.9.0/linux-i686/rm/thunderbird-78.9.0.tar.bz2";
locale = "rm";
arch = "linux-i686";
- sha256 = "15165421181470218c152da68adea6e1f8a2abef4c7fd70f19d210620d29dab6";
+ sha256 = "56387dea25d3bc4742c297e0609be55a2db938d10a5e94db192018c706e7f398";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.8.1/linux-i686/ro/thunderbird-78.8.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.9.0/linux-i686/ro/thunderbird-78.9.0.tar.bz2";
locale = "ro";
arch = "linux-i686";
- sha256 = "974f8139cf98576a588088fef03788f513e6e45fa054d4d53cc2131254e0b794";
+ sha256 = "7e84c211675cbd59e805ffa499663b3c02dbc2075f2b734eaa9f41862e59c59f";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.8.1/linux-i686/ru/thunderbird-78.8.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.9.0/linux-i686/ru/thunderbird-78.9.0.tar.bz2";
locale = "ru";
arch = "linux-i686";
- sha256 = "eae2f2f1e5bfcf389f34b9635c838cfcbfbc0d93e9daf6635c0faffea2df1d7f";
+ sha256 = "c9374d0b813baa7aa837e2283d75c9c47d75fca7bfc640be4782d90b480fa145";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.8.1/linux-i686/si/thunderbird-78.8.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.9.0/linux-i686/si/thunderbird-78.9.0.tar.bz2";
locale = "si";
arch = "linux-i686";
- sha256 = "cac0bdfbbc3b5cb21e38473aae44e4f8d2ebf192b6c35d7e075c47e25684da48";
+ sha256 = "ac8ff38bf196886f8b95c34a07ed701416c58b78758517377f6d8eefc85050ad";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.8.1/linux-i686/sk/thunderbird-78.8.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.9.0/linux-i686/sk/thunderbird-78.9.0.tar.bz2";
locale = "sk";
arch = "linux-i686";
- sha256 = "6a30b2b648b24e3cd4e2c3b668e73802796f296a2f81aa8e470ec0909f8dbc87";
+ sha256 = "dd44494bec41af06317266ee7d8f8f16ac6c648728636aa68c93f57ca9594231";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.8.1/linux-i686/sl/thunderbird-78.8.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.9.0/linux-i686/sl/thunderbird-78.9.0.tar.bz2";
locale = "sl";
arch = "linux-i686";
- sha256 = "0d4e597db5264bef212cdc3e86564acad1ed4cad3cae9eb61e583025b401bfa2";
+ sha256 = "2be1af23f71b22812a90ab2be33649ad53bf2d14acbbcc9540b835eade0fd9bf";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.8.1/linux-i686/sq/thunderbird-78.8.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.9.0/linux-i686/sq/thunderbird-78.9.0.tar.bz2";
locale = "sq";
arch = "linux-i686";
- sha256 = "8a4dd36ac981c89924755526fae8634f20d0d7dbdbb6fc9c324a5badbf7394db";
+ sha256 = "5c65db4fcc190408aa8a1c5f0170ede3f86f1c9f07dacc6fd7a9aa54bff533d1";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.8.1/linux-i686/sr/thunderbird-78.8.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.9.0/linux-i686/sr/thunderbird-78.9.0.tar.bz2";
locale = "sr";
arch = "linux-i686";
- sha256 = "6002d49812cbba0289db444e84b8a139c0784056a26e3a0592fd1806ce865cbe";
+ sha256 = "7a42279c8a4352c18d583503b2324f5dd98b6c927582fa1d5e8cd72a5b1ca782";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.8.1/linux-i686/sv-SE/thunderbird-78.8.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.9.0/linux-i686/sv-SE/thunderbird-78.9.0.tar.bz2";
locale = "sv-SE";
arch = "linux-i686";
- sha256 = "498303591a0d28ce2bbb59693fd55bdbf292c7feba8002c9cacdce7ec08b50d0";
+ sha256 = "3f508f801f1f4afc477ee1a0bd81d49d957429360b9691b5945a88b609dc9a21";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.8.1/linux-i686/th/thunderbird-78.8.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.9.0/linux-i686/th/thunderbird-78.9.0.tar.bz2";
locale = "th";
arch = "linux-i686";
- sha256 = "6c31f40537ba39bdba93eb46f480f8a1a446a6b028834f6886934b102ce1b861";
+ sha256 = "bd50cac75236ee9e1ad7226c605b37cc2f4aa57eafc4978af9f2563aff7dda0c";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.8.1/linux-i686/tr/thunderbird-78.8.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.9.0/linux-i686/tr/thunderbird-78.9.0.tar.bz2";
locale = "tr";
arch = "linux-i686";
- sha256 = "b8f5a0be988b89dc7e8b14750d6aa0ccbdbf2c1a1c3abee376b94b1443223757";
+ sha256 = "af134487b9c2d6f84df56e2da1fcbc7b4abd3960fa3d11a366281768812fd9e6";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.8.1/linux-i686/uk/thunderbird-78.8.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.9.0/linux-i686/uk/thunderbird-78.9.0.tar.bz2";
locale = "uk";
arch = "linux-i686";
- sha256 = "036065e1fc91907370ffe75883b1d1e8fd1a416a9a726583c758d7a0765b84ad";
+ sha256 = "a094a6fe935b002805252ad4694a15231587a66c31cff3064c2842332f1e82ae";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.8.1/linux-i686/uz/thunderbird-78.8.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.9.0/linux-i686/uz/thunderbird-78.9.0.tar.bz2";
locale = "uz";
arch = "linux-i686";
- sha256 = "3b5d683b237a88018e5b1999aee497d766007a3c1743517ab0b54e43f37e52b1";
+ sha256 = "6b8b7622374c92036828990db1de3042e1a7cebf12974d30d73dcdd0e564d707";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.8.1/linux-i686/vi/thunderbird-78.8.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.9.0/linux-i686/vi/thunderbird-78.9.0.tar.bz2";
locale = "vi";
arch = "linux-i686";
- sha256 = "0d31b2bd82161ec51314e57405345a9a004b268371c16de06fa4d2160eda0230";
+ sha256 = "4ffcd1d5f21145f857ee525169fe59ee8a1cdef6a1c4f3cc1918be1fc7c66e6a";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.8.1/linux-i686/zh-CN/thunderbird-78.8.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.9.0/linux-i686/zh-CN/thunderbird-78.9.0.tar.bz2";
locale = "zh-CN";
arch = "linux-i686";
- sha256 = "3994c114510a6c7457c78d3755518b1332bcf1b48371d2b88c000f977b5bb3a0";
+ sha256 = "8cd65c054b6fefcbd0ac9a057e277009c732af6baef08ccb3f57bee73b75ae20";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.8.1/linux-i686/zh-TW/thunderbird-78.8.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.9.0/linux-i686/zh-TW/thunderbird-78.9.0.tar.bz2";
locale = "zh-TW";
arch = "linux-i686";
- sha256 = "c38e5b2378bd0af57945e0e172e49b30fed491b91ffa79a946cce8f2bccf96f8";
+ sha256 = "1e39b1e38bfcc1735801dcd6c073ba1eeb344b23d9e859495947a37d95a4b3b8";
}
];
}
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 495cf3cf76..447c4b3f3b 100644
--- a/third_party/nixpkgs/pkgs/applications/networking/mailreaders/thunderbird/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/networking/mailreaders/thunderbird/default.nix
@@ -73,13 +73,13 @@ assert waylandSupport -> gtk3Support == true;
stdenv.mkDerivation rec {
pname = "thunderbird";
- version = "78.8.1";
+ version = "78.9.0";
src = fetchurl {
url =
"mirror://mozilla/thunderbird/releases/${version}/source/thunderbird-${version}.source.tar.xz";
sha512 =
- "08dnjqcdd5bs7wpl5imir0nsmvaqkri67cas1sn7ab4nb1f61lfdz4xg4x5v6f39sm5yxw2cy6rg5fc5lbiqza5bgs00gfg79kgfn2i";
+ "35n9l1kjx52davwf1k5gdx2y81hws3mfb5755464z9db48n0vfj756jlg9d8f2m2s29js27bdswl64mralw4j085dl11661g7p9ypzs";
};
nativeBuildInputs = [
diff --git a/third_party/nixpkgs/pkgs/applications/networking/mpop/default.nix b/third_party/nixpkgs/pkgs/applications/networking/mpop/default.nix
index a488817a0c..613226a2dc 100644
--- a/third_party/nixpkgs/pkgs/applications/networking/mpop/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/networking/mpop/default.nix
@@ -4,11 +4,11 @@ with lib;
stdenv.mkDerivation rec {
pname = "mpop";
- version = "1.4.12";
+ version = "1.4.13";
src = fetchurl {
url = "https://marlam.de/${pname}/releases/${pname}-${version}.tar.xz";
- sha256 = "sha256-X2NVtS2cNgYZYjpAxmwaVXHjk7Q/5YN1wN41QprDSAo=";
+ sha256 = "sha256-s0mEZsZbZQrdGm55IJsnuoY3VnOkXJalknvtaFoyfcE=";
};
nativeBuildInputs = [ pkg-config ];
diff --git a/third_party/nixpkgs/pkgs/applications/networking/p2p/deluge/default.nix b/third_party/nixpkgs/pkgs/applications/networking/p2p/deluge/default.nix
index 4587da48a4..2bd3cd739e 100644
--- a/third_party/nixpkgs/pkgs/applications/networking/p2p/deluge/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/networking/p2p/deluge/default.nix
@@ -1,5 +1,15 @@
-{ lib, fetchurl, intltool, libtorrent-rasterbar, pythonPackages
-, gtk3, glib, gobject-introspection, librsvg, wrapGAppsHook }:
+{ lib
+, fetchurl
+, fetchpatch
+, intltool
+, libtorrent-rasterbar
+, pythonPackages
+, gtk3
+, glib
+, gobject-introspection
+, librsvg
+, wrapGAppsHook
+}:
pythonPackages.buildPythonPackage rec {
pname = "deluge";
@@ -10,28 +20,60 @@ pythonPackages.buildPythonPackage rec {
sha256 = "14d8kn2pvr1qv8mwqrxmj85jycr73vwfqz12hzag0ararbkfhyky";
};
+ patches = [
+ (fetchpatch {
+ url = "https://github.com/deluge-torrent/deluge/commit/d6c96d629183e8bab2167ef56457f994017e7c85.patch";
+ sha256 = "sha256-slGMt2bgp36pjDztJUXFeZNbzdJsus0s9ARRD6IpNUw=";
+ name = "fix_ngettext_warning.patch";
+ })
+
+ (fetchpatch {
+ url = "https://github.com/deluge-torrent/deluge/commit/351664ec071daa04161577c6a1c949ed0f2c3206.patch";
+ sha256 = "sha256-ry1LFgMe9lys66xAvATcPqIa3rzBPWVnsf8FL1dXkHo=";
+ name = "fix_logging_on_py38.patch";
+ })
+ ];
+
propagatedBuildInputs = with pythonPackages; [
- twisted Mako chardet pyxdg pyopenssl service-identity
- libtorrent-rasterbar.dev libtorrent-rasterbar.python setuptools
- setproctitle pillow rencode six zope_interface
- dbus-python pygobject3 pycairo
- gtk3 gobject-introspection librsvg
+ twisted
+ Mako
+ chardet
+ pyxdg
+ pyopenssl
+ service-identity
+ libtorrent-rasterbar.dev
+ libtorrent-rasterbar.python
+ setuptools
+ setproctitle
+ pillow
+ rencode
+ six
+ zope_interface
+ dbus-python
+ pygobject3
+ pycairo
+ gtk3
+ gobject-introspection
+ librsvg
];
nativeBuildInputs = [ intltool wrapGAppsHook glib ];
checkInputs = with pythonPackages; [
- pytest /* pytest-twisted */ pytestcov mock
- mccabe pylint
+ pytestCheckHook
+ pytest-twisted
+ pytest-cov
+ mock
+ mccabe
+ pylint
];
doCheck = false; # until pytest-twisted is packaged
postInstall = ''
- mkdir -p $out/share/applications
- cp -R deluge/ui/data/pixmaps $out/share/
- cp -R deluge/ui/data/icons $out/share/
- cp deluge/ui/data/share/applications/deluge.desktop $out/share/applications
+ mkdir -p $out/share
+ cp -R deluge/ui/data/{icons,pixmaps} $out/share/
+ install -Dm444 -t $out/share/applications deluge/ui/data/share/applications/deluge.desktop
'';
meta = with lib; {
diff --git a/third_party/nixpkgs/pkgs/applications/networking/pyload/beautifulsoup.nix b/third_party/nixpkgs/pkgs/applications/networking/pyload/beautifulsoup.nix
deleted file mode 100644
index 8eb0c2298f..0000000000
--- a/third_party/nixpkgs/pkgs/applications/networking/pyload/beautifulsoup.nix
+++ /dev/null
@@ -1,20 +0,0 @@
-{ pythonPackages, isPy3k, pkgs }:
-
-pythonPackages.buildPythonPackage {
- name = "beautifulsoup-3.2.1";
- disabled = isPy3k;
-
- src = pkgs.fetchurl {
- url = "http://www.crummy.com/software/BeautifulSoup/download/3.x/BeautifulSoup-3.2.1.tar.gz";
- sha256 = "1nshbcpdn0jpcj51x0spzjp519pkmqz0n0748j7dgpz70zlqbfpm";
- };
-
- # error: invalid command 'test'
- doCheck = false;
-
- meta = {
- homepage = "http://www.crummy.com/software/BeautifulSoup/";
- license = "bsd";
- description = "Undemanding HTML/XML parser";
- };
-}
diff --git a/third_party/nixpkgs/pkgs/applications/networking/pyload/default.nix b/third_party/nixpkgs/pkgs/applications/networking/pyload/default.nix
deleted file mode 100644
index f70359cf7a..0000000000
--- a/third_party/nixpkgs/pkgs/applications/networking/pyload/default.nix
+++ /dev/null
@@ -1,60 +0,0 @@
-{ lib, fetchFromGitHub, fetchpatch, pythonPackages, gocr, unrar, rhino, spidermonkey_38 }:
-
-let
- beautifulsoup = pythonPackages.callPackage ./beautifulsoup.nix {
- inherit pythonPackages;
- };
-
-in pythonPackages.buildPythonApplication rec {
- version = "0.4.9-next";
- name = "pyLoad-" + version;
-
- src = fetchFromGitHub {
- owner = "pyload";
- repo = "pyload";
- rev = "721ea9f089217b9cb0f2799c051116421faac081";
- sha256 = "1ad4r9slx1wgvd2fs4plfbpzi4i2l2bk0lybzsb2ncgh59m87h54";
- };
-
- patches =
- let
- # gets merged in next release version of pyload
- configParserPatch = fetchpatch {
- url = "https://patch-diff.githubusercontent.com/raw/pyload/pyload/pull/2625.diff";
- sha256 = "1bisgx78kcr5c0x0i3h0ch5mykns5wx5wx7gvjj0pc71lfzlxzb9";
- };
- setupPyPatch = fetchpatch {
- url = "https://patch-diff.githubusercontent.com/raw/pyload/pyload/pull/2638.diff";
- sha256 = "006g4qbl582262ariflbyfrszcx8ck2ac1cpry1f82f76p4cgf6z";
- };
- in [ configParserPatch setupPyPatch ];
-
- buildInputs = [
- unrar rhino spidermonkey_38 gocr pythonPackages.paver
- ];
-
- propagatedBuildInputs = with pythonPackages; [
- pycurl jinja2 beaker thrift simplejson pycrypto feedparser tkinter
- beautifulsoup send2trash
- ];
-
- #remove this once the PR patches above are merged. Needed because githubs diff endpoint
- #does not support diff -N
- prePatch = ''
- touch module/config/__init__.py
- '';
-
- preBuild = ''
- ${pythonPackages.paver}/bin/paver generate_setup
- '';
-
- doCheck = false;
-
- meta = with lib; {
- description = "Free and open source downloader for 1-click-hosting sites";
- homepage = "https://github.com/pyload/pyload";
- license = licenses.gpl3;
- maintainers = [ maintainers.mahe ];
- platforms = platforms.all;
- };
-}
diff --git a/third_party/nixpkgs/pkgs/applications/networking/remote/citrix-workspace/default.nix b/third_party/nixpkgs/pkgs/applications/networking/remote/citrix-workspace/default.nix
index 3a6054db35..c73789ddeb 100644
--- a/third_party/nixpkgs/pkgs/applications/networking/remote/citrix-workspace/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/networking/remote/citrix-workspace/default.nix
@@ -14,7 +14,7 @@ let
Citrix Workspace at version ${x} is not supported anymore!
Actively supported releases are listed here:
- https://www.citrix.com/en-gb/support/product-lifecycle/milestones/receiver.html
+ https://www.citrix.com/support/product-lifecycle/milestones/receiver.html
'')) unsupportedVersions
);
diff --git a/third_party/nixpkgs/pkgs/applications/networking/remote/citrix-workspace/sources.nix b/third_party/nixpkgs/pkgs/applications/networking/remote/citrix-workspace/sources.nix
index 75eb4645f4..1256f47041 100644
--- a/third_party/nixpkgs/pkgs/applications/networking/remote/citrix-workspace/sources.nix
+++ b/third_party/nixpkgs/pkgs/applications/networking/remote/citrix-workspace/sources.nix
@@ -11,7 +11,7 @@ let
# Attribute-set with all actively supported versions of the Citrix workspace app
# for Linux.
#
- # The latest versions can be found at https://www.citrix.com/de-de/downloads/workspace-app/linux/
+ # The latest versions can be found at https://www.citrix.com/downloads/workspace-app/linux/
supportedVersions = lib.mapAttrs mkVersionInfo {
"20.04.0" = {
major = "20";
@@ -78,6 +78,17 @@ let
x86suffix = "14";
homepage = "https://www.citrix.com/de-de/downloads/workspace-app/linux/workspace-app-for-linux-latest.html";
};
+
+ "21.03.0" = {
+ major = "21";
+ minor = "3";
+ patch = "0";
+ x64hash = "004pgvxl81l99sqvrs5xzvjivjlc21rrlm2gky9hmbsm53nsl3zc";
+ x86hash = "11nn9734a515dm1q880z9wmhvx8ikyh3riayyn42z22q4kd852n3";
+ x64suffix = "38";
+ x86suffix = "38";
+ homepage = "https://www.citrix.com/downloads/workspace-app/linux/workspace-app-for-linux-latest.html";
+ };
};
# Retain attribute-names for abandoned versions of Citrix workspace to
diff --git a/third_party/nixpkgs/pkgs/applications/networking/remote/waypipe/default.nix b/third_party/nixpkgs/pkgs/applications/networking/remote/waypipe/default.nix
index fcbad67038..7be719c180 100644
--- a/third_party/nixpkgs/pkgs/applications/networking/remote/waypipe/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/networking/remote/waypipe/default.nix
@@ -1,26 +1,20 @@
{ lib, stdenv, fetchFromGitLab
, meson, ninja, pkg-config, scdoc
-, openssh
, mesa, lz4, zstd, ffmpeg, libva
}:
stdenv.mkDerivation rec {
pname = "waypipe-unstable";
- version = "0.7.2";
+ version = "0.8.0";
src = fetchFromGitLab {
domain = "gitlab.freedesktop.org";
owner = "mstoeckl";
repo = "waypipe";
rev = "v${version}";
- sha256 = "sha256-LtfrSEwZikOXp/fdyJ/+EylRx19zdsHMkrl1eEf1/aY=";
+ sha256 = "1qa47ljfvb1vv3h647xwn1j5j8gfmcmdfaz4j8ygnkvj36y87vnz";
};
- postPatch = ''
- substituteInPlace src/waypipe.c \
- --replace "/usr/bin/ssh" "${openssh}/bin/ssh"
- '';
-
nativeBuildInputs = [ meson ninja pkg-config scdoc ];
buildInputs = [
diff --git a/third_party/nixpkgs/pkgs/applications/networking/seaweedfs/default.nix b/third_party/nixpkgs/pkgs/applications/networking/seaweedfs/default.nix
index a226085c51..51e8e553ec 100644
--- a/third_party/nixpkgs/pkgs/applications/networking/seaweedfs/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/networking/seaweedfs/default.nix
@@ -2,16 +2,16 @@
buildGoModule rec {
pname = "seaweedfs";
- version = "2.34";
+ version = "2.35";
src = fetchFromGitHub {
owner = "chrislusf";
repo = "seaweedfs";
rev = version;
- sha256 = "sha256-YQL9xx4dpT1psZqLiF5ojQcEY2EI0szWTS4oOPbG7Co=";
+ sha256 = "sha256-J0vwc/sabc6T8+eh94luQdnVltmThapYwLCdyGjCnSc=";
};
- vendorSha256 = "sha256-8o/Y5SXMgDrid1a5KTQieiVrWce0wcgrhPbSsbravEI=";
+ vendorSha256 = "sha256-u1Aqcm6oJ1y2dVP9BJXV7/1nhNxEOtgZQppoA+cXbD0=";
subPackages = [ "weed" ];
diff --git a/third_party/nixpkgs/pkgs/applications/networking/sync/rsync/base.nix b/third_party/nixpkgs/pkgs/applications/networking/sync/rsync/base.nix
index 7c7d3a1f41..3479458088 100644
--- a/third_party/nixpkgs/pkgs/applications/networking/sync/rsync/base.nix
+++ b/third_party/nixpkgs/pkgs/applications/networking/sync/rsync/base.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchurl }:
+{ lib, fetchurl }:
rec {
version = "3.2.3";
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 c50ea08510..a38352a328 100644
--- a/third_party/nixpkgs/pkgs/applications/networking/sync/rsync/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/networking/sync/rsync/default.nix
@@ -15,7 +15,7 @@ assert enableXXHash -> xxHash != null;
assert enableZstd -> zstd != null;
let
- base = import ./base.nix { inherit lib stdenv fetchurl; };
+ base = import ./base.nix { inherit lib fetchurl; };
in
stdenv.mkDerivation rec {
name = "rsync-${base.version}";
diff --git a/third_party/nixpkgs/pkgs/applications/networking/sync/rsync/rrsync.nix b/third_party/nixpkgs/pkgs/applications/networking/sync/rsync/rrsync.nix
index 5a4c260056..83eb4658d2 100644
--- a/third_party/nixpkgs/pkgs/applications/networking/sync/rsync/rrsync.nix
+++ b/third_party/nixpkgs/pkgs/applications/networking/sync/rsync/rrsync.nix
@@ -1,7 +1,7 @@
{ lib, stdenv, fetchurl, perl, rsync }:
let
- base = import ./base.nix { inherit stdenv lib fetchurl; };
+ base = import ./base.nix { inherit lib fetchurl; };
in
stdenv.mkDerivation {
name = "rrsync-${base.version}";
diff --git a/third_party/nixpkgs/pkgs/applications/networking/syncthing/default.nix b/third_party/nixpkgs/pkgs/applications/networking/syncthing/default.nix
index 97ce75dfc9..6d4b3fe34c 100644
--- a/third_party/nixpkgs/pkgs/applications/networking/syncthing/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/networking/syncthing/default.nix
@@ -47,7 +47,7 @@ let
description = "Open Source Continuous File Synchronization";
changelog = "https://github.com/syncthing/syncthing/releases/tag/v${version}";
license = licenses.mpl20;
- maintainers = with maintainers; [ pshendry joko peterhoeg andrew-d ];
+ maintainers = with maintainers; [ joko peterhoeg andrew-d ];
platforms = platforms.unix;
};
};
diff --git a/third_party/nixpkgs/pkgs/applications/networking/umurmur/default.nix b/third_party/nixpkgs/pkgs/applications/networking/umurmur/default.nix
index bf45db9209..d137859887 100644
--- a/third_party/nixpkgs/pkgs/applications/networking/umurmur/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/networking/umurmur/default.nix
@@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "umurmur";
- version = "0.2.19";
+ version = "0.2.20";
src = fetchFromGitHub {
owner = "umurmur";
repo = "umurmur";
rev = version;
- sha256 = "sha256-86wveYlM493RIuU8aKac6XTOMPv0JxlZL4qH2N2AqRU=";
+ sha256 = "sha256-jp5+NbGmT90ksffvpLYIX2q5cPeVidDCYMPvLHCiP68=";
};
nativeBuildInputs = [ autoreconfHook ];
diff --git a/third_party/nixpkgs/pkgs/applications/networking/zerobin/default.nix b/third_party/nixpkgs/pkgs/applications/networking/zerobin/default.nix
new file mode 100644
index 0000000000..b86fe7cc64
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/applications/networking/zerobin/default.nix
@@ -0,0 +1,61 @@
+{ lib
+, python3Packages
+, fetchFromGitHub
+, nodePackages
+}:
+
+python3Packages.buildPythonApplication rec {
+ pname = "zerobin";
+ version = "1.0.5";
+ src = fetchFromGitHub {
+ owner = "Tygs";
+ repo = "0bin";
+ rev = "v${version}";
+ sha256 = "1dfy3h823ylz4w2vv3mrmnmiyvf6rvyvsp4j3llr074w9id0zy16";
+ };
+
+ disabled = python3Packages.pythonOlder "3.7";
+
+ nativeBuildInputs = [
+ python3Packages.doit
+ python3Packages.pyscss
+ nodePackages.uglify-js
+ ];
+ propagatedBuildInputs = with python3Packages; [
+ appdirs
+ beaker
+ bleach
+ bottle
+ clize
+ lockfile
+ paste
+ ];
+ prePatch = ''
+ # replace /bin/bash in compress.sh
+ patchShebangs .
+
+ # relax version constraints of some dependencies
+ substituteInPlace setup.cfg \
+ --replace "bleach==3.1.5" "bleach>=3.1.5,<4" \
+ --replace "bottle==0.12.18" "bottle>=0.12.18,<1" \
+ --replace "Paste==3.4.3" "Paste>=3.4.3,<4"
+ '';
+ buildPhase = ''
+ runHook preBuild
+ doit build
+ runHook postBuild
+ '';
+
+ # zerobin has no check, but checking would fail with:
+ # nix_run_setup runserver: Received extra arguments: test
+ # See https://github.com/NixOS/nixpkgs/pull/98734#discussion_r495823510
+ doCheck = false;
+
+ meta = with lib; {
+ description = "A client side encrypted pastebin";
+ homepage = "https://0bin.net/";
+ license = licenses.wtfpl;
+ platforms = platforms.all;
+ maintainers = with maintainers; [ julm ];
+ };
+}
diff --git a/third_party/nixpkgs/pkgs/applications/networking/znc/default.nix b/third_party/nixpkgs/pkgs/applications/networking/znc/default.nix
index 557c2865fa..e5aec91170 100644
--- a/third_party/nixpkgs/pkgs/applications/networking/znc/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/networking/znc/default.nix
@@ -39,6 +39,8 @@ stdenv.mkDerivation rec {
] ++ optional (!withIPv6) [ "--disable-ipv6" ]
++ optional withDebug [ "--enable-debug" ];
+ enableParallelBuilding = true;
+
meta = with lib; {
description = "Advanced IRC bouncer";
homepage = "https://wiki.znc.in/ZNC";
diff --git a/third_party/nixpkgs/pkgs/applications/office/banking/default.nix b/third_party/nixpkgs/pkgs/applications/office/banking/default.nix
new file mode 100644
index 0000000000..c71c1eafa6
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/applications/office/banking/default.nix
@@ -0,0 +1,67 @@
+{ lib
+, fetchurl
+, fetchFromGitLab
+, python3
+, appstream-glib
+, desktop-file-utils
+, glib
+, gtk3
+, libxml2
+, meson
+, ninja
+, pkg-config
+, wrapGAppsHook
+, gobject-introspection
+, libhandy
+, librsvg
+}:
+
+python3.pkgs.buildPythonApplication rec {
+ pname = "banking";
+ version = "0.3.0";
+ format = "other";
+
+ src = fetchFromGitLab {
+ owner = "tabos";
+ repo = "banking";
+ rev = version;
+ sha256 = "1w5x9iczw5hb9bfdm1df37n8xhdrida1yfrd82k9l8hb1k4q3h9d";
+ };
+
+ postPatch = ''
+ patchShebangs meson_post_install.py
+ '';
+
+ nativeBuildInputs = [
+ appstream-glib # for appstream-util
+ desktop-file-utils # for desktop-file-validate
+ glib # for glib-compile-resources
+ gtk3 # for gtk-update-icon-cache
+ libxml2 # for xmllint
+ meson
+ ninja
+ pkg-config
+ wrapGAppsHook
+ ];
+
+ buildInputs = [
+ gobject-introspection
+ gtk3
+ libhandy
+ librsvg
+ ];
+
+ propagatedBuildInputs = with python3.pkgs; [
+ cryptography
+ fints
+ mt-940
+ pygobject3
+ ];
+
+ meta = with lib; {
+ description = "Banking application for small screens";
+ homepage = "https://tabos.gitlab.io/project/banking/";
+ license = licenses.gpl3Plus;
+ maintainers = with maintainers; [ dotlambda ];
+ };
+}
diff --git a/third_party/nixpkgs/pkgs/applications/office/gnumeric/default.nix b/third_party/nixpkgs/pkgs/applications/office/gnumeric/default.nix
index f926391ac4..263a555ab4 100644
--- a/third_party/nixpkgs/pkgs/applications/office/gnumeric/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/office/gnumeric/default.nix
@@ -7,11 +7,11 @@ let
inherit (python3Packages) python pygobject3;
in stdenv.mkDerivation rec {
pname = "gnumeric";
- version = "1.12.48";
+ version = "1.12.49";
src = fetchurl {
url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
- sha256 = "14556b0vyxdvdwjlin0rv7jk0vq4nplbmvp9j89bhkfk84xf7k2p";
+ sha256 = "kcBy7JXDLgCxVv/oAVyTsyuO3zaPkEFDYZPPoy6E7Vc=";
};
configureFlags = [ "--disable-component" ];
diff --git a/third_party/nixpkgs/pkgs/applications/office/skanlite/default.nix b/third_party/nixpkgs/pkgs/applications/office/skanlite/default.nix
index 744240c921..6cdbea7559 100644
--- a/third_party/nixpkgs/pkgs/applications/office/skanlite/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/office/skanlite/default.nix
@@ -24,7 +24,7 @@ mkDerivation rec {
description = "KDE simple image scanning application";
homepage = "https://apps.kde.org/skanlite";
license = licenses.gpl2Plus;
- maintainers = with maintainers; [ pshendry ];
+ maintainers = with maintainers; [ polendri ];
platforms = platforms.linux;
};
}
diff --git a/third_party/nixpkgs/pkgs/applications/office/trilium/default.nix b/third_party/nixpkgs/pkgs/applications/office/trilium/default.nix
index 4692828601..2680a9a6a5 100644
--- a/third_party/nixpkgs/pkgs/applications/office/trilium/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/office/trilium/default.nix
@@ -19,16 +19,16 @@ let
maintainers = with maintainers; [ fliegendewurst ];
};
- version = "0.46.5";
+ version = "0.46.6";
desktopSource = {
url = "https://github.com/zadam/trilium/releases/download/v${version}/trilium-linux-x64-${version}.tar.xz";
- sha256 = "157yp8375aviy77i42s7wdzc5igs7ll3v6vjzy30l8i5zis7hry2";
+ sha256 = "0nxlph23gkxrn10gnm0ncsy54fzcmbqcrrk492ygfgw8a8pl4ah1";
};
serverSource = {
url = "https://github.com/zadam/trilium/releases/download/v${version}/trilium-linux-x64-server-${version}.tar.xz";
- sha256 = "0bc1p99hr12pj94z48wwdbiw4cwpq3sanxaadbc8vxiyb4mcv706";
+ sha256 = "0z9wg84sdbpk8zhljydm05z7cqqv2ly9s921cli7rs8hcpl175cz";
};
in {
diff --git a/third_party/nixpkgs/pkgs/applications/radio/direwolf/default.nix b/third_party/nixpkgs/pkgs/applications/radio/direwolf/default.nix
index e7da78034c..4f8ca55049 100644
--- a/third_party/nixpkgs/pkgs/applications/radio/direwolf/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/radio/direwolf/default.nix
@@ -1,5 +1,5 @@
{ lib, stdenv, fetchFromGitHub, cmake, alsaLib, espeak, glibc, gpsd
-, hamlib, perl, python, udev }:
+, hamlib, perl, python3, udev }:
with lib;
@@ -16,8 +16,10 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ cmake ];
+ strictDeps = true;
+
buildInputs = [
- espeak gpsd hamlib perl python
+ espeak gpsd hamlib perl python3
] ++ (optionals stdenv.isLinux [alsaLib udev]);
patches = [
diff --git a/third_party/nixpkgs/pkgs/applications/science/astronomy/stellarium/default.nix b/third_party/nixpkgs/pkgs/applications/science/astronomy/stellarium/default.nix
index 235d06a9cd..7922f4d02a 100644
--- a/third_party/nixpkgs/pkgs/applications/science/astronomy/stellarium/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/science/astronomy/stellarium/default.nix
@@ -6,13 +6,13 @@
mkDerivation rec {
pname = "stellarium";
- version = "0.20.4";
+ version = "0.21.0";
src = fetchFromGitHub {
owner = "Stellarium";
repo = "stellarium";
rev = "v${version}";
- sha256 = "sha256-EhlcaMxlDyX2RneBrpbmLScc9vd77Tf7RPblbQqAqZ0=";
+ sha256 = "sha256-LOBWfKLtoFemiWBUVayIBG0DORvjI6h9kgaPH9hGmKY=";
};
nativeBuildInputs = [ cmake perl wrapQtAppsHook ];
diff --git a/third_party/nixpkgs/pkgs/applications/science/biology/bcftools/default.nix b/third_party/nixpkgs/pkgs/applications/science/biology/bcftools/default.nix
index e15cac6029..80506bb79b 100644
--- a/third_party/nixpkgs/pkgs/applications/science/biology/bcftools/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/science/biology/bcftools/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchurl, htslib, zlib, bzip2, lzma, curl, perl, python, bash }:
+{ lib, stdenv, fetchurl, htslib, zlib, bzip2, lzma, curl, perl, python3, bash }:
stdenv.mkDerivation rec {
pname = "bcftools";
@@ -9,7 +9,14 @@ stdenv.mkDerivation rec {
sha256 = "0r508mp15pqzf8r1269kb4v5naw9zsvbwd3cz8s1yj7carsf9viw";
};
- buildInputs = [ htslib zlib bzip2 lzma curl perl python ];
+ nativeBuildInputs = [
+ perl
+ python3
+ ];
+
+ buildInputs = [ htslib zlib bzip2 lzma curl ];
+
+ strictDeps = true;
makeFlags = [
"HSTDIR=${htslib}"
diff --git a/third_party/nixpkgs/pkgs/applications/science/biology/bedops/default.nix b/third_party/nixpkgs/pkgs/applications/science/biology/bedops/default.nix
new file mode 100644
index 0000000000..407ed0c01f
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/applications/science/biology/bedops/default.nix
@@ -0,0 +1,51 @@
+{ lib, stdenv, fetchFromGitHub, zlib, bzip2, jansson, makeWrapper }:
+
+stdenv.mkDerivation rec {
+ pname = "bedops";
+ version = "2.4.39";
+
+ src = fetchFromGitHub {
+ owner = "bedops";
+ repo = "bedops";
+ rev = "v${version}";
+ sha256 = "sha256-vPrut3uhZK1Eg9vPcyxVNWW4zKeypdsb28oM1xbbpJo=";
+ };
+
+ buildInputs = [ zlib bzip2 jansson ];
+ nativeBuildInputs = [ makeWrapper ];
+
+ preConfigure = ''
+ # We use nixpkgs versions of these libraries
+ rm -r third-party
+ sed -i '/^LIBS/d' system.mk/*
+ sed -i 's|^LIBRARIES.*$|LIBRARIES = -lbz2 -lz -ljansson|' */*/*/*/Makefile
+ substituteInPlace applications/bed/starch/src/Makefile --replace '$(LIBRARIES)' ""
+
+ # Function name is different in nixpkgs provided libraries
+ for f in interfaces/src/data/starch/starchFileHelpers.c applications/bed/starch/src/starchcat.c ; do
+ substituteInPlace $f --replace deflateInit2cpp deflateInit2
+ done
+
+ # Don't force static
+ for f in */*/*/*/Makefile ; do
+ substituteInPlace $f --replace '-static' ""
+ done
+ '';
+
+ makeFlags = [ "BINDIR=$(out)/bin" ];
+
+ postFixup = ''
+ for f in $out/bin/* ; do
+ wrapProgram $f --prefix PATH : "$out/bin"
+ done
+ '';
+
+ meta = with lib; {
+ description = "Suite of tools for addressing questions arising in genomics studies";
+ homepage = "https://github.com/bedops/bedops";
+ license = licenses.gpl2Only;
+ maintainers = with maintainers; [ jbedo ];
+ platforms = platforms.x86_64;
+ broken = stdenv.isDarwin;
+ };
+}
diff --git a/third_party/nixpkgs/pkgs/applications/science/biology/bedtools/default.nix b/third_party/nixpkgs/pkgs/applications/science/biology/bedtools/default.nix
index d0553bb064..f5aad5d055 100644
--- a/third_party/nixpkgs/pkgs/applications/science/biology/bedtools/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/science/biology/bedtools/default.nix
@@ -1,4 +1,4 @@
-{lib, stdenv, fetchFromGitHub, zlib, python, bzip2, lzma}:
+{lib, stdenv, fetchFromGitHub, zlib, python3, bzip2, lzma}:
stdenv.mkDerivation rec {
pname = "bedtools";
@@ -11,7 +11,13 @@ stdenv.mkDerivation rec {
sha256 = "sha256-NqKldF7ePJn3pT+AkESIQghBKSFFOEBBsTaKEbU+oaQ=";
};
- buildInputs = [ zlib python bzip2 lzma ];
+ strictDeps = true;
+
+ nativeBuildInputs = [
+ python3
+ ];
+
+ buildInputs = [ zlib bzip2 lzma ];
cxx = if stdenv.cc.isClang then "clang++" else "g++";
cc = if stdenv.cc.isClang then "clang" else "gcc";
buildPhase = "make prefix=$out SHELL=${stdenv.shell} CXX=${cxx} CC=${cc} -j $NIX_BUILD_CORES";
diff --git a/third_party/nixpkgs/pkgs/applications/science/biology/picard-tools/default.nix b/third_party/nixpkgs/pkgs/applications/science/biology/picard-tools/default.nix
index 52a17e8d01..ed0d043cd5 100644
--- a/third_party/nixpkgs/pkgs/applications/science/biology/picard-tools/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/science/biology/picard-tools/default.nix
@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "picard-tools";
- version = "2.25.0";
+ version = "2.25.1";
src = fetchurl {
url = "https://github.com/broadinstitute/picard/releases/download/${version}/picard.jar";
- sha256 = "sha256-+vJDTahP4htRbVeBd2eSD97fwZ69wB2cro1tMxT36Jc=";
+ sha256 = "sha256-bW5iLWtGX5/HBMN7y6VbDaxa0U0HCIu9vfreXNAn7hw=";
};
nativeBuildInputs = [ makeWrapper ];
diff --git a/third_party/nixpkgs/pkgs/applications/science/biology/spades/default.nix b/third_party/nixpkgs/pkgs/applications/science/biology/spades/default.nix
index 9fd3510dc9..e6f33d6cde 100644
--- a/third_party/nixpkgs/pkgs/applications/science/biology/spades/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/science/biology/spades/default.nix
@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "SPAdes";
- version = "3.15.1";
+ version = "3.15.2";
src = fetchurl {
url = "http://cab.spbu.ru/files/release${version}/${pname}-${version}.tar.gz";
- sha256 = "sha256-2wZzdFRZ7zyhWwYL+c/5qhKDgj+LPtnge3UNHWJ9Ykk=";
+ sha256 = "03cxz4m1n4rc81lqb4p1pz2ammms7f31wvi4daywfkc13aal6fz9";
};
nativeBuildInputs = [ cmake ];
@@ -19,9 +19,9 @@ stdenv.mkDerivation rec {
meta = with lib; {
description = "St. Petersburg genome assembler: assembly toolkit containing various assembly pipelines";
- license = licenses.gpl2;
+ license = licenses.gpl2Only;
homepage = "http://cab.spbu.ru/software/spades/";
- platforms = platforms.unix;
+ platforms = with platforms; [ "x86_64-linux" "x86_64-darwin"];
maintainers = [ maintainers.bzizou ];
};
}
diff --git a/third_party/nixpkgs/pkgs/applications/science/chemistry/marvin/default.nix b/third_party/nixpkgs/pkgs/applications/science/chemistry/marvin/default.nix
index 23635f8e6c..b4f0d955d6 100644
--- a/third_party/nixpkgs/pkgs/applications/science/chemistry/marvin/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/science/chemistry/marvin/default.nix
@@ -4,12 +4,12 @@ with lib;
stdenv.mkDerivation rec {
pname = "marvin";
- version = "21.2.0";
+ version = "21.3.0";
src = fetchurl {
name = "marvin-${version}.deb";
url = "http://dl.chemaxon.com/marvin/${version}/marvin_linux_${versions.majorMinor version}.deb";
- sha256 = "sha256-CLvMspk7HqrtNM5TD45mZIz6vsS32eUuxFDJiBDs9VY=";
+ sha256 = "sha256-PM4Exi4YD6WibxqtewLzE4dDRgSVHiTT36p68uoQP4g=";
};
nativeBuildInputs = [ dpkg makeWrapper ];
diff --git a/third_party/nixpkgs/pkgs/applications/science/logic/elan/0001-dynamically-patchelf-binaries.patch b/third_party/nixpkgs/pkgs/applications/science/logic/elan/0001-dynamically-patchelf-binaries.patch
new file mode 100644
index 0000000000..b382e6f9e7
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/applications/science/logic/elan/0001-dynamically-patchelf-binaries.patch
@@ -0,0 +1,40 @@
+diff --git a/src/elan-dist/src/component/package.rs b/src/elan-dist/src/component/package.rs
+index fd9fe74..0fefa39 100644
+--- a/src/elan-dist/src/component/package.rs
++++ b/src/elan-dist/src/component/package.rs
+@@ -50,11 +50,35 @@ fn unpack_without_first_dir(archive: &mut tar::Archive, path: &Path)
+ };
+
+ try!(entry.unpack(&full_path).chain_err(|| ErrorKind::ExtractingPackage));
++ nix_patchelf_if_needed(&full_path);
+ }
+
+ Ok(())
+ }
+
++fn nix_patchelf_if_needed(dest_path: &Path) {
++ let (is_bin, is_lib) = if let Some(p) = dest_path.parent() {
++ (p.ends_with("bin"), p.ends_with("lib"))
++ } else {
++ (false, false)
++ };
++
++ if is_bin {
++ let _ = ::std::process::Command::new("@patchelf@/bin/patchelf")
++ .arg("--set-interpreter")
++ .arg("@dynamicLinker@")
++ .arg(dest_path)
++ .output();
++ }
++ else if is_lib {
++ let _ = ::std::process::Command::new("@patchelf@/bin/patchelf")
++ .arg("--set-rpath")
++ .arg("@libPath@")
++ .arg(dest_path)
++ .output();
++ }
++}
++
+ #[derive(Debug)]
+ pub struct ZipPackage<'a>(temp::Dir<'a>);
+
diff --git a/third_party/nixpkgs/pkgs/applications/science/logic/elan/default.nix b/third_party/nixpkgs/pkgs/applications/science/logic/elan/default.nix
index bb10998b2f..fab930e2c7 100644
--- a/third_party/nixpkgs/pkgs/applications/science/logic/elan/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/science/logic/elan/default.nix
@@ -1,24 +1,46 @@
-{ lib, pkg-config, curl, openssl, zlib, fetchFromGitHub, rustPlatform }:
+{ stdenv, lib, runCommand, patchelf, makeWrapper, pkg-config, curl
+, openssl, gmp, zlib, fetchFromGitHub, rustPlatform }:
+
+let
+ libPath = lib.makeLibraryPath [ gmp ];
+in
rustPlatform.buildRustPackage rec {
pname = "elan";
- version = "0.10.3";
+ version = "0.11.0";
src = fetchFromGitHub {
owner = "kha";
repo = "elan";
rev = "v${version}";
- sha256 = "sha256-YkGfuqtvVfPcxJ8UqD5QidcNEy5brTWGEK4fR64Yz70=";
+ sha256 = "1sl69ygdwhf80sx6m76x5gp1kwsw0rr1lv814cgzm8hvyr6g0jqa";
};
- cargoSha256 = "sha256-2fYicpoEERwD4OjdpseKQOkDvZlb7NnOZcb6Tu+rQdA=";
+ cargoSha256 = "1f881maf8jizd5ip7pc1ncbiq7lpggp0byma13pvqk7gisnqyr4r";
- nativeBuildInputs = [ pkg-config ];
+ nativeBuildInputs = [ pkg-config makeWrapper ];
+ OPENSSL_NO_VENDOR = 1;
buildInputs = [ curl zlib openssl ];
cargoBuildFlags = [ "--features no-self-update" ];
+ patches = lib.optionals stdenv.isLinux [
+ # Run patchelf on the downloaded binaries.
+ # This necessary because Lean 4 now dynamically links to GMP.
+ (runCommand "0001-dynamically-patchelf-binaries.patch" {
+ CC = stdenv.cc;
+ patchelf = patchelf;
+ libPath = "$ORIGIN/../lib:${libPath}";
+ } ''
+ export dynamicLinker=$(cat $CC/nix-support/dynamic-linker)
+ substitute ${./0001-dynamically-patchelf-binaries.patch} $out \
+ --subst-var patchelf \
+ --subst-var dynamicLinker \
+ --subst-var libPath
+ '')
+ ];
+
postInstall = ''
pushd $out/bin
mv elan-init elan
@@ -27,6 +49,8 @@ rustPlatform.buildRustPackage rec {
done
popd
+ wrapProgram $out/bin/elan --prefix "LD_LIBRARY_PATH" : "${libPath}"
+
# tries to create .elan
export HOME=$(mktemp -d)
mkdir -p "$out/share/"{bash-completion/completions,fish/vendor_completions.d,zsh/site-functions}
diff --git a/third_party/nixpkgs/pkgs/applications/science/logic/lean/default.nix b/third_party/nixpkgs/pkgs/applications/science/logic/lean/default.nix
index d57db0fd0d..b57ee0f61f 100644
--- a/third_party/nixpkgs/pkgs/applications/science/logic/lean/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/science/logic/lean/default.nix
@@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "lean";
- version = "3.27.0";
+ version = "3.28.0";
src = fetchFromGitHub {
owner = "leanprover-community";
repo = "lean";
rev = "v${version}";
- sha256 = "sha256-DSIWuMlweu9dsah5EdVCNQ9ADjYoEZongfw/Yh7/N/A=";
+ sha256 = "sha256-IzoFE92F559WeSUCiYZ/fx2hrsyRzgOACr3/pzJ4OOY=";
};
nativeBuildInputs = [ cmake ];
diff --git a/third_party/nixpkgs/pkgs/applications/science/math/calc/default.nix b/third_party/nixpkgs/pkgs/applications/science/math/calc/default.nix
index 2df68b49e6..c5a3fd606c 100644
--- a/third_party/nixpkgs/pkgs/applications/science/math/calc/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/science/math/calc/default.nix
@@ -3,14 +3,14 @@
stdenv.mkDerivation rec {
pname = "calc";
- version = "2.12.9.0";
+ version = "2.12.9.1";
src = fetchurl {
urls = [
"https://github.com/lcn2/calc/releases/download/${version}/${pname}-${version}.tar.bz2"
"http://www.isthe.com/chongo/src/calc/${pname}-${version}.tar.bz2"
];
- sha256 = "sha256-334WUhPG30U72hwzpHAZRNdmr/uBleOvEhu3rW9d5dM=";
+ sha256 = "sha256-B3ko+RNT+LYSJG1P5cujgRMc1OJhDPqm1ONrMh+7fI4=";
};
postPatch = ''
diff --git a/third_party/nixpkgs/pkgs/applications/science/math/gap/default.nix b/third_party/nixpkgs/pkgs/applications/science/math/gap/default.nix
index 04a49becc9..ce93c14b33 100644
--- a/third_party/nixpkgs/pkgs/applications/science/math/gap/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/science/math/gap/default.nix
@@ -101,6 +101,9 @@ stdenv.mkDerivation rec {
excludes = ["tst/testinstall/stringobj.tst"];
sha256 = "1mz5b4mbw2jdd1ypp5s0dy6pp0jsvwsxr2dm4kbkls20r1r192sc";
})
+
+ # fixes aarch64 gc crashes: https://github.com/gap-system/gap/pull/3965
+ ./mark-genstackfuncbags-as-noinline.patch
];
postPatch = ''
diff --git a/third_party/nixpkgs/pkgs/applications/science/math/gap/mark-genstackfuncbags-as-noinline.patch b/third_party/nixpkgs/pkgs/applications/science/math/gap/mark-genstackfuncbags-as-noinline.patch
new file mode 100644
index 0000000000..3a2f7231c0
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/applications/science/math/gap/mark-genstackfuncbags-as-noinline.patch
@@ -0,0 +1,13 @@
+diff --git a/src/gasman.c b/src/gasman.c
+index 417811401..314a74190 100644
+--- a/src/gasman.c
++++ b/src/gasman.c
+@@ -1861,7 +1861,7 @@ void SparcStackFuncBags( void )
+ #endif
+
+
+-void GenStackFuncBags ( void )
++NOINLINE void GenStackFuncBags ( void )
+ {
+ Bag * top; /* top of stack */
+ Bag * p; /* loop variable */
diff --git a/third_party/nixpkgs/pkgs/applications/science/math/sage/sage-src.nix b/third_party/nixpkgs/pkgs/applications/science/math/sage/sage-src.nix
index 3e4ed900a9..1fb605b359 100644
--- a/third_party/nixpkgs/pkgs/applications/science/math/sage/sage-src.nix
+++ b/third_party/nixpkgs/pkgs/applications/science/math/sage/sage-src.nix
@@ -87,6 +87,14 @@ stdenv.mkDerivation rec {
rev = "2959ac792ebd6107fe87c9af1541083de5ba02d6";
sha256 = "sha256-bWIpEGir9Kawak5CJegBMNcHm/CqhWmdru+emeSsvO0=";
})
+
+ # fix intermittent errors in doctest/test.py: https://trac.sagemath.org/ticket/26912
+ (fetchSageDiff {
+ base = "9.3.beta8";
+ name = "set-cysignals-crash-ndebug.patch";
+ rev = "ca5257a5d0f32efc9f8f07e126020856270b1a18";
+ sha256 = "sha256-KViw63xE3O0eUiOYzoxNrr4NL+csql9GPJLDJCf/EZs=";
+ })
];
# Patches needed because of package updates. We could just pin the versions of
@@ -153,6 +161,14 @@ stdenv.mkDerivation rec {
rev = "75c1516f0abb9e6f8c335e38e4031f6ef674ed30";
sha256 = "sha256-RukkieIZcXNrju904H2oyGKdtpdE+9vNzvyjN2IBNg0=";
})
+
+ # cypari 2.1.2 update (https://trac.sagemath.org/ticket/31029)
+ (fetchSageDiff {
+ base = "9.3.beta3";
+ name = "cypari-2.1.2-update.patch";
+ rev = "b9aadfd08e81d74ca7c229bb80eb853b592887d0";
+ sha256 = "sha256-eKaMy7kpu+YKdL8bPStgocxBCTfc2Z/10RrGy2LENFw=";
+ })
];
patches = nixPatches ++ bugfixPatches ++ packageUpgradePatches;
diff --git a/third_party/nixpkgs/pkgs/applications/science/medicine/xmedcon/default.nix b/third_party/nixpkgs/pkgs/applications/science/medicine/xmedcon/default.nix
new file mode 100644
index 0000000000..e4a5f22891
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/applications/science/medicine/xmedcon/default.nix
@@ -0,0 +1,36 @@
+{ stdenv
+, lib
+, fetchurl
+, gtk3
+, glib
+, pkg-config
+, libpng
+, zlib
+}:
+
+stdenv.mkDerivation rec {
+ pname = "xmedcon";
+ version = "0.21.0";
+
+ src = fetchurl {
+ url = "https://prdownloads.sourceforge.net/${pname}/${pname}-${version}.tar.bz2";
+ sha256 = "0yfnbrcil5i76z1wbg308pb1mnjbcxy6nih46qpqs038v1lhh4q8";
+ };
+
+ buildInputs = [
+ gtk3
+ glib
+ libpng
+ zlib
+ ];
+
+ nativeBuildInputs = [ pkg-config ];
+
+ meta = with lib; {
+ description = "An open source toolkit for medical image conversion ";
+ homepage = "https://xmedcon.sourceforge.io/Main/HomePage";
+ license = licenses.lgpl2Plus;
+ maintainers = with maintainers; [ arianvp flokli ];
+ platforms = with platforms; [ darwin linux ];
+ };
+}
diff --git a/third_party/nixpkgs/pkgs/applications/science/misc/snakemake/default.nix b/third_party/nixpkgs/pkgs/applications/science/misc/snakemake/default.nix
index edf26f7ec2..b2afc4701a 100644
--- a/third_party/nixpkgs/pkgs/applications/science/misc/snakemake/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/science/misc/snakemake/default.nix
@@ -2,13 +2,14 @@
python3Packages.buildPythonApplication rec {
pname = "snakemake";
- version = "5.28.0";
+ version = "6.0.5";
propagatedBuildInputs = with python3Packages; [
appdirs
ConfigArgParse
datrie
docutils
+ filelock
GitPython
jsonschema
nbformat
@@ -17,19 +18,20 @@ python3Packages.buildPythonApplication rec {
pyyaml
ratelimiter
requests
+ smart_open
toposort
wrapt
];
src = python3Packages.fetchPypi {
inherit pname version;
- sha256 = "2367ce91baf7f8fa7738d33aff9670ffdf5410bbac49aeb209f73b45a3425046";
+ sha256 = "9441169034cce46086a8b45486d75175db645b932e766d28fed312ec837792d3";
};
doCheck = false; # Tests depend on Google Cloud credentials at ${HOME}/gcloud-service-key.json
meta = with lib; {
- homepage = "https://snakemake.readthedocs.io";
+ homepage = "https://snakemake.github.io";
license = licenses.mit;
description = "Python-based execution environment for make-like workflows";
longDescription = ''
diff --git a/third_party/nixpkgs/pkgs/applications/science/physics/professor/default.nix b/third_party/nixpkgs/pkgs/applications/science/physics/professor/default.nix
new file mode 100644
index 0000000000..6d52951ee9
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/applications/science/physics/professor/default.nix
@@ -0,0 +1,41 @@
+{ lib, stdenv, fetchurl, eigen, makeWrapper, python3 }:
+
+stdenv.mkDerivation rec {
+ pname = "professor";
+ version = "2.3.3";
+
+ src = fetchurl {
+ name = "Professor-${version}.tar.gz";
+ url = "https://professor.hepforge.org/downloads/?f=Professor-${version}.tar.gz";
+ sha256 = "17q026r2fpfxzf74d1013ksy3a9m57rcr2q164n9x02ci40bmib0";
+ };
+
+ postPatch = lib.optionalString stdenv.isDarwin ''
+ substituteInPlace Makefile \
+ --replace '-shared -o' '-shared -install_name "$(out)/$@" -o'
+ '';
+
+ nativeBuildInputs = [ python3.pkgs.cython makeWrapper ];
+ buildInputs = [ python3 eigen ];
+ propagatedBuildInputs = with python3.pkgs; [ iminuit numpy matplotlib yoda ];
+
+ CPPFLAGS = [ "-I${eigen}/include/eigen3" ];
+ PREFIX = placeholder "out";
+
+ postInstall = ''
+ for prog in "$out"/bin/*; do
+ wrapProgram "$prog" --set PYTHONPATH "$PYTHONPATH:$(toPythonPath "$out")"
+ done
+ '';
+
+ doInstallCheck = true;
+ installCheckTarget = "check";
+
+ meta = with lib; {
+ description = "A tuning tool for Monte Carlo event generators";
+ homepage = "https://professor.hepforge.org/";
+ license = licenses.unfree; # no license specified
+ maintainers = [ maintainers.veprbl ];
+ platforms = platforms.unix;
+ };
+}
diff --git a/third_party/nixpkgs/pkgs/applications/terminal-emulators/xterm/default.nix b/third_party/nixpkgs/pkgs/applications/terminal-emulators/xterm/default.nix
index 8983b3d990..d5b0a9b3bb 100644
--- a/third_party/nixpkgs/pkgs/applications/terminal-emulators/xterm/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/terminal-emulators/xterm/default.nix
@@ -4,14 +4,14 @@
stdenv.mkDerivation rec {
pname = "xterm";
- version = "366";
+ version = "367";
src = fetchurl {
urls = [
"ftp://ftp.invisible-island.net/xterm/${pname}-${version}.tgz"
"https://invisible-mirror.net/archives/xterm/${pname}-${version}.tgz"
];
- sha256 = "0vmzffy3hzgcgwx305h07ars5sxsq6nnl1ir4xqpxs9zjs2ji2w5";
+ sha256 = "07y51l06n344pjyxdddq6sdvxw25nl10irl4avynkqjnqyqsiw97";
};
buildInputs = [
diff --git a/third_party/nixpkgs/pkgs/applications/version-management/bumpver/default.nix b/third_party/nixpkgs/pkgs/applications/version-management/bumpver/default.nix
index ded8f7ba69..756a031ae1 100644
--- a/third_party/nixpkgs/pkgs/applications/version-management/bumpver/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/version-management/bumpver/default.nix
@@ -2,11 +2,11 @@
python3.pkgs.buildPythonApplication rec {
pname = "bumpver";
- version = "2020.1108";
+ version = "2021.1110";
src = python3.pkgs.fetchPypi {
inherit pname version;
- sha256 = "1bhbrq8fk8rsr78vq9xjz8v9lgv571va0nmg86dwmv6qnj6dymzm";
+ sha256 = "b6a0ddb78db7e00ae7ffe895bf8ef97f91e6310dfc1c4721896bdfd044b1cb03";
};
prePatch = ''
diff --git a/third_party/nixpkgs/pkgs/applications/version-management/git-and-tools/bit/default.nix b/third_party/nixpkgs/pkgs/applications/version-management/git-and-tools/bit/default.nix
new file mode 100644
index 0000000000..e41c2569fc
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/applications/version-management/git-and-tools/bit/default.nix
@@ -0,0 +1,31 @@
+{ lib
+, buildGoModule
+, fetchFromGitHub
+, git
+}:
+
+buildGoModule rec {
+ pname = "bit";
+ version = "1.0.5";
+
+ src = fetchFromGitHub {
+ owner = "chriswalz";
+ repo = pname;
+ rev = "v${version}";
+ sha256 = "0dv6ma2vwb21cbxkxzrpmj7cqlhwr7a86i4g728m3y1aclh411sn";
+ };
+
+ vendorSha256 = "1j6w7bll4zyp99579dhs2rza4y9kgfz3g8d5grfzgqck6cjj9mn8";
+
+ propagatedBuildInputs = [ git ];
+
+ # Tests require a repository
+ doCheck = false;
+
+ meta = with lib; {
+ description = "Command-line tool for git";
+ homepage = "https://github.com/chriswalz/bit";
+ license = with licenses; [ asl20 ];
+ maintainers = with maintainers; [ fab ];
+ };
+}
diff --git a/third_party/nixpkgs/pkgs/applications/version-management/git-and-tools/delta/default.nix b/third_party/nixpkgs/pkgs/applications/version-management/git-and-tools/delta/default.nix
index 4b77853746..20c7f41bc5 100644
--- a/third_party/nixpkgs/pkgs/applications/version-management/git-and-tools/delta/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/version-management/git-and-tools/delta/default.nix
@@ -9,16 +9,16 @@
rustPlatform.buildRustPackage rec {
pname = "delta";
- version = "0.6.0";
+ version = "0.7.1";
src = fetchFromGitHub {
owner = "dandavison";
repo = pname;
rev = version;
- sha256 = "sha256-cEVYU7vMgVxVIKztL6LHcvQjrNRRMrB5XMP/7gPCr5A=";
+ sha256 = "02gm3fxqq91gn1hffy9kc6dkc0y7p09sl6f8njfpsaficij4bs7a";
};
- cargoSha256 = "sha256-iD3Cr1vo0FNyWvAN5m6ND+8sGyekgbkYmIxGTJkPEYE=";
+ cargoSha256 = "1crz7410xfixx2vb1c060fnygwkkp2k2lgh7y1mjjxjzhpybniw5";
nativeBuildInputs = [ installShellFiles ];
diff --git a/third_party/nixpkgs/pkgs/applications/version-management/git-and-tools/git-bug/default.nix b/third_party/nixpkgs/pkgs/applications/version-management/git-and-tools/git-bug/default.nix
index 7a24fe8e03..a90390ddd3 100644
--- a/third_party/nixpkgs/pkgs/applications/version-management/git-and-tools/git-bug/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/version-management/git-and-tools/git-bug/default.nix
@@ -2,17 +2,17 @@
buildGoModule rec {
pname = "git-bug";
- version = "0.7.1"; # the `rev` below pins the version of the source to get
- rev = "2d64b85db71a17ff3277bbbf7ac9d8e81f8e416c";
+ version = "0.7.2"; # the `rev` below pins the version of the source to get
+ rev = "cc4a93c8ce931b1390c61035b888ad17110b7bd6";
src = fetchFromGitHub {
inherit rev;
owner = "MichaelMure";
repo = "git-bug";
- sha256 = "01ab3mlwh5g1vr3x85fppflg18gb8ip9mjfsp2b5rfigd9lxyyns";
+ sha256 = "0r6wh0y1fj3d3fbbrzq5n9k6z94xvwqww3xfbslkgyrin5bmziiq";
};
- vendorSha256 = "0c8b47lj4wl3s21lm0vx4z7hznylm8c4fb8b8gxm278kn3zys607";
+ vendorSha256 = "15hhsrwwjc4krfc2d0r15lys3vr9rb9xk62pan4jr9ycbv0dny90";
doCheck = false;
@@ -32,7 +32,7 @@ buildGoModule rec {
meta = with lib; {
description = "Distributed bug tracker embedded in Git";
homepage = "https://github.com/MichaelMure/git-bug";
- license = licenses.gpl3;
+ license = licenses.gpl3Only;
maintainers = with maintainers; [ royneary ];
};
}
diff --git a/third_party/nixpkgs/pkgs/applications/version-management/git-and-tools/git-extras/default.nix b/third_party/nixpkgs/pkgs/applications/version-management/git-and-tools/git-extras/default.nix
index f2291882b2..387a1cb59c 100644
--- a/third_party/nixpkgs/pkgs/applications/version-management/git-and-tools/git-extras/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/version-management/git-and-tools/git-extras/default.nix
@@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "git-extras";
- version = "6.1.0";
+ version = "6.2.0";
src = fetchFromGitHub {
owner = "tj";
repo = "git-extras";
rev = version;
- sha256 = "12ff9rhgqd71xm72r385hx0h8g75hz0ag0adzqcwfa54k0lhrrrz";
+ sha256 = "sha256-ACuTb1DGft2/32Ezg23jhpl9yua5kUTZ2kKL8KHU+BU=";
};
nativeBuildInputs = [ unixtools.column which ];
diff --git a/third_party/nixpkgs/pkgs/applications/version-management/git-and-tools/git-machete/default.nix b/third_party/nixpkgs/pkgs/applications/version-management/git-and-tools/git-machete/default.nix
index 9933535475..99772f60bc 100644
--- a/third_party/nixpkgs/pkgs/applications/version-management/git-and-tools/git-machete/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/version-management/git-and-tools/git-machete/default.nix
@@ -4,11 +4,11 @@
buildPythonApplication rec {
pname = "git-machete";
- version = "3.0.0";
+ version = "3.1.0";
src = fetchPypi {
inherit pname version;
- sha256 = "077xs3grjidahxz1gc93565b25blf97lwsljmkmr0yapps8z630d";
+ sha256 = "0bb6ap8sdp4ad0xkh3y8vj46a363g5gdw0dzf9ycw0z9ah8ispfx";
};
nativeBuildInputs = [ installShellFiles pbr ];
diff --git a/third_party/nixpkgs/pkgs/applications/version-management/git-lfs/default.nix b/third_party/nixpkgs/pkgs/applications/version-management/git-lfs/default.nix
index c73a927713..5976f1de6a 100644
--- a/third_party/nixpkgs/pkgs/applications/version-management/git-lfs/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/version-management/git-lfs/default.nix
@@ -2,13 +2,13 @@
buildGoPackage rec {
pname = "git-lfs";
- version = "2.13.2";
+ version = "2.13.3";
src = fetchFromGitHub {
rev = "v${version}";
owner = "git-lfs";
repo = "git-lfs";
- sha256 = "0gfpzdya48phwln61746ii78sq55mhzj938lz8x062xkkcsdvbf4";
+ sha256 = "sha256-T4s/xnu5nL6dkEIo7xGywaE+EPH2OnzsaCF9OCGu7WQ=";
};
goPackagePath = "github.com/git-lfs/git-lfs";
diff --git a/third_party/nixpkgs/pkgs/applications/version-management/gitea/default.nix b/third_party/nixpkgs/pkgs/applications/version-management/gitea/default.nix
index cc36dc9ff5..64c98768fd 100644
--- a/third_party/nixpkgs/pkgs/applications/version-management/gitea/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/version-management/gitea/default.nix
@@ -1,5 +1,12 @@
-{ lib, buildGoPackage, fetchurl, makeWrapper
-, git, bash, gzip, openssh, pam
+{ lib
+, buildGoPackage
+, fetchurl
+, makeWrapper
+, git
+, bash
+, gzip
+, openssh
+, pam
, sqliteSupport ? true
, pamSupport ? true
, nixosTests
@@ -9,11 +16,12 @@ with lib;
buildGoPackage rec {
pname = "gitea";
- version = "1.13.5";
+ version = "1.13.6";
+ # not fetching directly from the git repo, because that lacks several vendor files for the web UI
src = fetchurl {
url = "https://github.com/go-gitea/gitea/releases/download/v${version}/gitea-src-${version}.tar.gz";
- sha256 = "08c5gp4qp65mnq4ggzfmyc7n3zcp0js86fz4nj5p249zs9vn1ypd";
+ sha256 = "1f0fsqcmmqygv0r796ddr2fjhh333i9nr0cqk9x2b2kbs1z264vf";
};
unpackPhase = ''
@@ -36,16 +44,18 @@ buildGoPackage rec {
buildInputs = optional pamSupport pam;
- preBuild = let
- tags = optional pamSupport "pam"
+ preBuild =
+ let
+ tags = optional pamSupport "pam"
++ optional sqliteSupport "sqlite sqlite_unlock_notify";
- tagsString = concatStringsSep " " tags;
- in ''
- export buildFlagsArray=(
- -tags="${tagsString}"
- -ldflags='-X "main.Version=${version}" -X "main.Tags=${tagsString}"'
- )
- '';
+ tagsString = concatStringsSep " " tags;
+ in
+ ''
+ export buildFlagsArray=(
+ -tags="${tagsString}"
+ -ldflags='-X "main.Version=${version}" -X "main.Tags=${tagsString}"'
+ )
+ '';
outputs = [ "out" "data" ];
diff --git a/third_party/nixpkgs/pkgs/applications/version-management/gitkraken/default.nix b/third_party/nixpkgs/pkgs/applications/version-management/gitkraken/default.nix
index 4f87dfc7cb..4199cf0910 100644
--- a/third_party/nixpkgs/pkgs/applications/version-management/gitkraken/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/version-management/gitkraken/default.nix
@@ -13,11 +13,11 @@ let
in
stdenv.mkDerivation rec {
pname = "gitkraken";
- version = "7.5.2";
+ version = "7.5.3";
src = fetchzip {
url = "https://release.axocdn.com/linux/GitKraken-v${version}.tar.gz";
- sha256 = "0qd83licmw3p7cl04dki510nsn3kxk31s18g2xlixl8zqs3h08lp";
+ sha256 = "0vxvfq0dh6l1plqbq67gfydr8bh5w3q6d5y3bn3rdia10wa1dac6";
};
dontBuild = true;
diff --git a/third_party/nixpkgs/pkgs/applications/video/catt/default.nix b/third_party/nixpkgs/pkgs/applications/video/catt/default.nix
index e60acf87da..e4225963cb 100644
--- a/third_party/nixpkgs/pkgs/applications/video/catt/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/video/catt/default.nix
@@ -4,11 +4,11 @@ with python3.pkgs;
buildPythonApplication rec {
pname = "catt";
- version = "0.12.0";
+ version = "0.12.1";
src = fetchPypi {
inherit pname version;
- sha256 = "sha256-6RUeinHhAvvSz38hHQP5/MXNiY00rCM8k2ONaFYbwPc=";
+ sha256 = "fef58bf7a8ebaba98399d1077cc4615f53d0196aab2a989df369a66f7111963b";
};
propagatedBuildInputs = [
diff --git a/third_party/nixpkgs/pkgs/applications/video/jellyfin-mpv-shim/default.nix b/third_party/nixpkgs/pkgs/applications/video/jellyfin-mpv-shim/default.nix
index 6dc42a4768..e577abda95 100644
--- a/third_party/nixpkgs/pkgs/applications/video/jellyfin-mpv-shim/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/video/jellyfin-mpv-shim/default.nix
@@ -1,25 +1,68 @@
-{ lib, buildPythonApplication, fetchFromGitHub, callPackage
-, mpv, python-mpv-jsonipc, jellyfin-apiclient-python
-, pillow, tkinter, pystray, jinja2, pywebview }:
+{ lib
+, buildPythonApplication
+, copyDesktopItems
+, fetchPypi
+, makeDesktopItem
+, flask
+, jellyfin-apiclient-python
+, jinja2
+, mpv
+, pillow
+, pydantic
+, pyqtwebengine
+, pystray
+, python-mpv-jsonipc
+, pywebview
+, qt5
+, tkinter
+, werkzeug
+}:
-let
- shaderPack = callPackage ./shader-pack.nix {};
-in
buildPythonApplication rec {
pname = "jellyfin-mpv-shim";
- version = "1.7.1";
+ version = "1.10.3";
- src = fetchFromGitHub {
- owner = "iwalton3";
- repo = pname;
- rev = "v${version}";
- sha256 = "0alrh5h3f8pq9mrq09jmpqa0yslxsjqwij6kwn24ggbwc10zkq75";
- fetchSubmodules = true; # needed for display_mirror css file
+ src = fetchPypi {
+ inherit pname version;
+ sha256 = "sha256-Tl7P8SJ/ZuwIi8RxDWkhfd7LUd63xv5Ehg1UqaYHb1g=";
};
- patches = [
- ./disable-desktop-client.patch
- ./disable-update-check.patch
+ propagatedBuildInputs = [
+ jellyfin-apiclient-python
+ mpv
+ pillow
+ pydantic
+ python-mpv-jsonipc
+
+ # gui dependencies
+ pystray
+ tkinter
+
+ # display_mirror dependencies
+ jinja2
+ pywebview
+
+ # desktop dependencies
+ flask
+ pyqtwebengine
+ werkzeug
+ ];
+
+ nativeBuildInputs = [
+ copyDesktopItems
+ qt5.wrapQtAppsHook
+ ];
+
+ desktopItems = [
+ (makeDesktopItem {
+ name = "Jellyfin Desktop";
+ exec = "jellyfin-desktop";
+ icon = "jellyfin-desktop";
+ desktopName = "jellyfin-desktop";
+ comment = "MPV-based desktop and cast client for Jellyfin";
+ genericName = "MPV-based desktop and cast client for Jellyfin";
+ categories = "Video;AudioVideo;TV;Player";
+ })
];
# override $HOME directory:
@@ -34,31 +77,27 @@ buildPythonApplication rec {
'';
postPatch = ''
- # link the default shader pack
- ln -s ${shaderPack} jellyfin_mpv_shim/default_shader_pack
+ substituteInPlace jellyfin_mpv_shim/conf.py \
+ --replace "check_updates: bool = True" "check_updates: bool = False" \
+ --replace "notify_updates: bool = True" "notify_updates: bool = False"
'';
- propagatedBuildInputs = [
- jellyfin-apiclient-python
- mpv
- pillow
- python-mpv-jsonipc
+ postInstall = ''
+ mkdir -p $out/share/pixmaps
+ cp jellyfin_mpv_shim/integration/jellyfin-256.png $out/share/pixmaps/jellyfin-desktop.png
+ '';
- # gui dependencies
- pystray
- tkinter
-
- # display_mirror dependencies
- jinja2
- pywebview
- ];
+ postFixup = ''
+ wrapQtApp $out/bin/jellyfin-desktop
+ wrapQtApp $out/bin/jellyfin-mpv-desktop
+ '';
# no tests
doCheck = false;
pythonImportsCheck = [ "jellyfin_mpv_shim" ];
meta = with lib; {
- homepage = "https://github.com/iwalton3/jellyfin-mpv-shim";
+ homepage = "https://github.com/jellyfin/jellyfin-desktop";
description = "Allows casting of videos to MPV via the jellyfin mobile and web app";
license = licenses.gpl3;
maintainers = with maintainers; [ jojosch ];
diff --git a/third_party/nixpkgs/pkgs/applications/video/jellyfin-mpv-shim/disable-desktop-client.patch b/third_party/nixpkgs/pkgs/applications/video/jellyfin-mpv-shim/disable-desktop-client.patch
deleted file mode 100644
index 996225efb3..0000000000
--- a/third_party/nixpkgs/pkgs/applications/video/jellyfin-mpv-shim/disable-desktop-client.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff --git a/setup.py b/setup.py
-index a831959..2206e6e 100644
---- a/setup.py
-+++ b/setup.py
-@@ -25,7 +25,6 @@ setup(
- entry_points={
- 'console_scripts': [
- 'jellyfin-mpv-shim=jellyfin_mpv_shim.mpv_shim:main',
-- 'jellyfin-mpv-desktop=jellyfin_mpv_shim.mpv_shim:main_desktop',
- ]
- },
- classifiers=[
diff --git a/third_party/nixpkgs/pkgs/applications/video/jellyfin-mpv-shim/disable-update-check.patch b/third_party/nixpkgs/pkgs/applications/video/jellyfin-mpv-shim/disable-update-check.patch
deleted file mode 100644
index 6941b956e8..0000000000
--- a/third_party/nixpkgs/pkgs/applications/video/jellyfin-mpv-shim/disable-update-check.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-diff --git a/jellyfin_mpv_shim/conf.py b/jellyfin_mpv_shim/conf.py
-index 0ab9326..ccedc17 100644
---- a/jellyfin_mpv_shim/conf.py
-+++ b/jellyfin_mpv_shim/conf.py
-@@ -88,8 +88,8 @@ class Settings(object):
- "sync_revert_seek": True,
- "sync_osd_message": True,
- "screenshot_menu": True,
-- "check_updates": True,
-- "notify_updates": True,
-+ "check_updates": False,
-+ "notify_updates": False,
- "lang": None,
- "desktop_scale": 1.0,
- }
diff --git a/third_party/nixpkgs/pkgs/applications/video/jellyfin-mpv-shim/shader-pack.nix b/third_party/nixpkgs/pkgs/applications/video/jellyfin-mpv-shim/shader-pack.nix
deleted file mode 100644
index 89a601af4a..0000000000
--- a/third_party/nixpkgs/pkgs/applications/video/jellyfin-mpv-shim/shader-pack.nix
+++ /dev/null
@@ -1,25 +0,0 @@
-{ lib, stdenv, fetchFromGitHub }:
-
-stdenv.mkDerivation rec {
- pname = "jellyfin-mpv-shim-shader-pack";
- version = "1.0.0";
-
- src = fetchFromGitHub {
- owner = "iwalton3";
- repo = "default-shader-pack";
- rev = "v${version}";
- sha256 = "04y8gvjy4v3773b1kyan4dxqcf86b56x7v33m2k246jbn0rl2pgr";
- };
-
- installPhase = ''
- mkdir -p $out
- cp -a . $out
- '';
-
- meta = with lib; {
- homepage = "https://github.com/iwalton3/default-shader-pack";
- description = "Preconfigured set of MPV shaders and configurations for MPV Shim media clients";
- license = with licenses; [ mit lgpl3Plus unlicense ];
- maintainers = with maintainers; [ jojosch ];
- };
-}
diff --git a/third_party/nixpkgs/pkgs/applications/video/kodi-packages/a4ksubtitles/default.nix b/third_party/nixpkgs/pkgs/applications/video/kodi-packages/a4ksubtitles/default.nix
new file mode 100644
index 0000000000..5d714cf179
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/applications/video/kodi-packages/a4ksubtitles/default.nix
@@ -0,0 +1,26 @@
+{ lib, buildKodiAddon, fetchFromGitHub, requests, vfs-libarchive }:
+
+buildKodiAddon rec {
+ pname = "a4ksubtitles";
+ namespace = "service.subtitles.a4ksubtitles";
+ version = "2.3.0";
+
+ src = fetchFromGitHub {
+ owner = "a4k-openproject";
+ repo = "a4kSubtitles";
+ rev = "${namespace}/${namespace}-${version}";
+ sha256 = "0hxvxkbihfyvixmlxf5n4ccn70w0244hhw3hr44rqvx00a0bg1lh";
+ };
+
+ propagatedBuildInputs = [
+ requests
+ vfs-libarchive
+ ];
+
+ meta = with lib; {
+ homepage = "https://a4k-openproject.github.io/a4kSubtitles/";
+ description = "Multi-Source Subtitles Addon";
+ license = licenses.mit;
+ maintainers = teams.kodi.members;
+ };
+}
diff --git a/third_party/nixpkgs/pkgs/applications/video/kodi-packages/pvr-hts/default.nix b/third_party/nixpkgs/pkgs/applications/video/kodi-packages/pvr-hts/default.nix
index 5c55873e81..32b4a035bf 100644
--- a/third_party/nixpkgs/pkgs/applications/video/kodi-packages/pvr-hts/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/video/kodi-packages/pvr-hts/default.nix
@@ -2,13 +2,13 @@
buildKodiBinaryAddon rec {
pname = "pvr-hts";
namespace = "pvr.hts";
- version = "8.2.2";
+ version = "8.2.4";
src = fetchFromGitHub {
owner = "kodi-pvr";
repo = "pvr.hts";
rev = "${version}-${rel}";
- sha256 = "0jnn9gfjl556acqjf92wzzn371gxymhbbi665nqgg2gjcan0a49q";
+ sha256 = "sha256-05RSB4ZwwZSzY2b1/MRw6zzl/HhMbeVhCVCOj3gSTWA=";
};
meta = with lib; {
diff --git a/third_party/nixpkgs/pkgs/applications/virtualization/qemu/default.nix b/third_party/nixpkgs/pkgs/applications/virtualization/qemu/default.nix
index 84604c6557..c04d3b3394 100644
--- a/third_party/nixpkgs/pkgs/applications/virtualization/qemu/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/virtualization/qemu/default.nix
@@ -101,6 +101,12 @@ stdenv.mkDerivation rec {
})
];
+ # Otherwise tries to ensure /var/run exists.
+ postPatch = ''
+ sed -i "/install_subdir('run', install_dir: get_option('localstatedir'))/d" \
+ qga/meson.build
+ '';
+
preConfigure = ''
unset CPP # intereferes with dependency calculation
# this script isn't marked as executable b/c it's indirectly used by meson. Needed to patch its shebang
@@ -119,6 +125,7 @@ stdenv.mkDerivation rec {
"--enable-docs"
"--enable-tools"
"--enable-guest-agent"
+ "--localstatedir=/var"
"--sysconfdir=/etc"
]
++ optional numaSupport "--enable-numa"
diff --git a/third_party/nixpkgs/pkgs/applications/virtualization/seabios/default.nix b/third_party/nixpkgs/pkgs/applications/virtualization/seabios/default.nix
index f97f13dab2..42e1eaf56d 100644
--- a/third_party/nixpkgs/pkgs/applications/virtualization/seabios/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/virtualization/seabios/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchurl, iasl, python }:
+{ lib, stdenv, fetchurl, iasl, python3 }:
stdenv.mkDerivation rec {
@@ -10,7 +10,11 @@ stdenv.mkDerivation rec {
sha256 = "1zc1brgafbbf5hmdr1qc1p859cabpz73l8sklq83xa4sn9icqw7b";
};
- buildInputs = [ iasl python ];
+ nativeBuildInputs = [ python3 ];
+
+ buildInputs = [ iasl ];
+
+ strictDeps = true;
hardeningDisable = [ "pic" "stackprotector" "fortify" ];
diff --git a/third_party/nixpkgs/pkgs/applications/window-managers/herbstluftwm/default.nix b/third_party/nixpkgs/pkgs/applications/window-managers/herbstluftwm/default.nix
index a1151dcf82..ce0b40c0bb 100644
--- a/third_party/nixpkgs/pkgs/applications/window-managers/herbstluftwm/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/window-managers/herbstluftwm/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchurl, cmake, pkg-config, python3, libX11, libXext, libXinerama, libXrandr, libXft, freetype, asciidoc-full
+{ lib, stdenv, fetchurl, cmake, pkg-config, python3, libX11, libXext, libXinerama, libXrandr, libXft, freetype, asciidoc
, xdotool, xorgserver, xsetroot, xterm, runtimeShell
, nixosTests }:
@@ -27,7 +27,7 @@ stdenv.mkDerivation rec {
];
depsBuildBuild = [
- asciidoc-full
+ asciidoc
];
buildInputs = [
diff --git a/third_party/nixpkgs/pkgs/build-support/docker/default.nix b/third_party/nixpkgs/pkgs/build-support/docker/default.nix
index fec289f0ff..a73737cb12 100644
--- a/third_party/nixpkgs/pkgs/build-support/docker/default.nix
+++ b/third_party/nixpkgs/pkgs/build-support/docker/default.nix
@@ -729,6 +729,8 @@ rec {
name,
# Image tag, the Nix's output hash will be used if null
tag ? null,
+ # Parent image, to append to.
+ fromImage ? null,
# Files to put on the image (a nix store path or list of paths).
contents ? [],
# Docker config; e.g. what command to run on the container.
@@ -791,7 +793,7 @@ rec {
unnecessaryDrvs = [ baseJson overallClosure ];
conf = runCommand "${baseName}-conf.json" {
- inherit maxLayers created;
+ inherit fromImage maxLayers created;
imageName = lib.toLower name;
passthru.imageTag =
if tag != null
@@ -821,6 +823,27 @@ rec {
unnecessaryDrvs}
}
+ # Compute the number of layers that are already used by a potential
+ # 'fromImage' as well as the customization layer. Ensure that there is
+ # still at least one layer available to store the image contents.
+ usedLayers=0
+
+ # subtract number of base image layers
+ if [[ -n "$fromImage" ]]; then
+ (( usedLayers += $(tar -xOf "$fromImage" manifest.json | jq '.[0].Layers | length') ))
+ fi
+
+ # one layer will be taken up by the customisation layer
+ (( usedLayers += 1 ))
+
+ if ! (( $usedLayers < $maxLayers )); then
+ echo >&2 "Error: usedLayers $usedLayers layers to store 'fromImage' and" \
+ "'extraCommands', but only maxLayers=$maxLayers were" \
+ "allowed. At least 1 layer is required to store contents."
+ exit 1
+ fi
+ availableLayers=$(( maxLayers - usedLayers ))
+
# Create $maxLayers worth of Docker Layers, one layer per store path
# unless there are more paths than $maxLayers. In that case, create
# $maxLayers-1 for the most popular layers, and smush the remainaing
@@ -838,18 +861,20 @@ rec {
| (.[:$maxLayers-1] | map([.])) + [ .[$maxLayers-1:] ]
| map(select(length > 0))
' \
- --argjson maxLayers "$(( maxLayers - 1 ))" # one layer will be taken up by the customisation layer
+ --argjson maxLayers "$availableLayers"
)"
cat ${baseJson} | jq '
. + {
"store_dir": $store_dir,
+ "from_image": $from_image,
"store_layers": $store_layers,
"customisation_layer", $customisation_layer,
"repo_tag": $repo_tag,
"created": $created
}
' --arg store_dir "${storeDir}" \
+ --argjson from_image ${if fromImage == null then "null" else "'\"${fromImage}\"'"} \
--argjson store_layers "$store_layers" \
--arg customisation_layer ${customisationLayer} \
--arg repo_tag "$imageName:$imageTag" \
diff --git a/third_party/nixpkgs/pkgs/build-support/docker/examples.nix b/third_party/nixpkgs/pkgs/build-support/docker/examples.nix
index 9e33a42af2..9c7d468121 100644
--- a/third_party/nixpkgs/pkgs/build-support/docker/examples.nix
+++ b/third_party/nixpkgs/pkgs/build-support/docker/examples.nix
@@ -188,7 +188,25 @@ rec {
};
};
- # 12. example of running something as root on top of a parent image
+ # 12 Create a layered image on top of a layered image
+ layered-on-top-layered = pkgs.dockerTools.buildLayeredImage {
+ name = "layered-on-top-layered";
+ tag = "latest";
+ fromImage = layered-image;
+ extraCommands = ''
+ mkdir ./example-output
+ chmod 777 ./example-output
+ '';
+ config = {
+ Env = [ "PATH=${pkgs.coreutils}/bin/" ];
+ WorkingDir = "/example-output";
+ Cmd = [
+ "${pkgs.bash}/bin/bash" "-c" "echo hello > foo; cat foo"
+ ];
+ };
+ };
+
+ # 13. example of running something as root on top of a parent image
# Regression test related to PR #52109
runAsRootParentImage = buildImage {
name = "runAsRootParentImage";
@@ -197,7 +215,7 @@ rec {
fromImage = bash;
};
- # 13. example of 3 layers images This image is used to verify the
+ # 14. example of 3 layers images This image is used to verify the
# order of layers is correct.
# It allows to validate
# - the layer of parent are below
@@ -235,23 +253,23 @@ rec {
'';
};
- # 14. Environment variable inheritance.
+ # 15. Environment variable inheritance.
# Child image should inherit parents environment variables,
# optionally overriding them.
- environmentVariables = let
- parent = pkgs.dockerTools.buildImage {
- name = "parent";
- tag = "latest";
- config = {
- Env = [
- "FROM_PARENT=true"
- "LAST_LAYER=parent"
- ];
- };
+ environmentVariablesParent = pkgs.dockerTools.buildImage {
+ name = "parent";
+ tag = "latest";
+ config = {
+ Env = [
+ "FROM_PARENT=true"
+ "LAST_LAYER=parent"
+ ];
};
- in pkgs.dockerTools.buildImage {
+ };
+
+ environmentVariables = pkgs.dockerTools.buildImage {
name = "child";
- fromImage = parent;
+ fromImage = environmentVariablesParent;
tag = "latest";
contents = [ pkgs.coreutils ];
config = {
@@ -262,14 +280,27 @@ rec {
};
};
- # 15. Create another layered image, for comparing layers with image 10.
+ environmentVariablesLayered = pkgs.dockerTools.buildLayeredImage {
+ name = "child";
+ fromImage = environmentVariablesParent;
+ tag = "latest";
+ contents = [ pkgs.coreutils ];
+ config = {
+ Env = [
+ "FROM_CHILD=true"
+ "LAST_LAYER=child"
+ ];
+ };
+ };
+
+ # 16. Create another layered image, for comparing layers with image 10.
another-layered-image = pkgs.dockerTools.buildLayeredImage {
name = "another-layered-image";
tag = "latest";
config.Cmd = [ "${pkgs.hello}/bin/hello" ];
};
- # 16. Create a layered image with only 2 layers
+ # 17. Create a layered image with only 2 layers
two-layered-image = pkgs.dockerTools.buildLayeredImage {
name = "two-layered-image";
tag = "latest";
@@ -278,7 +309,7 @@ rec {
maxLayers = 2;
};
- # 17. Create a layered image with more packages than max layers.
+ # 18. Create a layered image with more packages than max layers.
# coreutils and hello are part of the same layer
bulk-layer = pkgs.dockerTools.buildLayeredImage {
name = "bulk-layer";
@@ -289,7 +320,19 @@ rec {
maxLayers = 2;
};
- # 18. Create a "layered" image without nix store layers. This is not
+ # 19. Create a layered image with a base image and more packages than max
+ # layers. coreutils and hello are part of the same layer
+ layered-bulk-layer = pkgs.dockerTools.buildLayeredImage {
+ name = "layered-bulk-layer";
+ tag = "latest";
+ fromImage = two-layered-image;
+ contents = with pkgs; [
+ coreutils hello
+ ];
+ maxLayers = 4;
+ };
+
+ # 20. Create a "layered" image without nix store layers. This is not
# recommended, but can be useful for base images in rare cases.
no-store-paths = pkgs.dockerTools.buildLayeredImage {
name = "no-store-paths";
@@ -321,7 +364,7 @@ rec {
};
};
- # 19. Support files in the store on buildLayeredImage
+ # 21. Support files in the store on buildLayeredImage
# See: https://github.com/NixOS/nixpkgs/pull/91084#issuecomment-653496223
filesInStore = pkgs.dockerTools.buildLayeredImageWithNixDb {
name = "file-in-store";
@@ -341,7 +384,7 @@ rec {
};
};
- # 20. Ensure that setting created to now results in a date which
+ # 22. Ensure that setting created to now results in a date which
# isn't the epoch + 1 for layered images.
unstableDateLayered = pkgs.dockerTools.buildLayeredImage {
name = "unstable-date-layered";
diff --git a/third_party/nixpkgs/pkgs/build-support/docker/stream_layered_image.py b/third_party/nixpkgs/pkgs/build-support/docker/stream_layered_image.py
index 60d67442c1..d7c63eb43a 100644
--- a/third_party/nixpkgs/pkgs/build-support/docker/stream_layered_image.py
+++ b/third_party/nixpkgs/pkgs/build-support/docker/stream_layered_image.py
@@ -33,6 +33,7 @@ function does all this.
import io
import os
+import re
import sys
import json
import hashlib
@@ -126,10 +127,87 @@ class ExtractChecksum:
return (self._digest.hexdigest(), self._size)
+FromImage = namedtuple("FromImage", ["tar", "manifest_json", "image_json"])
# Some metadata for a layer
LayerInfo = namedtuple("LayerInfo", ["size", "checksum", "path", "paths"])
+def load_from_image(from_image_str):
+ """
+ Loads the given base image, if any.
+
+ from_image_str: Path to the base image archive.
+
+ Returns: A 'FromImage' object with references to the loaded base image,
+ or 'None' if no base image was provided.
+ """
+ if from_image_str is None:
+ return None
+
+ base_tar = tarfile.open(from_image_str)
+
+ manifest_json_tarinfo = base_tar.getmember("manifest.json")
+ with base_tar.extractfile(manifest_json_tarinfo) as f:
+ manifest_json = json.load(f)
+
+ image_json_tarinfo = base_tar.getmember(manifest_json[0]["Config"])
+ with base_tar.extractfile(image_json_tarinfo) as f:
+ image_json = json.load(f)
+
+ return FromImage(base_tar, manifest_json, image_json)
+
+
+def add_base_layers(tar, from_image):
+ """
+ Adds the layers from the given base image to the final image.
+
+ tar: 'tarfile.TarFile' object for new layers to be added to.
+ from_image: 'FromImage' object with references to the loaded base image.
+ """
+ if from_image is None:
+ print("No 'fromImage' provided", file=sys.stderr)
+ return []
+
+ layers = from_image.manifest_json[0]["Layers"]
+ checksums = from_image.image_json["rootfs"]["diff_ids"]
+ layers_checksums = zip(layers, checksums)
+
+ for num, (layer, checksum) in enumerate(layers_checksums, start=1):
+ layer_tarinfo = from_image.tar.getmember(layer)
+ checksum = re.sub(r"^sha256:", "", checksum)
+
+ tar.addfile(layer_tarinfo, from_image.tar.extractfile(layer_tarinfo))
+ path = layer_tarinfo.path
+ size = layer_tarinfo.size
+
+ print("Adding base layer", num, "from", path, file=sys.stderr)
+ yield LayerInfo(size=size, checksum=checksum, path=path, paths=[path])
+
+ from_image.tar.close()
+
+
+def overlay_base_config(from_image, final_config):
+ """
+ Overlays the final image 'config' JSON on top of selected defaults from the
+ base image 'config' JSON.
+
+ from_image: 'FromImage' object with references to the loaded base image.
+ final_config: 'dict' object of the final image 'config' JSON.
+ """
+ if from_image is None:
+ return final_config
+
+ base_config = from_image.image_json["config"]
+
+ # Preserve environment from base image
+ final_env = base_config.get("Env", []) + final_config.get("Env", [])
+ if final_env:
+ # Resolve duplicates (last one wins) and format back as list
+ resolved_env = {entry.split("=", 1)[0]: entry for entry in final_env}
+ final_config["Env"] = list(resolved_env.values())
+ return final_config
+
+
def add_layer_dir(tar, paths, store_dir, mtime):
"""
Appends given store paths to a TarFile object as a new layer.
@@ -248,17 +326,21 @@ def main():
mtime = int(created.timestamp())
store_dir = conf["store_dir"]
+ from_image = load_from_image(conf["from_image"])
+
with tarfile.open(mode="w|", fileobj=sys.stdout.buffer) as tar:
layers = []
- for num, store_layer in enumerate(conf["store_layers"]):
- print(
- "Creating layer", num,
- "from paths:", store_layer,
- file=sys.stderr)
+ layers.extend(add_base_layers(tar, from_image))
+
+ start = len(layers) + 1
+ for num, store_layer in enumerate(conf["store_layers"], start=start):
+ print("Creating layer", num, "from paths:", store_layer,
+ file=sys.stderr)
info = add_layer_dir(tar, store_layer, store_dir, mtime=mtime)
layers.append(info)
- print("Creating the customisation layer...", file=sys.stderr)
+ print("Creating layer", len(layers) + 1, "with customisation...",
+ file=sys.stderr)
layers.append(
add_customisation_layer(
tar,
@@ -273,7 +355,7 @@ def main():
"created": datetime.isoformat(created),
"architecture": conf["architecture"],
"os": "linux",
- "config": conf["config"],
+ "config": overlay_base_config(from_image, conf["config"]),
"rootfs": {
"diff_ids": [f"sha256:{layer.checksum}" for layer in layers],
"type": "layers",
diff --git a/third_party/nixpkgs/pkgs/data/documentation/man-pages/default.nix b/third_party/nixpkgs/pkgs/data/documentation/man-pages/default.nix
index f54df83219..d31272c2a5 100644
--- a/third_party/nixpkgs/pkgs/data/documentation/man-pages/default.nix
+++ b/third_party/nixpkgs/pkgs/data/documentation/man-pages/default.nix
@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "man-pages";
- version = "5.10";
+ version = "5.11";
src = fetchurl {
url = "mirror://kernel/linux/docs/man-pages/${pname}-${version}.tar.xz";
- sha256 = "sha256-dRAlNboRny8iP2dNhOHc2uvwpf/WObPC5ssKDjR2h2I=";
+ sha256 = "sha256-PtpdzlGEWZ7Dfa40lM+WTFUDYumkH7ckeS2mEL2xPKo=";
};
makeFlags = [ "MANDIR=$(out)/share/man" ];
diff --git a/third_party/nixpkgs/pkgs/data/fonts/inter-ui/default.nix b/third_party/nixpkgs/pkgs/data/fonts/inter-ui/default.nix
deleted file mode 100644
index 37b48f7ceb..0000000000
--- a/third_party/nixpkgs/pkgs/data/fonts/inter-ui/default.nix
+++ /dev/null
@@ -1,29 +0,0 @@
-{ lib, fetchzip }:
-
-# XXX: IMPORTANT:
-# For compat, keep this at the last version that used the name "Inter UI"
-# For newer versions, which are now simply named "Inter",
-# see the expression for `inter` (../inter/default.nix).
-let
- version = "3.2";
-in fetchzip {
- name = "inter-ui-${version}";
-
- url = "https://github.com/rsms/inter/releases/download/v${version}/Inter-UI-${version}.zip";
-
- postFetch = ''
- mkdir -p $out/share/fonts/opentype
- unzip -j $downloadedFile \*.otf -d $out/share/fonts/opentype
- '';
-
- sha256 = "01d2ql803jrhss6g60djvs08x9xl7z6b3snkn03vqnrajdgifcl4";
-
- meta = with lib; {
- homepage = "https://rsms.me/inter/";
- description = "A typeface specially designed for user interfaces";
- license = licenses.ofl;
- platforms = platforms.all;
- maintainers = with maintainers; [ demize ];
- };
-}
-
diff --git a/third_party/nixpkgs/pkgs/data/fonts/recursive/default.nix b/third_party/nixpkgs/pkgs/data/fonts/recursive/default.nix
index d6929153bf..88c80574e8 100644
--- a/third_party/nixpkgs/pkgs/data/fonts/recursive/default.nix
+++ b/third_party/nixpkgs/pkgs/data/fonts/recursive/default.nix
@@ -1,7 +1,7 @@
{ lib, fetchzip }:
let
- version = "1.071";
+ version = "1.077";
in
fetchzip {
name = "recursive-${version}";
@@ -14,7 +14,7 @@ fetchzip {
unzip -j $downloadedFile \*.ttf -d $out/share/fonts/truetype
'';
- sha256 = "0db410vcvgawb89f11l2v7w3b7l70wzlwwv8df3vnangl3mdv13z";
+ sha256 = "sha256-deztulQ33TIMevEQOP5OS8tmf6UjXT8IiVpRjkdismY=";
meta = with lib; {
homepage = "https://recursive.design/";
diff --git a/third_party/nixpkgs/pkgs/data/fonts/spleen/default.nix b/third_party/nixpkgs/pkgs/data/fonts/spleen/default.nix
index 726f60938b..4dea9253c0 100644
--- a/third_party/nixpkgs/pkgs/data/fonts/spleen/default.nix
+++ b/third_party/nixpkgs/pkgs/data/fonts/spleen/default.nix
@@ -2,7 +2,7 @@
let
pname = "spleen";
- version = "1.8.2";
+ version = "1.9.0";
in fetchurl {
name = "${pname}-${version}";
url = "https://github.com/fcambus/spleen/releases/download/${version}/spleen-${version}.tar.gz";
@@ -19,7 +19,7 @@ in fetchurl {
# create fonts.dir so NixOS xorg module adds to fp
${mkfontscale}/bin/mkfontdir "$d"
'';
- sha256 = "0195d8ssmd8hc0q941z6zwnccffxajv4vylypsndxf28f3ikawby";
+ sha256 = "sha256-hNPbYiU+v7kCYKVyOn+uc5cSlu9bWsC4CwFvfH6StWM=";
meta = with lib; {
description = "Monospaced bitmap fonts";
diff --git a/third_party/nixpkgs/pkgs/data/fonts/stix-two/default.nix b/third_party/nixpkgs/pkgs/data/fonts/stix-two/default.nix
index 3d957f249f..53c4143842 100644
--- a/third_party/nixpkgs/pkgs/data/fonts/stix-two/default.nix
+++ b/third_party/nixpkgs/pkgs/data/fonts/stix-two/default.nix
@@ -1,13 +1,13 @@
{ lib, fetchzip }:
let
- version = "2.11";
+ version = "2.12";
in
fetchzip {
name = "stix-two-${version}";
url = "https://github.com/stipub/stixfonts/raw/v${version}/zipfiles/STIX${builtins.replaceStrings [ "." ] [ "_" ] version}-all.zip";
- sha256 = "19ndavx5k85vm6wvq9603kynpgbfddbjiihivffvnbrxwf13h34n";
+ sha256 = "1a6v8p5zbjlv1gfhph0rzkvnmvxf4n1y0mdrdgng01yyl1nngrn9";
postFetch = ''
mkdir -p $out/share/fonts/
diff --git a/third_party/nixpkgs/pkgs/data/fonts/vista-fonts-chs/default.nix b/third_party/nixpkgs/pkgs/data/fonts/vista-fonts-chs/default.nix
index 5902356703..7c5d9dbba6 100644
--- a/third_party/nixpkgs/pkgs/data/fonts/vista-fonts-chs/default.nix
+++ b/third_party/nixpkgs/pkgs/data/fonts/vista-fonts-chs/default.nix
@@ -1,15 +1,23 @@
-{ lib, fetchzip, buildPackages }:
+{ lib, stdenvNoCC, fetchurl, cabextract }:
-# Modified from vista-fonts
+stdenvNoCC.mkDerivation {
+ pname = "vista-fonts-chs";
+ version = "1";
-fetchzip {
- name = "vista-fonts-chs-1";
+ src = fetchurl {
+ url = "http://web.archive.org/web/20161221192937if_/http://download.microsoft.com/download/d/6/e/d6e2ff26-5821-4f35-a18b-78c963b1535d/VistaFont_CHS.EXE";
+ # Alternative mirror:
+ # http://www.eeo.cn/download/font/VistaFont_CHS.EXE
+ sha256 = "1qwm30b8aq9piyqv07hv8b5bac9ms40rsdf8pwix5dyk8020i8xi";
+ };
- url = "http://download.microsoft.com/download/d/6/e/d6e2ff26-5821-4f35-a18b-78c963b1535d/VistaFont_CHS.EXE";
+ nativeBuildInputs = [ cabextract ];
- postFetch = ''
- ${buildPackages.cabextract}/bin/cabextract --lowercase --filter '*.TTF' $downloadedFile
+ unpackPhase = ''
+ cabextract --lowercase --filter '*.TTF' $src
+ '';
+ installPhase = ''
mkdir -p $out/share/fonts/truetype
cp *.ttf $out/share/fonts/truetype
@@ -20,8 +28,6 @@ fetchzip {
--subst-var-by fontname "Microsoft YaHei"
'';
- sha256 = "1zwrgck84k80gpg7493jdnxnv9ajxk5c7qndinnmqydnrw239zbw";
-
meta = {
description = "TrueType fonts from Microsoft Windows Vista For Simplified Chinese (Microsoft YaHei)";
homepage = "https://www.microsoft.com/typography/fonts/family.aspx?FID=350";
diff --git a/third_party/nixpkgs/pkgs/data/fonts/vista-fonts/default.nix b/third_party/nixpkgs/pkgs/data/fonts/vista-fonts/default.nix
index 20b5b673cc..ca2ae302b3 100644
--- a/third_party/nixpkgs/pkgs/data/fonts/vista-fonts/default.nix
+++ b/third_party/nixpkgs/pkgs/data/fonts/vista-fonts/default.nix
@@ -1,14 +1,22 @@
-{ lib, fetchzip, cabextract }:
+{ lib, stdenvNoCC, fetchurl, cabextract }:
-fetchzip {
- name = "vista-fonts-1";
+stdenvNoCC.mkDerivation {
+ pname = "vista-fonts";
+ version = "1";
- url = "https://web.archive.org/web/20171225132744/http://download.microsoft.com/download/E/6/7/E675FFFC-2A6D-4AB0-B3EB-27C9F8C8F696/PowerPointViewer.exe";
+ src = fetchurl {
+ url = "mirror://sourceforge/mscorefonts2/cabs/PowerPointViewer.exe";
+ sha256 = "07vhjdw8iip7gxk6wvp4myhvbn9619g10j9qvpbzz4ihima57ry4";
+ };
- postFetch = ''
- ${cabextract}/bin/cabextract --lowercase --filter ppviewer.cab $downloadedFile
- ${cabextract}/bin/cabextract --lowercase --filter '*.TTF' ppviewer.cab
+ nativeBuildInputs = [ cabextract ];
+ unpackPhase = ''
+ cabextract --lowercase --filter ppviewer.cab $src
+ cabextract --lowercase --filter '*.TTF' ppviewer.cab
+ '';
+
+ installPhase = ''
mkdir -p $out/share/fonts/truetype
cp *.ttf $out/share/fonts/truetype
@@ -21,8 +29,6 @@ fetchzip {
done
'';
- sha256 = "sha256-x7JSXS9Q1fzlJTVR+MAS3f2+cmo/H0s1qkY9FPjx2zI=";
-
meta = {
description = "Some TrueType fonts from Microsoft Windows Vista (Calibri, Cambria, Candara, Consolas, Constantia, Corbel)";
homepage = "http://www.microsoft.com/typography/ClearTypeFonts.mspx";
diff --git a/third_party/nixpkgs/pkgs/data/fonts/vollkorn/default.nix b/third_party/nixpkgs/pkgs/data/fonts/vollkorn/default.nix
new file mode 100644
index 0000000000..6c5836da5b
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/data/fonts/vollkorn/default.nix
@@ -0,0 +1,29 @@
+{ lib, stdenv, fetchzip }:
+let
+ pname = "vollkorn";
+ version = "4.105";
+in
+fetchzip {
+ name = "${pname}-${version}";
+ url = "http://vollkorn-typeface.com/download/vollkorn-${builtins.replaceStrings ["."] ["-"] version}.zip";
+ sha256 = "0srff2nqs7353mqcpmvaq156lamfh621py4h1771n0l9ix2c8mss";
+ stripRoot = false;
+
+ postFetch = ''
+ mkdir -pv $out/share/{doc/${pname}-${version},fonts/{opentype,truetype,WOFF,WOFF2}}
+ unzip $downloadedFile
+ cp -v {Fontlog,OFL-FAQ,OFL}.txt $out/share/doc/${pname}-${version}/
+ cp -v PS-OTF/*.otf $out/share/fonts/opentype
+ cp -v TTF/*.ttf $out/share/fonts/truetype
+ cp -v WOFF/*.woff $out/share/fonts/WOFF
+ cp -v WOFF2/*.woff2 $out/share/fonts/WOFF2
+ '';
+
+ meta = with lib; {
+ homepage = "http://vollkorn-typeface.com/";
+ description = "The free and healthy typeface for bread and butter use";
+ license = licenses.ofl;
+ platforms = platforms.all;
+ maintainers = [ maintainers.schmittlauch ];
+ };
+}
diff --git a/third_party/nixpkgs/pkgs/data/misc/conway_polynomials/default.nix b/third_party/nixpkgs/pkgs/data/misc/conway_polynomials/default.nix
index f7da9381e6..cabc28a89c 100644
--- a/third_party/nixpkgs/pkgs/data/misc/conway_polynomials/default.nix
+++ b/third_party/nixpkgs/pkgs/data/misc/conway_polynomials/default.nix
@@ -1,13 +1,13 @@
{ lib, stdenv
, fetchurl
-, python
+, python2
}:
stdenv.mkDerivation rec {
pname = "conway_polynomials";
version = "0.5";
- pythonEnv = python.withPackages (ps: with ps; [ six ]);
+ pythonEnv = python2.withPackages (ps: with ps; [ six ]);
src = fetchurl {
url = "mirror://sageupstream/conway_polynomials/conway_polynomials-${version}.tar.bz2";
diff --git a/third_party/nixpkgs/pkgs/data/misc/elliptic_curves/default.nix b/third_party/nixpkgs/pkgs/data/misc/elliptic_curves/default.nix
index 988716f542..9825940002 100644
--- a/third_party/nixpkgs/pkgs/data/misc/elliptic_curves/default.nix
+++ b/third_party/nixpkgs/pkgs/data/misc/elliptic_curves/default.nix
@@ -1,6 +1,6 @@
{ lib, stdenv
, fetchurl
-, python
+, python2
}:
stdenv.mkDerivation rec {
@@ -30,7 +30,7 @@ stdenv.mkDerivation rec {
export SAGE_SHARE="$out/share"
export PYTHONPATH=$PWD
- ${python.interpreter} ${spkg-install}
+ ${python2.interpreter} ${spkg-install}
'';
meta = with lib; {
diff --git a/third_party/nixpkgs/pkgs/data/misc/libkkc-data/default.nix b/third_party/nixpkgs/pkgs/data/misc/libkkc-data/default.nix
index 96130b2de5..7fcd2fbf51 100644
--- a/third_party/nixpkgs/pkgs/data/misc/libkkc-data/default.nix
+++ b/third_party/nixpkgs/pkgs/data/misc/libkkc-data/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchurl, marisa, libkkc }:
+{ lib, stdenv, fetchurl, python2, libkkc }:
stdenv.mkDerivation rec {
pname = "libkkc-data";
@@ -9,7 +9,9 @@ stdenv.mkDerivation rec {
sha256 = "16avb50jasq2f1n9xyziky39dhlnlad0991pisk3s11hl1aqfrwy";
};
- nativeBuildInputs = [ marisa ];
+ nativeBuildInputs = [ python2.pkgs.marisa ];
+
+ strictDeps = true;
meta = with lib; {
description = "Language model data package for libkkc";
diff --git a/third_party/nixpkgs/pkgs/desktops/gnome-3/extensions/appindicator/default.nix b/third_party/nixpkgs/pkgs/desktops/gnome-3/extensions/appindicator/default.nix
index 24709d0f2a..aaf8c92c67 100644
--- a/third_party/nixpkgs/pkgs/desktops/gnome-3/extensions/appindicator/default.nix
+++ b/third_party/nixpkgs/pkgs/desktops/gnome-3/extensions/appindicator/default.nix
@@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "gnome-shell-extension-appindicator";
- version = "35";
+ version = "36";
src = fetchFromGitHub {
owner = "Ubuntu";
repo = "gnome-shell-extension-appindicator";
rev = "v${version}";
- sha256 = "sha256-xVoXVVEULZZnoYEXl1x96Tjs8hOvs9/sOAUVMj9kKCo=";
+ sha256 = "1nx1lgrrp3w5z5hymb91frjdvdkk7x677my5v4jjd330ihqa02dq";
};
# This package has a Makefile, but it's used for building a zip for
diff --git a/third_party/nixpkgs/pkgs/desktops/gnome-3/extensions/sound-output-device-chooser/default.nix b/third_party/nixpkgs/pkgs/desktops/gnome-3/extensions/sound-output-device-chooser/default.nix
index a6444025eb..e58d8ce6e4 100644
--- a/third_party/nixpkgs/pkgs/desktops/gnome-3/extensions/sound-output-device-chooser/default.nix
+++ b/third_party/nixpkgs/pkgs/desktops/gnome-3/extensions/sound-output-device-chooser/default.nix
@@ -7,16 +7,17 @@
stdenv.mkDerivation rec {
pname = "gnome-shell-extension-sound-output-device-chooser";
- version = "32";
+ version = "35";
src = fetchFromGitHub {
owner = "kgshank";
repo = "gse-sound-output-device-chooser";
rev = version;
- sha256 = "1s83scr80qv5xmlfsy6dnsj96lwg2rr4pbsw9inld3ylblgvi35l";
+ sha256 = "sha256-Yl5ut6kJAkAAdCBiNFpwDgshXCLMmFH3/zhnFGpyKqs=";
};
patches = [
+ # Fix paths to libpulse and python
(substituteAll {
src = ./fix-paths.patch;
libpulse = "${libpulseaudio}/lib/libpulse.so";
@@ -36,7 +37,7 @@ stdenv.mkDerivation rec {
meta = with lib; {
description = "GNOME Shell extension adding audio device chooser to panel";
- license = licenses.gpl3;
+ license = licenses.gpl3Plus;
maintainers = with maintainers; [ jtojnar ];
homepage = "https://github.com/kgshank/gse-sound-output-device-chooser";
};
diff --git a/third_party/nixpkgs/pkgs/desktops/gnome-3/extensions/sound-output-device-chooser/fix-paths.patch b/third_party/nixpkgs/pkgs/desktops/gnome-3/extensions/sound-output-device-chooser/fix-paths.patch
index 5957cb956f..1971bf1e5e 100644
--- a/third_party/nixpkgs/pkgs/desktops/gnome-3/extensions/sound-output-device-chooser/fix-paths.patch
+++ b/third_party/nixpkgs/pkgs/desktops/gnome-3/extensions/sound-output-device-chooser/fix-paths.patch
@@ -2,20 +2,20 @@ diff --git a/sound-output-device-chooser@kgshank.net/convenience.js b/sound-outp
index 54ad06f..0860531 100644
--- a/sound-output-device-chooser@kgshank.net/convenience.js
+++ b/sound-output-device-chooser@kgshank.net/convenience.js
-@@ -129,7 +129,7 @@ function refreshCards() {
- if(_settings.get_boolean(Prefs.NEW_PROFILE_ID)) {
+@@ -142,7 +142,7 @@ function refreshCards() {
+ if (newProfLogic) {
_log("New logic");
- let pyLocation = Me.dir.get_child('utils/pa_helper.py').get_path();
-- let pythonExec = 'python';
+ let pyLocation = Me.dir.get_child("utils/pa_helper.py").get_path();
+- let pythonExec = ["python", "python3", "python2"].find(cmd => isCmdFound(cmd));
+ let pythonExec = '@python@';
- let pyVer = 3;
- while(!isCmdFound(pythonExec) && pyVer >=2){
- _log(pythonExec + " is not found. Try next");
+ if (!pythonExec) {
+ _log("ERROR: Python not found. fallback to default mode");
+ _settings.set_boolean(Prefs.NEW_PROFILE_ID, false);
diff --git a/sound-output-device-chooser@kgshank.net/utils/libpulse_introspect.py b/sound-output-device-chooser@kgshank.net/utils/libpulse_introspect.py
index c4d2484..262608d 100644
--- a/sound-output-device-chooser@kgshank.net/utils/libpulse_introspect.py
+++ b/sound-output-device-chooser@kgshank.net/utils/libpulse_introspect.py
-@@ -86,7 +86,7 @@ else:
+@@ -82,7 +82,7 @@ else:
_libraries = {}
diff --git a/third_party/nixpkgs/pkgs/desktops/gnome-3/extensions/unite/default.nix b/third_party/nixpkgs/pkgs/desktops/gnome-3/extensions/unite/default.nix
index 1949b97faf..e2f7f54757 100644
--- a/third_party/nixpkgs/pkgs/desktops/gnome-3/extensions/unite/default.nix
+++ b/third_party/nixpkgs/pkgs/desktops/gnome-3/extensions/unite/default.nix
@@ -1,13 +1,13 @@
-{ lib, stdenv, gnome3, fetchFromGitHub, xprop, glib, coreutils }:
+{ lib, stdenv, gnome3, fetchFromGitHub, xprop, glib }:
stdenv.mkDerivation rec {
pname = "gnome-shell-extension-unite";
- version = "45";
+ version = "48";
src = fetchFromGitHub {
owner = "hardpixel";
repo = "unite-shell";
rev = "v${version}";
- sha256 = "sha256-ghmCnzlPvxHEy2ro1AL+T2yiavJVrPhRfIKbMBwMjac=";
+ sha256 = "1rc9h7zrg9pvyl619ychcp0w7wmnf4ndaq2knv490kzhy0idj18j";
};
uuid = "unite@hardpixel.eu";
diff --git a/third_party/nixpkgs/pkgs/desktops/gnome-3/misc/gnome-autoar/default.nix b/third_party/nixpkgs/pkgs/desktops/gnome-3/misc/gnome-autoar/default.nix
index 0ea59c3fc4..2d66dabb5a 100644
--- a/third_party/nixpkgs/pkgs/desktops/gnome-3/misc/gnome-autoar/default.nix
+++ b/third_party/nixpkgs/pkgs/desktops/gnome-3/misc/gnome-autoar/default.nix
@@ -11,13 +11,13 @@
stdenv.mkDerivation rec {
pname = "gnome-autoar";
- version = "0.3.0";
+ version = "0.3.1";
outputs = [ "out" "dev" ];
src = fetchurl {
url = "mirror://gnome/sources/gnome-autoar/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
- sha256 = "0ssqckfkyldwld88zizy446y2359rg40lnrcm3sjpjhc2b015hgj";
+ sha256 = "1y6hh5dldhdq7mpbmd571zl0yadfackvifhnxvykkqqddwz72y0f";
};
passthru = {
diff --git a/third_party/nixpkgs/pkgs/desktops/plasma-5/fetch.sh b/third_party/nixpkgs/pkgs/desktops/plasma-5/fetch.sh
index 1a739585ef..10214b3fe2 100644
--- a/third_party/nixpkgs/pkgs/desktops/plasma-5/fetch.sh
+++ b/third_party/nixpkgs/pkgs/desktops/plasma-5/fetch.sh
@@ -1 +1 @@
-WGET_ARGS=( https://download.kde.org/stable/plasma/5.21.1/ -A '*.tar.xz' )
+WGET_ARGS=( https://download.kde.org/stable/plasma/5.21.3/ -A '*.tar.xz' )
diff --git a/third_party/nixpkgs/pkgs/desktops/plasma-5/kwin/0001-NixOS-Unwrap-executable-name-for-.desktop-search.patch b/third_party/nixpkgs/pkgs/desktops/plasma-5/kwin/0001-NixOS-Unwrap-executable-name-for-.desktop-search.patch
new file mode 100644
index 0000000000..7216f54b6c
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/desktops/plasma-5/kwin/0001-NixOS-Unwrap-executable-name-for-.desktop-search.patch
@@ -0,0 +1,57 @@
+From 29ec6fada935ef966e5859082435ed57daa9522d Mon Sep 17 00:00:00 2001
+From: Samuel Dionne-Riel
+Date: Tue, 16 Mar 2021 15:03:59 -0400
+Subject: [PATCH] [NixOS] Unwrap executable name for .desktop search
+
+Why is this necessary even though -a "$0" is used in the wrapper?
+Because it's completely bypassing argv0! This looks at the executable
+file in-use according to the kernel!
+
+Wrappers cannot affect the `/proc/.../exe` symlink!
+---
+ service_utils.h | 28 +++++++++++++++++++++++++++-
+ 1 file changed, 27 insertions(+), 1 deletion(-)
+
+diff --git a/service_utils.h b/service_utils.h
+index 8a70c1fad..6674f553b 100644
+--- a/service_utils.h
++++ b/service_utils.h
+@@ -26,8 +26,34 @@ namespace KWin
+ const static QString s_waylandInterfaceName = QStringLiteral("X-KDE-Wayland-Interfaces");
+ const static QString s_dbusRestrictedInterfaceName = QStringLiteral("X-KDE-DBUS-Restricted-Interfaces");
+
+-static QStringList fetchProcessServiceField(const QString &executablePath, const QString &fieldName)
++static QStringList fetchProcessServiceField(const QString &in_executablePath, const QString &fieldName)
+ {
++ // !! Start NixOS fix
++ // NixOS fixes many packaging issues through "wrapper" scripts that manipulates the environment or does
++ // miscellaneous trickeries and mischievous things to make the programs work.
++ // In turn, programs often employs different mischievous schemes and trickeries to do *other things.
++ // It often happens that they conflict.
++ // Here, `kwin` tries to detect the .desktop file for a given process.
++ // `kwin` followed the process `/proc/.../exe` up to the actual binary running.
++ // It normally would be fine, e.g. /usr/bin/foobar is what's in the desktop file.
++ // But it's not the truth here! It's extremely likely the resolved path is /nix/store/.../bin/.foobar-wrapped
++ // rather than what the desktop file points to, something like /nix/store/.../bin/foobar !!
++ // Since the wrappers for Nixpkgs *always* prepend a dot and append -wrapped, we assume here that we can keep
++ // `/^(.*)\/\.([^/]*)-wrapped/` until the (equivalent) regex does not match.
++ // This should canonicalize the wrapper name to the expected name to look for in the desktop file.
++
++ // Use a copy of the const string
++ QString executablePath(in_executablePath);
++
++ // While the parts needed are present, "unwrap" one layer of wrapper names.
++ while (executablePath.endsWith("-wrapped") && executablePath[executablePath.lastIndexOf("/")+1] == QChar('.')) {
++ // Approximately equivalent to s/-wrapped$//
++ executablePath.remove(executablePath.length() - 8, 8);
++ // Approximately equivalent to s;/\.;/;
++ executablePath.remove(executablePath.lastIndexOf("/")+1, 1);
++ }
++ // !! End NixOS fix
++
+ // needed to be able to use the logging category in a header static function
+ static QLoggingCategory KWIN_UTILS ("KWIN_UTILS", QtWarningMsg);
+ const auto servicesFound = KApplicationTrader::query([&executablePath] (const KService::Ptr &service) {
+--
+2.28.0
+
diff --git a/third_party/nixpkgs/pkgs/desktops/plasma-5/kwin/0001-follow-symlinks.patch b/third_party/nixpkgs/pkgs/desktops/plasma-5/kwin/0001-follow-symlinks.patch
index 4861df46ca..06b3653ace 100644
--- a/third_party/nixpkgs/pkgs/desktops/plasma-5/kwin/0001-follow-symlinks.patch
+++ b/third_party/nixpkgs/pkgs/desktops/plasma-5/kwin/0001-follow-symlinks.patch
@@ -1,17 +1,17 @@
-From 449896c45b23f50c168d8d2789832024c906ec36 Mon Sep 17 00:00:00 2001
+From af569c9ed8079169b524b31461e2789baa09ef7a Mon Sep 17 00:00:00 2001
From: Thomas Tuegel
Date: Mon, 27 Jan 2020 05:31:13 -0600
-Subject: [PATCH 1/2] follow symlinks
+Subject: [PATCH 1/3] follow symlinks
---
plugins/kdecorations/aurorae/src/aurorae.cpp | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/plugins/kdecorations/aurorae/src/aurorae.cpp b/plugins/kdecorations/aurorae/src/aurorae.cpp
-index fd723a8..fb95633 100644
+index 5242cb7..2e4ddae 100644
--- a/plugins/kdecorations/aurorae/src/aurorae.cpp
+++ b/plugins/kdecorations/aurorae/src/aurorae.cpp
-@@ -211,7 +211,7 @@ void Helper::init()
+@@ -201,7 +201,7 @@ void Helper::init()
// so let's try to locate our plugin:
QString pluginPath;
for (const QString &path : m_engine->importPathList()) {
@@ -21,5 +21,5 @@ index fd723a8..fb95633 100644
it.next();
QFileInfo fileInfo = it.fileInfo();
--
-2.23.1
+2.29.2
diff --git a/third_party/nixpkgs/pkgs/desktops/plasma-5/kwin/0002-xwayland.patch b/third_party/nixpkgs/pkgs/desktops/plasma-5/kwin/0002-xwayland.patch
index 0505810abe..312daa0938 100644
--- a/third_party/nixpkgs/pkgs/desktops/plasma-5/kwin/0002-xwayland.patch
+++ b/third_party/nixpkgs/pkgs/desktops/plasma-5/kwin/0002-xwayland.patch
@@ -1,17 +1,17 @@
-From d584b075d71c4486710c0bbed6d44038f2ff5075 Mon Sep 17 00:00:00 2001
+From 5c90dd84f541bd4789525f12f12ad24411b99018 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel
Date: Mon, 27 Jan 2020 05:31:23 -0600
-Subject: [PATCH 2/2] xwayland
+Subject: [PATCH 2/3] xwayland
---
xwl/xwayland.cpp | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/xwl/xwayland.cpp b/xwl/xwayland.cpp
-index 5f17d39..b4b69ba 100644
+index 57efdde..a211a58 100644
--- a/xwl/xwayland.cpp
+++ b/xwl/xwayland.cpp
-@@ -145,7 +145,7 @@ void Xwayland::init()
+@@ -124,7 +124,7 @@ void Xwayland::start()
m_xwaylandProcess = new Process(this);
m_xwaylandProcess->setProcessChannelMode(QProcess::ForwardedErrorChannel);
@@ -21,5 +21,5 @@ index 5f17d39..b4b69ba 100644
env.insert("WAYLAND_SOCKET", QByteArray::number(wlfd));
env.insert("EGL_PLATFORM", QByteArrayLiteral("DRM"));
--
-2.23.1
+2.29.2
diff --git a/third_party/nixpkgs/pkgs/desktops/plasma-5/kwin/0003-plugins-qpa-allow-using-nixos-wrapper.patch b/third_party/nixpkgs/pkgs/desktops/plasma-5/kwin/0003-plugins-qpa-allow-using-nixos-wrapper.patch
new file mode 100644
index 0000000000..eaffaf5918
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/desktops/plasma-5/kwin/0003-plugins-qpa-allow-using-nixos-wrapper.patch
@@ -0,0 +1,26 @@
+From 8d49f5ef8692c352a62f4f8b1bc68e6e210bbee6 Mon Sep 17 00:00:00 2001
+From: Yaroslav Bolyukin
+Date: Wed, 23 Dec 2020 18:02:14 +0300
+Subject: [PATCH 3/3] plugins/qpa: allow using nixos wrapper
+
+Signed-off-by: Yaroslav Bolyukin
+---
+ plugins/qpa/main.cpp | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/plugins/qpa/main.cpp b/plugins/qpa/main.cpp
+index efd236b..a69c046 100644
+--- a/plugins/qpa/main.cpp
++++ b/plugins/qpa/main.cpp
+@@ -23,7 +23,7 @@ public:
+ QPlatformIntegration *KWinIntegrationPlugin::create(const QString &system, const QStringList ¶mList)
+ {
+ Q_UNUSED(paramList)
+- if (!QCoreApplication::applicationFilePath().endsWith(QLatin1String("kwin_wayland")) && !qEnvironmentVariableIsSet("KWIN_FORCE_OWN_QPA")) {
++ if (!QCoreApplication::applicationFilePath().endsWith(QLatin1String("kwin_wayland")) && !QCoreApplication::applicationFilePath().endsWith(QLatin1String(".kwin_wayland-wrapped")) && !qEnvironmentVariableIsSet("KWIN_FORCE_OWN_QPA")) {
+ // Not KWin
+ return nullptr;
+ }
+--
+2.29.2
+
diff --git a/third_party/nixpkgs/pkgs/desktops/plasma-5/kwin/default.nix b/third_party/nixpkgs/pkgs/desktops/plasma-5/kwin/default.nix
index f127cc37ee..2008529a38 100644
--- a/third_party/nixpkgs/pkgs/desktops/plasma-5/kwin/default.nix
+++ b/third_party/nixpkgs/pkgs/desktops/plasma-5/kwin/default.nix
@@ -37,6 +37,8 @@ mkDerivation {
patches = [
./0001-follow-symlinks.patch
./0002-xwayland.patch
+ ./0003-plugins-qpa-allow-using-nixos-wrapper.patch
+ ./0001-NixOS-Unwrap-executable-name-for-.desktop-search.patch
];
CXXFLAGS = [
''-DNIXPKGS_XWAYLAND=\"${lib.getBin xwayland}/bin/Xwayland\"''
diff --git a/third_party/nixpkgs/pkgs/desktops/plasma-5/plasma-workspace/default.nix b/third_party/nixpkgs/pkgs/desktops/plasma-5/plasma-workspace/default.nix
index 69d7d508d5..b65bc7df8e 100644
--- a/third_party/nixpkgs/pkgs/desktops/plasma-5/plasma-workspace/default.nix
+++ b/third_party/nixpkgs/pkgs/desktops/plasma-5/plasma-workspace/default.nix
@@ -53,9 +53,10 @@ mkDerivation {
./0002-absolute-wallpaper-install-dir.patch
];
+ # QT_INSTALL_BINS refers to qtbase, and qdbus is in qttools
postPatch = ''
- substituteInPlace wallpapers/image/wallpaper.knsrc.cmake \
- --replace '@QtBinariesDir@/qdbus' ${getBin qttools}/bin/qdbus
+ substituteInPlace CMakeLists.txt \
+ --replace 'query_qmake(QtBinariesDir QT_INSTALL_BINS)' 'set(QtBinariesDir "${lib.getBin qttools}/bin")'
'';
NIX_CFLAGS_COMPILE = [
diff --git a/third_party/nixpkgs/pkgs/desktops/plasma-5/srcs.nix b/third_party/nixpkgs/pkgs/desktops/plasma-5/srcs.nix
index 96a60ac5e4..bf93e0564d 100644
--- a/third_party/nixpkgs/pkgs/desktops/plasma-5/srcs.nix
+++ b/third_party/nixpkgs/pkgs/desktops/plasma-5/srcs.nix
@@ -1,422 +1,422 @@
# DO NOT EDIT! This file is generated automatically.
-# Command: ./maintainers/scripts/fetch-kde-qt.sh pkgs/desktops/plasma-5/
+# Command: ./maintainers/scripts/fetch-kde-qt.sh pkgs/desktops/plasma-5
{ fetchurl, mirror }:
{
bluedevil = {
- version = "5.21.1";
+ version = "5.21.3";
src = fetchurl {
- url = "${mirror}/stable/plasma/5.21.1/bluedevil-5.21.1.tar.xz";
- sha256 = "0b69gacp5cbl32m92k2j36cqq38lpxlybx3wnzj1148j6wvfbajn";
- name = "bluedevil-5.21.1.tar.xz";
+ url = "${mirror}/stable/plasma/5.21.3/bluedevil-5.21.3.tar.xz";
+ sha256 = "1xqm4bn97asilc4yw5rvmmhk7c7wvmbalalr6gz8gw4gv0pg67qv";
+ name = "bluedevil-5.21.3.tar.xz";
};
};
breeze = {
- version = "5.21.1";
+ version = "5.21.3";
src = fetchurl {
- url = "${mirror}/stable/plasma/5.21.1/breeze-5.21.1.tar.xz";
- sha256 = "1xdpsc4nf0556x9iimszi287jjks8qpqi45n81iccbcz91i5bnb5";
- name = "breeze-5.21.1.tar.xz";
+ url = "${mirror}/stable/plasma/5.21.3/breeze-5.21.3.tar.xz";
+ sha256 = "0frm3f8q1n0pdzjk7zwmvlrl19fb9265ihnnfhak6ckaq50x72l3";
+ name = "breeze-5.21.3.tar.xz";
};
};
breeze-grub = {
- version = "5.21.1";
+ version = "5.21.3";
src = fetchurl {
- url = "${mirror}/stable/plasma/5.21.1/breeze-grub-5.21.1.tar.xz";
- sha256 = "0w0kkdqliliy72f41xps0a2mr0rf4kn08immichcvrm47r9bjr37";
- name = "breeze-grub-5.21.1.tar.xz";
+ url = "${mirror}/stable/plasma/5.21.3/breeze-grub-5.21.3.tar.xz";
+ sha256 = "1j0pk4pv5pxwhwah1gd5znnsw3j15x2sc74pp6zinz9a1ywjklnz";
+ name = "breeze-grub-5.21.3.tar.xz";
};
};
breeze-gtk = {
- version = "5.21.1";
+ version = "5.21.3";
src = fetchurl {
- url = "${mirror}/stable/plasma/5.21.1/breeze-gtk-5.21.1.tar.xz";
- sha256 = "14xq2796n8927362851kffpvxxscw82sm5j9ghsb24hr860zcdk7";
- name = "breeze-gtk-5.21.1.tar.xz";
+ url = "${mirror}/stable/plasma/5.21.3/breeze-gtk-5.21.3.tar.xz";
+ sha256 = "1x5by915lfhbkhgrhy3lkwg64skwdlqaxzbq92x0m9v9a9agwidc";
+ name = "breeze-gtk-5.21.3.tar.xz";
};
};
breeze-plymouth = {
- version = "5.21.1";
+ version = "5.21.3";
src = fetchurl {
- url = "${mirror}/stable/plasma/5.21.1/breeze-plymouth-5.21.1.tar.xz";
- sha256 = "0xgxmh5gnjz8r5h97arsb1ddvizfpajw6zfwrkrsiw0kxkb0ppn9";
- name = "breeze-plymouth-5.21.1.tar.xz";
+ url = "${mirror}/stable/plasma/5.21.3/breeze-plymouth-5.21.3.tar.xz";
+ sha256 = "01ida3pfj6g1igndjfjpv16199zysgxlxlnc7vsx7kr8aval8pmx";
+ name = "breeze-plymouth-5.21.3.tar.xz";
};
};
discover = {
- version = "5.21.1";
+ version = "5.21.3";
src = fetchurl {
- url = "${mirror}/stable/plasma/5.21.1/discover-5.21.1.tar.xz";
- sha256 = "1a1wmils7ijkvn1x5gqrdg3rv7mcnh0gaaig9ca555qqc2ab0ivl";
- name = "discover-5.21.1.tar.xz";
+ url = "${mirror}/stable/plasma/5.21.3/discover-5.21.3.tar.xz";
+ sha256 = "170kxhrwj4mvj5qg7cyz3sxdfyp7rr4pgsi3v7kahs19a9w3isnx";
+ name = "discover-5.21.3.tar.xz";
};
};
drkonqi = {
- version = "5.21.1";
+ version = "5.21.3";
src = fetchurl {
- url = "${mirror}/stable/plasma/5.21.1/drkonqi-5.21.1.tar.xz";
- sha256 = "1iqk9mg5bi5yn9ccalwva8yshamrmsx4kfww8imxv8mhmq9p4mib";
- name = "drkonqi-5.21.1.tar.xz";
+ url = "${mirror}/stable/plasma/5.21.3/drkonqi-5.21.3.tar.xz";
+ sha256 = "1hq37vi0vndhy66labspm75blicx1g4q594wxfxzl076mav5jds4";
+ name = "drkonqi-5.21.3.tar.xz";
};
};
kactivitymanagerd = {
- version = "5.21.1";
+ version = "5.21.3";
src = fetchurl {
- url = "${mirror}/stable/plasma/5.21.1/kactivitymanagerd-5.21.1.tar.xz";
- sha256 = "1wzwkyylk4qsiab7jzlw62mfv5r3pxdk3vqyydca112836nhbdj3";
- name = "kactivitymanagerd-5.21.1.tar.xz";
+ url = "${mirror}/stable/plasma/5.21.3/kactivitymanagerd-5.21.3.tar.xz";
+ sha256 = "1x5p6rbjf9kz07r5mrkiglvbigvk5bfx8qpb8l2vagsbvlg298c3";
+ name = "kactivitymanagerd-5.21.3.tar.xz";
};
};
kde-cli-tools = {
- version = "5.21.1";
+ version = "5.21.3";
src = fetchurl {
- url = "${mirror}/stable/plasma/5.21.1/kde-cli-tools-5.21.1.tar.xz";
- sha256 = "0835323rbb3akhzdnjxb2myfbfz0wh3c5j1jih4l9zqr0ixx9lb3";
- name = "kde-cli-tools-5.21.1.tar.xz";
+ url = "${mirror}/stable/plasma/5.21.3/kde-cli-tools-5.21.3.tar.xz";
+ sha256 = "0hkmr3zxg4np1ppsgj77ijgkwgvl7d0zxwl46xjc2px877lx8bpp";
+ name = "kde-cli-tools-5.21.3.tar.xz";
};
};
kdecoration = {
- version = "5.21.1";
+ version = "5.21.3";
src = fetchurl {
- url = "${mirror}/stable/plasma/5.21.1/kdecoration-5.21.1.tar.xz";
- sha256 = "1qy848hvqiar3vj7cz0srszybqj9sf5lfip8ws0fwllqgsa5v505";
- name = "kdecoration-5.21.1.tar.xz";
+ url = "${mirror}/stable/plasma/5.21.3/kdecoration-5.21.3.tar.xz";
+ sha256 = "06a3gsf1lyjxccjzn0ad254wsf7x2bln2i6kyk5j4gwqss6lplf5";
+ name = "kdecoration-5.21.3.tar.xz";
};
};
kde-gtk-config = {
- version = "5.21.1";
+ version = "5.21.3";
src = fetchurl {
- url = "${mirror}/stable/plasma/5.21.1/kde-gtk-config-5.21.1.tar.xz";
- sha256 = "0nq741x9flnyzhgj5h4r1774b11211ab0lcclhlji9ch7kqxs8dc";
- name = "kde-gtk-config-5.21.1.tar.xz";
+ url = "${mirror}/stable/plasma/5.21.3/kde-gtk-config-5.21.3.tar.xz";
+ sha256 = "17fyan2jah059kj1i0sy7h901a4d2k7cc87sd84mskyys7g8vs1h";
+ name = "kde-gtk-config-5.21.3.tar.xz";
};
};
kdeplasma-addons = {
- version = "5.21.1";
+ version = "5.21.3";
src = fetchurl {
- url = "${mirror}/stable/plasma/5.21.1/kdeplasma-addons-5.21.1.tar.xz";
- sha256 = "0xpki1kabdm4fwifx0xsb0isig9dnzks4zfglrkg9g0nafahsbf8";
- name = "kdeplasma-addons-5.21.1.tar.xz";
+ url = "${mirror}/stable/plasma/5.21.3/kdeplasma-addons-5.21.3.tar.xz";
+ sha256 = "1181ax96csn4170p5blvhr679d7l865nby5a66swscyl3a5ys8b1";
+ name = "kdeplasma-addons-5.21.3.tar.xz";
};
};
kgamma5 = {
- version = "5.21.1";
+ version = "5.21.3";
src = fetchurl {
- url = "${mirror}/stable/plasma/5.21.1/kgamma5-5.21.1.tar.xz";
- sha256 = "1316l73jj4b41mrsk1vba3g4mdj0q6hxazqqkvzrcinzwr34p3l2";
- name = "kgamma5-5.21.1.tar.xz";
+ url = "${mirror}/stable/plasma/5.21.3/kgamma5-5.21.3.tar.xz";
+ sha256 = "0h8rwwd6lyfzmxsr5sfvllh1j8gk1pbq1w2fva8q534qrkqhqb49";
+ name = "kgamma5-5.21.3.tar.xz";
};
};
khotkeys = {
- version = "5.21.1";
+ version = "5.21.3";
src = fetchurl {
- url = "${mirror}/stable/plasma/5.21.1/khotkeys-5.21.1.tar.xz";
- sha256 = "1kp6s1qgzz6j5z4widy5hqnwyh90vw3adf47jk54msdzlh2ak0q7";
- name = "khotkeys-5.21.1.tar.xz";
+ url = "${mirror}/stable/plasma/5.21.3/khotkeys-5.21.3.tar.xz";
+ sha256 = "1n3ahrb5mzrxap572ydal1sy5q71af97iy4i2fwbljdb6zb1l1bl";
+ name = "khotkeys-5.21.3.tar.xz";
};
};
kinfocenter = {
- version = "5.21.1";
+ version = "5.21.3";
src = fetchurl {
- url = "${mirror}/stable/plasma/5.21.1/kinfocenter-5.21.1.tar.xz";
- sha256 = "1fy5985f4zf9v656dfb30c95pkbasx2302qamdxpfhrl465nqn5d";
- name = "kinfocenter-5.21.1.tar.xz";
+ url = "${mirror}/stable/plasma/5.21.3/kinfocenter-5.21.3.tar.xz";
+ sha256 = "1hj4mnx2mxb1ya7la05frx5c39cp3q7c5f78lnp6p8bkv3ylik72";
+ name = "kinfocenter-5.21.3.tar.xz";
};
};
kmenuedit = {
- version = "5.21.1";
+ version = "5.21.3";
src = fetchurl {
- url = "${mirror}/stable/plasma/5.21.1/kmenuedit-5.21.1.tar.xz";
- sha256 = "1cksy6fn9mx96jnlglzmg0n9817vmypl1lwxdyxncxzw275k0c05";
- name = "kmenuedit-5.21.1.tar.xz";
+ url = "${mirror}/stable/plasma/5.21.3/kmenuedit-5.21.3.tar.xz";
+ sha256 = "0fc3sal11amaj5ydws86hdmc45zhrxkv6lc5sfy200wvff3ynjjj";
+ name = "kmenuedit-5.21.3.tar.xz";
};
};
kscreen = {
- version = "5.21.1";
+ version = "5.21.3";
src = fetchurl {
- url = "${mirror}/stable/plasma/5.21.1/kscreen-5.21.1.tar.xz";
- sha256 = "0w199x0ig7vv7ki17v5paipw1jkkiavj6296zmpbnxn88n6i8jw3";
- name = "kscreen-5.21.1.tar.xz";
+ url = "${mirror}/stable/plasma/5.21.3/kscreen-5.21.3.tar.xz";
+ sha256 = "1f9gxdlj883ddmc1xgd1nmm8n6m5yd269kfx3m9bbp61cw4hrqlm";
+ name = "kscreen-5.21.3.tar.xz";
};
};
kscreenlocker = {
- version = "5.21.1";
+ version = "5.21.3";
src = fetchurl {
- url = "${mirror}/stable/plasma/5.21.1/kscreenlocker-5.21.1.tar.xz";
- sha256 = "1qpmysv7cby0bir4qyr1if3zc1ky43fyzhhxfqc69mcx803iabyv";
- name = "kscreenlocker-5.21.1.tar.xz";
+ url = "${mirror}/stable/plasma/5.21.3/kscreenlocker-5.21.3.tar.xz";
+ sha256 = "1hjlpwwca9nrdwgsiy5ss5ainr1fy1wfvi4g599cvijb77qc84h0";
+ name = "kscreenlocker-5.21.3.tar.xz";
};
};
ksshaskpass = {
- version = "5.21.1";
+ version = "5.21.3";
src = fetchurl {
- url = "${mirror}/stable/plasma/5.21.1/ksshaskpass-5.21.1.tar.xz";
- sha256 = "11avkc3qqskq8pkdsq1jikpdh9izghv3algbf67lwl236s8mmdzk";
- name = "ksshaskpass-5.21.1.tar.xz";
+ url = "${mirror}/stable/plasma/5.21.3/ksshaskpass-5.21.3.tar.xz";
+ sha256 = "16c2kzdmw3viphaygdff29cvi06r53ag4a6hkxw15yrscw31n3ns";
+ name = "ksshaskpass-5.21.3.tar.xz";
};
};
ksysguard = {
- version = "5.21.1";
+ version = "5.21.3";
src = fetchurl {
- url = "${mirror}/stable/plasma/5.21.1/ksysguard-5.21.1.tar.xz";
- sha256 = "1fnccjs04b3pvdb8wwmw03g8x4h7zw5q4pxh0gfy7w705w3wkxwm";
- name = "ksysguard-5.21.1.tar.xz";
+ url = "${mirror}/stable/plasma/5.21.3/ksysguard-5.21.3.tar.xz";
+ sha256 = "0ys1idjqb9n67czdhlds6mhhiizxq8qq4rmds9nq8cm961g5kqsf";
+ name = "ksysguard-5.21.3.tar.xz";
};
};
kwallet-pam = {
- version = "5.21.1";
+ version = "5.21.3";
src = fetchurl {
- url = "${mirror}/stable/plasma/5.21.1/kwallet-pam-5.21.1.tar.xz";
- sha256 = "0ybdyalppfypvq26j6lxjfz2zm41kw1nlsyh857z06f0s65257zb";
- name = "kwallet-pam-5.21.1.tar.xz";
+ url = "${mirror}/stable/plasma/5.21.3/kwallet-pam-5.21.3.tar.xz";
+ sha256 = "1dnni2k4ry11mfjnfc0i44zww3glhsbr70qnpkl9dsf5rj4dcwj3";
+ name = "kwallet-pam-5.21.3.tar.xz";
};
};
kwayland-integration = {
- version = "5.21.1";
+ version = "5.21.3";
src = fetchurl {
- url = "${mirror}/stable/plasma/5.21.1/kwayland-integration-5.21.1.tar.xz";
- sha256 = "0s0gljcfv3sjh63d8bcjmzqgvxrqzjbxj8dsyi68w187dxzca8b4";
- name = "kwayland-integration-5.21.1.tar.xz";
+ url = "${mirror}/stable/plasma/5.21.3/kwayland-integration-5.21.3.tar.xz";
+ sha256 = "0kqw5dbsxmdm5fi34yq718ngkx5j23211jh4l9vl029qgbi42xhc";
+ name = "kwayland-integration-5.21.3.tar.xz";
};
};
kwayland-server = {
- version = "5.21.1";
+ version = "5.21.3";
src = fetchurl {
- url = "${mirror}/stable/plasma/5.21.1/kwayland-server-5.21.1.tar.xz";
- sha256 = "00d14d8q3jw1h2yyn49wpxndwl5v1clxnialrqgkyli6qkwkf29m";
- name = "kwayland-server-5.21.1.tar.xz";
+ url = "${mirror}/stable/plasma/5.21.3/kwayland-server-5.21.3.tar.xz";
+ sha256 = "0d3asblzz9c7cbjfdk33z26hn5n14rdrc3s9jm9awvcc1sd122a4";
+ name = "kwayland-server-5.21.3.tar.xz";
};
};
kwin = {
- version = "5.21.1";
+ version = "5.21.3";
src = fetchurl {
- url = "${mirror}/stable/plasma/5.21.1/kwin-5.21.1.tar.xz";
- sha256 = "035w7b9cfg3hv9kw3rab1y9xw4r51psz7csx7nki05nwzx84812s";
- name = "kwin-5.21.1.tar.xz";
+ url = "${mirror}/stable/plasma/5.21.3/kwin-5.21.3.tar.xz";
+ sha256 = "0ni0ipfm0hp90sq03m1a5lm6shxb2cf9j1a4kiqpaf7n62ch8f3w";
+ name = "kwin-5.21.3.tar.xz";
};
};
kwrited = {
- version = "5.21.1";
+ version = "5.21.3";
src = fetchurl {
- url = "${mirror}/stable/plasma/5.21.1/kwrited-5.21.1.tar.xz";
- sha256 = "15xsjkxqx48wpzjawv4qpbgh8a48sfrmldgcwhn1cscq8s0marh3";
- name = "kwrited-5.21.1.tar.xz";
+ url = "${mirror}/stable/plasma/5.21.3/kwrited-5.21.3.tar.xz";
+ sha256 = "01nn94qmi8q38rdv694d9qs7zahsziclmkw49zy0wlffq4ivpk6x";
+ name = "kwrited-5.21.3.tar.xz";
};
};
libkscreen = {
- version = "5.21.1";
+ version = "5.21.3";
src = fetchurl {
- url = "${mirror}/stable/plasma/5.21.1/libkscreen-5.21.1.tar.xz";
- sha256 = "0hrgmnvyv5v5d15wj1gynyzk83jj8p9cjhz0q2l41n2rh81rw52z";
- name = "libkscreen-5.21.1.tar.xz";
+ url = "${mirror}/stable/plasma/5.21.3/libkscreen-5.21.3.tar.xz";
+ sha256 = "1j2d1xpn48ks0wk9vvnvj9r03bc0ggrqvblyhs30p31svfihjs3a";
+ name = "libkscreen-5.21.3.tar.xz";
};
};
libksysguard = {
- version = "5.21.1";
+ version = "5.21.3.1";
src = fetchurl {
- url = "${mirror}/stable/plasma/5.21.1/libksysguard-5.21.1.tar.xz";
- sha256 = "14zafjp0ikqgkdr8a04idj08xami2xn8cw3scgwfcix3y7mv0ip8";
- name = "libksysguard-5.21.1.tar.xz";
+ url = "${mirror}/stable/plasma/5.21.3/libksysguard-5.21.3.1.tar.xz";
+ sha256 = "0nayjihapn71wrnzfb4wv9laafysl0x6sn98sbwhclapbdvxnw73";
+ name = "libksysguard-5.21.3.1.tar.xz";
};
};
milou = {
- version = "5.21.1";
+ version = "5.21.3";
src = fetchurl {
- url = "${mirror}/stable/plasma/5.21.1/milou-5.21.1.tar.xz";
- sha256 = "095mk7592r4fwkw5f3p8mgc0p2wg8wi347qx8s1yblwjcml86a5f";
- name = "milou-5.21.1.tar.xz";
+ url = "${mirror}/stable/plasma/5.21.3/milou-5.21.3.tar.xz";
+ sha256 = "0qbk0y783n7f7pl0akx252vyblrrgmsg5yr7ncaijq4x4l90f1yf";
+ name = "milou-5.21.3.tar.xz";
};
};
oxygen = {
- version = "5.21.1";
+ version = "5.21.3";
src = fetchurl {
- url = "${mirror}/stable/plasma/5.21.1/oxygen-5.21.1.tar.xz";
- sha256 = "1s5bzdj5l515g4biarrzmkc7vpi0hqbk75rjjkr11fsvkghhphwg";
- name = "oxygen-5.21.1.tar.xz";
+ url = "${mirror}/stable/plasma/5.21.3/oxygen-5.21.3.tar.xz";
+ sha256 = "16yj1qx4mbi62brkn8wkcr6sz5dkbl2pf49zc1hadnxfm9wd3z0a";
+ name = "oxygen-5.21.3.tar.xz";
};
};
plasma-browser-integration = {
- version = "5.21.1";
+ version = "5.21.3";
src = fetchurl {
- url = "${mirror}/stable/plasma/5.21.1/plasma-browser-integration-5.21.1.tar.xz";
- sha256 = "0m99il47932ybsdp5z7apgb9l991wdhbrm3sninflcrg6ag9myp3";
- name = "plasma-browser-integration-5.21.1.tar.xz";
+ url = "${mirror}/stable/plasma/5.21.3/plasma-browser-integration-5.21.3.tar.xz";
+ sha256 = "1hz996lv3vvp1zldzpkb9dmvnn94v69j2vq9sfs446c25ggf9d6y";
+ name = "plasma-browser-integration-5.21.3.tar.xz";
};
};
plasma-desktop = {
- version = "5.21.1";
+ version = "5.21.3";
src = fetchurl {
- url = "${mirror}/stable/plasma/5.21.1/plasma-desktop-5.21.1.tar.xz";
- sha256 = "1ligy1ps3ajrsg6lvb9ailirgc52sswbknp0zn53n8gka176c555";
- name = "plasma-desktop-5.21.1.tar.xz";
+ url = "${mirror}/stable/plasma/5.21.3/plasma-desktop-5.21.3.tar.xz";
+ sha256 = "0bryk523qfzb5max1h460d67ir6xbrsws9bq72bdfbv1wkv64kyy";
+ name = "plasma-desktop-5.21.3.tar.xz";
};
};
plasma-disks = {
- version = "5.21.1";
+ version = "5.21.3";
src = fetchurl {
- url = "${mirror}/stable/plasma/5.21.1/plasma-disks-5.21.1.tar.xz";
- sha256 = "0py662wlqbx5408rjbxnsa5ccnsaqx2wfy84fvjs4vl73wqmi2nl";
- name = "plasma-disks-5.21.1.tar.xz";
+ url = "${mirror}/stable/plasma/5.21.3/plasma-disks-5.21.3.tar.xz";
+ sha256 = "18a7dppfhb2wpb7sfhnayq96bxjlzygdz7sppcjikxil8klhv1aq";
+ name = "plasma-disks-5.21.3.tar.xz";
};
};
plasma-firewall = {
- version = "5.21.1";
+ version = "5.21.3";
src = fetchurl {
- url = "${mirror}/stable/plasma/5.21.1/plasma-firewall-5.21.1.tar.xz";
- sha256 = "19q7w9m1vj7gs5d3prraciw00iy0ywjfxlpjhxjiq0s0s0icf1hb";
- name = "plasma-firewall-5.21.1.tar.xz";
+ url = "${mirror}/stable/plasma/5.21.3/plasma-firewall-5.21.3.tar.xz";
+ sha256 = "0bzmcakzwiimc90bbpih1z5isrcfhdfwlslp4q3v3npppnivv9bw";
+ name = "plasma-firewall-5.21.3.tar.xz";
};
};
plasma-integration = {
- version = "5.21.1";
+ version = "5.21.3";
src = fetchurl {
- url = "${mirror}/stable/plasma/5.21.1/plasma-integration-5.21.1.tar.xz";
- sha256 = "0i51grmjkf9k6z1aq4j69wqdwdnn4rcryvi7b9lfpqaz1phsqhq7";
- name = "plasma-integration-5.21.1.tar.xz";
+ url = "${mirror}/stable/plasma/5.21.3/plasma-integration-5.21.3.tar.xz";
+ sha256 = "09dlbfildd8wl0nbss84yibljyl6cadx95q8q4n0c5wymyc4zqy1";
+ name = "plasma-integration-5.21.3.tar.xz";
};
};
plasma-nano = {
- version = "5.21.1";
+ version = "5.21.3";
src = fetchurl {
- url = "${mirror}/stable/plasma/5.21.1/plasma-nano-5.21.1.tar.xz";
- sha256 = "0qz14rmnlpk8mc1lgk854zlp032znc27j0wg6a7zsljikbx90dzm";
- name = "plasma-nano-5.21.1.tar.xz";
+ url = "${mirror}/stable/plasma/5.21.3/plasma-nano-5.21.3.tar.xz";
+ sha256 = "1yqn29769nnfhiyqbpv15c0zxvkfzq4yvk9x9qlchbcwjc1gr23j";
+ name = "plasma-nano-5.21.3.tar.xz";
};
};
plasma-nm = {
- version = "5.21.1";
+ version = "5.21.3";
src = fetchurl {
- url = "${mirror}/stable/plasma/5.21.1/plasma-nm-5.21.1.tar.xz";
- sha256 = "0lg9fkk4lag5pi648jv66b8mzp645xx75y4zylj87yz3i8h9may4";
- name = "plasma-nm-5.21.1.tar.xz";
+ url = "${mirror}/stable/plasma/5.21.3/plasma-nm-5.21.3.tar.xz";
+ sha256 = "0d7v757kzd0pcvlz201m0njcz9y8j0bqkwbzdz3gik9s7x6rl73p";
+ name = "plasma-nm-5.21.3.tar.xz";
};
};
plasma-pa = {
- version = "5.21.1";
+ version = "5.21.3";
src = fetchurl {
- url = "${mirror}/stable/plasma/5.21.1/plasma-pa-5.21.1.tar.xz";
- sha256 = "17vxvvrii3q46k22k3v94hicvxw7cdfl4rgaqbb8rvy94f2dhvir";
- name = "plasma-pa-5.21.1.tar.xz";
+ url = "${mirror}/stable/plasma/5.21.3/plasma-pa-5.21.3.tar.xz";
+ sha256 = "16z9xzn5swrzz86yd8lykjphs92ghdsahfxjv0v9nj3ca24kfibp";
+ name = "plasma-pa-5.21.3.tar.xz";
};
};
plasma-phone-components = {
- version = "5.21.1";
+ version = "5.21.3";
src = fetchurl {
- url = "${mirror}/stable/plasma/5.21.1/plasma-phone-components-5.21.1.tar.xz";
- sha256 = "1fzjwc1x40n8wxq9fqm83j07yg9zniilmafcsv0rd80k6v99691i";
- name = "plasma-phone-components-5.21.1.tar.xz";
+ url = "${mirror}/stable/plasma/5.21.3/plasma-phone-components-5.21.3.tar.xz";
+ sha256 = "1dhv0gdyk47dl8il6zwjdz84jmz2d4ppfyifzc2rzf0ys934scn0";
+ name = "plasma-phone-components-5.21.3.tar.xz";
};
};
plasma-sdk = {
- version = "5.21.1";
+ version = "5.21.3";
src = fetchurl {
- url = "${mirror}/stable/plasma/5.21.1/plasma-sdk-5.21.1.tar.xz";
- sha256 = "0s18lgp8baan9s9qr8wwaq3ah668255whz9xpl2xl1qv9qnr5v28";
- name = "plasma-sdk-5.21.1.tar.xz";
+ url = "${mirror}/stable/plasma/5.21.3/plasma-sdk-5.21.3.tar.xz";
+ sha256 = "0asbb7j5b8c4kixw1yf7mdfyd8gjrf57gdb2wfs1npasak0dw84w";
+ name = "plasma-sdk-5.21.3.tar.xz";
};
};
plasma-systemmonitor = {
- version = "5.21.1";
+ version = "5.21.3";
src = fetchurl {
- url = "${mirror}/stable/plasma/5.21.1/plasma-systemmonitor-5.21.1.tar.xz";
- sha256 = "1mfmlnsa2iy4wrdi2hghrapd7j02k3xkv4cfv44pw29i5iihvx6a";
- name = "plasma-systemmonitor-5.21.1.tar.xz";
+ url = "${mirror}/stable/plasma/5.21.3/plasma-systemmonitor-5.21.3.tar.xz";
+ sha256 = "1w1xzqmpzk016f8rkyx6cvm6lng3h177c441hird13n6v147l7ll";
+ name = "plasma-systemmonitor-5.21.3.tar.xz";
};
};
plasma-tests = {
- version = "5.21.1";
+ version = "5.21.3";
src = fetchurl {
- url = "${mirror}/stable/plasma/5.21.1/plasma-tests-5.21.1.tar.xz";
- sha256 = "1qxlwvxwkqgxy6kvd9dqp7wg02gc4j37az20gxglm5s4jf9j47kr";
- name = "plasma-tests-5.21.1.tar.xz";
+ url = "${mirror}/stable/plasma/5.21.3/plasma-tests-5.21.3.tar.xz";
+ sha256 = "000iwijpxxicixy5zbbgfs96h988x1d4wvjw90vagjw4hj361dk8";
+ name = "plasma-tests-5.21.3.tar.xz";
};
};
plasma-thunderbolt = {
- version = "5.21.1";
+ version = "5.21.3";
src = fetchurl {
- url = "${mirror}/stable/plasma/5.21.1/plasma-thunderbolt-5.21.1.tar.xz";
- sha256 = "1v6yjxk30wpr86f1m7zn9sm5vvagcjmqz8b3s9sliv0z69n50fzx";
- name = "plasma-thunderbolt-5.21.1.tar.xz";
+ url = "${mirror}/stable/plasma/5.21.3/plasma-thunderbolt-5.21.3.tar.xz";
+ sha256 = "1j0nb9p5wbgksxy19bxsz9ni9ys40r4arvs8rl8pvvv9hndqhndm";
+ name = "plasma-thunderbolt-5.21.3.tar.xz";
};
};
plasma-vault = {
- version = "5.21.1";
+ version = "5.21.3";
src = fetchurl {
- url = "${mirror}/stable/plasma/5.21.1/plasma-vault-5.21.1.tar.xz";
- sha256 = "0mfjmmn3s2piqg8idmndh1klrr3fllka0lx6ckx7bmj1g7z3kr0d";
- name = "plasma-vault-5.21.1.tar.xz";
+ url = "${mirror}/stable/plasma/5.21.3/plasma-vault-5.21.3.tar.xz";
+ sha256 = "1q59q6y8gx4qbp1a5nbsg8zmrdljacfqd3i5n214nlj6al13sg9j";
+ name = "plasma-vault-5.21.3.tar.xz";
};
};
plasma-workspace = {
- version = "5.21.1";
+ version = "5.21.3";
src = fetchurl {
- url = "${mirror}/stable/plasma/5.21.1/plasma-workspace-5.21.1.tar.xz";
- sha256 = "0aq2158sijlgz3baslj57kzhmdx3m0zir80qz1svw94grfszjc2a";
- name = "plasma-workspace-5.21.1.tar.xz";
+ url = "${mirror}/stable/plasma/5.21.3/plasma-workspace-5.21.3.tar.xz";
+ sha256 = "1djanxc7mslw9hnbzlngf6pflc6byjzqb14ibilg3fxsir2jwq40";
+ name = "plasma-workspace-5.21.3.tar.xz";
};
};
plasma-workspace-wallpapers = {
- version = "5.21.1";
+ version = "5.21.3";
src = fetchurl {
- url = "${mirror}/stable/plasma/5.21.1/plasma-workspace-wallpapers-5.21.1.tar.xz";
- sha256 = "1pfgzzfhwdgczhrgizwi7rvav1hawwv6zra8nlqnfia8rc4mjs3n";
- name = "plasma-workspace-wallpapers-5.21.1.tar.xz";
+ url = "${mirror}/stable/plasma/5.21.3/plasma-workspace-wallpapers-5.21.3.tar.xz";
+ sha256 = "1qjkk3qfzz1id898kmx7xx6rr6p77y0jfwkjyf26abk51bdfk9lm";
+ name = "plasma-workspace-wallpapers-5.21.3.tar.xz";
};
};
plymouth-kcm = {
- version = "5.21.1";
+ version = "5.21.3";
src = fetchurl {
- url = "${mirror}/stable/plasma/5.21.1/plymouth-kcm-5.21.1.tar.xz";
- sha256 = "1il5a60db4brgs0ifmbxhq1ncqg80pkz5pnddbb3vwiwgwrsjziw";
- name = "plymouth-kcm-5.21.1.tar.xz";
+ url = "${mirror}/stable/plasma/5.21.3/plymouth-kcm-5.21.3.tar.xz";
+ sha256 = "0wmpvb06z0js50c9jpv61jlxbx9sf1f5lidzs5v4xs31shxc9sbg";
+ name = "plymouth-kcm-5.21.3.tar.xz";
};
};
polkit-kde-agent = {
- version = "1-5.21.1";
+ version = "1-5.21.3";
src = fetchurl {
- url = "${mirror}/stable/plasma/5.21.1/polkit-kde-agent-1-5.21.1.tar.xz";
- sha256 = "1lm6rl3lfimlfw7yaqk81jdrdi31qbz951vzcss4prwa1iqdi7b2";
- name = "polkit-kde-agent-1-5.21.1.tar.xz";
+ url = "${mirror}/stable/plasma/5.21.3/polkit-kde-agent-1-5.21.3.tar.xz";
+ sha256 = "06qpkf01665mjr49wyc3f336g6g7l93k8l35q0yyih58i3v04s0v";
+ name = "polkit-kde-agent-1-5.21.3.tar.xz";
};
};
powerdevil = {
- version = "5.21.1";
+ version = "5.21.3";
src = fetchurl {
- url = "${mirror}/stable/plasma/5.21.1/powerdevil-5.21.1.tar.xz";
- sha256 = "08a9wl97lpcm0qz438ha8avdc6ybsij5vvy3p0ijkdn1psq2974b";
- name = "powerdevil-5.21.1.tar.xz";
+ url = "${mirror}/stable/plasma/5.21.3/powerdevil-5.21.3.tar.xz";
+ sha256 = "0lk6bvc0mym3x3sd85bsvsxvm82vr40lcx355xjycxskf75c5jzz";
+ name = "powerdevil-5.21.3.tar.xz";
};
};
qqc2-breeze-style = {
- version = "5.21.1";
+ version = "5.21.3";
src = fetchurl {
- url = "${mirror}/stable/plasma/5.21.1/qqc2-breeze-style-5.21.1.tar.xz";
- sha256 = "1k4zl5hbbyk2v9gila8whkh7yniv3nwcgdc73ysc75ivqyzydsix";
- name = "qqc2-breeze-style-5.21.1.tar.xz";
+ url = "${mirror}/stable/plasma/5.21.3/qqc2-breeze-style-5.21.3.tar.xz";
+ sha256 = "1ydvirjrkjbwfc2faz74dd9zlmfz18fa3cig143gna9rfr5api54";
+ name = "qqc2-breeze-style-5.21.3.tar.xz";
};
};
sddm-kcm = {
- version = "5.21.1";
+ version = "5.21.3";
src = fetchurl {
- url = "${mirror}/stable/plasma/5.21.1/sddm-kcm-5.21.1.tar.xz";
- sha256 = "0j76zwmn2r62hjzv1gni44a9admd38x2s8s30qfc1dzc7nkv61sh";
- name = "sddm-kcm-5.21.1.tar.xz";
+ url = "${mirror}/stable/plasma/5.21.3/sddm-kcm-5.21.3.tar.xz";
+ sha256 = "1flqgfpiz66s7dsw1k95zdrbj7ka09r0i2pcdygnrwlls5yvqljz";
+ name = "sddm-kcm-5.21.3.tar.xz";
};
};
systemsettings = {
- version = "5.21.1";
+ version = "5.21.3";
src = fetchurl {
- url = "${mirror}/stable/plasma/5.21.1/systemsettings-5.21.1.tar.xz";
- sha256 = "0kzg3raa2f3lwb5qs10g8kzmv6px8fk4z2sq5jnjl3n9zqgzykkr";
- name = "systemsettings-5.21.1.tar.xz";
+ url = "${mirror}/stable/plasma/5.21.3/systemsettings-5.21.3.tar.xz";
+ sha256 = "08ynlg282x1klgpd43mh3ng4m579iq9hjlln96fqaw19g7x1i58x";
+ name = "systemsettings-5.21.3.tar.xz";
};
};
xdg-desktop-portal-kde = {
- version = "5.21.1";
+ version = "5.21.3";
src = fetchurl {
- url = "${mirror}/stable/plasma/5.21.1/xdg-desktop-portal-kde-5.21.1.tar.xz";
- sha256 = "1xfnwycrq51sz1r57misrz8acq6yd1vrr5gjir4f1ynfclhf9aj6";
- name = "xdg-desktop-portal-kde-5.21.1.tar.xz";
+ url = "${mirror}/stable/plasma/5.21.3/xdg-desktop-portal-kde-5.21.3.tar.xz";
+ sha256 = "05r1kbw39jmj2gfn42052y779l0k89kxh7xynw07igr7c5mxy4ih";
+ name = "xdg-desktop-portal-kde-5.21.3.tar.xz";
};
};
}
diff --git a/third_party/nixpkgs/pkgs/development/compilers/adoptopenjdk-bin/generate-sources.py b/third_party/nixpkgs/pkgs/development/compilers/adoptopenjdk-bin/generate-sources.py
index b39090b167..d90953c71d 100755
--- a/third_party/nixpkgs/pkgs/development/compilers/adoptopenjdk-bin/generate-sources.py
+++ b/third_party/nixpkgs/pkgs/development/compilers/adoptopenjdk-bin/generate-sources.py
@@ -6,7 +6,7 @@ import re
import requests
import sys
-releases = ("openjdk8", "openjdk11", "openjdk13", "openjdk14", "openjdk15")
+releases = ("openjdk8", "openjdk11", "openjdk13", "openjdk14", "openjdk15", "openjdk16")
oses = ("mac", "linux")
types = ("jre", "jdk")
impls = ("hotspot", "openj9")
diff --git a/third_party/nixpkgs/pkgs/development/compilers/adoptopenjdk-bin/jdk16-darwin.nix b/third_party/nixpkgs/pkgs/development/compilers/adoptopenjdk-bin/jdk16-darwin.nix
new file mode 100644
index 0000000000..b2bf2877c8
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/development/compilers/adoptopenjdk-bin/jdk16-darwin.nix
@@ -0,0 +1,9 @@
+let
+ sources = builtins.fromJSON (builtins.readFile ./sources.json);
+in
+{
+ jdk-hotspot = import ./jdk-darwin-base.nix { sourcePerArch = sources.openjdk16.mac.jdk.hotspot; };
+ jre-hotspot = import ./jdk-darwin-base.nix { sourcePerArch = sources.openjdk16.mac.jre.hotspot; };
+ jdk-openj9 = import ./jdk-darwin-base.nix { sourcePerArch = sources.openjdk16.mac.jdk.openj9; };
+ jre-openj9 = import ./jdk-darwin-base.nix { sourcePerArch = sources.openjdk16.mac.jre.openj9; };
+}
diff --git a/third_party/nixpkgs/pkgs/development/compilers/adoptopenjdk-bin/jdk16-linux.nix b/third_party/nixpkgs/pkgs/development/compilers/adoptopenjdk-bin/jdk16-linux.nix
new file mode 100644
index 0000000000..738b31fe1d
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/development/compilers/adoptopenjdk-bin/jdk16-linux.nix
@@ -0,0 +1,9 @@
+let
+ sources = builtins.fromJSON (builtins.readFile ./sources.json);
+in
+{
+ jdk-hotspot = import ./jdk-linux-base.nix { sourcePerArch = sources.openjdk16.linux.jdk.hotspot; };
+ jre-hotspot = import ./jdk-linux-base.nix { sourcePerArch = sources.openjdk16.linux.jre.hotspot; };
+ jdk-openj9 = import ./jdk-linux-base.nix { sourcePerArch = sources.openjdk16.linux.jdk.openj9; };
+ jre-openj9 = import ./jdk-linux-base.nix { sourcePerArch = sources.openjdk16.linux.jre.openj9; };
+}
diff --git a/third_party/nixpkgs/pkgs/development/compilers/adoptopenjdk-bin/sources.json b/third_party/nixpkgs/pkgs/development/compilers/adoptopenjdk-bin/sources.json
index 36d1f62123..22a893c724 100644
--- a/third_party/nixpkgs/pkgs/development/compilers/adoptopenjdk-bin/sources.json
+++ b/third_party/nixpkgs/pkgs/development/compilers/adoptopenjdk-bin/sources.json
@@ -531,6 +531,148 @@
}
}
},
+ "openjdk16": {
+ "linux": {
+ "jdk": {
+ "hotspot": {
+ "aarch64": {
+ "build": "36",
+ "sha256": "7217a9f9be3b0c8dfc78538f95fd2deb493eb651152d975062920566492b2574",
+ "url": "https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk-16%2B36/OpenJDK16-jdk_aarch64_linux_hotspot_16_36.tar.gz",
+ "version": "16.0.0"
+ },
+ "armv6l": {
+ "build": "36",
+ "sha256": "f1d32ba01a40c98889f31368c0e987d6bbda65a7c50b8c088623b48e3a90104a",
+ "url": "https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk-16%2B36/OpenJDK16-jdk_arm_linux_hotspot_16_36.tar.gz",
+ "version": "16.0.0"
+ },
+ "armv7l": {
+ "build": "36",
+ "sha256": "f1d32ba01a40c98889f31368c0e987d6bbda65a7c50b8c088623b48e3a90104a",
+ "url": "https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk-16%2B36/OpenJDK16-jdk_arm_linux_hotspot_16_36.tar.gz",
+ "version": "16.0.0"
+ },
+ "packageType": "jdk",
+ "vmType": "hotspot",
+ "x86_64": {
+ "build": "36",
+ "sha256": "2e031cf37018161c9e59b45fa4b98ff2ce4ce9297b824c512989d579a70f8422",
+ "url": "https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk-16%2B36/OpenJDK16-jdk_x64_linux_hotspot_16_36.tar.gz",
+ "version": "16.0.0"
+ }
+ },
+ "openj9": {
+ "aarch64": {
+ "build": "36",
+ "sha256": "f4d4e0c0e9e0a4d0f14172878cee5e1a0ae73170058e1c183a452f8d97331ac0",
+ "url": "https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk-16%2B36_openj9-0.25.0/OpenJDK16-jdk_aarch64_linux_openj9_16_36_openj9-0.25.0.tar.gz",
+ "version": "16.0.0-ea"
+ },
+ "packageType": "jdk",
+ "vmType": "openj9",
+ "x86_64": {
+ "build": "36",
+ "sha256": "9f9b327d08cbc71b32f28004ae9d9c2c84ff9bc335cac3068c5a5737bfa4606f",
+ "url": "https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk-16%2B36_openj9-0.25.0/OpenJDK16-jdk_x64_linux_openj9_16_36_openj9-0.25.0.tar.gz",
+ "version": "16.0.0"
+ }
+ }
+ },
+ "jre": {
+ "hotspot": {
+ "aarch64": {
+ "build": "36",
+ "sha256": "947b02342513b085946b2e7c376cc1f1cfe89600bc3d30455160f88d41da3509",
+ "url": "https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk-16%2B36/OpenJDK16-jre_aarch64_linux_hotspot_16_36.tar.gz",
+ "version": "16.0.0"
+ },
+ "armv6l": {
+ "build": "36",
+ "sha256": "4d3f351a161792779417ee2730413a976258c4cc5f323526f1fbc0cca82aca6e",
+ "url": "https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk-16%2B36/OpenJDK16-jre_arm_linux_hotspot_16_36.tar.gz",
+ "version": "16.0.0"
+ },
+ "armv7l": {
+ "build": "36",
+ "sha256": "4d3f351a161792779417ee2730413a976258c4cc5f323526f1fbc0cca82aca6e",
+ "url": "https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk-16%2B36/OpenJDK16-jre_arm_linux_hotspot_16_36.tar.gz",
+ "version": "16.0.0"
+ },
+ "packageType": "jre",
+ "vmType": "hotspot",
+ "x86_64": {
+ "build": "36",
+ "sha256": "4aa99cbe5a6838c3ed29fa7aa7bee95c39ddd41e3f7544178dcd257b15a9359e",
+ "url": "https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk-16%2B36/OpenJDK16-jre_x64_linux_hotspot_16_36.tar.gz",
+ "version": "16.0.0"
+ }
+ },
+ "openj9": {
+ "aarch64": {
+ "build": "36",
+ "sha256": "13ae42f5040d4e5d97b8809e27ebfdf8f7326604771963d85b2c1385abe13742",
+ "url": "https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk-16%2B36_openj9-0.25.0/OpenJDK16-jre_aarch64_linux_openj9_16_36_openj9-0.25.0.tar.gz",
+ "version": "16.0.0-ea"
+ },
+ "packageType": "jre",
+ "vmType": "openj9",
+ "x86_64": {
+ "build": "36",
+ "sha256": "302b8b9bba4f51d0a9ac087ed91929dbd3ae52cf5a5b6c150373563012db60d9",
+ "url": "https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk-16%2B36_openj9-0.25.0/OpenJDK16-jre_x64_linux_openj9_16_36_openj9-0.25.0.tar.gz",
+ "version": "16.0.0"
+ }
+ }
+ }
+ },
+ "mac": {
+ "jdk": {
+ "hotspot": {
+ "packageType": "jdk",
+ "vmType": "hotspot",
+ "x86_64": {
+ "build": "36",
+ "sha256": "b66761b55fd493ed2a5f4df35a32b338ec34a9e0a1244439e3156561ab27c511",
+ "url": "https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk-16%2B36/OpenJDK16-jdk_x64_mac_hotspot_16_36.tar.gz",
+ "version": "16.0.0"
+ }
+ },
+ "openj9": {
+ "packageType": "jdk",
+ "vmType": "openj9",
+ "x86_64": {
+ "build": "36",
+ "sha256": "e6075cbe939b4de165cc8b4b91352f8885d549873f5cd419e75eba737502542e",
+ "url": "https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk-16%2B36_openj9-0.25.0/OpenJDK16-jdk_x64_mac_openj9_16_36_openj9-0.25.0.tar.gz",
+ "version": "16.0.0"
+ }
+ }
+ },
+ "jre": {
+ "hotspot": {
+ "packageType": "jre",
+ "vmType": "hotspot",
+ "x86_64": {
+ "build": "36",
+ "sha256": "92cb07e9e9d075996d1a9e0ccfc1d35e6f97f7e188e9bb78088ee1066062a428",
+ "url": "https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk-16%2B36/OpenJDK16-jre_x64_mac_hotspot_16_36.tar.gz",
+ "version": "16.0.0"
+ }
+ },
+ "openj9": {
+ "packageType": "jre",
+ "vmType": "openj9",
+ "x86_64": {
+ "build": "36",
+ "sha256": "9e5c31582778ca5c08fc221e185dc0f4dbce2091cbc69966a1e2617344b722f1",
+ "url": "https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk-16%2B36_openj9-0.25.0/OpenJDK16-jre_x64_mac_openj9_16_36_openj9-0.25.0.tar.gz",
+ "version": "16.0.0"
+ }
+ }
+ }
+ }
+ },
"openjdk8": {
"linux": {
"jdk": {
diff --git a/third_party/nixpkgs/pkgs/development/compilers/cmdstan/default.nix b/third_party/nixpkgs/pkgs/development/compilers/cmdstan/default.nix
index df674b67db..c52ffa0baf 100644
--- a/third_party/nixpkgs/pkgs/development/compilers/cmdstan/default.nix
+++ b/third_party/nixpkgs/pkgs/development/compilers/cmdstan/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchurl, python, runtimeShell }:
+{ lib, stdenv, fetchurl, python3, runtimeShell }:
stdenv.mkDerivation {
name = "cmdstan-2.17.1";
@@ -12,7 +12,7 @@ stdenv.mkDerivation {
enableParallelBuilding = true;
doCheck = true;
- checkInputs = [ python ];
+ checkInputs = [ python3 ];
checkPhase = "python ./runCmdStanTests.py src/test/interface"; # see #5368
installPhase = ''
diff --git a/third_party/nixpkgs/pkgs/development/compilers/crystal2nix/default.nix b/third_party/nixpkgs/pkgs/development/compilers/crystal2nix/default.nix
index 0f4909f5e1..b1f36b0209 100644
--- a/third_party/nixpkgs/pkgs/development/compilers/crystal2nix/default.nix
+++ b/third_party/nixpkgs/pkgs/development/compilers/crystal2nix/default.nix
@@ -2,13 +2,13 @@
crystal.buildCrystalPackage rec {
pname = "crystal2nix";
- version = "0.1.0";
+ version = "0.1.1";
src = fetchFromGitHub {
owner = "peterhoeg";
repo = "crystal2nix";
rev = "v${version}";
- sha256 = "sha256-K1ElG8VC/D0axmSRaufH3cE50xNQisAmFucDkV+5O0s=";
+ sha256 = "sha256-LKZychkhWy/rVdrP3Yo6g8CL1pGdiZlBykzFjnWh0fg=";
};
format = "shards";
diff --git a/third_party/nixpkgs/pkgs/development/compilers/dtc/default.nix b/third_party/nixpkgs/pkgs/development/compilers/dtc/default.nix
index c5d33590da..245e5bf2f5 100644
--- a/third_party/nixpkgs/pkgs/development/compilers/dtc/default.nix
+++ b/third_party/nixpkgs/pkgs/development/compilers/dtc/default.nix
@@ -1,7 +1,9 @@
{ stdenv, lib, fetchgit, flex, bison, pkg-config, which
-, pythonSupport ? false, python, swig
+, pythonSupport ? false, python ? null, swig
}:
+assert pythonSupport -> python != null;
+
stdenv.mkDerivation rec {
pname = "dtc";
version = "1.6.0";
diff --git a/third_party/nixpkgs/pkgs/development/compilers/gambit/build.nix b/third_party/nixpkgs/pkgs/development/compilers/gambit/build.nix
index 84d51a2bc3..d67e0053bb 100644
--- a/third_party/nixpkgs/pkgs/development/compilers/gambit/build.nix
+++ b/third_party/nixpkgs/pkgs/development/compilers/gambit/build.nix
@@ -63,11 +63,11 @@ gccStdenv.mkDerivation rec {
lib.optional (!gccStdenv.isDarwin) "--enable-poll";
configurePhase = ''
- export CC=${gccStdenv.cc.targetPrefix}gcc \
- CXX=${gccStdenv.cc.targetPrefix}g++ \
- CPP=${gccStdenv.cc.targetPrefix}cpp \
- CXXCPP=${gccStdenv.cc.targetPrefix}cpp \
- LD=${gccStdenv.cc.targetPrefix}ld \
+ export CC=${gccStdenv.cc}/bin/${gccStdenv.cc.targetPrefix}gcc \
+ CXX=${gccStdenv.cc}/bin/${gccStdenv.cc.targetPrefix}g++ \
+ CPP=${gccStdenv.cc}/bin/${gccStdenv.cc.targetPrefix}cpp \
+ CXXCPP=${gccStdenv.cc}/bin/${gccStdenv.cc.targetPrefix}cpp \
+ LD=${gccStdenv.cc}/bin/${gccStdenv.cc.targetPrefix}ld \
XMKMF=${coreutils}/bin/false
unset CFLAGS LDFLAGS LIBS CPPFLAGS CXXFLAGS
diff --git a/third_party/nixpkgs/pkgs/development/compilers/haxe/default.nix b/third_party/nixpkgs/pkgs/development/compilers/haxe/default.nix
index 5845119239..73b82ff48d 100644
--- a/third_party/nixpkgs/pkgs/development/compilers/haxe/default.nix
+++ b/third_party/nixpkgs/pkgs/development/compilers/haxe/default.nix
@@ -1,20 +1,44 @@
-{ lib, stdenv, fetchgit, coreutils, ocamlPackages, zlib, pcre, neko }:
-
-let inherit (ocamlPackages) ocaml camlp4; in
+{ lib, stdenv, fetchFromGitHub, coreutils, ocaml-ng, zlib, pcre, neko, mbedtls }:
let
- generic = { version, sha256, prePatch }:
+ ocamlDependencies = version:
+ if lib.versionAtLeast version "4.0"
+ then with ocaml-ng.ocamlPackages; [
+ ocaml
+ findlib
+ sedlex_2
+ xml-light
+ ptmap
+ camlp5
+ sha
+ dune_2
+ luv
+ ocaml_extlib
+ ] else with ocaml-ng.ocamlPackages_4_05; [
+ ocaml
+ camlp4
+ ];
+
+ defaultPatch = ''
+ substituteInPlace extra/haxelib_src/src/haxelib/client/Main.hx \
+ --replace '"neko"' '"${neko}/bin/neko"'
+ '';
+
+ generic = { sha256, version, prePatch ? defaultPatch }:
stdenv.mkDerivation {
pname = "haxe";
inherit version;
- buildInputs = [ocaml zlib pcre neko camlp4];
+ buildInputs = [ zlib pcre neko ]
+ ++ lib.optional (lib.versionAtLeast version "4.1") [ mbedtls ]
+ ++ ocamlDependencies version;
- src = fetchgit {
- url = "https://github.com/HaxeFoundation/haxe.git";
- inherit sha256;
+ src = fetchFromGitHub {
+ owner = "HaxeFoundation";
+ repo = "haxe";
+ rev = version;
fetchSubmodules = true;
- rev = "refs/tags/${version}";
+ inherit sha256;
};
inherit prePatch;
@@ -77,8 +101,8 @@ let
meta = with lib; {
description = "Programming language targeting JavaScript, Flash, NekoVM, PHP, C++";
homepage = "https://haxe.org";
- license = with licenses; [ gpl2 bsd2 /*?*/ ]; # -> docs/license.txt
- maintainers = [ maintainers.marcweber ];
+ license = with licenses; [ gpl2Plus mit ]; # based on upstream opam file
+ maintainers = [ maintainers.marcweber maintainers.locallycompact ];
platforms = platforms.linux ++ platforms.darwin;
};
};
@@ -89,15 +113,20 @@ in {
sha256 = "1x9ay5a2llq46fww3k07jxx8h1vfpyxb522snc6702a050ki5vz3";
prePatch = ''
sed -i -e 's|"/usr/lib/haxe/std/";|"'"$out/lib/haxe/std/"'";\n&|g' main.ml
- sed -i -e 's|"neko"|"${neko}/bin/neko"|g' extra/haxelib_src/src/tools/haxelib/Main.hx
+ substituteInPlace extra/haxelib_src/src/tools/haxelib/Main.hx \
+ --replace '"neko"' '"${neko}/bin/neko"'
'';
};
haxe_3_4 = generic {
version = "3.4.6";
sha256 = "1myc4b8fwp0f9vky17wv45n34a583f5sjvajsc93f5gm1wanp4if";
prePatch = ''
+ ${defaultPatch}
sed -i -re 's!(let +prefix_path += +).*( +in)!\1"'"$out/"'"\2!' src/main.ml
- sed -i -e 's|"neko"|"${neko}/bin/neko"|g' extra/haxelib_src/src/haxelib/client/Main.hx
'';
};
+ haxe_4_2 = generic {
+ version = "4.2.1";
+ sha256 = "sha256-0j6M21dh8DB1gC/bPYNJrVuDbJyqQbP+61ItO5RBUcA=";
+ };
}
diff --git a/third_party/nixpkgs/pkgs/development/compilers/julia/1.0.nix b/third_party/nixpkgs/pkgs/development/compilers/julia/1.0.nix
index 98d7ce90de..5b1a4674a8 100644
--- a/third_party/nixpkgs/pkgs/development/compilers/julia/1.0.nix
+++ b/third_party/nixpkgs/pkgs/development/compilers/julia/1.0.nix
@@ -139,7 +139,7 @@ stdenv.mkDerivation rec {
"prefix=$(out)"
"SHELL=${stdenv.shell}"
- "USE_SYSTEM_BLAS=1"
+ (lib.optionalString (!stdenv.isDarwin) "USE_SYSTEM_BLAS=1")
"USE_BLAS64=${if blas.isILP64 then "1" else "0"}"
"USE_SYSTEM_LAPACK=1"
diff --git a/third_party/nixpkgs/pkgs/development/compilers/julia/1.3.nix b/third_party/nixpkgs/pkgs/development/compilers/julia/1.3.nix
index da60fa8b98..5e431a5523 100644
--- a/third_party/nixpkgs/pkgs/development/compilers/julia/1.3.nix
+++ b/third_party/nixpkgs/pkgs/development/compilers/julia/1.3.nix
@@ -89,7 +89,7 @@ stdenv.mkDerivation rec {
"prefix=$(out)"
"SHELL=${stdenv.shell}"
- "USE_SYSTEM_BLAS=1"
+ (lib.optionalString (!stdenv.isDarwin) "USE_SYSTEM_BLAS=1")
"USE_BLAS64=${if blas.isILP64 then "1" else "0"}"
"USE_SYSTEM_LAPACK=1"
diff --git a/third_party/nixpkgs/pkgs/development/compilers/julia/1.5.nix b/third_party/nixpkgs/pkgs/development/compilers/julia/1.5.nix
index a523336b7b..b4c33faa44 100644
--- a/third_party/nixpkgs/pkgs/development/compilers/julia/1.5.nix
+++ b/third_party/nixpkgs/pkgs/development/compilers/julia/1.5.nix
@@ -1,7 +1,6 @@
-{ lib, stdenv, fetchurl, fetchzip, fetchFromGitHub
+{ lib, stdenv, fetchzip
# build tools
-, gfortran, m4, makeWrapper, patchelf, perl, which, python2
-, cmake
+, gfortran, m4, makeWrapper, patchelf, perl, which, python2, cmake
# libjulia dependencies
, libunwind, readline, utf8proc, zlib
# standard library dependencies
@@ -19,8 +18,8 @@ with lib;
let
majorVersion = "1";
minorVersion = "5";
- maintenanceVersion = "3";
- src_sha256 = "sha256:0jds8lrhk4hfdv7dg5p2ibzin9ivga7wrx7zwcmz6dqp3x792n1i";
+ maintenanceVersion = "4";
+ src_sha256 = "1ba1v7hakgj95xvhyff0zcp0574qv6vailjl48wl1f8w5k54lsw2";
version = "${majorVersion}.${minorVersion}.${maintenanceVersion}";
in
@@ -28,10 +27,10 @@ stdenv.mkDerivation rec {
pname = "julia";
inherit version;
- src = fetchzip {
- url = "https://github.com/JuliaLang/julia/releases/download/v${version}/julia-${version}-full.tar.gz";
- sha256 = src_sha256;
- };
+ src = fetchzip {
+ url = "https://github.com/JuliaLang/julia/releases/download/v${version}/julia-${version}-full.tar.gz";
+ sha256 = src_sha256;
+ };
patches = [
./use-system-utf8proc-julia-1.3.patch
@@ -89,7 +88,7 @@ stdenv.mkDerivation rec {
"prefix=$(out)"
"SHELL=${stdenv.shell}"
- "USE_SYSTEM_BLAS=1"
+ (lib.optionalString (!stdenv.isDarwin) "USE_SYSTEM_BLAS=1")
"USE_BLAS64=${if blas.isILP64 then "1" else "0"}"
"USE_SYSTEM_LAPACK=1"
diff --git a/third_party/nixpkgs/pkgs/development/compilers/julia/update-1.5.py b/third_party/nixpkgs/pkgs/development/compilers/julia/update-1.5.py
new file mode 100755
index 0000000000..e37f37d456
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/development/compilers/julia/update-1.5.py
@@ -0,0 +1,22 @@
+#!/usr/bin/env nix-shell
+#!nix-shell -i python3 -p python3 python3Packages.requests
+
+import os
+import re
+import requests
+import subprocess
+
+latest = requests.get("https://api.github.com/repos/JuliaLang/julia/releases/latest").json()["tag_name"]
+assert latest[0] == "v"
+major, minor, patch = latest[1:].split(".")
+assert major == "1"
+# When a new minor version comes out we'll have to refactor/copy this update script.
+assert minor == "5"
+
+sha256 = subprocess.check_output(["nix-prefetch-url", "--unpack", f"https://github.com/JuliaLang/julia/releases/download/v{major}.{minor}.{patch}/julia-{major}.{minor}.{patch}-full.tar.gz"], text=True).strip()
+
+nix_path = os.path.join(os.path.dirname(__file__), "1.5.nix")
+nix0 = open(nix_path, "r").read()
+nix1 = re.sub("maintenanceVersion = \".*\";", f"maintenanceVersion = \"{patch}\";", nix0)
+nix2 = re.sub("src_sha256 = \".*\";", f"src_sha256 = \"{sha256}\";", nix1)
+open(nix_path, "w").write(nix2)
diff --git a/third_party/nixpkgs/pkgs/development/compilers/llvm/6/default.nix b/third_party/nixpkgs/pkgs/development/compilers/llvm/6/default.nix
index a98314d118..fe6984ee58 100644
--- a/third_party/nixpkgs/pkgs/development/compilers/llvm/6/default.nix
+++ b/third_party/nixpkgs/pkgs/development/compilers/llvm/6/default.nix
@@ -36,6 +36,7 @@ let
llvm-manpages = lowPrio (tools.llvm.override {
enableManpages = true;
+ enableSharedLibraries = false;
python3 = pkgs.python3; # don't use python-boot
});
diff --git a/third_party/nixpkgs/pkgs/development/compilers/llvm/rocm/default.nix b/third_party/nixpkgs/pkgs/development/compilers/llvm/rocm/default.nix
index 5f9dba0fc3..135fcd2d25 100644
--- a/third_party/nixpkgs/pkgs/development/compilers/llvm/rocm/default.nix
+++ b/third_party/nixpkgs/pkgs/development/compilers/llvm/rocm/default.nix
@@ -1,12 +1,12 @@
{ lib, fetchFromGitHub, callPackage, wrapCCWith }:
let
- version = "4.0.1";
+ version = "4.1.0";
src = fetchFromGitHub {
owner = "RadeonOpenCompute";
repo = "llvm-project";
rev = "rocm-${version}";
- hash = "sha256-5mQ8tN7A045JCF7tHKgAZAbyVmXOd6Wf0CVUiPA80YM=";
+ hash = "sha256-DlId/dF5r0ULl2omYPCyu1Ic3XKlLL7ndiCA0RaF264=";
};
in rec {
clang = wrapCCWith rec {
diff --git a/third_party/nixpkgs/pkgs/development/compilers/llvm/rocm/lld.nix b/third_party/nixpkgs/pkgs/development/compilers/llvm/rocm/lld.nix
index 2a05331f7a..a6e993bb20 100644
--- a/third_party/nixpkgs/pkgs/development/compilers/llvm/rocm/lld.nix
+++ b/third_party/nixpkgs/pkgs/development/compilers/llvm/rocm/lld.nix
@@ -18,6 +18,8 @@ stdenv.mkDerivation rec {
outputs = [ "out" "dev" ];
+ cmakeFlags = [ "-DLLVM_MAIN_SRC_DIR=${llvm.src}" ];
+
postInstall = ''
moveToOutput include "$dev"
moveToOutput lib "$dev"
diff --git a/third_party/nixpkgs/pkgs/development/compilers/neko/default.nix b/third_party/nixpkgs/pkgs/development/compilers/neko/default.nix
index 8b157fb4ca..5260678193 100644
--- a/third_party/nixpkgs/pkgs/development/compilers/neko/default.nix
+++ b/third_party/nixpkgs/pkgs/development/compilers/neko/default.nix
@@ -1,14 +1,16 @@
-{ lib, stdenv, fetchurl, boehmgc, zlib, sqlite, pcre, cmake, pkg-config
+{ lib, stdenv, fetchFromGitHub, boehmgc, zlib, sqlite, pcre, cmake, pkg-config
, git, apacheHttpd, apr, aprutil, libmysqlclient, mbedtls, openssl, pkgs, gtk2, libpthreadstubs
}:
stdenv.mkDerivation rec {
pname = "neko";
- version = "2.2.0";
+ version = "2.3.0";
- src = fetchurl {
- url = "https://nekovm.org/media/neko-${version}-src.tar.gz";
- sha256 = "1qv47zaa0vzhjlq5wb71627n7dbsxpc1gqpg0hsngjxnbnh1q46g";
+ src = fetchFromGitHub {
+ owner = "HaxeFoundation";
+ repo = "neko";
+ rev = "v${lib.replaceStrings [ "." ] [ "-" ] version}";
+ sha256 = "19rc59cx7qqhcqlb0znwbnwbg04c1yq6xmvrwm1xi46k3vxa957g";
};
nativeBuildInputs = [ cmake pkg-config git ];
@@ -31,8 +33,17 @@ stdenv.mkDerivation rec {
meta = with lib; {
description = "A high-level dynamically typed programming language";
homepage = "https://nekovm.org";
- license = licenses.lgpl21;
- maintainers = [ maintainers.marcweber ];
+ license = [
+ # list based on https://github.com/HaxeFoundation/neko/blob/v2-3-0/LICENSE
+ licenses.gpl2Plus # nekoc, nekoml
+ licenses.lgpl21Plus # mysql.ndll
+ licenses.bsd3 # regexp.ndll
+ licenses.zlib # zlib.ndll
+ licenses.asl20 # mod_neko, mod_tora, mbedTLS
+ licenses.mit # overall, other libs
+ "https://github.com/HaxeFoundation/neko/blob/v2-3-0/LICENSE#L24-L40" # boehm gc
+ ];
+ maintainers = [ maintainers.marcweber maintainers.locallycompact ];
platforms = platforms.linux ++ platforms.darwin;
};
}
diff --git a/third_party/nixpkgs/pkgs/development/compilers/nim/default.nix b/third_party/nixpkgs/pkgs/development/compilers/nim/default.nix
index 75b1a0f002..676e35b06b 100644
--- a/third_party/nixpkgs/pkgs/development/compilers/nim/default.nix
+++ b/third_party/nixpkgs/pkgs/development/compilers/nim/default.nix
@@ -1,22 +1,10 @@
# https://nim-lang.github.io/Nim/packaging.html
+# https://nim-lang.org/docs/nimc.html
-{ stdenv, lib, fetchurl, fetchgit, fetchFromGitHub, makeWrapper, gdb, openssl
-, pcre, readline, boehmgc, sqlite, nim-unwrapped, nimble-unwrapped }:
+{ lib, buildPackages, stdenv, fetchurl, fetchgit, fetchFromGitHub, makeWrapper
+, openssl, pcre, readline, boehmgc, sqlite, nim-unwrapped }:
let
- version = "1.4.4";
- src = fetchurl {
- url = "https://nim-lang.org/download/nim-${version}.tar.xz";
- sha256 = "03k642nnjca0s6jlbn1v4jld51mbkix97jli4ky74gqlxyfp4wvd";
- };
-
- meta = with lib; {
- description = "Statically typed, imperative programming language";
- homepage = "https://nim-lang.org/";
- license = licenses.mit;
- maintainers = with maintainers; [ ehmry ];
- };
-
parseCpu = platform:
with platform;
# Derive a Nim CPU identifier
@@ -83,197 +71,251 @@ let
nimHost = parsePlatform stdenv.hostPlatform;
nimTarget = parsePlatform stdenv.targetPlatform;
- wrapperInputs = rec {
+ bootstrapCompiler = stdenv.mkDerivation rec {
+ pname = "nim-bootstrap";
+ version = "0.20.0";
- bootstrap = stdenv.mkDerivation rec {
- pname = "nim-bootstrap";
- version = "0.20.0";
-
- src = fetchgit {
- # A Git checkout is much smaller than a GitHub tarball.
- url = "https://github.com/nim-lang/csources.git";
- rev = "v" + version;
- sha256 = "0i6vsfy1sgapx43n226q8m0pvn159sw2mhp50zm3hhb9zfijanis";
- };
-
- enableParallelBuilding = true;
-
- installPhase = ''
- runHook preInstall
- install -Dt $out/bin bin/nim
- runHook postInstall
- '';
+ src = fetchgit {
+ # A Git checkout is much smaller than a GitHub tarball.
+ url = "https://github.com/nim-lang/csources.git";
+ rev = "v${version}";
+ sha256 = "0i6vsfy1sgapx43n226q8m0pvn159sw2mhp50zm3hhb9zfijanis";
};
- unwrapped = stdenv.mkDerivation {
- pname = "nim-unwrapped";
- inherit version src;
-
- buildInputs = [ boehmgc openssl pcre readline sqlite ];
-
- patches = [
- ./NIM_CONFIG_DIR.patch
- # Override compiler configuration via an environmental variable
-
- ./nixbuild.patch
- # Load libraries at runtime by absolute path
- ];
-
- configurePhase = ''
- runHook preConfigure
- cp ${bootstrap}/bin/nim bin/
- echo 'define:nixbuild' >> config/nim.cfg
- runHook postConfigure
- '';
-
- kochArgs = [
- "--cpu:${nimHost.cpu}"
- "--os:${nimHost.os}"
- "-d:release"
- "-d:useGnuReadline"
- ] ++ lib.optional (stdenv.isDarwin || stdenv.isLinux)
- "-d:nativeStacktrace";
-
- buildPhase = ''
- runHook preBuild
- local HOME=$TMPDIR
- ./bin/nim c koch
- ./koch boot $kochArgs --parallelBuild:$NIX_BUILD_CORES
- ./koch toolsNoExternal $kochArgs --parallelBuild:$NIX_BUILD_CORES
- runHook postBuild
- '';
-
- installPhase = ''
- runHook preInstall
- install -Dt $out/bin bin/*
- ln -sf $out/nim/bin/nim $out/bin/nim
- ./install.sh $out
- runHook postInstall
- '';
-
- inherit meta;
- };
-
- nimble-unwrapped = stdenv.mkDerivation rec {
- pname = "nimble-unwrapped";
- version = "0.13.1";
-
- src = fetchFromGitHub {
- owner = "nim-lang";
- repo = "nimble";
- rev = "v" + version;
- sha256 = "1idb4r0kjbqv16r6bgmxlr13w2vgq5332hmnc8pjbxiyfwm075x8";
- };
-
- nativeBuildInputs = [ nim-unwrapped ];
- buildInputs = [ openssl ];
-
- nimFlags = [ "--cpu:${nimHost.cpu}" "--os:${nimHost.os}" "-d:release" ];
-
- buildPhase = ''
- runHook preBuild
- HOME=$NIX_BUILD_TOP nim c $nimFlags src/nimble
- runHook postBuild
- '';
-
- installPhase = ''
- runHook preBuild
- install -Dt $out/bin src/nimble
- runHook postBuild
- '';
- };
+ enableParallelBuilding = true;
+ installPhase = ''
+ runHook preInstall
+ install -Dt $out/bin bin/nim
+ runHook postInstall
+ '';
};
- wrapped = let
- nim' = nim-unwrapped;
- nimble' = nimble-unwrapped;
+in {
+
+ nim-unwrapped = stdenv.mkDerivation rec {
+ pname = "nim-unwrapped";
+ version = "1.4.4";
+ strictDeps = true;
+
+ src = fetchurl {
+ url = "https://nim-lang.org/download/nim-${version}.tar.xz";
+ sha256 = "03k642nnjca0s6jlbn1v4jld51mbkix97jli4ky74gqlxyfp4wvd";
+ };
+
+ buildInputs = [ boehmgc openssl pcre readline sqlite ];
+
+ patches = [
+ ./NIM_CONFIG_DIR.patch
+ # Override compiler configuration via an environmental variable
+
+ ./nixbuild.patch
+ # Load libraries at runtime by absolute path
+ ];
+
+ configurePhase = ''
+ runHook preConfigure
+ cp ${bootstrapCompiler}/bin/nim bin/
+ echo 'define:nixbuild' >> config/nim.cfg
+ runHook postConfigure
+ '';
+
+ kochArgs = [
+ "--cpu:${nimHost.cpu}"
+ "--os:${nimHost.os}"
+ "-d:release"
+ "-d:useGnuReadline"
+ ] ++ lib.optional (stdenv.isDarwin || stdenv.isLinux) "-d:nativeStacktrace";
+
+ buildPhase = ''
+ runHook preBuild
+ local HOME=$TMPDIR
+ ./bin/nim c koch
+ ./koch boot $kochArgs --parallelBuild:$NIX_BUILD_CORES
+ ./koch toolsNoExternal $kochArgs --parallelBuild:$NIX_BUILD_CORES
+ runHook postBuild
+ '';
+
+ installPhase = ''
+ runHook preInstall
+ install -Dt $out/bin bin/*
+ ln -sf $out/nim/bin/nim $out/bin/nim
+ ./install.sh $out
+ runHook postInstall
+ '';
+
+ meta = with lib; {
+ description = "Statically typed, imperative programming language";
+ homepage = "https://nim-lang.org/";
+ license = licenses.mit;
+ maintainers = with maintainers; [ ehmry ];
+ };
+ };
+
+ nimble-unwrapped = stdenv.mkDerivation rec {
+ pname = "nimble-unwrapped";
+ version = "0.13.1";
+ strictDeps = true;
+
+ src = fetchFromGitHub {
+ owner = "nim-lang";
+ repo = "nimble";
+ rev = "v${version}";
+ sha256 = "1idb4r0kjbqv16r6bgmxlr13w2vgq5332hmnc8pjbxiyfwm075x8";
+ };
+
+ depsBuildBuild = [ nim-unwrapped ];
+ buildInputs = [ openssl ];
+
+ nimFlags = [ "--cpu:${nimHost.cpu}" "--os:${nimHost.os}" "-d:release" ];
+
+ buildPhase = ''
+ runHook preBuild
+ HOME=$NIX_BUILD_TOP nim c $nimFlags src/nimble
+ runHook postBuild
+ '';
+
+ installPhase = ''
+ runHook preBuild
+ install -Dt $out/bin src/nimble
+ runHook postBuild
+ '';
+ };
+
+ nim = let
+ nim' = buildPackages.nim-unwrapped;
+ nimble' = buildPackages.nimble-unwrapped;
inherit (stdenv) targetPlatform;
in stdenv.mkDerivation {
name = "${targetPlatform.config}-nim-wrapper-${nim'.version}";
inherit (nim') version;
preferLocalBuild = true;
+ strictDeps = true;
nativeBuildInputs = [ makeWrapper ];
+ patches = [
+ ./nim.cfg.patch
+ # Remove configurations that clash with ours
+ ];
+
unpackPhase = ''
runHook preUnpack
- tar xf ${nim'.src} nim-$version/config/nim.cfg
+ tar xf ${nim'.src} nim-$version/config
cd nim-$version
runHook postUnpack
'';
dontConfigure = true;
- wrapperArgs = [
- "--prefix PATH : ${lib.makeBinPath [ stdenv.cc gdb ]}:${
- placeholder "out"
- }/bin"
- "--prefix LD_LIBRARY_PATH : ${
- lib.makeLibraryPath [ stdenv.cc.libc openssl ]
- }"
- "--set NIM_CONFIG_PATH ${placeholder "out"}/etc/nim"
- ''--set NIX_HARDENING_ENABLE "''${NIX_HARDENING_ENABLE/fortify}"''
- # Fortify hardening appends -O2 to gcc flags which is unwanted for unoptimized nim builds.
- ];
-
- buildPhase = with stdenv;
- let
- ccType = if cc.isGNU then
- "gcc"
- else if cc.isClang then
- "clang"
- else
- abort "no Nim configuration available for ${cc.name}";
- in ''
+ buildPhase =
+ # Configure the Nim compiler to use $CC and $CXX as backends
+ # The compiler is configured by two configuration files, each with
+ # a different DSL. The order of evaluation matters and that order
+ # is not documented, so duplicate the configuration across both files.
+ ''
runHook preBuild
- cat >> config/nim.cfg << EOF
+ cat >> config/config.nims << WTF
- define:nixbuild
- os = ${nimTarget.os}
- cpu = ${nimTarget.cpu}
- cc = ${ccType}
- EOF
+ switch("os", "${nimTarget.os}")
+ switch("cpu", "${nimTarget.cpu}")
+ switch("define", "nixbuild")
- mkdir -p $out/bin $out/etc/nim
- export cc=$CC
- export cxx=$CXX
- substituteAll config/nim.cfg $out/etc/nim/nim.cfg \
- --replace "cc = gcc" ""
+ # Configure the compiler using the $CC set by Nix at build time
+ import strutils
+ let cc = getEnv"CC"
+ if cc.contains("gcc"):
+ switch("cc", "gcc")
+ elif cc.contains("clang"):
+ switch("cc", "clang")
+ WTF
- for binpath in ${nim'}/bin/nim?*; do
- local binname=`basename $binpath`
- makeWrapper \
- $binpath $out/bin/${targetPlatform.config}-$binname \
- $wrapperArgs
- ln -s $out/bin/${targetPlatform.config}-$binname $out/bin/$binname
- done
+ mv config/nim.cfg config/nim.cfg.old
+ cat > config/nim.cfg << WTF
+ os = "${nimTarget.os}"
+ cpu = "${nimTarget.cpu}"
+ define:"nixbuild"
+ WTF
- makeWrapper \
- ${nim'}/nim/bin/nim $out/bin/${targetPlatform.config}-nim \
- $wrapperArgs
- ln -s $out/bin/${targetPlatform.config}-nim $out/bin/nim
+ cat >> config/nim.cfg < config/nim.cfg.old
+ rm config/nim.cfg.old
- makeWrapper \
- ${nim'}/bin/testament $out/bin/${targetPlatform.config}-testament \
- $wrapperArgs
- ln -s $out/bin/${targetPlatform.config}-testament $out/bin/testament
+ cat >> config/nim.cfg << WTF
- makeWrapper \
- ${nimble'}/bin/nimble $out/bin/${targetPlatform.config}-nimble \
- --suffix PATH : $out/bin
- ln -s $out/bin/${targetPlatform.config}-nimble $out/bin/nimble
+ clang.cpp.exe %= "\$CXX"
+ clang.cpp.linkerexe %= "\$CXX"
+ clang.exe %= "\$CC"
+ clang.linkerexe %= "\$CC"
+ gcc.cpp.exe %= "\$CXX"
+ gcc.cpp.linkerexe %= "\$CXX"
+ gcc.exe %= "\$CC"
+ gcc.linkerexe %= "\$CC"
+ WTF
runHook postBuild
'';
- dontInstall = true;
+ wrapperArgs = [
+ "--prefix PATH : ${lib.makeBinPath [ buildPackages.gdb ]}:${
+ placeholder "out"
+ }/bin"
+ # Used by nim-gdb
- meta = meta // {
+ "--prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ openssl pcre ]}"
+ # These libraries may be referred to by the standard library.
+ # This is broken for cross-compilation because the package
+ # set will be shifted back by nativeBuildInputs.
+
+ "--set NIM_CONFIG_PATH ${placeholder "out"}/etc/nim"
+ # Use the custom configuration
+
+ ''--set NIX_HARDENING_ENABLE "''${NIX_HARDENING_ENABLE/fortify}"''
+ # Fortify hardening appends -O2 to gcc flags which is unwanted for unoptimized nim builds.
+ ];
+
+ installPhase = ''
+ runHook preInstall
+
+ mkdir -p $out/bin $out/etc
+
+ cp -r config $out/etc/nim
+
+ for binpath in ${nim'}/bin/nim?*; do
+ local binname=`basename $binpath`
+ makeWrapper \
+ $binpath $out/bin/${targetPlatform.config}-$binname \
+ $wrapperArgs
+ ln -s $out/bin/${targetPlatform.config}-$binname $out/bin/$binname
+ done
+
+ makeWrapper \
+ ${nim'}/nim/bin/nim $out/bin/${targetPlatform.config}-nim \
+ $wrapperArgs
+ ln -s $out/bin/${targetPlatform.config}-nim $out/bin/nim
+
+ makeWrapper \
+ ${nim'}/bin/testament $out/bin/${targetPlatform.config}-testament \
+ $wrapperArgs
+ ln -s $out/bin/${targetPlatform.config}-testament $out/bin/testament
+
+ makeWrapper \
+ ${nimble'}/bin/nimble $out/bin/${targetPlatform.config}-nimble \
+ --suffix PATH : $out/bin
+ ln -s $out/bin/${targetPlatform.config}-nimble $out/bin/nimble
+
+ runHook postInstall
+ '';
+
+ passthru = {
+ nim = nim';
+ nimble = nimble';
+ };
+
+ meta = nim'.meta // {
description = nim'.meta.description
+ " (${targetPlatform.config} wrapper)";
- platforms = lib.platforms.unix;
+ platforms = with lib.platforms; unix ++ genode;
};
};
-in wrapped // wrapperInputs
+}
diff --git a/third_party/nixpkgs/pkgs/development/compilers/nim/nim.cfg.patch b/third_party/nixpkgs/pkgs/development/compilers/nim/nim.cfg.patch
new file mode 100644
index 0000000000..a95b672d1c
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/development/compilers/nim/nim.cfg.patch
@@ -0,0 +1,70 @@
+diff --git a/config/nim.cfg b/config/nim.cfg
+index a33a2f0a9..e069193ff 100644
+--- a/config/nim.cfg
++++ b/config/nim.cfg
+@@ -8,26 +8,12 @@
+ # Environment variables can be accessed like so:
+ # gcc.path %= "$CC_PATH"
+
+-cc = gcc
+-
+ # additional options always passed to the compiler:
+ --parallel_build: "0" # 0 to auto-detect number of processors
+
+ hint[LineTooLong]=off
+ #hint[XDeclaredButNotUsed]=off
+
+-# Examples of how to setup a cross-compiler:
+-
+-# Cross-compiling for Raspberry Pi.
+-# (This compiler is available in gcc-arm-linux-gnueabihf package on Ubuntu)
+-arm.linux.gcc.exe = "arm-linux-gnueabihf-gcc"
+-arm.linux.gcc.linkerexe = "arm-linux-gnueabihf-gcc"
+-
+-# For OpenWRT, you will also need to adjust PATH to point to your toolchain.
+-mips.linux.gcc.exe = "mips-openwrt-linux-gcc"
+-mips.linux.gcc.linkerexe = "mips-openwrt-linux-gcc"
+-
+-
+ path="$lib/deprecated/core"
+ path="$lib/deprecated/pure"
+ path="$lib/pure/collections"
+@@ -111,7 +97,7 @@ path="$lib/pure"
+ @end
+
+ @if unix:
+- @if not bsd or haiku:
++ @if not bsd or genode or haiku:
+ # -fopenmp
+ gcc.options.linker = "-ldl"
+ gcc.cpp.options.linker = "-ldl"
+@@ -295,29 +281,6 @@ vcc.cpp.options.size = "/O1"
+ # Configuration for the Tiny C Compiler:
+ tcc.options.always = "-w"
+
+-# Configuration for the Genode toolchain
+-@if genode:
+- noCppExceptions # avoid std C++
+- tlsEmulation:on # no TLS segment register magic
+- @if i386 or amd64:
+- gcc.exe = "genode-x86-gcc"
+- gcc.cpp.exe = "genode-x86-g++"
+- gcc.cpp.linkerexe = "genode-x86-ld"
+- @elif arm:
+- gcc.exe = "genode-arm-gcc"
+- gcc.cpp.exe = "genode-arm-g++"
+- gcc.cpp.linkerexe = "genode-arm-ld"
+- @elif arm64:
+- gcc.exe = "genode-aarch64-gcc"
+- gcc.cpp.exe = "genode-aarch64-g++"
+- gcc.cpp.linkerexe = "genode-aarch64-ld"
+- @elif riscv64:
+- gcc.exe = "genode-riscv-gcc"
+- gcc.cpp.exe = "genode-riscv-g++"
+- gcc.cpp.linkerexe = "genode-riscv-ld"
+- @end
+-@end
+-
+ @if arm or arm64:
+ --define:nimEmulateOverflowChecks
+ @end
diff --git a/third_party/nixpkgs/pkgs/development/compilers/sbcl/default.nix b/third_party/nixpkgs/pkgs/development/compilers/sbcl/2.0.8.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/compilers/sbcl/default.nix
rename to third_party/nixpkgs/pkgs/development/compilers/sbcl/2.0.8.nix
diff --git a/third_party/nixpkgs/pkgs/development/compilers/sbcl/2.1.2.nix b/third_party/nixpkgs/pkgs/development/compilers/sbcl/2.1.2.nix
new file mode 100644
index 0000000000..4f4c85b286
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/development/compilers/sbcl/2.1.2.nix
@@ -0,0 +1,4 @@
+import ./common.nix {
+ version = "2.1.2";
+ sha256 = "sha256:02scrqyp2izsd8xjm2k5j5lhn4pdhd202jlcb54ysmcqjd80awdp";
+}
diff --git a/third_party/nixpkgs/pkgs/development/coq-modules/fourcolor/default.nix b/third_party/nixpkgs/pkgs/development/coq-modules/fourcolor/default.nix
new file mode 100644
index 0000000000..4de6e2da8b
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/development/coq-modules/fourcolor/default.nix
@@ -0,0 +1,24 @@
+{ lib, mkCoqDerivation, coq, mathcomp, version ? null }:
+with lib;
+
+mkCoqDerivation {
+ pname = "fourcolor";
+ owner = "math-comp";
+
+ release."1.2.3".rev = "v1.2.3";
+ release."1.2.3".sha256 = "sha256-gwKfUa74fIP7j+2eQgnLD7AswjCtOFGHGaIWb4qI0n4=";
+
+ inherit version;
+ defaultVersion = with versions; switch mathcomp.version [
+ { case = pred.inter (isGe "1.11.0") (isLt "1.13"); out = "1.2.3"; }
+ ] null;
+
+ propagatedBuildInputs = [ mathcomp.algebra ];
+
+ meta = {
+ description = "Formal proof of the Four Color Theorem ";
+ maintainers = with maintainers; [ siraben ];
+ license = licenses.cecill-b;
+ platforms = platforms.unix;
+ };
+}
diff --git a/third_party/nixpkgs/pkgs/development/gnuradio-modules/ais/default.nix b/third_party/nixpkgs/pkgs/development/gnuradio-modules/ais/default.nix
index 0770d83f21..5ff4ffd756 100644
--- a/third_party/nixpkgs/pkgs/development/gnuradio-modules/ais/default.nix
+++ b/third_party/nixpkgs/pkgs/development/gnuradio-modules/ais/default.nix
@@ -1,5 +1,4 @@
{ lib
-, stdenv
, mkDerivation
, fetchFromGitHub
, cmake
diff --git a/third_party/nixpkgs/pkgs/development/interpreters/cling/default.nix b/third_party/nixpkgs/pkgs/development/interpreters/cling/default.nix
index 8f80d2f4ee..dbc2751e78 100644
--- a/third_party/nixpkgs/pkgs/development/interpreters/cling/default.nix
+++ b/third_party/nixpkgs/pkgs/development/interpreters/cling/default.nix
@@ -1,5 +1,5 @@
{ lib, stdenv
-, python
+, python3
, libffi
, git
, cmake
@@ -38,9 +38,11 @@ let
chmod -R a+w ./tools/cling
'';
- nativeBuildInputs = [ python git cmake ];
+ nativeBuildInputs = [ python3 git cmake ];
buildInputs = [ libffi llvmPackages_5.llvm zlib ];
+ strictDeps = true;
+
cmakeFlags = [
"-DLLVM_TARGETS_TO_BUILD=host;NVPTX"
"-DLLVM_ENABLE_RTTI=ON"
diff --git a/third_party/nixpkgs/pkgs/development/interpreters/clojure/default.nix b/third_party/nixpkgs/pkgs/development/interpreters/clojure/default.nix
index 89db33c5a8..a96fb03aab 100644
--- a/third_party/nixpkgs/pkgs/development/interpreters/clojure/default.nix
+++ b/third_party/nixpkgs/pkgs/development/interpreters/clojure/default.nix
@@ -2,12 +2,12 @@
stdenv.mkDerivation rec {
pname = "clojure";
- version = "1.10.2.774";
+ version = "1.10.3.814";
src = fetchurl {
# https://clojure.org/releases/tools
url = "https://download.clojure.org/install/clojure-tools-${version}.tar.gz";
- sha256 = "0z3j8m9k7prmx6n3kpyhj04pjdg7y0plyxv4kp7789shanr6y4qp";
+ sha256 = "sha256-+jpnhuKPvxKJA8xDo9GiRKpFJdPYRJTssmZtafadEn4=";
};
nativeBuildInputs = [
diff --git a/third_party/nixpkgs/pkgs/development/interpreters/joker/default.nix b/third_party/nixpkgs/pkgs/development/interpreters/joker/default.nix
index 004d2732f3..a8e73339ee 100644
--- a/third_party/nixpkgs/pkgs/development/interpreters/joker/default.nix
+++ b/third_party/nixpkgs/pkgs/development/interpreters/joker/default.nix
@@ -2,16 +2,16 @@
buildGoModule rec {
pname = "joker";
- version = "0.15.7";
+ version = "0.16.0";
src = fetchFromGitHub {
rev = "v${version}";
owner = "candid82";
repo = "joker";
- sha256 = "01mlizkflajad4759yl60ymibymrvanhc22jaffj50k9b77v97kq";
+ sha256 = "sha256-ckbKxWzcISo9yOXuwgOiSfR2hs+5od0Ru0Ku2I52Gu8=";
};
- vendorSha256 = "031ban30kx84r54fj9aq96pwkz9nqh4p9yzs4l8i1wqmy52rldvl";
+ vendorSha256 = "sha256-AYoespfzFLP/jIIxbw5K653wc7sSfLY8K7di8GZ64wA=";
doCheck = false;
diff --git a/third_party/nixpkgs/pkgs/development/interpreters/php/generic.nix b/third_party/nixpkgs/pkgs/development/interpreters/php/generic.nix
index 659157e24c..ad53e75583 100644
--- a/third_party/nixpkgs/pkgs/development/interpreters/php/generic.nix
+++ b/third_party/nixpkgs/pkgs/development/interpreters/php/generic.nix
@@ -124,7 +124,9 @@ let
postBuild = ''
ln -s ${extraInit} $out/lib/php.ini
- wrapProgram $out/bin/php --set PHP_INI_SCAN_DIR $out/lib
+ if test -e $out/bin/php; then
+ wrapProgram $out/bin/php --set PHP_INI_SCAN_DIR $out/lib
+ fi
if test -e $out/bin/php-fpm; then
wrapProgram $out/bin/php-fpm --set PHP_INI_SCAN_DIR $out/lib
diff --git a/third_party/nixpkgs/pkgs/development/interpreters/spidermonkey/38.nix b/third_party/nixpkgs/pkgs/development/interpreters/spidermonkey/38.nix
deleted file mode 100644
index 482561a901..0000000000
--- a/third_party/nixpkgs/pkgs/development/interpreters/spidermonkey/38.nix
+++ /dev/null
@@ -1,72 +0,0 @@
-{ lib, stdenv, fetchurl, pkg-config, gnused_422, perl, python2, zip, libffi, readline, icu, zlib, buildPackages
-, libobjc }:
-
-with lib;
-
-stdenv.mkDerivation rec {
- version = "38.8.0";
- pname = "spidermonkey";
-
- src = fetchurl {
- url = "mirror://mozilla/firefox/releases/${version}esr/source/firefox-${version}esr.source.tar.bz2";
- sha256 = "10lrync6cxnjlnadc0j3vg8r2dq9b3wwanw8qj1h6ncxwb7asxcl";
- };
-
- buildInputs = [ libffi readline icu zlib ]
- ++ lib.optional stdenv.isDarwin libobjc;
- nativeBuildInputs = [ pkg-config perl python2 zip gnused_422 ];
-
- postUnpack = "sourceRoot=\${sourceRoot}/js/src";
-
- preConfigure = ''
- export CXXFLAGS="-fpermissive"
- export LIBXUL_DIST=$out
- export PYTHON="${buildPackages.python2.interpreter}"
- '';
-
- configureFlags = [
- "--enable-threadsafe"
- "--with-system-ffi"
- "--enable-posix-nspr-emulation"
- "--with-system-zlib"
- "--with-system-icu"
- "--enable-readline"
-
- # enabling these because they're wanted by 0ad. They may or may
- # not be good defaults for other uses.
- "--enable-gcgenerational"
- "--enable-shared-js"
- ] ++ optionals (stdenv.hostPlatform != stdenv.buildPlatform) [
- # Spidermonkey seems to use different host/build terminology for cross
- # compilation here.
- "--host=${stdenv.buildPlatform.config}"
- "--target=${stdenv.hostPlatform.config}"
- ];
-
- configurePlatforms = [];
-
- depsBuildBuild = [ buildPackages.stdenv.cc ];
-
- # This addresses some build system bug. It's quite likely to be safe
- # to re-enable parallel builds if the source revision changes.
- enableParallelBuilding = true;
-
- postFixup = ''
- # The headers are symlinks to a directory that doesn't get put
- # into $out, so they end up broken. Fix that by just resolving the
- # symlinks.
- for i in $(find $out -type l); do
- cp --remove-destination "$(readlink "$i")" "$i";
- done
- '';
-
- meta = with lib; {
- description = "Mozilla's JavaScript engine written in C/C++";
- homepage = "https://developer.mozilla.org/en/SpiderMonkey";
- # TODO: MPL/GPL/LGPL tri-license.
-
- maintainers = [ maintainers.abbradar ];
- platforms = platforms.unix;
- knownVulnerabilities = [ "SpiderMonkey 38 is outdated and contains known security vulnerabilities." ]; # as per https://developer.mozilla.org/en-US/docs/Mozilla/Projects/SpiderMonkey/Releases/38
- };
-}
diff --git a/third_party/nixpkgs/pkgs/development/libraries/abseil-cpp/default.nix b/third_party/nixpkgs/pkgs/development/libraries/abseil-cpp/default.nix
index f724c2e0ac..0813a96552 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/abseil-cpp/default.nix
+++ b/third_party/nixpkgs/pkgs/development/libraries/abseil-cpp/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchFromGitHub, cmake }:
+{ lib, stdenv, fetchFromGitHub, cmake, static ? stdenv.hostPlatform.isStatic }:
stdenv.mkDerivation rec {
pname = "abseil-cpp";
@@ -13,6 +13,7 @@ stdenv.mkDerivation rec {
cmakeFlags = [
"-DCMAKE_CXX_STANDARD=17"
+ "-DBUILD_SHARED_LIBS=${if static then "OFF" else "ON"}"
];
nativeBuildInputs = [ cmake ];
diff --git a/third_party/nixpkgs/pkgs/development/libraries/allegro/5.nix b/third_party/nixpkgs/pkgs/development/libraries/allegro/5.nix
index ca1446dd93..3143474112 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/allegro/5.nix
+++ b/third_party/nixpkgs/pkgs/development/libraries/allegro/5.nix
@@ -9,13 +9,13 @@
stdenv.mkDerivation rec {
pname = "allegro";
- version = "5.2.6.0";
+ version = "5.2.7.0";
src = fetchFromGitHub {
owner = "liballeg";
repo = "allegro5";
rev = version;
- sha256 = "1xbhvriyh10ka2j7jgjkpa6mlzp6av909hhr9sk317vjvf0z0mqz";
+ sha256 = "sha256-JdnzEW+qAhAljR+WfmgE3P9xeR2HvjS64tFgCC0tNA0=";
};
buildInputs = [
diff --git a/third_party/nixpkgs/pkgs/development/libraries/amdvlk/default.nix b/third_party/nixpkgs/pkgs/development/libraries/amdvlk/default.nix
index 24ad128a58..1d0256f3b2 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 = "2021.Q1.5";
+ version = "2021.Q1.6";
src = fetchRepoProject {
name = "${pname}-src";
manifest = "https://github.com/GPUOpen-Drivers/AMDVLK.git";
rev = "refs/tags/v-${version}";
- sha256 = "OSX4alrR49jqIu2QZcTieurUnyWQJ0wheDwFiNd9QcY=";
+ sha256 = "FSQ/bYlvdw0Ih3Yl329o8Gizw0YcZTLtiI222Ju4M8w=";
};
buildInputs = [
diff --git a/third_party/nixpkgs/pkgs/development/libraries/arrayfire/default.nix b/third_party/nixpkgs/pkgs/development/libraries/arrayfire/default.nix
index c636d67233..a66db48001 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/arrayfire/default.nix
+++ b/third_party/nixpkgs/pkgs/development/libraries/arrayfire/default.nix
@@ -1,7 +1,7 @@
{ lib, stdenv, fetchurl, fetchFromGitHub, cmake, pkg-config
, opencl-clhpp, ocl-icd, fftw, fftwFloat
, blas, lapack, boost, mesa, libGLU, libGL
-, freeimage, python, clfft, clblas
+, freeimage, python3, clfft, clblas
, doxygen, buildDocs ? false
, cudaSupport ? false, cudatoolkit
}:
@@ -39,9 +39,11 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [
cmake
pkg-config
- python
+ python3
];
+ strictDeps = true;
+
buildInputs = [
opencl-clhpp fftw fftwFloat
blas lapack
diff --git a/third_party/nixpkgs/pkgs/development/libraries/aubio/default.nix b/third_party/nixpkgs/pkgs/development/libraries/aubio/default.nix
index 7aa4859ef0..b1c6c6396c 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/aubio/default.nix
+++ b/third_party/nixpkgs/pkgs/development/libraries/aubio/default.nix
@@ -1,5 +1,5 @@
{ lib, stdenv, fetchurl, alsaLib, fftw, libjack2, libsamplerate
-, libsndfile, pkg-config, python, wafHook
+, libsndfile, pkg-config, python3, wafHook
}:
stdenv.mkDerivation rec {
@@ -10,9 +10,11 @@ stdenv.mkDerivation rec {
sha256 = "1npks71ljc48w6858l9bq30kaf5nph8z0v61jkfb70xb9np850nl";
};
- nativeBuildInputs = [ pkg-config python wafHook ];
+ nativeBuildInputs = [ pkg-config python3 wafHook ];
buildInputs = [ alsaLib fftw libjack2 libsamplerate libsndfile ];
+ strictDeps = true;
+
meta = with lib; {
description = "Library for audio labelling";
homepage = "https://aubio.org/";
diff --git a/third_party/nixpkgs/pkgs/development/libraries/botan/generic.nix b/third_party/nixpkgs/pkgs/development/libraries/botan/generic.nix
index 0369f603b8..33f9daf7b5 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/botan/generic.nix
+++ b/third_party/nixpkgs/pkgs/development/libraries/botan/generic.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchurl, python, bzip2, zlib, gmp, openssl, boost
+{ lib, stdenv, fetchurl, python3, bzip2, zlib, gmp, openssl, boost
# Passed by version specific builders
, baseVersion, revision, sha256
, sourceExtension ? "tar.xz"
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
};
inherit postPatch;
- buildInputs = [ python bzip2 zlib gmp openssl boost ]
+ buildInputs = [ python3 bzip2 zlib gmp openssl boost ]
++ lib.optionals stdenv.isDarwin [ CoreServices Security ];
configurePhase = ''
diff --git a/third_party/nixpkgs/pkgs/development/libraries/clearsilver/default.nix b/third_party/nixpkgs/pkgs/development/libraries/clearsilver/default.nix
index 74d167144a..73ffd6c12b 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/clearsilver/default.nix
+++ b/third_party/nixpkgs/pkgs/development/libraries/clearsilver/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchurl, fetchpatch, python }:
+{ lib, stdenv, fetchurl, fetchpatch, python2 }:
stdenv.mkDerivation rec {
name = "clearsilver-0.10.5";
@@ -8,10 +8,10 @@ stdenv.mkDerivation rec {
sha256 = "1046m1dpq3nkgxbis2dr2x7hynmy51n64465q78d7pdgvqwa178y";
};
- PYTHON_SITE = "$(out)/site-packages";
+ PYTHON_SITE = "${placeholder "out"}/${python2.sitePackages}";
configureFlags = [
- "--with-python=${python}/bin/python"
+ "--with-python=${python2.interpreter}"
"--disable-apache"
"--disable-perl"
"--disable-ruby"
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
preInstall = ''
mkdir -p $out
- mkdir -p $out/site-packages
+ mkdir -p $out/${python2.sitePackages}
'';
patches = [
diff --git a/third_party/nixpkgs/pkgs/development/libraries/coordgenlibs/default.nix b/third_party/nixpkgs/pkgs/development/libraries/coordgenlibs/default.nix
index f0f0718ab1..267c7df945 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/coordgenlibs/default.nix
+++ b/third_party/nixpkgs/pkgs/development/libraries/coordgenlibs/default.nix
@@ -9,13 +9,13 @@
stdenv.mkDerivation rec {
pname = "coordgenlibs";
- version = "1.4.2";
+ version = "2.0.0";
src = fetchFromGitHub {
owner = "schrodinger";
repo = pname;
rev = "v${version}";
- sha256 = "18s3y9v6x246hapxy0cy4srnll4qqzqfx003j551l5f27b2ng8fn";
+ sha256 = "sha256-lfA0y/tT64C/7NjBff4HEzIfhZ3piFBkQjX5xVbFXFc=";
};
nativeBuildInputs = [ cmake ];
diff --git a/third_party/nixpkgs/pkgs/development/libraries/cppcms/default.nix b/third_party/nixpkgs/pkgs/development/libraries/cppcms/default.nix
index aceb2d61e3..e0f9ed5991 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/cppcms/default.nix
+++ b/third_party/nixpkgs/pkgs/development/libraries/cppcms/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchurl, cmake, pcre, zlib, python, openssl }:
+{ lib, stdenv, fetchurl, cmake, pcre, zlib, python2, openssl }:
stdenv.mkDerivation rec {
pname = "cppcms";
@@ -10,7 +10,9 @@ stdenv.mkDerivation rec {
};
nativeBuildInputs = [ cmake ];
- buildInputs = [ pcre zlib python openssl ];
+ buildInputs = [ pcre zlib python2 openssl ];
+
+ strictDeps = true;
cmakeFlags = [
"--no-warn-unused-cli"
diff --git a/third_party/nixpkgs/pkgs/development/libraries/dlib/default.nix b/third_party/nixpkgs/pkgs/development/libraries/dlib/default.nix
index 096910b238..aadd61370b 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/dlib/default.nix
+++ b/third_party/nixpkgs/pkgs/development/libraries/dlib/default.nix
@@ -9,13 +9,13 @@
stdenv.mkDerivation rec {
pname = "dlib";
- version = "19.21";
+ version = "19.22";
src = fetchFromGitHub {
owner = "davisking";
repo = "dlib";
rev ="v${version}";
- sha256 = "00jwklnl21l3hlvb0bjc6rl3hgi88vxb41dsn4m0kh436c9v0rl3";
+ sha256 = "sha256-cEbw01w4KgSG3JTvTE/qruo7i4/L++m02HW+0VNmSSQ=";
};
postPatch = ''
diff --git a/third_party/nixpkgs/pkgs/development/libraries/docopt_cpp/default.nix b/third_party/nixpkgs/pkgs/development/libraries/docopt_cpp/default.nix
index f9456b8aca..3de84b684e 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/docopt_cpp/default.nix
+++ b/third_party/nixpkgs/pkgs/development/libraries/docopt_cpp/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchFromGitHub, cmake, python }:
+{ lib, stdenv, fetchFromGitHub, cmake, python2 }:
stdenv.mkDerivation rec {
version = "0.6.3";
@@ -11,10 +11,12 @@ stdenv.mkDerivation rec {
sha256 = "0cz3vv7g5snfbsqcf3q8bmd6kv5qp84gj3avwkn4vl00krw13bl7";
};
- nativeBuildInputs = [ cmake python ];
+ nativeBuildInputs = [ cmake python2 ];
cmakeFlags = ["-DWITH_TESTS=ON"];
+ strictDeps = true;
+
doCheck = true;
postPatch = ''
diff --git a/third_party/nixpkgs/pkgs/development/libraries/egl-wayland/default.nix b/third_party/nixpkgs/pkgs/development/libraries/egl-wayland/default.nix
index be22e24044..b3654087ff 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/egl-wayland/default.nix
+++ b/third_party/nixpkgs/pkgs/development/libraries/egl-wayland/default.nix
@@ -40,7 +40,7 @@ let
in stdenv.mkDerivation rec {
pname = "egl-wayland";
- version = "1.1.4";
+ version = "1.1.6";
outputs = [ "out" "dev" ];
@@ -48,13 +48,9 @@ in stdenv.mkDerivation rec {
owner = "Nvidia";
repo = pname;
rev = version;
- sha256 = "0wvamjcfycd7rgk7v14g2rin55xin9rfkxmivyay3cm08vnl7y1d";
+ sha256 = "1n9lg8hpjgxlf7dpddkjhbslsfd0symla2wk6jjmnl9n9jv2gmzk";
};
- # Add missing include
- # https://github.com/NVIDIA/egl-wayland/pull/24
- patches = [ ./eglmesaext.patch ];
-
nativeBuildInputs = [
meson
ninja
@@ -69,6 +65,13 @@ in stdenv.mkDerivation rec {
wayland
];
+ postFixup = ''
+ # Doubled prefix in pc file after postbuild hook replaces includedir prefix variable with dev output path
+ substituteInPlace $dev/lib/pkgconfig/wayland-eglstream.pc \
+ --replace "=$dev/$dev" "=$dev" \
+ --replace "Requires:" "Requires.private:"
+ '';
+
meta = with lib; {
description = "The EGLStream-based Wayland external platform";
homepage = "https://github.com/NVIDIA/egl-wayland/";
diff --git a/third_party/nixpkgs/pkgs/development/libraries/egl-wayland/eglmesaext.patch b/third_party/nixpkgs/pkgs/development/libraries/egl-wayland/eglmesaext.patch
deleted file mode 100644
index 9384ecff9b..0000000000
--- a/third_party/nixpkgs/pkgs/development/libraries/egl-wayland/eglmesaext.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff --git a/src/wayland-eglsurface.c b/src/wayland-eglsurface.c
-index 01c9cb3..45736b0 100644
---- a/src/wayland-eglsurface.c
-+++ b/src/wayland-eglsurface.c
-@@ -37,6 +37,7 @@
- #include
- #include
- #include
-+#include
-
- #define WL_EGL_WINDOW_DESTROY_CALLBACK_SINCE 3
-
diff --git a/third_party/nixpkgs/pkgs/development/libraries/gaia/default.nix b/third_party/nixpkgs/pkgs/development/libraries/gaia/default.nix
index 088354aecb..47926e2ec0 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/gaia/default.nix
+++ b/third_party/nixpkgs/pkgs/development/libraries/gaia/default.nix
@@ -9,7 +9,7 @@
, wafHook
, makeWrapper
, qt4
-, pythonPackages
+, pythonPackages ? null
, pythonSupport ? false
# Default to false since it breaks the build, see https://github.com/MTG/gaia/issues/11
, stlfacadeSupport ? false
diff --git a/third_party/nixpkgs/pkgs/development/libraries/galario/default.nix b/third_party/nixpkgs/pkgs/development/libraries/galario/default.nix
index 888f26f2da..4e28f84bac 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/galario/default.nix
+++ b/third_party/nixpkgs/pkgs/development/libraries/galario/default.nix
@@ -5,7 +5,7 @@
, fftw
, fftwFloat
, enablePython ? false
-, pythonPackages
+, pythonPackages ? null
, llvmPackages
}:
let
diff --git a/third_party/nixpkgs/pkgs/development/libraries/ganv/default.nix b/third_party/nixpkgs/pkgs/development/libraries/ganv/default.nix
index bf6c030589..d53206ca66 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/ganv/default.nix
+++ b/third_party/nixpkgs/pkgs/development/libraries/ganv/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchgit, graphviz, gtk2, gtkmm2, pkg-config, python, wafHook }:
+{ lib, stdenv, fetchgit, graphviz, gtk2, gtkmm2, pkg-config, python3, wafHook }:
stdenv.mkDerivation rec {
pname = "ganv";
@@ -11,8 +11,10 @@ stdenv.mkDerivation rec {
sha256 = "01znnalirbqxpz62fbw2c14c8xn117jc92xv6dhb3hln92k9x37f";
};
- nativeBuildInputs = [ pkg-config wafHook ];
- buildInputs = [ graphviz gtk2 gtkmm2 python ];
+ nativeBuildInputs = [ pkg-config wafHook python3 gtk2 ];
+ buildInputs = [ graphviz gtkmm2 ];
+
+ strictDeps = true;
meta = with lib; {
description = "An interactive Gtk canvas widget for graph-based interfaces";
diff --git a/third_party/nixpkgs/pkgs/development/libraries/google-cloud-cpp/default.nix b/third_party/nixpkgs/pkgs/development/libraries/google-cloud-cpp/default.nix
index af45128140..d493f31d37 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/google-cloud-cpp/default.nix
+++ b/third_party/nixpkgs/pkgs/development/libraries/google-cloud-cpp/default.nix
@@ -9,10 +9,8 @@
, doxygen
, protobuf
, crc32c
-, c-ares
, fetchurl
, openssl
-, zlib
, libnsl
}:
let
@@ -33,7 +31,7 @@ let
};
nativeBuildInputs = [ cmake pkg-config ];
- buildInputs = [ c-ares c-ares.cmake-config grpc openssl protobuf zlib ];
+ buildInputs = [ grpc openssl protobuf ];
postPatch = ''
sed -e 's,https://github.com/googleapis/googleapis/archive/9c9f778aedde02f9826d2ae5d0f9c96409ba0f25.tar.gz,file://${googleapis},' \
@@ -55,7 +53,7 @@ in stdenv.mkDerivation rec {
sha256 = "15wci4m8h6py7fqfziq8mp5m6pxp2h1cbh5rp2k90mk5js4jb9pa";
};
- buildInputs = [ curl crc32c c-ares c-ares.cmake-config googleapis-cpp-cmakefiles grpc protobuf libnsl ];
+ buildInputs = [ curl crc32c googleapis-cpp-cmakefiles grpc protobuf libnsl ];
nativeBuildInputs = [ clang-tools cmake pkg-config doxygen ];
outputs = [ "out" "dev" ];
diff --git a/third_party/nixpkgs/pkgs/development/libraries/grpc/default.nix b/third_party/nixpkgs/pkgs/development/libraries/grpc/default.nix
index 780f8c5f0b..5cdd988669 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/grpc/default.nix
+++ b/third_party/nixpkgs/pkgs/development/libraries/grpc/default.nix
@@ -1,15 +1,15 @@
{ lib, stdenv, fetchFromGitHub, fetchpatch, cmake, zlib, c-ares, pkg-config, re2, openssl, protobuf
-, gflags, libnsl
+, gflags, abseil-cpp, libnsl
}:
stdenv.mkDerivation rec {
- version = "1.36.1"; # N.B: if you change this, change pythonPackages.grpcio-tools to a matching version too
+ version = "1.36.4"; # N.B: if you change this, change pythonPackages.grpcio-tools to a matching version too
pname = "grpc";
src = fetchFromGitHub {
owner = "grpc";
repo = "grpc";
rev = "v${version}";
- sha256 = "0lb6pls9m05bvr6bvqzp6apdchhsazc5866yvmgkm979xcrzdy2z";
+ sha256 = "1zxvdg5vgjgkq5wmzwbxj2zydaj90ja074axs26yzd9x08j0bjxz";
fetchSubmodules = true;
};
patches = [
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
];
nativeBuildInputs = [ cmake pkg-config ];
- propagatedBuildInputs = [ c-ares re2 zlib ];
+ propagatedBuildInputs = [ c-ares re2 zlib abseil-cpp ];
buildInputs = [ c-ares.cmake-config openssl protobuf gflags ]
++ lib.optionals stdenv.isLinux [ libnsl ];
@@ -32,8 +32,10 @@ stdenv.mkDerivation rec {
"-DgRPC_SSL_PROVIDER=package"
"-DgRPC_PROTOBUF_PROVIDER=package"
"-DgRPC_GFLAGS_PROVIDER=package"
+ "-DgRPC_ABSL_PROVIDER=package"
"-DBUILD_SHARED_LIBS=ON"
"-DCMAKE_SKIP_BUILD_RPATH=OFF"
+ "-DCMAKE_CXX_STANDARD=17"
];
# CMake creates a build directory by default, this conflicts with the
diff --git a/third_party/nixpkgs/pkgs/development/libraries/gtksourceview/4.x.nix b/third_party/nixpkgs/pkgs/development/libraries/gtksourceview/4.x.nix
index 72646fc198..9ead894e0d 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/gtksourceview/4.x.nix
+++ b/third_party/nixpkgs/pkgs/development/libraries/gtksourceview/4.x.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchurl, pkg-config, atk, cairo, glib, gtk3, pango, fribidi, vala
+{ lib, stdenv, fetchurl, fetchpatch, pkg-config, atk, cairo, glib, gtk3, pango, fribidi, vala
, libxml2, perl, gettext, gnome3, gobject-introspection, dbus, xvfb_run, shared-mime-info
, meson, ninja }:
@@ -26,7 +26,16 @@ stdenv.mkDerivation rec {
buildInputs = [ atk cairo glib pango fribidi libxml2 ];
- patches = [ ./4.x-nix_share_path.patch ];
+ patches = [
+ ./4.x-nix_share_path.patch
+
+ # fixes intermittent "gtksourceview-gresources.h: no such file" errors
+ (fetchpatch {
+ name = "ensure-access-to-resources-in-corelib-build.patch";
+ url = "https://gitlab.gnome.org/GNOME/gtksourceview/-/commit/9bea9d1c4a56310701717bb106c52a5324ee392a.patch";
+ sha256 = "sha256-rSB6lOFEyz58HfOSj7ZM48/tHxhqbtWWbh60JuySAZ0=";
+ })
+ ];
enableParallelBuilding = true;
diff --git a/third_party/nixpkgs/pkgs/development/libraries/igraph/default.nix b/third_party/nixpkgs/pkgs/development/libraries/igraph/default.nix
index b98588eb41..bcd0fcee92 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/igraph/default.nix
+++ b/third_party/nixpkgs/pkgs/development/libraries/igraph/default.nix
@@ -1,20 +1,43 @@
-{ stdenv, lib, fetchFromGitHub,
- pkg-config, autoreconfHook,
- flex, yacc, zlib, libxml2 }:
+{ stdenv
+, lib
+, fetchFromGitHub
+, fetchpatch
+, arpack
+, bison
+, blas
+, cmake
+, flex
+, fop
+, glpk
+, gmp
+, lapack
+, libxml2
+, libxslt
+, pkg-config
+, python3
+, sourceHighlight
+, suitesparse
+, xmlto
+}:
stdenv.mkDerivation rec {
pname = "igraph";
- version = "0.8.5";
+ version = "0.9.1";
src = fetchFromGitHub {
owner = "igraph";
repo = pname;
rev = version;
- sha256 = "0cb0kp6mpmgz74kbymqw4xxads8ff7jh0n59dsm76xy6nn8hpqcz";
+ sha256 = "sha256-i6Zg6bfHZ9NHwqCouX9m9YqD0VtiWW8DEkxS0hdUyIE=";
};
- nativeBuildInputs = [ pkg-config autoreconfHook ];
- buildInputs = [ flex yacc zlib libxml2 ];
+ patches = [
+ (fetchpatch {
+ name = "pkg-config-paths.patch";
+ url = "https://github.com/igraph/igraph/commit/980521cc948777df471893f7b6de8f3e3916a3c0.patch";
+ sha256 = "0mbq8v5h90c3dhgmyjazjvva3rn57qhnv7pkc9hlbqdln9gpqg0g";
+ })
+ ];
# Normally, igraph wants us to call bootstrap.sh, which will call
# tools/getversion.sh. Instead, we're going to put the version directly
@@ -22,16 +45,69 @@ stdenv.mkDerivation rec {
# bootstrap. ~ C.
postPatch = ''
echo "${version}" > IGRAPH_VERSION
+ '' + lib.optionalString stdenv.isAarch64 ''
+ # https://github.com/igraph/igraph/issues/1694
+ substituteInPlace tests/CMakeLists.txt \
+ --replace "igraph_scg_grouping3" "" \
+ --replace "igraph_scg_semiprojectors2" ""
'';
+ outputs = [ "out" "dev" "doc" ];
+
+ nativeBuildInputs = [
+ cmake
+ fop
+ libxml2
+ libxslt
+ pkg-config
+ python3
+ sourceHighlight
+ xmlto
+ ];
+
+ buildInputs = [
+ arpack
+ bison
+ blas
+ flex
+ glpk
+ gmp
+ lapack
+ libxml2
+ suitesparse
+ ];
+
+ cmakeFlags = [
+ "-DIGRAPH_USE_INTERNAL_BLAS=OFF"
+ "-DIGRAPH_USE_INTERNAL_LAPACK=OFF"
+ "-DIGRAPH_USE_INTERNAL_ARPACK=OFF"
+ "-DIGRAPH_USE_INTERNAL_GLPK=OFF"
+ "-DIGRAPH_USE_INTERNAL_CXSPARSE=OFF"
+ "-DIGRAPH_USE_INTERNAL_GMP=OFF"
+ "-DIGRAPH_GLPK_SUPPORT=ON"
+ "-DIGRAPH_GRAPHML_SUPPORT=ON"
+ "-DIGRAPH_ENABLE_LTO=ON"
+ "-DIGRAPH_ENABLE_TLS=ON"
+ "-DBUILD_SHARED_LIBS=ON"
+ ];
+
doCheck = true;
- meta = {
+ preCheck = ''
+ # needed to find libigraph.so
+ export LD_LIBRARY_PATH="$PWD/src"
+ '';
+
+ postInstall = ''
+ mkdir -p "$out/share"
+ cp -r doc "$out/share"
+ '';
+
+ meta = with lib; {
description = "The network analysis package";
homepage = "https://igraph.org/";
- license = lib.licenses.gpl2;
- # NB: Known to fail tests on aarch64.
- platforms = [ "x86_64-linux" ] ++ lib.platforms.darwin;
- maintainers = [ lib.maintainers.MostAwesomeDude ];
+ license = licenses.gpl2Plus;
+ platforms = platforms.all;
+ maintainers = with maintainers; [ MostAwesomeDude dotlambda ];
};
}
diff --git a/third_party/nixpkgs/pkgs/development/libraries/jxrlib/default.nix b/third_party/nixpkgs/pkgs/development/libraries/jxrlib/default.nix
index 78cc48d820..b2cc4ab08b 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/jxrlib/default.nix
+++ b/third_party/nixpkgs/pkgs/development/libraries/jxrlib/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchFromGitHub, python }:
+{ lib, stdenv, fetchFromGitHub, python3 }:
stdenv.mkDerivation rec {
pname = "jxrlib";
@@ -19,7 +19,9 @@ stdenv.mkDerivation rec {
--replace '.so' '.dylib'
'';
- nativeBuildInputs = [ python ];
+ nativeBuildInputs = [ python3 ];
+
+ strictDeps = true;
makeFlags = [ "DIR_INSTALL=$(out)" "SHARED=1" ];
diff --git a/third_party/nixpkgs/pkgs/development/libraries/kdiagram/default.nix b/third_party/nixpkgs/pkgs/development/libraries/kdiagram/default.nix
index b9f16d3cfa..3cebc05f3d 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/kdiagram/default.nix
+++ b/third_party/nixpkgs/pkgs/development/libraries/kdiagram/default.nix
@@ -6,13 +6,13 @@
mkDerivation rec {
pname = "kdiagram";
- version = "2.7.0";
+ version = "2.8.0";
src = fetchFromGitLab {
domain = "invent.kde.org";
owner = "graphics";
repo = pname;
rev = "v${version}";
- sha256 = "NSBNHPr8JzBn3y3ivhL0RjiXjDuPwZsTTOeI22pq3vc=";
+ sha256 = "sha256-Se131GZE12wqdfN/V4id1pphUvteSrmMaKZ0+lqg1z8=";
};
nativeBuildInputs = [ extra-cmake-modules qttools ];
propagatedBuildInputs = [ qtbase qtsvg ];
diff --git a/third_party/nixpkgs/pkgs/development/libraries/kdsoap/default.nix b/third_party/nixpkgs/pkgs/development/libraries/kdsoap/default.nix
index 50ba2c300b..93aa169737 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/kdsoap/default.nix
+++ b/third_party/nixpkgs/pkgs/development/libraries/kdsoap/default.nix
@@ -4,7 +4,7 @@
}:
let
- version = "1.9.1";
+ version = "1.10.0";
in
mkDerivation {
@@ -24,7 +24,7 @@ mkDerivation {
};
src = fetchurl {
url = "https://github.com/KDAB/KDSoap/releases/download/kdsoap-${version}/kdsoap-${version}.tar.gz";
- sha256 = "09rxx7h98niawz7i94g279c2rgh7xmq1hqxwlyzwsaqsx4kfl850";
+ sha256 = "sha256-DGBuzENEZtutsoKYIMoWOvYMx8oib1U7XUAyGWc3M48=";
};
outputs = [ "out" "dev" ];
nativeBuildInputs = [ cmake ];
diff --git a/third_party/nixpkgs/pkgs/development/libraries/leveldb/default.nix b/third_party/nixpkgs/pkgs/development/libraries/leveldb/default.nix
index 0a1dabef32..2a7fb196ea 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/leveldb/default.nix
+++ b/third_party/nixpkgs/pkgs/development/libraries/leveldb/default.nix
@@ -13,25 +13,28 @@ stdenv.mkDerivation rec {
buildInputs = [ snappy ];
- nativeBuildInputs = []
- ++ lib.optional stdenv.isDarwin fixDarwinDylibNames;
+ nativeBuildInputs = lib.optional stdenv.isDarwin fixDarwinDylibNames;
- buildPhase = ''
- make all
+ doCheck = true;
+
+ buildFlags = [ "all" ];
+
+ postPatch = lib.optionalString stdenv.hostPlatform.isStatic ''
+ # remove shared objects from "all" target
+ sed -i '/^all:/ s/$(SHARED_LIBS) $(SHARED_PROGRAMS)//' Makefile
'';
- installPhase = "
- mkdir -p $out/{bin,lib,include}
+ installPhase = ''
+ runHook preInstall
- cp -r include $out
- mkdir -p $out/include/leveldb/helpers
- cp helpers/memenv/memenv.h $out/include/leveldb/helpers
+ install -D -t $out/include/leveldb include/leveldb/*
+ install -D helpers/memenv/memenv.h $out/include/leveldb/helpers
- cp out-shared/lib* $out/lib
- cp out-static/lib* $out/lib
+ install -D -t $out/lib out-{static,shared}/lib*
+ install -D -t $out/bin out-static/{leveldbutil,db_bench}
- cp out-static/leveldbutil $out/bin
- ";
+ runHook postInstall
+ '';
meta = with lib; {
homepage = "https://github.com/google/leveldb";
diff --git a/third_party/nixpkgs/pkgs/development/libraries/libfyaml/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libfyaml/default.nix
index a666a7db52..233f202c2c 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/libfyaml/default.nix
+++ b/third_party/nixpkgs/pkgs/development/libraries/libfyaml/default.nix
@@ -2,21 +2,17 @@
stdenv.mkDerivation rec {
pname = "libfyaml";
- version = "0.6";
+ version = "0.6.3";
src = fetchFromGitHub {
owner = "pantoniou";
repo = pname;
rev = "v${version}";
- sha256 = "0b1wnalh49rbjykw4bj5k3y1d9yr8k6f0im221bl1gyrwlgw7hp5";
+ sha256 = "1aw5s0ns79jr3lpcy3hdsrlr79rrv5aqymv4h43axvy2bi90nrr0";
};
nativeBuildInputs = [ autoreconfHook pkg-config ];
- postPatch = ''
- echo ${version} > .tarball-version
- '';
-
meta = with lib; {
homepage = "https://github.com/pantoniou/libfyaml";
description = "Fully feature complete YAML parser and emitter, supporting the latest YAML spec and passing the full YAML testsuite";
diff --git a/third_party/nixpkgs/pkgs/development/libraries/libmspack/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libmspack/default.nix
index 4ad60bcfb1..a26f0c3f3a 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/libmspack/default.nix
+++ b/third_party/nixpkgs/pkgs/development/libraries/libmspack/default.nix
@@ -1,17 +1,18 @@
{lib, stdenv, fetchurl}:
stdenv.mkDerivation rec {
- name = "libmspack-0.7.1alpha";
+ pname = "libmspack";
+ version = "0.10.1alpha";
src = fetchurl {
- url = "https://www.cabextract.org.uk/libmspack/${name}.tar.gz";
- sha256 = "0zn4vwzk5ankgd0l88cipan19pzbzv0sm3fba17lvqwka3dp1acp";
+ url = "https://www.cabextract.org.uk/libmspack/${pname}-${version}.tar.gz";
+ sha256 = "13janaqsvm7aqc4agjgd4819pbgqv50j88bh5kci1z70wvg65j5s";
};
meta = {
description = "A de/compression library for various Microsoft formats";
homepage = "https://www.cabextract.org.uk/libmspack";
- license = lib.licenses.lgpl2;
+ license = lib.licenses.lgpl2Only;
platforms = lib.platforms.unix;
};
}
diff --git a/third_party/nixpkgs/pkgs/development/libraries/libnbd/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libnbd/default.nix
index 6ad0435a84..6afced2d6d 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/libnbd/default.nix
+++ b/third_party/nixpkgs/pkgs/development/libraries/libnbd/default.nix
@@ -11,11 +11,11 @@
stdenv.mkDerivation rec {
pname = "libnbd";
- version = "1.7.2";
+ version = "1.7.4";
src = fetchurl {
url = "https://download.libguestfs.org/libnbd/${lib.versions.majorMinor version}-development/${pname}-${version}.tar.gz";
- hash = "sha256-+xC4wDEeWi3RteF04C/qjMmjM+lmhtrtXZZyM1UUli4=";
+ sha256 = "0d586c8mbk50hjslq32n70sdp2a7lbsjv9zhky4w6jy950rrdfqh";
};
nativeBuildInputs = [
diff --git a/third_party/nixpkgs/pkgs/development/libraries/libpst/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libpst/default.nix
index 40f6b3b1ae..f27b58a02b 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/libpst/default.nix
+++ b/third_party/nixpkgs/pkgs/development/libraries/libpst/default.nix
@@ -1,5 +1,15 @@
-{ lib, stdenv, fetchurl, autoreconfHook, boost, libgsf,
- pkg-config, bzip2, xmlto, gettext, imagemagick, doxygen }:
+{ lib
+, stdenv
+, fetchurl
+, autoreconfHook
+, pkg-config
+, bzip2
+, doxygen
+, gettext
+, imagemagick
+, libgsf
+, xmlto
+}:
stdenv.mkDerivation rec {
name = "libpst-0.6.75";
@@ -9,14 +19,24 @@ stdenv.mkDerivation rec {
sha256 = "11wrf47i3brlxg25wsfz17373q7m5fpjxn2lr41dj252ignqzaac";
};
- nativeBuildInputs = [ autoreconfHook pkg-config ];
+ nativeBuildInputs = [
+ autoreconfHook
+ pkg-config
+ doxygen
+ gettext
+ xmlto
+ ];
+
buildInputs = [
- boost libgsf bzip2
- xmlto gettext imagemagick doxygen
+ bzip2
+ imagemagick
+ libgsf
];
configureFlags = [
"--enable-python=no"
+ "--disable-static"
+ "--enable-libpst-shared"
];
doCheck = true;
@@ -24,8 +44,8 @@ stdenv.mkDerivation rec {
meta = with lib; {
homepage = "https://www.five-ten-sg.com/libpst/";
description = "A library to read PST (MS Outlook Personal Folders) files";
- license = licenses.gpl2;
- maintainers = [maintainers.tohl];
+ license = licenses.gpl2Plus;
+ maintainers = [ maintainers.tohl ];
platforms = platforms.unix;
};
}
diff --git a/third_party/nixpkgs/pkgs/development/libraries/lightstep-tracer-cpp/default.nix b/third_party/nixpkgs/pkgs/development/libraries/lightstep-tracer-cpp/default.nix
index d47c7b50ab..8ef4513a18 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/lightstep-tracer-cpp/default.nix
+++ b/third_party/nixpkgs/pkgs/development/libraries/lightstep-tracer-cpp/default.nix
@@ -1,12 +1,8 @@
{ stdenv, lib, fetchFromGitHub, pkg-config, cmake
-, opentracing-cpp, protobuf, zlib
-, enableGrpc ? false, grpc ? null, openssl ? null, c-ares ? null
+, opentracing-cpp, protobuf
+, enableGrpc ? false, grpc, openssl
}:
-assert enableGrpc -> grpc != null;
-assert enableGrpc -> openssl != null;
-assert enableGrpc -> c-ares != null;
-
stdenv.mkDerivation rec {
pname = "lightstep-tracer-cpp";
version = "0.14.0";
@@ -23,9 +19,9 @@ stdenv.mkDerivation rec {
];
buildInputs = [
- opentracing-cpp protobuf zlib
+ opentracing-cpp protobuf
] ++ lib.optionals enableGrpc [
- grpc openssl c-ares c-ares.cmake-config
+ grpc openssl
];
cmakeFlags = lib.optionals (!enableGrpc) [ "-DWITH_GRPC=OFF" ];
diff --git a/third_party/nixpkgs/pkgs/development/libraries/lmdb/default.nix b/third_party/nixpkgs/pkgs/development/libraries/lmdb/default.nix
index a59b460734..229e82c323 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/lmdb/default.nix
+++ b/third_party/nixpkgs/pkgs/development/libraries/lmdb/default.nix
@@ -2,12 +2,12 @@
stdenv.mkDerivation rec {
pname = "lmdb";
- version = "0.9.25";
+ version = "0.9.28";
src = fetchgit {
url = "https://git.openldap.org/openldap/openldap.git";
rev = "LMDB_${version}";
- sha256 = "0i60zlca8r6fib23gdgl4c80gxpx24772ggpvz94yr7zaai4k11w";
+ sha256 = "012a8bs49cswsnzw7k4piis5b6dn4by85w7a7mai9i04xcjyy9as";
};
postUnpack = "sourceRoot=\${sourceRoot}/libraries/liblmdb";
diff --git a/third_party/nixpkgs/pkgs/development/libraries/opencl-clhpp/default.nix b/third_party/nixpkgs/pkgs/development/libraries/opencl-clhpp/default.nix
index ec40bc393d..b6aa714916 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/opencl-clhpp/default.nix
+++ b/third_party/nixpkgs/pkgs/development/libraries/opencl-clhpp/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchFromGitHub, cmake, python, opencl-headers }:
+{ lib, stdenv, fetchFromGitHub, cmake, python3, opencl-headers }:
stdenv.mkDerivation rec {
pname = "opencl-clhpp";
@@ -11,10 +11,12 @@ stdenv.mkDerivation rec {
sha256 = "04g3mg2cpbi048fxxkghra81bpxzqr4r3gspx5mvqipx1lzypsci";
};
- nativeBuildInputs = [ cmake python ];
+ nativeBuildInputs = [ cmake python3 ];
propagatedBuildInputs = [ opencl-headers ];
+ strictDeps = true;
+
cmakeFlags = [
"-DBUILD_EXAMPLES=OFF"
"-DBUILD_TESTS=OFF"
diff --git a/third_party/nixpkgs/pkgs/development/libraries/opencv/3.x.nix b/third_party/nixpkgs/pkgs/development/libraries/opencv/3.x.nix
index 11872cd47c..a65e978f98 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/opencv/3.x.nix
+++ b/third_party/nixpkgs/pkgs/development/libraries/opencv/3.x.nix
@@ -18,7 +18,7 @@
, enableUnfree ? false
, enableIpp ? false
-, enablePython ? false, pythonPackages
+, enablePython ? false, pythonPackages ? null
, enableGtk2 ? false, gtk2
, enableGtk3 ? false, gtk3
, enableVtk ? false, vtk
@@ -36,6 +36,8 @@
assert blas.implementation == "openblas" && lapack.implementation == "openblas";
+assert enablePython -> pythonPackages != null;
+
let
version = "3.4.8";
diff --git a/third_party/nixpkgs/pkgs/development/libraries/partio/default.nix b/third_party/nixpkgs/pkgs/development/libraries/partio/default.nix
index 0247d12715..d4af69532b 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/partio/default.nix
+++ b/third_party/nixpkgs/pkgs/development/libraries/partio/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchFromGitHub, unzip, cmake, freeglut, libGLU, libGL, zlib, swig, python, doxygen, xorg }:
+{ lib, stdenv, fetchFromGitHub, unzip, cmake, freeglut, libGLU, libGL, zlib, swig, doxygen, xorg }:
stdenv.mkDerivation {
pname = "partio";
@@ -14,7 +14,7 @@ stdenv.mkDerivation {
outputs = [ "dev" "out" "lib" ];
nativeBuildInputs = [ unzip cmake doxygen ];
- buildInputs = [ freeglut libGLU libGL zlib swig python xorg.libXi xorg.libXmu ];
+ buildInputs = [ freeglut libGLU libGL zlib swig xorg.libXi xorg.libXmu ];
buildPhase = ''
make partio
@@ -32,6 +32,8 @@ stdenv.mkDerivation {
mv $dev/include/*.h $dev/include/partio
'';
+ strictDeps = true;
+
meta = with lib; {
description = "C++ (with python bindings) library for easily reading/writing/manipulating common animation particle formats such as PDB, BGEO, PTC";
homepage = "https://www.disneyanimation.com/technology/partio.html";
diff --git a/third_party/nixpkgs/pkgs/development/libraries/physics/rivet/default.nix b/third_party/nixpkgs/pkgs/development/libraries/physics/rivet/default.nix
index 7cacab9bdf..44065904d9 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/physics/rivet/default.nix
+++ b/third_party/nixpkgs/pkgs/development/libraries/physics/rivet/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchurl, fastjet, fastjet-contrib, ghostscript, gsl, hepmc, imagemagick, less, python3, rsync, texlive, yoda, which, makeWrapper }:
+{ lib, stdenv, fetchurl, fetchpatch, fastjet, fastjet-contrib, ghostscript, hepmc, imagemagick, less, python3, rsync, texlive, yoda, which, makeWrapper }:
stdenv.mkDerivation rec {
pname = "rivet";
@@ -11,6 +11,38 @@ stdenv.mkDerivation rec {
patches = [
./darwin.patch # configure relies on impure sw_vers to -Dunix
+
+ # fix compilation errors (fails depending on number of cores filesystem ordering?)
+ # https://gitlab.com/hepcedar/rivet/-/merge_requests/220
+ (fetchpatch {
+ url = "https://gitlab.com/hepcedar/rivet/commit/3203bf12a4bef81f880789eb9cde7ff489ae5115.diff";
+ sha256 = "0zn5yxlv6dk4vcqgz0syzb9mp4qc9smpmgshcqimcvii7qcp20mc";
+ })
+ # https://gitlab.com/hepcedar/rivet/-/merge_requests/223
+ (fetchpatch {
+ url = "https://gitlab.com/hepcedar/rivet/commit/476f267c46b126fa163a92aa6cbcb7806c4624c3.diff";
+ sha256 = "0dhkraddzp06v5z0d2wf0c8vsd50hl5pqsjgsrb8x14d0vwi8rnc";
+ })
+
+ # fix for new python and fix transparency gs 9.52
+ # gs 9.52 opacity fix
+ (fetchpatch {
+ url = "https://gitlab.com/hepcedar/rivet/commit/25c4bee19882fc56407b0a438f86e1a11753d5e6.diff";
+ sha256 = "18p2wk54r0qfq6l27z6805zq1z5jhk5sbxbjixgibzq8prj1a78v";
+ })
+
+ # make-plots: fix wrong logic in Plot.set_xmax()
+ (fetchpatch {
+ url = "https://gitlab.com/hepcedar/rivet/commit/d371c6c10cf67a41c0e4e27c16ff5723d6276ad2.diff";
+ sha256 = "0w622rd5darj7qafbbc84blznvy5rnhsdyr2n1i1fkz19mrf5h2p";
+ })
+
+ # fix https://gitlab.com/hepcedar/rivet/-/issues/200
+ (fetchpatch {
+ url = "https://gitlab.com/hepcedar/rivet/commit/442dbd17dcb3bd6e30b26e54c50f6a8237f966f9.diff";
+ includes = [ "bin/make-pgfplots" "bin/make-plots" "bin/make-plots-fast" ];
+ sha256 = "0c3rysgcib49km1zdpgsdai3xi4s6ijqgxp4whn04mrh3qf4bmr3";
+ })
];
latex = texlive.combine { inherit (texlive)
diff --git a/third_party/nixpkgs/pkgs/development/libraries/qpdf/default.nix b/third_party/nixpkgs/pkgs/development/libraries/qpdf/default.nix
index 4d9e911572..c461824e62 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/qpdf/default.nix
+++ b/third_party/nixpkgs/pkgs/development/libraries/qpdf/default.nix
@@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "qpdf";
- version = "10.1.0";
+ version = "10.2.0";
src = fetchFromGitHub {
owner = "qpdf";
repo = "qpdf";
rev = "release-qpdf-${version}";
- sha256 = "sha256-abPT1u/ceBrE1U+omOHiU3UjLrmcpdSpe1vgar0wUGk=";
+ sha256 = "sha256-KiO2iIrLLjPhHTiR/FKEGRJOhdVV2kcZK9sdyCqONC8=";
};
nativeBuildInputs = [ perl ];
diff --git a/third_party/nixpkgs/pkgs/development/libraries/qt-5/5.15/default.nix b/third_party/nixpkgs/pkgs/development/libraries/qt-5/5.15/default.nix
index fdb68d89bc..c32f4b001e 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/qt-5/5.15/default.nix
+++ b/third_party/nixpkgs/pkgs/development/libraries/qt-5/5.15/default.nix
@@ -16,7 +16,7 @@ top-level attribute to `top-level/all-packages.nix`.
{
newScope,
- lib, stdenv, fetchurl, fetchpatch, fetchFromGitHub, makeSetupHook, makeWrapper,
+ lib, stdenv, fetchurl, fetchpatch, fetchgit, fetchFromGitHub, makeSetupHook, makeWrapper,
bison, cups ? null, harfbuzz, libGL, perl,
gstreamer, gst-plugins-base, gtk3, dconf,
llvmPackages_5,
@@ -48,6 +48,42 @@ let
};
version = "5.212.0-alpha4";
};
+
+ # Even if developed in the public, QtWebEngine does not have official
+ # releases or new tags since the Qt company made 5.15.3 proprietary.
+ # Apparently they care more about licensing than the security of their users.
+ # See https://lists.qt-project.org/pipermail/interest/2021-March/036387.html
+ qtwebengine =
+ let
+ branchName = "5.15.3";
+ rev = "a059e7404a6db799f4da0ad696e65ae9c854b4b0";
+ in
+ {
+ version = "${branchName}-${lib.substring 0 7 rev}";
+
+ src = fetchgit {
+ url = "https://github.com/qt/qtwebengine.git";
+ sha256 = "1vdgxfbmx4z4qrm2g61dl64gqn3fv5f83jwpp7h1gyfx5z2qvfmv";
+ inherit rev branchName;
+ fetchSubmodules = true;
+ leaveDotGit = true;
+ name = "qtwebengine-${substring 0 7 rev}.tar.gz";
+ postFetch = ''
+ # remove submodule .git directory
+ rm -rf $out/src/3rdparty/.git
+
+ # compress to not exceed the 2GB output limit
+ mv $out source
+ # try to make a deterministic tarball
+ tar -I 'gzip -n' \
+ --sort name \
+ --mtime 1970-01-01 \
+ --owner=root --group=root \
+ --numeric-owner --mode=go=rX,u+rw,a-s \
+ -cf $out source
+ '';
+ };
+ };
};
patches = {
@@ -83,11 +119,16 @@ let
qtdeclarative = [ ./qtdeclarative.patch ];
qtscript = [ ./qtscript.patch ];
qtserialport = [ ./qtserialport.patch ];
- qtwebengine = [ ]
- ++ optionals stdenv.isDarwin [
- ./qtwebengine-darwin-no-platform-check.patch
- ./qtwebengine-mac-dont-set-dsymutil-path.patch
- ];
+ qtwebengine = [
+ # Fix crashes with non en_US.UTF-8 locales
+ (fetchpatch {
+ url = "https://github.com/qt/qtwebengine/commit/199ea00a9eea13315a652c62778738629185b059.patch";
+ sha256 = "1b5k2g1v8913cvsgvp6ja4mcprjlk5vcwqzi0p1qq7b1wyi4f0g2";
+ })
+ ] ++ optionals stdenv.isDarwin [
+ ./qtwebengine-darwin-no-platform-check.patch
+ ./qtwebengine-mac-dont-set-dsymutil-path.patch
+ ];
qtwebkit = [
(fetchpatch {
name = "qtwebkit-bison-3.7-build.patch";
diff --git a/third_party/nixpkgs/pkgs/development/libraries/qt-5/modules/qtwebengine.nix b/third_party/nixpkgs/pkgs/development/libraries/qt-5/modules/qtwebengine.nix
index 617b2c1d9d..f994c7ef6c 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/qt-5/modules/qtwebengine.nix
+++ b/third_party/nixpkgs/pkgs/development/libraries/qt-5/modules/qtwebengine.nix
@@ -2,6 +2,7 @@
, qtdeclarative, qtquickcontrols, qtlocation, qtwebchannel
, bison, coreutils, flex, git, gperf, ninja, pkg-config, python2, which
+, nodejs, qtbase, perl
, xorg, libXcursor, libXScrnSaver, libXrandr, libXtst
, fontconfig, freetype, harfbuzz, icu, dbus, libdrm
@@ -25,7 +26,15 @@ qtModule {
name = "qtwebengine";
qtInputs = [ qtdeclarative qtquickcontrols qtlocation qtwebchannel ];
nativeBuildInputs = [
- bison coreutils flex git gperf ninja pkg-config python2 which gn
+ bison coreutils flex git gperf ninja pkg-config python2 which gn nodejs
+
+ # qmake looks for syncqt instead of syncqt.pl and fails with a cryptic
+ # error if it can't find it. syncqt.pl also has a /usr/bin/env shebang, so
+ # it can't be directly used in a sandboxed build environment.
+ (writeScriptBin "syncqt" ''
+ #!${stdenv.shell}
+ exec ${perl}/bin/perl ${qtbase.dev}/bin/syncqt.pl "$@"
+ '')
] ++ optional stdenv.isDarwin xcbuild;
doCheck = true;
outputs = [ "bin" "dev" "out" ];
@@ -40,9 +49,17 @@ qtModule {
hardeningDisable = [ "format" ];
postPatch =
- # Patch Chromium build tools
''
- ( cd src/3rdparty/chromium; patchShebangs . )
+ # Patch Chromium build tools
+ (
+ cd src/3rdparty/chromium;
+
+ # Manually fix unsupported shebangs
+ substituteInPlace third_party/harfbuzz-ng/src/src/update-unicode-tables.make \
+ --replace "/usr/bin/env -S make -f" "/usr/bin/make -f" || true
+
+ patchShebangs .
+ )
''
# Prevent Chromium build script from making the path to `clang` relative to
# the build directory. `clang_base_path` is the value of `QMAKE_CLANG_DIR`
@@ -120,7 +137,7 @@ qtModule {
if [ -d "$PWD/tools/qmake" ]; then
QMAKEPATH="$PWD/tools/qmake''${QMAKEPATH:+:}$QMAKEPATH"
fi
- '';
+ '';
qmakeFlags = if stdenv.hostPlatform.isAarch32 || stdenv.hostPlatform.isAarch64
then [ "--" "-system-ffmpeg" ] ++ optional enableProprietaryCodecs "-proprietary-codecs"
diff --git a/third_party/nixpkgs/pkgs/development/libraries/qt-5/qt-env.nix b/third_party/nixpkgs/pkgs/development/libraries/qt-5/qt-env.nix
index da56c07779..b4a201c08c 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/qt-5/qt-env.nix
+++ b/third_party/nixpkgs/pkgs/development/libraries/qt-5/qt-env.nix
@@ -5,7 +5,7 @@ buildEnv {
paths = [ qtbase ] ++ paths;
pathsToLink = [ "/bin" "/mkspecs" "/include" "/lib" "/share" ];
- extraOutputsToInstall = [ "dev" ];
+ extraOutputsToInstall = [ "out" "dev" ];
postBuild = ''
rm "$out/bin/qmake"
diff --git a/third_party/nixpkgs/pkgs/development/libraries/rnnoise/default.nix b/third_party/nixpkgs/pkgs/development/libraries/rnnoise/default.nix
index 4dec2f3cfc..ad587f0f58 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/rnnoise/default.nix
+++ b/third_party/nixpkgs/pkgs/development/libraries/rnnoise/default.nix
@@ -2,13 +2,13 @@
stdenv.mkDerivation (rec {
pname = "rnnoise";
- version = "2020-06-28";
+ version = "2021-01-22";
src = fetchFromGitHub {
owner = "xiph";
repo = "rnnoise";
- rev = "90ec41ef659fd82cfec2103e9bb7fc235e9ea66c";
- sha256 = "02z6qzjajhlpsb80lwl7cqqga9hm638psnqnppjkw84w4lrp15ny";
+ rev = "1cbdbcf1283499bbb2230a6b0f126eb9b236defd";
+ sha256 = "1y0rzgmvy8bf9a431garpm2w177s6ajgf79y5ymw4yb0pik57rwb";
};
nativeBuildInputs = [ autoreconfHook ];
diff --git a/third_party/nixpkgs/pkgs/development/libraries/rocclr/default.nix b/third_party/nixpkgs/pkgs/development/libraries/rocclr/default.nix
index 278fdecc1a..c93ea5ba78 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/rocclr/default.nix
+++ b/third_party/nixpkgs/pkgs/development/libraries/rocclr/default.nix
@@ -15,13 +15,13 @@
stdenv.mkDerivation rec {
pname = "rocclr";
- version = "4.0.0";
+ version = "4.1.0";
src = fetchFromGitHub {
owner = "ROCm-Developer-Tools";
repo = "ROCclr";
rev = "rocm-${version}";
- hash = "sha256-B27ff1b9JRhxFUsBt7CGuYaR87hvKbVSCERWD45d8tM=";
+ hash = "sha256-2DI/PL29aiZcxOrGZBzXwAnNgZQpSDjyyGKgl+vDErk=";
};
nativeBuildInputs = [ cmake rocm-cmake ];
diff --git a/third_party/nixpkgs/pkgs/development/libraries/rocm-comgr/default.nix b/third_party/nixpkgs/pkgs/development/libraries/rocm-comgr/default.nix
index 96f7108e3f..b9a34b113e 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/rocm-comgr/default.nix
+++ b/third_party/nixpkgs/pkgs/development/libraries/rocm-comgr/default.nix
@@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "rocm-comgr";
- version = "4.0.0";
+ version = "4.1.0";
src = fetchFromGitHub {
owner = "RadeonOpenCompute";
repo = "ROCm-CompilerSupport";
rev = "rocm-${version}";
- hash = "sha256-JMzXg1Hw0iWcTnKu/NgW7rD8iagp724F01GaJbrJj9M=";
+ hash = "sha256-LbQqyJxRqb6vpXiYSkRlF1FeqXJJXktPafGmYDDK02U=";
};
sourceRoot = "source/lib/comgr";
diff --git a/third_party/nixpkgs/pkgs/development/libraries/rocm-device-libs/default.nix b/third_party/nixpkgs/pkgs/development/libraries/rocm-device-libs/default.nix
index 965d92179b..e62d6f0076 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/rocm-device-libs/default.nix
+++ b/third_party/nixpkgs/pkgs/development/libraries/rocm-device-libs/default.nix
@@ -9,13 +9,13 @@
stdenv.mkDerivation rec {
pname = "rocm-device-libs";
- version = "4.0.0";
+ version = "4.1.0";
src = fetchFromGitHub {
owner = "RadeonOpenCompute";
repo = "ROCm-Device-Libs";
rev = "rocm-${version}";
- hash = "sha256-IAE8T/gmotXO/ADH3bxTjrpxWd2lRoj3o/rrSaEFNNo=";
+ hash = "sha256-9p6PIXdHFIgHgNWZzqVz5O9i2Np0z/iyxodG2cLrpGs=";
};
nativeBuildInputs = [ cmake ];
diff --git a/third_party/nixpkgs/pkgs/development/libraries/rocm-opencl-runtime/default.nix b/third_party/nixpkgs/pkgs/development/libraries/rocm-opencl-runtime/default.nix
index ab0957474a..d721cfece9 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/rocm-opencl-runtime/default.nix
+++ b/third_party/nixpkgs/pkgs/development/libraries/rocm-opencl-runtime/default.nix
@@ -21,13 +21,13 @@
stdenv.mkDerivation rec {
pname = "rocm-opencl-runtime";
- version = "4.0.0";
+ version = "4.1.0";
src = fetchFromGitHub {
owner = "RadeonOpenCompute";
repo = "ROCm-OpenCL-Runtime";
rev = "rocm-${version}";
- hash = "sha256-kW5jTDlQtXQ0i4ADJEnmESxjcLCt4QZCYJ1ouIsk4YE=";
+ hash = "sha256-+6h1E5uWNKjjaeO5ZIi854CWYi0QGQ5mVUHdi9+4vX4=";
};
nativeBuildInputs = [ cmake rocm-cmake ];
diff --git a/third_party/nixpkgs/pkgs/development/libraries/rocm-runtime/default.nix b/third_party/nixpkgs/pkgs/development/libraries/rocm-runtime/default.nix
index beb0c61e68..c63e8249cf 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/rocm-runtime/default.nix
+++ b/third_party/nixpkgs/pkgs/development/libraries/rocm-runtime/default.nix
@@ -11,13 +11,13 @@
stdenv.mkDerivation rec {
pname = "rocm-runtime";
- version = "4.0.0";
+ version = "4.1.0";
src = fetchFromGitHub {
owner = "RadeonOpenCompute";
repo = "ROCR-Runtime";
rev = "rocm-${version}";
- hash = "sha256-8hNb0Yo9ApedOG7xrUr5rwiA/YsqDTcyr6dBRg8lXro=";
+ hash = "sha256-Jxg3n203tV0L+UrmeQEuzX0TKpFu5An2cnuEA/F/SNY=";
};
sourceRoot = "source/src";
diff --git a/third_party/nixpkgs/pkgs/development/libraries/rocm-thunk/default.nix b/third_party/nixpkgs/pkgs/development/libraries/rocm-thunk/default.nix
index 5863e1f0a5..1339e035eb 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/rocm-thunk/default.nix
+++ b/third_party/nixpkgs/pkgs/development/libraries/rocm-thunk/default.nix
@@ -7,13 +7,13 @@
stdenv.mkDerivation rec {
pname = "rocm-thunk";
- version = "4.0.0";
+ version = "4.1.0";
src = fetchFromGitHub {
owner = "RadeonOpenCompute";
repo = "ROCT-Thunk-Interface";
rev = "rocm-${version}";
- hash = "sha256-2kLSlGwX3pD8I5pXwV5L0k9l8OzJRkUvnAqv5E+gcd4=";
+ hash = "sha256-gdto7BbrSRa3UiRNvTW1KLkHyjrcxdah4+L+1Gdm0wA=";
};
preConfigure = ''
diff --git a/third_party/nixpkgs/pkgs/development/libraries/science/math/amd-blis/default.nix b/third_party/nixpkgs/pkgs/development/libraries/science/math/amd-blis/default.nix
index 42c84b3ed6..1eea35a34e 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/science/math/amd-blis/default.nix
+++ b/third_party/nixpkgs/pkgs/development/libraries/science/math/amd-blis/default.nix
@@ -6,10 +6,10 @@
# Enable BLAS interface with 64-bit integer width.
, blas64 ? false
-# Target architecture, use "zen" or "zen2", optimization for Zen and
-# other families is pretty much mutually exclusive in the AMD fork of
-# BLIS.
-, withArchitecture ? "zen"
+# Target architecture. "amd64" compiles kernels for all Zen
+# generations. To build kernels for specific Zen generations,
+# use "zen", "zen2", or "zen3".
+, withArchitecture ? "amd64"
# Enable OpenMP-based threading.
, withOpenMP ? true
@@ -20,13 +20,13 @@ let
blasIntSize = if blas64 then "64" else "32";
in stdenv.mkDerivation rec {
pname = "amd-blis";
- version = "2.2";
+ version = "3.0";
src = fetchFromGitHub {
owner = "amd";
repo = "blis";
rev = version;
- sha256 = "1b2f5bwi0gkw2ih2rb7wfzn3m9hgg7k270kg43rmzpr2acpy86xa";
+ hash = "sha256-bbbeo1yOKse9pzbsB6lQ7pULKdzu3G7zJzTUgPXiMZY=";
};
inherit blas64;
@@ -36,7 +36,10 @@ in stdenv.mkDerivation rec {
python3
];
- doCheck = true;
+ # Tests currently fail with non-Zen CPUs due to a floating point
+ # exception in one of the generic kernels. Try to re-enable the
+ # next release.
+ doCheck = false;
enableParallelBuilding = true;
@@ -51,8 +54,8 @@ in stdenv.mkDerivation rec {
'';
postInstall = ''
- ln -s $out/lib/libblis${threadingSuffix}.so.2 $out/lib/libblas.so.3
- ln -s $out/lib/libblis${threadingSuffix}.so.2 $out/lib/libcblas.so.3
+ ln -s $out/lib/libblis${threadingSuffix}.so.3 $out/lib/libblas.so.3
+ ln -s $out/lib/libblis${threadingSuffix}.so.3 $out/lib/libcblas.so.3
ln -s $out/lib/libblas.so.3 $out/lib/libblas.so
ln -s $out/lib/libcblas.so.3 $out/lib/libcblas.so
'';
diff --git a/third_party/nixpkgs/pkgs/development/libraries/science/math/arpack/default.nix b/third_party/nixpkgs/pkgs/development/libraries/science/math/arpack/default.nix
index 382f868a99..23e44bf28b 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/science/math/arpack/default.nix
+++ b/third_party/nixpkgs/pkgs/development/libraries/science/math/arpack/default.nix
@@ -1,17 +1,27 @@
-{ lib, stdenv, fetchFromGitHub, cmake
+{ lib, stdenv, fetchFromGitHub, fetchpatch, cmake
, gfortran, blas, lapack, eigen }:
stdenv.mkDerivation rec {
pname = "arpack";
- version = "3.7.0";
+ version = "3.8.0";
src = fetchFromGitHub {
owner = "opencollab";
repo = "arpack-ng";
rev = version;
- sha256 = "1x7a1dj3dg43nlpvjlh8jzzbadjyr3mbias6f0256qkmgdyk4izr";
+ sha256 = "sha256-nc710iLRqy/p3EaVgbEoCRzNJ9GpKqqQp33tbn7R6lA=";
};
+ patches = [
+ # https://github.com/opencollab/arpack-ng/pull/301
+ (fetchpatch {
+ name = "pkg-config-paths.patch";
+ url = "https://github.com/opencollab/arpack-ng/commit/47fc83cb371a9cc8a8c058097de5e0298cd548f5.patch";
+ excludes = [ "CHANGES" ];
+ sha256 = "1aijvrfsxkgzqmkzq2dmaj8q3jdpg2hwlqpfl8ddk9scv17gh9m8";
+ })
+ ];
+
nativeBuildInputs = [ cmake ];
buildInputs = assert (blas.isILP64 == lapack.isILP64); [
gfortran
@@ -24,7 +34,7 @@ stdenv.mkDerivation rec {
cmakeFlags = [
"-DBUILD_SHARED_LIBS=ON"
- "-DINTERFACE64=${lib.optionalString blas.isILP64 "1"}"
+ "-DINTERFACE64=${if blas.isILP64 then "1" else "0"}"
];
preCheck = if stdenv.isDarwin then ''
@@ -36,12 +46,6 @@ stdenv.mkDerivation rec {
export OMP_NUM_THREADS=2
'';
- postInstall = ''
- mkdir -p $out/lib/pkgconfig
- cp arpack.pc $out/lib/pkgconfig/
- '';
-
-
meta = {
homepage = "https://github.com/opencollab/arpack-ng";
description = ''
@@ -49,7 +53,7 @@ stdenv.mkDerivation rec {
problems.
'';
license = lib.licenses.bsd3;
- maintainers = [ lib.maintainers.ttuegel ];
+ maintainers = with lib.maintainers; [ ttuegel dotlambda ];
platforms = lib.platforms.unix;
};
}
diff --git a/third_party/nixpkgs/pkgs/development/libraries/science/math/clblas/default.nix b/third_party/nixpkgs/pkgs/development/libraries/science/math/clblas/default.nix
index aca395001f..fcb49d70a3 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/science/math/clblas/default.nix
+++ b/third_party/nixpkgs/pkgs/development/libraries/science/math/clblas/default.nix
@@ -4,7 +4,7 @@
, gfortran
, blas
, boost
-, python
+, python3
, ocl-icd
, opencl-headers
, Accelerate, CoreGraphics, CoreVideo, OpenCL
@@ -39,7 +39,7 @@ stdenv.mkDerivation rec {
buildInputs = [
gfortran
blas
- python
+ python3
boost
] ++ lib.optionals (!stdenv.isDarwin) [
ocl-icd
@@ -53,6 +53,8 @@ stdenv.mkDerivation rec {
OpenCL
];
+ strictDeps = true;
+
meta = with lib; {
homepage = "https://github.com/clMathLibraries/clBLAS";
description = "A software library containing BLAS functions written in OpenCL";
diff --git a/third_party/nixpkgs/pkgs/development/libraries/silgraphite/graphite2.nix b/third_party/nixpkgs/pkgs/development/libraries/silgraphite/graphite2.nix
index 166d0f2911..cd737a82a2 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/silgraphite/graphite2.nix
+++ b/third_party/nixpkgs/pkgs/development/libraries/silgraphite/graphite2.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchurl, pkg-config, freetype, cmake, python }:
+{ lib, stdenv, fetchurl, pkg-config, freetype, cmake }:
stdenv.mkDerivation rec {
version = "1.3.14";
@@ -15,7 +15,6 @@ stdenv.mkDerivation rec {
patches = lib.optionals stdenv.isDarwin [ ./macosx.patch ];
- checkInputs = [ python ];
doCheck = false; # fails, probably missing something
meta = with lib; {
diff --git a/third_party/nixpkgs/pkgs/development/libraries/tachyon/default.nix b/third_party/nixpkgs/pkgs/development/libraries/tachyon/default.nix
index f536442295..47cebd62df 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/tachyon/default.nix
+++ b/third_party/nixpkgs/pkgs/development/libraries/tachyon/default.nix
@@ -13,10 +13,10 @@ assert stdenv.isDarwin -> Carbon != null;
stdenv.mkDerivation rec {
pname = "tachyon";
- version = "0.99b2";
+ version = "0.99b6";
src = fetchurl {
url = "http://jedi.ks.uiuc.edu/~johns/tachyon/files/${version}/${pname}-${version}.tar.gz";
- sha256 = "04m0bniszyg7ryknj8laj3rl5sspacw5nr45x59j2swcsxmdvn1v";
+ sha256 = "15wv2748ngk2iid798a774sjxhhijq7kjm32yl897x54fsfazp7l";
};
buildInputs = lib.optionals stdenv.isDarwin [
Carbon
@@ -36,8 +36,11 @@ stdenv.mkDerivation rec {
'';
arch = if stdenv.hostPlatform.system == "x86_64-linux" then "linux-64-thr" else
if stdenv.hostPlatform.system == "i686-linux" then "linux-thr" else
- if stdenv.hostPlatform.system == "aarch64-linux" then "linux-arm-thr" else
- if stdenv.hostPlatform.system == "armv7l-linux" then "linux-arm-thr" else
+ # 2021-03-29: multithread (-DTHR -D_REENTRANT) was disabled on linux-arm
+ # because it caused Sage's 3D plotting tests to hang indefinitely.
+ # see https://github.com/NixOS/nixpkgs/pull/117465
+ if stdenv.hostPlatform.system == "aarch64-linux" then "linux-arm" else
+ if stdenv.hostPlatform.system == "armv7l-linux" then "linux-arm" else
if stdenv.hostPlatform.system == "x86_64-darwin" then "macosx-thr" else
if stdenv.hostPlatform.system == "i686-darwin" then "macosx-64-thr" else
if stdenv.hostPlatform.system == "i686-cygwin" then "win32" else
diff --git a/third_party/nixpkgs/pkgs/development/libraries/tachyon/make-archs.patch b/third_party/nixpkgs/pkgs/development/libraries/tachyon/make-archs.patch
index cf83f8c8c3..ee81681e10 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/tachyon/make-archs.patch
+++ b/third_party/nixpkgs/pkgs/development/libraries/tachyon/make-archs.patch
@@ -22,11 +22,11 @@ index 08afb85..dbeb691 100644
"RANLIB = ranlib" \
"LIBS = -L. -ltachyon $(MISCLIB) -lm -lpthread"
-+# Linux Arm using gcc, with threads
-+linux-arm-thr:
++# Linux Arm using gcc
++linux-arm:
+ $(MAKE) all \
-+ "ARCH = linux-arm-thr" \
-+ "CFLAGS = -Wall -O3 -fomit-frame-pointer -ffast-math -DLinux -DTHR -D_REENTRANT $(MISCFLAGS)" \
++ "ARCH = linux-arm" \
++ "CFLAGS = -Wall -O3 -fomit-frame-pointer -ffast-math -DLinux $(MISCFLAGS)" \
+ "ARFLAGS = r" \
+ "STRIP = strip" \
+ "RANLIB = ranlib" \
diff --git a/third_party/nixpkgs/pkgs/development/libraries/tachyon/no-absolute-paths.patch b/third_party/nixpkgs/pkgs/development/libraries/tachyon/no-absolute-paths.patch
index faa3810fb5..8ebc656040 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/tachyon/no-absolute-paths.patch
+++ b/third_party/nixpkgs/pkgs/development/libraries/tachyon/no-absolute-paths.patch
@@ -1,5 +1,4 @@
diff --git a/unix/Make-config b/unix/Make-config
-index ee4f388..c1d51d4 100644
--- a/unix/Make-config
+++ b/unix/Make-config
@@ -18,7 +18,7 @@
@@ -11,7 +10,7 @@ index ee4f388..c1d51d4 100644
-@@ -30,7 +30,7 @@ SHELL=/bin/sh
+@@ -30,7 +30,7 @@
# The following line should be set to -Ixxx where xxx is your X11 include path
# Sun puts X11 in /usr/openwin/xxx
@@ -20,16 +19,20 @@ index ee4f388..c1d51d4 100644
# Others typically use /usr/X11 or /usr/X11R6
#X11INC= -I/usr/X11
-@@ -57,7 +57,7 @@ X11LIB= -lX11
+@@ -105,9 +105,9 @@
##########################################################################
-
- # Standard MPICH installation location
+ # Customize MPI directories and includes as-needed.
+ # A typical MPICH installation location:
-MPIDIR=/usr/local/mpi
+-MPIINC=$(MPIDIR)/include
+-MPILIB=$(MPIDIR)/lib
+# MPIDIR=/usr/local/mpi
++# MPIINC=$(MPIDIR)/include
++# MPILIB=$(MPIDIR)/lib
- # UMR CS Dept
- #MPIDIR=/software/all/mpi
-@@ -108,9 +108,9 @@ MBOX=
+ # MPI defines and any flags needed by the local installation.
+ # Always list -DMPI at a minimum.
+@@ -166,9 +166,9 @@
# http://www.ijg.org/files/
##########################################################################
# Uncomment the following lines to disable JPEG support
@@ -42,7 +45,7 @@ index ee4f388..c1d51d4 100644
# Uncomment the following lines to enable JPEG support
#USEJPEG= -DUSEJPEG
-@@ -128,9 +128,9 @@ JPEGLIB=
+@@ -186,9 +186,9 @@
# http://www.libpng.org/
##########################################################################
# Uncomment the following lines to disable PNG support
diff --git a/third_party/nixpkgs/pkgs/development/libraries/talloc/default.nix b/third_party/nixpkgs/pkgs/development/libraries/talloc/default.nix
index 553c42da7c..27705c5785 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/talloc/default.nix
+++ b/third_party/nixpkgs/pkgs/development/libraries/talloc/default.nix
@@ -12,11 +12,11 @@
stdenv.mkDerivation (rec {
pname = "talloc";
- version = "2.3.1";
+ version = "2.3.2";
src = fetchurl {
url = "mirror://samba/talloc/${pname}-${version}.tar.gz";
- sha256 = "0xwzgzrqamfdlklwacp9d219pqkah0yfrhxb1j7bxlmgzp924j7g";
+ sha256 = "sha256-J6A++Z44TXeRJN91XesinNF2H5Reym0gDoz9m/Upe9c=";
};
nativeBuildInputs = [
diff --git a/third_party/nixpkgs/pkgs/development/libraries/udunits/default.nix b/third_party/nixpkgs/pkgs/development/libraries/udunits/default.nix
index deed5b64d2..b8ea203ef1 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/udunits/default.nix
+++ b/third_party/nixpkgs/pkgs/development/libraries/udunits/default.nix
@@ -1,26 +1,49 @@
-{ lib, stdenv, fetchFromGitHub, autoreconfHook,
- texinfo, bison, flex, expat, file
+{ lib
+, stdenv
+, fetchFromGitHub
+, autoreconfHook
+, bison
+, expat
+, file
+, flex
+, texinfo
}:
stdenv.mkDerivation rec {
pname = "udunits";
- version = "2.2.27.6";
+ version = "unstable-2021-03-17";
src = fetchFromGitHub {
owner = "Unidata";
repo = "UDUNITS-2";
- rev = "v${version}";
- sha256 = "0621pac24c842dyipzaa59rh6pza9phdqi3snd4cq4pib0wjw6gm";
+ rev = "c83da987387db1174cd2266b73dd5dd556f4476b";
+ hash = "sha256-+HW21+r65OroCxMK2/B5fe7zHs4hD4xyoJK2bhdJGyQ=";
};
- nativeBuildInputs = [ autoreconfHook texinfo bison flex file ];
- buildInputs = [ expat ];
+ nativeBuildInputs = [
+ autoreconfHook
+ texinfo
+ bison
+ flex
+ file
+ ];
+ buildInputs = [
+ expat
+ ];
meta = with lib; {
homepage = "https://www.unidata.ucar.edu/software/udunits/";
description = "A C-based package for the programatic handling of units of physical quantities";
- license = licenses.bsdOriginal;
+ longDescription = ''
+ The UDUNITS package supports units of physical quantities. Its C library
+ provides for arithmetic manipulation of units and for conversion of
+ numeric values between compatible units. The package contains an extensive
+ unit database, which is in XML format and user-extendable. The package
+ also contains a command-line utility for investigating units and
+ converting values.
+ '';
+ license = licenses.asl20;
+ maintainers = with maintainers; [ AndersonTorres pSub ];
platforms = platforms.linux;
- maintainers = with maintainers; [ pSub ];
};
}
diff --git a/third_party/nixpkgs/pkgs/development/libraries/webkitgtk/default.nix b/third_party/nixpkgs/pkgs/development/libraries/webkitgtk/default.nix
index 490adf8e32..28722dc8fc 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/webkitgtk/default.nix
+++ b/third_party/nixpkgs/pkgs/development/libraries/webkitgtk/default.nix
@@ -59,7 +59,7 @@ with lib;
stdenv.mkDerivation rec {
pname = "webkitgtk";
- version = "2.30.5";
+ version = "2.30.6";
outputs = [ "out" "dev" ];
@@ -67,7 +67,7 @@ stdenv.mkDerivation rec {
src = fetchurl {
url = "https://webkitgtk.org/releases/${pname}-${version}.tar.xz";
- sha256 = "07vzbbnvz69rn9pciji4axfpclp98bpj4a0br2z0gbn5wc4an3bx";
+ sha256 = "07kwkn7gnlfw4idl5vyyzhzbj2bjzvjrclbikn9vaw0pm73nwwsh";
};
patches = optionals stdenv.isLinux [
diff --git a/third_party/nixpkgs/pkgs/development/libraries/zchunk/default.nix b/third_party/nixpkgs/pkgs/development/libraries/zchunk/default.nix
index a0d1378aa7..2037d815a8 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/zchunk/default.nix
+++ b/third_party/nixpkgs/pkgs/development/libraries/zchunk/default.nix
@@ -1,17 +1,17 @@
-{ lib, stdenv
+{ lib
+, stdenv
, fetchFromGitHub
-, fetchpatch
-, pkg-config
+, argp-standalone
+, curl
, meson
, ninja
+, pkg-config
, zstd
-, curl
-, argp-standalone
}:
stdenv.mkDerivation rec {
pname = "zchunk";
- version = "1.1.8";
+ version = "1.1.9";
outputs = [ "out" "lib" "dev" ];
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
owner = "zchunk";
repo = pname;
rev = version;
- sha256 = "0q1jafxh5nqgn2w5ciljkh8h46xma0qia8a5rj9m0pxixcacqj6q";
+ hash = "sha256-MqnHtqOjLl6R5GZ4f2UX1iLoO9FUT2IfZlSN58wW8JA=";
};
nativeBuildInputs = [
@@ -29,25 +29,23 @@ stdenv.mkDerivation rec {
];
buildInputs = [
- zstd
curl
+ zstd
] ++ lib.optional stdenv.isDarwin argp-standalone;
- # Darwin needs a patch for argp-standalone usage and differing endian.h location on macOS
- # https://github.com/zchunk/zchunk/pull/35
- patches = [
- (fetchpatch {
- name = "darwin-support.patch";
- url = "https://github.com/zchunk/zchunk/commit/f7db2ac0a95028a7f82ecb89862426bf53a69232.patch";
- sha256 = "0cm84gyii4ly6nsmagk15g9kbfa13rw395nqk3fdcwm0dpixlkh4";
- })
-];
-
meta = with lib; {
- description = "File format designed for highly efficient deltas while maintaining good compression";
homepage = "https://github.com/zchunk/zchunk";
+ description = "File format designed for highly efficient deltas while maintaining good compression";
+ longDescription = ''
+ zchunk is a compressed file format that splits the file into independent
+ chunks. This allows you to only download changed chunks when downloading a
+ new version of the file, and also makes zchunk files efficient over rsync.
+
+ zchunk files are protected with strong checksums to verify that the file
+ you downloaded is, in fact, the file you wanted.
+ '';
license = licenses.bsd2;
- maintainers = with maintainers; [];
+ maintainers = with maintainers; [ AndersonTorres ];
platforms = platforms.unix;
};
}
diff --git a/third_party/nixpkgs/pkgs/development/libraries/zziplib/default.nix b/third_party/nixpkgs/pkgs/development/libraries/zziplib/default.nix
index 8cfec83af5..90758db16e 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/zziplib/default.nix
+++ b/third_party/nixpkgs/pkgs/development/libraries/zziplib/default.nix
@@ -1,80 +1,81 @@
-{ lib, stdenv
-, perl
-, pkg-config
+{ lib
+, stdenv
, fetchFromGitHub
, fetchpatch
-, zip
-, unzip
+, cmake
+, perl
+, pkg-config
, python3
, xmlto
+, zip
, zlib
}:
stdenv.mkDerivation rec {
pname = "zziplib";
- version = "0.13.71";
+ version = "0.13.72";
src = fetchFromGitHub {
owner = "gdraheim";
- repo = "zziplib";
+ repo = pname;
rev = "v${version}";
- sha256 = "P+7D57sc2oIABhk3k96aRILpGnsND5SLXHh2lqr9O4E=";
+ hash = "sha256-Ht3fBgdrTm4mCi5uhgQPNtpGzADoRVOpSuGPsIS6y0Q=";
};
patches = [
- # Install man pages
+ # apply https://github.com/gdraheim/zziplib/pull/113
(fetchpatch {
- url = "https://github.com/gdraheim/zziplib/commit/5583ccc7a247ee27556ede344e93d3ac1dc72e9b.patch";
- sha256 = "wVExEZN8Ml1/3GicB0ZYsLVS3KJ8BSz8i4Gu46naz1Y=";
- excludes = [ "GNUmakefile" ];
+ url = "https://github.com/gdraheim/zziplib/commit/82a7773cd17828a3b0a4f5f552ae80c1cc8777c7.diff";
+ sha256 = "0ifqdzxwb5d19mziy9j6lhl8wj95jpxzm0d2c6y3bgwa931avd3y";
})
-
- # Fix man page formatting
(fetchpatch {
- url = "https://github.com/gdraheim/zziplib/commit/22ed64f13dc239f86664c60496261f544bce1088.patch";
- sha256 = "ScFVWLc4LQPqkcHn9HK/VkLula4b5HzuYl0b5vi4Ikc=";
+ url = "https://github.com/gdraheim/zziplib/commit/1cd611514c5f9559eb9dfc191d678dfc991f66db.diff";
+ sha256 = "11w9qa46xq49l113k266dnv8izzdk1fq4y54yy5w8zps8zd3xfny";
+ })
+ (fetchpatch {
+ url = "https://github.com/gdraheim/zziplib/commit/e47b1e1da952a92f917db6fb19485b8a0b1a42f3.diff";
+ sha256 = "0d032hkmi3s3db12z2zbppl2swa3gdpbj0c6w13ylv2g2ixglrwg";
})
];
nativeBuildInputs = [
+ cmake
perl
pkg-config
- zip
python3
xmlto
+ zip
];
-
buildInputs = [
zlib
];
- checkInputs = [
- unzip
+ # test/zziptests.py requires network access
+ # (https://github.com/gdraheim/zziplib/issues/24)
+ cmakeFlags = [
+ "-DZZIP_TESTCVE=OFF"
+ "-DBUILD_SHARED_LIBS=True"
+ "-DBUILD_STATIC_LIBS=False"
+ "-DBUILD_TESTS=OFF"
+ "-DMSVC_STATIC_RUNTIME=OFF"
+ "-DZZIPSDL=OFF"
+ "-DZZIPTEST=OFF"
+ "-DZZIPWRAP=OFF"
+ "-DBUILDTESTS=OFF"
];
- # tests are broken (https://github.com/gdraheim/zziplib/issues/20),
- # and test/zziptests.py requires network access
- # (https://github.com/gdraheim/zziplib/issues/24)
- doCheck = false;
- checkTarget = "check";
-
meta = with lib; {
+ homepage = "https://github.com/gdraheim/zziplib";
description = "Library to extract data from files archived in a zip file";
-
longDescription = ''
- The zziplib library is intentionally lightweight, it offers the ability
- to easily extract data from files archived in a single zip
- file. Applications can bundle files into a single zip archive and
- access them. The implementation is based only on the (free) subset of
- compression with the zlib algorithm which is actually used by the
- zip/unzip tools.
+ The zziplib library is intentionally lightweight, it offers the ability to
+ easily extract data from files archived in a single zip file.
+ Applications can bundle files into a single zip archive and access them.
+ The implementation is based only on the (free) subset of compression with
+ the zlib algorithm which is actually used by the zip/unzip tools.
'';
-
license = with licenses; [ lgpl2Plus mpl11 ];
-
- homepage = "http://zziplib.sourceforge.net/";
-
- maintainers = [ ];
+ maintainers = with maintainers; [ AndersonTorres ];
platforms = python3.meta.platforms;
};
}
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 831edcaee2..57a422a916 100644
--- a/third_party/nixpkgs/pkgs/development/lisp-modules/lisp-packages.nix
+++ b/third_party/nixpkgs/pkgs/development/lisp-modules/lisp-packages.nix
@@ -8,7 +8,7 @@ let lispPackages = rec {
quicklisp = buildLispPackage rec {
baseName = "quicklisp";
- version = "2019-02-16";
+ version = "2021-02-13";
buildSystems = [];
@@ -17,15 +17,15 @@ let lispPackages = rec {
src = pkgs.fetchgit {
url = "https://github.com/quicklisp/quicklisp-client/";
rev = "refs/tags/version-${version}";
- sha256 = "0x9b4vf36n2hh102gqgjxg5f5ymxcr9j5khn4rskjdprfgd8d1y9";
+ sha256 = "sha256:102f1chpx12h5dcf659a9kzifgfjc482ylf73fg1cs3w34zdawnl";
};
overrides = x: rec {
inherit clwrapper;
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/2020-10-16/distinfo.txt";
- sha256 = "sha256:090xjcnyqcv8az9n1a7m0f6vzz2nwcncy95ha7ixb7fnd2rj1n65";
+ url = "https://beta.quicklisp.org/dist/quicklisp/2021-02-28/distinfo.txt";
+ sha256 = "sha256:1apc0s07fmm386rj866dbrhrkq3lrbgbd79kwcyp91ix7sza8z3z";
};
buildPhase = "true; ";
postInstall = ''
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
index 70de895a58..aa9c3dc892 100644
--- 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
@@ -1,15 +1,15 @@
args @ { fetchurl, ... }:
rec {
- baseName = "_3bmd-ext-code-blocks";
- version = "3bmd-20200925-git";
+ baseName = ''_3bmd-ext-code-blocks'';
+ version = ''3bmd-20201220-git'';
- description = "extension to 3bmd implementing github style ``` delimited code blocks, with support for syntax highlighting using colorize, pygments, or chroma";
+ 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" ];
+ deps = [ args."_3bmd" args."alexandria" args."colorize" args."esrap" args."html-encode" args."split-sequence" args."trivial-with-current-source-form" ];
src = fetchurl {
- url = "http://beta.quicklisp.org/archive/3bmd/2020-09-25/3bmd-20200925-git.tgz";
- sha256 = "0sk4b0xma4vv6ssiskbz7h5bw8v8glm34mbv3llqywb50b9ks4fw";
+ url = ''http://beta.quicklisp.org/archive/3bmd/2020-12-20/3bmd-20201220-git.tgz'';
+ sha256 = ''0hcx8p8la3fmwhj8ddqik7bwrn9rvf5mcv6m77glimwckh51na71'';
};
packageName = "3bmd-ext-code-blocks";
@@ -19,16 +19,20 @@ rec {
}
/* (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
+ SHA256 0hcx8p8la3fmwhj8ddqik7bwrn9rvf5mcv6m77glimwckh51na71 URL
+ http://beta.quicklisp.org/archive/3bmd/2020-12-20/3bmd-20201220-git.tgz MD5
+ 67b6e5fa51d18817e7110e4fef6517ac 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
+ (NAME split-sequence FILENAME split-sequence)
+ (NAME trivial-with-current-source-form FILENAME
+ trivial-with-current-source-form))
+ DEPENDENCIES
+ (3bmd alexandria colorize esrap html-encode split-sequence
+ trivial-with-current-source-form)
+ VERSION 3bmd-20201220-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 b49b183b24..101d7768df 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 = "20200925-git";
+ baseName = ''_3bmd'';
+ version = ''20201220-git'';
- description = "markdown processor in CL using esrap parser.";
+ description = ''markdown processor in CL using esrap parser.'';
- deps = [ args."alexandria" args."esrap" args."split-sequence" ];
+ deps = [ args."alexandria" args."esrap" args."split-sequence" args."trivial-with-current-source-form" ];
src = fetchurl {
- url = "http://beta.quicklisp.org/archive/3bmd/2020-09-25/3bmd-20200925-git.tgz";
- sha256 = "0sk4b0xma4vv6ssiskbz7h5bw8v8glm34mbv3llqywb50b9ks4fw";
+ url = ''http://beta.quicklisp.org/archive/3bmd/2020-12-20/3bmd-20201220-git.tgz'';
+ sha256 = ''0hcx8p8la3fmwhj8ddqik7bwrn9rvf5mcv6m77glimwckh51na71'';
};
packageName = "3bmd";
@@ -18,13 +18,16 @@ rec {
overrides = x: x;
}
/* (SYSTEM 3bmd DESCRIPTION markdown processor in CL using esrap parser. SHA256
- 0sk4b0xma4vv6ssiskbz7h5bw8v8glm34mbv3llqywb50b9ks4fw URL
- http://beta.quicklisp.org/archive/3bmd/2020-09-25/3bmd-20200925-git.tgz MD5
- 3b2c0b2094e473234742d150ac84abdd NAME 3bmd FILENAME _3bmd DEPS
+ 0hcx8p8la3fmwhj8ddqik7bwrn9rvf5mcv6m77glimwckh51na71 URL
+ http://beta.quicklisp.org/archive/3bmd/2020-12-20/3bmd-20201220-git.tgz MD5
+ 67b6e5fa51d18817e7110e4fef6517ac 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 20200925-git
- SIBLINGS
+ (NAME split-sequence FILENAME split-sequence)
+ (NAME trivial-with-current-source-form FILENAME
+ trivial-with-current-source-form))
+ DEPENDENCIES
+ (alexandria esrap split-sequence trivial-with-current-source-form) VERSION
+ 20201220-git SIBLINGS
(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/access.nix b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/access.nix
index d4f68526f1..17d7f7d7d0 100644
--- 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
@@ -1,7 +1,7 @@
args @ { fetchurl, ... }:
rec {
- baseName = "access";
- version = "20151218-git";
+ baseName = ''access'';
+ version = ''20210124-git'';
parasites = [ "access-test" ];
@@ -11,8 +11,8 @@ rec {
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";
+ url = ''http://beta.quicklisp.org/archive/access/2021-01-24/access-20210124-git.tgz'';
+ sha256 = ''1n4j15v1ikspchcbb0bn15kk3lh78f6bxk56cs4arimm8bisyqlq'';
};
packageName = "access";
@@ -23,9 +23,9 @@ rec {
/* (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
+ SHA256 1n4j15v1ikspchcbb0bn15kk3lh78f6bxk56cs4arimm8bisyqlq URL
+ http://beta.quicklisp.org/archive/access/2021-01-24/access-20210124-git.tgz
+ MD5 d2d7d9826cbfb3de568d05a4d6bacdbe 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)
@@ -36,4 +36,4 @@ rec {
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)) */
+ VERSION 20210124-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
index 69d28a65c1..f93506505a 100644
--- 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
@@ -1,15 +1,15 @@
args @ { fetchurl, ... }:
rec {
- baseName = "acclimation";
- version = "20200925-git";
+ baseName = ''acclimation'';
+ version = ''20200925-git'';
- description = "Library supporting internationalization";
+ description = ''Library supporting internationalization'';
deps = [ ];
src = fetchurl {
- url = "http://beta.quicklisp.org/archive/acclimation/2020-09-25/acclimation-20200925-git.tgz";
- sha256 = "11vw1h5zxicj5qxb1smiyjxafw8xk0isnzcf5g0lqis3y9ssqxbw";
+ url = ''http://beta.quicklisp.org/archive/acclimation/2020-09-25/acclimation-20200925-git.tgz'';
+ sha256 = ''11vw1h5zxicj5qxb1smiyjxafw8xk0isnzcf5g0lqis3y9ssqxbw'';
};
packageName = "acclimation";
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 f1eaf58742..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 = "20200925-git";
+ baseName = ''alexandria'';
+ version = ''20200925-git'';
- description = "Alexandria is a collection of portable public domain utilities.";
+ description = ''Alexandria is a collection of portable public domain utilities.'';
deps = [ ];
src = fetchurl {
- url = "http://beta.quicklisp.org/archive/alexandria/2020-09-25/alexandria-20200925-git.tgz";
- sha256 = "1cpvnzfs807ah07hrk8kplim6ryzqs4r35ym03cpky5xdl8c89fl";
+ url = ''http://beta.quicklisp.org/archive/alexandria/2020-09-25/alexandria-20200925-git.tgz'';
+ sha256 = ''1cpvnzfs807ah07hrk8kplim6ryzqs4r35ym03cpky5xdl8c89fl'';
};
packageName = "alexandria";
diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/anaphora.nix b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/anaphora.nix
index 1d5e3a5997..d62800f2e8 100644
--- a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/anaphora.nix
+++ b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/anaphora.nix
@@ -1,17 +1,17 @@
args @ { fetchurl, ... }:
rec {
- baseName = "anaphora";
- version = "20191007-git";
+ baseName = ''anaphora'';
+ version = ''20210124-git'';
parasites = [ "anaphora/test" ];
- description = "The Anaphoric Macro Package from Hell";
+ description = ''The Anaphoric Macro Package from Hell'';
deps = [ args."rt" ];
src = fetchurl {
- url = "http://beta.quicklisp.org/archive/anaphora/2019-10-07/anaphora-20191007-git.tgz";
- sha256 = "0iwfddh3cycjr9vhjnr1ldd5xc3qwqhrp41904s1dvysf99277kv";
+ url = ''http://beta.quicklisp.org/archive/anaphora/2021-01-24/anaphora-20210124-git.tgz'';
+ sha256 = ''0b4xwrnv007sfcqkxkarrbf99v3md8h199z1z69r4vx7r5pq2i4v'';
};
packageName = "anaphora";
@@ -20,8 +20,8 @@ rec {
overrides = x: x;
}
/* (SYSTEM anaphora DESCRIPTION The Anaphoric Macro Package from Hell SHA256
- 0iwfddh3cycjr9vhjnr1ldd5xc3qwqhrp41904s1dvysf99277kv URL
- http://beta.quicklisp.org/archive/anaphora/2019-10-07/anaphora-20191007-git.tgz
- MD5 bfaae44cfb6226f35f0afde335e51ca4 NAME anaphora FILENAME anaphora DEPS
- ((NAME rt FILENAME rt)) DEPENDENCIES (rt) VERSION 20191007-git SIBLINGS NIL
+ 0b4xwrnv007sfcqkxkarrbf99v3md8h199z1z69r4vx7r5pq2i4v URL
+ http://beta.quicklisp.org/archive/anaphora/2021-01-24/anaphora-20210124-git.tgz
+ MD5 09a11971206da9d259b34c050783b74b NAME anaphora FILENAME anaphora DEPS
+ ((NAME rt FILENAME rt)) DEPENDENCIES (rt) VERSION 20210124-git SIBLINGS NIL
PARASITES (anaphora/test)) */
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
index 5ac59f713e..97ae196c0f 100644
--- 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
@@ -1,17 +1,17 @@
args @ { fetchurl, ... }:
rec {
- baseName = "arnesi";
- version = "20170403-git";
+ 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";
+ 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";
+ url = ''http://beta.quicklisp.org/archive/arnesi/2017-04-03/arnesi-20170403-git.tgz'';
+ sha256 = ''01kirjpgv5pgbcdxjrnw3ld4jw7wrqm3rgqnxwac4gxaphr2s6q4'';
};
packageName = "arnesi";
diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/array-utils.nix b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/array-utils.nix
index 07aca0eb9d..b65df191ad 100644
--- a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/array-utils.nix
+++ b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/array-utils.nix
@@ -1,15 +1,15 @@
args @ { fetchurl, ... }:
rec {
- baseName = "array-utils";
- version = "20190710-git";
+ baseName = ''array-utils'';
+ version = ''20201220-git'';
- description = "A few utilities for working with arrays.";
+ description = ''A few utilities for working with arrays.'';
deps = [ ];
src = fetchurl {
- url = "http://beta.quicklisp.org/archive/array-utils/2019-07-10/array-utils-20190710-git.tgz";
- sha256 = "1fzsg3lqa79yrkad6fx924vai7i6m92i2rq8lyq37wrbwkhm7grh";
+ url = ''http://beta.quicklisp.org/archive/array-utils/2020-12-20/array-utils-20201220-git.tgz'';
+ sha256 = ''11y6k8gzzcj00jyccg2k9nh6rvivcvh23z4yzjfly7adygd3n717'';
};
packageName = "array-utils";
@@ -18,8 +18,8 @@ rec {
overrides = x: x;
}
/* (SYSTEM array-utils DESCRIPTION A few utilities for working with arrays.
- SHA256 1fzsg3lqa79yrkad6fx924vai7i6m92i2rq8lyq37wrbwkhm7grh URL
- http://beta.quicklisp.org/archive/array-utils/2019-07-10/array-utils-20190710-git.tgz
- MD5 58c39c2ba3d2c8cd8a695fb867b72c33 NAME array-utils FILENAME array-utils
- DEPS NIL DEPENDENCIES NIL VERSION 20190710-git SIBLINGS (array-utils-test)
+ SHA256 11y6k8gzzcj00jyccg2k9nh6rvivcvh23z4yzjfly7adygd3n717 URL
+ http://beta.quicklisp.org/archive/array-utils/2020-12-20/array-utils-20201220-git.tgz
+ MD5 d6ed906f28c46b2ab0335ec1fc05f8af NAME array-utils FILENAME array-utils
+ DEPS NIL DEPENDENCIES NIL VERSION 20201220-git SIBLINGS (array-utils-test)
PARASITES NIL) */
diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/asdf-package-system.nix b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/asdf-package-system.nix
index b0fa628993..1a56676f03 100644
--- a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/asdf-package-system.nix
+++ b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/asdf-package-system.nix
@@ -1,15 +1,15 @@
args @ { fetchurl, ... }:
rec {
- baseName = "asdf-package-system";
- version = "20150608-git";
+ baseName = ''asdf-package-system'';
+ version = ''20150608-git'';
- description = "System lacks description";
+ description = ''System lacks description'';
deps = [ ];
src = fetchurl {
- url = "http://beta.quicklisp.org/archive/asdf-package-system/2015-06-08/asdf-package-system-20150608-git.tgz";
- sha256 = "17lfwfc15hcag8a2jsaxkx42wmz2mwkvxf6vb2h9cim7dwsnyy29";
+ url = ''http://beta.quicklisp.org/archive/asdf-package-system/2015-06-08/asdf-package-system-20150608-git.tgz'';
+ sha256 = ''17lfwfc15hcag8a2jsaxkx42wmz2mwkvxf6vb2h9cim7dwsnyy29'';
};
packageName = "asdf-package-system";
diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/asdf-system-connections.nix b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/asdf-system-connections.nix
index 7133bf2577..65df45d95a 100644
--- a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/asdf-system-connections.nix
+++ b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/asdf-system-connections.nix
@@ -1,15 +1,15 @@
args @ { fetchurl, ... }:
rec {
- baseName = "asdf-system-connections";
- version = "20170124-git";
+ baseName = ''asdf-system-connections'';
+ version = ''20170124-git'';
- description = "Allows for ASDF system to be connected so that auto-loading may occur.";
+ description = ''Allows for ASDF system to be connected so that auto-loading may occur.'';
deps = [ ];
src = fetchurl {
- url = "http://beta.quicklisp.org/archive/asdf-system-connections/2017-01-24/asdf-system-connections-20170124-git.tgz";
- sha256 = "0h8237bq3niw6glcsps77n1ykcmc5bjkcrbjyxjgkmcb1c5kwwpq";
+ url = ''http://beta.quicklisp.org/archive/asdf-system-connections/2017-01-24/asdf-system-connections-20170124-git.tgz'';
+ sha256 = ''0h8237bq3niw6glcsps77n1ykcmc5bjkcrbjyxjgkmcb1c5kwwpq'';
};
packageName = "asdf-system-connections";
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 1c99fc6944..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 = "20200925-git";
+ baseName = ''babel'';
+ version = ''20200925-git'';
- description = "Babel, a charset conversion library.";
+ description = ''Babel, a charset conversion library.'';
deps = [ args."alexandria" args."trivial-features" ];
src = fetchurl {
- url = "http://beta.quicklisp.org/archive/babel/2020-09-25/babel-20200925-git.tgz";
- sha256 = "1hpjm2whw7zla9igzj50y3nibii0mfg2a6y6nslaf5vpkni88jfi";
+ url = ''http://beta.quicklisp.org/archive/babel/2020-09-25/babel-20200925-git.tgz'';
+ sha256 = ''1hpjm2whw7zla9igzj50y3nibii0mfg2a6y6nslaf5vpkni88jfi'';
};
packageName = "babel";
diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/blackbird.nix b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/blackbird.nix
index 1510022289..a660882f36 100644
--- a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/blackbird.nix
+++ b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/blackbird.nix
@@ -1,15 +1,15 @@
args @ { fetchurl, ... }:
rec {
- baseName = "blackbird";
- version = "20160531-git";
+ baseName = ''blackbird'';
+ version = ''20160531-git'';
- description = "A promise implementation for Common Lisp.";
+ description = ''A promise implementation for Common Lisp.'';
deps = [ args."vom" ];
src = fetchurl {
- url = "http://beta.quicklisp.org/archive/blackbird/2016-05-31/blackbird-20160531-git.tgz";
- sha256 = "0l053fb5fdz1q6dyfgys6nmbairc3aig4wjl5abpf8b1paf7gzq9";
+ url = ''http://beta.quicklisp.org/archive/blackbird/2016-05-31/blackbird-20160531-git.tgz'';
+ sha256 = ''0l053fb5fdz1q6dyfgys6nmbairc3aig4wjl5abpf8b1paf7gzq9'';
};
packageName = "blackbird";
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 b8c225174a..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,17 +1,17 @@
args @ { fetchurl, ... }:
rec {
- baseName = "bordeaux-threads";
- version = "v0.8.8";
+ baseName = ''bordeaux-threads'';
+ version = ''v0.8.8'';
parasites = [ "bordeaux-threads/test" ];
- description = "Bordeaux Threads makes writing portable multi-threaded apps simple.";
+ description = ''Bordeaux Threads makes writing portable multi-threaded apps simple.'';
deps = [ args."alexandria" args."fiveam" ];
src = fetchurl {
- url = "http://beta.quicklisp.org/archive/bordeaux-threads/2020-06-10/bordeaux-threads-v0.8.8.tgz";
- sha256 = "1ppb7lvr796k1j4hi0jnp717v9zxy6vq4f5cyzgn7svg1ic6l0pp";
+ url = ''http://beta.quicklisp.org/archive/bordeaux-threads/2020-06-10/bordeaux-threads-v0.8.8.tgz'';
+ sha256 = ''1ppb7lvr796k1j4hi0jnp717v9zxy6vq4f5cyzgn7svg1ic6l0pp'';
};
packageName = "bordeaux-threads";
diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/buildnode-xhtml.nix b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/buildnode-xhtml.nix
index 18d22d1cf3..5d7f3f2dd1 100644
--- a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/buildnode-xhtml.nix
+++ b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/buildnode-xhtml.nix
@@ -1,15 +1,15 @@
args @ { fetchurl, ... }:
rec {
- baseName = "buildnode-xhtml";
- version = "buildnode-20170403-git";
+ baseName = ''buildnode-xhtml'';
+ version = ''buildnode-20170403-git'';
- description = "Tool for building up an xml dom of an excel spreadsheet nicely.";
+ description = ''Tool for building up an xml dom of an excel spreadsheet nicely.'';
deps = [ args."alexandria" args."babel" args."buildnode" args."cl-interpol" args."cl-ppcre" args."cl-unicode" args."closer-mop" args."closure-common" args."closure-html" args."collectors" args."cxml" args."flexi-streams" args."iterate" args."named-readtables" args."puri" args."split-sequence" args."swank" args."symbol-munger" args."trivial-features" args."trivial-gray-streams" ];
src = fetchurl {
- url = "http://beta.quicklisp.org/archive/buildnode/2017-04-03/buildnode-20170403-git.tgz";
- sha256 = "1gb3zsp4g31iscvvhvb99z0i7lfn1g3493q6sgpr46fmn2vdwwb6";
+ url = ''http://beta.quicklisp.org/archive/buildnode/2017-04-03/buildnode-20170403-git.tgz'';
+ sha256 = ''1gb3zsp4g31iscvvhvb99z0i7lfn1g3493q6sgpr46fmn2vdwwb6'';
};
packageName = "buildnode-xhtml";
diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/buildnode.nix b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/buildnode.nix
index b3a281ed3a..0a2e56a9c9 100644
--- a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/buildnode.nix
+++ b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/buildnode.nix
@@ -1,17 +1,17 @@
args @ { fetchurl, ... }:
rec {
- baseName = "buildnode";
- version = "20170403-git";
+ baseName = ''buildnode'';
+ version = ''20170403-git'';
parasites = [ "buildnode-test" ];
- description = "Tool for building up an xml dom nicely.";
+ description = ''Tool for building up an xml dom nicely.'';
deps = [ args."alexandria" args."babel" args."buildnode-xhtml" args."cl-interpol" args."cl-ppcre" args."cl-unicode" args."closer-mop" args."closure-common" args."closure-html" args."collectors" args."cxml" args."flexi-streams" args."iterate" args."lisp-unit2" args."named-readtables" args."puri" args."split-sequence" args."swank" args."symbol-munger" args."trivial-features" args."trivial-gray-streams" ];
src = fetchurl {
- url = "http://beta.quicklisp.org/archive/buildnode/2017-04-03/buildnode-20170403-git.tgz";
- sha256 = "1gb3zsp4g31iscvvhvb99z0i7lfn1g3493q6sgpr46fmn2vdwwb6";
+ url = ''http://beta.quicklisp.org/archive/buildnode/2017-04-03/buildnode-20170403-git.tgz'';
+ sha256 = ''1gb3zsp4g31iscvvhvb99z0i7lfn1g3493q6sgpr46fmn2vdwwb6'';
};
packageName = "buildnode";
diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/calispel.nix b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/calispel.nix
new file mode 100644
index 0000000000..27b43beaf2
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/calispel.nix
@@ -0,0 +1,35 @@
+args @ { fetchurl, ... }:
+rec {
+ baseName = ''calispel'';
+ version = ''20170830-git'';
+
+ parasites = [ "calispel-test" ];
+
+ description = ''Thread-safe message-passing channels, in the style of
+the occam programming language.'';
+
+ deps = [ args."alexandria" args."bordeaux-threads" args."eager-future2" args."jpl-queues" args."jpl-util" ];
+
+ src = fetchurl {
+ url = ''http://beta.quicklisp.org/archive/calispel/2017-08-30/calispel-20170830-git.tgz'';
+ sha256 = ''0qwmzmyh63jlw5bdv4wf458n1dz9k77gd5b4ix1kd6xrzx247k7i'';
+ };
+
+ packageName = "calispel";
+
+ asdFilesToKeep = ["calispel.asd"];
+ overrides = x: x;
+}
+/* (SYSTEM calispel DESCRIPTION
+ Thread-safe message-passing channels, in the style of
+the occam programming language.
+ SHA256 0qwmzmyh63jlw5bdv4wf458n1dz9k77gd5b4ix1kd6xrzx247k7i URL
+ http://beta.quicklisp.org/archive/calispel/2017-08-30/calispel-20170830-git.tgz
+ MD5 1fba6e4b2055f5d1f0a78387e29552b1 NAME calispel FILENAME calispel DEPS
+ ((NAME alexandria FILENAME alexandria)
+ (NAME bordeaux-threads FILENAME bordeaux-threads)
+ (NAME eager-future2 FILENAME eager-future2)
+ (NAME jpl-queues FILENAME jpl-queues) (NAME jpl-util FILENAME jpl-util))
+ DEPENDENCIES
+ (alexandria bordeaux-threads eager-future2 jpl-queues jpl-util) VERSION
+ 20170830-git SIBLINGS NIL PARASITES (calispel-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 3b44cbbb97..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 = "20200325-git";
+ baseName = ''caveman'';
+ version = ''20200325-git'';
- description = "Web Application Framework for Common Lisp";
+ 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-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/2020-03-25/caveman-20200325-git.tgz";
- sha256 = "0s134lamlyll4ad0380rj0hkiy9gakly7cb6sjr1yg2yd6ydz1py";
+ url = ''http://beta.quicklisp.org/archive/caveman/2020-03-25/caveman-20200325-git.tgz'';
+ sha256 = ''0s134lamlyll4ad0380rj0hkiy9gakly7cb6sjr1yg2yd6ydz1py'';
};
packageName = "caveman";
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 97328db254..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.23.0";
+ baseName = ''cffi-grovel'';
+ version = ''cffi_0.23.0'';
- description = "The CFFI Groveller";
+ 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/2020-07-15/cffi_0.23.0.tgz";
- sha256 = "1szpbg5m5fjq7bpkblflpnwmgz3ncsvp1y43g3jzwlk7yfxrwxck";
+ url = ''http://beta.quicklisp.org/archive/cffi/2020-07-15/cffi_0.23.0.tgz'';
+ sha256 = ''1szpbg5m5fjq7bpkblflpnwmgz3ncsvp1y43g3jzwlk7yfxrwxck'';
};
packageName = "cffi-grovel";
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 51fe6a00f1..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.23.0";
+ baseName = ''cffi-toolchain'';
+ version = ''cffi_0.23.0'';
- description = "The CFFI toolchain";
+ description = ''The CFFI toolchain'';
deps = [ args."alexandria" args."babel" args."cffi" args."trivial-features" ];
src = fetchurl {
- url = "http://beta.quicklisp.org/archive/cffi/2020-07-15/cffi_0.23.0.tgz";
- sha256 = "1szpbg5m5fjq7bpkblflpnwmgz3ncsvp1y43g3jzwlk7yfxrwxck";
+ url = ''http://beta.quicklisp.org/archive/cffi/2020-07-15/cffi_0.23.0.tgz'';
+ sha256 = ''1szpbg5m5fjq7bpkblflpnwmgz3ncsvp1y43g3jzwlk7yfxrwxck'';
};
packageName = "cffi-toolchain";
diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cffi-uffi-compat.nix b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cffi-uffi-compat.nix
new file mode 100644
index 0000000000..49d8a74df3
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cffi-uffi-compat.nix
@@ -0,0 +1,31 @@
+args @ { fetchurl, ... }:
+rec {
+ baseName = ''cffi-uffi-compat'';
+ version = ''cffi_0.23.0'';
+
+ description = ''UFFI Compatibility Layer for CFFI'';
+
+ deps = [ args."alexandria" args."babel" args."cffi" args."trivial-features" ];
+
+ src = fetchurl {
+ url = ''http://beta.quicklisp.org/archive/cffi/2020-07-15/cffi_0.23.0.tgz'';
+ sha256 = ''1szpbg5m5fjq7bpkblflpnwmgz3ncsvp1y43g3jzwlk7yfxrwxck'';
+ };
+
+ packageName = "cffi-uffi-compat";
+
+ asdFilesToKeep = ["cffi-uffi-compat.asd"];
+ overrides = x: x;
+}
+/* (SYSTEM cffi-uffi-compat DESCRIPTION UFFI Compatibility Layer for CFFI
+ SHA256 1szpbg5m5fjq7bpkblflpnwmgz3ncsvp1y43g3jzwlk7yfxrwxck URL
+ http://beta.quicklisp.org/archive/cffi/2020-07-15/cffi_0.23.0.tgz MD5
+ a43e3c440fc4f20494e6d2347887c963 NAME cffi-uffi-compat FILENAME
+ cffi-uffi-compat 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.23.0
+ SIBLINGS
+ (cffi-examples cffi-grovel cffi-libffi cffi-tests cffi-toolchain 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 a56fbf6b26..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,17 +1,17 @@
args @ { fetchurl, ... }:
rec {
- baseName = "cffi";
- version = "cffi_0.23.0";
+ baseName = ''cffi'';
+ version = ''cffi_0.23.0'';
parasites = [ "cffi/c2ffi" "cffi/c2ffi-generator" ];
- description = "The Common Foreign Function Interface";
+ description = ''The Common Foreign Function Interface'';
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/2020-07-15/cffi_0.23.0.tgz";
- sha256 = "1szpbg5m5fjq7bpkblflpnwmgz3ncsvp1y43g3jzwlk7yfxrwxck";
+ url = ''http://beta.quicklisp.org/archive/cffi/2020-07-15/cffi_0.23.0.tgz'';
+ sha256 = ''1szpbg5m5fjq7bpkblflpnwmgz3ncsvp1y43g3jzwlk7yfxrwxck'';
};
packageName = "cffi";
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
index 3b9e089b31..6a6abcc4e2 100644
--- 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
@@ -1,17 +1,17 @@
args @ { fetchurl, ... }:
rec {
- baseName = "chanl";
- version = "20201016-git";
+ baseName = ''chanl'';
+ version = ''20210124-git'';
parasites = [ "chanl/examples" "chanl/tests" ];
- description = "Communicating Sequential Process support for Common Lisp";
+ 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";
+ url = ''http://beta.quicklisp.org/archive/chanl/2021-01-24/chanl-20210124-git.tgz'';
+ sha256 = ''1lb0k5nh51f8hskpm1pma5ds4lk1zpbk9czpw9bk8hdykr178mzc'';
};
packageName = "chanl";
@@ -21,11 +21,11 @@ rec {
}
/* (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
+ 1lb0k5nh51f8hskpm1pma5ds4lk1zpbk9czpw9bk8hdykr178mzc URL
+ http://beta.quicklisp.org/archive/chanl/2021-01-24/chanl-20210124-git.tgz
+ MD5 2f9e2d16caa2febff4f5beb6226b7ccf 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
+ DEPENDENCIES (alexandria bordeaux-threads fiveam) VERSION 20210124-git
SIBLINGS NIL PARASITES (chanl/examples chanl/tests)) */
diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/chipz.nix b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/chipz.nix
index 3c05684de5..c30c68e53c 100644
--- a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/chipz.nix
+++ b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/chipz.nix
@@ -1,15 +1,15 @@
args @ { fetchurl, ... }:
rec {
- baseName = "chipz";
- version = "20190202-git";
+ baseName = ''chipz'';
+ version = ''20190202-git'';
- description = "A library for decompressing deflate, zlib, and gzip data";
+ description = ''A library for decompressing deflate, zlib, and gzip data'';
deps = [ ];
src = fetchurl {
- url = "http://beta.quicklisp.org/archive/chipz/2019-02-02/chipz-20190202-git.tgz";
- sha256 = "1vk8nml2kvkpwydcnm49gz2j9flvl8676kbvci5qa7qm286dhn5a";
+ url = ''http://beta.quicklisp.org/archive/chipz/2019-02-02/chipz-20190202-git.tgz'';
+ sha256 = ''1vk8nml2kvkpwydcnm49gz2j9flvl8676kbvci5qa7qm286dhn5a'';
};
packageName = "chipz";
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 e08a2efe96..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 = "20200427-git";
+ baseName = ''chunga'';
+ version = ''20200427-git'';
- description = "System lacks description";
+ description = ''System lacks description'';
deps = [ args."trivial-gray-streams" ];
src = fetchurl {
- url = "http://beta.quicklisp.org/archive/chunga/2020-04-27/chunga-20200427-git.tgz";
- sha256 = "0p6dlnan6raincd682brcjbklyvmkfkhz0yzp2bkfw67s9615bkk";
+ url = ''http://beta.quicklisp.org/archive/chunga/2020-04-27/chunga-20200427-git.tgz'';
+ sha256 = ''0p6dlnan6raincd682brcjbklyvmkfkhz0yzp2bkfw67s9615bkk'';
};
packageName = "chunga";
diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/circular-streams.nix b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/circular-streams.nix
index f0b211d27d..2e387d2983 100644
--- a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/circular-streams.nix
+++ b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/circular-streams.nix
@@ -1,15 +1,15 @@
args @ { fetchurl, ... }:
rec {
- baseName = "circular-streams";
- version = "20161204-git";
+ baseName = ''circular-streams'';
+ version = ''20161204-git'';
- description = "Circularly readable streams for Common Lisp";
+ description = ''Circularly readable streams for Common Lisp'';
deps = [ args."alexandria" args."babel" args."cffi" args."cffi-grovel" args."cffi-toolchain" args."fast-io" args."static-vectors" args."trivial-features" args."trivial-gray-streams" ];
src = fetchurl {
- url = "http://beta.quicklisp.org/archive/circular-streams/2016-12-04/circular-streams-20161204-git.tgz";
- sha256 = "1i29b9sciqs5x59hlkdj2r4siyqgrwj5hb4lnc80jgfqvzbq4128";
+ url = ''http://beta.quicklisp.org/archive/circular-streams/2016-12-04/circular-streams-20161204-git.tgz'';
+ sha256 = ''1i29b9sciqs5x59hlkdj2r4siyqgrwj5hb4lnc80jgfqvzbq4128'';
};
packageName = "circular-streams";
diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-aa.nix b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-aa.nix
index 8f1448e436..531d429df2 100644
--- a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-aa.nix
+++ b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-aa.nix
@@ -1,15 +1,15 @@
args @ { fetchurl, ... }:
rec {
- baseName = "cl-aa";
- version = "cl-vectors-20180228-git";
+ baseName = ''cl-aa'';
+ version = ''cl-vectors-20180228-git'';
- description = "cl-aa: polygon rasterizer";
+ description = ''cl-aa: polygon rasterizer'';
deps = [ ];
src = fetchurl {
- url = "http://beta.quicklisp.org/archive/cl-vectors/2018-02-28/cl-vectors-20180228-git.tgz";
- sha256 = "0fcypjfzqra8ryb4nx1vx1fqy7fwvyz3f443qkjg2z81akhkscly";
+ url = ''http://beta.quicklisp.org/archive/cl-vectors/2018-02-28/cl-vectors-20180228-git.tgz'';
+ sha256 = ''0fcypjfzqra8ryb4nx1vx1fqy7fwvyz3f443qkjg2z81akhkscly'';
};
packageName = "cl-aa";
diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-annot.nix b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-annot.nix
index c85c60a0f1..5f93167a11 100644
--- a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-annot.nix
+++ b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-annot.nix
@@ -1,15 +1,15 @@
args @ { fetchurl, ... }:
rec {
- baseName = "cl-annot";
- version = "20150608-git";
+ baseName = ''cl-annot'';
+ version = ''20150608-git'';
- description = "Python-like Annotation Syntax for Common Lisp";
+ description = ''Python-like Annotation Syntax for Common Lisp'';
deps = [ args."alexandria" ];
src = fetchurl {
- url = "http://beta.quicklisp.org/archive/cl-annot/2015-06-08/cl-annot-20150608-git.tgz";
- sha256 = "0ixsp20rk498phv3iivipn3qbw7a7x260x63hc6kpv2s746lpdg3";
+ url = ''http://beta.quicklisp.org/archive/cl-annot/2015-06-08/cl-annot-20150608-git.tgz'';
+ sha256 = ''0ixsp20rk498phv3iivipn3qbw7a7x260x63hc6kpv2s746lpdg3'';
};
packageName = "cl-annot";
diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-anonfun.nix b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-anonfun.nix
index 2ae0f7d36d..a413743eb8 100644
--- a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-anonfun.nix
+++ b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-anonfun.nix
@@ -1,15 +1,15 @@
args @ { fetchurl, ... }:
rec {
- baseName = "cl-anonfun";
- version = "20111203-git";
+ baseName = ''cl-anonfun'';
+ version = ''20111203-git'';
- description = "Anonymous function helpers for Common Lisp";
+ description = ''Anonymous function helpers for Common Lisp'';
deps = [ ];
src = fetchurl {
- url = "http://beta.quicklisp.org/archive/cl-anonfun/2011-12-03/cl-anonfun-20111203-git.tgz";
- sha256 = "16r3v3yba41smkqpz0qvzabkxashl39klfb6vxhzbly696x87p1m";
+ url = ''http://beta.quicklisp.org/archive/cl-anonfun/2011-12-03/cl-anonfun-20111203-git.tgz'';
+ sha256 = ''16r3v3yba41smkqpz0qvzabkxashl39klfb6vxhzbly696x87p1m'';
};
packageName = "cl-anonfun";
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 dd6eeba98a..0343efcaae 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 = "20200218-git";
+ baseName = ''cl-ansi-text'';
+ version = ''20210124-git'';
- description = "ANSI control string characters, focused on color";
+ description = ''ANSI control string characters, focused on color'';
deps = [ args."alexandria" args."cl-colors2" args."cl-ppcre" ];
src = fetchurl {
- url = "http://beta.quicklisp.org/archive/cl-ansi-text/2020-02-18/cl-ansi-text-20200218-git.tgz";
- sha256 = "1yn657rka3pcg3p5g9czbpk0f0rv81dbq1gknid1b24zg7krks5r";
+ url = ''http://beta.quicklisp.org/archive/cl-ansi-text/2021-01-24/cl-ansi-text-20210124-git.tgz'';
+ sha256 = ''1l7slqk26xznfyn0zpp5l32v6xfpj4qj42h4x4ds5s1yncq306cm'';
};
packageName = "cl-ansi-text";
@@ -19,11 +19,11 @@ rec {
}
/* (SYSTEM cl-ansi-text DESCRIPTION
ANSI control string characters, focused on color SHA256
- 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
+ 1l7slqk26xznfyn0zpp5l32v6xfpj4qj42h4x4ds5s1yncq306cm URL
+ http://beta.quicklisp.org/archive/cl-ansi-text/2021-01-24/cl-ansi-text-20210124-git.tgz
+ MD5 76f54998b056919978737815468e31b6 NAME cl-ansi-text FILENAME
cl-ansi-text DEPS
((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
+ DEPENDENCIES (alexandria cl-colors2 cl-ppcre) VERSION 20210124-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 5a5a8b362f..29f98e805c 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-20200610-git";
+ baseName = ''cl-async-repl'';
+ version = ''cl-async-20210228-git'';
- description = "REPL integration for CL-ASYNC.";
+ 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/2020-06-10/cl-async-20200610-git.tgz";
- sha256 = "10fyd36i5zlnxh69y1l7098b3h94l4hqwl0zhv0nshcs4sa7l37h";
+ url = ''http://beta.quicklisp.org/archive/cl-async/2021-02-28/cl-async-20210228-git.tgz'';
+ sha256 = ''08r8jlvj2zbc1f864imb864adkqhspgm5s8drjykqhv1d3hrsvy4'';
};
packageName = "cl-async-repl";
@@ -18,9 +18,9 @@ rec {
overrides = x: x;
}
/* (SYSTEM cl-async-repl DESCRIPTION REPL integration for CL-ASYNC. SHA256
- 10fyd36i5zlnxh69y1l7098b3h94l4hqwl0zhv0nshcs4sa7l37h URL
- http://beta.quicklisp.org/archive/cl-async/2020-06-10/cl-async-20200610-git.tgz
- MD5 4bf419e7ed94249648eb9d0013e7d360 NAME cl-async-repl FILENAME
+ 08r8jlvj2zbc1f864imb864adkqhspgm5s8drjykqhv1d3hrsvy4 URL
+ http://beta.quicklisp.org/archive/cl-async/2021-02-28/cl-async-20210228-git.tgz
+ MD5 0954743eb96f941aa27ff09bceff91dc 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-20200610-git SIBLINGS
+ VERSION cl-async-20210228-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 93de96b5ea..909a5a41ed 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-20200610-git";
+ baseName = ''cl-async-ssl'';
+ version = ''cl-async-20210228-git'';
- description = "SSL Wrapper around cl-async socket implementation.";
+ 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/2020-06-10/cl-async-20200610-git.tgz";
- sha256 = "10fyd36i5zlnxh69y1l7098b3h94l4hqwl0zhv0nshcs4sa7l37h";
+ url = ''http://beta.quicklisp.org/archive/cl-async/2021-02-28/cl-async-20210228-git.tgz'';
+ sha256 = ''08r8jlvj2zbc1f864imb864adkqhspgm5s8drjykqhv1d3hrsvy4'';
};
packageName = "cl-async-ssl";
@@ -19,9 +19,9 @@ rec {
}
/* (SYSTEM cl-async-ssl DESCRIPTION
SSL Wrapper around cl-async socket implementation. SHA256
- 10fyd36i5zlnxh69y1l7098b3h94l4hqwl0zhv0nshcs4sa7l37h URL
- http://beta.quicklisp.org/archive/cl-async/2020-06-10/cl-async-20200610-git.tgz
- MD5 4bf419e7ed94249648eb9d0013e7d360 NAME cl-async-ssl FILENAME
+ 08r8jlvj2zbc1f864imb864adkqhspgm5s8drjykqhv1d3hrsvy4 URL
+ http://beta.quicklisp.org/archive/cl-async/2021-02-28/cl-async-20210228-git.tgz
+ MD5 0954743eb96f941aa27ff09bceff91dc 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-20200610-git SIBLINGS
+ VERSION cl-async-20210228-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 ce188aeee1..a13ffd6ec4 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,17 +1,17 @@
args @ { fetchurl, ... }:
rec {
- baseName = "cl-async";
- version = "20200610-git";
+ baseName = ''cl-async'';
+ version = ''20210228-git'';
parasites = [ "cl-async-base" "cl-async-util" ];
- description = "Asynchronous operations for Common Lisp.";
+ description = ''Asynchronous operations for Common Lisp.'';
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/2020-06-10/cl-async-20200610-git.tgz";
- sha256 = "10fyd36i5zlnxh69y1l7098b3h94l4hqwl0zhv0nshcs4sa7l37h";
+ url = ''http://beta.quicklisp.org/archive/cl-async/2021-02-28/cl-async-20210228-git.tgz'';
+ sha256 = ''08r8jlvj2zbc1f864imb864adkqhspgm5s8drjykqhv1d3hrsvy4'';
};
packageName = "cl-async";
@@ -20,9 +20,9 @@ rec {
overrides = x: x;
}
/* (SYSTEM cl-async DESCRIPTION Asynchronous operations for Common Lisp. SHA256
- 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
+ 08r8jlvj2zbc1f864imb864adkqhspgm5s8drjykqhv1d3hrsvy4 URL
+ http://beta.quicklisp.org/archive/cl-async/2021-02-28/cl-async-20210228-git.tgz
+ MD5 0954743eb96f941aa27ff09bceff91dc 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 20200610-git SIBLINGS (cl-async-repl cl-async-ssl cl-async-test)
+ VERSION 20210228-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 37a0fa0c32..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 = "20201016-git";
+ baseName = ''cl-base64'';
+ version = ''20201016-git'';
parasites = [ "cl-base64/test" ];
- description = "Base64 encoding and decoding with URI support.";
+ description = ''Base64 encoding and decoding with URI support.'';
deps = [ args."kmrcl" args."ptester" ];
src = fetchurl {
- url = "http://beta.quicklisp.org/archive/cl-base64/2020-10-16/cl-base64-20201016-git.tgz";
- sha256 = "1wd2sgvfrivrbzlhs1vgj762jqz7sk171ssli6gl1kfwbnphzx9z";
+ url = ''http://beta.quicklisp.org/archive/cl-base64/2020-10-16/cl-base64-20201016-git.tgz'';
+ sha256 = ''1wd2sgvfrivrbzlhs1vgj762jqz7sk171ssli6gl1kfwbnphzx9z'';
};
packageName = "cl-base64";
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
index be751aa0e1..3bd70c5535 100644
--- 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
@@ -1,15 +1,15 @@
args @ { fetchurl, ... }:
rec {
- baseName = "cl-cffi-gtk-cairo";
- version = "cl-cffi-gtk-20201016-git";
+ baseName = ''cl-cffi-gtk-cairo'';
+ version = ''cl-cffi-gtk-20201220-git'';
- description = "A Lisp binding to Cairo";
+ 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";
+ url = ''http://beta.quicklisp.org/archive/cl-cffi-gtk/2020-12-20/cl-cffi-gtk-20201220-git.tgz'';
+ sha256 = ''15vc0d7nirh0m6rkvzby2zb7qcpyvsxzs5yw5h6h3madyl8qm9b1'';
};
packageName = "cl-cffi-gtk-cairo";
@@ -18,9 +18,9 @@ rec {
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
+ 15vc0d7nirh0m6rkvzby2zb7qcpyvsxzs5yw5h6h3madyl8qm9b1 URL
+ http://beta.quicklisp.org/archive/cl-cffi-gtk/2020-12-20/cl-cffi-gtk-20201220-git.tgz
+ MD5 954beac0970a46263153c2863ad1cb5f 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)
@@ -31,7 +31,7 @@ rec {
DEPENDENCIES
(alexandria babel bordeaux-threads cffi cl-cffi-gtk-glib iterate
trivial-features)
- VERSION cl-cffi-gtk-20201016-git SIBLINGS
+ VERSION cl-cffi-gtk-20201220-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
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
index a331c048fd..70d09b9f35 100644
--- 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
@@ -1,15 +1,15 @@
args @ { fetchurl, ... }:
rec {
- baseName = "cl-cffi-gtk-gdk-pixbuf";
- version = "cl-cffi-gtk-20201016-git";
+ baseName = ''cl-cffi-gtk-gdk-pixbuf'';
+ version = ''cl-cffi-gtk-20201220-git'';
- description = "A Lisp binding to GDK Pixbuf 2";
+ 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";
+ url = ''http://beta.quicklisp.org/archive/cl-cffi-gtk/2020-12-20/cl-cffi-gtk-20201220-git.tgz'';
+ sha256 = ''15vc0d7nirh0m6rkvzby2zb7qcpyvsxzs5yw5h6h3madyl8qm9b1'';
};
packageName = "cl-cffi-gtk-gdk-pixbuf";
@@ -18,9 +18,9 @@ rec {
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
+ SHA256 15vc0d7nirh0m6rkvzby2zb7qcpyvsxzs5yw5h6h3madyl8qm9b1 URL
+ http://beta.quicklisp.org/archive/cl-cffi-gtk/2020-12-20/cl-cffi-gtk-20201220-git.tgz
+ MD5 954beac0970a46263153c2863ad1cb5f 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)
@@ -33,7 +33,7 @@ rec {
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
+ VERSION cl-cffi-gtk-20201220-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
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
index 02140a47a3..b019f1683e 100644
--- 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
@@ -1,15 +1,15 @@
args @ { fetchurl, ... }:
rec {
- baseName = "cl-cffi-gtk-gdk";
- version = "cl-cffi-gtk-20201016-git";
+ baseName = ''cl-cffi-gtk-gdk'';
+ version = ''cl-cffi-gtk-20201220-git'';
- description = "A Lisp binding to GDK 3";
+ 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";
+ url = ''http://beta.quicklisp.org/archive/cl-cffi-gtk/2020-12-20/cl-cffi-gtk-20201220-git.tgz'';
+ sha256 = ''15vc0d7nirh0m6rkvzby2zb7qcpyvsxzs5yw5h6h3madyl8qm9b1'';
};
packageName = "cl-cffi-gtk-gdk";
@@ -18,9 +18,9 @@ rec {
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
+ 15vc0d7nirh0m6rkvzby2zb7qcpyvsxzs5yw5h6h3madyl8qm9b1 URL
+ http://beta.quicklisp.org/archive/cl-cffi-gtk/2020-12-20/cl-cffi-gtk-20201220-git.tgz
+ MD5 954beac0970a46263153c2863ad1cb5f 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)
@@ -39,7 +39,7 @@ rec {
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
+ VERSION cl-cffi-gtk-20201220-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
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
index 920fc4edec..5867ce10a0 100644
--- 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
@@ -1,15 +1,15 @@
args @ { fetchurl, ... }:
rec {
- baseName = "cl-cffi-gtk-gio";
- version = "cl-cffi-gtk-20201016-git";
+ baseName = ''cl-cffi-gtk-gio'';
+ version = ''cl-cffi-gtk-20201220-git'';
- description = "A Lisp binding to GIO 2";
+ 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";
+ url = ''http://beta.quicklisp.org/archive/cl-cffi-gtk/2020-12-20/cl-cffi-gtk-20201220-git.tgz'';
+ sha256 = ''15vc0d7nirh0m6rkvzby2zb7qcpyvsxzs5yw5h6h3madyl8qm9b1'';
};
packageName = "cl-cffi-gtk-gio";
@@ -18,9 +18,9 @@ rec {
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
+ 15vc0d7nirh0m6rkvzby2zb7qcpyvsxzs5yw5h6h3madyl8qm9b1 URL
+ http://beta.quicklisp.org/archive/cl-cffi-gtk/2020-12-20/cl-cffi-gtk-20201220-git.tgz
+ MD5 954beac0970a46263153c2863ad1cb5f 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)
@@ -33,7 +33,7 @@ rec {
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
+ VERSION cl-cffi-gtk-20201220-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
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
index 429dfb7889..781489cbe6 100644
--- 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
@@ -1,15 +1,15 @@
args @ { fetchurl, ... }:
rec {
- baseName = "cl-cffi-gtk-glib";
- version = "cl-cffi-gtk-20201016-git";
+ baseName = ''cl-cffi-gtk-glib'';
+ version = ''cl-cffi-gtk-20201220-git'';
- description = "A Lisp binding to GLib 2";
+ 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";
+ url = ''http://beta.quicklisp.org/archive/cl-cffi-gtk/2020-12-20/cl-cffi-gtk-20201220-git.tgz'';
+ sha256 = ''15vc0d7nirh0m6rkvzby2zb7qcpyvsxzs5yw5h6h3madyl8qm9b1'';
};
packageName = "cl-cffi-gtk-glib";
@@ -18,9 +18,9 @@ rec {
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
+ 15vc0d7nirh0m6rkvzby2zb7qcpyvsxzs5yw5h6h3madyl8qm9b1 URL
+ http://beta.quicklisp.org/archive/cl-cffi-gtk/2020-12-20/cl-cffi-gtk-20201220-git.tgz
+ MD5 954beac0970a46263153c2863ad1cb5f 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)
@@ -28,7 +28,7 @@ rec {
(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-20201220-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
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
index d2f7f2e164..99225f97a2 100644
--- 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
@@ -1,15 +1,15 @@
args @ { fetchurl, ... }:
rec {
- baseName = "cl-cffi-gtk-gobject";
- version = "cl-cffi-gtk-20201016-git";
+ baseName = ''cl-cffi-gtk-gobject'';
+ version = ''cl-cffi-gtk-20201220-git'';
- description = "A Lisp binding GObject 2";
+ 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";
+ url = ''http://beta.quicklisp.org/archive/cl-cffi-gtk/2020-12-20/cl-cffi-gtk-20201220-git.tgz'';
+ sha256 = ''15vc0d7nirh0m6rkvzby2zb7qcpyvsxzs5yw5h6h3madyl8qm9b1'';
};
packageName = "cl-cffi-gtk-gobject";
@@ -18,9 +18,9 @@ rec {
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
+ 15vc0d7nirh0m6rkvzby2zb7qcpyvsxzs5yw5h6h3madyl8qm9b1 URL
+ http://beta.quicklisp.org/archive/cl-cffi-gtk/2020-12-20/cl-cffi-gtk-20201220-git.tgz
+ MD5 954beac0970a46263153c2863ad1cb5f 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)
@@ -32,7 +32,7 @@ rec {
DEPENDENCIES
(alexandria babel bordeaux-threads cffi cl-cffi-gtk-glib closer-mop iterate
trivial-features trivial-garbage)
- VERSION cl-cffi-gtk-20201016-git SIBLINGS
+ VERSION cl-cffi-gtk-20201220-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
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
index 72b3ad647c..44b1b10887 100644
--- 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
@@ -1,15 +1,15 @@
args @ { fetchurl, ... }:
rec {
- baseName = "cl-cffi-gtk-pango";
- version = "cl-cffi-gtk-20201016-git";
+ baseName = ''cl-cffi-gtk-pango'';
+ version = ''cl-cffi-gtk-20201220-git'';
- description = "A Lisp binding to Pango";
+ 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";
+ url = ''http://beta.quicklisp.org/archive/cl-cffi-gtk/2020-12-20/cl-cffi-gtk-20201220-git.tgz'';
+ sha256 = ''15vc0d7nirh0m6rkvzby2zb7qcpyvsxzs5yw5h6h3madyl8qm9b1'';
};
packageName = "cl-cffi-gtk-pango";
@@ -18,9 +18,9 @@ rec {
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
+ 15vc0d7nirh0m6rkvzby2zb7qcpyvsxzs5yw5h6h3madyl8qm9b1 URL
+ http://beta.quicklisp.org/archive/cl-cffi-gtk/2020-12-20/cl-cffi-gtk-20201220-git.tgz
+ MD5 954beac0970a46263153c2863ad1cb5f 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)
@@ -34,7 +34,7 @@ rec {
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
+ VERSION cl-cffi-gtk-20201220-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
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
index 98256cc740..05e57b829a 100644
--- 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
@@ -1,15 +1,15 @@
args @ { fetchurl, ... }:
rec {
- baseName = "cl-cffi-gtk";
- version = "20201016-git";
+ baseName = ''cl-cffi-gtk'';
+ version = ''20201220-git'';
- description = "A Lisp binding to GTK 3";
+ 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";
+ url = ''http://beta.quicklisp.org/archive/cl-cffi-gtk/2020-12-20/cl-cffi-gtk-20201220-git.tgz'';
+ sha256 = ''15vc0d7nirh0m6rkvzby2zb7qcpyvsxzs5yw5h6h3madyl8qm9b1'';
};
packageName = "cl-cffi-gtk";
@@ -18,9 +18,9 @@ rec {
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
+ 15vc0d7nirh0m6rkvzby2zb7qcpyvsxzs5yw5h6h3madyl8qm9b1 URL
+ http://beta.quicklisp.org/archive/cl-cffi-gtk/2020-12-20/cl-cffi-gtk-20201220-git.tgz
+ MD5 954beac0970a46263153c2863ad1cb5f NAME cl-cffi-gtk FILENAME cl-cffi-gtk
DEPS
((NAME alexandria FILENAME alexandria) (NAME babel FILENAME babel)
(NAME bordeaux-threads FILENAME bordeaux-threads)
@@ -40,7 +40,7 @@ rec {
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
+ VERSION 20201220-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
diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-change-case.nix b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-change-case.nix
index ce74ce967e..d72d8076d3 100644
--- a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-change-case.nix
+++ b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-change-case.nix
@@ -1,15 +1,17 @@
args @ { fetchurl, ... }:
rec {
- baseName = "cl-change-case";
- version = "20191007-git";
+ baseName = ''cl-change-case'';
+ version = ''20210228-git'';
- description = "Convert strings between camelCase, param-case, PascalCase and more";
+ parasites = [ "cl-change-case/test" ];
- deps = [ args."cl-ppcre" args."cl-ppcre-unicode" args."cl-unicode" args."flexi-streams" ];
+ description = ''Convert strings between camelCase, param-case, PascalCase and more'';
+
+ deps = [ args."cl-ppcre" args."cl-ppcre-unicode" args."cl-unicode" args."fiveam" args."flexi-streams" ];
src = fetchurl {
- url = "http://beta.quicklisp.org/archive/cl-change-case/2019-10-07/cl-change-case-20191007-git.tgz";
- sha256 = "097n7bzlsryqh6gbwn3nzi9qdw4jhck4vn3qw41zpc496xfgz9y1";
+ url = ''http://beta.quicklisp.org/archive/cl-change-case/2021-02-28/cl-change-case-20210228-git.tgz'';
+ sha256 = ''15x8zxwa3pxs02fh0qxmbvz6vi59x6ha09p5hs4rgd6axs0k4pmi'';
};
packageName = "cl-change-case";
@@ -19,13 +21,13 @@ rec {
}
/* (SYSTEM cl-change-case DESCRIPTION
Convert strings between camelCase, param-case, PascalCase and more SHA256
- 097n7bzlsryqh6gbwn3nzi9qdw4jhck4vn3qw41zpc496xfgz9y1 URL
- http://beta.quicklisp.org/archive/cl-change-case/2019-10-07/cl-change-case-20191007-git.tgz
- MD5 385245df04b1f1514b9fd709a08c4082 NAME cl-change-case FILENAME
+ 15x8zxwa3pxs02fh0qxmbvz6vi59x6ha09p5hs4rgd6axs0k4pmi URL
+ http://beta.quicklisp.org/archive/cl-change-case/2021-02-28/cl-change-case-20210228-git.tgz
+ MD5 8fec07f0634a739134dc4fcec807fe16 NAME cl-change-case FILENAME
cl-change-case DEPS
((NAME cl-ppcre FILENAME cl-ppcre)
(NAME cl-ppcre-unicode FILENAME cl-ppcre-unicode)
- (NAME cl-unicode FILENAME cl-unicode)
+ (NAME cl-unicode FILENAME cl-unicode) (NAME fiveam FILENAME fiveam)
(NAME flexi-streams FILENAME flexi-streams))
- DEPENDENCIES (cl-ppcre cl-ppcre-unicode cl-unicode flexi-streams) VERSION
- 20191007-git SIBLINGS (cl-change-case-test) PARASITES NIL) */
+ DEPENDENCIES (cl-ppcre cl-ppcre-unicode cl-unicode fiveam flexi-streams)
+ VERSION 20210228-git SIBLINGS NIL PARASITES (cl-change-case/test)) */
diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-cli.nix b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-cli.nix
index cbc4deba6b..36641b73b7 100644
--- a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-cli.nix
+++ b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-cli.nix
@@ -1,15 +1,15 @@
args @ { fetchurl, ... }:
rec {
- baseName = "cl-cli";
- version = "20151218-git";
+ baseName = ''cl-cli'';
+ version = ''20151218-git'';
- description = "Command line parser";
+ description = ''Command line parser'';
deps = [ args."split-sequence" ];
src = fetchurl {
- url = "http://beta.quicklisp.org/archive/cl-cli/2015-12-18/cl-cli-20151218-git.tgz";
- sha256 = "0d097wjprljghkai1yacvjqmjm1mwpa46yxbacjnwps8pqwh18ay";
+ url = ''http://beta.quicklisp.org/archive/cl-cli/2015-12-18/cl-cli-20151218-git.tgz'';
+ sha256 = ''0d097wjprljghkai1yacvjqmjm1mwpa46yxbacjnwps8pqwh18ay'';
};
packageName = "cl-cli";
diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-colors.nix b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-colors.nix
index 8882b1473c..0d0337a65c 100644
--- a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-colors.nix
+++ b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-colors.nix
@@ -1,17 +1,17 @@
args @ { fetchurl, ... }:
rec {
- baseName = "cl-colors";
- version = "20180328-git";
+ baseName = ''cl-colors'';
+ version = ''20180328-git'';
parasites = [ "cl-colors-tests" ];
- description = "Simple color library for Common Lisp";
+ description = ''Simple color library for Common Lisp'';
deps = [ args."alexandria" args."anaphora" args."let-plus" args."lift" ];
src = fetchurl {
- url = "http://beta.quicklisp.org/archive/cl-colors/2018-03-28/cl-colors-20180328-git.tgz";
- sha256 = "0anrb3zsi03dixfsjz92y06w93kpn0d0c5142fhx72f5kafwvc4a";
+ url = ''http://beta.quicklisp.org/archive/cl-colors/2018-03-28/cl-colors-20180328-git.tgz'';
+ sha256 = ''0anrb3zsi03dixfsjz92y06w93kpn0d0c5142fhx72f5kafwvc4a'';
};
packageName = "cl-colors";
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
index 3432660cff..519f43ff32 100644
--- 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
@@ -1,17 +1,17 @@
args @ { fetchurl, ... }:
rec {
- baseName = "cl-colors2";
- version = "20200218-git";
+ baseName = ''cl-colors2'';
+ version = ''20200218-git'';
parasites = [ "cl-colors2/tests" ];
- description = "Simple color library for Common Lisp";
+ 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";
+ url = ''http://beta.quicklisp.org/archive/cl-colors2/2020-02-18/cl-colors2-20200218-git.tgz'';
+ sha256 = ''0rpf8j232qv254zhkvkz3ja20al1kswvcqhvvv0r2ag6dks56j29'';
};
packageName = "cl-colors2";
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 c8dc5ca9a9..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,17 +1,17 @@
args @ { fetchurl, ... }:
rec {
- baseName = "cl-containers";
- version = "20200427-git";
+ baseName = ''cl-containers'';
+ version = ''20200427-git'';
parasites = [ "cl-containers/with-moptilities" "cl-containers/with-utilities" ];
- description = "A generic container library for Common Lisp";
+ description = ''A generic container library for Common Lisp'';
deps = [ args."asdf-system-connections" args."metatilities-base" args."moptilities" ];
src = fetchurl {
- url = "http://beta.quicklisp.org/archive/cl-containers/2020-04-27/cl-containers-20200427-git.tgz";
- sha256 = "0llaymnlss0dhwyqgr2s38w1hjb2as1x1nn57qcvdphnm7qs50fy";
+ url = ''http://beta.quicklisp.org/archive/cl-containers/2020-04-27/cl-containers-20200427-git.tgz'';
+ sha256 = ''0llaymnlss0dhwyqgr2s38w1hjb2as1x1nn57qcvdphnm7qs50fy'';
};
packageName = "cl-containers";
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 f35d40fb41..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
@@ -1,15 +1,15 @@
args @ { fetchurl, ... }:
rec {
- baseName = "cl-cookie";
- version = "20191007-git";
+ baseName = ''cl-cookie'';
+ version = ''20191007-git'';
- description = "HTTP cookie manager";
+ description = ''HTTP cookie manager'';
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";
- sha256 = "1xcb69n3qfp37nwj0mj2whf3yj5xfsgh9sdw6c64gxqkiiq9nfhh";
+ url = ''http://beta.quicklisp.org/archive/cl-cookie/2019-10-07/cl-cookie-20191007-git.tgz'';
+ sha256 = ''1xcb69n3qfp37nwj0mj2whf3yj5xfsgh9sdw6c64gxqkiiq9nfhh'';
};
packageName = "cl-cookie";
diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-css.nix b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-css.nix
index 0d0b2aa1dc..ba295b6e43 100644
--- a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-css.nix
+++ b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-css.nix
@@ -1,15 +1,15 @@
args @ { fetchurl, ... }:
rec {
- baseName = "cl-css";
- version = "20140914-git";
+ baseName = ''cl-css'';
+ version = ''20140914-git'';
- description = "Simple inline CSS generator";
+ description = ''Simple inline CSS generator'';
deps = [ ];
src = fetchurl {
- url = "http://beta.quicklisp.org/archive/cl-css/2014-09-14/cl-css-20140914-git.tgz";
- sha256 = "16zjm10qqyv5v0ysvicbiscplrwlfr0assbf01gp73j1m108rn7n";
+ url = ''http://beta.quicklisp.org/archive/cl-css/2014-09-14/cl-css-20140914-git.tgz'';
+ sha256 = ''16zjm10qqyv5v0ysvicbiscplrwlfr0assbf01gp73j1m108rn7n'';
};
packageName = "cl-css";
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 c9badad400..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 = "20201016-git";
+ baseName = ''cl-csv'';
+ version = ''20201016-git'';
parasites = [ "cl-csv/speed-test" "cl-csv/test" ];
- description = "Facilities for reading and writing CSV format files";
+ 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/2020-10-16/cl-csv-20201016-git.tgz";
- sha256 = "1w12ads26v5sgcmy6rjm6ys9lml7l6rz86w776s2an2maci9kzmf";
+ url = ''http://beta.quicklisp.org/archive/cl-csv/2020-10-16/cl-csv-20201016-git.tgz'';
+ sha256 = ''1w12ads26v5sgcmy6rjm6ys9lml7l6rz86w776s2an2maci9kzmf'';
};
packageName = "cl-csv";
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 8dc68dc36f..a9d6d4cf56 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 = "20200610-git";
+ baseName = ''cl-dbi'';
+ version = ''20210228-git'';
- description = "System lacks description";
+ description = ''System lacks description'';
deps = [ args."alexandria" args."bordeaux-threads" args."closer-mop" args."dbi" args."split-sequence" ];
src = fetchurl {
- url = "http://beta.quicklisp.org/archive/cl-dbi/2020-06-10/cl-dbi-20200610-git.tgz";
- sha256 = "1d7hwywcqzqwmr5b42c0mmjq3v3xxd4cwb4fn5k1wd7j6pr0bkas";
+ url = ''http://beta.quicklisp.org/archive/cl-dbi/2021-02-28/cl-dbi-20210228-git.tgz'';
+ sha256 = ''0yfs7k6samv6q0n1bvscvcck7qg3c4g03qn7i81619q7g2f98jdk'';
};
packageName = "cl-dbi";
@@ -18,13 +18,13 @@ rec {
overrides = x: x;
}
/* (SYSTEM cl-dbi 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 cl-dbi FILENAME cl-dbi DEPS
+ 0yfs7k6samv6q0n1bvscvcck7qg3c4g03qn7i81619q7g2f98jdk URL
+ http://beta.quicklisp.org/archive/cl-dbi/2021-02-28/cl-dbi-20210228-git.tgz
+ MD5 7cfb5ad172bc30906ae32ca620099a1f NAME cl-dbi FILENAME cl-dbi DEPS
((NAME alexandria FILENAME alexandria)
(NAME bordeaux-threads FILENAME bordeaux-threads)
(NAME closer-mop FILENAME closer-mop) (NAME dbi FILENAME dbi)
(NAME split-sequence FILENAME split-sequence))
DEPENDENCIES (alexandria bordeaux-threads closer-mop dbi split-sequence)
- VERSION 20200610-git SIBLINGS
+ VERSION 20210228-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-difflib.nix b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-difflib.nix
new file mode 100644
index 0000000000..8f613d45fe
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-difflib.nix
@@ -0,0 +1,26 @@
+args @ { fetchurl, ... }:
+rec {
+ baseName = ''cl-difflib'';
+ version = ''20130128-git'';
+
+ description = ''A Lisp library for computing differences between sequences.'';
+
+ deps = [ ];
+
+ src = fetchurl {
+ url = ''http://beta.quicklisp.org/archive/cl-difflib/2013-01-28/cl-difflib-20130128-git.tgz'';
+ sha256 = ''1bgb0nmm93x90c7v1q1ah1v5dfm2anhkim7nh88sg7kg50y4ksm6'';
+ };
+
+ packageName = "cl-difflib";
+
+ asdFilesToKeep = ["cl-difflib.asd"];
+ overrides = x: x;
+}
+/* (SYSTEM cl-difflib DESCRIPTION
+ A Lisp library for computing differences between sequences. SHA256
+ 1bgb0nmm93x90c7v1q1ah1v5dfm2anhkim7nh88sg7kg50y4ksm6 URL
+ http://beta.quicklisp.org/archive/cl-difflib/2013-01-28/cl-difflib-20130128-git.tgz
+ MD5 e8a3434843a368373b67d09983d2b809 NAME cl-difflib FILENAME cl-difflib
+ DEPS NIL DEPENDENCIES NIL VERSION 20130128-git SIBLINGS (cl-difflib-tests)
+ 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
index a01f8be353..53cf2214ed 100644
--- 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
@@ -1,15 +1,15 @@
args @ { fetchurl, ... }:
rec {
- baseName = "cl-dot";
- version = "20200925-git";
+ baseName = ''cl-dot'';
+ version = ''20200925-git'';
- description = "Generate Dot Output from Arbitrary Lisp Data";
+ 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";
+ url = ''http://beta.quicklisp.org/archive/cl-dot/2020-09-25/cl-dot-20200925-git.tgz'';
+ sha256 = ''01vx4yzasmgswrlyagjr2cz76g906jsijdwikdf8wvxyyq77gkla'';
};
packageName = "cl-dot";
diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-emb.nix b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-emb.nix
index b78dd2339b..1510495a4c 100644
--- a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-emb.nix
+++ b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-emb.nix
@@ -1,15 +1,15 @@
args @ { fetchurl, ... }:
rec {
- baseName = "cl-emb";
- version = "20190521-git";
+ baseName = ''cl-emb'';
+ version = ''20190521-git'';
- description = "A templating system for Common Lisp";
+ description = ''A templating system for Common Lisp'';
deps = [ args."cl-ppcre" ];
src = fetchurl {
- url = "http://beta.quicklisp.org/archive/cl-emb/2019-05-21/cl-emb-20190521-git.tgz";
- sha256 = "1d6bi2mx1kw7an3maxjp4ldrhkwfdb58va9whxblz2xjlbykdv8d";
+ url = ''http://beta.quicklisp.org/archive/cl-emb/2019-05-21/cl-emb-20190521-git.tgz'';
+ sha256 = ''1d6bi2mx1kw7an3maxjp4ldrhkwfdb58va9whxblz2xjlbykdv8d'';
};
packageName = "cl-emb";
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 28cf369206..6702066b0d 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,17 +1,17 @@
args @ { fetchurl, ... }:
rec {
- baseName = "cl-fad";
- version = "20200610-git";
+ baseName = ''cl-fad'';
+ version = ''20210124-git'';
parasites = [ "cl-fad-test" ];
- description = "Portable pathname library";
+ description = ''Portable pathname library'';
deps = [ args."alexandria" args."bordeaux-threads" args."cl-ppcre" args."unit-test" ];
src = fetchurl {
- url = "http://beta.quicklisp.org/archive/cl-fad/2020-06-10/cl-fad-20200610-git.tgz";
- sha256 = "08d0q2jpjz4djz20w8m86rfkili8g0vdbkkmvn8c88qmvcr79k5x";
+ url = ''http://beta.quicklisp.org/archive/cl-fad/2021-01-24/cl-fad-20210124-git.tgz'';
+ sha256 = ''17vkvkwg4wpyny5x2nsazgpip5nxxahsjngaxjyrj5z15d4lkrm0'';
};
packageName = "cl-fad";
@@ -20,11 +20,11 @@ rec {
overrides = x: x;
}
/* (SYSTEM cl-fad DESCRIPTION Portable pathname library SHA256
- 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
+ 17vkvkwg4wpyny5x2nsazgpip5nxxahsjngaxjyrj5z15d4lkrm0 URL
+ http://beta.quicklisp.org/archive/cl-fad/2021-01-24/cl-fad-20210124-git.tgz
+ MD5 aa8705a0dd8ca1b43d8c76a177efdf74 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
- 20200610-git SIBLINGS NIL PARASITES (cl-fad-test)) */
+ 20210124-git SIBLINGS NIL PARASITES (cl-fad-test)) */
diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-fuse-meta-fs.nix b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-fuse-meta-fs.nix
index bf3c36d62b..6a40d0fa8c 100644
--- a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-fuse-meta-fs.nix
+++ b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-fuse-meta-fs.nix
@@ -1,15 +1,15 @@
args @ { fetchurl, ... }:
rec {
- baseName = "cl-fuse-meta-fs";
- version = "20190710-git";
+ baseName = ''cl-fuse-meta-fs'';
+ version = ''20190710-git'';
- description = "CFFI bindings to FUSE (Filesystem in user space)";
+ 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-fuse" args."cl-utilities" 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/cl-fuse-meta-fs/2019-07-10/cl-fuse-meta-fs-20190710-git.tgz";
- sha256 = "1c2nyxj7q8njxydn4xiagvnb21zhb1l07q7nhfw0qs2qk6dkasq7";
+ url = ''http://beta.quicklisp.org/archive/cl-fuse-meta-fs/2019-07-10/cl-fuse-meta-fs-20190710-git.tgz'';
+ sha256 = ''1c2nyxj7q8njxydn4xiagvnb21zhb1l07q7nhfw0qs2qk6dkasq7'';
};
packageName = "cl-fuse-meta-fs";
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 a2384c0ffa..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 = "20200925-git";
+ baseName = ''cl-fuse'';
+ version = ''20200925-git'';
- description = "CFFI bindings to FUSE (Filesystem in user space)";
+ 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/2020-09-25/cl-fuse-20200925-git.tgz";
- sha256 = "1c5cn0l0md77asw804qssylcbbphw81mfpbijydd0s25q6xga7dp";
+ url = ''http://beta.quicklisp.org/archive/cl-fuse/2020-09-25/cl-fuse-20200925-git.tgz'';
+ sha256 = ''1c5cn0l0md77asw804qssylcbbphw81mfpbijydd0s25q6xga7dp'';
};
packageName = "cl-fuse";
diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-hooks.nix b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-hooks.nix
index f7b7878279..72eafacb19 100644
--- a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-hooks.nix
+++ b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-hooks.nix
@@ -1,7 +1,7 @@
args @ { fetchurl, ... }:
rec {
- baseName = "cl-hooks";
- version = "architecture.hooks-20181210-git";
+ baseName = ''cl-hooks'';
+ version = ''architecture.hooks-20181210-git'';
parasites = [ "cl-hooks/test" ];
@@ -11,8 +11,8 @@ mechanism (as known, e.g., from GNU Emacs).'';
deps = [ args."alexandria" args."anaphora" args."closer-mop" args."fiveam" args."let-plus" args."trivial-garbage" ];
src = fetchurl {
- url = "http://beta.quicklisp.org/archive/architecture.hooks/2018-12-10/architecture.hooks-20181210-git.tgz";
- sha256 = "04l8rjmgsd7i580rpm1wndz1jcvfqrmwllnkh3h7als3azi3q2ns";
+ url = ''http://beta.quicklisp.org/archive/architecture.hooks/2018-12-10/architecture.hooks-20181210-git.tgz'';
+ sha256 = ''04l8rjmgsd7i580rpm1wndz1jcvfqrmwllnkh3h7als3azi3q2ns'';
};
packageName = "cl-hooks";
diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-html-diff.nix b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-html-diff.nix
new file mode 100644
index 0000000000..d94c33156b
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-html-diff.nix
@@ -0,0 +1,25 @@
+args @ { fetchurl, ... }:
+rec {
+ baseName = ''cl-html-diff'';
+ version = ''20130128-git'';
+
+ description = ''System lacks description'';
+
+ deps = [ args."cl-difflib" ];
+
+ src = fetchurl {
+ url = ''http://beta.quicklisp.org/archive/cl-html-diff/2013-01-28/cl-html-diff-20130128-git.tgz'';
+ sha256 = ''0dbqfgfl2qmlk91fncjj804md2crvj0bsvkdxfrsybrhn6dmikci'';
+ };
+
+ packageName = "cl-html-diff";
+
+ asdFilesToKeep = ["cl-html-diff.asd"];
+ overrides = x: x;
+}
+/* (SYSTEM cl-html-diff DESCRIPTION System lacks description SHA256
+ 0dbqfgfl2qmlk91fncjj804md2crvj0bsvkdxfrsybrhn6dmikci URL
+ http://beta.quicklisp.org/archive/cl-html-diff/2013-01-28/cl-html-diff-20130128-git.tgz
+ MD5 70f93e60e968dad9a44ede60856dc343 NAME cl-html-diff FILENAME
+ cl-html-diff DEPS ((NAME cl-difflib FILENAME cl-difflib)) DEPENDENCIES
+ (cl-difflib) VERSION 20130128-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 60cb467f9a..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 = "20200925-git";
+ baseName = ''cl-html-parse'';
+ version = ''20200925-git'';
- description = "HTML Parser";
+ description = ''HTML Parser'';
deps = [ ];
src = fetchurl {
- url = "http://beta.quicklisp.org/archive/cl-html-parse/2020-09-25/cl-html-parse-20200925-git.tgz";
- sha256 = "14pfd4gwjb8ywr79dqrcznw6h8a1il3g5b6cm5x9aiyr49zdv15f";
+ url = ''http://beta.quicklisp.org/archive/cl-html-parse/2020-09-25/cl-html-parse-20200925-git.tgz'';
+ sha256 = ''14pfd4gwjb8ywr79dqrcznw6h8a1il3g5b6cm5x9aiyr49zdv15f'';
};
packageName = "cl-html-parse";
diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-html5-parser.nix b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-html5-parser.nix
index 64a8776381..dde2cc31dd 100644
--- a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-html5-parser.nix
+++ b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-html5-parser.nix
@@ -1,15 +1,15 @@
args @ { fetchurl, ... }:
rec {
- baseName = "cl-html5-parser";
- version = "20190521-git";
+ baseName = ''cl-html5-parser'';
+ version = ''20190521-git'';
- description = "A HTML5 parser for Common Lisp";
+ description = ''A HTML5 parser for Common Lisp'';
deps = [ args."cl-ppcre" args."flexi-streams" args."string-case" args."trivial-gray-streams" ];
src = fetchurl {
- url = "http://beta.quicklisp.org/archive/cl-html5-parser/2019-05-21/cl-html5-parser-20190521-git.tgz";
- sha256 = "055jz0yqgjncvy2dxvnwg4iwdvmfsvkch46v58nymz5gi8gaaz7p";
+ url = ''http://beta.quicklisp.org/archive/cl-html5-parser/2019-05-21/cl-html5-parser-20190521-git.tgz'';
+ sha256 = ''055jz0yqgjncvy2dxvnwg4iwdvmfsvkch46v58nymz5gi8gaaz7p'';
};
packageName = "cl-html5-parser";
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 8719adf631..db5c229994 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,17 +1,17 @@
args @ { fetchurl, ... }:
rec {
- baseName = "cl-interpol";
- version = "20200715-git";
+ baseName = ''cl-interpol'';
+ version = ''20201220-git'';
parasites = [ "cl-interpol-test" ];
- description = "System lacks description";
+ description = ''System lacks description'';
deps = [ args."cl-ppcre" args."cl-unicode" args."flexi-streams" args."named-readtables" ];
src = fetchurl {
- url = "http://beta.quicklisp.org/archive/cl-interpol/2020-07-15/cl-interpol-20200715-git.tgz";
- sha256 = "0qbmpgnlg9y6ykwahmw1q8b058krmcq47w3gx75xz920im46wvmw";
+ url = ''http://beta.quicklisp.org/archive/cl-interpol/2020-12-20/cl-interpol-20201220-git.tgz'';
+ sha256 = ''1q3zxsbl5br08lv481jsqmq8r9yayp44x6icixcxx5sdz6fbcd3d'';
};
packageName = "cl-interpol";
@@ -20,12 +20,12 @@ rec {
overrides = x: x;
}
/* (SYSTEM cl-interpol DESCRIPTION System lacks description SHA256
- 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
+ 1q3zxsbl5br08lv481jsqmq8r9yayp44x6icixcxx5sdz6fbcd3d URL
+ http://beta.quicklisp.org/archive/cl-interpol/2020-12-20/cl-interpol-20201220-git.tgz
+ MD5 d678c521474e1774185b78883396da49 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
- 20200715-git SIBLINGS NIL PARASITES (cl-interpol-test)) */
+ 20201220-git SIBLINGS NIL PARASITES (cl-interpol-test)) */
diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-jpeg.nix b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-jpeg.nix
index 1f9fdc420f..713aff0ea4 100644
--- a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-jpeg.nix
+++ b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-jpeg.nix
@@ -1,15 +1,15 @@
args @ { fetchurl, ... }:
rec {
- baseName = "cl-jpeg";
- version = "20170630-git";
+ baseName = ''cl-jpeg'';
+ version = ''20170630-git'';
- description = "A self-contained baseline JPEG codec implementation";
+ description = ''A self-contained baseline JPEG codec implementation'';
deps = [ ];
src = fetchurl {
- url = "http://beta.quicklisp.org/archive/cl-jpeg/2017-06-30/cl-jpeg-20170630-git.tgz";
- sha256 = "1wwzn2valhh5ka7qkmab59pb1ijagcj296553fp8z03migl0sil0";
+ url = ''http://beta.quicklisp.org/archive/cl-jpeg/2017-06-30/cl-jpeg-20170630-git.tgz'';
+ sha256 = ''1wwzn2valhh5ka7qkmab59pb1ijagcj296553fp8z03migl0sil0'';
};
packageName = "cl-jpeg";
diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-json.nix b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-json.nix
index 00f8b90e48..d8bc535f35 100644
--- a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-json.nix
+++ b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-json.nix
@@ -1,17 +1,17 @@
args @ { fetchurl, ... }:
rec {
- baseName = "cl-json";
- version = "20141217-git";
+ baseName = ''cl-json'';
+ version = ''20141217-git'';
parasites = [ "cl-json.test" ];
- description = "JSON in Lisp. JSON (JavaScript Object Notation) is a lightweight data-interchange format.";
+ description = ''JSON in Lisp. JSON (JavaScript Object Notation) is a lightweight data-interchange format.'';
deps = [ args."fiveam" ];
src = fetchurl {
- url = "http://beta.quicklisp.org/archive/cl-json/2014-12-17/cl-json-20141217-git.tgz";
- sha256 = "00cfppyi6njsbpv1x03jcv4zwplg0q1138174l3wjkvi3gsql17g";
+ url = ''http://beta.quicklisp.org/archive/cl-json/2014-12-17/cl-json-20141217-git.tgz'';
+ sha256 = ''00cfppyi6njsbpv1x03jcv4zwplg0q1138174l3wjkvi3gsql17g'';
};
packageName = "cl-json";
diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-l10n-cldr.nix b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-l10n-cldr.nix
index 3162edc386..dfabda0428 100644
--- a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-l10n-cldr.nix
+++ b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-l10n-cldr.nix
@@ -1,15 +1,15 @@
args @ { fetchurl, ... }:
rec {
- baseName = "cl-l10n-cldr";
- version = "20120909-darcs";
+ baseName = ''cl-l10n-cldr'';
+ version = ''20120909-darcs'';
- description = "The necessary CLDR files for cl-l10n packaged in a QuickLisp friendly way.";
+ description = ''The necessary CLDR files for cl-l10n packaged in a QuickLisp friendly way.'';
deps = [ ];
src = fetchurl {
- url = "http://beta.quicklisp.org/archive/cl-l10n-cldr/2012-09-09/cl-l10n-cldr-20120909-darcs.tgz";
- sha256 = "03l81bx8izvzwzw0qah34l4k47l4gmhr917phhhl81qp55x7zbiv";
+ url = ''http://beta.quicklisp.org/archive/cl-l10n-cldr/2012-09-09/cl-l10n-cldr-20120909-darcs.tgz'';
+ sha256 = ''03l81bx8izvzwzw0qah34l4k47l4gmhr917phhhl81qp55x7zbiv'';
};
packageName = "cl-l10n-cldr";
diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-l10n.nix b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-l10n.nix
index 61c37acb82..f37e653bc5 100644
--- a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-l10n.nix
+++ b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-l10n.nix
@@ -1,17 +1,17 @@
args @ { fetchurl, ... }:
rec {
- baseName = "cl-l10n";
- version = "20161204-darcs";
+ baseName = ''cl-l10n'';
+ version = ''20161204-darcs'';
parasites = [ "cl-l10n/test" ];
- description = "Portable CL Locale Support";
+ description = ''Portable CL Locale Support'';
deps = [ args."alexandria" args."babel" args."bordeaux-threads" args."cl-fad" args."cl-l10n-cldr" args."cl-ppcre" args."closer-mop" args."closure-common" args."cxml" args."flexi-streams" args."hu_dot_dwim_dot_stefil" args."iterate" args."local-time" args."metabang-bind" args."parse-number" args."puri" args."trivial-features" args."trivial-gray-streams" ];
src = fetchurl {
- url = "http://beta.quicklisp.org/archive/cl-l10n/2016-12-04/cl-l10n-20161204-darcs.tgz";
- sha256 = "1r8jgwks21az78c5kdxgw5llk9ml423vjkv1f93qg1vx3zma6vzl";
+ url = ''http://beta.quicklisp.org/archive/cl-l10n/2016-12-04/cl-l10n-20161204-darcs.tgz'';
+ sha256 = ''1r8jgwks21az78c5kdxgw5llk9ml423vjkv1f93qg1vx3zma6vzl'';
};
packageName = "cl-l10n";
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 7c3f1b7c06..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 = "20200610-git";
+ baseName = ''cl-libuv'';
+ version = ''20200610-git'';
- description = "Low-level libuv bindings for Common Lisp.";
+ 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/2020-06-10/cl-libuv-20200610-git.tgz";
- sha256 = "1ywk1z1ibyk3z0irg5azjrjk3x08ixv30fx4qa0p500fmbfhha19";
+ url = ''http://beta.quicklisp.org/archive/cl-libuv/2020-06-10/cl-libuv-20200610-git.tgz'';
+ sha256 = ''1ywk1z1ibyk3z0irg5azjrjk3x08ixv30fx4qa0p500fmbfhha19'';
};
packageName = "cl-libuv";
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
index 656cb70463..f0d727a633 100644
--- 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
@@ -1,15 +1,15 @@
args @ { fetchurl, ... }:
rec {
- baseName = "cl-locale";
- version = "20151031-git";
+ baseName = ''cl-locale'';
+ version = ''20151031-git'';
- description = "Simple i18n library for Common Lisp";
+ 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";
+ url = ''http://beta.quicklisp.org/archive/cl-locale/2015-10-31/cl-locale-20151031-git.tgz'';
+ sha256 = ''14j4xazrx2v5cj4q4irfwra0ksvl2l0s7073fimpwc0xqjfsnjpg'';
};
packageName = "cl-locale";
diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-markup.nix b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-markup.nix
index 56853f0dfc..b1916c27bf 100644
--- a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-markup.nix
+++ b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-markup.nix
@@ -1,15 +1,15 @@
args @ { fetchurl, ... }:
rec {
- baseName = "cl-markup";
- version = "20131003-git";
+ baseName = ''cl-markup'';
+ version = ''20131003-git'';
- description = "System lacks description";
+ description = ''System lacks description'';
deps = [ ];
src = fetchurl {
- url = "http://beta.quicklisp.org/archive/cl-markup/2013-10-03/cl-markup-20131003-git.tgz";
- sha256 = "1ik3a5k6axq941zbf6zyig553i5gnypbcxdq9l7bfxp8w18vbj0r";
+ url = ''http://beta.quicklisp.org/archive/cl-markup/2013-10-03/cl-markup-20131003-git.tgz'';
+ sha256 = ''1ik3a5k6axq941zbf6zyig553i5gnypbcxdq9l7bfxp8w18vbj0r'';
};
packageName = "cl-markup";
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 c2ede1ee6e..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 = "20200610-git";
+ baseName = ''cl-mysql'';
+ version = ''20200610-git'';
- description = "Common Lisp MySQL library bindings";
+ 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/2020-06-10/cl-mysql-20200610-git.tgz";
- sha256 = "0fzyqzz01zn9fy8v766lib3dghg9yq5wawa0hcmxslms7knzxz7w";
+ url = ''http://beta.quicklisp.org/archive/cl-mysql/2020-06-10/cl-mysql-20200610-git.tgz'';
+ sha256 = ''0fzyqzz01zn9fy8v766lib3dghg9yq5wawa0hcmxslms7knzxz7w'';
};
packageName = "cl-mysql";
diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-paths-ttf.nix b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-paths-ttf.nix
index 249a54ed0f..cfca59e3b5 100644
--- a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-paths-ttf.nix
+++ b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-paths-ttf.nix
@@ -1,15 +1,15 @@
args @ { fetchurl, ... }:
rec {
- baseName = "cl-paths-ttf";
- version = "cl-vectors-20180228-git";
+ baseName = ''cl-paths-ttf'';
+ version = ''cl-vectors-20180228-git'';
- description = "cl-paths-ttf: vectorial paths manipulation";
+ description = ''cl-paths-ttf: vectorial paths manipulation'';
deps = [ args."cl-paths" args."zpb-ttf" ];
src = fetchurl {
- url = "http://beta.quicklisp.org/archive/cl-vectors/2018-02-28/cl-vectors-20180228-git.tgz";
- sha256 = "0fcypjfzqra8ryb4nx1vx1fqy7fwvyz3f443qkjg2z81akhkscly";
+ url = ''http://beta.quicklisp.org/archive/cl-vectors/2018-02-28/cl-vectors-20180228-git.tgz'';
+ sha256 = ''0fcypjfzqra8ryb4nx1vx1fqy7fwvyz3f443qkjg2z81akhkscly'';
};
packageName = "cl-paths-ttf";
diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-paths.nix b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-paths.nix
index 9f7fc95a91..e8034b11c2 100644
--- a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-paths.nix
+++ b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-paths.nix
@@ -1,15 +1,15 @@
args @ { fetchurl, ... }:
rec {
- baseName = "cl-paths";
- version = "cl-vectors-20180228-git";
+ baseName = ''cl-paths'';
+ version = ''cl-vectors-20180228-git'';
- description = "cl-paths: vectorial paths manipulation";
+ description = ''cl-paths: vectorial paths manipulation'';
deps = [ ];
src = fetchurl {
- url = "http://beta.quicklisp.org/archive/cl-vectors/2018-02-28/cl-vectors-20180228-git.tgz";
- sha256 = "0fcypjfzqra8ryb4nx1vx1fqy7fwvyz3f443qkjg2z81akhkscly";
+ url = ''http://beta.quicklisp.org/archive/cl-vectors/2018-02-28/cl-vectors-20180228-git.tgz'';
+ sha256 = ''0fcypjfzqra8ryb4nx1vx1fqy7fwvyz3f443qkjg2z81akhkscly'';
};
packageName = "cl-paths";
diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-pdf.nix b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-pdf.nix
index 35deef0c2a..ba3c81b10f 100644
--- a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-pdf.nix
+++ b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-pdf.nix
@@ -1,15 +1,15 @@
args @ { fetchurl, ... }:
rec {
- baseName = "cl-pdf";
- version = "20191007-git";
+ baseName = ''cl-pdf'';
+ version = ''20210228-git'';
- description = "Common Lisp PDF Generation Library";
+ description = ''Common Lisp PDF Generation Library'';
deps = [ args."iterate" args."uiop" args."zpb-ttf" ];
src = fetchurl {
- url = "http://beta.quicklisp.org/archive/cl-pdf/2019-10-07/cl-pdf-20191007-git.tgz";
- sha256 = "0l0hnxysy7dc4wj50nfwn8x7v188vaxvsvk8kl92zb92lfzgw7cd";
+ url = ''http://beta.quicklisp.org/archive/cl-pdf/2021-02-28/cl-pdf-20210228-git.tgz'';
+ sha256 = ''1m1nq91p49gfc9iccja2wbhglrv0mgzhqvliss7jr0j6icv66x3y'';
};
packageName = "cl-pdf";
@@ -18,10 +18,10 @@ rec {
overrides = x: x;
}
/* (SYSTEM cl-pdf DESCRIPTION Common Lisp PDF Generation Library SHA256
- 0l0hnxysy7dc4wj50nfwn8x7v188vaxvsvk8kl92zb92lfzgw7cd URL
- http://beta.quicklisp.org/archive/cl-pdf/2019-10-07/cl-pdf-20191007-git.tgz
- MD5 edde2f2da08ec10be65364737ed5fa5c NAME cl-pdf FILENAME cl-pdf DEPS
+ 1m1nq91p49gfc9iccja2wbhglrv0mgzhqvliss7jr0j6icv66x3y URL
+ http://beta.quicklisp.org/archive/cl-pdf/2021-02-28/cl-pdf-20210228-git.tgz
+ MD5 a0eae40821642fc5287b67bf462b54d9 NAME cl-pdf FILENAME cl-pdf DEPS
((NAME iterate FILENAME iterate) (NAME uiop FILENAME uiop)
(NAME zpb-ttf FILENAME zpb-ttf))
- DEPENDENCIES (iterate uiop zpb-ttf) VERSION 20191007-git SIBLINGS
+ DEPENDENCIES (iterate uiop zpb-ttf) VERSION 20210228-git SIBLINGS
(cl-pdf-parser) 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 f26326f307..44af87a6d9 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-20201016-git";
+ baseName = ''cl-postgres'';
+ version = ''postmodern-20210124-git'';
parasites = [ "cl-postgres/simple-date-tests" "cl-postgres/tests" ];
- description = "Low-level client library for PostgreSQL";
+ description = ''Low-level client library for PostgreSQL'';
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/2020-10-16/postmodern-20201016-git.tgz";
- sha256 = "1svaiksbqcaq8sh7q6sj9kzazdfl360zqr2nzhwbgy4xnaj4vf3n";
+ url = ''http://beta.quicklisp.org/archive/postmodern/2021-01-24/postmodern-20210124-git.tgz'';
+ sha256 = ''1fl103fga5iq2gf1p15xvbrmmjrcv2bbi3lz1zv32j6smy5aymhc'';
};
packageName = "cl-postgres";
@@ -20,9 +20,9 @@ rec {
overrides = x: x;
}
/* (SYSTEM cl-postgres DESCRIPTION Low-level client library for PostgreSQL
- SHA256 1svaiksbqcaq8sh7q6sj9kzazdfl360zqr2nzhwbgy4xnaj4vf3n URL
- http://beta.quicklisp.org/archive/postmodern/2020-10-16/postmodern-20201016-git.tgz
- MD5 f61e827d7e7ba023f6fbc7c2667de4c8 NAME cl-postgres FILENAME cl-postgres
+ SHA256 1fl103fga5iq2gf1p15xvbrmmjrcv2bbi3lz1zv32j6smy5aymhc URL
+ http://beta.quicklisp.org/archive/postmodern/2021-01-24/postmodern-20210124-git.tgz
+ MD5 05c2c5f4d2354a5fa69a32b7b96f8ff8 NAME cl-postgres FILENAME cl-postgres
DEPS
((NAME alexandria FILENAME alexandria)
(NAME bordeaux-threads FILENAME bordeaux-threads)
@@ -35,5 +35,5 @@ rec {
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)
+ VERSION postmodern-20210124-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-postgres_plus_local-time.nix b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-postgres_plus_local-time.nix
new file mode 100644
index 0000000000..d85ab33f06
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-postgres_plus_local-time.nix
@@ -0,0 +1,36 @@
+args @ { fetchurl, ... }:
+rec {
+ baseName = ''cl-postgres_plus_local-time'';
+ version = ''local-time-20210124-git'';
+
+ description = ''Integration between cl-postgres and local-time'';
+
+ deps = [ args."alexandria" args."bordeaux-threads" args."cl-base64" args."cl-postgres" args."cl-ppcre" args."ironclad" args."local-time" args."md5" args."split-sequence" args."uax-15" args."usocket" ];
+
+ src = fetchurl {
+ url = ''http://beta.quicklisp.org/archive/local-time/2021-01-24/local-time-20210124-git.tgz'';
+ sha256 = ''0bz5z0rd8gfd22bpqkalaijxlrk806zc010cvgd4qjapbrxzjg3s'';
+ };
+
+ packageName = "cl-postgres+local-time";
+
+ asdFilesToKeep = ["cl-postgres+local-time.asd"];
+ overrides = x: x;
+}
+/* (SYSTEM cl-postgres+local-time DESCRIPTION
+ Integration between cl-postgres and local-time SHA256
+ 0bz5z0rd8gfd22bpqkalaijxlrk806zc010cvgd4qjapbrxzjg3s URL
+ http://beta.quicklisp.org/archive/local-time/2021-01-24/local-time-20210124-git.tgz
+ MD5 631d67bc84ae838792717b256f2cdbaf NAME cl-postgres+local-time FILENAME
+ cl-postgres_plus_local-time 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-ppcre FILENAME cl-ppcre)
+ (NAME ironclad FILENAME ironclad) (NAME local-time FILENAME local-time)
+ (NAME md5 FILENAME md5) (NAME split-sequence FILENAME split-sequence)
+ (NAME uax-15 FILENAME uax-15) (NAME usocket FILENAME usocket))
+ DEPENDENCIES
+ (alexandria bordeaux-threads cl-base64 cl-postgres cl-ppcre ironclad
+ local-time md5 split-sequence uax-15 usocket)
+ VERSION local-time-20210124-git SIBLINGS (local-time) PARASITES NIL) */
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 f681b384b5..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-20200925-git";
+ baseName = ''cl-ppcre-template'';
+ 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/2020-09-25/cl-unification-20200925-git.tgz";
- sha256 = "05i1bmbabfgym9v28cbl37yr0r1m4a4k4a844z6wlq6qf45vzais";
+ url = ''http://beta.quicklisp.org/archive/cl-unification/2020-09-25/cl-unification-20200925-git.tgz'';
+ sha256 = ''05i1bmbabfgym9v28cbl37yr0r1m4a4k4a844z6wlq6qf45vzais'';
};
packageName = "cl-ppcre-template";
diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-ppcre-unicode.nix b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-ppcre-unicode.nix
index 8002137e77..27887f1249 100644
--- a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-ppcre-unicode.nix
+++ b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-ppcre-unicode.nix
@@ -1,17 +1,17 @@
args @ { fetchurl, ... }:
rec {
- baseName = "cl-ppcre-unicode";
- version = "cl-ppcre-20190521-git";
+ baseName = ''cl-ppcre-unicode'';
+ version = ''cl-ppcre-20190521-git'';
parasites = [ "cl-ppcre-unicode-test" ];
- description = "Perl-compatible regular expression library (Unicode)";
+ description = ''Perl-compatible regular expression library (Unicode)'';
deps = [ args."cl-ppcre" args."cl-ppcre-test" args."cl-unicode" args."flexi-streams" ];
src = fetchurl {
- url = "http://beta.quicklisp.org/archive/cl-ppcre/2019-05-21/cl-ppcre-20190521-git.tgz";
- sha256 = "0p6jcvf9afnsg80a1zqsp7fyz0lf1fxzbin7rs9bl4i6jvm0hjqx";
+ url = ''http://beta.quicklisp.org/archive/cl-ppcre/2019-05-21/cl-ppcre-20190521-git.tgz'';
+ sha256 = ''0p6jcvf9afnsg80a1zqsp7fyz0lf1fxzbin7rs9bl4i6jvm0hjqx'';
};
packageName = "cl-ppcre-unicode";
diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-ppcre.nix b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-ppcre.nix
index 3d038b19dc..8bb8fb2478 100644
--- a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-ppcre.nix
+++ b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-ppcre.nix
@@ -1,17 +1,17 @@
args @ { fetchurl, ... }:
rec {
- baseName = "cl-ppcre";
- version = "20190521-git";
+ baseName = ''cl-ppcre'';
+ version = ''20190521-git'';
parasites = [ "cl-ppcre-test" ];
- description = "Perl-compatible regular expression library";
+ description = ''Perl-compatible regular expression library'';
deps = [ args."flexi-streams" ];
src = fetchurl {
- url = "http://beta.quicklisp.org/archive/cl-ppcre/2019-05-21/cl-ppcre-20190521-git.tgz";
- sha256 = "0p6jcvf9afnsg80a1zqsp7fyz0lf1fxzbin7rs9bl4i6jvm0hjqx";
+ url = ''http://beta.quicklisp.org/archive/cl-ppcre/2019-05-21/cl-ppcre-20190521-git.tgz'';
+ sha256 = ''0p6jcvf9afnsg80a1zqsp7fyz0lf1fxzbin7rs9bl4i6jvm0hjqx'';
};
packageName = "cl-ppcre";
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 3fa35243c2..0c31c570b6 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 = "20200715-git";
+ baseName = ''cl-prevalence'';
+ version = ''20210228-git'';
- description = "Common Lisp Prevalence Package";
+ description = ''Common Lisp Prevalence Package'';
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/2020-07-15/cl-prevalence-20200715-git.tgz";
- sha256 = "1m2wrqnly9i35kjk2wydwywjmwkbh3a3f4ds7wl63q8kpn8g0ibd";
+ url = ''http://beta.quicklisp.org/archive/cl-prevalence/2021-02-28/cl-prevalence-20210228-git.tgz'';
+ sha256 = ''0irx60xa7ivlnjg1qzhl7x5sgdjqk53nrx0nji29q639h71czfpl'';
};
packageName = "cl-prevalence";
@@ -18,9 +18,9 @@ rec {
overrides = x: x;
}
/* (SYSTEM cl-prevalence DESCRIPTION Common Lisp Prevalence Package SHA256
- 1m2wrqnly9i35kjk2wydwywjmwkbh3a3f4ds7wl63q8kpn8g0ibd URL
- http://beta.quicklisp.org/archive/cl-prevalence/2020-07-15/cl-prevalence-20200715-git.tgz
- MD5 d01b70db724ac8408b072ac39bbd8837 NAME cl-prevalence FILENAME
+ 0irx60xa7ivlnjg1qzhl7x5sgdjqk53nrx0nji29q639h71czfpl URL
+ http://beta.quicklisp.org/archive/cl-prevalence/2021-02-28/cl-prevalence-20210228-git.tgz
+ MD5 d67c661693637b837ef7f6b1d4d47f9f NAME cl-prevalence FILENAME
cl-prevalence DEPS
((NAME alexandria FILENAME alexandria)
(NAME bordeaux-threads FILENAME bordeaux-threads)
@@ -31,4 +31,4 @@ rec {
DEPENDENCIES
(alexandria bordeaux-threads s-sysdeps s-xml split-sequence usocket
usocket-server)
- VERSION 20200715-git SIBLINGS (cl-prevalence-test) PARASITES NIL) */
+ VERSION 20210228-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 55edc3cf12..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 = "20200715-git";
+ baseName = ''cl-project'';
+ version = ''20200715-git'';
- description = "Generate a skeleton for modern project";
+ description = ''Generate a skeleton for modern project'';
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/2020-07-15/cl-project-20200715-git.tgz";
- sha256 = "044rx97wc839a8q2wv271s07bnsasl6x5fx4gr5pvy34jbrhp306";
+ url = ''http://beta.quicklisp.org/archive/cl-project/2020-07-15/cl-project-20200715-git.tgz'';
+ sha256 = ''044rx97wc839a8q2wv271s07bnsasl6x5fx4gr5pvy34jbrhp306'';
};
packageName = "cl-project";
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 fdbb48c375..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 = "20200325-git";
+ baseName = ''cl-protobufs'';
+ version = ''20200325-git'';
- description = "Protobufs for Common Lisp";
+ 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/2020-03-25/cl-protobufs-20200325-git.tgz";
- sha256 = "1sgvp038bvd3mq2f0xh4wawf8h21jmw449yjyahidh1zfqdibpin";
+ url = ''http://beta.quicklisp.org/archive/cl-protobufs/2020-03-25/cl-protobufs-20200325-git.tgz'';
+ sha256 = ''1sgvp038bvd3mq2f0xh4wawf8h21jmw449yjyahidh1zfqdibpin'';
};
packageName = "cl-protobufs";
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
index 72f7d85bc2..1ccf6af5cb 100644
--- 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
@@ -1,15 +1,15 @@
args @ { fetchurl, ... }:
rec {
- baseName = "cl-qprint";
- version = "20150804-git";
+ baseName = ''cl-qprint'';
+ version = ''20150804-git'';
- description = "Encode and decode quoted-printable encoded strings.";
+ 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";
+ url = ''http://beta.quicklisp.org/archive/cl-qprint/2015-08-04/cl-qprint-20150804-git.tgz'';
+ sha256 = ''042nq9airkc4yaqzpmly5iszmkbwfn38wsgi9k361ldf1y54lq28'';
};
packageName = "cl-qprint";
diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-reexport.nix b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-reexport.nix
index a4ada8ee9e..d323844346 100644
--- a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-reexport.nix
+++ b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-reexport.nix
@@ -1,15 +1,15 @@
args @ { fetchurl, ... }:
rec {
- baseName = "cl-reexport";
- version = "20150709-git";
+ baseName = ''cl-reexport'';
+ version = ''20210228-git'';
- description = "Reexport external symbols in other packages.";
+ description = ''Reexport external symbols in other packages.'';
deps = [ args."alexandria" ];
src = fetchurl {
- url = "http://beta.quicklisp.org/archive/cl-reexport/2015-07-09/cl-reexport-20150709-git.tgz";
- sha256 = "1y6qlyps7g0wl4rbmzvw6s1kjdwwmh33layyjclsjp9j5nm8mdmi";
+ url = ''http://beta.quicklisp.org/archive/cl-reexport/2021-02-28/cl-reexport-20210228-git.tgz'';
+ sha256 = ''1ay0ng5nnbq200g4wxs0h7byx24za4yk208nhfsmksahk5qj1qra'';
};
packageName = "cl-reexport";
@@ -18,8 +18,8 @@ rec {
overrides = x: x;
}
/* (SYSTEM cl-reexport DESCRIPTION Reexport external symbols in other packages.
- SHA256 1y6qlyps7g0wl4rbmzvw6s1kjdwwmh33layyjclsjp9j5nm8mdmi URL
- http://beta.quicklisp.org/archive/cl-reexport/2015-07-09/cl-reexport-20150709-git.tgz
- MD5 207d02771cbd906d033ff704ca5c3a3d NAME cl-reexport FILENAME cl-reexport
+ SHA256 1ay0ng5nnbq200g4wxs0h7byx24za4yk208nhfsmksahk5qj1qra URL
+ http://beta.quicklisp.org/archive/cl-reexport/2021-02-28/cl-reexport-20210228-git.tgz
+ MD5 e083a9c49fe39d65f1ff7743eebe37c2 NAME cl-reexport FILENAME cl-reexport
DEPS ((NAME alexandria FILENAME alexandria)) DEPENDENCIES (alexandria)
- VERSION 20150709-git SIBLINGS (cl-reexport-test) PARASITES NIL) */
+ VERSION 20210228-git SIBLINGS (cl-reexport-test) 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
index 464cddbd5f..2c4fd03f94 100644
--- 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
@@ -1,17 +1,17 @@
args @ { fetchurl, ... }:
rec {
- baseName = "cl-slice";
- version = "20171130-git";
+ baseName = ''cl-slice'';
+ version = ''20171130-git'';
parasites = [ "cl-slice-tests" ];
- description = "DSL for array slices in Common Lisp.";
+ 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";
+ url = ''http://beta.quicklisp.org/archive/cl-slice/2017-11-30/cl-slice-20171130-git.tgz'';
+ sha256 = ''0nay95qsnck40kdxjgjdii5rcgrdhf880pg9ajmbxilgw84xb2zn'';
};
packageName = "cl-slice";
diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-smtp.nix b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-smtp.nix
index 58957c7826..d702c467c0 100644
--- a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-smtp.nix
+++ b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-smtp.nix
@@ -1,15 +1,15 @@
args @ { fetchurl, ... }:
rec {
- baseName = "cl-smtp";
- version = "20191130-git";
+ baseName = ''cl-smtp'';
+ version = ''20210228-git'';
- description = "Common Lisp smtp client.";
+ description = ''Common Lisp smtp client.'';
deps = [ args."alexandria" args."babel" args."bordeaux-threads" args."cffi" args."cl_plus_ssl" args."cl-base64" args."flexi-streams" args."split-sequence" args."trivial-features" args."trivial-garbage" args."trivial-gray-streams" args."usocket" ];
src = fetchurl {
- url = "http://beta.quicklisp.org/archive/cl-smtp/2019-11-30/cl-smtp-20191130-git.tgz";
- sha256 = "04x1xq1qlsnhl4wdi82l8ds6rl9rzxk72bjf2ja10jay1p6ljvdq";
+ url = ''http://beta.quicklisp.org/archive/cl-smtp/2021-02-28/cl-smtp-20210228-git.tgz'';
+ sha256 = ''1x965jyhifx8hss2v6qc6lr54nlckchs712dny376krwkl43jh5g'';
};
packageName = "cl-smtp";
@@ -18,9 +18,9 @@ rec {
overrides = x: x;
}
/* (SYSTEM cl-smtp DESCRIPTION Common Lisp smtp client. SHA256
- 04x1xq1qlsnhl4wdi82l8ds6rl9rzxk72bjf2ja10jay1p6ljvdq URL
- http://beta.quicklisp.org/archive/cl-smtp/2019-11-30/cl-smtp-20191130-git.tgz
- MD5 880f09b9fd22e358d1b94a3caf3bd34b NAME cl-smtp FILENAME cl-smtp DEPS
+ 1x965jyhifx8hss2v6qc6lr54nlckchs712dny376krwkl43jh5g URL
+ http://beta.quicklisp.org/archive/cl-smtp/2021-02-28/cl-smtp-20210228-git.tgz
+ MD5 e2f9137807f80514e0433bf2e8522ee5 NAME cl-smtp FILENAME cl-smtp DEPS
((NAME alexandria FILENAME alexandria) (NAME babel FILENAME babel)
(NAME bordeaux-threads FILENAME bordeaux-threads)
(NAME cffi FILENAME cffi) (NAME cl+ssl FILENAME cl_plus_ssl)
@@ -35,4 +35,4 @@ rec {
(alexandria babel bordeaux-threads cffi cl+ssl cl-base64 flexi-streams
split-sequence trivial-features trivial-garbage trivial-gray-streams
usocket)
- VERSION 20191130-git SIBLINGS NIL PARASITES NIL) */
+ VERSION 20210228-git SIBLINGS NIL PARASITES NIL) */
diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-speedy-queue.nix b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-speedy-queue.nix
new file mode 100644
index 0000000000..f953573797
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-speedy-queue.nix
@@ -0,0 +1,26 @@
+args @ { fetchurl, ... }:
+rec {
+ baseName = ''cl-speedy-queue'';
+ version = ''20150302-git'';
+
+ description = ''cl-speedy-queue is a portable, non-consing, optimized queue implementation.'';
+
+ deps = [ ];
+
+ src = fetchurl {
+ url = ''http://beta.quicklisp.org/archive/cl-speedy-queue/2015-03-02/cl-speedy-queue-20150302-git.tgz'';
+ sha256 = ''1w83vckk0ldr61vpkwg4i8l2b2yx54cs4ak62j4lxhshax105rqr'';
+ };
+
+ packageName = "cl-speedy-queue";
+
+ asdFilesToKeep = ["cl-speedy-queue.asd"];
+ overrides = x: x;
+}
+/* (SYSTEM cl-speedy-queue DESCRIPTION
+ cl-speedy-queue is a portable, non-consing, optimized queue implementation.
+ SHA256 1w83vckk0ldr61vpkwg4i8l2b2yx54cs4ak62j4lxhshax105rqr URL
+ http://beta.quicklisp.org/archive/cl-speedy-queue/2015-03-02/cl-speedy-queue-20150302-git.tgz
+ MD5 509d1acf7e4cfcef99127de75b16521f NAME cl-speedy-queue FILENAME
+ cl-speedy-queue DEPS NIL DEPENDENCIES NIL VERSION 20150302-git SIBLINGS NIL
+ PARASITES NIL) */
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 f7571c4bfc..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,17 +1,17 @@
args @ { fetchurl, ... }:
rec {
- baseName = "cl-store";
- version = "20200925-git";
+ baseName = ''cl-store'';
+ version = ''20200925-git'';
parasites = [ "cl-store-tests" ];
- description = "Serialization package";
+ description = ''Serialization package'';
deps = [ args."rt" ];
src = fetchurl {
- url = "http://beta.quicklisp.org/archive/cl-store/2020-09-25/cl-store-20200925-git.tgz";
- sha256 = "0vqlrci1634jgfg6c1dzwvx58qjjwbcbwdbpm7xxw2s823xl9jf3";
+ url = ''http://beta.quicklisp.org/archive/cl-store/2020-09-25/cl-store-20200925-git.tgz'';
+ sha256 = ''0vqlrci1634jgfg6c1dzwvx58qjjwbcbwdbpm7xxw2s823xl9jf3'';
};
packageName = "cl-store";
diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-syntax-annot.nix b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-syntax-annot.nix
index 6cedd33973..add200b09a 100644
--- a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-syntax-annot.nix
+++ b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-syntax-annot.nix
@@ -1,15 +1,15 @@
args @ { fetchurl, ... }:
rec {
- baseName = "cl-syntax-annot";
- version = "cl-syntax-20150407-git";
+ baseName = ''cl-syntax-annot'';
+ version = ''cl-syntax-20150407-git'';
- description = "CL-Syntax Reader Syntax for cl-annot";
+ description = ''CL-Syntax Reader Syntax for cl-annot'';
deps = [ args."alexandria" args."cl-annot" args."cl-syntax" args."named-readtables" args."trivial-types" ];
src = fetchurl {
- url = "http://beta.quicklisp.org/archive/cl-syntax/2015-04-07/cl-syntax-20150407-git.tgz";
- sha256 = "1pz9a7hiql493ax5qgs9zb3bmvf0nnmmgdx14s4j2apdy2m34v8n";
+ url = ''http://beta.quicklisp.org/archive/cl-syntax/2015-04-07/cl-syntax-20150407-git.tgz'';
+ sha256 = ''1pz9a7hiql493ax5qgs9zb3bmvf0nnmmgdx14s4j2apdy2m34v8n'';
};
packageName = "cl-syntax-annot";
diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-syntax-anonfun.nix b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-syntax-anonfun.nix
index c862b137b0..c19a47df6c 100644
--- a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-syntax-anonfun.nix
+++ b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-syntax-anonfun.nix
@@ -1,15 +1,15 @@
args @ { fetchurl, ... }:
rec {
- baseName = "cl-syntax-anonfun";
- version = "cl-syntax-20150407-git";
+ baseName = ''cl-syntax-anonfun'';
+ version = ''cl-syntax-20150407-git'';
- description = "CL-Syntax Reader Syntax for cl-anonfun";
+ description = ''CL-Syntax Reader Syntax for cl-anonfun'';
deps = [ args."cl-anonfun" args."cl-syntax" args."named-readtables" args."trivial-types" ];
src = fetchurl {
- url = "http://beta.quicklisp.org/archive/cl-syntax/2015-04-07/cl-syntax-20150407-git.tgz";
- sha256 = "1pz9a7hiql493ax5qgs9zb3bmvf0nnmmgdx14s4j2apdy2m34v8n";
+ url = ''http://beta.quicklisp.org/archive/cl-syntax/2015-04-07/cl-syntax-20150407-git.tgz'';
+ sha256 = ''1pz9a7hiql493ax5qgs9zb3bmvf0nnmmgdx14s4j2apdy2m34v8n'';
};
packageName = "cl-syntax-anonfun";
diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-syntax-markup.nix b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-syntax-markup.nix
index ed1158f099..cded8dc2d0 100644
--- a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-syntax-markup.nix
+++ b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-syntax-markup.nix
@@ -1,15 +1,15 @@
args @ { fetchurl, ... }:
rec {
- baseName = "cl-syntax-markup";
- version = "cl-syntax-20150407-git";
+ baseName = ''cl-syntax-markup'';
+ version = ''cl-syntax-20150407-git'';
- description = "CL-Syntax Reader Syntax for CL-Markup";
+ description = ''CL-Syntax Reader Syntax for CL-Markup'';
deps = [ args."cl-markup" args."cl-syntax" args."named-readtables" args."trivial-types" ];
src = fetchurl {
- url = "http://beta.quicklisp.org/archive/cl-syntax/2015-04-07/cl-syntax-20150407-git.tgz";
- sha256 = "1pz9a7hiql493ax5qgs9zb3bmvf0nnmmgdx14s4j2apdy2m34v8n";
+ url = ''http://beta.quicklisp.org/archive/cl-syntax/2015-04-07/cl-syntax-20150407-git.tgz'';
+ sha256 = ''1pz9a7hiql493ax5qgs9zb3bmvf0nnmmgdx14s4j2apdy2m34v8n'';
};
packageName = "cl-syntax-markup";
diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-syntax.nix b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-syntax.nix
index 195071e88c..353c821088 100644
--- a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-syntax.nix
+++ b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-syntax.nix
@@ -1,15 +1,15 @@
args @ { fetchurl, ... }:
rec {
- baseName = "cl-syntax";
- version = "20150407-git";
+ baseName = ''cl-syntax'';
+ version = ''20150407-git'';
- description = "Reader Syntax Coventions for Common Lisp and SLIME";
+ description = ''Reader Syntax Coventions for Common Lisp and SLIME'';
deps = [ args."named-readtables" args."trivial-types" ];
src = fetchurl {
- url = "http://beta.quicklisp.org/archive/cl-syntax/2015-04-07/cl-syntax-20150407-git.tgz";
- sha256 = "1pz9a7hiql493ax5qgs9zb3bmvf0nnmmgdx14s4j2apdy2m34v8n";
+ url = ''http://beta.quicklisp.org/archive/cl-syntax/2015-04-07/cl-syntax-20150407-git.tgz'';
+ sha256 = ''1pz9a7hiql493ax5qgs9zb3bmvf0nnmmgdx14s4j2apdy2m34v8n'';
};
packageName = "cl-syntax";
diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-syslog.nix b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-syslog.nix
new file mode 100644
index 0000000000..5fe7fe2576
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-syslog.nix
@@ -0,0 +1,33 @@
+args @ { fetchurl, ... }:
+rec {
+ baseName = ''cl-syslog'';
+ version = ''20190202-git'';
+
+ description = ''Common Lisp syslog interface.'';
+
+ deps = [ args."alexandria" args."babel" args."cffi" args."global-vars" args."local-time" args."split-sequence" args."trivial-features" args."usocket" ];
+
+ src = fetchurl {
+ url = ''http://beta.quicklisp.org/archive/cl-syslog/2019-02-02/cl-syslog-20190202-git.tgz'';
+ sha256 = ''1kzz613y9fvx33svlwc65vjaj1cafnxz8icds80ww7il7y6alwgh'';
+ };
+
+ packageName = "cl-syslog";
+
+ asdFilesToKeep = ["cl-syslog.asd"];
+ overrides = x: x;
+}
+/* (SYSTEM cl-syslog DESCRIPTION Common Lisp syslog interface. SHA256
+ 1kzz613y9fvx33svlwc65vjaj1cafnxz8icds80ww7il7y6alwgh URL
+ http://beta.quicklisp.org/archive/cl-syslog/2019-02-02/cl-syslog-20190202-git.tgz
+ MD5 eafff19eb1f38a36a9535c729d2217fe NAME cl-syslog FILENAME cl-syslog DEPS
+ ((NAME alexandria FILENAME alexandria) (NAME babel FILENAME babel)
+ (NAME cffi FILENAME cffi) (NAME global-vars FILENAME global-vars)
+ (NAME local-time FILENAME local-time)
+ (NAME split-sequence FILENAME split-sequence)
+ (NAME trivial-features FILENAME trivial-features)
+ (NAME usocket FILENAME usocket))
+ DEPENDENCIES
+ (alexandria babel cffi global-vars local-time split-sequence
+ trivial-features usocket)
+ VERSION 20190202-git SIBLINGS NIL PARASITES NIL) */
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 8b5bff40c6..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-20200218-git";
+ baseName = ''cl-test-more'';
+ version = ''prove-20200218-git'';
- description = "System lacks description";
+ description = ''System lacks description'';
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/2020-02-18/prove-20200218-git.tgz";
- sha256 = "1sv3zyam9sdmyis5lyv0khvw82q7bcpsycpj9b3bsv9isb4j30zn";
+ url = ''http://beta.quicklisp.org/archive/prove/2020-02-18/prove-20200218-git.tgz'';
+ sha256 = ''1sv3zyam9sdmyis5lyv0khvw82q7bcpsycpj9b3bsv9isb4j30zn'';
};
packageName = "cl-test-more";
diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-typesetting.nix b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-typesetting.nix
index 2e43b2c37e..95960a8e0d 100644
--- a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-typesetting.nix
+++ b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-typesetting.nix
@@ -1,15 +1,15 @@
args @ { fetchurl, ... }:
rec {
- baseName = "cl-typesetting";
- version = "20170830-git";
+ baseName = ''cl-typesetting'';
+ version = ''20210228-git'';
- description = "Common Lisp Typesetting system";
+ description = ''Common Lisp Typesetting system'';
deps = [ args."cl-pdf" args."iterate" args."zpb-ttf" ];
src = fetchurl {
- url = "http://beta.quicklisp.org/archive/cl-typesetting/2017-08-30/cl-typesetting-20170830-git.tgz";
- sha256 = "1mkdr02qikzij3jiyrqy0dldzy8wsnvgcpznfha6x8p2xap586z3";
+ url = ''http://beta.quicklisp.org/archive/cl-typesetting/2021-02-28/cl-typesetting-20210228-git.tgz'';
+ sha256 = ''13rmzyzp0glq35jq3qdlmrsdssa6csqp5g455li4wi7kq8clrwnp'';
};
packageName = "cl-typesetting";
@@ -18,11 +18,11 @@ rec {
overrides = x: x;
}
/* (SYSTEM cl-typesetting DESCRIPTION Common Lisp Typesetting system SHA256
- 1mkdr02qikzij3jiyrqy0dldzy8wsnvgcpznfha6x8p2xap586z3 URL
- http://beta.quicklisp.org/archive/cl-typesetting/2017-08-30/cl-typesetting-20170830-git.tgz
- MD5 e12b9f249c60c220c5dc4a0939eb3343 NAME cl-typesetting FILENAME
+ 13rmzyzp0glq35jq3qdlmrsdssa6csqp5g455li4wi7kq8clrwnp URL
+ http://beta.quicklisp.org/archive/cl-typesetting/2021-02-28/cl-typesetting-20210228-git.tgz
+ MD5 949e7de37838d63f4c6b6e7dd88befeb NAME cl-typesetting FILENAME
cl-typesetting DEPS
((NAME cl-pdf FILENAME cl-pdf) (NAME iterate FILENAME iterate)
(NAME zpb-ttf FILENAME zpb-ttf))
- DEPENDENCIES (cl-pdf iterate zpb-ttf) VERSION 20170830-git SIBLINGS
+ DEPENDENCIES (cl-pdf iterate zpb-ttf) VERSION 20210228-git SIBLINGS
(xml-render cl-pdf-doc) PARASITES NIL) */
diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-unicode.nix b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-unicode.nix
index f7ad7a8592..d7b08c5f77 100644
--- a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-unicode.nix
+++ b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-unicode.nix
@@ -1,17 +1,17 @@
args @ { fetchurl, ... }:
rec {
- baseName = "cl-unicode";
- version = "20190521-git";
+ baseName = ''cl-unicode'';
+ version = ''20210228-git'';
parasites = [ "cl-unicode/base" "cl-unicode/build" "cl-unicode/test" ];
- description = "Portable Unicode Library";
+ description = ''Portable Unicode Library'';
deps = [ args."cl-ppcre" args."flexi-streams" ];
src = fetchurl {
- url = "http://beta.quicklisp.org/archive/cl-unicode/2019-05-21/cl-unicode-20190521-git.tgz";
- sha256 = "0p20yrqbn3fwsnrxvh2cv0m86mh3mz9vj15m7siw1kjkbzq0vngc";
+ url = ''http://beta.quicklisp.org/archive/cl-unicode/2021-02-28/cl-unicode-20210228-git.tgz'';
+ sha256 = ''0phy5wppb7m78dixrf2vjq8vas4drfd4qg38al6q8ymkl0yfy5js'';
};
packageName = "cl-unicode";
@@ -20,11 +20,11 @@ rec {
overrides = x: x;
}
/* (SYSTEM cl-unicode DESCRIPTION Portable Unicode Library SHA256
- 0p20yrqbn3fwsnrxvh2cv0m86mh3mz9vj15m7siw1kjkbzq0vngc URL
- http://beta.quicklisp.org/archive/cl-unicode/2019-05-21/cl-unicode-20190521-git.tgz
- MD5 04009a1266edbdda4d38902907caba25 NAME cl-unicode FILENAME cl-unicode
+ 0phy5wppb7m78dixrf2vjq8vas4drfd4qg38al6q8ymkl0yfy5js URL
+ http://beta.quicklisp.org/archive/cl-unicode/2021-02-28/cl-unicode-20210228-git.tgz
+ MD5 5b3bdddde3be5b8427e3fac92495a10b NAME cl-unicode FILENAME cl-unicode
DEPS
((NAME cl-ppcre FILENAME cl-ppcre)
(NAME flexi-streams FILENAME flexi-streams))
- DEPENDENCIES (cl-ppcre flexi-streams) VERSION 20190521-git SIBLINGS NIL
+ DEPENDENCIES (cl-ppcre flexi-streams) VERSION 20210228-git SIBLINGS NIL
PARASITES (cl-unicode/base cl-unicode/build cl-unicode/test)) */
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 d4328b7319..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 = "20200925-git";
+ baseName = ''cl-unification'';
+ 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/2020-09-25/cl-unification-20200925-git.tgz";
- sha256 = "05i1bmbabfgym9v28cbl37yr0r1m4a4k4a844z6wlq6qf45vzais";
+ url = ''http://beta.quicklisp.org/archive/cl-unification/2020-09-25/cl-unification-20200925-git.tgz'';
+ sha256 = ''05i1bmbabfgym9v28cbl37yr0r1m4a4k4a844z6wlq6qf45vzais'';
};
packageName = "cl-unification";
diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-utilities.nix b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-utilities.nix
index 1304b11990..ba8be7927f 100644
--- a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-utilities.nix
+++ b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-utilities.nix
@@ -1,15 +1,15 @@
args @ { fetchurl, ... }:
rec {
- baseName = "cl-utilities";
- version = "1.2.4";
+ baseName = ''cl-utilities'';
+ version = ''1.2.4'';
- description = "System lacks description";
+ description = ''System lacks description'';
deps = [ ];
src = fetchurl {
- url = "http://beta.quicklisp.org/archive/cl-utilities/2010-10-06/cl-utilities-1.2.4.tgz";
- sha256 = "1z2ippnv2wgyxpz15zpif7j7sp1r20fkjhm4n6am2fyp6a3k3a87";
+ url = ''http://beta.quicklisp.org/archive/cl-utilities/2010-10-06/cl-utilities-1.2.4.tgz'';
+ sha256 = ''1z2ippnv2wgyxpz15zpif7j7sp1r20fkjhm4n6am2fyp6a3k3a87'';
};
packageName = "cl-utilities";
diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-vectors.nix b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-vectors.nix
index 14cee31761..f44bd0f22e 100644
--- a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-vectors.nix
+++ b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-vectors.nix
@@ -1,15 +1,15 @@
args @ { fetchurl, ... }:
rec {
- baseName = "cl-vectors";
- version = "20180228-git";
+ baseName = ''cl-vectors'';
+ version = ''20180228-git'';
- description = "cl-paths: vectorial paths manipulation";
+ description = ''cl-paths: vectorial paths manipulation'';
deps = [ args."cl-aa" args."cl-paths" ];
src = fetchurl {
- url = "http://beta.quicklisp.org/archive/cl-vectors/2018-02-28/cl-vectors-20180228-git.tgz";
- sha256 = "0fcypjfzqra8ryb4nx1vx1fqy7fwvyz3f443qkjg2z81akhkscly";
+ url = ''http://beta.quicklisp.org/archive/cl-vectors/2018-02-28/cl-vectors-20180228-git.tgz'';
+ sha256 = ''0fcypjfzqra8ryb4nx1vx1fqy7fwvyz3f443qkjg2z81akhkscly'';
};
packageName = "cl-vectors";
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
index 9c54794331..8874bcde7f 100644
--- 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
@@ -1,15 +1,15 @@
args @ { fetchurl, ... }:
rec {
- baseName = "cl-webkit2";
- version = "cl-webkit-20201016-git";
+ baseName = ''cl-webkit2'';
+ version = ''cl-webkit-20210228-git'';
- description = "An FFI binding to WebKit2GTK+";
+ 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";
+ url = ''http://beta.quicklisp.org/archive/cl-webkit/2021-02-28/cl-webkit-20210228-git.tgz'';
+ sha256 = ''1r6i64g37palar4hij6c5m240xbn2dwzwaashv015nhjwmra1ms1'';
};
packageName = "cl-webkit2";
@@ -18,9 +18,9 @@ rec {
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
+ 1r6i64g37palar4hij6c5m240xbn2dwzwaashv015nhjwmra1ms1 URL
+ http://beta.quicklisp.org/archive/cl-webkit/2021-02-28/cl-webkit-20210228-git.tgz
+ MD5 49f38c18ac292122628356762270e5ff NAME cl-webkit2 FILENAME cl-webkit2
DEPS
((NAME alexandria FILENAME alexandria) (NAME babel FILENAME babel)
(NAME bordeaux-threads FILENAME bordeaux-threads)
@@ -40,4 +40,4 @@ rec {
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) */
+ VERSION cl-webkit-20210228-git SIBLINGS NIL PARASITES NIL) */
diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-who.nix b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-who.nix
index 4b4f431425..3be45384d4 100644
--- a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-who.nix
+++ b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-who.nix
@@ -1,17 +1,17 @@
args @ { fetchurl, ... }:
rec {
- baseName = "cl-who";
- version = "20190710-git";
+ baseName = ''cl-who'';
+ version = ''20190710-git'';
parasites = [ "cl-who-test" ];
- description = "(X)HTML generation macros";
+ description = ''(X)HTML generation macros'';
deps = [ args."flexi-streams" ];
src = fetchurl {
- url = "http://beta.quicklisp.org/archive/cl-who/2019-07-10/cl-who-20190710-git.tgz";
- sha256 = "0pbigwn38xikdwvjy9696z9f00dwg565y3wh6ja51q681y8zh9ir";
+ url = ''http://beta.quicklisp.org/archive/cl-who/2019-07-10/cl-who-20190710-git.tgz'';
+ sha256 = ''0pbigwn38xikdwvjy9696z9f00dwg565y3wh6ja51q681y8zh9ir'';
};
packageName = "cl-who";
diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-xmlspam.nix b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-xmlspam.nix
index 86c9f0c594..223c50f471 100644
--- a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-xmlspam.nix
+++ b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-xmlspam.nix
@@ -1,15 +1,15 @@
args @ { fetchurl, ... }:
rec {
- baseName = "cl-xmlspam";
- version = "20101006-http";
+ baseName = ''cl-xmlspam'';
+ version = ''20101006-http'';
- description = "Streaming pattern matching for XML";
+ description = ''Streaming pattern matching for XML'';
deps = [ args."alexandria" args."babel" args."cl-ppcre" args."closure-common" args."cxml" args."puri" args."trivial-features" args."trivial-gray-streams" ];
src = fetchurl {
- url = "http://beta.quicklisp.org/archive/cl-xmlspam/2010-10-06/cl-xmlspam-20101006-http.tgz";
- sha256 = "1mx1a6ab4irncrx5pamh7zng35m4c5wh0pw68avaz7fbz81s953h";
+ url = ''http://beta.quicklisp.org/archive/cl-xmlspam/2010-10-06/cl-xmlspam-20101006-http.tgz'';
+ sha256 = ''1mx1a6ab4irncrx5pamh7zng35m4c5wh0pw68avaz7fbz81s953h'';
};
packageName = "cl-xmlspam";
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 1826e79f5a..699a5bdf7a 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-20200610-git";
+ baseName = ''cl_plus_ssl'';
+ version = ''cl+ssl-20210228-git'';
- description = "Common Lisp interface to OpenSSL.";
+ 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" ];
+ deps = [ args."alexandria" args."babel" args."bordeaux-threads" args."cffi" args."flexi-streams" args."split-sequence" args."trivial-features" args."trivial-garbage" args."trivial-gray-streams" args."uiop" args."usocket" ];
src = fetchurl {
- url = "http://beta.quicklisp.org/archive/cl+ssl/2020-06-10/cl+ssl-20200610-git.tgz";
- sha256 = "1kijg8vlwcxraknp4gadf3n5zjchkgg8axr94v3kas9rb717r6ql";
+ url = ''http://beta.quicklisp.org/archive/cl+ssl/2021-02-28/cl+ssl-20210228-git.tgz'';
+ sha256 = ''1njppcg5fm8l0lhf7nf8nfyaz9vsr922y0vfxqdp9hp7qfid8yll'';
};
packageName = "cl+ssl";
@@ -18,17 +18,18 @@ rec {
overrides = x: x;
}
/* (SYSTEM cl+ssl DESCRIPTION Common Lisp interface to OpenSSL. SHA256
- 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
+ 1njppcg5fm8l0lhf7nf8nfyaz9vsr922y0vfxqdp9hp7qfid8yll URL
+ http://beta.quicklisp.org/archive/cl+ssl/2021-02-28/cl+ssl-20210228-git.tgz
+ MD5 01b61fd8ee6ad8d3c1c695ba56d510b6 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)
+ (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 uiop FILENAME uiop))
+ (NAME uiop FILENAME uiop) (NAME usocket FILENAME usocket))
DEPENDENCIES
- (alexandria babel bordeaux-threads cffi flexi-streams trivial-features
- trivial-garbage trivial-gray-streams uiop)
- VERSION cl+ssl-20200610-git SIBLINGS (cl+ssl.test) PARASITES NIL) */
+ (alexandria babel bordeaux-threads cffi flexi-streams split-sequence
+ trivial-features trivial-garbage trivial-gray-streams uiop usocket)
+ VERSION cl+ssl-20210228-git SIBLINGS (cl+ssl.test) PARASITES NIL) */
diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/clack-handler-hunchentoot.nix b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/clack-handler-hunchentoot.nix
index 75a30decba..5a831da39b 100644
--- a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/clack-handler-hunchentoot.nix
+++ b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/clack-handler-hunchentoot.nix
@@ -1,15 +1,15 @@
args @ { fetchurl, ... }:
rec {
- baseName = "clack-handler-hunchentoot";
- version = "clack-20191007-git";
+ baseName = ''clack-handler-hunchentoot'';
+ version = ''clack-20191007-git'';
- description = "Clack handler for Hunchentoot.";
+ description = ''Clack handler for Hunchentoot.'';
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."clack-socket" args."flexi-streams" args."hunchentoot" 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/clack/2019-10-07/clack-20191007-git.tgz";
- sha256 = "004drm82mhxmcsa00lbmq2l89g4fzwn6j2drfwdazrpi27z0ry5w";
+ url = ''http://beta.quicklisp.org/archive/clack/2019-10-07/clack-20191007-git.tgz'';
+ sha256 = ''004drm82mhxmcsa00lbmq2l89g4fzwn6j2drfwdazrpi27z0ry5w'';
};
packageName = "clack-handler-hunchentoot";
diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/clack-socket.nix b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/clack-socket.nix
index 5b39ac9e5a..a9294b293c 100644
--- a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/clack-socket.nix
+++ b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/clack-socket.nix
@@ -1,15 +1,15 @@
args @ { fetchurl, ... }:
rec {
- baseName = "clack-socket";
- version = "clack-20191007-git";
+ baseName = ''clack-socket'';
+ version = ''clack-20191007-git'';
- description = "System lacks description";
+ description = ''System lacks description'';
deps = [ ];
src = fetchurl {
- url = "http://beta.quicklisp.org/archive/clack/2019-10-07/clack-20191007-git.tgz";
- sha256 = "004drm82mhxmcsa00lbmq2l89g4fzwn6j2drfwdazrpi27z0ry5w";
+ url = ''http://beta.quicklisp.org/archive/clack/2019-10-07/clack-20191007-git.tgz'';
+ sha256 = ''004drm82mhxmcsa00lbmq2l89g4fzwn6j2drfwdazrpi27z0ry5w'';
};
packageName = "clack-socket";
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 b990af4439..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
@@ -1,15 +1,15 @@
args @ { fetchurl, ... }:
rec {
- baseName = "clack-test";
- version = "clack-20191007-git";
+ baseName = ''clack-test'';
+ version = ''clack-20191007-git'';
- description = "Testing Clack Applications.";
+ 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."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";
- sha256 = "004drm82mhxmcsa00lbmq2l89g4fzwn6j2drfwdazrpi27z0ry5w";
+ url = ''http://beta.quicklisp.org/archive/clack/2019-10-07/clack-20191007-git.tgz'';
+ sha256 = ''004drm82mhxmcsa00lbmq2l89g4fzwn6j2drfwdazrpi27z0ry5w'';
};
packageName = "clack-test";
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 5c0a586431..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
@@ -1,15 +1,15 @@
args @ { fetchurl, ... }:
rec {
- baseName = "clack-v1-compat";
- version = "clack-20191007-git";
+ baseName = ''clack-v1-compat'';
+ version = ''clack-20191007-git'';
- description = "System lacks description";
+ 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."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";
- sha256 = "004drm82mhxmcsa00lbmq2l89g4fzwn6j2drfwdazrpi27z0ry5w";
+ url = ''http://beta.quicklisp.org/archive/clack/2019-10-07/clack-20191007-git.tgz'';
+ sha256 = ''004drm82mhxmcsa00lbmq2l89g4fzwn6j2drfwdazrpi27z0ry5w'';
};
packageName = "clack-v1-compat";
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 878b037cb3..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
@@ -1,15 +1,15 @@
args @ { fetchurl, ... }:
rec {
- baseName = "clack";
- version = "20191007-git";
+ baseName = ''clack'';
+ version = ''20191007-git'';
- description = "Web application environment for Common Lisp";
+ 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."uiop" ];
src = fetchurl {
- url = "http://beta.quicklisp.org/archive/clack/2019-10-07/clack-20191007-git.tgz";
- sha256 = "004drm82mhxmcsa00lbmq2l89g4fzwn6j2drfwdazrpi27z0ry5w";
+ url = ''http://beta.quicklisp.org/archive/clack/2019-10-07/clack-20191007-git.tgz'';
+ sha256 = ''004drm82mhxmcsa00lbmq2l89g4fzwn6j2drfwdazrpi27z0ry5w'';
};
packageName = "clack";
diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/clfswm.nix b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/clfswm.nix
index b707385860..81b335520b 100644
--- a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/clfswm.nix
+++ b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/clfswm.nix
@@ -1,15 +1,15 @@
args @ { fetchurl, ... }:
rec {
- baseName = "clfswm";
- version = "20161204-git";
+ baseName = ''clfswm'';
+ version = ''20161204-git'';
- description = "CLFSWM: Fullscreen Window Manager";
+ description = ''CLFSWM: Fullscreen Window Manager'';
deps = [ args."clx" ];
src = fetchurl {
- url = "http://beta.quicklisp.org/archive/clfswm/2016-12-04/clfswm-20161204-git.tgz";
- sha256 = "1jgz127721dgcv3qm1knc335gy04vzh9gl0hshp256rxi82cpp73";
+ url = ''http://beta.quicklisp.org/archive/clfswm/2016-12-04/clfswm-20161204-git.tgz'';
+ sha256 = ''1jgz127721dgcv3qm1knc335gy04vzh9gl0hshp256rxi82cpp73'';
};
packageName = "clfswm";
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 5c7f91ac88..c5a06b9a03 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 = "20201016-git";
+ baseName = ''closer-mop'';
+ version = ''20210228-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.";
+ 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/2020-10-16/closer-mop-20201016-git.tgz";
- sha256 = "1fccvxzrrfdiwjx9cdia7idp8xym1y86bf7zcyxvmpkdcvgdsdcd";
+ url = ''http://beta.quicklisp.org/archive/closer-mop/2021-02-28/closer-mop-20210228-git.tgz'';
+ sha256 = ''0x3rp2v84zzw5mhcxrgbq2kcb9gs4jn1l9rh4ylsnih89l9lqc6i'';
};
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 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) */
+ SHA256 0x3rp2v84zzw5mhcxrgbq2kcb9gs4jn1l9rh4ylsnih89l9lqc6i URL
+ http://beta.quicklisp.org/archive/closer-mop/2021-02-28/closer-mop-20210228-git.tgz
+ MD5 49c0004ff21157bc99f227cecf7b6025 NAME closer-mop FILENAME closer-mop
+ DEPS NIL DEPENDENCIES NIL VERSION 20210228-git SIBLINGS NIL PARASITES NIL) */
diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/closure-common.nix b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/closure-common.nix
index 86e19bc347..c1b36b6b65 100644
--- a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/closure-common.nix
+++ b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/closure-common.nix
@@ -1,15 +1,15 @@
args @ { fetchurl, ... }:
rec {
- baseName = "closure-common";
- version = "20181018-git";
+ baseName = ''closure-common'';
+ version = ''20181018-git'';
- description = "System lacks description";
+ description = ''System lacks description'';
deps = [ args."alexandria" args."babel" args."trivial-features" args."trivial-gray-streams" ];
src = fetchurl {
- url = "http://beta.quicklisp.org/archive/closure-common/2018-10-18/closure-common-20181018-git.tgz";
- sha256 = "18bp7jnxma9hscp09fa723ws9nnynjil935rp8dy9hp6ypghpxpn";
+ url = ''http://beta.quicklisp.org/archive/closure-common/2018-10-18/closure-common-20181018-git.tgz'';
+ sha256 = ''18bp7jnxma9hscp09fa723ws9nnynjil935rp8dy9hp6ypghpxpn'';
};
packageName = "closure-common";
diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/closure-html.nix b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/closure-html.nix
index d1d0757380..7d9d8730f2 100644
--- a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/closure-html.nix
+++ b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/closure-html.nix
@@ -1,15 +1,15 @@
args @ { fetchurl, ... }:
rec {
- baseName = "closure-html";
- version = "20180711-git";
+ baseName = ''closure-html'';
+ version = ''20180711-git'';
- description = "System lacks description";
+ description = ''System lacks description'';
deps = [ args."alexandria" args."babel" args."closure-common" args."flexi-streams" args."trivial-features" args."trivial-gray-streams" ];
src = fetchurl {
- url = "http://beta.quicklisp.org/archive/closure-html/2018-07-11/closure-html-20180711-git.tgz";
- sha256 = "0ljcrz1wix77h1ywp0bixm3pb5ncmr1vdiwh8m1qzkygwpfjr8aq";
+ url = ''http://beta.quicklisp.org/archive/closure-html/2018-07-11/closure-html-20180711-git.tgz'';
+ sha256 = ''0ljcrz1wix77h1ywp0bixm3pb5ncmr1vdiwh8m1qzkygwpfjr8aq'';
};
packageName = "closure-html";
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 a01522b032..d3c51f519b 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-20201016-git";
+ baseName = ''clsql-postgresql-socket'';
+ version = ''clsql-20210228-git'';
- description = "Common Lisp SQL PostgreSQL Socket Driver";
+ description = ''Common Lisp SQL PostgreSQL Socket Driver'';
deps = [ args."clsql" args."md5" args."uffi" ];
src = fetchurl {
- url = "http://beta.quicklisp.org/archive/clsql/2020-10-16/clsql-20201016-git.tgz";
- sha256 = "0wzjxcm7df4fipvj5qsqlllai92hkzd4cvlaghvaikcah9r63hv8";
+ url = ''http://beta.quicklisp.org/archive/clsql/2021-02-28/clsql-20210228-git.tgz'';
+ sha256 = ''0g7racshjy47xbfijymddjwnphp0c93z2lnlgi330g257s9l7vd4'';
};
packageName = "clsql-postgresql-socket";
@@ -19,13 +19,13 @@ rec {
}
/* (SYSTEM clsql-postgresql-socket DESCRIPTION
Common Lisp SQL PostgreSQL Socket Driver SHA256
- 0wzjxcm7df4fipvj5qsqlllai92hkzd4cvlaghvaikcah9r63hv8 URL
- http://beta.quicklisp.org/archive/clsql/2020-10-16/clsql-20201016-git.tgz
- MD5 bfa0842f9875113aed8e82eca58dab9e NAME clsql-postgresql-socket FILENAME
+ 0g7racshjy47xbfijymddjwnphp0c93z2lnlgi330g257s9l7vd4 URL
+ http://beta.quicklisp.org/archive/clsql/2021-02-28/clsql-20210228-git.tgz
+ MD5 d32b2b37e4211f5da61d2e29847a2f12 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-20201016-git SIBLINGS
+ DEPENDENCIES (clsql md5 uffi) VERSION clsql-20210228-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 1c5ee97284..f881cf4221 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-20201016-git";
+ baseName = ''clsql-postgresql'';
+ version = ''clsql-20210228-git'';
- description = "Common Lisp PostgreSQL API Driver";
+ description = ''Common Lisp PostgreSQL API Driver'';
deps = [ args."clsql" args."clsql-uffi" args."uffi" ];
src = fetchurl {
- url = "http://beta.quicklisp.org/archive/clsql/2020-10-16/clsql-20201016-git.tgz";
- sha256 = "0wzjxcm7df4fipvj5qsqlllai92hkzd4cvlaghvaikcah9r63hv8";
+ url = ''http://beta.quicklisp.org/archive/clsql/2021-02-28/clsql-20210228-git.tgz'';
+ sha256 = ''0g7racshjy47xbfijymddjwnphp0c93z2lnlgi330g257s9l7vd4'';
};
packageName = "clsql-postgresql";
@@ -18,13 +18,13 @@ rec {
overrides = x: x;
}
/* (SYSTEM clsql-postgresql DESCRIPTION Common Lisp PostgreSQL API Driver
- SHA256 0wzjxcm7df4fipvj5qsqlllai92hkzd4cvlaghvaikcah9r63hv8 URL
- http://beta.quicklisp.org/archive/clsql/2020-10-16/clsql-20201016-git.tgz
- MD5 bfa0842f9875113aed8e82eca58dab9e NAME clsql-postgresql FILENAME
+ SHA256 0g7racshjy47xbfijymddjwnphp0c93z2lnlgi330g257s9l7vd4 URL
+ http://beta.quicklisp.org/archive/clsql/2021-02-28/clsql-20210228-git.tgz
+ MD5 d32b2b37e4211f5da61d2e29847a2f12 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-20201016-git SIBLINGS
+ DEPENDENCIES (clsql clsql-uffi uffi) VERSION clsql-20210228-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 500eddc5c5..ce512042bb 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-20201016-git";
+ baseName = ''clsql-sqlite3'';
+ version = ''clsql-20210228-git'';
- description = "Common Lisp Sqlite3 Driver";
+ description = ''Common Lisp Sqlite3 Driver'';
deps = [ args."clsql" args."clsql-uffi" args."uffi" ];
src = fetchurl {
- url = "http://beta.quicklisp.org/archive/clsql/2020-10-16/clsql-20201016-git.tgz";
- sha256 = "0wzjxcm7df4fipvj5qsqlllai92hkzd4cvlaghvaikcah9r63hv8";
+ url = ''http://beta.quicklisp.org/archive/clsql/2021-02-28/clsql-20210228-git.tgz'';
+ sha256 = ''0g7racshjy47xbfijymddjwnphp0c93z2lnlgi330g257s9l7vd4'';
};
packageName = "clsql-sqlite3";
@@ -18,13 +18,13 @@ rec {
overrides = x: x;
}
/* (SYSTEM clsql-sqlite3 DESCRIPTION Common Lisp Sqlite3 Driver SHA256
- 0wzjxcm7df4fipvj5qsqlllai92hkzd4cvlaghvaikcah9r63hv8 URL
- http://beta.quicklisp.org/archive/clsql/2020-10-16/clsql-20201016-git.tgz
- MD5 bfa0842f9875113aed8e82eca58dab9e NAME clsql-sqlite3 FILENAME
+ 0g7racshjy47xbfijymddjwnphp0c93z2lnlgi330g257s9l7vd4 URL
+ http://beta.quicklisp.org/archive/clsql/2021-02-28/clsql-20210228-git.tgz
+ MD5 d32b2b37e4211f5da61d2e29847a2f12 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-20201016-git SIBLINGS
+ DEPENDENCIES (clsql clsql-uffi uffi) VERSION clsql-20210228-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 898df29319..4ec1170f37 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-20201016-git";
+ baseName = ''clsql-uffi'';
+ version = ''clsql-20210228-git'';
- description = "Common UFFI Helper functions for Common Lisp SQL Interface Library";
+ 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/2020-10-16/clsql-20201016-git.tgz";
- sha256 = "0wzjxcm7df4fipvj5qsqlllai92hkzd4cvlaghvaikcah9r63hv8";
+ url = ''http://beta.quicklisp.org/archive/clsql/2021-02-28/clsql-20210228-git.tgz'';
+ sha256 = ''0g7racshjy47xbfijymddjwnphp0c93z2lnlgi330g257s9l7vd4'';
};
packageName = "clsql-uffi";
@@ -19,11 +19,11 @@ rec {
}
/* (SYSTEM clsql-uffi DESCRIPTION
Common UFFI Helper functions for Common Lisp SQL Interface Library SHA256
- 0wzjxcm7df4fipvj5qsqlllai92hkzd4cvlaghvaikcah9r63hv8 URL
- http://beta.quicklisp.org/archive/clsql/2020-10-16/clsql-20201016-git.tgz
- MD5 bfa0842f9875113aed8e82eca58dab9e NAME clsql-uffi FILENAME clsql-uffi
+ 0g7racshjy47xbfijymddjwnphp0c93z2lnlgi330g257s9l7vd4 URL
+ http://beta.quicklisp.org/archive/clsql/2021-02-28/clsql-20210228-git.tgz
+ MD5 d32b2b37e4211f5da61d2e29847a2f12 NAME clsql-uffi FILENAME clsql-uffi
DEPS ((NAME clsql FILENAME clsql) (NAME uffi FILENAME uffi)) DEPENDENCIES
- (clsql uffi) VERSION clsql-20201016-git SIBLINGS
+ (clsql uffi) VERSION clsql-20210228-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 3ec3826322..e7595695df 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 = "20201016-git";
+ baseName = ''clsql'';
+ version = ''20210228-git'';
- description = "Common Lisp SQL Interface library";
+ description = ''Common Lisp SQL Interface library'';
deps = [ args."uffi" ];
src = fetchurl {
- url = "http://beta.quicklisp.org/archive/clsql/2020-10-16/clsql-20201016-git.tgz";
- sha256 = "0wzjxcm7df4fipvj5qsqlllai92hkzd4cvlaghvaikcah9r63hv8";
+ url = ''http://beta.quicklisp.org/archive/clsql/2021-02-28/clsql-20210228-git.tgz'';
+ sha256 = ''0g7racshjy47xbfijymddjwnphp0c93z2lnlgi330g257s9l7vd4'';
};
packageName = "clsql";
@@ -18,10 +18,10 @@ rec {
overrides = x: x;
}
/* (SYSTEM clsql DESCRIPTION Common Lisp SQL Interface library SHA256
- 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
+ 0g7racshjy47xbfijymddjwnphp0c93z2lnlgi330g257s9l7vd4 URL
+ http://beta.quicklisp.org/archive/clsql/2021-02-28/clsql-20210228-git.tgz
+ MD5 d32b2b37e4211f5da61d2e29847a2f12 NAME clsql FILENAME clsql DEPS
+ ((NAME uffi FILENAME uffi)) DEPENDENCIES (uffi) VERSION 20210228-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/clss.nix b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/clss.nix
index 19a1e5ebb1..aa89d5e45c 100644
--- a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/clss.nix
+++ b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/clss.nix
@@ -1,15 +1,15 @@
args @ { fetchurl, ... }:
rec {
- baseName = "clss";
- version = "20191130-git";
+ baseName = ''clss'';
+ version = ''20191130-git'';
- description = "A DOM tree searching engine based on CSS selectors.";
+ description = ''A DOM tree searching engine based on CSS selectors.'';
deps = [ args."array-utils" args."documentation-utils" args."plump" args."trivial-indent" ];
src = fetchurl {
- url = "http://beta.quicklisp.org/archive/clss/2019-11-30/clss-20191130-git.tgz";
- sha256 = "0cbjzsc90fpa8zqv5s0ri7ncbv6f8azgbbfsxswqfphbibkcpcka";
+ url = ''http://beta.quicklisp.org/archive/clss/2019-11-30/clss-20191130-git.tgz'';
+ sha256 = ''0cbjzsc90fpa8zqv5s0ri7ncbv6f8azgbbfsxswqfphbibkcpcka'';
};
packageName = "clss";
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
index bc9a8beb66..10ab18a8ca 100644
--- 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
@@ -1,15 +1,15 @@
args @ { fetchurl, ... }:
rec {
- baseName = "clump-2-3-tree";
- version = "clump-20160825-git";
+ baseName = ''clump-2-3-tree'';
+ version = ''clump-20160825-git'';
- description = "System lacks description";
+ 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";
+ url = ''http://beta.quicklisp.org/archive/clump/2016-08-25/clump-20160825-git.tgz'';
+ sha256 = ''1mngxmwklpi52inihkp4akzdi7y32609spfi70yamwgzc1wijbrl'';
};
packageName = "clump-2-3-tree";
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
index 96543b9ba8..ad28447154 100644
--- 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
@@ -1,15 +1,15 @@
args @ { fetchurl, ... }:
rec {
- baseName = "clump-binary-tree";
- version = "clump-20160825-git";
+ baseName = ''clump-binary-tree'';
+ version = ''clump-20160825-git'';
- description = "System lacks description";
+ 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";
+ url = ''http://beta.quicklisp.org/archive/clump/2016-08-25/clump-20160825-git.tgz'';
+ sha256 = ''1mngxmwklpi52inihkp4akzdi7y32609spfi70yamwgzc1wijbrl'';
};
packageName = "clump-binary-tree";
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
index 8c6c9e0220..476cacb6f3 100644
--- 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
@@ -1,15 +1,15 @@
args @ { fetchurl, ... }:
rec {
- baseName = "clump";
- version = "20160825-git";
+ baseName = ''clump'';
+ version = ''20160825-git'';
- description = "Library for operations on different kinds of trees";
+ 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";
+ url = ''http://beta.quicklisp.org/archive/clump/2016-08-25/clump-20160825-git.tgz'';
+ sha256 = ''1mngxmwklpi52inihkp4akzdi7y32609spfi70yamwgzc1wijbrl'';
};
packageName = "clump";
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
index 7ef0b4a52d..7ab00c0344 100644
--- 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
@@ -1,15 +1,15 @@
args @ { fetchurl, ... }:
rec {
- baseName = "clunit";
- version = "20171019-git";
+ baseName = ''clunit'';
+ version = ''20171019-git'';
- description = "CLUnit is a Common Lisp unit testing framework.";
+ 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";
+ url = ''http://beta.quicklisp.org/archive/clunit/2017-10-19/clunit-20171019-git.tgz'';
+ sha256 = ''1rapyh0fbjnksj8j3y6imzya1kw80882w18j0fv9iq1hlp718zs5'';
};
packageName = "clunit";
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
index c62d20e6e2..6a143073b5 100644
--- 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
@@ -1,15 +1,15 @@
args @ { fetchurl, ... }:
rec {
- baseName = "clunit2";
- version = "20201016-git";
+ baseName = ''clunit2'';
+ version = ''20201016-git'';
- description = "CLUnit is a Common Lisp unit testing framework.";
+ 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";
+ url = ''http://beta.quicklisp.org/archive/clunit2/2020-10-16/clunit2-20201016-git.tgz'';
+ sha256 = ''1mj3c125drq9a3pxrh0r8q3gqgq68yk7qi0zbqh4mkpavl1aspdp'';
};
packageName = "clunit2";
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 9592921de1..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,17 +1,17 @@
args @ { fetchurl, ... }:
rec {
- baseName = "clx";
- version = "20200715-git";
+ baseName = ''clx'';
+ version = ''20200715-git'';
parasites = [ "clx/test" ];
- description = "An implementation of the X Window System protocol in Lisp.";
+ description = ''An implementation of the X Window System protocol in Lisp.'';
deps = [ args."fiasco" ];
src = fetchurl {
- url = "http://beta.quicklisp.org/archive/clx/2020-07-15/clx-20200715-git.tgz";
- sha256 = "1fvx6m3imvkkd0z5a3jmm2v6mkrndwsidhykrs229rqx343zg8ra";
+ url = ''http://beta.quicklisp.org/archive/clx/2020-07-15/clx-20200715-git.tgz'';
+ sha256 = ''1fvx6m3imvkkd0z5a3jmm2v6mkrndwsidhykrs229rqx343zg8ra'';
};
packageName = "clx";
diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/collectors.nix b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/collectors.nix
index 20b0435faf..7375b8dd70 100644
--- a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/collectors.nix
+++ b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/collectors.nix
@@ -1,7 +1,7 @@
args @ { fetchurl, ... }:
rec {
- baseName = "collectors";
- version = "20161204-git";
+ baseName = ''collectors'';
+ version = ''20161204-git'';
parasites = [ "collectors-test" ];
@@ -11,8 +11,8 @@ rec {
deps = [ args."alexandria" args."closer-mop" args."iterate" args."lisp-unit2" args."symbol-munger" ];
src = fetchurl {
- url = "http://beta.quicklisp.org/archive/collectors/2016-12-04/collectors-20161204-git.tgz";
- sha256 = "0cf2y2yxraqs9v54gbj8hhp7s522gz8qfwwc5hvlhl2s7540b2zf";
+ url = ''http://beta.quicklisp.org/archive/collectors/2016-12-04/collectors-20161204-git.tgz'';
+ sha256 = ''0cf2y2yxraqs9v54gbj8hhp7s522gz8qfwwc5hvlhl2s7540b2zf'';
};
packageName = "collectors";
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
index 2abbb95655..9084d6a309 100644
--- 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
@@ -1,15 +1,15 @@
args @ { fetchurl, ... }:
rec {
- baseName = "colorize";
- version = "20180228-git";
+ baseName = ''colorize'';
+ version = ''20180228-git'';
- description = "A Syntax highlighting library";
+ 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";
+ url = ''http://beta.quicklisp.org/archive/colorize/2018-02-28/colorize-20180228-git.tgz'';
+ sha256 = ''1g0xbryavsf17zy9iy0sbqsb4lyva04h93sbaj3iwv12w50fwz2h'';
};
packageName = "colorize";
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 1beb758a79..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 = "20200325-git";
+ baseName = ''command-line-arguments'';
+ version = ''20200325-git'';
- description = "small library to deal with command-line arguments";
+ description = ''small library to deal with command-line arguments'';
deps = [ ];
src = fetchurl {
- url = "http://beta.quicklisp.org/archive/command-line-arguments/2020-03-25/command-line-arguments-20200325-git.tgz";
- sha256 = "0ny0c0aw3mfjpmf31pnd9zfnylqh8ji2yi636w1f352c13z2w5sz";
+ url = ''http://beta.quicklisp.org/archive/command-line-arguments/2020-03-25/command-line-arguments-20200325-git.tgz'';
+ sha256 = ''0ny0c0aw3mfjpmf31pnd9zfnylqh8ji2yi636w1f352c13z2w5sz'';
};
packageName = "command-line-arguments";
diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/css-lite.nix b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/css-lite.nix
index 41ac2a90aa..38ea5aa106 100644
--- a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/css-lite.nix
+++ b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/css-lite.nix
@@ -1,15 +1,15 @@
args @ { fetchurl, ... }:
rec {
- baseName = "css-lite";
- version = "20120407-git";
+ baseName = ''css-lite'';
+ version = ''20120407-git'';
- description = "System lacks description";
+ description = ''System lacks description'';
deps = [ ];
src = fetchurl {
- url = "http://beta.quicklisp.org/archive/css-lite/2012-04-07/css-lite-20120407-git.tgz";
- sha256 = "1gf1qqaxhly6ixh9ykqhg9b52s8p5wlwi46vp2k29qy7gmx4f1qg";
+ url = ''http://beta.quicklisp.org/archive/css-lite/2012-04-07/css-lite-20120407-git.tgz'';
+ sha256 = ''1gf1qqaxhly6ixh9ykqhg9b52s8p5wlwi46vp2k29qy7gmx4f1qg'';
};
packageName = "css-lite";
diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/css-selectors-simple-tree.nix b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/css-selectors-simple-tree.nix
index 5fc683cdc9..98c565648d 100644
--- a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/css-selectors-simple-tree.nix
+++ b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/css-selectors-simple-tree.nix
@@ -1,15 +1,15 @@
args @ { fetchurl, ... }:
rec {
- baseName = "css-selectors-simple-tree";
- version = "css-selectors-20160628-git";
+ baseName = ''css-selectors-simple-tree'';
+ version = ''css-selectors-20160628-git'';
- description = "An implementation of css selectors that interacts with cl-html5-parser's simple-tree";
+ description = ''An implementation of css selectors that interacts with cl-html5-parser's simple-tree'';
deps = [ args."alexandria" args."babel" args."buildnode" args."cl-html5-parser" args."cl-interpol" args."cl-ppcre" args."cl-unicode" args."closer-mop" args."closure-common" args."closure-html" args."collectors" args."css-selectors" args."cxml" args."flexi-streams" args."iterate" args."named-readtables" args."puri" args."split-sequence" args."string-case" args."swank" args."symbol-munger" args."trivial-features" args."trivial-gray-streams" args."yacc" ];
src = fetchurl {
- url = "http://beta.quicklisp.org/archive/css-selectors/2016-06-28/css-selectors-20160628-git.tgz";
- sha256 = "0y9q719w5cv4g7in731q5p98n7pznb05vr7i7wi92mmpah2g1w4b";
+ url = ''http://beta.quicklisp.org/archive/css-selectors/2016-06-28/css-selectors-20160628-git.tgz'';
+ sha256 = ''0y9q719w5cv4g7in731q5p98n7pznb05vr7i7wi92mmpah2g1w4b'';
};
packageName = "css-selectors-simple-tree";
diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/css-selectors-stp.nix b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/css-selectors-stp.nix
index 9d03244efa..fcdb69f3c3 100644
--- a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/css-selectors-stp.nix
+++ b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/css-selectors-stp.nix
@@ -1,15 +1,15 @@
args @ { fetchurl, ... }:
rec {
- baseName = "css-selectors-stp";
- version = "css-selectors-20160628-git";
+ baseName = ''css-selectors-stp'';
+ version = ''css-selectors-20160628-git'';
- description = "An implementation of css selectors that interacts with cxml-stp";
+ description = ''An implementation of css selectors that interacts with cxml-stp'';
deps = [ args."alexandria" args."babel" args."buildnode" args."cl-interpol" args."cl-ppcre" args."cl-unicode" args."closer-mop" args."closure-common" args."closure-html" args."collectors" args."css-selectors" args."cxml" args."cxml-stp" args."flexi-streams" args."iterate" args."named-readtables" args."parse-number" args."puri" args."split-sequence" args."swank" args."symbol-munger" args."trivial-features" args."trivial-gray-streams" args."xpath" args."yacc" ];
src = fetchurl {
- url = "http://beta.quicklisp.org/archive/css-selectors/2016-06-28/css-selectors-20160628-git.tgz";
- sha256 = "0y9q719w5cv4g7in731q5p98n7pznb05vr7i7wi92mmpah2g1w4b";
+ url = ''http://beta.quicklisp.org/archive/css-selectors/2016-06-28/css-selectors-20160628-git.tgz'';
+ sha256 = ''0y9q719w5cv4g7in731q5p98n7pznb05vr7i7wi92mmpah2g1w4b'';
};
packageName = "css-selectors-stp";
diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/css-selectors.nix b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/css-selectors.nix
index b18d3a03b6..aa523d6f83 100644
--- a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/css-selectors.nix
+++ b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/css-selectors.nix
@@ -1,17 +1,17 @@
args @ { fetchurl, ... }:
rec {
- baseName = "css-selectors";
- version = "20160628-git";
+ baseName = ''css-selectors'';
+ version = ''20160628-git'';
parasites = [ "css-selectors-test" ];
- description = "An implementation of css selectors";
+ description = ''An implementation of css selectors'';
deps = [ args."alexandria" args."babel" args."buildnode" args."buildnode-xhtml" args."cl-interpol" args."cl-ppcre" args."cl-unicode" args."closer-mop" args."closure-common" args."closure-html" args."collectors" args."cxml" args."flexi-streams" args."iterate" args."lisp-unit2" args."named-readtables" args."puri" args."split-sequence" args."swank" args."symbol-munger" args."trivial-features" args."trivial-gray-streams" args."yacc" ];
src = fetchurl {
- url = "http://beta.quicklisp.org/archive/css-selectors/2016-06-28/css-selectors-20160628-git.tgz";
- sha256 = "0y9q719w5cv4g7in731q5p98n7pznb05vr7i7wi92mmpah2g1w4b";
+ url = ''http://beta.quicklisp.org/archive/css-selectors/2016-06-28/css-selectors-20160628-git.tgz'';
+ sha256 = ''0y9q719w5cv4g7in731q5p98n7pznb05vr7i7wi92mmpah2g1w4b'';
};
packageName = "css-selectors";
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 4491687d61..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 = "20200325-git";
+ baseName = ''cxml-stp'';
+ version = ''20200325-git'';
parasites = [ "cxml-stp/test" ];
- description = "System lacks description";
+ description = ''System lacks description'';
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/2020-03-25/cxml-stp-20200325-git.tgz";
- sha256 = "1y26bksmysvxifqx4lslpbsdvmcqkf7di36a3yyqnjgrb5r0jv1n";
+ url = ''http://beta.quicklisp.org/archive/cxml-stp/2020-03-25/cxml-stp-20200325-git.tgz'';
+ sha256 = ''1y26bksmysvxifqx4lslpbsdvmcqkf7di36a3yyqnjgrb5r0jv1n'';
};
packageName = "cxml-stp";
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 cd7ac83f2e..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,17 +1,17 @@
args @ { fetchurl, ... }:
rec {
- baseName = "cxml";
- version = "20200610-git";
+ baseName = ''cxml'';
+ version = ''20200610-git'';
parasites = [ "cxml/dom" "cxml/klacks" "cxml/test" "cxml/xml" ];
- description = "Closure XML - a Common Lisp XML parser";
+ description = ''Closure XML - a Common Lisp XML parser'';
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/2020-06-10/cxml-20200610-git.tgz";
- sha256 = "0545rh4mfxqx2yn9b48s0hzd5w80kars7hpykbg0lgf7ys5218mq";
+ url = ''http://beta.quicklisp.org/archive/cxml/2020-06-10/cxml-20200610-git.tgz'';
+ sha256 = ''0545rh4mfxqx2yn9b48s0hzd5w80kars7hpykbg0lgf7ys5218mq'';
};
packageName = "cxml";
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 1b84a8c038..c971ac78ba 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-20200610-git";
+ baseName = ''dbd-mysql'';
+ version = ''cl-dbi-20210228-git'';
- description = "Database driver for MySQL.";
+ description = ''Database driver for MySQL.'';
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/2020-06-10/cl-dbi-20200610-git.tgz";
- sha256 = "1d7hwywcqzqwmr5b42c0mmjq3v3xxd4cwb4fn5k1wd7j6pr0bkas";
+ url = ''http://beta.quicklisp.org/archive/cl-dbi/2021-02-28/cl-dbi-20210228-git.tgz'';
+ sha256 = ''0yfs7k6samv6q0n1bvscvcck7qg3c4g03qn7i81619q7g2f98jdk'';
};
packageName = "dbd-mysql";
@@ -18,9 +18,9 @@ rec {
overrides = x: x;
}
/* (SYSTEM dbd-mysql DESCRIPTION Database driver for MySQL. SHA256
- 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
+ 0yfs7k6samv6q0n1bvscvcck7qg3c4g03qn7i81619q7g2f98jdk URL
+ http://beta.quicklisp.org/archive/cl-dbi/2021-02-28/cl-dbi-20210228-git.tgz
+ MD5 7cfb5ad172bc30906ae32ca620099a1f 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-mysql FILENAME cl-mysql)
@@ -30,5 +30,5 @@ rec {
DEPENDENCIES
(alexandria babel bordeaux-threads cffi cl-mysql closer-mop dbi
split-sequence trivial-features)
- VERSION cl-dbi-20200610-git SIBLINGS
+ VERSION cl-dbi-20210228-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 7590319fbc..d1f4ea485d 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-20200610-git";
+ baseName = ''dbd-postgres'';
+ version = ''cl-dbi-20210228-git'';
- description = "Database driver for PostgreSQL.";
+ description = ''Database driver for PostgreSQL.'';
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/2020-06-10/cl-dbi-20200610-git.tgz";
- sha256 = "1d7hwywcqzqwmr5b42c0mmjq3v3xxd4cwb4fn5k1wd7j6pr0bkas";
+ url = ''http://beta.quicklisp.org/archive/cl-dbi/2021-02-28/cl-dbi-20210228-git.tgz'';
+ sha256 = ''0yfs7k6samv6q0n1bvscvcck7qg3c4g03qn7i81619q7g2f98jdk'';
};
packageName = "dbd-postgres";
@@ -18,9 +18,9 @@ rec {
overrides = x: x;
}
/* (SYSTEM dbd-postgres DESCRIPTION Database driver for PostgreSQL. SHA256
- 1d7hwywcqzqwmr5b42c0mmjq3v3xxd4cwb4fn5k1wd7j6pr0bkas URL
- http://beta.quicklisp.org/archive/cl-dbi/2020-06-10/cl-dbi-20200610-git.tgz
- MD5 2caeb911b23327e054986211d6bfea55 NAME dbd-postgres FILENAME
+ 0yfs7k6samv6q0n1bvscvcck7qg3c4g03qn7i81619q7g2f98jdk URL
+ http://beta.quicklisp.org/archive/cl-dbi/2021-02-28/cl-dbi-20210228-git.tgz
+ MD5 7cfb5ad172bc30906ae32ca620099a1f NAME dbd-postgres FILENAME
dbd-postgres DEPS
((NAME alexandria FILENAME alexandria)
(NAME bordeaux-threads FILENAME bordeaux-threads)
@@ -34,5 +34,5 @@ rec {
DEPENDENCIES
(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
+ VERSION cl-dbi-20210228-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 b2a2641591..f57f81d87e 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-20200610-git";
+ baseName = ''dbd-sqlite3'';
+ version = ''cl-dbi-20210228-git'';
- description = "Database driver for SQLite3.";
+ description = ''Database driver for SQLite3.'';
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/2020-06-10/cl-dbi-20200610-git.tgz";
- sha256 = "1d7hwywcqzqwmr5b42c0mmjq3v3xxd4cwb4fn5k1wd7j6pr0bkas";
+ url = ''http://beta.quicklisp.org/archive/cl-dbi/2021-02-28/cl-dbi-20210228-git.tgz'';
+ sha256 = ''0yfs7k6samv6q0n1bvscvcck7qg3c4g03qn7i81619q7g2f98jdk'';
};
packageName = "dbd-sqlite3";
@@ -18,9 +18,9 @@ rec {
overrides = x: x;
}
/* (SYSTEM dbd-sqlite3 DESCRIPTION Database driver for SQLite3. SHA256
- 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
+ 0yfs7k6samv6q0n1bvscvcck7qg3c4g03qn7i81619q7g2f98jdk URL
+ http://beta.quicklisp.org/archive/cl-dbi/2021-02-28/cl-dbi-20210228-git.tgz
+ MD5 7cfb5ad172bc30906ae32ca620099a1f NAME dbd-sqlite3 FILENAME dbd-sqlite3
DEPS
((NAME alexandria FILENAME alexandria) (NAME babel FILENAME babel)
(NAME bordeaux-threads FILENAME bordeaux-threads)
@@ -33,5 +33,5 @@ rec {
DEPENDENCIES
(alexandria babel bordeaux-threads cffi closer-mop dbi iterate
split-sequence sqlite trivial-features trivial-garbage)
- VERSION cl-dbi-20200610-git SIBLINGS
+ VERSION cl-dbi-20210228-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
index f24003e87c..b8aff83451 100644
--- 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
@@ -1,15 +1,15 @@
args @ { fetchurl, ... }:
rec {
- baseName = "dbi-test";
- version = "cl-dbi-20200610-git";
+ baseName = ''dbi-test'';
+ version = ''cl-dbi-20210228-git'';
- description = "System lacks description";
+ 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";
+ url = ''http://beta.quicklisp.org/archive/cl-dbi/2021-02-28/cl-dbi-20210228-git.tgz'';
+ sha256 = ''0yfs7k6samv6q0n1bvscvcck7qg3c4g03qn7i81619q7g2f98jdk'';
};
packageName = "dbi-test";
@@ -18,9 +18,9 @@ rec {
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
+ 0yfs7k6samv6q0n1bvscvcck7qg3c4g03qn7i81619q7g2f98jdk URL
+ http://beta.quicklisp.org/archive/cl-dbi/2021-02-28/cl-dbi-20210228-git.tgz
+ MD5 7cfb5ad172bc30906ae32ca620099a1f 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)
@@ -31,5 +31,5 @@ rec {
DEPENDENCIES
(alexandria bordeaux-threads closer-mop dbi dissect rove split-sequence
trivial-gray-streams trivial-types)
- VERSION cl-dbi-20200610-git SIBLINGS
+ VERSION cl-dbi-20210228-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 b4f9fc45de..0f3c8ecf2f 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,17 +1,17 @@
args @ { fetchurl, ... }:
rec {
- baseName = "dbi";
- version = "cl-20200610-git";
+ baseName = ''dbi'';
+ version = ''cl-20210228-git'';
parasites = [ "dbi/test" ];
- description = "Database independent interface for Common Lisp";
+ description = ''Database independent interface for Common Lisp'';
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/2020-06-10/cl-dbi-20200610-git.tgz";
- sha256 = "1d7hwywcqzqwmr5b42c0mmjq3v3xxd4cwb4fn5k1wd7j6pr0bkas";
+ url = ''http://beta.quicklisp.org/archive/cl-dbi/2021-02-28/cl-dbi-20210228-git.tgz'';
+ sha256 = ''0yfs7k6samv6q0n1bvscvcck7qg3c4g03qn7i81619q7g2f98jdk'';
};
packageName = "dbi";
@@ -20,9 +20,9 @@ rec {
overrides = x: x;
}
/* (SYSTEM dbi DESCRIPTION Database independent interface for Common Lisp
- 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
+ SHA256 0yfs7k6samv6q0n1bvscvcck7qg3c4g03qn7i81619q7g2f98jdk URL
+ http://beta.quicklisp.org/archive/cl-dbi/2021-02-28/cl-dbi-20210228-git.tgz
+ MD5 7cfb5ad172bc30906ae32ca620099a1f NAME dbi FILENAME dbi DEPS
((NAME alexandria FILENAME alexandria)
(NAME bordeaux-threads FILENAME bordeaux-threads)
(NAME cl-mysql FILENAME cl-mysql) (NAME cl-postgres FILENAME cl-postgres)
@@ -37,5 +37,5 @@ rec {
(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
+ VERSION cl-20210228-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 b5ebe86a19..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 = "20200610-git";
+ baseName = ''dbus'';
+ version = ''20200610-git'';
- description = "A D-BUS client library for Common Lisp";
+ 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/2020-06-10/dbus-20200610-git.tgz";
- sha256 = "1njwjf1z9xngsfmlddmbcan49vcjqvvxfkhbi62xcxwbn9rgqn79";
+ url = ''http://beta.quicklisp.org/archive/dbus/2020-06-10/dbus-20200610-git.tgz'';
+ sha256 = ''1njwjf1z9xngsfmlddmbcan49vcjqvvxfkhbi62xcxwbn9rgqn79'';
};
packageName = "dbus";
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 d5af479b22..3622a4ad85 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 = "20200427-git";
+ baseName = ''dexador'';
+ version = ''20210228-git'';
- description = "Yet another HTTP client for Common Lisp";
+ 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-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/2020-04-27/dexador-20200427-git.tgz";
- sha256 = "0qy8x47ni270dzwscy86nkwfzn491w2jqwyg57dm6w8lkjzwpgld";
+ url = ''http://beta.quicklisp.org/archive/dexador/2021-02-28/dexador-20210228-git.tgz'';
+ sha256 = ''0glzvi7nbr58izpwr8xzxvlcc78zmgwqaik374rmcy6w89q5ksw7'';
};
packageName = "dexador";
@@ -18,9 +18,9 @@ rec {
overrides = x: x;
}
/* (SYSTEM dexador DESCRIPTION Yet another HTTP client for Common Lisp SHA256
- 0qy8x47ni270dzwscy86nkwfzn491w2jqwyg57dm6w8lkjzwpgld URL
- http://beta.quicklisp.org/archive/dexador/2020-04-27/dexador-20200427-git.tgz
- MD5 1c418ff2381f1fe128cde8c121effecb NAME dexador FILENAME dexador DEPS
+ 0glzvi7nbr58izpwr8xzxvlcc78zmgwqaik374rmcy6w89q5ksw7 URL
+ http://beta.quicklisp.org/archive/dexador/2021-02-28/dexador-20210228-git.tgz
+ MD5 e3b69c8ceb78d99351e574c40dfd0e12 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)
@@ -47,4 +47,4 @@ rec {
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 20200427-git SIBLINGS (dexador-test) PARASITES NIL) */
+ VERSION 20210228-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 54f55a4d3e..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 = "20200427-git";
+ baseName = ''dissect'';
+ version = ''20200427-git'';
- description = "A lib for introspecting the call stack and active restarts.";
+ description = ''A lib for introspecting the call stack and active restarts.'';
deps = [ ];
src = fetchurl {
- url = "http://beta.quicklisp.org/archive/dissect/2020-04-27/dissect-20200427-git.tgz";
- sha256 = "1d7sri20jma9r105lxv0sx2q60kb8zp7bf023kain3rnyqr74v8a";
+ url = ''http://beta.quicklisp.org/archive/dissect/2020-04-27/dissect-20200427-git.tgz'';
+ sha256 = ''1d7sri20jma9r105lxv0sx2q60kb8zp7bf023kain3rnyqr74v8a'';
};
packageName = "dissect";
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
index 7010a186bf..765e3a996d 100644
--- 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
@@ -1,15 +1,15 @@
args @ { fetchurl, ... }:
rec {
- baseName = "djula";
- version = "20201016-git";
+ baseName = ''djula'';
+ version = ''20210124-git'';
- description = "An implementation of Django templates for Common Lisp.";
+ 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";
+ url = ''http://beta.quicklisp.org/archive/djula/2021-01-24/djula-20210124-git.tgz'';
+ sha256 = ''0hkyp5himz73r2l3vbwkwsd1as4f75ih6wh7v1wbabpbjwh2j2vx'';
};
packageName = "djula";
@@ -19,9 +19,9 @@ rec {
}
/* (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
+ 0hkyp5himz73r2l3vbwkwsd1as4f75ih6wh7v1wbabpbjwh2j2vx URL
+ http://beta.quicklisp.org/archive/djula/2021-01-24/djula-20210124-git.tgz
+ MD5 33ab6232122ccb88a53c51517b0c2bba 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)
@@ -50,4 +50,4 @@ rec {
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) */
+ VERSION 20210124-git SIBLINGS (djula-demo djula-test) PARASITES NIL) */
diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/do-urlencode.nix b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/do-urlencode.nix
index 09a27df91e..3dbacdf0f8 100644
--- a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/do-urlencode.nix
+++ b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/do-urlencode.nix
@@ -1,15 +1,15 @@
args @ { fetchurl, ... }:
rec {
- baseName = "do-urlencode";
- version = "20181018-git";
+ baseName = ''do-urlencode'';
+ version = ''20181018-git'';
- description = "Percent Encoding (aka URL Encoding) library";
+ description = ''Percent Encoding (aka URL Encoding) library'';
deps = [ args."alexandria" args."babel" args."trivial-features" ];
src = fetchurl {
- url = "http://beta.quicklisp.org/archive/do-urlencode/2018-10-18/do-urlencode-20181018-git.tgz";
- sha256 = "1cajd219s515y65kp562c6xczqaq0p4lyp13iv00z6i44rijmfp2";
+ url = ''http://beta.quicklisp.org/archive/do-urlencode/2018-10-18/do-urlencode-20181018-git.tgz'';
+ sha256 = ''1cajd219s515y65kp562c6xczqaq0p4lyp13iv00z6i44rijmfp2'';
};
packageName = "do-urlencode";
diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/documentation-utils.nix b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/documentation-utils.nix
index 27e05af70b..7c25ed9a03 100644
--- a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/documentation-utils.nix
+++ b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/documentation-utils.nix
@@ -1,15 +1,15 @@
args @ { fetchurl, ... }:
rec {
- baseName = "documentation-utils";
- version = "20190710-git";
+ baseName = ''documentation-utils'';
+ version = ''20190710-git'';
- description = "A few simple tools to help you with documenting your library.";
+ description = ''A few simple tools to help you with documenting your library.'';
deps = [ args."trivial-indent" ];
src = fetchurl {
- url = "http://beta.quicklisp.org/archive/documentation-utils/2019-07-10/documentation-utils-20190710-git.tgz";
- sha256 = "1n3z8sw75k2jjpsg6ch5g9s4v56y96dbs4338ajrfdsk3pk4wgj3";
+ url = ''http://beta.quicklisp.org/archive/documentation-utils/2019-07-10/documentation-utils-20190710-git.tgz'';
+ sha256 = ''1n3z8sw75k2jjpsg6ch5g9s4v56y96dbs4338ajrfdsk3pk4wgj3'';
};
packageName = "documentation-utils";
diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/drakma.nix b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/drakma.nix
index 7ba2b4f9a3..e880d94f43 100644
--- a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/drakma.nix
+++ b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/drakma.nix
@@ -1,15 +1,15 @@
args @ { fetchurl, ... }:
rec {
- baseName = "drakma";
- version = "v2.0.7";
+ baseName = ''drakma'';
+ version = ''v2.0.7'';
- description = "Full-featured http/https client based on usocket";
+ description = ''Full-featured http/https client based on usocket'';
deps = [ args."alexandria" args."babel" args."bordeaux-threads" args."cffi" args."chipz" args."chunga" args."cl_plus_ssl" args."cl-base64" args."cl-ppcre" args."flexi-streams" args."puri" args."split-sequence" args."trivial-features" args."trivial-garbage" args."trivial-gray-streams" args."usocket" ];
src = fetchurl {
- url = "http://beta.quicklisp.org/archive/drakma/2019-11-30/drakma-v2.0.7.tgz";
- sha256 = "1r0sh0nsx7fq24yybazjw8n7grk1b85l52x523axwchnnaj58kzw";
+ url = ''http://beta.quicklisp.org/archive/drakma/2019-11-30/drakma-v2.0.7.tgz'';
+ sha256 = ''1r0sh0nsx7fq24yybazjw8n7grk1b85l52x523axwchnnaj58kzw'';
};
packageName = "drakma";
diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/eager-future2.nix b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/eager-future2.nix
new file mode 100644
index 0000000000..eb240954b8
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/eager-future2.nix
@@ -0,0 +1,30 @@
+args @ { fetchurl, ... }:
+rec {
+ baseName = ''eager-future2'';
+ version = ''20191130-git'';
+
+ description = ''Parallel programming library providing the futures/promises synchronization mechanism'';
+
+ deps = [ args."alexandria" args."bordeaux-threads" args."trivial-garbage" ];
+
+ src = fetchurl {
+ url = ''http://beta.quicklisp.org/archive/eager-future2/2019-11-30/eager-future2-20191130-git.tgz'';
+ sha256 = ''01pvgcp6d4hz1arpvsv73m8xnbv8qm2d0qychpxc72d0m71p6ks0'';
+ };
+
+ packageName = "eager-future2";
+
+ asdFilesToKeep = ["eager-future2.asd"];
+ overrides = x: x;
+}
+/* (SYSTEM eager-future2 DESCRIPTION
+ Parallel programming library providing the futures/promises synchronization mechanism
+ SHA256 01pvgcp6d4hz1arpvsv73m8xnbv8qm2d0qychpxc72d0m71p6ks0 URL
+ http://beta.quicklisp.org/archive/eager-future2/2019-11-30/eager-future2-20191130-git.tgz
+ MD5 72298620b0fb2f874d86d887cce4acf0 NAME eager-future2 FILENAME
+ eager-future2 DEPS
+ ((NAME alexandria FILENAME alexandria)
+ (NAME bordeaux-threads FILENAME bordeaux-threads)
+ (NAME trivial-garbage FILENAME trivial-garbage))
+ DEPENDENCIES (alexandria bordeaux-threads trivial-garbage) VERSION
+ 20191130-git SIBLINGS (test.eager-future2) 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
index f0bdf6d037..a5e44cefa4 100644
--- 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
@@ -1,15 +1,15 @@
args @ { fetchurl, ... }:
rec {
- baseName = "enchant";
- version = "cl-20190521-git";
+ baseName = ''enchant'';
+ version = ''cl-20190521-git'';
- description = "Programming interface for Enchant spell-checker library";
+ 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";
+ url = ''http://beta.quicklisp.org/archive/cl-enchant/2019-05-21/cl-enchant-20190521-git.tgz'';
+ sha256 = ''16ag48fr74m536an8fak5z0lfjdb265gv1ajai1lqg0vq2l5mr14'';
};
packageName = "enchant";
diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/esrap-peg.nix b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/esrap-peg.nix
index 367e268f34..5f5f9828cb 100644
--- a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/esrap-peg.nix
+++ b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/esrap-peg.nix
@@ -1,15 +1,15 @@
args @ { fetchurl, ... }:
rec {
- baseName = "esrap-peg";
- version = "20191007-git";
+ baseName = ''esrap-peg'';
+ version = ''20191007-git'';
- description = "A wrapper around Esrap to allow generating Esrap grammars from PEG definitions";
+ description = ''A wrapper around Esrap to allow generating Esrap grammars from PEG definitions'';
- deps = [ args."alexandria" args."cl-unification" args."esrap" args."iterate" ];
+ deps = [ args."alexandria" args."cl-unification" args."esrap" args."iterate" args."trivial-with-current-source-form" ];
src = fetchurl {
- url = "http://beta.quicklisp.org/archive/esrap-peg/2019-10-07/esrap-peg-20191007-git.tgz";
- sha256 = "0285ngcm73rpzmr0ydy6frps2b4q6n4jymjv3ncwsh81x5blfvis";
+ url = ''http://beta.quicklisp.org/archive/esrap-peg/2019-10-07/esrap-peg-20191007-git.tgz'';
+ sha256 = ''0285ngcm73rpzmr0ydy6frps2b4q6n4jymjv3ncwsh81x5blfvis'';
};
packageName = "esrap-peg";
@@ -24,6 +24,9 @@ rec {
MD5 48d87d3118febeefc23ca3a8dda36fc0 NAME esrap-peg FILENAME esrap-peg DEPS
((NAME alexandria FILENAME alexandria)
(NAME cl-unification FILENAME cl-unification) (NAME esrap FILENAME esrap)
- (NAME iterate FILENAME iterate))
- DEPENDENCIES (alexandria cl-unification esrap iterate) VERSION 20191007-git
- SIBLINGS NIL PARASITES NIL) */
+ (NAME iterate FILENAME iterate)
+ (NAME trivial-with-current-source-form FILENAME
+ trivial-with-current-source-form))
+ DEPENDENCIES
+ (alexandria cl-unification esrap iterate trivial-with-current-source-form)
+ VERSION 20191007-git SIBLINGS NIL PARASITES NIL) */
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 7eca78ca53..7e887f9241 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,17 +1,17 @@
args @ { fetchurl, ... }:
rec {
- baseName = "esrap";
- version = "20200325-git";
+ baseName = ''esrap'';
+ version = ''20201220-git'';
parasites = [ "esrap/tests" ];
- description = "A Packrat / Parsing Grammar / TDPL parser for Common Lisp.";
+ description = ''A Packrat / Parsing Grammar / TDPL parser for Common Lisp.'';
- deps = [ args."alexandria" args."fiveam" ];
+ deps = [ args."alexandria" args."fiveam" args."trivial-with-current-source-form" ];
src = fetchurl {
- url = "http://beta.quicklisp.org/archive/esrap/2020-03-25/esrap-20200325-git.tgz";
- sha256 = "1pwgjsm19nxx8d4iwbn3x7g08r6qyq1vmp9m83m87r53597b3a68";
+ url = ''http://beta.quicklisp.org/archive/esrap/2020-12-20/esrap-20201220-git.tgz'';
+ sha256 = ''0yhi4ay98i81nqv9yjlj321azwmiylsw0afdd6y1c1zflfcrzkrk'';
};
packageName = "esrap";
@@ -21,9 +21,11 @@ rec {
}
/* (SYSTEM esrap DESCRIPTION
A Packrat / Parsing Grammar / TDPL parser for Common Lisp. SHA256
- 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 20200325-git SIBLINGS NIL
- PARASITES (esrap/tests)) */
+ 0yhi4ay98i81nqv9yjlj321azwmiylsw0afdd6y1c1zflfcrzkrk URL
+ http://beta.quicklisp.org/archive/esrap/2020-12-20/esrap-20201220-git.tgz
+ MD5 cc33cc8dbc236403f6b285c8eae0ce3b NAME esrap FILENAME esrap DEPS
+ ((NAME alexandria FILENAME alexandria) (NAME fiveam FILENAME fiveam)
+ (NAME trivial-with-current-source-form FILENAME
+ trivial-with-current-source-form))
+ DEPENDENCIES (alexandria fiveam trivial-with-current-source-form) VERSION
+ 20201220-git SIBLINGS NIL PARASITES (esrap/tests)) */
diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/external-program.nix b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/external-program.nix
index f0936fe5c4..4fd7523425 100644
--- a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/external-program.nix
+++ b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/external-program.nix
@@ -1,17 +1,17 @@
args @ { fetchurl, ... }:
rec {
- baseName = "external-program";
- version = "20190307-git";
+ baseName = ''external-program'';
+ version = ''20190307-git'';
parasites = [ "external-program-test" ];
- description = "System lacks description";
+ description = ''System lacks description'';
deps = [ args."fiveam" args."trivial-features" ];
src = fetchurl {
- url = "http://beta.quicklisp.org/archive/external-program/2019-03-07/external-program-20190307-git.tgz";
- sha256 = "1nl3mngh7vp2l9mfbdhni4nc164zznafnl74p1kv9j07n5fcpnyz";
+ url = ''http://beta.quicklisp.org/archive/external-program/2019-03-07/external-program-20190307-git.tgz'';
+ sha256 = ''1nl3mngh7vp2l9mfbdhni4nc164zznafnl74p1kv9j07n5fcpnyz'';
};
packageName = "external-program";
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
index 8c088a149f..67d75b89db 100644
--- 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
@@ -1,15 +1,15 @@
args @ { fetchurl, ... }:
rec {
- baseName = "fare-csv";
- version = "20171227-git";
+ baseName = ''fare-csv'';
+ version = ''20171227-git'';
- description = "Robust CSV parser and printer";
+ 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";
+ url = ''http://beta.quicklisp.org/archive/fare-csv/2017-12-27/fare-csv-20171227-git.tgz'';
+ sha256 = ''1hkzg05kq2c4xihsfx4wk1k6mmjq2fw40id8vy0315rpa47a5i7x'';
};
packageName = "fare-csv";
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
index 929f0f820b..a5cec39c15 100644
--- 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
@@ -1,15 +1,15 @@
args @ { fetchurl, ... }:
rec {
- baseName = "fare-mop";
- version = "20151218-git";
+ baseName = ''fare-mop'';
+ version = ''20151218-git'';
- description = "Utilities using the MOP; notably make informative pretty-printing trivial";
+ 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";
+ url = ''http://beta.quicklisp.org/archive/fare-mop/2015-12-18/fare-mop-20151218-git.tgz'';
+ sha256 = ''0bvrwqvacy114xsblrk2w28qk6b484a3p0w14mzl264b3wjrdna9'';
};
packageName = "fare-mop";
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 1b9be4dea1..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-20200925-git";
+ baseName = ''fare-quasiquote-extras'';
+ version = ''fare-quasiquote-20200925-git'';
- description = "fare-quasiquote plus extras";
+ 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."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/2020-09-25/fare-quasiquote-20200925-git.tgz";
- sha256 = "0k25kx4gvr046bcnv5mqxbb4483v9p2lk7dvzjkgj2cxrvczmj8b";
+ url = ''http://beta.quicklisp.org/archive/fare-quasiquote/2020-09-25/fare-quasiquote-20200925-git.tgz'';
+ sha256 = ''0k25kx4gvr046bcnv5mqxbb4483v9p2lk7dvzjkgj2cxrvczmj8b'';
};
packageName = "fare-quasiquote-extras";
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 2f1c97bbb6..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-20200925-git";
+ baseName = ''fare-quasiquote-optima'';
+ version = ''fare-quasiquote-20200925-git'';
- description = "fare-quasiquote extension for optima";
+ description = ''fare-quasiquote extension for 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/2020-09-25/fare-quasiquote-20200925-git.tgz";
- sha256 = "0k25kx4gvr046bcnv5mqxbb4483v9p2lk7dvzjkgj2cxrvczmj8b";
+ url = ''http://beta.quicklisp.org/archive/fare-quasiquote/2020-09-25/fare-quasiquote-20200925-git.tgz'';
+ sha256 = ''0k25kx4gvr046bcnv5mqxbb4483v9p2lk7dvzjkgj2cxrvczmj8b'';
};
packageName = "fare-quasiquote-optima";
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 47c7c3851b..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-20200925-git";
+ baseName = ''fare-quasiquote-readtable'';
+ version = ''fare-quasiquote-20200925-git'';
- description = "Using fare-quasiquote with named-readtable";
+ 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/2020-09-25/fare-quasiquote-20200925-git.tgz";
- sha256 = "0k25kx4gvr046bcnv5mqxbb4483v9p2lk7dvzjkgj2cxrvczmj8b";
+ url = ''http://beta.quicklisp.org/archive/fare-quasiquote/2020-09-25/fare-quasiquote-20200925-git.tgz'';
+ sha256 = ''0k25kx4gvr046bcnv5mqxbb4483v9p2lk7dvzjkgj2cxrvczmj8b'';
};
packageName = "fare-quasiquote-readtable";
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 3560c48fee..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 = "20200925-git";
+ baseName = ''fare-quasiquote'';
+ version = ''20200925-git'';
- description = "Portable, matchable implementation of quasiquote";
+ description = ''Portable, matchable implementation of quasiquote'';
deps = [ args."fare-utils" ];
src = fetchurl {
- url = "http://beta.quicklisp.org/archive/fare-quasiquote/2020-09-25/fare-quasiquote-20200925-git.tgz";
- sha256 = "0k25kx4gvr046bcnv5mqxbb4483v9p2lk7dvzjkgj2cxrvczmj8b";
+ url = ''http://beta.quicklisp.org/archive/fare-quasiquote/2020-09-25/fare-quasiquote-20200925-git.tgz'';
+ sha256 = ''0k25kx4gvr046bcnv5mqxbb4483v9p2lk7dvzjkgj2cxrvczmj8b'';
};
packageName = "fare-quasiquote";
diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/fare-utils.nix b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/fare-utils.nix
index b4e77dad91..d7af897eaf 100644
--- a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/fare-utils.nix
+++ b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/fare-utils.nix
@@ -1,15 +1,15 @@
args @ { fetchurl, ... }:
rec {
- baseName = "fare-utils";
- version = "20170124-git";
+ baseName = ''fare-utils'';
+ version = ''20170124-git'';
- description = "Basic functions and macros, interfaces, pure and stateful datastructures";
+ description = ''Basic functions and macros, interfaces, pure and stateful datastructures'';
deps = [ ];
src = fetchurl {
- url = "http://beta.quicklisp.org/archive/fare-utils/2017-01-24/fare-utils-20170124-git.tgz";
- sha256 = "0jhb018ccn3spkgjywgd0524m5qacn8x15fdiban4zz3amj9dapq";
+ url = ''http://beta.quicklisp.org/archive/fare-utils/2017-01-24/fare-utils-20170124-git.tgz'';
+ sha256 = ''0jhb018ccn3spkgjywgd0524m5qacn8x15fdiban4zz3amj9dapq'';
};
packageName = "fare-utils";
diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/fast-http.nix b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/fast-http.nix
index 345b94124d..cea5d251d7 100644
--- a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/fast-http.nix
+++ b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/fast-http.nix
@@ -1,15 +1,15 @@
args @ { fetchurl, ... }:
rec {
- baseName = "fast-http";
- version = "20191007-git";
+ baseName = ''fast-http'';
+ version = ''20191007-git'';
- description = "A fast HTTP protocol parser in Common Lisp";
+ description = ''A fast HTTP protocol parser in Common Lisp'';
deps = [ args."alexandria" args."babel" args."cl-utilities" args."flexi-streams" args."proc-parse" args."smart-buffer" args."trivial-features" args."trivial-gray-streams" args."xsubseq" ];
src = fetchurl {
- url = "http://beta.quicklisp.org/archive/fast-http/2019-10-07/fast-http-20191007-git.tgz";
- sha256 = "00qnl56cfss2blm4pp03dwv84bmkyd0kbarhahclxbn8f7pgwf32";
+ url = ''http://beta.quicklisp.org/archive/fast-http/2019-10-07/fast-http-20191007-git.tgz'';
+ sha256 = ''00qnl56cfss2blm4pp03dwv84bmkyd0kbarhahclxbn8f7pgwf32'';
};
packageName = "fast-http";
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 22ccfd78de..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 = "20200925-git";
+ baseName = ''fast-io'';
+ version = ''20200925-git'';
- description = "Alternative I/O mechanism to a stream or vector";
+ 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/2020-09-25/fast-io-20200925-git.tgz";
- sha256 = "1rgyr6y20fp3jqnx5snpjf9lngzalip2a28l04ssypwagmhaa975";
+ url = ''http://beta.quicklisp.org/archive/fast-io/2020-09-25/fast-io-20200925-git.tgz'';
+ sha256 = ''1rgyr6y20fp3jqnx5snpjf9lngzalip2a28l04ssypwagmhaa975'';
};
packageName = "fast-io";
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 ab8118deac..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,17 +1,17 @@
args @ { fetchurl, ... }:
rec {
- baseName = "fiasco";
- version = "20200610-git";
+ baseName = ''fiasco'';
+ version = ''20200610-git'';
parasites = [ "fiasco-self-tests" ];
- description = "A Common Lisp test framework that treasures your failures, logical continuation of Stefil.";
+ description = ''A Common Lisp test framework that treasures your failures, logical continuation of Stefil.'';
deps = [ args."alexandria" args."trivial-gray-streams" ];
src = fetchurl {
- url = "http://beta.quicklisp.org/archive/fiasco/2020-06-10/fiasco-20200610-git.tgz";
- sha256 = "1wb0ibw6ka9fbsb40zjipn7vh3jbzyfsvcc9gq19nqhbqa8gy9r4";
+ url = ''http://beta.quicklisp.org/archive/fiasco/2020-06-10/fiasco-20200610-git.tgz'';
+ sha256 = ''1wb0ibw6ka9fbsb40zjipn7vh3jbzyfsvcc9gq19nqhbqa8gy9r4'';
};
packageName = "fiasco";
diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/file-attributes.nix b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/file-attributes.nix
new file mode 100644
index 0000000000..1c8e487978
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/file-attributes.nix
@@ -0,0 +1,33 @@
+args @ { fetchurl, ... }:
+rec {
+ baseName = ''file-attributes'';
+ version = ''20200925-git'';
+
+ description = ''Access to file attributes (uid, gid, atime, mtime, mod)'';
+
+ deps = [ args."alexandria" args."babel" args."cffi" args."documentation-utils" args."trivial-features" args."trivial-indent" ];
+
+ src = fetchurl {
+ url = ''http://beta.quicklisp.org/archive/file-attributes/2020-09-25/file-attributes-20200925-git.tgz'';
+ sha256 = ''0wq3gs36zwl8dzknj3c794l60vg1zpf0siwhd7ad9pn81v3mdan7'';
+ };
+
+ packageName = "file-attributes";
+
+ asdFilesToKeep = ["file-attributes.asd"];
+ overrides = x: x;
+}
+/* (SYSTEM file-attributes DESCRIPTION
+ Access to file attributes (uid, gid, atime, mtime, mod) SHA256
+ 0wq3gs36zwl8dzknj3c794l60vg1zpf0siwhd7ad9pn81v3mdan7 URL
+ http://beta.quicklisp.org/archive/file-attributes/2020-09-25/file-attributes-20200925-git.tgz
+ MD5 368468453cf57ecc29fa75f2a030a738 NAME file-attributes FILENAME
+ file-attributes DEPS
+ ((NAME alexandria FILENAME alexandria) (NAME babel FILENAME babel)
+ (NAME cffi FILENAME cffi)
+ (NAME documentation-utils FILENAME documentation-utils)
+ (NAME trivial-features FILENAME trivial-features)
+ (NAME trivial-indent FILENAME trivial-indent))
+ DEPENDENCIES
+ (alexandria babel cffi documentation-utils trivial-features trivial-indent)
+ VERSION 20200925-git SIBLINGS NIL PARASITES NIL) */
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 d02f9de5b0..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,17 +1,17 @@
args @ { fetchurl, ... }:
rec {
- baseName = "fiveam";
- version = "20200925-git";
+ baseName = ''fiveam'';
+ version = ''20200925-git'';
parasites = [ "fiveam/test" ];
- description = "A simple regression testing framework";
+ description = ''A simple regression testing framework'';
deps = [ args."alexandria" args."net_dot_didierverna_dot_asdf-flv" args."trivial-backtrace" ];
src = fetchurl {
- url = "http://beta.quicklisp.org/archive/fiveam/2020-09-25/fiveam-20200925-git.tgz";
- sha256 = "0j9dzjs4prlx33f5idbcic4amx2mcgnjcyrpc3dd4b7lrw426l0d";
+ url = ''http://beta.quicklisp.org/archive/fiveam/2020-09-25/fiveam-20200925-git.tgz'';
+ sha256 = ''0j9dzjs4prlx33f5idbcic4amx2mcgnjcyrpc3dd4b7lrw426l0d'';
};
packageName = "fiveam";
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 328c91cd2b..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,17 +1,17 @@
args @ { fetchurl, ... }:
rec {
- baseName = "flexi-streams";
- version = "20200925-git";
+ baseName = ''flexi-streams'';
+ version = ''20200925-git'';
parasites = [ "flexi-streams-test" ];
- description = "Flexible bivalent streams for Common Lisp";
+ description = ''Flexible bivalent streams for Common Lisp'';
deps = [ args."trivial-gray-streams" ];
src = fetchurl {
- url = "http://beta.quicklisp.org/archive/flexi-streams/2020-09-25/flexi-streams-20200925-git.tgz";
- sha256 = "1hmsryfkjnk4gdv803s3hpp71fpdybfl1jb5hgngxpd5lsrq0gb2";
+ url = ''http://beta.quicklisp.org/archive/flexi-streams/2020-09-25/flexi-streams-20200925-git.tgz'';
+ sha256 = ''1hmsryfkjnk4gdv803s3hpp71fpdybfl1jb5hgngxpd5lsrq0gb2'';
};
packageName = "flexi-streams";
diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/form-fiddle.nix b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/form-fiddle.nix
index 56de0edc9c..90ce8b83dd 100644
--- a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/form-fiddle.nix
+++ b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/form-fiddle.nix
@@ -1,15 +1,15 @@
args @ { fetchurl, ... }:
rec {
- baseName = "form-fiddle";
- version = "20190710-git";
+ baseName = ''form-fiddle'';
+ version = ''20190710-git'';
- description = "A collection of utilities to destructure lambda forms.";
+ description = ''A collection of utilities to destructure lambda forms.'';
deps = [ args."documentation-utils" args."trivial-indent" ];
src = fetchurl {
- url = "http://beta.quicklisp.org/archive/form-fiddle/2019-07-10/form-fiddle-20190710-git.tgz";
- sha256 = "12zmqm2vls043kaka7jp6pnsvkxlyv6x183yjyrs8jk461qfydwl";
+ url = ''http://beta.quicklisp.org/archive/form-fiddle/2019-07-10/form-fiddle-20190710-git.tgz'';
+ sha256 = ''12zmqm2vls043kaka7jp6pnsvkxlyv6x183yjyrs8jk461qfydwl'';
};
packageName = "form-fiddle";
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 20f41296a8..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,7 +1,7 @@
args @ { fetchurl, ... }:
rec {
- baseName = "fset";
- version = "20200925-git";
+ baseName = ''fset'';
+ version = ''20200925-git'';
parasites = [ "fset/test" ];
@@ -12,8 +12,8 @@ See: http://www.ergy.com/FSet.html
deps = [ args."misc-extensions" args."mt19937" args."named-readtables" ];
src = fetchurl {
- url = "http://beta.quicklisp.org/archive/fset/2020-09-25/fset-20200925-git.tgz";
- sha256 = "19fr6ds1a493b0kbsligpn7i771r1yfshbbkdp0hxs4l792l05wv";
+ url = ''http://beta.quicklisp.org/archive/fset/2020-09-25/fset-20200925-git.tgz'';
+ sha256 = ''19fr6ds1a493b0kbsligpn7i771r1yfshbbkdp0hxs4l792l05wv'';
};
packageName = "fset";
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
index 0a9d812d5f..ffc517973d 100644
--- 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
@@ -1,15 +1,15 @@
args @ { fetchurl, ... }:
rec {
- baseName = "gettext";
- version = "20171130-git";
+ 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.";
+ 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";
+ url = ''http://beta.quicklisp.org/archive/gettext/2017-11-30/gettext-20171130-git.tgz'';
+ sha256 = ''0nb8i66sb5qmpnk6rk2adlr87m322bra0xpirp63872mybd3y6yd'';
};
packageName = "gettext";
diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/global-vars.nix b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/global-vars.nix
index a4d135188f..42cdca06d9 100644
--- a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/global-vars.nix
+++ b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/global-vars.nix
@@ -1,15 +1,15 @@
args @ { fetchurl, ... }:
rec {
- baseName = "global-vars";
- version = "20141106-git";
+ baseName = ''global-vars'';
+ version = ''20141106-git'';
- description = "Define efficient global variables.";
+ description = ''Define efficient global variables.'';
deps = [ ];
src = fetchurl {
- url = "http://beta.quicklisp.org/archive/global-vars/2014-11-06/global-vars-20141106-git.tgz";
- sha256 = "0bjgmsifs9vrq409rfrsgrhlxwklvls1dpvh2d706i0incxq957j";
+ url = ''http://beta.quicklisp.org/archive/global-vars/2014-11-06/global-vars-20141106-git.tgz'';
+ sha256 = ''0bjgmsifs9vrq409rfrsgrhlxwklvls1dpvh2d706i0incxq957j'';
};
packageName = "global-vars";
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
index 646bcff472..9f4672644f 100644
--- 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
@@ -1,15 +1,15 @@
args @ { fetchurl, ... }:
rec {
- baseName = "html-encode";
- version = "1.2";
+ baseName = ''html-encode'';
+ version = ''1.2'';
- description = "A library for encoding text in various web-savvy encodings.";
+ 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";
+ url = ''http://beta.quicklisp.org/archive/html-encode/2010-10-06/html-encode-1.2.tgz'';
+ sha256 = ''06mf8wn95yf5swhmzk4vp0xr4ylfl33dgfknkabbkd8n6jns8gcf'';
};
packageName = "html-encode";
diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/http-body.nix b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/http-body.nix
index 09ba474e5a..4242d95904 100644
--- a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/http-body.nix
+++ b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/http-body.nix
@@ -1,15 +1,15 @@
args @ { fetchurl, ... }:
rec {
- baseName = "http-body";
- version = "20190813-git";
+ baseName = ''http-body'';
+ version = ''20190813-git'';
- description = "HTTP POST data parser for Common Lisp";
+ description = ''HTTP POST data parser for Common Lisp'';
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."cl-utilities" args."fast-http" args."fast-io" args."flexi-streams" args."jonathan" args."named-readtables" args."proc-parse" args."quri" args."smart-buffer" args."split-sequence" args."static-vectors" args."trivial-features" args."trivial-gray-streams" args."trivial-types" args."xsubseq" ];
src = fetchurl {
- url = "http://beta.quicklisp.org/archive/http-body/2019-08-13/http-body-20190813-git.tgz";
- sha256 = "1mc4xinqnvjr7cdyaywdb5lv9k34pal7lhp6f9a660r1rbxybvy8";
+ url = ''http://beta.quicklisp.org/archive/http-body/2019-08-13/http-body-20190813-git.tgz'';
+ sha256 = ''1mc4xinqnvjr7cdyaywdb5lv9k34pal7lhp6f9a660r1rbxybvy8'';
};
packageName = "http-body";
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 ed8b80752d..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 = "20200925-darcs";
+ baseName = ''hu_dot_dwim_dot_asdf'';
+ version = ''20200925-darcs'';
- description = "Various ASDF extensions such as attached test and documentation system, explicit development support, etc.";
+ 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/2020-09-25/hu.dwim.asdf-20200925-darcs.tgz";
- sha256 = "1812gk65x8yy8s817zhzga52zvdlagws4sw6a8f6zk7yaaa6br8h";
+ url = ''http://beta.quicklisp.org/archive/hu.dwim.asdf/2020-09-25/hu.dwim.asdf-20200925-darcs.tgz'';
+ sha256 = ''1812gk65x8yy8s817zhzga52zvdlagws4sw6a8f6zk7yaaa6br8h'';
};
packageName = "hu.dwim.asdf";
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
index 13f4d11fb5..46a5cb48ea 100644
--- 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
@@ -1,15 +1,15 @@
args @ { fetchurl, ... }:
rec {
- baseName = "hu_dot_dwim_dot_defclass-star";
- version = "20150709-darcs";
+ baseName = ''hu_dot_dwim_dot_defclass-star'';
+ version = ''stable-git'';
- description = "Simplify class like definitions with defclass* and friends.";
+ 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";
+ url = ''http://beta.quicklisp.org/archive/hu.dwim.defclass-star/2021-02-28/hu.dwim.defclass-star-stable-git.tgz'';
+ sha256 = ''1zj4c9pz7y69gclyd7kzf6d6s1r0am49czgvp2axbv7w50j5caf9'';
};
packageName = "hu.dwim.defclass-star";
@@ -19,12 +19,12 @@ rec {
}
/* (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
+ 1zj4c9pz7y69gclyd7kzf6d6s1r0am49czgvp2axbv7w50j5caf9 URL
+ http://beta.quicklisp.org/archive/hu.dwim.defclass-star/2021-02-28/hu.dwim.defclass-star-stable-git.tgz
+ MD5 adb295fecbe4570f4c03dbd857b2ddbc 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.asdf) VERSION stable-git 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)
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 af6529582a..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 = "20200218-darcs";
+ baseName = ''hu_dot_dwim_dot_stefil'';
+ version = ''20200218-darcs'';
parasites = [ "hu.dwim.stefil/test" ];
- description = "A Simple Test Framework In Lisp.";
+ description = ''A Simple Test Framework In Lisp.'';
deps = [ args."alexandria" ];
src = fetchurl {
- url = "http://beta.quicklisp.org/archive/hu.dwim.stefil/2020-02-18/hu.dwim.stefil-20200218-darcs.tgz";
- sha256 = "16p25pq9fhk0dny6r43yl9z24g6qm6dag9zf2cila9v9jh3r76qf";
+ url = ''http://beta.quicklisp.org/archive/hu.dwim.stefil/2020-02-18/hu.dwim.stefil-20200218-darcs.tgz'';
+ sha256 = ''16p25pq9fhk0dny6r43yl9z24g6qm6dag9zf2cila9v9jh3r76qf'';
};
packageName = "hu.dwim.stefil";
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 883d755490..1ef97864a5 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,20 +1,20 @@
args @ { fetchurl, ... }:
rec {
- baseName = "hunchentoot";
- version = "v1.3.0";
+ baseName = ''hunchentoot'';
+ version = ''v1.3.0'';
- parasites = [ "hunchentoot-test" ];
+ parasites = [ "hunchentoot-dev" "hunchentoot-test" ];
description = ''Hunchentoot is a HTTP server based on USOCKET and
BORDEAUX-THREADS. It supports HTTP 1.1, serves static files, has a
simple framework for user-defined handlers and can be extended
through subclassing.'';
- 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" ];
+ 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."cxml-stp" args."drakma" args."flexi-streams" args."md5" args."rfc2388" args."split-sequence" args."swank" args."trivial-backtrace" args."trivial-features" args."trivial-garbage" args."trivial-gray-streams" args."usocket" args."xpath" ];
src = fetchurl {
- url = "http://beta.quicklisp.org/archive/hunchentoot/2020-06-10/hunchentoot-v1.3.0.tgz";
- sha256 = "08znpi5lq2dhgv6mhvabk3w4ggrg31dbv4k6gmshr18xd2lq43i8";
+ url = ''http://beta.quicklisp.org/archive/hunchentoot/2020-06-10/hunchentoot-v1.3.0.tgz'';
+ sha256 = ''08znpi5lq2dhgv6mhvabk3w4ggrg31dbv4k6gmshr18xd2lq43i8'';
};
packageName = "hunchentoot";
@@ -36,18 +36,18 @@ rec {
(NAME cffi FILENAME cffi) (NAME chunga FILENAME chunga)
(NAME cl+ssl FILENAME cl_plus_ssl) (NAME cl-base64 FILENAME cl-base64)
(NAME cl-fad FILENAME cl-fad) (NAME cl-ppcre FILENAME cl-ppcre)
- (NAME cl-who FILENAME cl-who) (NAME drakma FILENAME drakma)
- (NAME flexi-streams FILENAME flexi-streams) (NAME md5 FILENAME md5)
- (NAME rfc2388 FILENAME rfc2388)
- (NAME split-sequence FILENAME split-sequence)
+ (NAME cl-who FILENAME cl-who) (NAME cxml-stp FILENAME cxml-stp)
+ (NAME drakma FILENAME drakma) (NAME flexi-streams FILENAME flexi-streams)
+ (NAME md5 FILENAME md5) (NAME rfc2388 FILENAME rfc2388)
+ (NAME split-sequence FILENAME split-sequence) (NAME swank FILENAME swank)
(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 usocket FILENAME usocket))
+ (NAME usocket FILENAME usocket) (NAME xpath FILENAME xpath))
DEPENDENCIES
(alexandria babel bordeaux-threads cffi chunga cl+ssl cl-base64 cl-fad
- cl-ppcre cl-who drakma flexi-streams md5 rfc2388 split-sequence
- trivial-backtrace trivial-features trivial-garbage trivial-gray-streams
- usocket)
- VERSION v1.3.0 SIBLINGS NIL PARASITES (hunchentoot-test)) */
+ cl-ppcre cl-who cxml-stp drakma flexi-streams md5 rfc2388 split-sequence
+ swank trivial-backtrace trivial-features trivial-garbage
+ trivial-gray-streams usocket xpath)
+ VERSION v1.3.0 SIBLINGS NIL PARASITES (hunchentoot-dev hunchentoot-test)) */
diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/idna.nix b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/idna.nix
index 8c3ffe879c..1b948bcf32 100644
--- a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/idna.nix
+++ b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/idna.nix
@@ -1,15 +1,15 @@
args @ { fetchurl, ... }:
rec {
- baseName = "idna";
- version = "20120107-git";
+ baseName = ''idna'';
+ version = ''20120107-git'';
- description = "IDNA (international domain names) string encoding and decoding routines";
+ description = ''IDNA (international domain names) string encoding and decoding routines'';
deps = [ args."split-sequence" ];
src = fetchurl {
- url = "http://beta.quicklisp.org/archive/idna/2012-01-07/idna-20120107-git.tgz";
- sha256 = "0q9hja9v5q7z89p0bzm2whchn05hymn3255fr5zj3fkja8akma5c";
+ url = ''http://beta.quicklisp.org/archive/idna/2012-01-07/idna-20120107-git.tgz'';
+ sha256 = ''0q9hja9v5q7z89p0bzm2whchn05hymn3255fr5zj3fkja8akma5c'';
};
packageName = "idna";
diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/ieee-floats.nix b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/ieee-floats.nix
index 2544cd99df..4211dfbc91 100644
--- a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/ieee-floats.nix
+++ b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/ieee-floats.nix
@@ -1,17 +1,17 @@
args @ { fetchurl, ... }:
rec {
- baseName = "ieee-floats";
- version = "20170830-git";
+ baseName = ''ieee-floats'';
+ version = ''20170830-git'';
parasites = [ "ieee-floats-tests" ];
- description = "Convert floating point values to IEEE 754 binary representation";
+ description = ''Convert floating point values to IEEE 754 binary representation'';
deps = [ args."fiveam" ];
src = fetchurl {
- url = "http://beta.quicklisp.org/archive/ieee-floats/2017-08-30/ieee-floats-20170830-git.tgz";
- sha256 = "15c4q4w3cda82vqlpvdfrnah6ms6vxbjf4a0chd10daw72rwayqk";
+ url = ''http://beta.quicklisp.org/archive/ieee-floats/2017-08-30/ieee-floats-20170830-git.tgz'';
+ sha256 = ''15c4q4w3cda82vqlpvdfrnah6ms6vxbjf4a0chd10daw72rwayqk'';
};
packageName = "ieee-floats";
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
index 5aa30e92cd..2072945f26 100644
--- 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
@@ -1,17 +1,17 @@
args @ { fetchurl, ... }:
rec {
- baseName = "inferior-shell";
- version = "20200925-git";
+ baseName = ''inferior-shell'';
+ version = ''20200925-git'';
parasites = [ "inferior-shell/test" ];
- description = "spawn local or remote processes and shell pipes";
+ 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";
+ url = ''http://beta.quicklisp.org/archive/inferior-shell/2020-09-25/inferior-shell-20200925-git.tgz'';
+ sha256 = ''1hykybcmdpcjk0irl4f1lmqc4aawpp1zfvh27qp6mldsibra7l80'';
};
packageName = "inferior-shell";
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 4590e55ffd..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 = "20200715-git";
+ baseName = ''introspect-environment'';
+ version = ''20200715-git'';
- description = "Small interface to portable but nonstandard introspection of CL environments.";
+ description = ''Small interface to portable but nonstandard introspection of CL environments.'';
deps = [ ];
src = fetchurl {
- url = "http://beta.quicklisp.org/archive/introspect-environment/2020-07-15/introspect-environment-20200715-git.tgz";
- sha256 = "1m2vqpbrvjb0mkmi2n5rg3j0dr68hyv23lbw6s474hylx02nw5ns";
+ url = ''http://beta.quicklisp.org/archive/introspect-environment/2020-07-15/introspect-environment-20200715-git.tgz'';
+ sha256 = ''1m2vqpbrvjb0mkmi2n5rg3j0dr68hyv23lbw6s474hylx02nw5ns'';
};
packageName = "introspect-environment";
diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/iolib.nix b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/iolib.nix
index 8d547d93b5..c4ae44cd67 100644
--- a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/iolib.nix
+++ b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/iolib.nix
@@ -1,17 +1,17 @@
args @ { fetchurl, ... }:
rec {
- baseName = "iolib";
- version = "v0.8.3";
+ baseName = ''iolib'';
+ version = ''v0.8.3'';
parasites = [ "iolib/multiplex" "iolib/os" "iolib/pathnames" "iolib/sockets" "iolib/streams" "iolib/syscalls" "iolib/trivial-sockets" "iolib/zstreams" ];
- description = "I/O library.";
+ description = ''I/O library.'';
deps = [ args."alexandria" args."babel" args."bordeaux-threads" args."cffi" args."idna" args."iolib_dot_asdf" args."iolib_dot_base" args."iolib_dot_common-lisp" args."iolib_dot_conf" args."iolib_dot_grovel" args."split-sequence" args."swap-bytes" args."trivial-features" ];
src = fetchurl {
- url = "http://beta.quicklisp.org/archive/iolib/2018-02-28/iolib-v0.8.3.tgz";
- sha256 = "12gsvsjyxmclwidcjvyrfvd0773ib54a3qzmf33hmgc9knxlli7c";
+ url = ''http://beta.quicklisp.org/archive/iolib/2018-02-28/iolib-v0.8.3.tgz'';
+ sha256 = ''12gsvsjyxmclwidcjvyrfvd0773ib54a3qzmf33hmgc9knxlli7c'';
};
packageName = "iolib";
diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/iolib_dot_asdf.nix b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/iolib_dot_asdf.nix
index b4136a5dc8..195b52c08c 100644
--- a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/iolib_dot_asdf.nix
+++ b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/iolib_dot_asdf.nix
@@ -1,15 +1,15 @@
args @ { fetchurl, ... }:
rec {
- baseName = "iolib_dot_asdf";
- version = "iolib-v0.8.3";
+ baseName = ''iolib_dot_asdf'';
+ version = ''iolib-v0.8.3'';
- description = "A few ASDF component classes.";
+ description = ''A few ASDF component classes.'';
deps = [ args."alexandria" ];
src = fetchurl {
- url = "http://beta.quicklisp.org/archive/iolib/2018-02-28/iolib-v0.8.3.tgz";
- sha256 = "12gsvsjyxmclwidcjvyrfvd0773ib54a3qzmf33hmgc9knxlli7c";
+ url = ''http://beta.quicklisp.org/archive/iolib/2018-02-28/iolib-v0.8.3.tgz'';
+ sha256 = ''12gsvsjyxmclwidcjvyrfvd0773ib54a3qzmf33hmgc9knxlli7c'';
};
packageName = "iolib.asdf";
diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/iolib_dot_base.nix b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/iolib_dot_base.nix
index 97763556c1..aa650edde0 100644
--- a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/iolib_dot_base.nix
+++ b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/iolib_dot_base.nix
@@ -1,15 +1,15 @@
args @ { fetchurl, ... }:
rec {
- baseName = "iolib_dot_base";
- version = "iolib-v0.8.3";
+ baseName = ''iolib_dot_base'';
+ version = ''iolib-v0.8.3'';
- description = "Base IOlib package, used instead of CL.";
+ description = ''Base IOlib package, used instead of CL.'';
deps = [ args."alexandria" args."iolib_dot_asdf" args."iolib_dot_common-lisp" args."iolib_dot_conf" args."split-sequence" ];
src = fetchurl {
- url = "http://beta.quicklisp.org/archive/iolib/2018-02-28/iolib-v0.8.3.tgz";
- sha256 = "12gsvsjyxmclwidcjvyrfvd0773ib54a3qzmf33hmgc9knxlli7c";
+ url = ''http://beta.quicklisp.org/archive/iolib/2018-02-28/iolib-v0.8.3.tgz'';
+ sha256 = ''12gsvsjyxmclwidcjvyrfvd0773ib54a3qzmf33hmgc9knxlli7c'';
};
packageName = "iolib.base";
diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/iolib_dot_common-lisp.nix b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/iolib_dot_common-lisp.nix
index 2482a76453..c0ec72d486 100644
--- a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/iolib_dot_common-lisp.nix
+++ b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/iolib_dot_common-lisp.nix
@@ -1,15 +1,15 @@
args @ { fetchurl, ... }:
rec {
- baseName = "iolib_dot_common-lisp";
- version = "iolib-v0.8.3";
+ baseName = ''iolib_dot_common-lisp'';
+ version = ''iolib-v0.8.3'';
- description = "Slightly modified Common Lisp.";
+ description = ''Slightly modified Common Lisp.'';
deps = [ args."alexandria" args."iolib_dot_asdf" args."iolib_dot_conf" ];
src = fetchurl {
- url = "http://beta.quicklisp.org/archive/iolib/2018-02-28/iolib-v0.8.3.tgz";
- sha256 = "12gsvsjyxmclwidcjvyrfvd0773ib54a3qzmf33hmgc9knxlli7c";
+ url = ''http://beta.quicklisp.org/archive/iolib/2018-02-28/iolib-v0.8.3.tgz'';
+ sha256 = ''12gsvsjyxmclwidcjvyrfvd0773ib54a3qzmf33hmgc9knxlli7c'';
};
packageName = "iolib.common-lisp";
diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/iolib_dot_conf.nix b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/iolib_dot_conf.nix
index d9d055fab0..4ba0cfa1ce 100644
--- a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/iolib_dot_conf.nix
+++ b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/iolib_dot_conf.nix
@@ -1,15 +1,15 @@
args @ { fetchurl, ... }:
rec {
- baseName = "iolib_dot_conf";
- version = "iolib-v0.8.3";
+ baseName = ''iolib_dot_conf'';
+ version = ''iolib-v0.8.3'';
- description = "Compile-time configuration for IOLib.";
+ description = ''Compile-time configuration for IOLib.'';
deps = [ args."alexandria" args."iolib_dot_asdf" ];
src = fetchurl {
- url = "http://beta.quicklisp.org/archive/iolib/2018-02-28/iolib-v0.8.3.tgz";
- sha256 = "12gsvsjyxmclwidcjvyrfvd0773ib54a3qzmf33hmgc9knxlli7c";
+ url = ''http://beta.quicklisp.org/archive/iolib/2018-02-28/iolib-v0.8.3.tgz'';
+ sha256 = ''12gsvsjyxmclwidcjvyrfvd0773ib54a3qzmf33hmgc9knxlli7c'';
};
packageName = "iolib.conf";
diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/iolib_dot_grovel.nix b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/iolib_dot_grovel.nix
index 5e7df7a5c7..7a1a12243f 100644
--- a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/iolib_dot_grovel.nix
+++ b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/iolib_dot_grovel.nix
@@ -1,15 +1,15 @@
args @ { fetchurl, ... }:
rec {
- baseName = "iolib_dot_grovel";
- version = "iolib-v0.8.3";
+ baseName = ''iolib_dot_grovel'';
+ version = ''iolib-v0.8.3'';
- description = "The CFFI Groveller";
+ description = ''The CFFI Groveller'';
deps = [ args."alexandria" args."babel" args."cffi" args."iolib_dot_asdf" args."iolib_dot_base" args."iolib_dot_common-lisp" args."iolib_dot_conf" args."split-sequence" args."trivial-features" args."uiop" ];
src = fetchurl {
- url = "http://beta.quicklisp.org/archive/iolib/2018-02-28/iolib-v0.8.3.tgz";
- sha256 = "12gsvsjyxmclwidcjvyrfvd0773ib54a3qzmf33hmgc9knxlli7c";
+ url = ''http://beta.quicklisp.org/archive/iolib/2018-02-28/iolib-v0.8.3.tgz'';
+ sha256 = ''12gsvsjyxmclwidcjvyrfvd0773ib54a3qzmf33hmgc9knxlli7c'';
};
packageName = "iolib.grovel";
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 48e7595f3e..b942f5dd0b 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.51";
+ baseName = ''ironclad'';
+ version = ''v0.54'';
parasites = [ "ironclad/tests" ];
- description = "A cryptographic toolkit written in pure Common Lisp";
+ description = ''A cryptographic toolkit written in pure Common Lisp'';
deps = [ args."alexandria" args."bordeaux-threads" args."rt" ];
src = fetchurl {
- url = "http://beta.quicklisp.org/archive/ironclad/2020-09-25/ironclad-v0.51.tgz";
- sha256 = "0zfazyvg91fxr9gm195qwwf1y5qdci7i1cwzpv0fggxhylpkswrn";
+ url = ''http://beta.quicklisp.org/archive/ironclad/2021-01-24/ironclad-v0.54.tgz'';
+ sha256 = ''01mpsnjx8cgn3wx2n0dkv8v83z93da9zrxncn58ghbpyq3z1i4w2'';
};
packageName = "ironclad";
@@ -21,10 +21,10 @@ rec {
}
/* (SYSTEM ironclad DESCRIPTION
A cryptographic toolkit written in pure Common Lisp SHA256
- 0zfazyvg91fxr9gm195qwwf1y5qdci7i1cwzpv0fggxhylpkswrn URL
- http://beta.quicklisp.org/archive/ironclad/2020-09-25/ironclad-v0.51.tgz
- MD5 23b0b6a654bceca511e100fdc976e107 NAME ironclad FILENAME ironclad DEPS
+ 01mpsnjx8cgn3wx2n0dkv8v83z93da9zrxncn58ghbpyq3z1i4w2 URL
+ http://beta.quicklisp.org/archive/ironclad/2021-01-24/ironclad-v0.54.tgz
+ MD5 f99610509e4603aac66d9aa03ede2770 NAME ironclad FILENAME ironclad DEPS
((NAME alexandria FILENAME alexandria)
(NAME bordeaux-threads FILENAME bordeaux-threads) (NAME rt FILENAME rt))
- DEPENDENCIES (alexandria bordeaux-threads rt) VERSION v0.51 SIBLINGS
+ DEPENDENCIES (alexandria bordeaux-threads rt) VERSION v0.54 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 d82d371ca0..52d1d51903 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,17 +1,17 @@
args @ { fetchurl, ... }:
rec {
- baseName = "iterate";
- version = "20200610-git";
+ baseName = ''iterate'';
+ version = ''20210228-git'';
parasites = [ "iterate/tests" ];
- description = "Jonathan Amsterdam's iterator/gatherer/accumulator facility";
+ description = ''Jonathan Amsterdam's iterator/gatherer/accumulator facility'';
deps = [ ];
src = fetchurl {
- url = "http://beta.quicklisp.org/archive/iterate/2020-06-10/iterate-20200610-git.tgz";
- sha256 = "0xz3v321b8zgjsgak432frs0gmpr2n24sf5gq97qnqvwqfn4infb";
+ url = ''http://beta.quicklisp.org/archive/iterate/2021-02-28/iterate-20210228-git.tgz'';
+ sha256 = ''1bd6m1lxmd6an75z7j61sms4v54bfxmg1n1w7zd7fm2kb15vai46'';
};
packageName = "iterate";
@@ -21,8 +21,8 @@ rec {
}
/* (SYSTEM iterate DESCRIPTION
Jonathan Amsterdam's iterator/gatherer/accumulator facility SHA256
- 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
+ 1bd6m1lxmd6an75z7j61sms4v54bfxmg1n1w7zd7fm2kb15vai46 URL
+ http://beta.quicklisp.org/archive/iterate/2021-02-28/iterate-20210228-git.tgz
+ MD5 16a4d7811ffc0f4a1cc45257c4cefd1d NAME iterate FILENAME iterate DEPS NIL
+ DEPENDENCIES NIL VERSION 20210228-git SIBLINGS NIL PARASITES
(iterate/tests)) */
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 547a909c06..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 = "20200925-git";
+ baseName = ''jonathan'';
+ version = ''20200925-git'';
- description = "High performance JSON encoder and decoder. Currently support: SBCL, CCL.";
+ 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/2020-09-25/jonathan-20200925-git.tgz";
- sha256 = "1y5v3g351nsy7px0frdr2asmcy0lyfbj73ic1f5yf4q65hrgvryx";
+ url = ''http://beta.quicklisp.org/archive/jonathan/2020-09-25/jonathan-20200925-git.tgz'';
+ sha256 = ''1y5v3g351nsy7px0frdr2asmcy0lyfbj73ic1f5yf4q65hrgvryx'';
};
packageName = "jonathan";
diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/jpl-queues.nix b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/jpl-queues.nix
new file mode 100644
index 0000000000..c6b20ba5da
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/jpl-queues.nix
@@ -0,0 +1,31 @@
+args @ { fetchurl, ... }:
+rec {
+ baseName = ''jpl-queues'';
+ version = ''0.1'';
+
+ description = ''A few different kinds of queues, with optional
+multithreading synchronization.'';
+
+ deps = [ args."alexandria" args."bordeaux-threads" args."jpl-util" ];
+
+ src = fetchurl {
+ url = ''http://beta.quicklisp.org/archive/jpl-queues/2010-10-06/jpl-queues-0.1.tgz'';
+ sha256 = ''1wvvv7j117h9a42qaj1g4fh4mji28xqs7s60rn6d11gk9jl76h96'';
+ };
+
+ packageName = "jpl-queues";
+
+ asdFilesToKeep = ["jpl-queues.asd"];
+ overrides = x: x;
+}
+/* (SYSTEM jpl-queues DESCRIPTION A few different kinds of queues, with optional
+multithreading synchronization.
+ SHA256 1wvvv7j117h9a42qaj1g4fh4mji28xqs7s60rn6d11gk9jl76h96 URL
+ http://beta.quicklisp.org/archive/jpl-queues/2010-10-06/jpl-queues-0.1.tgz
+ MD5 7c3d14c955db0a5c8ece2b9409333ce0 NAME jpl-queues FILENAME jpl-queues
+ DEPS
+ ((NAME alexandria FILENAME alexandria)
+ (NAME bordeaux-threads FILENAME bordeaux-threads)
+ (NAME jpl-util FILENAME jpl-util))
+ DEPENDENCIES (alexandria bordeaux-threads jpl-util) VERSION 0.1 SIBLINGS
+ NIL PARASITES NIL) */
diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/jpl-util.nix b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/jpl-util.nix
new file mode 100644
index 0000000000..3a1a3a5b78
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/jpl-util.nix
@@ -0,0 +1,24 @@
+args @ { fetchurl, ... }:
+rec {
+ baseName = ''jpl-util'';
+ version = ''cl-20151031-git'';
+
+ description = ''Sundry utilities for J.P. Larocque.'';
+
+ deps = [ ];
+
+ src = fetchurl {
+ url = ''http://beta.quicklisp.org/archive/cl-jpl-util/2015-10-31/cl-jpl-util-20151031-git.tgz'';
+ sha256 = ''1a3sfamgrqgsf0ql3fkbpmjbs837v1b3nxqxp4mkisp6yxanmhzx'';
+ };
+
+ packageName = "jpl-util";
+
+ asdFilesToKeep = ["jpl-util.asd"];
+ overrides = x: x;
+}
+/* (SYSTEM jpl-util DESCRIPTION Sundry utilities for J.P. Larocque. SHA256
+ 1a3sfamgrqgsf0ql3fkbpmjbs837v1b3nxqxp4mkisp6yxanmhzx URL
+ http://beta.quicklisp.org/archive/cl-jpl-util/2015-10-31/cl-jpl-util-20151031-git.tgz
+ MD5 e294bedace729724873e7633b8265a00 NAME jpl-util FILENAME jpl-util DEPS
+ NIL DEPENDENCIES NIL VERSION cl-20151031-git SIBLINGS NIL 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 d785fbd225..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,17 +1,17 @@
args @ { fetchurl, ... }:
rec {
- baseName = "kmrcl";
- version = "20201016-git";
+ baseName = ''kmrcl'';
+ version = ''20201016-git'';
parasites = [ "kmrcl/test" ];
- description = "System lacks description";
+ description = ''System lacks description'';
deps = [ args."rt" ];
src = fetchurl {
- url = "http://beta.quicklisp.org/archive/kmrcl/2020-10-16/kmrcl-20201016-git.tgz";
- sha256 = "0i0k61385hrzbg15qs1wprz6sis7mx2abxv1hqcc2f53rqm9b2hf";
+ url = ''http://beta.quicklisp.org/archive/kmrcl/2020-10-16/kmrcl-20201016-git.tgz'';
+ sha256 = ''0i0k61385hrzbg15qs1wprz6sis7mx2abxv1hqcc2f53rqm9b2hf'';
};
packageName = "kmrcl";
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 2af6575754..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-20201016-git";
+ baseName = ''lack-component'';
+ version = ''lack-20201016-git'';
- description = "System lacks description";
+ description = ''System lacks description'';
deps = [ ];
src = fetchurl {
- url = "http://beta.quicklisp.org/archive/lack/2020-10-16/lack-20201016-git.tgz";
- sha256 = "124c3k8116m5gc0rp4vvkqcvz35lglrbwdq4i929hbq65xyx5gan";
+ url = ''http://beta.quicklisp.org/archive/lack/2020-10-16/lack-20201016-git.tgz'';
+ sha256 = ''124c3k8116m5gc0rp4vvkqcvz35lglrbwdq4i929hbq65xyx5gan'';
};
packageName = "lack-component";
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 edadaa07c1..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-20201016-git";
+ baseName = ''lack-middleware-backtrace'';
+ version = ''lack-20201016-git'';
- description = "System lacks description";
+ description = ''System lacks description'';
deps = [ args."uiop" ];
src = fetchurl {
- url = "http://beta.quicklisp.org/archive/lack/2020-10-16/lack-20201016-git.tgz";
- sha256 = "124c3k8116m5gc0rp4vvkqcvz35lglrbwdq4i929hbq65xyx5gan";
+ url = ''http://beta.quicklisp.org/archive/lack/2020-10-16/lack-20201016-git.tgz'';
+ sha256 = ''124c3k8116m5gc0rp4vvkqcvz35lglrbwdq4i929hbq65xyx5gan'';
};
packageName = "lack-middleware-backtrace";
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 ad8bdc84b5..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-20201016-git";
+ baseName = ''lack-util'';
+ version = ''lack-20201016-git'';
- description = "System lacks description";
+ description = ''System lacks description'';
deps = [ args."alexandria" args."bordeaux-threads" args."ironclad" ];
src = fetchurl {
- url = "http://beta.quicklisp.org/archive/lack/2020-10-16/lack-20201016-git.tgz";
- sha256 = "124c3k8116m5gc0rp4vvkqcvz35lglrbwdq4i929hbq65xyx5gan";
+ url = ''http://beta.quicklisp.org/archive/lack/2020-10-16/lack-20201016-git.tgz'';
+ sha256 = ''124c3k8116m5gc0rp4vvkqcvz35lglrbwdq4i929hbq65xyx5gan'';
};
packageName = "lack-util";
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 06f596509a..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 = "20201016-git";
+ baseName = ''lack'';
+ version = ''20201016-git'';
- description = "A minimal Clack";
+ description = ''A minimal Clack'';
deps = [ args."alexandria" args."bordeaux-threads" args."ironclad" args."lack-component" args."lack-util" ];
src = fetchurl {
- url = "http://beta.quicklisp.org/archive/lack/2020-10-16/lack-20201016-git.tgz";
- sha256 = "124c3k8116m5gc0rp4vvkqcvz35lglrbwdq4i929hbq65xyx5gan";
+ url = ''http://beta.quicklisp.org/archive/lack/2020-10-16/lack-20201016-git.tgz'';
+ sha256 = ''124c3k8116m5gc0rp4vvkqcvz35lglrbwdq4i929hbq65xyx5gan'';
};
packageName = "lack";
diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/let-plus.nix b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/let-plus.nix
index 791c7f0a2d..9d130c2b05 100644
--- a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/let-plus.nix
+++ b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/let-plus.nix
@@ -1,17 +1,17 @@
args @ { fetchurl, ... }:
rec {
- baseName = "let-plus";
- version = "20191130-git";
+ baseName = ''let-plus'';
+ version = ''20191130-git'';
parasites = [ "let-plus/tests" ];
- description = "Destructuring extension of LET*.";
+ description = ''Destructuring extension of LET*.'';
deps = [ args."alexandria" args."anaphora" args."lift" ];
src = fetchurl {
- url = "http://beta.quicklisp.org/archive/let-plus/2019-11-30/let-plus-20191130-git.tgz";
- sha256 = "0zj0fgb7lvczgpz4jq8q851p77kma7ikn7hd2jk2c37iv4nmz29p";
+ url = ''http://beta.quicklisp.org/archive/let-plus/2019-11-30/let-plus-20191130-git.tgz'';
+ sha256 = ''0zj0fgb7lvczgpz4jq8q851p77kma7ikn7hd2jk2c37iv4nmz29p'';
};
packageName = "let-plus";
diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/lev.nix b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/lev.nix
index e4bbb44a46..9dd6baad1b 100644
--- a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/lev.nix
+++ b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/lev.nix
@@ -1,15 +1,15 @@
args @ { fetchurl, ... }:
rec {
- baseName = "lev";
- version = "20150505-git";
+ baseName = ''lev'';
+ version = ''20150505-git'';
- description = "libev bindings for Common Lisp";
+ description = ''libev bindings for Common Lisp'';
deps = [ args."alexandria" args."babel" args."cffi" args."trivial-features" ];
src = fetchurl {
- url = "http://beta.quicklisp.org/archive/lev/2015-05-05/lev-20150505-git.tgz";
- sha256 = "0lkkzb221ks4f0qjgh6pr5lyvb4884a87p96ir4m36x411pyk5xl";
+ url = ''http://beta.quicklisp.org/archive/lev/2015-05-05/lev-20150505-git.tgz'';
+ sha256 = ''0lkkzb221ks4f0qjgh6pr5lyvb4884a87p96ir4m36x411pyk5xl'';
};
packageName = "lev";
diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/lfarm-client.nix b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/lfarm-client.nix
index 448f41e5b5..10977c16f8 100644
--- a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/lfarm-client.nix
+++ b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/lfarm-client.nix
@@ -1,15 +1,15 @@
args @ { fetchurl, ... }:
rec {
- baseName = "lfarm-client";
- version = "lfarm-20150608-git";
+ baseName = ''lfarm-client'';
+ version = ''lfarm-20150608-git'';
- description = "Client component of lfarm, a library for distributing work across machines.";
+ description = ''Client component of lfarm, a library for distributing work across machines.'';
deps = [ args."alexandria" args."bordeaux-threads" args."cl-store" args."flexi-streams" args."lfarm-common" args."lparallel" args."split-sequence" args."trivial-gray-streams" args."usocket" ];
src = fetchurl {
- url = "http://beta.quicklisp.org/archive/lfarm/2015-06-08/lfarm-20150608-git.tgz";
- sha256 = "1rkjcfam4601yczs13pi2qgi5jql0c150dxja53hkcnqhkyqgl66";
+ url = ''http://beta.quicklisp.org/archive/lfarm/2015-06-08/lfarm-20150608-git.tgz'';
+ sha256 = ''1rkjcfam4601yczs13pi2qgi5jql0c150dxja53hkcnqhkyqgl66'';
};
packageName = "lfarm-client";
diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/lfarm-common.nix b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/lfarm-common.nix
index fc92bbe89b..4a5fe87982 100644
--- a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/lfarm-common.nix
+++ b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/lfarm-common.nix
@@ -1,7 +1,7 @@
args @ { fetchurl, ... }:
rec {
- baseName = "lfarm-common";
- version = "lfarm-20150608-git";
+ baseName = ''lfarm-common'';
+ version = ''lfarm-20150608-git'';
description = ''(private) Common components of lfarm, a library for distributing
work across machines.'';
@@ -9,8 +9,8 @@ work across machines.'';
deps = [ args."alexandria" args."bordeaux-threads" args."cl-store" args."flexi-streams" args."split-sequence" args."trivial-gray-streams" args."usocket" ];
src = fetchurl {
- url = "http://beta.quicklisp.org/archive/lfarm/2015-06-08/lfarm-20150608-git.tgz";
- sha256 = "1rkjcfam4601yczs13pi2qgi5jql0c150dxja53hkcnqhkyqgl66";
+ url = ''http://beta.quicklisp.org/archive/lfarm/2015-06-08/lfarm-20150608-git.tgz'';
+ sha256 = ''1rkjcfam4601yczs13pi2qgi5jql0c150dxja53hkcnqhkyqgl66'';
};
packageName = "lfarm-common";
diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/lfarm-server.nix b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/lfarm-server.nix
index 5cc5cc1e9d..354d6c3150 100644
--- a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/lfarm-server.nix
+++ b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/lfarm-server.nix
@@ -1,15 +1,15 @@
args @ { fetchurl, ... }:
rec {
- baseName = "lfarm-server";
- version = "lfarm-20150608-git";
+ baseName = ''lfarm-server'';
+ version = ''lfarm-20150608-git'';
- description = "Server component of lfarm, a library for distributing work across machines.";
+ description = ''Server component of lfarm, a library for distributing work across machines.'';
deps = [ args."alexandria" args."bordeaux-threads" args."cl-store" args."flexi-streams" args."lfarm-common" args."split-sequence" args."trivial-gray-streams" args."usocket" ];
src = fetchurl {
- url = "http://beta.quicklisp.org/archive/lfarm/2015-06-08/lfarm-20150608-git.tgz";
- sha256 = "1rkjcfam4601yczs13pi2qgi5jql0c150dxja53hkcnqhkyqgl66";
+ url = ''http://beta.quicklisp.org/archive/lfarm/2015-06-08/lfarm-20150608-git.tgz'';
+ sha256 = ''1rkjcfam4601yczs13pi2qgi5jql0c150dxja53hkcnqhkyqgl66'';
};
packageName = "lfarm-server";
diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/lfarm-ssl.nix b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/lfarm-ssl.nix
index 0ba638611c..348c71fe96 100644
--- a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/lfarm-ssl.nix
+++ b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/lfarm-ssl.nix
@@ -1,15 +1,15 @@
args @ { fetchurl, ... }:
rec {
- baseName = "lfarm-ssl";
- version = "lfarm-20150608-git";
+ baseName = ''lfarm-ssl'';
+ version = ''lfarm-20150608-git'';
- description = "SSL support for lfarm";
+ description = ''SSL support for lfarm'';
deps = [ args."alexandria" args."babel" args."bordeaux-threads" args."cffi" args."cl_plus_ssl" args."cl-store" args."flexi-streams" args."lfarm-common" args."split-sequence" args."trivial-features" args."trivial-garbage" args."trivial-gray-streams" args."usocket" ];
src = fetchurl {
- url = "http://beta.quicklisp.org/archive/lfarm/2015-06-08/lfarm-20150608-git.tgz";
- sha256 = "1rkjcfam4601yczs13pi2qgi5jql0c150dxja53hkcnqhkyqgl66";
+ url = ''http://beta.quicklisp.org/archive/lfarm/2015-06-08/lfarm-20150608-git.tgz'';
+ sha256 = ''1rkjcfam4601yczs13pi2qgi5jql0c150dxja53hkcnqhkyqgl66'';
};
packageName = "lfarm-ssl";
diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/lift.nix b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/lift.nix
index c0e4f0caee..1edb65596a 100644
--- a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/lift.nix
+++ b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/lift.nix
@@ -1,15 +1,15 @@
args @ { fetchurl, ... }:
rec {
- baseName = "lift";
- version = "20190521-git";
+ baseName = ''lift'';
+ version = ''20190521-git'';
- description = "LIsp Framework for Testing";
+ description = ''LIsp Framework for Testing'';
deps = [ ];
src = fetchurl {
- url = "http://beta.quicklisp.org/archive/lift/2019-05-21/lift-20190521-git.tgz";
- sha256 = "0cinilin9bxzsj3mzd4488zx2irvyl5qpbykv0xbyfz2mjh94ac9";
+ url = ''http://beta.quicklisp.org/archive/lift/2019-05-21/lift-20190521-git.tgz'';
+ sha256 = ''0cinilin9bxzsj3mzd4488zx2irvyl5qpbykv0xbyfz2mjh94ac9'';
};
packageName = "lift";
diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/lisp-namespace.nix b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/lisp-namespace.nix
index 80b0431799..7f88beb974 100644
--- a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/lisp-namespace.nix
+++ b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/lisp-namespace.nix
@@ -1,15 +1,15 @@
args @ { fetchurl, ... }:
rec {
- baseName = "lisp-namespace";
- version = "20171130-git";
+ baseName = ''lisp-namespace'';
+ version = ''20171130-git'';
- description = "Provides LISP-N --- extensible namespaces in Common Lisp.";
+ description = ''Provides LISP-N --- extensible namespaces in Common Lisp.'';
deps = [ args."alexandria" ];
src = fetchurl {
- url = "http://beta.quicklisp.org/archive/lisp-namespace/2017-11-30/lisp-namespace-20171130-git.tgz";
- sha256 = "0vxk06c5434kcjv9p414yk23gs4rkibfq695is9y7wglck31fz2j";
+ url = ''http://beta.quicklisp.org/archive/lisp-namespace/2017-11-30/lisp-namespace-20171130-git.tgz'';
+ sha256 = ''0vxk06c5434kcjv9p414yk23gs4rkibfq695is9y7wglck31fz2j'';
};
packageName = "lisp-namespace";
diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/lisp-unit2.nix b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/lisp-unit2.nix
index 12d82701e0..8d21f88cbf 100644
--- a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/lisp-unit2.nix
+++ b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/lisp-unit2.nix
@@ -1,17 +1,17 @@
args @ { fetchurl, ... }:
rec {
- baseName = "lisp-unit2";
- version = "20180131-git";
+ baseName = ''lisp-unit2'';
+ version = ''20180131-git'';
parasites = [ "lisp-unit2-test" ];
- description = "Common Lisp library that supports unit testing.";
+ description = ''Common Lisp library that supports unit testing.'';
deps = [ args."alexandria" args."cl-interpol" args."cl-ppcre" args."cl-unicode" args."flexi-streams" args."iterate" args."named-readtables" args."symbol-munger" ];
src = fetchurl {
- url = "http://beta.quicklisp.org/archive/lisp-unit2/2018-01-31/lisp-unit2-20180131-git.tgz";
- sha256 = "04kwrg605mqzf3ghshgbygvvryk5kipl6gyc5kdaxafjxvhxaak7";
+ url = ''http://beta.quicklisp.org/archive/lisp-unit2/2018-01-31/lisp-unit2-20180131-git.tgz'';
+ sha256 = ''04kwrg605mqzf3ghshgbygvvryk5kipl6gyc5kdaxafjxvhxaak7'';
};
packageName = "lisp-unit2";
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 9bf7ea7fa1..b3767498d2 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 = "20200925-git";
+ baseName = ''local-time'';
+ version = ''20210124-git'';
parasites = [ "local-time/test" ];
- description = "A library for manipulating dates and times, based on a paper by Erik Naggum";
+ description = ''A library for manipulating dates and times, based on a paper by Erik Naggum'';
- deps = [ args."stefil" args."uiop" ];
+ deps = [ args."hu_dot_dwim_dot_stefil" args."uiop" ];
src = fetchurl {
- url = "http://beta.quicklisp.org/archive/local-time/2020-09-25/local-time-20200925-git.tgz";
- sha256 = "0rr2bs93vhj7ngplw85572jfx8250fr2iki8y9spxmfz1sldm12f";
+ url = ''http://beta.quicklisp.org/archive/local-time/2021-01-24/local-time-20210124-git.tgz'';
+ sha256 = ''0bz5z0rd8gfd22bpqkalaijxlrk806zc010cvgd4qjapbrxzjg3s'';
};
packageName = "local-time";
@@ -21,9 +21,11 @@ rec {
}
/* (SYSTEM local-time DESCRIPTION
A library for manipulating dates and times, based on a paper by Erik Naggum
- 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)) */
+ SHA256 0bz5z0rd8gfd22bpqkalaijxlrk806zc010cvgd4qjapbrxzjg3s URL
+ http://beta.quicklisp.org/archive/local-time/2021-01-24/local-time-20210124-git.tgz
+ MD5 631d67bc84ae838792717b256f2cdbaf NAME local-time FILENAME local-time
+ DEPS
+ ((NAME hu.dwim.stefil FILENAME hu_dot_dwim_dot_stefil)
+ (NAME uiop FILENAME uiop))
+ DEPENDENCIES (hu.dwim.stefil uiop) VERSION 20210124-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 e4b4795fe0..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,17 +1,17 @@
args @ { fetchurl, ... }:
rec {
- baseName = "log4cl";
- version = "20200925-git";
+ baseName = ''log4cl'';
+ version = ''20200925-git'';
parasites = [ "log4cl/syslog" "log4cl/test" ];
- description = "System lacks description";
+ description = ''System lacks description'';
deps = [ args."alexandria" args."bordeaux-threads" args."stefil" ];
src = fetchurl {
- url = "http://beta.quicklisp.org/archive/log4cl/2020-09-25/log4cl-20200925-git.tgz";
- sha256 = "1z98ly71hsbd46i0dqqv2s3cm9y8bi0pl3yg8a168vz629c6mdrf";
+ url = ''http://beta.quicklisp.org/archive/log4cl/2020-09-25/log4cl-20200925-git.tgz'';
+ sha256 = ''1z98ly71hsbd46i0dqqv2s3cm9y8bi0pl3yg8a168vz629c6mdrf'';
};
packageName = "log4cl";
diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/lparallel.nix b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/lparallel.nix
index 73b42c3fc9..1a6f217a2f 100644
--- a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/lparallel.nix
+++ b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/lparallel.nix
@@ -1,15 +1,15 @@
args @ { fetchurl, ... }:
rec {
- baseName = "lparallel";
- version = "20160825-git";
+ baseName = ''lparallel'';
+ version = ''20160825-git'';
- description = "Parallelism for Common Lisp";
+ description = ''Parallelism for Common Lisp'';
deps = [ args."alexandria" args."bordeaux-threads" ];
src = fetchurl {
- url = "http://beta.quicklisp.org/archive/lparallel/2016-08-25/lparallel-20160825-git.tgz";
- sha256 = "0wwwwszbj6m0b2rsp8mpn4m6y7xk448bw8fb7gy0ggmsdfgchfr1";
+ url = ''http://beta.quicklisp.org/archive/lparallel/2016-08-25/lparallel-20160825-git.tgz'';
+ sha256 = ''0wwwwszbj6m0b2rsp8mpn4m6y7xk448bw8fb7gy0ggmsdfgchfr1'';
};
packageName = "lparallel";
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 e287b7519a..c460f50b79 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 = "20200715-git";
+ baseName = ''lquery'';
+ version = ''20201220-git'';
- description = "A library to allow jQuery-like HTML/DOM manipulation.";
+ 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/2020-07-15/lquery-20200715-git.tgz";
- sha256 = "1akj9yzz71733yfbqq9jig0zkx8brphzh35d8zzic0469idd3rcd";
+ url = ''http://beta.quicklisp.org/archive/lquery/2020-12-20/lquery-20201220-git.tgz'';
+ sha256 = ''0mfnk1p73aihraklw802j5mjgc8cjxva0mdf0c4p7b253crf15jx'';
};
packageName = "lquery";
@@ -19,13 +19,13 @@ rec {
}
/* (SYSTEM lquery DESCRIPTION
A library to allow jQuery-like HTML/DOM manipulation. SHA256
- 1akj9yzz71733yfbqq9jig0zkx8brphzh35d8zzic0469idd3rcd URL
- http://beta.quicklisp.org/archive/lquery/2020-07-15/lquery-20200715-git.tgz
- MD5 38e282ac02c6a1ce9bc28bd9c1deee34 NAME lquery FILENAME lquery DEPS
+ 0mfnk1p73aihraklw802j5mjgc8cjxva0mdf0c4p7b253crf15jx URL
+ http://beta.quicklisp.org/archive/lquery/2020-12-20/lquery-20201220-git.tgz
+ MD5 a71685848959cf33cd6963b4a5f9e2ed 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 20200715-git SIBLINGS (lquery-test) PARASITES NIL) */
+ VERSION 20201220-git SIBLINGS (lquery-test) PARASITES NIL) */
diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/map-set.nix b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/map-set.nix
index fd6213f307..8187c99f94 100644
--- a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/map-set.nix
+++ b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/map-set.nix
@@ -1,15 +1,15 @@
args @ { fetchurl, ... }:
rec {
- baseName = "map-set";
- version = "20190307-hg";
+ baseName = ''map-set'';
+ version = ''20190307-hg'';
- description = "Set-like data structure.";
+ description = ''Set-like data structure.'';
deps = [ ];
src = fetchurl {
- url = "http://beta.quicklisp.org/archive/map-set/2019-03-07/map-set-20190307-hg.tgz";
- sha256 = "1x7yh4gzdvypr1q45qgmjln5pjlh82bfpk6sqyrihrldmwwnbzg9";
+ url = ''http://beta.quicklisp.org/archive/map-set/2019-03-07/map-set-20190307-hg.tgz'';
+ sha256 = ''1x7yh4gzdvypr1q45qgmjln5pjlh82bfpk6sqyrihrldmwwnbzg9'';
};
packageName = "map-set";
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 94b8e64bfb..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-20201016-git";
+ baseName = ''marshal'';
+ version = ''cl-20201016-git'';
- description = "marshal: Simple (de)serialization of Lisp datastructures.";
+ description = ''marshal: Simple (de)serialization of Lisp datastructures.'';
deps = [ ];
src = fetchurl {
- url = "http://beta.quicklisp.org/archive/cl-marshal/2020-10-16/cl-marshal-20201016-git.tgz";
- sha256 = "03j52yhgpc2myypgy07213l20rznxvf6m3sfbzy2wyapcmv7nxnz";
+ url = ''http://beta.quicklisp.org/archive/cl-marshal/2020-10-16/cl-marshal-20201016-git.tgz'';
+ sha256 = ''03j52yhgpc2myypgy07213l20rznxvf6m3sfbzy2wyapcmv7nxnz'';
};
packageName = "marshal";
diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/md5.nix b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/md5.nix
index 845c235d49..953dd0a58a 100644
--- a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/md5.nix
+++ b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/md5.nix
@@ -1,15 +1,15 @@
args @ { fetchurl, ... }:
rec {
- baseName = "md5";
- version = "20180228-git";
+ baseName = ''md5'';
+ version = ''20180228-git'';
- description = "The MD5 Message-Digest Algorithm RFC 1321";
+ description = ''The MD5 Message-Digest Algorithm RFC 1321'';
deps = [ ];
src = fetchurl {
- url = "http://beta.quicklisp.org/archive/md5/2018-02-28/md5-20180228-git.tgz";
- sha256 = "1261ix6bmkjyx8bkpj6ksa0kgyrhngm31as77dyy3vfg6dvrsnd4";
+ url = ''http://beta.quicklisp.org/archive/md5/2018-02-28/md5-20180228-git.tgz'';
+ sha256 = ''1261ix6bmkjyx8bkpj6ksa0kgyrhngm31as77dyy3vfg6dvrsnd4'';
};
packageName = "md5";
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 993f363920..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 = "20200218-git";
+ baseName = ''metabang-bind'';
+ 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.";
+ 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/2020-02-18/metabang-bind-20200218-git.tgz";
- sha256 = "0mfjzfsv8v6i9ahwldfzznl29i42cmh5srmpgq64ar1vp6bdn1hq";
+ url = ''http://beta.quicklisp.org/archive/metabang-bind/2020-02-18/metabang-bind-20200218-git.tgz'';
+ sha256 = ''0mfjzfsv8v6i9ahwldfzznl29i42cmh5srmpgq64ar1vp6bdn1hq'';
};
packageName = "metabang-bind";
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 bf553ddf37..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 @@
args @ { fetchurl, ... }:
rec {
- baseName = "metatilities-base";
- version = "20191227-git";
+ baseName = ''metatilities-base'';
+ version = ''20191227-git'';
- description = "These are metabang.com's Common Lisp basic utilities.";
+ description = ''These are metabang.com's Common Lisp basic utilities.'';
deps = [ ];
src = fetchurl {
- url = "http://beta.quicklisp.org/archive/metatilities-base/2019-12-27/metatilities-base-20191227-git.tgz";
- sha256 = "1mal51p7mknya2ljcwl3wdjvnirw5vvzic6qcnci7qhmfrb1awil";
+ url = ''http://beta.quicklisp.org/archive/metatilities-base/2019-12-27/metatilities-base-20191227-git.tgz'';
+ sha256 = ''1mal51p7mknya2ljcwl3wdjvnirw5vvzic6qcnci7qhmfrb1awil'';
};
packageName = "metatilities-base";
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
index 33cc8bc90b..8915600014 100644
--- 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
@@ -1,18 +1,18 @@
args @ { fetchurl, ... }:
rec {
- baseName = "mgl-pax";
- version = "20201016-git";
+ baseName = ''mgl-pax'';
+ version = ''20210228-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" ];
+ 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" args."trivial-with-current-source-form" ];
src = fetchurl {
- url = "http://beta.quicklisp.org/archive/mgl-pax/2020-10-16/mgl-pax-20201016-git.tgz";
- sha256 = "0n48fw4a21sqy491bfi9fygrjl9psrryw00iha40dxy2ww86s6li";
+ url = ''http://beta.quicklisp.org/archive/mgl-pax/2021-02-28/mgl-pax-20210228-git.tgz'';
+ sha256 = ''1dyhbnd69lb6ih89pvg8nn6pwsg25v5xjsfk1i5l1fdib14612cw'';
};
packageName = "mgl-pax";
@@ -22,9 +22,9 @@ rec {
}
/* (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
+ SHA256 1dyhbnd69lb6ih89pvg8nn6pwsg25v5xjsfk1i5l1fdib14612cw URL
+ http://beta.quicklisp.org/archive/mgl-pax/2021-02-28/mgl-pax-20210228-git.tgz
+ MD5 a256ce4ee76d669d233ee09830ef7968 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)
@@ -35,9 +35,12 @@ rec {
(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))
+ (NAME trivial-features FILENAME trivial-features)
+ (NAME trivial-with-current-source-form FILENAME
+ trivial-with-current-source-form))
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)) */
+ pythonic-string-reader split-sequence swank trivial-features
+ trivial-with-current-source-form)
+ VERSION 20210228-git SIBLINGS NIL PARASITES (mgl-pax/test)) */
diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/misc-extensions.nix b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/misc-extensions.nix
index 163f85182e..16609db5c2 100644
--- a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/misc-extensions.nix
+++ b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/misc-extensions.nix
@@ -1,15 +1,15 @@
args @ { fetchurl, ... }:
rec {
- baseName = "misc-extensions";
- version = "20150608-git";
+ baseName = ''misc-extensions'';
+ version = ''20150608-git'';
- description = "System lacks description";
+ description = ''System lacks description'';
deps = [ ];
src = fetchurl {
- url = "http://beta.quicklisp.org/archive/misc-extensions/2015-06-08/misc-extensions-20150608-git.tgz";
- sha256 = "0pkvi1l5djwpvm0p8m0bcdjm61gxvzy0vgn415gngdixvbbchdqj";
+ url = ''http://beta.quicklisp.org/archive/misc-extensions/2015-06-08/misc-extensions-20150608-git.tgz'';
+ sha256 = ''0pkvi1l5djwpvm0p8m0bcdjm61gxvzy0vgn415gngdixvbbchdqj'';
};
packageName = "misc-extensions";
diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/mk-string-metrics.nix b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/mk-string-metrics.nix
index 3bd71c00d9..dc63474679 100644
--- a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/mk-string-metrics.nix
+++ b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/mk-string-metrics.nix
@@ -1,15 +1,15 @@
args @ { fetchurl, ... }:
rec {
- baseName = "mk-string-metrics";
- version = "20180131-git";
+ baseName = ''mk-string-metrics'';
+ version = ''20180131-git'';
- description = "efficient implementations of various string metric algorithms";
+ description = ''efficient implementations of various string metric algorithms'';
deps = [ ];
src = fetchurl {
- url = "http://beta.quicklisp.org/archive/mk-string-metrics/2018-01-31/mk-string-metrics-20180131-git.tgz";
- sha256 = "10xb9n6568nh019nq3phijbc7l6hkv69yllfiqvc1zzsprxpkwc4";
+ url = ''http://beta.quicklisp.org/archive/mk-string-metrics/2018-01-31/mk-string-metrics-20180131-git.tgz'';
+ sha256 = ''10xb9n6568nh019nq3phijbc7l6hkv69yllfiqvc1zzsprxpkwc4'';
};
packageName = "mk-string-metrics";
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 458acc6e94..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,15 +1,15 @@
args @ { fetchurl, ... }:
rec {
- baseName = "moptilities";
- version = "20170403-git";
+ baseName = ''moptilities'';
+ version = ''20170403-git'';
- description = "Common Lisp MOP utilities";
+ description = ''Common Lisp MOP utilities'';
deps = [ args."closer-mop" ];
src = fetchurl {
- url = "http://beta.quicklisp.org/archive/moptilities/2017-04-03/moptilities-20170403-git.tgz";
- sha256 = "0az01wx60ll3nybqlp21f5bps3fnpqhvvfg6d9x84969wdj7q4q8";
+ url = ''http://beta.quicklisp.org/archive/moptilities/2017-04-03/moptilities-20170403-git.tgz'';
+ sha256 = ''0az01wx60ll3nybqlp21f5bps3fnpqhvvfg6d9x84969wdj7q4q8'';
};
packageName = "moptilities";
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
index 40460f6d71..9a014c4160 100644
--- 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
@@ -1,7 +1,7 @@
args @ { fetchurl, ... }:
rec {
- baseName = "more-conditions";
- version = "20180831-git";
+ baseName = ''more-conditions'';
+ version = ''20180831-git'';
parasites = [ "more-conditions/test" ];
@@ -11,8 +11,8 @@ rec {
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";
+ url = ''http://beta.quicklisp.org/archive/more-conditions/2018-08-31/more-conditions-20180831-git.tgz'';
+ sha256 = ''0wa989kv3sl977g9szxkx52fdnww6aj2a9i77363f90iq02vj97x'';
};
packageName = "more-conditions";
diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/mt19937.nix b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/mt19937.nix
index a5628dddec..a8cfc070bf 100644
--- a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/mt19937.nix
+++ b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/mt19937.nix
@@ -1,15 +1,15 @@
args @ { fetchurl, ... }:
rec {
- baseName = "mt19937";
- version = "1.1.1";
+ baseName = ''mt19937'';
+ version = ''1.1.1'';
- description = "Portable MT19937 Mersenne Twister random number generator";
+ description = ''Portable MT19937 Mersenne Twister random number generator'';
deps = [ ];
src = fetchurl {
- url = "http://beta.quicklisp.org/archive/mt19937/2011-02-19/mt19937-1.1.1.tgz";
- sha256 = "1iw636b0iw5ygkv02y8i41lh7xj0acglv0hg5agryn0zzi2nf1xv";
+ url = ''http://beta.quicklisp.org/archive/mt19937/2011-02-19/mt19937-1.1.1.tgz'';
+ sha256 = ''1iw636b0iw5ygkv02y8i41lh7xj0acglv0hg5agryn0zzi2nf1xv'';
};
packageName = "mt19937";
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 cb35cd2c4e..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 = "20200325-git";
+ baseName = ''myway'';
+ version = ''20200325-git'';
- description = "Sinatra-compatible routing library.";
+ 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/2020-03-25/myway-20200325-git.tgz";
- sha256 = "07r0mq9n0gmm7n20mkpsnmjvcr4gj9nckpnh1c2mddrb3sag8n15";
+ url = ''http://beta.quicklisp.org/archive/myway/2020-03-25/myway-20200325-git.tgz'';
+ sha256 = ''07r0mq9n0gmm7n20mkpsnmjvcr4gj9nckpnh1c2mddrb3sag8n15'';
};
packageName = "myway";
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 9479bf85d0..972e77fde8 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 = "20200925-git";
+ baseName = ''named-readtables'';
+ version = ''20210124-git'';
parasites = [ "named-readtables/test" ];
@@ -11,8 +11,8 @@ rec {
deps = [ ];
src = fetchurl {
- url = "http://beta.quicklisp.org/archive/named-readtables/2020-09-25/named-readtables-20200925-git.tgz";
- sha256 = "0klbvv2syv8a8agacxdjrmmhibvhgfbxxwv6k4hx0ifk6n5iazxl";
+ url = ''http://beta.quicklisp.org/archive/named-readtables/2021-01-24/named-readtables-20210124-git.tgz'';
+ sha256 = ''00lbcv1qdb9ldq2kbf1rkn5sh657px9dgqrcynbwjzvla4czadl4'';
};
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 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
+ SHA256 00lbcv1qdb9ldq2kbf1rkn5sh657px9dgqrcynbwjzvla4czadl4 URL
+ http://beta.quicklisp.org/archive/named-readtables/2021-01-24/named-readtables-20210124-git.tgz
+ MD5 a4f2ae5f9715ec2c42cd164d15a0c918 NAME named-readtables FILENAME
+ named-readtables DEPS NIL DEPENDENCIES NIL VERSION 20210124-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
index 0bb4d755d6..a9c4927956 100644
--- 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
@@ -1,15 +1,15 @@
args @ { fetchurl, ... }:
rec {
- baseName = "net-telent-date";
- version = "net-telent-date_0.42";
+ baseName = ''net-telent-date'';
+ version = ''net-telent-date_0.42'';
- description = "System lacks description";
+ 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";
+ url = ''http://beta.quicklisp.org/archive/net-telent-date/2010-10-06/net-telent-date_0.42.tgz'';
+ sha256 = ''06vdlddwi6kx999n1093chwgw0ksbys4j4w9i9zqvw768wxp4li1'';
};
packageName = "net-telent-date";
diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/net_dot_didierverna_dot_asdf-flv.nix b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/net_dot_didierverna_dot_asdf-flv.nix
index 039277bcc0..4e7c84566a 100644
--- a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/net_dot_didierverna_dot_asdf-flv.nix
+++ b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/net_dot_didierverna_dot_asdf-flv.nix
@@ -1,15 +1,15 @@
args @ { fetchurl, ... }:
rec {
- baseName = "net_dot_didierverna_dot_asdf-flv";
- version = "asdf-flv-version-2.1";
+ baseName = ''net_dot_didierverna_dot_asdf-flv'';
+ version = ''asdf-flv-version-2.1'';
- description = "ASDF extension to provide support for file-local variables.";
+ description = ''ASDF extension to provide support for file-local variables.'';
deps = [ ];
src = fetchurl {
- url = "http://beta.quicklisp.org/archive/asdf-flv/2016-04-21/asdf-flv-version-2.1.tgz";
- sha256 = "12k0d4xyv6s9vy6gq18p8c9bm334jsfjly22lhg680kx2zr7y0lc";
+ url = ''http://beta.quicklisp.org/archive/asdf-flv/2016-04-21/asdf-flv-version-2.1.tgz'';
+ sha256 = ''12k0d4xyv6s9vy6gq18p8c9bm334jsfjly22lhg680kx2zr7y0lc'';
};
packageName = "net.didierverna.asdf-flv";
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 f6fbd1e1b6..a11654dd5f 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,17 +1,17 @@
args @ { fetchurl, ... }:
rec {
- baseName = "nibbles";
- version = "20200925-git";
+ baseName = ''nibbles'';
+ version = ''20210124-git'';
parasites = [ "nibbles/tests" ];
- description = "A library for accessing octet-addressed blocks of data in big- and little-endian orders";
+ description = ''A library for accessing octet-addressed blocks of data in big- and little-endian orders'';
deps = [ args."rt" ];
src = fetchurl {
- url = "http://beta.quicklisp.org/archive/nibbles/2020-09-25/nibbles-20200925-git.tgz";
- sha256 = "14k9hg8kmzwcb9b5aiwqhimc0zmcs3xp8q29sck8zklf8ziqaqb4";
+ url = ''http://beta.quicklisp.org/archive/nibbles/2021-01-24/nibbles-20210124-git.tgz'';
+ sha256 = ''0y3h4k7665w7b8ivmql9w6rz3ivfa3h8glk45sn6mwix55xmzp26'';
};
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 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
+ SHA256 0y3h4k7665w7b8ivmql9w6rz3ivfa3h8glk45sn6mwix55xmzp26 URL
+ http://beta.quicklisp.org/archive/nibbles/2021-01-24/nibbles-20210124-git.tgz
+ MD5 e37b58da46b4756006e790e658f35ea8 NAME nibbles FILENAME nibbles DEPS
+ ((NAME rt FILENAME rt)) DEPENDENCIES (rt) VERSION 20210124-git SIBLINGS NIL
PARASITES (nibbles/tests)) */
diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/optima.nix b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/optima.nix
index 487fd2c50a..07b86f58fe 100644
--- a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/optima.nix
+++ b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/optima.nix
@@ -1,15 +1,15 @@
args @ { fetchurl, ... }:
rec {
- baseName = "optima";
- version = "20150709-git";
+ baseName = ''optima'';
+ version = ''20150709-git'';
- description = "Optimized Pattern Matching Library";
+ description = ''Optimized Pattern Matching Library'';
deps = [ args."alexandria" args."closer-mop" ];
src = fetchurl {
- url = "http://beta.quicklisp.org/archive/optima/2015-07-09/optima-20150709-git.tgz";
- sha256 = "0vqyqrnx2d8qwa2jlg9l2wn6vrykraj8a1ysz0gxxxnwpqc29hdc";
+ url = ''http://beta.quicklisp.org/archive/optima/2015-07-09/optima-20150709-git.tgz'';
+ sha256 = ''0vqyqrnx2d8qwa2jlg9l2wn6vrykraj8a1ysz0gxxxnwpqc29hdc'';
};
packageName = "optima";
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
index bc7f59d5fb..ae91070d24 100644
--- 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
@@ -1,17 +1,17 @@
args @ { fetchurl, ... }:
rec {
- baseName = "osicat";
- version = "20200925-git";
+ baseName = ''osicat'';
+ version = ''20210228-git'';
parasites = [ "osicat/tests" ];
- description = "A lightweight operating system interface";
+ 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";
+ url = ''http://beta.quicklisp.org/archive/osicat/2021-02-28/osicat-20210228-git.tgz'';
+ sha256 = ''0g9frahjr2i6fvwd3bzvcz9icx4n4mnwcmsz6gvg5s6wmq5ny6wb'';
};
packageName = "osicat";
@@ -20,13 +20,13 @@ rec {
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
+ 0g9frahjr2i6fvwd3bzvcz9icx4n4mnwcmsz6gvg5s6wmq5ny6wb URL
+ http://beta.quicklisp.org/archive/osicat/2021-02-28/osicat-20210228-git.tgz
+ MD5 22c1b81abfe4fb30a2789877d2f85a86 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)) */
+ VERSION 20210228-git SIBLINGS NIL PARASITES (osicat/tests)) */
diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/parenscript.nix b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/parenscript.nix
index 952b9cbdf0..bf6216dcad 100644
--- a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/parenscript.nix
+++ b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/parenscript.nix
@@ -1,15 +1,15 @@
args @ { fetchurl, ... }:
rec {
- baseName = "parenscript";
- version = "Parenscript-2.7.1";
+ baseName = ''parenscript'';
+ version = ''Parenscript-2.7.1'';
- description = "Lisp to JavaScript transpiler";
+ description = ''Lisp to JavaScript transpiler'';
deps = [ args."anaphora" args."cl-ppcre" args."named-readtables" ];
src = fetchurl {
- url = "http://beta.quicklisp.org/archive/parenscript/2018-12-10/Parenscript-2.7.1.tgz";
- sha256 = "1vbldjzj9py8vqyk0f3rb795cjai0h7p858dflm4l8p0kp4mll6f";
+ url = ''http://beta.quicklisp.org/archive/parenscript/2018-12-10/Parenscript-2.7.1.tgz'';
+ sha256 = ''1vbldjzj9py8vqyk0f3rb795cjai0h7p858dflm4l8p0kp4mll6f'';
};
packageName = "parenscript";
diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/parse-declarations-1_dot_0.nix b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/parse-declarations-1_dot_0.nix
index 3e59fcfa5f..ea153987c0 100644
--- a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/parse-declarations-1_dot_0.nix
+++ b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/parse-declarations-1_dot_0.nix
@@ -1,15 +1,15 @@
args @ { fetchurl, ... }:
rec {
- baseName = "parse-declarations-1_dot_0";
- version = "parse-declarations-20101006-darcs";
+ baseName = ''parse-declarations-1_dot_0'';
+ version = ''parse-declarations-20101006-darcs'';
- description = "Library to parse and rebuild declarations.";
+ description = ''Library to parse and rebuild declarations.'';
deps = [ ];
src = fetchurl {
- url = "http://beta.quicklisp.org/archive/parse-declarations/2010-10-06/parse-declarations-20101006-darcs.tgz";
- sha256 = "0r85b0jfacd28kr65kw9c13dx4i6id1dpmby68zjy63mqbnyawrd";
+ url = ''http://beta.quicklisp.org/archive/parse-declarations/2010-10-06/parse-declarations-20101006-darcs.tgz'';
+ sha256 = ''0r85b0jfacd28kr65kw9c13dx4i6id1dpmby68zjy63mqbnyawrd'';
};
packageName = "parse-declarations-1.0";
diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/parse-number.nix b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/parse-number.nix
index a4b9488a34..e636df0805 100644
--- a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/parse-number.nix
+++ b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/parse-number.nix
@@ -1,17 +1,17 @@
args @ { fetchurl, ... }:
rec {
- baseName = "parse-number";
- version = "v1.7";
+ baseName = ''parse-number'';
+ version = ''v1.7'';
parasites = [ "parse-number/tests" ];
- description = "Number parsing library";
+ description = ''Number parsing library'';
deps = [ ];
src = fetchurl {
- url = "http://beta.quicklisp.org/archive/parse-number/2018-02-28/parse-number-v1.7.tgz";
- sha256 = "11ji8856ipmqki5i4cw1zgx8hahfi8x1raz1xb20c4rmgad6nsha";
+ url = ''http://beta.quicklisp.org/archive/parse-number/2018-02-28/parse-number-v1.7.tgz'';
+ sha256 = ''11ji8856ipmqki5i4cw1zgx8hahfi8x1raz1xb20c4rmgad6nsha'';
};
packageName = "parse-number";
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
index 391f04bd76..5105ec9923 100644
--- 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
@@ -1,15 +1,15 @@
args @ { fetchurl, ... }:
rec {
- baseName = "parser-combinators";
- version = "cl-20131111-git";
+ baseName = ''parser-combinators'';
+ version = ''cl-20131111-git'';
- description = "An implementation of parser combinators for Common Lisp";
+ 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";
+ url = ''http://beta.quicklisp.org/archive/cl-parser-combinators/2013-11-11/cl-parser-combinators-20131111-git.tgz'';
+ sha256 = ''0wg1a7favbwqcxyqcy2zxi4l11qsp4ar9fvddmx960grf2d72lds'';
};
packageName = "parser-combinators";
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
index d438d4b157..d7ac773f49 100644
--- 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
@@ -1,17 +1,17 @@
args @ { fetchurl, ... }:
rec {
- baseName = "parser_dot_common-rules";
- version = "20200715-git";
+ baseName = ''parser_dot_common-rules'';
+ version = ''20200715-git'';
parasites = [ "parser.common-rules/test" ];
- description = "Provides common parsing rules that are useful in many grammars.";
+ 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" ];
+ deps = [ args."alexandria" args."anaphora" args."esrap" args."fiveam" args."let-plus" args."split-sequence" args."trivial-with-current-source-form" ];
src = fetchurl {
- url = "http://beta.quicklisp.org/archive/parser.common-rules/2020-07-15/parser.common-rules-20200715-git.tgz";
- sha256 = "17nw0shhb8079b26ldwpfxggkzs6ysfqm4s4nr1rfhba9mkvxdxy";
+ url = ''http://beta.quicklisp.org/archive/parser.common-rules/2020-07-15/parser.common-rules-20200715-git.tgz'';
+ sha256 = ''17nw0shhb8079b26ldwpfxggkzs6ysfqm4s4nr1rfhba9mkvxdxy'';
};
packageName = "parser.common-rules";
@@ -28,7 +28,11 @@ rec {
((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)
+ (NAME split-sequence FILENAME split-sequence)
+ (NAME trivial-with-current-source-form FILENAME
+ trivial-with-current-source-form))
+ DEPENDENCIES
+ (alexandria anaphora esrap fiveam let-plus split-sequence
+ trivial-with-current-source-form)
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/pcall-queue.nix b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/pcall-queue.nix
index a60f3f377b..fe9ccae288 100644
--- a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/pcall-queue.nix
+++ b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/pcall-queue.nix
@@ -1,15 +1,15 @@
args @ { fetchurl, ... }:
rec {
- baseName = "pcall-queue";
- version = "pcall-0.3";
+ baseName = ''pcall-queue'';
+ version = ''pcall-0.3'';
- description = "System lacks description";
+ description = ''System lacks description'';
deps = [ args."alexandria" args."bordeaux-threads" ];
src = fetchurl {
- url = "http://beta.quicklisp.org/archive/pcall/2010-10-06/pcall-0.3.tgz";
- sha256 = "02idx1wnv9770fl2nh179sb8njw801g70b5mf8jqhqm2gwsb731y";
+ url = ''http://beta.quicklisp.org/archive/pcall/2010-10-06/pcall-0.3.tgz'';
+ sha256 = ''02idx1wnv9770fl2nh179sb8njw801g70b5mf8jqhqm2gwsb731y'';
};
packageName = "pcall-queue";
diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/pcall.nix b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/pcall.nix
index 6b3ef96ca1..99e9517e50 100644
--- a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/pcall.nix
+++ b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/pcall.nix
@@ -1,17 +1,17 @@
args @ { fetchurl, ... }:
rec {
- baseName = "pcall";
- version = "0.3";
+ baseName = ''pcall'';
+ version = ''0.3'';
parasites = [ "pcall-tests" ];
- description = "System lacks description";
+ description = ''System lacks description'';
deps = [ args."alexandria" args."bordeaux-threads" args."fiveam" args."pcall-queue" ];
src = fetchurl {
- url = "http://beta.quicklisp.org/archive/pcall/2010-10-06/pcall-0.3.tgz";
- sha256 = "02idx1wnv9770fl2nh179sb8njw801g70b5mf8jqhqm2gwsb731y";
+ url = ''http://beta.quicklisp.org/archive/pcall/2010-10-06/pcall-0.3.tgz'';
+ sha256 = ''02idx1wnv9770fl2nh179sb8njw801g70b5mf8jqhqm2gwsb731y'';
};
packageName = "pcall";
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 a82c9c54c6..7fa3d43d4b 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 = "20200427-git";
+ baseName = ''plump'';
+ version = ''20210124-git'';
- description = "An XML / XHTML / HTML parser that aims to be as lenient as possible.";
+ 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/2020-04-27/plump-20200427-git.tgz";
- sha256 = "0l5bi503djjkhrih94h5jbihlm60h267qm2ycq9m9fldp4fjrjic";
+ url = ''http://beta.quicklisp.org/archive/plump/2021-01-24/plump-20210124-git.tgz'';
+ sha256 = ''0br64xiz4mgmmsvkfmi43k2q16rmc6hbqf976x8cdafs3h266jdm'';
};
packageName = "plump";
@@ -19,11 +19,11 @@ rec {
}
/* (SYSTEM plump DESCRIPTION
An XML / XHTML / HTML parser that aims to be as lenient as possible. SHA256
- 0l5bi503djjkhrih94h5jbihlm60h267qm2ycq9m9fldp4fjrjic URL
- http://beta.quicklisp.org/archive/plump/2020-04-27/plump-20200427-git.tgz
- MD5 f9244ce58ee5cf5044092369e534f3b7 NAME plump FILENAME plump DEPS
+ 0br64xiz4mgmmsvkfmi43k2q16rmc6hbqf976x8cdafs3h266jdm URL
+ http://beta.quicklisp.org/archive/plump/2021-01-24/plump-20210124-git.tgz
+ MD5 44a5d371dd1c3d4afc6b8801926b059a 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
- 20200427-git SIBLINGS (plump-dom plump-lexer plump-parser) PARASITES NIL) */
+ 20210124-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 32345ee367..03c541488e 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 = "20201016-git";
+ baseName = ''postmodern'';
+ version = ''20210124-git'';
parasites = [ "postmodern/tests" ];
- description = "PostgreSQL programming API";
+ description = ''PostgreSQL programming API'';
- 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" ];
+ deps = [ args."alexandria" args."bordeaux-threads" args."cl-base64" args."cl-postgres" args."cl-postgres_plus_local-time" 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."local-time" 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/2020-10-16/postmodern-20201016-git.tgz";
- sha256 = "1svaiksbqcaq8sh7q6sj9kzazdfl360zqr2nzhwbgy4xnaj4vf3n";
+ url = ''http://beta.quicklisp.org/archive/postmodern/2021-01-24/postmodern-20210124-git.tgz'';
+ sha256 = ''1fl103fga5iq2gf1p15xvbrmmjrcv2bbi3lz1zv32j6smy5aymhc'';
};
packageName = "postmodern";
@@ -20,29 +20,30 @@ rec {
overrides = x: x;
}
/* (SYSTEM postmodern DESCRIPTION PostgreSQL programming API SHA256
- 1svaiksbqcaq8sh7q6sj9kzazdfl360zqr2nzhwbgy4xnaj4vf3n URL
- http://beta.quicklisp.org/archive/postmodern/2020-10-16/postmodern-20201016-git.tgz
- MD5 f61e827d7e7ba023f6fbc7c2667de4c8 NAME postmodern FILENAME postmodern
+ 1fl103fga5iq2gf1p15xvbrmmjrcv2bbi3lz1zv32j6smy5aymhc URL
+ http://beta.quicklisp.org/archive/postmodern/2021-01-24/postmodern-20210124-git.tgz
+ MD5 05c2c5f4d2354a5fa69a32b7b96f8ff8 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+local-time FILENAME cl-postgres_plus_local-time)
(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 local-time FILENAME local-time) (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 uax-15 FILENAME uax-15) (NAME usocket FILENAME usocket))
DEPENDENCIES
- (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
+ (alexandria bordeaux-threads cl-base64 cl-postgres cl-postgres+local-time
+ cl-postgres/tests cl-ppcre cl-unicode closer-mop fiveam flexi-streams
+ global-vars ironclad local-time md5 s-sql s-sql/tests simple-date
+ simple-date/postgres-glue split-sequence uax-15 usocket)
+ VERSION 20210124-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/proc-parse.nix b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/proc-parse.nix
index 8cb24f674f..d9146cede1 100644
--- a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/proc-parse.nix
+++ b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/proc-parse.nix
@@ -1,15 +1,15 @@
args @ { fetchurl, ... }:
rec {
- baseName = "proc-parse";
- version = "20190813-git";
+ baseName = ''proc-parse'';
+ version = ''20190813-git'';
- description = "Procedural vector parser";
+ description = ''Procedural vector parser'';
deps = [ args."alexandria" args."babel" args."trivial-features" ];
src = fetchurl {
- url = "http://beta.quicklisp.org/archive/proc-parse/2019-08-13/proc-parse-20190813-git.tgz";
- sha256 = "126l7mqxjcgw2limddgrdq63cdhwkhaxabxl9l0bjadf92nczg0j";
+ url = ''http://beta.quicklisp.org/archive/proc-parse/2019-08-13/proc-parse-20190813-git.tgz'';
+ sha256 = ''126l7mqxjcgw2limddgrdq63cdhwkhaxabxl9l0bjadf92nczg0j'';
};
packageName = "proc-parse";
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 379fbbbe9a..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-20200218-git";
+ baseName = ''prove-asdf'';
+ version = ''prove-20200218-git'';
- description = "System lacks description";
+ description = ''System lacks description'';
deps = [ ];
src = fetchurl {
- url = "http://beta.quicklisp.org/archive/prove/2020-02-18/prove-20200218-git.tgz";
- sha256 = "1sv3zyam9sdmyis5lyv0khvw82q7bcpsycpj9b3bsv9isb4j30zn";
+ url = ''http://beta.quicklisp.org/archive/prove/2020-02-18/prove-20200218-git.tgz'';
+ sha256 = ''1sv3zyam9sdmyis5lyv0khvw82q7bcpsycpj9b3bsv9isb4j30zn'';
};
packageName = "prove-asdf";
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 9bb12d3e3c..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 = "20200218-git";
+ baseName = ''prove'';
+ version = ''20200218-git'';
- description = "System lacks description";
+ description = ''System lacks description'';
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/2020-02-18/prove-20200218-git.tgz";
- sha256 = "1sv3zyam9sdmyis5lyv0khvw82q7bcpsycpj9b3bsv9isb4j30zn";
+ url = ''http://beta.quicklisp.org/archive/prove/2020-02-18/prove-20200218-git.tgz'';
+ sha256 = ''1sv3zyam9sdmyis5lyv0khvw82q7bcpsycpj9b3bsv9isb4j30zn'';
};
packageName = "prove";
diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/ptester.nix b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/ptester.nix
index fef37625dd..ffa2e595c2 100644
--- a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/ptester.nix
+++ b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/ptester.nix
@@ -1,15 +1,15 @@
args @ { fetchurl, ... }:
rec {
- baseName = "ptester";
- version = "20160929-git";
+ baseName = ''ptester'';
+ version = ''20160929-git'';
- description = "Portable test harness package";
+ description = ''Portable test harness package'';
deps = [ ];
src = fetchurl {
- url = "http://beta.quicklisp.org/archive/ptester/2016-09-29/ptester-20160929-git.tgz";
- sha256 = "04rlq1zljhxc65pm31bah3sq3as24l0sdivz440s79qlnnyh13hz";
+ url = ''http://beta.quicklisp.org/archive/ptester/2016-09-29/ptester-20160929-git.tgz'';
+ sha256 = ''04rlq1zljhxc65pm31bah3sq3as24l0sdivz440s79qlnnyh13hz'';
};
packageName = "ptester";
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 b349fccd6d..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 = "20201016-git";
+ baseName = ''puri'';
+ version = ''20201016-git'';
parasites = [ "puri/test" ];
- description = "Portable Universal Resource Indentifier Library";
+ description = ''Portable Universal Resource Indentifier Library'';
deps = [ args."ptester" ];
src = fetchurl {
- url = "http://beta.quicklisp.org/archive/puri/2020-10-16/puri-20201016-git.tgz";
- sha256 = "16h7gip6d0564s9yba3jg0rjzndmysv531hcrngvi3j3sandjfzx";
+ url = ''http://beta.quicklisp.org/archive/puri/2020-10-16/puri-20201016-git.tgz'';
+ sha256 = ''16h7gip6d0564s9yba3jg0rjzndmysv531hcrngvi3j3sandjfzx'';
};
packageName = "puri";
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
index ff6cdb460e..ae810d3479 100644
--- 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
@@ -1,7 +1,7 @@
args @ { fetchurl, ... }:
rec {
- baseName = "pythonic-string-reader";
- version = "20180711-git";
+ 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.'';
@@ -9,8 +9,8 @@ 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";
+ url = ''http://beta.quicklisp.org/archive/pythonic-string-reader/2018-07-11/pythonic-string-reader-20180711-git.tgz'';
+ sha256 = ''0gr6sbkmfwca9r0xa5vczjm4s9psbrqy5hvijkp5g42b0b7x5myx'';
};
packageName = "pythonic-string-reader";
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 1cac12f860..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 = "20200610-git";
+ baseName = ''query-fs'';
+ version = ''20200610-git'';
- description = "High-level virtual FS using CL-Fuse-Meta-FS to represent results of queries";
+ 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/2020-06-10/query-fs-20200610-git.tgz";
- sha256 = "1kcq2xs5dqwbhapknrynanwqn3c9h4cpi7hf362il2p6v6y4r413";
+ url = ''http://beta.quicklisp.org/archive/query-fs/2020-06-10/query-fs-20200610-git.tgz'';
+ sha256 = ''1kcq2xs5dqwbhapknrynanwqn3c9h4cpi7hf362il2p6v6y4r413'';
};
packageName = "query-fs";
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 a38d024ea8..295e216db5 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 = "20200610-git";
+ baseName = ''quri'';
+ version = ''20210228-git'';
- description = "Yet another URI library for Common Lisp";
+ 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/2020-06-10/quri-20200610-git.tgz";
- sha256 = "1qv8x1m6m70jczvydfq9ws5zw3jw6y74s607vfrqaf0ck5rrwsk6";
+ url = ''http://beta.quicklisp.org/archive/quri/2021-02-28/quri-20210228-git.tgz'';
+ sha256 = ''03hq6x715kv37c089b73f6j8b0f4ywhxr37wbw9any2jcgrswx0g'';
};
packageName = "quri";
@@ -18,13 +18,13 @@ rec {
overrides = x: x;
}
/* (SYSTEM quri DESCRIPTION Yet another URI library for Common Lisp SHA256
- 1qv8x1m6m70jczvydfq9ws5zw3jw6y74s607vfrqaf0ck5rrwsk6 URL
- http://beta.quicklisp.org/archive/quri/2020-06-10/quri-20200610-git.tgz MD5
- 409b559ce780952f1349b2abeaf47235 NAME quri FILENAME quri DEPS
+ 03hq6x715kv37c089b73f6j8b0f4ywhxr37wbw9any2jcgrswx0g URL
+ http://beta.quicklisp.org/archive/quri/2021-02-28/quri-20210228-git.tgz MD5
+ 67eac028850cc2539c076d31b049f7bd 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
- 20200610-git SIBLINGS (quri-test) PARASITES NIL) */
+ 20210228-git SIBLINGS (quri-test) PARASITES NIL) */
diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/rfc2388.nix b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/rfc2388.nix
index bc94b7fe3d..25d535176a 100644
--- a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/rfc2388.nix
+++ b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/rfc2388.nix
@@ -1,15 +1,15 @@
args @ { fetchurl, ... }:
rec {
- baseName = "rfc2388";
- version = "20180831-git";
+ baseName = ''rfc2388'';
+ version = ''20180831-git'';
- description = "Implementation of RFC 2388";
+ description = ''Implementation of RFC 2388'';
deps = [ ];
src = fetchurl {
- url = "http://beta.quicklisp.org/archive/rfc2388/2018-08-31/rfc2388-20180831-git.tgz";
- sha256 = "1r7vvrlq2wl213bm2aknkf34ynpl8y4nbkfir79srrdsl1337z33";
+ url = ''http://beta.quicklisp.org/archive/rfc2388/2018-08-31/rfc2388-20180831-git.tgz'';
+ sha256 = ''1r7vvrlq2wl213bm2aknkf34ynpl8y4nbkfir79srrdsl1337z33'';
};
packageName = "rfc2388";
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 91e94b2cc7..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 = "20200325-git";
+ baseName = ''rove'';
+ version = ''20200325-git'';
- description = "Yet another testing framework intended to be a successor of Prove";
+ 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/2020-03-25/rove-20200325-git.tgz";
- sha256 = "0zn8d3408rgy2nibia5hdfbf80ix1fgssywx01izx7z99l5x50z5";
+ url = ''http://beta.quicklisp.org/archive/rove/2020-03-25/rove-20200325-git.tgz'';
+ sha256 = ''0zn8d3408rgy2nibia5hdfbf80ix1fgssywx01izx7z99l5x50z5'';
};
packageName = "rove";
diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/rt.nix b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/rt.nix
index 7a53315daf..d5be4be7da 100644
--- a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/rt.nix
+++ b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/rt.nix
@@ -1,15 +1,15 @@
args @ { fetchurl, ... }:
rec {
- baseName = "rt";
- version = "20101006-git";
+ baseName = ''rt'';
+ version = ''20101006-git'';
- description = "MIT Regression Tester";
+ description = ''MIT Regression Tester'';
deps = [ ];
src = fetchurl {
- url = "http://beta.quicklisp.org/archive/rt/2010-10-06/rt-20101006-git.tgz";
- sha256 = "1jncar0xwkqk8yrc2dln389ivvgzs7ijdhhs3zpfyi5d21f0qa1v";
+ url = ''http://beta.quicklisp.org/archive/rt/2010-10-06/rt-20101006-git.tgz'';
+ sha256 = ''1jncar0xwkqk8yrc2dln389ivvgzs7ijdhhs3zpfyi5d21f0qa1v'';
};
packageName = "rt";
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 d4397b8221..7a166a3075 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-20201016-git";
+ baseName = ''s-sql'';
+ version = ''postmodern-20210124-git'';
parasites = [ "s-sql/tests" ];
- description = "Lispy DSL for SQL";
+ description = ''Lispy DSL for SQL'';
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/2020-10-16/postmodern-20201016-git.tgz";
- sha256 = "1svaiksbqcaq8sh7q6sj9kzazdfl360zqr2nzhwbgy4xnaj4vf3n";
+ url = ''http://beta.quicklisp.org/archive/postmodern/2021-01-24/postmodern-20210124-git.tgz'';
+ sha256 = ''1fl103fga5iq2gf1p15xvbrmmjrcv2bbi3lz1zv32j6smy5aymhc'';
};
packageName = "s-sql";
@@ -20,9 +20,9 @@ rec {
overrides = x: x;
}
/* (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
+ 1fl103fga5iq2gf1p15xvbrmmjrcv2bbi3lz1zv32j6smy5aymhc URL
+ http://beta.quicklisp.org/archive/postmodern/2021-01-24/postmodern-20210124-git.tgz
+ MD5 05c2c5f4d2354a5fa69a32b7b96f8ff8 NAME s-sql FILENAME s-sql DEPS
((NAME alexandria FILENAME alexandria)
(NAME bordeaux-threads FILENAME bordeaux-threads)
(NAME cl-base64 FILENAME cl-base64)
@@ -38,5 +38,5 @@ rec {
(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
+ VERSION postmodern-20210124-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 3d9e001dde..20b7fb059b 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 = "20200427-git";
+ baseName = ''s-sysdeps'';
+ version = ''20210228-git'';
- description = "An abstraction layer over platform dependent functionality";
+ description = ''An abstraction layer over platform dependent functionality'';
deps = [ args."alexandria" args."bordeaux-threads" args."split-sequence" args."usocket" args."usocket-server" ];
src = fetchurl {
- url = "http://beta.quicklisp.org/archive/s-sysdeps/2020-04-27/s-sysdeps-20200427-git.tgz";
- sha256 = "04dhi0mibqz4i1jly9i6lrd9lf93i25k2f0hba1sqis3x6sm38zy";
+ url = ''http://beta.quicklisp.org/archive/s-sysdeps/2021-02-28/s-sysdeps-20210228-git.tgz'';
+ sha256 = ''0pybgicif1qavvix9183g4ahjrgcax3qf2ab523cas8l79lr1xkw'';
};
packageName = "s-sysdeps";
@@ -19,9 +19,9 @@ rec {
}
/* (SYSTEM s-sysdeps DESCRIPTION
An abstraction layer over platform dependent functionality SHA256
- 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
+ 0pybgicif1qavvix9183g4ahjrgcax3qf2ab523cas8l79lr1xkw URL
+ http://beta.quicklisp.org/archive/s-sysdeps/2021-02-28/s-sysdeps-20210228-git.tgz
+ MD5 25d8c1673457341bf60a20752fe59772 NAME s-sysdeps FILENAME s-sysdeps DEPS
((NAME alexandria FILENAME alexandria)
(NAME bordeaux-threads FILENAME bordeaux-threads)
(NAME split-sequence FILENAME split-sequence)
@@ -29,4 +29,4 @@ rec {
(NAME usocket-server FILENAME usocket-server))
DEPENDENCIES
(alexandria bordeaux-threads split-sequence usocket usocket-server) VERSION
- 20200427-git SIBLINGS NIL PARASITES NIL) */
+ 20210228-git SIBLINGS NIL PARASITES NIL) */
diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/s-xml.nix b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/s-xml.nix
index 08bd208a89..ec12dde522 100644
--- a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/s-xml.nix
+++ b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/s-xml.nix
@@ -1,17 +1,17 @@
args @ { fetchurl, ... }:
rec {
- baseName = "s-xml";
- version = "20150608-git";
+ baseName = ''s-xml'';
+ version = ''20150608-git'';
parasites = [ "s-xml.examples" "s-xml.test" ];
- description = "Simple Common Lisp XML Parser";
+ description = ''Simple Common Lisp XML Parser'';
deps = [ ];
src = fetchurl {
- url = "http://beta.quicklisp.org/archive/s-xml/2015-06-08/s-xml-20150608-git.tgz";
- sha256 = "0cy36wqzasqma4maw9djq1vdwsp5hxq8svlbnhbv9sq9zzys5viq";
+ url = ''http://beta.quicklisp.org/archive/s-xml/2015-06-08/s-xml-20150608-git.tgz'';
+ sha256 = ''0cy36wqzasqma4maw9djq1vdwsp5hxq8svlbnhbv9sq9zzys5viq'';
};
packageName = "s-xml";
diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/salza2.nix b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/salza2.nix
index f5f294cfdb..9056cfbdcc 100644
--- a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/salza2.nix
+++ b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/salza2.nix
@@ -1,7 +1,7 @@
args @ { fetchurl, ... }:
rec {
- baseName = "salza2";
- version = "2.0.9";
+ baseName = ''salza2'';
+ version = ''2.0.9'';
description = ''Create compressed data in the ZLIB, DEFLATE, or GZIP
data formats'';
@@ -9,8 +9,8 @@ rec {
deps = [ ];
src = fetchurl {
- url = "http://beta.quicklisp.org/archive/salza2/2013-07-20/salza2-2.0.9.tgz";
- sha256 = "1m0hksgvq3njd9xa2nxlm161vgzw77djxmisq08v9pz2bz16v8va";
+ url = ''http://beta.quicklisp.org/archive/salza2/2013-07-20/salza2-2.0.9.tgz'';
+ sha256 = ''1m0hksgvq3njd9xa2nxlm161vgzw77djxmisq08v9pz2bz16v8va'';
};
packageName = "salza2";
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 143a8fad1d..17c8123a51 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 = "20201016-git";
+ baseName = ''serapeum'';
+ version = ''20210228-git'';
- description = "Utilities beyond Alexandria.";
+ 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."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."babel" 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-features" 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/2020-10-16/serapeum-20201016-git.tgz";
- sha256 = "0rbxa0r75jxkhisyjwjh7zn7m1450k58sc9g68bgkj0fsjvr44sq";
+ url = ''http://beta.quicklisp.org/archive/serapeum/2021-02-28/serapeum-20210228-git.tgz'';
+ sha256 = ''1dici8bmvrx5h74disrlvwns8f8jl746i4cyzyclswhv208x2m3x'';
};
packageName = "serapeum";
@@ -18,10 +18,10 @@ rec {
overrides = x: x;
}
/* (SYSTEM serapeum DESCRIPTION Utilities beyond Alexandria. SHA256
- 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)
+ 1dici8bmvrx5h74disrlvwns8f8jl746i4cyzyclswhv208x2m3x URL
+ http://beta.quicklisp.org/archive/serapeum/2021-02-28/serapeum-20210228-git.tgz
+ MD5 25502093ea13851021422000686a54b7 NAME serapeum FILENAME serapeum DEPS
+ ((NAME alexandria FILENAME alexandria) (NAME babel FILENAME babel)
(NAME bordeaux-threads FILENAME bordeaux-threads)
(NAME closer-mop FILENAME closer-mop)
(NAME fare-quasiquote FILENAME fare-quasiquote)
@@ -45,16 +45,18 @@ rec {
(NAME trivia.quasiquote FILENAME trivia_dot_quasiquote)
(NAME trivia.trivial FILENAME trivia_dot_trivial)
(NAME trivial-cltl2 FILENAME trivial-cltl2)
+ (NAME trivial-features FILENAME trivial-features)
(NAME trivial-file-size FILENAME trivial-file-size)
(NAME trivial-garbage FILENAME trivial-garbage)
(NAME trivial-macroexpand-all FILENAME trivial-macroexpand-all)
(NAME type-i FILENAME type-i) (NAME uiop FILENAME uiop))
DEPENDENCIES
- (alexandria bordeaux-threads closer-mop fare-quasiquote
+ (alexandria babel 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 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 20201016-git SIBLINGS NIL PARASITES NIL) */
+ trivial-features trivial-file-size trivial-garbage trivial-macroexpand-all
+ type-i uiop)
+ VERSION 20210228-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
index 31f818a8e6..1f2759cf38 100644
--- 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
@@ -1,15 +1,15 @@
args @ { fetchurl, ... }:
rec {
- baseName = "simple-date-time";
- version = "20160421-git";
+ baseName = ''simple-date-time'';
+ version = ''20160421-git'';
- description = "date and time library for common lisp";
+ 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";
+ url = ''http://beta.quicklisp.org/archive/simple-date-time/2016-04-21/simple-date-time-20160421-git.tgz'';
+ sha256 = ''1db9n7pspxkqkzz12829a1lp7v4ghrnlb7g3wh04yz6m224d3i4h'';
};
packageName = "simple-date-time";
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 c4bae5608a..a9dd27c31b 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-20201016-git";
+ baseName = ''simple-date'';
+ version = ''postmodern-20210124-git'';
parasites = [ "simple-date/tests" ];
- description = "Simple date library that can be used with postmodern";
+ description = ''Simple date library that can be used with postmodern'';
deps = [ args."fiveam" ];
src = fetchurl {
- url = "http://beta.quicklisp.org/archive/postmodern/2020-10-16/postmodern-20201016-git.tgz";
- sha256 = "1svaiksbqcaq8sh7q6sj9kzazdfl360zqr2nzhwbgy4xnaj4vf3n";
+ url = ''http://beta.quicklisp.org/archive/postmodern/2021-01-24/postmodern-20210124-git.tgz'';
+ sha256 = ''1fl103fga5iq2gf1p15xvbrmmjrcv2bbi3lz1zv32j6smy5aymhc'';
};
packageName = "simple-date";
@@ -21,9 +21,9 @@ rec {
}
/* (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
+ 1fl103fga5iq2gf1p15xvbrmmjrcv2bbi3lz1zv32j6smy5aymhc URL
+ http://beta.quicklisp.org/archive/postmodern/2021-01-24/postmodern-20210124-git.tgz
+ MD5 05c2c5f4d2354a5fa69a32b7b96f8ff8 NAME simple-date FILENAME simple-date
DEPS ((NAME fiveam FILENAME fiveam)) DEPENDENCIES (fiveam) VERSION
- postmodern-20201016-git SIBLINGS (cl-postgres postmodern s-sql) PARASITES
+ postmodern-20210124-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
index 596e509608..55d35ba8c0 100644
--- 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
@@ -1,15 +1,15 @@
args @ { fetchurl, ... }:
rec {
- baseName = "simple-tasks";
- version = "20190710-git";
+ baseName = ''simple-tasks'';
+ version = ''20190710-git'';
- description = "A very simple task scheduling framework.";
+ 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";
+ url = ''http://beta.quicklisp.org/archive/simple-tasks/2019-07-10/simple-tasks-20190710-git.tgz'';
+ sha256 = ''12y5phnbj9s2fsrz1ab6xj857zf1fv8kjk7jj2mdjs6k2d8gk8v3'';
};
packageName = "simple-tasks";
diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/smart-buffer.nix b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/smart-buffer.nix
index 18d669225a..63adab5574 100644
--- a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/smart-buffer.nix
+++ b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/smart-buffer.nix
@@ -1,15 +1,15 @@
args @ { fetchurl, ... }:
rec {
- baseName = "smart-buffer";
- version = "20160628-git";
+ baseName = ''smart-buffer'';
+ version = ''20160628-git'';
- description = "Smart octets buffer";
+ description = ''Smart octets buffer'';
deps = [ args."flexi-streams" args."trivial-gray-streams" args."uiop" args."xsubseq" ];
src = fetchurl {
- url = "http://beta.quicklisp.org/archive/smart-buffer/2016-06-28/smart-buffer-20160628-git.tgz";
- sha256 = "1wp50snkc8739n91xlnfnq1dzz3kfp0awgp92m7xbpcw3hbaib1s";
+ url = ''http://beta.quicklisp.org/archive/smart-buffer/2016-06-28/smart-buffer-20160628-git.tgz'';
+ sha256 = ''1wp50snkc8739n91xlnfnq1dzz3kfp0awgp92m7xbpcw3hbaib1s'';
};
packageName = "smart-buffer";
diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/split-sequence.nix b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/split-sequence.nix
index 3971d41044..a22076facd 100644
--- a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/split-sequence.nix
+++ b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/split-sequence.nix
@@ -1,7 +1,7 @@
args @ { fetchurl, ... }:
rec {
- baseName = "split-sequence";
- version = "v2.0.0";
+ baseName = ''split-sequence'';
+ version = ''v2.0.0'';
parasites = [ "split-sequence/tests" ];
@@ -11,8 +11,8 @@ rec {
deps = [ args."fiveam" ];
src = fetchurl {
- url = "http://beta.quicklisp.org/archive/split-sequence/2019-05-21/split-sequence-v2.0.0.tgz";
- sha256 = "09cmmswzl1kahvlzgqv8lqm9qcnz5iqg8f26fw3mm9rb3dcp7aba";
+ url = ''http://beta.quicklisp.org/archive/split-sequence/2019-05-21/split-sequence-v2.0.0.tgz'';
+ sha256 = ''09cmmswzl1kahvlzgqv8lqm9qcnz5iqg8f26fw3mm9rb3dcp7aba'';
};
packageName = "split-sequence";
diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/sqlite.nix b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/sqlite.nix
index 145156be45..ac04ba80a0 100644
--- a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/sqlite.nix
+++ b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/sqlite.nix
@@ -1,15 +1,15 @@
args @ { fetchurl, ... }:
rec {
- baseName = "sqlite";
- version = "cl-20190813-git";
+ baseName = ''sqlite'';
+ version = ''cl-20190813-git'';
- description = "CL-SQLITE package is an interface to the SQLite embedded relational database engine.";
+ description = ''CL-SQLITE package is an interface to the SQLite embedded relational database engine.'';
deps = [ args."alexandria" args."babel" args."cffi" args."iterate" args."trivial-features" ];
src = fetchurl {
- url = "http://beta.quicklisp.org/archive/cl-sqlite/2019-08-13/cl-sqlite-20190813-git.tgz";
- sha256 = "07zla2h7i7ggmzsyj33f12vpxvcbbvq6x022c2dy13flx8a83rmk";
+ url = ''http://beta.quicklisp.org/archive/cl-sqlite/2019-08-13/cl-sqlite-20190813-git.tgz'';
+ sha256 = ''07zla2h7i7ggmzsyj33f12vpxvcbbvq6x022c2dy13flx8a83rmk'';
};
packageName = "sqlite";
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 cf1f1655a3..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,17 +1,17 @@
args @ { fetchurl, ... }:
rec {
- baseName = "static-vectors";
- version = "v1.8.6";
+ baseName = ''static-vectors'';
+ version = ''v1.8.6'';
parasites = [ "static-vectors/test" ];
- description = "Create vectors allocated in static memory.";
+ description = ''Create vectors allocated in static memory.'';
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/2020-06-10/static-vectors-v1.8.6.tgz";
- sha256 = "0s549cxd8a8ix6jl4dfxj2nh01nl9f4hgnlmb88w7iixanxn58mc";
+ url = ''http://beta.quicklisp.org/archive/static-vectors/2020-06-10/static-vectors-v1.8.6.tgz'';
+ sha256 = ''0s549cxd8a8ix6jl4dfxj2nh01nl9f4hgnlmb88w7iixanxn58mc'';
};
packageName = "static-vectors";
diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/stefil.nix b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/stefil.nix
index a4a688e124..df63a5c983 100644
--- a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/stefil.nix
+++ b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/stefil.nix
@@ -1,17 +1,17 @@
args @ { fetchurl, ... }:
rec {
- baseName = "stefil";
- version = "20181210-git";
+ baseName = ''stefil'';
+ version = ''20181210-git'';
parasites = [ "stefil-test" ];
- description = "Stefil - Simple Test Framework In Lisp";
+ description = ''Stefil - Simple Test Framework In Lisp'';
deps = [ args."alexandria" args."iterate" args."metabang-bind" args."swank" ];
src = fetchurl {
- url = "http://beta.quicklisp.org/archive/stefil/2018-12-10/stefil-20181210-git.tgz";
- sha256 = "10dr8yjrjc2pyx55knds5llh9k716khlvbkmpxh0vn8rdmxmz96g";
+ url = ''http://beta.quicklisp.org/archive/stefil/2018-12-10/stefil-20181210-git.tgz'';
+ sha256 = ''10dr8yjrjc2pyx55knds5llh9k716khlvbkmpxh0vn8rdmxmz96g'';
};
packageName = "stefil";
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 5fff3b8c56..35f00dc063 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-20200925-git";
+ baseName = ''str'';
+ version = ''cl-20210124-git'';
- description = "Modern, consistent and terse Common Lisp string manipulation library.";
+ 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/2020-09-25/cl-str-20200925-git.tgz";
- sha256 = "06k81x80vjw7qd8gca6lnm5k5ws40c6kl99s7m4z72v7jxwa9ykn";
+ url = ''http://beta.quicklisp.org/archive/cl-str/2021-01-24/cl-str-20210124-git.tgz'';
+ sha256 = ''07y24mx8gmhwz6px63llgsz15aqicqa4m8gd5zwxy708xggv73jc'';
};
packageName = "str";
@@ -19,9 +19,9 @@ rec {
}
/* (SYSTEM str DESCRIPTION
Modern, consistent and terse Common Lisp string manipulation library.
- 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
+ SHA256 07y24mx8gmhwz6px63llgsz15aqicqa4m8gd5zwxy708xggv73jc URL
+ http://beta.quicklisp.org/archive/cl-str/2021-01-24/cl-str-20210124-git.tgz
+ MD5 afd5d3e1078bef872b0507215855397e 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-20200925-git SIBLINGS (str.test) PARASITES NIL) */
+ cl-20210124-git SIBLINGS (str.test) PARASITES NIL) */
diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/string-case.nix b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/string-case.nix
index 616d3aa88b..17a56c09b7 100644
--- a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/string-case.nix
+++ b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/string-case.nix
@@ -1,15 +1,15 @@
args @ { fetchurl, ... }:
rec {
- baseName = "string-case";
- version = "20180711-git";
+ baseName = ''string-case'';
+ version = ''20180711-git'';
- description = "string-case is a macro that generates specialised decision trees to dispatch on string equality";
+ description = ''string-case is a macro that generates specialised decision trees to dispatch on string equality'';
deps = [ ];
src = fetchurl {
- url = "http://beta.quicklisp.org/archive/string-case/2018-07-11/string-case-20180711-git.tgz";
- sha256 = "1n36ign4bv0idw14zyayn6i0n3iaff9yw92kpjh3qmdcq3asv90z";
+ url = ''http://beta.quicklisp.org/archive/string-case/2018-07-11/string-case-20180711-git.tgz'';
+ sha256 = ''1n36ign4bv0idw14zyayn6i0n3iaff9yw92kpjh3qmdcq3asv90z'';
};
packageName = "string-case";
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 fe13a7d8c1..90077d10f9 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 = "20201016-git";
+ baseName = ''stumpwm'';
+ version = ''20210228-git'';
- description = "A tiling, keyboard driven window manager";
+ description = ''A tiling, keyboard driven window manager'';
deps = [ args."alexandria" args."cl-ppcre" args."clx" ];
src = fetchurl {
- url = "http://beta.quicklisp.org/archive/stumpwm/2020-10-16/stumpwm-20201016-git.tgz";
- sha256 = "06lc1d9y83x0ckqd9pls7a1dyriz650mpv1rigncr02qsj3aqpp2";
+ url = ''http://beta.quicklisp.org/archive/stumpwm/2021-02-28/stumpwm-20210228-git.tgz'';
+ sha256 = ''0vfhn90vfyhlbjkfkzx0i7i6qh79p9q4c4hhsym80niz508xw5v8'';
};
packageName = "stumpwm";
@@ -18,10 +18,10 @@ rec {
overrides = x: x;
}
/* (SYSTEM stumpwm DESCRIPTION A tiling, keyboard driven window manager SHA256
- 06lc1d9y83x0ckqd9pls7a1dyriz650mpv1rigncr02qsj3aqpp2 URL
- http://beta.quicklisp.org/archive/stumpwm/2020-10-16/stumpwm-20201016-git.tgz
- MD5 fe99208b03be907ad75b0ed388e171c3 NAME stumpwm FILENAME stumpwm DEPS
+ 0vfhn90vfyhlbjkfkzx0i7i6qh79p9q4c4hhsym80niz508xw5v8 URL
+ http://beta.quicklisp.org/archive/stumpwm/2021-02-28/stumpwm-20210228-git.tgz
+ MD5 0506bcd0951463ea45cebfdb5ce76511 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 20201016-git SIBLINGS
+ DEPENDENCIES (alexandria cl-ppcre clx) VERSION 20210228-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 e2f1ba6bd2..8740dbac81 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.26";
+ baseName = ''swank'';
+ version = ''slime-v2.26.1'';
- description = "System lacks description";
+ description = ''System lacks description'';
deps = [ ];
src = fetchurl {
- url = "http://beta.quicklisp.org/archive/slime/2020-09-25/slime-v2.26.tgz";
- sha256 = "0zba4vm73g9zamhqkqcb0prm51kf4clixm2rjz89mq180qa7rrqc";
+ url = ''http://beta.quicklisp.org/archive/slime/2020-12-20/slime-v2.26.1.tgz'';
+ sha256 = ''12q3la9lwzs01x0ii5vss0i8i78lgyjrn3adr3rs027f4b7386ny'';
};
packageName = "swank";
@@ -18,7 +18,7 @@ rec {
overrides = x: x;
}
/* (SYSTEM swank DESCRIPTION System lacks description SHA256
- 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) */
+ 12q3la9lwzs01x0ii5vss0i8i78lgyjrn3adr3rs027f4b7386ny URL
+ http://beta.quicklisp.org/archive/slime/2020-12-20/slime-v2.26.1.tgz MD5
+ bd91e1fe29a4f7ebf53a0bfecc9e1e36 NAME swank FILENAME swank DEPS NIL
+ DEPENDENCIES NIL VERSION slime-v2.26.1 SIBLINGS NIL PARASITES NIL) */
diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/swap-bytes.nix b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/swap-bytes.nix
index 7c19a27135..de11d48c93 100644
--- a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/swap-bytes.nix
+++ b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/swap-bytes.nix
@@ -1,17 +1,17 @@
args @ { fetchurl, ... }:
rec {
- baseName = "swap-bytes";
- version = "v1.2";
+ baseName = ''swap-bytes'';
+ version = ''v1.2'';
parasites = [ "swap-bytes/test" ];
- description = "Optimized byte-swapping primitives.";
+ description = ''Optimized byte-swapping primitives.'';
deps = [ args."fiveam" args."trivial-features" ];
src = fetchurl {
- url = "http://beta.quicklisp.org/archive/swap-bytes/2019-11-30/swap-bytes-v1.2.tgz";
- sha256 = "05g37m4cpsszh16jz7kiscd6m6l66ms73f3s6s94i56c49jfxdy8";
+ url = ''http://beta.quicklisp.org/archive/swap-bytes/2019-11-30/swap-bytes-v1.2.tgz'';
+ sha256 = ''05g37m4cpsszh16jz7kiscd6m6l66ms73f3s6s94i56c49jfxdy8'';
};
packageName = "swap-bytes";
diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/symbol-munger.nix b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/symbol-munger.nix
index 30a4a0bcbb..4bae3cc1ce 100644
--- a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/symbol-munger.nix
+++ b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/symbol-munger.nix
@@ -1,7 +1,7 @@
args @ { fetchurl, ... }:
rec {
- baseName = "symbol-munger";
- version = "20150407-git";
+ baseName = ''symbol-munger'';
+ version = ''20150407-git'';
description = ''Functions to convert between the spacing and
capitalization conventions of various environments'';
@@ -9,8 +9,8 @@ rec {
deps = [ args."alexandria" args."iterate" ];
src = fetchurl {
- url = "http://beta.quicklisp.org/archive/symbol-munger/2015-04-07/symbol-munger-20150407-git.tgz";
- sha256 = "0dccli8557kvyy2rngh646rmavf96p7xqn5bry65d7c1f61lyqv6";
+ url = ''http://beta.quicklisp.org/archive/symbol-munger/2015-04-07/symbol-munger-20150407-git.tgz'';
+ sha256 = ''0dccli8557kvyy2rngh646rmavf96p7xqn5bry65d7c1f61lyqv6'';
};
packageName = "symbol-munger";
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 bd318dcad1..67800af432 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 = "20200925-git";
+ baseName = ''trivia'';
+ version = ''20210228-git'';
- description = "NON-optimized pattern matcher compatible with OPTIMA, with extensible optimizer interface and clean codebase";
+ 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/2020-09-25/trivia-20200925-git.tgz";
- sha256 = "192306pdx50nikph36swipdy2xz1jqrr8p9c3bi91m8qws75wi4z";
+ url = ''http://beta.quicklisp.org/archive/trivia/2021-02-28/trivia-20210228-git.tgz'';
+ sha256 = ''0qqyspq2mryl87wgrm43sj7d2wqb1pckk7fjvnmmyrf5kz5p4pc6'';
};
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 192306pdx50nikph36swipdy2xz1jqrr8p9c3bi91m8qws75wi4z URL
- http://beta.quicklisp.org/archive/trivia/2020-09-25/trivia-20200925-git.tgz
- MD5 c6546ecf272e52e051a9d3946242511b NAME trivia FILENAME trivia DEPS
+ SHA256 0qqyspq2mryl87wgrm43sj7d2wqb1pckk7fjvnmmyrf5kz5p4pc6 URL
+ http://beta.quicklisp.org/archive/trivia/2021-02-28/trivia-20210228-git.tgz
+ MD5 b374212a63c1e3b7e5c0e26348516106 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 20200925-git SIBLINGS
+ VERSION 20210228-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 3f66d67eac..60e76ff92c 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-20200925-git";
+ baseName = ''trivia_dot_balland2006'';
+ version = ''trivia-20210228-git'';
- description = "Optimizer for Trivia based on (Balland 2006)";
+ 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/2020-09-25/trivia-20200925-git.tgz";
- sha256 = "192306pdx50nikph36swipdy2xz1jqrr8p9c3bi91m8qws75wi4z";
+ url = ''http://beta.quicklisp.org/archive/trivia/2021-02-28/trivia-20210228-git.tgz'';
+ sha256 = ''0qqyspq2mryl87wgrm43sj7d2wqb1pckk7fjvnmmyrf5kz5p4pc6'';
};
packageName = "trivia.balland2006";
@@ -19,9 +19,9 @@ rec {
}
/* (SYSTEM trivia.balland2006 DESCRIPTION
Optimizer for Trivia based on (Balland 2006) SHA256
- 192306pdx50nikph36swipdy2xz1jqrr8p9c3bi91m8qws75wi4z URL
- http://beta.quicklisp.org/archive/trivia/2020-09-25/trivia-20200925-git.tgz
- MD5 c6546ecf272e52e051a9d3946242511b NAME trivia.balland2006 FILENAME
+ 0qqyspq2mryl87wgrm43sj7d2wqb1pckk7fjvnmmyrf5kz5p4pc6 URL
+ http://beta.quicklisp.org/archive/trivia/2021-02-28/trivia-20210228-git.tgz
+ MD5 b374212a63c1e3b7e5c0e26348516106 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-20200925-git SIBLINGS
+ VERSION trivia-20210228-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 d6885e3f50..5b7ca4a163 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-20200925-git";
+ baseName = ''trivia_dot_level0'';
+ version = ''trivia-20210228-git'';
- description = "Bootstrapping Pattern Matching Library for implementing Trivia";
+ description = ''Bootstrapping Pattern Matching Library for implementing Trivia'';
deps = [ args."alexandria" ];
src = fetchurl {
- url = "http://beta.quicklisp.org/archive/trivia/2020-09-25/trivia-20200925-git.tgz";
- sha256 = "192306pdx50nikph36swipdy2xz1jqrr8p9c3bi91m8qws75wi4z";
+ url = ''http://beta.quicklisp.org/archive/trivia/2021-02-28/trivia-20210228-git.tgz'';
+ sha256 = ''0qqyspq2mryl87wgrm43sj7d2wqb1pckk7fjvnmmyrf5kz5p4pc6'';
};
packageName = "trivia.level0";
@@ -19,11 +19,11 @@ rec {
}
/* (SYSTEM trivia.level0 DESCRIPTION
Bootstrapping Pattern Matching Library for implementing Trivia SHA256
- 192306pdx50nikph36swipdy2xz1jqrr8p9c3bi91m8qws75wi4z URL
- http://beta.quicklisp.org/archive/trivia/2020-09-25/trivia-20200925-git.tgz
- MD5 c6546ecf272e52e051a9d3946242511b NAME trivia.level0 FILENAME
+ 0qqyspq2mryl87wgrm43sj7d2wqb1pckk7fjvnmmyrf5kz5p4pc6 URL
+ http://beta.quicklisp.org/archive/trivia/2021-02-28/trivia-20210228-git.tgz
+ MD5 b374212a63c1e3b7e5c0e26348516106 NAME trivia.level0 FILENAME
trivia_dot_level0 DEPS ((NAME alexandria FILENAME alexandria)) DEPENDENCIES
- (alexandria) VERSION trivia-20200925-git SIBLINGS
+ (alexandria) VERSION trivia-20210228-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 d208c06e8b..6e0f41fcca 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-20200925-git";
+ baseName = ''trivia_dot_level1'';
+ version = ''trivia-20210228-git'';
- description = "Core patterns of Trivia";
+ description = ''Core patterns of Trivia'';
deps = [ args."alexandria" args."trivia_dot_level0" ];
src = fetchurl {
- url = "http://beta.quicklisp.org/archive/trivia/2020-09-25/trivia-20200925-git.tgz";
- sha256 = "192306pdx50nikph36swipdy2xz1jqrr8p9c3bi91m8qws75wi4z";
+ url = ''http://beta.quicklisp.org/archive/trivia/2021-02-28/trivia-20210228-git.tgz'';
+ sha256 = ''0qqyspq2mryl87wgrm43sj7d2wqb1pckk7fjvnmmyrf5kz5p4pc6'';
};
packageName = "trivia.level1";
@@ -18,13 +18,13 @@ rec {
overrides = x: x;
}
/* (SYSTEM trivia.level1 DESCRIPTION Core patterns of Trivia SHA256
- 192306pdx50nikph36swipdy2xz1jqrr8p9c3bi91m8qws75wi4z URL
- http://beta.quicklisp.org/archive/trivia/2020-09-25/trivia-20200925-git.tgz
- MD5 c6546ecf272e52e051a9d3946242511b NAME trivia.level1 FILENAME
+ 0qqyspq2mryl87wgrm43sj7d2wqb1pckk7fjvnmmyrf5kz5p4pc6 URL
+ http://beta.quicklisp.org/archive/trivia/2021-02-28/trivia-20210228-git.tgz
+ MD5 b374212a63c1e3b7e5c0e26348516106 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-20200925-git
+ DEPENDENCIES (alexandria trivia.level0) VERSION trivia-20210228-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 c6ce58bceb..b9e823c5ec 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-20200925-git";
+ baseName = ''trivia_dot_level2'';
+ version = ''trivia-20210228-git'';
- description = "NON-optimized pattern matcher compatible with OPTIMA, with extensible optimizer interface and clean codebase";
+ 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/2020-09-25/trivia-20200925-git.tgz";
- sha256 = "192306pdx50nikph36swipdy2xz1jqrr8p9c3bi91m8qws75wi4z";
+ url = ''http://beta.quicklisp.org/archive/trivia/2021-02-28/trivia-20210228-git.tgz'';
+ sha256 = ''0qqyspq2mryl87wgrm43sj7d2wqb1pckk7fjvnmmyrf5kz5p4pc6'';
};
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 192306pdx50nikph36swipdy2xz1jqrr8p9c3bi91m8qws75wi4z URL
- http://beta.quicklisp.org/archive/trivia/2020-09-25/trivia-20200925-git.tgz
- MD5 c6546ecf272e52e051a9d3946242511b NAME trivia.level2 FILENAME
+ SHA256 0qqyspq2mryl87wgrm43sj7d2wqb1pckk7fjvnmmyrf5kz5p4pc6 URL
+ http://beta.quicklisp.org/archive/trivia/2021-02-28/trivia-20210228-git.tgz
+ MD5 b374212a63c1e3b7e5c0e26348516106 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-20200925-git SIBLINGS
+ VERSION trivia-20210228-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 1dd1776525..a32ad1e2cd 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-20200925-git";
+ baseName = ''trivia_dot_quasiquote'';
+ version = ''trivia-20210228-git'';
- description = "fare-quasiquote extension for trivia";
+ 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/2020-09-25/trivia-20200925-git.tgz";
- sha256 = "192306pdx50nikph36swipdy2xz1jqrr8p9c3bi91m8qws75wi4z";
+ url = ''http://beta.quicklisp.org/archive/trivia/2021-02-28/trivia-20210228-git.tgz'';
+ sha256 = ''0qqyspq2mryl87wgrm43sj7d2wqb1pckk7fjvnmmyrf5kz5p4pc6'';
};
packageName = "trivia.quasiquote";
@@ -18,9 +18,9 @@ rec {
overrides = x: x;
}
/* (SYSTEM trivia.quasiquote DESCRIPTION fare-quasiquote extension for trivia
- SHA256 192306pdx50nikph36swipdy2xz1jqrr8p9c3bi91m8qws75wi4z URL
- http://beta.quicklisp.org/archive/trivia/2020-09-25/trivia-20200925-git.tgz
- MD5 c6546ecf272e52e051a9d3946242511b NAME trivia.quasiquote FILENAME
+ SHA256 0qqyspq2mryl87wgrm43sj7d2wqb1pckk7fjvnmmyrf5kz5p4pc6 URL
+ http://beta.quicklisp.org/archive/trivia/2021-02-28/trivia-20210228-git.tgz
+ MD5 b374212a63c1e3b7e5c0e26348516106 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-20200925-git SIBLINGS
+ VERSION trivia-20210228-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 ef84229d7a..e0bf11c38d 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-20200925-git";
+ baseName = ''trivia_dot_trivial'';
+ version = ''trivia-20210228-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/2020-09-25/trivia-20200925-git.tgz";
- sha256 = "192306pdx50nikph36swipdy2xz1jqrr8p9c3bi91m8qws75wi4z";
+ url = ''http://beta.quicklisp.org/archive/trivia/2021-02-28/trivia-20210228-git.tgz'';
+ sha256 = ''0qqyspq2mryl87wgrm43sj7d2wqb1pckk7fjvnmmyrf5kz5p4pc6'';
};
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 192306pdx50nikph36swipdy2xz1jqrr8p9c3bi91m8qws75wi4z URL
- http://beta.quicklisp.org/archive/trivia/2020-09-25/trivia-20200925-git.tgz
- MD5 c6546ecf272e52e051a9d3946242511b NAME trivia.trivial FILENAME
+ SHA256 0qqyspq2mryl87wgrm43sj7d2wqb1pckk7fjvnmmyrf5kz5p4pc6 URL
+ http://beta.quicklisp.org/archive/trivia/2021-02-28/trivia-20210228-git.tgz
+ MD5 b374212a63c1e3b7e5c0e26348516106 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-20200925-git SIBLINGS
+ VERSION trivia-20210228-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 f095ecc223..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 = "20200610-git";
+ baseName = ''trivial-backtrace'';
+ version = ''20200610-git'';
- description = "trivial-backtrace";
+ description = ''trivial-backtrace'';
deps = [ ];
src = fetchurl {
- url = "http://beta.quicklisp.org/archive/trivial-backtrace/2020-06-10/trivial-backtrace-20200610-git.tgz";
- sha256 = "0slz2chal6vpiqx9zmjh4cnihhw794rq3267s7kz7livpiv52rks";
+ url = ''http://beta.quicklisp.org/archive/trivial-backtrace/2020-06-10/trivial-backtrace-20200610-git.tgz'';
+ sha256 = ''0slz2chal6vpiqx9zmjh4cnihhw794rq3267s7kz7livpiv52rks'';
};
packageName = "trivial-backtrace";
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 c72e79dac5..f5495ba691 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 = "20200925-git";
+ baseName = ''trivial-clipboard'';
+ version = ''20210228-git'';
- description = "trivial-clipboard let access system clipboard.";
+ description = ''trivial-clipboard let access system clipboard.'';
deps = [ args."uiop" ];
src = fetchurl {
- url = "http://beta.quicklisp.org/archive/trivial-clipboard/2020-09-25/trivial-clipboard-20200925-git.tgz";
- sha256 = "1aksag9nfklkg0bshd7dxfip4dj9gl3x0cbisgd2c143k2csb1yc";
+ url = ''http://beta.quicklisp.org/archive/trivial-clipboard/2021-02-28/trivial-clipboard-20210228-git.tgz'';
+ sha256 = ''1fmxkz97qrjkc320w849r1411f7j2ghf3g9xh5lczcapgjwq8f0l'';
};
packageName = "trivial-clipboard";
@@ -19,8 +19,8 @@ rec {
}
/* (SYSTEM trivial-clipboard DESCRIPTION
trivial-clipboard let access system clipboard. SHA256
- 1aksag9nfklkg0bshd7dxfip4dj9gl3x0cbisgd2c143k2csb1yc URL
- http://beta.quicklisp.org/archive/trivial-clipboard/2020-09-25/trivial-clipboard-20200925-git.tgz
- MD5 4098d356666a3a3a1ff6a45b10e28354 NAME trivial-clipboard FILENAME
+ 1fmxkz97qrjkc320w849r1411f7j2ghf3g9xh5lczcapgjwq8f0l URL
+ http://beta.quicklisp.org/archive/trivial-clipboard/2021-02-28/trivial-clipboard-20210228-git.tgz
+ MD5 f147ff33934a3796d89597cea8dbe462 NAME trivial-clipboard FILENAME
trivial-clipboard DEPS ((NAME uiop FILENAME uiop)) DEPENDENCIES (uiop)
- VERSION 20200925-git SIBLINGS (trivial-clipboard-test) PARASITES NIL) */
+ VERSION 20210228-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 a73c24e9f5..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 = "20200325-git";
+ baseName = ''trivial-cltl2'';
+ version = ''20200325-git'';
- description = "Compatibility package exporting CLtL2 functionality";
+ description = ''Compatibility package exporting CLtL2 functionality'';
deps = [ ];
src = fetchurl {
- url = "http://beta.quicklisp.org/archive/trivial-cltl2/2020-03-25/trivial-cltl2-20200325-git.tgz";
- sha256 = "0hahi36v47alsvamg62d0cgay8l0razcgxl089ifj6sqy7s8iwys";
+ url = ''http://beta.quicklisp.org/archive/trivial-cltl2/2020-03-25/trivial-cltl2-20200325-git.tgz'';
+ sha256 = ''0hahi36v47alsvamg62d0cgay8l0razcgxl089ifj6sqy7s8iwys'';
};
packageName = "trivial-cltl2";
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 5988055841..714bafa839 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 = "20200715-git";
+ baseName = ''trivial-features'';
+ version = ''20210228-git'';
- description = "Ensures consistent *FEATURES* across multiple CLs.";
+ description = ''Ensures consistent *FEATURES* across multiple CLs.'';
deps = [ ];
src = fetchurl {
- url = "http://beta.quicklisp.org/archive/trivial-features/2020-07-15/trivial-features-20200715-git.tgz";
- sha256 = "0h0xxkp7vciq5yj6a1b5k76h7mzqgb5f9v25nssijgp738nmkni2";
+ url = ''http://beta.quicklisp.org/archive/trivial-features/2021-02-28/trivial-features-20210228-git.tgz'';
+ sha256 = ''1najk88r8nlpbxm8mjfj8b22f9chr9h2hxg9wqz87kkmhg4rfwwj'';
};
packageName = "trivial-features";
@@ -19,8 +19,8 @@ rec {
}
/* (SYSTEM trivial-features DESCRIPTION
Ensures consistent *FEATURES* across multiple CLs. SHA256
- 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
+ 1najk88r8nlpbxm8mjfj8b22f9chr9h2hxg9wqz87kkmhg4rfwwj URL
+ http://beta.quicklisp.org/archive/trivial-features/2021-02-28/trivial-features-20210228-git.tgz
+ MD5 6d628c0c941346773751a684213a52d7 NAME trivial-features FILENAME
+ trivial-features DEPS NIL DEPENDENCIES NIL VERSION 20210228-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 a06eda6ff1..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,17 +1,17 @@
args @ { fetchurl, ... }:
rec {
- baseName = "trivial-file-size";
- version = "20200427-git";
+ baseName = ''trivial-file-size'';
+ version = ''20200427-git'';
parasites = [ "trivial-file-size/tests" ];
- description = "Stat a file's size.";
+ description = ''Stat a file's size.'';
deps = [ args."fiveam" args."uiop" ];
src = fetchurl {
- url = "http://beta.quicklisp.org/archive/trivial-file-size/2020-04-27/trivial-file-size-20200427-git.tgz";
- sha256 = "1vspkgygrldbjb4gdm1fsn04j50rwil41x0fvvm4fxm84rwrscsa";
+ url = ''http://beta.quicklisp.org/archive/trivial-file-size/2020-04-27/trivial-file-size-20200427-git.tgz'';
+ sha256 = ''1vspkgygrldbjb4gdm1fsn04j50rwil41x0fvvm4fxm84rwrscsa'';
};
packageName = "trivial-file-size";
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 7804dc8b9a..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,17 +1,17 @@
args @ { fetchurl, ... }:
rec {
- baseName = "trivial-garbage";
- version = "20200925-git";
+ baseName = ''trivial-garbage'';
+ version = ''20200925-git'';
parasites = [ "trivial-garbage/tests" ];
- description = "Portable finalizers, weak hash-tables and weak pointers.";
+ description = ''Portable finalizers, weak hash-tables and weak pointers.'';
deps = [ args."rt" ];
src = fetchurl {
- url = "http://beta.quicklisp.org/archive/trivial-garbage/2020-09-25/trivial-garbage-20200925-git.tgz";
- sha256 = "00iw2iw6qzji9b2gwy798l54jdk185sxh1k7m2qd9srs8s730k83";
+ url = ''http://beta.quicklisp.org/archive/trivial-garbage/2020-09-25/trivial-garbage-20200925-git.tgz'';
+ sha256 = ''00iw2iw6qzji9b2gwy798l54jdk185sxh1k7m2qd9srs8s730k83'';
};
packageName = "trivial-garbage";
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 2b763b0480..8fba0ff37f 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 = "20200925-git";
+ baseName = ''trivial-gray-streams'';
+ version = ''20210124-git'';
- description = "Compatibility layer for Gray Streams (see http://www.cliki.net/Gray%20streams).";
+ 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/2020-09-25/trivial-gray-streams-20200925-git.tgz";
- sha256 = "1mg31fwjixd04lfqbpzjan3cny1i478xm1a9l3p0i9m4dv4g2k2b";
+ url = ''http://beta.quicklisp.org/archive/trivial-gray-streams/2021-01-24/trivial-gray-streams-20210124-git.tgz'';
+ sha256 = ''0swqcw3649279qyn5lc42xqgi13jc4kd7hf3iasf4vfli8lhb3n6'';
};
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 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
+ SHA256 0swqcw3649279qyn5lc42xqgi13jc4kd7hf3iasf4vfli8lhb3n6 URL
+ http://beta.quicklisp.org/archive/trivial-gray-streams/2021-01-24/trivial-gray-streams-20210124-git.tgz
+ MD5 1b93af1cae9f8465d813964db4d10588 NAME trivial-gray-streams FILENAME
+ trivial-gray-streams DEPS NIL DEPENDENCIES NIL VERSION 20210124-git
SIBLINGS (trivial-gray-streams-test) PARASITES NIL) */
diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-indent.nix b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-indent.nix
index 42e09023af..de16d81082 100644
--- a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-indent.nix
+++ b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-indent.nix
@@ -1,15 +1,15 @@
args @ { fetchurl, ... }:
rec {
- baseName = "trivial-indent";
- version = "20191007-git";
+ baseName = ''trivial-indent'';
+ version = ''20191007-git'';
- description = "A very simple library to allow indentation hints for SWANK.";
+ description = ''A very simple library to allow indentation hints for SWANK.'';
deps = [ ];
src = fetchurl {
- url = "http://beta.quicklisp.org/archive/trivial-indent/2019-10-07/trivial-indent-20191007-git.tgz";
- sha256 = "0v5isxg6lfbgcpmndb3c515d7bswhwqgjm97li85w39krnw1bfmv";
+ url = ''http://beta.quicklisp.org/archive/trivial-indent/2019-10-07/trivial-indent-20191007-git.tgz'';
+ sha256 = ''0v5isxg6lfbgcpmndb3c515d7bswhwqgjm97li85w39krnw1bfmv'';
};
packageName = "trivial-indent";
diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-macroexpand-all.nix b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-macroexpand-all.nix
index b416494920..473a41063e 100644
--- a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-macroexpand-all.nix
+++ b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-macroexpand-all.nix
@@ -1,15 +1,15 @@
args @ { fetchurl, ... }:
rec {
- baseName = "trivial-macroexpand-all";
- version = "20171023-git";
+ baseName = ''trivial-macroexpand-all'';
+ version = ''20171023-git'';
- description = "Call each implementation's macroexpand-all equivalent";
+ description = ''Call each implementation's macroexpand-all equivalent'';
deps = [ ];
src = fetchurl {
- url = "http://beta.quicklisp.org/archive/trivial-macroexpand-all/2017-10-23/trivial-macroexpand-all-20171023-git.tgz";
- sha256 = "0h5h9zn32pn26x7ll9h08g0csr2f5hvk1wgbr7kdhx5zbrszd7zm";
+ url = ''http://beta.quicklisp.org/archive/trivial-macroexpand-all/2017-10-23/trivial-macroexpand-all-20171023-git.tgz'';
+ sha256 = ''0h5h9zn32pn26x7ll9h08g0csr2f5hvk1wgbr7kdhx5zbrszd7zm'';
};
packageName = "trivial-macroexpand-all";
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
index de53bf5bd0..dc0de9da62 100644
--- 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
@@ -1,15 +1,15 @@
args @ { fetchurl, ... }:
rec {
- baseName = "trivial-main-thread";
- version = "20190710-git";
+ baseName = ''trivial-main-thread'';
+ version = ''20190710-git'';
- description = "Compatibility library to run things in the main thread.";
+ 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";
+ url = ''http://beta.quicklisp.org/archive/trivial-main-thread/2019-07-10/trivial-main-thread-20190710-git.tgz'';
+ sha256 = ''1zj12rc29rrff5grmi7sjxfzdv78khbb4sg43hy2cb33hykpvg2h'';
};
packageName = "trivial-main-thread";
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 36c6e31cc8..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 = "20200715-git";
+ baseName = ''trivial-mimes'';
+ version = ''20200715-git'';
- description = "Tiny library to detect mime types in files.";
+ description = ''Tiny library to detect mime types in files.'';
deps = [ ];
src = fetchurl {
- url = "http://beta.quicklisp.org/archive/trivial-mimes/2020-07-15/trivial-mimes-20200715-git.tgz";
- sha256 = "10mk1v5ad0m3bg5pl7lqhh827jvg5jb896807vmi8wznwk7zaif1";
+ url = ''http://beta.quicklisp.org/archive/trivial-mimes/2020-07-15/trivial-mimes-20200715-git.tgz'';
+ sha256 = ''10mk1v5ad0m3bg5pl7lqhh827jvg5jb896807vmi8wznwk7zaif1'';
};
packageName = "trivial-mimes";
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
index 78dcc5163b..9cd37f8072 100644
--- 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
@@ -1,15 +1,15 @@
args @ { fetchurl, ... }:
rec {
- baseName = "trivial-package-local-nicknames";
- version = "20200610-git";
+ baseName = ''trivial-package-local-nicknames'';
+ version = ''20200610-git'';
- description = "Portability library for package-local nicknames";
+ 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";
+ 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";
diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-types.nix b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-types.nix
index 83785140db..8cc04c2c64 100644
--- a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-types.nix
+++ b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-types.nix
@@ -1,15 +1,15 @@
args @ { fetchurl, ... }:
rec {
- baseName = "trivial-types";
- version = "20120407-git";
+ baseName = ''trivial-types'';
+ version = ''20120407-git'';
- description = "Trivial type definitions";
+ description = ''Trivial type definitions'';
deps = [ ];
src = fetchurl {
- url = "http://beta.quicklisp.org/archive/trivial-types/2012-04-07/trivial-types-20120407-git.tgz";
- sha256 = "0y3lfbbvi2qp2cwswzmk1awzqrsrrcfkcm1qn744bgm1fiqhxbxx";
+ url = ''http://beta.quicklisp.org/archive/trivial-types/2012-04-07/trivial-types-20120407-git.tgz'';
+ sha256 = ''0y3lfbbvi2qp2cwswzmk1awzqrsrrcfkcm1qn744bgm1fiqhxbxx'';
};
packageName = "trivial-types";
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 c38ca16d2f..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 = "20200925-git";
+ baseName = ''trivial-utf-8'';
+ version = ''20200925-git'';
parasites = [ "trivial-utf-8/doc" "trivial-utf-8/tests" ];
- description = "A small library for doing UTF-8-based input and output.";
+ description = ''A small library for doing UTF-8-based input and output.'';
deps = [ args."mgl-pax" ];
src = fetchurl {
- url = "http://beta.quicklisp.org/archive/trivial-utf-8/2020-09-25/trivial-utf-8-20200925-git.tgz";
- sha256 = "06v9jif4f5xyl5jd7ldg69ds7cypf72xl7nda5q55fssmgcydi1b";
+ url = ''http://beta.quicklisp.org/archive/trivial-utf-8/2020-09-25/trivial-utf-8-20200925-git.tgz'';
+ sha256 = ''06v9jif4f5xyl5jd7ldg69ds7cypf72xl7nda5q55fssmgcydi1b'';
};
packageName = "trivial-utf-8";
diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-with-current-source-form.nix b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-with-current-source-form.nix
new file mode 100644
index 0000000000..f3c60a4b47
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-with-current-source-form.nix
@@ -0,0 +1,27 @@
+args @ { fetchurl, ... }:
+rec {
+ baseName = ''trivial-with-current-source-form'';
+ version = ''20200427-git'';
+
+ description = ''Helps macro writers produce better errors for macro users'';
+
+ deps = [ args."alexandria" ];
+
+ src = fetchurl {
+ url = ''http://beta.quicklisp.org/archive/trivial-with-current-source-form/2020-04-27/trivial-with-current-source-form-20200427-git.tgz'';
+ sha256 = ''05zkj42f071zhg7swfyklg44k0zc893c9li9virkigzmvhids84f'';
+ };
+
+ packageName = "trivial-with-current-source-form";
+
+ asdFilesToKeep = ["trivial-with-current-source-form.asd"];
+ overrides = x: x;
+}
+/* (SYSTEM trivial-with-current-source-form DESCRIPTION
+ Helps macro writers produce better errors for macro users SHA256
+ 05zkj42f071zhg7swfyklg44k0zc893c9li9virkigzmvhids84f URL
+ http://beta.quicklisp.org/archive/trivial-with-current-source-form/2020-04-27/trivial-with-current-source-form-20200427-git.tgz
+ MD5 9a1367a5434664bd1ca2215d06e6d5cf NAME trivial-with-current-source-form
+ FILENAME trivial-with-current-source-form DEPS
+ ((NAME alexandria FILENAME alexandria)) DEPENDENCIES (alexandria) VERSION
+ 20200427-git SIBLINGS NIL PARASITES NIL) */
diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/type-i.nix b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/type-i.nix
index bc08f1683d..e76be59540 100644
--- a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/type-i.nix
+++ b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/type-i.nix
@@ -1,15 +1,15 @@
args @ { fetchurl, ... }:
rec {
- baseName = "type-i";
- version = "20191227-git";
+ baseName = ''type-i'';
+ version = ''20191227-git'';
- description = "Type Inference Utility on Fundamentally 1-arg Predicates";
+ description = ''Type Inference Utility on Fundamentally 1-arg Predicates'';
deps = [ args."alexandria" args."closer-mop" args."introspect-environment" args."lisp-namespace" 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/type-i/2019-12-27/type-i-20191227-git.tgz";
- sha256 = "0f8q6klqjgz1kdyhisfkk07izvgs04jchlv2kl3srjxfr5dj5jl5";
+ url = ''http://beta.quicklisp.org/archive/type-i/2019-12-27/type-i-20191227-git.tgz'';
+ sha256 = ''0f8q6klqjgz1kdyhisfkk07izvgs04jchlv2kl3srjxfr5dj5jl5'';
};
packageName = "type-i";
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
index 3575424634..5807ac6b96 100644
--- 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
@@ -1,17 +1,17 @@
args @ { fetchurl, ... }:
rec {
- baseName = "uax-15";
- version = "20200325-git";
+ baseName = ''uax-15'';
+ version = ''20210228-git'';
parasites = [ "uax-15/tests" ];
- description = "Common lisp implementation of Unicode normalization functions :nfc, :nfd, :nfkc and :nfkd (Uax-15)";
+ 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";
+ url = ''http://beta.quicklisp.org/archive/uax-15/2021-02-28/uax-15-20210228-git.tgz'';
+ sha256 = ''1vf590djzyika6200zqw4mbqrajcmv7g5swydimnvk7xqzpa8ksp'';
};
packageName = "uax-15";
@@ -21,10 +21,10 @@ rec {
}
/* (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
+ SHA256 1vf590djzyika6200zqw4mbqrajcmv7g5swydimnvk7xqzpa8ksp URL
+ http://beta.quicklisp.org/archive/uax-15/2021-02-28/uax-15-20210228-git.tgz
+ MD5 b801b3b91cdd57cecf086f1fe5fb31d6 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
+ DEPENDENCIES (cl-ppcre fiveam split-sequence uiop) VERSION 20210228-git
SIBLINGS NIL PARASITES (uax-15/tests)) */
diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/uffi.nix b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/uffi.nix
index 2c36113658..1986f7c88f 100644
--- a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/uffi.nix
+++ b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/uffi.nix
@@ -1,15 +1,15 @@
args @ { fetchurl, ... }:
rec {
- baseName = "uffi";
- version = "20180228-git";
+ baseName = ''uffi'';
+ version = ''20180228-git'';
- description = "Universal Foreign Function Library for Common Lisp";
+ description = ''Universal Foreign Function Library for Common Lisp'';
deps = [ ];
src = fetchurl {
- url = "http://beta.quicklisp.org/archive/uffi/2018-02-28/uffi-20180228-git.tgz";
- sha256 = "1kknzwxsbg2ydy2w0n88y2bq37lqqwg02ffsmz57gqbxvlk26479";
+ url = ''http://beta.quicklisp.org/archive/uffi/2018-02-28/uffi-20180228-git.tgz'';
+ sha256 = ''1kknzwxsbg2ydy2w0n88y2bq37lqqwg02ffsmz57gqbxvlk26479'';
};
packageName = "uffi";
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 b5a77d6ea3..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.4";
+ baseName = ''uiop'';
+ version = ''3.3.4'';
- description = "System lacks description";
+ description = ''System lacks description'';
deps = [ ];
src = fetchurl {
- url = "http://beta.quicklisp.org/archive/uiop/2020-02-18/uiop-3.3.4.tgz";
- sha256 = "0n0fp55ivwi6gzhaywdkngnk2snpp9nn3mz5rq3pnrwldi9q7aav";
+ url = ''http://beta.quicklisp.org/archive/uiop/2020-02-18/uiop-3.3.4.tgz'';
+ sha256 = ''0n0fp55ivwi6gzhaywdkngnk2snpp9nn3mz5rq3pnrwldi9q7aav'';
};
packageName = "uiop";
diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/unit-test.nix b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/unit-test.nix
index 8f54a89416..6c45649673 100644
--- a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/unit-test.nix
+++ b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/unit-test.nix
@@ -1,15 +1,15 @@
args @ { fetchurl, ... }:
rec {
- baseName = "unit-test";
- version = "20120520-git";
+ baseName = ''unit-test'';
+ version = ''20120520-git'';
- description = "unit-testing framework for common lisp";
+ description = ''unit-testing framework for common lisp'';
deps = [ ];
src = fetchurl {
- url = "http://beta.quicklisp.org/archive/unit-test/2012-05-20/unit-test-20120520-git.tgz";
- sha256 = "1bwbx9d2z9qll46ksfh7bgd0dgh4is2dyfhkladq53qycvjywv9l";
+ url = ''http://beta.quicklisp.org/archive/unit-test/2012-05-20/unit-test-20120520-git.tgz'';
+ sha256 = ''1bwbx9d2z9qll46ksfh7bgd0dgh4is2dyfhkladq53qycvjywv9l'';
};
packageName = "unit-test";
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
index 250ef24f9a..7243d5a17e 100644
--- 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
@@ -1,15 +1,15 @@
args @ { fetchurl, ... }:
rec {
- baseName = "unix-options";
- version = "20151031-git";
+ baseName = ''unix-options'';
+ version = ''20151031-git'';
- description = "Easy to use command line option parser";
+ 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";
+ url = ''http://beta.quicklisp.org/archive/unix-options/2015-10-31/unix-options-20151031-git.tgz'';
+ sha256 = ''0c9vbvvyx5qwvns87624gzxjcbdkbkcwssg29cxjfv3ci3qwqcd5'';
};
packageName = "unix-options";
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 b7af624f7a..e89d751dba 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,17 +1,17 @@
args @ { fetchurl, ... }:
rec {
- baseName = "unix-opts";
- version = "20200925-git";
+ baseName = ''unix-opts'';
+ version = ''20210124-git'';
parasites = [ "unix-opts/tests" ];
- description = "minimalistic parser of command line arguments";
+ description = ''minimalistic parser of command line arguments'';
deps = [ ];
src = fetchurl {
- url = "http://beta.quicklisp.org/archive/unix-opts/2020-09-25/unix-opts-20200925-git.tgz";
- sha256 = "0y7bg825l8my7kpk4iwx0n8wn7rgy7bir60kb0s55g3x0nx5vx35";
+ url = ''http://beta.quicklisp.org/archive/unix-opts/2021-01-24/unix-opts-20210124-git.tgz'';
+ sha256 = ''1gjjav035n6297vgc4wi3i64516b8sdyi0d02q0nwicciwg6mwsn'';
};
packageName = "unix-opts";
@@ -20,8 +20,8 @@ rec {
overrides = x: x;
}
/* (SYSTEM unix-opts DESCRIPTION minimalistic parser of command line arguments
- 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
+ SHA256 1gjjav035n6297vgc4wi3i64516b8sdyi0d02q0nwicciwg6mwsn URL
+ http://beta.quicklisp.org/archive/unix-opts/2021-01-24/unix-opts-20210124-git.tgz
+ MD5 c75d3233c0f2e16793b1ce19bfc83811 NAME unix-opts FILENAME unix-opts DEPS
+ NIL DEPENDENCIES NIL VERSION 20210124-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
index 977ee934c9..04a09a8ab4 100644
--- 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
@@ -1,15 +1,15 @@
args @ { fetchurl, ... }:
rec {
- baseName = "usocket-server";
- version = "usocket-0.8.3";
+ baseName = ''usocket-server'';
+ version = ''usocket-0.8.3'';
- description = "Universal socket library for Common Lisp (server side)";
+ 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";
+ url = ''http://beta.quicklisp.org/archive/usocket/2019-12-27/usocket-0.8.3.tgz'';
+ sha256 = ''19gl72r9jqms8slzn7i7bww2cqng9mhiqqhhccadlrx2xv6d3lm7'';
};
packageName = "usocket-server";
diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/usocket.nix b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/usocket.nix
index 4dbf781f96..6b75384ea1 100644
--- a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/usocket.nix
+++ b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/usocket.nix
@@ -1,15 +1,15 @@
args @ { fetchurl, ... }:
rec {
- baseName = "usocket";
- version = "0.8.3";
+ baseName = ''usocket'';
+ version = ''0.8.3'';
- description = "Universal socket library for Common Lisp";
+ description = ''Universal socket library for Common Lisp'';
deps = [ args."split-sequence" ];
src = fetchurl {
- url = "http://beta.quicklisp.org/archive/usocket/2019-12-27/usocket-0.8.3.tgz";
- sha256 = "19gl72r9jqms8slzn7i7bww2cqng9mhiqqhhccadlrx2xv6d3lm7";
+ url = ''http://beta.quicklisp.org/archive/usocket/2019-12-27/usocket-0.8.3.tgz'';
+ sha256 = ''19gl72r9jqms8slzn7i7bww2cqng9mhiqqhhccadlrx2xv6d3lm7'';
};
packageName = "usocket";
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
index 5b992620ec..b672d0c2ec 100644
--- 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
@@ -1,17 +1,17 @@
args @ { fetchurl, ... }:
rec {
- baseName = "utilities_dot_print-items";
- version = "20190813-git";
+ baseName = ''utilities_dot_print-items'';
+ version = ''20190813-git'';
parasites = [ "utilities.print-items/test" ];
- description = "A protocol for flexible and composable printing.";
+ 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";
+ url = ''http://beta.quicklisp.org/archive/utilities.print-items/2019-08-13/utilities.print-items-20190813-git.tgz'';
+ sha256 = ''12l4kzz621qfcg8p5qzyxp4n4hh9wdlpiziykwb4c80g32rdwkc2'';
};
packageName = "utilities.print-items";
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
index 2f2345fe0b..80ff6d9ff7 100644
--- 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
@@ -1,17 +1,17 @@
args @ { fetchurl, ... }:
rec {
- baseName = "utilities_dot_print-tree";
- version = "20200325-git";
+ baseName = ''utilities_dot_print-tree'';
+ version = ''20200325-git'';
parasites = [ "utilities.print-tree/test" ];
- description = "This system provides simple facilities for printing tree structures.";
+ 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";
+ url = ''http://beta.quicklisp.org/archive/utilities.print-tree/2020-03-25/utilities.print-tree-20200325-git.tgz'';
+ sha256 = ''1nam8g2ppzkzpkwwhmil9y68is43ljpvc7hd64zxp4zsaqab5dww'';
};
packageName = "utilities.print-tree";
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 a64d913d1d..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 = "20200715-git";
+ baseName = ''uuid'';
+ version = ''20200715-git'';
- description = "UUID Generation";
+ description = ''UUID Generation'';
deps = [ args."alexandria" args."bordeaux-threads" args."ironclad" args."trivial-utf-8" ];
src = fetchurl {
- url = "http://beta.quicklisp.org/archive/uuid/2020-07-15/uuid-20200715-git.tgz";
- sha256 = "1ymir6hgax1vbbcgyprnwbsx224ih03a55v10l35xridwyzhzrx0";
+ url = ''http://beta.quicklisp.org/archive/uuid/2020-07-15/uuid-20200715-git.tgz'';
+ sha256 = ''1ymir6hgax1vbbcgyprnwbsx224ih03a55v10l35xridwyzhzrx0'';
};
packageName = "uuid";
diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/vom.nix b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/vom.nix
index 401466e8a5..6a4751f799 100644
--- a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/vom.nix
+++ b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/vom.nix
@@ -1,15 +1,15 @@
args @ { fetchurl, ... }:
rec {
- baseName = "vom";
- version = "20160825-git";
+ baseName = ''vom'';
+ version = ''20160825-git'';
- description = "A tiny logging utility.";
+ description = ''A tiny logging utility.'';
deps = [ ];
src = fetchurl {
- url = "http://beta.quicklisp.org/archive/vom/2016-08-25/vom-20160825-git.tgz";
- sha256 = "0mvln0xx8qnrsmaj7c0f2ilgahvf078qvhqag7qs3j26xmamjm93";
+ url = ''http://beta.quicklisp.org/archive/vom/2016-08-25/vom-20160825-git.tgz'';
+ sha256 = ''0mvln0xx8qnrsmaj7c0f2ilgahvf078qvhqag7qs3j26xmamjm93'';
};
packageName = "vom";
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 e4ddb59c39..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 = "20200427-git";
+ baseName = ''woo'';
+ version = ''20200427-git'';
- description = "An asynchronous HTTP server written in Common Lisp";
+ 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/2020-04-27/woo-20200427-git.tgz";
- sha256 = "1mmgwgf9n74zab96x1n4faij30l2vk19xy74fcp0xnpj4lrp7v29";
+ url = ''http://beta.quicklisp.org/archive/woo/2020-04-27/woo-20200427-git.tgz'';
+ sha256 = ''1mmgwgf9n74zab96x1n4faij30l2vk19xy74fcp0xnpj4lrp7v29'';
};
packageName = "woo";
diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/wookie.nix b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/wookie.nix
index b28c751fdd..257ed57df4 100644
--- a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/wookie.nix
+++ b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/wookie.nix
@@ -1,15 +1,15 @@
args @ { fetchurl, ... }:
rec {
- baseName = "wookie";
- version = "20191130-git";
+ baseName = ''wookie'';
+ version = ''20191130-git'';
- description = "An evented webserver for Common Lisp.";
+ description = ''An evented webserver for Common Lisp.'';
deps = [ args."alexandria" args."babel" args."blackbird" args."bordeaux-threads" args."cffi" args."cffi-grovel" args."cffi-toolchain" args."chunga" args."cl-async" args."cl-async-base" args."cl-async-ssl" args."cl-async-util" args."cl-fad" args."cl-libuv" args."cl-ppcre" args."cl-utilities" args."do-urlencode" args."fast-http" args."fast-io" args."flexi-streams" args."proc-parse" args."quri" args."smart-buffer" args."split-sequence" args."static-vectors" args."trivial-features" args."trivial-gray-streams" args."vom" args."xsubseq" ];
src = fetchurl {
- url = "http://beta.quicklisp.org/archive/wookie/2019-11-30/wookie-20191130-git.tgz";
- sha256 = "13f9fi7yv28lag79z03jrnm7aih2x5zwvh4hw9cadw75956975d2";
+ url = ''http://beta.quicklisp.org/archive/wookie/2019-11-30/wookie-20191130-git.tgz'';
+ sha256 = ''13f9fi7yv28lag79z03jrnm7aih2x5zwvh4hw9cadw75956975d2'';
};
packageName = "wookie";
diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/xembed.nix b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/xembed.nix
index 5130b81c91..5a1b903942 100644
--- a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/xembed.nix
+++ b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/xembed.nix
@@ -1,15 +1,15 @@
args @ { fetchurl, ... }:
rec {
- baseName = "xembed";
- version = "clx-20191130-git";
+ baseName = ''xembed'';
+ version = ''clx-20191130-git'';
- description = "An implementation of the XEMBED protocol that integrates with CLX.";
+ description = ''An implementation of the XEMBED protocol that integrates with CLX.'';
deps = [ args."clx" ];
src = fetchurl {
- url = "http://beta.quicklisp.org/archive/clx-xembed/2019-11-30/clx-xembed-20191130-git.tgz";
- sha256 = "1ik5gxzhn9j7827jg6g8rk2wa5jby11n2db24y6wrf0ldnbpj7jd";
+ url = ''http://beta.quicklisp.org/archive/clx-xembed/2019-11-30/clx-xembed-20191130-git.tgz'';
+ sha256 = ''1ik5gxzhn9j7827jg6g8rk2wa5jby11n2db24y6wrf0ldnbpj7jd'';
};
packageName = "xembed";
diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/xkeyboard.nix b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/xkeyboard.nix
index f46bff1f58..4bfc0678f0 100644
--- a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/xkeyboard.nix
+++ b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/xkeyboard.nix
@@ -1,17 +1,17 @@
args @ { fetchurl, ... }:
rec {
- baseName = "xkeyboard";
- version = "clx-20120811-git";
+ baseName = ''xkeyboard'';
+ version = ''clx-20120811-git'';
parasites = [ "xkeyboard-test" ];
- description = "XKeyboard is X11 extension for clx of the same name.";
+ description = ''XKeyboard is X11 extension for clx of the same name.'';
deps = [ args."clx" ];
src = fetchurl {
- url = "http://beta.quicklisp.org/archive/clx-xkeyboard/2012-08-11/clx-xkeyboard-20120811-git.tgz";
- sha256 = "11q70drx3xn7rvk528qlnzpnxd6hg6801kc54ys3jz1l7074458n";
+ url = ''http://beta.quicklisp.org/archive/clx-xkeyboard/2012-08-11/clx-xkeyboard-20120811-git.tgz'';
+ sha256 = ''11q70drx3xn7rvk528qlnzpnxd6hg6801kc54ys3jz1l7074458n'';
};
packageName = "xkeyboard";
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
index 730b1287ba..35854cd6b9 100644
--- 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
@@ -1,7 +1,7 @@
args @ { fetchurl, ... }:
rec {
- baseName = "xml_dot_location";
- version = "20200325-git";
+ baseName = ''xml_dot_location'';
+ version = ''20200325-git'';
parasites = [ "xml.location/test" ];
@@ -11,8 +11,8 @@ rec {
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";
+ url = ''http://beta.quicklisp.org/archive/xml.location/2020-03-25/xml.location-20200325-git.tgz'';
+ sha256 = ''0wfccj1p1al0w9pc5rhxpsvm3wb2lr5fc4cfjyg751pwsasjikwx'';
};
packageName = "xml.location";
diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/xmls.nix b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/xmls.nix
index e1da47fe37..c02e6e2481 100644
--- a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/xmls.nix
+++ b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/xmls.nix
@@ -1,17 +1,17 @@
args @ { fetchurl, ... }:
rec {
- baseName = "xmls";
- version = "3.0.2";
+ baseName = ''xmls'';
+ version = ''3.0.2'';
parasites = [ "xmls/test" "xmls/unit-test" ];
- description = "System lacks description";
+ description = ''System lacks description'';
deps = [ args."fiveam" ];
src = fetchurl {
- url = "http://beta.quicklisp.org/archive/xmls/2018-04-30/xmls-3.0.2.tgz";
- sha256 = "1r7mvw62zjcg45j3hm8jlbiisad2b415pghn6qcmhl03dmgp7kgi";
+ url = ''http://beta.quicklisp.org/archive/xmls/2018-04-30/xmls-3.0.2.tgz'';
+ sha256 = ''1r7mvw62zjcg45j3hm8jlbiisad2b415pghn6qcmhl03dmgp7kgi'';
};
packageName = "xmls";
diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/xpath.nix b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/xpath.nix
index 1f062549a0..3e14a5ba9f 100644
--- a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/xpath.nix
+++ b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/xpath.nix
@@ -1,17 +1,17 @@
args @ { fetchurl, ... }:
rec {
- baseName = "xpath";
- version = "plexippus-20190521-git";
+ baseName = ''xpath'';
+ version = ''plexippus-20190521-git'';
parasites = [ "xpath/test" ];
- description = "An implementation of the XML Path Language (XPath) Version 1.0";
+ description = ''An implementation of the XML Path Language (XPath) Version 1.0'';
deps = [ args."alexandria" args."babel" args."cl-ppcre" args."closure-common" args."cxml" args."parse-number" args."puri" args."trivial-features" args."trivial-gray-streams" args."yacc" ];
src = fetchurl {
- url = "http://beta.quicklisp.org/archive/plexippus-xpath/2019-05-21/plexippus-xpath-20190521-git.tgz";
- sha256 = "15357w1rlmahld4rh8avix7m40mwiiv7n2vlyc57ldw2k1m0n7xa";
+ url = ''http://beta.quicklisp.org/archive/plexippus-xpath/2019-05-21/plexippus-xpath-20190521-git.tgz'';
+ sha256 = ''15357w1rlmahld4rh8avix7m40mwiiv7n2vlyc57ldw2k1m0n7xa'';
};
packageName = "xpath";
diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/xsubseq.nix b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/xsubseq.nix
index 7d0c52d28a..b9ab71744c 100644
--- a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/xsubseq.nix
+++ b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/xsubseq.nix
@@ -1,15 +1,15 @@
args @ { fetchurl, ... }:
rec {
- baseName = "xsubseq";
- version = "20170830-git";
+ baseName = ''xsubseq'';
+ version = ''20170830-git'';
description = ''Efficient way to manage "subseq"s in Common Lisp'';
deps = [ ];
src = fetchurl {
- url = "http://beta.quicklisp.org/archive/xsubseq/2017-08-30/xsubseq-20170830-git.tgz";
- sha256 = "1am63wkha97hyvkqf4ydx3q07mqpa0chkx65znr7kmqi83a8waml";
+ url = ''http://beta.quicklisp.org/archive/xsubseq/2017-08-30/xsubseq-20170830-git.tgz'';
+ sha256 = ''1am63wkha97hyvkqf4ydx3q07mqpa0chkx65znr7kmqi83a8waml'';
};
packageName = "xsubseq";
diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/yacc.nix b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/yacc.nix
index 5ec84290c4..c7031f4aa3 100644
--- a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/yacc.nix
+++ b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/yacc.nix
@@ -1,15 +1,15 @@
args @ { fetchurl, ... }:
rec {
- baseName = "yacc";
- version = "cl-20101006-darcs";
+ baseName = ''yacc'';
+ version = ''cl-20101006-darcs'';
- description = "A LALR(1) parser generator for Common Lisp";
+ description = ''A LALR(1) parser generator for Common Lisp'';
deps = [ ];
src = fetchurl {
- url = "http://beta.quicklisp.org/archive/cl-yacc/2010-10-06/cl-yacc-20101006-darcs.tgz";
- sha256 = "0cymvl0arp4yahqcnhxggs1z2g42bf6z4ix75ba7wbsi52zirjp7";
+ url = ''http://beta.quicklisp.org/archive/cl-yacc/2010-10-06/cl-yacc-20101006-darcs.tgz'';
+ sha256 = ''0cymvl0arp4yahqcnhxggs1z2g42bf6z4ix75ba7wbsi52zirjp7'';
};
packageName = "yacc";
diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/yason.nix b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/yason.nix
index 727bb74e57..9f6ac0a84c 100644
--- a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/yason.nix
+++ b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/yason.nix
@@ -1,15 +1,15 @@
args @ { fetchurl, ... }:
rec {
- baseName = "yason";
- version = "v0.7.8";
+ baseName = ''yason'';
+ version = ''v0.7.8'';
- description = "JSON parser/encoder";
+ description = ''JSON parser/encoder'';
deps = [ args."alexandria" args."trivial-gray-streams" ];
src = fetchurl {
- url = "http://beta.quicklisp.org/archive/yason/2019-12-27/yason-v0.7.8.tgz";
- sha256 = "11d51i2iw4nxsparwbh3s6w9zyms3wi0z0fprwz1d3sqlf03j6f1";
+ url = ''http://beta.quicklisp.org/archive/yason/2019-12-27/yason-v0.7.8.tgz'';
+ sha256 = ''11d51i2iw4nxsparwbh3s6w9zyms3wi0z0fprwz1d3sqlf03j6f1'';
};
packageName = "yason";
diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/zpb-ttf.nix b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/zpb-ttf.nix
index bed825c24b..61a6a2a925 100644
--- a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/zpb-ttf.nix
+++ b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-output/zpb-ttf.nix
@@ -1,15 +1,15 @@
args @ { fetchurl, ... }:
rec {
- baseName = "zpb-ttf";
- version = "1.0.3";
+ baseName = ''zpb-ttf'';
+ version = ''release-1.0.4'';
- description = "Access TrueType font metrics and outlines from Common Lisp";
+ description = ''Access TrueType font metrics and outlines from Common Lisp'';
deps = [ ];
src = fetchurl {
- url = "http://beta.quicklisp.org/archive/zpb-ttf/2013-07-20/zpb-ttf-1.0.3.tgz";
- sha256 = "1irv0d0pcbwi2wx6hhjjyxzw12lnw8pvyg6ljsljh8xmhppbg5j6";
+ url = ''http://beta.quicklisp.org/archive/zpb-ttf/2021-01-24/zpb-ttf-release-1.0.4.tgz'';
+ sha256 = ''186jzhmklby2pkmwv3zxw09qh8023f7w5ng2ql46l6abx146s3ll'';
};
packageName = "zpb-ttf";
@@ -19,7 +19,7 @@ rec {
}
/* (SYSTEM zpb-ttf DESCRIPTION
Access TrueType font metrics and outlines from Common Lisp SHA256
- 1irv0d0pcbwi2wx6hhjjyxzw12lnw8pvyg6ljsljh8xmhppbg5j6 URL
- http://beta.quicklisp.org/archive/zpb-ttf/2013-07-20/zpb-ttf-1.0.3.tgz MD5
- 1e896d8b0b01babab882e43fe4c3c2d4 NAME zpb-ttf FILENAME zpb-ttf DEPS NIL
- DEPENDENCIES NIL VERSION 1.0.3 SIBLINGS NIL PARASITES NIL) */
+ 186jzhmklby2pkmwv3zxw09qh8023f7w5ng2ql46l6abx146s3ll URL
+ http://beta.quicklisp.org/archive/zpb-ttf/2021-01-24/zpb-ttf-release-1.0.4.tgz
+ MD5 b66f67b0a1fc347657d4d71ddb304920 NAME zpb-ttf FILENAME zpb-ttf DEPS NIL
+ DEPENDENCIES NIL VERSION release-1.0.4 SIBLINGS NIL PARASITES NIL) */
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 79a799f76f..628001000e 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
@@ -1,4 +1,4 @@
-{pkgs, quicklisp-to-nix-packages}:
+{pkgs, clwrapper, quicklisp-to-nix-packages}:
let
addNativeLibs = libs: x: { propagatedBuildInputs = libs; };
skipBuildPhase = x: {
@@ -6,6 +6,10 @@ let
};
multiOverride = l: x: if l == [] then {} else
((builtins.head l) x) // (multiOverride (builtins.tail l) x);
+ lispName = (clwrapper.lisp.pname or (builtins.parseDrvName clwrapper.lisp.name).name);
+ ifLispIn = l: f: if (pkgs.lib.elem lispName l) then f else (x: {});
+ ifLispNotIn = l: f: if ! (pkgs.lib.elem lispName l) then f else (x: {});
+ extraLispDeps = l: x: { deps = x.deps ++ l; };
in
{
stumpwm = x:{
@@ -23,7 +27,8 @@ in
'';
};
};
- iterate = skipBuildPhase;
+ iterate = multiOverride [ skipBuildPhase
+ (ifLispNotIn ["sbcl" "gcl"] (x: { parasites=[]; }))];
cl-fuse = x: {
propagatedBuildInputs = [pkgs.fuse];
overrides = y : (x.overrides y) // {
@@ -65,15 +70,32 @@ in
cl-libuv = addNativeLibs [pkgs.libuv];
cl-async-ssl = addNativeLibs [pkgs.openssl (import ./openssl-lib-marked.nix)];
cl-async-test = addNativeLibs [pkgs.openssl];
- clsql = x: {
+ clsql = multiOverride [ (x: {
propagatedBuildInputs = with pkgs; [libmysqlclient postgresql sqlite zlib];
overrides = y: (x.overrides y) // {
preConfigure = ((x.overrides y).preConfigure or "") + ''
export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I${pkgs.libmysqlclient}/include/mysql"
export NIX_LDFLAGS="$NIX_LDFLAGS -L${pkgs.libmysqlclient}/lib/mysql"
- '';
- };
- };
+ '';};})
+ (ifLispIn ["ecl" "clisp"] (x: {
+ deps = pkgs.lib.filter (x: x.outPath != quicklisp-to-nix-packages.uffi.outPath)
+ (x.deps ++ (with quicklisp-to-nix-packages; [cffi-uffi-compat]));
+ overrides = y: (x.overrides y) // {
+ postUnpack = ''
+ sed -e '1i(cl:push :clsql-cffi cl:*features*)' -i "$sourceRoot/clsql.asd"
+ '';
+ };
+ }))
+ ];
+ clsql-postgresql-socket = ifLispIn ["ecl" "clisp"] (x: {
+ deps = pkgs.lib.filter (x: x.outPath != quicklisp-to-nix-packages.uffi.outPath)
+ (x.deps ++ (with quicklisp-to-nix-packages; [cffi-uffi-compat]));
+ overrides = y: (x.overrides y) // {
+ postUnpack = ''
+ sed -e '1i(cl:push :clsql-cffi cl:*features*)' -i "$sourceRoot/clsql-postgresql-socket.asd"
+ '';
+ };
+ });
clx-truetype = skipBuildPhase;
query-fs = x: {
overrides = y: (x.overrides y) // {
@@ -241,4 +263,17 @@ $out/lib/common-lisp/query-fs"
'';
};
};
+ woo = ifLispNotIn ["sbcl" "gcl"]
+ (extraLispDeps (with quicklisp-to-nix-packages; [cl-speedy-queue]));
+ cl-syslog = x: {
+ overrides = y: (x.overrides y) // {
+ postUnpack = ''
+ sed -e '1a:serial t' -i $sourceRoot/cl-syslog.asd
+ '';
+ };
+ };
+ log4cl = ifLispNotIn ["sbcl" "gcl"]
+ (extraLispDeps (with quicklisp-to-nix-packages; [cl-syslog]));
+ md5 = ifLispNotIn ["sbcl" "ccl" "gcl"]
+ (extraLispDeps (with quicklisp-to-nix-packages; [flexi-streams]));
}
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 383510df77..119648bb03 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
@@ -9,9 +9,11 @@ asdf-system-connections
babel
blackbird
bordeaux-threads
+calispel
caveman
cffi
cffi-grovel
+cffi-uffi-compat
chanl
chipz
chunga
@@ -39,6 +41,7 @@ cl-fad
cl-fuse
cl-fuse-meta-fs
cl-hooks
+cl-html-diff
cl-html5-parser
cl-html-parse
cl-interpol
@@ -47,6 +50,7 @@ cl-json
cl-l10n
cl-libuv
cl-locale
+cl-markup
cl-mysql
closer-mop
closure-common
@@ -61,7 +65,9 @@ cl-protobufs
cl-qprint
cl-reexport
cl-slice
+cl-speedy-queue
cl-smtp
+cl-syslog
clsql
clsql-postgresql
clsql-postgresql-socket
@@ -110,6 +116,7 @@ fare-quasiquote
fare-utils
fast-http
fast-io
+file-attributes
fiveam
flexi-streams
form-fiddle
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 df6d908ba9..f96f1a1f55 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
@@ -1,6 +1,6 @@
-{lib, stdenv, fetchurl, pkgs, clwrapper}:
+{stdenv, lib, fetchurl, pkgs, clwrapper}:
let quicklisp-to-nix-packages = rec {
- inherit lib stdenv fetchurl clwrapper pkgs quicklisp-to-nix-packages;
+ inherit stdenv lib fetchurl clwrapper pkgs quicklisp-to-nix-packages;
callPackage = pkgs.lib.callPackageWith quicklisp-to-nix-packages;
buildLispPackage = callPackage ./define-package.nix;
@@ -45,6 +45,7 @@ let quicklisp-to-nix-packages = rec {
"esrap" = quicklisp-to-nix-packages."esrap";
"html-encode" = quicklisp-to-nix-packages."html-encode";
"split-sequence" = quicklisp-to-nix-packages."split-sequence";
+ "trivial-with-current-source-form" = quicklisp-to-nix-packages."trivial-with-current-source-form";
}));
@@ -93,6 +94,7 @@ let quicklisp-to-nix-packages = rec {
"split-sequence" = quicklisp-to-nix-packages."split-sequence";
"swank" = quicklisp-to-nix-packages."swank";
"trivial-features" = quicklisp-to-nix-packages."trivial-features";
+ "trivial-with-current-source-form" = quicklisp-to-nix-packages."trivial-with-current-source-form";
}));
@@ -116,6 +118,7 @@ let quicklisp-to-nix-packages = rec {
"cl-ppcre" = quicklisp-to-nix-packages."cl-ppcre";
"cl-ppcre-unicode" = quicklisp-to-nix-packages."cl-ppcre-unicode";
"cl-unicode" = quicklisp-to-nix-packages."cl-unicode";
+ "fiveam" = quicklisp-to-nix-packages."fiveam";
"flexi-streams" = quicklisp-to-nix-packages."flexi-streams";
}));
@@ -176,17 +179,28 @@ 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;
- }));
-
-
"cl-postgres_slash_tests" = quicklisp-to-nix-packages."cl-postgres";
+ "cl-postgres_plus_local-time" = buildLispPackage
+ ((f: x: (x // (f x)))
+ (qlOverrides."cl-postgres_plus_local-time" or (x: {}))
+ (import ./quicklisp-to-nix-output/cl-postgres_plus_local-time.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-ppcre" = quicklisp-to-nix-packages."cl-ppcre";
+ "ironclad" = quicklisp-to-nix-packages."ironclad";
+ "local-time" = quicklisp-to-nix-packages."local-time";
+ "md5" = quicklisp-to-nix-packages."md5";
+ "split-sequence" = quicklisp-to-nix-packages."split-sequence";
+ "uax-15" = quicklisp-to-nix-packages."uax-15";
+ "usocket" = quicklisp-to-nix-packages."usocket";
+ }));
+
+
"stefil" = buildLispPackage
((f: x: (x // (f x)))
(qlOverrides."stefil" or (x: {}))
@@ -638,14 +652,6 @@ let quicklisp-to-nix-packages = rec {
}));
- "cl-markup" = buildLispPackage
- ((f: x: (x // (f x)))
- (qlOverrides."cl-markup" or (x: {}))
- (import ./quicklisp-to-nix-output/cl-markup.nix {
- inherit fetchurl;
- }));
-
-
"cl-anonfun" = buildLispPackage
((f: x: (x // (f x)))
(qlOverrides."cl-anonfun" or (x: {}))
@@ -664,6 +670,14 @@ 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;
+ }));
+
+
"clunit" = buildLispPackage
((f: x: (x // (f x)))
(qlOverrides."clunit" or (x: {}))
@@ -749,6 +763,14 @@ let quicklisp-to-nix-packages = rec {
}));
+ "cl-difflib" = buildLispPackage
+ ((f: x: (x // (f x)))
+ (qlOverrides."cl-difflib" or (x: {}))
+ (import ./quicklisp-to-nix-output/cl-difflib.nix {
+ inherit fetchurl;
+ }));
+
+
"pcall-queue" = buildLispPackage
((f: x: (x // (f x)))
(qlOverrides."pcall-queue" or (x: {}))
@@ -1160,6 +1182,36 @@ let quicklisp-to-nix-packages = rec {
}));
+ "jpl-util" = buildLispPackage
+ ((f: x: (x // (f x)))
+ (qlOverrides."jpl-util" or (x: {}))
+ (import ./quicklisp-to-nix-output/jpl-util.nix {
+ inherit fetchurl;
+ }));
+
+
+ "jpl-queues" = buildLispPackage
+ ((f: x: (x // (f x)))
+ (qlOverrides."jpl-queues" or (x: {}))
+ (import ./quicklisp-to-nix-output/jpl-queues.nix {
+ inherit fetchurl;
+ "alexandria" = quicklisp-to-nix-packages."alexandria";
+ "bordeaux-threads" = quicklisp-to-nix-packages."bordeaux-threads";
+ "jpl-util" = quicklisp-to-nix-packages."jpl-util";
+ }));
+
+
+ "eager-future2" = buildLispPackage
+ ((f: x: (x // (f x)))
+ (qlOverrides."eager-future2" or (x: {}))
+ (import ./quicklisp-to-nix-output/eager-future2.nix {
+ inherit fetchurl;
+ "alexandria" = quicklisp-to-nix-packages."alexandria";
+ "bordeaux-threads" = quicklisp-to-nix-packages."bordeaux-threads";
+ "trivial-garbage" = quicklisp-to-nix-packages."trivial-garbage";
+ }));
+
+
"vom" = buildLispPackage
((f: x: (x // (f x)))
(qlOverrides."vom" or (x: {}))
@@ -1192,6 +1244,15 @@ let quicklisp-to-nix-packages = rec {
}));
+ "trivial-with-current-source-form" = buildLispPackage
+ ((f: x: (x // (f x)))
+ (qlOverrides."trivial-with-current-source-form" or (x: {}))
+ (import ./quicklisp-to-nix-output/trivial-with-current-source-form.nix {
+ inherit fetchurl;
+ "alexandria" = quicklisp-to-nix-packages."alexandria";
+ }));
+
+
"yason" = buildLispPackage
((f: x: (x // (f x)))
(qlOverrides."yason" or (x: {}))
@@ -1640,6 +1701,7 @@ let quicklisp-to-nix-packages = rec {
(import ./quicklisp-to-nix-output/serapeum.nix {
inherit fetchurl;
"alexandria" = quicklisp-to-nix-packages."alexandria";
+ "babel" = quicklisp-to-nix-packages."babel";
"bordeaux-threads" = quicklisp-to-nix-packages."bordeaux-threads";
"closer-mop" = quicklisp-to-nix-packages."closer-mop";
"fare-quasiquote" = quicklisp-to-nix-packages."fare-quasiquote";
@@ -1664,6 +1726,7 @@ let quicklisp-to-nix-packages = rec {
"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";
+ "trivial-features" = quicklisp-to-nix-packages."trivial-features";
"trivial-file-size" = quicklisp-to-nix-packages."trivial-file-size";
"trivial-garbage" = quicklisp-to-nix-packages."trivial-garbage";
"trivial-macroexpand-all" = quicklisp-to-nix-packages."trivial-macroexpand-all";
@@ -1779,6 +1842,7 @@ let quicklisp-to-nix-packages = rec {
"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_plus_local-time" = quicklisp-to-nix-packages."cl-postgres_plus_local-time";
"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";
@@ -1787,6 +1851,7 @@ let quicklisp-to-nix-packages = rec {
"flexi-streams" = quicklisp-to-nix-packages."flexi-streams";
"global-vars" = quicklisp-to-nix-packages."global-vars";
"ironclad" = quicklisp-to-nix-packages."ironclad";
+ "local-time" = quicklisp-to-nix-packages."local-time";
"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";
@@ -1832,6 +1897,7 @@ let quicklisp-to-nix-packages = rec {
"fiveam" = quicklisp-to-nix-packages."fiveam";
"let-plus" = quicklisp-to-nix-packages."let-plus";
"split-sequence" = quicklisp-to-nix-packages."split-sequence";
+ "trivial-with-current-source-form" = quicklisp-to-nix-packages."trivial-with-current-source-form";
}));
@@ -2031,7 +2097,7 @@ let quicklisp-to-nix-packages = rec {
(qlOverrides."local-time" or (x: {}))
(import ./quicklisp-to-nix-output/local-time.nix {
inherit fetchurl;
- "stefil" = quicklisp-to-nix-packages."stefil";
+ "hu_dot_dwim_dot_stefil" = quicklisp-to-nix-packages."hu_dot_dwim_dot_stefil";
"uiop" = quicklisp-to-nix-packages."uiop";
}));
@@ -2270,16 +2336,19 @@ let quicklisp-to-nix-packages = rec {
"cl-fad" = quicklisp-to-nix-packages."cl-fad";
"cl-ppcre" = quicklisp-to-nix-packages."cl-ppcre";
"cl-who" = quicklisp-to-nix-packages."cl-who";
+ "cxml-stp" = quicklisp-to-nix-packages."cxml-stp";
"drakma" = quicklisp-to-nix-packages."drakma";
"flexi-streams" = quicklisp-to-nix-packages."flexi-streams";
"md5" = quicklisp-to-nix-packages."md5";
"rfc2388" = quicklisp-to-nix-packages."rfc2388";
"split-sequence" = quicklisp-to-nix-packages."split-sequence";
+ "swank" = quicklisp-to-nix-packages."swank";
"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";
"usocket" = quicklisp-to-nix-packages."usocket";
+ "xpath" = quicklisp-to-nix-packages."xpath";
}));
@@ -2386,6 +2455,20 @@ let quicklisp-to-nix-packages = rec {
}));
+ "file-attributes" = buildLispPackage
+ ((f: x: (x // (f x)))
+ (qlOverrides."file-attributes" or (x: {}))
+ (import ./quicklisp-to-nix-output/file-attributes.nix {
+ inherit fetchurl;
+ "alexandria" = quicklisp-to-nix-packages."alexandria";
+ "babel" = quicklisp-to-nix-packages."babel";
+ "cffi" = quicklisp-to-nix-packages."cffi";
+ "documentation-utils" = quicklisp-to-nix-packages."documentation-utils";
+ "trivial-features" = quicklisp-to-nix-packages."trivial-features";
+ "trivial-indent" = quicklisp-to-nix-packages."trivial-indent";
+ }));
+
+
"fast-io" = buildLispPackage
((f: x: (x // (f x)))
(qlOverrides."fast-io" or (x: {}))
@@ -2473,6 +2556,7 @@ let quicklisp-to-nix-packages = rec {
"cl-unification" = quicklisp-to-nix-packages."cl-unification";
"esrap" = quicklisp-to-nix-packages."esrap";
"iterate" = quicklisp-to-nix-packages."iterate";
+ "trivial-with-current-source-form" = quicklisp-to-nix-packages."trivial-with-current-source-form";
}));
@@ -2483,6 +2567,7 @@ let quicklisp-to-nix-packages = rec {
inherit fetchurl;
"alexandria" = quicklisp-to-nix-packages."alexandria";
"fiveam" = quicklisp-to-nix-packages."fiveam";
+ "trivial-with-current-source-form" = quicklisp-to-nix-packages."trivial-with-current-source-form";
}));
@@ -2848,6 +2933,7 @@ let quicklisp-to-nix-packages = rec {
"fiasco" = quicklisp-to-nix-packages."fiasco";
}));
+
"clfswm" = buildLispPackage
((f: x: (x // (f x)))
(qlOverrides."clfswm" or (x: {}))
@@ -2856,6 +2942,7 @@ let quicklisp-to-nix-packages = rec {
"clx" = quicklisp-to-nix-packages."clx";
}));
+
"cl-who" = buildLispPackage
((f: x: (x // (f x)))
(qlOverrides."cl-who" or (x: {}))
@@ -3029,10 +3116,12 @@ let quicklisp-to-nix-packages = rec {
"bordeaux-threads" = quicklisp-to-nix-packages."bordeaux-threads";
"cffi" = quicklisp-to-nix-packages."cffi";
"flexi-streams" = quicklisp-to-nix-packages."flexi-streams";
+ "split-sequence" = quicklisp-to-nix-packages."split-sequence";
"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";
+ "usocket" = quicklisp-to-nix-packages."usocket";
}));
@@ -3090,6 +3179,22 @@ let quicklisp-to-nix-packages = rec {
}));
+ "cl-syslog" = buildLispPackage
+ ((f: x: (x // (f x)))
+ (qlOverrides."cl-syslog" or (x: {}))
+ (import ./quicklisp-to-nix-output/cl-syslog.nix {
+ inherit fetchurl;
+ "alexandria" = quicklisp-to-nix-packages."alexandria";
+ "babel" = quicklisp-to-nix-packages."babel";
+ "cffi" = quicklisp-to-nix-packages."cffi";
+ "global-vars" = quicklisp-to-nix-packages."global-vars";
+ "local-time" = quicklisp-to-nix-packages."local-time";
+ "split-sequence" = quicklisp-to-nix-packages."split-sequence";
+ "trivial-features" = quicklisp-to-nix-packages."trivial-features";
+ "usocket" = quicklisp-to-nix-packages."usocket";
+ }));
+
+
"cl-smtp" = buildLispPackage
((f: x: (x // (f x)))
(qlOverrides."cl-smtp" or (x: {}))
@@ -3110,6 +3215,14 @@ let quicklisp-to-nix-packages = rec {
}));
+ "cl-speedy-queue" = buildLispPackage
+ ((f: x: (x // (f x)))
+ (qlOverrides."cl-speedy-queue" or (x: {}))
+ (import ./quicklisp-to-nix-output/cl-speedy-queue.nix {
+ inherit fetchurl;
+ }));
+
+
"cl-slice" = buildLispPackage
((f: x: (x // (f x)))
(qlOverrides."cl-slice" or (x: {}))
@@ -3267,6 +3380,14 @@ let quicklisp-to-nix-packages = rec {
}));
+ "cl-markup" = buildLispPackage
+ ((f: x: (x // (f x)))
+ (qlOverrides."cl-markup" or (x: {}))
+ (import ./quicklisp-to-nix-output/cl-markup.nix {
+ inherit fetchurl;
+ }));
+
+
"cl-locale" = buildLispPackage
((f: x: (x // (f x)))
(qlOverrides."cl-locale" or (x: {}))
@@ -3376,6 +3497,15 @@ let quicklisp-to-nix-packages = rec {
}));
+ "cl-html-diff" = buildLispPackage
+ ((f: x: (x // (f x)))
+ (qlOverrides."cl-html-diff" or (x: {}))
+ (import ./quicklisp-to-nix-output/cl-html-diff.nix {
+ inherit fetchurl;
+ "cl-difflib" = quicklisp-to-nix-packages."cl-difflib";
+ }));
+
+
"cl-hooks" = buildLispPackage
((f: x: (x // (f x)))
(qlOverrides."cl-hooks" or (x: {}))
@@ -3798,6 +3928,18 @@ let quicklisp-to-nix-packages = rec {
}));
+ "cffi-uffi-compat" = buildLispPackage
+ ((f: x: (x // (f x)))
+ (qlOverrides."cffi-uffi-compat" or (x: {}))
+ (import ./quicklisp-to-nix-output/cffi-uffi-compat.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";
+ }));
+
+
"cffi-grovel" = buildLispPackage
((f: x: (x // (f x)))
(qlOverrides."cffi-grovel" or (x: {}))
@@ -3900,6 +4042,19 @@ let quicklisp-to-nix-packages = rec {
}));
+ "calispel" = buildLispPackage
+ ((f: x: (x // (f x)))
+ (qlOverrides."calispel" or (x: {}))
+ (import ./quicklisp-to-nix-output/calispel.nix {
+ inherit fetchurl;
+ "alexandria" = quicklisp-to-nix-packages."alexandria";
+ "bordeaux-threads" = quicklisp-to-nix-packages."bordeaux-threads";
+ "eager-future2" = quicklisp-to-nix-packages."eager-future2";
+ "jpl-queues" = quicklisp-to-nix-packages."jpl-queues";
+ "jpl-util" = quicklisp-to-nix-packages."jpl-util";
+ }));
+
+
"bordeaux-threads" = buildLispPackage
((f: x: (x // (f x)))
(qlOverrides."bordeaux-threads" or (x: {}))
@@ -4011,6 +4166,7 @@ let quicklisp-to-nix-packages = rec {
"alexandria" = quicklisp-to-nix-packages."alexandria";
"esrap" = quicklisp-to-nix-packages."esrap";
"split-sequence" = quicklisp-to-nix-packages."split-sequence";
+ "trivial-with-current-source-form" = quicklisp-to-nix-packages."trivial-with-current-source-form";
}));
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 fecae71024..e9df02e010 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
@@ -244,7 +244,8 @@ dependencies that are detected during the install."
"named-readtables/doc" ;; Dependency cycle between named-readtabes and mgl-pax
"symbol-munger-test" ;; Dependency cycle between lisp-unit2 and symbol-munger
"cl-postgres-simple-date-tests" ;; Dependency cycle between cl-postgres and simple-date
- "cl-containers/with-variates") ;; Symbol conflict between cl-variates:next-element, metabang.utilities:next-element
+ "cl-containers/with-variates" ;; Symbol conflict between cl-variates:next-element, metabang.utilities:next-element
+ "serapeum/docs") ;; Weird issue with FUN-INFO redefinition
"A vector of systems that shouldn't be loaded by `quickload-parasitic-systems'.
These systems are known to be troublemakers. In some sense, all
diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix/top-package.emb b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix/top-package.emb
index 9ba7a89eb2..38b4f67aa1 100644
--- a/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix/top-package.emb
+++ b/third_party/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix/top-package.emb
@@ -1,6 +1,6 @@
-{stdenv, fetchurl, pkgs, clwrapper}:
+{stdenv, lib, fetchurl, pkgs, clwrapper}:
let quicklisp-to-nix-packages = rec {
- inherit stdenv fetchurl clwrapper pkgs quicklisp-to-nix-packages;
+ inherit stdenv lib fetchurl clwrapper pkgs quicklisp-to-nix-packages;
callPackage = pkgs.lib.callPackageWith quicklisp-to-nix-packages;
buildLispPackage = callPackage ./define-package.nix;
diff --git a/third_party/nixpkgs/pkgs/development/node-packages/node-packages.json b/third_party/nixpkgs/pkgs/development/node-packages/node-packages.json
index d6ee818d43..959cb20d10 100644
--- a/third_party/nixpkgs/pkgs/development/node-packages/node-packages.json
+++ b/third_party/nixpkgs/pkgs/development/node-packages/node-packages.json
@@ -135,6 +135,7 @@
, "json-refs"
, "json-server"
, "jsonlint"
+, "kaput-cli"
, "karma"
, "lcov-result-merger"
, "leetcode-cli"
diff --git a/third_party/nixpkgs/pkgs/development/node-packages/node-packages.nix b/third_party/nixpkgs/pkgs/development/node-packages/node-packages.nix
index 4090028c97..950115f80b 100644
--- a/third_party/nixpkgs/pkgs/development/node-packages/node-packages.nix
+++ b/third_party/nixpkgs/pkgs/development/node-packages/node-packages.nix
@@ -49,13 +49,13 @@ let
sha512 = "o/xdK8b4P0t/xpCARgWXAeaiWeh9jeua6bP1jrcbfN39+Z4zC4x2jg4NysHNhz6spRG8dJFH3kJIUoIbs0Ckww==";
};
};
- "@angular-devkit/architect-0.1102.5" = {
+ "@angular-devkit/architect-0.1102.6" = {
name = "_at_angular-devkit_slash_architect";
packageName = "@angular-devkit/architect";
- version = "0.1102.5";
+ version = "0.1102.6";
src = fetchurl {
- url = "https://registry.npmjs.org/@angular-devkit/architect/-/architect-0.1102.5.tgz";
- sha512 = "lVc6NmEAZZPzvc18GzMFLoxqKKvPlNOg4vEtFsFldZmrydLJJGFi4KAs2WaJd8qVR1XuY4el841cjDQAJSq6sQ==";
+ url = "https://registry.npmjs.org/@angular-devkit/architect/-/architect-0.1102.6.tgz";
+ sha512 = "27+5tjoUOAcm2pzo6EJhQn3lK4s9Gk0RfZFc2ygVu8PHnukXZAd4ntclGi33aPgJmt4zA2qbWq4Ytn2a/G6FMg==";
};
};
"@angular-devkit/core-11.2.0" = {
@@ -76,13 +76,13 @@ let
sha512 = "2JEGXzFqjTqVls2uIZEE0sk4VY9a/alxBAq8BFYIVbvzKsL9gAY71Ztf21zrhQrZop9qeuLJtOAbp00QyYUaQA==";
};
};
- "@angular-devkit/core-11.2.5" = {
+ "@angular-devkit/core-11.2.6" = {
name = "_at_angular-devkit_slash_core";
packageName = "@angular-devkit/core";
- version = "11.2.5";
+ version = "11.2.6";
src = fetchurl {
- url = "https://registry.npmjs.org/@angular-devkit/core/-/core-11.2.5.tgz";
- sha512 = "DRFvEHRKoC+hTwcOAJqLe6UQa+bpXc/1IGCMHWEbuply0KIFIGQOlmaYwFZKixz3HdFZlmoCMcAVkAXvyaWVsQ==";
+ url = "https://registry.npmjs.org/@angular-devkit/core/-/core-11.2.6.tgz";
+ sha512 = "3dA0Z6sIIxCDjZS/DucgmIKti7EZ/LgHoHgCO72Q50H5ZXbUSNBz5wGl5hVq2+gzrnFgU/0u40MIs6eptk30ZA==";
};
};
"@angular-devkit/schematics-11.2.0" = {
@@ -103,13 +103,13 @@ let
sha512 = "x/IKgZDn6z/MzQ28WF2GTP2N+n78iySQhLu6n6bpmdrFp9noi9QASzN+mAFiqSNO8XpO9oyIB5y2ERl8KBrU1g==";
};
};
- "@angular-devkit/schematics-11.2.5" = {
+ "@angular-devkit/schematics-11.2.6" = {
name = "_at_angular-devkit_slash_schematics";
packageName = "@angular-devkit/schematics";
- version = "11.2.5";
+ version = "11.2.6";
src = fetchurl {
- url = "https://registry.npmjs.org/@angular-devkit/schematics/-/schematics-11.2.5.tgz";
- sha512 = "7RoWgpMvhljPhW9CMz1EtqkwNnGpnsPyy0N29ClHPUq+o8wLR0hvbLBDz1fKSF7j1AwRccaQSNTj8KWsjzQJLQ==";
+ url = "https://registry.npmjs.org/@angular-devkit/schematics/-/schematics-11.2.6.tgz";
+ sha512 = "bhi2+5xtVAjtr3bsXKT8pnoBamQrArd/Y20ueA4Od7cd38YT97nzTA1wyHBFG0vWd0HMyg42ZS0aycNBuOebaA==";
};
};
"@angular-devkit/schematics-cli-0.1102.0" = {
@@ -328,13 +328,13 @@ let
sha512 = "HV1Cm0Q3ZrpCR93tkWOYiuYIgLxZXZFVG2VgK+MBWjUqZTundupbfx2aXarXuw5Ko5aMcjtJgbSs4vUGBS5v6g==";
};
};
- "@babel/compat-data-7.13.11" = {
+ "@babel/compat-data-7.13.12" = {
name = "_at_babel_slash_compat-data";
packageName = "@babel/compat-data";
- version = "7.13.11";
+ version = "7.13.12";
src = fetchurl {
- url = "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.13.11.tgz";
- sha512 = "BwKEkO+2a67DcFeS3RLl0Z3Gs2OvdXewuWjc1Hfokhb5eQWP9YRYH1/+VrVZvql2CfjOiNGqSAFOYt4lsqTHzg==";
+ url = "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.13.12.tgz";
+ sha512 = "3eJJ841uKxeV8dcN/2yGEUy+RfgQspPEgQat85umsE1rotuquQ2AbIub4S6j7c50a2d+4myc+zSlnXeIHrOnhQ==";
};
};
"@babel/core-7.13.10" = {
@@ -454,31 +454,31 @@ let
sha512 = "0kBzvXiIKfsCA0y6cFEIJf4OdzfpRuNk4+YTeHZpGGc666SATFKTz6sRncwFnQk7/ugJ4dSrCj6iJuvW4Qwr2g==";
};
};
- "@babel/helper-member-expression-to-functions-7.13.0" = {
+ "@babel/helper-member-expression-to-functions-7.13.12" = {
name = "_at_babel_slash_helper-member-expression-to-functions";
packageName = "@babel/helper-member-expression-to-functions";
- version = "7.13.0";
+ version = "7.13.12";
src = fetchurl {
- url = "https://registry.npmjs.org/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.13.0.tgz";
- sha512 = "yvRf8Ivk62JwisqV1rFRMxiSMDGnN6KH1/mDMmIrij4jztpQNRoHqqMG3U6apYbGRPJpgPalhva9Yd06HlUxJQ==";
+ url = "https://registry.npmjs.org/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.13.12.tgz";
+ sha512 = "48ql1CLL59aKbU94Y88Xgb2VFy7a95ykGRbJJaaVv+LX5U8wFpLfiGXJJGUozsmA1oEh/o5Bp60Voq7ACyA/Sw==";
};
};
- "@babel/helper-module-imports-7.12.13" = {
+ "@babel/helper-module-imports-7.13.12" = {
name = "_at_babel_slash_helper-module-imports";
packageName = "@babel/helper-module-imports";
- version = "7.12.13";
+ version = "7.13.12";
src = fetchurl {
- url = "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.12.13.tgz";
- sha512 = "NGmfvRp9Rqxy0uHSSVP+SRIW1q31a7Ji10cLBcqSDUngGentY4FRiHOFZFE1CLU5eiL0oE8reH7Tg1y99TDM/g==";
+ url = "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.13.12.tgz";
+ sha512 = "4cVvR2/1B693IuOvSI20xqqa/+bl7lqAMR59R4iu39R9aOX8/JoYY1sFaNvUMyMBGnHdwvJgUrzNLoUZxXypxA==";
};
};
- "@babel/helper-module-transforms-7.13.0" = {
+ "@babel/helper-module-transforms-7.13.12" = {
name = "_at_babel_slash_helper-module-transforms";
packageName = "@babel/helper-module-transforms";
- version = "7.13.0";
+ version = "7.13.12";
src = fetchurl {
- url = "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.13.0.tgz";
- sha512 = "Ls8/VBwH577+pw7Ku1QkUWIyRRNHpYlts7+qSqBBFCW3I8QteB9DxfcZ5YJpOwH6Ihe/wn8ch7fMGOP1OhEIvw==";
+ url = "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.13.12.tgz";
+ sha512 = "7zVQqMO3V+K4JOOj40kxiCrMf6xlQAkewBB0eu2b03OO/Q21ZutOzjpfD79A5gtE/2OWi1nv625MrDlGlkbknQ==";
};
};
"@babel/helper-optimise-call-expression-7.12.13" = {
@@ -508,22 +508,22 @@ let
sha512 = "pUQpFBE9JvC9lrQbpX0TmeNIy5s7GnZjna2lhhcHC7DzgBs6fWn722Y5cfwgrtrqc7NAJwMvOa0mKhq6XaE4jg==";
};
};
- "@babel/helper-replace-supers-7.13.0" = {
+ "@babel/helper-replace-supers-7.13.12" = {
name = "_at_babel_slash_helper-replace-supers";
packageName = "@babel/helper-replace-supers";
- version = "7.13.0";
+ version = "7.13.12";
src = fetchurl {
- url = "https://registry.npmjs.org/@babel/helper-replace-supers/-/helper-replace-supers-7.13.0.tgz";
- sha512 = "Segd5me1+Pz+rmN/NFBOplMbZG3SqRJOBlY+mA0SxAv6rjj7zJqr1AVr3SfzUVTLCv7ZLU5FycOM/SBGuLPbZw==";
+ url = "https://registry.npmjs.org/@babel/helper-replace-supers/-/helper-replace-supers-7.13.12.tgz";
+ sha512 = "Gz1eiX+4yDO8mT+heB94aLVNCL+rbuT2xy4YfyNqu8F+OI6vMvJK891qGBTqL9Uc8wxEvRW92Id6G7sDen3fFw==";
};
};
- "@babel/helper-simple-access-7.12.13" = {
+ "@babel/helper-simple-access-7.13.12" = {
name = "_at_babel_slash_helper-simple-access";
packageName = "@babel/helper-simple-access";
- version = "7.12.13";
+ version = "7.13.12";
src = fetchurl {
- url = "https://registry.npmjs.org/@babel/helper-simple-access/-/helper-simple-access-7.12.13.tgz";
- sha512 = "0ski5dyYIHEfwpWGx5GPWhH35j342JaflmCeQmsPWcrOQDtCN6C1zKAVRFVbK53lPW2c9TsuLLSUDf0tIGJ5hA==";
+ url = "https://registry.npmjs.org/@babel/helper-simple-access/-/helper-simple-access-7.13.12.tgz";
+ sha512 = "7FEjbrx5SL9cWvXioDbnlYTppcZGuCY6ow3/D5vMggb2Ywgu4dMrpTJX0JdQAIcRRUElOIxF3yEooa9gUb9ZbA==";
};
};
"@babel/helper-skip-transparent-expression-wrappers-7.12.1" = {
@@ -589,13 +589,22 @@ let
sha512 = "5aPpe5XQPzflQrFwL1/QoeHkP2MsA4JCntcXHRhEsdsfPVkvPi2w7Qix4iV7t5S/oC9OodGrggd8aco1g3SZFg==";
};
};
- "@babel/parser-7.13.11" = {
+ "@babel/parser-7.13.12" = {
name = "_at_babel_slash_parser";
packageName = "@babel/parser";
- version = "7.13.11";
+ version = "7.13.12";
src = fetchurl {
- url = "https://registry.npmjs.org/@babel/parser/-/parser-7.13.11.tgz";
- sha512 = "PhuoqeHoO9fc4ffMEVk4qb/w/s2iOSWohvbHxLtxui0eBg3Lg5gN1U8wp1V1u61hOWkPQJJyJzGH6Y+grwkq8Q==";
+ url = "https://registry.npmjs.org/@babel/parser/-/parser-7.13.12.tgz";
+ sha512 = "4T7Pb244rxH24yR116LAuJ+adxXXnHhZaLJjegJVKSdoNCe4x1eDBaud5YIcQFcqzsaD5BHvJw5BQ0AZapdCRw==";
+ };
+ };
+ "@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining-7.13.12" = {
+ name = "_at_babel_slash_plugin-bugfix-v8-spread-parameters-in-optional-chaining";
+ packageName = "@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining";
+ version = "7.13.12";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining/-/plugin-bugfix-v8-spread-parameters-in-optional-chaining-7.13.12.tgz";
+ sha512 = "d0u3zWKcoZf379fOeJdr1a5WPDny4aOFZ6hlfKivgK0LY7ZxNfoaHL2fWwdGtHyVvra38FC+HVYkO+byfSA8AQ==";
};
};
"@babel/plugin-external-helpers-7.8.3" = {
@@ -715,13 +724,13 @@ let
sha512 = "0wS/4DUF1CuTmGo+NiaHfHcVSeSLj5S3e6RivPTg/2k3wOv3jO35tZ6/ZWsQhQMvdgI7CwphjQa/ccarLymHVA==";
};
};
- "@babel/plugin-proposal-optional-chaining-7.13.8" = {
+ "@babel/plugin-proposal-optional-chaining-7.13.12" = {
name = "_at_babel_slash_plugin-proposal-optional-chaining";
packageName = "@babel/plugin-proposal-optional-chaining";
- version = "7.13.8";
+ version = "7.13.12";
src = fetchurl {
- url = "https://registry.npmjs.org/@babel/plugin-proposal-optional-chaining/-/plugin-proposal-optional-chaining-7.13.8.tgz";
- sha512 = "hpbBwbTgd7Cz1QryvwJZRo1U0k1q8uyBmeXOSQUjdg/A2TASkhR/rz7AyqZ/kS8kbpsNA80rOYbxySBJAqmhhQ==";
+ url = "https://registry.npmjs.org/@babel/plugin-proposal-optional-chaining/-/plugin-proposal-optional-chaining-7.13.12.tgz";
+ sha512 = "fcEdKOkIB7Tf4IxrgEVeFC4zeJSTr78no9wTdBuZZbqF64kzllU0ybo2zrzm7gUQfxGhBgq4E39oRs8Zx/RMYQ==";
};
};
"@babel/plugin-proposal-private-methods-7.13.0" = {
@@ -1138,13 +1147,13 @@ let
sha512 = "MprESJzI9O5VnJZrL7gg1MpdqmiFcUv41Jc7SahxYsNP2kDkFqClxxTZq+1Qv4AFCamm+GXMRDQINNn+qrxmiA==";
};
};
- "@babel/plugin-transform-react-jsx-7.12.17" = {
+ "@babel/plugin-transform-react-jsx-7.13.12" = {
name = "_at_babel_slash_plugin-transform-react-jsx";
packageName = "@babel/plugin-transform-react-jsx";
- version = "7.12.17";
+ version = "7.13.12";
src = fetchurl {
- url = "https://registry.npmjs.org/@babel/plugin-transform-react-jsx/-/plugin-transform-react-jsx-7.12.17.tgz";
- sha512 = "mwaVNcXV+l6qJOuRhpdTEj8sT/Z0owAVWf9QujTZ0d2ye9X/K+MTOTSizcgKOj18PGnTc/7g1I4+cIUjsKhBcw==";
+ url = "https://registry.npmjs.org/@babel/plugin-transform-react-jsx/-/plugin-transform-react-jsx-7.13.12.tgz";
+ sha512 = "jcEI2UqIcpCqB5U5DRxIl0tQEProI2gcu+g8VTIqxLO5Iidojb4d77q+fwGseCvd8af/lJ9masp4QWzBXFE2xA==";
};
};
"@babel/plugin-transform-react-jsx-self-7.12.13" = {
@@ -1273,13 +1282,13 @@ let
sha512 = "9PMijx8zFbCwTHrd2P4PJR5nWGH3zWebx2OcpTjqQrHhCiL2ssSR2Sc9ko2BsI2VmVBfoaQmPrlMTCui4LmXQg==";
};
};
- "@babel/preset-env-7.13.10" = {
+ "@babel/preset-env-7.13.12" = {
name = "_at_babel_slash_preset-env";
packageName = "@babel/preset-env";
- version = "7.13.10";
+ version = "7.13.12";
src = fetchurl {
- url = "https://registry.npmjs.org/@babel/preset-env/-/preset-env-7.13.10.tgz";
- sha512 = "nOsTScuoRghRtUsRr/c69d042ysfPHcu+KOB4A9aAO9eJYqrkat+LF8G1yp1HD18QiwixT2CisZTr/0b3YZPXQ==";
+ url = "https://registry.npmjs.org/@babel/preset-env/-/preset-env-7.13.12.tgz";
+ sha512 = "JzElc6jk3Ko6zuZgBtjOd01pf9yYDEIH8BcqVuYIuOkzOwDesoa/Nz4gIo4lBG6K861KTV9TvIgmFuT6ytOaAA==";
};
};
"@babel/preset-flow-7.12.13" = {
@@ -1381,13 +1390,13 @@ let
sha512 = "xys5xi5JEhzC3RzEmSGrs/b3pJW/o87SypZ+G/PhaE7uqVQNv/jlmVIBXuoh5atqQ434LfXV+sf23Oxj0bchJQ==";
};
};
- "@babel/types-7.13.0" = {
+ "@babel/types-7.13.12" = {
name = "_at_babel_slash_types";
packageName = "@babel/types";
- version = "7.13.0";
+ version = "7.13.12";
src = fetchurl {
- url = "https://registry.npmjs.org/@babel/types/-/types-7.13.0.tgz";
- sha512 = "hE+HE8rnG1Z6Wzo+MhaKE5lM5eMx71T4EHJgku2E3xIfaULhDcxiiRxUYgwX8qwP1BBSlag+TdGOt6JAidIZTA==";
+ url = "https://registry.npmjs.org/@babel/types/-/types-7.13.12.tgz";
+ sha512 = "K4nY2xFN4QMvQwkQ+zmBDp6ANMbVNw6BbxWmYA4qNjhR9W+Lj/8ky5MEY2Me5r+B2c6/v6F53oMndG+f9s3IiA==";
};
};
"@braintree/sanitize-url-3.1.0" = {
@@ -1786,22 +1795,22 @@ let
sha512 = "6nr9DbJPUR9Xujw6zD3y+rS95TyItEVM0NVjt1EehY2vUWfIgPiIPVHxCvaTS0xr2B+DRxovYVKbuOWqC35kjg==";
};
};
- "@emmetio/abbreviation-2.2.1" = {
+ "@emmetio/abbreviation-2.2.2" = {
name = "_at_emmetio_slash_abbreviation";
packageName = "@emmetio/abbreviation";
- version = "2.2.1";
+ version = "2.2.2";
src = fetchurl {
- url = "https://registry.npmjs.org/@emmetio/abbreviation/-/abbreviation-2.2.1.tgz";
- sha512 = "uUNwNgbH0JPlrdXhy8VQbNPLLG7abMvOaLVMblx22i68Rl9r+2N235ALgIYFUty1yXC9DkVw6xMbz/D4QVARcQ==";
+ url = "https://registry.npmjs.org/@emmetio/abbreviation/-/abbreviation-2.2.2.tgz";
+ sha512 = "TtE/dBnkTCct8+LntkqVrwqQao6EnPAs1YN3cUgxOxTaBlesBCY37ROUAVZrRlG64GNnVShdl/b70RfAI3w5lw==";
};
};
- "@emmetio/css-abbreviation-2.1.2" = {
+ "@emmetio/css-abbreviation-2.1.4" = {
name = "_at_emmetio_slash_css-abbreviation";
packageName = "@emmetio/css-abbreviation";
- version = "2.1.2";
+ version = "2.1.4";
src = fetchurl {
- url = "https://registry.npmjs.org/@emmetio/css-abbreviation/-/css-abbreviation-2.1.2.tgz";
- sha512 = "CvYTzJltVpLqJaCZ1Qn97LVAKsl2Uwl2fzir1EX/WuMY3xWxgc3BWRCheL6k65km6GyDrLVl6RhrrNb/pxOiAQ==";
+ url = "https://registry.npmjs.org/@emmetio/css-abbreviation/-/css-abbreviation-2.1.4.tgz";
+ sha512 = "qk9L60Y+uRtM5CPbB0y+QNl/1XKE09mSO+AhhSauIfr2YOx/ta3NJw2d8RtCFxgzHeRqFRr8jgyzThbu+MZ4Uw==";
};
};
"@emmetio/extract-abbreviation-0.1.6" = {
@@ -2101,13 +2110,13 @@ let
sha512 = "SMyoMFCPRNoDeHB5MMIi8W3loDxjXsSBeQfQaaKqmph7gVN48DCky6K/xBHHDJDeqJjcmEgwPTRP8qsuuLWnqw==";
};
};
- "@fluentui/react-7.165.0" = {
+ "@fluentui/react-7.165.1" = {
name = "_at_fluentui_slash_react";
packageName = "@fluentui/react";
- version = "7.165.0";
+ version = "7.165.1";
src = fetchurl {
- url = "https://registry.npmjs.org/@fluentui/react/-/react-7.165.0.tgz";
- sha512 = "fztahwnYIVB6hvb0VV11DKQK4jO4WJiTx2o3IFcxSPcOtZmjYtGDU8X0MXGadWRnzldfNLgkW+5NzqxZrwRD1w==";
+ url = "https://registry.npmjs.org/@fluentui/react/-/react-7.165.1.tgz";
+ sha512 = "2l/481URLxucUxQBKsXgHXPKBkhQEpJCCpGjfWf3uWwPz3X5PNMy+pujyYN6Di2LLPOfdpLf5sWTNw+DJjy2jA==";
};
};
"@fluentui/react-focus-7.17.6" = {
@@ -2209,22 +2218,22 @@ let
sha512 = "RNhQk0jMz6fZB4Ilu37PZj6YUQgSEZJrppXlaHpw/xYyDelcjYKZg/z9eMvYo6rxQPR2mGXjoj6by+zew1WgOw==";
};
};
- "@graphql-tools/batch-execute-7.0.0" = {
+ "@graphql-tools/batch-execute-7.1.0" = {
name = "_at_graphql-tools_slash_batch-execute";
packageName = "@graphql-tools/batch-execute";
- version = "7.0.0";
+ version = "7.1.0";
src = fetchurl {
- url = "https://registry.npmjs.org/@graphql-tools/batch-execute/-/batch-execute-7.0.0.tgz";
- sha512 = "+ywPfK6N2Ddna6oOa5Qb1Mv7EA8LOwRNOAPP9dL37FEhksJM9pYqPSceUcqMqg7S9b0+Cgr78s408rgvurV3/Q==";
+ url = "https://registry.npmjs.org/@graphql-tools/batch-execute/-/batch-execute-7.1.0.tgz";
+ sha512 = "Yb4QRpHZqDk24+T4K3ARk/KFU26Dyl30XcbYeVvIrgIKcmeON/p3DfSeiB0+MaxYlsv+liQKvlxNbeC2hD31pA==";
};
};
- "@graphql-tools/delegate-7.0.10" = {
+ "@graphql-tools/delegate-7.1.1" = {
name = "_at_graphql-tools_slash_delegate";
packageName = "@graphql-tools/delegate";
- version = "7.0.10";
+ version = "7.1.1";
src = fetchurl {
- url = "https://registry.npmjs.org/@graphql-tools/delegate/-/delegate-7.0.10.tgz";
- sha512 = "6Di9ia5ohoDvrHuhj2cak1nJGhIefJmUsd3WKZcJ2nu2yZAFawWMxGvQImqv3N7iyaWKiVhrrK8Roi/JrYhdKg==";
+ url = "https://registry.npmjs.org/@graphql-tools/delegate/-/delegate-7.1.1.tgz";
+ sha512 = "+uV0KZPI070sEykf3uxy+AhirHOqZnqbVqTqcfhH8/97+vdoLPE5oVceCTvMQsC7bDapbcbNiwcpYd8T6OQ4KQ==";
};
};
"@graphql-tools/graphql-file-loader-6.2.7" = {
@@ -2263,13 +2272,13 @@ let
sha512 = "FlQC50VELwRxoWUbJMMMs5gG0Dl8BaQYMrXUHTsxwqR7UmksUYnysC21rdousvs6jVZ7pf4unZfZFtBjz+8Edg==";
};
};
- "@graphql-tools/merge-6.2.10" = {
+ "@graphql-tools/merge-6.2.11" = {
name = "_at_graphql-tools_slash_merge";
packageName = "@graphql-tools/merge";
- version = "6.2.10";
+ version = "6.2.11";
src = fetchurl {
- url = "https://registry.npmjs.org/@graphql-tools/merge/-/merge-6.2.10.tgz";
- sha512 = "dM3n37PcslvhOAkCz7Cwk0BfoiSVKXGmCX+VMZkATbXk/0vlxUfNEpVfA5yF4IkP27F04SzFQSaNrbD0W2Rszw==";
+ url = "https://registry.npmjs.org/@graphql-tools/merge/-/merge-6.2.11.tgz";
+ sha512 = "temQABWkDTZb/qJwcIdrEbyJ5WkhaWZQeYxiuxGqZWlIOoFkYfqzfAP2qKl2Ry+ZkN+Q/Yozr1/ap//xjpwAlA==";
};
};
"@graphql-tools/schema-7.1.3" = {
@@ -2299,13 +2308,13 @@ let
sha512 = "ybgZ9EIJE3JMOtTrTd2VcIpTXtDrn2q6eiYkeYMKRVh3K41+LZa6YnR2zKERTXqTWqhobROwLt4BZbw2O3Aeeg==";
};
};
- "@graphql-tools/utils-7.6.0" = {
+ "@graphql-tools/utils-7.7.1" = {
name = "_at_graphql-tools_slash_utils";
packageName = "@graphql-tools/utils";
- version = "7.6.0";
+ version = "7.7.1";
src = fetchurl {
- url = "https://registry.npmjs.org/@graphql-tools/utils/-/utils-7.6.0.tgz";
- sha512 = "YCZDDdhfb4Yhie0IH031eGdvQG8C73apDuNg6lqBNbauNw45OG/b8wi3+vuMiDnJTJN32GQUb1Gt9gxDKoRDKw==";
+ url = "https://registry.npmjs.org/@graphql-tools/utils/-/utils-7.7.1.tgz";
+ sha512 = "SFT4/dTfrwWer1wSOLU+jqgv3oa/xTR8q+MiNbE9nCH2FXyMsqIOaXKm9wHfKIWFWHozqBdcnwFkQZrdD7H2TQ==";
};
};
"@graphql-tools/wrap-7.0.5" = {
@@ -2326,13 +2335,13 @@ let
sha512 = "wj6GkNiorWYaPiIZ767xImmw7avMMVUweTvPFg4mJWOxz2180DKwfuxhJJZ7rpc1+7D3mX/v8vJdxTuIo71Ieg==";
};
};
- "@grpc/grpc-js-1.2.11" = {
+ "@grpc/grpc-js-1.2.12" = {
name = "_at_grpc_slash_grpc-js";
packageName = "@grpc/grpc-js";
- version = "1.2.11";
+ version = "1.2.12";
src = fetchurl {
- url = "https://registry.npmjs.org/@grpc/grpc-js/-/grpc-js-1.2.11.tgz";
- sha512 = "DZqx3nHBm2OGY7NKq4sppDEfx4nBAsQH/d/H/yxo/+BwpVLWLGs+OorpwQ+Fqd6EgpDEoi4MhqndjGUeLl/5GA==";
+ url = "https://registry.npmjs.org/@grpc/grpc-js/-/grpc-js-1.2.12.tgz";
+ sha512 = "+gPCklP1eqIgrNPyzddYQdt9+GvZqPlLpIjIo+TveE+gbtp74VV1A2ju8ExeO8ma8f7MbpaGZx/KJPYVWL9eDw==";
};
};
"@grpc/proto-loader-0.5.6" = {
@@ -2974,13 +2983,13 @@ let
sha512 = "4JQNk+3mVzK3xh2rqd6RB4J46qUR19azEHBneZyTZM+c456qOrbbM/5xcR8huNCCcbVt7+UmizG6GuUvPvKUYg==";
};
};
- "@jsii/spec-1.25.0" = {
+ "@jsii/spec-1.26.0" = {
name = "_at_jsii_slash_spec";
packageName = "@jsii/spec";
- version = "1.25.0";
+ version = "1.26.0";
src = fetchurl {
- url = "https://registry.npmjs.org/@jsii/spec/-/spec-1.25.0.tgz";
- sha512 = "Zr56+uqZLoxI8qxIZZEweZdYBo0KqWf+q25m/okgwcKV4njCZuh0APXzeT/ebSkSOHQ3tneEE+g2EP/8IPP2og==";
+ url = "https://registry.npmjs.org/@jsii/spec/-/spec-1.26.0.tgz";
+ sha512 = "wh9Z/wfQYcWE5IgUfKNBYQ9Lhye9Xh/lsRsxMQluqEsgObNqb/8JreenWviqzHzBBcvTcHHyl+G30mpmyO1PWQ==";
};
};
"@kwsites/file-exists-1.1.1" = {
@@ -3649,13 +3658,13 @@ let
sha512 = "b+MGNyP9/LXkapreJzNUzcvuzZslj/RGgdVVJ16P2wSlYatfLycPObImqVJSmNAdyeShvNeM/pl3sVZsObFueg==";
};
};
- "@netlify/build-9.11.2" = {
+ "@netlify/build-9.13.2" = {
name = "_at_netlify_slash_build";
packageName = "@netlify/build";
- version = "9.11.2";
+ version = "9.13.2";
src = fetchurl {
- url = "https://registry.npmjs.org/@netlify/build/-/build-9.11.2.tgz";
- sha512 = "hnKDssHUnTSNibvK67lJ2hqZHutsUVSCWvLDV2ExEbSlqws0GdGjTunas39Vx6Vq/YKLEg/bLI+SXSsVyPKWxQ==";
+ url = "https://registry.npmjs.org/@netlify/build/-/build-9.13.2.tgz";
+ sha512 = "XhTk7Wm/l+GpE+bw7zZQpPBKV3Jsxjo1k3qCkMO3sWufN+pKmm+Z4DFRLhAKE+Vbev0wMf52HGhXEheroM5M1w==";
};
};
"@netlify/cache-utils-1.0.7" = {
@@ -3667,13 +3676,13 @@ let
sha512 = "yrdrnQkzg/qMovoFYwQ24UVt/OyHtP+t0KpQFd7eBl6gnuuGGgxFocaFFv6eKpMVwzHTsOwx/y9B/FcC3/6cfA==";
};
};
- "@netlify/config-4.2.0" = {
+ "@netlify/config-4.3.0" = {
name = "_at_netlify_slash_config";
packageName = "@netlify/config";
- version = "4.2.0";
+ version = "4.3.0";
src = fetchurl {
- url = "https://registry.npmjs.org/@netlify/config/-/config-4.2.0.tgz";
- sha512 = "z145O9ZOklq6+C02wxS+NZanJAyHHmGS1v9OQ3uTtoE6U0H1W1y7lalxEBNTaVg4/TQTj1X7xOX81KfNuuQ0MA==";
+ url = "https://registry.npmjs.org/@netlify/config/-/config-4.3.0.tgz";
+ sha512 = "jS6u5Dm3asg8zF6cYNYWfvyH3+XB3dMMm0UpC/BOLrYuXKVjP6uiIoUoUI6IjIN7gxAcotTN6RKCA5jU2Ahy5w==";
};
};
"@netlify/framework-info-3.2.0" = {
@@ -3712,22 +3721,22 @@ let
sha512 = "GcCPXIWI8VDBsLN4nPvb6sKS9tbi4lrHLhex90hT27nwTDeu4HgGE93YilcsgZ1LLODJNxC5LdfTNLtvEHMKVg==";
};
};
- "@netlify/plugin-edge-handlers-1.11.5" = {
+ "@netlify/plugin-edge-handlers-1.11.6" = {
name = "_at_netlify_slash_plugin-edge-handlers";
packageName = "@netlify/plugin-edge-handlers";
- version = "1.11.5";
+ version = "1.11.6";
src = fetchurl {
- url = "https://registry.npmjs.org/@netlify/plugin-edge-handlers/-/plugin-edge-handlers-1.11.5.tgz";
- sha512 = "R7oEvYjLOrvO8uSy484c4TrZeD5A1M2TN4dIM7dAdd2iHgpC+i3+RhlM9XFHFOqc8lsim+A+BcKMQYZ19z+j6A==";
+ url = "https://registry.npmjs.org/@netlify/plugin-edge-handlers/-/plugin-edge-handlers-1.11.6.tgz";
+ sha512 = "7L5pkXlwPfyUrmm9cu2+nOQYW1FMx6waMbl2Uj5SmxjLz5Dvt2zkUYbNU2ImNmJ10mxziv3LABSFn2k2qy2nLw==";
};
};
- "@netlify/plugins-list-2.4.3" = {
+ "@netlify/plugins-list-2.5.0" = {
name = "_at_netlify_slash_plugins-list";
packageName = "@netlify/plugins-list";
- version = "2.4.3";
+ version = "2.5.0";
src = fetchurl {
- url = "https://registry.npmjs.org/@netlify/plugins-list/-/plugins-list-2.4.3.tgz";
- sha512 = "xJ4o8IRwjjWrsFw/Ii4VSWQgmoBe/GFyWTj1q+ShOpC0BJUTZ22g7+rMwlEZXkisOT+Y/niPkikkrXcU9FCzZg==";
+ url = "https://registry.npmjs.org/@netlify/plugins-list/-/plugins-list-2.5.0.tgz";
+ sha512 = "45BG3E6A+540BZDG4Dul5KmoOwzw+TwiwqQSP08bKiywWtyl3IDDFoozZRp+GjhRo1+CnNVN0L9FxdxvU82UDw==";
};
};
"@netlify/run-utils-1.0.7" = {
@@ -4108,13 +4117,13 @@ let
sha512 = "2lYlvf4YTDgZCTXTW4+OX+9WTLFtEUc6hGm4qM1nlZjzxj+arizM4aHWzBVBCxY9glh7GIs0WEuiSgbVzv8cmA==";
};
};
- "@octokit/openapi-types-5.3.2" = {
+ "@octokit/openapi-types-6.0.0" = {
name = "_at_octokit_slash_openapi-types";
packageName = "@octokit/openapi-types";
- version = "5.3.2";
+ version = "6.0.0";
src = fetchurl {
- url = "https://registry.npmjs.org/@octokit/openapi-types/-/openapi-types-5.3.2.tgz";
- sha512 = "NxF1yfYOUO92rCx3dwvA2onF30Vdlg7YUkMVXkeptqpzA3tRLplThhFleV/UKWFgh7rpKu1yYRbvNDUtzSopKA==";
+ url = "https://registry.npmjs.org/@octokit/openapi-types/-/openapi-types-6.0.0.tgz";
+ sha512 = "CnDdK7ivHkBtJYzWzZm7gEkanA7gKH6a09Eguz7flHw//GacPJLmkHA3f3N++MJmlxD1Fl+mB7B32EEpSCwztQ==";
};
};
"@octokit/plugin-enterprise-rest-6.0.1" = {
@@ -4162,13 +4171,13 @@ let
sha512 = "EZi/AWhtkdfAYi01obpX0DF7U6b1VRr30QNQ5xSFPITMdLSfhcBqjamE3F+sKcxPbD7eZuMHu3Qkk2V+JGxBDQ==";
};
};
- "@octokit/plugin-rest-endpoint-methods-4.13.5" = {
+ "@octokit/plugin-rest-endpoint-methods-4.14.0" = {
name = "_at_octokit_slash_plugin-rest-endpoint-methods";
packageName = "@octokit/plugin-rest-endpoint-methods";
- version = "4.13.5";
+ version = "4.14.0";
src = fetchurl {
- url = "https://registry.npmjs.org/@octokit/plugin-rest-endpoint-methods/-/plugin-rest-endpoint-methods-4.13.5.tgz";
- sha512 = "kYKcWkFm4Ldk8bZai2RVEP1z97k1C/Ay2FN9FNTBg7JIyKoiiJjks4OtT6cuKeZX39tqa+C3J9xeYc6G+6g8uQ==";
+ url = "https://registry.npmjs.org/@octokit/plugin-rest-endpoint-methods/-/plugin-rest-endpoint-methods-4.14.0.tgz";
+ sha512 = "QoZ469GDvFALHuxhcRA4KFGTaPeu5Z0MILGPa7irTGfYE0WfL+LFqWmULm9tuFKaKNlTcEQ7c5uJ0p4k5uvmNQ==";
};
};
"@octokit/request-5.4.14" = {
@@ -4207,13 +4216,13 @@ let
sha512 = "ngDBevLbBTFfrHZeiS7SAMAZ6ssuVmXuya+F/7RaVvlysgGa1JKJkKWY+jV6TCJYcW0OALfJ7nTIGXcBXzycfQ==";
};
};
- "@octokit/rest-18.3.5" = {
+ "@octokit/rest-18.4.0" = {
name = "_at_octokit_slash_rest";
packageName = "@octokit/rest";
- version = "18.3.5";
+ version = "18.4.0";
src = fetchurl {
- url = "https://registry.npmjs.org/@octokit/rest/-/rest-18.3.5.tgz";
- sha512 = "ZPeRms3WhWxQBEvoIh0zzf8xdU2FX0Capa7+lTca8YHmRsO3QNJzf1H3PcuKKsfgp91/xVDRtX91sTe1kexlbw==";
+ url = "https://registry.npmjs.org/@octokit/rest/-/rest-18.4.0.tgz";
+ sha512 = "3bFg0vyD3O+6EukYzLTu4tUapMofSR4nYgMEOJc25sefippsatiWfNoOnx0QNj3PIXVJdW0riUjQnDwgS0JNWA==";
};
};
"@octokit/types-2.16.2" = {
@@ -4225,13 +4234,13 @@ let
sha512 = "O75k56TYvJ8WpAakWwYRN8Bgu60KrmX0z1KqFp1kNiFNkgW+JW+9EBKZ+S33PU6SLvbihqd+3drvPxKK68Ee8Q==";
};
};
- "@octokit/types-6.12.2" = {
+ "@octokit/types-6.13.0" = {
name = "_at_octokit_slash_types";
packageName = "@octokit/types";
- version = "6.12.2";
+ version = "6.13.0";
src = fetchurl {
- url = "https://registry.npmjs.org/@octokit/types/-/types-6.12.2.tgz";
- sha512 = "kCkiN8scbCmSq+gwdJV0iLgHc0O/GTPY1/cffo9kECu1MvatLPh9E+qFhfRIktKfHEA6ZYvv6S1B4Wnv3bi3pA==";
+ url = "https://registry.npmjs.org/@octokit/types/-/types-6.13.0.tgz";
+ sha512 = "W2J9qlVIU11jMwKHUp5/rbVUeErqelCsO5vW5PKNb7wAXQVUz87Rc+imjlEvpvbH8yUb+KHmv8NEjVZdsdpyxA==";
};
};
"@open-policy-agent/opa-wasm-1.2.0" = {
@@ -4828,6 +4837,15 @@ let
sha1 = "a777360b5b39a1a2e5106f8e858f2fd2d060c570";
};
};
+ "@putdotio/api-client-8.15.1" = {
+ name = "_at_putdotio_slash_api-client";
+ packageName = "@putdotio/api-client";
+ version = "8.15.1";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/@putdotio/api-client/-/api-client-8.15.1.tgz";
+ sha512 = "1ODxgqJJTWe+Sb6XL05oJWmHKt81nDerLtfbJH16LY5Z8dkzg9FS9K0DWrzPR8e9TmGg8rdnF4MBCDGzOJRgCA==";
+ };
+ };
"@react-native-community/cli-debugger-ui-4.13.1" = {
name = "_at_react-native-community_slash_cli-debugger-ui";
packageName = "@react-native-community/cli-debugger-ui";
@@ -4945,13 +4963,13 @@ let
sha512 = "c/qwwcHyafOQuVQJj0IlBjf5yYgBI7YPJ77k4fOJYesb41jio65eaJODRUmfYKhTOFBrIZ66kgvGPlNbjuoRdQ==";
};
};
- "@schematics/angular-11.2.5" = {
+ "@schematics/angular-11.2.6" = {
name = "_at_schematics_slash_angular";
packageName = "@schematics/angular";
- version = "11.2.5";
+ version = "11.2.6";
src = fetchurl {
- url = "https://registry.npmjs.org/@schematics/angular/-/angular-11.2.5.tgz";
- sha512 = "pjaK0gZyqhzgAVxMKElG6cDpAvNZ3adVCTA8dhEixpH+JaQdoczl59hMn7rH75yQW0PApe+8g7HMwVK6bLRmxQ==";
+ url = "https://registry.npmjs.org/@schematics/angular/-/angular-11.2.6.tgz";
+ sha512 = "NUtoX6Dfo2mUWVHt2zXEtlBsz88mo9N9fIPFAEpSY6U9x/jGSs+4rZ6sGRpkqm5UgVtYHzRyQINH7608HuGUuA==";
};
};
"@schematics/schematics-0.1102.0" = {
@@ -4963,13 +4981,13 @@ let
sha512 = "0mN6qGnI31GVNYAKDdZ6ISiJMtN8Z0rekpJ/xNHK/lDNl/QkoJVBHDf68oEcNE8dvWMq86ULpznCdT1IBQ7YFA==";
};
};
- "@schematics/update-0.1102.5" = {
+ "@schematics/update-0.1102.6" = {
name = "_at_schematics_slash_update";
packageName = "@schematics/update";
- version = "0.1102.5";
+ version = "0.1102.6";
src = fetchurl {
- url = "https://registry.npmjs.org/@schematics/update/-/update-0.1102.5.tgz";
- sha512 = "iz9pM8mabieqQnPZjrqP5jfRFvPm81/uIg46kY3KjtDtSBi4GAF2dnFyX1dC2mG1rq+e+8zeQLvOvhdLifYlEA==";
+ url = "https://registry.npmjs.org/@schematics/update/-/update-0.1102.6.tgz";
+ sha512 = "JJ9pwGWI5NfwK7d09uQ6zHV63Ms+8r0NsvJHjZlHFlolY04J6yFe0X7TF7/mcjKsaVKCjYIpe5VuTeam/wk5QQ==";
};
};
"@segment/loosely-validate-event-2.0.0" = {
@@ -4999,13 +5017,13 @@ let
sha512 = "lOUyRopNTKJYVEU9T6stp2irwlTDsYMmUKBOUjnMcwGveuUfIJqrCOtFLtIPPj3XJlbZy5F68l4KP9rZ8Ipang==";
};
};
- "@serverless/components-3.7.5" = {
+ "@serverless/components-3.7.7" = {
name = "_at_serverless_slash_components";
packageName = "@serverless/components";
- version = "3.7.5";
+ version = "3.7.7";
src = fetchurl {
- url = "https://registry.npmjs.org/@serverless/components/-/components-3.7.5.tgz";
- sha512 = "fD2Yxaxqt4WmlJquSu5AmWUqJxDTY7d1+u58hFIZyB5mwbFX3cTsHkEVMaLDlZtS6bWveSgGg14pFchLq+AV5A==";
+ url = "https://registry.npmjs.org/@serverless/components/-/components-3.7.7.tgz";
+ sha512 = "GMo0wOyrfMiekRKZuOI046bxinM/cSsAkLivaT6J0rAG6DV+C8yZHLis5090kya50XndidiSdfshlaP0lv21lQ==";
};
};
"@serverless/core-1.1.2" = {
@@ -5017,13 +5035,13 @@ let
sha512 = "PY7gH+7aQ+MltcUD7SRDuQODJ9Sav9HhFJsgOiyf8IVo7XVD6FxZIsSnpMI6paSkptOB7n+0Jz03gNlEkKetQQ==";
};
};
- "@serverless/enterprise-plugin-4.5.1" = {
+ "@serverless/enterprise-plugin-4.5.2" = {
name = "_at_serverless_slash_enterprise-plugin";
packageName = "@serverless/enterprise-plugin";
- version = "4.5.1";
+ version = "4.5.2";
src = fetchurl {
- url = "https://registry.npmjs.org/@serverless/enterprise-plugin/-/enterprise-plugin-4.5.1.tgz";
- sha512 = "wDZ/Ulu6PZ30gfiwCZ+CxDDt7fZHgH1wbU3pkBOIWtXpksm2edv+eN4irWwVe93OVUqN3uWEtLZJVZH5YQzf1g==";
+ url = "https://registry.npmjs.org/@serverless/enterprise-plugin/-/enterprise-plugin-4.5.2.tgz";
+ sha512 = "Y/7WK0BAL7oVK3QDV9nL1qUKTC4p/gKWI8W1Ozp+P4RA9RPIqDHmdqmu8Uhc/rUS0nD64LijfLlapeXq2qITVg==";
};
};
"@serverless/event-mocks-1.1.1" = {
@@ -5035,13 +5053,13 @@ let
sha512 = "YAV5V/y+XIOfd+HEVeXfPWZb8C6QLruFk9tBivoX2roQLWVq145s4uxf8D0QioCueuRzkukHUS4JIj+KVoS34A==";
};
};
- "@serverless/platform-client-4.2.1" = {
+ "@serverless/platform-client-4.2.2" = {
name = "_at_serverless_slash_platform-client";
packageName = "@serverless/platform-client";
- version = "4.2.1";
+ version = "4.2.2";
src = fetchurl {
- url = "https://registry.npmjs.org/@serverless/platform-client/-/platform-client-4.2.1.tgz";
- sha512 = "Mb68YdkhKUs4LFsrluabE00ng08fLCslf07Ufy/kwN7LfFZKTpNTnuvc/pR59zk7v3s5XWBTlnGWKbID3IWLlQ==";
+ url = "https://registry.npmjs.org/@serverless/platform-client/-/platform-client-4.2.2.tgz";
+ sha512 = "8jP72e0POFGEW7HKtDzK0qt1amYtvlB7bYSal8JUCXbeY2qk3xRJZuLWCZBBKRGz4ha4eBNjlz7iniACb9biLg==";
};
};
"@serverless/platform-client-china-2.1.9" = {
@@ -5206,13 +5224,13 @@ let
sha512 = "ca2JKOnSRzYHJkhOB9gYmdRZHmd02b/uBd/S0D5W+L9nIMS7sUBV5jfhKwVgrYPIpVNIc0XCI9rxK4TfkQRpiA==";
};
};
- "@snyk/code-client-3.1.4" = {
+ "@snyk/code-client-3.1.5" = {
name = "_at_snyk_slash_code-client";
packageName = "@snyk/code-client";
- version = "3.1.4";
+ version = "3.1.5";
src = fetchurl {
- url = "https://registry.npmjs.org/@snyk/code-client/-/code-client-3.1.4.tgz";
- sha512 = "ZZWPWAaKgNii/HYtyO9guFDVpi5T/SoCWQIo/B/RbLbXLrdZ5VIHsn0E4ztY7Y69GjQCyrus5pu7adlYrwQtEQ==";
+ url = "https://registry.npmjs.org/@snyk/code-client/-/code-client-3.1.5.tgz";
+ sha512 = "bJb00zZ7956MzIjW/4DPaMolk2/r7eox+5Bvq0bpcu1NFUFYYQPZeEPsPgh5YzK4te2v6W5hZBtjUUNIY+AQYg==";
};
};
"@snyk/composer-lockfile-parser-1.4.1" = {
@@ -5953,6 +5971,15 @@ let
sha512 = "laIjwTQaD+5DukBZaygQ79K1Z0jb1bPEMRrkXSLjtCcZm+abyp5YbrqpSLzD42FwWW6gK/aS4NYpJ804nG2brg==";
};
};
+ "@types/estree-0.0.47" = {
+ name = "_at_types_slash_estree";
+ packageName = "@types/estree";
+ version = "0.0.47";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/@types/estree/-/estree-0.0.47.tgz";
+ sha512 = "c5ciR06jK8u9BstrmJyO97m+klJrrhCf9u3rLu3DEAJBirxRqSCvDQoYKmxuYwQI5SZChAWu+tq9oVlGRuzPAg==";
+ };
+ };
"@types/express-4.17.11" = {
name = "_at_types_slash_express";
packageName = "@types/express";
@@ -6349,13 +6376,13 @@ let
sha512 = "YATxVxgRqNH6nHEIsvg6k2Boc1JHI9ZbH5iWFFv/MTkchz3b1ieGDa5T0a9RznNdI0KhVbdbWSN+KWWrQZRxTw==";
};
};
- "@types/minimatch-3.0.3" = {
+ "@types/minimatch-3.0.4" = {
name = "_at_types_slash_minimatch";
packageName = "@types/minimatch";
- version = "3.0.3";
+ version = "3.0.4";
src = fetchurl {
- url = "https://registry.npmjs.org/@types/minimatch/-/minimatch-3.0.3.tgz";
- sha512 = "tHq6qdbT9U1IRSGf14CL0pUlULksvY9OZ+5eEgl1N7t+OA3tGvNpxJCzuKQlsNgCVwbAs670L1vcVQi8j9HjnA==";
+ url = "https://registry.npmjs.org/@types/minimatch/-/minimatch-3.0.4.tgz";
+ sha512 = "1z8k4wzFnNjVK/tlxvrWuK5WMt6mydWWP7+zvH5eFep4oj+UkrfiJTRtjCeBXNpwaA/FYqqtb4/QS4ianFpIRA==";
};
};
"@types/minimist-1.2.0" = {
@@ -6952,13 +6979,13 @@ let
sha512 = "S9q47ByT2pPvD65IvrWp7qppVMpk9WGMbVq9wbWZOHg6tnXSD4vyhao6nOSBwwfDdV2p3Kx9evA9vI+XWTfDvw==";
};
};
- "@typescript-eslint/eslint-plugin-4.18.0" = {
+ "@typescript-eslint/eslint-plugin-4.19.0" = {
name = "_at_typescript-eslint_slash_eslint-plugin";
packageName = "@typescript-eslint/eslint-plugin";
- version = "4.18.0";
+ version = "4.19.0";
src = fetchurl {
- url = "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-4.18.0.tgz";
- sha512 = "Lzkc/2+7EoH7+NjIWLS2lVuKKqbEmJhtXe3rmfA8cyiKnZm3IfLf51irnBcmow8Q/AptVV0XBZmBJKuUJTe6cQ==";
+ url = "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-4.19.0.tgz";
+ sha512 = "CRQNQ0mC2Pa7VLwKFbrGVTArfdVDdefS+gTw0oC98vSI98IX5A8EVH4BzJ2FOB0YlCmm8Im36Elad/Jgtvveaw==";
};
};
"@typescript-eslint/experimental-utils-3.10.1" = {
@@ -6970,13 +6997,13 @@ let
sha512 = "DewqIgscDzmAfd5nOGe4zm6Bl7PKtMG2Ad0KG8CUZAHlXfAKTF9Ol5PXhiMh39yRL2ChRH1cuuUGOcVyyrhQIw==";
};
};
- "@typescript-eslint/experimental-utils-4.18.0" = {
+ "@typescript-eslint/experimental-utils-4.19.0" = {
name = "_at_typescript-eslint_slash_experimental-utils";
packageName = "@typescript-eslint/experimental-utils";
- version = "4.18.0";
+ version = "4.19.0";
src = fetchurl {
- url = "https://registry.npmjs.org/@typescript-eslint/experimental-utils/-/experimental-utils-4.18.0.tgz";
- sha512 = "92h723Kblt9JcT2RRY3QS2xefFKar4ZQFVs3GityOKWQYgtajxt/tuXIzL7sVCUlM1hgreiV5gkGYyBpdOwO6A==";
+ url = "https://registry.npmjs.org/@typescript-eslint/experimental-utils/-/experimental-utils-4.19.0.tgz";
+ sha512 = "9/23F1nnyzbHKuoTqFN1iXwN3bvOm/PRIXSBR3qFAYotK/0LveEOHr5JT1WZSzcD6BESl8kPOG3OoDRKO84bHA==";
};
};
"@typescript-eslint/parser-3.10.1" = {
@@ -6988,22 +7015,22 @@ let
sha512 = "Ug1RcWcrJP02hmtaXVS3axPPTTPnZjupqhgj+NnZ6BCkwSImWk/283347+x9wN+lqOdK9Eo3vsyiyDHgsmiEJw==";
};
};
- "@typescript-eslint/parser-4.18.0" = {
+ "@typescript-eslint/parser-4.19.0" = {
name = "_at_typescript-eslint_slash_parser";
packageName = "@typescript-eslint/parser";
- version = "4.18.0";
+ version = "4.19.0";
src = fetchurl {
- url = "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-4.18.0.tgz";
- sha512 = "W3z5S0ZbecwX3PhJEAnq4mnjK5JJXvXUDBYIYGoweCyWyuvAKfGHvzmpUzgB5L4cRBb+cTu9U/ro66dx7dIimA==";
+ url = "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-4.19.0.tgz";
+ sha512 = "/uabZjo2ZZhm66rdAu21HA8nQebl3lAIDcybUoOxoI7VbZBYavLIwtOOmykKCJy+Xq6Vw6ugkiwn8Js7D6wieA==";
};
};
- "@typescript-eslint/scope-manager-4.18.0" = {
+ "@typescript-eslint/scope-manager-4.19.0" = {
name = "_at_typescript-eslint_slash_scope-manager";
packageName = "@typescript-eslint/scope-manager";
- version = "4.18.0";
+ version = "4.19.0";
src = fetchurl {
- url = "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-4.18.0.tgz";
- sha512 = "olX4yN6rvHR2eyFOcb6E4vmhDPsfdMyfQ3qR+oQNkAv8emKKlfxTWUXU5Mqxs2Fwe3Pf1BoPvrwZtwngxDzYzQ==";
+ url = "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-4.19.0.tgz";
+ sha512 = "GGy4Ba/hLXwJXygkXqMzduqOMc+Na6LrJTZXJWVhRrSuZeXmu8TAnniQVKgj8uTRKe4igO2ysYzH+Np879G75g==";
};
};
"@typescript-eslint/types-3.10.1" = {
@@ -7015,13 +7042,13 @@ let
sha512 = "+3+FCUJIahE9q0lDi1WleYzjCwJs5hIsbugIgnbB+dSCYUxl8L6PwmsyOPFZde2hc1DlTo/xnkOgiTLSyAbHiQ==";
};
};
- "@typescript-eslint/types-4.18.0" = {
+ "@typescript-eslint/types-4.19.0" = {
name = "_at_typescript-eslint_slash_types";
packageName = "@typescript-eslint/types";
- version = "4.18.0";
+ version = "4.19.0";
src = fetchurl {
- url = "https://registry.npmjs.org/@typescript-eslint/types/-/types-4.18.0.tgz";
- sha512 = "/BRociARpj5E+9yQ7cwCF/SNOWwXJ3qhjurMuK2hIFUbr9vTuDeu476Zpu+ptxY2kSxUHDGLLKy+qGq2sOg37A==";
+ url = "https://registry.npmjs.org/@typescript-eslint/types/-/types-4.19.0.tgz";
+ sha512 = "A4iAlexVvd4IBsSTNxdvdepW0D4uR/fwxDrKUa+iEY9UWvGREu2ZyB8ylTENM1SH8F7bVC9ac9+si3LWNxcBuA==";
};
};
"@typescript-eslint/typescript-estree-2.34.0" = {
@@ -7042,13 +7069,13 @@ let
sha512 = "QbcXOuq6WYvnB3XPsZpIwztBoquEYLXh2MtwVU+kO8jgYCiv4G5xrSP/1wg4tkvrEE+esZVquIPX/dxPlePk1w==";
};
};
- "@typescript-eslint/typescript-estree-4.18.0" = {
+ "@typescript-eslint/typescript-estree-4.19.0" = {
name = "_at_typescript-eslint_slash_typescript-estree";
packageName = "@typescript-eslint/typescript-estree";
- version = "4.18.0";
+ version = "4.19.0";
src = fetchurl {
- url = "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-4.18.0.tgz";
- sha512 = "wt4xvF6vvJI7epz+rEqxmoNQ4ZADArGQO9gDU+cM0U5fdVv7N+IAuVoVAoZSOZxzGHBfvE3XQMLdy+scsqFfeg==";
+ url = "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-4.19.0.tgz";
+ sha512 = "3xqArJ/A62smaQYRv2ZFyTA+XxGGWmlDYrsfZG68zJeNbeqRScnhf81rUVa6QG4UgzHnXw5VnMT5cg75dQGDkA==";
};
};
"@typescript-eslint/visitor-keys-3.10.1" = {
@@ -7060,13 +7087,13 @@ let
sha512 = "9JgC82AaQeglebjZMgYR5wgmfUdUc+EitGUUMW8u2nDckaeimzW+VsoLV6FoimPv2id3VQzfjwBxEMVz08ameQ==";
};
};
- "@typescript-eslint/visitor-keys-4.18.0" = {
+ "@typescript-eslint/visitor-keys-4.19.0" = {
name = "_at_typescript-eslint_slash_visitor-keys";
packageName = "@typescript-eslint/visitor-keys";
- version = "4.18.0";
+ version = "4.19.0";
src = fetchurl {
- url = "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-4.18.0.tgz";
- sha512 = "Q9t90JCvfYaN0OfFUgaLqByOfz8yPeTAdotn/XYNm5q9eHax90gzdb+RJ6E9T5s97Kv/UHWKERTmqA0jTKAEHw==";
+ url = "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-4.19.0.tgz";
+ sha512 = "aGPS6kz//j7XLSlgpzU2SeTqHPsmRYxFztj2vPuMMFJXZudpRSehE3WCV+BaxwZFvfAqMoSd86TEuM0PQ59E/A==";
};
};
"@uifabric/foundation-7.9.26" = {
@@ -8815,13 +8842,13 @@ let
sha512 = "cBhpre4ma+U0T1oM5fXg7Dy1Jw7zzwv7lt/GoCpr+hDQJoYnKVPLL4dCvSEFMmQurOQvSrwT7SL/DAlhBI97RQ==";
};
};
- "ansi-escapes-4.3.1" = {
+ "ansi-escapes-4.3.2" = {
name = "ansi-escapes";
packageName = "ansi-escapes";
- version = "4.3.1";
+ version = "4.3.2";
src = fetchurl {
- url = "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-4.3.1.tgz";
- sha512 = "JWF7ocqNrp8u9oqpgV+wH5ftbt+cfvv+PTjOvKLT3AdYly/LmORARfEVT1iyjwN+4MqE5UmVKoAdIBqeoCHgLA==";
+ url = "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-4.3.2.tgz";
+ sha512 = "gKXj5ALrKWQLsYG9jlTRmR/xKluxHV+Z9QEwNIgCfM1/uwPMCuzVVnh5mwTd+OuBZcwSIMbqssNWRm1lE51QaQ==";
};
};
"ansi-gray-0.1.1" = {
@@ -10543,13 +10570,13 @@ let
sha512 = "+KBkqH7t/XE91Fqn8eyJeNIWsnhSWL8bSUqFD7TfE3FN07MTlC0nprGYp+2WfcYNz5i8Bus1vY2DHNVhtTImnw==";
};
};
- "aws-sdk-2.868.0" = {
+ "aws-sdk-2.871.0" = {
name = "aws-sdk";
packageName = "aws-sdk";
- version = "2.868.0";
+ version = "2.871.0";
src = fetchurl {
- url = "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.868.0.tgz";
- sha512 = "ZayPsA/ycaAXqqa2oDyf8iUpl1WOLODZS8ZdvYj77L5owMQm0XC7yqiD+WHj9nToUECF9VAD+AKQMIN6695tVQ==";
+ url = "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.871.0.tgz";
+ sha512 = "rFd2shGgYfCzQQQeqqgZRiLuPFUm3uUlHqM40nMtbqM1y7abuOUyuOMxTHsKsbY+Bu7gRESngPTf7Iknxq9/uQ==";
};
};
"aws-sign2-0.6.0" = {
@@ -10588,6 +10615,15 @@ let
sha512 = "wMHVg2EOHaMRxbzgFJ9gtjOOCrI80OHLG14rxi28XwOW8ux6IiEbRCGGGqCtdAIg4FQCbW20k9RsT4y3gJlFug==";
};
};
+ "axios-0.19.2" = {
+ name = "axios";
+ packageName = "axios";
+ version = "0.19.2";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/axios/-/axios-0.19.2.tgz";
+ sha512 = "fjgm5MvRHLhx+osE2xoekY70AhARk3a6hkN+3Io1jc00jtquGvxYlKlsFUhmUET0V5te6CcZI7lcv2Ym61mjHA==";
+ };
+ };
"axios-0.21.1" = {
name = "axios";
packageName = "axios";
@@ -13432,13 +13468,13 @@ let
sha512 = "a0tMB40oefvuInr4Cwb3GerbL9xTj1D5yg0T5xrjGCGyfvbxseIXX7BAO/u/hIXdafzOI5JC3wDwHyf24buOAQ==";
};
};
- "cacache-15.0.5" = {
+ "cacache-15.0.6" = {
name = "cacache";
packageName = "cacache";
- version = "15.0.5";
+ version = "15.0.6";
src = fetchurl {
- url = "https://registry.npmjs.org/cacache/-/cacache-15.0.5.tgz";
- sha512 = "lloiL22n7sOjEEXdL8NAjTgv9a1u43xICE9/203qonkZUCj5X1UEWIdf2/Y0d6QcCtMzbKQyhrcDbdvlZTs/+A==";
+ url = "https://registry.npmjs.org/cacache/-/cacache-15.0.6.tgz";
+ sha512 = "g1WYDMct/jzW+JdWEyjaX2zoBkZ6ZT9VpOyp2I/VMtDsNLffNat3kqPFfi1eDRSK9/SuKGyORDHcQMcPF8sQ/w==";
};
};
"cache-base-1.0.1" = {
@@ -13747,13 +13783,13 @@ let
sha512 = "bsTwuIg/BZZK/vreVTYYbSWoe2F+71P7K5QGEX+pT250DZbfU1MQ5prOKpPR+LL6uWKK3KMwMCAS74QB3Um1uw==";
};
};
- "caniuse-lite-1.0.30001203" = {
+ "caniuse-lite-1.0.30001204" = {
name = "caniuse-lite";
packageName = "caniuse-lite";
- version = "1.0.30001203";
+ version = "1.0.30001204";
src = fetchurl {
- url = "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001203.tgz";
- sha512 = "/I9tvnzU/PHMH7wBPrfDMSuecDeUKerjCPX7D0xBbaJZPxoT9m+yYxt0zCTkcijCkjTdim3H56Zm0i5Adxch4w==";
+ url = "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001204.tgz";
+ sha512 = "JUdjWpcxfJ9IPamy2f5JaRDCaqJOxDzOSKtbdx4rH9VivMd1vIzoPumsJa9LoMIi4Fx2BV2KZOxWhNkBjaYivQ==";
};
};
"canvas-2.7.0" = {
@@ -15331,13 +15367,13 @@ let
sha512 = "3WQV/Fpa77nvzjUlc+0u53uIroJyyMB2Qwl++aXpAiDIsrsiAQq4uCURwdRBRX+eLkOTIAmT0L4qna3T7+2pUg==";
};
};
- "codemaker-1.25.0" = {
+ "codemaker-1.26.0" = {
name = "codemaker";
packageName = "codemaker";
- version = "1.25.0";
+ version = "1.26.0";
src = fetchurl {
- url = "https://registry.npmjs.org/codemaker/-/codemaker-1.25.0.tgz";
- sha512 = "54qCHs6X6llXIAztHCo2IyzzvuH9GrEecwxxTU925M3EJV4z+7PMiI1AollZxSeyY2pGO5TjNlAQAyLXETI3NQ==";
+ url = "https://registry.npmjs.org/codemaker/-/codemaker-1.26.0.tgz";
+ sha512 = "oK0SdWi3CUHL7hVcDpXVBQc2xm31RCJSqg7I1wviMifD89zbvu3boAz/s5aoXbcVDKKxLOZn2w55WlGCih9HOw==";
};
};
"codepage-1.4.0" = {
@@ -15853,6 +15889,15 @@ let
sha512 = "pRxBna3MJe6HKnBGsDyMv8ETbptw3axEdYHoqNh7gu5oDcew8fs0xnivZGm06Ogk8zGAJ9VX+OPEr2GXEQK4dg==";
};
};
+ "commander-7.2.0" = {
+ name = "commander";
+ packageName = "commander";
+ version = "7.2.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/commander/-/commander-7.2.0.tgz";
+ sha512 = "QrWXB+ZQSVPmIWIhtEO9H+gwHaMGYiF5ChvoJ+K9ZGHG/sVsa6yiesAD1GC/x46sET00Xlwo1u49RVVVzvcSkw==";
+ };
+ };
"commandpost-1.4.0" = {
name = "commandpost";
packageName = "commandpost";
@@ -16132,6 +16177,15 @@ let
sha512 = "bzlVWS2THbMetHqXKB8ypsXN4DQ/1qopGwNJi1eYbpwesJcd86FBjFciCQX/YwAhp9bM7NVnPFqZ5LpV7gP0Dg==";
};
};
+ "conf-6.2.4" = {
+ name = "conf";
+ packageName = "conf";
+ version = "6.2.4";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/conf/-/conf-6.2.4.tgz";
+ sha512 = "GjgyPRLo1qK1LR9RWAdUagqo+DP18f5HWCFk4va7GS+wpxQTOzfuKTwKOvGW2c01/YXNicAyyoyuSddmdkBzZQ==";
+ };
+ };
"conf-7.1.2" = {
name = "conf";
packageName = "conf";
@@ -16357,13 +16411,13 @@ let
sha512 = "5AKrTtmiioQWloJ3WRFZb0/uR1lrRboaVE9go++XZltvRnZkN2/kQjaZ0gtFxynU5u5k9mWVtk8mNcgJ9yoRbQ==";
};
};
- "constructs-3.3.68" = {
+ "constructs-3.3.71" = {
name = "constructs";
packageName = "constructs";
- version = "3.3.68";
+ version = "3.3.71";
src = fetchurl {
- url = "https://registry.npmjs.org/constructs/-/constructs-3.3.68.tgz";
- sha512 = "Fq029KuZo16NdYqlSuK1loIDiR1P2WwxsihZjjeK9hM5qoFXjcAAzMI7i5Z1LxZwWl9cUoutBNXSvhF7xHUG7Q==";
+ url = "https://registry.npmjs.org/constructs/-/constructs-3.3.71.tgz";
+ sha512 = "3KFtTsA7OV27m/+pJhN4iJkKzHbPIPvyvEX5BQ/JCAWjfCHOQEVpIgxHLpT4i8L1OFta+pJrzcEVAHo6UitwqA==";
};
};
"consume-http-header-1.0.0" = {
@@ -17861,13 +17915,13 @@ let
sha512 = "KHW6M86R+FUPYGb3R5XiYjXPq7VzwxZ22buHhAEVG5ztoEcZZMLov530mmccaqA1GghZArjQV46fuc8kUqhhHw==";
};
};
- "d3-array-2.12.0" = {
+ "d3-array-2.12.1" = {
name = "d3-array";
packageName = "d3-array";
- version = "2.12.0";
+ version = "2.12.1";
src = fetchurl {
- url = "https://registry.npmjs.org/d3-array/-/d3-array-2.12.0.tgz";
- sha512 = "T6H/qNldyD/1OlRkJbonb3u3MPhNwju8OPxYv0YSjDb/B2RUeeBEHzIpNrYiinwpmz8+am+puMrpcrDWgY9wRg==";
+ url = "https://registry.npmjs.org/d3-array/-/d3-array-2.12.1.tgz";
+ sha512 = "B0ErZK/66mHtEsR1TkPEEkwdy+WDesimkM5gpZr5Dsg54BiTA5RXtYW5qTLIAcekaS9xfZrzBLF/OAkB3Qn1YQ==";
};
};
"d3-axis-1.0.12" = {
@@ -18653,6 +18707,15 @@ let
sha512 = "XRRe6Glud4rd/ZGQfiV1ruXSfbvfJedlV9Y6zOlP+2K04vBYiJEte6stfFkCP03aMnY5tsipamumUjL14fofug==";
};
};
+ "debounce-fn-3.0.1" = {
+ name = "debounce-fn";
+ packageName = "debounce-fn";
+ version = "3.0.1";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/debounce-fn/-/debounce-fn-3.0.1.tgz";
+ sha512 = "aBoJh5AhpqlRoHZjHmOzZlRx+wz2xVwGL9rjs+Kj0EWUrL4/h4K7OD176thl2Tdoqui/AaA4xhHrNArGLAaI3Q==";
+ };
+ };
"debounce-fn-4.0.0" = {
name = "debounce-fn";
packageName = "debounce-fn";
@@ -20075,6 +20138,15 @@ let
sha512 = "qKftHMVoMliYBaYLkgttm+NXhRISVNkIMfAL4ecmXjiWRElfdfY+xNgITiehG0LpUEDbFUa/UDCByYq/2UZIpQ==";
};
};
+ "dockerfile-ast-0.2.0" = {
+ name = "dockerfile-ast";
+ packageName = "dockerfile-ast";
+ version = "0.2.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/dockerfile-ast/-/dockerfile-ast-0.2.0.tgz";
+ sha512 = "iQyp12k1A4tF3sEfLAq2wfFPKdpoiGTJeuiu2Y1bdEqIZu0DfSSL2zm0fk7a/UHeQkngnYaRRGuON+C+2LO1Fw==";
+ };
+ };
"dockerfile-language-service-0.2.0" = {
name = "dockerfile-language-service";
packageName = "dockerfile-language-service";
@@ -20831,13 +20903,13 @@ let
sha512 = "1sQ1DRtQGpglFhc3urD4olMJzt/wxlbnAAsf+WY2xHf5c50ZovivZvCXSpVgTOP9f4TzOMvelWyspyfhxQKHzQ==";
};
};
- "electron-to-chromium-1.3.693" = {
+ "electron-to-chromium-1.3.699" = {
name = "electron-to-chromium";
packageName = "electron-to-chromium";
- version = "1.3.693";
+ version = "1.3.699";
src = fetchurl {
- url = "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.693.tgz";
- sha512 = "vUdsE8yyeu30RecppQtI+XTz2++LWLVEIYmzeCaCRLSdtKZ2eXqdJcrs85KwLiPOPVc6PELgWyXBsfqIvzGZag==";
+ url = "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.699.tgz";
+ sha512 = "fjt43CPXdPYwD9ybmKbNeLwZBmCVdLY2J5fGZub7/eMPuiqQznOGNXv/wurnpXIlE7ScHnvG9Zi+H4/i6uMKmw==";
};
};
"electrum-client-git://github.com/janoside/electrum-client" = {
@@ -20932,13 +21004,13 @@ let
sha512 = "Bt1sBAGFHY9DKY+4/2cV6izcKJUf5T7/gkdmkxzX/qv9CcGH8xSwVRW5mtX03SWJtRTWSOpzCuWN9rBFYZepZQ==";
};
};
- "emmet-2.3.2" = {
+ "emmet-2.3.4" = {
name = "emmet";
packageName = "emmet";
- version = "2.3.2";
+ version = "2.3.4";
src = fetchurl {
- url = "https://registry.npmjs.org/emmet/-/emmet-2.3.2.tgz";
- sha512 = "PRHGy5RfLp7+WBgoNq0QYtjSbbG1g28PtnN8McPhlEMoPwZWBDftVIz4vDNUNvQFSBtekuYZxB7J0vLgodZxFw==";
+ url = "https://registry.npmjs.org/emmet/-/emmet-2.3.4.tgz";
+ sha512 = "3IqSwmO+N2ZGeuhDyhV/TIOJFUbkChi53bcasSNRE7Yd+4eorbbYz4e53TpMECt38NtYkZNupQCZRlwdAYA42A==";
};
};
"emoji-named-characters-1.0.2" = {
@@ -21697,13 +21769,13 @@ let
sha512 = "j02SFrUwFTRUqiY0Kjplwjm1psuzO1d6AjaXKuOR9hrY0HuPsT6sV42B6myW34h1q4CRy+Y3g4RU/cGJeI/nNA==";
};
};
- "esbuild-0.9.6" = {
+ "esbuild-0.9.7" = {
name = "esbuild";
packageName = "esbuild";
- version = "0.9.6";
+ version = "0.9.7";
src = fetchurl {
- url = "https://registry.npmjs.org/esbuild/-/esbuild-0.9.6.tgz";
- sha512 = "F6vASxU0wT/Davt9aj2qtDwDNSkQxh9VbyO56M7PDWD+D/Vgq/rmUDGDQo7te76W5auauVojjnQr/wTu3vpaUA==";
+ url = "https://registry.npmjs.org/esbuild/-/esbuild-0.9.7.tgz";
+ sha512 = "VtUf6aQ89VTmMLKrWHYG50uByMF4JQlVysb8dmg6cOgW8JnFCipmz7p+HNBl+RR3LLCuBxFGVauAe2wfnF9bLg==";
};
};
"esc-exit-2.0.2" = {
@@ -21922,13 +21994,13 @@ let
sha512 = "Nhc+oVAHm0uz/PkJAWscwIT4ijTrK5fqNqz9QB1D35SbbuMG1uB6Yr5AJpvPSWg+WOw7nYNswerYh0kOk64gqQ==";
};
};
- "eslint-plugin-vue-7.7.0" = {
+ "eslint-plugin-vue-7.8.0" = {
name = "eslint-plugin-vue";
packageName = "eslint-plugin-vue";
- version = "7.7.0";
+ version = "7.8.0";
src = fetchurl {
- url = "https://registry.npmjs.org/eslint-plugin-vue/-/eslint-plugin-vue-7.7.0.tgz";
- sha512 = "mYz4bpLGv5jx6YG/GvKkqbGSfV7uma2u1P3mLA41Q5vQl8W1MeuTneB8tfsLq6xxxesFubcrOC0BZBJ5R+eaCQ==";
+ url = "https://registry.npmjs.org/eslint-plugin-vue/-/eslint-plugin-vue-7.8.0.tgz";
+ sha512 = "OGrnPz+PuYL2HmVyBHxm4mRjxW2kfFCQE6Hw9G6qOHs/Pcu0srOlCCW0FMa8SLzIEqxl8WuKoBSPcMnrjUG2vw==";
};
};
"eslint-scope-3.7.3" = {
@@ -22516,13 +22588,13 @@ let
sha512 = "FIUCJz1RbuS0FKTdaAafAByGS0CPvU3R0MeHxgtl+djzCc//F8HakL8GzmVNZanasTbTAY/3DRFA0KpVqj/eAw==";
};
};
- "exec-sh-0.3.4" = {
+ "exec-sh-0.3.6" = {
name = "exec-sh";
packageName = "exec-sh";
- version = "0.3.4";
+ version = "0.3.6";
src = fetchurl {
- url = "https://registry.npmjs.org/exec-sh/-/exec-sh-0.3.4.tgz";
- sha512 = "sEFIkc61v75sWeOe72qyrqg2Qg0OuLESziUDk/O/z2qgS15y2gWVFrI6f2Qn/qw/0/NCfCEsmNA4zOjkwEZT1A==";
+ url = "https://registry.npmjs.org/exec-sh/-/exec-sh-0.3.6.tgz";
+ sha512 = "nQn+hI3yp+oD0huYhKwvYI32+JFeq+XkNcD1GAo3Y/MjxsfVGmrrzrnzjWiNY6f+pUCP440fThsFh5gZrRAU/w==";
};
};
"execa-0.1.1" = {
@@ -23389,13 +23461,13 @@ let
sha512 = "483XLLxTVIwWK3QTrMGRqUfUpoOs/0hbQrl2oz4J0pAcm3A3bu84wxTFqGqkJzewCLdME38xJLJAxBABfQT8sQ==";
};
};
- "fastpriorityqueue-0.6.3" = {
+ "fastpriorityqueue-0.7.0" = {
name = "fastpriorityqueue";
packageName = "fastpriorityqueue";
- version = "0.6.3";
+ version = "0.7.0";
src = fetchurl {
- url = "https://registry.npmjs.org/fastpriorityqueue/-/fastpriorityqueue-0.6.3.tgz";
- sha512 = "l4Whw9/MDkl/0XuqZEzGE/sw9T7dIxuUnxqq4ZJDLt8AE45j8wkx4/nBRZm50aQ9kN71NB9mwQzglLsvQGROsw==";
+ url = "https://registry.npmjs.org/fastpriorityqueue/-/fastpriorityqueue-0.7.0.tgz";
+ sha512 = "L5Je6LktYDK5aRJIAHO4NEyQXsihwe/+VEaI2qwyoxvuTPcyooLi9+MeLJnOzvEDwijxAXrrqqkV4cNgW55Rog==";
};
};
"fastq-1.11.0" = {
@@ -24406,6 +24478,15 @@ let
sha512 = "DUgl6+HDzB0iEptNQEXLx/KhTmDb8tZUHSeLqpnjpknR70H0nC2t9N73BK6fN4hOvJ84pKlIQVQ4k5FFlBedKA==";
};
};
+ "follow-redirects-1.5.10" = {
+ name = "follow-redirects";
+ packageName = "follow-redirects";
+ version = "1.5.10";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.5.10.tgz";
+ sha512 = "0V5l4Cizzvqt5D44aTXbFZz+FtyXV1vrDN6qrelxtfYQKW0KO0W2T/hkE8xvGa/540LkZlkaUjO4ailYTFtHVQ==";
+ };
+ };
"font-awesome-filetypes-2.1.0" = {
name = "font-awesome-filetypes";
packageName = "font-awesome-filetypes";
@@ -26180,13 +26261,13 @@ let
sha512 = "iH9RmgwCmUJHi2z5o2l3eTtGBtXek1OYlHrbcxOYugyHLmAsZrPj43OtHThd62Buh/Vv6VyCBD2bdyWcGNQqoQ==";
};
};
- "globby-11.0.2" = {
+ "globby-11.0.3" = {
name = "globby";
packageName = "globby";
- version = "11.0.2";
+ version = "11.0.3";
src = fetchurl {
- url = "https://registry.npmjs.org/globby/-/globby-11.0.2.tgz";
- sha512 = "2ZThXDvvV8fYFRVIxnrMQBipZQDr7MxKAmQK1vujaj9/7eF0efG7BPUKJ7jP7G5SLF37xKDXvO4S/KKLj/Z0og==";
+ url = "https://registry.npmjs.org/globby/-/globby-11.0.3.tgz";
+ sha512 = "ffdmosjA807y7+lA1NM0jELARVmYul/715xiILEjo3hBLPTcirgQNnXECn5g3mtR8TOLCVbkfua1Hpen25/Xcg==";
};
};
"globby-4.1.0" = {
@@ -26315,13 +26396,13 @@ let
sha512 = "Q+ZjUEvLQj/lrVHF/IQwRo6p3s8Nc44Zk/DALsN+ac3T4HY/g/3rrufkgtl+nZ1TW7DNAw5cTChdVp4apUXVgQ==";
};
};
- "google-auth-library-7.0.2" = {
+ "google-auth-library-7.0.3" = {
name = "google-auth-library";
packageName = "google-auth-library";
- version = "7.0.2";
+ version = "7.0.3";
src = fetchurl {
- url = "https://registry.npmjs.org/google-auth-library/-/google-auth-library-7.0.2.tgz";
- sha512 = "vjyNZR3pDLC0u7GHLfj+Hw9tGprrJwoMwkYGqURCXYITjCrP9HprOyxVV+KekdLgATtWGuDkQG2MTh0qpUPUgg==";
+ url = "https://registry.npmjs.org/google-auth-library/-/google-auth-library-7.0.3.tgz";
+ sha512 = "6wJNYqY1QUr5I2lWaUkkzOT2b9OCNhNQrdFOt/bsBbGb7T7NCdEvrBsXraUm+KTUGk2xGlQ7m9RgUd4Llcw8NQ==";
};
};
"google-closure-compiler-js-20170910.0.1" = {
@@ -27665,13 +27746,13 @@ let
sha512 = "aXpmwoOhRBrw6X3j0h5RloK4x1OzsxMPyxqIHyNfSe2pypkVTZFpEiRoSipPEPlMrh0HW/XsjkJ5WgnCirpNUw==";
};
};
- "hosted-git-info-4.0.1" = {
+ "hosted-git-info-4.0.2" = {
name = "hosted-git-info";
packageName = "hosted-git-info";
- version = "4.0.1";
+ version = "4.0.2";
src = fetchurl {
- url = "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-4.0.1.tgz";
- sha512 = "eT7NrxAsppPRQEBSwKSosReE+v8OzABwEScQYk5d4uxaEPlzxTIku7LINXtBGalthkLhJnq5lBI89PfK43zAKg==";
+ url = "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-4.0.2.tgz";
+ sha512 = "c9OGXbZ3guC/xOlCg1Ci/VgWlwsqDv1yMQL1CWqXDL0hDjXuNcq0zuR4xqPSuasI3kqFDhqSyTjREz5gzq0fXg==";
};
};
"hot-formula-parser-4.0.0" = {
@@ -31239,13 +31320,13 @@ let
sha512 = "0soPJif+yjmzmOF+4cF2hyhxUWWpXpQntsm2joJXFFoRcQiPzsG4dbLKYqYPT3Fc6PjZ8MaLtCkDqqckVSfmRw==";
};
};
- "jitdb-2.3.3" = {
+ "jitdb-2.3.4" = {
name = "jitdb";
packageName = "jitdb";
- version = "2.3.3";
+ version = "2.3.4";
src = fetchurl {
- url = "https://registry.npmjs.org/jitdb/-/jitdb-2.3.3.tgz";
- sha512 = "wSB+iNzPm/Qcp1lKg8olKL0zeZdAhDVXLpWLKLWtqWN/vpHeu7vKmYxClsxhmV4YhZ/Hjzzi0oXBY8hVqKHQTA==";
+ url = "https://registry.npmjs.org/jitdb/-/jitdb-2.3.4.tgz";
+ sha512 = "KK20bNiuzIekY7KzH4DvKDMGOu4yGAfiPFLE6GbFZUWurXOQJAbfjvbqKmNHOTE6FA5o8pPg2dz8OvJyjByWEQ==";
};
};
"jju-1.4.0" = {
@@ -31635,40 +31716,40 @@ let
sha512 = "xKqzzWXDttJuOcawBt4KnKHHIf5oQ/Cxax+0PWFG+DFDgHNAdi+TXECADI+RYiFUMmx8792xsMbbgXj4CwnP4g==";
};
};
- "jsii-1.25.0" = {
+ "jsii-1.26.0" = {
name = "jsii";
packageName = "jsii";
- version = "1.25.0";
+ version = "1.26.0";
src = fetchurl {
- url = "https://registry.npmjs.org/jsii/-/jsii-1.25.0.tgz";
- sha512 = "5dchUvG+RTc48v8euUUNvxKxAlPMIaE9rG8BFp4RiXQiB3EFDTJeeM89cXK4w/vAhjgDlAxMDx3EJr7k6e461A==";
+ url = "https://registry.npmjs.org/jsii/-/jsii-1.26.0.tgz";
+ sha512 = "ZUu5N8+u12VyNkPgSgvVzIhZ+aEAd531zDZK4qkth7UsGNhSy4zBz9BJMSSKnaVV0oR6Pvehhg5DJ3dCu8qJrw==";
};
};
- "jsii-pacmak-1.25.0" = {
+ "jsii-pacmak-1.26.0" = {
name = "jsii-pacmak";
packageName = "jsii-pacmak";
- version = "1.25.0";
+ version = "1.26.0";
src = fetchurl {
- url = "https://registry.npmjs.org/jsii-pacmak/-/jsii-pacmak-1.25.0.tgz";
- sha512 = "GEVdCYvnwYVnVNdcLDrvStaHqWIXBiZCpM9i4LS2rpA+qSsyXJUF8FV4cj2YFjdHsolUdY1EKY7njSs8XQ+1gg==";
+ url = "https://registry.npmjs.org/jsii-pacmak/-/jsii-pacmak-1.26.0.tgz";
+ sha512 = "KOKOIazxddh8CuyuLMoBURW2bj3prhzyT0qF5ojUhHrbZeuH3eulF/Sn5PaIAadmQdmCiu69DYJe2JIwY/zwjw==";
};
};
- "jsii-reflect-1.25.0" = {
+ "jsii-reflect-1.26.0" = {
name = "jsii-reflect";
packageName = "jsii-reflect";
- version = "1.25.0";
+ version = "1.26.0";
src = fetchurl {
- url = "https://registry.npmjs.org/jsii-reflect/-/jsii-reflect-1.25.0.tgz";
- sha512 = "ufBgOeGe6WVmx0CO7ABraEYOzhzxvmx6gJuUvOz/8XMe1dIIU2USLW3O1ArkEtIWchN4F2gITdd7I7jhdzzN1A==";
+ url = "https://registry.npmjs.org/jsii-reflect/-/jsii-reflect-1.26.0.tgz";
+ sha512 = "mlu97Xs2M+YCq3Z8z2vzLYOe3XVC3T0YBabvJjkKoNYdH6F/S5zQMVdGwfHEXv1asFv7PrrVu46Zf/dKnqULcw==";
};
};
- "jsii-rosetta-1.25.0" = {
+ "jsii-rosetta-1.26.0" = {
name = "jsii-rosetta";
packageName = "jsii-rosetta";
- version = "1.25.0";
+ version = "1.26.0";
src = fetchurl {
- url = "https://registry.npmjs.org/jsii-rosetta/-/jsii-rosetta-1.25.0.tgz";
- sha512 = "2g+O5mkXrcsJPrHs71WPvLhcV4JERYUUzfG4rArZQ+YsGYSlpP2K6FdYlAk8haeCeEgyaedNgsbcW9NbxV8p3A==";
+ url = "https://registry.npmjs.org/jsii-rosetta/-/jsii-rosetta-1.26.0.tgz";
+ sha512 = "J/VQR8j/mD4Q5qGF0JmfvOJeNWIx0I158nvo6FsnC8aYmHyIpBPmlpKWZzUGC8fHxoD3mC8oeiFLp2Yv8BNtvQ==";
};
};
"jsii-srcmak-0.1.255" = {
@@ -36262,13 +36343,13 @@ let
sha512 = "SoO8y1B9NjMOYlNdwXMchuTVvqSTlUmXm1P5QvZNPv7OH7aa8qJV+3aA+vl1DHK9Vk1uZAlgwokjvDQhS6bINA==";
};
};
- "mdast-util-mdx-jsx-0.1.3" = {
+ "mdast-util-mdx-jsx-0.1.4" = {
name = "mdast-util-mdx-jsx";
packageName = "mdast-util-mdx-jsx";
- version = "0.1.3";
+ version = "0.1.4";
src = fetchurl {
- url = "https://registry.npmjs.org/mdast-util-mdx-jsx/-/mdast-util-mdx-jsx-0.1.3.tgz";
- sha512 = "MIAop4fMALAAVMpXIZqSq2T9/3d/hiiSTdPTJ9AOIZL1td2JBbUOBSnBSMfEk4GOyiQSsla+NFziJbNBwBH1sw==";
+ url = "https://registry.npmjs.org/mdast-util-mdx-jsx/-/mdast-util-mdx-jsx-0.1.4.tgz";
+ sha512 = "67KOAvCmypBSpr+AJEAVQg1Obig5Wnguo4ETTxASe5WVP4TLt57bZjDX/9EW5sWYQsO4gPqLxkUOlypVn5rkhg==";
};
};
"mdast-util-mdxjs-esm-0.1.1" = {
@@ -39188,6 +39269,15 @@ let
sha1 = "5f5665d93351335caabef8f1c554516cf5f1e4e5";
};
};
+ "node-downloader-helper-1.0.17" = {
+ name = "node-downloader-helper";
+ packageName = "node-downloader-helper";
+ version = "1.0.17";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/node-downloader-helper/-/node-downloader-helper-1.0.17.tgz";
+ sha512 = "EnaY0uBSdVo4kYfSmkDlTJG8GqmS8fbfoOau/OsTnikCwt9vsU0w8REVxwWbVz7DzNtHSEBKpU6jV1hmtlx0Dg==";
+ };
+ };
"node-emoji-1.10.0" = {
name = "node-emoji";
packageName = "node-emoji";
@@ -40657,13 +40747,13 @@ let
sha512 = "fZ4qZdQ2nxJvtcasX7Ghl+WlWS/d9IgnBIwFZXVNNZUmzpno91SX5bc5vuxiuKoCtK78XxGGNuSCrDC7xYB3OQ==";
};
};
- "office-ui-fabric-react-7.165.0" = {
+ "office-ui-fabric-react-7.165.1" = {
name = "office-ui-fabric-react";
packageName = "office-ui-fabric-react";
- version = "7.165.0";
+ version = "7.165.1";
src = fetchurl {
- url = "https://registry.npmjs.org/office-ui-fabric-react/-/office-ui-fabric-react-7.165.0.tgz";
- sha512 = "alOv6F8ZRPaLkM9nEKSiuyAEE4y2OJLqCu9iadkjQykjypcAhDQSA6mrBN0nzS6helb1hxakNLkQja6rrVwjtg==";
+ url = "https://registry.npmjs.org/office-ui-fabric-react/-/office-ui-fabric-react-7.165.1.tgz";
+ sha512 = "a8H0KGwhfEps7v0Ia+kU9kQyRtj3qVMWbkDmMhZ2iTnPXcMs6gF1X+1x3xuMQblJXpp/fqyCLpuU1DUSOMbmhw==";
};
};
"omggif-1.0.10" = {
@@ -40837,13 +40927,13 @@ let
sha512 = "jQ31cORBFE6td25deYeD80wxKBMj+zBmHTrVxnc6CKhx8gho6ipmWM5zj/oeoqioZ99yqBls9Z/9Nss7J26G2g==";
};
};
- "oo-ascii-tree-1.25.0" = {
+ "oo-ascii-tree-1.26.0" = {
name = "oo-ascii-tree";
packageName = "oo-ascii-tree";
- version = "1.25.0";
+ version = "1.26.0";
src = fetchurl {
- url = "https://registry.npmjs.org/oo-ascii-tree/-/oo-ascii-tree-1.25.0.tgz";
- sha512 = "bV3aHhVkSc862VMMj1JV9y8yBqzhXCMNE9UFt8w9NwkM7tvw94O8niGlvmFzNx2Hf4+qhO4gYdtRAYQqUaH+1w==";
+ url = "https://registry.npmjs.org/oo-ascii-tree/-/oo-ascii-tree-1.26.0.tgz";
+ sha512 = "JcRUxvHG+QAheXnxx9cwtgDJY6aXc70UAvgoFxKtRz+KfWEU47z/X2HHb81O/aZ3mN4fRnnnnwQhaTUuQRw2Ag==";
};
};
"opal-runtime-1.0.11" = {
@@ -42088,13 +42178,13 @@ let
sha512 = "GfTeVQGJ6WyBQbQD4t3ocHbyOmTQLmWjkCKSZPmKiGFKYKNUaM5U2gbLzUW8WG1XmS9yQFnsTFA0k3o1+q4klQ==";
};
};
- "pacote-11.3.0" = {
+ "pacote-11.3.1" = {
name = "pacote";
packageName = "pacote";
- version = "11.3.0";
+ version = "11.3.1";
src = fetchurl {
- url = "https://registry.npmjs.org/pacote/-/pacote-11.3.0.tgz";
- sha512 = "cygprcGpEVqvDzpuPMkGVXW/ooc2ibpoosuJ4YHcUXozDs9VJP7Vha+41pYppG2MVNis4t1BB8IygIBh7vVr2Q==";
+ url = "https://registry.npmjs.org/pacote/-/pacote-11.3.1.tgz";
+ sha512 = "TymtwoAG12cczsJIrwI/euOQKtjrQHlD0k0oyt9QSmZGpqa+KdlxKdWR/YUjYizkixaVyztxt/Wsfo8bL3A6Fg==";
};
};
"pad-0.0.5" = {
@@ -46175,13 +46265,13 @@ let
sha1 = "15931d3cd967ade52206f523aa7331aef7d43af7";
};
};
- "pyright-1.1.123" = {
+ "pyright-1.1.125" = {
name = "pyright";
packageName = "pyright";
- version = "1.1.123";
+ version = "1.1.125";
src = fetchurl {
- url = "https://registry.npmjs.org/pyright/-/pyright-1.1.123.tgz";
- sha512 = "EYjELbm4G4icuIki6PfpzYrxNeGH78vNbXNmsbb/9XnnVQISdFcbc9oOBc2mU77enUwZctwZ6Nj2mZUMD9VibQ==";
+ url = "https://registry.npmjs.org/pyright/-/pyright-1.1.125.tgz";
+ sha512 = "MPaMGCnMR0i0VePXUPpXMHr23A2mkbW1Su+aTAWsqHho1rhQcxBtjeyhR0xqiwTxcC+c9eK9VwFHbd+OMGC6fQ==";
};
};
"q-0.9.7" = {
@@ -46310,13 +46400,13 @@ let
sha1 = "c31d9b74ec27df75e543a86c78728ed8d4623607";
};
};
- "qs-6.10.0" = {
+ "qs-6.10.1" = {
name = "qs";
packageName = "qs";
- version = "6.10.0";
+ version = "6.10.1";
src = fetchurl {
- url = "https://registry.npmjs.org/qs/-/qs-6.10.0.tgz";
- sha512 = "yjACOWijC6L/kmPZZAsVBNY2zfHSIbpdpL977quseu56/8BZ2LoF5axK2bGhbzhVKt7V9xgWTtpyLbxwIoER0Q==";
+ url = "https://registry.npmjs.org/qs/-/qs-6.10.1.tgz";
+ sha512 = "M528Hph6wsSVOBiYUnGf+K/7w0hNshs/duGsNXPUCLH5XAqjEtiPGwNONLV0tBH8NoGb0mvD5JubnUTrujKDTg==";
};
};
"qs-6.3.2" = {
@@ -46454,13 +46544,13 @@ let
sha512 = "iHZWu+q3IdFZFX36ro/lKBkSvfkztY5Y7HMiPlOUjhupPcG2JMfst2KKEpu5XndviX/3UhFbRngUPNKtgvtZiA==";
};
};
- "queue-microtask-1.2.2" = {
+ "queue-microtask-1.2.3" = {
name = "queue-microtask";
packageName = "queue-microtask";
- version = "1.2.2";
+ version = "1.2.3";
src = fetchurl {
- url = "https://registry.npmjs.org/queue-microtask/-/queue-microtask-1.2.2.tgz";
- sha512 = "dB15eXv3p2jDlbOiNLyMabYg1/sXvppd8DP2J3EOCQ0AkuSXCW2tP7mnVouVLJKgUMY6yP0kcQDVpLCN13h4Xg==";
+ url = "https://registry.npmjs.org/queue-microtask/-/queue-microtask-1.2.3.tgz";
+ sha512 = "NuaNSa6flKT5JaSYQzJok04JzTL1CA6aGhv5rfLW3PgqA+M2ChpZQnAC8h8i4ZFkBS8X5RqkDBHA7r4hej3K9A==";
};
};
"quick-format-unescaped-4.0.3" = {
@@ -47615,13 +47705,13 @@ let
sha512 = "MguG95oij0fC3QV3URf4V2SDYGJhJnJGqvIIgdECeODCT98wSWDAJ94SSuVpYQUoTcGUIL6L4yNB7j1DFFHSBg==";
};
};
- "regenerator-runtime-0.13.7" = {
+ "regenerator-runtime-0.13.8" = {
name = "regenerator-runtime";
packageName = "regenerator-runtime";
- version = "0.13.7";
+ version = "0.13.8";
src = fetchurl {
- url = "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.13.7.tgz";
- sha512 = "a54FxoJDIr27pgf7IgeQGxmqUNYrcV338lf/6gH456HZ/PhX+5BcwHXG9ajESmwe6WRO0tAzRUrRmNONWgkrew==";
+ url = "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.13.8.tgz";
+ sha512 = "o/ASGwgZ6UiVjspr4YnzHKF1NbBdX+mCPkSeymofk/d7I+csCYn3ZgZMMVtXeecpT8DBiI2nAlYkHd+xNCqu4A==";
};
};
"regenerator-transform-0.14.5" = {
@@ -47750,13 +47840,13 @@ let
sha512 = "OFFT3MfrH90xIW8OOSyUrk6QHD5E9JOTeGodiJeBS3J6IwlgzJMNE/1bZklWz5oTg+9dCMyEetclvCVXOPoN3A==";
};
};
- "regjsparser-0.6.7" = {
+ "regjsparser-0.6.9" = {
name = "regjsparser";
packageName = "regjsparser";
- version = "0.6.7";
+ version = "0.6.9";
src = fetchurl {
- url = "https://registry.npmjs.org/regjsparser/-/regjsparser-0.6.7.tgz";
- sha512 = "ib77G0uxsA2ovgiYbCVGx4Pv3PSttAx2vIwidqQzbL2U5S4Q+j00HdSAneSBuyVcMvEnTXMjiGgB+DlXozVhpQ==";
+ url = "https://registry.npmjs.org/regjsparser/-/regjsparser-0.6.9.tgz";
+ sha512 = "ZqbNRz1SNjLAiYuwY0zoXW8Ne675IX5q+YHioAGbCw4X96Mjl2+dcX9B2ciaeyYjViDAfvIjFpQjJgLttTEERQ==";
};
};
"rehype-parse-7.0.1" = {
@@ -48911,13 +49001,13 @@ let
sha512 = "/2HA0Ec70TvQnXdzynFffkjA6XN+1e2pEv/uKS5Ulca40g2L7KuOE3riasHoNVHOsFD5KKZgDsMk1CP3Tw9s+A==";
};
};
- "rollup-2.42.1" = {
+ "rollup-2.42.4" = {
name = "rollup";
packageName = "rollup";
- version = "2.42.1";
+ version = "2.42.4";
src = fetchurl {
- url = "https://registry.npmjs.org/rollup/-/rollup-2.42.1.tgz";
- sha512 = "/y7M2ULg06JOXmMpPzhTeQroJSchy8lX8q6qrjqil0jmLz6ejCWbQzVnWTsdmMQRhfU0QcwtiW8iZlmrGXWV4g==";
+ url = "https://registry.npmjs.org/rollup/-/rollup-2.42.4.tgz";
+ sha512 = "Zqv3EvNfcllBHyyEUM754npqsZw82VIjK34cDQMwrQ1d6aqxzeYu5yFb7smGkPU4C1Bj7HupIMeT6WU7uIdnMw==";
};
};
"rollup-plugin-babel-4.4.0" = {
@@ -49793,6 +49883,15 @@ let
sha512 = "tCfb2WLjqFAtXn4KEdxIhalnRtoKFN7nAwj0B3ZXCbQloV2tq5eDbcTmT68JJD3nRJq24/XgxtQKFIpQdtvmVw==";
};
};
+ "semver-7.3.5" = {
+ name = "semver";
+ packageName = "semver";
+ version = "7.3.5";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/semver/-/semver-7.3.5.tgz";
+ sha512 = "PoeGJYh8HK4BTO/a9Tf6ZG3veo/A7ZVsYrSA6J8ny9nb3B1VrpkuN+z9OE5wfE5p6H4LchYZsegiQgbJD94ZFQ==";
+ };
+ };
"semver-compare-1.0.0" = {
name = "semver-compare";
packageName = "semver-compare";
@@ -50927,13 +51026,13 @@ let
sha512 = "NFwVLMCqKTocY66gcim0ukF6e31VRDJqDapg5sy3vCHqlD1OCNUXSK/aI4VQEEndDrsnFmQepsL5KpEU0dDRIQ==";
};
};
- "snyk-docker-plugin-4.17.3" = {
+ "snyk-docker-plugin-4.19.3" = {
name = "snyk-docker-plugin";
packageName = "snyk-docker-plugin";
- version = "4.17.3";
+ version = "4.19.3";
src = fetchurl {
- url = "https://registry.npmjs.org/snyk-docker-plugin/-/snyk-docker-plugin-4.17.3.tgz";
- sha512 = "Egqkad3YTP41Dlu19/3A2gQfqf4nxa7C36USQGSXIC5JodPvptObiSLmyQssjxVJ7iCRpw6IxytZVf412KKJCg==";
+ url = "https://registry.npmjs.org/snyk-docker-plugin/-/snyk-docker-plugin-4.19.3.tgz";
+ sha512 = "5WkXyT7uY5NrTOvEqxeMqb6dDcskT3c/gbHUTOyPuvE6tMut+OOYK8RRXbwZFeLzpS8asq4e1R7U7syYG3VXwg==";
};
};
"snyk-go-parser-1.4.1" = {
@@ -51044,13 +51143,13 @@ let
sha512 = "XYjhOTRPFA7NfDUsH6uH1fbML2OgSFsqdUPbud7x01urNP9CHXgUgAD4NhKMi3dVQK+7IdYadWt0wrFWw4y+qg==";
};
};
- "snyk-python-plugin-1.19.5" = {
+ "snyk-python-plugin-1.19.7" = {
name = "snyk-python-plugin";
packageName = "snyk-python-plugin";
- version = "1.19.5";
+ version = "1.19.7";
src = fetchurl {
- url = "https://registry.npmjs.org/snyk-python-plugin/-/snyk-python-plugin-1.19.5.tgz";
- sha512 = "wgfhloo6PZ8V+6eIUU7pLcVfHx4yo5LQPPQX6rLfTSZ6p9uRYazIvw/NoUmIjb8Qrn9GdD3zUJY9/83TyTgKLw==";
+ url = "https://registry.npmjs.org/snyk-python-plugin/-/snyk-python-plugin-1.19.7.tgz";
+ sha512 = "twAGoIgJVSLVzMkuT/n5l9ZDvhMbWH7De6flWiHQB/grthfl3vJDzLCxiTa+6H/IEEYNSv6F/nSrfNh9UbW5/A==";
};
};
"snyk-resolve-1.1.0" = {
@@ -51899,13 +51998,13 @@ let
sha1 = "6c83aff3692fa61256e0cd197e05e9de157691a6";
};
};
- "split-lines-2.0.0" = {
+ "split-lines-2.1.0" = {
name = "split-lines";
packageName = "split-lines";
- version = "2.0.0";
+ version = "2.1.0";
src = fetchurl {
- url = "https://registry.npmjs.org/split-lines/-/split-lines-2.0.0.tgz";
- sha512 = "gaIdhbqxkB5/VflPXsJwZvEzh/kdwiRPF9iqpkxX4us+lzB8INedFwjCyo6vwuz5x2Ddlnav2zh270CEjCG8mA==";
+ url = "https://registry.npmjs.org/split-lines/-/split-lines-2.1.0.tgz";
+ sha512 = "8dv+1zKgTpfTkOy8XZLFyWrfxO0NV/bj/3EaQ+hBrBxGv2DwiroljPjU8NlCr+59nLnsVm9WYT7lXKwe4TC6bw==";
};
};
"split-on-first-1.1.0" = {
@@ -54023,13 +54122,13 @@ let
sha512 = "SROWH0rB0DJ+0Ii264cprmNu/NJyZacs5wFD71ya93Cg/oA2lKHgQm4F6j0EWA4ktFMzeuJJm/eX6fka39hEHA==";
};
};
- "svelte2tsx-0.1.182" = {
+ "svelte2tsx-0.1.184" = {
name = "svelte2tsx";
packageName = "svelte2tsx";
- version = "0.1.182";
+ version = "0.1.184";
src = fetchurl {
- url = "https://registry.npmjs.org/svelte2tsx/-/svelte2tsx-0.1.182.tgz";
- sha512 = "c0Qnc8sebPt940boE4CvRcmwLu+XRyhQsm89ZPXlxvZ3ea7VQmtWOhWkReSVyxnEFRm7VnrKCrTitZHKGNCptA==";
+ url = "https://registry.npmjs.org/svelte2tsx/-/svelte2tsx-0.1.184.tgz";
+ sha512 = "VhmzqF8p5LL390td9mngJ2l1BrlZCY5/4SgYu9NxgYWLo54gyamrC2VNe+y5ZxAC59oxjw6byKbPlIFx0acXjg==";
};
};
"sver-compat-1.5.0" = {
@@ -56472,15 +56571,6 @@ let
sha512 = "EUV9jo4sffrwlg8s0zDhP0T2WD3pru5Xi0+HTE3zTUmBaZNhfkite9PdSJwdXLwPVW0jnAHT56pZHIOYckPEiw==";
};
};
- "type-fest-0.11.0" = {
- name = "type-fest";
- packageName = "type-fest";
- version = "0.11.0";
- src = fetchurl {
- url = "https://registry.npmjs.org/type-fest/-/type-fest-0.11.0.tgz";
- sha512 = "OdjXJxnCN1AvyLSzeKIgXTXxV+99ZuXl3Hpo9XpJAv9MBcHrrJOQ5kV7ypXOuQie+AmWG25hLbiKdwYTifzcfQ==";
- };
- };
"type-fest-0.12.0" = {
name = "type-fest";
packageName = "type-fest";
@@ -56535,6 +56625,15 @@ let
sha512 = "Ne+eE4r0/iWnpAxD852z3A+N0Bt5RN//NjJwRd2VFHEmrywxf5vsZlh4R6lixl6B+wz/8d+maTSAkN1FIkI3LQ==";
};
};
+ "type-fest-0.21.3" = {
+ name = "type-fest";
+ packageName = "type-fest";
+ version = "0.21.3";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/type-fest/-/type-fest-0.21.3.tgz";
+ sha512 = "t0rzBq87m3fVcduHDUFhKmyyX+9eo6WQjZvf51Ea/M0Q7+T374Jp1aUiyUl0GKxp8M/OETVHSDvmkyPgvX+X2w==";
+ };
+ };
"type-fest-0.3.1" = {
name = "type-fest";
packageName = "type-fest";
@@ -56643,13 +56742,13 @@ let
sha512 = "7uc1O8h1M1g0rArakJdf0uLRSSgFcYexrVoKo+bzJd32gd4gDy2L/Z+8/FjPnU9ydY3pEnVPtr9FyscYY60K1g==";
};
};
- "typegram-3.2.2" = {
+ "typegram-3.2.3" = {
name = "typegram";
packageName = "typegram";
- version = "3.2.2";
+ version = "3.2.3";
src = fetchurl {
- url = "https://registry.npmjs.org/typegram/-/typegram-3.2.2.tgz";
- sha512 = "PC7MclSZcLnCEnflubX61/YEwZph98EHbCsrL9tFhU5bZYz3uXm3Mc6iseKjiS3VyKOCCyoT3A4ZDtPkoYyucg==";
+ url = "https://registry.npmjs.org/typegram/-/typegram-3.2.3.tgz";
+ sha512 = "zlkY7vNTLcwQhLUyYXAUzRelzH752LBFl8m4u04d5g5P7lM9bGegeIRwzd3mVCHJH6R3s48pKeFTVSdVlN+omg==";
};
};
"typescript-2.9.2" = {
@@ -56778,13 +56877,13 @@ let
sha512 = "+O8/qh/Qj8CgC6eYBVBykMrNtp5Gebn4dlGD/kKXVkJNDwyrAwSIqwz8CDf+tsAIWVycKcku6gIXJ0qwx/ZXaQ==";
};
};
- "ua-parser-js-0.7.24" = {
+ "ua-parser-js-0.7.25" = {
name = "ua-parser-js";
packageName = "ua-parser-js";
- version = "0.7.24";
+ version = "0.7.25";
src = fetchurl {
- url = "https://registry.npmjs.org/ua-parser-js/-/ua-parser-js-0.7.24.tgz";
- sha512 = "yo+miGzQx5gakzVK3QFfN0/L9uVhosXBBO7qmnk7c2iw1IhL212wfA3zbnI54B0obGwC/5NWub/iT9sReMx+Fw==";
+ url = "https://registry.npmjs.org/ua-parser-js/-/ua-parser-js-0.7.25.tgz";
+ sha512 = "8NFExdfI24Ny8R3Vc6+uUytP/I7dpqk3JERlvxPWlrtx5YboqCgxAXYKPAifbPLV2zKbgmmPL53ufW7mUC/VOQ==";
};
};
"uc.micro-1.0.6" = {
@@ -56814,13 +56913,13 @@ let
sha512 = "L5i5jg/SHkEqzN18gQMTWsZk3KelRsfD1wUVNqtq0kzqWQqcJjyL8yc1o8hJgRrWqrAl2mUFbhfznEIoi7zi2A==";
};
};
- "uglify-js-3.13.1" = {
+ "uglify-js-3.13.2" = {
name = "uglify-js";
packageName = "uglify-js";
- version = "3.13.1";
+ version = "3.13.2";
src = fetchurl {
- url = "https://registry.npmjs.org/uglify-js/-/uglify-js-3.13.1.tgz";
- sha512 = "EWhx3fHy3M9JbaeTnO+rEqzCe1wtyQClv6q3YWq0voOj4E+bMZBErVS1GAHPDiRGONYq34M1/d8KuQMgvi6Gjw==";
+ url = "https://registry.npmjs.org/uglify-js/-/uglify-js-3.13.2.tgz";
+ sha512 = "SbMu4D2Vo95LMC/MetNaso1194M1htEA+JrqE9Hk+G2DhI+itfS9TRu9ZKeCahLDNa/J3n4MqUJ/fOHMzQpRWw==";
};
};
"uglify-js-3.4.10" = {
@@ -59308,22 +59407,22 @@ let
sha512 = "DTMa8QbVmujFPvD3NxoC5jjIXCyCG+cvn3hNzwQRhvhsk8LblNymBZBwzfcDdgEtqsi4O/2AB5HnMIRzxhzEzg==";
};
};
- "vscode-debugadapter-testsupport-1.45.0" = {
+ "vscode-debugadapter-testsupport-1.46.0" = {
name = "vscode-debugadapter-testsupport";
packageName = "vscode-debugadapter-testsupport";
- version = "1.45.0";
+ version = "1.46.0";
src = fetchurl {
- url = "https://registry.npmjs.org/vscode-debugadapter-testsupport/-/vscode-debugadapter-testsupport-1.45.0.tgz";
- sha512 = "/5q/F2K1mNLfJWxXStG9pO86mgOeK73PoMJpOBZaniToplrzM7LgFEdXUPlzNH07//XZwzRsCFn7Eq3brqYk6Q==";
+ url = "https://registry.npmjs.org/vscode-debugadapter-testsupport/-/vscode-debugadapter-testsupport-1.46.0.tgz";
+ sha512 = "6n+uu4+Q5sZvN2FgFLNJkyaE6AECYzFh+Hfv+IeJoVKA7KNiQ1SNd3yTsvSFxkS00LmVU6V00XGaqZRlwM15Jg==";
};
};
- "vscode-debugprotocol-1.45.0" = {
+ "vscode-debugprotocol-1.46.0" = {
name = "vscode-debugprotocol";
packageName = "vscode-debugprotocol";
- version = "1.45.0";
+ version = "1.46.0";
src = fetchurl {
- url = "https://registry.npmjs.org/vscode-debugprotocol/-/vscode-debugprotocol-1.45.0.tgz";
- sha512 = "xU6XtdKJ0waWIt79Zt4WVyIQ3oDkhilku9Shbv7Vc4KXEr/npsf8dhinyIZXSIlH2lzJiE3imp1xbYpyRTIrhg==";
+ url = "https://registry.npmjs.org/vscode-debugprotocol/-/vscode-debugprotocol-1.46.0.tgz";
+ sha512 = "V10u1L679DJZfOtQXhKylJPMqNbhazav4mRxPrBE8/Jpznow1b1j1EGDDvJ4prQ623CLAnvpFfVkVQ+CX3xdtg==";
};
};
"vscode-emmet-helper-1.2.17" = {
@@ -60244,13 +60343,13 @@ let
sha512 = "OqedPIGOfsDlo31UNwYbCFMSaO9m9G/0faIHj5/dZFDMFqPTcx6UwqyOy3COEaEOg/9VsGIpdqn62W5KhoKSpg==";
};
};
- "webtorrent-0.115.4" = {
+ "webtorrent-0.116.0" = {
name = "webtorrent";
packageName = "webtorrent";
- version = "0.115.4";
+ version = "0.116.0";
src = fetchurl {
- url = "https://registry.npmjs.org/webtorrent/-/webtorrent-0.115.4.tgz";
- sha512 = "JJ3kZKZjM+3n0R0zyHZJARnqBLDfQHbMVarYieQFnZE4a2Ec/RpDP7c/NYeoKyBChsDOwrpxitk6FOmHdZkqyA==";
+ url = "https://registry.npmjs.org/webtorrent/-/webtorrent-0.116.0.tgz";
+ sha512 = "jpptAAME7miPpoaywK+WZgn6CSLEvtqv9/7RUdr+M5vp1HbkVQDf5nX21funEWl955EIDdgzYvegU5JOm9W7cw==";
};
};
"well-known-symbols-2.0.0" = {
@@ -60307,13 +60406,13 @@ let
sha512 = "WUu7Rg1DroM7oQvGWfOiAK21n74Gg+T4elXEQYkOhtyLeWiJFoOGLXPKI/9gzIie9CtwVLm8wtw6YJdKyxSjeg==";
};
};
- "whatwg-url-8.4.0" = {
+ "whatwg-url-8.5.0" = {
name = "whatwg-url";
packageName = "whatwg-url";
- version = "8.4.0";
+ version = "8.5.0";
src = fetchurl {
- url = "https://registry.npmjs.org/whatwg-url/-/whatwg-url-8.4.0.tgz";
- sha512 = "vwTUFf6V4zhcPkWp/4CQPr1TW9Ml6SF4lVyaIMBdJw5i6qUUJ1QWM4Z6YYVkfka0OUIzVo/0aNtGVGk256IKWw==";
+ url = "https://registry.npmjs.org/whatwg-url/-/whatwg-url-8.5.0.tgz";
+ sha512 = "fy+R77xWv0AiqfLl4nuGUlQ3/6b5uNfQ4WAbGQVMYshCTCCPK9psC1nWh3XHuxGVCtlcDDQPQW1csmmIQo+fwg==";
};
};
"whatwg-url-compat-0.6.5" = {
@@ -62276,15 +62375,15 @@ in
"@angular/cli" = nodeEnv.buildNodePackage {
name = "_at_angular_slash_cli";
packageName = "@angular/cli";
- version = "11.2.5";
+ version = "11.2.6";
src = fetchurl {
- url = "https://registry.npmjs.org/@angular/cli/-/cli-11.2.5.tgz";
- sha512 = "GIwK8l6wtg/++8aDYW++LSf7v1uqDtB6so2rPjNlOm7oYk5iqM73KaorQb/1A52oxWE3IRSJLNQaSyUlWvHvSA==";
+ url = "https://registry.npmjs.org/@angular/cli/-/cli-11.2.6.tgz";
+ sha512 = "67XH3wJgs1YuM4xW5PoouclT57AsfMhiOup2VPfGQn8GNINB4zauJfBotGyb3jQtRSFdwz+bXif6V9MSAw4oHA==";
};
dependencies = [
- sources."@angular-devkit/architect-0.1102.5"
- sources."@angular-devkit/core-11.2.5"
- sources."@angular-devkit/schematics-11.2.5"
+ sources."@angular-devkit/architect-0.1102.6"
+ sources."@angular-devkit/core-11.2.6"
+ sources."@angular-devkit/schematics-11.2.6"
sources."@npmcli/ci-detect-1.3.0"
(sources."@npmcli/git-2.0.6" // {
dependencies = [
@@ -62300,8 +62399,8 @@ in
sources."read-package-json-fast-2.0.2"
];
})
- sources."@schematics/angular-11.2.5"
- sources."@schematics/update-0.1102.5"
+ sources."@schematics/angular-11.2.6"
+ sources."@schematics/update-0.1102.6"
sources."@tootallnate/once-1.1.2"
sources."@yarnpkg/lockfile-1.1.0"
sources."abbrev-1.1.1"
@@ -62310,7 +62409,7 @@ in
sources."aggregate-error-3.1.0"
sources."ajv-6.12.6"
sources."ansi-colors-4.1.1"
- sources."ansi-escapes-4.3.1"
+ sources."ansi-escapes-4.3.2"
sources."ansi-regex-5.0.0"
sources."ansi-styles-4.3.0"
sources."aproba-1.2.0"
@@ -62333,7 +62432,7 @@ in
sources."brace-expansion-1.1.11"
sources."buffer-5.7.1"
sources."builtins-1.0.3"
- sources."cacache-15.0.5"
+ sources."cacache-15.0.6"
sources."caseless-0.12.0"
sources."chalk-4.1.0"
sources."chardet-0.7.0"
@@ -62529,7 +62628,7 @@ in
sources."tslib-1.14.1"
sources."tunnel-agent-0.6.0"
sources."tweetnacl-0.14.5"
- sources."type-fest-0.11.0"
+ sources."type-fest-0.21.3"
sources."unique-filename-1.1.1"
sources."unique-slug-2.0.2"
(sources."universal-analytics-0.4.23" // {
@@ -62881,7 +62980,7 @@ in
];
})
sources."to-utf8-0.0.1"
- sources."uglify-js-3.13.1"
+ sources."uglify-js-3.13.2"
sources."unc-path-regex-0.1.2"
sources."unique-stream-2.3.1"
sources."universalify-0.1.2"
@@ -63161,7 +63260,7 @@ in
sources."ajv-6.12.6"
sources."ajv-keywords-3.5.2"
sources."ansi-colors-4.1.1"
- sources."ansi-escapes-4.3.1"
+ sources."ansi-escapes-4.3.2"
sources."ansi-regex-3.0.0"
sources."ansi-styles-4.3.0"
sources."anymatch-3.1.1"
@@ -63176,7 +63275,7 @@ in
sources."buffer-5.7.1"
sources."buffer-from-1.1.1"
sources."callsites-3.1.0"
- sources."caniuse-lite-1.0.30001203"
+ sources."caniuse-lite-1.0.30001204"
sources."chalk-3.0.0"
sources."chardet-0.7.0"
sources."chokidar-3.5.1"
@@ -63197,7 +63296,7 @@ in
sources."cross-spawn-7.0.3"
sources."deepmerge-4.2.2"
sources."defaults-1.0.3"
- sources."electron-to-chromium-1.3.693"
+ sources."electron-to-chromium-1.3.699"
sources."emoji-regex-8.0.0"
sources."end-of-stream-1.4.4"
sources."enhanced-resolve-4.5.0"
@@ -63347,7 +63446,7 @@ in
sources."safe-buffer-5.2.1"
sources."safer-buffer-2.1.2"
sources."schema-utils-2.7.0"
- sources."semver-7.3.4"
+ sources."semver-7.3.5"
sources."serialize-javascript-5.0.1"
sources."shebang-command-2.0.0"
sources."shebang-regex-3.0.0"
@@ -63396,7 +63495,7 @@ in
];
})
sources."tslib-1.14.1"
- sources."type-fest-0.11.0"
+ sources."type-fest-0.21.3"
sources."typescript-4.1.5"
sources."universalify-2.0.0"
sources."uri-js-4.4.1"
@@ -63452,7 +63551,7 @@ in
sources."@apollographql/graphql-playground-html-1.6.27"
sources."@apollographql/graphql-upload-8-fork-8.1.3"
sources."@babel/code-frame-7.12.13"
- sources."@babel/compat-data-7.13.11"
+ sources."@babel/compat-data-7.13.12"
sources."@babel/core-7.13.10"
sources."@babel/generator-7.13.9"
sources."@babel/helper-annotate-as-pure-7.12.13"
@@ -63465,14 +63564,14 @@ in
sources."@babel/helper-function-name-7.12.13"
sources."@babel/helper-get-function-arity-7.12.13"
sources."@babel/helper-hoist-variables-7.13.0"
- sources."@babel/helper-member-expression-to-functions-7.13.0"
- sources."@babel/helper-module-imports-7.12.13"
- sources."@babel/helper-module-transforms-7.13.0"
+ sources."@babel/helper-member-expression-to-functions-7.13.12"
+ sources."@babel/helper-module-imports-7.13.12"
+ sources."@babel/helper-module-transforms-7.13.12"
sources."@babel/helper-optimise-call-expression-7.12.13"
sources."@babel/helper-plugin-utils-7.13.0"
sources."@babel/helper-remap-async-to-generator-7.13.0"
- sources."@babel/helper-replace-supers-7.13.0"
- sources."@babel/helper-simple-access-7.12.13"
+ sources."@babel/helper-replace-supers-7.13.12"
+ sources."@babel/helper-simple-access-7.13.12"
sources."@babel/helper-skip-transparent-expression-wrappers-7.12.1"
sources."@babel/helper-split-export-declaration-7.12.13"
sources."@babel/helper-validator-identifier-7.12.11"
@@ -63480,7 +63579,8 @@ in
sources."@babel/helper-wrap-function-7.13.0"
sources."@babel/helpers-7.13.10"
sources."@babel/highlight-7.13.10"
- sources."@babel/parser-7.13.11"
+ sources."@babel/parser-7.13.12"
+ sources."@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining-7.13.12"
sources."@babel/plugin-proposal-async-generator-functions-7.13.8"
sources."@babel/plugin-proposal-class-properties-7.13.0"
sources."@babel/plugin-proposal-dynamic-import-7.13.8"
@@ -63491,7 +63591,7 @@ in
sources."@babel/plugin-proposal-numeric-separator-7.12.13"
sources."@babel/plugin-proposal-object-rest-spread-7.13.8"
sources."@babel/plugin-proposal-optional-catch-binding-7.13.8"
- sources."@babel/plugin-proposal-optional-chaining-7.13.8"
+ sources."@babel/plugin-proposal-optional-chaining-7.13.12"
sources."@babel/plugin-proposal-private-methods-7.13.0"
sources."@babel/plugin-proposal-unicode-property-regex-7.12.13"
sources."@babel/plugin-syntax-async-generators-7.8.4"
@@ -63542,7 +63642,7 @@ in
sources."@babel/plugin-transform-typescript-7.13.0"
sources."@babel/plugin-transform-unicode-escapes-7.12.13"
sources."@babel/plugin-transform-unicode-regex-7.12.13"
- sources."@babel/preset-env-7.13.10"
+ sources."@babel/preset-env-7.13.12"
sources."@babel/preset-flow-7.12.13"
sources."@babel/preset-modules-0.1.4"
sources."@babel/preset-typescript-7.13.0"
@@ -63556,7 +63656,7 @@ in
sources."@babel/runtime-7.13.10"
sources."@babel/template-7.12.13"
sources."@babel/traverse-7.13.0"
- sources."@babel/types-7.13.0"
+ sources."@babel/types-7.13.12"
sources."@hapi/address-2.1.4"
sources."@hapi/bourne-1.3.2"
sources."@hapi/hoek-8.5.1"
@@ -63607,7 +63707,7 @@ in
sources."@types/koa-compose-3.2.5"
sources."@types/long-4.0.1"
sources."@types/mime-1.3.2"
- sources."@types/minimatch-3.0.3"
+ sources."@types/minimatch-3.0.4"
sources."@types/node-14.14.35"
(sources."@types/node-fetch-2.5.7" // {
dependencies = [
@@ -63645,9 +63745,9 @@ in
sources."strip-ansi-5.2.0"
];
})
- (sources."ansi-escapes-4.3.1" // {
+ (sources."ansi-escapes-4.3.2" // {
dependencies = [
- sources."type-fest-0.11.0"
+ sources."type-fest-0.21.3"
];
})
sources."ansi-regex-4.1.0"
@@ -63758,7 +63858,7 @@ in
sources."call-bind-1.0.2"
sources."call-me-maybe-1.0.1"
sources."camelcase-5.3.1"
- sources."caniuse-lite-1.0.30001203"
+ sources."caniuse-lite-1.0.30001204"
sources."caseless-0.12.0"
sources."caw-2.0.1"
sources."chalk-2.4.2"
@@ -63887,7 +63987,7 @@ in
sources."ecc-jsbn-0.1.2"
sources."ee-first-1.1.1"
sources."ejs-2.7.4"
- sources."electron-to-chromium-1.3.693"
+ sources."electron-to-chromium-1.3.699"
sources."emoji-regex-7.0.3"
sources."encodeurl-1.0.2"
sources."end-of-stream-1.4.4"
@@ -64217,7 +64317,7 @@ in
dependencies = [
sources."is-wsl-2.2.0"
sources."lru-cache-6.0.0"
- sources."semver-7.3.4"
+ sources."semver-7.3.5"
sources."uuid-8.3.2"
sources."which-2.0.2"
];
@@ -64325,7 +64425,7 @@ in
sources."punycode-2.1.1"
sources."qs-6.5.2"
sources."query-string-5.1.1"
- sources."queue-microtask-1.2.2"
+ sources."queue-microtask-1.2.3"
sources."range-parser-1.2.1"
(sources."raw-body-2.4.0" // {
dependencies = [
@@ -64347,7 +64447,7 @@ in
})
sources."regenerate-1.4.2"
sources."regenerate-unicode-properties-8.2.0"
- sources."regenerator-runtime-0.13.7"
+ sources."regenerator-runtime-0.13.8"
sources."regenerator-transform-0.14.5"
(sources."regex-not-1.0.2" // {
dependencies = [
@@ -64357,7 +64457,7 @@ in
})
sources."regexpu-core-4.7.1"
sources."regjsgen-0.5.2"
- (sources."regjsparser-0.6.7" // {
+ (sources."regjsparser-0.6.9" // {
dependencies = [
sources."jsesc-0.5.0"
];
@@ -64609,7 +64709,7 @@ in
sources."fast-glob-3.2.5"
sources."fill-range-7.0.1"
sources."glob-parent-5.1.2"
- sources."globby-11.0.2"
+ sources."globby-11.0.3"
sources."ignore-5.1.8"
sources."is-number-7.0.0"
sources."lru-cache-6.0.0"
@@ -64789,9 +64889,9 @@ in
sources."@babel/generator-7.13.9"
sources."@babel/helper-validator-identifier-7.12.11"
sources."@babel/highlight-7.13.10"
- sources."@babel/parser-7.13.11"
+ sources."@babel/parser-7.13.12"
sources."@babel/template-7.12.13"
- sources."@babel/types-7.13.0"
+ sources."@babel/types-7.13.12"
sources."@webassemblyjs/ast-1.11.0"
sources."@webassemblyjs/floating-point-hex-parser-1.11.0"
sources."@webassemblyjs/helper-api-error-1.11.0"
@@ -64867,7 +64967,7 @@ in
};
dependencies = [
sources."@babel/code-frame-7.12.13"
- sources."@babel/compat-data-7.13.11"
+ sources."@babel/compat-data-7.13.12"
(sources."@babel/core-7.13.10" // {
dependencies = [
sources."source-map-0.5.7"
@@ -64881,21 +64981,21 @@ in
sources."@babel/helper-compilation-targets-7.13.10"
sources."@babel/helper-function-name-7.12.13"
sources."@babel/helper-get-function-arity-7.12.13"
- sources."@babel/helper-member-expression-to-functions-7.13.0"
- sources."@babel/helper-module-imports-7.12.13"
- sources."@babel/helper-module-transforms-7.13.0"
+ sources."@babel/helper-member-expression-to-functions-7.13.12"
+ sources."@babel/helper-module-imports-7.13.12"
+ sources."@babel/helper-module-transforms-7.13.12"
sources."@babel/helper-optimise-call-expression-7.12.13"
- sources."@babel/helper-replace-supers-7.13.0"
- sources."@babel/helper-simple-access-7.12.13"
+ sources."@babel/helper-replace-supers-7.13.12"
+ sources."@babel/helper-simple-access-7.13.12"
sources."@babel/helper-split-export-declaration-7.12.13"
sources."@babel/helper-validator-identifier-7.12.11"
sources."@babel/helper-validator-option-7.12.17"
sources."@babel/helpers-7.13.10"
sources."@babel/highlight-7.13.10"
- sources."@babel/parser-7.13.11"
+ sources."@babel/parser-7.13.12"
sources."@babel/template-7.12.13"
sources."@babel/traverse-7.13.0"
- sources."@babel/types-7.13.0"
+ sources."@babel/types-7.13.12"
sources."JSV-4.0.2"
sources."ansi-styles-3.2.1"
sources."array-unique-0.3.2"
@@ -64903,7 +65003,7 @@ in
sources."balanced-match-1.0.0"
sources."brace-expansion-1.1.11"
sources."browserslist-4.16.3"
- sources."caniuse-lite-1.0.30001203"
+ sources."caniuse-lite-1.0.30001204"
sources."chalk-2.4.2"
sources."color-convert-1.9.3"
sources."color-name-1.1.3"
@@ -64914,7 +65014,7 @@ in
sources."convert-source-map-1.7.0"
sources."debug-4.3.2"
sources."ejs-3.1.6"
- sources."electron-to-chromium-1.3.693"
+ sources."electron-to-chromium-1.3.699"
sources."ensure-posix-path-1.1.1"
sources."escalade-3.1.1"
sources."escape-string-regexp-1.0.5"
@@ -65007,7 +65107,7 @@ in
};
dependencies = [
sources."@types/glob-7.1.3"
- sources."@types/minimatch-3.0.3"
+ sources."@types/minimatch-3.0.4"
sources."@types/node-14.14.35"
sources."balanced-match-1.0.0"
sources."brace-expansion-1.1.11"
@@ -65334,7 +65434,7 @@ in
sources."ini-2.0.0"
(sources."inquirer-8.0.0" // {
dependencies = [
- sources."ansi-escapes-4.3.1"
+ sources."ansi-escapes-4.3.2"
sources."ansi-regex-5.0.0"
sources."ansi-styles-4.3.0"
sources."chalk-4.1.0"
@@ -65584,12 +65684,12 @@ in
sources."tunnel-agent-0.6.0"
sources."tweetnacl-0.14.5"
sources."tweetnacl-util-0.15.1"
- sources."type-fest-0.11.0"
+ sources."type-fest-0.21.3"
sources."type-is-1.6.18"
sources."typedarray-0.0.6"
sources."typedarray-to-buffer-3.1.5"
sources."typeforce-1.18.0"
- sources."typegram-3.2.2"
+ sources."typegram-3.2.3"
sources."unique-string-2.0.0"
sources."unpipe-1.0.0"
(sources."update-notifier-5.1.0" // {
@@ -65597,7 +65697,7 @@ in
sources."ansi-styles-4.3.0"
sources."chalk-4.1.0"
sources."import-lazy-2.1.0"
- sources."semver-7.3.4"
+ sources."semver-7.3.5"
sources."supports-color-7.2.0"
];
})
@@ -66533,7 +66633,7 @@ in
sources."safe-buffer-5.1.2"
sources."safe-json-stringify-1.2.0"
sources."safer-buffer-2.1.2"
- (sources."semver-7.3.4" // {
+ (sources."semver-7.3.5" // {
dependencies = [
sources."lru-cache-6.0.0"
sources."yallist-4.0.0"
@@ -66716,7 +66816,7 @@ in
sources."co-3.1.0"
sources."codepage-1.4.0"
sources."combined-stream-1.0.8"
- sources."commander-7.1.0"
+ sources."commander-7.2.0"
sources."compact2string-1.4.1"
sources."concat-map-0.0.1"
(sources."concat-stream-2.0.0" // {
@@ -66910,7 +67010,7 @@ in
sources."qap-3.3.1"
sources."qs-6.5.2"
sources."query-string-1.0.1"
- sources."queue-microtask-1.2.2"
+ sources."queue-microtask-1.2.3"
sources."random-access-file-2.2.0"
sources."random-access-storage-1.4.1"
sources."random-iterate-1.0.1"
@@ -67066,7 +67166,7 @@ in
sha512 = "9PI2OLv8PmnnZSNP3PN16gr/yMxBJinh/LMgjk66PBfVmAduojFzJ1pTYPE/vb4qBxHYP4BkEbR8Auxa+qyEvw==";
};
dependencies = [
- sources."@jsii/spec-1.25.0"
+ sources."@jsii/spec-1.26.0"
sources."@types/node-10.17.55"
sources."ansi-regex-5.0.0"
sources."ansi-styles-4.3.0"
@@ -67079,7 +67179,7 @@ in
sources."cdk8s-1.0.0-beta.10"
sources."cliui-7.0.4"
sources."clone-2.1.2"
- (sources."codemaker-1.25.0" // {
+ (sources."codemaker-1.26.0" // {
dependencies = [
sources."fs-extra-9.1.0"
];
@@ -67137,25 +67237,25 @@ in
sources."is-weakmap-2.0.1"
sources."is-weakset-2.0.1"
sources."isarray-2.0.5"
- (sources."jsii-1.25.0" // {
+ (sources."jsii-1.26.0" // {
dependencies = [
sources."fs-extra-9.1.0"
sources."yargs-16.2.0"
];
})
- (sources."jsii-pacmak-1.25.0" // {
+ (sources."jsii-pacmak-1.26.0" // {
dependencies = [
sources."fs-extra-9.1.0"
sources."yargs-16.2.0"
];
})
- (sources."jsii-reflect-1.25.0" // {
+ (sources."jsii-reflect-1.26.0" // {
dependencies = [
sources."fs-extra-9.1.0"
sources."yargs-16.2.0"
];
})
- (sources."jsii-rosetta-1.25.0" // {
+ (sources."jsii-rosetta-1.26.0" // {
dependencies = [
sources."fs-extra-9.1.0"
sources."yargs-16.2.0"
@@ -67183,7 +67283,7 @@ in
sources."object-is-1.1.5"
sources."object-keys-1.1.1"
sources."object.assign-4.1.2"
- sources."oo-ascii-tree-1.25.0"
+ sources."oo-ascii-tree-1.26.0"
sources."p-limit-2.3.0"
sources."p-locate-4.1.0"
sources."p-try-2.2.0"
@@ -67192,7 +67292,7 @@ in
sources."require-directory-2.1.1"
sources."require-main-filename-2.0.0"
sources."rfdc-1.3.0"
- sources."semver-7.3.4"
+ sources."semver-7.3.5"
(sources."semver-intersect-1.4.0" // {
dependencies = [
sources."semver-5.7.1"
@@ -67260,15 +67360,15 @@ in
};
dependencies = [
sources."@cdktf/hcl2json-0.2.0"
- sources."@jsii/spec-1.25.0"
+ sources."@jsii/spec-1.26.0"
sources."@skorfmann/ink-confirm-input-3.0.0"
sources."@skorfmann/terraform-cloud-1.9.1"
sources."@types/node-14.14.35"
sources."@types/node-fetch-2.5.8"
sources."@types/yoga-layout-1.9.2"
- (sources."ansi-escapes-4.3.1" // {
+ (sources."ansi-escapes-4.3.2" // {
dependencies = [
- sources."type-fest-0.11.0"
+ sources."type-fest-0.21.3"
];
})
sources."ansi-regex-4.1.0"
@@ -67319,7 +67419,7 @@ in
sources."commonmark-0.29.3"
sources."compress-commons-4.1.0"
sources."concat-map-0.0.1"
- sources."constructs-3.3.68"
+ sources."constructs-3.3.71"
sources."convert-to-spaces-1.0.2"
sources."core-util-is-1.0.2"
sources."crc-32-1.2.0"
@@ -67399,7 +67499,7 @@ in
sources."is-wsl-2.2.0"
sources."isarray-1.0.0"
sources."js-tokens-4.0.0"
- (sources."jsii-1.25.0" // {
+ (sources."jsii-1.26.0" // {
dependencies = [
sources."fs-extra-9.1.0"
sources."jsonfile-6.1.0"
@@ -67407,10 +67507,10 @@ in
sources."yargs-16.2.0"
];
})
- (sources."jsii-pacmak-1.25.0" // {
+ (sources."jsii-pacmak-1.26.0" // {
dependencies = [
sources."camelcase-6.2.0"
- sources."codemaker-1.25.0"
+ sources."codemaker-1.26.0"
sources."decamelize-5.0.0"
sources."escape-string-regexp-4.0.0"
sources."fs-extra-9.1.0"
@@ -67419,7 +67519,7 @@ in
sources."yargs-16.2.0"
];
})
- (sources."jsii-reflect-1.25.0" // {
+ (sources."jsii-reflect-1.26.0" // {
dependencies = [
sources."fs-extra-9.1.0"
sources."jsonfile-6.1.0"
@@ -67427,7 +67527,7 @@ in
sources."yargs-16.2.0"
];
})
- (sources."jsii-rosetta-1.25.0" // {
+ (sources."jsii-rosetta-1.26.0" // {
dependencies = [
sources."fs-extra-9.1.0"
sources."jsonfile-6.1.0"
@@ -67477,7 +67577,7 @@ in
sources."object.assign-4.1.2"
sources."once-1.4.0"
sources."onetime-5.1.2"
- sources."oo-ascii-tree-1.25.0"
+ sources."oo-ascii-tree-1.26.0"
sources."open-7.4.2"
sources."p-limit-2.3.0"
sources."p-locate-4.1.0"
@@ -67503,7 +67603,7 @@ in
sources."rfdc-1.3.0"
sources."safe-buffer-5.1.2"
sources."scheduler-0.18.0"
- sources."semver-7.3.4"
+ sources."semver-7.3.5"
(sources."semver-intersect-1.4.0" // {
dependencies = [
sources."semver-5.7.1"
@@ -67594,7 +67694,7 @@ in
sources."balanced-match-1.0.0"
sources."brace-expansion-1.1.11"
sources."clean-css-5.1.2"
- sources."commander-7.1.0"
+ sources."commander-7.2.0"
sources."concat-map-0.0.1"
sources."fs.realpath-1.0.0"
sources."glob-7.1.6"
@@ -68141,7 +68241,7 @@ in
sources."rfdc-1.3.0"
sources."rimraf-3.0.2"
sources."safe-buffer-5.1.2"
- sources."semver-7.3.4"
+ sources."semver-7.3.5"
sources."setimmediate-1.0.5"
sources."shebang-command-1.2.0"
sources."shebang-regex-1.0.0"
@@ -68295,7 +68395,7 @@ in
sources."callsites-3.1.0"
sources."camelcase-2.1.1"
sources."camelcase-keys-2.1.0"
- sources."caniuse-lite-1.0.30001203"
+ sources."caniuse-lite-1.0.30001204"
sources."capture-stack-trace-1.0.1"
sources."ccount-1.1.0"
(sources."chalk-4.1.0" // {
@@ -68393,7 +68493,7 @@ in
sources."domutils-1.7.0"
sources."dot-prop-5.3.0"
sources."duplexer3-0.1.4"
- sources."electron-to-chromium-1.3.693"
+ sources."electron-to-chromium-1.3.699"
sources."emoji-regex-8.0.0"
sources."end-of-stream-1.4.4"
sources."enquirer-2.3.6"
@@ -68927,7 +69027,7 @@ in
sources."rimraf-3.0.2"
sources."safe-buffer-5.2.1"
sources."safe-regex-1.1.0"
- sources."semver-7.3.4"
+ sources."semver-7.3.5"
(sources."semver-diff-2.1.0" // {
dependencies = [
sources."semver-5.7.1"
@@ -69185,13 +69285,13 @@ in
coc-pyright = nodeEnv.buildNodePackage {
name = "coc-pyright";
packageName = "coc-pyright";
- version = "1.1.122";
+ version = "1.1.123";
src = fetchurl {
- url = "https://registry.npmjs.org/coc-pyright/-/coc-pyright-1.1.122.tgz";
- sha512 = "On0ZR74g6wXH7BjSlfZdG35RYzIRHp7KF0V9gQG5f1cTlfy2T+pjzF5d9gO/cu0P6F1+i2RQ39anJ+FQ5P0wYA==";
+ url = "https://registry.npmjs.org/coc-pyright/-/coc-pyright-1.1.123.tgz";
+ sha512 = "ebNooa4Wg94/jCNpiBi/+a6Kaci6hKUpcht2Ws548LSoI0a/rCAF+UMKfXQi5kVjIdTc8SNUC1pL6GYfna+y8Q==";
};
dependencies = [
- sources."pyright-1.1.123"
+ sources."pyright-1.1.125"
];
buildInputs = globalBuildInputs;
meta = {
@@ -69342,18 +69442,18 @@ in
};
dependencies = [
sources."@babel/code-frame-7.12.13"
- sources."@babel/compat-data-7.13.11"
+ sources."@babel/compat-data-7.13.12"
sources."@babel/core-7.13.10"
sources."@babel/generator-7.13.9"
sources."@babel/helper-compilation-targets-7.13.10"
sources."@babel/helper-function-name-7.12.13"
sources."@babel/helper-get-function-arity-7.12.13"
- sources."@babel/helper-member-expression-to-functions-7.13.0"
- sources."@babel/helper-module-imports-7.12.13"
- sources."@babel/helper-module-transforms-7.13.0"
+ sources."@babel/helper-member-expression-to-functions-7.13.12"
+ sources."@babel/helper-module-imports-7.13.12"
+ sources."@babel/helper-module-transforms-7.13.12"
sources."@babel/helper-optimise-call-expression-7.12.13"
- sources."@babel/helper-replace-supers-7.13.0"
- sources."@babel/helper-simple-access-7.12.13"
+ sources."@babel/helper-replace-supers-7.13.12"
+ sources."@babel/helper-simple-access-7.13.12"
sources."@babel/helper-split-export-declaration-7.12.13"
sources."@babel/helper-validator-identifier-7.12.11"
sources."@babel/helper-validator-option-7.12.17"
@@ -69363,10 +69463,10 @@ in
sources."chalk-2.4.2"
];
})
- sources."@babel/parser-7.13.11"
+ sources."@babel/parser-7.13.12"
sources."@babel/template-7.12.13"
sources."@babel/traverse-7.13.0"
- sources."@babel/types-7.13.0"
+ sources."@babel/types-7.13.12"
sources."@nodelib/fs.scandir-2.1.4"
sources."@nodelib/fs.stat-2.0.4"
sources."@nodelib/fs.walk-1.2.6"
@@ -69392,7 +69492,7 @@ in
sources."callsites-3.1.0"
sources."camelcase-5.3.1"
sources."camelcase-keys-6.2.2"
- sources."caniuse-lite-1.0.30001203"
+ sources."caniuse-lite-1.0.30001204"
(sources."chalk-4.1.0" // {
dependencies = [
sources."ansi-styles-4.3.0"
@@ -69430,7 +69530,7 @@ in
sources."domelementtype-1.3.1"
sources."domhandler-2.4.2"
sources."domutils-1.7.0"
- sources."electron-to-chromium-1.3.693"
+ sources."electron-to-chromium-1.3.699"
sources."emoji-regex-8.0.0"
sources."entities-1.1.2"
sources."error-ex-1.3.2"
@@ -69457,13 +69557,13 @@ in
sources."global-modules-2.0.0"
sources."global-prefix-3.0.0"
sources."globals-11.12.0"
- sources."globby-11.0.2"
+ sources."globby-11.0.3"
sources."globjoin-0.1.4"
sources."gonzales-pe-4.3.0"
sources."hard-rejection-2.1.0"
sources."has-1.0.3"
sources."has-flag-3.0.0"
- sources."hosted-git-info-4.0.1"
+ sources."hosted-git-info-4.0.2"
sources."html-tags-3.1.0"
sources."htmlparser2-3.10.1"
sources."ignore-5.1.8"
@@ -69529,7 +69629,7 @@ in
sources."node-releases-1.1.71"
(sources."normalize-package-data-3.0.2" // {
dependencies = [
- sources."semver-7.3.4"
+ sources."semver-7.3.5"
];
})
sources."normalize-range-0.1.2"
@@ -69570,7 +69670,7 @@ in
sources."postcss-syntax-0.36.2"
sources."postcss-value-parser-4.1.0"
sources."punycode-2.1.1"
- sources."queue-microtask-1.2.2"
+ sources."queue-microtask-1.2.3"
sources."quick-lru-4.0.1"
(sources."read-pkg-5.2.0" // {
dependencies = [
@@ -69877,7 +69977,7 @@ in
sources."enquirer-2.3.6"
sources."escape-string-regexp-1.0.5"
sources."eslint-7.22.0"
- sources."eslint-plugin-vue-7.7.0"
+ sources."eslint-plugin-vue-7.8.0"
sources."eslint-scope-5.1.1"
(sources."eslint-utils-2.1.0" // {
dependencies = [
@@ -69958,7 +70058,7 @@ in
sources."resolve-1.20.0"
sources."resolve-from-4.0.0"
sources."rimraf-3.0.2"
- sources."semver-7.3.4"
+ sources."semver-7.3.5"
sources."shebang-command-2.0.0"
sources."shebang-regex-3.0.0"
(sources."slice-ansi-4.0.0" // {
@@ -70352,7 +70452,7 @@ in
sources."braces-3.0.2"
sources."builtins-1.0.3"
sources."bytes-3.0.0"
- sources."cacache-15.0.5"
+ sources."cacache-15.0.6"
(sources."cacheable-request-6.1.0" // {
dependencies = [
sources."lowercase-keys-2.0.0"
@@ -70495,7 +70595,7 @@ in
sources."glob-7.1.6"
sources."glob-parent-5.1.2"
sources."global-dirs-2.1.0"
- sources."globby-11.0.2"
+ sources."globby-11.0.3"
(sources."got-9.6.0" // {
dependencies = [
sources."get-stream-4.1.0"
@@ -70508,7 +70608,7 @@ in
sources."has-flag-4.0.0"
sources."has-unicode-2.0.1"
sources."has-yarn-2.1.0"
- sources."hosted-git-info-4.0.1"
+ sources."hosted-git-info-4.0.2"
sources."http-cache-semantics-4.1.0"
(sources."http-errors-1.7.2" // {
dependencies = [
@@ -70700,7 +70800,7 @@ in
sources."semver-6.3.0"
];
})
- sources."pacote-11.3.0"
+ sources."pacote-11.3.1"
sources."parent-module-1.0.1"
sources."parseurl-1.3.3"
sources."path-exists-3.0.0"
@@ -70727,7 +70827,7 @@ in
sources."pupa-2.1.1"
sources."q-1.5.1"
sources."qs-6.5.2"
- sources."queue-microtask-1.2.2"
+ sources."queue-microtask-1.2.3"
sources."range-parser-1.2.1"
(sources."raw-body-2.4.0" // {
dependencies = [
@@ -70762,7 +70862,7 @@ in
sources."safe-buffer-5.1.2"
sources."safer-buffer-2.1.2"
sources."sax-1.1.4"
- sources."semver-7.3.4"
+ sources."semver-7.3.5"
(sources."semver-diff-3.1.1" // {
dependencies = [
sources."semver-6.3.0"
@@ -70894,7 +70994,7 @@ in
sources."@mrmlnc/readdir-enhanced-2.2.1"
sources."@nodelib/fs.stat-1.1.3"
sources."@types/glob-7.1.3"
- sources."@types/minimatch-3.0.3"
+ sources."@types/minimatch-3.0.4"
sources."@types/minimist-1.2.1"
sources."@types/node-14.14.35"
sources."@types/normalize-package-data-2.4.0"
@@ -71363,7 +71463,7 @@ in
sources."performance-now-2.1.0"
sources."process-nextick-args-2.0.1"
sources."pseudomap-1.0.2"
- sources."qs-6.10.0"
+ sources."qs-6.10.1"
sources."quicktask-1.1.0"
sources."raf-3.3.2"
sources."readable-stream-2.3.7"
@@ -72261,7 +72361,7 @@ in
sources."fs.realpath-1.0.0"
sources."glob-7.1.6"
sources."glob-parent-5.1.2"
- sources."globby-11.0.2"
+ sources."globby-11.0.3"
sources."graceful-fs-4.2.6"
sources."ignore-5.1.8"
sources."indent-string-4.0.0"
@@ -72287,7 +72387,7 @@ in
sources."path-is-absolute-1.0.1"
sources."path-type-4.0.0"
sources."picomatch-2.2.2"
- sources."queue-microtask-1.2.2"
+ sources."queue-microtask-1.2.3"
sources."reusify-1.0.4"
sources."rimraf-3.0.2"
sources."run-parallel-1.2.0"
@@ -72347,10 +72447,10 @@ in
elasticdump = nodeEnv.buildNodePackage {
name = "elasticdump";
packageName = "elasticdump";
- version = "6.66.1";
+ version = "6.66.2";
src = fetchurl {
- url = "https://registry.npmjs.org/elasticdump/-/elasticdump-6.66.1.tgz";
- sha512 = "Bz3addITPTKoIpVP7UVFlszh5JkqeuA7+6zIT9odBD5sJ/bHF3ZN5zQJ73WiY2nyifp0q2HzEwa1u1+ULDITAg==";
+ url = "https://registry.npmjs.org/elasticdump/-/elasticdump-6.66.2.tgz";
+ sha512 = "9vWIUjRfuuOKu+qEgE1taqxx6yXX2OuD3yxxiwnCmiCTk+kq1QAu24rbDe5pdFvsBXzgTa6NT4dZ6i76uXgd6Q==";
};
dependencies = [
sources."@fast-csv/format-4.3.5"
@@ -72547,15 +72647,15 @@ in
sources."@types/glob-7.1.3"
sources."@types/http-cache-semantics-4.0.0"
sources."@types/keyv-3.1.1"
- sources."@types/minimatch-3.0.3"
+ sources."@types/minimatch-3.0.4"
sources."@types/node-14.14.35"
sources."@types/responselike-1.0.0"
sources."@types/yauzl-2.9.1"
sources."abbrev-1.1.1"
sources."ajv-6.12.6"
- (sources."ansi-escapes-4.3.1" // {
+ (sources."ansi-escapes-4.3.2" // {
dependencies = [
- sources."type-fest-0.11.0"
+ sources."type-fest-0.21.3"
];
})
sources."ansi-regex-5.0.0"
@@ -72981,7 +73081,7 @@ in
sources."safe-buffer-5.2.1"
sources."safer-buffer-2.1.2"
sources."sax-1.2.4"
- sources."semver-7.3.4"
+ sources."semver-7.3.5"
sources."semver-compare-1.0.0"
sources."serialize-error-7.0.1"
sources."set-blocking-2.0.0"
@@ -73124,7 +73224,7 @@ in
};
dependencies = [
sources."@babel/code-frame-7.12.13"
- sources."@babel/compat-data-7.13.11"
+ sources."@babel/compat-data-7.13.12"
(sources."@babel/core-7.13.10" // {
dependencies = [
sources."semver-6.3.0"
@@ -73139,28 +73239,28 @@ in
})
sources."@babel/helper-function-name-7.12.13"
sources."@babel/helper-get-function-arity-7.12.13"
- sources."@babel/helper-member-expression-to-functions-7.13.0"
- sources."@babel/helper-module-imports-7.12.13"
- sources."@babel/helper-module-transforms-7.13.0"
+ sources."@babel/helper-member-expression-to-functions-7.13.12"
+ sources."@babel/helper-module-imports-7.13.12"
+ sources."@babel/helper-module-transforms-7.13.12"
sources."@babel/helper-optimise-call-expression-7.12.13"
sources."@babel/helper-plugin-utils-7.13.0"
- sources."@babel/helper-replace-supers-7.13.0"
- sources."@babel/helper-simple-access-7.12.13"
+ sources."@babel/helper-replace-supers-7.13.12"
+ sources."@babel/helper-simple-access-7.13.12"
sources."@babel/helper-split-export-declaration-7.12.13"
sources."@babel/helper-validator-identifier-7.12.11"
sources."@babel/helper-validator-option-7.12.17"
sources."@babel/helpers-7.13.10"
sources."@babel/highlight-7.13.10"
- sources."@babel/parser-7.13.11"
+ sources."@babel/parser-7.13.12"
sources."@babel/plugin-proposal-object-rest-spread-7.13.8"
sources."@babel/plugin-syntax-jsx-7.12.13"
sources."@babel/plugin-syntax-object-rest-spread-7.8.3"
sources."@babel/plugin-transform-destructuring-7.13.0"
sources."@babel/plugin-transform-parameters-7.13.0"
- sources."@babel/plugin-transform-react-jsx-7.12.17"
+ sources."@babel/plugin-transform-react-jsx-7.13.12"
sources."@babel/template-7.12.13"
sources."@babel/traverse-7.13.0"
- sources."@babel/types-7.13.0"
+ sources."@babel/types-7.13.12"
sources."@sindresorhus/is-4.0.0"
sources."@szmarczak/http-timer-4.0.5"
sources."@types/cacheable-request-6.0.1"
@@ -73172,9 +73272,9 @@ in
sources."@types/responselike-1.0.0"
sources."@types/yoga-layout-1.9.2"
sources."ajv-6.12.6"
- (sources."ansi-escapes-4.3.1" // {
+ (sources."ansi-escapes-4.3.2" // {
dependencies = [
- sources."type-fest-0.11.0"
+ sources."type-fest-0.21.3"
];
})
sources."ansi-regex-5.0.0"
@@ -73202,7 +73302,7 @@ in
sources."quick-lru-4.0.1"
];
})
- sources."caniuse-lite-1.0.30001203"
+ sources."caniuse-lite-1.0.30001204"
sources."chalk-2.4.2"
sources."ci-info-2.0.0"
sources."cli-boxes-2.2.1"
@@ -73218,7 +73318,7 @@ in
sources."concat-map-0.0.1"
(sources."conf-7.1.2" // {
dependencies = [
- sources."semver-7.3.4"
+ sources."semver-7.3.5"
];
})
sources."convert-source-map-1.7.0"
@@ -73239,7 +73339,7 @@ in
})
sources."defer-to-connect-2.0.1"
sources."dot-prop-5.3.0"
- sources."electron-to-chromium-1.3.693"
+ sources."electron-to-chromium-1.3.699"
sources."emoji-regex-8.0.0"
sources."emojilib-2.4.0"
sources."end-of-stream-1.4.4"
@@ -73500,7 +73600,7 @@ in
sources."@fluentui/date-time-utilities-7.9.1"
sources."@fluentui/dom-utilities-1.1.2"
sources."@fluentui/keyboard-key-0.2.14"
- sources."@fluentui/react-7.165.0"
+ sources."@fluentui/react-7.165.1"
sources."@fluentui/react-focus-7.17.6"
sources."@fluentui/react-window-provider-1.0.2"
sources."@fluentui/theme-1.7.4"
@@ -73541,7 +73641,7 @@ in
sources."@types/lodash-4.14.161"
sources."@types/material-design-lite-1.1.16"
sources."@types/mime-1.3.2"
- sources."@types/minimatch-3.0.3"
+ sources."@types/minimatch-3.0.4"
sources."@types/minimist-1.2.0"
sources."@types/mithril-2.0.3"
sources."@types/mkdirp-1.0.1"
@@ -73748,7 +73848,7 @@ in
];
})
sources."bytes-3.1.0"
- (sources."cacache-15.0.5" // {
+ (sources."cacache-15.0.6" // {
dependencies = [
sources."chownr-2.0.0"
sources."fs-minipass-2.1.0"
@@ -74541,7 +74641,7 @@ in
sources."object.map-1.0.1"
sources."object.pick-1.3.0"
sources."object.reduce-1.0.1"
- sources."office-ui-fabric-react-7.165.0"
+ sources."office-ui-fabric-react-7.165.1"
sources."on-finished-2.3.0"
sources."on-headers-1.0.2"
sources."once-1.4.0"
@@ -74701,7 +74801,7 @@ in
sources."qs-6.7.0"
sources."querystring-0.2.0"
sources."querystring-es3-0.2.1"
- sources."queue-microtask-1.2.2"
+ sources."queue-microtask-1.2.3"
sources."randombytes-2.1.0"
sources."randomfill-1.0.4"
sources."range-parser-1.2.1"
@@ -74772,7 +74872,7 @@ in
sources."sax-1.2.4"
sources."scheduler-0.19.1"
sources."schema-utils-2.7.1"
- sources."semver-7.3.4"
+ sources."semver-7.3.5"
sources."semver-greatest-satisfied-range-1.1.0"
(sources."send-0.17.1" // {
dependencies = [
@@ -75295,7 +75395,7 @@ in
sources."require-from-string-2.0.2"
sources."resolve-from-4.0.0"
sources."rimraf-3.0.2"
- sources."semver-7.3.4"
+ sources."semver-7.3.5"
sources."shebang-command-2.0.0"
sources."shebang-regex-3.0.0"
(sources."slice-ansi-4.0.0" // {
@@ -75463,7 +75563,7 @@ in
sources."require-from-string-2.0.2"
sources."resolve-from-4.0.0"
sources."rimraf-3.0.2"
- sources."semver-7.3.4"
+ sources."semver-7.3.5"
sources."shebang-command-2.0.0"
sources."shebang-regex-3.0.0"
(sources."slice-ansi-4.0.0" // {
@@ -75531,7 +75631,7 @@ in
};
dependencies = [
sources."@babel/code-frame-7.12.13"
- sources."@babel/compat-data-7.13.11"
+ sources."@babel/compat-data-7.13.12"
(sources."@babel/core-7.9.0" // {
dependencies = [
sources."semver-5.7.1"
@@ -75556,14 +75656,14 @@ in
sources."@babel/helper-function-name-7.12.13"
sources."@babel/helper-get-function-arity-7.12.13"
sources."@babel/helper-hoist-variables-7.13.0"
- sources."@babel/helper-member-expression-to-functions-7.13.0"
- sources."@babel/helper-module-imports-7.12.13"
- sources."@babel/helper-module-transforms-7.13.0"
+ sources."@babel/helper-member-expression-to-functions-7.13.12"
+ sources."@babel/helper-module-imports-7.13.12"
+ sources."@babel/helper-module-transforms-7.13.12"
sources."@babel/helper-optimise-call-expression-7.12.13"
sources."@babel/helper-plugin-utils-7.13.0"
sources."@babel/helper-remap-async-to-generator-7.13.0"
- sources."@babel/helper-replace-supers-7.13.0"
- sources."@babel/helper-simple-access-7.12.13"
+ sources."@babel/helper-replace-supers-7.13.12"
+ sources."@babel/helper-simple-access-7.13.12"
sources."@babel/helper-skip-transparent-expression-wrappers-7.12.1"
sources."@babel/helper-split-export-declaration-7.12.13"
sources."@babel/helper-validator-identifier-7.12.11"
@@ -75575,7 +75675,7 @@ in
sources."chalk-2.4.2"
];
})
- sources."@babel/parser-7.13.11"
+ sources."@babel/parser-7.13.12"
sources."@babel/plugin-proposal-async-generator-functions-7.13.8"
sources."@babel/plugin-proposal-class-properties-7.12.13"
sources."@babel/plugin-proposal-dynamic-import-7.13.8"
@@ -75587,7 +75687,7 @@ in
sources."@babel/plugin-proposal-numeric-separator-7.12.13"
sources."@babel/plugin-proposal-object-rest-spread-7.13.8"
sources."@babel/plugin-proposal-optional-catch-binding-7.13.8"
- sources."@babel/plugin-proposal-optional-chaining-7.13.8"
+ sources."@babel/plugin-proposal-optional-chaining-7.13.12"
sources."@babel/plugin-proposal-private-methods-7.13.0"
sources."@babel/plugin-proposal-unicode-property-regex-7.12.13"
sources."@babel/plugin-syntax-async-generators-7.8.4"
@@ -75632,7 +75732,7 @@ in
sources."@babel/plugin-transform-parameters-7.13.0"
sources."@babel/plugin-transform-property-literals-7.12.13"
sources."@babel/plugin-transform-react-display-name-7.12.13"
- sources."@babel/plugin-transform-react-jsx-7.12.17"
+ sources."@babel/plugin-transform-react-jsx-7.13.12"
sources."@babel/plugin-transform-react-jsx-self-7.12.13"
sources."@babel/plugin-transform-react-jsx-source-7.12.13"
sources."@babel/plugin-transform-regenerator-7.12.13"
@@ -75660,7 +75760,7 @@ in
sources."@babel/runtime-7.13.10"
sources."@babel/template-7.12.13"
sources."@babel/traverse-7.13.0"
- sources."@babel/types-7.13.0"
+ sources."@babel/types-7.13.12"
sources."@expo/apple-utils-0.0.0-alpha.17"
sources."@expo/bunyan-4.0.0"
sources."@expo/config-3.3.33"
@@ -75844,7 +75944,7 @@ in
sources."@types/istanbul-reports-1.1.2"
sources."@types/json-schema-7.0.7"
sources."@types/keyv-3.1.1"
- sources."@types/minimatch-3.0.3"
+ sources."@types/minimatch-3.0.4"
sources."@types/node-9.6.61"
sources."@types/q-1.5.4"
sources."@types/responselike-1.0.0"
@@ -75914,9 +76014,9 @@ in
];
})
sources."ansi-colors-3.2.4"
- (sources."ansi-escapes-4.3.1" // {
+ (sources."ansi-escapes-4.3.2" // {
dependencies = [
- sources."type-fest-0.11.0"
+ sources."type-fest-0.21.3"
];
})
sources."ansi-html-0.0.7"
@@ -76056,7 +76156,7 @@ in
sources."builtin-status-codes-3.0.0"
sources."builtins-1.0.3"
sources."bytes-3.0.0"
- (sources."cacache-15.0.5" // {
+ (sources."cacache-15.0.6" // {
dependencies = [
sources."minipass-3.1.3"
sources."mkdirp-1.0.4"
@@ -76079,7 +76179,7 @@ in
})
sources."camelcase-5.3.1"
sources."caniuse-api-3.0.0"
- sources."caniuse-lite-1.0.30001203"
+ sources."caniuse-lite-1.0.30001204"
sources."caseless-0.12.0"
(sources."chalk-4.1.0" // {
dependencies = [
@@ -76352,7 +76452,7 @@ in
sources."duplexify-3.7.1"
sources."ecc-jsbn-0.1.2"
sources."ee-first-1.1.1"
- sources."electron-to-chromium-1.3.693"
+ sources."electron-to-chromium-1.3.699"
(sources."elliptic-6.5.4" // {
dependencies = [
sources."bn.js-4.12.0"
@@ -76985,17 +77085,17 @@ in
sources."npm-packlist-2.1.4"
(sources."npm-pick-manifest-6.1.1" // {
dependencies = [
- sources."hosted-git-info-4.0.1"
+ sources."hosted-git-info-4.0.2"
sources."npm-package-arg-8.1.2"
- sources."semver-7.3.4"
+ sources."semver-7.3.5"
];
})
(sources."npm-registry-fetch-9.0.0" // {
dependencies = [
- sources."hosted-git-info-4.0.1"
+ sources."hosted-git-info-4.0.2"
sources."minipass-3.1.3"
sources."npm-package-arg-8.1.2"
- sources."semver-7.3.4"
+ sources."semver-7.3.5"
];
})
sources."npm-run-path-2.0.2"
@@ -77087,14 +77187,14 @@ in
sources."semver-6.3.0"
];
})
- (sources."pacote-11.3.0" // {
+ (sources."pacote-11.3.1" // {
dependencies = [
- sources."hosted-git-info-4.0.1"
+ sources."hosted-git-info-4.0.2"
sources."minipass-3.1.3"
sources."mkdirp-1.0.4"
sources."npm-package-arg-8.1.2"
sources."rimraf-3.0.2"
- sources."semver-7.3.4"
+ sources."semver-7.3.5"
];
})
sources."pako-1.0.11"
@@ -77332,7 +77432,7 @@ in
sources."querystring-0.2.1"
sources."querystring-es3-0.2.1"
sources."querystringify-2.2.0"
- sources."queue-microtask-1.2.2"
+ sources."queue-microtask-1.2.3"
sources."quick-lru-5.1.1"
sources."randombytes-2.1.0"
sources."randomfill-1.0.4"
@@ -77380,7 +77480,7 @@ in
sources."recursive-readdir-2.2.2"
sources."regenerate-1.4.2"
sources."regenerate-unicode-properties-8.2.0"
- sources."regenerator-runtime-0.13.7"
+ sources."regenerator-runtime-0.13.8"
sources."regenerator-transform-0.14.5"
sources."regex-not-1.0.2"
sources."regexp.prototype.flags-1.3.1"
@@ -77388,7 +77488,7 @@ in
sources."registry-auth-token-3.3.2"
sources."registry-url-3.1.0"
sources."regjsgen-0.5.2"
- (sources."regjsparser-0.6.7" // {
+ (sources."regjsparser-0.6.9" // {
dependencies = [
sources."jsesc-0.5.0"
];
@@ -78282,7 +78382,7 @@ in
})
(sources."@oclif/config-1.17.0" // {
dependencies = [
- sources."globby-11.0.2"
+ sources."globby-11.0.3"
sources."tslib-2.1.0"
];
})
@@ -78652,7 +78752,7 @@ in
sources."punycode-2.1.1"
sources."qs-6.5.2"
sources."query-string-5.1.1"
- sources."queue-microtask-1.2.2"
+ sources."queue-microtask-1.2.3"
(sources."readable-stream-2.3.7" // {
dependencies = [
sources."safe-buffer-5.1.2"
@@ -78673,7 +78773,7 @@ in
sources."safe-buffer-5.2.1"
sources."safe-regex-1.1.0"
sources."safer-buffer-2.1.2"
- sources."semver-7.3.4"
+ sources."semver-7.3.5"
(sources."set-value-2.0.1" // {
dependencies = [
sources."extend-shallow-2.0.1"
@@ -78807,10 +78907,10 @@ in
firebase-tools = nodeEnv.buildNodePackage {
name = "firebase-tools";
packageName = "firebase-tools";
- version = "9.6.1";
+ version = "9.7.0";
src = fetchurl {
- url = "https://registry.npmjs.org/firebase-tools/-/firebase-tools-9.6.1.tgz";
- sha512 = "Av2RMjTVJtFthl+XTfgtvbXY6K19GgjV/kyeqSkLklmWDpJle8dYhsodosx5tquBsLyOQQxrkpC4cZcGk3+IoA==";
+ url = "https://registry.npmjs.org/firebase-tools/-/firebase-tools-9.7.0.tgz";
+ sha512 = "mQaNZ0EE/lOFIc7ycLRSsyWSWKqAAH1/0ND9V9A8HFqu3tAdfTfhxiUUj8dDv1u0u4YVG5hZjpco+AmxeJEnlg==";
};
dependencies = [
sources."@apidevtools/json-schema-ref-parser-9.0.7"
@@ -78821,10 +78921,10 @@ in
sources."@google-cloud/promisify-2.0.3"
(sources."@google-cloud/pubsub-2.10.0" // {
dependencies = [
- sources."google-auth-library-7.0.2"
+ sources."google-auth-library-7.0.3"
];
})
- (sources."@grpc/grpc-js-1.2.11" // {
+ (sources."@grpc/grpc-js-1.2.12" // {
dependencies = [
sources."semver-6.3.0"
];
@@ -78835,7 +78935,7 @@ in
sources."@opentelemetry/context-base-0.12.0"
(sources."@opentelemetry/core-0.12.0" // {
dependencies = [
- sources."semver-7.3.4"
+ sources."semver-7.3.5"
];
})
sources."@opentelemetry/resources-0.12.0"
@@ -78858,7 +78958,7 @@ in
sources."@types/duplexify-3.6.0"
sources."@types/glob-7.1.3"
sources."@types/long-4.0.1"
- sources."@types/minimatch-3.0.3"
+ sources."@types/minimatch-3.0.4"
sources."@types/node-14.14.35"
sources."JSONStream-1.3.5"
sources."abbrev-1.1.1"
@@ -79011,6 +79111,7 @@ in
sources."cookie-0.4.0"
sources."cookie-signature-1.0.6"
sources."core-util-is-1.0.2"
+ sources."cors-2.8.5"
sources."crc-32-1.2.0"
sources."crc32-stream-4.0.2"
(sources."cross-env-5.2.1" // {
@@ -79079,7 +79180,7 @@ in
sources."events-listener-1.1.0"
(sources."exegesis-2.5.6" // {
dependencies = [
- sources."semver-7.3.4"
+ sources."semver-7.3.5"
];
})
sources."exegesis-express-2.0.0"
@@ -79183,7 +79284,7 @@ in
sources."google-auth-library-6.1.6"
(sources."google-gax-2.11.2" // {
dependencies = [
- sources."google-auth-library-7.0.2"
+ sources."google-auth-library-7.0.3"
];
})
sources."google-p12-pem-3.0.3"
@@ -79358,7 +79459,7 @@ in
(sources."node-gyp-7.1.2" // {
dependencies = [
sources."mkdirp-1.0.4"
- sources."semver-7.3.4"
+ sources."semver-7.3.5"
sources."tar-6.1.0"
sources."which-2.0.2"
];
@@ -79723,7 +79824,7 @@ in
sources."@types/minimist-1.2.1"
sources."@types/normalize-package-data-2.4.0"
sources."aggregate-error-3.1.0"
- sources."ansi-escapes-4.3.1"
+ sources."ansi-escapes-4.3.2"
sources."ansi-regex-5.0.0"
sources."ansi-styles-4.3.0"
sources."arrify-2.0.1"
@@ -79760,7 +79861,7 @@ in
sources."hard-rejection-2.1.0"
sources."has-1.0.3"
sources."has-flag-4.0.0"
- sources."hosted-git-info-4.0.1"
+ sources."hosted-git-info-4.0.2"
sources."human-signals-2.1.0"
sources."iconv-lite-0.4.24"
sources."indent-string-4.0.0"
@@ -79836,7 +79937,7 @@ in
sources."run-async-2.4.1"
sources."rxjs-6.6.6"
sources."safer-buffer-2.1.2"
- sources."semver-7.3.4"
+ sources."semver-7.3.5"
sources."shebang-command-2.0.0"
sources."shebang-regex-3.0.0"
sources."signal-exit-3.0.3"
@@ -79861,7 +79962,7 @@ in
sources."tmp-0.0.33"
sources."trim-newlines-3.0.0"
sources."tslib-1.14.1"
- sources."type-fest-0.11.0"
+ sources."type-fest-0.21.3"
sources."validate-npm-package-license-3.0.4"
sources."which-2.0.2"
sources."wrappy-1.0.2"
@@ -80632,7 +80733,7 @@ in
sources."strip-ansi-5.2.0"
];
})
- sources."ansi-escapes-4.3.1"
+ sources."ansi-escapes-4.3.2"
sources."ansi-regex-5.0.0"
sources."ansi-styles-4.3.0"
sources."arrify-1.0.1"
@@ -80711,7 +80812,7 @@ in
sources."has-1.0.3"
sources."has-flag-4.0.0"
sources."has-yarn-2.1.0"
- sources."hosted-git-info-4.0.1"
+ sources."hosted-git-info-4.0.2"
sources."http-cache-semantics-4.1.0"
sources."human-signals-2.1.0"
sources."iconv-lite-0.4.24"
@@ -80838,7 +80939,7 @@ in
sources."rxjs-6.6.6"
sources."safe-buffer-5.2.1"
sources."safer-buffer-2.1.2"
- sources."semver-7.3.4"
+ sources."semver-7.3.5"
(sources."semver-diff-3.1.1" // {
dependencies = [
sources."semver-6.3.0"
@@ -80863,7 +80964,7 @@ in
sources."to-readable-stream-1.0.0"
sources."trim-newlines-3.0.0"
sources."tslib-1.14.1"
- sources."type-fest-0.11.0"
+ sources."type-fest-0.21.3"
sources."typedarray-to-buffer-3.1.5"
sources."unique-string-2.0.0"
sources."update-notifier-5.1.0"
@@ -80916,24 +81017,21 @@ in
sources."@exodus/schemasafe-1.0.0-rc.3"
sources."@graphql-cli/common-4.1.0"
sources."@graphql-cli/init-4.1.0"
- (sources."@graphql-tools/batch-execute-7.0.0" // {
+ (sources."@graphql-tools/batch-execute-7.1.0" // {
dependencies = [
- (sources."@graphql-tools/utils-7.6.0" // {
- dependencies = [
- sources."tslib-2.1.0"
- ];
- })
+ sources."@graphql-tools/utils-7.7.1"
+ sources."tslib-2.1.0"
];
})
- (sources."@graphql-tools/delegate-7.0.10" // {
+ (sources."@graphql-tools/delegate-7.1.1" // {
dependencies = [
- sources."@graphql-tools/utils-7.6.0"
+ sources."@graphql-tools/utils-7.7.1"
sources."tslib-2.1.0"
];
})
(sources."@graphql-tools/graphql-file-loader-6.2.7" // {
dependencies = [
- sources."@graphql-tools/utils-7.6.0"
+ sources."@graphql-tools/utils-7.7.1"
sources."tslib-2.1.0"
];
})
@@ -80944,7 +81042,7 @@ in
})
(sources."@graphql-tools/json-file-loader-6.2.6" // {
dependencies = [
- (sources."@graphql-tools/utils-7.6.0" // {
+ (sources."@graphql-tools/utils-7.7.1" // {
dependencies = [
sources."tslib-2.1.0"
];
@@ -80952,21 +81050,21 @@ in
];
})
sources."@graphql-tools/load-6.2.4"
- (sources."@graphql-tools/merge-6.2.10" // {
+ (sources."@graphql-tools/merge-6.2.11" // {
dependencies = [
- sources."@graphql-tools/utils-7.6.0"
+ sources."@graphql-tools/utils-7.7.1"
sources."tslib-2.1.0"
];
})
(sources."@graphql-tools/schema-7.1.3" // {
dependencies = [
- sources."@graphql-tools/utils-7.6.0"
+ sources."@graphql-tools/utils-7.7.1"
sources."tslib-2.1.0"
];
})
(sources."@graphql-tools/url-loader-6.8.2" // {
dependencies = [
- sources."@graphql-tools/utils-7.6.0"
+ sources."@graphql-tools/utils-7.7.1"
sources."cross-fetch-3.1.1"
sources."form-data-4.0.0"
sources."tslib-2.1.0"
@@ -80983,7 +81081,7 @@ in
})
(sources."@graphql-tools/wrap-7.0.5" // {
dependencies = [
- (sources."@graphql-tools/utils-7.6.0" // {
+ (sources."@graphql-tools/utils-7.7.1" // {
dependencies = [
sources."tslib-2.1.0"
];
@@ -81002,9 +81100,9 @@ in
sources."@types/websocket-1.0.2"
sources."aggregate-error-3.1.0"
sources."ajv-6.12.6"
- (sources."ansi-escapes-4.3.1" // {
+ (sources."ansi-escapes-4.3.2" // {
dependencies = [
- sources."type-fest-0.11.0"
+ sources."type-fest-0.21.3"
];
})
sources."ansi-regex-4.1.0"
@@ -81353,7 +81451,7 @@ in
sources."punycode-2.1.1"
sources."qs-6.5.2"
sources."querystringify-2.2.0"
- sources."queue-microtask-1.2.2"
+ sources."queue-microtask-1.2.3"
sources."rc-1.2.8"
sources."reftools-1.1.8"
sources."regexp.prototype.flags-1.3.1"
@@ -81883,7 +81981,7 @@ in
};
dependencies = [
sources."abbrev-1.1.1"
- sources."ansi-escapes-4.3.1"
+ sources."ansi-escapes-4.3.2"
sources."ansi-regex-2.1.1"
sources."ansi-styles-2.2.1"
sources."ansi-term-0.0.2"
@@ -81947,7 +82045,7 @@ in
})
sources."systeminformation-4.34.19"
sources."term-canvas-0.0.5"
- sources."type-fest-0.11.0"
+ sources."type-fest-0.21.3"
sources."wordwrap-0.0.3"
sources."x256-0.0.2"
sources."xml2js-0.4.23"
@@ -82841,7 +82939,7 @@ in
sources."param-case-2.1.1"
sources."relateurl-0.2.7"
sources."source-map-0.6.1"
- sources."uglify-js-3.13.1"
+ sources."uglify-js-3.13.2"
sources."upper-case-1.1.3"
];
buildInputs = globalBuildInputs;
@@ -82980,7 +83078,7 @@ in
sources."object-inspect-1.9.0"
sources."opener-1.5.2"
sources."portfinder-1.0.28"
- sources."qs-6.10.0"
+ sources."qs-6.10.1"
sources."requires-port-1.0.0"
sources."secure-compare-3.0.1"
sources."side-channel-1.0.4"
@@ -83752,7 +83850,7 @@ in
sources."inherits-2.0.4"
(sources."inquirer-7.3.3" // {
dependencies = [
- sources."ansi-escapes-4.3.1"
+ sources."ansi-escapes-4.3.2"
sources."ansi-styles-4.3.0"
sources."chalk-4.1.0"
sources."cli-cursor-3.1.0"
@@ -83836,7 +83934,7 @@ in
sources."proxy-agent-4.0.1"
sources."proxy-from-env-1.1.0"
sources."pump-3.0.0"
- sources."qs-6.10.0"
+ sources."qs-6.10.1"
sources."raw-body-2.4.1"
sources."readable-stream-3.6.0"
sources."restore-cursor-2.0.0"
@@ -83903,7 +84001,7 @@ in
sources."tree-kill-1.2.2"
sources."tslib-1.14.1"
sources."type-check-0.3.2"
- sources."type-fest-0.11.0"
+ sources."type-fest-0.21.3"
sources."typedarray-to-buffer-3.1.5"
sources."universalify-0.1.2"
sources."unpipe-1.0.0"
@@ -84123,7 +84221,7 @@ in
sources."safer-buffer-2.1.2"
sources."sax-1.2.4"
sources."semaphore-async-await-1.5.1"
- (sources."semver-7.3.4" // {
+ (sources."semver-7.3.5" // {
dependencies = [
sources."lru-cache-6.0.0"
];
@@ -84381,7 +84479,7 @@ in
sources."async-mutex-0.1.4"
sources."asynckit-0.4.0"
sources."atob-2.1.2"
- (sources."aws-sdk-2.868.0" // {
+ (sources."aws-sdk-2.871.0" // {
dependencies = [
sources."sax-1.2.1"
sources."uuid-3.3.2"
@@ -84739,7 +84837,7 @@ in
sources."debug-4.3.2"
sources."html-minifier-4.0.0"
sources."ms-2.1.2"
- sources."uglify-js-3.13.1"
+ sources."uglify-js-3.13.2"
];
})
sources."minimatch-3.0.4"
@@ -84879,7 +84977,7 @@ in
sources."safer-buffer-2.1.2"
sources."sax-1.2.4"
sources."saxes-3.1.11"
- sources."semver-7.3.4"
+ sources."semver-7.3.5"
sources."server-destroy-1.0.1"
sources."set-blocking-2.0.0"
sources."setimmediate-1.0.5"
@@ -85127,7 +85225,7 @@ in
sha512 = "znR99e1BHeyEkSvgDDpX0sTiTu+8aQyDl9DawrkOGZTTW8hv0deIFXx87114zJ7gRaDZKVQD/4tr1ifmJp9xhQ==";
};
dependencies = [
- sources."@babel/parser-7.13.11"
+ sources."@babel/parser-7.13.12"
sources."argparse-1.0.10"
sources."bluebird-3.7.2"
sources."catharsis-0.8.11"
@@ -85298,7 +85396,7 @@ in
sources."path-loader-1.0.10"
sources."process-nextick-args-2.0.1"
sources."punycode-2.1.1"
- sources."qs-6.10.0"
+ sources."qs-6.10.1"
sources."readable-stream-2.3.7"
sources."safe-buffer-5.1.2"
sources."side-channel-1.0.4"
@@ -85497,7 +85595,7 @@ in
sources."responselike-1.0.2"
sources."safe-buffer-5.1.2"
sources."safer-buffer-2.1.2"
- sources."semver-7.3.4"
+ sources."semver-7.3.5"
sources."semver-compare-1.0.0"
(sources."semver-diff-3.1.1" // {
dependencies = [
@@ -85588,13 +85686,264 @@ in
bypassCache = true;
reconstructLock = true;
};
+ kaput-cli = nodeEnv.buildNodePackage {
+ name = "kaput-cli";
+ packageName = "kaput-cli";
+ version = "1.1.1";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/kaput-cli/-/kaput-cli-1.1.1.tgz";
+ sha512 = "JbF3PiO1wNawJnOQlb4nJZ2rvDfDWnD7ROCdzqgFXhqi3XTNXBqjpoC7PT3ylfNR6BGibjchndH27VieqyMA0A==";
+ };
+ dependencies = [
+ sources."@nodelib/fs.scandir-2.1.4"
+ sources."@nodelib/fs.stat-2.0.4"
+ sources."@nodelib/fs.walk-1.2.6"
+ sources."@oclif/command-1.8.0"
+ (sources."@oclif/config-1.17.0" // {
+ dependencies = [
+ sources."tslib-2.1.0"
+ ];
+ })
+ sources."@oclif/errors-1.3.4"
+ sources."@oclif/linewrap-1.0.0"
+ (sources."@oclif/parser-3.8.5" // {
+ dependencies = [
+ sources."ansi-styles-3.2.1"
+ sources."chalk-2.4.2"
+ sources."color-convert-1.9.3"
+ sources."color-name-1.1.3"
+ sources."escape-string-regexp-1.0.5"
+ ];
+ })
+ (sources."@oclif/plugin-help-3.2.2" // {
+ dependencies = [
+ sources."ansi-regex-3.0.0"
+ sources."ansi-styles-3.2.1"
+ sources."color-convert-1.9.3"
+ sources."color-name-1.1.3"
+ sources."is-fullwidth-code-point-2.0.0"
+ (sources."wrap-ansi-4.0.0" // {
+ dependencies = [
+ sources."string-width-2.1.1"
+ sources."strip-ansi-4.0.0"
+ ];
+ })
+ ];
+ })
+ sources."@oclif/screen-1.0.4"
+ sources."@putdotio/api-client-8.15.1"
+ sources."ajv-6.12.6"
+ sources."ansi-escapes-4.3.2"
+ sources."ansi-regex-5.0.0"
+ sources."ansi-styles-4.3.0"
+ sources."ansicolors-0.3.2"
+ sources."argparse-1.0.10"
+ sources."array-union-2.1.0"
+ sources."asynckit-0.4.0"
+ sources."axios-0.19.2"
+ sources."braces-3.0.2"
+ sources."call-bind-1.0.2"
+ sources."cardinal-2.1.1"
+ (sources."chalk-4.1.0" // {
+ dependencies = [
+ sources."has-flag-4.0.0"
+ sources."supports-color-7.2.0"
+ ];
+ })
+ sources."chardet-0.7.0"
+ sources."clean-stack-3.0.1"
+ sources."cli-cursor-3.1.0"
+ sources."cli-progress-3.9.0"
+ (sources."cli-ux-5.5.1" // {
+ dependencies = [
+ sources."has-flag-4.0.0"
+ sources."supports-color-7.2.0"
+ sources."tslib-2.1.0"
+ ];
+ })
+ sources."cli-width-3.0.0"
+ sources."color-convert-2.0.1"
+ sources."color-name-1.1.4"
+ sources."colors-1.4.0"
+ sources."combined-stream-1.0.8"
+ (sources."conf-6.2.4" // {
+ dependencies = [
+ sources."semver-6.3.0"
+ ];
+ })
+ (sources."cross-spawn-6.0.5" // {
+ dependencies = [
+ sources."semver-5.7.1"
+ ];
+ })
+ (sources."d-1.0.1" // {
+ dependencies = [
+ sources."type-1.2.0"
+ ];
+ })
+ sources."debounce-fn-3.0.1"
+ sources."debug-4.3.2"
+ sources."delayed-stream-1.0.0"
+ sources."dir-glob-3.0.1"
+ sources."dot-prop-5.3.0"
+ sources."dotenv-8.2.0"
+ sources."emoji-regex-8.0.0"
+ sources."env-paths-2.2.1"
+ sources."es5-ext-0.10.53"
+ sources."es6-iterator-2.0.3"
+ sources."es6-symbol-3.1.3"
+ sources."escape-string-regexp-4.0.0"
+ sources."esprima-4.0.1"
+ sources."event-emitter-0.3.5"
+ sources."ext-1.4.0"
+ sources."external-editor-3.1.0"
+ sources."extract-stack-2.0.0"
+ sources."fast-deep-equal-3.1.3"
+ sources."fast-glob-3.2.5"
+ sources."fast-json-stable-stringify-2.1.0"
+ sources."fastq-1.11.0"
+ (sources."figures-3.2.0" // {
+ dependencies = [
+ sources."escape-string-regexp-1.0.5"
+ ];
+ })
+ sources."fill-range-7.0.1"
+ sources."find-up-3.0.0"
+ (sources."follow-redirects-1.5.10" // {
+ dependencies = [
+ sources."debug-3.1.0"
+ sources."ms-2.0.0"
+ ];
+ })
+ sources."form-data-3.0.1"
+ sources."fs-extra-8.1.0"
+ sources."function-bind-1.1.1"
+ sources."get-intrinsic-1.1.1"
+ sources."glob-parent-5.1.2"
+ sources."globby-11.0.3"
+ sources."graceful-fs-4.2.6"
+ sources."has-1.0.3"
+ sources."has-flag-3.0.0"
+ sources."has-symbols-1.0.2"
+ sources."hyperlinker-1.0.0"
+ sources."iconv-lite-0.4.24"
+ sources."ignore-5.1.8"
+ sources."imurmurhash-0.1.4"
+ sources."indent-string-4.0.0"
+ sources."inquirer-7.3.3"
+ sources."is-docker-2.1.1"
+ sources."is-extglob-2.1.1"
+ sources."is-fullwidth-code-point-3.0.0"
+ sources."is-glob-4.0.1"
+ sources."is-number-7.0.0"
+ sources."is-obj-2.0.0"
+ sources."is-typedarray-1.0.0"
+ sources."is-wsl-2.2.0"
+ sources."isexe-2.0.0"
+ sources."js-base64-2.6.4"
+ sources."js-yaml-3.14.1"
+ sources."json-schema-traverse-0.4.1"
+ sources."json-schema-typed-7.0.3"
+ sources."jsonfile-4.0.0"
+ sources."locate-path-3.0.0"
+ sources."lodash-4.17.21"
+ sources."lodash._reinterpolate-3.0.0"
+ sources."lodash.template-4.5.0"
+ sources."lodash.templatesettings-4.2.0"
+ sources."lru-cache-6.0.0"
+ (sources."make-dir-3.1.0" // {
+ dependencies = [
+ sources."semver-6.3.0"
+ ];
+ })
+ sources."merge2-1.4.1"
+ sources."micromatch-4.0.2"
+ sources."mime-db-1.46.0"
+ sources."mime-types-2.1.29"
+ sources."mimic-fn-2.1.0"
+ sources."moment-2.29.1"
+ sources."ms-2.1.2"
+ sources."mute-stream-0.0.8"
+ sources."natural-orderby-2.0.3"
+ sources."next-tick-1.0.0"
+ sources."nice-try-1.0.5"
+ sources."node-downloader-helper-1.0.17"
+ sources."object-inspect-1.9.0"
+ sources."object-treeify-1.1.33"
+ sources."onetime-5.1.2"
+ sources."os-tmpdir-1.0.2"
+ sources."p-limit-2.3.0"
+ sources."p-locate-3.0.0"
+ sources."p-try-2.2.0"
+ (sources."password-prompt-1.1.2" // {
+ dependencies = [
+ sources."ansi-escapes-3.2.0"
+ ];
+ })
+ sources."path-exists-3.0.0"
+ sources."path-key-2.0.1"
+ sources."path-type-4.0.0"
+ sources."picomatch-2.2.2"
+ sources."pkg-up-3.1.0"
+ sources."punycode-2.1.1"
+ sources."qs-6.10.1"
+ sources."queue-microtask-1.2.3"
+ sources."redeyed-2.1.1"
+ sources."restore-cursor-3.1.0"
+ sources."reusify-1.0.4"
+ sources."run-async-2.4.1"
+ sources."run-parallel-1.2.0"
+ sources."rxjs-6.6.6"
+ sources."safer-buffer-2.1.2"
+ sources."semver-7.3.5"
+ sources."shebang-command-1.2.0"
+ sources."shebang-regex-1.0.0"
+ sources."side-channel-1.0.4"
+ sources."signal-exit-3.0.3"
+ sources."slash-3.0.0"
+ sources."sprintf-js-1.0.3"
+ sources."string-width-4.2.2"
+ sources."strip-ansi-6.0.0"
+ sources."supports-color-5.5.0"
+ (sources."supports-hyperlinks-2.1.0" // {
+ dependencies = [
+ sources."has-flag-4.0.0"
+ sources."supports-color-7.2.0"
+ ];
+ })
+ sources."through-2.3.8"
+ sources."tmp-0.0.33"
+ sources."to-regex-range-5.0.1"
+ sources."tslib-1.14.1"
+ sources."type-2.5.0"
+ sources."type-fest-0.21.3"
+ sources."typedarray-to-buffer-3.1.5"
+ sources."universalify-0.1.2"
+ sources."uri-js-4.4.1"
+ sources."urijs-1.19.6"
+ sources."which-1.3.1"
+ sources."widest-line-3.1.0"
+ sources."wrap-ansi-7.0.0"
+ sources."write-file-atomic-3.0.3"
+ sources."yallist-4.0.0"
+ ];
+ buildInputs = globalBuildInputs;
+ meta = {
+ description = "CLI tools for Put.io";
+ homepage = "https://github.com/davidchalifoux/kaput-cli";
+ license = "MIT";
+ };
+ production = true;
+ bypassCache = true;
+ reconstructLock = true;
+ };
karma = nodeEnv.buildNodePackage {
name = "karma";
packageName = "karma";
- version = "6.2.0";
+ version = "6.3.1";
src = fetchurl {
- url = "https://registry.npmjs.org/karma/-/karma-6.2.0.tgz";
- sha512 = "pCB8eNxGgdIdZeC885rbhZ/VyuOPNHUIDNL9EaaMf1NVzpvTjMO8a7zRTn51ZJhOOOxCSpalUdT1A8x76LyVqg==";
+ url = "https://registry.npmjs.org/karma/-/karma-6.3.1.tgz";
+ sha512 = "Is71g0f1dIpbLTXA+ULpev1i1soczQ1Dr8oum3zSmBFsDl3IWUlTLytsCb9os4v9xvUVWGDz0sCmLO4veANnSw==";
};
dependencies = [
sources."@types/component-emitter-1.2.10"
@@ -85728,7 +86077,7 @@ in
sources."to-regex-range-5.0.1"
sources."toidentifier-1.0.0"
sources."type-is-1.6.18"
- sources."ua-parser-js-0.7.24"
+ sources."ua-parser-js-0.7.25"
sources."universalify-0.1.2"
sources."unpipe-1.0.0"
sources."utils-merge-1.0.1"
@@ -86226,21 +86575,21 @@ in
];
})
sources."@octokit/graphql-4.6.1"
- sources."@octokit/openapi-types-5.3.2"
+ sources."@octokit/openapi-types-6.0.0"
sources."@octokit/plugin-enterprise-rest-6.0.1"
sources."@octokit/plugin-paginate-rest-2.13.3"
sources."@octokit/plugin-request-log-1.0.3"
- sources."@octokit/plugin-rest-endpoint-methods-4.13.5"
+ sources."@octokit/plugin-rest-endpoint-methods-4.14.0"
(sources."@octokit/request-5.4.14" // {
dependencies = [
sources."is-plain-object-5.0.0"
];
})
sources."@octokit/request-error-2.0.5"
- sources."@octokit/rest-18.3.5"
- sources."@octokit/types-6.12.2"
+ sources."@octokit/rest-18.4.0"
+ sources."@octokit/types-6.13.0"
sources."@tootallnate/once-1.1.2"
- sources."@types/minimatch-3.0.3"
+ sources."@types/minimatch-3.0.4"
sources."@types/minimist-1.2.1"
sources."@types/normalize-package-data-2.4.0"
sources."@types/parse-json-4.0.0"
@@ -86251,9 +86600,9 @@ in
sources."agentkeepalive-4.1.4"
sources."aggregate-error-3.1.0"
sources."ajv-6.12.6"
- (sources."ansi-escapes-4.3.1" // {
+ (sources."ansi-escapes-4.3.2" // {
dependencies = [
- sources."type-fest-0.11.0"
+ sources."type-fest-0.21.3"
];
})
sources."ansi-regex-2.1.1"
@@ -86287,7 +86636,7 @@ in
sources."builtins-1.0.3"
sources."byline-5.0.0"
sources."byte-size-7.0.1"
- sources."cacache-15.0.5"
+ sources."cacache-15.0.6"
sources."call-bind-1.0.2"
sources."callsites-3.1.0"
sources."camelcase-5.3.1"
@@ -86455,7 +86804,7 @@ in
sources."gitconfiglocal-1.0.0"
sources."glob-7.1.6"
sources."glob-parent-5.1.2"
- sources."globby-11.0.2"
+ sources."globby-11.0.3"
sources."graceful-fs-4.2.6"
sources."handlebars-4.7.7"
sources."har-schema-2.0.0"
@@ -86466,7 +86815,7 @@ in
sources."has-flag-4.0.0"
sources."has-symbols-1.0.2"
sources."has-unicode-2.0.1"
- sources."hosted-git-info-4.0.1"
+ sources."hosted-git-info-4.0.2"
sources."http-cache-semantics-4.1.0"
sources."http-proxy-agent-4.0.1"
sources."http-signature-1.2.0"
@@ -86559,7 +86908,6 @@ in
sources."lodash-4.17.21"
sources."lodash._reinterpolate-3.0.0"
sources."lodash.ismatch-4.4.0"
- sources."lodash.sortby-4.7.0"
sources."lodash.template-4.5.0"
sources."lodash.templatesettings-4.2.0"
sources."loud-rejection-1.6.0"
@@ -86678,13 +87026,13 @@ in
sources."p-timeout-3.2.0"
sources."p-try-2.2.0"
sources."p-waterfall-2.1.1"
- sources."pacote-11.3.0"
+ sources."pacote-11.3.1"
sources."parent-module-1.0.1"
sources."parse-github-repo-url-1.4.1"
sources."parse-json-5.2.0"
(sources."parse-path-4.0.3" // {
dependencies = [
- sources."qs-6.10.0"
+ sources."qs-6.10.1"
];
})
sources."parse-url-5.0.2"
@@ -86710,7 +87058,7 @@ in
sources."q-1.5.1"
sources."qs-6.5.2"
sources."query-string-6.14.1"
- sources."queue-microtask-1.2.2"
+ sources."queue-microtask-1.2.3"
sources."quick-lru-4.0.1"
sources."read-1.0.7"
sources."read-cmd-shim-2.0.0"
@@ -86755,7 +87103,7 @@ in
sources."rxjs-6.6.6"
sources."safe-buffer-5.2.1"
sources."safer-buffer-2.1.2"
- sources."semver-7.3.4"
+ sources."semver-7.3.5"
sources."set-blocking-2.0.0"
sources."shallow-clone-3.0.1"
sources."shebang-command-2.0.0"
@@ -86818,7 +87166,7 @@ in
sources."type-fest-0.4.1"
sources."typedarray-0.0.6"
sources."typedarray-to-buffer-3.1.5"
- sources."uglify-js-3.13.1"
+ sources."uglify-js-3.13.2"
sources."uid-number-0.0.6"
sources."umask-1.1.0"
sources."unbox-primitive-1.0.0"
@@ -86836,7 +87184,7 @@ in
sources."verror-1.10.0"
sources."wcwidth-1.0.1"
sources."webidl-conversions-6.1.0"
- sources."whatwg-url-8.4.0"
+ sources."whatwg-url-8.5.0"
sources."which-2.0.2"
sources."which-boxed-primitive-1.0.2"
(sources."wide-align-1.1.3" // {
@@ -87786,7 +88134,7 @@ in
src = ../interpreters/clojurescript/lumo;
dependencies = [
sources."@babel/code-frame-7.12.13"
- sources."@babel/compat-data-7.13.11"
+ sources."@babel/compat-data-7.13.12"
sources."@babel/core-7.13.10"
sources."@babel/generator-7.13.9"
sources."@babel/helper-annotate-as-pure-7.12.13"
@@ -87799,14 +88147,14 @@ in
sources."@babel/helper-function-name-7.12.13"
sources."@babel/helper-get-function-arity-7.12.13"
sources."@babel/helper-hoist-variables-7.13.0"
- sources."@babel/helper-member-expression-to-functions-7.13.0"
- sources."@babel/helper-module-imports-7.12.13"
- sources."@babel/helper-module-transforms-7.13.0"
+ sources."@babel/helper-member-expression-to-functions-7.13.12"
+ sources."@babel/helper-module-imports-7.13.12"
+ sources."@babel/helper-module-transforms-7.13.12"
sources."@babel/helper-optimise-call-expression-7.12.13"
sources."@babel/helper-plugin-utils-7.13.0"
sources."@babel/helper-remap-async-to-generator-7.13.0"
- sources."@babel/helper-replace-supers-7.13.0"
- sources."@babel/helper-simple-access-7.12.13"
+ sources."@babel/helper-replace-supers-7.13.12"
+ sources."@babel/helper-simple-access-7.13.12"
sources."@babel/helper-skip-transparent-expression-wrappers-7.12.1"
sources."@babel/helper-split-export-declaration-7.12.13"
sources."@babel/helper-validator-identifier-7.12.11"
@@ -87818,7 +88166,8 @@ in
sources."chalk-2.4.2"
];
})
- sources."@babel/parser-7.13.11"
+ sources."@babel/parser-7.13.12"
+ sources."@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining-7.13.12"
sources."@babel/plugin-external-helpers-7.8.3"
sources."@babel/plugin-proposal-async-generator-functions-7.13.8"
sources."@babel/plugin-proposal-class-properties-7.13.0"
@@ -87830,7 +88179,7 @@ in
sources."@babel/plugin-proposal-numeric-separator-7.12.13"
sources."@babel/plugin-proposal-object-rest-spread-7.13.8"
sources."@babel/plugin-proposal-optional-catch-binding-7.13.8"
- sources."@babel/plugin-proposal-optional-chaining-7.13.8"
+ sources."@babel/plugin-proposal-optional-chaining-7.13.12"
sources."@babel/plugin-proposal-private-methods-7.13.0"
sources."@babel/plugin-proposal-unicode-property-regex-7.12.13"
sources."@babel/plugin-syntax-async-generators-7.8.4"
@@ -87880,13 +88229,13 @@ in
sources."@babel/plugin-transform-typeof-symbol-7.12.13"
sources."@babel/plugin-transform-unicode-escapes-7.12.13"
sources."@babel/plugin-transform-unicode-regex-7.12.13"
- sources."@babel/preset-env-7.13.10"
+ sources."@babel/preset-env-7.13.12"
sources."@babel/preset-modules-0.1.4"
sources."@babel/preset-stage-2-7.8.3"
sources."@babel/runtime-7.13.10"
sources."@babel/template-7.12.13"
sources."@babel/traverse-7.13.0"
- sources."@babel/types-7.13.0"
+ sources."@babel/types-7.13.12"
sources."@cnakazawa/watch-1.0.4"
sources."@comandeer/babel-plugin-banner-5.0.0"
sources."@istanbuljs/load-nyc-config-1.1.0"
@@ -87901,7 +88250,7 @@ in
sources."@types/babel__generator-7.6.2"
sources."@types/babel__template-7.4.0"
sources."@types/babel__traverse-7.11.1"
- sources."@types/estree-0.0.46"
+ sources."@types/estree-0.0.47"
sources."@types/graceful-fs-4.1.5"
sources."@types/istanbul-lib-coverage-2.0.3"
sources."@types/istanbul-lib-report-3.0.0"
@@ -88080,7 +88429,7 @@ in
sources."cached-path-relative-1.0.2"
sources."call-bind-1.0.2"
sources."camelcase-5.3.1"
- sources."caniuse-lite-1.0.30001203"
+ sources."caniuse-lite-1.0.30001204"
sources."capture-exit-2.0.0"
sources."caseless-0.12.0"
(sources."chalk-3.0.0" // {
@@ -88204,7 +88553,7 @@ in
sources."duplexer2-0.1.4"
sources."duplexify-3.7.1"
sources."ecc-jsbn-0.1.2"
- sources."electron-to-chromium-1.3.693"
+ sources."electron-to-chromium-1.3.699"
(sources."elliptic-6.5.4" // {
dependencies = [
sources."bn.js-4.12.0"
@@ -88235,7 +88584,7 @@ in
sources."esutils-2.0.3"
sources."events-2.1.0"
sources."evp_bytestokey-1.0.3"
- sources."exec-sh-0.3.4"
+ sources."exec-sh-0.3.6"
sources."execa-1.0.0"
(sources."expand-brackets-2.1.4" // {
dependencies = [
@@ -88601,12 +88950,12 @@ in
sources."realpath-native-2.0.0"
sources."regenerate-1.4.2"
sources."regenerate-unicode-properties-8.2.0"
- sources."regenerator-runtime-0.13.7"
+ sources."regenerator-runtime-0.13.8"
sources."regenerator-transform-0.14.5"
sources."regex-not-1.0.2"
sources."regexpu-core-4.7.1"
sources."regjsgen-0.5.2"
- (sources."regjsparser-0.6.7" // {
+ (sources."regjsparser-0.6.9" // {
dependencies = [
sources."jsesc-0.5.0"
];
@@ -89529,7 +89878,7 @@ in
sources."through-2.3.8"
sources."try-catch-2.0.1"
sources."try-to-catch-1.1.1"
- sources."uglify-js-3.13.1"
+ sources."uglify-js-3.13.2"
sources."unbzip2-stream-1.4.3"
sources."upper-case-1.1.3"
sources."util-deprecate-1.0.2"
@@ -89559,7 +89908,7 @@ in
sources."@fluentui/date-time-utilities-7.9.1"
sources."@fluentui/dom-utilities-1.1.2"
sources."@fluentui/keyboard-key-0.2.14"
- sources."@fluentui/react-7.165.0"
+ sources."@fluentui/react-7.165.1"
sources."@fluentui/react-focus-7.17.6"
sources."@fluentui/react-window-provider-1.0.2"
sources."@fluentui/theme-1.7.4"
@@ -89699,7 +90048,7 @@ in
sources."node-fetch-1.6.3"
sources."normalize-url-4.5.0"
sources."object-assign-4.1.1"
- sources."office-ui-fabric-react-7.165.0"
+ sources."office-ui-fabric-react-7.165.1"
sources."on-finished-2.3.0"
sources."on-headers-1.0.2"
sources."once-1.4.0"
@@ -89756,7 +90105,7 @@ in
sources."safe-buffer-5.1.2"
sources."safer-buffer-2.1.2"
sources."scheduler-0.19.1"
- sources."semver-7.3.4"
+ sources."semver-7.3.5"
(sources."send-0.17.1" // {
dependencies = [
sources."ms-2.1.1"
@@ -89992,7 +90341,7 @@ in
sources."path-loader-1.0.10"
sources."process-nextick-args-2.0.1"
sources."punycode-2.1.1"
- sources."qs-6.10.0"
+ sources."qs-6.10.1"
sources."readable-stream-2.3.7"
sources."safe-buffer-5.1.2"
sources."side-channel-1.0.4"
@@ -90051,7 +90400,7 @@ in
sources."process-nextick-args-2.0.1"
sources."readable-stream-3.6.0"
sources."safe-buffer-5.2.1"
- sources."semver-7.3.4"
+ sources."semver-7.3.5"
sources."simple-swizzle-0.2.2"
sources."stack-trace-0.0.10"
sources."string_decoder-1.3.0"
@@ -90081,14 +90430,14 @@ in
netlify-cli = nodeEnv.buildNodePackage {
name = "netlify-cli";
packageName = "netlify-cli";
- version = "3.13.5";
+ version = "3.13.7";
src = fetchurl {
- url = "https://registry.npmjs.org/netlify-cli/-/netlify-cli-3.13.5.tgz";
- sha512 = "H077yu7Tt7uPqTnN6ZEtKrFwVsvkAyiPDmHzOxA13g9h/5Ho9tUEFhOrxsYRo/CNqdYDqvun5edBcyvNmif+ow==";
+ url = "https://registry.npmjs.org/netlify-cli/-/netlify-cli-3.13.7.tgz";
+ sha512 = "I5aY4yOi3R5yNzhMy3RK9LG42jD422Eni/iiwv7+As9EpkYYcWXFwPLy7mE1bxE9xtyxkE1zKxKqEqDjLqt2kA==";
};
dependencies = [
sources."@babel/code-frame-7.12.13"
- sources."@babel/compat-data-7.13.11"
+ sources."@babel/compat-data-7.13.12"
(sources."@babel/core-7.13.10" // {
dependencies = [
sources."semver-6.3.0"
@@ -90113,14 +90462,14 @@ in
sources."@babel/helper-function-name-7.12.13"
sources."@babel/helper-get-function-arity-7.12.13"
sources."@babel/helper-hoist-variables-7.13.0"
- sources."@babel/helper-member-expression-to-functions-7.13.0"
- sources."@babel/helper-module-imports-7.12.13"
- sources."@babel/helper-module-transforms-7.13.0"
+ sources."@babel/helper-member-expression-to-functions-7.13.12"
+ sources."@babel/helper-module-imports-7.13.12"
+ sources."@babel/helper-module-transforms-7.13.12"
sources."@babel/helper-optimise-call-expression-7.12.13"
sources."@babel/helper-plugin-utils-7.13.0"
sources."@babel/helper-remap-async-to-generator-7.13.0"
- sources."@babel/helper-replace-supers-7.13.0"
- sources."@babel/helper-simple-access-7.12.13"
+ sources."@babel/helper-replace-supers-7.13.12"
+ sources."@babel/helper-simple-access-7.13.12"
sources."@babel/helper-skip-transparent-expression-wrappers-7.12.1"
sources."@babel/helper-split-export-declaration-7.12.13"
sources."@babel/helper-validator-identifier-7.12.11"
@@ -90128,7 +90477,8 @@ in
sources."@babel/helper-wrap-function-7.13.0"
sources."@babel/helpers-7.13.10"
sources."@babel/highlight-7.13.10"
- sources."@babel/parser-7.13.11"
+ sources."@babel/parser-7.13.12"
+ sources."@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining-7.13.12"
sources."@babel/plugin-proposal-async-generator-functions-7.13.8"
sources."@babel/plugin-proposal-class-properties-7.13.0"
sources."@babel/plugin-proposal-dynamic-import-7.13.8"
@@ -90139,7 +90489,7 @@ in
sources."@babel/plugin-proposal-numeric-separator-7.12.13"
sources."@babel/plugin-proposal-object-rest-spread-7.13.8"
sources."@babel/plugin-proposal-optional-catch-binding-7.13.8"
- sources."@babel/plugin-proposal-optional-chaining-7.13.8"
+ sources."@babel/plugin-proposal-optional-chaining-7.13.12"
sources."@babel/plugin-proposal-private-methods-7.13.0"
sources."@babel/plugin-proposal-unicode-property-regex-7.12.13"
sources."@babel/plugin-syntax-async-generators-7.8.4"
@@ -90186,7 +90536,7 @@ in
sources."@babel/plugin-transform-typeof-symbol-7.12.13"
sources."@babel/plugin-transform-unicode-escapes-7.12.13"
sources."@babel/plugin-transform-unicode-regex-7.12.13"
- (sources."@babel/preset-env-7.13.10" // {
+ (sources."@babel/preset-env-7.13.12" // {
dependencies = [
sources."semver-6.3.0"
];
@@ -90195,7 +90545,7 @@ in
sources."@babel/runtime-7.13.10"
sources."@babel/template-7.12.13"
sources."@babel/traverse-7.13.0"
- sources."@babel/types-7.13.0"
+ sources."@babel/types-7.13.12"
sources."@bugsnag/browser-7.9.0"
sources."@bugsnag/core-7.9.0"
sources."@bugsnag/cuid-3.0.0"
@@ -90205,7 +90555,7 @@ in
sources."@dabh/diagnostics-2.0.2"
sources."@jest/types-24.9.0"
sources."@mrmlnc/readdir-enhanced-2.2.1"
- (sources."@netlify/build-9.11.2" // {
+ (sources."@netlify/build-9.13.2" // {
dependencies = [
sources."ansi-styles-4.3.0"
sources."chalk-3.0.0"
@@ -90220,7 +90570,7 @@ in
sources."locate-path-5.0.0"
];
})
- (sources."@netlify/config-4.2.0" // {
+ (sources."@netlify/config-4.3.0" // {
dependencies = [
sources."ansi-styles-4.3.0"
sources."chalk-3.0.0"
@@ -90244,7 +90594,7 @@ in
];
})
sources."@netlify/open-api-1.3.0"
- (sources."@netlify/plugin-edge-handlers-1.11.5" // {
+ (sources."@netlify/plugin-edge-handlers-1.11.6" // {
dependencies = [
sources."@nodelib/fs.stat-2.0.4"
sources."array-union-2.1.0"
@@ -90254,7 +90604,7 @@ in
sources."fast-glob-3.2.5"
sources."fill-range-7.0.1"
sources."glob-parent-5.1.2"
- sources."globby-11.0.2"
+ sources."globby-11.0.3"
sources."ignore-5.1.8"
sources."is-number-7.0.0"
sources."micromatch-4.0.2"
@@ -90263,7 +90613,7 @@ in
sources."to-regex-range-5.0.1"
];
})
- sources."@netlify/plugins-list-2.4.3"
+ sources."@netlify/plugins-list-2.5.0"
(sources."@netlify/run-utils-1.0.7" // {
dependencies = [
sources."execa-3.4.0"
@@ -90332,7 +90682,7 @@ in
sources."fast-glob-3.2.5"
sources."fill-range-7.0.1"
sources."glob-parent-5.1.2"
- sources."globby-11.0.2"
+ sources."globby-11.0.3"
sources."ignore-5.1.8"
sources."is-number-7.0.0"
sources."micromatch-4.0.2"
@@ -90408,7 +90758,7 @@ in
sources."universal-user-agent-6.0.0"
];
})
- sources."@octokit/openapi-types-5.3.2"
+ sources."@octokit/openapi-types-6.0.0"
(sources."@octokit/plugin-paginate-rest-1.1.2" // {
dependencies = [
sources."@octokit/types-2.16.2"
@@ -90433,7 +90783,7 @@ in
];
})
sources."@octokit/rest-16.43.2"
- sources."@octokit/types-6.12.2"
+ sources."@octokit/types-6.13.0"
sources."@rollup/plugin-babel-5.3.0"
(sources."@rollup/plugin-commonjs-17.1.0" // {
dependencies = [
@@ -90470,7 +90820,7 @@ in
sources."@types/istanbul-lib-report-3.0.0"
sources."@types/istanbul-reports-1.1.2"
sources."@types/keyv-3.1.1"
- sources."@types/minimatch-3.0.3"
+ sources."@types/minimatch-3.0.4"
sources."@types/mkdirp-0.5.2"
sources."@types/node-14.14.35"
sources."@types/node-fetch-2.5.8"
@@ -90545,7 +90895,7 @@ in
sources."at-least-node-1.0.0"
sources."atob-2.1.2"
sources."atob-lite-2.0.0"
- (sources."aws-sdk-2.868.0" // {
+ (sources."aws-sdk-2.871.0" // {
dependencies = [
sources."buffer-4.9.2"
sources."ieee754-1.1.13"
@@ -90619,7 +90969,7 @@ in
sources."call-bind-1.0.2"
sources."call-me-maybe-1.0.1"
sources."camelcase-5.3.1"
- sources."caniuse-lite-1.0.30001203"
+ sources."caniuse-lite-1.0.30001204"
sources."cardinal-2.1.1"
sources."caw-2.0.1"
sources."ccount-1.1.0"
@@ -90679,7 +91029,7 @@ in
})
(sources."cli-ux-5.5.1" // {
dependencies = [
- sources."ansi-escapes-4.3.1"
+ sources."ansi-escapes-4.3.2"
sources."ansi-styles-4.3.0"
sources."argparse-1.0.10"
sources."chalk-4.1.0"
@@ -90689,7 +91039,7 @@ in
sources."js-yaml-3.14.1"
sources."supports-hyperlinks-2.1.0"
sources."tslib-2.1.0"
- sources."type-fest-0.11.0"
+ sources."type-fest-0.21.3"
];
})
sources."cli-width-2.2.1"
@@ -90877,7 +91227,7 @@ in
})
sources."duplexer3-0.1.4"
sources."ee-first-1.1.1"
- sources."electron-to-chromium-1.3.693"
+ sources."electron-to-chromium-1.3.699"
sources."elegant-spinner-1.0.1"
sources."elf-cam-0.1.1"
sources."emoji-regex-8.0.0"
@@ -90888,7 +91238,7 @@ in
sources."envinfo-7.7.4"
sources."error-ex-1.3.2"
sources."error-stack-parser-2.0.6"
- sources."esbuild-0.9.6"
+ sources."esbuild-0.9.7"
sources."escalade-3.1.1"
sources."escape-goat-2.1.1"
sources."escape-html-1.0.3"
@@ -91188,10 +91538,10 @@ in
})
(sources."inquirer-autocomplete-prompt-1.3.0" // {
dependencies = [
- sources."ansi-escapes-4.3.1"
+ sources."ansi-escapes-4.3.2"
sources."ansi-styles-4.3.0"
sources."chalk-4.1.0"
- sources."type-fest-0.11.0"
+ sources."type-fest-0.21.3"
];
})
sources."into-stream-3.1.0"
@@ -91437,7 +91787,7 @@ in
sources."@netlify/zip-it-and-ship-it-2.7.1"
sources."esbuild-0.8.57"
sources."locate-path-5.0.0"
- sources."qs-6.10.0"
+ sources."qs-6.10.1"
sources."resolve-2.0.0-next.3"
sources."semver-6.3.0"
];
@@ -91638,7 +91988,7 @@ in
sources."qs-6.7.0"
sources."query-string-5.1.1"
sources."querystring-0.2.0"
- sources."queue-microtask-1.2.2"
+ sources."queue-microtask-1.2.3"
sources."random-bytes-1.0.0"
sources."random-item-3.1.0"
sources."randombytes-2.1.0"
@@ -91661,14 +92011,14 @@ in
sources."redeyed-2.1.1"
sources."regenerate-1.4.2"
sources."regenerate-unicode-properties-8.2.0"
- sources."regenerator-runtime-0.13.7"
+ sources."regenerator-runtime-0.13.8"
sources."regenerator-transform-0.14.5"
sources."regex-not-1.0.2"
sources."regexpu-core-4.7.1"
sources."registry-auth-token-4.2.1"
sources."registry-url-5.1.0"
sources."regjsgen-0.5.2"
- (sources."regjsparser-0.6.7" // {
+ (sources."regjsparser-0.6.9" // {
dependencies = [
sources."jsesc-0.5.0"
];
@@ -91695,7 +92045,7 @@ in
sources."ret-0.1.15"
sources."reusify-1.0.4"
sources."rimraf-3.0.2"
- sources."rollup-2.42.1"
+ sources."rollup-2.42.4"
(sources."rollup-plugin-inject-3.0.2" // {
dependencies = [
sources."estree-walker-0.6.1"
@@ -91718,7 +92068,7 @@ in
sources."safer-buffer-2.1.2"
sources."sax-1.2.1"
sources."seek-bzip-1.0.6"
- sources."semver-7.3.4"
+ sources."semver-7.3.5"
(sources."semver-diff-3.1.1" // {
dependencies = [
sources."semver-6.3.0"
@@ -92161,7 +92511,7 @@ in
sources."rimraf-3.0.2"
sources."safe-buffer-5.1.2"
sources."safer-buffer-2.1.2"
- sources."semver-7.3.4"
+ sources."semver-7.3.5"
sources."set-blocking-2.0.0"
sources."signal-exit-3.0.3"
sources."sshpk-1.16.1"
@@ -92979,7 +93329,7 @@ in
sources."rc-1.2.8"
sources."read-1.0.7"
sources."readable-stream-1.1.14"
- sources."regenerator-runtime-0.13.7"
+ sources."regenerator-runtime-0.13.8"
sources."reinterval-1.1.0"
sources."remove-trailing-separator-1.1.0"
(sources."request-2.88.0" // {
@@ -93222,7 +93572,7 @@ in
sources."rimraf-2.6.3"
sources."safe-buffer-5.2.1"
sources."safer-buffer-2.1.2"
- sources."semver-7.3.4"
+ sources."semver-7.3.5"
sources."set-blocking-2.0.0"
sources."signal-exit-3.0.3"
sources."slasp-0.0.4"
@@ -93485,7 +93835,7 @@ in
sources."strip-ansi-5.2.0"
];
})
- sources."ansi-escapes-4.3.1"
+ sources."ansi-escapes-4.3.2"
sources."ansi-regex-5.0.0"
sources."ansi-styles-4.3.0"
sources."any-observable-0.5.1"
@@ -93582,7 +93932,7 @@ in
sources."glob-7.1.6"
sources."glob-parent-5.1.2"
sources."global-dirs-2.1.0"
- sources."globby-11.0.2"
+ sources."globby-11.0.3"
(sources."got-10.7.0" // {
dependencies = [
sources."get-stream-5.2.0"
@@ -93771,7 +94121,7 @@ in
})
(sources."normalize-package-data-3.0.2" // {
dependencies = [
- sources."hosted-git-info-4.0.1"
+ sources."hosted-git-info-4.0.2"
];
})
sources."normalize-url-4.5.0"
@@ -93863,7 +94213,7 @@ in
sources."escape-goat-2.1.1"
];
})
- sources."queue-microtask-1.2.2"
+ sources."queue-microtask-1.2.3"
sources."quick-lru-4.0.1"
sources."rc-1.2.8"
(sources."read-pkg-5.2.0" // {
@@ -93898,7 +94248,7 @@ in
sources."rxjs-6.6.6"
sources."safer-buffer-2.1.2"
sources."scoped-regex-2.1.0"
- sources."semver-7.3.4"
+ sources."semver-7.3.5"
(sources."semver-diff-3.1.1" // {
dependencies = [
sources."semver-6.3.0"
@@ -93929,7 +94279,7 @@ in
sources."to-regex-range-5.0.1"
sources."trim-newlines-3.0.0"
sources."tslib-1.14.1"
- sources."type-fest-0.11.0"
+ sources."type-fest-0.21.3"
sources."typedarray-to-buffer-3.1.5"
sources."unique-string-2.0.0"
(sources."update-notifier-5.1.0" // {
@@ -93974,10 +94324,10 @@ in
npm = nodeEnv.buildNodePackage {
name = "npm";
packageName = "npm";
- version = "7.6.3";
+ version = "7.7.4";
src = fetchurl {
- url = "https://registry.npmjs.org/npm/-/npm-7.6.3.tgz";
- sha512 = "+Cs8TEtkfdQGTIPw8AeqVtNNHyo1Zw8HATzAFFWYnK7jQYgT/CatEy85+BlEoEpqvga2uaKqVrXsTAYj28emjg==";
+ url = "https://registry.npmjs.org/npm/-/npm-7.7.4.tgz";
+ sha512 = "+gUjp4hbUnN7S1z2S3uDTnac94uRiztzFkMLNimHsB4KpuvhO+xjg30ARoptq7UYqF6KTXA4L8XLDMuriyB9Fg==";
};
buildInputs = globalBuildInputs;
meta = {
@@ -94049,7 +94399,7 @@ in
sources."brace-expansion-1.1.11"
sources."braces-3.0.2"
sources."builtins-1.0.3"
- sources."cacache-15.0.5"
+ sources."cacache-15.0.6"
(sources."cacheable-request-6.1.0" // {
dependencies = [
sources."get-stream-5.2.0"
@@ -94120,7 +94470,7 @@ in
sources."ini-2.0.0"
];
})
- sources."globby-11.0.2"
+ sources."globby-11.0.3"
sources."got-9.6.0"
sources."graceful-fs-4.2.6"
sources."har-schema-2.0.0"
@@ -94128,7 +94478,7 @@ in
sources."has-flag-4.0.0"
sources."has-unicode-2.0.1"
sources."has-yarn-2.1.0"
- sources."hosted-git-info-4.0.1"
+ sources."hosted-git-info-4.0.2"
sources."http-cache-semantics-4.1.0"
sources."http-proxy-agent-4.0.1"
sources."http-signature-1.2.0"
@@ -94241,7 +94591,7 @@ in
sources."semver-6.3.0"
];
})
- sources."pacote-11.3.0"
+ sources."pacote-11.3.1"
sources."parse-github-url-1.0.2"
sources."path-exists-4.0.0"
sources."path-is-absolute-1.0.1"
@@ -94259,7 +94609,7 @@ in
sources."punycode-2.1.1"
sources."pupa-2.1.1"
sources."qs-6.5.2"
- sources."queue-microtask-1.2.2"
+ sources."queue-microtask-1.2.3"
sources."rc-1.2.8"
sources."rc-config-loader-4.0.0"
sources."read-package-json-fast-2.0.2"
@@ -94276,7 +94626,7 @@ in
sources."run-parallel-1.2.0"
sources."safe-buffer-5.1.2"
sources."safer-buffer-2.1.2"
- sources."semver-7.3.4"
+ sources."semver-7.3.5"
(sources."semver-diff-3.1.1" // {
dependencies = [
sources."semver-6.3.0"
@@ -94577,7 +94927,7 @@ in
};
dependencies = [
sources."@babel/code-frame-7.12.13"
- sources."@babel/compat-data-7.13.11"
+ sources."@babel/compat-data-7.13.12"
(sources."@babel/core-7.13.10" // {
dependencies = [
sources."json5-2.2.0"
@@ -94608,14 +94958,14 @@ in
sources."@babel/helper-function-name-7.12.13"
sources."@babel/helper-get-function-arity-7.12.13"
sources."@babel/helper-hoist-variables-7.13.0"
- sources."@babel/helper-member-expression-to-functions-7.13.0"
- sources."@babel/helper-module-imports-7.12.13"
- sources."@babel/helper-module-transforms-7.13.0"
+ sources."@babel/helper-member-expression-to-functions-7.13.12"
+ sources."@babel/helper-module-imports-7.13.12"
+ sources."@babel/helper-module-transforms-7.13.12"
sources."@babel/helper-optimise-call-expression-7.12.13"
sources."@babel/helper-plugin-utils-7.13.0"
sources."@babel/helper-remap-async-to-generator-7.13.0"
- sources."@babel/helper-replace-supers-7.13.0"
- sources."@babel/helper-simple-access-7.12.13"
+ sources."@babel/helper-replace-supers-7.13.12"
+ sources."@babel/helper-simple-access-7.13.12"
sources."@babel/helper-skip-transparent-expression-wrappers-7.12.1"
sources."@babel/helper-split-export-declaration-7.12.13"
sources."@babel/helper-validator-identifier-7.12.11"
@@ -94623,7 +94973,8 @@ in
sources."@babel/helper-wrap-function-7.13.0"
sources."@babel/helpers-7.13.10"
sources."@babel/highlight-7.13.10"
- sources."@babel/parser-7.13.11"
+ sources."@babel/parser-7.13.12"
+ sources."@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining-7.13.12"
sources."@babel/plugin-proposal-async-generator-functions-7.13.8"
sources."@babel/plugin-proposal-class-properties-7.13.0"
sources."@babel/plugin-proposal-dynamic-import-7.13.8"
@@ -94634,7 +94985,7 @@ in
sources."@babel/plugin-proposal-numeric-separator-7.12.13"
sources."@babel/plugin-proposal-object-rest-spread-7.13.8"
sources."@babel/plugin-proposal-optional-catch-binding-7.13.8"
- sources."@babel/plugin-proposal-optional-chaining-7.13.8"
+ sources."@babel/plugin-proposal-optional-chaining-7.13.12"
sources."@babel/plugin-proposal-private-methods-7.13.0"
sources."@babel/plugin-proposal-unicode-property-regex-7.12.13"
sources."@babel/plugin-syntax-async-generators-7.8.4"
@@ -94675,7 +95026,7 @@ in
sources."@babel/plugin-transform-object-super-7.12.13"
sources."@babel/plugin-transform-parameters-7.13.0"
sources."@babel/plugin-transform-property-literals-7.12.13"
- sources."@babel/plugin-transform-react-jsx-7.12.17"
+ sources."@babel/plugin-transform-react-jsx-7.13.12"
sources."@babel/plugin-transform-regenerator-7.12.13"
sources."@babel/plugin-transform-reserved-words-7.12.13"
sources."@babel/plugin-transform-shorthand-properties-7.12.13"
@@ -94685,7 +95036,7 @@ in
sources."@babel/plugin-transform-typeof-symbol-7.12.13"
sources."@babel/plugin-transform-unicode-escapes-7.12.13"
sources."@babel/plugin-transform-unicode-regex-7.12.13"
- (sources."@babel/preset-env-7.13.10" // {
+ (sources."@babel/preset-env-7.13.12" // {
dependencies = [
sources."semver-6.3.0"
];
@@ -94694,7 +95045,7 @@ in
sources."@babel/runtime-7.13.10"
sources."@babel/template-7.12.13"
sources."@babel/traverse-7.13.0"
- sources."@babel/types-7.13.0"
+ sources."@babel/types-7.13.12"
sources."@iarna/toml-2.2.5"
sources."@mrmlnc/readdir-enhanced-2.2.1"
sources."@nodelib/fs.stat-1.1.3"
@@ -94816,7 +95167,7 @@ in
sources."caller-path-2.0.0"
sources."callsites-2.0.0"
sources."caniuse-api-3.0.0"
- sources."caniuse-lite-1.0.30001203"
+ sources."caniuse-lite-1.0.30001204"
sources."caseless-0.12.0"
sources."chalk-2.4.2"
sources."chokidar-2.1.8"
@@ -94951,7 +95302,7 @@ in
sources."duplexer2-0.1.4"
sources."ecc-jsbn-0.1.2"
sources."ee-first-1.1.1"
- sources."electron-to-chromium-1.3.693"
+ sources."electron-to-chromium-1.3.699"
(sources."elliptic-6.5.4" // {
dependencies = [
sources."bn.js-4.12.0"
@@ -95352,7 +95703,7 @@ in
sources."readdirp-2.2.1"
sources."regenerate-1.4.2"
sources."regenerate-unicode-properties-8.2.0"
- sources."regenerator-runtime-0.13.7"
+ sources."regenerator-runtime-0.13.8"
sources."regenerator-transform-0.14.5"
(sources."regex-not-1.0.2" // {
dependencies = [
@@ -95362,7 +95713,7 @@ in
})
sources."regexpu-core-4.7.1"
sources."regjsgen-0.5.2"
- (sources."regjsparser-0.6.7" // {
+ (sources."regjsparser-0.6.9" // {
dependencies = [
sources."jsesc-0.5.0"
];
@@ -95794,7 +96145,7 @@ in
sources."serve-static-1.14.1"
(sources."service-runner-2.8.1" // {
dependencies = [
- sources."semver-7.3.4"
+ sources."semver-7.3.5"
sources."yargs-14.2.3"
];
})
@@ -95815,7 +96166,7 @@ in
sources."tunnel-agent-0.6.0"
sources."tweetnacl-0.14.5"
sources."type-is-1.6.18"
- sources."uglify-js-3.13.1"
+ sources."uglify-js-3.13.2"
sources."unix-dgram-2.0.4"
sources."unpipe-1.0.0"
sources."uri-js-4.4.1"
@@ -96133,7 +96484,7 @@ in
sources."plist-1.2.0"
sources."process-nextick-args-2.0.1"
sources."pump-2.0.1"
- sources."queue-microtask-1.2.2"
+ sources."queue-microtask-1.2.3"
sources."random-access-file-2.2.0"
sources."random-access-storage-1.4.1"
sources."random-iterate-1.0.1"
@@ -96482,7 +96833,7 @@ in
sources."pump-3.0.0"
sources."punycode-2.1.1"
sources."qs-6.7.0"
- sources."queue-microtask-1.2.2"
+ sources."queue-microtask-1.2.3"
sources."random-access-file-2.2.0"
sources."random-access-storage-1.4.1"
sources."random-bytes-1.0.0"
@@ -96840,7 +97191,7 @@ in
sources."safe-buffer-5.1.2"
sources."safer-buffer-2.1.2"
sources."sax-1.2.4"
- (sources."semver-7.3.4" // {
+ (sources."semver-7.3.5" // {
dependencies = [
sources."lru-cache-6.0.0"
sources."yallist-4.0.0"
@@ -96993,7 +97344,7 @@ in
sources."get-caller-file-2.0.5"
sources."get-stdin-8.0.0"
sources."glob-parent-5.1.2"
- sources."globby-11.0.2"
+ sources."globby-11.0.3"
sources."graceful-fs-4.2.6"
sources."has-flag-4.0.0"
sources."ignore-5.1.8"
@@ -97030,7 +97381,7 @@ in
sources."postcss-load-config-3.0.1"
sources."postcss-reporter-7.0.2"
sources."pretty-hrtime-1.0.3"
- sources."queue-microtask-1.2.2"
+ sources."queue-microtask-1.2.3"
sources."read-cache-1.0.0"
sources."readdirp-3.5.0"
sources."require-directory-2.1.1"
@@ -97448,10 +97799,10 @@ in
pyright = nodeEnv.buildNodePackage {
name = "pyright";
packageName = "pyright";
- version = "1.1.123";
+ version = "1.1.125";
src = fetchurl {
- url = "https://registry.npmjs.org/pyright/-/pyright-1.1.123.tgz";
- sha512 = "EYjELbm4G4icuIki6PfpzYrxNeGH78vNbXNmsbb/9XnnVQISdFcbc9oOBc2mU77enUwZctwZ6Nj2mZUMD9VibQ==";
+ url = "https://registry.npmjs.org/pyright/-/pyright-1.1.125.tgz";
+ sha512 = "MPaMGCnMR0i0VePXUPpXMHr23A2mkbW1Su+aTAWsqHho1rhQcxBtjeyhR0xqiwTxcC+c9eK9VwFHbd+OMGC6fQ==";
};
buildInputs = globalBuildInputs;
meta = {
@@ -97930,7 +98281,6 @@ in
sources."jsprim-1.4.1"
sources."levn-0.3.0"
sources."lodash-4.17.21"
- sources."lodash.sortby-4.7.0"
sources."mime-db-1.46.0"
sources."mime-types-2.1.29"
sources."nwsapi-2.2.0"
@@ -97977,7 +98327,7 @@ in
sources."webidl-conversions-6.1.0"
sources."whatwg-encoding-1.0.5"
sources."whatwg-mimetype-2.3.0"
- sources."whatwg-url-8.4.0"
+ sources."whatwg-url-8.5.0"
sources."word-wrap-1.2.3"
sources."wrap-ansi-7.0.0"
sources."ws-7.4.4"
@@ -98014,15 +98364,15 @@ in
sources."@babel/helper-annotate-as-pure-7.12.13"
sources."@babel/helper-function-name-7.12.13"
sources."@babel/helper-get-function-arity-7.12.13"
- sources."@babel/helper-module-imports-7.12.13"
+ sources."@babel/helper-module-imports-7.13.12"
sources."@babel/helper-split-export-declaration-7.12.13"
sources."@babel/helper-validator-identifier-7.12.11"
sources."@babel/highlight-7.13.10"
- sources."@babel/parser-7.13.11"
+ sources."@babel/parser-7.13.12"
sources."@babel/runtime-7.13.10"
sources."@babel/template-7.12.13"
sources."@babel/traverse-7.13.0"
- sources."@babel/types-7.13.0"
+ sources."@babel/types-7.13.12"
sources."@emotion/is-prop-valid-0.8.8"
sources."@emotion/memoize-0.7.4"
sources."@emotion/stylis-0.8.5"
@@ -98252,7 +98602,7 @@ in
sources."readdirp-3.5.0"
sources."redoc-2.0.0-rc.48"
sources."reftools-1.1.8"
- sources."regenerator-runtime-0.13.7"
+ sources."regenerator-runtime-0.13.8"
sources."require-directory-2.1.1"
sources."require-main-filename-2.0.0"
sources."ripemd160-2.0.2"
@@ -98289,7 +98639,7 @@ in
sources."to-regex-range-5.0.1"
sources."tslib-2.1.0"
sources."tty-browserify-0.0.0"
- sources."uglify-js-3.13.1"
+ sources."uglify-js-3.13.2"
(sources."url-0.11.0" // {
dependencies = [
sources."punycode-1.3.2"
@@ -98390,10 +98740,10 @@ in
rollup = nodeEnv.buildNodePackage {
name = "rollup";
packageName = "rollup";
- version = "2.42.1";
+ version = "2.42.4";
src = fetchurl {
- url = "https://registry.npmjs.org/rollup/-/rollup-2.42.1.tgz";
- sha512 = "/y7M2ULg06JOXmMpPzhTeQroJSchy8lX8q6qrjqil0jmLz6ejCWbQzVnWTsdmMQRhfU0QcwtiW8iZlmrGXWV4g==";
+ url = "https://registry.npmjs.org/rollup/-/rollup-2.42.4.tgz";
+ sha512 = "Zqv3EvNfcllBHyyEUM754npqsZw82VIjK34cDQMwrQ1d6aqxzeYu5yFb7smGkPU4C1Bj7HupIMeT6WU7uIdnMw==";
};
dependencies = [
sources."fsevents-2.3.2"
@@ -98441,19 +98791,19 @@ in
sources."@types/estree-0.0.39"
sources."@types/glob-7.1.3"
sources."@types/json-schema-7.0.7"
- sources."@types/minimatch-3.0.3"
+ sources."@types/minimatch-3.0.4"
sources."@types/mocha-8.2.2"
sources."@types/node-12.12.70"
sources."@types/node-fetch-2.5.8"
sources."@types/resolve-1.17.1"
sources."@types/vscode-1.54.0"
- sources."@typescript-eslint/eslint-plugin-4.18.0"
- sources."@typescript-eslint/experimental-utils-4.18.0"
- sources."@typescript-eslint/parser-4.18.0"
- sources."@typescript-eslint/scope-manager-4.18.0"
- sources."@typescript-eslint/types-4.18.0"
- sources."@typescript-eslint/typescript-estree-4.18.0"
- sources."@typescript-eslint/visitor-keys-4.18.0"
+ sources."@typescript-eslint/eslint-plugin-4.19.0"
+ sources."@typescript-eslint/experimental-utils-4.19.0"
+ sources."@typescript-eslint/parser-4.19.0"
+ sources."@typescript-eslint/scope-manager-4.19.0"
+ sources."@typescript-eslint/types-4.19.0"
+ sources."@typescript-eslint/typescript-estree-4.19.0"
+ sources."@typescript-eslint/visitor-keys-4.19.0"
sources."@ungap/promise-all-settled-1.1.2"
sources."acorn-7.4.1"
sources."acorn-jsx-5.3.1"
@@ -98595,7 +98945,7 @@ in
sources."type-fest-0.20.2"
];
})
- sources."globby-11.0.2"
+ sources."globby-11.0.3"
sources."graceful-fs-4.2.6"
sources."growl-1.10.5"
sources."has-1.0.3"
@@ -98697,7 +99047,7 @@ in
sources."progress-2.0.3"
sources."pseudomap-1.0.2"
sources."punycode-2.1.1"
- sources."queue-microtask-1.2.2"
+ sources."queue-microtask-1.2.3"
sources."randombytes-2.1.0"
sources."read-1.0.7"
(sources."readable-stream-2.3.7" // {
@@ -98713,10 +99063,10 @@ in
sources."resolve-from-4.0.0"
sources."reusify-1.0.4"
sources."rimraf-3.0.2"
- sources."rollup-2.42.1"
+ sources."rollup-2.42.4"
sources."run-parallel-1.2.0"
sources."safe-buffer-5.2.1"
- sources."semver-7.3.4"
+ sources."semver-7.3.5"
sources."serialize-javascript-5.0.1"
sources."setimmediate-1.0.5"
sources."shebang-command-2.0.0"
@@ -98987,10 +99337,10 @@ in
semver = nodeEnv.buildNodePackage {
name = "semver";
packageName = "semver";
- version = "7.3.4";
+ version = "7.3.5";
src = fetchurl {
- url = "https://registry.npmjs.org/semver/-/semver-7.3.4.tgz";
- sha512 = "tCfb2WLjqFAtXn4KEdxIhalnRtoKFN7nAwj0B3ZXCbQloV2tq5eDbcTmT68JJD3nRJq24/XgxtQKFIpQdtvmVw==";
+ url = "https://registry.npmjs.org/semver/-/semver-7.3.5.tgz";
+ sha512 = "PoeGJYh8HK4BTO/a9Tf6ZG3veo/A7ZVsYrSA6J8ny9nb3B1VrpkuN+z9OE5wfE5p6H4LchYZsegiQgbJD94ZFQ==";
};
dependencies = [
sources."lru-cache-6.0.0"
@@ -99115,10 +99465,10 @@ in
serverless = nodeEnv.buildNodePackage {
name = "serverless";
packageName = "serverless";
- version = "2.30.3";
+ version = "2.31.0";
src = fetchurl {
- url = "https://registry.npmjs.org/serverless/-/serverless-2.30.3.tgz";
- sha512 = "a/81mGvXwzw90iBGKRcXdVw0lKMWzECh/3BpX8BJvgjCSINmUPjA/HSTota2UWTFp7Ne1vuiBEiLT4x8E/6kgQ==";
+ url = "https://registry.npmjs.org/serverless/-/serverless-2.31.0.tgz";
+ sha512 = "gqjiMemQKvOEYgAQB8IuPA4v6GMg83kkxREy8i55oHnv4xwMJQ2RX11Z83Sk05qPR5fl59e3ZNuLgvXZKoOgBA==";
};
dependencies = [
sources."2-thenable-1.0.0"
@@ -99150,7 +99500,7 @@ in
];
})
sources."@serverless/component-metrics-1.0.8"
- (sources."@serverless/components-3.7.5" // {
+ (sources."@serverless/components-3.7.7" // {
dependencies = [
(sources."@serverless/utils-3.1.0" // {
dependencies = [
@@ -99177,13 +99527,13 @@ in
sources."semver-6.3.0"
];
})
- (sources."@serverless/enterprise-plugin-4.5.1" // {
+ (sources."@serverless/enterprise-plugin-4.5.2" // {
dependencies = [
sources."js-yaml-3.14.1"
];
})
sources."@serverless/event-mocks-1.1.1"
- (sources."@serverless/platform-client-4.2.1" // {
+ (sources."@serverless/platform-client-4.2.2" // {
dependencies = [
sources."adm-zip-0.4.16"
sources."js-yaml-3.14.1"
@@ -99233,7 +99583,7 @@ in
sources."string-width-3.1.0"
];
})
- sources."ansi-escapes-4.3.1"
+ sources."ansi-escapes-4.3.2"
sources."ansi-regex-4.1.0"
sources."ansi-styles-3.2.1"
sources."anymatch-3.1.1"
@@ -99272,7 +99622,7 @@ in
sources."async-2.6.3"
sources."asynckit-0.4.0"
sources."at-least-node-1.0.0"
- (sources."aws-sdk-2.868.0" // {
+ (sources."aws-sdk-2.871.0" // {
dependencies = [
sources."buffer-4.9.2"
sources."ieee754-1.1.13"
@@ -99545,7 +99895,7 @@ in
sources."github-from-package-0.0.0"
sources."glob-7.1.6"
sources."glob-parent-5.1.2"
- sources."globby-11.0.2"
+ sources."globby-11.0.3"
(sources."got-11.8.2" // {
dependencies = [
sources."@sindresorhus/is-4.0.0"
@@ -99791,7 +100141,7 @@ in
sources."qs-6.5.2"
sources."query-string-5.1.1"
sources."querystring-0.2.1"
- sources."queue-microtask-1.2.2"
+ sources."queue-microtask-1.2.3"
sources."quick-lru-5.1.1"
sources."ramda-0.26.1"
sources."rc-1.2.8"
@@ -99822,7 +100172,7 @@ in
sources."safer-buffer-2.1.2"
sources."sax-1.2.1"
sources."seek-bzip-1.0.6"
- sources."semver-7.3.4"
+ sources."semver-7.3.5"
sources."set-blocking-2.0.0"
sources."set-immediate-shim-1.0.1"
sources."shebang-command-1.2.0"
@@ -99941,7 +100291,7 @@ in
sources."tunnel-agent-0.6.0"
sources."tweetnacl-0.14.5"
sources."type-2.5.0"
- sources."type-fest-0.11.0"
+ sources."type-fest-0.21.3"
sources."typedarray-to-buffer-3.1.5"
sources."unbzip2-stream-1.4.3"
sources."universalify-0.1.2"
@@ -100641,10 +100991,10 @@ in
snyk = nodeEnv.buildNodePackage {
name = "snyk";
packageName = "snyk";
- version = "1.503.0";
+ version = "1.509.0";
src = fetchurl {
- url = "https://registry.npmjs.org/snyk/-/snyk-1.503.0.tgz";
- sha512 = "CCDlwvQJ/TyR6cbG38p/TxzE313CIvtPJe8LIxplfoLj6yswRtwspY5iYCOW4wdUzbZQyXk/Y4A7VSjXhBL9qQ==";
+ url = "https://registry.npmjs.org/snyk/-/snyk-1.509.0.tgz";
+ sha512 = "3vdfa79Phr16O6Laun5zkNOxhQ7VIPeqb+aWwREkY3xOldLiZmOgQxfwKkllc/kImDmxB1CdDmRRwSJvPGMJ3Q==";
};
dependencies = [
sources."@deepcode/dcignore-1.0.2"
@@ -100656,7 +101006,7 @@ in
sources."@sindresorhus/is-2.1.1"
sources."@snyk/cli-interface-2.11.0"
sources."@snyk/cocoapods-lockfile-parser-3.6.2"
- (sources."@snyk/code-client-3.1.4" // {
+ (sources."@snyk/code-client-3.1.5" // {
dependencies = [
sources."uuid-8.3.2"
];
@@ -100664,7 +101014,7 @@ in
sources."@snyk/composer-lockfile-parser-1.4.1"
(sources."@snyk/dep-graph-1.28.0" // {
dependencies = [
- sources."semver-7.3.4"
+ sources."semver-7.3.5"
];
})
sources."@snyk/docker-registry-v2-client-1.13.9"
@@ -100674,7 +101024,7 @@ in
sources."@snyk/graphlib-2.1.9-patch.3"
(sources."@snyk/inquirer-7.3.3-patch" // {
dependencies = [
- sources."ansi-escapes-4.3.1"
+ sources."ansi-escapes-4.3.2"
sources."chalk-4.1.0"
sources."strip-ansi-6.0.0"
];
@@ -100826,7 +101176,7 @@ in
sources."string_decoder-1.3.0"
];
})
- sources."dockerfile-ast-0.1.0"
+ sources."dockerfile-ast-0.2.0"
sources."dot-prop-5.3.0"
sources."dotnet-deps-parser-5.0.0"
sources."duplexer3-0.1.4"
@@ -101071,7 +101421,7 @@ in
})
sources."pupa-2.1.1"
sources."queue-6.0.2"
- sources."queue-microtask-1.2.2"
+ sources."queue-microtask-1.2.3"
sources."quick-lru-5.1.1"
sources."raw-body-2.4.1"
sources."rc-1.2.8"
@@ -101109,9 +101459,10 @@ in
sources."tslib-2.1.0"
];
})
- (sources."snyk-docker-plugin-4.17.3" // {
+ (sources."snyk-docker-plugin-4.19.3" // {
dependencies = [
sources."rimraf-3.0.2"
+ sources."semver-7.3.5"
sources."snyk-nodejs-lockfile-parser-1.30.2"
sources."tmp-0.2.1"
sources."uuid-8.3.2"
@@ -101178,7 +101529,7 @@ in
sources."yallist-3.1.1"
];
})
- sources."snyk-python-plugin-1.19.5"
+ sources."snyk-python-plugin-1.19.7"
sources."snyk-resolve-1.1.0"
(sources."snyk-resolve-deps-4.7.2" // {
dependencies = [
@@ -101257,7 +101608,7 @@ in
sources."tslib-1.14.1"
sources."tweetnacl-0.14.5"
sources."type-check-0.3.2"
- sources."type-fest-0.11.0"
+ sources."type-fest-0.21.3"
sources."typedarray-to-buffer-3.1.5"
sources."unique-string-2.0.0"
sources."unpipe-1.0.0"
@@ -101538,7 +101889,7 @@ in
sources."random-access-storage-1.3.0"
];
})
- sources."@types/minimatch-3.0.3"
+ sources."@types/minimatch-3.0.4"
sources."abstract-leveldown-6.0.3"
sources."aligned-block-file-1.2.2"
sources."ansi-escapes-1.4.0"
@@ -101727,7 +102078,7 @@ in
sources."extend.js-0.0.2"
sources."extglob-0.3.2"
sources."fastintcompression-0.0.4"
- sources."fastpriorityqueue-0.6.3"
+ sources."fastpriorityqueue-0.7.0"
sources."file-uri-to-path-1.0.0"
sources."filename-regex-2.0.1"
sources."fill-range-2.2.4"
@@ -101881,7 +102232,7 @@ in
sources."isarray-1.0.0"
sources."isexe-2.0.0"
sources."isobject-2.1.0"
- (sources."jitdb-2.3.3" // {
+ (sources."jitdb-2.3.4" // {
dependencies = [
sources."mkdirp-1.0.4"
sources."push-stream-11.0.0"
@@ -102576,7 +102927,7 @@ in
sources."async-1.5.2"
sources."async-limiter-1.0.1"
sources."asynckit-0.4.0"
- (sources."aws-sdk-2.868.0" // {
+ (sources."aws-sdk-2.871.0" // {
dependencies = [
sources."uuid-3.3.2"
];
@@ -103168,7 +103519,7 @@ in
dependencies = [
sources."debug-3.2.7"
sources."form-data-2.5.1"
- sources."qs-6.10.0"
+ sources."qs-6.10.1"
sources."readable-stream-2.3.7"
sources."string_decoder-1.1.1"
];
@@ -103181,7 +103532,7 @@ in
sources."esprima-4.0.1"
sources."js-yaml-3.14.1"
sources."lodash-3.10.1"
- sources."qs-6.10.0"
+ sources."qs-6.10.1"
];
})
sources."swagger-schema-official-2.0.0-bab6bed"
@@ -103353,18 +103704,18 @@ in
};
dependencies = [
sources."@babel/code-frame-7.12.13"
- sources."@babel/compat-data-7.13.11"
+ sources."@babel/compat-data-7.13.12"
sources."@babel/core-7.13.10"
sources."@babel/generator-7.13.9"
sources."@babel/helper-compilation-targets-7.13.10"
sources."@babel/helper-function-name-7.12.13"
sources."@babel/helper-get-function-arity-7.12.13"
- sources."@babel/helper-member-expression-to-functions-7.13.0"
- sources."@babel/helper-module-imports-7.12.13"
- sources."@babel/helper-module-transforms-7.13.0"
+ sources."@babel/helper-member-expression-to-functions-7.13.12"
+ sources."@babel/helper-module-imports-7.13.12"
+ sources."@babel/helper-module-transforms-7.13.12"
sources."@babel/helper-optimise-call-expression-7.12.13"
- sources."@babel/helper-replace-supers-7.13.0"
- sources."@babel/helper-simple-access-7.12.13"
+ sources."@babel/helper-replace-supers-7.13.12"
+ sources."@babel/helper-simple-access-7.13.12"
sources."@babel/helper-split-export-declaration-7.12.13"
sources."@babel/helper-validator-identifier-7.12.11"
sources."@babel/helper-validator-option-7.12.17"
@@ -103374,10 +103725,10 @@ in
sources."chalk-2.4.2"
];
})
- sources."@babel/parser-7.13.11"
+ sources."@babel/parser-7.13.12"
sources."@babel/template-7.12.13"
sources."@babel/traverse-7.13.0"
- sources."@babel/types-7.13.0"
+ sources."@babel/types-7.13.12"
sources."@nodelib/fs.scandir-2.1.4"
sources."@nodelib/fs.stat-2.0.4"
sources."@nodelib/fs.walk-1.2.6"
@@ -103403,7 +103754,7 @@ in
sources."callsites-3.1.0"
sources."camelcase-5.3.1"
sources."camelcase-keys-6.2.2"
- sources."caniuse-lite-1.0.30001203"
+ sources."caniuse-lite-1.0.30001204"
(sources."chalk-4.1.0" // {
dependencies = [
sources."ansi-styles-4.3.0"
@@ -103441,7 +103792,7 @@ in
sources."domelementtype-1.3.1"
sources."domhandler-2.4.2"
sources."domutils-1.7.0"
- sources."electron-to-chromium-1.3.693"
+ sources."electron-to-chromium-1.3.699"
sources."emoji-regex-8.0.0"
sources."entities-1.1.2"
sources."error-ex-1.3.2"
@@ -103467,13 +103818,13 @@ in
sources."global-modules-2.0.0"
sources."global-prefix-3.0.0"
sources."globals-11.12.0"
- sources."globby-11.0.2"
+ sources."globby-11.0.3"
sources."globjoin-0.1.4"
sources."gonzales-pe-4.3.0"
sources."hard-rejection-2.1.0"
sources."has-1.0.3"
sources."has-flag-3.0.0"
- sources."hosted-git-info-4.0.1"
+ sources."hosted-git-info-4.0.2"
sources."html-tags-3.1.0"
sources."htmlparser2-3.10.1"
sources."ignore-5.1.8"
@@ -103539,7 +103890,7 @@ in
sources."node-releases-1.1.71"
(sources."normalize-package-data-3.0.2" // {
dependencies = [
- sources."semver-7.3.4"
+ sources."semver-7.3.5"
];
})
sources."normalize-range-0.1.2"
@@ -103579,7 +103930,7 @@ in
sources."postcss-syntax-0.36.2"
sources."postcss-value-parser-4.1.0"
sources."punycode-2.1.1"
- sources."queue-microtask-1.2.2"
+ sources."queue-microtask-1.2.3"
sources."quick-lru-4.0.1"
(sources."read-pkg-5.2.0" // {
dependencies = [
@@ -103674,17 +104025,17 @@ in
svelte-language-server = nodeEnv.buildNodePackage {
name = "svelte-language-server";
packageName = "svelte-language-server";
- version = "0.12.22";
+ version = "0.12.24";
src = fetchurl {
- url = "https://registry.npmjs.org/svelte-language-server/-/svelte-language-server-0.12.22.tgz";
- sha512 = "Wb1gazaGXc2efzq6x+RUHA1BXNnYikFPHHN4eIO1Ju3Gl1OJ4oHpzOloKGN+dH3awche6xQjlo4Uo7ONrWPwOw==";
+ url = "https://registry.npmjs.org/svelte-language-server/-/svelte-language-server-0.12.24.tgz";
+ sha512 = "kArBDbgiSj24dgd+u9KU9XgmN6plEETUQDgXcj9o/XEYp6Ii2VBZwxTbIxHAa4AFcOwIUxq5B6gX8zzt3y7v+Q==";
};
dependencies = [
sources."@babel/code-frame-7.12.13"
sources."@babel/helper-validator-identifier-7.12.11"
sources."@babel/highlight-7.13.10"
- sources."@emmetio/abbreviation-2.2.1"
- sources."@emmetio/css-abbreviation-2.1.2"
+ sources."@emmetio/abbreviation-2.2.2"
+ sources."@emmetio/css-abbreviation-2.1.4"
sources."@emmetio/scanner-1.0.0"
sources."@types/node-14.14.35"
sources."@types/parse-json-4.0.0"
@@ -103702,7 +104053,7 @@ in
sources."cosmiconfig-7.0.0"
sources."dedent-js-1.0.1"
sources."detect-indent-6.0.0"
- sources."emmet-2.3.2"
+ sources."emmet-2.3.4"
sources."error-ex-1.3.2"
sources."escape-string-regexp-1.0.5"
sources."estree-walker-2.0.2"
@@ -103739,7 +104090,7 @@ in
sources."supports-color-5.5.0"
sources."svelte-3.35.0"
sources."svelte-preprocess-4.6.9"
- sources."svelte2tsx-0.1.182"
+ sources."svelte2tsx-0.1.184"
sources."to-regex-range-5.0.1"
sources."tslib-2.1.0"
sources."typescript-4.2.3"
@@ -103780,7 +104131,7 @@ in
sources."chalk-4.1.0"
sources."color-convert-2.0.1"
sources."color-name-1.1.4"
- sources."commander-7.1.0"
+ sources."commander-7.2.0"
sources."css-select-3.1.2"
sources."css-tree-1.1.2"
sources."css-what-4.0.0"
@@ -104208,7 +104559,7 @@ in
dependencies = [
sources."debug-3.2.7"
sources."ms-2.1.3"
- sources."qs-6.10.0"
+ sources."qs-6.10.1"
sources."superagent-3.8.3"
];
})
@@ -104386,7 +104737,7 @@ in
sources."truncate-utf8-bytes-1.0.2"
sources."type-is-1.6.18"
sources."typedarray-0.0.6"
- sources."uglify-js-3.13.1"
+ sources."uglify-js-3.13.2"
sources."undefsafe-2.0.3"
(sources."union-value-1.0.1" // {
dependencies = [
@@ -105100,7 +105451,7 @@ in
sources."mdast-comment-marker-1.1.2"
sources."mdast-util-mdx-0.1.1"
sources."mdast-util-mdx-expression-0.1.1"
- sources."mdast-util-mdx-jsx-0.1.3"
+ sources."mdast-util-mdx-jsx-0.1.4"
sources."mdast-util-mdxjs-esm-0.1.1"
sources."mdast-util-to-markdown-0.6.5"
sources."mdast-util-to-nlcst-4.0.1"
@@ -105572,7 +105923,7 @@ in
sources."@textlint/types-1.5.4"
sources."boundary-1.0.1"
sources."lodash-4.17.21"
- sources."split-lines-2.0.0"
+ sources."split-lines-2.1.0"
sources."structured-source-3.0.2"
sources."textlint-rule-helper-2.1.1"
sources."unist-util-is-3.0.0"
@@ -106043,7 +106394,7 @@ in
sources."read-chunk-3.2.0"
sources."readable-stream-3.6.0"
sources."readable-web-to-node-stream-2.0.0"
- sources."regenerator-runtime-0.13.7"
+ sources."regenerator-runtime-0.13.8"
sources."registry-auth-token-4.2.1"
sources."registry-url-5.1.0"
(sources."request-2.88.2" // {
@@ -106285,7 +106636,7 @@ in
sources."rimraf-2.6.3"
sources."safe-buffer-5.2.1"
sources."safer-buffer-2.1.2"
- sources."semver-7.3.4"
+ sources."semver-7.3.5"
sources."sprintf-0.1.5"
sources."sshpk-1.16.1"
sources."stack-trace-0.0.10"
@@ -106646,10 +106997,10 @@ in
uglify-js = nodeEnv.buildNodePackage {
name = "uglify-js";
packageName = "uglify-js";
- version = "3.13.1";
+ version = "3.13.2";
src = fetchurl {
- url = "https://registry.npmjs.org/uglify-js/-/uglify-js-3.13.1.tgz";
- sha512 = "EWhx3fHy3M9JbaeTnO+rEqzCe1wtyQClv6q3YWq0voOj4E+bMZBErVS1GAHPDiRGONYq34M1/d8KuQMgvi6Gjw==";
+ url = "https://registry.npmjs.org/uglify-js/-/uglify-js-3.13.2.tgz";
+ sha512 = "SbMu4D2Vo95LMC/MetNaso1194M1htEA+JrqE9Hk+G2DhI+itfS9TRu9ZKeCahLDNa/J3n4MqUJ/fOHMzQpRWw==";
};
buildInputs = globalBuildInputs;
meta = {
@@ -106884,7 +107235,7 @@ in
sources."rimraf-3.0.2"
sources."safe-buffer-5.1.2"
sources."safer-buffer-2.1.2"
- (sources."semver-7.3.4" // {
+ (sources."semver-7.3.5" // {
dependencies = [
sources."lru-cache-6.0.0"
sources."yallist-4.0.0"
@@ -106998,7 +107349,7 @@ in
sources."concat-map-0.0.1"
sources."console-control-strings-1.1.0"
sources."core-util-is-1.0.2"
- sources."d3-array-2.12.0"
+ sources."d3-array-2.12.1"
sources."d3-color-2.0.0"
sources."d3-delaunay-5.3.0"
sources."d3-dispatch-2.0.0"
@@ -108105,8 +108456,8 @@ in
sources."v8-compile-cache-2.3.0"
sources."vm-browserify-1.1.2"
sources."vsce-1.87.0"
- sources."vscode-debugadapter-testsupport-1.45.0"
- sources."vscode-debugprotocol-1.45.0"
+ sources."vscode-debugadapter-testsupport-1.46.0"
+ sources."vscode-debugprotocol-1.46.0"
(sources."watchpack-1.7.5" // {
dependencies = [
sources."chokidar-3.5.1"
@@ -108433,7 +108784,7 @@ in
sources."tslib-1.14.1"
sources."tunnel-agent-0.6.0"
sources."tweetnacl-0.14.5"
- sources."uglify-js-3.13.1"
+ sources."uglify-js-3.13.2"
sources."uid-0.0.2"
sources."unbzip2-stream-1.4.3"
sources."unyield-0.0.1"
@@ -109434,7 +109785,7 @@ in
sources."@mdn/browser-compat-data-3.1.3"
sources."@sindresorhus/is-0.14.0"
sources."@szmarczak/http-timer-1.1.2"
- sources."@types/minimatch-3.0.3"
+ sources."@types/minimatch-3.0.4"
sources."@types/node-14.14.35"
sources."@types/yauzl-2.9.1"
sources."acorn-7.4.1"
@@ -109896,7 +110247,7 @@ in
})
sources."readable-stream-3.6.0"
sources."readdir-glob-1.1.1"
- sources."regenerator-runtime-0.13.7"
+ sources."regenerator-runtime-0.13.8"
sources."regexp.prototype.flags-1.3.1"
sources."regexpp-3.1.0"
sources."registry-auth-token-4.2.1"
@@ -110040,10 +110391,10 @@ in
webpack = nodeEnv.buildNodePackage {
name = "webpack";
packageName = "webpack";
- version = "5.27.1";
+ version = "5.28.0";
src = fetchurl {
- url = "https://registry.npmjs.org/webpack/-/webpack-5.27.1.tgz";
- sha512 = "rxIDsPZ3Apl3JcqiemiLmWH+hAq04YeOXqvCxNZOnTp8ZgM9NEPtbu4CaMfMEf9KShnx/Ym8uLGmM6P4XnwCoA==";
+ url = "https://registry.npmjs.org/webpack/-/webpack-5.28.0.tgz";
+ sha512 = "1xllYVmA4dIvRjHzwELgW4KjIU1fW4PEuEnjsylz7k7H5HgPOctIq7W1jrt3sKH9yG5d72//XWzsHhfoWvsQVg==";
};
dependencies = [
sources."@types/eslint-7.2.7"
@@ -110073,11 +110424,11 @@ in
sources."ajv-keywords-3.5.2"
sources."browserslist-4.16.3"
sources."buffer-from-1.1.1"
- sources."caniuse-lite-1.0.30001203"
+ sources."caniuse-lite-1.0.30001204"
sources."chrome-trace-event-1.0.2"
sources."colorette-1.2.2"
sources."commander-2.20.3"
- sources."electron-to-chromium-1.3.693"
+ sources."electron-to-chromium-1.3.699"
sources."enhanced-resolve-5.7.0"
sources."es-module-lexer-0.4.1"
sources."escalade-3.1.1"
@@ -110152,7 +110503,7 @@ in
sources."ansi-colors-4.1.1"
sources."clone-deep-4.0.1"
sources."colorette-1.2.2"
- sources."commander-7.1.0"
+ sources."commander-7.2.0"
sources."cross-spawn-7.0.3"
sources."enquirer-2.3.6"
sources."envinfo-7.7.4"
@@ -110217,7 +110568,7 @@ in
};
dependencies = [
sources."@types/glob-7.1.3"
- sources."@types/minimatch-3.0.3"
+ sources."@types/minimatch-3.0.4"
sources."@types/node-14.14.35"
sources."accepts-1.3.7"
sources."ajv-6.12.6"
@@ -110791,10 +111142,10 @@ in
copy-webpack-plugin = nodeEnv.buildNodePackage {
name = "copy-webpack-plugin";
packageName = "copy-webpack-plugin";
- version = "8.0.0";
+ version = "8.1.0";
src = fetchurl {
- url = "https://registry.npmjs.org/copy-webpack-plugin/-/copy-webpack-plugin-8.0.0.tgz";
- sha512 = "sqGe2FsB67wV/De+sz5azQklADe4thN016od6m7iK9KbjrSc1SEgg5QZ0LN+jGx5aZR52CbuXbqOhoIbqzzXlA==";
+ url = "https://registry.npmjs.org/copy-webpack-plugin/-/copy-webpack-plugin-8.1.0.tgz";
+ sha512 = "Soiq8kXI2AZkpw3dSp18u6oU2JonC7UKv3UdXsKOmT1A5QT46ku9+6c0Qy29JDbSavQJNN1/eKGpd3QNw+cZWg==";
};
dependencies = [
sources."@nodelib/fs.scandir-2.1.4"
@@ -110812,7 +111163,7 @@ in
sources."fastq-1.11.0"
sources."fill-range-7.0.1"
sources."glob-parent-5.1.2"
- sources."globby-11.0.2"
+ sources."globby-11.0.3"
sources."ignore-5.1.8"
sources."is-extglob-2.1.1"
sources."is-glob-4.0.1"
@@ -110825,7 +111176,7 @@ in
sources."path-type-4.0.0"
sources."picomatch-2.2.2"
sources."punycode-2.1.1"
- sources."queue-microtask-1.2.2"
+ sources."queue-microtask-1.2.3"
sources."randombytes-2.1.0"
sources."reusify-1.0.4"
sources."run-parallel-1.2.0"
@@ -111055,7 +111406,7 @@ in
sources."protobufjs-6.10.2"
sources."pump-3.0.0"
sources."qap-3.3.1"
- sources."queue-microtask-1.2.2"
+ sources."queue-microtask-1.2.3"
sources."random-access-file-2.2.0"
sources."random-access-storage-1.4.1"
sources."random-iterate-1.0.1"
@@ -111136,7 +111487,7 @@ in
sources."utp-native-2.3.0"
sources."videostream-3.2.2"
sources."vlc-command-1.2.0"
- (sources."webtorrent-0.115.4" // {
+ (sources."webtorrent-0.116.0" // {
dependencies = [
sources."debug-4.3.2"
sources."decompress-response-6.0.0"
@@ -111292,7 +111643,7 @@ in
sources."@nodelib/fs.stat-1.1.3"
sources."@sindresorhus/is-0.7.0"
sources."@types/glob-7.1.3"
- sources."@types/minimatch-3.0.3"
+ sources."@types/minimatch-3.0.4"
sources."@types/node-14.14.35"
sources."@types/normalize-package-data-2.4.0"
sources."JSONStream-1.3.5"
@@ -111544,7 +111895,7 @@ in
sources."glob-to-regexp-0.3.0"
(sources."global-agent-2.1.12" // {
dependencies = [
- sources."semver-7.3.4"
+ sources."semver-7.3.5"
];
})
sources."global-dirs-0.1.1"
@@ -111869,7 +112220,7 @@ in
sources."indent-string-2.1.0"
];
})
- sources."regenerator-runtime-0.13.7"
+ sources."regenerator-runtime-0.13.8"
sources."regex-not-1.0.2"
sources."registry-auth-token-3.4.0"
sources."registry-url-3.1.0"
@@ -112132,7 +112483,7 @@ in
sources."yeoman-doctor-4.0.0"
(sources."yeoman-environment-2.10.3" // {
dependencies = [
- sources."ansi-escapes-4.3.1"
+ sources."ansi-escapes-4.3.2"
sources."ansi-regex-5.0.0"
sources."ansi-styles-4.3.0"
sources."cli-cursor-3.1.0"
@@ -112159,7 +112510,7 @@ in
sources."onetime-5.1.2"
sources."path-key-3.1.1"
sources."restore-cursor-3.1.0"
- sources."semver-7.3.4"
+ sources."semver-7.3.5"
sources."shebang-command-2.0.0"
sources."shebang-regex-3.0.0"
(sources."string-width-4.2.2" // {
@@ -112173,7 +112524,7 @@ in
];
})
sources."supports-color-7.2.0"
- sources."type-fest-0.11.0"
+ sources."type-fest-0.21.3"
sources."which-2.0.2"
];
})
@@ -112211,7 +112562,7 @@ in
sources."pify-4.0.1"
sources."read-pkg-5.2.0"
sources."read-pkg-up-5.0.0"
- sources."semver-7.3.4"
+ sources."semver-7.3.5"
sources."slash-2.0.0"
sources."type-fest-0.6.0"
];
diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/cpuid/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/cpuid/default.nix
index 8adca8b956..a0c28bc92d 100644
--- a/third_party/nixpkgs/pkgs/development/ocaml-modules/cpuid/default.nix
+++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/cpuid/default.nix
@@ -4,6 +4,8 @@ buildDunePackage rec {
pname = "cpuid";
version = "0.1.2";
+ useDune2 = true;
+
minimumOCamlVersion = "4.03";
src = fetchurl {
diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/eliom/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/eliom/default.nix
index 4c845273d7..92d89afe39 100644
--- a/third_party/nixpkgs/pkgs/development/ocaml-modules/eliom/default.nix
+++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/eliom/default.nix
@@ -1,6 +1,7 @@
-{ stdenv, lib, fetchzip, which, ocsigen_server, ocaml,
+{ stdenv, lib, fetchzip, fetchpatch, which, ocsigen_server, ocaml,
lwt_react,
opaline, ppx_deriving, findlib
+, ocaml-migrate-parsetree
, ppx_tools_versioned
, js_of_ocaml-ocamlbuild, js_of_ocaml-ppx, js_of_ocaml-ppx_deriving_json
, js_of_ocaml-lwt
@@ -22,7 +23,17 @@ stdenv.mkDerivation rec
sha256 = "00m6v2k4mg8705dy41934lznl6gj91i6dk7p1nkaccm51nna25kz";
};
- buildInputs = [ ocaml which findlib js_of_ocaml-ocamlbuild js_of_ocaml-ppx_deriving_json opaline
+ patches = [
+ # Compatibility with js_of_ocaml >= 3.9.0, remove at next release
+ (fetchpatch {
+ url = "https://github.com/ocsigen/eliom/commit/4106a4217956f7b74a8ef3f73a1e1f55e02ade45.patch";
+ sha256 = "1cgbvpljn9x6zxirxf3rdjrsdwy319ykz3qq03c36cc40hy2w13p";
+ })
+ ];
+
+ buildInputs = [ ocaml which findlib js_of_ocaml-ocamlbuild
+ ocaml-migrate-parsetree
+ js_of_ocaml-ppx_deriving_json opaline
ppx_tools_versioned
];
diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/git/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/git/default.nix
index 0fd66226e3..b8d73178d0 100644
--- a/third_party/nixpkgs/pkgs/development/ocaml-modules/git/default.nix
+++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/git/default.nix
@@ -8,14 +8,14 @@
buildDunePackage rec {
pname = "git";
- version = "3.3.2";
+ version = "3.3.3";
minimumOCamlVersion = "4.08";
useDune2 = true;
src = fetchurl {
url = "https://github.com/mirage/ocaml-git/releases/download/${version}/git-${version}.tbz";
- sha256 = "01xcjggsb13n6018lp6ic0f6pglfl39qcg126h1k3da19hvpzhrv";
+ sha256 = "0j8pw9w74bfhrjsqr8zm8g7h1az94z9vg7qgc6z6649zm9yjiax3";
};
buildInputs = [
diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/janestreet/0.14.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/janestreet/0.14.nix
index 0bcdd78095..738828e830 100644
--- a/third_party/nixpkgs/pkgs/development/ocaml-modules/janestreet/0.14.nix
+++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/janestreet/0.14.nix
@@ -182,7 +182,8 @@ rec {
base_quickcheck = janePackage {
pname = "base_quickcheck";
- hash = "1lmp1h68g0gqiw8m6gqcbrp0fn76nsrlsqrwxp20d7jhh0693f3j";
+ version = "0.14.1";
+ hash = "0apq3d9xb0zdaqsl4cjk5skyig57ff1plndb2mh0nn3czvfhifxs";
minimumOCamlVersion = "4.04.2";
meta.description = "Randomized testing framework, designed for compatibility with Base";
propagatedBuildInputs = [ ppx_base ppx_fields_conv ppx_let ppx_sexp_value splittable_random ];
@@ -450,7 +451,8 @@ rec {
ppx_custom_printf = janePackage {
pname = "ppx_custom_printf";
- hash = "0p9hgx0krxqw8hlzfv2bg2m3zi5nxsnzhyp0fj5936rapad02hc5";
+ version = "0.14.1";
+ hash = "0c1m65kn27zvwmfwy7kk46ga76yw2a3ik9jygpy1b6nn6pi026w9";
minimumOCamlVersion = "4.04.2";
meta.description = "Printf-style format-strings for user-defined string conversion";
propagatedBuildInputs = [ ppx_sexp_conv ];
@@ -466,7 +468,8 @@ rec {
ppx_expect = janePackage {
pname = "ppx_expect";
- hash = "05v6jzn1nbmwk3vzxxnb3380wzg2nb28jpb3v5m5c4ikn0jrhcwn";
+ version = "0.14.1";
+ hash = "0vbbnjrzpyk5p0js21lafr6fcp2wqka89p1876rdf472cmg0l7fv";
minimumOCamlVersion = "4.04.2";
meta.description = "Cram like framework for OCaml";
propagatedBuildInputs = [ ppx_here ppx_inline_test re ];
@@ -559,7 +562,8 @@ rec {
ppx_optcomp = janePackage {
pname = "ppx_optcomp";
- hash = "1wav3zgh4244x1ll562g735cwwrzyk5jj72niq9jgz9qjlpsprlk";
+ version = "0.14.1";
+ hash = "0j5smqa0hig1yn8wfrb4mv0y59kkwsalmqkm5asbd7kcc6589ap4";
minimumOCamlVersion = "4.04.2";
meta.description = "Optional compilation for OCaml";
propagatedBuildInputs = [ ppxlib ];
@@ -591,16 +595,17 @@ rec {
ppx_sexp_conv = janePackage {
pname = "ppx_sexp_conv";
- version = "0.14.1";
+ version = "0.14.3";
minimumOCamlVersion = "4.04.2";
- hash = "04bx5id99clrgvkg122nx03zig1m7igg75piphhyx04w33shgkz2";
+ hash = "0dbri9d00ydi0dw1cavswnqdmhjaaz80vap29ns2lr6mhhlvyjmj";
meta.description = "[@@deriving] plugin to generate S-expression conversion functions";
propagatedBuildInputs = [ ppxlib sexplib0 base ];
};
ppx_sexp_message = janePackage {
pname = "ppx_sexp_message";
- hash = "17xnq345xwfkl9ydn05ljsg37m2glh3alnspayl3fgbhmcjmav3i";
+ version = "0.14.1";
+ hash = "1lvsr0d68kakih1ll33hy6dxbjkly6lmky4q6z0h0hrcbd6z48k4";
minimumOCamlVersion = "4.04.2";
meta.description = "A ppx rewriter for easy construction of s-expressions";
propagatedBuildInputs = [ ppx_here ppx_sexp_conv ];
@@ -634,9 +639,9 @@ rec {
ppx_typerep_conv = janePackage {
pname = "ppx_typerep_conv";
- version = "0.14.1";
+ version = "0.14.2";
minimumOCamlVersion = "4.04.2";
- hash = "1r0z7qlcpaicas5hkymy2q0gi207814wlay4hys7pl5asd59wcdh";
+ hash = "0yk9vkpnwr8labgfncqdi4rfkj88d8mb3cr8m4gdqpi3f2r27hf0";
meta.description = "Generation of runtime types from type declarations";
propagatedBuildInputs = [ ppxlib typerep ];
};
diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/ocaml-freestanding/configurable-binding.patch b/third_party/nixpkgs/pkgs/development/ocaml-modules/ocaml-freestanding/configurable-binding.patch
new file mode 100644
index 0000000000..25a7b92f01
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/ocaml-freestanding/configurable-binding.patch
@@ -0,0 +1,49 @@
+commit b273c9f7ab10475787db4d6e09bd4b71b374d0ec
+Author: sternenseemann <0rpkxez4ksa01gb3typccl0i@systemli.org>
+Date: Thu Mar 18 01:28:46 2021 +0100
+
+ Let user specify solo5-binding to use
+
+ This is a little feature for the configure script I wanted to have for
+ the NixOS package: It allows the user to set PKG_CONFIG_DEPS before
+ running configure.sh to disable the autodetection mechanism. This is
+ useful for NixOS as we have all bindings bundled in the solo5 package,
+ so the result would also be solo5-bindings-xen. Additionally, it allows
+ us to do the binding selection declaratively and minimize the risk of
+ accidentally switching backend.
+
+ PKG_CONFIG_DEPS seems like a bit of an unappropriate variable name for a
+ user “interface”, let me know if you want a dedicated environment
+ variable for this in case there will be more PKG_CONFIG_DEPS.
+
+diff --git a/configure.sh b/configure.sh
+index c254f7b..c675a02 100755
+--- a/configure.sh
++++ b/configure.sh
+@@ -11,13 +11,19 @@ if pkg_exists solo5-bindings-hvt solo5-bindings-spt solo5-bindings-virtio solo5-
+ echo "ERROR: Only one of solo5-bindings-hvt, solo5-bindings-spt, solo5-bindings-virtio, solo5-bindings-muen, solo5-bindings-genode, solo5-bindings-xen can be installed." 1>&2
+ exit 1
+ fi
+-PKG_CONFIG_DEPS=
+-pkg_exists solo5-bindings-hvt && PKG_CONFIG_DEPS=solo5-bindings-hvt
+-pkg_exists solo5-bindings-spt && PKG_CONFIG_DEPS=solo5-bindings-spt
+-pkg_exists solo5-bindings-muen && PKG_CONFIG_DEPS=solo5-bindings-muen
+-pkg_exists solo5-bindings-virtio && PKG_CONFIG_DEPS=solo5-bindings-virtio
+-pkg_exists solo5-bindings-genode && PKG_CONFIG_DEPS=solo5-bindings-genode
+-pkg_exists solo5-bindings-xen && PKG_CONFIG_DEPS=solo5-bindings-xen
++if [ -z "${PKG_CONFIG_DEPS}" ]; then
++ PKG_CONFIG_DEPS=
++ pkg_exists solo5-bindings-hvt && PKG_CONFIG_DEPS=solo5-bindings-hvt
++ pkg_exists solo5-bindings-spt && PKG_CONFIG_DEPS=solo5-bindings-spt
++ pkg_exists solo5-bindings-muen && PKG_CONFIG_DEPS=solo5-bindings-muen
++ pkg_exists solo5-bindings-virtio && PKG_CONFIG_DEPS=solo5-bindings-virtio
++ pkg_exists solo5-bindings-genode && PKG_CONFIG_DEPS=solo5-bindings-genode
++ pkg_exists solo5-bindings-xen && PKG_CONFIG_DEPS=solo5-bindings-xen
++else
++ pkg_exists "${PKG_CONFIG_DEPS}" \
++ || (echo "ERROR: ${PKG_CONFIG_DEPS} is not installed" 1>&2; exit 1) \
++ || exit 1
++fi
+ if [ -z "${PKG_CONFIG_DEPS}" ]; then
+ echo "ERROR: No supported Solo5 bindings package found." 1>&2
+ echo "ERROR: solo5-bindings-hvt, solo5-bindings-spt, solo5-bindings-virtio, solo5-bindings-muen, solo5-bindings-genode or solo5-bindings-xen must be installed." 1>&2
diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/ocaml-freestanding/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/ocaml-freestanding/default.nix
new file mode 100644
index 0000000000..a777b7b22b
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/ocaml-freestanding/default.nix
@@ -0,0 +1,87 @@
+{ lib
+, stdenv
+, fetchFromGitHub
+, ocaml
+, pkg-config
+, solo5
+, target ? "xen"
+}:
+
+# note: this is not technically an ocaml-module,
+# but can be built with different compilers, so
+# the ocamlPackages set is very useful.
+
+let
+ pname = "ocaml-freestanding";
+in
+
+if lib.versionOlder ocaml.version "4.08"
+then builtins.throw "${pname} is not available for OCaml ${ocaml.version}"
+else
+
+stdenv.mkDerivation rec {
+ name = "ocaml${ocaml.version}-${pname}-${version}";
+ inherit pname;
+ version = "0.6.4";
+
+ src = fetchFromGitHub {
+ owner = "mirage";
+ repo = pname;
+ rev = "v${version}";
+ sha256 = "0w3x2wfd04qr6mci4cp1gfqw33yysp8gamgkpgbgwslr0skryiq5";
+ };
+
+ postUnpack = ''
+ # get ocaml-src from the ocaml drv instead of via ocamlfind
+ mkdir -p "${src.name}/ocaml"
+ tar --strip-components=1 -xf ${ocaml.src} -C "${src.name}/ocaml"
+ '';
+
+ patches = [
+ ./no-opam.patch
+ ./configurable-binding.patch
+ ];
+
+ nativeBuildInputs = [
+ ocaml
+ pkg-config
+ ];
+
+ buildInputs = [ solo5 ];
+
+ configurePhase = ''
+ runHook preConfigure
+ env PKG_CONFIG_DEPS=solo5-bindings-${target} sh configure.sh
+ runHook postConfigure
+ '';
+
+ preBuild = ''
+ # perform substitutions, so opam isn't needed
+ for flags in flags/cflags.tmp flags/libs.tmp; do
+ substitute "$flags.in" "$flags" \
+ --replace "%{prefix}%" "$out" \
+ --replace "%{ocaml-freestanding:lib}%" "$out/lib"
+ done
+ '';
+
+ installPhase = ''
+ runHook preInstall
+ ./install.sh "$out"
+ runHook postInstall
+ '';
+
+ meta = with lib; {
+ description = "Freestanding OCaml runtime";
+ license = licenses.mit;
+ maintainers = [ maintainers.sternenseemann ];
+ homepage = "https://github.com/mirage/ocaml-freestanding";
+ platforms = builtins.map ({ arch, os }: "${arch}-${os}")
+ (cartesianProductOfSets {
+ arch = [ "aarch64" "x86_64" ];
+ os = [ "linux" ];
+ } ++ [
+ { arch = "x86_64"; os = "freebsd"; }
+ { arch = "x86_64"; os = "openbsd"; }
+ ]);
+ };
+}
diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/ocaml-freestanding/no-opam.patch b/third_party/nixpkgs/pkgs/development/ocaml-modules/ocaml-freestanding/no-opam.patch
new file mode 100644
index 0000000000..43141b1472
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/ocaml-freestanding/no-opam.patch
@@ -0,0 +1,84 @@
+commit 637b7ce639d54e617170433aa9596176b167d085
+Author: sternenseemann <0rpkxez4ksa01gb3typccl0i@systemli.org>
+Date: Thu Mar 18 01:07:49 2021 +0100
+
+ Allow building without ocamlfind and opam
+
+ This change is the result of my first go at packaging ocaml-freestanding
+ for NixOS. Our build infrastructure for ocaml there is completely
+ independent of opam at the moment, so depending on opam for the build
+ time is not an option, especially in this case where the information it
+ would give us would be garbage.
+
+ Fortunately the build environment plays nicely with pkg-config which is
+ already heavily used by ocaml-freestanding. This patch leaves pkg-config
+ to its own devices if opam is not present (it can be assisted by a
+ manually set PKG_CONFIG_PATH environment variable).
+
+ Additionally, in configure.sh we check if the target ocaml source
+ directory already exists. This allows for building ocaml-freestanding
+ without the ocaml-src package (which would be unnecessarily cumbersome
+ to package for NixOS) and ocamlfind (one less dependency is always a
+ nice bonus). The Makefile needs no fix since the target ocaml/Makefile
+ won't be built if it's already present.
+
+diff --git a/Makefile b/Makefile
+index b07b8c6..a68b31d 100644
+--- a/Makefile
++++ b/Makefile
+@@ -2,6 +2,12 @@
+
+ include Makeconf
+
++ifneq ($(shell command -v opam),)
++ # only set if opam is available and PKG_CONFIG_PATH isn't
++ # already set in the environment or on the command line
++ PKG_CONFIG_PATH ?= $(shell opam config var prefix)/lib/pkgconfig
++endif
++
+ FREESTANDING_LIBS=openlibm/libopenlibm.a \
+ ocaml/runtime/libasmrun.a \
+ nolibc/libnolibc.a
+@@ -73,8 +79,7 @@ flags/libs.tmp: flags/libs.tmp.in
+ opam config subst $@
+
+ flags/libs: flags/libs.tmp Makeconf
+- env PKG_CONFIG_PATH="$(shell opam config var prefix)/lib/pkgconfig" \
+- pkg-config $(PKG_CONFIG_DEPS) --libs >> $<
++ pkg-config $(PKG_CONFIG_DEPS) --libs >> $<
+ awk -v RS= -- '{ \
+ sub("@@PKG_CONFIG_EXTRA_LIBS@@", "$(PKG_CONFIG_EXTRA_LIBS)", $$0); \
+ print "(", $$0, ")" \
+@@ -84,8 +89,7 @@ flags/cflags.tmp: flags/cflags.tmp.in
+ opam config subst $@
+
+ flags/cflags: flags/cflags.tmp Makeconf
+- env PKG_CONFIG_PATH="$(shell opam config var prefix)/lib/pkgconfig" \
+- pkg-config $(PKG_CONFIG_DEPS) --cflags >> $<
++ pkg-config $(PKG_CONFIG_DEPS) --cflags >> $<
+ awk -v RS= -- '{ \
+ print "(", $$0, ")" \
+ }' $< >$@
+diff --git a/configure.sh b/configure.sh
+index 4d154ed..c254f7b 100755
+--- a/configure.sh
++++ b/configure.sh
+@@ -1,6 +1,8 @@
+ #!/bin/sh
+
+-export PKG_CONFIG_PATH=$(opam config var prefix)/lib/pkgconfig
++if command -v opam &> /dev/null; then
++ export PKG_CONFIG_PATH=$(opam config var prefix)/lib/pkgconfig
++fi
+ pkg_exists() {
+ pkg-config --exists "$@"
+ }
+@@ -21,7 +23,7 @@ if [ -z "${PKG_CONFIG_DEPS}" ]; then
+ echo "ERROR: solo5-bindings-hvt, solo5-bindings-spt, solo5-bindings-virtio, solo5-bindings-muen, solo5-bindings-genode or solo5-bindings-xen must be installed." 1>&2
+ exit 1
+ fi
+-ocamlfind query ocaml-src >/dev/null || exit 1
++[ -e "$(dirname "$0")/ocaml" ] || ocamlfind query ocaml-src >/dev/null || exit 1
+
+ FREESTANDING_CFLAGS="$(pkg-config --cflags ${PKG_CONFIG_DEPS})"
+ BUILD_ARCH="$(uname -m)"
diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/ocaml-version/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/ocaml-version/default.nix
index 54133850e0..4fde475cf9 100644
--- a/third_party/nixpkgs/pkgs/development/ocaml-modules/ocaml-version/default.nix
+++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/ocaml-version/default.nix
@@ -7,6 +7,8 @@ buildDunePackage rec {
minimumOCamlVersion = "4.07";
+ useDune2 = true;
+
src = fetchurl {
url = "https://github.com/ocurrent/ocaml-version/releases/download/v${version}/ocaml-version-v${version}.tbz";
sha256 = "15vk8sh50p3f2mbv8z7mqnx76cffri36f2krp25zkkwix8jg7ci4";
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 f67d614af3..5c00f2c899 100644
--- a/third_party/nixpkgs/pkgs/development/ocaml-modules/pgocaml/default.nix
+++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/pgocaml/default.nix
@@ -4,12 +4,12 @@
buildDunePackage rec {
pname = "pgocaml";
- version = "4.2.2";
+ version = "4.2.2-dev-20210111";
src = fetchFromGitHub {
owner = "darioteixeira";
repo = "pgocaml";
- rev = version;
- sha256 = "1rdypc83nap9j2ml9r6n1pzgf79gk1yffwyi6fmcrl7zmy01cg0n";
+ rev = "1bb0025deeb3d14029afdcc69aaa7847026e243e";
+ sha256 = "11inbjf87gclc2xmpq56ag4cm4467y9q9hjgbdn69fa1bman2zn2";
};
minimumOCamlVersion = "4.08";
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 35c19622f8..dce2e2b0c9 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_optcomp, ppx_tools, ppx_tools_versioned, rresult }:
+{ buildDunePackage, pgocaml, ppx_optcomp }:
buildDunePackage {
pname = "pgocaml_ppx";
inherit (pgocaml) src version useDune2 meta;
- propagatedBuildInputs = [ pgocaml ppx_optcomp ppx_tools ppx_tools_versioned rresult ];
+ propagatedBuildInputs = [ pgocaml ppx_optcomp ];
}
diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/ppxlib/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/ppxlib/default.nix
index 11b608e6ef..c92992197d 100644
--- a/third_party/nixpkgs/pkgs/development/ocaml-modules/ppxlib/default.nix
+++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/ppxlib/default.nix
@@ -1,5 +1,8 @@
{ lib, fetchFromGitHub, buildDunePackage, ocaml
-, version ? if lib.versionAtLeast ocaml.version "4.07" then "0.15.0" else "0.13.0"
+, version ?
+ if lib.versionAtLeast ocaml.version "4.07"
+ then if lib.versionAtLeast ocaml.version "4.08"
+ then "0.22.0" else "0.15.0" else "0.13.0"
, ocaml-compiler-libs, ocaml-migrate-parsetree, ppx_derivers, stdio
, stdlib-shims, ocaml-migrate-parsetree-2-1
}:
@@ -19,11 +22,13 @@ let param = {
"0.15.0" = {
sha256 = "1p037kqj5858xrhh0dps6vbf4fnijla6z9fjz5zigvnqp4i2xkrn";
min_version = "4.07";
+ max_version = "4.12";
useOMP2 = false;
};
"0.18.0" = {
sha256 = "1ciy6va2gjrpjs02kha83pzh0x1gkmfsfsdgabbs1v14a8qgfibm";
min_version = "4.07";
+ max_version = "4.12";
};
"0.22.0" = {
sha256 = "0kf7lgcwygf6zlx7rwddqpqvasa6v7xiq0bqal8vxlib6lpg074q";
diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/spelll/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/spelll/default.nix
index 5901dcb896..9df0779e53 100644
--- a/third_party/nixpkgs/pkgs/development/ocaml-modules/spelll/default.nix
+++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/spelll/default.nix
@@ -6,6 +6,8 @@ buildDunePackage rec {
pname = "spelll";
version = "0.3";
+ useDune2 = true;
+
src = fetchFromGitHub {
owner = "c-cube";
repo = pname;
diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/tcpip/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/tcpip/default.nix
index 6e639f984c..80fa01066f 100644
--- a/third_party/nixpkgs/pkgs/development/ocaml-modules/tcpip/default.nix
+++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/tcpip/default.nix
@@ -1,5 +1,5 @@
{ lib, buildDunePackage, fetchurl
-, bisect_ppx, ppx_cstruct, pkg-config
+, bisect_ppx, ppx_cstruct
, rresult, cstruct, cstruct-lwt, mirage-net, mirage-clock
, mirage-random, mirage-stack, mirage-protocols, mirage-time
, ipaddr, macaddr, macaddr-cstruct, mirage-profile, fmt
@@ -11,23 +11,18 @@
buildDunePackage rec {
pname = "tcpip";
- version = "6.1.0";
+ version = "6.0.0";
useDune2 = true;
src = fetchurl {
url = "https://github.com/mirage/mirage-${pname}/releases/download/v${version}/${pname}-v${version}.tbz";
- sha256 = "e81c98a6e80e05f9fa4e5fbee50e6c247f6011254c7b1d9a0e58bae318c1f0c8";
+ sha256 = "0wbrs8jz1vw3zdrqmqcwawxh4yhc2gy30rw7gz4w116cblkvnb8s";
};
- patches = [
- ./no-opam-pkg-config-path.patch
- ];
-
nativeBuildInputs = [
bisect_ppx
ppx_cstruct
- pkg-config
];
propagatedBuildInputs = [
diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/tcpip/no-opam-pkg-config-path.patch b/third_party/nixpkgs/pkgs/development/ocaml-modules/tcpip/no-opam-pkg-config-path.patch
deleted file mode 100644
index a7e9155ce5..0000000000
--- a/third_party/nixpkgs/pkgs/development/ocaml-modules/tcpip/no-opam-pkg-config-path.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-diff --git a/freestanding/Makefile b/freestanding/Makefile
-index f22d220d..4bb3ac57 100644
---- a/freestanding/Makefile
-+++ b/freestanding/Makefile
-@@ -1,6 +1,4 @@
--PKG_CONFIG_PATH := $(shell opam config var prefix)/lib/pkgconfig
--
--EXISTS := $(shell PKG_CONFIG_PATH=$(PKG_CONFIG_PATH) pkg-config --exists ocaml-freestanding; echo $$?)
-+EXISTS := $(shell pkg-config --exists ocaml-freestanding; echo $$?)
-
- .PHONY: all clean
- all: libtcpip_freestanding_stubs.a
-@@ -10,7 +8,7 @@ libtcpip_freestanding_stubs.a:
- touch $@
- else
- CC ?= cc
--FREESTANDING_CFLAGS := $(shell PKG_CONFIG_PATH=$(PKG_CONFIG_PATH) pkg-config --cflags ocaml-freestanding)
-+FREESTANDING_CFLAGS := $(shell pkg-config --cflags ocaml-freestanding)
- CFLAGS := $(FREESTANDING_CFLAGS)
-
- OBJS=checksum_stubs.o
diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/visitors/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/visitors/default.nix
index bda50bdb78..a47cd414fb 100644
--- a/third_party/nixpkgs/pkgs/development/ocaml-modules/visitors/default.nix
+++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/visitors/default.nix
@@ -2,18 +2,18 @@
buildDunePackage rec {
pname = "visitors";
- version = "20210127";
+ version = "20210316";
useDune2 = true;
- minimumOCamlVersion = "4.07";
+ minimumOCamlVersion = "4.08";
src = fetchFromGitLab {
owner = "fpottier";
repo = pname;
rev = version;
domain = "gitlab.inria.fr";
- sha256 = "0b73h7d4yv04a0b5x2i222jknbcgf9vvxzfjxzy2jwanxz9d873z";
+ sha256 = "12d45ncy3g9mpcs6n58aq6yzs5qz662msgcr7ccms9jhiq44m8f7";
};
propagatedBuildInputs = [ ppxlib ppx_deriving result ];
diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/wtf8/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/wtf8/default.nix
index 828df66b41..fec6c43360 100644
--- a/third_party/nixpkgs/pkgs/development/ocaml-modules/wtf8/default.nix
+++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/wtf8/default.nix
@@ -4,6 +4,8 @@ buildDunePackage rec {
pname = "wtf8";
version = "1.0.2";
+ useDune2 = true;
+
minimumOCamlVersion = "4.02";
src = fetchurl {
diff --git a/third_party/nixpkgs/pkgs/development/php-packages/pcov/default.nix b/third_party/nixpkgs/pkgs/development/php-packages/pcov/default.nix
index 84fbc4f7a4..1422e1b176 100644
--- a/third_party/nixpkgs/pkgs/development/php-packages/pcov/default.nix
+++ b/third_party/nixpkgs/pkgs/development/php-packages/pcov/default.nix
@@ -3,8 +3,8 @@
buildPecl {
pname = "pcov";
- version = "1.0.6";
- sha256 = "1psfwscrc025z8mziq69pcx60k4fbkqa5g2ia8lplb94mmarj0v1";
+ version = "1.0.8";
+ sha256 = "sha256-6rbniyxLIHPW/e+eWZN1qS8F1rOB7ld1N8JKUS1geRQ=";
buildInputs = [ pcre' ];
diff --git a/third_party/nixpkgs/pkgs/development/php-packages/php-cs-fixer/default.nix b/third_party/nixpkgs/pkgs/development/php-packages/php-cs-fixer/default.nix
index 9f1ce65db0..c2e6a1292c 100644
--- a/third_party/nixpkgs/pkgs/development/php-packages/php-cs-fixer/default.nix
+++ b/third_party/nixpkgs/pkgs/development/php-packages/php-cs-fixer/default.nix
@@ -1,14 +1,14 @@
{ mkDerivation, fetchurl, makeWrapper, lib, php }:
let
pname = "php-cs-fixer";
- version = "2.18.3";
+ version = "2.18.4";
in
mkDerivation {
inherit pname version;
src = fetchurl {
url = "https://github.com/FriendsOfPHP/PHP-CS-Fixer/releases/download/v${version}/php-cs-fixer.phar";
- sha256 = "sha256-Bdk1+X+SKcVS/zxEqlgnR3zjq/l0ht7icE4sQ1hjn8g=";
+ sha256 = "sha256-ZgnWv7Xd+0XgZ/IPdjVpAEraNNJq2KHB3aUUIG1SirU=";
};
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 0e536d5713..902529806a 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, makeWrapper, lib, php }:
let
pname = "phpstan";
- version = "0.12.81";
+ version = "0.12.82";
in
mkDerivation {
inherit pname version;
src = fetchurl {
url = "https://github.com/phpstan/phpstan/releases/download/${version}/phpstan.phar";
- sha256 = "sha256-mdqVrTrxWE2AuLVqgumA7V+JjzGW9ukkFM7klJSLeDE=";
+ sha256 = "sha256-fX7YK4z6xUhSJ2jTCy7bRK13TxXSn/qo7E5DeZlv2Nw=";
};
phases = [ "installPhase" ];
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/Pygments/2_5.nix b/third_party/nixpkgs/pkgs/development/python-modules/Pygments/2_5.nix
index a0c40550c9..aa59c370d2 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/Pygments/2_5.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/Pygments/2_5.nix
@@ -1,6 +1,7 @@
{ lib
, buildPythonPackage
, fetchPypi
+, fetchpatch
, docutils
}:
@@ -13,6 +14,15 @@ buildPythonPackage rec {
sha256 = "98c8aa5a9f778fcd1026a17361ddaf7330d1b7c62ae97c3bb0ae73e0b9b6b0fe";
};
+ patches = [
+ (fetchpatch {
+ name = "CVE-2021-27291.patch";
+ url = "https://github.com/pygments/pygments/commit/2e7e8c4a7b318f4032493773732754e418279a14.patch";
+ sha256 = "0ap7jgkmvkkzijabsgnfrwl376cjsxa4jmzvqysrkwpjq3q4rxpa";
+ excludes = ["CHANGES"];
+ })
+ ];
+
propagatedBuildInputs = [ docutils ];
# Circular dependency with sphinx
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/adafruit-platformdetect/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/adafruit-platformdetect/default.nix
index 3879aed84d..8f1b9d2ffc 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/adafruit-platformdetect/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/adafruit-platformdetect/default.nix
@@ -5,12 +5,13 @@
}:
buildPythonPackage rec {
- pname = "Adafruit-PlatformDetect";
- version = "3.4.0";
+ pname = "adafruit-platformdetect";
+ version = "3.4.1";
src = fetchPypi {
- inherit pname version;
- sha256 = "sha256-+rZUIZA2P7NZ4jbJsenGlD0OZi5fXFQ/Y5vJo4bmvMo=";
+ pname = "Adafruit-PlatformDetect";
+ inherit version;
+ sha256 = "31275dcf949c8b00598aaf2b0da65d970a0cba28e7cb45691d5f354b8e82fe85";
};
nativeBuildInputs = [ setuptools-scm ];
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/aiosmb/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/aiosmb/default.nix
new file mode 100644
index 0000000000..49c67a0aa0
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/development/python-modules/aiosmb/default.nix
@@ -0,0 +1,44 @@
+{ lib
+, asysocks
+, buildPythonPackage
+, fetchPypi
+, minikerberos
+, prompt_toolkit
+, pythonOlder
+, six
+, tqdm
+, winacl
+, winsspi
+}:
+
+buildPythonPackage rec {
+ pname = "aiosmb";
+ version = "0.2.37";
+ disabled = pythonOlder "3.7";
+
+ src = fetchPypi {
+ inherit pname version;
+ sha256 = "0daf1fk7406vpywc0yxv0wzf4nw986js9lc2agfyfxz0q7s29lf0";
+ };
+
+ propagatedBuildInputs = [
+ minikerberos
+ winsspi
+ six
+ asysocks
+ tqdm
+ prompt_toolkit
+ winacl
+ ];
+
+ # Project doesn't have tests
+ doCheck = false;
+ pythonImportsCheck = [ "aiosmb" ];
+
+ meta = with lib; {
+ description = "Python SMB library";
+ homepage = "https://github.com/skelsec/aiosmb";
+ license = with licenses; [ mit ];
+ maintainers = with maintainers; [ fab ];
+ };
+}
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/android-backup/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/android-backup/default.nix
new file mode 100644
index 0000000000..319c951418
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/development/python-modules/android-backup/default.nix
@@ -0,0 +1,37 @@
+{ lib
+, buildPythonPackage
+, fetchFromGitHub
+, pycrypto
+, pythonOlder
+, enum34
+, python
+}:
+
+buildPythonPackage rec {
+ pname = "android-backup";
+ version = "0.2.0";
+
+ src = fetchFromGitHub {
+ owner = "bluec0re";
+ repo = "android-backup-tools";
+ rev = "v${version}";
+ sha256 = "0c436hv64ddqrjs77pa7z6spiv49pjflbmgg31p38haj5mzlrqvw";
+ };
+
+ propagatedBuildInputs = [
+ pycrypto
+ ] ++ lib.optional (pythonOlder "3.4") enum34;
+
+ checkPhase = ''
+ ${python.interpreter} -m android_backup.tests
+ '';
+
+ pythonImportsCheck = [ "android_backup" ];
+
+ meta = with lib; {
+ description = "Unpack and repack android backups";
+ homepage = https://github.com/bluec0re/android-backup-tools;
+ license = licenses.asl20;
+ maintainers = with maintainers; [ dotlambda ];
+ };
+}
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/apispec/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/apispec/default.nix
index ac6eb09577..13fb71d7f2 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/apispec/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/apispec/default.nix
@@ -11,11 +11,11 @@
buildPythonPackage rec {
pname = "apispec";
- version = "4.2.0";
+ version = "4.3.0";
src = fetchPypi {
inherit pname version;
- sha256 = "fbbd069caa22c0270bc71a5330b46b5a4e1984d8345b9236ca02fbca23094647";
+ sha256 = "5ec0fe72f1422a1198973fcbb48d0eb5c7390f4b0fbe55474fce999ad6826a9b";
};
checkInputs = [
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/apptools/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/apptools/default.nix
index a03b051b11..a6bb058401 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/apptools/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/apptools/default.nix
@@ -1,34 +1,35 @@
-{ lib, fetchPypi, buildPythonPackage, fetchpatch
+{ lib, fetchPypi, buildPythonPackage
, configobj, six, traitsui
-, nose, tables, pandas
+, pytestCheckHook, tables, pandas
+, pythonOlder, importlib-resources
}:
buildPythonPackage rec {
pname = "apptools";
- version = "4.5.0";
+ version = "5.1.0";
src = fetchPypi {
inherit pname version;
- sha256 = "10h52ibhr2aw076pivqxiajr9rpcr1mancg6xlpxzckcm3if02i6";
+ sha256 = "12x5lcs1cllpybz7f0i1lcwvmqsaa5n818wb2165lj049wqxx4yh";
};
- # PyTables issue; should be merged in next post-4.5.0 release (#117)
- patches = [ (fetchpatch {
- url = "https://github.com/enthought/apptools/commit/3734289d1a0ebd8513fa67f75288add31ed0113c.patch";
- sha256 = "001012q1ib5cbib3nq1alh9ckzj588bfrywr8brkd1f6y1pgvngk";
- })
+ propagatedBuildInputs = [
+ configobj
+ six
+ traitsui
+ ] ++ lib.optionals (pythonOlder "3.9") [
+ importlib-resources
];
- propagatedBuildInputs = [ configobj six traitsui ];
-
checkInputs = [
- nose
tables
pandas
+ pytestCheckHook
];
- doCheck = true;
- checkPhase = "HOME=$TMP nosetests";
+ preCheck = ''
+ export HOME=$TMP
+ '';
meta = with lib; {
description = "Set of packages that Enthought has found useful in creating a number of applications.";
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/asttokens/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/asttokens/default.nix
index 0f090d14ab..ecbbfa9091 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/asttokens/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/asttokens/default.nix
@@ -1,4 +1,4 @@
-{ lib, fetchPypi, buildPythonPackage,
+{ lib, fetchPypi, fetchpatch, buildPythonPackage,
setuptools_scm, toml, six, astroid, pytest
}:
@@ -11,6 +11,16 @@ buildPythonPackage rec {
sha256 = "0a2ixiz04aw4p0aivxh47k3fa9ql804l3y5iv5gcih9aizi5fbm4";
};
+ patches = [
+ # Fixes compatibility with python 3.9, will be included in the next release
+ # after 2.0.4
+ (fetchpatch {
+ url = "https://github.com/gristlabs/asttokens/commit/d8ff80ee7d2e64c5e1daf50cc38eb99663f1b1ac.patch";
+ sha256 = "19y8n8vpzr2ijldbq5rh19sf0vz5azqqpkb9bx0ljjg98h6k7kjj";
+ excludes = [ "setup.cfg" ];
+ })
+ ];
+
propagatedBuildInputs = [ setuptools_scm toml six astroid ];
checkInputs = [ pytest ];
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/awkward0/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/awkward0/default.nix
index c248c81da7..3783f9776c 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/awkward0/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/awkward0/default.nix
@@ -2,33 +2,31 @@
, buildPythonPackage
, fetchFromGitHub
, numpy
-, pandas
, pytestrunner
, pytestCheckHook
}:
buildPythonPackage rec {
pname = "awkward0";
- version = "0.15.2";
+ version = "0.15.5";
src = fetchFromGitHub {
owner = "scikit-hep";
repo = "awkward-0.x";
rev = version;
- sha256 = "sha256-C6/byIGcabGjws5QI9sh5BO2M4Lhqkooh4mSjUEKCKU=";
+ sha256 = "039pxzgll2yz8xpr6bw788ymvgvqgna5kgl9m6d9mzi4yhbjsjpx";
};
nativeBuildInputs = [ pytestrunner ];
propagatedBuildInputs = [ numpy ];
- checkInputs = [ pandas pytestCheckHook ];
+ checkInputs = [ pytestCheckHook ];
- checkPhase = ''
- # Almost all tests in this file fail
- rm tests/test_persist.py
- py.test
- '';
+ # Can't find a fixture
+ disabledTests = [ "test_import_pandas" ];
+
+ pythonImportsCheck = [ "awkward0" ];
meta = with lib; {
description = "Manipulate jagged, chunky, and/or bitmasked arrays as easily as Numpy";
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/azure-eventgrid/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/azure-eventgrid/default.nix
index 9d413cf7a6..3d8e4df565 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/azure-eventgrid/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/azure-eventgrid/default.nix
@@ -9,12 +9,12 @@
buildPythonPackage rec {
pname = "azure-eventgrid";
- version = "4.0.0";
+ version = "4.1.0";
src = fetchPypi {
inherit pname version;
extension = "zip";
- sha256 = "a8b1d4aa9386efa923bad1a07da9f9098facd3b654d036a900a54de77d06eabe";
+ sha256 = "c4f29b2d9b717dad7919048f0a458dd84f83637c3d5c8f5a7e64634b22086719";
};
propagatedBuildInputs = [
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/beaker/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/beaker/default.nix
index 09e0b8b3f3..a429ab682f 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/beaker/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/beaker/default.nix
@@ -1,6 +1,8 @@
-{ lib
+{ stdenv
+, lib
, buildPythonPackage
, fetchFromGitHub
+, glibcLocales
, nose
, pylibmc
, memcached
@@ -19,14 +21,14 @@
buildPythonPackage rec {
pname = "Beaker";
- version = "1.10.1";
+ version = "1.11.0";
# The pypy release do not contains the tests
src = fetchFromGitHub {
owner = "bbangert";
repo = "beaker";
rev = version;
- sha256 = "0xrvg503xmi28w0hllr4s7fkap0p09fgw2wax3p1s2r6b3xjvbz7";
+ sha256 = "059sc7iar90lc2y9mppdis5ddfcxyirz03gmsfb0307f5dsa1dhj";
};
propagatedBuildInputs = [
@@ -39,16 +41,16 @@ buildPythonPackage rec {
];
checkInputs = [
- nose
- mock
- webtest
- pylibmc
+ glibcLocales
memcached
- redis
+ mock
+ nose
+ pylibmc
pymongo
+ redis
+ webtest
];
-
# Can not run memcached tests because it immediately tries to connect
postPatch = lib.optionalString isPy3k ''
substituteInPlace setup.py \
@@ -66,6 +68,7 @@ buildPythonPackage rec {
nosetests \
-e ".*test_ext_.*" \
-e "test_upgrade" \
+ ${lib.optionalString (!stdenv.isLinux) ''-e "test_cookie_expires_different_locale"''} \
-vv tests
'';
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/bitarray/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/bitarray/default.nix
index b287e7be98..dc09aa2c6b 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/bitarray/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/bitarray/default.nix
@@ -2,11 +2,11 @@
buildPythonPackage rec {
pname = "bitarray";
- version = "1.7.1";
+ version = "1.8.1";
src = fetchPypi {
inherit pname version;
- sha256 = "e4de977d708b7024760266d827b8285e4405dce4293f25508c4556970139018a";
+ sha256 = "e02f79fba7a470d438eb39017d503498faaf760b17b6b46af1a9de12fd58d311";
};
pythonImportsCheck = [ "bitarray" ];
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/boltons/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/boltons/default.nix
index f4842981c4..0986a5dc7c 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/boltons/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/boltons/default.nix
@@ -1,19 +1,35 @@
-{ lib, buildPythonPackage, fetchFromGitHub, pytest }:
+{ lib
+, buildPythonPackage
+, fetchFromGitHub
+, fetchpatch
+, pytestCheckHook
+}:
buildPythonPackage rec {
pname = "boltons";
- version = "20.2.0";
+ version = "20.2.1";
# No tests in PyPi Tarball
src = fetchFromGitHub {
owner = "mahmoud";
repo = "boltons";
rev = version;
- sha256 = "08rd6av8dp5n1vz6nybmayl1mfsmj66cskiaybfshcgix29ca803";
+ sha256 = "0vw0h0z81gfxgjfijqiza92ic0siv9xy65mklgj5d0dzr1k9waw8";
};
- checkInputs = [ pytest ];
- checkPhase = "pytest tests";
+ patches = [
+ (fetchpatch {
+ url = "https://github.com/mahmoud/boltons/commit/754afddf141ea26956c88c7e13fe5e7ca7942654.patch";
+ sha256 = "14kcq8pl4pmgcnlnmj1sh1yrksgym0kn0kgz2648g192svqkbpz8";
+ })
+ ];
+
+ checkInputs = [ pytestCheckHook ];
+ disabledTests = [
+ # This test is broken without this PR, which has not yet been merged
+ # https://github.com/mahmoud/boltons/pull/283
+ "test_frozendict_ior"
+ ];
meta = with lib; {
homepage = "https://github.com/mahmoud/boltons";
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/boto3/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/boto3/default.nix
index 8868b40259..e1733116dd 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/boto3/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/boto3/default.nix
@@ -13,11 +13,11 @@
buildPythonPackage rec {
pname = "boto3";
- version = "1.17.33"; # N.B: if you change this, change botocore and awscli to a matching version
+ version = "1.17.39"; # N.B: if you change this, change botocore and awscli to a matching version
src = fetchPypi {
inherit pname version;
- sha256 = "sha256-DKwv/8G6kV97tezuU5MYUy21HyGMkooij6/j5QHpRy4=";
+ sha256 = "sha256-tYFP9ztbj8hgHBtztwZ1gH+c5kcTVi4YOghBWiUW7tQ=";
};
propagatedBuildInputs = [ botocore jmespath s3transfer ] ++ lib.optionals (!isPy3k) [ futures ];
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/botocore/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/botocore/default.nix
index 4aef369c60..3fb30ba8a7 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/botocore/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/botocore/default.nix
@@ -12,11 +12,11 @@
buildPythonPackage rec {
pname = "botocore";
- version = "1.20.33"; # N.B: if you change this, change boto3 and awscli to a matching version
+ version = "1.20.39"; # N.B: if you change this, change boto3 and awscli to a matching version
src = fetchPypi {
inherit pname version;
- sha256 = "sha256-41UwUwlpnTrKHgBQ/CHUhZW0DbBGyw0kkc1X/1smkgs=";
+ sha256 = "sha256-KFBtI/+pq/VmbCyQnH7cg6ERLNRP506xpJYN9WFTHpg=";
};
propagatedBuildInputs = [
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/breathe/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/breathe/default.nix
index be51e87c95..1ca33222ef 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/breathe/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/breathe/default.nix
@@ -1,13 +1,13 @@
{ lib, fetchPypi, buildPythonPackage, docutils, six, sphinx, isPy3k, isPy27 }:
buildPythonPackage rec {
- version = "4.27.0";
+ version = "4.28.0";
pname = "breathe";
disabled = isPy27;
src = fetchPypi {
inherit pname version;
- sha256 = "5b21f86d0cc99d3168f0d9730e07c1438057083ccc9a9c54de322e59e1f4e740";
+ sha256 = "11e35a5fed7545554be51b70eea4578643d8c08972bea43774f413943006b17a";
};
propagatedBuildInputs = [ docutils six sphinx ];
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/cherrypy/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/cherrypy/default.nix
index 9ef27b754c..9561f2aff8 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/cherrypy/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/cherrypy/default.nix
@@ -18,6 +18,26 @@ buildPythonPackage rec {
sha256 = "16f410izp2c4qhn4n3l5l3qirmkf43h2amjqms8hkl0shgfqwq2n";
};
+ patches = [
+ # 1/3 Fix compatibility with pytest 6. Will be part of the next release after 18.6
+ (fetchpatch {
+ url = "https://github.com/cherrypy/cherrypy/pull/1897/commits/59c0e19d7df8680e36afc96756dce72435121448.patch";
+ sha256 = "1jachbvp505gndccdhny0c3grzdrmvmbzq4kw55jx93ay94ni6p0";
+ })
+ # 2/3 Fix compatibility with pytest 6. Will be part of the next release after 18.6
+ (fetchpatch {
+ url = "https://github.com/cherrypy/cherrypy/pull/1897/commits/4a6287b73539adcb7b0ae72d69644a1ced1f7eaa.patch";
+ sha256 = "0nz40qmgxknkbjsdzfzcqfxdsmsxx3v104fb0h04yvs76mqvw3i4";
+ })
+ # 3/3 Fix compatibility with pytest 6. Will be part of the next release after 18.6
+ (fetchpatch {
+ url = "https://github.com/cherrypy/cherrypy/commit/3bae7f06868553b006915f05ff14d86163f59a7d.patch";
+ sha256 = "1z0bv23ybyw87rf1i8alsdi3gc2bzmdj9d0kjsghdkvi3zdp4n8q";
+ })
+ ];
+
+ nativeBuildInputs = [ setuptools_scm ];
+
propagatedBuildInputs = [
# required
cheroot portend more-itertools zc_lockfile
@@ -26,8 +46,6 @@ buildPythonPackage rec {
routes
];
- nativeBuildInputs = [ setuptools_scm ];
-
checkInputs = [
objgraph pytest pytestcov pathpy requests_toolbelt pytest-services
];
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/cmarkgfm/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/cmarkgfm/default.nix
index 5b94dc78cd..7379d6dc6c 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/cmarkgfm/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/cmarkgfm/default.nix
@@ -1,25 +1,29 @@
-{ lib, buildPythonPackage, fetchPypi, cffi, pytest }:
+{ lib
+, buildPythonPackage
+, cffi
+, fetchPypi
+, pytestCheckHook
+}:
buildPythonPackage rec {
pname = "cmarkgfm";
- version = "0.5.2";
+ version = "0.5.3";
src = fetchPypi {
inherit pname version;
- sha256 = "e7d65b90645faa55c28886d01f658235af08b4c4edbf9d959518a17007dd20b4";
+ sha256 = "sha256-tqVJq6Mnq9mG1nSM8hyGN9dBx2hQ5/773vjSi/4TjjI=";
};
propagatedBuildInputs = [ cffi ];
- checkInputs = [ pytest ];
+ checkInputs = [ pytestCheckHook ];
- checkPhase = ''
- py.test
- '';
+ pythonImportsCheck = [ "cmarkgfm" ];
meta = with lib; {
description = "Minimal bindings to GitHub's fork of cmark";
homepage = "https://github.com/jonparrott/cmarkgfm";
license = licenses.mit;
+ maintainers = with maintainers; [ fab ];
};
}
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/croniter/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/croniter/default.nix
index 3080703557..577fef8d79 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/croniter/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/croniter/default.nix
@@ -2,7 +2,7 @@
, buildPythonPackage
, fetchPypi
, python-dateutil
-, pytest
+, pytestCheckHook
, pytz
, natsort
, tzlocal
@@ -10,11 +10,11 @@
buildPythonPackage rec {
pname = "croniter";
- version = "0.3.37";
+ version = "1.0.9";
src = fetchPypi {
inherit pname version;
- sha256 = "12ced475dfc107bf7c6c1440af031f34be14cd97bbbfaf0f62221a9c11e86404";
+ sha256 = "708532f70584207e23ef2989ca40f367e6238bfe050133a1aff43e1e0e6f6092";
};
propagatedBuildInputs = [
@@ -23,15 +23,11 @@ buildPythonPackage rec {
];
checkInputs = [
- pytest
+ pytestCheckHook
pytz
tzlocal
];
- checkPhase = ''
- pytest src/croniter
- '';
-
meta = with lib; {
description = "croniter provides iteration for datetime object with cron like format";
homepage = "https://github.com/kiorky/croniter";
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/cupy/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/cupy/default.nix
index d4b42ac83e..f5d262f0b8 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/cupy/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/cupy/default.nix
@@ -1,33 +1,35 @@
{ lib, buildPythonPackage
-, fetchPypi, isPy3k, linuxPackages
-, fastrlock, numpy, six, wheel, pytest, mock, setuptools
+, fetchPypi, isPy3k, cython
+, fastrlock, numpy, six, wheel, pytestCheckHook, mock, setuptools
, cudatoolkit, cudnn, cutensor, nccl
+, addOpenGLRunpath
}:
buildPythonPackage rec {
pname = "cupy";
- version = "8.4.0";
+ version = "8.5.0";
disabled = !isPy3k;
src = fetchPypi {
inherit pname version;
- sha256 = "58d19af6b2e83388d4f0f6ca4226bae4b947920d2ca4951c2eddc8bc78abf66b";
+ sha256 = "fb3f8d3b3454beb249b9880502a45fe493c5a44efacc4c72914cbe1a5dbdf803";
};
- checkInputs = [
- pytest
- mock
+ preConfigure = ''
+ export CUDA_PATH=${cudatoolkit}
+ '';
+
+ nativeBuildInputs = [
+ addOpenGLRunpath
+ cython
];
- preConfigure = ''
- export CUDA_PATH=${cudatoolkit}
- '';
+ LDFLAGS = "-L${cudatoolkit}/lib/stubs";
propagatedBuildInputs = [
cudatoolkit
cudnn
cutensor
- linuxPackages.nvidia_x11
nccl
fastrlock
numpy
@@ -36,8 +38,20 @@ buildPythonPackage rec {
wheel
];
- # In python3, test was failed...
- doCheck = !isPy3k;
+ checkInputs = [
+ pytestCheckHook
+ mock
+ ];
+
+ # Won't work with the GPU, whose drivers won't be accessible from the build
+ # sandbox
+ doCheck = false;
+
+ postFixup = ''
+ find $out -type f \( -name '*.so' -or -name '*.so.*' \) | while read lib; do
+ addOpenGLRunpath "$lib"
+ done
+ '';
enableParallelBuilding = true;
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/cypari2/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/cypari2/default.nix
index a7115d1e94..a553aeab65 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/cypari2/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/cypari2/default.nix
@@ -1,6 +1,7 @@
{ lib
, buildPythonPackage
, python
+, fetchpatch
, fetchPypi
, pari
, gmp
@@ -11,13 +12,23 @@
buildPythonPackage rec {
pname = "cypari2";
# upgrade may break sage, please test the sage build or ping @timokau on upgrade
- version = "2.1.1";
+ version = "2.1.2";
src = fetchPypi {
inherit pname version;
- sha256 = "df1ef62e771ec36e5a456f5fc8b51bc6745b70f0efdd0c7a30c3f0b5f1fb93db";
+ sha256 = "03cd45edab8716ebbfdb754e65fea72e873c73dc91aec098fe4a01e35324ac7a";
};
+ patches = [
+ # patch to avoid some segfaults in sage's totallyreal.pyx test.
+ # (https://trac.sagemath.org/ticket/27267). depends on Cython patch.
+ (fetchpatch {
+ name = "use-trashcan-for-gen.patch";
+ url = "https://git.sagemath.org/sage.git/plain/build/pkgs/cypari/patches/trashcan.patch?id=b6ea17ef8e4d652de0a85047bac8d41e90b25555";
+ sha256 = "sha256-w4kktWb9/aR9z4CjrUvAMOxEwRN2WkubaKzQttN8rU8=";
+ })
+ ];
+
# This differs slightly from the default python installPhase in that it pip-installs
# "." instead of "*.whl".
# That is because while the default install phase succeeds to build the package,
@@ -48,7 +59,7 @@ buildPythonPackage rec {
meta = with lib; {
description = "Cython bindings for PARI";
- license = licenses.gpl2;
+ license = licenses.gpl2Plus;
maintainers = teams.sage.members;
homepage = "https://github.com/defeo/cypari2";
};
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/cysignals/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/cysignals/default.nix
index 201a8c42d6..d075360d1a 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/cysignals/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/cysignals/default.nix
@@ -1,5 +1,4 @@
{ lib
-, fetchpatch
, fetchPypi
, buildPythonPackage
, cython
@@ -10,23 +9,13 @@ assert pariSupport -> pari != null;
buildPythonPackage rec {
pname = "cysignals";
- version = "1.10.2";
+ version = "1.10.3";
src = fetchPypi {
inherit pname version;
- sha256 = "1ckxzch3wk5cg80mppky5jib5z4fzslny3001r5zg4ar1ixbc1w1";
+ sha256 = "sha256-XEYGxDV3UCgxb3Jf23y4lOPK4Lb9L4YqDSlxdIRptDo=";
};
- patches = [
- # fixes intermittent crashes in Sage tests (including in interfaces/singular.py)
- # will be included in cysignals 1.10.3: https://github.com/sagemath/cysignals/pull/127
- (fetchpatch {
- name = "fix-verify_exc_value.patch";
- url = "https://github.com/sagemath/cysignals/commit/49a7eee4bba3ab8f340cf56c371fa4f5ed702dcc.patch";
- sha256 = "sha256-Pfc5tL9VDSP6ftDoHoIb+MDi5rjYqr0PRfIajFuuYVs=";
- })
- ];
-
# explicit check:
# build/src/cysignals/implementation.c:27:2: error: #error "cysignals must be compiled without _FORTIFY_SOURCE"
hardeningDisable = [
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/databricks-connect/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/databricks-connect/default.nix
index f4a9495568..17116eb130 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/databricks-connect/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/databricks-connect/default.nix
@@ -2,11 +2,11 @@
buildPythonPackage rec {
pname = "databricks-connect";
- version = "7.3.10";
+ version = "8.1.0";
src = fetchPypi {
inherit pname version;
- sha256 = "8aa75740900f9b4bcc6d3f2bd815408dba30dc9a512bcc950b93e7353ec45133";
+ sha256 = "3726c648cc60796294356e2617acc534d2503824ccfbdff26abbea595eb83135";
};
sourceRoot = ".";
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/dulwich/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/dulwich/default.nix
index a4c8cb7227..9c7f62edf1 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/dulwich/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/dulwich/default.nix
@@ -13,12 +13,12 @@
}:
buildPythonPackage rec {
- version = "0.20.20";
+ version = "0.20.21";
pname = "dulwich";
src = fetchPypi {
inherit pname version;
- sha256 = "sha256-QmlZuXBfrcxsgg5a3zKR1xpIq6CvzPdBFCLjMI8RX4c=";
+ sha256 = "sha256-rHZMmpuA+mGv40BNUnDFBgqlf38IexGpU5XTt287cf0=";
};
LC_ALL = "en_US.UTF-8";
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/elementpath/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/elementpath/default.nix
index 745b7a7b10..c98937804a 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/elementpath/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/elementpath/default.nix
@@ -1,7 +1,7 @@
{ lib, buildPythonPackage, fetchFromGitHub, isPy27 }:
buildPythonPackage rec {
- version = "2.2.0";
+ version = "2.2.1";
pname = "elementpath";
disabled = isPy27; # uses incompatible class syntax
@@ -9,7 +9,7 @@ buildPythonPackage rec {
owner = "sissaschool";
repo = "elementpath";
rev = "v${version}";
- sha256 = "1xfn5yasi849vs06ffxq6phapm6gc3p8yvdyvqmb47gbnji5mpb5";
+ sha256 = "15yjl18n81zddd27789mcy12gnja3cqycjdykybwgd9i0ysj96gl";
};
# avoid circular dependency with xmlschema which directly depends on this
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/executing/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/executing/default.nix
index 84026d7374..f0c67f3ae5 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/executing/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/executing/default.nix
@@ -1,15 +1,27 @@
-{ lib, buildPythonPackage, fetchzip, pytest, asttokens }:
+{ lib
+, buildPythonPackage
+, fetchFromGitHub
+, asttokens
+}:
buildPythonPackage rec {
pname = "executing";
- version = "0.4.3";
+ version = "0.5.4";
- src = fetchzip {
- url = "https://github.com/alexmojaki/executing/archive/v${version}.tar.gz";
- sha256 = "1fqfc26nl703nsx2flzf7x4mgr3rpbd8pnn9c195rca648zhi3nh";
+ src = fetchFromGitHub {
+ owner = "alexmojaki";
+ repo = pname;
+ rev = "v${version}";
+ sha256 = "1hqx94h6l2wg9sljiaajfay2nr62sqa819w3bxrz8cdki1abdygv";
};
- checkInputs = [ pytest asttokens ];
+ preBuild = ''
+ export SETUPTOOLS_SCM_PRETEND_VERSION="${version}"
+ '';
+
+ # Tests appear to run fine (Ran 22 tests in 4.076s) with setuptoolsCheckPhase
+ # but crash with pytestCheckHook
+ checkInputs = [ asttokens ];
meta = with lib; {
description = "Get information about what a frame is currently doing, particularly the AST node being executed";
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/fakeredis/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/fakeredis/default.nix
index 8513c168cf..b0cf3b546f 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/fakeredis/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/fakeredis/default.nix
@@ -16,12 +16,12 @@
buildPythonPackage rec {
pname = "fakeredis";
- version = "1.4.5";
+ version = "1.5.0";
disabled = pythonOlder "3.5";
src = fetchPypi {
inherit pname version;
- sha256 = "0slb23zxn47a4z8b7jq7gq40g4zsn52y9h29zdqs29b85394gjq1";
+ sha256 = "1ac0cef767c37f51718874a33afb5413e69d132988cb6a80c6e6dbeddf8c7623";
};
propagatedBuildInputs = [
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/forbiddenfruit/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/forbiddenfruit/default.nix
index 6ad99a1258..13c46ba1e8 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/forbiddenfruit/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/forbiddenfruit/default.nix
@@ -1,6 +1,6 @@
{ lib
, buildPythonPackage
-, fetchPypi
+, fetchFromGitHub
, nose
}:
@@ -8,13 +8,20 @@ buildPythonPackage rec {
version = "0.1.4";
pname = "forbiddenfruit";
- src = fetchPypi {
- inherit pname version;
- sha256 = "e3f7e66561a29ae129aac139a85d610dbf3dd896128187ed5454b6421f624253";
+ src = fetchFromGitHub {
+ owner = "clarete";
+ repo = "forbiddenfruit";
+ rev = version;
+ sha256 = "16chhrxbbmg6lfbzm532fq0v00z8qihcsj0kg2b5jlgnb6qijwn8";
};
checkInputs = [ nose ];
+ preBuild = ''
+ export FFRUIT_EXTENSION="true";
+ '';
+
+ # https://github.com/clarete/forbiddenfruit/pull/47 required to switch to pytest
checkPhase = ''
find ./build -name '*.so' -exec mv {} tests/unit \;
nosetests
@@ -22,7 +29,7 @@ buildPythonPackage rec {
meta = with lib; {
description = "Patch python built-in objects";
- homepage = "https://pypi.python.org/pypi/forbiddenfruit";
+ homepage = "https://github.com/clarete/forbiddenfruit";
license = licenses.mit;
};
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-bigquery/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-bigquery/default.nix
index 6f2e6c473a..0c62727ff8 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-bigquery/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-bigquery/default.nix
@@ -17,11 +17,11 @@
buildPythonPackage rec {
pname = "google-cloud-bigquery";
- version = "2.12.0";
+ version = "2.13.1";
src = fetchPypi {
inherit pname version;
- sha256 = "484bb733e5dd14bb82d28480a5d7f540b8ee59f081fcf32782546b717180d1b8";
+ sha256 = "915f93c61c03d1d6024d5b19355bb96af25da9f924d0b5bab5cde851e1bd48f4";
};
propagatedBuildInputs = [
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-container/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-container/default.nix
index 4a14080e5e..ce21a27209 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-container/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-container/default.nix
@@ -12,11 +12,11 @@
buildPythonPackage rec {
pname = "google-cloud-container";
- version = "2.3.1";
+ version = "2.4.0";
src = fetchPypi {
inherit pname version;
- sha256 = "69e10c999c64996822aa2ca138cffcdf0f1e04bdbdb7206c286fa17fb800703a";
+ sha256 = "c62d15f58459fbe83ba5789f800ac27b4be9a1d7735f6c6b702cd6c3f8c6f0c9";
};
propagatedBuildInputs = [ google-api-core grpc_google_iam_v1 libcst proto-plus ];
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-speech/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-speech/default.nix
index 65ad31af2e..be93593504 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-speech/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-speech/default.nix
@@ -11,11 +11,11 @@
buildPythonPackage rec {
pname = "google-cloud-speech";
- version = "2.1.0";
+ version = "2.2.0";
src = fetchPypi {
inherit pname version;
- sha256 = "4a77a79e990004af96e789565b174f9b971f00afa23142f6673722dae0910b0c";
+ sha256 = "013279a411644545ee0d67a5c077d0f19db58b846d758f36a8cc759f9c9e0a19";
};
propagatedBuildInputs = [ libcst google-api-core proto-plus ];
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/hdbscan/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/hdbscan/default.nix
index 6e381794cf..d2590d1495 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/hdbscan/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/hdbscan/default.nix
@@ -1,8 +1,9 @@
{ lib
, buildPythonPackage
+, fetchpatch
, cython
, numpy
-, nose
+, pytestCheckHook
, scipy
, scikitlearn
, fetchPypi
@@ -18,11 +19,22 @@ buildPythonPackage rec {
inherit pname version;
sha256 = "e3a418d0d36874f7b6a1bf0b7461f3857fc13a525fd48ba34caed2fe8973aa26";
};
-
- checkInputs = [ nose ];
+ patches = [
+ # This patch fixes compatibility with numpy 1.20. It will be in the next release
+ # after 0.8.27
+ (fetchpatch {
+ url = "https://github.com/scikit-learn-contrib/hdbscan/commit/5b67a4fba39c5aebe8187a6a418da677f89a63e0.patch";
+ sha256 = "07d7jdwk0b8kgaqkifd529sarji01j1jiih7cfccc5kxmlb5py9h";
+ })
+ ];
nativeBuildInputs = [ cython ];
propagatedBuildInputs = [ numpy scipy scikitlearn joblib six ];
+ preCheck = ''
+ cd hdbscan/tests
+ rm __init__.py
+ '';
+ checkInputs = [ pytestCheckHook ];
meta = with lib; {
description = "Hierarchical Density-Based Spatial Clustering of Applications with Noise, a clustering algorithm with a scikit-learn compatible API";
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/hwi/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/hwi/default.nix
index 0b52402ed4..5da15fa3e2 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/hwi/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/hwi/default.nix
@@ -12,13 +12,13 @@
buildPythonPackage rec {
pname = "hwi";
- version = "2.0.0";
+ version = "2.0.1";
src = fetchFromGitHub {
owner = "bitcoin-core";
repo = "HWI";
rev = version;
- sha256 = "0m8maxhjpfxnkry2l0x8143m1gmds8mbwyd9flnkfipxz0r0xwbr";
+ sha256 = "148m0vgwm6l8drcx6j3fjs2zpdzvslk4w2nkb8nm0g8qdlm6gjlw";
};
propagatedBuildInputs = [
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/iminuit/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/iminuit/default.nix
new file mode 100644
index 0000000000..5bfb66fe4c
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/development/python-modules/iminuit/default.nix
@@ -0,0 +1,26 @@
+{ lib, buildPythonPackage, isPy3k, fetchPypi, cmake, numpy, pytestCheckHook }:
+
+buildPythonPackage rec {
+ pname = "iminuit";
+ version = "2.4.0";
+ disabled = !isPy3k;
+
+ src = fetchPypi {
+ inherit pname version;
+ sha256 = "350c13d33f3ec5884335aea1cc11a17ae49dd8e6b2181c3f1b3c9c27e2e0b228";
+ };
+
+ nativeBuildInputs = [ cmake ];
+ propagatedBuildInputs = [ numpy ];
+
+ dontUseCmakeConfigure = true;
+
+ checkInputs = [ pytestCheckHook ];
+
+ meta = with lib; {
+ homepage = "https://github.com/scikit-hep/iminuit";
+ description = "Python interface for the Minuit2 C++ library";
+ license = with licenses; [ mit lgpl2Only ];
+ maintainers = with maintainers; [ veprbl ];
+ };
+}
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/jellyfin-apiclient-python/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/jellyfin-apiclient-python/default.nix
index 33c14dbaeb..b06db621b7 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/jellyfin-apiclient-python/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/jellyfin-apiclient-python/default.nix
@@ -1,24 +1,23 @@
-{ lib, buildPythonPackage, fetchFromGitHub, requests
+{ lib, buildPythonPackage, fetchPypi, requests
, websocket_client, pythonOlder }:
buildPythonPackage rec {
pname = "jellyfin-apiclient-python";
- version = "1.6.1";
+ version = "1.7.2";
disabled = pythonOlder "3.6";
- src = fetchFromGitHub {
- owner = "iwalton3";
- repo = "jellyfin-apiclient-python";
- rev = "v${version}";
- sha256 = "0f7czq83ic22fz1vnf0cavb7l3grcxxd5yyw9wcjz3g1j2d76735";
+ src = fetchPypi {
+ inherit pname version;
+ sha256 = "sha256-nSLUa9/jAT6XrHo77kV5HYBxPO/lhcWKqPfpES7ul9A=";
};
propagatedBuildInputs = [ requests websocket_client ];
+ doCheck = false; # no tests
pythonImportsCheck = [ "jellyfin_apiclient_python" ];
meta = with lib; {
- homepage = "https://github.com/iwalton3/jellyfin-apiclient-python";
+ homepage = "https://github.com/jellyfin/jellyfin-apiclient-python";
description = "Python API client for Jellyfin";
license = licenses.gpl3;
maintainers = with maintainers; [ jojosch ];
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/labmath/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/labmath/default.nix
new file mode 100644
index 0000000000..24018fd742
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/development/python-modules/labmath/default.nix
@@ -0,0 +1,24 @@
+{ lib, buildPythonPackage, fetchPypi }:
+
+buildPythonPackage rec {
+ pname = "labmath";
+ version = "1.2.0";
+
+ src = fetchPypi {
+ inherit pname version;
+ sha256 = "sha256-/fZ61tJ6PVZsubr3OXlbg/VxyyKimz36uPV+r33kgD0=";
+ };
+
+ postPatch = ''
+ substituteInPlace setup.py --replace "labmath/DESCRIPTION.rst" "PKG-INFO"
+ '';
+
+ pythonImportsCheck = [ "labmath" ];
+
+ meta = with lib; {
+ homepage = "https://pypi.org/project/labmath";
+ description = "Module for basic math in the general vicinity of computational number theory";
+ license = licenses.mit;
+ maintainers = with maintainers; [ siraben ];
+ };
+}
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/ldap/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/ldap/default.nix
index e5cd3d3828..1b1aea2ab1 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/ldap/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/ldap/default.nix
@@ -1,5 +1,6 @@
{ buildPythonPackage, fetchPypi
-, pyasn1, pyasn1-modules, pytest
+, pyasn1, pyasn1-modules
+, pythonAtLeast, pytestCheckHook
, openldap, cyrus_sasl, lib, stdenv }:
buildPythonPackage rec {
@@ -13,20 +14,22 @@ buildPythonPackage rec {
propagatedBuildInputs = [ pyasn1 pyasn1-modules ];
+ checkInputs = [ pytestCheckHook ];
buildInputs = [ openldap cyrus_sasl ];
- checkInputs = [ pytest ];
-
- checkPhase = ''
+ preCheck = ''
# Needed by tests to setup a mockup ldap server.
export BIN="${openldap}/bin"
export SBIN="${openldap}/bin"
export SLAPD="${openldap}/libexec/slapd"
export SCHEMA="${openldap}/etc/schema"
-
- py.test
'';
+ disabledTests = lib.optionals (pythonAtLeast "3.9") [
+ # See https://github.com/python-ldap/python-ldap/issues/407
+ "test_simple_bind_noarg"
+ ];
+
doCheck = !stdenv.isDarwin;
meta = with lib; {
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/libagent/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/libagent/default.nix
index 47be977755..5334513e23 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/libagent/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/libagent/default.nix
@@ -25,7 +25,7 @@ buildPythonPackage rec {
meta = with lib; {
description = "Using hardware wallets as SSH/GPG agent";
homepage = "https://github.com/romanz/trezor-agent";
- license = licenses.gpl3;
+ license = licenses.lgpl3Only;
maintainers = with maintainers; [ np ];
};
}
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/lightgbm/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/lightgbm/default.nix
index 62686234b6..1018ceaec4 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/lightgbm/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/lightgbm/default.nix
@@ -10,11 +10,11 @@
buildPythonPackage rec {
pname = "lightgbm";
- version = "3.1.1";
+ version = "3.2.0";
src = fetchPypi {
inherit pname version;
- sha256 = "babece2e3613e97748a67ed45387bb0e984bdb1f4126e39f010fbfe7503c7b20";
+ sha256 = "000c6e0e225834a8a94a84571cf41e4b7c7b97a0db6d286c1237de8ba6066726";
};
nativeBuildInputs = [
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/llfuse/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/llfuse/default.nix
index 4e68beba53..44aa9136b0 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/llfuse/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/llfuse/default.nix
@@ -1,44 +1,53 @@
-{ lib, stdenv, fetchPypi, fetchpatch, buildPythonPackage, pkg-config, pytest, fuse, attr, which
-, contextlib2, macfuse-stubs, DiskArbitration
+{ lib
+, stdenv
+, buildPythonPackage
+, pythonOlder
+, fetchFromGitHub
+, contextlib2
+, cython
+, fuse
+, pkg-config
+, pytestCheckHook
+, python
+, which
}:
buildPythonPackage rec {
pname = "llfuse";
- version = "1.3.8";
+ version = "1.4.1";
- src = fetchPypi {
- inherit pname version;
- sha256 = "1g2cdhdqrb6m7655qp61pn61pwj1ql61cdzhr2jvl3w4i8877ddr";
+ disabled = pythonOlder "3.5";
+
+ src = fetchFromGitHub {
+ owner = "python-llfuse";
+ repo = "python-llfuse";
+ rev = "release-${version}";
+ sha256 = "1dcpdg6cpkmdbyg66fgrylj7dp9zqzg5bf23y6m6673ykgxlv480";
};
- patches = [
- # fix tests with pytest 6
- (fetchpatch {
- url = "https://github.com/python-llfuse/python-llfuse/commit/1ed8b280d2544eedf8bf209761bef0d2519edd17.diff";
- sha256 = "0wailfrr1i0n2m9ylwpr00jh79s7z3l36w7x19jx1x4djcz2hdps";
- })
- ];
+ nativeBuildInputs = [ cython pkg-config ];
- nativeBuildInputs = [ pkg-config ];
-
- buildInputs =
- lib.optionals stdenv.isLinux [ fuse ]
- ++ lib.optionals stdenv.isDarwin [ DiskArbitration macfuse-stubs ];
-
- checkInputs = [ pytest which ] ++
- lib.optionals stdenv.isLinux [ attr ];
+ buildInputs = [ fuse ];
propagatedBuildInputs = [ contextlib2 ];
- checkPhase = ''
- py.test -k "not test_listdir" ${lib.optionalString stdenv.isDarwin ''-m "not uses_fuse"''}
+ preBuild = ''
+ ${python.interpreter} setup.py build_cython
'';
+ # On Darwin, the test requires macFUSE to be installed outside of Nix.
+ doCheck = !stdenv.isDarwin;
+ checkInputs = [ pytestCheckHook which ];
+
+ disabledTests = [
+ "test_listdir" # accesses /usr/bin
+ ];
+
meta = with lib; {
description = "Python bindings for the low-level FUSE API";
homepage = "https://github.com/python-llfuse/python-llfuse";
license = licenses.lgpl2Plus;
platforms = platforms.unix;
- maintainers = with maintainers; [ bjornfor ];
+ maintainers = with maintainers; [ bjornfor dotlambda ];
};
}
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/loguru/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/loguru/default.nix
index 458d2ca503..8146f8b183 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/loguru/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/loguru/default.nix
@@ -1,19 +1,36 @@
-{ lib, stdenv, buildPythonPackage, fetchPypi, isPy27, colorama, pytestCheckHook }:
+{ lib
+, stdenv
+, buildPythonPackage
+, fetchPypi
+, fetchpatch
+, isPy27
+, colorama
+, pytestCheckHook
+, pythonAtLeast
+}:
buildPythonPackage rec {
pname = "loguru";
version = "0.5.3";
- disabled = isPy27;
+ # python3.9 compatibility should be in the next release after 0.5.3
+ disabled = isPy27 || pythonAtLeast "3.9";
src = fetchPypi {
inherit pname version;
sha256 = "b28e72ac7a98be3d28ad28570299a393dfcd32e5e3f6a353dec94675767b6319";
};
+ patches = [
+ # Fixes tests with pytest>=6.2.2. Will be part of the next release after 0.5.3
+ (fetchpatch {
+ url = "https://github.com/Delgan/loguru/commit/31cf758ee9d22dbfa125f38153782fe20ac9dce5.patch";
+ sha256 = "1lzbs8akg1s7s6xjl3samf4c4bpssqvwg5fn3mwlm4ysr7jd5y67";
+ })
+ ];
+
checkInputs = [ pytestCheckHook colorama ];
- pytestFlagsArray = lib.optionals stdenv.isDarwin [ "--ignore=tests/test_multiprocessing.py" ];
-
+ disabledTestPaths = lib.optionals stdenv.isDarwin [ "tests/test_multiprocessing.py" ];
disabledTests = [ "test_time_rotation_reopening" "test_file_buffering" ]
++ lib.optionals stdenv.isDarwin [ "test_rotation_and_retention" "test_rotation_and_retention_timed_file" "test_renaming" "test_await_complete_inheritance" ];
@@ -21,6 +38,6 @@ buildPythonPackage rec {
homepage = "https://github.com/Delgan/loguru";
description = "Python logging made (stupidly) simple";
license = licenses.mit;
- maintainers = with maintainers; [ jakewaksbaum ];
+ maintainers = with maintainers; [ jakewaksbaum rmcgibbo ];
};
}
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/managesieve/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/managesieve/default.nix
index 8559339b01..fd2eac2b2c 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/managesieve/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/managesieve/default.nix
@@ -6,11 +6,11 @@
buildPythonPackage rec {
pname = "managesieve";
- version = "0.7";
+ version = "0.7.1";
src = fetchPypi {
inherit pname version;
- sha256 = "1dx0j8hhjwip1ackaj2m4hqrrx2iiv846ic4wa6ymrawwb8iq8m6";
+ sha256 = "44930a3b48332d23b35a5305ae7ba47904d4485ed1b7a22208b7d5ad9d60427a";
};
checkInputs = [ pytestCheckHook ];
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/mautrix/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/mautrix/default.nix
index 6632b88b72..6a6e353673 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/mautrix/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/mautrix/default.nix
@@ -1,14 +1,14 @@
{ lib, buildPythonPackage, fetchPypi, aiohttp, pythonOlder
-, sqlalchemy, ruamel_yaml, CommonMark, lxml, fetchpatch
+, sqlalchemy, ruamel_yaml, CommonMark, lxml
}:
buildPythonPackage rec {
pname = "mautrix";
- version = "0.8.16";
+ version = "0.8.17";
src = fetchPypi {
inherit pname version;
- sha256 = "ccaa1691affa5f257e13d61f7c46088ff0affdd782331b01bfdcbd0b3eb5e10e";
+ sha256 = "9a15a8e39f9d0b36c91dfe0f5dd1efc8752cc1d317057840a3dbffd6ee90e068";
};
propagatedBuildInputs = [
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/micawber/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/micawber/default.nix
index 73f50d32a5..97681291a6 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/micawber/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/micawber/default.nix
@@ -2,11 +2,11 @@
buildPythonPackage rec {
pname = "micawber";
- version = "0.5.2";
+ version = "0.5.3";
src = fetchPypi {
inherit pname version;
- sha256 = "ac2d737d8ff27ed01ea3825ed8806970e8137d7b342cef37b39b6dd17e6eb3a4";
+ sha256 = "05ef4c89e307e3031dd1d85a3a557cd7f9f900f7dbbbcb33dde454940ca38460";
};
propagatedBuildInputs = [ beautifulsoup4 ];
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/minidump/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/minidump/default.nix
index 60440ff4b4..45adc7adb7 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/minidump/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/minidump/default.nix
@@ -5,11 +5,11 @@
buildPythonPackage rec {
pname = "minidump";
- version = "0.0.15";
+ version = "0.0.16";
src = fetchPypi {
inherit pname version;
- sha256 = "sha256-IVlzAsnl1KhErxWPi96hUFlIX4IN3Y9t8OicckdYUv0=";
+ sha256 = "65a71ca1da2b73ee96daa9d52e4fb9c9b80a849475502c6a1c2a80a68bd149b0";
};
# Upstream doesn't have tests
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/mxnet/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/mxnet/default.nix
index 2ad3b9fd6d..47f4d80ad9 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/mxnet/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/mxnet/default.nix
@@ -9,7 +9,7 @@
}:
buildPythonPackage {
- inherit (pkgs.mxnet) name version src meta;
+ inherit (pkgs.mxnet) pname version src meta;
buildInputs = [ pkgs.mxnet ];
propagatedBuildInputs = [ requests numpy graphviz ];
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/ndjson/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/ndjson/default.nix
index 715a1989b4..b69e8401eb 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/ndjson/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/ndjson/default.nix
@@ -16,6 +16,7 @@ buildPythonPackage rec {
homepage = "https://github.com/rhgrant10/ndjson";
description = "JsonDecoder";
platforms = platforms.unix;
+ license = licenses.gpl3Only;
maintainers = with maintainers; [ freezeboy ];
};
}
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/nose-timer/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/nose-timer/default.nix
index c93f5bda98..bbc164c85e 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/nose-timer/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/nose-timer/default.nix
@@ -1,20 +1,44 @@
-{ buildPythonPackage, fetchPypi, lib, nose, }:
+{ lib
+, buildPythonPackage
+, fetchFromGitHub
+, nose
+, mock
+, parameterized
+, termcolor
+}:
buildPythonPackage rec {
pname = "nose-timer";
- version = "1.0.0";
+ version = "1.0.1";
- src = fetchPypi {
- inherit pname version;
- sha256 = "09hwjwbczi06bfqgiylb2yxs5h88jdl26zi1fdqxdzvamrkksf2c";
+ src = fetchFromGitHub {
+ owner = "mahmoudimus";
+ repo = pname;
+ rev = "v${version}";
+ sha256 = "0xsai2l5i1av62y9y0q63wy2zk27klmf2jizgghhxg2y8nfa8x3x";
};
propagatedBuildInputs = [ nose ];
+ checkInputs = [
+ mock
+ nose
+ parameterized
+ termcolor
+ ];
+
+ checkPhase = ''
+ runHook preCheck
+ nosetests --verbosity 2 tests
+ runHook postCheck
+ '';
+
+ pythonImportsCheck = [ "nosetimer" ];
+
meta = with lib; {
+ description = "A timer plugin for nosetests";
homepage = "https://github.com/mahmoudimus/nose-timer";
license = licenses.mit;
- description = "A timer plugin for nosetests (how much time does every test take?)";
maintainers = with maintainers; [ doronbehar ];
};
}
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/numtraits/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/numtraits/default.nix
deleted file mode 100644
index 624f32fd33..0000000000
--- a/third_party/nixpkgs/pkgs/development/python-modules/numtraits/default.nix
+++ /dev/null
@@ -1,32 +0,0 @@
-{ lib
-, buildPythonPackage
-, fetchPypi
-, pytest
-, six
-, numpy
-, traitlets
-}:
-
-buildPythonPackage rec {
- pname = "numtraits";
- version = "0.2";
-
- src = fetchPypi {
- inherit pname version;
- sha256 = "2fca9a6c9334f7358ef1a3e2e64ccaa6a479fc99fc096910e0d5fbe8edcdfd7e";
- };
-
- checkInputs = [ pytest ];
- propagatedBuildInputs = [ six numpy traitlets];
-
- checkPhase = ''
- py.test
- '';
-
- meta = {
- description = "Numerical traits for Python objects";
- license = lib.licenses.bsd2;
- maintainers = with lib.maintainers; [ fridh ];
- homepage = "https://github.com/astrofrog/numtraits";
- };
-}
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/onnx/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/onnx/default.nix
index 807b6cf5f5..90683a84f4 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/onnx/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/onnx/default.nix
@@ -46,7 +46,8 @@ buildPythonPackage rec {
];
postPatch = ''
- patchShebangs tools/protoc-gen-mypy.py
+ chmod +x tools/protoc-gen-mypy.sh.in
+ patchShebangs tools/protoc-gen-mypy.sh.in tools/protoc-gen-mypy.py
'';
preBuild = ''
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/openrazer/common.nix b/third_party/nixpkgs/pkgs/development/python-modules/openrazer/common.nix
index 2ed723944d..35655b207a 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/openrazer/common.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/openrazer/common.nix
@@ -1,12 +1,12 @@
{ lib
, fetchFromGitHub
}: rec {
- version = "2.9.0";
+ version = "3.0.0";
src = fetchFromGitHub {
owner = "openrazer";
repo = "openrazer";
rev = "v${version}";
- sha256 = "1js7hq7zx5kj99brffrfaaah283ydkffmmrzsxv4mkd3nnd6rykk";
+ sha256 = "sha256-gw6Qt9BntPcF3zw19PXftDbhoCeBr8hwrujy51rb5Fc=";
};
meta = with lib; {
homepage = "https://openrazer.github.io/";
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/parameterized/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/parameterized/default.nix
index dbf5475bab..1183c09e62 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/parameterized/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/parameterized/default.nix
@@ -1,28 +1,40 @@
-{ lib, fetchPypi, buildPythonPackage, nose, mock, glibcLocales, isPy3k, isPy38 }:
+{ lib
+, buildPythonPackage
+, fetchPypi
+, glibcLocales
+, isPy3k
+, mock
+, nose
+}:
buildPythonPackage rec {
pname = "parameterized";
- version = "0.7.5";
+ version = "0.8.1";
+ disable = !isPy3k;
src = fetchPypi {
inherit pname version;
- sha256 = "b5e6af67b9e49485e30125b1c8f031ffa81a265ca08bfa73f31551bf03cf68c4";
+ sha256 = "sha256-Qbv/N9YYZDD3f5ANd35btqJJKKHEb7HeaS+LUriDO1w=";
};
- # Tests require some python3-isms but code works without.
- # python38 is not fully supported yet
- doCheck = isPy3k && (!isPy38);
-
- checkInputs = [ nose mock glibcLocales ];
+ checkInputs = [
+ nose
+ mock
+ glibcLocales
+ ];
checkPhase = ''
+ runHook preCheck
LC_ALL="en_US.UTF-8" nosetests -v
+ runHook postCheck
'';
+ pythonImportsCheck = [ "parameterized" ];
+
meta = with lib; {
description = "Parameterized testing with any Python test framework";
- homepage = "https://pypi.python.org/pypi/parameterized";
- license = licenses.bsd3;
+ homepage = "https://github.com/wolever/parameterized";
+ license = licenses.bsd2;
maintainers = with maintainers; [ ma27 ];
};
}
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pg8000/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pg8000/default.nix
index 3cf843b864..efa4c3005f 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/pg8000/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/pg8000/default.nix
@@ -8,15 +8,20 @@
buildPythonPackage rec {
pname = "pg8000";
- version = "1.18.0";
+ version = "1.19.0";
disabled = pythonOlder "3.6";
src = fetchPypi {
inherit pname version;
- sha256 = "1nkjxf95ldda41mkmahbikhd1fvxai5lfjb4a5gyhialpz4g5fim";
+ sha256 = "sha256-EexwwLIOpECAfiyGmUDxSE7qk9cbQ1gHtjhW3YK3RN0=";
};
- propagatedBuildInputs = [ passlib scramp ];
+ propagatedBuildInputs = [passlib scramp ];
+
+ postPatch = ''
+ substituteInPlace setup.py \
+ --replace "scramp==1.3.0" "scramp>=1.3.0"
+ '';
# Tests require a running PostgreSQL instance
doCheck = false;
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/piep/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/piep/default.nix
index aacd9e314c..c99f408db6 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/piep/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/piep/default.nix
@@ -3,11 +3,13 @@
, fetchPypi
, nose
, pygments
+, isPy3k
}:
buildPythonPackage rec {
version = "0.9.2";
pname = "piep";
+ disabled = isPy3k;
src = fetchPypi {
inherit pname version;
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pkutils/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pkutils/default.nix
index d674e876b1..c383f5ff86 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/pkutils/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/pkutils/default.nix
@@ -1,5 +1,4 @@
{ lib
-, pythonOlder
, buildPythonPackage
, isPy3k
, fetchFromGitHub
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/plexapi/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/plexapi/default.nix
index 1686887a15..1fbdd6773e 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/plexapi/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/plexapi/default.nix
@@ -9,14 +9,14 @@
buildPythonPackage rec {
pname = "PlexAPI";
- version = "4.4.1";
+ version = "4.5.0";
disabled = isPy27;
src = fetchFromGitHub {
owner = "pkkid";
repo = "python-plexapi";
rev = version;
- sha256 = "11zarqnrpis6xpsjdvfl3pczv1l9rzbgkawkv2lhfvzlnc00d7df";
+ sha256 = "sha256-MjV1JUHrIHTu3UHy4HnMtTEjSCx3U9kMgUkbCJOAZr0=";
};
propagatedBuildInputs = [
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/prance/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/prance/default.nix
index 3c9bc5c7c5..f9d5b6f80b 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/prance/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/prance/default.nix
@@ -6,10 +6,9 @@
, requests
, six
, semver
-, pytest
+, pytestCheckHook
, pytestcov
, pytestrunner
-, sphinx
, openapi-spec-validator
}:
@@ -35,18 +34,28 @@ buildPythonPackage rec {
];
checkInputs = [
- pytest
+ pytestCheckHook
pytestcov
openapi-spec-validator
];
postPatch = ''
substituteInPlace setup.py \
- --replace "tests_require = dev_require," "tests_require = None,"
+ --replace "tests_require = dev_require," "tests_require = None," \
+ --replace "chardet~=4.0" "" \
+ --replace "semver~=2.13" ""
+ substituteInPlace setup.cfg \
+ --replace "--cov-fail-under=90" ""
'';
- # many tests require network connection
- doCheck = false;
+ # Disable tests that require network
+ disabledTestPaths = [
+ "tests/test_convert.py"
+ ];
+ disabledTests = [
+ "test_fetch_url_http"
+ ];
+ pythonImportsCheck = [ "prance" ];
meta = with lib; {
description = "Resolving Swagger/OpenAPI 2.0 and 3.0.0 Parser";
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pyicu/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyicu/default.nix
index e152002cdd..75bbcde09c 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/pyicu/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/pyicu/default.nix
@@ -1,36 +1,26 @@
{ lib
, buildPythonPackage
, fetchPypi
-, pytest
+, pytestCheckHook
, six
-, fetchpatch
, icu
}:
buildPythonPackage rec {
pname = "PyICU";
- version = "2.3.1";
+ version = "2.6";
src = fetchPypi {
inherit pname version;
- sha256 = "ddb2b453853b4c25db382bc5e8c4cde09b3f4696ef1e1494f8294e174f459cf4";
+ sha256 = "0wb3v421i2fnnxdywam4ay8hqvnxlz0r2nrpx5lqy3rn6dlbz9d9";
};
- patches = [
- (fetchpatch {
- url = "https://salsa.debian.org/python-team/modules/pyicu/raw/debian/2.2-2/"
- + "debian/patches/icu_test.patch";
- sha256 = "1iavdkyqixm9i753svl17barla93b7jzgkw09dn3hnggamx7zwx9";
- })
- ];
-
nativeBuildInputs = [ icu ]; # for icu-config
buildInputs = [ icu ];
- checkInputs = [ pytest ];
- propagatedBuildInputs = [ six ];
+ checkInputs = [ pytestCheckHook six ];
meta = with lib; {
- homepage = "https://pypi.python.org/pypi/PyICU/";
+ homepage = "https://github.com/ovalhub/pyicu/";
description = "Python extension wrapping the ICU C++ API";
license = licenses.mit;
platforms = platforms.unix;
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pykodi/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pykodi/default.nix
new file mode 100644
index 0000000000..24450270a8
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/development/python-modules/pykodi/default.nix
@@ -0,0 +1,22 @@
+{ lib, buildPythonPackage, fetchPypi, aiohttp, jsonrpc-async, jsonrpc-websocket }:
+
+buildPythonPackage rec {
+ pname = "pykodi";
+ version = "0.2.3";
+
+ src = fetchPypi {
+ inherit pname version;
+ sha256 = "099xyn5aql5mdim6kh4hwx0fg1a3bx73qdvwr48nz23cljmmk1m8";
+ };
+
+ propagatedBuildInputs = [ aiohttp jsonrpc-async jsonrpc-websocket ];
+
+ pythonImportsCheck = [ "pykodi" ];
+
+ meta = with lib; {
+ description = "An async python interface for Kodi over JSON-RPC";
+ homepage = "https://github.com/OnFreund/PyKodi";
+ license = licenses.mit;
+ maintainers = with maintainers; [ sephalon ];
+ };
+}
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pymumble/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pymumble/default.nix
index 6e72309a58..45c193899f 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/pymumble/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/pymumble/default.nix
@@ -1,31 +1,50 @@
-{ buildPythonPackage,
- fetchFromGitHub,
- isPy27,
- lib,
- opuslib,
- protobuf,
+{ buildPythonPackage
+, fetchFromGitHub
+, fetchpatch
+, isPy27
+, lib
+, opuslib
+, protobuf
+, pytestCheckHook
+, pycrypto
}:
buildPythonPackage rec {
pname = "pymumble";
- version = "0.3.1";
+ version = "1.6";
disabled = isPy27;
src = fetchFromGitHub {
owner = "azlux";
repo = "pymumble";
- rev = "1dd6d6d4df2fdef33202f17e2acf3ba9678a5737";
- sha256 = "1r1sch8xrpbzffsb72lhp5xjr3ac3xb599n44vsfmaam3xklz6vz";
+ rev = version;
+ sha256 = "04nc66d554a98mbmdgzgsg6ncaz0jsn4zdr3mr14w6wnhrxpjkrs";
};
+ patches = [
+ # Compatibility with pycryptodome (which is what our pycrypto really is)
+ # See https://github.com/azlux/pymumble/pull/99
+ (fetchpatch {
+ url = "https://github.com/azlux/pymumble/pull/99/commits/b85548a0e1deaac820954b1c0b308af214311a14.patch";
+ sha256 = "0w9dpc87rny6vmhi634pih1p97b67jm26qajscpa9wp6nphdlxlj";
+ })
+ ];
+
+ postPatch = ''
+ # Changes all `library==x.y.z` statements to just `library`
+ # So that we aren't constrained to a specific version
+ sed -i 's/\(.*\)==.*/\1/' requirements.txt
+ '';
propagatedBuildInputs = [ opuslib protobuf ];
+ checkInputs = [ pytestCheckHook pycrypto ];
+
pythonImportsCheck = [ "pymumble_py3" ];
meta = with lib; {
description = "Python 3 version of pymumble, Mumble library used for multiple uses like making mumble bot.";
homepage = "https://github.com/azlux/pymumble";
- license = licenses.gpl3;
- maintainers = with maintainers; [ thelegy ];
+ license = licenses.gpl3Only;
+ maintainers = with maintainers; [ thelegy infinisil ];
};
}
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pynmea2/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pynmea2/default.nix
index bf9a9eecfb..8bb82fa330 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/pynmea2/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/pynmea2/default.nix
@@ -2,11 +2,11 @@
buildPythonPackage rec {
pname = "pynmea2";
- version = "1.16.0";
+ version = "1.17.0";
src = fetchPypi {
inherit pname version;
- sha256 = "0w9g5qh573276404f04b46684ydlakv30ds0x0r4kcl370ljmfsg";
+ sha256 = "0x5xrk51dpzsvky1ncikadm80a44a82j3mjjykmhmx7jddc5qh9d";
};
checkInputs = [ pytestCheckHook ];
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pypykatz/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pypykatz/default.nix
index 4b52d3b290..e98e2bc3db 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/pypykatz/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/pypykatz/default.nix
@@ -1,7 +1,8 @@
{ lib
+, aiosmb
, aiowinreg
, buildPythonPackage
-, fetchFromGitHub
+, fetchPypi
, minidump
, minikerberos
, msldap
@@ -10,16 +11,15 @@
buildPythonPackage rec {
pname = "pypykatz";
- version = "0.4.3";
+ version = "0.4.7";
- src = fetchFromGitHub {
- owner = "skelsec";
- repo = pname;
- rev = version;
- sha256 = "sha256-ows6zJyygdAwgKNKKCURWX+kl42f3CN23/xZrLjkfrw=";
+ src = fetchPypi {
+ inherit pname version;
+ sha256 = "0il5sj47wyf9gn76alm8v1l63rqw2vsd27v6f7q1dpn0wq209syi";
};
propagatedBuildInputs = [
+ aiosmb
aiowinreg
minikerberos
msldap
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pyqtwebengine/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyqtwebengine/default.nix
index 367c258b5f..ce25bc04a1 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/pyqtwebengine/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/pyqtwebengine/default.nix
@@ -14,12 +14,12 @@ let
in buildPythonPackage rec {
pname = "PyQtWebEngine";
- version = "5.15.2";
+ version = "5.15.4";
format = "other";
src = pythonPackages.fetchPypi {
inherit pname version;
- sha256 = "0d56ak71r14w4f9r96vaj34qcn2rbln3s6ildvvyc707fjkzwwjd";
+ sha256 = "06fc35hzg346a9c86dk7vzm1fakkgzn5l52jfq3bix3587sjip6f";
};
inherit patches;
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pyradios/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyradios/default.nix
new file mode 100644
index 0000000000..f95988063d
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/development/python-modules/pyradios/default.nix
@@ -0,0 +1,24 @@
+{ lib, buildPythonPackage, fetchPypi, appdirs, requests }:
+buildPythonPackage rec {
+ pname = "pyradios";
+ version = "0.0.22";
+
+ src = fetchPypi {
+ inherit pname version;
+ sha256 = "1bgfb8vz7jybswss16pdzns0qpqfrwa9f2g8qrh1r4mig4xh2dmi";
+ };
+
+ propagatedBuildInputs = [
+ appdirs
+ requests
+ ];
+
+ doCheck = false;
+
+ meta = with lib; {
+ description = "Python client for the https://api.radio-browser.info";
+ homepage = "https://github.com/andreztz/pyradios";
+ license = licenses.mit;
+ maintainers = with maintainers; [ infinisil ];
+ };
+}
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pyregion/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyregion/default.nix
index 86a5ef6bfe..6d33e18e4f 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/pyregion/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/pyregion/default.nix
@@ -1,13 +1,13 @@
{ lib
, buildPythonPackage
-, fetchPypi
+, fetchFromGitHub
, fetchpatch
, pyparsing
, numpy
, cython
, astropy
, astropy-helpers
-, pytest
+, pytestCheckHook
, pytest-astropy
}:
@@ -15,15 +15,18 @@ buildPythonPackage rec {
pname = "pyregion";
version = "2.0";
- src = fetchPypi {
- inherit pname version;
- sha256 = "a8ac5f764b53ec332f6bc43f6f2193ca13e8b7d5a3fb2e20ced6b2ea42a9d094";
+ # pypi src contains cython-produced .c files which don't compile
+ # with python3.9
+ src = fetchFromGitHub {
+ owner = "astropy";
+ repo = pname;
+ rev = version;
+ sha256 = "1izar7z606czcyws9s8bjbpb1xhqshpv5009rlpc92hciw7jv4kg";
};
propagatedBuildInputs = [
pyparsing
numpy
- cython
astropy
];
@@ -36,9 +39,9 @@ buildPythonPackage rec {
})
];
- nativeBuildInputs = [ astropy-helpers ];
+ nativeBuildInputs = [ astropy-helpers cython ];
- checkInputs = [ pytest pytest-astropy ];
+ checkInputs = [ pytestCheckHook pytest-astropy ];
# Disable automatic update of the astropy-helper module
postPatch = ''
@@ -46,9 +49,11 @@ buildPythonPackage rec {
'';
# Tests must be run in the build directory
- checkPhase = ''
- cd build/lib.*
- pytest
+ preCheck = ''
+ pushd build/lib.*
+ '';
+ postCheck = ''
+ popd
'';
meta = with lib; {
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pyscss/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyscss/default.nix
index e4e7791fa7..bbf4ee712c 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/pyscss/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/pyscss/default.nix
@@ -26,6 +26,9 @@ buildPythonPackage rec {
++ (lib.optionals (pythonOlder "3.4") [ enum34 pathlib ])
++ (lib.optionals (pythonOlder "2.7") [ ordereddict ]);
+ # Test suite is broken.
+ # See https://github.com/Kronuz/pyScss/issues/415
+ doCheck = false;
checkPhase = ''
py.test
'';
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/python-igraph/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/python-igraph/default.nix
index 728d47b1f9..8e90ce5190 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/python-igraph/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/python-igraph/default.nix
@@ -1,32 +1,54 @@
-{ buildPythonPackage, fetchPypi, lib, isPy3k
-, pkg-config, igraph
-, texttable }:
+{ lib
+, buildPythonPackage
+, pythonOlder
+, fetchFromGitHub
+, pkg-config
+, igraph
+, texttable
+, python
+}:
buildPythonPackage rec {
pname = "python-igraph";
- version = "0.8.3";
- disabled = !isPy3k; # fails to build
+ version = "0.9.1";
- nativeBuildInputs = [ pkg-config ];
- buildInputs = [ igraph ];
- propagatedBuildInputs = [ texttable ];
+ disabled = pythonOlder "3.6";
- src = fetchPypi {
- inherit pname version;
- sha256 = "e1f27622eddeb2bd5fdcbadb41ef048e884790bb050f9627c086dc609d0f1236";
+ src = fetchFromGitHub {
+ owner = "igraph";
+ repo = "python-igraph";
+ rev = version;
+ sha256 = "1ldyzza25zvwh144lw8x856z76s8gfvnbdm56fcmwkvm7aj81npw";
};
+ nativeBuildInputs = [
+ pkg-config
+ ];
+
+ buildInputs = [
+ igraph
+ igraph.dev
+ ];
+
+ propagatedBuildInputs = [
+ texttable
+ ];
+
# NB: We want to use our igraph, not vendored igraph, but even with
# pkg-config on the PATH, their custom setup.py still needs to be explicitly
# told to do it. ~ C.
setupPyGlobalFlags = [ "--use-pkg-config" ];
- doCheck = !isPy3k;
+ checkPhase = ''
+ ${python.interpreter} -m unittest
+ '';
- meta = {
+ pythonImportsCheck = [ "igraph" ];
+
+ meta = with lib; {
description = "High performance graph data structures and algorithms";
homepage = "https://igraph.org/python/";
- license = lib.licenses.gpl2;
- maintainers = [ lib.maintainers.MostAwesomeDude ];
+ license = licenses.gpl2Plus;
+ maintainers = with maintainers; [ MostAwesomeDude dotlambda ];
};
}
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/python-miio/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/python-miio/default.nix
index 78c89408ac..07d7ba9b3c 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/python-miio/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/python-miio/default.nix
@@ -1,51 +1,75 @@
{ lib
, buildPythonPackage
+, pythonOlder
, fetchPypi
-, appdirs
+, poetry
, click
-, construct
-, croniter
, cryptography
-, importlib-metadata
-, pytest
-, pytest-mock
+, construct
, zeroconf
, attrs
, pytz
+, appdirs
, tqdm
, netifaces
+, android-backup
+, importlib-metadata
+, croniter
+, defusedxml
+, pytestCheckHook
+, pytest-mock
+, pyyaml
}:
buildPythonPackage rec {
pname = "python-miio";
- version = "0.5.4";
+ version = "0.5.5.2";
+ disabled = pythonOlder "3.6";
+ format = "pyproject";
src = fetchPypi {
inherit pname version;
- sha256 = "5a6fd3bb2cc2f75cdfe5673f36a5a418144d08add6e53b384cb146e99f27bd39";
+ sha256 = "sha256-lk7egCyj+vSsaXmxuWxlQuom8n3JEs/RIWwCuwTOXeI=";
};
postPatch = ''
- substituteInPlace setup.py \
- --replace "zeroconf>=0.25.1,<0.26.0" "zeroconf"
- substituteInPlace setup.py \
- --replace "pytz>=2019.3,<2020.0" "pytz"
- substituteInPlace setup.py \
- --replace "cryptography>=2.9,<3.0" "cryptography"
- '';
-
- checkInputs = [ pytest pytest-mock];
- propagatedBuildInputs = [ appdirs click construct croniter cryptography importlib-metadata zeroconf attrs pytz tqdm netifaces ];
-
- checkPhase = ''
- pytest
+ substituteInPlace pyproject.toml \
+ --replace 'croniter = "^0"' 'croniter = "*"' \
+ --replace 'defusedxml = "^0.6"' 'defusedxml = "*"'
'';
+ nativeBuildInputs = [
+ poetry
+ ];
+
+ propagatedBuildInputs = [
+ click
+ cryptography
+ construct
+ zeroconf
+ attrs
+ pytz
+ appdirs
+ tqdm
+ netifaces
+ android-backup
+ croniter
+ defusedxml
+ ] ++ lib.optional (pythonOlder "3.8") importlib-metadata;
+
+ checkInputs = [
+ pytestCheckHook
+ pytest-mock
+ pyyaml
+ ];
+
+ pythonImportsCheck = [ "miio" ];
+
meta = with lib; {
description = "Python library for interfacing with Xiaomi smart appliances";
homepage = "https://github.com/rytilahti/python-miio";
- license = licenses.gpl3;
+ license = licenses.gpl3Only;
maintainers = with maintainers; [ flyfloh ];
};
}
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pyxnat/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyxnat/default.nix
index 700188f15d..87f6b9756e 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/pyxnat/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/pyxnat/default.nix
@@ -1,7 +1,7 @@
{ lib
, buildPythonPackage
, fetchPypi
-, isPy27
+, pythonOlder
, nose
, lxml
, requests
@@ -10,7 +10,7 @@
buildPythonPackage rec {
pname = "pyxnat";
version = "1.4";
- disabled = isPy27;
+ disabled = pythonOlder "3.7";
src = fetchPypi {
inherit pname version;
@@ -19,6 +19,14 @@ buildPythonPackage rec {
propagatedBuildInputs = [ lxml requests ];
+ # future is not used, and pathlib is installed part of python38+
+ # w/o an external package
+ prePatch = ''
+ substituteInPlace setup.py \
+ --replace "pathlib>=1.0" "" \
+ --replace "future>=0.16" ""
+ '';
+
checkInputs = [ nose ];
checkPhase = "nosetests pyxnat/tests";
doCheck = false; # requires a docker container running an XNAT server
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pyzerproc/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyzerproc/default.nix
index 4f3c53fe48..99f1ac7fd0 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/pyzerproc/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/pyzerproc/default.nix
@@ -12,14 +12,14 @@
buildPythonPackage rec {
pname = "pyzerproc";
- version = "0.4.8";
+ version = "0.4.9";
disabled = pythonOlder "3.6";
src = fetchFromGitHub {
owner = "emlove";
repo = pname;
rev = version;
- sha256 = "sha256-PNvkgjPcBbnETjWpVF3De9O9IprdpCke0nWvJ9Tju1M=";
+ sha256 = "11bsvmvazx9gpj0w80b6wgdp41z8y2sk6bhkj3ps7grsgr59n7rz";
};
postPatch = ''
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/qiskit-ibmq-provider/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/qiskit-ibmq-provider/default.nix
index 9346fae974..80f060c668 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/qiskit-ibmq-provider/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/qiskit-ibmq-provider/default.nix
@@ -39,7 +39,7 @@ let
in
buildPythonPackage rec {
pname = "qiskit-ibmq-provider";
- version = "0.12.1";
+ version = "0.12.2";
disabled = pythonOlder "3.6";
@@ -47,7 +47,7 @@ buildPythonPackage rec {
owner = "Qiskit";
repo = pname;
rev = version;
- sha256 = "1i5dj5dl0hxqd61bdflyy6yq958fj9qhf6s6m40n1vnql7g50gdx";
+ sha256 = "0yil363mqssq0453nrwxgkjivzk3a4jgbnaf21bp7lwfcl2jdhqm";
};
propagatedBuildInputs = [
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/qiskit/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/qiskit/default.nix
index 5051c6541c..97603dc3cd 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/qiskit/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/qiskit/default.nix
@@ -15,7 +15,7 @@
buildPythonPackage rec {
pname = "qiskit";
# NOTE: This version denotes a specific set of subpackages. See https://qiskit.org/documentation/release_notes.html#version-history
- version = "0.24.0";
+ version = "0.24.1";
disabled = pythonOlder "3.6";
@@ -23,7 +23,7 @@ buildPythonPackage rec {
owner = "qiskit";
repo = "qiskit";
rev = version;
- sha256 = "1b78q75bi666v0yj33bkjlc40d2172dsq5yp1s2kkisjfa8qmh7h";
+ sha256 = "0qfz69n8sl7sk4hzygni9qars9q1cyz0n3bv1lca00ia5qsc72d2";
};
propagatedBuildInputs = [
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/restview/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/restview/default.nix
index acce48c45d..b2fc2d9bea 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/restview/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/restview/default.nix
@@ -7,38 +7,32 @@
, packaging
, pygments
, mock
+, pytestCheckHook
}:
buildPythonPackage rec {
pname = "restview";
- version = "2.9.1";
+ version = "2.9.2";
src = fetchPypi {
inherit pname version;
- sha256 = "de87c84f19526bd4a76505f6d40b51b7bb03ca43b6067c93f82f1c7237ac9e84";
+ sha256 = "1p1jgdvc04ws8kga3r0vrq3m0b52qw3clwyydl96a13wb3mrf03r";
};
- propagatedBuildInputs = [ docutils readme_renderer packaging pygments ];
- checkInputs = [ mock ];
-
patches = [
- # fix tests after readme_renderer update
- # TODO remove on next update
(fetchpatch {
- url = "https://github.com/mgedmin/restview/commit/541743ded13ae55dea4c437046984a5f13d06e8b.patch";
- sha256 = "031b1dlqx346bz7afpc011lslnq771lnxb6iy1l2285pph534bci";
+ url = "https://github.com/mgedmin/restview/commit/a1ded30a87c65f3ce59a18497a7fc5099317c2be.patch";
+ sha256 = "1ax7pih456a3nbj8qrrq7hqigbyag4ihzpn6bm0z4y74d0r3v8a5";
})
];
- postPatch = ''
- # dict order breaking tests
- sed -i 's@@...@' src/restview/tests.py
- '';
+ propagatedBuildInputs = [ docutils readme_renderer packaging pygments ];
+ checkInputs = [ mock pytestCheckHook ];
meta = {
description = "ReStructuredText viewer";
homepage = "https://mg.pov.lt/restview/";
- license = lib.licenses.gpl2;
+ license = lib.licenses.gpl3Only;
maintainers = with lib.maintainers; [ koral ];
};
}
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/sagemaker/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/sagemaker/default.nix
index 8476701d47..c62f5ede3c 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/sagemaker/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/sagemaker/default.nix
@@ -14,11 +14,11 @@
buildPythonPackage rec {
pname = "sagemaker";
- version = "2.31.0";
+ version = "2.32.0";
src = fetchPypi {
inherit pname version;
- sha256 = "sha256-RMw7l3s0QBzB+exiZg2aBQYeprHUJM+f0Rf+N8ywaBU=";
+ sha256 = "sha256-gwymCOwmA++FCy0Zl+MxPMbPp+kmNFpx9Azuc34m+J0=";
};
pythonImportsCheck = [
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/salmon-mail/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/salmon-mail/default.nix
index 0b8edf8bdd..52aa8a98e1 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/salmon-mail/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/salmon-mail/default.nix
@@ -28,7 +28,7 @@ buildPythonPackage rec {
meta = with lib; {
homepage = "https://salmon-mail.readthedocs.org/";
description = "Pythonic mail application server";
- license = licenses.gpl3;
+ license = licenses.gpl3Only;
maintainers = with maintainers; [ jluttine ];
};
}
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/sasmodels/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/sasmodels/default.nix
index 06d2d40d18..08c9e7ce3e 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/sasmodels/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/sasmodels/default.nix
@@ -1,20 +1,30 @@
-{ lib, fetchFromGitHub, buildPythonPackage, pytest, numpy, scipy, matplotlib, docutils
-, pyopencl, opencl-headers
+{ lib
+, fetchFromGitHub
+, buildPythonPackage
+, pytest_5
+, numpy
+, scipy
+, matplotlib
+, docutils
+, pyopencl
+, opencl-headers
}:
buildPythonPackage rec {
pname = "sasmodels";
- version = "1.0.2";
+ version = "1.0.4";
src = fetchFromGitHub {
owner = "SasView";
repo = "sasmodels";
rev = "v${version}";
- sha256 = "1qvh7q0fkls5r8r9mrph6igcvv8x3qsslqsc5jf1n20alcs5zjrl";
+ sha256 = "0h2k81dm92sm0z086qy3ipw6y6cfgpb7ppl7lhjmx6816s3k50sa";
};
buildInputs = [ opencl-headers ];
- checkInputs = [ pytest ];
+ # Note: the 1.0.5 release should be compatible with pytest6, so this can
+ # be set back to 'pytest' at that point
+ checkInputs = [ pytest_5 ];
propagatedBuildInputs = [ docutils matplotlib numpy scipy pyopencl ];
checkPhase = ''
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/scramp/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/scramp/default.nix
index dc57461d54..68e4b9821b 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/scramp/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/scramp/default.nix
@@ -7,13 +7,13 @@
buildPythonPackage rec {
pname = "scramp";
- version = "1.2.2";
+ version = "1.4.0";
src = fetchFromGitHub {
owner = "tlocke";
repo = "scramp";
rev = version;
- sha256 = "sha256-d/kfrhvU96eH8TQX7n1hVRclEFWLseEvOxiR6VaOdrg=";
+ sha256 = "sha256-aXuRIW/3qBzan8z3EzSSxqaZfa3WnPhlviNa2ugIjik=";
};
propagatedBuildInputs = [ asn1crypto ];
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/semver/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/semver/default.nix
index c281a6d6b0..cb4578671b 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/semver/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/semver/default.nix
@@ -1,27 +1,34 @@
{ lib
-, fetchFromGitHub
, buildPythonPackage
+, fetchFromGitHub
+, pytest-cov
, pytestCheckHook
-, pytestcov
}:
buildPythonPackage rec {
pname = "semver";
- version = "2.10.2";
+ version = "2.13.0";
src = fetchFromGitHub {
owner = "python-semver";
repo = "python-semver";
rev = version;
- sha256 = "0yxjmcgk5iwp53l9z1cg0ajrj18i09ircs11ifpdrggzm8n1blf3";
+ sha256 = "sha256-IWTo/P9JRxBQlhtcH3JMJZZrwAA8EALF4dtHajWUc4w=";
};
- preCheck = "rm -rf dist"; # confuses source vs dist imports in pytest
- checkInputs = [ pytestCheckHook pytestcov ];
+ checkInputs = [
+ pytest-cov
+ pytestCheckHook
+ ];
+
+ # Confuses source vs dist imports in pytest
+ preCheck = "rm -r dist";
+
+ pythonImportsCheck = [ "semver" ];
meta = with lib; {
description = "Python package to work with Semantic Versioning (http://semver.org/)";
- homepage = "https://python-semver.readthedocs.io/en/latest/";
+ homepage = "https://python-semver.readthedocs.io/";
license = licenses.bsd3;
maintainers = with maintainers; [ np ];
};
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/solaredge/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/solaredge/default.nix
new file mode 100644
index 0000000000..f593ff5016
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/development/python-modules/solaredge/default.nix
@@ -0,0 +1,36 @@
+{ lib
+, buildPythonPackage
+, fetchPypi
+, python-dateutil
+, pythonOlder
+, pytz
+, requests
+}:
+
+buildPythonPackage rec {
+ pname = "solaredge";
+ version = "0.0.4";
+ disabled = pythonOlder "3.7";
+
+ src = fetchPypi {
+ inherit pname version;
+ sha256 = "0q4gib0l3qnlpncg84ki027vr1apjlr47vd6845rpk7zkm8lqgfz";
+ };
+
+ propagatedBuildInputs = [
+ python-dateutil
+ pytz
+ requests
+ ];
+
+ # Project has no tests
+ doCheck = false;
+ pythonImportsCheck = [ "solaredge" ];
+
+ meta = with lib; {
+ description = "Python wrapper for Solaredge monitoring service";
+ homepage = "https://github.com/bertouttier/solaredge";
+ license = with licenses; [ mit ];
+ maintainers = with maintainers; [ fab ];
+ };
+}
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/sphinx-autobuild/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/sphinx-autobuild/default.nix
index 739ea2afa8..94047b359a 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/sphinx-autobuild/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/sphinx-autobuild/default.nix
@@ -24,6 +24,6 @@ buildPythonPackage rec {
description = "Rebuild Sphinx documentation on changes, with live-reload in the browser";
homepage = "https://github.com/executablebooks/sphinx-autobuild";
license = with licenses; [ mit ];
- maintainer = with maintainers; [holgerpeters];
+ maintainers = with maintainers; [holgerpeters];
};
}
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/tldextract/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/tldextract/default.nix
index b91289e506..d5b257abed 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/tldextract/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/tldextract/default.nix
@@ -1,28 +1,56 @@
-{ lib, fetchPypi, buildPythonPackage, setuptools_scm
-, requests, requests-file, idna, filelock, pytest
+{ lib
+, buildPythonPackage
+, fetchPypi
+, filelock
+, idna
+, pytest-mock
+, pytestCheckHook
+, pythonOlder
+, requests
+, requests-file
, responses
+, setuptools-scm
}:
buildPythonPackage rec {
pname = "tldextract";
version = "3.1.0";
+ disabled = pythonOlder "3.6";
src = fetchPypi {
inherit pname version;
sha256 = "cfae9bc8bda37c3e8c7c8639711ad20e95dc85b207a256b60b0b23d7ff5540ea";
};
- propagatedBuildInputs = [ requests requests-file idna filelock ];
- checkInputs = [ pytest responses ];
- nativeBuildInputs = [ setuptools_scm ];
+ nativeBuildInputs = [ setuptools-scm ];
+
+ propagatedBuildInputs = [
+ filelock
+ idna
+ requests
+ requests-file
+ ];
+
+ checkInputs = [
+ pytest-mock
+ pytestCheckHook
+ responses
+ ];
+
+ postPatch = ''
+ substituteInPlace pytest.ini --replace " --pylint" ""
+ '';
- # No tests included
- doCheck = false;
pythonImportsCheck = [ "tldextract" ];
- meta = {
+ meta = with lib; {
+ description = "Python module to accurately separate the TLD from the domain of an URL";
+ longDescription = ''
+ tldextract accurately separates the gTLD or ccTLD (generic or country code top-level domain)
+ from the registered domain and subdomains of a URL.
+ '';
homepage = "https://github.com/john-kurkowski/tldextract";
- description = "Accurately separate the TLD from the registered domain and subdomains of a URL, using the Public Suffix List";
- license = lib.licenses.bsd3;
+ license = with licenses; [ bsd3 ];
+ maintainers = with maintainers; [ fab ];
};
}
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/urllib3/2.nix b/third_party/nixpkgs/pkgs/development/python-modules/urllib3/2.nix
index b44993c71b..a67ebd62f7 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/urllib3/2.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/urllib3/2.nix
@@ -1,5 +1,4 @@
{ lib
-, stdenv
, brotli
, buildPythonPackage
, certifi
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/urllib3/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/urllib3/default.nix
index fa323fb960..b4fb9a0e71 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/urllib3/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/urllib3/default.nix
@@ -1,5 +1,4 @@
{ lib
-, stdenv
, brotli
, buildPythonPackage
, certifi
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/xdis/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/xdis/default.nix
index 280470957d..3da2574359 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/xdis/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/xdis/default.nix
@@ -6,14 +6,14 @@
buildPythonPackage rec {
pname = "xdis";
- version = "5.0.5";
+ version = "5.0.8";
disabled = isPy27;
src = fetchFromGitHub {
owner = "rocky";
repo = "python-xdis";
rev = version;
- sha256 = "01248nh8y5szin6ymd3hrl8qnsg4xijsk3lxyks8zk9cjh008lmq";
+ sha256 = "01g1bk7rscwmvr2i183z0y2bs1iw7bxk7c5rcf9gf25242nppv6a";
};
checkInputs = [ pytest ];
@@ -22,10 +22,11 @@ buildPythonPackage rec {
checkPhase = ''
make check
'';
+ pythonImportsCheck = [ "xdis" ];
meta = with lib; {
description = "Python cross-version byte-code disassembler and marshal routines";
homepage = "https://github.com/rocky/python-xdis/";
- license = licenses.gpl2;
+ license = licenses.gpl2Plus;
};
}
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/xknx/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/xknx/default.nix
index b1a1afbe20..26f6516829 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/xknx/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/xknx/default.nix
@@ -11,14 +11,14 @@
buildPythonPackage rec {
pname = "xknx";
- version = "0.17.2";
+ version = "0.17.4";
disabled = pythonOlder "3.7";
src = fetchFromGitHub {
owner = "XKNX";
repo = pname;
rev = version;
- sha256 = "sha256-DJglvcpqGBVkycEjq+Oa9gz9Keop39+UR9SctX0lg/A=";
+ sha256 = "sha256-QMtpGd7JFPGTLHbhyjOsan1Ow32v8B2ss84GpHA0qqs=";
};
propagatedBuildInputs = [
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/ytmusicapi/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/ytmusicapi/default.nix
index ed4a416568..f84db4ff62 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/ytmusicapi/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/ytmusicapi/default.nix
@@ -7,13 +7,13 @@
buildPythonPackage rec {
pname = "ytmusicapi";
- version = "0.14.3";
+ version = "0.15.0";
disabled = isPy27;
src = fetchPypi {
inherit pname version;
- sha256 = "83251a95d5bd74116353d29dfda2d0c5055b88276a0876a313a66f8b9c691344";
+ sha256 = "sha256-pVQqoMvuuFc/1QNG5z/AspGlgIGPi9aqjZ3/3eVNhis=";
};
propagatedBuildInputs = [
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/zerobin/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/zerobin/default.nix
deleted file mode 100644
index 19d02a7049..0000000000
--- a/third_party/nixpkgs/pkgs/development/python-modules/zerobin/default.nix
+++ /dev/null
@@ -1,33 +0,0 @@
-{ lib
-, buildPythonPackage
-, fetchFromGitHub
-, cherrypy
-, bottle
-, lockfile
-, clize
-}:
-
-buildPythonPackage {
- pname = "zerobin";
- version = "20160108";
-
- src = fetchFromGitHub {
- owner = "sametmax";
- repo = "0bin";
- rev = "7da1615";
- sha256 = "1pzcwy454kn5216pvwjqzz311s6jbh7viw9s6kw4xps6f5h44bid";
- };
-
- propagatedBuildInputs = [ cherrypy bottle lockfile clize ];
-
- # zerobin doesn't have any tests, but includes a copy of cherrypy which
- # can wrongly fail the check phase.
- doCheck = false;
-
- meta = with lib; {
- description = "A client side encrypted pastebin";
- homepage = "https://0bin.net/";
- license = licenses.wtfpl;
- };
-
-}
diff --git a/third_party/nixpkgs/pkgs/development/ruby-modules/gem/default.nix b/third_party/nixpkgs/pkgs/development/ruby-modules/gem/default.nix
index 02af8eaa96..2066798854 100644
--- a/third_party/nixpkgs/pkgs/development/ruby-modules/gem/default.nix
+++ b/third_party/nixpkgs/pkgs/development/ruby-modules/gem/default.nix
@@ -18,7 +18,7 @@
# Normal gem packages can be used outside of bundler; a binstub is created in
# $out/bin.
-{ lib, fetchurl, fetchgit, makeWrapper, git, darwin
+{ lib, fetchurl, fetchgit, makeWrapper, gitMinimal, darwin
, ruby, bundler
} @ defs:
@@ -89,7 +89,7 @@ stdenv.mkDerivation ((builtins.removeAttrs attrs ["source"]) // {
buildInputs = [
ruby makeWrapper
- ] ++ lib.optionals (type == "git") [ git ]
+ ] ++ lib.optionals (type == "git") [ gitMinimal ]
++ lib.optionals (type != "gem") [ bundler ]
++ lib.optional stdenv.isDarwin darwin.libobjc
++ buildInputs;
diff --git a/third_party/nixpkgs/pkgs/development/tools/analysis/codeql/default.nix b/third_party/nixpkgs/pkgs/development/tools/analysis/codeql/default.nix
index 77992b9909..f62b1a2480 100644
--- a/third_party/nixpkgs/pkgs/development/tools/analysis/codeql/default.nix
+++ b/third_party/nixpkgs/pkgs/development/tools/analysis/codeql/default.nix
@@ -12,7 +12,7 @@
stdenv.mkDerivation rec {
pname = "codeql";
- version = "2.4.5";
+ version = "2.5.0";
dontConfigure = true;
dontBuild = true;
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
src = fetchzip {
url = "https://github.com/github/codeql-cli-binaries/releases/download/v${version}/codeql.zip";
- sha256 = "sha256-FM7fcjbZilp1spy0HxDhEAzs7Qe2r/HObKB80o4mSiw=";
+ sha256 = "sha256-teZ/9+oAEqGmy2S8Q89YDe8lqvAjzV6RWJ5AnfgQ6Mc=";
};
nativeBuildInputs = [
diff --git a/third_party/nixpkgs/pkgs/development/tools/analysis/flow/default.nix b/third_party/nixpkgs/pkgs/development/tools/analysis/flow/default.nix
index bbee2768a5..47c7b0fac9 100644
--- a/third_party/nixpkgs/pkgs/development/tools/analysis/flow/default.nix
+++ b/third_party/nixpkgs/pkgs/development/tools/analysis/flow/default.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
install -Dm644 resources/shell/bash-completion $out/share/bash-completion/completions/flow
'';
- buildInputs = (with ocamlPackages; [ ocaml findlib ocamlbuild dtoa core_kernel sedlex_2 ocaml_lwt lwt_log lwt_ppx ppx_deriving ppx_gen_rec ppx_tools_versioned visitors wtf8 ocaml-migrate-parsetree ])
+ buildInputs = (with ocamlPackages; [ ocaml findlib ocamlbuild ocaml-migrate-parsetree dtoa core_kernel sedlex_2 ocaml_lwt lwt_log lwt_ppx ppx_deriving ppx_gen_rec ppx_tools_versioned visitors wtf8 ])
++ lib.optionals stdenv.isDarwin [ CoreServices ];
meta = with lib; {
diff --git a/third_party/nixpkgs/pkgs/development/tools/analysis/tfsec/default.nix b/third_party/nixpkgs/pkgs/development/tools/analysis/tfsec/default.nix
index 87143766d4..03f6954d5a 100644
--- a/third_party/nixpkgs/pkgs/development/tools/analysis/tfsec/default.nix
+++ b/third_party/nixpkgs/pkgs/development/tools/analysis/tfsec/default.nix
@@ -2,13 +2,13 @@
buildGoPackage rec {
pname = "tfsec";
- version = "0.39.10";
+ version = "0.39.14";
src = fetchFromGitHub {
owner = "tfsec";
repo = pname;
rev = "v${version}";
- sha256 = "sha256-T2soogk5KcNSeluNyJ4b2GjLkvauvvznaLSMQVgVZgI=";
+ sha256 = "sha256-Peq51XN8EEvHWdSL3ngBx74t7V4RUrZa4RpGnvZ0Ml8=";
};
goPackagePath = "github.com/tfsec/tfsec";
diff --git a/third_party/nixpkgs/pkgs/development/tools/asmfmt/default.nix b/third_party/nixpkgs/pkgs/development/tools/asmfmt/default.nix
index c93b864b70..dca74fa76b 100644
--- a/third_party/nixpkgs/pkgs/development/tools/asmfmt/default.nix
+++ b/third_party/nixpkgs/pkgs/development/tools/asmfmt/default.nix
@@ -1,12 +1,11 @@
{ buildGoPackage
, lib
, fetchFromGitHub
-, fetchpatch
}:
buildGoPackage rec {
pname = "asmfmt";
- version = "1.2.1";
+ version = "1.2.3";
goPackagePath = "github.com/klauspost/asmfmt";
@@ -14,7 +13,7 @@ buildGoPackage rec {
owner = "klauspost";
repo = "asmfmt";
rev = "v${version}";
- sha256 = "0qwxb4yx12yl817vgbhs7acaj98lgk27dh50mb8sm9ccw1f43h9i";
+ sha256 = "0f2cgwxs2b2kpq5348h8hjkcqc40p8ajapzpcy9ia2fsmsn2a2s4";
};
goDeps = ./deps.nix;
diff --git a/third_party/nixpkgs/pkgs/development/tools/bashate/default.nix b/third_party/nixpkgs/pkgs/development/tools/bashate/default.nix
new file mode 100644
index 0000000000..cc5d3aca2c
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/development/tools/bashate/default.nix
@@ -0,0 +1,43 @@
+{ lib
+, Babel
+, buildPythonApplication
+, fetchPypi
+, fixtures
+, mock
+, pbr
+, pytestCheckHook
+, pythonOlder
+, setuptools
+}:
+
+buildPythonApplication rec {
+ pname = "bashate";
+ version = "2.0.0";
+ disabled = pythonOlder "3.5";
+
+ src = fetchPypi {
+ inherit pname version;
+ sha256 = "05qsaaqfpvr6h4g19prbkpznwb9a4dwzyzivdzh9x80cgkq0r6gb";
+ };
+
+ propagatedBuildInputs = [
+ Babel
+ pbr
+ setuptools
+ ];
+
+ checkInputs = [
+ fixtures
+ mock
+ pytestCheckHook
+ ];
+
+ pythonImportsCheck = [ "bashate" ];
+
+ meta = with lib; {
+ description = "Style enforcement for bash programs";
+ homepage = "https://opendev.org/openstack/bashate";
+ license = with licenses; [ asl20 ];
+ maintainers = with maintainers; [ fab ];
+ };
+}
diff --git a/third_party/nixpkgs/pkgs/development/tools/bazel-watcher/default.nix b/third_party/nixpkgs/pkgs/development/tools/bazel-watcher/default.nix
index bc3a2828f6..657704a653 100644
--- a/third_party/nixpkgs/pkgs/development/tools/bazel-watcher/default.nix
+++ b/third_party/nixpkgs/pkgs/development/tools/bazel-watcher/default.nix
@@ -2,7 +2,7 @@
, fetchFromGitHub
, git
, go
-, python
+, python3
, lib, stdenv
}:
@@ -22,7 +22,7 @@ buildBazelPackage rec {
sha256 = "0gigl1lg8sb4bj5crvj54329ws4yirldbncs15f96db6vhp0ig7r";
};
- nativeBuildInputs = [ go git python ];
+ nativeBuildInputs = [ go git python3 ];
removeRulesCC = false;
bazelTarget = "//ibazel";
diff --git a/third_party/nixpkgs/pkgs/development/tools/buf/default.nix b/third_party/nixpkgs/pkgs/development/tools/buf/default.nix
new file mode 100644
index 0000000000..fc232d55da
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/development/tools/buf/default.nix
@@ -0,0 +1,36 @@
+{ lib
+, buildGoModule
+, fetchFromGitHub
+, protobuf
+}:
+
+buildGoModule rec {
+ pname = "buf";
+ version = "0.40.0";
+
+ src = fetchFromGitHub {
+ owner = "bufbuild";
+ repo = pname;
+ rev = "v${version}";
+ sha256 = "sha256-N6o+1cfer8rgKJ3+CL25axJSjGV/YSG1sLIHXJzsC6o=";
+ };
+
+ patches = [
+ ./skip_test_requiring_network.patch
+ ];
+
+ preCheck = ''
+ export PATH=$PATH:$GOPATH/bin
+ '';
+
+ nativeBuildInputs = [ protobuf ];
+
+ vendorSha256 = "sha256-vl+WqtpegoAvylx/lcyfJk8DAOub8U4Lx3Pe3eW4M/E=";
+
+ meta = with lib; {
+ description = "Create consistent Protobuf APIs that preserve compatibility and comply with design best-practices";
+ homepage = "https://buf.build";
+ license = licenses.asl20;
+ maintainers = with maintainers; [ raboof ];
+ };
+}
diff --git a/third_party/nixpkgs/pkgs/development/tools/buf/skip_test_requiring_network.patch b/third_party/nixpkgs/pkgs/development/tools/buf/skip_test_requiring_network.patch
new file mode 100644
index 0000000000..8d3e15c17f
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/development/tools/buf/skip_test_requiring_network.patch
@@ -0,0 +1,15 @@
+diff --git a/internal/buf/internal/buftesting/buftesting.go b/internal/buf/internal/buftesting/buftesting.go
+index dc8da0c..70ad299 100644
+--- a/internal/buf/internal/buftesting/buftesting.go
++++ b/internal/buf/internal/buftesting/buftesting.go
+@@ -100,6 +100,10 @@ func RunActualProtoc(
+
+ // GetGoogleapisDirPath gets the path to a clone of googleapis.
+ func GetGoogleapisDirPath(t *testing.T, buftestingDirPath string) string {
++ // Requires network access, which is not available during
++ // the nixpkgs sandboxed build
++ t.Skip()
++
+ googleapisDirPath := filepath.Join(buftestingDirPath, testGoogleapisDirPath)
+ require.NoError(
+ t,
diff --git a/third_party/nixpkgs/pkgs/development/tools/build-managers/bam/default.nix b/third_party/nixpkgs/pkgs/development/tools/build-managers/bam/default.nix
index a828c57b8c..556725cca6 100644
--- a/third_party/nixpkgs/pkgs/development/tools/build-managers/bam/default.nix
+++ b/third_party/nixpkgs/pkgs/development/tools/build-managers/bam/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchFromGitHub, lua5_3, python }:
+{ lib, stdenv, fetchFromGitHub, lua5_3, python3 }:
stdenv.mkDerivation rec {
pname = "bam";
@@ -11,11 +11,13 @@ stdenv.mkDerivation rec {
sha256 = "13br735ig7lygvzyfd15fc2rdygrqm503j6xj5xkrl1r7w2wipq6";
};
- buildInputs = [ lua5_3 python ];
+ nativeBuildInputs = [ lua5_3 python3 ];
buildPhase = "${stdenv.shell} make_unix.sh";
- checkPhase = "${python.interpreter} scripts/test.py";
+ checkPhase = "${python3.interpreter} scripts/test.py";
+
+ strictDeps = true;
installPhase = ''
mkdir -p "$out/share/bam"
diff --git a/third_party/nixpkgs/pkgs/development/tools/build-managers/bazel/bazel_0_26/default.nix b/third_party/nixpkgs/pkgs/development/tools/build-managers/bazel/bazel_0_26/default.nix
index 2ec244e502..f03f42be38 100644
--- a/third_party/nixpkgs/pkgs/development/tools/build-managers/bazel/bazel_0_26/default.nix
+++ b/third_party/nixpkgs/pkgs/development/tools/build-managers/bazel/bazel_0_26/default.nix
@@ -1,6 +1,6 @@
{ stdenv, callPackage, lib, fetchurl, fetchpatch, runCommand, makeWrapper
, zip, unzip, bash, writeCBin, coreutils
-, which, python, perl, gawk, gnused, gnutar, gnugrep, gzip, findutils
+, which, python3, perl, gawk, gnused, gnutar, gnugrep, gzip, findutils
# Apple dependencies
, cctools, llvmPackages_8, CoreFoundation, CoreServices, Foundation
# Allow to independently override the jdks used to build and run respectively
@@ -210,8 +210,8 @@ stdenv'.mkDerivation rec {
# Substitute python's stub shebang to plain python path. (see TODO add pr URL)
# See also `postFixup` where python is added to $out/nix-support
substituteInPlace src/main/java/com/google/devtools/build/lib/bazel/rules/python/python_stub_template.txt\
- --replace "/usr/bin/env python" "${python}/bin/python" \
- --replace "NIX_STORE_PYTHON_PATH" "${python}/bin/python" \
+ --replace "/usr/bin/env python" "${python3.interpreter}" \
+ --replace "NIX_STORE_PYTHON_PATH" "${python3.interpreter}" \
# md5sum is part of coreutils
sed -i 's|/sbin/md5|md5sum|' \
@@ -287,11 +287,13 @@ stdenv'.mkDerivation rec {
buildJdk
];
+ strictDeps = true;
+
# when a command can’t be found in a bazel build, you might also
# need to add it to `defaultShellPath`.
nativeBuildInputs = [
zip
- python
+ python3
unzip
makeWrapper
which
@@ -380,7 +382,7 @@ stdenv'.mkDerivation rec {
echo "${customBash} ${defaultShellPath}" >> $out/nix-support/depends
# The templates get tar’d up into a .jar,
# so nix can’t detect python is needed in the runtime closure
- echo "${python}" >> $out/nix-support/depends
+ echo "${python3}" >> $out/nix-support/depends
'';
dontStrip = true;
diff --git a/third_party/nixpkgs/pkgs/development/tools/build-managers/mill/default.nix b/third_party/nixpkgs/pkgs/development/tools/build-managers/mill/default.nix
index 5942e20ec9..4538c212da 100644
--- a/third_party/nixpkgs/pkgs/development/tools/build-managers/mill/default.nix
+++ b/third_party/nixpkgs/pkgs/development/tools/build-managers/mill/default.nix
@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "mill";
- version = "0.9.3";
+ version = "0.9.5";
src = fetchurl {
- url = "https://github.com/lihaoyi/mill/releases/download/${version}/${version}";
- sha256 = "0x9mvcm5znyi7w6cpiasj2v6f63y7d8qdck7lx03p2k6i9aa2f77";
+ url = "https://github.com/com-lihaoyi/mill/releases/download/${version}/${version}";
+ sha256 = "142vr40p60mapvvb5amn8hz6a8930kxsz510baql40hai4yhga7z";
};
nativeBuildInputs = [ makeWrapper ];
diff --git a/third_party/nixpkgs/pkgs/development/tools/build-managers/rocm-cmake/default.nix b/third_party/nixpkgs/pkgs/development/tools/build-managers/rocm-cmake/default.nix
index 9ef0cfe10e..16ea0dc283 100644
--- a/third_party/nixpkgs/pkgs/development/tools/build-managers/rocm-cmake/default.nix
+++ b/third_party/nixpkgs/pkgs/development/tools/build-managers/rocm-cmake/default.nix
@@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "rocm-cmake";
- version = "4.0.0";
+ version = "4.1.0";
src = fetchFromGitHub {
owner = "RadeonOpenCompute";
repo = "rocm-cmake";
rev = "rocm-${version}";
- hash = "sha256-1T0S2GWA/ojRZMRyWgtFQ2rzmIqvMvaa19jI4Fl9R44=";
+ hash = "sha256-uK060F7d7/pTCNbGqdKCzxgPrPPbGjNwuUOt176z7EM=";
};
nativeBuildInputs = [ cmake ];
diff --git a/third_party/nixpkgs/pkgs/development/tools/buildah/default.nix b/third_party/nixpkgs/pkgs/development/tools/buildah/default.nix
index e5763e6aa9..4ca0343d8f 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.19.8";
+ version = "1.20.0";
src = fetchFromGitHub {
owner = "containers";
repo = "buildah";
rev = "v${version}";
- sha256 = "sha256-xhnhc4vhKw5T93076vS+pszIOpj22KzaPyzCvuHMaPE=";
+ sha256 = "12gmn61mfrr58071x3cdsksad6swn1b23ghih128hjdpdzk1zxs3";
};
outputs = [ "out" "man" ];
diff --git a/third_party/nixpkgs/pkgs/development/tools/buildpack/default.nix b/third_party/nixpkgs/pkgs/development/tools/buildpack/default.nix
index aa60d7be5b..0f31f7b1b3 100644
--- a/third_party/nixpkgs/pkgs/development/tools/buildpack/default.nix
+++ b/third_party/nixpkgs/pkgs/development/tools/buildpack/default.nix
@@ -2,16 +2,16 @@
buildGoModule rec {
pname = "pack";
- version = "0.17.0";
+ version = "0.18.0";
src = fetchFromGitHub {
owner = "buildpacks";
repo = pname;
rev = "v${version}";
- sha256 = "sha256-VTQ3NOskBp7ic8a/nn/ZbALJVff+Pb/ZHHbld/OxQdo=";
+ sha256 = "sha256-+fYw5dIDJJKGQKBL6RQh1SCQufbAkKeuJpPlywzbbnM=";
};
- vendorSha256 = "sha256-n8X2NyQiOpEQ0d/ek1kdxKFfaCFf0EucflVLZjOGMfY=";
+ vendorSha256 = "sha256-fSUTl5W/DyloCuCpEqA5z4bhB7wYxzPt6E0SfjorfQ0=";
nativeBuildInputs = [ installShellFiles ];
diff --git a/third_party/nixpkgs/pkgs/development/tools/cask/default.nix b/third_party/nixpkgs/pkgs/development/tools/cask/default.nix
index 886d435b81..1c5f316cea 100644
--- a/third_party/nixpkgs/pkgs/development/tools/cask/default.nix
+++ b/third_party/nixpkgs/pkgs/development/tools/cask/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchurl, python, emacs }:
+{ lib, stdenv, fetchurl, python3, emacs }:
stdenv.mkDerivation rec {
pname = "cask";
@@ -12,9 +12,11 @@ stdenv.mkDerivation rec {
s f dash ansi ecukes servant ert-runner el-mock
noflet ert-async shell-split-string git package-build
] ++ [
- python
+ python3
];
+ strictDeps = true;
+
buildPhase = ''
emacs --batch -L . -f batch-byte-compile cask.el cask-cli.el
'';
diff --git a/third_party/nixpkgs/pkgs/development/tools/continuous-integration/buildkite-agent/default.nix b/third_party/nixpkgs/pkgs/development/tools/continuous-integration/buildkite-agent/default.nix
index 5ba6718a6b..4a402111b0 100644
--- a/third_party/nixpkgs/pkgs/development/tools/continuous-integration/buildkite-agent/default.nix
+++ b/third_party/nixpkgs/pkgs/development/tools/continuous-integration/buildkite-agent/default.nix
@@ -2,16 +2,16 @@
makeWrapper, coreutils, git, openssh, bash, gnused, gnugrep }:
buildGoModule rec {
name = "buildkite-agent-${version}";
- version = "3.27.0";
+ version = "3.28.1";
src = fetchFromGitHub {
owner = "buildkite";
repo = "agent";
rev = "v${version}";
- sha256 = "sha256-JfOCht+awc0I22vtRD5hgowgdVkcJR3qSxnxLoc3XZY=";
+ sha256 = "sha256-5YOXYOAh/0fOagcqdK2IEwm5XDCxyfTeTzwBGtsQRCs=";
};
- vendorSha256 = "sha256-4zKe8y+9fedvCt/XmPf0HxtyqLz+FP4Ylt6k9KBjaIw=";
+ vendorSha256 = "sha256-3UXZxeiL0WO4X/3/hW8ubL1TormGbn9X/k0PX+/cLuM=";
postPatch = ''
substituteInPlace bootstrap/shell/shell.go --replace /bin/bash ${bash}/bin/bash
diff --git a/third_party/nixpkgs/pkgs/development/tools/continuous-integration/fly/default.nix b/third_party/nixpkgs/pkgs/development/tools/continuous-integration/fly/default.nix
index 91c494f731..895d12ecb4 100644
--- a/third_party/nixpkgs/pkgs/development/tools/continuous-integration/fly/default.nix
+++ b/third_party/nixpkgs/pkgs/development/tools/continuous-integration/fly/default.nix
@@ -1,4 +1,4 @@
-{ buildGoModule, fetchFromGitHub, stdenv, lib, writeText }:
+{ buildGoModule, fetchFromGitHub, stdenv, lib }:
buildGoModule rec {
pname = "fly";
diff --git a/third_party/nixpkgs/pkgs/development/tools/coursier/default.nix b/third_party/nixpkgs/pkgs/development/tools/coursier/default.nix
index 69e55463cc..64c48b702c 100644
--- a/third_party/nixpkgs/pkgs/development/tools/coursier/default.nix
+++ b/third_party/nixpkgs/pkgs/development/tools/coursier/default.nix
@@ -2,7 +2,7 @@
, coreutils, git, gnused, nix, nixfmt }:
let
- version = "2.0.15";
+ version = "2.0.16";
zshCompletion = fetchurl {
url =
@@ -19,7 +19,7 @@ in stdenv.mkDerivation rec {
src = fetchurl {
url =
"https://github.com/coursier/coursier/releases/download/v${version}/coursier";
- sha256 = "sha256-XfTW8GNoPsNXamy0K9Ai3SSzBSyS1dNNCeWsbD8xCQI=";
+ sha256 = "sha256-Yx6PvBo763GnEwU5s7AYUs++Au25TF6cZ4WYGgruHpw=";
};
nativeBuildInputs = [ makeWrapper ];
diff --git a/third_party/nixpkgs/pkgs/development/tools/electron/default.nix b/third_party/nixpkgs/pkgs/development/tools/electron/default.nix
index 9d4c7d6e69..518eef2d1a 100644
--- a/third_party/nixpkgs/pkgs/development/tools/electron/default.nix
+++ b/third_party/nixpkgs/pkgs/development/tools/electron/default.nix
@@ -86,30 +86,30 @@ rec {
headers = "0yx8mkrm15ha977hzh7g2sc5fab9sdvlk1bk3yxignhxrqqbw885";
};
- electron_10 = mkElectron "10.4.0" {
- x86_64-linux = "6246481577bc0bfa719e0efb3144e8d7ca53e3f20defce7b5e1be4d9feb0becb";
- x86_64-darwin = "bc9e201643db3dae803db934fa4e180d13b707de6be1c3348ca5ed2c21d30bf4";
- i686-linux = "aa6a9042097b964230b519c158e369a249a668cc6c7654b30ddd02ced4bad9d1";
- armv7l-linux = "7e99a9c6aeedd7cc0b25260ac4630730629f363a09b72bd024b42837ab9777bd";
- aarch64-linux = "ef671fe3cbb7c84e277d885ed157552602bc88d326dc95b322953c6b193f59a1";
- headers = "1vsvna2zr7qxnk2qsdjzgkv5v2svrllbsjj08qrilly7nbksk9fg";
+ electron_10 = mkElectron "10.4.2" {
+ x86_64-linux = "3d613b413f01c8af1600be42c82941761452407e1160125eca60feec0d7dd0c0";
+ x86_64-darwin = "87b18811d165f2fd64606ae13a567b737f54bd41c7e2204a047a3532f4fa2d9c";
+ i686-linux = "297083ca9b21554ea1f729ed17c0c8b13aaea24e77194f9c1b340489fcfc0fa6";
+ armv7l-linux = "3d93ec220824cce5d99b3a7511604b89c63935bd1130fc64ce08b8436e34c096";
+ aarch64-linux = "0060e37eada91bac51945ae325ab04309438609089d31ab3f8bbfda73cc26166";
+ headers = "13cpkblkvhvd3sww8n1gw4rhva84x2fkkg81yr3n2mb0virlfgpn";
};
- electron_11 = mkElectron "11.3.0" {
- x86_64-linux = "136794f9ecc1c6ea38fe9b85682e8fcc8c4afd559f5cd6b4059339b017279917";
- x86_64-darwin = "7569db1d2e470b0db512735f27f99498f631da3cd86374345139f18df88789fe";
- i686-linux = "48ab133cab380c564529ea605d4521404b9bd07d80dad6346e1756a0952081cd";
- armv7l-linux = "5774c2995c6dcf911ece00a94ace0f37d55132da91b1fd242c69e047872ef137";
- aarch64-linux = "fad31c6fba7aba54db19a2aaedb03b514c51dd58bf301afab5265126833feb15";
- headers = "123g3dgsb4vp8w1bm4apbp973ppzx4i4y35lhhmqjbp51jhrm9f0";
+ electron_11 = mkElectron "11.4.1" {
+ x86_64-linux = "3efd3d3b5a9f71323320288aece65fcec89ea0331c3d6d3afc2495d3b0dc95d3";
+ x86_64-darwin = "6ff91613c51b2ebaf280eb86b826f47d62639081a0f38c2012c428a17619a163";
+ i686-linux = "513e1bc7a3e546dc0e712836886ac89c9f76bb7fb1e4b7a1f9d9cbc7347d8569";
+ armv7l-linux = "838fc96d90cfcc5e1e892287008f9d9d2dbe27f3d4cf2479e6275ecdd140fb65";
+ aarch64-linux = "a3de4208b5033a19ffa9dd8130d440909b181c0ef57cb51c8f9c8dbbb1267a26";
+ headers = "1bpsmmlxl4gk9yn5w7f8m6g8k1gmvwk0jwpqlk5islpkcy6x7107";
};
- electron_12 = mkElectron "12.0.1" {
- x86_64-linux = "495cd0df420becbd9581b8833fa8bdefaef397fc3590d064932722d55cf5ff82";
- x86_64-darwin = "af2adac0b5b32c95ad2b834d5521bd301983954e986048b46cdf5c739423de17";
- i686-linux = "4a41d03ef38eda8d50dc57774f49f676398a2130783c2c9a3411e7018ef77e2b";
- armv7l-linux = "ae06d70d34abc06c7127a468ab0956a4a26752cc313ab1b802972748e952a3a7";
- aarch64-linux = "95716be616ab690c2e78236715fe52ae57b4213fe1c19dc08593ae1e75b8767e";
- headers = "1gxzafzi47wrvwrzmll5zff7dzw4jk2p5pdkzgazr2yxkhw9qvca";
+ electron_12 = mkElectron "12.0.2" {
+ x86_64-linux = "fc3ff888d8cd4ada8368420c8951ed1b5ad78919bdcb688abe698d00e12a2e0a";
+ x86_64-darwin = "766ca8f8adc4535db3069665ea8983979ea79dd5ec376e1c298f858b420ec58f";
+ i686-linux = "78ab55db275b85210c6cc14ddf41607fbd5cefed93ef4d1b6b74630b0841b23c";
+ armv7l-linux = "8be8c6ea05da669d79179c5969ddee853710a1dd44f86e8f3bbe1167a2daf13c";
+ aarch64-linux = "9ef70ab9347be63555784cac99efbaff1ef2d02dcc79070d7bccd18c38de87ef";
+ headers = "07095b5rylilbmyd0syamm6fc4pngazldj5jgm7blgirdi8yzzd2";
};
}
diff --git a/third_party/nixpkgs/pkgs/development/tools/fedpkg/default.nix b/third_party/nixpkgs/pkgs/development/tools/fedpkg/default.nix
index d9633e88f3..2ba0f494c2 100644
--- a/third_party/nixpkgs/pkgs/development/tools/fedpkg/default.nix
+++ b/third_party/nixpkgs/pkgs/development/tools/fedpkg/default.nix
@@ -1,4 +1,6 @@
-{ lib, buildPythonApplication, buildPythonPackage, isPy3k, fetchurl, rpkg, offtrac, urlgrabber, pyopenssl, python_fedora }:
+{ lib, python2Packages, fetchurl }:
+
+with python2Packages;
let
fedora_cert = buildPythonPackage rec {
diff --git a/third_party/nixpkgs/pkgs/development/tools/flawfinder/default.nix b/third_party/nixpkgs/pkgs/development/tools/flawfinder/default.nix
new file mode 100644
index 0000000000..28805b4abe
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/development/tools/flawfinder/default.nix
@@ -0,0 +1,35 @@
+{ lib
+, stdenv
+, fetchurl
+, installShellFiles
+, python3
+}:
+
+stdenv.mkDerivation rec {
+ pname = "flawfinder";
+ version = "2.0.15";
+
+ src = fetchurl {
+ url = "https://dwheeler.com/flawfinder/flawfinder-${version}.tar.gz";
+ sha256 = "01j4szy8gwvikrfzfayfayjnc1za0jxsnxp5fsa6d06kn69wyr8a";
+ };
+
+ nativeBuildInputs = [ installShellFiles ];
+
+ buildInputs = [ python3 ];
+
+ installPhase = ''
+ runHook preInstall
+ mkdir -p $out/bin
+ cp ${pname} $out/bin
+ installManPage flawfinder.1
+ runHook postInstall
+ '';
+
+ meta = with lib; {
+ description = "Tool to examines C/C++ source code for security flaws";
+ homepage = "https://dwheeler.com/flawfinder/";
+ license = with licenses; [ gpl2Only ];
+ maintainers = with maintainers; [ fab ];
+ };
+}
diff --git a/third_party/nixpkgs/pkgs/development/tools/go-task/default.nix b/third_party/nixpkgs/pkgs/development/tools/go-task/default.nix
index b9241174ea..d2ea8a4f6b 100644
--- a/third_party/nixpkgs/pkgs/development/tools/go-task/default.nix
+++ b/third_party/nixpkgs/pkgs/development/tools/go-task/default.nix
@@ -22,7 +22,7 @@ buildGoModule rec {
];
postInstall = ''
- mv $out/bin/task $out/bin/go-task
+ ln -s $out/bin/task $out/bin/go-task
'';
meta = with lib; {
diff --git a/third_party/nixpkgs/pkgs/development/tools/golangci-lint/default.nix b/third_party/nixpkgs/pkgs/development/tools/golangci-lint/default.nix
index 4336ba76a2..83bc3f473d 100644
--- a/third_party/nixpkgs/pkgs/development/tools/golangci-lint/default.nix
+++ b/third_party/nixpkgs/pkgs/development/tools/golangci-lint/default.nix
@@ -2,16 +2,16 @@
buildGoModule rec {
pname = "golangci-lint";
- version = "1.38.0";
+ version = "1.39.0";
src = fetchFromGitHub {
owner = "golangci";
repo = "golangci-lint";
rev = "v${version}";
- sha256 = "sha256-hJGyK+hrP6CuSkODNsN8d2IhteKe/fXTF9GxbF7TQOk=";
+ sha256 = "0c9yka27k4v1waijk7mn7k31l5a373sclykypflchy7xnlrsa18v";
};
- vendorSha256 = "sha256-zTWipGoWFndBSH8V+QxWmGv+8RoFa+OGT4BhAq/yIbE=";
+ vendorSha256 = "1685iv1lsal462c8xqvs76x9dwvbwazrak902j0p12s0fyb66lpl";
doCheck = false;
diff --git a/third_party/nixpkgs/pkgs/development/tools/jbang/default.nix b/third_party/nixpkgs/pkgs/development/tools/jbang/default.nix
index bb244c57cc..4c35aaaae0 100644
--- a/third_party/nixpkgs/pkgs/development/tools/jbang/default.nix
+++ b/third_party/nixpkgs/pkgs/development/tools/jbang/default.nix
@@ -1,12 +1,12 @@
{ stdenv, lib, fetchzip, jdk, makeWrapper, coreutils, curl }:
stdenv.mkDerivation rec {
- version = "0.68.0";
+ version = "0.69.1";
pname = "jbang";
src = fetchzip {
url = "https://github.com/jbangdev/jbang/releases/download/v${version}/${pname}-${version}.tar";
- sha256 = "sha256-+hBI4asgRZg1nu50GMCl0/djqCxjb92xlO3roU4LZS8=";
+ sha256 = "sha256-FuwivcF1SpGbLcoQshVNSWSQ7PgWC0XPCQF+i9zHb/w=";
};
nativeBuildInputs = [ makeWrapper ];
diff --git a/third_party/nixpkgs/pkgs/development/tools/kubie/default.nix b/third_party/nixpkgs/pkgs/development/tools/kubie/default.nix
index 7f8a193551..c00304c1ec 100644
--- a/third_party/nixpkgs/pkgs/development/tools/kubie/default.nix
+++ b/third_party/nixpkgs/pkgs/development/tools/kubie/default.nix
@@ -2,16 +2,16 @@
rustPlatform.buildRustPackage rec {
pname = "kubie";
- version = "0.12.1";
+ version = "0.13.4";
src = fetchFromGitHub {
rev = "v${version}";
owner = "sbstp";
repo = "kubie";
- sha256 = "sha256-y4/azFr2fngmUxQw3c2xAhAppYHeD6Bz7IvZ6GTdsEQ=";
+ sha256 = "sha256-ZD63Xtnw7qzTrzFxzzZ37N177/PnRaMEzBbhz7h/zCY=";
};
- cargoSha256 = "sha256-/Vg3qojBWN2tp8QaKmHrzy3cDWlkT6067Wprcjlu31U=";
+ cargoSha256 = "sha256-c6veaasuwRtaO8TwHS0tNxjbBfekQOa52I9INcE1Jn0=";
nativeBuildInputs = [ installShellFiles ];
diff --git a/third_party/nixpkgs/pkgs/development/tools/misc/blackfire/php-probe.nix b/third_party/nixpkgs/pkgs/development/tools/misc/blackfire/php-probe.nix
index 780b2a8906..e9bc528740 100644
--- a/third_party/nixpkgs/pkgs/development/tools/misc/blackfire/php-probe.nix
+++ b/third_party/nixpkgs/pkgs/development/tools/misc/blackfire/php-probe.nix
@@ -18,11 +18,11 @@ let
}.${lib.versions.majorMinor php.version} or (throw "Unsupported PHP version.");
in stdenv.mkDerivation rec {
pname = "php-blackfire";
- version = "1.49.1";
+ version = "1.53.0";
src = fetchurl {
url = "https://packages.blackfire.io/debian/pool/any/main/b/blackfire-php/blackfire-php_${version}_amd64.deb";
- sha256 = "5Z6CUj/HfSj+pC9iDEmU/OKCYePSAazU9q9M3glnOZU=";
+ sha256 = "ApKj5gulTCzWh7oSAM+JWQnWviHCnHV3OJHegpXJL54=";
};
nativeBuildInputs = [
diff --git a/third_party/nixpkgs/pkgs/development/tools/misc/blackmagic/default.nix b/third_party/nixpkgs/pkgs/development/tools/misc/blackmagic/default.nix
index fc1af1a4d6..080bc7a7f7 100644
--- a/third_party/nixpkgs/pkgs/development/tools/misc/blackmagic/default.nix
+++ b/third_party/nixpkgs/pkgs/development/tools/misc/blackmagic/default.nix
@@ -1,6 +1,6 @@
{ stdenv, lib, fetchFromGitHub
, gcc-arm-embedded, libftdi1, libusb-compat-0_1, pkg-config
-, python, pythonPackages
+, python3
}:
with lib;
@@ -21,15 +21,16 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [
gcc-arm-embedded pkg-config
+ python3
];
buildInputs = [
libftdi1
libusb-compat-0_1
- python
- pythonPackages.intelhex
];
+ strictDeps = true;
+
postPatch = ''
# Prevent calling out to `git' to generate a version number:
substituteInPlace src/Makefile \
diff --git a/third_party/nixpkgs/pkgs/development/tools/misc/cli11/default.nix b/third_party/nixpkgs/pkgs/development/tools/misc/cli11/default.nix
index 03c3e51cb8..d62ad413e1 100644
--- a/third_party/nixpkgs/pkgs/development/tools/misc/cli11/default.nix
+++ b/third_party/nixpkgs/pkgs/development/tools/misc/cli11/default.nix
@@ -3,7 +3,7 @@
fetchFromGitHub,
cmake,
gtest,
- python,
+ python3,
boost
}:
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ cmake ];
- checkInputs = [ boost python ];
+ checkInputs = [ boost python3 ];
doCheck = true;
diff --git a/third_party/nixpkgs/pkgs/development/tools/misc/distcc/default.nix b/third_party/nixpkgs/pkgs/development/tools/misc/distcc/default.nix
index cad9fe0960..38ddc1ff43 100644
--- a/third_party/nixpkgs/pkgs/development/tools/misc/distcc/default.nix
+++ b/third_party/nixpkgs/pkgs/development/tools/misc/distcc/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchFromGitHub, popt, avahi, pkg-config, python, gtk2, runCommand
+{ lib, stdenv, fetchFromGitHub, popt, avahi, pkg-config, python3, gtk2, runCommand
, gcc, autoconf, automake, which, procps, libiberty_static
, runtimeShell
, sysconfDir ? "" # set this parameter to override the default value $out/etc
@@ -18,7 +18,7 @@ let
};
nativeBuildInputs = [ pkg-config ];
- buildInputs = [popt avahi pkg-config python gtk2 autoconf automake which procps libiberty_static];
+ buildInputs = [popt avahi pkg-config python3 gtk2 autoconf automake which procps libiberty_static];
preConfigure =
''
export CPATH=$(ls -d ${gcc.cc}/lib/gcc/*/${gcc.cc.version}/plugin/include)
diff --git a/third_party/nixpkgs/pkgs/development/tools/misc/doclifter/default.nix b/third_party/nixpkgs/pkgs/development/tools/misc/doclifter/default.nix
index 8b77178811..0692d84b45 100644
--- a/third_party/nixpkgs/pkgs/development/tools/misc/doclifter/default.nix
+++ b/third_party/nixpkgs/pkgs/development/tools/misc/doclifter/default.nix
@@ -1,4 +1,4 @@
-{lib, stdenv, fetchurl, python}:
+{lib, stdenv, fetchurl, python3}:
stdenv.mkDerivation {
name = "doclifter-2.19";
@@ -6,7 +6,9 @@ stdenv.mkDerivation {
url = "http://www.catb.org/~esr/doclifter/doclifter-2.19.tar.gz";
sha256 = "1as6z7mdjrrkw2kism41q5ybvyzvwcmj9qzla2fz98v9f4jbj2s2";
};
- buildInputs = [ python ];
+ buildInputs = [ python3 ];
+
+ strictDeps = true;
makeFlags = [ "PREFIX=$(out)" ];
diff --git a/third_party/nixpkgs/pkgs/development/tools/misc/editorconfig-checker/default.nix b/third_party/nixpkgs/pkgs/development/tools/misc/editorconfig-checker/default.nix
index b934160949..b4359bb186 100644
--- a/third_party/nixpkgs/pkgs/development/tools/misc/editorconfig-checker/default.nix
+++ b/third_party/nixpkgs/pkgs/development/tools/misc/editorconfig-checker/default.nix
@@ -2,16 +2,16 @@
buildGoModule rec {
pname = "editorconfig-checker";
- version = "2.3.4";
+ version = "2.3.5";
src = fetchFromGitHub {
owner = "editorconfig-checker";
repo = "editorconfig-checker";
rev = version;
- sha256 = "sha256-aTHY9RFFkpTQKv+Erczu5joqvE7L05Ev2GOSiXNxLj8=";
+ sha256 = "sha256-t1qvmTs6hOrAnq5hjU2Qjt33vdW9MuSOvWCCY82db+g=";
};
- vendorSha256 = "sha256-y+wQ6XzX4vmKzesUcF9jgfrKPj5EsCuw/aKizVX/ogI=";
+ vendorSha256 = "sha256-Rs7u/ZepnMNg5EZ/HWqSdO428KOkxpSbo7rl0treqUY=";
doCheck = false;
diff --git a/third_party/nixpkgs/pkgs/development/tools/misc/nimlsp/default.nix b/third_party/nixpkgs/pkgs/development/tools/misc/nimlsp/default.nix
index 1919e26dde..7f73fb9a1b 100644
--- a/third_party/nixpkgs/pkgs/development/tools/misc/nimlsp/default.nix
+++ b/third_party/nixpkgs/pkgs/development/tools/misc/nimlsp/default.nix
@@ -31,7 +31,7 @@ stdenv.mkDerivation rec {
export HOME=$TMPDIR
nim -d:release -p:${astpatternmatching}/src -p:${jsonschema}/src \
c --threads:on -d:nimcore -d:nimsuggest -d:debugCommunication \
- -d:debugLogging -d:explicitSourcePath=${srcOnly nim.unwrapped} -d:tempDir=/tmp src/nimlsp
+ -d:debugLogging -d:explicitSourcePath=${srcOnly nim.passthru.nim} -d:tempDir=/tmp src/nimlsp
'';
installPhase = ''
diff --git a/third_party/nixpkgs/pkgs/development/tools/misc/pkgconf/default.nix b/third_party/nixpkgs/pkgs/development/tools/misc/pkgconf/default.nix
index c6c984f969..2c55a6f03a 100644
--- a/third_party/nixpkgs/pkgs/development/tools/misc/pkgconf/default.nix
+++ b/third_party/nixpkgs/pkgs/development/tools/misc/pkgconf/default.nix
@@ -2,7 +2,7 @@
stdenv.mkDerivation rec {
pname = "pkgconf";
- version = "1.7.3";
+ version = "1.7.4";
nativeBuildInputs = [ removeReferencesTo ];
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
src = fetchurl {
url = "https://distfiles.dereferenced.org/${pname}/${pname}-${version}.tar.xz";
- sha256 = "1h7rf5cch0cbxp8nmjkkf272zrz2jgpqpr8a58ww75pn3jjswimq";
+ sha256 = "sha256-1z8ywkikWRE5prF3d8gNTeq2tBTsKz0h0KJL40jEdqs=";
};
# Debian has outputs like these too:
diff --git a/third_party/nixpkgs/pkgs/development/tools/ocaml/js_of_ocaml/compiler.nix b/third_party/nixpkgs/pkgs/development/tools/ocaml/js_of_ocaml/compiler.nix
index f1398c2f7c..12306d2a30 100644
--- a/third_party/nixpkgs/pkgs/development/tools/ocaml/js_of_ocaml/compiler.nix
+++ b/third_party/nixpkgs/pkgs/development/tools/ocaml/js_of_ocaml/compiler.nix
@@ -1,16 +1,16 @@
{ lib, fetchurl, buildDunePackage
-, cmdliner, cppo, yojson, ppxlib
+, ocaml, cmdliner, cppo, yojson, ppxlib
, menhir
}:
buildDunePackage rec {
pname = "js_of_ocaml-compiler";
- version = "3.8.0";
+ version = "3.9.1";
useDune2 = true;
src = fetchurl {
url = "https://github.com/ocsigen/js_of_ocaml/releases/download/${version}/js_of_ocaml-${version}.tbz";
- sha256 = "069jyiayxcgwnips3adxb3d53mzd4rrq2783b9fgmsiyzm545lcy";
+ sha256 = "0ib551kfsjlp9vr3fk36hrbq7xxyl8bj6vcn3ccr0s370bsmgpm6";
};
nativeBuildInputs = [ cppo menhir ];
diff --git a/third_party/nixpkgs/pkgs/development/tools/ocaml/merlin/4.x.nix b/third_party/nixpkgs/pkgs/development/tools/ocaml/merlin/4.x.nix
new file mode 100644
index 0000000000..7759516956
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/development/tools/ocaml/merlin/4.x.nix
@@ -0,0 +1,77 @@
+{ lib
+, substituteAll
+, fetchurl
+, ocaml
+, dune_2
+, buildDunePackage
+, yojson
+, csexp
+, result
+, dot-merlin-reader
+, jq
+, menhir
+}:
+
+let
+ merlinVersion = "4.1";
+
+ hashes = {
+ "4.1-411" = "9e2e6fc799c93ce1f2c7181645eafa37f64e43ace062b69218e1c29ac459937d";
+ "4.1-412" = "fb4caede73bdb8393bd60e31792af74b901ae2d319ac2f2a2252c694d2069d8d";
+ };
+
+ ocamlVersionShorthand = lib.concatStrings
+ (lib.take 2 (lib.splitVersion ocaml.version));
+
+ version = "${merlinVersion}-${ocamlVersionShorthand}";
+in
+
+if !lib.hasAttr version hashes
+then builtins.throw "merlin ${merlinVersion} is not available for OCaml ${ocaml.version}"
+else
+
+buildDunePackage {
+ pname = "merlin";
+ inherit version;
+
+ src = fetchurl {
+ url = "https://github.com/ocaml/merlin/releases/download/v${version}/merlin-v${version}.tbz";
+ sha256 = hashes."${version}";
+ };
+
+ patches = [
+ (substituteAll {
+ src = ./fix-paths.patch;
+ dot_merlin_reader = "${dot-merlin-reader}/bin/dot-merlin-reader";
+ dune = "${dune_2}/bin/dune";
+ })
+ ];
+
+ useDune2 = true;
+
+ buildInputs = [
+ dot-merlin-reader
+ yojson
+ csexp
+ result
+ ];
+
+ doCheck = true;
+ checkPhase = ''
+ runHook preCheck
+ patchShebangs tests/merlin-wrapper
+ dune runtest # filtering with -p disables tests
+ runHook postCheck
+ '';
+ checkInputs = [
+ jq
+ menhir
+ ];
+
+ meta = with lib; {
+ description = "An editor-independent tool to ease the development of programs in OCaml";
+ homepage = "https://github.com/ocaml/merlin";
+ license = licenses.mit;
+ maintainers = [ maintainers.vbgl maintainers.sternenseemann ];
+ };
+}
diff --git a/third_party/nixpkgs/pkgs/development/tools/ocaml/merlin/default.nix b/third_party/nixpkgs/pkgs/development/tools/ocaml/merlin/default.nix
index ce168084f2..1c9b549d61 100644
--- a/third_party/nixpkgs/pkgs/development/tools/ocaml/merlin/default.nix
+++ b/third_party/nixpkgs/pkgs/development/tools/ocaml/merlin/default.nix
@@ -3,8 +3,14 @@
buildDunePackage rec {
pname = "merlin";
+ version = "3.4.2";
- inherit (dot-merlin-reader) src version useDune2;
+ src = fetchurl {
+ url = "https://github.com/ocaml/merlin/releases/download/v${version}/merlin-v${version}.tbz";
+ sha256 = "e1b7b897b11119d92995c558530149fd07bd67a4aaf140f55f3c4ffb5e882a81";
+ };
+
+ useDune2 = true;
minimumOCamlVersion = "4.02.3";
diff --git a/third_party/nixpkgs/pkgs/development/tools/ocaml/merlin/dot-merlin-reader.nix b/third_party/nixpkgs/pkgs/development/tools/ocaml/merlin/dot-merlin-reader.nix
index b3b7377605..894fe6f75a 100644
--- a/third_party/nixpkgs/pkgs/development/tools/ocaml/merlin/dot-merlin-reader.nix
+++ b/third_party/nixpkgs/pkgs/development/tools/ocaml/merlin/dot-merlin-reader.nix
@@ -2,15 +2,15 @@
buildDunePackage rec {
pname = "dot-merlin-reader";
- version = "3.4.2";
+ version = "4.1";
useDune2 = true;
- minimumOCamlVersion = "4.02.1";
+ minimumOCamlVersion = "4.06";
src = fetchurl {
- url = "https://github.com/ocaml/merlin/releases/download/v${version}/merlin-v${version}.tbz";
- sha256 = "109ai1ggnkrwbzsl1wdalikvs1zx940m6n65jllxj68in6bvidz1";
+ url = "https://github.com/ocaml/merlin/releases/download/v${version}/dot-merlin-reader-v${version}.tbz";
+ sha256 = "14a36d6fb8646a5df4530420a7861722f1a4ee04753717947305e3676031e7cd";
};
buildInputs = [ yojson csexp result ];
diff --git a/third_party/nixpkgs/pkgs/development/tools/rubocop/Gemfile.lock b/third_party/nixpkgs/pkgs/development/tools/rubocop/Gemfile.lock
index 2c5deffc2d..913009f6b2 100644
--- a/third_party/nixpkgs/pkgs/development/tools/rubocop/Gemfile.lock
+++ b/third_party/nixpkgs/pkgs/development/tools/rubocop/Gemfile.lock
@@ -8,7 +8,7 @@ GEM
rainbow (3.0.0)
regexp_parser (2.1.1)
rexml (3.2.4)
- rubocop (1.11.0)
+ rubocop (1.12.0)
parallel (~> 1.10)
parser (>= 3.0.0.0)
rainbow (>= 2.2.2, < 4.0)
diff --git a/third_party/nixpkgs/pkgs/development/tools/rubocop/gemset.nix b/third_party/nixpkgs/pkgs/development/tools/rubocop/gemset.nix
index 46d920bc65..fc919235e2 100644
--- a/third_party/nixpkgs/pkgs/development/tools/rubocop/gemset.nix
+++ b/third_party/nixpkgs/pkgs/development/tools/rubocop/gemset.nix
@@ -66,10 +66,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0zrzsgx35mcr81c51gyx63s7yngcfgk33dbkx5j0npkaks4fcm7r";
+ sha256 = "1i3y0h6awywx4rdmjdan908jmnyk589pndbjypxkfbkqvjx514fw";
type = "gem";
};
- version = "1.11.0";
+ version = "1.12.0";
};
rubocop-ast = {
dependencies = ["parser"];
diff --git a/third_party/nixpkgs/pkgs/development/tools/rust/cargo-udeps/default.nix b/third_party/nixpkgs/pkgs/development/tools/rust/cargo-udeps/default.nix
index d89bad18e3..9fadea3f31 100644
--- a/third_party/nixpkgs/pkgs/development/tools/rust/cargo-udeps/default.nix
+++ b/third_party/nixpkgs/pkgs/development/tools/rust/cargo-udeps/default.nix
@@ -2,16 +2,16 @@
rustPlatform.buildRustPackage rec {
pname = "cargo-udeps";
- version = "0.1.19";
+ version = "0.1.20";
src = fetchFromGitHub {
owner = "est31";
repo = pname;
rev = "v${version}";
- sha256 = "sha256-0XE1w/FZmy0iMm5LI885S7F6GxgeHwh57t8N4hreSKw=";
+ sha256 = "sha256-1gAkc8x9rl80xkFWR2iKYOjkHplWUPWQZDbE8U5gkOM=";
};
- cargoSha256 = "sha256-7pfGMCChOMSLlZ/bvaHfpksru5bCHfBQUN+sGyI1M8E=";
+ cargoSha256 = "sha256-APUQYqC0MYNeeuehkQvxQsjOnXBgvEMNBqfoUy2KH0U=";
nativeBuildInputs = [ pkg-config ];
diff --git a/third_party/nixpkgs/pkgs/development/tools/rust/crate2nix/default.nix b/third_party/nixpkgs/pkgs/development/tools/rust/crate2nix/default.nix
index 9432c4fd85..b5a3486da7 100644
--- a/third_party/nixpkgs/pkgs/development/tools/rust/crate2nix/default.nix
+++ b/third_party/nixpkgs/pkgs/development/tools/rust/crate2nix/default.nix
@@ -12,13 +12,14 @@ rustPlatform.buildRustPackage rec {
pname = "crate2nix";
version = "0.9.0";
- src = fetchFromGitHub
- {
- owner = "kolloch";
- repo = pname;
- rev = version;
- sha256 = "sha256-dB8wa3CQFw8ckD420zpBGw4TnsLrHqXf+ff/WuhPsVM=";
- } + "/crate2nix";
+ src = fetchFromGitHub {
+ owner = "kolloch";
+ repo = pname;
+ rev = version;
+ sha256 = "sha256-dB8wa3CQFw8ckD420zpBGw4TnsLrHqXf+ff/WuhPsVM=";
+ };
+
+ sourceRoot = "source/crate2nix";
cargoSha256 = "sha256-6V0ifH63/s5XLo4BCexPtvlUH0UQPHFW8YHF8OCH3ik=";
diff --git a/third_party/nixpkgs/pkgs/development/tools/rust/sqlx-cli/default.nix b/third_party/nixpkgs/pkgs/development/tools/rust/sqlx-cli/default.nix
index c6f34a9e20..5c4f40bbd0 100644
--- a/third_party/nixpkgs/pkgs/development/tools/rust/sqlx-cli/default.nix
+++ b/third_party/nixpkgs/pkgs/development/tools/rust/sqlx-cli/default.nix
@@ -1,4 +1,4 @@
-{ lib, rustPlatform, fetchFromGitHub, pkg-config, openssl }:
+{ stdenv, lib, rustPlatform, fetchFromGitHub, pkg-config, openssl, SystemConfiguration, CoreFoundation, Security }:
rustPlatform.buildRustPackage rec {
pname = "sqlx-cli";
@@ -17,7 +17,8 @@ rustPlatform.buildRustPackage rec {
cargoBuildFlags = [ "-p sqlx-cli" ];
nativeBuildInputs = [ pkg-config ];
- buildInputs = [ openssl ];
+ buildInputs = lib.optionals stdenv.isLinux [ openssl ]
+ ++ lib.optionals stdenv.isDarwin [ SystemConfiguration CoreFoundation Security ];
meta = with lib; {
description =
diff --git a/third_party/nixpkgs/pkgs/development/tools/sd-local/default.nix b/third_party/nixpkgs/pkgs/development/tools/sd-local/default.nix
index eea5dc9b10..9cb70db3c7 100644
--- a/third_party/nixpkgs/pkgs/development/tools/sd-local/default.nix
+++ b/third_party/nixpkgs/pkgs/development/tools/sd-local/default.nix
@@ -2,13 +2,13 @@
buildGoModule rec {
pname = "sd-local";
- version = "1.0.26";
+ version = "1.0.27";
src = fetchFromGitHub {
owner = "screwdriver-cd";
repo = pname;
rev = "v${version}";
- sha256 = "sha256-JQeqCvnGWE0VesLQ6HbH7gikwAP3im19nBnwr1ruQqk=";
+ sha256 = "sha256-aJxSLOUmTuPzBJCnXv2d09Kdh/jPPBUmFnuq8629PWY=";
};
vendorSha256 = "sha256-3KNYG6RBnfFRgIoIyAe7QwAB56ZMF8bHdgt9Ghtod20=";
diff --git a/third_party/nixpkgs/pkgs/development/tools/stagit/default.nix b/third_party/nixpkgs/pkgs/development/tools/stagit/default.nix
index f74698bb11..85d6489018 100644
--- a/third_party/nixpkgs/pkgs/development/tools/stagit/default.nix
+++ b/third_party/nixpkgs/pkgs/development/tools/stagit/default.nix
@@ -2,12 +2,12 @@
stdenv.mkDerivation rec {
pname = "stagit";
- version = "0.9.4";
+ version = "0.9.5";
src = fetchgit {
url = "git://git.codemadness.org/stagit";
rev = version;
- sha256 = "1n0f2pf4gmqnkx4kfn2c79zx2vk4xkg03h7wvdigijkkbhs7a3pm";
+ sha256 = "1wlx5k0v464fr1ifjv04v7ccwb559s54xpsbxdda4whyx1v0fbq4";
};
makeFlags = [ "PREFIX=$(out)" ];
@@ -19,6 +19,6 @@ stdenv.mkDerivation rec {
homepage = "https://git.codemadness.org/stagit/file/README.html";
license = licenses.mit;
platforms = platforms.all;
- maintainers = with maintainers; [ jb55 ];
+ maintainers = with maintainers; [ jb55 sikmir ];
};
}
diff --git a/third_party/nixpkgs/pkgs/development/tools/tabnine/default.nix b/third_party/nixpkgs/pkgs/development/tools/tabnine/default.nix
index f18be619f2..49265d22f8 100644
--- a/third_party/nixpkgs/pkgs/development/tools/tabnine/default.nix
+++ b/third_party/nixpkgs/pkgs/development/tools/tabnine/default.nix
@@ -1,20 +1,23 @@
{ stdenv, lib, fetchurl, unzip }:
let
- version = "3.2.63";
+ version = "3.3.101";
src =
if stdenv.hostPlatform.system == "x86_64-darwin" then
- fetchurl {
- url = "https://update.tabnine.com/bundles/${version}/x86_64-apple-darwin/TabNine.zip";
- sha256 = "0y0wb3jdr2qk4k21c11w8c9a5fl0h2rm1wm7m8hqdywy4lz9ppgy";
- }
+ fetchurl
+ {
+ url = "https://update.tabnine.com/bundles/${version}/x86_64-apple-darwin/TabNine.zip";
+ sha256 = "KrFDQSs7hMCioeqPKTNODe3RKnwNV8XafdYDUaxou/Y=";
+ }
else if stdenv.hostPlatform.system == "x86_64-linux" then
- fetchurl {
- url = "https://update.tabnine.com/bundles/${version}/x86_64-unknown-linux-musl/TabNine.zip";
- sha256 = "0zzk2w5azk5f0svjxlj2774x01xdflb767xxvbglj4223dgyx2x5";
- }
+ fetchurl
+ {
+ url = "https://update.tabnine.com/bundles/${version}/x86_64-unknown-linux-musl/TabNine.zip";
+ sha256 = "vbeuZf/phOj83xTha+AzpKIvvrjwMar7q2teAmr5ESQ=";
+ }
else throw "Not supported on ${stdenv.hostPlatform.system}";
-in stdenv.mkDerivation rec {
+in
+stdenv.mkDerivation rec {
pname = "tabnine";
inherit version src;
diff --git a/third_party/nixpkgs/pkgs/development/tools/vendir/default.nix b/third_party/nixpkgs/pkgs/development/tools/vendir/default.nix
new file mode 100644
index 0000000000..ff9523c717
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/development/tools/vendir/default.nix
@@ -0,0 +1,24 @@
+{ lib, buildGoModule, fetchFromGitHub }:
+
+buildGoModule rec {
+ pname = "vendir";
+ version = "0.17.0";
+
+ src = fetchFromGitHub {
+ owner = "vmware-tanzu";
+ repo = "carvel-vendir";
+ rev = "v${version}";
+ sha256 = "14yd14z4666alwsn2jhcvg2kijvw4qjr4h3gikchiir38w520fs9";
+ };
+
+ vendorSha256 = null;
+
+ subPackages = [ "cmd/vendir" ];
+
+ meta = with lib; {
+ description = "CLI tool to vendor portions of git repos, github releases, helm charts, docker image contents, etc. declaratively";
+ homepage = "https://carvel.dev/vendir/";
+ license = licenses.asl20;
+ maintainers = with maintainers; [ russell ];
+ };
+}
diff --git a/third_party/nixpkgs/pkgs/development/tools/vultr/default.nix b/third_party/nixpkgs/pkgs/development/tools/vultr/default.nix
index 1f101882b5..2f1d6618d3 100644
--- a/third_party/nixpkgs/pkgs/development/tools/vultr/default.nix
+++ b/third_party/nixpkgs/pkgs/development/tools/vultr/default.nix
@@ -2,14 +2,14 @@
buildGoPackage rec {
pname = "vultr";
- version = "2.0.2";
+ version = "2.0.3";
goPackagePath = "github.com/JamesClonk/vultr";
src = fetchFromGitHub {
owner = "JamesClonk";
repo = "vultr";
rev = "v${version}";
- sha256 = "0br8nxi9syraarp4hzav9a3p4zxhyi45cq5dsclzxi3fga2l6mqg";
+ sha256 = "sha256-kyB6gUbc32NsSDqDy1zVT4HXn0pWxHdBOEBOSaI0Xro=";
};
meta = {
diff --git a/third_party/nixpkgs/pkgs/development/tools/wabt/default.nix b/third_party/nixpkgs/pkgs/development/tools/wabt/default.nix
index 27b11870a8..aaffa4f821 100644
--- a/third_party/nixpkgs/pkgs/development/tools/wabt/default.nix
+++ b/third_party/nixpkgs/pkgs/development/tools/wabt/default.nix
@@ -1,20 +1,19 @@
-{ lib, stdenv, fetchpatch, fetchFromGitHub, cmake, python3, substituteAll }:
+{ lib, stdenv, fetchFromGitHub, cmake }:
stdenv.mkDerivation rec {
pname = "wabt";
- version = "1.0.20";
+ version = "1.0.23";
src = fetchFromGitHub {
owner = "WebAssembly";
repo = "wabt";
rev = version;
- sha256 = "1wwyljppxz03slvgx809g87mdrglpimz4xaici71a9mqwjpgj0l8";
+ sha256 = "1drjngcqkaahzk92jysrzv86fhj02c074xffd7kn3k6q8fxc0976";
fetchSubmodules = true;
};
nativeBuildInputs = [ cmake ];
cmakeFlags = [ "-DBUILD_TESTS=OFF" "-DCMAKE_PROJECT_VERSION=${version}" ];
- buildInputs = [ python3 ];
meta = with lib; {
description = "The WebAssembly Binary Toolkit";
diff --git a/third_party/nixpkgs/pkgs/development/tools/wasm-bindgen-cli/Cargo.lock b/third_party/nixpkgs/pkgs/development/tools/wasm-bindgen-cli/Cargo.lock
index 289bb631c1..165aa6ac85 100644
--- a/third_party/nixpkgs/pkgs/development/tools/wasm-bindgen-cli/Cargo.lock
+++ b/third_party/nixpkgs/pkgs/development/tools/wasm-bindgen-cli/Cargo.lock
@@ -15,9 +15,9 @@ checksum = "aae1277d39aeec15cb388266ecc24b11c80469deae6067e17a1a7aa9e5c1f234"
[[package]]
name = "aho-corasick"
-version = "0.7.15"
+version = "0.7.13"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7404febffaa47dac81aa44dba71523c9d069b1bdc50a77db41195149e17f68e5"
+checksum = "043164d8ba5c4c3035fec9bbee8647c0261d788f3474306f93bb65901cae0e86"
dependencies = [
"memchr",
]
@@ -33,9 +33,9 @@ dependencies = [
[[package]]
name = "anyhow"
-version = "1.0.35"
+version = "1.0.32"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2c0df63cb2955042487fad3aefd2c6e3ae7389ac5dc1beb28921de0b69f779d4"
+checksum = "6b602bfe940d21c130f3895acd65221e8a61270debe89d628b9cb4e3ccb8569b"
[[package]]
name = "arrayref"
@@ -45,9 +45,9 @@ checksum = "a4c527152e37cf757a3f78aae5a06fbeefdb07ccc535c980a3208ee3060dd544"
[[package]]
name = "arrayvec"
-version = "0.5.2"
+version = "0.5.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "23b62fc65de8e4e7f52534fb52b0f3ed04746ae267519eef2a83941e8085068b"
+checksum = "cff77d8686867eceff3105329d4698d96c2391c176d5d03adc90c7389162b5b8"
[[package]]
name = "ascii"
@@ -57,9 +57,9 @@ checksum = "97be891acc47ca214468e09425d02cef3af2c94d0d82081cd02061f996802f14"
[[package]]
name = "askama"
-version = "0.10.5"
+version = "0.10.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d298738b6e47e1034e560e5afe63aa488fea34e25ec11b855a76f0d7b8e73134"
+checksum = "70a6e7ebd44d0047fd48206c83c5cd3214acc7b9d87f001da170145c47ef7d12"
dependencies = [
"askama_derive",
"askama_escape",
@@ -68,12 +68,13 @@ dependencies = [
[[package]]
name = "askama_derive"
-version = "0.10.5"
+version = "0.10.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ca2925c4c290382f9d2fa3d1c1b6a63fa1427099721ecca4749b154cc9c25522"
+checksum = "e1d7169690c4f56343dcd821ab834972a22570a2662a19a84fd7775d5e1c3881"
dependencies = [
"askama_shared",
"proc-macro2",
+ "quote",
"syn",
]
@@ -85,14 +86,14 @@ checksum = "90c108c1a94380c89d2215d0ac54ce09796823cca0fd91b299cfff3b33e346fb"
[[package]]
name = "askama_shared"
-version = "0.11.1"
+version = "0.10.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2582b77e0f3c506ec4838a25fa8a5f97b9bed72bb6d3d272ea1c031d8bd373bc"
+checksum = "62fc272363345c8cdc030e4c259d9d028237f8b057dc9bb327772a257bde6bb5"
dependencies = [
"askama_escape",
"humansize",
- "nom 6.0.1",
- "num-traits 0.2.14",
+ "nom",
+ "num-traits 0.2.12",
"percent-encoding 2.1.0",
"proc-macro2",
"quote",
@@ -103,9 +104,9 @@ dependencies = [
[[package]]
name = "assert_cmd"
-version = "1.0.2"
+version = "1.0.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3dc1679af9a1ab4bea16f228b05d18f8363f8327b1fa8db00d2760cfafc6b61e"
+checksum = "c88b9ca26f9c16ec830350d309397e74ee9abdfd8eb1f71cb6ecc71a3fc818da"
dependencies = [
"doc-comment",
"predicates",
@@ -133,9 +134,9 @@ checksum = "1d49d90015b3c36167a20fe2810c5cd875ad504b39cff3d4eae7977e6b7c1cb2"
[[package]]
name = "autocfg"
-version = "1.0.1"
+version = "1.0.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cdb031dd78e28731d87d56cc8ffef4a8f36ca26c38fe2de700543e627f8a464a"
+checksum = "f8aac770f1885fd7e387acedd76065302551364496e46b3dd00860b2f8359b9d"
[[package]]
name = "base64"
@@ -149,9 +150,9 @@ dependencies = [
[[package]]
name = "base64"
-version = "0.13.0"
+version = "0.11.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "904dfeac50f3cdaba28fc6f57fdcddb75f49ed61346676a78c4ffe55877802fd"
+checksum = "b41b7ea54a0c9d92199de89e20e58d49f02f8e699814ef3fdf266f6f748d15c7"
[[package]]
name = "bitflags"
@@ -165,23 +166,11 @@ version = "1.2.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "cf1de2fe8c75bc145a2f577add951f8134889b4795d47466a54a5c846d691693"
-[[package]]
-name = "bitvec"
-version = "0.19.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a7ba35e9565969edb811639dbebfe34edc0368e472c5018474c8eb2543397f81"
-dependencies = [
- "funty",
- "radium",
- "tap",
- "wyz",
-]
-
[[package]]
name = "blake2b_simd"
-version = "0.5.11"
+version = "0.5.10"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "afa748e348ad3be8263be728124b24a24f268266f6f5d58af9d75f6a40b5c587"
+checksum = "d8fb2d74254a3a0b5cac33ac9f8ed0e44aa50378d9dbb2e5d83bd21ed1dc2c8a"
dependencies = [
"arrayref",
"arrayvec",
@@ -221,9 +210,9 @@ dependencies = [
[[package]]
name = "cc"
-version = "1.0.66"
+version = "1.0.58"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4c0496836a84f8d0495758516b8621a622beb77c0fed418570e50764093ced48"
+checksum = "f9a06fb2e53271d7c279ec1efea6ab691c35a2ae67ec0d91d7acec0caf13b518"
[[package]]
name = "cfg-if"
@@ -246,15 +235,13 @@ dependencies = [
[[package]]
name = "chrono"
-version = "0.4.19"
+version = "0.4.13"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "670ad68c9088c2a963aaa298cb369688cf3f9465ce5e2d4ca10e6e0098a1ce73"
+checksum = "c74d84029116787153e02106bf53e66828452a4b325cc8652b788b5967c0a0b6"
dependencies = [
- "libc",
"num-integer",
- "num-traits 0.2.14",
+ "num-traits 0.2.12",
"time",
- "winapi",
]
[[package]]
@@ -265,9 +252,9 @@ checksum = "498d20a7aaf62625b9bf26e637cf7736417cde1d0c99f1d04d1170229a85cf87"
[[package]]
name = "clap"
-version = "2.33.3"
+version = "2.33.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "37e58ac78573c40708d45522f0d80fa2f01cc4f9b4e2bf749807255454312002"
+checksum = "bdfa80d47f954d53a35a64987ca1422f495b8d6483c0fe9f7117b36c2a792129"
dependencies = [
"ansi_term",
"atty",
@@ -298,9 +285,9 @@ dependencies = [
[[package]]
name = "color_quant"
-version = "1.1.0"
+version = "1.0.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3d7b894f5411737b7867f4827955924d7c254fc9f4d91a6aad6b097804b1018b"
+checksum = "0dbbb57365263e881e805dc77d94697c9118fd94d8da011240555aa7b23445bd"
[[package]]
name = "console_error_panic_hook"
@@ -320,69 +307,65 @@ dependencies = [
"web-sys",
]
-[[package]]
-name = "const_fn"
-version = "0.4.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cd51eab21ab4fd6a3bf889e2d0958c0a6e3a61ad04260325e919e652a2a62826"
-
[[package]]
name = "constant_time_eq"
version = "0.1.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "245097e9a4535ee1e3e3931fcfcd55a796a44c643e8596ff6566d68f09b87bbc"
-[[package]]
-name = "crossbeam-channel"
-version = "0.5.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dca26ee1f8d361640700bde38b2c37d8c22b3ce2d360e1fc1c74ea4b0aa7d775"
-dependencies = [
- "cfg-if 1.0.0",
- "crossbeam-utils",
-]
-
[[package]]
name = "crossbeam-deque"
-version = "0.8.0"
+version = "0.7.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "94af6efb46fef72616855b036a624cf27ba656ffc9be1b9a3c931cfc7749a9a9"
+checksum = "9f02af974daeee82218205558e51ec8768b48cf524bd01d550abe5573a608285"
dependencies = [
- "cfg-if 1.0.0",
"crossbeam-epoch",
"crossbeam-utils",
+ "maybe-uninit",
]
[[package]]
name = "crossbeam-epoch"
-version = "0.9.1"
+version = "0.8.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a1aaa739f95311c2c7887a76863f500026092fb1dce0161dab577e559ef3569d"
+checksum = "058ed274caafc1f60c4997b5fc07bf7dc7cca454af7c6e81edffe5f33f70dace"
dependencies = [
- "cfg-if 1.0.0",
- "const_fn",
+ "autocfg 1.0.0",
+ "cfg-if 0.1.10",
"crossbeam-utils",
"lazy_static",
+ "maybe-uninit",
"memoffset",
"scopeguard",
]
[[package]]
-name = "crossbeam-utils"
-version = "0.8.1"
+name = "crossbeam-queue"
+version = "0.2.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "02d96d1e189ef58269ebe5b97953da3274d83a93af647c2ddd6f9dab28cedb8d"
+checksum = "774ba60a54c213d409d5353bda12d49cd68d14e45036a285234c8d6f91f92570"
dependencies = [
- "autocfg 1.0.1",
- "cfg-if 1.0.0",
+ "cfg-if 0.1.10",
+ "crossbeam-utils",
+ "maybe-uninit",
+]
+
+[[package]]
+name = "crossbeam-utils"
+version = "0.7.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c3c7c73a2d1e9fc0886a08b93e98eb643461230d5f1925e4036204d5f2e261a8"
+dependencies = [
+ "autocfg 1.0.0",
+ "cfg-if 0.1.10",
"lazy_static",
]
[[package]]
name = "curl"
-version = "0.4.34"
+version = "0.4.31"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e268162af1a5fe89917ae25ba3b0a77c8da752bdc58e7dbb4f15b91fbd33756e"
+checksum = "9447ad28eee2a5cfb031c329d46bef77487244fff6a724b378885b8691a35f78"
dependencies = [
"curl-sys",
"libc",
@@ -395,9 +378,9 @@ dependencies = [
[[package]]
name = "curl-sys"
-version = "0.4.39+curl-7.74.0"
+version = "0.4.33+curl-7.71.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "07a8ce861e7b68a0b394e814d7ee9f1b2750ff8bd10372c6ad3bacc10e86f874"
+checksum = "3e9818ea018327f79c811612f29b9834d2abddbe7db81460a2d5c7e12946b337"
dependencies = [
"cc",
"libc",
@@ -476,9 +459,9 @@ dependencies = [
[[package]]
name = "either"
-version = "1.6.1"
+version = "1.5.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e78d4f1cc4ae33bbfc157ed5d5a5ef3bc29227303d595861deb238fcec4e9457"
+checksum = "bb1f6b1ce1c140482ea30ddd3335fc0024ac7ee112895426e0a629a6c20adfe3"
[[package]]
name = "enum_primitive"
@@ -491,9 +474,9 @@ dependencies = [
[[package]]
name = "env_logger"
-version = "0.8.2"
+version = "0.8.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f26ecb66b4bdca6c1409b40fb255eefc2bd4f6d135dab3c3124f80ffa2a9661e"
+checksum = "17392a012ea30ef05a610aa97dfb49496e71c9f676b27879922ea5bdf60d9d3f"
dependencies = [
"atty",
"humantime",
@@ -516,11 +499,11 @@ dependencies = [
[[package]]
name = "filetime"
-version = "0.2.13"
+version = "0.2.11"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0c122a393ea57648015bf06fbd3d372378992e86b9ff5a7a497b076a28c79efe"
+checksum = "e500da2fab70bdc43f8f0e0b350a227f31c72311c56aba48f01d5cd62bb0345b"
dependencies = [
- "cfg-if 1.0.0",
+ "cfg-if 0.1.10",
"libc",
"redox_syscall",
"winapi",
@@ -532,7 +515,7 @@ version = "0.8.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "e1267f4ac4f343772758f7b1bdcbe767c218bbab93bb432acbf5162bbf85a6c4"
dependencies = [
- "num-traits 0.2.14",
+ "num-traits 0.2.12",
]
[[package]]
@@ -556,17 +539,11 @@ version = "0.1.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "a06f77d526c1a601b7c4cdd98f54b5eaabffc14d5f2f0296febdc7f357c6d3ba"
-[[package]]
-name = "funty"
-version = "1.0.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0ba62103ce691c2fd80fbae2213dfdda9ce60804973ac6b6e97de818ea7f52c8"
-
[[package]]
name = "futures"
-version = "0.3.8"
+version = "0.3.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9b3b0c040a1fe6529d30b3c5944b280c7f0dcb2930d2c3062bca967b602583d0"
+checksum = "1e05b85ec287aac0dc34db7d4a569323df697f9c55b99b15d6b4ef8cde49f613"
dependencies = [
"futures-channel",
"futures-core",
@@ -579,9 +556,9 @@ dependencies = [
[[package]]
name = "futures-channel"
-version = "0.3.8"
+version = "0.3.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4b7109687aa4e177ef6fe84553af6280ef2778bdb7783ba44c9dc3399110fe64"
+checksum = "f366ad74c28cca6ba456d95e6422883cfb4b252a83bed929c83abfdbbf2967d5"
dependencies = [
"futures-core",
"futures-sink",
@@ -598,9 +575,9 @@ dependencies = [
[[package]]
name = "futures-core"
-version = "0.3.8"
+version = "0.3.13"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "847ce131b72ffb13b6109a221da9ad97a64cbe48feb1028356b836b47b8f1748"
+checksum = "15496a72fabf0e62bdc3df11a59a3787429221dd0710ba8ef163d6f7a9112c94"
[[package]]
name = "futures-core-preview"
@@ -610,9 +587,9 @@ checksum = "b35b6263fb1ef523c3056565fa67b1d16f0a8604ff12b11b08c25f28a734c60a"
[[package]]
name = "futures-executor"
-version = "0.3.8"
+version = "0.3.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4caa2b2b68b880003057c1dd49f1ed937e38f22fcf6c212188a121f08cf40a65"
+checksum = "10d6bb888be1153d3abeb9006b11b02cf5e9b209fda28693c31ae1e4e012e314"
dependencies = [
"futures-core",
"futures-task",
@@ -621,15 +598,26 @@ dependencies = [
[[package]]
name = "futures-io"
-version = "0.3.8"
+version = "0.3.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "611834ce18aaa1bd13c4b374f5d653e1027cf99b6b502584ff8c9a64413b30bb"
+checksum = "de27142b013a8e869c14957e6d2edeef89e97c289e69d042ee3a49acd8b51789"
+
+[[package]]
+name = "futures-lite"
+version = "1.11.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b4481d0cd0de1d204a4fa55e7d45f07b1d958abcb06714b3446438e2eff695fb"
+dependencies = [
+ "futures-core",
+ "memchr",
+ "pin-project-lite",
+]
[[package]]
name = "futures-macro"
-version = "0.3.8"
+version = "0.3.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "77408a692f1f97bcc61dc001d752e00643408fbc922e4d634c655df50d595556"
+checksum = "d0b5a30a4328ab5473878237c447333c093297bded83a4983d10f4deea240d39"
dependencies = [
"proc-macro-hack",
"proc-macro2",
@@ -639,24 +627,24 @@ dependencies = [
[[package]]
name = "futures-sink"
-version = "0.3.8"
+version = "0.3.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f878195a49cee50e006b02b93cf7e0a95a38ac7b776b4c4d9cc1207cd20fcb3d"
+checksum = "3f2032893cb734c7a05d85ce0cc8b8c4075278e93b24b66f9de99d6eb0fa8acc"
[[package]]
name = "futures-task"
-version = "0.3.8"
+version = "0.3.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7c554eb5bf48b2426c4771ab68c6b14468b6e76cc90996f528c3338d761a4d0d"
+checksum = "bdb66b5f09e22019b1ab0830f7785bcea8e7a42148683f99214f73f8ec21a626"
dependencies = [
"once_cell",
]
[[package]]
name = "futures-util"
-version = "0.3.8"
+version = "0.3.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d304cff4a7b99cfb7986f7d43fbe93d175e72e704a8860787cc95e9ffd85cbd2"
+checksum = "8764574ff08b701a084482c3c7031349104b07ac897393010494beaa18ce32c6"
dependencies = [
"futures-channel",
"futures-core",
@@ -674,13 +662,13 @@ dependencies = [
[[package]]
name = "getrandom"
-version = "0.1.15"
+version = "0.1.14"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fc587bc0ec293155d5bfa6b9891ec18a1e330c234f896ea47fbada4cadbe47e6"
+checksum = "7abc8dd8451921606d809ba32e95b6111925cd2906060d2dcc29c070220503eb"
dependencies = [
"cfg-if 0.1.10",
"libc",
- "wasi 0.9.0+wasi-snapshot-preview1",
+ "wasi",
]
[[package]]
@@ -724,9 +712,9 @@ dependencies = [
[[package]]
name = "hermit-abi"
-version = "0.1.17"
+version = "0.1.15"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5aca5565f760fb5b220e499d72710ed156fdb74e631659e99377d9ebfbd13ae8"
+checksum = "3deed196b6e7f9e44a2ae8d94225d80302d81208b1bb673fd21fe634645c85a9"
dependencies = [
"libc",
]
@@ -817,7 +805,7 @@ dependencies = [
[[package]]
name = "js-sys"
-version = "0.3.46"
+version = "0.3.50"
dependencies = [
"wasm-bindgen",
"wasm-bindgen-futures",
@@ -844,30 +832,17 @@ version = "0.2.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "3576a87f2ba00f6f106fdfcd16db1d698d648a26ad8e0573cad8537c3c362d2a"
-[[package]]
-name = "lexical-core"
-version = "0.7.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "db65c6da02e61f55dae90a0ae427b2a5f6b3e8db09f58d10efab23af92592616"
-dependencies = [
- "arrayvec",
- "bitflags 1.2.1",
- "cfg-if 0.1.10",
- "ryu",
- "static_assertions",
-]
-
[[package]]
name = "libc"
-version = "0.2.81"
+version = "0.2.74"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1482821306169ec4d07f6aca392a4681f66c75c9918aa49641a2595db64053cb"
+checksum = "a2f02823cf78b754822df5f7f268fb59822e7296276d3e069d8e8cb26a14bd10"
[[package]]
name = "libz-sys"
-version = "1.1.2"
+version = "1.0.25"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "602113192b08db8f38796c4e85c39e960c145965140e918018bcde1952429655"
+checksum = "2eb5e43362e38e2bca2fd5f5134c4d4564a23a5c28e9b95411652021a8675ebe"
dependencies = [
"cc",
"libc",
@@ -906,18 +881,24 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "7ffc5c5338469d4d3ea17d269fa8ea3512ad247247c30bd2df69e68309ed0a08"
[[package]]
-name = "memchr"
-version = "2.3.4"
+name = "maybe-uninit"
+version = "2.0.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0ee1c47aaa256ecabcaea351eae4a9b01ef39ed810004e298d2511ed284b1525"
+checksum = "60302e4db3a61da70c0cb7991976248362f30319e88850c487b9b95bbf059e00"
+
+[[package]]
+name = "memchr"
+version = "2.3.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3728d817d99e5ac407411fa471ff9800a778d88a24685968b36824eaf4bee400"
[[package]]
name = "memoffset"
-version = "0.6.1"
+version = "0.5.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "157b4208e3059a8f9e78d559edc658e13df41410cb3ae03979c83130067fdd87"
+checksum = "c198b026e1bbf08a937e94c6c60f9ec4a2267f5b0d2eec9c1b21b061ce2be55f"
dependencies = [
- "autocfg 1.0.1",
+ "autocfg 1.0.0",
]
[[package]]
@@ -976,18 +957,6 @@ dependencies = [
"version_check 0.9.2",
]
-[[package]]
-name = "nom"
-version = "6.0.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "88034cfd6b4a0d54dd14f4a507eceee36c0b70e5a02236c4e4df571102be17f0"
-dependencies = [
- "bitvec",
- "lexical-core",
- "memchr",
- "version_check 0.9.2",
-]
-
[[package]]
name = "normalize-line-endings"
version = "0.3.0"
@@ -996,23 +965,23 @@ checksum = "61807f77802ff30975e01f4f071c8ba10c022052f98b3294119f3e615d13e5be"
[[package]]
name = "num-integer"
-version = "0.1.44"
+version = "0.1.43"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d2cc698a63b549a70bc047073d2949cce27cd1c7b0a4a862d08a8031bc2801db"
+checksum = "8d59457e662d541ba17869cf51cf177c0b5f0cbf476c66bdc90bf1edac4f875b"
dependencies = [
- "autocfg 1.0.1",
- "num-traits 0.2.14",
+ "autocfg 1.0.0",
+ "num-traits 0.2.12",
]
[[package]]
name = "num-iter"
-version = "0.1.42"
+version = "0.1.41"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b2021c8337a54d21aca0d59a92577a029af9431cb59b909b03252b9c164fad59"
+checksum = "7a6e6b7c748f995c4c29c5f5ae0248536e04a5739927c74ec0fa564805094b9f"
dependencies = [
- "autocfg 1.0.1",
+ "autocfg 1.0.0",
"num-integer",
- "num-traits 0.2.14",
+ "num-traits 0.2.12",
]
[[package]]
@@ -1022,7 +991,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "ee314c74bd753fc86b4780aa9475da469155f3848473a261d2d18e35245a784e"
dependencies = [
"num-integer",
- "num-traits 0.2.14",
+ "num-traits 0.2.12",
]
[[package]]
@@ -1031,16 +1000,16 @@ version = "0.1.43"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "92e5113e9fd4cc14ded8e499429f396a20f98c772a47cc8622a736e1ec843c31"
dependencies = [
- "num-traits 0.2.14",
+ "num-traits 0.2.12",
]
[[package]]
name = "num-traits"
-version = "0.2.14"
+version = "0.2.12"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9a64b1ec5cda2586e284722486d802acf1f7dbdc623e2bfc57e65ca1cd099290"
+checksum = "ac267bcc07f48ee5f8935ab0d24f316fb722d7a1292e2913f0cc196b29ffd611"
dependencies = [
- "autocfg 1.0.1",
+ "autocfg 1.0.0",
]
[[package]]
@@ -1055,18 +1024,18 @@ dependencies = [
[[package]]
name = "once_cell"
-version = "1.5.2"
+version = "1.4.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "13bd41f508810a131401606d54ac32a467c97172d74ba7662562ebba5ad07fa0"
+checksum = "0b631f7e854af39a1739f401cf34a8a013dfe09eac4fa4dba91e9768bd28168d"
[[package]]
name = "openssl"
-version = "0.10.31"
+version = "0.10.30"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8d008f51b1acffa0d3450a68606e6a51c123012edaacb0f4e1426bd978869187"
+checksum = "8d575eff3665419f9b83678ff2815858ad9d11567e082f5ac1814baba4e2bcb4"
dependencies = [
"bitflags 1.2.1",
- "cfg-if 1.0.0",
+ "cfg-if 0.1.10",
"foreign-types",
"lazy_static",
"libc",
@@ -1081,20 +1050,20 @@ checksum = "77af24da69f9d9341038eba93a073b1fdaaa1b788221b00a69bce9e762cb32de"
[[package]]
name = "openssl-src"
-version = "111.13.0+1.1.1i"
+version = "111.10.2+1.1.1g"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "045e4dc48af57aad93d665885789b43222ae26f4886494da12d1ed58d309dcb6"
+checksum = "a287fdb22e32b5b60624d4a5a7a02dbe82777f730ec0dbc42a0554326fef5a70"
dependencies = [
"cc",
]
[[package]]
name = "openssl-sys"
-version = "0.9.59"
+version = "0.9.58"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "de52d8eabd217311538a39bba130d7dea1f1e118010fee7a033d966845e7d5fe"
+checksum = "a842db4709b604f0fe5d1170ae3565899be2ad3d9cbc72dedc789ac0511f78de"
dependencies = [
- "autocfg 1.0.1",
+ "autocfg 1.0.0",
"cc",
"libc",
"openssl-src",
@@ -1164,24 +1133,30 @@ dependencies = [
[[package]]
name = "pin-project"
-version = "1.0.2"
+version = "0.4.23"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9ccc2237c2c489783abd8c4c80e5450fc0e98644555b1364da68cc29aa151ca7"
+checksum = "ca4433fff2ae79342e497d9f8ee990d174071408f28f726d6d83af93e58e48aa"
dependencies = [
"pin-project-internal",
]
[[package]]
name = "pin-project-internal"
-version = "1.0.2"
+version = "0.4.23"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f8e8d2bf0b23038a4424865103a4df472855692821aab4e4f5c3312d461d9e5f"
+checksum = "2c0e815c3ee9a031fdf5af21c10aa17c573c9c6a566328d99e3936c34e36461f"
dependencies = [
"proc-macro2",
"quote",
"syn",
]
+[[package]]
+name = "pin-project-lite"
+version = "0.2.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "dc0e1f259c92177c30a4c9d177246edd0a3568b25756a977d0632cf8fa37e905"
+
[[package]]
name = "pin-utils"
version = "0.1.0"
@@ -1190,9 +1165,9 @@ checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184"
[[package]]
name = "pkg-config"
-version = "0.3.19"
+version = "0.3.18"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3831453b3449ceb48b6d9c7ad7c96d5ea673e9b470a1dc578c2ce6521230884c"
+checksum = "d36492546b6af1463394d46f0c834346f31548646f6ba10849802c9c9a27ac33"
[[package]]
name = "png"
@@ -1208,9 +1183,9 @@ dependencies = [
[[package]]
name = "ppv-lite86"
-version = "0.2.10"
+version = "0.2.8"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ac74c624d6b2d21f425f752262f42188365d7b8ff1aff74c82e45136510a4857"
+checksum = "237a5ed80e274dbc66f86bd59c1e25edc039660be53194b5fe0a482e0f2612ea"
[[package]]
name = "predicates"
@@ -1243,9 +1218,9 @@ dependencies = [
[[package]]
name = "proc-macro-error"
-version = "1.0.4"
+version = "1.0.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "da25490ff9892aab3fcf7c36f08cfb902dd3e71ca0f9f9517bea02a73a5ce38c"
+checksum = "fc175e9777c3116627248584e8f8b3e2987405cabe1c0adf7d1dd28f09dc7880"
dependencies = [
"proc-macro-error-attr",
"proc-macro2",
@@ -1256,20 +1231,22 @@ dependencies = [
[[package]]
name = "proc-macro-error-attr"
-version = "1.0.4"
+version = "1.0.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a1be40180e52ecc98ad80b184934baf3d0d29f979574e439af5a55274b35f869"
+checksum = "3cc9795ca17eb581285ec44936da7fc2335a3f34f2ddd13118b6f4d515435c50"
dependencies = [
"proc-macro2",
"quote",
+ "syn",
+ "syn-mid",
"version_check 0.9.2",
]
[[package]]
name = "proc-macro-hack"
-version = "0.5.19"
+version = "0.5.18"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dbf0c48bc1d91375ae5c3cd81e3722dff1abcf81a30960240640d223f59fe0e5"
+checksum = "99c605b9a0adc77b7211c6b1f722dcb613d68d66859a44f3d485a6da332b0598"
[[package]]
name = "proc-macro-nested"
@@ -1301,12 +1278,6 @@ dependencies = [
"proc-macro2",
]
-[[package]]
-name = "radium"
-version = "0.5.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "941ba9d78d8e2f7ce474c015eea4d9c6d25b6a3327f9832ee29a4de27f91bbb8"
-
[[package]]
name = "rand"
version = "0.4.6"
@@ -1482,11 +1453,11 @@ dependencies = [
[[package]]
name = "rayon"
-version = "1.5.0"
+version = "1.3.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8b0d8e0819fadc20c74ea8373106ead0600e3a67ef1fe8da56e39b9ae7275674"
+checksum = "62f02856753d04e03e26929f820d0a0a337ebe71f849801eea335d464b349080"
dependencies = [
- "autocfg 1.0.1",
+ "autocfg 1.0.0",
"crossbeam-deque",
"either",
"rayon-core",
@@ -1494,12 +1465,12 @@ dependencies = [
[[package]]
name = "rayon-core"
-version = "1.9.0"
+version = "1.7.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9ab346ac5921dc62ffa9f89b7a773907511cdfa5490c572ae9be1be33e8afa4a"
+checksum = "e92e15d89083484e11353891f1af602cc661426deb9564c298b270c726973280"
dependencies = [
- "crossbeam-channel",
"crossbeam-deque",
+ "crossbeam-queue",
"crossbeam-utils",
"lazy_static",
"num_cpus",
@@ -1547,9 +1518,9 @@ checksum = "41cc0f7e4d5d4544e8861606a285bb08d3e70712ccc7d2b84d7c0ccfaf4b05ce"
[[package]]
name = "redox_users"
-version = "0.3.5"
+version = "0.3.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "de0737333e7a9502c789a36d7c7fa6092a49895d4faa31ca5df163857ded2e9d"
+checksum = "09b23093265f8d200fa7b4c2c76297f47e681c655f6f1285a8780d6a022f7431"
dependencies = [
"getrandom",
"redox_syscall",
@@ -1558,9 +1529,9 @@ dependencies = [
[[package]]
name = "regex"
-version = "1.4.2"
+version = "1.3.9"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "38cf2c13ed4745de91a5eb834e11c00bcc3709e773173b2ce4c56c9fbde04b9c"
+checksum = "9c3780fcf44b193bc4d09f36d2a3c87b251da4a046c87795a0d35f4f927ad8e6"
dependencies = [
"aho-corasick",
"memchr",
@@ -1570,9 +1541,9 @@ dependencies = [
[[package]]
name = "regex-syntax"
-version = "0.6.21"
+version = "0.6.18"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3b181ba2dcf07aaccad5448e8ead58db5b742cf85dfe035e2227f137a539a189"
+checksum = "26412eb97c6b088a6997e05f69403a802a92d520de2f8e63c2b65f9e0f47c4e8"
[[package]]
name = "remove_dir_all"
@@ -1616,11 +1587,11 @@ dependencies = [
[[package]]
name = "rust-argon2"
-version = "0.8.3"
+version = "0.7.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4b18820d944b33caa75a71378964ac46f58517c92b6ae5f762636247c09e78fb"
+checksum = "2bc8af4bda8e1ff4932523b94d3dd20ee30a87232323eda55903ffd71d2fb017"
dependencies = [
- "base64 0.13.0",
+ "base64 0.11.0",
"blake2b_simd",
"constant_time_eq",
"crossbeam-utils",
@@ -1635,9 +1606,9 @@ dependencies = [
[[package]]
name = "rustc-demangle"
-version = "0.1.18"
+version = "0.1.16"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6e3bad0ee36814ca07d7968269dd4b7ec89ec2da10c4bb613928d3077083c232"
+checksum = "4c691c0e608126e00913e33f0ccf3727d5fc84573623b8d65b2df340b5201783"
[[package]]
name = "ryu"
@@ -1691,18 +1662,18 @@ checksum = "d29ab0c6d3fc0ee92fe66e2d99f700eab17a8d57d1c1d3b748380fb20baa78cd"
[[package]]
name = "serde"
-version = "1.0.118"
+version = "1.0.114"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "06c64263859d87aa2eb554587e2d23183398d617427327cf2b3d0ed8c69e4800"
+checksum = "5317f7588f0a5078ee60ef675ef96735a1442132dc645eb1d12c018620ed8cd3"
dependencies = [
"serde_derive",
]
[[package]]
name = "serde_derive"
-version = "1.0.118"
+version = "1.0.114"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c84d3526699cd55261af4b941e4e725444df67aa4f9e6a3564f18030d12672df"
+checksum = "2a0be94b04690fbaed37cddffc5c134bf537c8e3329d53e982fe04c374978f8e"
dependencies = [
"proc-macro2",
"quote",
@@ -1711,9 +1682,9 @@ dependencies = [
[[package]]
name = "serde_json"
-version = "1.0.60"
+version = "1.0.57"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1500e84d27fe482ed1dc791a56eddc2f230046a040fa908c08bda1d9fb615779"
+checksum = "164eacbdb13512ec2745fb09d51fd5b22b0d65ed294a1dcf7285a360c80a675c"
dependencies = [
"itoa",
"ryu",
@@ -1740,11 +1711,11 @@ checksum = "c111b5bd5695e56cffe5129854aa230b39c93a305372fdbb2668ca2394eea9f8"
[[package]]
name = "socket2"
-version = "0.3.17"
+version = "0.3.12"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2c29947abdee2a218277abeca306f25789c938e500ea5a9d4b12a5a504466902"
+checksum = "03088793f677dce356f3ccc2edb1b314ad191ab702a5de3faf49304f7e104918"
dependencies = [
- "cfg-if 1.0.0",
+ "cfg-if 0.1.10",
"libc",
"redox_syscall",
"winapi",
@@ -1756,12 +1727,6 @@ version = "0.1.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "4bf77cb82ba8453b42b6ae1d692e4cdc92f9a47beaf89a847c8be83f4e328ad3"
-[[package]]
-name = "static_assertions"
-version = "1.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f"
-
[[package]]
name = "strsim"
version = "0.8.0"
@@ -1776,9 +1741,9 @@ checksum = "6446ced80d6c486436db5c078dde11a9f73d42b57fb273121e160b84f63d894c"
[[package]]
name = "structopt"
-version = "0.3.21"
+version = "0.3.15"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5277acd7ee46e63e5168a80734c9f6ee81b1367a7d8772a2d765df2a3705d28c"
+checksum = "de2f5e239ee807089b62adce73e48c625e0ed80df02c7ab3f068f5db5281065c"
dependencies = [
"clap",
"lazy_static",
@@ -1787,9 +1752,9 @@ dependencies = [
[[package]]
name = "structopt-derive"
-version = "0.4.14"
+version = "0.4.8"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5ba9cdfda491b814720b6b06e0cac513d922fc407582032e8706e9f137976f90"
+checksum = "510413f9de616762a4fbeab62509bf15c729603b72d7cd71280fbca431b1c118"
dependencies = [
"heck",
"proc-macro-error",
@@ -1800,9 +1765,9 @@ dependencies = [
[[package]]
name = "syn"
-version = "1.0.54"
+version = "1.0.67"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9a2af957a63d6bd42255c359c93d9bfdb97076bd3b820897ce55ffbfbf107f44"
+checksum = "6498a9efc342871f91cc2d0d694c674368b4ceb40f62b65a7a08c3792935e702"
dependencies = [
"proc-macro2",
"quote",
@@ -1810,10 +1775,15 @@ dependencies = [
]
[[package]]
-name = "tap"
-version = "1.0.0"
+name = "syn-mid"
+version = "0.5.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "36474e732d1affd3a6ed582781b3683df3d0563714c59c39591e8ff707cf078e"
+checksum = "7be3539f6c128a931cf19dcee741c1af532c7fd387baa739c03dd2e96479338a"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn",
+]
[[package]]
name = "tempdir"
@@ -1852,9 +1822,9 @@ dependencies = [
[[package]]
name = "termcolor"
-version = "1.1.2"
+version = "1.1.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2dfed899f0eb03f32ee8c6a0aabdb8a7949659e3466561fc0adf54e26d88c5f4"
+checksum = "bb6bfa289a4d7c5766392812c0a1f4c1ba45afa1ad47803c11e1f407d846d75f"
dependencies = [
"winapi-util",
]
@@ -1888,12 +1858,11 @@ dependencies = [
[[package]]
name = "time"
-version = "0.1.44"
+version = "0.1.43"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6db9e6914ab8b1ae1c260a4ae7a49b6c5611b40328a735b21862567685e73255"
+checksum = "ca8a50ef2360fbd1eeb0ecd46795a87a19024eb4b53c5dc916ca1fd95fe62438"
dependencies = [
"libc",
- "wasi 0.10.0+wasi-snapshot-preview1",
"winapi",
]
@@ -1912,18 +1881,9 @@ dependencies = [
[[package]]
name = "tinyvec"
-version = "1.1.0"
+version = "0.3.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ccf8dbc19eb42fba10e8feaaec282fb50e2c14b2726d6301dbfeed0f73306a6f"
-dependencies = [
- "tinyvec_macros",
-]
-
-[[package]]
-name = "tinyvec_macros"
-version = "0.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cda74da7e1a664f795bb1f8a87ec406fb89a02522cf6e50620d016add6dbbf5c"
+checksum = "53953d2d3a5ad81d9f844a32f14ebb121f50b650cd59d0ee2a07cf13c617efed"
[[package]]
name = "todomvc"
@@ -1938,9 +1898,9 @@ dependencies = [
[[package]]
name = "toml"
-version = "0.5.7"
+version = "0.5.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "75cf45bb0bef80604d001caaec0d09da99611b3c0fd39d3080468875cdb65645"
+checksum = "ffc92d160b1eef40665be3a05630d003936a3bc7da7421277846c2613e92c71a"
dependencies = [
"serde",
]
@@ -1953,9 +1913,9 @@ checksum = "a7f741b240f1a48843f9b8e0444fb55fb2a4ff67293b50a9179dfd5ea67f8d41"
[[package]]
name = "trybuild"
-version = "1.0.37"
+version = "1.0.31"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "18ccca2bc5e97a2688cba15c573d5179cdff976fc597b95472c2e0f443492b98"
+checksum = "7a4d94e6adf00b96b1ab94fcfcd8c3cf916733b39adf90c8f72693629887b9b8"
dependencies = [
"glob",
"lazy_static",
@@ -2003,18 +1963,18 @@ dependencies = [
[[package]]
name = "unicode-normalization"
-version = "0.1.16"
+version = "0.1.13"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a13e63ab62dbe32aeee58d1c5408d35c36c392bba5d9d3142287219721afe606"
+checksum = "6fb19cf769fa8c6a80a162df694621ebeb4dafb606470b2b2fce0be40a98a977"
dependencies = [
"tinyvec",
]
[[package]]
name = "unicode-segmentation"
-version = "1.7.1"
+version = "1.6.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bb0d2e7be6ae3a5fa87eed5fb451aff96f2573d2694942e40543ae0bbe19c796"
+checksum = "e83e153d1053cbb5a118eeff7fd5be06ed99153f00dbcd8ae310c5fb2b22edc0"
[[package]]
name = "unicode-width"
@@ -2041,9 +2001,9 @@ dependencies = [
[[package]]
name = "vcpkg"
-version = "0.2.11"
+version = "0.2.10"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b00bca6106a5e23f3eee943593759b7fcddb00554332e856d990c893966879fb"
+checksum = "6454029bf181f092ad1b853286f23e2c507d8e8194d01d92da4a55c274a5508c"
[[package]]
name = "vec_map"
@@ -2105,15 +2065,9 @@ version = "0.9.0+wasi-snapshot-preview1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "cccddf32554fecc6acb585f82a32a72e28b48f8c4c1883ddfeeeaa96f7d8e519"
-[[package]]
-name = "wasi"
-version = "0.10.0+wasi-snapshot-preview1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1a143597ca7c7793eff794def352d41792a93c481eb1042423ff7ff72ba2c31f"
-
[[package]]
name = "wasm-bindgen"
-version = "0.2.69"
+version = "0.2.73"
dependencies = [
"cfg-if 1.0.0",
"js-sys",
@@ -2129,7 +2083,7 @@ dependencies = [
[[package]]
name = "wasm-bindgen-backend"
-version = "0.2.69"
+version = "0.2.73"
dependencies = [
"bumpalo",
"lazy_static",
@@ -2150,7 +2104,7 @@ dependencies = [
[[package]]
name = "wasm-bindgen-cli"
-version = "0.2.69"
+version = "0.2.73"
dependencies = [
"anyhow",
"assert_cmd",
@@ -2178,7 +2132,7 @@ dependencies = [
[[package]]
name = "wasm-bindgen-cli-support"
-version = "0.2.69"
+version = "0.2.73"
dependencies = [
"anyhow",
"base64 0.9.3",
@@ -2200,22 +2154,24 @@ dependencies = [
[[package]]
name = "wasm-bindgen-externref-xform"
-version = "0.2.69"
+version = "0.2.73"
dependencies = [
"anyhow",
"rayon",
"walrus",
"wasmprinter",
- "wast 21.0.0",
+ "wast",
"wat",
]
[[package]]
name = "wasm-bindgen-futures"
-version = "0.4.19"
+version = "0.4.23"
dependencies = [
"cfg-if 1.0.0",
"futures-channel-preview",
+ "futures-core",
+ "futures-lite",
"js-sys",
"wasm-bindgen",
"wasm-bindgen-test",
@@ -2224,7 +2180,7 @@ dependencies = [
[[package]]
name = "wasm-bindgen-macro"
-version = "0.2.69"
+version = "0.2.73"
dependencies = [
"quote",
"trybuild",
@@ -2235,7 +2191,7 @@ dependencies = [
[[package]]
name = "wasm-bindgen-macro-support"
-version = "0.2.69"
+version = "0.2.73"
dependencies = [
"proc-macro2",
"quote",
@@ -2246,13 +2202,13 @@ dependencies = [
[[package]]
name = "wasm-bindgen-multi-value-xform"
-version = "0.2.69"
+version = "0.2.73"
dependencies = [
"anyhow",
"rayon",
"walrus",
"wasmprinter",
- "wast 21.0.0",
+ "wast",
"wat",
]
@@ -2267,11 +2223,11 @@ dependencies = [
[[package]]
name = "wasm-bindgen-shared"
-version = "0.2.69"
+version = "0.2.73"
[[package]]
name = "wasm-bindgen-test"
-version = "0.3.19"
+version = "0.3.23"
dependencies = [
"console_error_panic_hook",
"js-sys",
@@ -2297,7 +2253,7 @@ dependencies = [
[[package]]
name = "wasm-bindgen-test-macro"
-version = "0.3.19"
+version = "0.3.23"
dependencies = [
"proc-macro2",
"quote",
@@ -2305,7 +2261,7 @@ dependencies = [
[[package]]
name = "wasm-bindgen-threads-xform"
-version = "0.2.69"
+version = "0.2.73"
dependencies = [
"anyhow",
"walrus",
@@ -2314,7 +2270,7 @@ dependencies = [
[[package]]
name = "wasm-bindgen-wasm-conventions"
-version = "0.2.69"
+version = "0.2.73"
dependencies = [
"anyhow",
"walrus",
@@ -2322,7 +2278,7 @@ dependencies = [
[[package]]
name = "wasm-bindgen-wasm-interpreter"
-version = "0.2.69"
+version = "0.2.73"
dependencies = [
"anyhow",
"log 0.4.11",
@@ -2334,7 +2290,7 @@ dependencies = [
[[package]]
name = "wasm-bindgen-webidl"
-version = "0.2.69"
+version = "0.2.73"
dependencies = [
"anyhow",
"env_logger",
@@ -2383,18 +2339,18 @@ checksum = "a950e6a618f62147fd514ff445b2a0b53120d382751960797f85f058c7eda9b9"
[[package]]
name = "wasmparser"
-version = "0.71.0"
+version = "0.60.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "89a30c99437829ede826802bfcf28500cf58df00e66cb9114df98813bc145ff1"
+checksum = "c2d5790a08f11f3d6b5767f6c49152df74b215e3dc5a38147713c4f6a05aac7f"
[[package]]
name = "wasmprinter"
-version = "0.2.18"
+version = "0.2.7"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0515db67c610037f3c53ec36976edfd1eb01bac6b1226914b17ce609480e729f"
+checksum = "ecc836dba85dd00df43d71b22063bcb367d324aa1be0d046077cc7fca4c43876"
dependencies = [
"anyhow",
- "wasmparser 0.71.0",
+ "wasmparser 0.60.2",
]
[[package]]
@@ -2406,27 +2362,18 @@ dependencies = [
"leb128",
]
-[[package]]
-name = "wast"
-version = "30.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9b79907b22f740634810e882d8d1d9d0f9563095a8ab94e786e370242bff5cd2"
-dependencies = [
- "leb128",
-]
-
[[package]]
name = "wat"
-version = "1.0.31"
+version = "1.0.22"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a8279a02835bf12e61ed2b3c3cbc6ecf9918762fd97e036917c11a09ec20ca44"
+checksum = "ce85d72b74242c340e9e3492cfb602652d7bb324c3172dd441b5577e39a2e18c"
dependencies = [
- "wast 30.0.0",
+ "wast",
]
[[package]]
name = "web-sys"
-version = "0.3.46"
+version = "0.3.50"
dependencies = [
"js-sys",
"wasm-bindgen",
@@ -2496,11 +2443,11 @@ dependencies = [
[[package]]
name = "weedle"
-version = "0.11.0"
+version = "0.12.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8a7d4f9feb723a800d8f7b74edc9fa44ff35cb0b2ec64886714362f423427f37"
+checksum = "610950904727748ca09682e857f0d6d6437f0ca862f32f9229edba8cec8b2635"
dependencies = [
- "nom 5.1.2",
+ "nom",
]
[[package]]
@@ -2570,7 +2517,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "33358e95c77d660f1c7c07f4a93c2bd89768965e844e3c50730bb4b42658df5f"
dependencies = [
"anyhow",
- "wast 21.0.0",
+ "wast",
"wit-writer",
]
@@ -2625,9 +2572,3 @@ dependencies = [
"wasm-bindgen",
"web-sys",
]
-
-[[package]]
-name = "wyz"
-version = "0.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "85e60b0d1b5f99db2556934e21937020776a5d31520bf169e851ac44e6420214"
diff --git a/third_party/nixpkgs/pkgs/development/tools/wasm-bindgen-cli/default.nix b/third_party/nixpkgs/pkgs/development/tools/wasm-bindgen-cli/default.nix
index 0024c43e05..e566d4cb1c 100644
--- a/third_party/nixpkgs/pkgs/development/tools/wasm-bindgen-cli/default.nix
+++ b/third_party/nixpkgs/pkgs/development/tools/wasm-bindgen-cli/default.nix
@@ -4,7 +4,7 @@
rustPlatform.buildRustPackage rec {
pname = "wasm-bindgen-cli";
- version = "0.2.69";
+ version = "0.2.73";
src =
let
@@ -12,7 +12,7 @@ rustPlatform.buildRustPackage rec {
owner = "rustwasm";
repo = "wasm-bindgen";
rev = version;
- sha256 = "1psylk3hlx0ahwib3ph8qdk0jwlp8qzc6dv61002rj7ns28vs4mx";
+ sha256 = "sha256-JrfS9Z/ZqhoZXJxrxMSLpl2NiktTUkjW6q3xN9AU2zw=";
};
in runCommand "source" { } ''
cp -R ${tarball} $out
@@ -23,7 +23,7 @@ rustPlatform.buildRustPackage rec {
buildInputs = [ openssl ] ++ lib.optionals stdenv.isDarwin [ Security curl ];
nativeBuildInputs = [ pkg-config ];
- cargoSha256 = "1wrfly7c3an1mjqm7v13mlvx57hwlcxfjijkimicck04q6qdhbp6";
+ cargoSha256 = "sha256-2UBCcA4eBrSHrJjJdDprsysiOObg2GrC7QtveAydbhk=";
cargoBuildFlags = [ "-p" pname ];
meta = with lib; {
diff --git a/third_party/nixpkgs/pkgs/development/tools/wrangler/default.nix b/third_party/nixpkgs/pkgs/development/tools/wrangler/default.nix
index 0458f63fdd..5fc7b6a180 100644
--- a/third_party/nixpkgs/pkgs/development/tools/wrangler/default.nix
+++ b/third_party/nixpkgs/pkgs/development/tools/wrangler/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchFromGitHub, rustPlatform, pkg-config, openssl, curl, Security, CoreServices, CoreFoundation }:
+{ lib, stdenv, fetchFromGitHub, rustPlatform, pkg-config, openssl, curl, Security, CoreServices, CoreFoundation, libiconv }:
rustPlatform.buildRustPackage rec {
pname = "wrangler";
@@ -16,7 +16,7 @@ rustPlatform.buildRustPackage rec {
nativeBuildInputs = [ pkg-config ];
buildInputs = [ openssl ]
- ++ lib.optionals stdenv.isDarwin [ curl CoreFoundation CoreServices Security ];
+ ++ lib.optionals stdenv.isDarwin [ curl CoreFoundation CoreServices Security libiconv ];
OPENSSL_NO_VENDOR = 1;
diff --git a/third_party/nixpkgs/pkgs/development/tools/yq-go/default.nix b/third_party/nixpkgs/pkgs/development/tools/yq-go/default.nix
index 9ea5dcc55f..26e9361433 100644
--- a/third_party/nixpkgs/pkgs/development/tools/yq-go/default.nix
+++ b/third_party/nixpkgs/pkgs/development/tools/yq-go/default.nix
@@ -2,13 +2,13 @@
buildGoModule rec {
pname = "yq-go";
- version = "4.6.2";
+ version = "4.6.3";
src = fetchFromGitHub {
owner = "mikefarah";
rev = "v${version}";
repo = "yq";
- sha256 = "sha256-Hv1o1MzkpapmeIsZJ4peyG5kSHt0EXjTA+gE0iq1XF8=";
+ sha256 = "sha256-+qSGdskv8qUZRl7wYKn8WsgAcD8DYw1BwZnVKK6g/sI=";
};
vendorSha256 = "sha256-vpvIl1lfaziuoHs+oDEIztufH1somphiBAn6qTaQaZw=";
diff --git a/third_party/nixpkgs/pkgs/games/20kly/default.nix b/third_party/nixpkgs/pkgs/games/20kly/default.nix
index 092e0e4eac..0cc61367e2 100644
--- a/third_party/nixpkgs/pkgs/games/20kly/default.nix
+++ b/third_party/nixpkgs/pkgs/games/20kly/default.nix
@@ -1,16 +1,19 @@
{ lib
-, fetchurl
-, python }:
+, fetchFromGitHub
+, python3Packages
+}:
-python.pkgs.buildPythonApplication rec {
+python3Packages.buildPythonApplication rec {
pname = "20kly";
- version = "1.4";
- format = "other";
- disabled = !(python.isPy2 or false);
+ version = "1.5.0";
- src = fetchurl {
- url = "http://jwhitham.org.uk/20kly/lightyears-${version}.tar.bz2";
- sha256 = "13h73cmfjqkipffimfc4iv0hf89if490ng6vd6xf3wcalpgaim5d";
+ format = "other";
+
+ src = fetchFromGitHub {
+ owner = "20kly";
+ repo = "20kly";
+ rev = "v${version}";
+ sha256 = "1zxsxg49a02k7zidx3kgk2maa0vv0n1f9wrl5vch07sq3ghvpphx";
};
patchPhase = ''
@@ -20,21 +23,24 @@ python.pkgs.buildPythonApplication rec {
"LIGHTYEARS_DIR = \"$out/share\""
'';
- propagatedBuildInputs = with python.pkgs; [ pygame ];
+ propagatedBuildInputs = with python3Packages; [
+ pygame
+ ];
- buildPhase = "python -O -m compileall .";
+ buildPhase = ''
+ python -O -m compileall .
+ '';
installPhase = ''
mkdir -p "$out/share"
- cp -r audio code data lightyears "$out/share"
+ cp -r data lib20k lightyears "$out/share"
install -Dm755 lightyears "$out/bin/lightyears"
'';
meta = with lib; {
description = "A steampunk-themed strategy game where you have to manage a steam supply network";
homepage = "http://jwhitham.org.uk/20kly/";
- license = licenses.gpl2;
+ license = licenses.gpl2Only;
maintainers = with maintainers; [ fgaz ];
};
}
-
diff --git a/third_party/nixpkgs/pkgs/games/crispy-doom/default.nix b/third_party/nixpkgs/pkgs/games/crispy-doom/default.nix
index 432600e879..04c0868510 100644
--- a/third_party/nixpkgs/pkgs/games/crispy-doom/default.nix
+++ b/third_party/nixpkgs/pkgs/games/crispy-doom/default.nix
@@ -1,14 +1,14 @@
-{ lib, stdenv, autoreconfHook, pkg-config, SDL2, SDL2_mixer, SDL2_net, fetchFromGitHub, python }:
+{ lib, stdenv, autoreconfHook, pkg-config, SDL2, SDL2_mixer, SDL2_net, fetchFromGitHub, python2 }:
stdenv.mkDerivation rec {
pname = "crispy-doom";
- version = "5.10.0";
+ version = "5.10.1";
src = fetchFromGitHub {
owner = "fabiangreffrath";
repo = pname;
rev = "${pname}-${version}";
- sha256 = "sha256-hRdd5ZrcVBU7tn1juvrLdbenULzu6OsXefG0oLjjFIg=";
+ sha256 = "sha256-5doytVxemqaXWXiqDSQUEAe71xmY0pOLASj/NJNyM5g=";
};
postPatch = ''
@@ -16,10 +16,12 @@ stdenv.mkDerivation rec {
for script in $(grep -lr '^#!/usr/bin/env python$'); do patchShebangs $script; done
'';
- nativeBuildInputs = [ autoreconfHook pkg-config python ];
+ nativeBuildInputs = [ autoreconfHook pkg-config python2 ];
buildInputs = [ SDL2 SDL2_mixer SDL2_net ];
enableParallelBuilding = true;
+ strictDeps = true;
+
meta = {
homepage = "http://fabiangreffrath.github.io/crispy-doom";
description = "A limit-removing enhanced-resolution Doom source port based on Chocolate Doom";
diff --git a/third_party/nixpkgs/pkgs/games/factorio/versions.json b/third_party/nixpkgs/pkgs/games/factorio/versions.json
index 1f8b201022..6460e262d0 100644
--- a/third_party/nixpkgs/pkgs/games/factorio/versions.json
+++ b/third_party/nixpkgs/pkgs/games/factorio/versions.json
@@ -2,56 +2,56 @@
"x86_64-linux": {
"alpha": {
"experimental": {
- "name": "factorio_alpha_x64-1.1.27.tar.xz",
+ "name": "factorio_alpha_x64-1.1.30.tar.xz",
"needsAuth": true,
- "sha256": "0s8qnr2p819r4pjby71jp5in679yvsz235iy1csmjjm2d2q6igln",
+ "sha256": "14mcf9pj6s5ms2hl68n3r5jk1q5y2qzw88wiahsb5plkv9qyqyp6",
"tarDirectory": "x64",
- "url": "https://factorio.com/get-download/1.1.27/alpha/linux64",
- "version": "1.1.27"
+ "url": "https://factorio.com/get-download/1.1.30/alpha/linux64",
+ "version": "1.1.30"
},
"stable": {
- "name": "factorio_alpha_x64-1.1.27.tar.xz",
+ "name": "factorio_alpha_x64-1.1.30.tar.xz",
"needsAuth": true,
- "sha256": "0s8qnr2p819r4pjby71jp5in679yvsz235iy1csmjjm2d2q6igln",
+ "sha256": "14mcf9pj6s5ms2hl68n3r5jk1q5y2qzw88wiahsb5plkv9qyqyp6",
"tarDirectory": "x64",
- "url": "https://factorio.com/get-download/1.1.27/alpha/linux64",
- "version": "1.1.27"
+ "url": "https://factorio.com/get-download/1.1.30/alpha/linux64",
+ "version": "1.1.30"
}
},
"demo": {
"experimental": {
- "name": "factorio_demo_x64-1.1.27.tar.xz",
+ "name": "factorio_demo_x64-1.1.30.tar.xz",
"needsAuth": false,
- "sha256": "0cgnv6w8bxxskf0gxqcg9hq0zl4idnwh5d61b0510axah1m6i57z",
+ "sha256": "1b3na8xn9lhlvrsd6hxr130nf9p81s26n25a4qdgkczz6waysgjv",
"tarDirectory": "x64",
- "url": "https://factorio.com/get-download/1.1.27/demo/linux64",
- "version": "1.1.27"
+ "url": "https://factorio.com/get-download/1.1.30/demo/linux64",
+ "version": "1.1.30"
},
"stable": {
- "name": "factorio_demo_x64-1.1.27.tar.xz",
+ "name": "factorio_demo_x64-1.1.30.tar.xz",
"needsAuth": false,
- "sha256": "0cgnv6w8bxxskf0gxqcg9hq0zl4idnwh5d61b0510axah1m6i57z",
+ "sha256": "1b3na8xn9lhlvrsd6hxr130nf9p81s26n25a4qdgkczz6waysgjv",
"tarDirectory": "x64",
- "url": "https://factorio.com/get-download/1.1.27/demo/linux64",
- "version": "1.1.27"
+ "url": "https://factorio.com/get-download/1.1.30/demo/linux64",
+ "version": "1.1.30"
}
},
"headless": {
"experimental": {
- "name": "factorio_headless_x64-1.1.27.tar.xz",
+ "name": "factorio_headless_x64-1.1.30.tar.xz",
"needsAuth": false,
- "sha256": "08bny927jiph0zj101yx2wirm16194sap3ifk9rs582s506i1p2w",
+ "sha256": "1rac6d8v8swiw1nn2hl53rhjfhsyv98qg8hfnwhfqn76jgspspdl",
"tarDirectory": "x64",
- "url": "https://factorio.com/get-download/1.1.27/headless/linux64",
- "version": "1.1.27"
+ "url": "https://factorio.com/get-download/1.1.30/headless/linux64",
+ "version": "1.1.30"
},
"stable": {
- "name": "factorio_headless_x64-1.1.27.tar.xz",
+ "name": "factorio_headless_x64-1.1.30.tar.xz",
"needsAuth": false,
- "sha256": "08bny927jiph0zj101yx2wirm16194sap3ifk9rs582s506i1p2w",
+ "sha256": "1rac6d8v8swiw1nn2hl53rhjfhsyv98qg8hfnwhfqn76jgspspdl",
"tarDirectory": "x64",
- "url": "https://factorio.com/get-download/1.1.27/headless/linux64",
- "version": "1.1.27"
+ "url": "https://factorio.com/get-download/1.1.30/headless/linux64",
+ "version": "1.1.30"
}
}
}
diff --git a/third_party/nixpkgs/pkgs/games/gcompris/default.nix b/third_party/nixpkgs/pkgs/games/gcompris/default.nix
index e4bc00793e..a930b1682d 100644
--- a/third_party/nixpkgs/pkgs/games/gcompris/default.nix
+++ b/third_party/nixpkgs/pkgs/games/gcompris/default.nix
@@ -18,11 +18,11 @@
mkDerivation rec {
pname = "gcompris";
- version = "1.0";
+ version = "1.1";
src = fetchurl {
url = "http://gcompris.net/download/qt/src/gcompris-qt-${version}.tar.xz";
- sha256 = "08dw1q0h4qz2q0ksa5pbmb9v60hr1zv9skx6z8dlq9b1i7harnds";
+ sha256 = "sha256-8Kj5R/7WwOuew7e9qgx2HWS8mnHX+cv8mhHmgXbm8q4=";
};
cmakeFlags = [
diff --git a/third_party/nixpkgs/pkgs/games/gimx/default.nix b/third_party/nixpkgs/pkgs/games/gimx/default.nix
index 727945ff2b..ab208dfa00 100644
--- a/third_party/nixpkgs/pkgs/games/gimx/default.nix
+++ b/third_party/nixpkgs/pkgs/games/gimx/default.nix
@@ -5,8 +5,8 @@ let
gimx-config = fetchFromGitHub {
owner = "matlo";
repo = "GIMX-configurations";
- rev = "f31bba7d3be57519540be290cd69ba6a8dc4e4d4";
- sha256 = "0wpxx2qxyiiblz2qrl5swg00ls1aq7i5vzlk0qlnqdq8ss8jssax";
+ rev = "c20300f24d32651d369e2b27614b62f4b856e4a0";
+ sha256 = "02wcjk8da188x7y0jf3p0arjdh9zbb0lla3fxdb28b1xyybfvx5p";
};
in stdenv.mkDerivation rec {
@@ -51,15 +51,15 @@ in stdenv.mkDerivation rec {
mkdir -p $out/share
cp -r ./loader/firmware $out/share/firmware
cp -r ${gimx-config}/Linux $out/share/config
- patch ${gimx-config}/Linux/Dualshock4.xml ${./ds4.patch} -o $out/share/DS4_noff.xml
+ patch ${gimx-config}/Linux/Dualshock4.xml ${./noff.patch} -o $out/share/ds4.xml
makeWrapper $out/bin/gimx $out/bin/gimx-with-confs \
- --set GIMXCONF $out/share
+ --set GIMXCONF $out/share/config
makeWrapper $out/bin/gimx $out/bin/gimx-test-ds4 \
--set GIMXCONF $out/share \
--add-flags "--nograb" --add-flags "--curses" \
- --add-flags "-p /dev/ttyUSB0" --add-flags "-c DS4_noff.xml"
+ --add-flags "-p /dev/ttyUSB0" --add-flags "-c ds4.xml"
'';
meta = with lib; {
diff --git a/third_party/nixpkgs/pkgs/games/gimx/ds4.patch b/third_party/nixpkgs/pkgs/games/gimx/noff.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/games/gimx/ds4.patch
rename to third_party/nixpkgs/pkgs/games/gimx/noff.patch
diff --git a/third_party/nixpkgs/pkgs/games/multimc/default.nix b/third_party/nixpkgs/pkgs/games/multimc/default.nix
index 5a1f42ee13..bedf78102b 100644
--- a/third_party/nixpkgs/pkgs/games/multimc/default.nix
+++ b/third_party/nixpkgs/pkgs/games/multimc/default.nix
@@ -5,12 +5,12 @@ let
libpath = with xorg; lib.makeLibraryPath [ libX11 libXext libXcursor libXrandr libXxf86vm libpulseaudio libGL ];
in mkDerivation rec {
pname = "multimc";
- version = "unstable-2021-01-17";
+ version = "0.6.12";
src = fetchFromGitHub {
owner = "MultiMC";
repo = "MultiMC5";
- rev = "02887536f773643313f15442fc82cebf616da54a";
- sha256 = "1aykvavcv415lq488hx4ig2a79g5a561jg92gw14fb964r43782i";
+ rev = version;
+ sha256 = "h2T023vrqemWhHiA2/gFleuUhIOucjwTgoExliFiYig=";
fetchSubmodules = true;
};
nativeBuildInputs = [ cmake file makeWrapper ];
diff --git a/third_party/nixpkgs/pkgs/games/pinball/default.nix b/third_party/nixpkgs/pkgs/games/pinball/default.nix
new file mode 100644
index 0000000000..b7abf1dac8
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/games/pinball/default.nix
@@ -0,0 +1,40 @@
+{ lib, stdenv, fetchurl, autoreconfHook, pkg-config
+, libglvnd, SDL, SDL_image, SDL_mixer, xorg
+}:
+
+stdenv.mkDerivation rec {
+ pname = "pinball";
+ version = "0.3.20201218";
+
+ src = fetchurl {
+ url = "mirror://sourceforge/pinball/pinball-${version}.tar.gz";
+ sha256 = "0vacypp3ksq1hs6hxpypx7nrfkprbl4ksfywcncckwrh4qcir631";
+ };
+
+ postPatch = ''
+ sed -i 's/^AUTOMAKE_OPTIONS = gnu$/AUTOMAKE_OPTIONS = foreign/' Makefile.am
+ '';
+
+ nativeBuildInputs = [ autoreconfHook pkg-config ];
+ buildInputs = [ libglvnd SDL SDL_image SDL_mixer xorg.libSM ];
+ strictDeps = true;
+
+ configureFlags = [
+ "--with-sdl-prefix=${lib.getDev SDL}"
+ ];
+
+ NIX_CFLAGS_COMPILE = [
+ "-I${lib.getDev SDL_image}/include/SDL"
+ "-I${lib.getDev SDL_mixer}/include/SDL"
+ ];
+
+ enableParallelBuilding = true;
+
+ meta = with lib; {
+ homepage = "https://purl.org/rzr/pinball";
+ description = "Emilia Pinball simulator";
+ license = licenses.gpl2Only;
+ maintainers = with maintainers; [ qyliss ];
+ platforms = platforms.linux;
+ };
+}
diff --git a/third_party/nixpkgs/pkgs/games/unciv/default.nix b/third_party/nixpkgs/pkgs/games/unciv/default.nix
index c280d03edb..35397e262e 100644
--- a/third_party/nixpkgs/pkgs/games/unciv/default.nix
+++ b/third_party/nixpkgs/pkgs/games/unciv/default.nix
@@ -25,11 +25,11 @@ let
in
stdenv.mkDerivation rec {
pname = "unciv";
- version = "3.13.10";
+ version = "3.13.11";
src = fetchurl {
url = "https://github.com/yairm210/Unciv/releases/download/${version}/Unciv.jar";
- sha256 = "sha256-5UT/STcU+/17wjc/guOXgkD6UCtn97EQkVRgnTliFjg=";
+ sha256 = "sha256-U0kTkdcEC1cu+UFmQmgadNn1bIZ5Rq4+bBqjFU3c4+M=";
};
dontUnpack = true;
diff --git a/third_party/nixpkgs/pkgs/games/zaz/default.nix b/third_party/nixpkgs/pkgs/games/zaz/default.nix
index edee0db261..1925d64171 100644
--- a/third_party/nixpkgs/pkgs/games/zaz/default.nix
+++ b/third_party/nixpkgs/pkgs/games/zaz/default.nix
@@ -13,11 +13,11 @@
stdenv.mkDerivation rec {
pname = "zaz";
- version = "1.0.0";
+ version = "1.0.1";
src = fetchurl {
- url = "mirror://sourceforge/${pname}/${pname}-${version}.tar.bz2";
- sha256 = "15q3kxzl71m50byw37dshfsx5wp240ywah19ccmqmqarcldcqcp3";
+ url = "mirror://sourceforge/${pname}/${pname}-${version}.tar.gz";
+ sha256 = "1r3bmwny05zzmdalxm5ah2rray0nnsg1w00r30p47q6x2lpwj8ml";
};
nativeBuildInputs = [
diff --git a/third_party/nixpkgs/pkgs/misc/emulators/cen64/default.nix b/third_party/nixpkgs/pkgs/misc/emulators/cen64/default.nix
index 0153ed11cd..ddf4554733 100644
--- a/third_party/nixpkgs/pkgs/misc/emulators/cen64/default.nix
+++ b/third_party/nixpkgs/pkgs/misc/emulators/cen64/default.nix
@@ -2,21 +2,22 @@
stdenv.mkDerivation rec {
pname = "cen64";
- version = "unstable-2020-02-20";
+ version = "unstable-2021-03-12";
src = fetchFromGitHub {
owner = "n64dev";
repo = "cen64";
- rev = "6f9f5784bf0a720522c4ecb0915e20229c126aed";
- sha256 = "08q0a3b2ilb95zlz4cw681gwz45n2wrb2gp2z414cf0bhn90vz0s";
+ rev = "1b31ca9b3c3bb783391ab9773bd26c50db2056a8";
+ sha256 = "0x1fz3z4ffl5xssiyxnmbhpjlf0k0fxsqn4f2ikrn17742dx4c0z";
};
nativeBuildInputs = [ cmake ];
buildInputs = [ libGL libiconv openal libX11 ];
installPhase = ''
- mkdir -p $out/bin
- mv cen64 $out/bin
+ runHook preInstall
+ install -D {,$out/bin/}${pname}
+ runHook postInstall
'';
meta = with lib; {
diff --git a/third_party/nixpkgs/pkgs/misc/emulators/wine/default.nix b/third_party/nixpkgs/pkgs/misc/emulators/wine/default.nix
index 24f827b25f..6def48b4f5 100644
--- a/third_party/nixpkgs/pkgs/misc/emulators/wine/default.nix
+++ b/third_party/nixpkgs/pkgs/misc/emulators/wine/default.nix
@@ -44,7 +44,7 @@
sdlSupport ? false,
faudioSupport ? false,
vkd3dSupport ? false,
- mingwSupport ? false,
+ mingwSupport ? wineRelease != "stable",
}:
let wine-build = build: release:
diff --git a/third_party/nixpkgs/pkgs/misc/emulators/wine/sources.nix b/third_party/nixpkgs/pkgs/misc/emulators/wine/sources.nix
index 1bcd08e6f4..7f02ead3e0 100644
--- a/third_party/nixpkgs/pkgs/misc/emulators/wine/sources.nix
+++ b/third_party/nixpkgs/pkgs/misc/emulators/wine/sources.nix
@@ -44,9 +44,9 @@ in rec {
unstable = fetchurl rec {
# NOTE: Don't forget to change the SHA256 for staging as well.
- version = "6.3";
+ version = "6.5";
url = "https://dl.winehq.org/wine/source/6.x/wine-${version}.tar.xz";
- sha256 = "sha256-aCp3wf0S9WNHyiCA2F/hfe8bZV0yQdlFgvh1kdnQzDs=";
+ sha256 = "sha256-BgD9IIwGkl1mNNKfVDu6CmQ2HDTpvXYJwvDiCWEK00c=";
inherit (stable) mono gecko32 gecko64;
patches = [
@@ -58,7 +58,7 @@ in rec {
staging = fetchFromGitHub rec {
# https://github.com/wine-staging/wine-staging/releases
inherit (unstable) version;
- sha256 = "sha256-Fok0jdGBQtH84PL6LVnuCR7ZVSUIHECqPUI/2lLXs44=";
+ sha256 = "sha256-u6wDavrFirN1e0fFra4ui3i4PnJF0gcENYoIyNwhIYc=";
owner = "wine-staging";
repo = "wine-staging";
rev = "v${version}";
diff --git a/third_party/nixpkgs/pkgs/misc/seafile-shared/default.nix b/third_party/nixpkgs/pkgs/misc/seafile-shared/default.nix
index 21e2d4516c..15a129246e 100644
--- a/third_party/nixpkgs/pkgs/misc/seafile-shared/default.nix
+++ b/third_party/nixpkgs/pkgs/misc/seafile-shared/default.nix
@@ -1,11 +1,7 @@
{ lib, stdenv
, fetchFromGitHub
, autoreconfHook
-, ccnet
, curl
-, fuse
-, glib
-, intltool
, libevent
, libsearpc
, libuuid
@@ -13,7 +9,6 @@
, python3
, sqlite
, vala
-, which
}:
stdenv.mkDerivation rec {
diff --git a/third_party/nixpkgs/pkgs/misc/vim-plugins/generated.nix b/third_party/nixpkgs/pkgs/misc/vim-plugins/generated.nix
index 98fafe4bb7..6e070256a5 100644
--- a/third_party/nixpkgs/pkgs/misc/vim-plugins/generated.nix
+++ b/third_party/nixpkgs/pkgs/misc/vim-plugins/generated.nix
@@ -65,12 +65,12 @@ let
ale = buildVimPluginFrom2Nix {
pname = "ale";
- version = "2021-03-21";
+ version = "2021-03-26";
src = fetchFromGitHub {
owner = "dense-analysis";
repo = "ale";
- rev = "f7852dbd0a063d6d82ee17a5057fea53cb79b21d";
- sha256 = "16cslwkc8kcr2z0crchl9w5p5vsbzfwpfa103wysyvq9d0q309xk";
+ rev = "655f0070cd2ce575f81092d1faac739fd116b515";
+ sha256 = "1g85cy5nmc1h2bkwm46qzsx6m19cm8mk9knyb88zanf23bj4w9xc";
};
meta.homepage = "https://github.com/dense-analysis/ale/";
};
@@ -389,12 +389,12 @@ let
chadtree = buildVimPluginFrom2Nix {
pname = "chadtree";
- version = "2021-03-22";
+ version = "2021-03-27";
src = fetchFromGitHub {
owner = "ms-jpq";
repo = "chadtree";
- rev = "8f7238502c742fe098e0d681c3597452aa053b89";
- sha256 = "1cppnzf1slzxf3kb24pg18r2izdpd6mylrhc49rla083mr7hqx15";
+ rev = "7efa17a4193a9835b4b29f9ae3accdc86174cdcf";
+ sha256 = "0zya44l1svf7f97w2h4jql3zn86nhv8r8lk416xiy22g6kw37xsl";
};
meta.homepage = "https://github.com/ms-jpq/chadtree/";
};
@@ -509,12 +509,12 @@ let
coc-lua = buildVimPluginFrom2Nix {
pname = "coc-lua";
- version = "2021-03-19";
+ version = "2021-03-26";
src = fetchFromGitHub {
owner = "josa42";
repo = "coc-lua";
- rev = "ed79b7745d31c2981feb9922e8a4ec2f7be5f376";
- sha256 = "0ncxa7xjgkdjha7jyqfd3s7lmm459lg9achmid0qjwx0r0cavzdb";
+ rev = "f996547651b775155bbc14f8031a4b674320a9ee";
+ sha256 = "09h9ybb9lir9lq62496dh3d57i8x01a0iy2kfg273rp1fn7l8j03";
};
meta.homepage = "https://github.com/josa42/coc-lua/";
};
@@ -545,12 +545,12 @@ let
coc-nvim = buildVimPluginFrom2Nix {
pname = "coc-nvim";
- version = "2021-03-22";
+ version = "2021-03-24";
src = fetchFromGitHub {
owner = "neoclide";
repo = "coc.nvim";
- rev = "3b3c5f88bcb25c3d68351f417fa5e8425a3a3142";
- sha256 = "1fkgyb0a5wirndk99d9ajdvxaiipgnv3r0cmvzldvy6ps5ljxabm";
+ rev = "67fb4d138f34c12c6b44d87be66ede26d51b95c2";
+ sha256 = "0nnh0gnc6g0a67na3zar6zvpc3i2qlna3l783hhy3832ih79v9s9";
};
meta.homepage = "https://github.com/neoclide/coc.nvim/";
};
@@ -858,12 +858,12 @@ let
dashboard-nvim = buildVimPluginFrom2Nix {
pname = "dashboard-nvim";
- version = "2021-03-14";
+ version = "2021-03-27";
src = fetchFromGitHub {
owner = "glepnir";
repo = "dashboard-nvim";
- rev = "563c8c1885044ad3fbb5339ad5a10439d9899e51";
- sha256 = "0xp6dpdz45lfqx0s6xhxkgxwnbbdwiaybjvb0qfyh2pziirxdrxm";
+ rev = "81b804d4009a9abacc259c542871c34852ec65a3";
+ sha256 = "0cwarklmyj4wfvjmh7f1nlxnrx8vfvjbrlz3l3j6wc3amcd12kik";
};
meta.homepage = "https://github.com/glepnir/dashboard-nvim/";
};
@@ -894,12 +894,12 @@ let
defx-nvim = buildVimPluginFrom2Nix {
pname = "defx-nvim";
- version = "2021-03-22";
+ version = "2021-03-24";
src = fetchFromGitHub {
owner = "Shougo";
repo = "defx.nvim";
- rev = "a07fdb14c2ae04f1dd4cd78ddeaba9ce1eda4070";
- sha256 = "0z57vvw7jjh021qis4bywznwaywyznrh2zns6wl3ar65zys4dym7";
+ rev = "e5a757e2dc2f3409f5ccc4e4df384df93b0ef09d";
+ sha256 = "1qfwpwb7r94hnjidggn1fwcshikac8j0ckf1qb0fppfx1akyf78q";
};
meta.homepage = "https://github.com/Shougo/defx.nvim/";
};
@@ -942,12 +942,12 @@ let
denite-nvim = buildVimPluginFrom2Nix {
pname = "denite-nvim";
- version = "2021-03-18";
+ version = "2021-03-27";
src = fetchFromGitHub {
owner = "Shougo";
repo = "denite.nvim";
- rev = "8c44de41ec46c44f84dd70907a5763112df2eacb";
- sha256 = "1y235ap3hchkf3hc85frcjl5kwr56lz3vw12qzhhzhrl2k7k5ziw";
+ rev = "7cce9b9e9e1d2c44e07574572f730018d9c7ab9a";
+ sha256 = "1cazz5ykfl6k0l3cxs3g60n9a5rrd78w0517861lbg9vwll7llw6";
};
meta.homepage = "https://github.com/Shougo/denite.nvim/";
};
@@ -1370,8 +1370,8 @@ let
src = fetchFromGitHub {
owner = "fenetikm";
repo = "falcon";
- rev = "2ba0036e19adbefaf0beffe545e349964a68cc0a";
- sha256 = "0pg3i1dvbjv746szki36yszz6bd82pgzvfyr3ayxf7lih4pjbxmj";
+ rev = "f6be01e8642dc8ccc7ed1f37b23f4b0dfa2c6f8c";
+ sha256 = "1w4ld5dvy0jxgjvp6yf8qibc4x82hn490vfg0hpln67nr6mhq1iw";
};
meta.homepage = "https://github.com/fenetikm/falcon/";
};
@@ -1414,12 +1414,12 @@ let
fern-vim = buildVimPluginFrom2Nix {
pname = "fern-vim";
- version = "2021-03-14";
+ version = "2021-03-25";
src = fetchFromGitHub {
owner = "lambdalisue";
repo = "fern.vim";
- rev = "31c76b351f6d995009dcd117d7910b80df96928a";
- sha256 = "1qkf6bsff6cfrqyhdrmn91diq9p53i3i3fvgcb5m9az33p42fqgn";
+ rev = "3f9f1957699346f240a9e71eee83fcb67c8fc0e5";
+ sha256 = "1wkxih5glkpvjy6ka42y0x1di2iqm1y7rc93av4gfqhhskryfv0h";
};
meta.homepage = "https://github.com/lambdalisue/fern.vim/";
};
@@ -1535,12 +1535,12 @@ let
fzf-vim = buildVimPluginFrom2Nix {
pname = "fzf-vim";
- version = "2021-03-14";
+ version = "2021-03-24";
src = fetchFromGitHub {
owner = "junegunn";
repo = "fzf.vim";
- rev = "1ef72b14ccd05fdbdb01d253b91a74c4760ae655";
- sha256 = "1yrj8dq0n3wfdrl5c93cfzsjyv175b9h65iwxkincag926m6sr06";
+ rev = "caf7754b2636eabdf1bc11d30daccc5de66951ef";
+ sha256 = "1743br19x41rycc1iqh2jiwaa2z80bi2zcd0lr9n17dc733ww5n2";
};
meta.homepage = "https://github.com/junegunn/fzf.vim/";
};
@@ -1643,12 +1643,12 @@ let
gitsigns-nvim = buildVimPluginFrom2Nix {
pname = "gitsigns-nvim";
- version = "2021-03-17";
+ version = "2021-03-27";
src = fetchFromGitHub {
owner = "lewis6991";
repo = "gitsigns.nvim";
- rev = "18d0a4bab12193460e6443d02d22218b5ce05a35";
- sha256 = "0qizdphmady0baz5wgi92vdy9wbz1npgahsx0kmpx8c4vfvcdv10";
+ rev = "4ac3ea179d0f751ed1d9300fae63719f55085d7b";
+ sha256 = "0a5czpf6808xrr327c9kcg68br6whfv41rp4w9073kvf1ir32kp3";
};
meta.homepage = "https://github.com/lewis6991/gitsigns.nvim/";
};
@@ -1811,12 +1811,12 @@ let
hop-nvim = buildVimPluginFrom2Nix {
pname = "hop-nvim";
- version = "2021-03-18";
+ version = "2021-03-25";
src = fetchFromGitHub {
owner = "phaazon";
repo = "hop.nvim";
- rev = "8d1a199236590a6e6667a45e0084d26aaeb32fb6";
- sha256 = "1skya8iqkf9bblpdf1vvkl73i9rqm0lqd40114a8ppk8vbqjp53x";
+ rev = "a0e9e229bbd0e493511fb9d27d917f55c5e4191a";
+ sha256 = "090waig8fqq1s9z66ykr64ns3g9yb6qy32jf5fwamx43m9xcws2s";
};
meta.homepage = "https://github.com/phaazon/hop.nvim/";
};
@@ -1967,12 +1967,12 @@ let
iosvkem = buildVimPluginFrom2Nix {
pname = "iosvkem";
- version = "2020-06-18";
+ version = "2021-03-26";
src = fetchFromGitHub {
owner = "neutaaaaan";
repo = "iosvkem";
- rev = "df359d91510be0c078905568d9033c891a3a2f4b";
- sha256 = "0xqh5hr4m6hm2vfms1iqarzhgkmrgx6f5ywyh6qhwkbrdj8q3lyq";
+ rev = "ba116cae99eaa116f781f4bfef0a20a80bc19e98";
+ sha256 = "1as5xfcc6bgm2sp23qzxjpasbnx9jsdgzc97hhmybhq4115kfmxv";
};
meta.homepage = "https://github.com/neutaaaaan/iosvkem/";
};
@@ -2328,24 +2328,24 @@ let
lspsaga-nvim = buildVimPluginFrom2Nix {
pname = "lspsaga-nvim";
- version = "2021-03-20";
+ version = "2021-03-26";
src = fetchFromGitHub {
owner = "glepnir";
repo = "lspsaga.nvim";
- rev = "855a8d816fa4fcd4cc378b32585474bf407812eb";
- sha256 = "1f440mmc6j2ybp86vaxwc0icvxl3l00i3vbr12knbcf2p3aigkm9";
+ rev = "9a377c6e727cff15b4c4c3657e36f3a36e559d50";
+ sha256 = "0cpyiwckn1dpgf6cyrlh1yffib3dckg18ac84c1bvpmvc37zvghy";
};
meta.homepage = "https://github.com/glepnir/lspsaga.nvim/";
};
lualine-nvim = buildVimPluginFrom2Nix {
pname = "lualine-nvim";
- version = "2021-03-19";
+ version = "2021-03-26";
src = fetchFromGitHub {
owner = "hoob3rt";
repo = "lualine.nvim";
- rev = "f80d5adb415812484c1b86692846feb3a8ce7e46";
- sha256 = "0gp0nw173ryn6mn9z98jvrk9y7fyhm08r90qc1zv7z85lngd9226";
+ rev = "a3037fbf0b101daa0ab2564ee3948d52e470ce03";
+ sha256 = "1r8aryyl8zajj1vpvkwf4lqikgjxpagdiahcvgbclfdmc3dn82c7";
};
meta.homepage = "https://github.com/hoob3rt/lualine.nvim/";
};
@@ -2412,12 +2412,12 @@ let
minimap-vim = buildVimPluginFrom2Nix {
pname = "minimap-vim";
- version = "2021-03-20";
+ version = "2021-03-23";
src = fetchFromGitHub {
owner = "wfxr";
repo = "minimap.vim";
- rev = "adc19481ceececc53b4a6e3157bae7ebf7b9bb66";
- sha256 = "14hjfnqh9wvbhgf55arjhwbcsm1d91x9mhglz2qdmln6nr66ayz4";
+ rev = "31e22971ba5f5f3e5955fa8e2247b6cd22c3f7b1";
+ sha256 = "19hg4nnwdr6mj9wyrcapg91vm2bzvcsfbvjkirdsxp2v3ca83w2i";
};
meta.homepage = "https://github.com/wfxr/minimap.vim/";
};
@@ -2724,12 +2724,12 @@ let
neogit = buildVimPluginFrom2Nix {
pname = "neogit";
- version = "2021-03-21";
+ version = "2021-03-27";
src = fetchFromGitHub {
owner = "TimUntersberger";
repo = "neogit";
- rev = "0b969a8f6a7d38aed32ca7bddfeb19f80a2b1a29";
- sha256 = "1x9q4kl5595dq7ydpv21apbff5pr15diyww8cd600ibjwybmlm8v";
+ rev = "2f504fcf734ddb6b281a93e01782ecb0dae0774e";
+ sha256 = "07yjlqjkxz3g1vk2jd4ns7dppi0lmmzrb6ihj5vhvxgc6nfkh7gg";
};
meta.homepage = "https://github.com/TimUntersberger/neogit/";
};
@@ -2868,12 +2868,12 @@ let
nerdtree = buildVimPluginFrom2Nix {
pname = "nerdtree";
- version = "2021-03-01";
+ version = "2021-03-25";
src = fetchFromGitHub {
owner = "preservim";
repo = "nerdtree";
- rev = "f63fb6984f9cd07cf723c3e2e20f6ccc0aad48c2";
- sha256 = "1lm4dqp8rxr5sl6faxyncz5jibkgzjwjxadvgcja81wnm71sr0xa";
+ rev = "81f3eaba295b3fceb2d032db57e5eae99ae480f8";
+ sha256 = "0zws0b20n8ak2s3hffsb0rrwdjh8sx3sgrilmmmvr0d2ivsfqwlb";
};
meta.homepage = "https://github.com/preservim/nerdtree/";
};
@@ -2976,12 +2976,12 @@ let
nvcode-color-schemes-vim = buildVimPluginFrom2Nix {
pname = "nvcode-color-schemes-vim";
- version = "2021-03-20";
+ version = "2021-03-26";
src = fetchFromGitHub {
owner = "ChristianChiarulli";
repo = "nvcode-color-schemes.vim";
- rev = "e22ce2c391e0fe82f66c767cf2b99ff1e044d428";
- sha256 = "1dl967mc8slsfm8c8dk7kbzsrnr6ll7y8m36aq5v827f49f1byak";
+ rev = "3aaeb3d070538a7208363cc775258d52a6da5b3f";
+ sha256 = "1gsg1m27rdcbg2qszxwnvjigwxgy5n9rdc6nl9r902rg5kzhb054";
};
meta.homepage = "https://github.com/ChristianChiarulli/nvcode-color-schemes.vim/";
};
@@ -3000,28 +3000,40 @@ let
nvim-autopairs = buildVimPluginFrom2Nix {
pname = "nvim-autopairs";
- version = "2021-02-08";
+ version = "2021-03-24";
src = fetchFromGitHub {
owner = "windwp";
repo = "nvim-autopairs";
- rev = "1596756a90114cbe25d0f383825a1ae2145b459b";
- sha256 = "1c0h0082lkngn0ly4qpla98xgg71ax5r26v4q4h3gc77jf6mlqrd";
+ rev = "b8272f539017ffb6de6a05247e7c333b3721279b";
+ sha256 = "11ng14pb14l0hsv27r24wwkjkw2l77kvd114pij3k5dl8b9zdgv2";
};
meta.homepage = "https://github.com/windwp/nvim-autopairs/";
};
nvim-bqf = buildVimPluginFrom2Nix {
pname = "nvim-bqf";
- version = "2021-03-16";
+ version = "2021-03-27";
src = fetchFromGitHub {
owner = "kevinhwang91";
repo = "nvim-bqf";
- rev = "fae71d14f2cd61becc87bae223f0c3a6fb72245c";
- sha256 = "054v62pp33kxfx9rcqh7dqa2glpi1fsm0z4gsh9nwf4y60hx0fhs";
+ rev = "0c568588354c8aec104bb5dcbf833c9e7dfb89b4";
+ sha256 = "0kzncj80vibfypncc8jnc7wnnywj6ibylshzljpq60d88ib1py8k";
};
meta.homepage = "https://github.com/kevinhwang91/nvim-bqf/";
};
+ nvim-bufferline-lua = buildVimPluginFrom2Nix {
+ pname = "nvim-bufferline-lua";
+ version = "2021-03-26";
+ src = fetchFromGitHub {
+ owner = "akinsho";
+ repo = "nvim-bufferline.lua";
+ rev = "e6953ebd37d79c8656cde6fae5ecf5aeb2483f47";
+ sha256 = "0k945yi8laaf0y1j770m6ywzbp6g5fl7k0dgk1hf3p1hczy6nhbm";
+ };
+ meta.homepage = "https://github.com/akinsho/nvim-bufferline.lua/";
+ };
+
nvim-cm-racer = buildVimPluginFrom2Nix {
pname = "nvim-cm-racer";
version = "2017-07-27";
@@ -3034,14 +3046,26 @@ let
meta.homepage = "https://github.com/roxma/nvim-cm-racer/";
};
+ nvim-colorizer-lua = buildVimPluginFrom2Nix {
+ pname = "nvim-colorizer-lua";
+ version = "2020-06-11";
+ src = fetchFromGitHub {
+ owner = "norcalli";
+ repo = "nvim-colorizer.lua";
+ rev = "36c610a9717cc9ec426a07c8e6bf3b3abcb139d6";
+ sha256 = "0gvqdfkqf6k9q46r0vcc3nqa6w45gsvp8j4kya1bvi24vhifg2p9";
+ };
+ meta.homepage = "https://github.com/norcalli/nvim-colorizer.lua/";
+ };
+
nvim-compe = buildVimPluginFrom2Nix {
pname = "nvim-compe";
- version = "2021-03-21";
+ version = "2021-03-25";
src = fetchFromGitHub {
owner = "hrsh7th";
repo = "nvim-compe";
- rev = "08dbc5f47d2be27cbc92c9684ec876b1eb778a4f";
- sha256 = "09fnzidcmknkrmls3wmjfa6drp5i8hmcbfs3hrvvp8jywgfyrpr3";
+ rev = "a39284243014c1414134b99ee2f7ae1fdd070273";
+ sha256 = "0648gz8rc6l79hg3xqkr0049fn762v7rcyvq50ya81ljrs2jl004";
};
meta.homepage = "https://github.com/hrsh7th/nvim-compe/";
};
@@ -3060,12 +3084,12 @@ let
nvim-dap = buildVimPluginFrom2Nix {
pname = "nvim-dap";
- version = "2021-03-15";
+ version = "2021-03-24";
src = fetchFromGitHub {
owner = "mfussenegger";
repo = "nvim-dap";
- rev = "492849bf57425d005c4a13ee2a5d6f3c8207cc02";
- sha256 = "1jspnzkb9371jfkppj77f95zccbnyw6gn0i4jlqpbci2p0ppp0gz";
+ rev = "cd0afafc788f9d4d9df5fef5d348841906b295d6";
+ sha256 = "1zh35qjxmkf37khagn8722byzjq2pns20cbmc821hfqdkj6q3pc8";
};
meta.homepage = "https://github.com/mfussenegger/nvim-dap/";
};
@@ -3108,12 +3132,12 @@ let
nvim-hlslens = buildVimPluginFrom2Nix {
pname = "nvim-hlslens";
- version = "2021-03-22";
+ version = "2021-03-25";
src = fetchFromGitHub {
owner = "kevinhwang91";
repo = "nvim-hlslens";
- rev = "fb6bf0c836b384f3afa66c43b24de112e2e05764";
- sha256 = "1p887iysf2a2nhj3cih9a7mzlipqakglzgw6ll065ghrn4dmr28p";
+ rev = "fdce47e0bd9669e2424cc2a0112ecb47ba571d13";
+ sha256 = "1dn9wr23dizhs7byrim9zd3yi22g629jc2aqfx0q1v1i2i9g107v";
};
meta.homepage = "https://github.com/kevinhwang91/nvim-hlslens/";
};
@@ -3132,12 +3156,12 @@ let
nvim-jdtls = buildVimPluginFrom2Nix {
pname = "nvim-jdtls";
- version = "2021-03-20";
+ version = "2021-03-27";
src = fetchFromGitHub {
owner = "mfussenegger";
repo = "nvim-jdtls";
- rev = "c4199f88d5f6bf269b91ae5d775a082aef05f9bd";
- sha256 = "18cnhhybhzw20l6v4rxzk5a5jcgv8l7jhbmzl529rd9jdhxqikfa";
+ rev = "7a4049b3d05b0a91e12a9a2c874d7d96475af501";
+ sha256 = "1gp9flk6myq1y67hhavk7689rfib5na6y012dc78rnwmf2v6gc0z";
};
meta.homepage = "https://github.com/mfussenegger/nvim-jdtls/";
};
@@ -3156,12 +3180,12 @@ let
nvim-lspconfig = buildVimPluginFrom2Nix {
pname = "nvim-lspconfig";
- version = "2021-03-20";
+ version = "2021-03-27";
src = fetchFromGitHub {
owner = "neovim";
repo = "nvim-lspconfig";
- rev = "00e9a7450eac88121768df21fde7d21f43de7529";
- sha256 = "0qqr6zz4a1i13hmj4hvcx08m5ipy28iz3hlaa239jf5yx9rw0y1h";
+ rev = "97bdebef2c46404cb1441ea62658cdd797265f24";
+ sha256 = "1j7051cj4lim97kfpzhwgp95y63lk336yshbjsr89al9dxhvsaa3";
};
meta.homepage = "https://github.com/neovim/nvim-lspconfig/";
};
@@ -3204,12 +3228,12 @@ let
nvim-scrollview = buildVimPluginFrom2Nix {
pname = "nvim-scrollview";
- version = "2021-03-21";
+ version = "2021-03-23";
src = fetchFromGitHub {
owner = "dstein64";
repo = "nvim-scrollview";
- rev = "693b93d273c4c0c0670d364cab9f3ab880d2f306";
- sha256 = "04dsjc6f8ag0vfr4sa6nmpfqimx48cvadwv7dd3m9g2mwivkfgyi";
+ rev = "902f24503ab7a754be2a1c483de1cd3428bd85ec";
+ sha256 = "0b31lpzdx1z88fm60p7d5gs442h4apm2n9h098n4j0ghcs5ppvnf";
};
meta.homepage = "https://github.com/dstein64/nvim-scrollview/";
};
@@ -3226,26 +3250,38 @@ let
meta.homepage = "https://github.com/norcalli/nvim-terminal.lua/";
};
+ nvim-toggleterm-lua = buildVimPluginFrom2Nix {
+ pname = "nvim-toggleterm-lua";
+ version = "2021-03-23";
+ src = fetchFromGitHub {
+ owner = "akinsho";
+ repo = "nvim-toggleterm.lua";
+ rev = "84980bd3f549821fe58d1821fdc1e7c54d1ebf3a";
+ sha256 = "09dcajyfbimfzgxj57c988rqr6y6ah4p97j04gyvg1mrvlj95dg4";
+ };
+ meta.homepage = "https://github.com/akinsho/nvim-toggleterm.lua/";
+ };
+
nvim-tree-lua = buildVimPluginFrom2Nix {
pname = "nvim-tree-lua";
- version = "2021-03-16";
+ version = "2021-03-26";
src = fetchFromGitHub {
owner = "kyazdani42";
repo = "nvim-tree.lua";
- rev = "f7ad4ce5f4c93c91aca00f0d9f10316c98471798";
- sha256 = "0l7ixschycw3lvg488bxgbbzsba59k0zkm8yrjdh63dp2nk2p2kj";
+ rev = "709d6b968bd905db03521ea3f44bfcb56e4a2c03";
+ sha256 = "08amszn1a2dd8xs5339yhmjbwwhnwxxzzav8rhy1va48mq7safmr";
};
meta.homepage = "https://github.com/kyazdani42/nvim-tree.lua/";
};
nvim-treesitter = buildVimPluginFrom2Nix {
pname = "nvim-treesitter";
- version = "2021-03-22";
+ version = "2021-03-27";
src = fetchFromGitHub {
owner = "nvim-treesitter";
repo = "nvim-treesitter";
- rev = "600509aad6c3e38c45a0f67802ede5d2204e0250";
- sha256 = "0j92ayfrlapgh09mz9rxfjzxag2kjmljd2qkbv54jl5dzr6p0f3q";
+ rev = "0df7c4aa39a6097e112f001520d2cea257440ed7";
+ sha256 = "1pb3nvq8f1nvpp184gwqs386kimxvca3wjrdiz74mb5jkhz1khq1";
};
meta.homepage = "https://github.com/nvim-treesitter/nvim-treesitter/";
};
@@ -3288,28 +3324,40 @@ let
nvim-ts-rainbow = buildVimPluginFrom2Nix {
pname = "nvim-ts-rainbow";
- version = "2021-03-22";
+ version = "2021-03-25";
src = fetchFromGitHub {
owner = "p00f";
repo = "nvim-ts-rainbow";
- rev = "4c9043e117bfa5ea8e4d5b04b60b2e29c0548e14";
- sha256 = "1ada87qkka1bsjdy52xqcnj5rmd9fl8q2v0km1pml3lcjyi0zdf5";
+ rev = "8714eade54870231b1df247453a5535a40b0a7b4";
+ sha256 = "192376c6nbx5kgj96wvpmds7ird8hfk4v8ayg1gay18vljyszxj9";
};
meta.homepage = "https://github.com/p00f/nvim-ts-rainbow/";
};
nvim-web-devicons = buildVimPluginFrom2Nix {
pname = "nvim-web-devicons";
- version = "2021-03-10";
+ version = "2021-03-23";
src = fetchFromGitHub {
owner = "kyazdani42";
repo = "nvim-web-devicons";
- rev = "1fb0962b8c4a217eec8166b03d683aa070115ed7";
- sha256 = "1rqswcjqrg6ckp7vyzqlncfabkggnhjvp3b0sq7y2g333z925sjm";
+ rev = "6e32d113d848c76ddbcc824038244657f170a97a";
+ sha256 = "02m8bsq7172sm9vkq3shh87xv4c3jxkgvhwhd3vv0na86kl9sqd6";
};
meta.homepage = "https://github.com/kyazdani42/nvim-web-devicons/";
};
+ nvim-whichkey-setup-lua = buildVimPluginFrom2Nix {
+ pname = "nvim-whichkey-setup-lua";
+ version = "2021-03-26";
+ src = fetchFromGitHub {
+ owner = "AckslD";
+ repo = "nvim-whichkey-setup.lua";
+ rev = "59aa0a4287adf6c2c9faabf912cdc005230e7c98";
+ sha256 = "093yjj28ak1ifbkn1s69wx8ldinj4v2bpf82fhqziw6d58ghwang";
+ };
+ meta.homepage = "https://github.com/AckslD/nvim-whichkey-setup.lua/";
+ };
+
nvim-yarp = buildVimPluginFrom2Nix {
pname = "nvim-yarp";
version = "2020-04-08";
@@ -3420,12 +3468,12 @@ let
packer-nvim = buildVimPluginFrom2Nix {
pname = "packer-nvim";
- version = "2021-03-15";
+ version = "2021-03-24";
src = fetchFromGitHub {
owner = "wbthomason";
repo = "packer.nvim";
- rev = "6d7be3232ed0dcbbd040bf92ba70b997fe4fd840";
- sha256 = "0k1ydkplqpizyqn56bdwhpsdib384ikv2lqfmk8j11r7p6m0xvir";
+ rev = "df33faeef884d55ca8f97479ea55b8d9bd2ffb3f";
+ sha256 = "1pizzzmb551c2pr0srw27ya8a4awfgq14k2dswmk8i8vra54vsj6";
};
meta.homepage = "https://github.com/wbthomason/packer.nvim/";
};
@@ -3504,12 +3552,12 @@ let
playground = buildVimPluginFrom2Nix {
pname = "playground";
- version = "2021-02-17";
+ version = "2021-03-22";
src = fetchFromGitHub {
owner = "nvim-treesitter";
repo = "playground";
- rev = "444eab728ecaf337629a45a733535e94a3efc04a";
- sha256 = "0r10fmk90wdc9hj3kdfkb93vvw1kdxwkl20f9zs3rfs5vs7p9i97";
+ rev = "d96cef521d22afd1a409449a890f20f50b436ee1";
+ sha256 = "1j1iqzi9q8fnl02hvazl8szg84iz8dqy0n52ngh1lvl78s9qa393";
};
meta.homepage = "https://github.com/nvim-treesitter/playground/";
};
@@ -3733,12 +3781,12 @@ let
registers-nvim = buildVimPluginFrom2Nix {
pname = "registers-nvim";
- version = "2021-03-21";
+ version = "2021-03-27";
src = fetchFromGitHub {
owner = "tversteeg";
repo = "registers.nvim";
- rev = "ba84c085ca868515520310073d922132fd811a24";
- sha256 = "02qadqyppn7w2ssc7m7zqr5s9iknhj0fbg88w2mdn7s4kcf8jyim";
+ rev = "69f49a0185fb9c08454d74f441dfe216d18e6a82";
+ sha256 = "12mgbfysm7cn2qahpmr08451avanvzjzngylf95ss0r2s65whlk4";
};
meta.homepage = "https://github.com/tversteeg/registers.nvim/";
};
@@ -3985,12 +4033,12 @@ let
sonokai = buildVimPluginFrom2Nix {
pname = "sonokai";
- version = "2021-02-28";
+ version = "2021-03-22";
src = fetchFromGitHub {
owner = "sainnhe";
repo = "sonokai";
- rev = "86298232f4f5ab418d5d9d18a336d7ab8b167b68";
- sha256 = "060k664gm4857nfmxaj0v6sz50mb3y9v8489jnv1bhqplzqf8gmy";
+ rev = "78f1b14ad18b043eb888a173f4c431dbf79462d8";
+ sha256 = "0spnpzr874ad9jpawcgydfm242wq55ychcky14f1qa09svsrdiv0";
};
meta.homepage = "https://github.com/sainnhe/sonokai/";
};
@@ -4238,12 +4286,12 @@ let
tagbar = buildVimPluginFrom2Nix {
pname = "tagbar";
- version = "2021-02-18";
+ version = "2021-03-23";
src = fetchFromGitHub {
owner = "preservim";
repo = "tagbar";
- rev = "51ff7a05404e2f5c83799dd6c38134ed4aaca85c";
- sha256 = "0i7qzn3vlvjjd5qvf230r7aaqz84rn30zkn643fdvpni7pxfywdv";
+ rev = "f6012cb65da4bda46b0779a36840df36ad01483e";
+ sha256 = "08vb3ffm1f47q5gxyqmmfv75x12001qpkqml7v612wnnfpclcqf5";
};
meta.homepage = "https://github.com/preservim/tagbar/";
};
@@ -4345,6 +4393,18 @@ let
meta.homepage = "https://github.com/jacoborus/tender.vim/";
};
+ termwrapper-nvim = buildVimPluginFrom2Nix {
+ pname = "termwrapper-nvim";
+ version = "2020-12-23";
+ src = fetchFromGitHub {
+ owner = "oberblastmeister";
+ repo = "termwrapper.nvim";
+ rev = "beb5d2d8a4b6c8fee10cfe5e0dfda158bb0cb33a";
+ sha256 = "05vr38w4qx42hy9injnji7qjkzm7pkysbkr8mlzalwb0i2giy51a";
+ };
+ meta.homepage = "https://github.com/oberblastmeister/termwrapper.nvim/";
+ };
+
tern_for_vim = buildVimPluginFrom2Nix {
pname = "tern_for_vim";
version = "2019-01-23";
@@ -4395,12 +4455,12 @@ let
tmux-complete-vim = buildVimPluginFrom2Nix {
pname = "tmux-complete-vim";
- version = "2019-11-10";
+ version = "2021-03-26";
src = fetchFromGitHub {
owner = "wellle";
repo = "tmux-complete.vim";
- rev = "7237d8d8d60af7916e3b546a9f4f396df95a1b21";
- sha256 = "05ypjahaf7gk4vjc8hhglmw7y8vyjxyhxq8sm0s3np05aw0gdbsc";
+ rev = "87f6f96c73b599554d1d7f313413d7f9d0336096";
+ sha256 = "0bqh08q1jv05srd15bp9zrlrdzavxy83v153balvhrrvg3z4lk4x";
};
meta.homepage = "https://github.com/wellle/tmux-complete.vim/";
};
@@ -4840,12 +4900,12 @@ let
vim-airline = buildVimPluginFrom2Nix {
pname = "vim-airline";
- version = "2021-03-09";
+ version = "2021-03-27";
src = fetchFromGitHub {
owner = "vim-airline";
repo = "vim-airline";
- rev = "09dbd09ed3b6318ca4c3cda8f61f02f1bc8ce783";
- sha256 = "0hi4yvd5b8il63a42kk10hxc8ixb1khf8h8q601qipkvgla8mpiy";
+ rev = "ed60e1d36912f64fdbed5640532b1067e11557ca";
+ sha256 = "0yijan5nknkkxr36rncscm043badn49w6778nwyazi2fx4266jfn";
};
meta.homepage = "https://github.com/vim-airline/vim-airline/";
};
@@ -5116,12 +5176,12 @@ let
vim-clap = buildVimPluginFrom2Nix {
pname = "vim-clap";
- version = "2021-03-13";
+ version = "2021-03-26";
src = fetchFromGitHub {
owner = "liuchengxu";
repo = "vim-clap";
- rev = "b7b1d078f4556a6829400185bbfb47be171e6828";
- sha256 = "1vncq3ypp5x3v9vq90zwg12ih45nph6g5mrl0xh2m82llqsp5r7c";
+ rev = "a3b20219708ff9e08d9afd9689e6c34ca780d3f2";
+ sha256 = "0s03xsfblfk778g0yr6ykg509kx21i3rmnjff335nwq8nb1ldxkz";
};
meta.homepage = "https://github.com/liuchengxu/vim-clap/";
};
@@ -5164,12 +5224,12 @@ let
vim-closetag = buildVimPluginFrom2Nix {
pname = "vim-closetag";
- version = "2020-10-09";
+ version = "2021-03-24";
src = fetchFromGitHub {
owner = "alvan";
repo = "vim-closetag";
- rev = "bd6bbc33c7e178673aa1dd17a5d249bbd4e3a6a6";
- sha256 = "0nqzjma6mqg19cxq0ck2lym51ajb1x97z497zf9pbp47hkg5875j";
+ rev = "c0779ef575d5c239162f4ca3506cfb4a95d45a58";
+ sha256 = "1mkn6d7m23ak06pl8i328hd9x6qx5fzrg8ijz32lgd4a56k98n6i";
};
meta.homepage = "https://github.com/alvan/vim-closetag/";
};
@@ -5248,12 +5308,12 @@ let
vim-commentary = buildVimPluginFrom2Nix {
pname = "vim-commentary";
- version = "2019-11-18";
+ version = "2021-03-23";
src = fetchFromGitHub {
owner = "tpope";
repo = "vim-commentary";
- rev = "f8238d70f873969fb41bf6a6b07ca63a4c0b82b1";
- sha256 = "09d81q9na7pvvrmxxqy09ffdzsx5v5dikinb704c9wm4ys2bidr9";
+ rev = "349340debb34f6302931f0eb7139b2c11dfdf427";
+ sha256 = "01lpfcn2hmvxddcf97f4qx5vksxj1hwrxb0c8ri59z9lb9z2hgjd";
};
meta.homepage = "https://github.com/tpope/vim-commentary/";
};
@@ -5464,12 +5524,12 @@ let
vim-dispatch = buildVimPluginFrom2Nix {
pname = "vim-dispatch";
- version = "2021-03-20";
+ version = "2021-03-26";
src = fetchFromGitHub {
owner = "tpope";
repo = "vim-dispatch";
- rev = "895c8fa958018fa3366f0e70a18cfeb73a204588";
- sha256 = "10q8xgbds6r34ka004qvzd3nkkqv8sas5ca7vx0jwvyhglijy644";
+ rev = "4313cbb398d8b61b08be09f9b5a9ae4270c86004";
+ sha256 = "154vxj4bd10i70wd0d40g9j2yji6l5y00a0y4xk9402x5yljjmwr";
};
meta.homepage = "https://github.com/tpope/vim-dispatch/";
};
@@ -5764,12 +5824,12 @@ let
vim-floaterm = buildVimPluginFrom2Nix {
pname = "vim-floaterm";
- version = "2021-03-17";
+ version = "2021-03-24";
src = fetchFromGitHub {
owner = "voldikss";
repo = "vim-floaterm";
- rev = "2d9107b1e1ceb3d4f118647f2cd5f9165172ccf9";
- sha256 = "1ja58d2x8a5af7vhvbjp8x7l4bzbvndr2nd97p115q89l2zy6ayp";
+ rev = "ae7eea5c5c6c082fe66410e72306b5b1bcb693dd";
+ sha256 = "1lvaww22rj9jnd8b8fjcaclvj8n6vqc390l3z5d7ivm6fc5h1k1j";
};
meta.homepage = "https://github.com/voldikss/vim-floaterm/";
};
@@ -5824,12 +5884,12 @@ let
vim-fugitive = buildVimPluginFrom2Nix {
pname = "vim-fugitive";
- version = "2021-03-21";
+ version = "2021-03-26";
src = fetchFromGitHub {
owner = "tpope";
repo = "vim-fugitive";
- rev = "58d2b25836f420cf2fe20cc0b6f988165ae33782";
- sha256 = "0550dq20axl1qj6rasws2hsar7x4kjx9fspqzmkisv4wzrxr1kp5";
+ rev = "eaee845abaf75827cc3c6a3f96d7ff77a3a8beff";
+ sha256 = "1m5yns33a92mhhjbpba76hnkai0d45k7iwqwdlm524c90cmkff55";
};
meta.homepage = "https://github.com/tpope/vim-fugitive/";
};
@@ -5944,12 +6004,12 @@ let
vim-go = buildVimPluginFrom2Nix {
pname = "vim-go";
- version = "2021-03-21";
+ version = "2021-03-26";
src = fetchFromGitHub {
owner = "fatih";
repo = "vim-go";
- rev = "a60ff48be1d57991866320886569d012cdfb9e6f";
- sha256 = "1w3cbvdl08vf7d9w4d3vaw3l4ccvzvgfkamk7qxanmcg2vd0k1rg";
+ rev = "80d0e38fbdc3b5e88133e730fc563414a0403485";
+ sha256 = "070by6ki5zw112ia4gvm3zasr1qliysb7lag6s0x7vh1ywdzg9ii";
};
meta.homepage = "https://github.com/fatih/vim-go/";
};
@@ -6438,12 +6498,12 @@ let
vim-kitty-navigator = buildVimPluginFrom2Nix {
pname = "vim-kitty-navigator";
- version = "2020-12-16";
+ version = "2021-03-27";
src = fetchFromGitHub {
owner = "knubie";
repo = "vim-kitty-navigator";
- rev = "ee9252c62bcdc22e8326373ba1716442658b19d1";
- sha256 = "1885gwbv2a4bwwydn129hd7xjgqp0cfjqkm0zw8lfylxgxadg0zb";
+ rev = "b417bfd95d573254de7dbc4efd2ee12301f2e4a1";
+ sha256 = "0ai14s0a2i5xiak2n102ji9nhhv3lgkr32prcdl9snfybniy9l7b";
};
meta.homepage = "https://github.com/knubie/vim-kitty-navigator/";
};
@@ -6594,12 +6654,12 @@ let
vim-lsc = buildVimPluginFrom2Nix {
pname = "vim-lsc";
- version = "2021-03-21";
+ version = "2021-03-23";
src = fetchFromGitHub {
owner = "natebosch";
repo = "vim-lsc";
- rev = "d2b394c0033014288daac317c32918bed469ff66";
- sha256 = "0a8hd20v5q3bjq5pcs8p708f5jmh1y87aqa0f7ip4snldnf6gq2d";
+ rev = "2f0cbbfb8ea8997b408e447a2bc9554a3de33617";
+ sha256 = "1y3r5a5mcjf8dp0pkmhgnbay10hh48w1b3wd795wwbm6nx4izjjq";
};
meta.homepage = "https://github.com/natebosch/vim-lsc/";
};
@@ -6811,12 +6871,12 @@ let
vim-mundo = buildVimPluginFrom2Nix {
pname = "vim-mundo";
- version = "2020-12-29";
+ version = "2021-03-25";
src = fetchFromGitHub {
owner = "simnalamburt";
repo = "vim-mundo";
- rev = "4f8628caebe393ac1b84564e965f894d89a7582d";
- sha256 = "0hmww1xln0rvvi8hy7sv9arjwlp40ks0b07irzqpm5xi93hgyq2n";
+ rev = "c6dcea90166750bb5ed40321749966b1a8020a1a";
+ sha256 = "1bd9xab96m2j6zcp6bh7k958wj95m8w40hczmn2qzpq3cvpy8nb0";
};
meta.homepage = "https://github.com/simnalamburt/vim-mundo/";
};
@@ -6919,12 +6979,12 @@ let
vim-obsession = buildVimPluginFrom2Nix {
pname = "vim-obsession";
- version = "2020-01-19";
+ version = "2021-03-22";
src = fetchFromGitHub {
owner = "tpope";
repo = "vim-obsession";
- rev = "96a3f837c112cb64e0a9857b69f6d6a71041155e";
- sha256 = "11h7jyg7fhjmq3pmpc93nrsxm175ra14407rs3558h8p04snc159";
+ rev = "82c9ac5e130c92a46e043dd9cd9e5b48d15e286d";
+ sha256 = "0lfcba8sk25l5yp3agh6pwniddf8jx627ikpr8i2z9ary2fqsj98";
};
meta.homepage = "https://github.com/tpope/vim-obsession/";
};
@@ -7543,12 +7603,12 @@ let
vim-scriptease = buildVimPluginFrom2Nix {
pname = "vim-scriptease";
- version = "2021-03-08";
+ version = "2021-03-25";
src = fetchFromGitHub {
owner = "tpope";
repo = "vim-scriptease";
- rev = "9450c4ea654649b6199750edc9f3f84637268d7b";
- sha256 = "0nkxcykn63187jwzw0anl3chzhm31yzgmkhqra0c9071jzi149xg";
+ rev = "dbdc88f2ca38613a089354823fb2cec4d87d104d";
+ sha256 = "0i89vrnfphr32qcix9ah9cf68xnw6n8jm03xmgys29gkfim4v7sq";
};
meta.homepage = "https://github.com/tpope/vim-scriptease/";
};
@@ -7723,12 +7783,12 @@ let
vim-snippets = buildVimPluginFrom2Nix {
pname = "vim-snippets";
- version = "2021-03-15";
+ version = "2021-03-25";
src = fetchFromGitHub {
owner = "honza";
repo = "vim-snippets";
- rev = "a8ac81b8922ac621e7043813d98e69ad0ac265a4";
- sha256 = "0gl77mnajzvmnxwnbzb5fqzzljb59lbfv23gzbz1h493gfm0f04n";
+ rev = "67e506c5598c19de4fcdf8780377a92aaddfdbad";
+ sha256 = "1gabnzgrjkrf2x32i55js8xf6zm0vzwnzmlbwqkjf1xi25wgbx1n";
};
meta.homepage = "https://github.com/honza/vim-snippets/";
};
@@ -7807,12 +7867,12 @@ let
vim-startuptime = buildVimPluginFrom2Nix {
pname = "vim-startuptime";
- version = "2021-02-23";
+ version = "2021-03-22";
src = fetchFromGitHub {
owner = "dstein64";
repo = "vim-startuptime";
- rev = "af70d17a863c9a33def9cafbb3911195a571c686";
- sha256 = "078xq6bwkbwsjajyq3c9bn8b3r0da6j70vp1ba934a6jjdv6vrj4";
+ rev = "cee157ee4f73ddacfe1a70bb833b96f7a47a10c2";
+ sha256 = "1y049vbjhsg80am0hxyrcq0d0p7qfyvb1z38nc7yd7bcgwsqc5ac";
};
meta.homepage = "https://github.com/dstein64/vim-startuptime/";
};
@@ -7952,12 +8012,12 @@ let
vim-test = buildVimPluginFrom2Nix {
pname = "vim-test";
- version = "2021-03-03";
+ version = "2021-03-25";
src = fetchFromGitHub {
owner = "vim-test";
repo = "vim-test";
- rev = "f5619460b77b9b444311aa3b6f31ecd9ffdaa6d8";
- sha256 = "1izzpfvppiyf4pcxdny0na634bl147rwiijyaj7rg679w9lv6qwg";
+ rev = "a0a3f130dddfde95700f8d07e51884a2bc0a53c4";
+ sha256 = "07qv8l3rz63ksrv8shphqk42p1yzcjjck6s5sv3sz2z1xwr2dy0x";
};
meta.homepage = "https://github.com/vim-test/vim-test/";
};
@@ -8120,12 +8180,12 @@ let
vim-tpipeline = buildVimPluginFrom2Nix {
pname = "vim-tpipeline";
- version = "2021-03-11";
+ version = "2021-03-24";
src = fetchFromGitHub {
owner = "vimpostor";
repo = "vim-tpipeline";
- rev = "327944d0d7824e6de4dda33bc2b008708a6cb447";
- sha256 = "16nsick3p5nj9vmi6h531l8lc5c6gy2c1zd83xbgav38x655kjws";
+ rev = "b36abe2613191912e12b9562b209f157a8b927de";
+ sha256 = "1ly3iy1c05ry7yfsph0rribiagcyw07daj2dbfj0la3pbfmvip24";
};
meta.homepage = "https://github.com/vimpostor/vim-tpipeline/";
};
@@ -8252,12 +8312,12 @@ let
vim-vsnip = buildVimPluginFrom2Nix {
pname = "vim-vsnip";
- version = "2021-03-21";
+ version = "2021-03-24";
src = fetchFromGitHub {
owner = "hrsh7th";
repo = "vim-vsnip";
- rev = "fe1f56cb924a67ce3b3b70583f00e05e780509e5";
- sha256 = "0kd4pfjrjcssql154pnrzvw3kgp6rnll2p0d4bgph1b0lc5xp1nk";
+ rev = "4eb5f669c11c497fa075912eb03294b11fca2c07";
+ sha256 = "1imrkir6ir2fl63wh91yh5jp64kxd3zh1m7p05dcfbyd7rc2l9c1";
};
meta.homepage = "https://github.com/hrsh7th/vim-vsnip/";
};
@@ -8324,12 +8384,12 @@ let
vim-which-key = buildVimPluginFrom2Nix {
pname = "vim-which-key";
- version = "2021-02-09";
+ version = "2021-03-26";
src = fetchFromGitHub {
owner = "liuchengxu";
repo = "vim-which-key";
- rev = "68bd1775277ad5677ebf5cdc774ca3ba4755d457";
- sha256 = "1pg179iz0xvd6r7xks7qrn1c7vh7zmp39s9axhdgp7jisqbhaaqx";
+ rev = "9b80ded965f088d03ec45bbc9de6cc9119d38d7f";
+ sha256 = "1rmj8agpyqyrclbvhv3d4wpdrk1cp5xz4sh57d4xymnh0fjb56db";
};
meta.homepage = "https://github.com/liuchengxu/vim-which-key/";
};
@@ -8528,12 +8588,12 @@ let
vimspector = buildVimPluginFrom2Nix {
pname = "vimspector";
- version = "2021-03-20";
+ version = "2021-03-22";
src = fetchFromGitHub {
owner = "puremourning";
repo = "vimspector";
- rev = "35e5b3d56e193ee6129eabedcd48fd17b8293b2d";
- sha256 = "0njs7bn3hzr44sn04lg44baia5khpxra0l1llshx42bkdidcj1s1";
+ rev = "054ea35428e5e8d6abe12b6a535a3b0426d4874e";
+ sha256 = "0cx35hbyhrzmbfzsikbpa4jh0gr3sbdhk27v2nsbwj4i3rg9767p";
fetchSubmodules = true;
};
meta.homepage = "https://github.com/puremourning/vimspector/";
@@ -8541,12 +8601,12 @@ let
vimtex = buildVimPluginFrom2Nix {
pname = "vimtex";
- version = "2021-03-21";
+ version = "2021-03-26";
src = fetchFromGitHub {
owner = "lervag";
repo = "vimtex";
- rev = "4b9e69dc5e817c3436843ee0cb431e59fa5705b0";
- sha256 = "1s2h2bgd751jf7vj9dr1756g7gxdx3b7pwx49686273ibv1spnwf";
+ rev = "41667e58248595aa50109f856f47cb38ab93225a";
+ sha256 = "1zwsflvxljmx7mndpq5ph19n5kk5cild4grg7dvan9jd2qlf6cvi";
};
meta.homepage = "https://github.com/lervag/vimtex/";
};
@@ -8589,12 +8649,12 @@ let
vista-vim = buildVimPluginFrom2Nix {
pname = "vista-vim";
- version = "2021-03-08";
+ version = "2021-03-26";
src = fetchFromGitHub {
owner = "liuchengxu";
repo = "vista.vim";
- rev = "954754c830d2ca7da3157cdea029c8d50021d0bc";
- sha256 = "1cw79hzkisii0g2n457wbzha65wbpp00x3yrb8rb3d5299bz0z72";
+ rev = "b37d9b3331b8345a7c6cb821eda89e08eb7d7fa1";
+ sha256 = "12m54rj9xjcbyfa61z9qim8mbwqcmjfqkmdsp23jlm41nw17627y";
};
meta.homepage = "https://github.com/liuchengxu/vista.vim/";
};
@@ -8722,12 +8782,12 @@ let
YouCompleteMe = buildVimPluginFrom2Nix {
pname = "YouCompleteMe";
- version = "2021-03-20";
+ version = "2021-03-22";
src = fetchFromGitHub {
owner = "ycm-core";
repo = "YouCompleteMe";
- rev = "3352684bfb6a08be8e864a46b0773e459d4d201f";
- sha256 = "03mqrprmiain4n9aw5388msq4smczw1avcls71rj0c7igzpdc4vw";
+ rev = "ed423e8a1d2a5842a126d33b824ad3b65f85f3ba";
+ sha256 = "19c238sdc6i3ky374v52g13csnbmdcm9d97iji6fmklmzsyrq4cr";
fetchSubmodules = true;
};
meta.homepage = "https://github.com/ycm-core/YouCompleteMe/";
@@ -8771,12 +8831,12 @@ let
zephyr-nvim = buildVimPluginFrom2Nix {
pname = "zephyr-nvim";
- version = "2021-03-18";
+ version = "2021-03-27";
src = fetchFromGitHub {
owner = "glepnir";
repo = "zephyr-nvim";
- rev = "05315a214fc0b4681e596cbcb40045d54564ff8c";
- sha256 = "0bapbwyvvbvqd8ggcyns2y5iya44jvb0jxq14xh5qfnxiycrwrgi";
+ rev = "d0ece1ef669d5799ab4184b05deca74943270232";
+ sha256 = "0p959ih2xkcskk83fn92w9g0xdqs93s5lq5sq7hw6frc6plk3fh1";
};
meta.homepage = "https://github.com/glepnir/zephyr-nvim/";
};
diff --git a/third_party/nixpkgs/pkgs/misc/vim-plugins/overrides.nix b/third_party/nixpkgs/pkgs/misc/vim-plugins/overrides.nix
index 7a0df067f6..cacbbde1d2 100644
--- a/third_party/nixpkgs/pkgs/misc/vim-plugins/overrides.nix
+++ b/third_party/nixpkgs/pkgs/misc/vim-plugins/overrides.nix
@@ -731,7 +731,7 @@ self: super: {
libiconv
];
- cargoSha256 = "u1ryOhwDgRBQ32MBPkWHI6eU6yZqNAZfyKvckr6nvCY=";
+ cargoSha256 = "1f8ns3a5am9jb52niy3ass9hpzymjml62f3d7vyl1fvk3rriq4jw";
};
in
''
diff --git a/third_party/nixpkgs/pkgs/misc/vim-plugins/vim-plugin-names b/third_party/nixpkgs/pkgs/misc/vim-plugins/vim-plugin-names
index b72aeb0d10..f180ba419f 100644
--- a/third_party/nixpkgs/pkgs/misc/vim-plugins/vim-plugin-names
+++ b/third_party/nixpkgs/pkgs/misc/vim-plugins/vim-plugin-names
@@ -1,8 +1,11 @@
907th/vim-auto-save
aca/completion-tabnine
+AckslD/nvim-whichkey-setup.lua@main
ackyshake/Spacegray.vim@main
airblade/vim-gitgutter
airblade/vim-rooter
+akinsho/nvim-bufferline.lua
+akinsho/nvim-toggleterm.lua
aklt/plantuml-syntax
altercation/vim-colors-solarized
alvan/vim-closetag
@@ -418,6 +421,7 @@ nishigori/increment-activator
nixprime/cpsm
NLKNguyen/papercolor-theme
noc7c9/vim-iced-coffee-script
+norcalli/nvim-colorizer.lua
norcalli/nvim-terminal.lua
norcalli/snippets.nvim
npxbr/glow.nvim
@@ -439,6 +443,7 @@ nvim-treesitter/nvim-treesitter
nvim-treesitter/nvim-treesitter-refactor
nvim-treesitter/nvim-treesitter-textobjects
nvim-treesitter/playground
+oberblastmeister/termwrapper.nvim
ocaml/vim-ocaml
octol/vim-cpp-enhanced-highlight
ojroques/vim-oscyank@main
diff --git a/third_party/nixpkgs/pkgs/misc/vscode-extensions/default.nix b/third_party/nixpkgs/pkgs/misc/vscode-extensions/default.nix
index 533c2e3f4a..3f77906bce 100644
--- a/third_party/nixpkgs/pkgs/misc/vscode-extensions/default.nix
+++ b/third_party/nixpkgs/pkgs/misc/vscode-extensions/default.nix
@@ -48,6 +48,18 @@ let
};
};
+ alygin.vscode-tlaplus = buildVscodeMarketplaceExtension {
+ mktplcRef = {
+ name = "vscode-tlaplus";
+ publisher = "alygin";
+ version = "1.5.3";
+ sha256 = "1cy0qn8iyjrinscn9p5ckpsa2hyryapxfi7is6s2zk2mpligbb1d";
+ };
+ meta = {
+ license = lib.licenses.mit;
+ };
+ };
+
antfu.icons-carbon = buildVscodeMarketplaceExtension {
mktplcRef = {
name = "icons-carbon";
@@ -75,6 +87,18 @@ let
};
};
+ baccata.scaladex-search = buildVscodeMarketplaceExtension {
+ mktplcRef = {
+ name = "scaladex-search";
+ publisher = "baccata";
+ version = "0.0.1";
+ sha256 = "1y8p4rr8qq5ng52g4pbx8ayq04gi2869wrx68k69rl7ga7bzcyp9";
+ };
+ meta = {
+ license = lib.licenses.asl20;
+ };
+ };
+
bbenoist.Nix = buildVscodeMarketplaceExtension {
mktplcRef = {
name = "Nix";
@@ -111,6 +135,18 @@ let
};
};
+ codezombiech.gitignore = buildVscodeMarketplaceExtension {
+ mktplcRef = {
+ name = "gitignore";
+ publisher = "codezombiech";
+ version = "0.6.0";
+ sha256 = "0gnc0691pwkd9s8ldqabmpfvj0236rw7bxvkf0bvmww32kv1ia0b";
+ };
+ meta = with lib; {
+ license = licenses.mit;
+ };
+ };
+
CoenraadS.bracket-pair-colorizer = buildVscodeMarketplaceExtension {
meta = with lib; {
changelog = "https://marketplace.visualstudio.com/items/CoenraadS.bracket-pair-colorizer/changelog";
@@ -201,6 +237,20 @@ let
};
};
+ dotjoshjohnson.xml = buildVscodeMarketplaceExtension {
+ mktplcRef = {
+ name = "xml";
+ publisher = "dotjoshjohnson";
+ version = "2.5.1";
+ sha256 = "1v4x6yhzny1f8f4jzm4g7vqmqg5bqchyx4n25mkgvw2xp6yls037";
+ };
+ meta = {
+ description = "XML Tools";
+ homepage = "https://github.com/DotJoshJohnson/vscode-xml";
+ license = lib.licenses.mit;
+ };
+ };
+
dracula-theme.theme-dracula = buildVscodeMarketplaceExtension {
mktplcRef = {
name = "theme-dracula";
@@ -229,6 +279,18 @@ let
};
};
+ edonet.vscode-command-runner = buildVscodeMarketplaceExtension {
+ mktplcRef = {
+ name = "vscode-command-runner";
+ publisher = "edonet";
+ version = "0.0.116";
+ sha256 = "0fxvplyk080m0cdsvzynp6wjillrd4flr5qz7af7fibb2jbmfdkn";
+ };
+ meta = {
+ license = lib.licenses.mit;
+ };
+ };
+
elmtooling.elm-ls-vscode = buildVscodeMarketplaceExtension {
mktplcRef = {
name = "elm-ls-vscode";
@@ -345,19 +407,33 @@ let
};
};
- github.github-vscode-theme = buildVscodeMarketplaceExtension {
- mktplcRef = {
- name = "github-vscode-theme";
- publisher = "github";
- version = "1.1.5";
- sha256 = "10f0098cce026d1f0c855fb7a66ea60b5d8acd2b76126ea94fe7361e49cd9ed2";
+ github = {
+ github-vscode-theme = buildVscodeMarketplaceExtension {
+ mktplcRef = {
+ name = "github-vscode-theme";
+ publisher = "github";
+ version = "1.1.5";
+ sha256 =
+ "10f0098cce026d1f0c855fb7a66ea60b5d8acd2b76126ea94fe7361e49cd9ed2";
+ };
+ meta = with lib; {
+ description = "GitHub theme for VS Code";
+ downloadPage =
+ "https://marketplace.visualstudio.com/items?itemName=GitHub.github-vscode-theme";
+ homepage = "https://github.com/primer/github-vscode-theme";
+ license = licenses.mit;
+ maintainers = with maintainers; [ hugolgst ];
+ };
};
- meta = with lib; {
- description = "GitHub theme for VS Code";
- downloadPage = "https://marketplace.visualstudio.com/items?itemName=GitHub.github-vscode-theme";
- homepage = "https://github.com/primer/github-vscode-theme";
- license = licenses.mit;
- maintainers = with maintainers; [ hugolgst ];
+
+ vscode-pull-request-github = buildVscodeMarketplaceExtension {
+ mktplcRef = {
+ name = "vscode-pull-request-github";
+ publisher = "github";
+ version = "0.22.0";
+ sha256 = "13p3z86vkra26npp5a78pxdwa4z6jqjzsd38arhgdnjgwmi6bnrw";
+ };
+ meta = { license = lib.licenses.mit; };
};
};
@@ -389,8 +465,8 @@ let
mktplcRef = {
name = "todo-tree";
publisher = "Gruntfuggly";
- version = "0.0.206";
- sha256 = "1xalwk2bndb73p8p2b4w5qz7m1n80xyw67wb5qlq1rrfjchhicyv";
+ version = "0.0.208";
+ sha256 = "1yjz7i3f2f9a3i797vwa9vnxsh9lyxqr4k0ixx8v55h628kvafr9";
};
meta = with lib; {
license = licenses.mit;
@@ -512,6 +588,18 @@ let
};
};
+ mishkinf.goto-next-previous-member = buildVscodeMarketplaceExtension {
+ mktplcRef = {
+ name = "goto-next-previous-member";
+ publisher = "mishkinf";
+ version = "0.0.5";
+ sha256 = "0kgzap1k924i95al0a63hxcsv8skhaapgfpi9d7vvaxm0fc10l1i";
+ };
+ meta = {
+ license = lib.licenses.mit;
+ };
+ };
+
mskelton.one-dark-theme = buildVscodeMarketplaceExtension {
mktplcRef = {
name = "one-dark-theme";
@@ -540,8 +628,8 @@ let
mktplcRef = {
name = "vscode-docker";
publisher = "ms-azuretools";
- version = "0.8.1";
- sha256 = "0n59whmcrx8946xix6skvc50f2vsc85ckvn8cs06w9mqmymm1q0s";
+ version = "1.9.1";
+ sha256 = "1l7pm3s5kbf2vark164ykz4qbpa1ac9ls691hham36f6v91dmff9";
};
meta = {
license = lib.licenses.mit;
@@ -691,8 +779,8 @@ let
mktplcRef = {
name = "scala";
publisher = "scala-lang";
- version = "0.4.5";
- sha256 = "0nrj32a7a86vwc9gfh748xs3mmfwbc304dp7nks61f0lx8b4wzxw";
+ version = "0.5.1";
+ sha256 = "0p9nhds2xn08xz8x822q15jdrdlqkg2wa1y7mk9k89n8n2kfh91g";
};
meta = {
license = lib.licenses.mit;
@@ -703,8 +791,8 @@ let
mktplcRef = {
name = "metals";
publisher = "scalameta";
- version = "1.9.10";
- sha256 = "1afmqzlw3bl9bv59l9b2jrljhbq8djb7vl8rjv58c5wi7nvm2qab";
+ version = "1.9.13";
+ sha256 = "0vrg25ygmyjx1lwif2ypyv688b290ycfn1qf0izxbmgi2z3f0wf9";
};
meta = {
license = lib.licenses.asl20;
@@ -723,6 +811,19 @@ let
};
};
+
+ shyykoserhiy.vscode-spotify = buildVscodeMarketplaceExtension {
+ mktplcRef = {
+ name = "vscode-spotify";
+ publisher = "shyykoserhiy";
+ version = "3.2.1";
+ sha256 = "14d68rcnjx4a20r0ps9g2aycv5myyhks5lpfz0syr2rxr4kd1vh6";
+ };
+ meta = {
+ license = lib.licenses.mit;
+ };
+ };
+
skyapps.fish-vscode = buildVscodeMarketplaceExtension {
mktplcRef = {
name = "fish-vscode";
@@ -730,8 +831,20 @@ let
version = "0.2.1";
sha256 = "0y1ivymn81ranmir25zk83kdjpjwcqpnc9r3jwfykjd9x0jib2hl";
};
- meta = with lib; {
- license = licenses.mit;
+ meta = {
+ license = lib.licenses.mit;
+ };
+ };
+
+ slevesque.vscode-multiclip = buildVscodeMarketplaceExtension {
+ mktplcRef = {
+ name = "vscode-multiclip";
+ publisher = "slevesque";
+ version = "0.1.5";
+ sha256 = "1cg8dqj7f10fj9i0g6mi3jbyk61rs6rvg9aq28575rr52yfjc9f9";
+ };
+ meta = {
+ license = lib.licenses.mit;
};
};
@@ -771,6 +884,18 @@ let
};
};
+ timonwong.shellcheck = buildVscodeMarketplaceExtension {
+ mktplcRef = {
+ name = "shellcheck";
+ publisher = "timonwong";
+ version = "0.12.3";
+ sha256 = "1i9rszgnac2z1kyahmgxmz05ib7z14s458fvvjlzmvl64fa1fdvf";
+ };
+ meta = {
+ license = lib.licenses.mit;
+ };
+ };
+
tomoki1207.pdf = buildVscodeMarketplaceExtension {
mktplcRef = {
name = "pdf";
@@ -848,6 +973,42 @@ let
};
};
+ xyz.local-history = buildVscodeMarketplaceExtension {
+ mktplcRef = {
+ name = "local-history";
+ publisher = "xyz";
+ version = "1.8.1";
+ sha256 = "1mfmnbdv76nvwg4xs3rgsqbxk8hw9zr1b61har9c3pbk9r4cay7v";
+ };
+ meta = {
+ license = lib.licenses.mit;
+ };
+ };
+
+ yzhang.markdown-all-in-one = buildVscodeMarketplaceExtension {
+ mktplcRef = {
+ name = "markdown-all-in-one";
+ publisher = "yzhang";
+ version = "3.4.0";
+ sha256 = "0ihfrsg2sc8d441a2lkc453zbw1jcpadmmkbkaf42x9b9cipd5qb";
+ };
+ meta = {
+ license = lib.licenses.mit;
+ };
+ };
+
+ zhuangtongfa.material-theme = buildVscodeMarketplaceExtension {
+ mktplcRef = {
+ name = "material-theme";
+ publisher = "zhuangtongfa";
+ version = "3.9.12";
+ sha256 = "017h9hxplf2rhmlhn3vag0wypcx6gxi7p9fgllj5jzwrl2wsjl0g";
+ };
+ meta = {
+ license = lib.licenses.mit;
+ };
+ };
+
llvm-org.lldb-vscode = llvmPackages_8.lldb;
WakaTime.vscode-wakatime = callPackage ./wakatime {};
diff --git a/third_party/nixpkgs/pkgs/misc/vscode-extensions/terraform/default.nix b/third_party/nixpkgs/pkgs/misc/vscode-extensions/terraform/default.nix
index 7c9eaa6561..fbfb7c06dc 100644
--- a/third_party/nixpkgs/pkgs/misc/vscode-extensions/terraform/default.nix
+++ b/third_party/nixpkgs/pkgs/misc/vscode-extensions/terraform/default.nix
@@ -3,13 +3,13 @@ vscode-utils.buildVscodeMarketplaceExtension rec {
mktplcRef = {
name = "terraform";
publisher = "hashicorp";
- version = "2.8.3";
+ version = "2.9.1";
};
vsix = fetchurl {
name = "${mktplcRef.publisher}-${mktplcRef.name}.zip";
url = "https://github.com/hashicorp/vscode-terraform/releases/download/v${mktplcRef.version}/terraform-${mktplcRef.version}.vsix";
- sha256 = "1cng82q9079qmn5q71h9knh9qzhqrl3phaamkqfjy1jallgi43b1";
+ sha256 = "1i4pzxw57hf2g7x62hfsb588b1lz3zjjh8ny96qqrif2bj2h887z";
};
patches = [ ./fix-terraform-ls.patch ];
diff --git a/third_party/nixpkgs/pkgs/misc/vscode-extensions/terraform/fix-terraform-ls.patch b/third_party/nixpkgs/pkgs/misc/vscode-extensions/terraform/fix-terraform-ls.patch
index 9c076d06df..d91ffcc17a 100644
--- a/third_party/nixpkgs/pkgs/misc/vscode-extensions/terraform/fix-terraform-ls.patch
+++ b/third_party/nixpkgs/pkgs/misc/vscode-extensions/terraform/fix-terraform-ls.patch
@@ -1,25 +1,38 @@
diff --git a/out/extension.js b/out/extension.js
-index 4a2c6a9..158fe28 100644
+index e44cef2..fba0899 100644
--- a/out/extension.js
+++ b/out/extension.js
-@@ -215,19 +215,7 @@ function pathToBinary() {
- if (!_pathToBinaryPromise) {
- let command = vscodeUtils_1.config('terraform').get('languageServer.pathToBinary');
- if (!command) { // Skip install/upgrade if user has set custom binary path
-- const installDir = `${extensionPath}/lsp`;
-- const installer = new languageServerInstaller_1.LanguageServerInstaller(reporter);
+@@ -141,24 +141,6 @@ function updateLanguageServer() {
+ return __awaiter(this, void 0, void 0, function* () {
+ const delay = 1000 * 60 * 24;
+ setTimeout(updateLanguageServer, delay); // check for new updates every 24hrs
+- // skip install if a language server binary path is set
+- if (!vscodeUtils_1.config('terraform').get('languageServer.pathToBinary')) {
+- const installer = new languageServerInstaller_1.LanguageServerInstaller(installPath, reporter);
+- const install = yield installer.needsInstall();
+- if (install) {
+- yield stopClients();
- try {
-- yield installer.install(installDir);
+- yield installer.install();
- }
- catch (err) {
- reporter.sendTelemetryException(err);
- throw err;
- }
- finally {
-- yield installer.cleanupZips(installDir);
+- yield installer.cleanupZips();
- }
-- command = `${installDir}/terraform-ls`;
-+ command = 'TERRAFORM-LS-PATH';
+- }
+- }
+ return startClients(); // on repeat runs with no install, this will be a no-op
+ });
+ }
+@@ -256,7 +238,7 @@ function pathToBinary() {
+ reporter.sendTelemetryEvent('usePathToBinary');
}
else {
- reporter.sendTelemetryEvent('usePathToBinary');
+- command = path.join(installPath, 'terraform-ls');
++ command = 'TERRAFORM-LS-PATH';
+ }
+ _pathToBinaryPromise = Promise.resolve(command);
+ }
diff --git a/third_party/nixpkgs/pkgs/os-specific/darwin/macfuse/default.nix b/third_party/nixpkgs/pkgs/os-specific/darwin/macfuse/default.nix
index a5162b3aed..7e1b4ed776 100644
--- a/third_party/nixpkgs/pkgs/os-specific/darwin/macfuse/default.nix
+++ b/third_party/nixpkgs/pkgs/os-specific/darwin/macfuse/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchurl, cpio, xar, undmg, libtapi }:
+{ lib, stdenv, fetchurl, cpio, xar, undmg, libtapi, DiskArbitration }:
stdenv.mkDerivation rec {
pname = "macfuse-stubs";
@@ -10,6 +10,7 @@ stdenv.mkDerivation rec {
};
nativeBuildInputs = [ cpio xar undmg libtapi ];
+ propagatedBuildInputs = [ DiskArbitration ];
postUnpack = ''
xar -xf 'Install macFUSE.pkg'
@@ -40,6 +41,11 @@ stdenv.mkDerivation rec {
meta = with lib; {
homepage = "https://osxfuse.github.io";
description = "Build time stubs for FUSE on macOS";
+ longDescription = ''
+ macFUSE is required for this package to work on macOS. To install macFUSE,
+ use the installer from the
+ project website.
+ '';
platforms = platforms.darwin;
maintainers = with maintainers; [ midchildan ];
diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/compsize/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/compsize/default.nix
index f835b9a9ec..9d0dbeffae 100644
--- a/third_party/nixpkgs/pkgs/os-specific/linux/compsize/default.nix
+++ b/third_party/nixpkgs/pkgs/os-specific/linux/compsize/default.nix
@@ -13,18 +13,19 @@ stdenv.mkDerivation rec {
buildInputs = [ btrfs-progs ];
- installPhase = ''
- mkdir -p $out/bin
+ installFlags = [
+ "PREFIX=${placeholder "out"}"
+ ];
+
+ preInstall = ''
mkdir -p $out/share/man/man8
- install -m 0755 compsize $out/bin
- install -m 0444 compsize.8 $out/share/man/man8
'';
meta = with lib; {
description = "btrfs: Find compression type/ratio on a file or set of files";
- homepage = "https://github.com/kilobyte/compsize";
- license = licenses.gpl2Plus;
+ homepage = "https://github.com/kilobyte/compsize";
+ license = licenses.gpl2Plus;
maintainers = with maintainers; [ CrazedProgrammer ];
- platforms = platforms.linux;
+ platforms = platforms.linux;
};
}
diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/dlm/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/dlm/default.nix
new file mode 100644
index 0000000000..9e81ea3834
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/os-specific/linux/dlm/default.nix
@@ -0,0 +1,26 @@
+{ lib
+, rustPlatform
+, fetchFromSourcehut
+}:
+
+rustPlatform.buildRustPackage rec {
+ pname = "dlm";
+ version = "2020-01-07";
+
+ src = fetchFromSourcehut {
+ owner = "~kennylevinsen";
+ repo = pname;
+ rev = "6b0e11c4f453b1a4d7a32019227539a980b7ce66";
+ sha256 = "1r3w7my0g3v2ya317qnvjx8wnagjahpj7yx72a65hf2pjbf5x42p";
+ };
+
+ cargoSha256 = "OFMCsUmrRYlobiUAqm1huuzDxdf1BWmU2RqZ9Y6Yjew=";
+
+ meta = with lib; {
+ description = "A stupid simple graphical login manager";
+ homepage = "https://git.sr.ht/~kennylevinsen/dlm";
+ license = licenses.gpl3Plus;
+ maintainers = with maintainers; [ luc65r ];
+ platforms = platforms.linux;
+ };
+}
diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/dmtcp/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/dmtcp/default.nix
index 21458daf96..5a472c7357 100644
--- a/third_party/nixpkgs/pkgs/os-specific/linux/dmtcp/default.nix
+++ b/third_party/nixpkgs/pkgs/os-specific/linux/dmtcp/default.nix
@@ -1,4 +1,6 @@
-{ lib, stdenv, fetchFromGitHub, bash, perl, python }:
+{ lib, stdenv, fetchFromGitHub, bash, perl, python2 }:
+
+# There are fixes for python3 compatibility on master
stdenv.mkDerivation rec {
pname = "dmtcp";
@@ -28,7 +30,7 @@ stdenv.mkDerivation rec {
substituteInPlace test/autotest.py \
--replace /bin/bash ${bash}/bin/bash \
--replace /usr/bin/perl ${perl}/bin/perl \
- --replace /usr/bin/python ${python}/bin/python \
+ --replace /usr/bin/python ${python2}/bin/python \
--replace "os.environ['USER']" "\"nixbld1\"" \
--replace "os.getenv('USER')" "\"nixbld1\""
'';
diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/firmware/system76-firmware/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/firmware/system76-firmware/default.nix
index a5722d59c2..138fea042f 100644
--- a/third_party/nixpkgs/pkgs/os-specific/linux/firmware/system76-firmware/default.nix
+++ b/third_party/nixpkgs/pkgs/os-specific/linux/firmware/system76-firmware/default.nix
@@ -29,11 +29,11 @@ rustPlatform.buildRustPackage rec {
done
'';
- meta = {
+ meta = with lib; {
description = "Tools for managing firmware updates for system76 devices";
homepage = "https://github.com/pop-os/system76-firmware";
- license = lib.licenses.gpl3;
- maintainers = [ lib.maintainers.shlevy ];
- platforms = lib.platforms.linux;
+ license = licenses.gpl3Only;
+ maintainers = with maintainers; [ shlevy ];
+ platforms = [ "i686-linux" "x86_64-linux" ];
};
}
diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/greetd/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/greetd/default.nix
new file mode 100644
index 0000000000..fc5dd04b43
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/os-specific/linux/greetd/default.nix
@@ -0,0 +1,51 @@
+{ rustPlatform
+, lib
+, fetchFromSourcehut
+, pam
+, scdoc
+, installShellFiles
+}:
+
+rustPlatform.buildRustPackage rec {
+ pname = "greetd";
+ version = "0.7.0";
+
+ src = fetchFromSourcehut {
+ owner = "~kennylevinsen";
+ repo = pname;
+ rev = version;
+ sha256 = "b+S3fuJ8gjnSQzLHl3Bs9iO/Un2ynggAplz01GjJvFI=";
+ };
+
+ cargoSha256 = "w6d8rIc03Qa2/TpztpyVijjd3y0Vo38+JDhsOkSFG5E=";
+
+ nativeBuildInputs = [
+ scdoc
+ installShellFiles
+ ];
+
+ buildInputs = [
+ pam
+ ];
+
+ postInstall = ''
+ for f in man/*; do
+ scdoc < "$f" > "$(sed 's/-\([0-9]\)\.scd$/.\1/' <<< "$f")"
+ rm "$f"
+ done
+ installManPage man/*
+ '';
+
+ meta = with lib; {
+ description = "Minimal and flexible login manager daemon";
+ longDescription = ''
+ greetd is a minimal and flexible login manager daemon
+ that makes no assumptions about what you want to launch.
+ Comes with agreety, a simple, text-based greeter.
+ '';
+ homepage = "https://kl.wtf/projects/greetd/";
+ license = licenses.gpl3Plus;
+ maintainers = with maintainers; [ luc65r ];
+ platforms = platforms.linux;
+ };
+}
diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/gtkgreet/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/gtkgreet/default.nix
new file mode 100644
index 0000000000..7ab7c01475
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/os-specific/linux/gtkgreet/default.nix
@@ -0,0 +1,50 @@
+{ stdenv
+, lib
+, fetchFromSourcehut
+, pkg-config
+, cmake
+, meson
+, ninja
+, gtk3
+, gtk-layer-shell
+, json_c
+, scdoc
+}:
+
+stdenv.mkDerivation rec {
+ pname = "gtkgreet";
+ version = "0.7";
+
+ src = fetchFromSourcehut {
+ owner = "~kennylevinsen";
+ repo = pname;
+ rev = version;
+ sha256 = "ms+2FdtzzNlmlzNxFhu4cpX5H+5H+9ZOtZ0p8uVA3lo=";
+ };
+
+ nativeBuildInputs = [
+ pkg-config
+ meson
+ ninja
+ cmake
+ ];
+
+ buildInputs = [
+ gtk3
+ gtk-layer-shell
+ json_c
+ scdoc
+ ];
+
+ mesonFlags = [
+ "-Dlayershell=enabled"
+ ];
+
+ meta = with lib; {
+ description = "GTK based greeter for greetd, to be run under cage or similar";
+ homepage = "https://git.sr.ht/~kennylevinsen/gtkgreet";
+ license = licenses.gpl3Plus;
+ maintainers = with maintainers; [ luc65r ];
+ platforms = platforms.linux;
+ };
+}
diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/kernel/common-config.nix b/third_party/nixpkgs/pkgs/os-specific/linux/kernel/common-config.nix
index 4fef56077c..7ba05d1329 100644
--- a/third_party/nixpkgs/pkgs/os-specific/linux/kernel/common-config.nix
+++ b/third_party/nixpkgs/pkgs/os-specific/linux/kernel/common-config.nix
@@ -244,8 +244,9 @@ let
# Allow specifying custom EDID on the kernel command line
DRM_LOAD_EDID_FIRMWARE = yes;
VGA_SWITCHEROO = yes; # Hybrid graphics support
+ DRM_GMA500 = whenAtLeast "5.12" module;
DRM_GMA600 = yes;
- DRM_GMA3600 = yes;
+ DRM_GMA3600 = whenOlder "5.12" yes;
DRM_VMWGFX_FBCON = yes;
# necessary for amdgpu polaris support
DRM_AMD_POWERPLAY = whenBetween "4.5" "4.9" yes;
@@ -288,21 +289,31 @@ let
SND_SOC_SOF_TOPLEVEL = yes;
SND_SOC_SOF_ACPI = module;
SND_SOC_SOF_PCI = module;
- SND_SOC_SOF_APOLLOLAKE_SUPPORT = yes;
- SND_SOC_SOF_CANNONLAKE_SUPPORT = yes;
- SND_SOC_SOF_COFFEELAKE_SUPPORT = yes;
+ SND_SOC_SOF_APOLLOLAKE = whenAtLeast "5.12" module;
+ SND_SOC_SOF_APOLLOLAKE_SUPPORT = whenOlder "5.12" yes;
+ SND_SOC_SOF_CANNONLAKE = whenAtLeast "5.12" module;
+ SND_SOC_SOF_CANNONLAKE_SUPPORT = whenOlder "5.12" yes;
+ SND_SOC_SOF_COFFEELAKE = whenAtLeast "5.12" module;
+ SND_SOC_SOF_COFFEELAKE_SUPPORT = whenOlder "5.12" yes;
+ SND_SOC_SOF_COMETLAKE = whenAtLeast "5.12" module;
SND_SOC_SOF_COMETLAKE_H_SUPPORT = whenOlder "5.8" yes;
- SND_SOC_SOF_COMETLAKE_LP_SUPPORT = yes;
- SND_SOC_SOF_ELKHARTLAKE_SUPPORT = yes;
- SND_SOC_SOF_GEMINILAKE_SUPPORT = yes;
+ SND_SOC_SOF_COMETLAKE_LP_SUPPORT = whenOlder "5.12" yes;
+ SND_SOC_SOF_ELKHARTLAKE = whenAtLeast "5.12" module;
+ SND_SOC_SOF_ELKHARTLAKE_SUPPORT = whenOlder "5.12" yes;
+ SND_SOC_SOF_GEMINILAKE = whenAtLeast "5.12" module;
+ SND_SOC_SOF_GEMINILAKE_SUPPORT = whenOlder "5.12" yes;
SND_SOC_SOF_HDA_AUDIO_CODEC = yes;
SND_SOC_SOF_HDA_COMMON_HDMI_CODEC = whenOlder "5.7" yes;
SND_SOC_SOF_HDA_LINK = yes;
- SND_SOC_SOF_ICELAKE_SUPPORT = yes;
+ SND_SOC_SOF_ICELAKE = whenAtLeast "5.12" module;
+ SND_SOC_SOF_ICELAKE_SUPPORT = whenOlder "5.12" yes;
SND_SOC_SOF_INTEL_TOPLEVEL = yes;
- SND_SOC_SOF_JASPERLAKE_SUPPORT = yes;
- SND_SOC_SOF_MERRIFIELD_SUPPORT = yes;
- SND_SOC_SOF_TIGERLAKE_SUPPORT = yes;
+ SND_SOC_SOF_JASPERLAKE = whenAtLeast "5.12" module;
+ SND_SOC_SOF_JASPERLAKE_SUPPORT = whenOlder "5.12" yes;
+ SND_SOC_SOF_MERRIFIELD = whenAtLeast "5.12" module;
+ SND_SOC_SOF_MERRIFIELD_SUPPORT = whenOlder "5.12" yes;
+ SND_SOC_SOF_TIGERLAKE = whenAtLeast "5.12" module;
+ SND_SOC_SOF_TIGERLAKE_SUPPORT = whenOlder "5.12" yes;
};
usb-serial = {
diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/kernel/hardened/config.nix b/third_party/nixpkgs/pkgs/os-specific/linux/kernel/hardened/config.nix
index acffa383f0..20f9f5aaa1 100644
--- a/third_party/nixpkgs/pkgs/os-specific/linux/kernel/hardened/config.nix
+++ b/third_party/nixpkgs/pkgs/os-specific/linux/kernel/hardened/config.nix
@@ -55,8 +55,8 @@ assert (versionAtLeast version "4.9");
# Wipe higher-level memory allocations on free() with page_poison=1
PAGE_POISONING = yes;
- PAGE_POISONING_NO_SANITY = yes;
- PAGE_POISONING_ZERO = yes;
+ PAGE_POISONING_NO_SANITY = whenOlder "5.11" yes;
+ PAGE_POISONING_ZERO = whenOlder "5.11" yes;
# Enable the SafeSetId LSM
SECURITY_SAFESETID = whenAtLeast "5.1" yes;
@@ -91,4 +91,6 @@ assert (versionAtLeast version "4.9");
CC_STACKPROTECTOR_REGULAR = whenOlder "4.18" no;
CC_STACKPROTECTOR_STRONG = whenOlder "4.18" yes;
+ # Detect out-of-bound reads/writes and use-after-free
+ KFENCE = whenAtLeast "5.12" yes;
}
diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/kernel/hardened/patches.json b/third_party/nixpkgs/pkgs/os-specific/linux/kernel/hardened/patches.json
index d1d8c9c555..a8cdaafcdf 100644
--- a/third_party/nixpkgs/pkgs/os-specific/linux/kernel/hardened/patches.json
+++ b/third_party/nixpkgs/pkgs/os-specific/linux/kernel/hardened/patches.json
@@ -1,15 +1,15 @@
{
"4.14": {
"extra": "-hardened1",
- "name": "linux-hardened-4.14.226-hardened1.patch",
- "sha256": "12h42fsr1sc2zgr1cb2ais0aivg4hpg9x4gc762r7cd4l40fyyg9",
- "url": "https://github.com/anthraxx/linux-hardened/releases/download/4.14.226-hardened1/linux-hardened-4.14.226-hardened1.patch"
+ "name": "linux-hardened-4.14.227-hardened1.patch",
+ "sha256": "0g8s91cvcxin95is7hhap5i8vkn4k3570s28vnz8mf0jrcgwdgfd",
+ "url": "https://github.com/anthraxx/linux-hardened/releases/download/4.14.227-hardened1/linux-hardened-4.14.227-hardened1.patch"
},
"4.19": {
"extra": "-hardened1",
- "name": "linux-hardened-4.19.182-hardened1.patch",
- "sha256": "02848qbglzj0w8lwic0fp19zc2b3d229ghfn804qx2h2rxh48c96",
- "url": "https://github.com/anthraxx/linux-hardened/releases/download/4.19.182-hardened1/linux-hardened-4.19.182-hardened1.patch"
+ "name": "linux-hardened-4.19.183-hardened1.patch",
+ "sha256": "1xi4fkvdvf1rjhrihi7im415x26hwmvhf3zrklm8hw2rmajdfrca",
+ "url": "https://github.com/anthraxx/linux-hardened/releases/download/4.19.183-hardened1/linux-hardened-4.19.183-hardened1.patch"
},
"5.10": {
"extra": "-hardened1",
@@ -19,14 +19,14 @@
},
"5.11": {
"extra": "-hardened1",
- "name": "linux-hardened-5.11.8-hardened1.patch",
- "sha256": "1qlvhj8g6vkg3bsd3fl27n6j5c3ykcyypigf22vfy8yl55mnbmv6",
- "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.11.8-hardened1/linux-hardened-5.11.8-hardened1.patch"
+ "name": "linux-hardened-5.11.9-hardened1.patch",
+ "sha256": "169jcalr81ckad08vx489h8j6k42s0rzxbpkr6knyrd7rv06ddk0",
+ "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.11.9-hardened1/linux-hardened-5.11.9-hardened1.patch"
},
"5.4": {
"extra": "-hardened1",
- "name": "linux-hardened-5.4.107-hardened1.patch",
- "sha256": "1wy66a97zjrk2g061xj0va0km3y15m0w4p1bvqsyvjlj5x4wwmwh",
- "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.4.107-hardened1/linux-hardened-5.4.107-hardened1.patch"
+ "name": "linux-hardened-5.4.108-hardened1.patch",
+ "sha256": "1m208j0svysyn3m0acn10pd4wqjm203ampkhf1wimzpzs8wfasgj",
+ "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.4.108-hardened1/linux-hardened-5.4.108-hardened1.patch"
}
}
diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-4.14.nix b/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-4.14.nix
index 5052d3754b..1dd2521dfb 100644
--- a/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-4.14.nix
+++ b/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-4.14.nix
@@ -3,7 +3,7 @@
with lib;
buildLinux (args // rec {
- version = "4.14.226";
+ version = "4.14.227";
# modDirVersion needs to be x.y.z, will automatically add .0 if needed
modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg;
@@ -13,6 +13,6 @@ buildLinux (args // rec {
src = fetchurl {
url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
- sha256 = "09llp8jl5xgxxzj0f2sfx32annwyz82k1zmgd26zy90lz0d09p3s";
+ sha256 = "1iz029v407xv81prrvg4gr2ql8hvm0mpj21x9picwv05pk2d68h7";
};
} // (args.argsOverride or {}))
diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-4.19.nix b/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-4.19.nix
index 8d2f607dbf..3530d02236 100644
--- a/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-4.19.nix
+++ b/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-4.19.nix
@@ -3,7 +3,7 @@
with lib;
buildLinux (args // rec {
- version = "4.19.182";
+ version = "4.19.183";
# modDirVersion needs to be x.y.z, will automatically add .0 if needed
modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg;
@@ -13,6 +13,6 @@ buildLinux (args // rec {
src = fetchurl {
url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
- sha256 = "0r93mgvjypmj0glg0912vfq9zbagi59w4d88ynz5gm8sl05pbnq5";
+ sha256 = "1xd5hjdjbsw7kpj9csgi8kk4ki3z46sqbiigjsr71psivxfxkkxs";
};
} // (args.argsOverride or {}))
diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-4.4.nix b/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-4.4.nix
index 941a1dda9b..b2b5c43722 100644
--- a/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-4.4.nix
+++ b/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-4.4.nix
@@ -1,11 +1,11 @@
{ buildPackages, fetchurl, perl, buildLinux, ... } @ args:
buildLinux (args // rec {
- version = "4.4.262";
+ version = "4.4.263";
extraMeta.branch = "4.4";
src = fetchurl {
url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
- sha256 = "0yz9qi4i46ndshxmb99kvv7lk6cbb09y7bzagq7sgvqaj4lwaw6j";
+ sha256 = "1qqh3n09pn87n6f7ain3am8k7j043vzm65qcvccq9as129y5w1a2";
};
} // (args.argsOverride or {}))
diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-4.9.nix b/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-4.9.nix
index 6d9bb6111d..c07e1c98d4 100644
--- a/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-4.9.nix
+++ b/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-4.9.nix
@@ -1,11 +1,11 @@
{ buildPackages, fetchurl, perl, buildLinux, ... } @ args:
buildLinux (args // rec {
- version = "4.9.262";
+ version = "4.9.263";
extraMeta.branch = "4.9";
src = fetchurl {
url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
- sha256 = "1zq77x9zf1wbk8n17rnblm5lfwlkin1xnxb3sxirwb9njm07cbmj";
+ sha256 = "1dhmgyg6asqg1pmhnzqymwz4bm6gy8gi0n2gr794as38dhn2szwz";
};
} // (args.argsOverride or {}))
diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-5.10.nix b/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-5.10.nix
index 80b3ee780c..623a3a14f1 100644
--- a/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-5.10.nix
+++ b/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-5.10.nix
@@ -3,7 +3,7 @@
with lib;
buildLinux (args // rec {
- version = "5.10.25";
+ version = "5.10.26";
# modDirVersion needs to be x.y.z, will automatically add .0 if needed
modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg;
@@ -13,6 +13,6 @@ buildLinux (args // rec {
src = fetchurl {
url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz";
- sha256 = "1p8s8vp5b6vjmvhj3plm0pr0d9qp5lrwm6l40a4bjr1vk9myf2lk";
+ sha256 = "10hlc020imxxh71nvxhnnmd66bcxndfyi78v7wv7y5mcy4rjhlzw";
};
} // (args.argsOverride or {}))
diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-5.11.nix b/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-5.11.nix
index 6f59b234ef..cf9302757f 100644
--- a/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-5.11.nix
+++ b/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-5.11.nix
@@ -3,7 +3,7 @@
with lib;
buildLinux (args // rec {
- version = "5.11.8";
+ version = "5.11.9";
# modDirVersion needs to be x.y.z, will automatically add .0 if needed
modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg;
@@ -13,6 +13,6 @@ buildLinux (args // rec {
src = fetchurl {
url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz";
- sha256 = "17y8q0gy4b00rms6pgglzmzz4msvmn2frqvln9vac39m78k3kyci";
+ sha256 = "0dcqn6s85sd4zl7rv8ay88p5z12xvy2rma0dx6g6b480rg68sxal";
};
} // (args.argsOverride or {}))
diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-5.4.nix b/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-5.4.nix
index cb5e9ef7a2..fdb32a2476 100644
--- a/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-5.4.nix
+++ b/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-5.4.nix
@@ -3,7 +3,7 @@
with lib;
buildLinux (args // rec {
- version = "5.4.107";
+ version = "5.4.108";
# modDirVersion needs to be x.y.z, will automatically add .0 if needed
modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg;
@@ -13,6 +13,6 @@ buildLinux (args // rec {
src = fetchurl {
url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz";
- sha256 = "0q3m4d96d0hhhzn71aarh314i4cx9h3qvhhi5hrmcsrnbxafyg0w";
+ sha256 = "0wi1ql7brfsdzvwbxrxvg12zfm54lbdjvfzxk1l3xlqvq83sq4pj";
};
} // (args.argsOverride or {}))
diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-testing.nix b/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-testing.nix
index 1ed116cdfd..06efc5da1e 100644
--- a/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-testing.nix
+++ b/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-testing.nix
@@ -3,15 +3,15 @@
with lib;
buildLinux (args // rec {
- version = "5.11-rc5";
- extraMeta.branch = "5.11";
+ version = "5.12-rc4";
+ extraMeta.branch = "5.12";
# modDirVersion needs to be x.y.z, will always add .0
modDirVersion = if (modDirVersionArg == null) then builtins.replaceStrings ["-"] [".0-"] version else modDirVersionArg;
src = fetchurl {
url = "https://git.kernel.org/torvalds/t/linux-${version}.tar.gz";
- sha256 = "029nps41nrym5qz9lq832cys4rai04ig5xp9ddvrpazzh0lfnr4q";
+ sha256 = "06i6xnfbyn522pj9zksx6ka01yxwv8dsrb2z517grv682sp8j70k";
};
# Should the testing kernels ever be built on Hydra?
diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/nvidia-x11/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/nvidia-x11/default.nix
index a5a02206c4..1da25db7ae 100644
--- a/third_party/nixpkgs/pkgs/os-specific/linux/nvidia-x11/default.nix
+++ b/third_party/nixpkgs/pkgs/os-specific/linux/nvidia-x11/default.nix
@@ -28,10 +28,10 @@ rec {
# Policy: use the highest stable version as the default (on our master).
stable = if stdenv.hostPlatform.system == "x86_64-linux"
then generic {
- version = "460.56";
- sha256_64bit = "003kwlsghlix2kilrqad7mn7ygkb755rzjlxd0b52vqz1nx1qmsf";
- settingsSha256 = "1xwhbd78q0bc3v8fnlss9amkl03vnvf91ffpfnz0v7clvn3xymkf";
- persistencedSha256 = "0sh2csv04fkimf1msbmdc608gxb3j95g8i3rqf32b1pl9jv0p5ly";
+ version = "460.67";
+ sha256_64bit = "L2cRySVw7mgYSN25mJV+b4uOeHTdjLGvFPEkwyFgtec=";
+ settingsSha256 = "DB+ZeKm6cYQuVkJWjVd71qOTOmwIcRqx1CxfkgMbDpg=";
+ persistencedSha256 = "HCmZZRlNhOHi5yN2lNHhBILZkdng73q0vCbv7CIX/8s=";
}
else legacy_390;
diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/powercap/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/powercap/default.nix
new file mode 100644
index 0000000000..ad9de9f75d
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/os-specific/linux/powercap/default.nix
@@ -0,0 +1,26 @@
+{ lib, stdenv, fetchFromGitHub, cmake }:
+
+stdenv.mkDerivation rec {
+ pname = "powercap";
+ version = "0.3.1";
+
+ src = fetchFromGitHub {
+ owner = "powercap";
+ repo = "powercap";
+ rev = "v${version}";
+ sha256 = "0f1sg1zsskcfralg9khwq7lmz25gvnyknza3bb0hmh1a9lw0jhdn";
+ };
+
+ nativeBuildInputs = [ cmake ];
+
+ cmakeFlags = [
+ "-DBUILD_SHARED_LIBS=On"
+ ];
+
+ meta = with lib; {
+ description = "Tools and library to read/write to the Linux power capping framework (sysfs interface)";
+ license = licenses.bsd3;
+ platforms = platforms.linux;
+ maintainers = with maintainers; [ rowanG077 ];
+ };
+}
diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/rtl8821ce/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/rtl8821ce/default.nix
index 050830927e..e5b34fa665 100644
--- a/third_party/nixpkgs/pkgs/os-specific/linux/rtl8821ce/default.nix
+++ b/third_party/nixpkgs/pkgs/os-specific/linux/rtl8821ce/default.nix
@@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "rtl8821ce-${kernel.version}";
- version = "unstable-2020-12-16";
+ version = "unstable-2021-03-21";
src = fetchFromGitHub {
owner = "tomaspinho";
repo = "rtl8821ce";
- rev = "14b536f0c9ad2d0abbdab8afc7ade684900ca9cf";
- sha256 = "0z7r7spsgn22gwv9pcmkdjn9ingi8jj7xkxasph8118h46fw8ip2";
+ rev = "897e7c4c15dd5a0a569745dc223d969a26ff5bfc";
+ sha256 = "0935dzz0njxh78wfd17yqah1dxn6b3kaszvzclwwrwwhwcrdp80j";
};
hardeningDisable = [ "pic" ];
@@ -31,7 +31,7 @@ stdenv.mkDerivation rec {
meta = with lib; {
description = "Realtek rtl8821ce driver";
homepage = "https://github.com/tomaspinho/rtl8821ce";
- license = licenses.gpl2;
+ license = licenses.gpl2Only;
platforms = platforms.linux;
maintainers = with maintainers; [ hhm samuelgrf ];
};
diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/sysdig/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/sysdig/default.nix
index ecbd23e117..23e78dd848 100644
--- a/third_party/nixpkgs/pkgs/os-specific/linux/sysdig/default.nix
+++ b/third_party/nixpkgs/pkgs/os-specific/linux/sysdig/default.nix
@@ -1,5 +1,5 @@
{ lib, stdenv, fetchFromGitHub, cmake, kernel, installShellFiles
-, luajit, zlib, ncurses, perl, jsoncpp, libb64, openssl, curl, jq, gcc, elfutils, tbb, c-ares, protobuf, grpc
+, luajit, ncurses, perl, jsoncpp, libb64, openssl, curl, jq, gcc, elfutils, tbb, protobuf, grpc
}:
with lib;
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ cmake perl installShellFiles ];
buildInputs = [
- zlib luajit ncurses jsoncpp libb64 openssl curl jq gcc elfutils tbb c-ares protobuf grpc
+ luajit ncurses jsoncpp libb64 openssl curl jq gcc elfutils tbb protobuf grpc
] ++ optionals (kernel != null) kernel.moduleBuildDependencies;
hardeningDisable = [ "pic" ];
diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/tuigreet/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/tuigreet/default.nix
new file mode 100644
index 0000000000..b6db7cfbb7
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/os-specific/linux/tuigreet/default.nix
@@ -0,0 +1,26 @@
+{ lib
+, rustPlatform
+, fetchFromGitHub
+}:
+
+rustPlatform.buildRustPackage rec {
+ pname = "tuigreet";
+ version = "0.2.0";
+
+ src = fetchFromGitHub {
+ owner = "apognu";
+ repo = pname;
+ rev = version;
+ sha256 = "1fk8ppxr3a8vdp7g18pp3sgr8b8s11j30mcqpdap4ai14v19idh8";
+ };
+
+ cargoSha256 = "0qpambizjy6z44spnjnh2kd8nay5953mf1ga2iff2mjlv97zpq22";
+
+ meta = with lib; {
+ description = "Graphical console greter for greetd";
+ homepage = "https://github.com/apognu/tuigreet";
+ license = licenses.gpl3Plus;
+ maintainers = with maintainers; [ luc65r ];
+ platforms = platforms.linux;
+ };
+}
diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/wlgreet/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/wlgreet/default.nix
new file mode 100644
index 0000000000..e48443b1b1
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/os-specific/linux/wlgreet/default.nix
@@ -0,0 +1,26 @@
+{ lib
+, rustPlatform
+, fetchFromSourcehut
+}:
+
+rustPlatform.buildRustPackage rec {
+ pname = "wlgreet";
+ version = "2020-10-20";
+
+ src = fetchFromSourcehut {
+ owner = "~kennylevinsen";
+ repo = pname;
+ rev = "4425d296b81550cce01f044fbd7ff083e37550f4";
+ sha256 = "0n0lzg3y1z5s9s6kfkdj5q8w67bqpw08hqfccc5kz0ninzy9j0cc";
+ };
+
+ cargoSha256 = "01bfv2kzg2r9z75b8pq61n2ydc8l5zh69jdyjpj931l642f6kd5a";
+
+ meta = with lib; {
+ description = "Raw wayland greeter for greetd, to be run under sway or similar";
+ homepage = "https://git.sr.ht/~kennylevinsen/wlgreet";
+ license = licenses.gpl3Plus;
+ maintainers = with maintainers; [ luc65r ];
+ platforms = platforms.linux;
+ };
+}
diff --git a/third_party/nixpkgs/pkgs/os-specific/solo5/default.nix b/third_party/nixpkgs/pkgs/os-specific/solo5/default.nix
index baba0ecdf0..71584aff77 100644
--- a/third_party/nixpkgs/pkgs/os-specific/solo5/default.nix
+++ b/third_party/nixpkgs/pkgs/os-specific/solo5/default.nix
@@ -1,6 +1,16 @@
{ lib, stdenv, fetchurl, pkg-config, libseccomp, util-linux, qemu }:
-let version = "0.6.8";
+let
+ version = "0.6.8";
+ # list of all theoretically available targets
+ targets = [
+ "genode"
+ "hvt"
+ "muen"
+ "spt"
+ "virtio"
+ "xen"
+ ];
in stdenv.mkDerivation {
pname = "solo5";
inherit version;
@@ -29,21 +39,26 @@ in stdenv.mkDerivation {
export DESTDIR=$out
export PREFIX=$out
make install-tools
- ${lib.optionalString stdenv.hostPlatform.isLinux "make ${
- (lib.concatMapStringsSep " " (x: "install-opam-${x}") [ "hvt" "spt" ])
- }"}
+
+ # get CONFIG_* vars from Makeconf which also parse in sh
+ grep '^CONFIG_' Makeconf > nix_tmp_targetconf
+ source nix_tmp_targetconf
+ # install opam / pkg-config files for all enabled targets
+ ${lib.concatMapStrings (bind: ''
+ [ -n "$CONFIG_${lib.toUpper bind}" ] && make install-opam-${bind}
+ '') targets}
+
runHook postInstall
'';
- doCheck = true;
+ doCheck = stdenv.hostPlatform.isLinux;
checkInputs = [ util-linux qemu ];
- checkPhase = if stdenv.hostPlatform.isLinux then
- ''
+ checkPhase = ''
+ runHook preCheck
patchShebangs tests
./tests/bats-core/bats ./tests/tests.bats
- ''
- else
- null;
+ runHook postCheck
+ '';
meta = with lib; {
description = "Sandboxed execution environment";
diff --git a/third_party/nixpkgs/pkgs/servers/bazarr/default.nix b/third_party/nixpkgs/pkgs/servers/bazarr/default.nix
index d68646c427..1356f1c7a0 100644
--- a/third_party/nixpkgs/pkgs/servers/bazarr/default.nix
+++ b/third_party/nixpkgs/pkgs/servers/bazarr/default.nix
@@ -1,12 +1,12 @@
-{ stdenv, lib, fetchurl, makeWrapper, python3, nixosTests }:
+{ stdenv, lib, fetchurl, makeWrapper, python3, unrar, ffmpeg, nixosTests }:
stdenv.mkDerivation rec {
pname = "bazarr";
- version = "0.9.0.8";
+ version = "0.9.2";
src = fetchurl {
url = "https://github.com/morpheus65535/bazarr/archive/v${version}.tar.gz";
- sha256 = "sha256-Ecbx7FHpcEkcWBAKCtZPtQKX5ibvU4tajSJ5pyEboKc=";
+ sha256 = "16mh7v8z5ijr75pvavcj6225w6bg12qy1d1w9vm2d5axnfm3wfbk";
};
nativeBuildInputs = [ makeWrapper ];
@@ -19,6 +19,7 @@ stdenv.mkDerivation rec {
makeWrapper "${(python3.withPackages (ps: [ps.lxml ps.numpy])).interpreter}" \
$out/bin/bazarr \
--add-flags "$out/src/bazarr.py" \
+ --suffix PATH : ${lib.makeBinPath [ unrar ffmpeg ]} \
'';
passthru.tests = {
@@ -28,7 +29,7 @@ stdenv.mkDerivation rec {
meta = with lib; {
description = "Subtitle manager for Sonarr and Radarr";
homepage = "https://www.bazarr.media/";
- license = licenses.gpl3;
+ license = licenses.gpl3Only;
maintainers = with maintainers; [ xwvvvvwx ];
platforms = platforms.all;
};
diff --git a/third_party/nixpkgs/pkgs/servers/dico/default.nix b/third_party/nixpkgs/pkgs/servers/dico/default.nix
index cf0417e332..6a8c6541c2 100644
--- a/third_party/nixpkgs/pkgs/servers/dico/default.nix
+++ b/third_party/nixpkgs/pkgs/servers/dico/default.nix
@@ -1,5 +1,5 @@
{ fetchurl, lib, stdenv, libtool, gettext, zlib, readline, gsasl
-, guile, python, pcre, libffi, groff }:
+, guile, python2, pcre, libffi, groff }:
stdenv.mkDerivation rec {
pname = "dico";
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
hardeningDisable = [ "format" ];
buildInputs =
- [ libtool gettext zlib readline gsasl guile python pcre libffi groff ];
+ [ libtool gettext zlib readline gsasl guile python2 pcre libffi groff ];
doCheck = true;
diff --git a/third_party/nixpkgs/pkgs/servers/dict/dictd-wordnet.nix b/third_party/nixpkgs/pkgs/servers/dict/dictd-wordnet.nix
index 3f76d60233..8378102dac 100644
--- a/third_party/nixpkgs/pkgs/servers/dict/dictd-wordnet.nix
+++ b/third_party/nixpkgs/pkgs/servers/dict/dictd-wordnet.nix
@@ -1,10 +1,10 @@
-{lib, stdenv, python, wordnet, writeScript}:
+{lib, stdenv, python2, wordnet, writeScript}:
stdenv.mkDerivation rec {
version = "542";
pname = "dict-db-wordnet";
- buildInputs = [python wordnet];
+ buildInputs = [python2 wordnet];
convert = ./wordnet_structures.py;
builder = writeScript "builder.sh" ''
diff --git a/third_party/nixpkgs/pkgs/servers/dict/wiktionary/default.nix b/third_party/nixpkgs/pkgs/servers/dict/wiktionary/default.nix
index cd0c9c6c24..3a01120f3a 100644
--- a/third_party/nixpkgs/pkgs/servers/dict/wiktionary/default.nix
+++ b/third_party/nixpkgs/pkgs/servers/dict/wiktionary/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchurl, python, dict, glibcLocales }:
+{ lib, stdenv, fetchurl, python2, dict, glibcLocales }:
stdenv.mkDerivation rec {
version = "20210201";
@@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
};
convert = ./wiktionary2dict.py;
- buildInputs = [ python dict glibcLocales ];
+ buildInputs = [ python2 dict glibcLocales ];
builder = ./builder.sh;
passthru.updateScript = ./update.sh;
diff --git a/third_party/nixpkgs/pkgs/servers/dns/knot-dns/default.nix b/third_party/nixpkgs/pkgs/servers/dns/knot-dns/default.nix
index 2a9e00b266..2b407074ca 100644
--- a/third_party/nixpkgs/pkgs/servers/dns/knot-dns/default.nix
+++ b/third_party/nixpkgs/pkgs/servers/dns/knot-dns/default.nix
@@ -7,11 +7,11 @@ let inherit (lib) optional optionals; in
stdenv.mkDerivation rec {
pname = "knot-dns";
- version = "3.0.4";
+ version = "3.0.5";
src = fetchurl {
url = "https://secure.nic.cz/files/knot-dns/knot-${version}.tar.xz";
- sha256 = "451d8913a769b7e4bcb3e250a3181b448e28a82cfc58cea6f2509475d7327983";
+ sha256 = "695e7d7a0abefc5a8fd01f3b3080f030f33b0948215f84cd4892c6d904390802";
};
outputs = [ "bin" "out" "dev" ];
diff --git a/third_party/nixpkgs/pkgs/servers/fishnet/assets.nix b/third_party/nixpkgs/pkgs/servers/fishnet/assets.nix
index d246159402..b150e8ed63 100644
--- a/third_party/nixpkgs/pkgs/servers/fishnet/assets.nix
+++ b/third_party/nixpkgs/pkgs/servers/fishnet/assets.nix
@@ -9,13 +9,13 @@
# again so that a selection of them can be embedded into the fishnet binary.
stdenv.mkDerivation rec {
pname = "fishnet-assets";
- version = "unstable-2020-01-30";
+ version = "unstable-2020-03-27";
src = fetchFromGitHub {
owner = "niklasf";
repo = pname;
- rev = "acd36ab6ccee67a652b6d84aedc4c2828abac5c6";
- sha256 = "0mh4gh6qij70clp64m4jw6q7dafr7gwjqpvpaf9vc6h10g1rhzrx";
+ rev = "a1fe3ec6074ad9dc43e6d46e0d42fab5d7cce12c";
+ sha256 = "1548wj2bs89b5w42z3c98hpnbln5w8p1909wyl7a63d8vkvnyn5l";
};
relAssetsPath = "share/${pname}";
diff --git a/third_party/nixpkgs/pkgs/servers/fishnet/default.nix b/third_party/nixpkgs/pkgs/servers/fishnet/default.nix
index 8060943fa5..b23a7d1c92 100644
--- a/third_party/nixpkgs/pkgs/servers/fishnet/default.nix
+++ b/third_party/nixpkgs/pkgs/servers/fishnet/default.nix
@@ -12,22 +12,24 @@ let
in
rustPlatform.buildRustPackage rec {
pname = "fishnet";
- version = "2.2.5";
+ version = "2.2.6";
src = fetchFromGitHub {
owner = "niklasf";
repo = pname;
rev = "v${version}";
- sha256 = "0gif9wagm9bzq7j3biasqvzp9lfvmxqr5wagqqybmhbn8ipj20a8";
+ sha256 = "0dmc58wzv758b82pjpfzcfi0hr14hqcr61cd9v5xlgk5w78cisjq";
};
- cargoSha256 = "0hqyh0nzfrm7m34kqixrlbc7w8d0k7v6psw8jg6zpwpfcmhqq15j";
+ cargoSha256 = "08v969b0kvsg4dq3xsb159pr52a0vqr34g48j8nvq13979yq6d8p";
preBuild = ''
rmdir ./assets
ln -snf ${assets}/${assets.relAssetsPath} ./assets
'';
+ passthru.assets = assets;
+
meta = with lib; {
description = "Distributed Stockfish analysis for lichess.org";
homepage = "https://github.com/niklasf/fishnet";
diff --git a/third_party/nixpkgs/pkgs/servers/foundationdb/default.nix b/third_party/nixpkgs/pkgs/servers/foundationdb/default.nix
index 78addfc4aa..b3a876546e 100644
--- a/third_party/nixpkgs/pkgs/servers/foundationdb/default.nix
+++ b/third_party/nixpkgs/pkgs/servers/foundationdb/default.nix
@@ -2,7 +2,7 @@
, lib, fetchurl, fetchpatch, fetchFromGitHub
, cmake, ninja, which, findutils, m4, gawk
-, python, python3, openjdk, mono, libressl, boost
+, python2, python3, openjdk, mono, libressl, boost
}@args:
let
diff --git a/third_party/nixpkgs/pkgs/servers/foundationdb/vsmake.nix b/third_party/nixpkgs/pkgs/servers/foundationdb/vsmake.nix
index aac9ab07c0..e171d71456 100644
--- a/third_party/nixpkgs/pkgs/servers/foundationdb/vsmake.nix
+++ b/third_party/nixpkgs/pkgs/servers/foundationdb/vsmake.nix
@@ -4,7 +4,7 @@
{ gcc6Stdenv, lib, fetchurl, fetchFromGitHub
, which, findutils, m4, gawk
-, python, openjdk, mono, libressl
+, python2, openjdk, mono, libressl
, ...
}:
@@ -51,7 +51,7 @@ let
inherit rev sha256;
};
- nativeBuildInputs = [ python openjdk gawk which m4 findutils mono ];
+ nativeBuildInputs = [ python2 openjdk gawk which m4 findutils mono ];
buildInputs = [ libressl boost ];
inherit patches;
diff --git a/third_party/nixpkgs/pkgs/servers/gemini/agate/default.nix b/third_party/nixpkgs/pkgs/servers/gemini/agate/default.nix
index a5028159b0..48f0b8b75b 100644
--- a/third_party/nixpkgs/pkgs/servers/gemini/agate/default.nix
+++ b/third_party/nixpkgs/pkgs/servers/gemini/agate/default.nix
@@ -2,16 +2,16 @@
rustPlatform.buildRustPackage rec {
pname = "agate";
- version = "2.5.3";
+ version = "3.0.0";
src = fetchFromGitHub {
owner = "mbrubeck";
repo = pname;
rev = "v${version}";
- sha256 = "sha256-EhIBkAPy+sZ629yxJ8GCVhEQx7gQypMFYquGpQJkke0=";
+ sha256 = "sha256-2gtiULRnur8OPjX1/Xp1LTiL8owXt/sQgSGjoS7F9NU=";
};
- cargoSha256 = "sha256-nRrFC/6CgXZR78aJQVw2y2sKUmRpz8Rofo0N4vgeekg=";
+ cargoSha256 = "sha256-MrUmqawXl3kQKFgJ9bWRHIgvit/fQCLMqoL6kXEF9+k=";
buildInputs = lib.optionals stdenv.isDarwin [ Security ];
diff --git a/third_party/nixpkgs/pkgs/servers/home-assistant/component-packages.nix b/third_party/nixpkgs/pkgs/servers/home-assistant/component-packages.nix
index c699830ba6..f41c5556d7 100644
--- a/third_party/nixpkgs/pkgs/servers/home-assistant/component-packages.nix
+++ b/third_party/nixpkgs/pkgs/servers/home-assistant/component-packages.nix
@@ -424,7 +424,7 @@
"kiwi" = ps: with ps; [ ]; # missing inputs: kiwiki-client
"kmtronic" = ps: with ps; [ pykmtronic ];
"knx" = ps: with ps; [ xknx ];
- "kodi" = ps: with ps; [ ]; # missing inputs: pykodi
+ "kodi" = ps: with ps; [ pykodi ];
"konnected" = ps: with ps; [ aiohttp-cors ]; # missing inputs: konnected
"kulersky" = ps: with ps; [ ]; # missing inputs: pykulersky
"kwb" = ps: with ps; [ ]; # missing inputs: pykwb
@@ -766,7 +766,7 @@
"snmp" = ps: with ps; [ pysnmp ];
"sochain" = ps: with ps; [ ]; # missing inputs: python-sochain-api
"socialblade" = ps: with ps; [ ]; # missing inputs: socialbladeclient
- "solaredge" = ps: with ps; [ stringcase ]; # missing inputs: solaredge
+ "solaredge" = ps: with ps; [ solaredge stringcase ];
"solaredge_local" = ps: with ps; [ ]; # missing inputs: solaredge-local
"solarlog" = ps: with ps; [ ]; # missing inputs: sunwatcher
"solax" = ps: with ps; [ solax ];
diff --git a/third_party/nixpkgs/pkgs/servers/home-assistant/default.nix b/third_party/nixpkgs/pkgs/servers/home-assistant/default.nix
index a5949e738b..6260906e0c 100644
--- a/third_party/nixpkgs/pkgs/servers/home-assistant/default.nix
+++ b/third_party/nixpkgs/pkgs/servers/home-assistant/default.nix
@@ -298,6 +298,7 @@ in with py.pkgs; buildPythonApplication rec {
"sensor"
"smarttub"
"smtp"
+ "solaredge"
"sql"
"ssdp"
"stream"
diff --git a/third_party/nixpkgs/pkgs/servers/http/apache-modules/mod_evasive/default.nix b/third_party/nixpkgs/pkgs/servers/http/apache-modules/mod_evasive/default.nix
deleted file mode 100644
index daac483985..0000000000
--- a/third_party/nixpkgs/pkgs/servers/http/apache-modules/mod_evasive/default.nix
+++ /dev/null
@@ -1,35 +0,0 @@
-{ lib, stdenv, fetchurl, apacheHttpd }:
-
-if lib.versionAtLeast (lib.getVersion apacheHttpd) "2.4" then
-
- throw "mod_evasive is not supported on Apache httpd 2.4"
-
-else
-
-stdenv.mkDerivation {
- name = "mod_evasive-1.10.1";
-
- src = fetchurl {
- url = "http://www.zdziarski.com/blog/wp-content/uploads/2010/02/mod_evasive_1.10.1.tar.gz";
- sha256 = "0rsnx50rjv6xygbp9r0gyss7xqdkcb0hy3wh9949jf1im8wm3i07";
- };
-
- buildInputs = [ apacheHttpd ];
-
- buildPhase = ''
- export APACHE_LIBEXECDIR=$out/modules
- export makeFlagsArray=(APACHE_LIBEXECDIR=$out/modules)
- apxs -ca mod_evasive20.c
- '';
-
- installPhase = ''
- mkdir -p $out/modules
- cp .libs/mod_evasive20.so $out/modules
- '';
-
- meta = {
- homepage = "http://www.zdziarski.com/blog/?page_id=442";
- description = "Evasive maneuvers module for Apache to provide evasive action in the event of an HTTP DoS or DDoS attack or brute force attack";
- platforms = lib.platforms.linux;
- };
-}
diff --git a/third_party/nixpkgs/pkgs/servers/http/apache-modules/mod_perl/default.nix b/third_party/nixpkgs/pkgs/servers/http/apache-modules/mod_perl/default.nix
index 04746d678c..2762f636f5 100644
--- a/third_party/nixpkgs/pkgs/servers/http/apache-modules/mod_perl/default.nix
+++ b/third_party/nixpkgs/pkgs/servers/http/apache-modules/mod_perl/default.nix
@@ -1,11 +1,12 @@
{ stdenv, fetchurl, apacheHttpd, perl }:
stdenv.mkDerivation rec {
- name = "mod_perl-2.0.10";
+ pname = "mod_perl";
+ version = "2.0.11";
src = fetchurl {
- url = "mirror://apache/perl/${name}.tar.gz";
- sha256 = "0r1bhzwl5gr0202r6448943hjxsickzn55kdmb7dzad39vnq7kyi";
+ url = "mirror://apache/perl/${pname}-${version}.tar.gz";
+ sha256 = "0x3gq4nz96y202cymgrf56n8spm7bffkd1p74dh9q3zrrlc9wana";
};
buildInputs = [ apacheHttpd perl ];
diff --git a/third_party/nixpkgs/pkgs/servers/http/nginx/generic.nix b/third_party/nixpkgs/pkgs/servers/http/nginx/generic.nix
index 251f099f7d..d249d47a21 100644
--- a/third_party/nixpkgs/pkgs/servers/http/nginx/generic.nix
+++ b/third_party/nixpkgs/pkgs/servers/http/nginx/generic.nix
@@ -1,4 +1,5 @@
{ lib, stdenv, fetchurl, fetchpatch, openssl, zlib, pcre, libxml2, libxslt
+
, nixosTests
, substituteAll, gd, geoip, perl
, withDebug ? false
@@ -55,7 +56,6 @@ stdenv.mkDerivation {
"--with-http_realip_module"
"--with-http_addition_module"
"--with-http_xslt_module"
- "--with-http_geoip_module"
"--with-http_sub_module"
"--with-http_dav_module"
"--with-http_flv_module"
@@ -81,7 +81,6 @@ stdenv.mkDerivation {
"--with-debug"
] ++ optionals withStream [
"--with-stream"
- "--with-stream_geoip_module"
"--with-stream_realip_module"
"--with-stream_ssl_module"
"--with-stream_ssl_preread_module"
@@ -94,6 +93,8 @@ stdenv.mkDerivation {
"--with-perl_modules_path=lib/perl5"
]
++ optional (gd != null) "--with-http_image_filter_module"
+ ++ optional (geoip != null) "--with-http_geoip_module"
+ ++ optional (withStream && geoip != null) "--with-stream_geoip_module"
++ optional (with stdenv.hostPlatform; isLinux || isFreeBSD) "--with-file-aio"
++ configureFlags
++ map (mod: "--add-module=${mod.src}") modules;
diff --git a/third_party/nixpkgs/pkgs/servers/isso/default.nix b/third_party/nixpkgs/pkgs/servers/isso/default.nix
index 4db8ac1f40..3338f8b2a8 100644
--- a/third_party/nixpkgs/pkgs/servers/isso/default.nix
+++ b/third_party/nixpkgs/pkgs/servers/isso/default.nix
@@ -3,14 +3,14 @@
with python3Packages; buildPythonApplication rec {
pname = "isso";
- version = "0.12.4";
+ version = "0.12.5";
# no tests on PyPI
src = fetchFromGitHub {
owner = "posativ";
repo = pname;
rev = version;
- sha256 = "16wjpz8r74fzjvzhl6by3sjc2g1riz8lh59ccgp14bns1yhsh2yi";
+ sha256 = "12ccfba2kwbfm9h4zhlxrcigi98akbdm4qi89iglr4z53ygzpay5";
};
propagatedBuildInputs = [
@@ -23,7 +23,7 @@ with python3Packages; buildPythonApplication rec {
flask-caching
];
- buildInputs = [
+ nativeBuildInputs = [
cffi
];
diff --git a/third_party/nixpkgs/pkgs/servers/ldap/389/default.nix b/third_party/nixpkgs/pkgs/servers/ldap/389/default.nix
index bfa372ed06..90510d5025 100644
--- a/third_party/nixpkgs/pkgs/servers/ldap/389/default.nix
+++ b/third_party/nixpkgs/pkgs/servers/ldap/389/default.nix
@@ -1,5 +1,5 @@
{ lib, stdenv, fetchurl, fetchpatch, autoreconfHook, pkg-config, doxygen, perl, pam, nspr, nss, openldap
-, db, cyrus_sasl, svrcore, icu, net-snmp, kerberos, pcre, perlPackages, libevent, openssl, python
+, db, cyrus_sasl, svrcore, icu, net-snmp, kerberos, pcre, perlPackages, libevent, openssl, python3
}:
stdenv.mkDerivation rec {
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ autoreconfHook pkg-config doxygen ];
buildInputs = [
perl pam nspr nss openldap db cyrus_sasl svrcore icu
- net-snmp kerberos pcre libevent openssl python
+ net-snmp kerberos pcre libevent openssl python3
] ++ (with perlPackages; [ MozillaLdap NetAddrIP DBFile ]);
patches = [
diff --git a/third_party/nixpkgs/pkgs/servers/mail/spamassassin/default.nix b/third_party/nixpkgs/pkgs/servers/mail/spamassassin/default.nix
index 71bcc3fc68..03a135d6c7 100644
--- a/third_party/nixpkgs/pkgs/servers/mail/spamassassin/default.nix
+++ b/third_party/nixpkgs/pkgs/servers/mail/spamassassin/default.nix
@@ -2,11 +2,11 @@
perlPackages.buildPerlPackage rec {
pname = "SpamAssassin";
- version = "3.4.4";
+ version = "3.4.5";
src = fetchurl {
url = "mirror://apache/spamassassin/source/Mail-${pname}-${version}.tar.bz2";
- sha256 = "0ga5mi2nv2v91kakk9xakkg71rnxnddlzv76ca13vfyd4jgcfasf";
+ sha256 = "0qsl18p2swdbq4zizvs9ahl2bkilpcyzq817lk16jj5g4rqzivb7";
};
nativeBuildInputs = [ makeWrapper ];
diff --git a/third_party/nixpkgs/pkgs/servers/monitoring/zabbix/agent2.nix b/third_party/nixpkgs/pkgs/servers/monitoring/zabbix/agent2.nix
new file mode 100644
index 0000000000..c2b6c0bb54
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/servers/monitoring/zabbix/agent2.nix
@@ -0,0 +1,60 @@
+{ lib, buildGoModule, fetchurl, autoreconfHook, pkg-config, libiconv, openssl, pcre, zlib }:
+
+import ./versions.nix ({ version, sha256 }:
+ buildGoModule {
+ pname = "zabbix-agent2";
+ inherit version;
+
+ src = fetchurl {
+ url = "https://cdn.zabbix.com/zabbix/sources/stable/${lib.versions.majorMinor version}/zabbix-${version}.tar.gz";
+ inherit sha256;
+ };
+
+ modRoot = "src/go";
+
+ vendorSha256 = "1ral3xg58x0lf5vl839nlabf443yzqnbrlzm0q127mvv412f5ajc";
+
+ nativeBuildInputs = [ autoreconfHook pkg-config ];
+ buildInputs = [ libiconv openssl pcre zlib ];
+
+ inherit (buildGoModule.go) GOOS GOARCH;
+
+ # need to provide GO* env variables & patch for reproducibility
+ postPatch = ''
+ substituteInPlace src/go/Makefile.am \
+ --replace '`go env GOOS`' "$GOOS" \
+ --replace '`go env GOARCH`' "$GOARCH" \
+ --replace '`date +%H:%M:%S`' "00:00:00" \
+ --replace '`date +"%b %_d %Y"`' "Jan 1 1970"
+ '';
+
+ # manually configure the c dependencies
+ preConfigure = ''
+ ./configure \
+ --prefix=${placeholder "out"} \
+ --enable-agent2 \
+ --with-iconv \
+ --with-libpcre \
+ --with-openssl=${openssl.dev}
+ '';
+
+ # zabbix build process is complex to get right in nix...
+ # use automake to build the go project ensuring proper access to the go vendor directory
+ buildPhase = ''
+ cd ../..
+ make
+ '';
+
+ installPhase = ''
+ install -Dm0644 src/go/conf/zabbix_agent2.conf $out/etc/zabbix_agent2.conf
+ install -Dm0755 src/go/bin/zabbix_agent2 $out/bin/zabbix_agent2
+ '';
+
+ meta = with lib; {
+ description = "An enterprise-class open source distributed monitoring solution (client-side agent)";
+ homepage = "https://www.zabbix.com/";
+ license = licenses.gpl2Plus;
+ maintainers = [ maintainers.aanderse ];
+ platforms = platforms.linux;
+ };
+ })
diff --git a/third_party/nixpkgs/pkgs/servers/monitoring/zabbix/versions.nix b/third_party/nixpkgs/pkgs/servers/monitoring/zabbix/versions.nix
index a19b2432be..b3cdca20b3 100644
--- a/third_party/nixpkgs/pkgs/servers/monitoring/zabbix/versions.nix
+++ b/third_party/nixpkgs/pkgs/servers/monitoring/zabbix/versions.nix
@@ -1,16 +1,16 @@
generic: {
v50 = generic {
- version = "5.0.5";
- sha256 = "104jxyaclx92pyas7kqz357da7qjcw44yx3yi7vqlc7h5ch3avgc";
+ version = "5.0.9";
+ sha256 = "16vwh01hlxmh9qg3d7q1vsmz3bwydk7v7da58d3764ldmh8ag199";
};
v40 = generic {
- version = "4.0.26";
- sha256 = "0mbk8afkwv208hwyl0zr2l4sib65z7n9ykisznk6pjzb9kdl73s1";
+ version = "4.0.29";
+ sha256 = "0qghx7r7rbyya79mfsvr5fqws2d8ffn86zfdkzdrnmyl0x25fr9y";
};
v30 = generic {
- version = "3.0.31";
- sha256 = "0a2jznpmg24lqdqbc9p8i2q6jkz0hx53hh6q12xsvvmq48vi3snm";
+ version = "3.0.32";
+ sha256 = "1n9l0llmifmg5zzh2jzqax8y23ch7250v36bcfkpizvr8wji7xi7";
};
}
diff --git a/third_party/nixpkgs/pkgs/servers/radarr/default.nix b/third_party/nixpkgs/pkgs/servers/radarr/default.nix
index ae01951562..47edb29723 100644
--- a/third_party/nixpkgs/pkgs/servers/radarr/default.nix
+++ b/third_party/nixpkgs/pkgs/servers/radarr/default.nix
@@ -1,12 +1,26 @@
-{ lib, stdenv, fetchurl, mono, libmediainfo, sqlite, curl, makeWrapper }:
+{ lib, stdenv, fetchurl, mono, libmediainfo, sqlite, curl, makeWrapper, icu, dotnetCorePackages, openssl, nixosTests }:
-stdenv.mkDerivation rec {
+let
+ os = if stdenv.isDarwin then "osx" else "linux";
+ arch = {
+ x86_64-linux = "x64";
+ aarch64-linux = "arm64";
+ x86_64-darwin = "x64";
+ }."${stdenv.hostPlatform.system}" or (throw "Unsupported system: ${stdenv.hostPlatform.system}");
+
+ hash = {
+ x64-linux_hash = "sha256-bTh+Z5w5ZkL2iPteStqVcoFDGZIbpVjuXn20TZsfgtY=";
+ arm64-linux_hash = "sha256-aIzVSIRuGNiIFJPToXCQwYsbICKuPtwKATnQhkxvJuA=";
+ x64-osx_hash = "sha256-FxRSAJvRQya2x1kei6yRceGcyQ2mCaFveyeMGw0Jqw4=";
+ }."${arch}-${os}_hash";
+
+in stdenv.mkDerivation rec {
pname = "radarr";
- version = "0.2.0.1504";
+ version = "3.0.2.4552";
src = fetchurl {
- url = "https://github.com/Radarr/Radarr/releases/download/v${version}/Radarr.develop.${version}.linux.tar.gz";
- sha256 = "1h7pqn39vxd0vr1fwrnvfpxv5vhh4zcr0s8h0zvgplay2z6b6bvb";
+ url = "https://github.com/Radarr/Radarr/releases/download/v${version}/Radarr.master.${version}.${os}-core-${arch}.tar.gz";
+ sha256 = hash;
};
nativeBuildInputs = [ makeWrapper ];
@@ -15,17 +29,22 @@ stdenv.mkDerivation rec {
mkdir -p $out/{bin,share/${pname}-${version}}
cp -r * $out/share/${pname}-${version}/.
- makeWrapper "${mono}/bin/mono" $out/bin/Radarr \
- --add-flags "$out/share/${pname}-${version}/Radarr.exe" \
+ makeWrapper "${dotnetCorePackages.netcore_3_1}/bin/dotnet" $out/bin/Radarr \
+ --add-flags "$out/share/${pname}-${version}/Radarr.dll" \
--prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [
- curl sqlite libmediainfo ]}
+ curl sqlite libmediainfo mono openssl icu ]}
'';
+ passthru = {
+ updateScript = ./update.sh;
+ tests.smoke-test = nixosTests.radarr;
+ };
+
meta = with lib; {
description = "A Usenet/BitTorrent movie downloader";
homepage = "https://radarr.video/";
- license = licenses.gpl3;
+ license = licenses.gpl3Only;
maintainers = with maintainers; [ edwtjo purcell ];
- platforms = platforms.all;
+ platforms = [ "x86_64-linux" "aarch64-linux" "x86_64-darwin" ];
};
}
diff --git a/third_party/nixpkgs/pkgs/servers/radarr/update.sh b/third_party/nixpkgs/pkgs/servers/radarr/update.sh
new file mode 100755
index 0000000000..240689eb45
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/servers/radarr/update.sh
@@ -0,0 +1,42 @@
+#!/usr/bin/env nix-shell
+#!nix-shell -i bash -p curl gnused nix-prefetch jq
+
+set -e
+
+dirname="$(dirname "$0")"
+
+updateHash()
+{
+ version=$1
+ arch=$2
+ os=$3
+
+ hashKey="${arch}-${os}_hash"
+
+ url="https://github.com/Radarr/Radarr/releases/download/v$version/Radarr.master.$version.$os-core-$arch.tar.gz"
+ hash=$(nix-prefetch-url --type sha256 $url)
+ sriHash="$(nix to-sri --type sha256 $hash)"
+
+ sed -i "s|$hashKey = \"[a-zA-Z0-9\/+-=]*\";|$hashKey = \"$sriHash\";|g" "$dirname/default.nix"
+}
+
+updateVersion()
+{
+ sed -i "s/version = \"[0-9.]*\";/version = \"$1\";/g" "$dirname/default.nix"
+}
+
+currentVersion=$(cd $dirname && nix eval --raw '(with import ../../.. {}; radarr.version)')
+
+latestTag=$(curl https://api.github.com/repos/Radarr/Radarr/releases/latest | jq -r ".tag_name")
+latestVersion="$(expr $latestTag : 'v\(.*\)')"
+
+if [[ "$currentVersion" == "$latestVersion" ]]; then
+ echo "Radarr is up-to-date: ${currentVersion}"
+ exit 0
+fi
+
+updateVersion $latestVersion
+
+updateHash $latestVersion x64 linux
+updateHash $latestVersion arm64 linux
+updateHash $latestVersion x64 osx
diff --git a/third_party/nixpkgs/pkgs/servers/rippled/default.nix b/third_party/nixpkgs/pkgs/servers/rippled/default.nix
index 0b2a0e38f0..6bedb891b5 100644
--- a/third_party/nixpkgs/pkgs/servers/rippled/default.nix
+++ b/third_party/nixpkgs/pkgs/servers/rippled/default.nix
@@ -1,5 +1,5 @@
{ lib, stdenv, fetchgit, fetchurl, git, cmake, pkg-config
-, openssl, zlib, boost, grpc, c-ares, abseil-cpp, protobuf3_8, libnsl }:
+, openssl, boost, grpc, abseil-cpp, protobuf3_8, libnsl }:
let
sqlite3 = fetchurl rec {
@@ -130,7 +130,7 @@ in stdenv.mkDerivation rec {
cmakeFlags = ["-Dstatic=OFF" "-DBoost_NO_BOOST_CMAKE=ON"];
nativeBuildInputs = [ pkg-config cmake git ];
- buildInputs = [ openssl openssl.dev boostSharedStatic zlib grpc c-ares c-ares.cmake-config abseil-cpp protobuf3_8 libnsl ];
+ buildInputs = [ openssl openssl.dev boostSharedStatic grpc abseil-cpp protobuf3_8 libnsl ];
preConfigure = ''
export HOME=$PWD
diff --git a/third_party/nixpkgs/pkgs/servers/rtsp-simple-server/default.nix b/third_party/nixpkgs/pkgs/servers/rtsp-simple-server/default.nix
index cf96edfe96..ada7ea1c22 100644
--- a/third_party/nixpkgs/pkgs/servers/rtsp-simple-server/default.nix
+++ b/third_party/nixpkgs/pkgs/servers/rtsp-simple-server/default.nix
@@ -5,16 +5,16 @@
buildGoModule rec {
pname = "rtsp-simple-server";
- version = "0.15.0";
+ version = "0.15.1";
src = fetchFromGitHub {
owner = "aler9";
repo = pname;
rev = "v${version}";
- sha256 = "sha256-U0wZ0NrvCQjMLDDjO6Jf6uu5FlHar7Td2zhoU2+MMkM=";
+ sha256 = "sha256-uahgIphp2/iE11v33sPNrm0evz6dQvzjEQ9uMVEuTTI=";
};
- vendorSha256 = "sha256-dfAuq4iw3NQ4xaabPv7MQ88CYXgivRBeyvbmJ3SSjbI=";
+ vendorSha256 = "sha256-nAeP9ZmYu5VPKR628aJVNS8t41V/AYkgwOcO/d0nQv4=";
# Tests need docker
doCheck = false;
diff --git a/third_party/nixpkgs/pkgs/servers/sonarr/default.nix b/third_party/nixpkgs/pkgs/servers/sonarr/default.nix
index a1803abe6a..cdaa96464e 100644
--- a/third_party/nixpkgs/pkgs/servers/sonarr/default.nix
+++ b/third_party/nixpkgs/pkgs/servers/sonarr/default.nix
@@ -1,12 +1,12 @@
-{ lib, stdenv, fetchurl, mono, libmediainfo, sqlite, curl, makeWrapper, ... }:
+{ lib, stdenv, fetchurl, mono, libmediainfo, sqlite, curl, makeWrapper, nixosTests }:
stdenv.mkDerivation rec {
pname = "sonarr";
- version = "2.0.0.5344";
+ version = "3.0.5.1144";
src = fetchurl {
- url = "https://download.sonarr.tv/v2/master/mono/NzbDrone.master.${version}.mono.tar.gz";
- sha256 = "0bsxf7m2dir7gi0cfn8vdasr11q224b9mp6cixak9ss5zafwn59a";
+ url = "https://download.sonarr.tv/v3/main/${version}/Sonarr.main.${version}.linux.tar.gz";
+ sha256 = "1ajqh3hvjfsbs6rb2f8dnndxsycmlzamp0cwjwkh1j2dinbzdbvp";
};
nativeBuildInputs = [ makeWrapper ];
@@ -14,17 +14,21 @@ stdenv.mkDerivation rec {
installPhase = ''
mkdir -p $out/bin
cp -r * $out/bin/
-
makeWrapper "${mono}/bin/mono" $out/bin/NzbDrone \
- --add-flags "$out/bin/NzbDrone.exe" \
+ --add-flags "$out/bin/Sonarr.exe" \
--prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [
curl sqlite libmediainfo ]}
'';
+ passthru = {
+ updateScript = "./update.sh";
+ tests.smoke-test = nixosTests.sonarr;
+ };
+
meta = {
description = "Smart PVR for newsgroup and bittorrent users";
homepage = "https://sonarr.tv/";
- license = lib.licenses.gpl3;
+ license = lib.licenses.gpl3Only;
maintainers = with lib.maintainers; [ fadenb purcell ];
platforms = lib.platforms.all;
};
diff --git a/third_party/nixpkgs/pkgs/servers/sonarr/update.sh b/third_party/nixpkgs/pkgs/servers/sonarr/update.sh
new file mode 100755
index 0000000000..faa4f65cfc
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/servers/sonarr/update.sh
@@ -0,0 +1,7 @@
+#!/usr/bin/env nix-shell
+#!nix-shell -i bash -p curl jq common-updater-scripts
+
+latestTag=$(curl https://api.github.com/repos/Sonarr/Sonarr/tags | jq -r '.[] | .name' | sort --version-sort | tail -1)
+version="$(expr $latestTag : 'v\(.*\)')"
+
+update-source-version sonarr "$version"
diff --git a/third_party/nixpkgs/pkgs/servers/sql/postgresql/ext/pg_auto_failover.nix b/third_party/nixpkgs/pkgs/servers/sql/postgresql/ext/pg_auto_failover.nix
index 7459da6d6c..ad1d25a3ce 100644
--- a/third_party/nixpkgs/pkgs/servers/sql/postgresql/ext/pg_auto_failover.nix
+++ b/third_party/nixpkgs/pkgs/servers/sql/postgresql/ext/pg_auto_failover.nix
@@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "pg_auto_failover";
- version = "1.4.2";
+ version = "1.5.1";
src = fetchFromGitHub {
owner = "citusdata";
repo = pname;
rev = "v${version}";
- sha256 = "030vm83ksfi4daypr4hamvvfs4g1ckww4ldg7rrk6c6hqkppykpa";
+ sha256 = "14bh3cqkdd1z16iy0lmv8a3f8gmmink1nzhf5jhkd0n6g7r65p6d";
};
buildInputs = [ postgresql openssl zlib readline ];
@@ -23,6 +23,7 @@ stdenv.mkDerivation rec {
meta = with lib; {
description = "PostgreSQL extension and service for automated failover and high-availability";
homepage = "https://github.com/citusdata/pg_auto_failover";
+ changelog = "https://github.com/citusdata/pg_auto_failover/raw/v${version}/CHANGELOG.md";
maintainers = [ maintainers.marsam ];
platforms = postgresql.meta.platforms;
license = licenses.postgresql;
diff --git a/third_party/nixpkgs/pkgs/servers/swego/default.nix b/third_party/nixpkgs/pkgs/servers/swego/default.nix
index 92c31ead6c..c71d705a00 100644
--- a/third_party/nixpkgs/pkgs/servers/swego/default.nix
+++ b/third_party/nixpkgs/pkgs/servers/swego/default.nix
@@ -6,13 +6,13 @@
buildGoModule rec {
pname = "swego";
- version = "0.93";
+ version = "0.94";
src = fetchFromGitHub {
owner = "nodauf";
repo = "Swego";
rev = "v${version}";
- sha256 = "sha256-oTeSh7OzjzbgKbSQSNhnCUZw5FdUkN+Y9LkIbWFhn5c=";
+ sha256 = "sha256-PquedlfBzNSXa3l6IIHlf6Xb4M4uEb1XCKRfN229IEA=";
};
vendorSha256 = "sha256-TK1LN9EmVH95jPO6K7gtCwdnW4WOKH3K7Q0FhgNMVUQ=";
diff --git a/third_party/nixpkgs/pkgs/servers/traefik/default.nix b/third_party/nixpkgs/pkgs/servers/traefik/default.nix
index 6053b09731..ca8d7d7412 100644
--- a/third_party/nixpkgs/pkgs/servers/traefik/default.nix
+++ b/third_party/nixpkgs/pkgs/servers/traefik/default.nix
@@ -2,15 +2,15 @@
buildGoModule rec {
pname = "traefik";
- version = "2.4.7";
+ version = "2.4.8";
src = fetchzip {
url = "https://github.com/traefik/traefik/releases/download/v${version}/traefik-v${version}.src.tar.gz";
- sha256 = "sha256-K1uSfsi/uC41ukDGaWaYIKX6A+SU59x3a/DYip9/LPI=";
+ sha256 = "sha256-hCBhJazI0Y1qQjULF+CBfUfz6PvkgLXafvXKR6iKHmU=";
stripRoot = false;
};
- vendorSha256 = "sha256-MCQbSy2TOSkZoqC2POIq8mDRld4fe245m0Xe0drxEq8=";
+ vendorSha256 = "sha256-MW/JG4TbUvbo4dQnQbKIbLlLgkQvOqsfagpXILJ/BYQ=";
doCheck = false;
diff --git a/third_party/nixpkgs/pkgs/servers/web-apps/wiki-js/default.nix b/third_party/nixpkgs/pkgs/servers/web-apps/wiki-js/default.nix
new file mode 100644
index 0000000000..974b7a62e5
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/servers/web-apps/wiki-js/default.nix
@@ -0,0 +1,32 @@
+{ stdenv, fetchurl, lib, nixosTests }:
+
+stdenv.mkDerivation rec {
+ pname = "wiki-js";
+ version = "2.5.197";
+
+ src = fetchurl {
+ url = "https://github.com/Requarks/wiki/releases/download/${version}/${pname}.tar.gz";
+ sha256 = "sha256-0xM9BtQvSt5WkbKBri+KxB+Ghc4wgY8/TUgI6PCFmm0=";
+ };
+
+ sourceRoot = ".";
+
+ dontBuild = true;
+ installPhase = ''
+ runHook preInstall
+
+ mkdir $out
+ cp -r . $out
+
+ runHook postInstall
+ '';
+
+ passthru.tests = { inherit (nixosTests) wiki-js; };
+
+ meta = with lib; {
+ homepage = "https://js.wiki/";
+ description = "A modern and powerful wiki app built on Node.js";
+ license = licenses.agpl3Only;
+ maintainers = with maintainers; [ ma27 ];
+ };
+}
diff --git a/third_party/nixpkgs/pkgs/servers/web-apps/wordpress/default.nix b/third_party/nixpkgs/pkgs/servers/web-apps/wordpress/default.nix
index 0fae5ac228..330470f0fd 100644
--- a/third_party/nixpkgs/pkgs/servers/web-apps/wordpress/default.nix
+++ b/third_party/nixpkgs/pkgs/servers/web-apps/wordpress/default.nix
@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "wordpress";
- version = "5.5.3";
+ version = "5.6.2";
src = fetchurl {
url = "https://wordpress.org/${pname}-${version}.tar.gz";
- sha256 = "sTkmdr9Mulw7XwNEMJBU81rwNV/agNpBjCznGuObrtQ=";
+ sha256 = "sha256-W9/U3i6jALXolDFraiI/a+PNPoNHim0rZHzaqSy4gkI=";
};
installPhase = ''
diff --git a/third_party/nixpkgs/pkgs/servers/xandikos/default.nix b/third_party/nixpkgs/pkgs/servers/xandikos/default.nix
index 60480b3ac2..b29151911a 100644
--- a/third_party/nixpkgs/pkgs/servers/xandikos/default.nix
+++ b/third_party/nixpkgs/pkgs/servers/xandikos/default.nix
@@ -1,18 +1,18 @@
{ lib
, fetchFromGitHub
, python3Packages
-, installShellFiles
+, nixosTests
}:
python3Packages.buildPythonApplication rec {
pname = "xandikos";
- version = "0.2.5";
+ version = "0.2.6";
src = fetchFromGitHub {
owner = "jelmer";
repo = "xandikos";
rev = "v${version}";
- sha256 = "sha256-/pr8ZqgYk24CdJNAETCDF4ZtufXkVEu1Zw25PcPEo7M=";
+ sha256 = "sha256-Epy6NWtRY2Oj4MHTStdv8ZJ5SvSmUo6IlwL5PJV9pD0=";
};
propagatedBuildInputs = with python3Packages; [
@@ -25,11 +25,7 @@ python3Packages.buildPythonApplication rec {
prometheus_client
];
- nativeBuildInputs = [ installShellFiles ];
-
- postInstall = ''
- installManPage xandikos.1
- '';
+ passthru.tests.xandikos = nixosTests.xandikos;
meta = with lib; {
description = "Lightweight CalDAV/CardDAV server";
diff --git a/third_party/nixpkgs/pkgs/shells/bash/5.1.nix b/third_party/nixpkgs/pkgs/shells/bash/5.1.nix
index 5dd060db7e..d234b18e6c 100644
--- a/third_party/nixpkgs/pkgs/shells/bash/5.1.nix
+++ b/third_party/nixpkgs/pkgs/shells/bash/5.1.nix
@@ -45,7 +45,7 @@ stdenv.mkDerivation rec {
-DSSH_SOURCE_BASHRC
'';
- patchFlags = [ "-p0" "-T" ];
+ patchFlags = [ "-p0" ];
patches = upstreamPatches
++ [ ./pgrp-pipe-5.1.patch ];
diff --git a/third_party/nixpkgs/pkgs/shells/bash/pgrp-pipe-5.1.patch b/third_party/nixpkgs/pkgs/shells/bash/pgrp-pipe-5.1.patch
index 2a9fa6f33c..478327cafc 100644
--- a/third_party/nixpkgs/pkgs/shells/bash/pgrp-pipe-5.1.patch
+++ b/third_party/nixpkgs/pkgs/shells/bash/pgrp-pipe-5.1.patch
@@ -14,18 +14,3 @@ diff -u ./configure ../bash-5.0-fixed/configure
netbsd*|openbsd*) LOCAL_CFLAGS="-DDEV_FD_STAT_BROKEN" ;;
*qnx[67]*) LOCAL_LIBS="-lncurses" ;;
*qnx*) LOCAL_CFLAGS="-Dqnx -F -3s" LOCAL_LDFLAGS="-3s" LOCAL_LIBS="-lunix -lncurses" ;;
-diff -u ./configure.ac ../bash-5.0-fixed/configure.ac
---- ./configure.ac 2019-01-02 15:39:11.000000000 +0100
-+++ ../bash-5.0-fixed/configure.ac 2019-01-02 15:39:11.000000000 +0100
-@@ -1108,10 +1108,7 @@
- solaris2*) LOCAL_CFLAGS=-DSOLARIS ;;
- lynxos*) LOCAL_CFLAGS=-DRECYCLES_PIDS ;;
- linux*) LOCAL_LDFLAGS=-rdynamic # allow dynamic loading
-- case "`uname -r`" in
-- 1.*|2.[[0123]]*) : ;;
-- *) AC_DEFINE(PGRP_PIPE) ;;
-- esac ;;
-+ AC_DEFINE(PGRP_PIPE) ;;
- netbsd*|openbsd*) LOCAL_CFLAGS="-DDEV_FD_STAT_BROKEN" ;;
- *qnx[[67]]*) LOCAL_LIBS="-lncurses" ;;
- *qnx*) LOCAL_CFLAGS="-Dqnx -F -3s" LOCAL_LDFLAGS="-3s" LOCAL_LIBS="-lunix -lncurses" ;;
diff --git a/third_party/nixpkgs/pkgs/shells/oil/default.nix b/third_party/nixpkgs/pkgs/shells/oil/default.nix
index 0c508d0e29..78cef0df26 100644
--- a/third_party/nixpkgs/pkgs/shells/oil/default.nix
+++ b/third_party/nixpkgs/pkgs/shells/oil/default.nix
@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "oil";
- version = "0.8.7";
+ version = "0.8.8";
src = fetchurl {
url = "https://www.oilshell.org/download/oil-${version}.tar.xz";
- sha256 = "sha256-KcXu1u/MvvbCLb5a7D09NvfJPaeo0c8Z/Czuk7XR23M=";
+ sha256 = "sha256-J9aNuw72qufoVY6VnbdpCtpcI6GAI7ON10XGEJuqieI=";
};
postPatch = ''
diff --git a/third_party/nixpkgs/pkgs/shells/xonsh/default.nix b/third_party/nixpkgs/pkgs/shells/xonsh/default.nix
index 53bd137ddf..a2cc420662 100644
--- a/third_party/nixpkgs/pkgs/shells/xonsh/default.nix
+++ b/third_party/nixpkgs/pkgs/shells/xonsh/default.nix
@@ -8,14 +8,14 @@
python3Packages.buildPythonApplication rec {
pname = "xonsh";
- version = "0.9.24";
+ version = "0.9.27";
# fetch from github because the pypi package ships incomplete tests
src = fetchFromGitHub {
owner = "xonsh";
repo = "xonsh";
rev = version;
- sha256 = "1nk7kbiv7jzmr6narsnr0nyzkhlc7xw3b2bksyq2j6nda67b9b3y";
+ sha256 = "09w6bl3qsygfs2ph2r423ndnbd74bzf67vp8587h2dkkfxlzjbad";
};
LC_ALL = "en_US.UTF-8";
@@ -34,7 +34,7 @@ python3Packages.buildPythonApplication rec {
doCheck = !stdenv.isDarwin;
checkPhase = ''
- HOME=$TMPDIR pytest -k 'not test_repath_backslash and not test_os and not test_man_completion and not test_builtins and not test_main and not test_ptk_highlight and not test_pyghooks'
+ HOME=$TMPDIR pytest -k 'not test_repath_backslash and not test_os and not test_man_completion and not test_builtins and not test_main and not test_ptk_highlight and not test_pyghooks and not test_command_pipeline_capture and not test_git_dirty_working_directory_includes_untracked and not test_dirty_working_directory and not test_vc_get_branch'
HOME=$TMPDIR pytest -k 'test_builtins or test_main' --reruns 5
HOME=$TMPDIR pytest -k 'test_ptk_highlight'
'';
@@ -46,7 +46,7 @@ python3Packages.buildPythonApplication rec {
meta = with lib; {
description = "A Python-ish, BASHwards-compatible shell";
homepage = "https://xon.sh/";
- changelog = "https://github.com/xonsh/xonsh/releases/tag/${version}";
+ changelog = "https://github.com/xonsh/xonsh/raw/${version}/CHANGELOG.rst";
license = licenses.bsd3;
maintainers = with maintainers; [ spwhitt vrthra ];
platforms = platforms.all;
diff --git a/third_party/nixpkgs/pkgs/stdenv/generic/make-derivation.nix b/third_party/nixpkgs/pkgs/stdenv/generic/make-derivation.nix
index 19c3d8965a..2b89b37f78 100644
--- a/third_party/nixpkgs/pkgs/stdenv/generic/make-derivation.nix
+++ b/third_party/nixpkgs/pkgs/stdenv/generic/make-derivation.nix
@@ -106,7 +106,12 @@ in rec {
++ depsTargetTarget ++ depsTargetTargetPropagated) == 0;
dontAddHostSuffix = attrs ? outputHash && !noNonNativeDeps || (stdenv.noCC or false);
supportedHardeningFlags = [ "fortify" "stackprotector" "pie" "pic" "strictoverflow" "format" "relro" "bindnow" ];
- defaultHardeningFlags = if stdenv.hostPlatform.isMusl
+ # Musl-based platforms will keep "pie", other platforms will not.
+ defaultHardeningFlags = if stdenv.hostPlatform.isMusl &&
+ # Except when:
+ # - static aarch64, where compilation works, but produces segfaulting dynamically linked binaries.
+ # - static armv7l, where compilation fails.
+ !((stdenv.hostPlatform.isAarch64 || stdenv.hostPlatform.isAarch32) && stdenv.hostPlatform.isStatic)
then supportedHardeningFlags
else lib.remove "pie" supportedHardeningFlags;
enabledHardeningOptions =
diff --git a/third_party/nixpkgs/pkgs/tools/X11/xkeysnail/default.nix b/third_party/nixpkgs/pkgs/tools/X11/xkeysnail/default.nix
index fa52a714c7..2d66405904 100644
--- a/third_party/nixpkgs/pkgs/tools/X11/xkeysnail/default.nix
+++ b/third_party/nixpkgs/pkgs/tools/X11/xkeysnail/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, fetchFromGitHub, makeWrapper, python3Packages }:
+{ lib, fetchFromGitHub, makeWrapper, python3Packages }:
python3Packages.buildPythonApplication rec {
pname = "xkeysnail";
diff --git a/third_party/nixpkgs/pkgs/tools/admin/aws-lambda-runtime-interface-emulator/default.nix b/third_party/nixpkgs/pkgs/tools/admin/aws-lambda-runtime-interface-emulator/default.nix
new file mode 100644
index 0000000000..84372423d6
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/tools/admin/aws-lambda-runtime-interface-emulator/default.nix
@@ -0,0 +1,25 @@
+{ lib, buildGoModule, fetchFromGitHub }:
+
+buildGoModule rec {
+ pname = "aws-lambda-runtime-interface-emulator";
+ version = "1.0";
+
+ src = fetchFromGitHub {
+ owner = "aws";
+ repo = "aws-lambda-runtime-interface-emulator";
+ rev = "v${version}";
+ sha256 = "sha256-vbVygZzLlJlxaRF/LIqSJP0gZGyu1wSSdeVjILl/OJE=";
+ };
+
+ vendorSha256 = "sha256-WcvYPGgkrK7Zs5IplAoUTay5ys9LrDJHpRN3ywEdWRM=";
+
+ # disabled because I lack the skill
+ doCheck = false;
+
+ meta = with lib; {
+ description = "To locally test their Lambda function packaged as a container image.";
+ homepage = "https://github.com/aws/aws-lambda-runtime-interface-emulator";
+ license = licenses.asl20;
+ maintainers = with maintainers; [ teto ];
+ };
+}
diff --git a/third_party/nixpkgs/pkgs/tools/admin/awscli/default.nix b/third_party/nixpkgs/pkgs/tools/admin/awscli/default.nix
index e9d2bb713d..173bf13295 100644
--- a/third_party/nixpkgs/pkgs/tools/admin/awscli/default.nix
+++ b/third_party/nixpkgs/pkgs/tools/admin/awscli/default.nix
@@ -28,11 +28,11 @@ let
in
with py.pkgs; buildPythonApplication rec {
pname = "awscli";
- version = "1.19.33"; # N.B: if you change this, change botocore and boto3 to a matching version too
+ version = "1.19.39"; # N.B: if you change this, change botocore and boto3 to a matching version too
src = fetchPypi {
inherit pname version;
- sha256 = "sha256-Rz0aZTsFV3RAdH04d3jvvqi1wFuIIx3SFddONhM8c8E=";
+ sha256 = "sha256-qX8ThQwvwc5wGud5Q4KqO24kGdqvi3oK7K71O5aeJeQ=";
};
# https://github.com/aws/aws-cli/issues/4837
diff --git a/third_party/nixpkgs/pkgs/tools/admin/chkcrontab/default.nix b/third_party/nixpkgs/pkgs/tools/admin/chkcrontab/default.nix
index bbf8d7eaeb..d91894f000 100644
--- a/third_party/nixpkgs/pkgs/tools/admin/chkcrontab/default.nix
+++ b/third_party/nixpkgs/pkgs/tools/admin/chkcrontab/default.nix
@@ -1,6 +1,6 @@
-{ python, lib }:
+{ python3, lib }:
-with python.pkgs;
+with python3.pkgs;
buildPythonApplication rec {
pname = "chkcrontab";
diff --git a/third_party/nixpkgs/pkgs/tools/admin/clair/default.nix b/third_party/nixpkgs/pkgs/tools/admin/clair/default.nix
index 1ab4795dd6..93b5433fcc 100644
--- a/third_party/nixpkgs/pkgs/tools/admin/clair/default.nix
+++ b/third_party/nixpkgs/pkgs/tools/admin/clair/default.nix
@@ -2,16 +2,16 @@
buildGoModule rec {
pname = "clair";
- version = "4.0.3";
+ version = "4.0.4";
src = fetchFromGitHub {
owner = "quay";
repo = pname;
rev = "v${version}";
- sha256 = "sha256-ztp3t55EOUQqTAEUZtHvHK8nTTVOAmYR9vN2hXLhpVw=";
+ sha256 = "sha256-KY9POvwmyUVx9jcn02Ltcz2a1ULqyKW73A9Peb6rpYE=";
};
- vendorSha256 = "sha256-+0jp/TvUjpeJJxEs2drVkUb/ua9qqqxome4M9TkpfP4=";
+ vendorSha256 = "sha256-+p3ucnvgOpSLS/uP9RAkWixCkaDoF64qCww013jPqSs=";
doCheck = false;
diff --git a/third_party/nixpkgs/pkgs/tools/admin/exoscale-cli/default.nix b/third_party/nixpkgs/pkgs/tools/admin/exoscale-cli/default.nix
index 89b9682460..514b16eca8 100644
--- a/third_party/nixpkgs/pkgs/tools/admin/exoscale-cli/default.nix
+++ b/third_party/nixpkgs/pkgs/tools/admin/exoscale-cli/default.nix
@@ -2,13 +2,13 @@
buildGoPackage rec {
pname = "exoscale-cli";
- version = "1.24.0";
+ version = "1.26.0";
src = fetchFromGitHub {
owner = "exoscale";
repo = "cli";
rev = "v${version}";
- sha256 = "sha256-uriXZ4fEUswSBh9hv122wkAPHOnmt6+AodKkCHAMSh8=";
+ sha256 = "sha256-vYezpO5Oe5KXmCx6D70GMKamhK8/EiaV2BPb0tQLDzg=";
};
goPackagePath = "github.com/exoscale/cli";
diff --git a/third_party/nixpkgs/pkgs/tools/admin/fioctl/default.nix b/third_party/nixpkgs/pkgs/tools/admin/fioctl/default.nix
new file mode 100644
index 0000000000..2c04eef216
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/tools/admin/fioctl/default.nix
@@ -0,0 +1,28 @@
+{ lib, buildGoModule, fetchFromGitHub }:
+
+buildGoModule rec {
+ pname = "fioctl";
+ version = "0.14.1";
+
+ src = fetchFromGitHub {
+ owner = "foundriesio";
+ repo = "fioctl";
+ rev = "v${version}";
+ sha256 = "1jbj2w2s78wcnrwyr80jyc11ipjysv5aab3486kphx8ysvvgcwfs";
+ };
+
+ vendorSha256 = "1a3x6cv18f0n01f4ac1kprzmby8dphygnwsdl98pmzs3gqqnh284";
+
+ runVend = true;
+
+ buildFlagsArray = ''
+ -ldflags=-s -w -X github.com/foundriesio/fioctl/subcommands/version.Commit=${src.rev}
+ '';
+
+ meta = with lib; {
+ description = "A simple CLI to manage your Foundries Factory ";
+ homepage = "https://github.com/foundriesio/fioctl";
+ license = licenses.asl20;
+ maintainers = with maintainers; [ nixinator matthewcroughan ];
+ };
+}
diff --git a/third_party/nixpkgs/pkgs/tools/admin/procs/default.nix b/third_party/nixpkgs/pkgs/tools/admin/procs/default.nix
index 022496cbd5..1f86affa8c 100644
--- a/third_party/nixpkgs/pkgs/tools/admin/procs/default.nix
+++ b/third_party/nixpkgs/pkgs/tools/admin/procs/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchFromGitHub, rustPlatform, installShellFiles, Security }:
+{ lib, stdenv, fetchFromGitHub, rustPlatform, installShellFiles, Security, libiconv }:
rustPlatform.buildRustPackage rec {
pname = "procs";
@@ -22,7 +22,7 @@ rustPlatform.buildRustPackage rec {
done
'';
- buildInputs = lib.optional stdenv.isDarwin Security;
+ buildInputs = lib.optionals stdenv.isDarwin [ Security libiconv ];
meta = with lib; {
description = "A modern replacement for ps written in Rust";
diff --git a/third_party/nixpkgs/pkgs/tools/admin/salt/default.nix b/third_party/nixpkgs/pkgs/tools/admin/salt/default.nix
index 9a2d8e52fd..7df6e94e46 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 = "3002.5";
+ version = "3002.6";
src = python3.pkgs.fetchPypi {
inherit pname version;
- sha256 = "1bqranhanxcxjc1qcc6cm95f4xxag0ic9g61dq352hqh6m1l1ay8";
+ sha256 = "/8R4VpNj4dF7ajoMQh6q6cB5u+q8THcloiLQ+/kDoKU=";
};
propagatedBuildInputs = with python3.pkgs; [
diff --git a/third_party/nixpkgs/pkgs/tools/admin/stripe-cli/default.nix b/third_party/nixpkgs/pkgs/tools/admin/stripe-cli/default.nix
index 347a936c3a..dd75474215 100644
--- a/third_party/nixpkgs/pkgs/tools/admin/stripe-cli/default.nix
+++ b/third_party/nixpkgs/pkgs/tools/admin/stripe-cli/default.nix
@@ -2,16 +2,16 @@
buildGoModule rec {
pname = "stripe-cli";
- version = "1.5.10";
+ version = "1.5.11";
src = fetchFromGitHub {
owner = "stripe";
repo = pname;
rev = "v${version}";
- sha256 = "sha256-cedreUdLjUONA8iVlQ/OfOJtM8EgCI8zaKDCbruUIVo=";
+ sha256 = "sha256-aoflV4C7eH0RNdq8j7kPeAfnOEZECmfZ91/QBQy7oxY=";
};
- vendorSha256 = "sha256-hYvW5xAbnxOEapFc70wOF9ybbDv7hLGljKqHI+1Itaw=";
+ vendorSha256 = "sha256-e7EZ5o30vDpS904/R1y7/Mds7HxQNmsIftrnc1Bj2bc=";
subPackages = [
"cmd/stripe"
diff --git a/third_party/nixpkgs/pkgs/tools/archivers/rpm2targz/default.nix b/third_party/nixpkgs/pkgs/tools/archivers/rpm2targz/default.nix
index ac5b132d7a..1c4730c8de 100644
--- a/third_party/nixpkgs/pkgs/tools/archivers/rpm2targz/default.nix
+++ b/third_party/nixpkgs/pkgs/tools/archivers/rpm2targz/default.nix
@@ -10,18 +10,7 @@
, zstd
}:
-let
- shdeps = [
- bzip2
- coreutils
- cpio
- gnutar
- gzip
- xz
- zstd
- ];
-
-in stdenv.mkDerivation rec {
+stdenv.mkDerivation rec {
pname = "rpm2targz";
version = "2021.03.16";
@@ -31,9 +20,17 @@ in stdenv.mkDerivation rec {
hash = "sha256-rcV+o9V2wWKznqSW2rA8xgnpQ02kpK4te6mYvLRC5vQ=";
};
- buildInputs = shdeps;
-
- postPatch = ''
+ postPatch = let
+ shdeps = [
+ bzip2
+ coreutils
+ cpio
+ gnutar
+ gzip
+ xz
+ zstd
+ ];
+ in ''
substituteInPlace rpm2targz --replace "=\"rpmoffset\"" "=\"$out/bin/rpmoffset\""
# rpm2targz relies on the executable name
# to guess what compressor it should use
@@ -41,9 +38,7 @@ in stdenv.mkDerivation rec {
sed -i -e '2iexport PATH="${lib.makeBinPath shdeps}"' rpm2targz
'';
- preBuild = ''
- makeFlagsArray+=(prefix=$out)
- '';
+ installFlags = [ "prefix=$(out)" ];
meta = with lib; {
description = "Convert a .rpm file to a .tar.gz archive";
diff --git a/third_party/nixpkgs/pkgs/tools/audio/abcmidi/default.nix b/third_party/nixpkgs/pkgs/tools/audio/abcmidi/default.nix
index 3937a6d65e..26484b436c 100644
--- a/third_party/nixpkgs/pkgs/tools/audio/abcmidi/default.nix
+++ b/third_party/nixpkgs/pkgs/tools/audio/abcmidi/default.nix
@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "abcMIDI";
- version = "2021.03.10";
+ version = "2021.03.27";
src = fetchzip {
url = "https://ifdo.ca/~seymour/runabc/${pname}-${version}.zip";
- sha256 = "1g4a5b17jbra1c59fpsv1d1jrdsjwg5mw54qilrm12nw7yh9lihf";
+ sha256 = "sha256-dOUdxH1jJUr9MkU6mf0nwbjY5NYUJpHGkjUZWbRSGsw=";
};
meta = with lib; {
diff --git a/third_party/nixpkgs/pkgs/tools/audio/beets/default.nix b/third_party/nixpkgs/pkgs/tools/audio/beets/default.nix
index a3eedf3ea4..ef47578ac5 100644
--- a/third_party/nixpkgs/pkgs/tools/audio/beets/default.nix
+++ b/third_party/nixpkgs/pkgs/tools/audio/beets/default.nix
@@ -73,7 +73,7 @@ let
};
pluginsWithoutDeps = [
- "bench" "bpd" "bpm" "bucket" "cue" "duplicates" "edit" "embedart"
+ "bareasc" "bench" "bpd" "bpm" "bucket" "duplicates" "edit" "embedart"
"export" "filefilter" "fish" "freedesktop" "fromfilename" "ftintitle" "fuzzy"
"hook" "ihate" "importadded" "importfeeds" "info" "inline" "ipfs"
"mbcollection" "mbsubmit" "mbsync" "metasync" "missing" "parentwork" "permissions" "play"
@@ -105,13 +105,13 @@ in pythonPackages.buildPythonApplication rec {
# unstable does not require bs1770gain[2].
# [1]: https://discourse.beets.io/t/forming-a-beets-core-team/639
# [2]: https://github.com/NixOS/nixpkgs/pull/90504
- version = "unstable-2021-03-08";
+ version = "unstable-2021-03-24";
src = fetchFromGitHub {
owner = "beetbox";
repo = "beets";
- rev = "debd382837ef1d30574c2234710d536bb299f979";
- sha256 = "sha256-I6ejW3f72fdzWoz7g4n8pDYz2NiHGrorLegUQhQOSiI=";
+ rev = "854b4ab48324afe8884fcd11fa47bd6258d2f4f7";
+ sha256 = "sha256-y5EWVNF4bd9fNvU6VkucMpenyFZuqdPkrqQDgG9ZPJY=";
};
propagatedBuildInputs = [
diff --git a/third_party/nixpkgs/pkgs/tools/audio/botamusique/default.nix b/third_party/nixpkgs/pkgs/tools/audio/botamusique/default.nix
new file mode 100644
index 0000000000..11f228ea69
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/tools/audio/botamusique/default.nix
@@ -0,0 +1,150 @@
+{ pkgs
+, lib
+, stdenv
+, fetchFromGitHub
+, python3Packages
+, ffmpeg
+, makeWrapper
+
+# For the update script
+, coreutils
+, nix-prefetch-git
+, jq
+, nodePackages
+}:
+let
+ nodejs = pkgs.nodejs-12_x;
+ nodeEnv = import ../../../development/node-packages/node-env.nix {
+ inherit (pkgs) stdenv lib python2 runCommand writeTextFile;
+ inherit pkgs nodejs;
+ libtool = if pkgs.stdenv.isDarwin then pkgs.darwin.cctools else null;
+ };
+ botamusiqueNodePackages = import ./node-packages.nix {
+ inherit (pkgs) fetchurl nix-gitignore stdenv lib fetchgit;
+ inherit nodeEnv;
+ };
+
+ srcJson = lib.importJSON ./src.json;
+ src = fetchFromGitHub {
+ owner = "azlux";
+ repo = "botamusique";
+ inherit (srcJson) rev sha256;
+ };
+
+ nodeDependencies = (botamusiqueNodePackages.shell.override (old: {
+ src = src + "/web";
+ })).nodeDependencies;
+
+ # Python needed to instantiate the html templates
+ buildPython = python3Packages.python.withPackages (ps: [ ps.jinja2 ]);
+in
+stdenv.mkDerivation rec {
+ pname = "botamusique";
+ version = "unstable-${lib.substring 0 10 srcJson.date}";
+
+ inherit src;
+
+ patches = [
+ # botamusique by default resolves relative state paths by first checking
+ # whether it exists in the working directory, then falls back to using the
+ # installation directory. With Nix however, the installation directory is
+ # not writable, so that won't work. So we change this so that it uses
+ # relative paths unconditionally, whether they exist or not.
+ ./unconditional-relative-state-paths.patch
+
+ # We can't update the package at runtime with NixOS, so this patch makes
+ # the !update command mention that
+ ./no-runtime-update.patch
+ ];
+
+ postPatch = ''
+ # However, the function that's patched above is also used for
+ # configuration.default.ini, which is in the installation directory
+ # after all. So we need to counter-patch it here so it can find it absolutely
+ substituteInPlace mumbleBot.py \
+ --replace "configuration.default.ini" "$out/share/botamusique/configuration.default.ini"
+ '';
+
+ nativeBuildInputs = [
+ python3Packages.wrapPython
+ nodejs
+ makeWrapper
+ ];
+
+ pythonPath = with python3Packages; [
+ pymumble
+ packaging
+ magic
+ requests
+ youtube-dl
+ flask
+ mutagen
+ pillow
+ pyradios
+ ];
+
+ buildPhase = ''
+ runHook preBuild
+
+ # Generates artifacts in ./static
+ (
+ cd web
+ ln -s ${nodeDependencies}/lib/node_modules ./node_modules
+ export PATH="${nodeDependencies}/bin:$PATH"
+
+ npm run build
+ )
+
+ # Fills out http templates
+ ${buildPython}/bin/python scripts/translate_templates.py --lang-dir lang/ --template-dir templates/
+
+ runHook postBuild
+ '';
+
+ installPhase = ''
+ runHook preInstall
+
+ mkdir -p $out/share $out/bin
+ cp -r . $out/share/botamusique
+ chmod +x $out/share/botamusique/mumbleBot.py
+ wrapPythonProgramsIn $out/share/botamusique "$out $pythonPath"
+
+ # Convenience binary and wrap with ffmpeg dependency
+ makeWrapper $out/share/botamusique/mumbleBot.py $out/bin/botamusique \
+ --prefix PATH : ${lib.makeBinPath [ ffmpeg ]}
+
+ runHook postInstall
+ '';
+
+ passthru.updateScript = pkgs.writeShellScript "botamusique-updater" ''
+ export PATH=${lib.makeBinPath [ coreutils nix-prefetch-git jq nodePackages.node2nix ]}
+
+ nix-prefetch-git https://github.com/azlux/botamusique > ${toString ./src.json}
+ path=$(jq '.path' -r < ${toString ./src.json})
+
+ tmp=$(mktemp -d)
+ trap 'rm -rf "$tmp"' exit
+
+ # botamusique doesn't have a version in its package.json
+ # But that's needed for node2nix
+ jq < "$path"/web/package.json > "$tmp/package.json" \
+ --arg version "0.0.0" \
+ '.version |= $version'
+
+ node2nix \
+ --input "$tmp"/package.json \
+ --lock "$path"/web/package-lock.json \
+ --no-copy-node-env \
+ --development \
+ --composition /dev/null \
+ --output ${toString ./node-packages.nix}
+ '';
+
+ meta = with lib; {
+ description = "Bot to play youtube / soundcloud / radio / local music on Mumble";
+ homepage = "https://github.com/azlux/botamusique";
+ license = licenses.mit;
+ platforms = platforms.all;
+ maintainers = with maintainers; [ infinisil ];
+ };
+}
diff --git a/third_party/nixpkgs/pkgs/tools/audio/botamusique/no-runtime-update.patch b/third_party/nixpkgs/pkgs/tools/audio/botamusique/no-runtime-update.patch
new file mode 100644
index 0000000000..8fc8580fce
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/tools/audio/botamusique/no-runtime-update.patch
@@ -0,0 +1,12 @@
+diff --git a/util.py b/util.py
+index bfec1ed..5147757 100644
+--- a/util.py
++++ b/util.py
+@@ -132,6 +132,7 @@ def check_update(current_version):
+
+
+ def update(current_version):
++ return "Can't update Nix installation at runtime"
+ global log
+
+ target = var.config.get('bot', 'target_version')
diff --git a/third_party/nixpkgs/pkgs/tools/audio/botamusique/node-packages.nix b/third_party/nixpkgs/pkgs/tools/audio/botamusique/node-packages.nix
new file mode 100644
index 0000000000..3f9e2dcdfd
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/tools/audio/botamusique/node-packages.nix
@@ -0,0 +1,5247 @@
+# This file has been generated by node2nix 1.9.0. Do not edit!
+
+{nodeEnv, fetchurl, fetchgit, nix-gitignore, stdenv, lib, globalBuildInputs ? []}:
+
+let
+ sources = {
+ "@babel/code-frame-7.10.4" = {
+ name = "_at_babel_slash_code-frame";
+ packageName = "@babel/code-frame";
+ version = "7.10.4";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.10.4.tgz";
+ sha512 = "vG6SvB6oYEhvgisZNFRmRCUkLz11c7rp+tbNTynGqc6mS1d5ATd/sGyV6W0KZZnXRKMTzZDRgQT3Ou9jhpAfUg==";
+ };
+ };
+ "@babel/compat-data-7.12.7" = {
+ name = "_at_babel_slash_compat-data";
+ packageName = "@babel/compat-data";
+ version = "7.12.7";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.12.7.tgz";
+ sha512 = "YaxPMGs/XIWtYqrdEOZOCPsVWfEoriXopnsz3/i7apYPXQ3698UFhS6dVT1KN5qOsWmVgw/FOrmQgpRaZayGsw==";
+ };
+ };
+ "@babel/core-7.12.9" = {
+ name = "_at_babel_slash_core";
+ packageName = "@babel/core";
+ version = "7.12.9";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/@babel/core/-/core-7.12.9.tgz";
+ sha512 = "gTXYh3M5wb7FRXQy+FErKFAv90BnlOuNn1QkCK2lREoPAjrQCO49+HVSrFoe5uakFAF5eenS75KbO2vQiLrTMQ==";
+ };
+ };
+ "@babel/eslint-parser-7.12.1" = {
+ name = "_at_babel_slash_eslint-parser";
+ packageName = "@babel/eslint-parser";
+ version = "7.12.1";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/@babel/eslint-parser/-/eslint-parser-7.12.1.tgz";
+ sha512 = "cc7WQHnHQY3++/bghgbDtPx+5bf6xTsokyGzV6Qzh65NLz/unv+mPQuACkQ9GFhIhcTFv6yqwNaEcfX7EkOEsg==";
+ };
+ };
+ "@babel/eslint-plugin-7.12.1" = {
+ name = "_at_babel_slash_eslint-plugin";
+ packageName = "@babel/eslint-plugin";
+ version = "7.12.1";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/@babel/eslint-plugin/-/eslint-plugin-7.12.1.tgz";
+ sha512 = "rOjrD5yupTYCO4x0kEbQmi/NsaD+VGOD/9Cvso64WMVPY2y6o5Nvw2sqFWdeSEBdR1Dsa07YjplBs067x5YbXg==";
+ };
+ };
+ "@babel/generator-7.12.5" = {
+ name = "_at_babel_slash_generator";
+ packageName = "@babel/generator";
+ version = "7.12.5";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/@babel/generator/-/generator-7.12.5.tgz";
+ sha512 = "m16TQQJ8hPt7E+OS/XVQg/7U184MLXtvuGbCdA7na61vha+ImkyyNM/9DDA0unYCVZn3ZOhng+qz48/KBOT96A==";
+ };
+ };
+ "@babel/helper-annotate-as-pure-7.10.4" = {
+ name = "_at_babel_slash_helper-annotate-as-pure";
+ packageName = "@babel/helper-annotate-as-pure";
+ version = "7.10.4";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.10.4.tgz";
+ sha512 = "XQlqKQP4vXFB7BN8fEEerrmYvHp3fK/rBkRFz9jaJbzK0B1DSfej9Kc7ZzE8Z/OnId1jpJdNAZ3BFQjWG68rcA==";
+ };
+ };
+ "@babel/helper-builder-binary-assignment-operator-visitor-7.10.4" = {
+ name = "_at_babel_slash_helper-builder-binary-assignment-operator-visitor";
+ packageName = "@babel/helper-builder-binary-assignment-operator-visitor";
+ version = "7.10.4";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/@babel/helper-builder-binary-assignment-operator-visitor/-/helper-builder-binary-assignment-operator-visitor-7.10.4.tgz";
+ sha512 = "L0zGlFrGWZK4PbT8AszSfLTM5sDU1+Az/En9VrdT8/LmEiJt4zXt+Jve9DCAnQcbqDhCI+29y/L93mrDzddCcg==";
+ };
+ };
+ "@babel/helper-compilation-targets-7.12.5" = {
+ name = "_at_babel_slash_helper-compilation-targets";
+ packageName = "@babel/helper-compilation-targets";
+ version = "7.12.5";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.12.5.tgz";
+ sha512 = "+qH6NrscMolUlzOYngSBMIOQpKUGPPsc61Bu5W10mg84LxZ7cmvnBHzARKbDoFxVvqqAbj6Tg6N7bSrWSPXMyw==";
+ };
+ };
+ "@babel/helper-create-class-features-plugin-7.12.1" = {
+ name = "_at_babel_slash_helper-create-class-features-plugin";
+ packageName = "@babel/helper-create-class-features-plugin";
+ version = "7.12.1";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.12.1.tgz";
+ sha512 = "hkL++rWeta/OVOBTRJc9a5Azh5mt5WgZUGAKMD8JM141YsE08K//bp1unBBieO6rUKkIPyUE0USQ30jAy3Sk1w==";
+ };
+ };
+ "@babel/helper-create-regexp-features-plugin-7.12.7" = {
+ name = "_at_babel_slash_helper-create-regexp-features-plugin";
+ packageName = "@babel/helper-create-regexp-features-plugin";
+ version = "7.12.7";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/@babel/helper-create-regexp-features-plugin/-/helper-create-regexp-features-plugin-7.12.7.tgz";
+ sha512 = "idnutvQPdpbduutvi3JVfEgcVIHooQnhvhx0Nk9isOINOIGYkZea1Pk2JlJRiUnMefrlvr0vkByATBY/mB4vjQ==";
+ };
+ };
+ "@babel/helper-define-map-7.10.5" = {
+ name = "_at_babel_slash_helper-define-map";
+ packageName = "@babel/helper-define-map";
+ version = "7.10.5";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/@babel/helper-define-map/-/helper-define-map-7.10.5.tgz";
+ sha512 = "fMw4kgFB720aQFXSVaXr79pjjcW5puTCM16+rECJ/plGS+zByelE8l9nCpV1GibxTnFVmUuYG9U8wYfQHdzOEQ==";
+ };
+ };
+ "@babel/helper-explode-assignable-expression-7.12.1" = {
+ name = "_at_babel_slash_helper-explode-assignable-expression";
+ packageName = "@babel/helper-explode-assignable-expression";
+ version = "7.12.1";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/@babel/helper-explode-assignable-expression/-/helper-explode-assignable-expression-7.12.1.tgz";
+ sha512 = "dmUwH8XmlrUpVqgtZ737tK88v07l840z9j3OEhCLwKTkjlvKpfqXVIZ0wpK3aeOxspwGrf/5AP5qLx4rO3w5rA==";
+ };
+ };
+ "@babel/helper-function-name-7.10.4" = {
+ name = "_at_babel_slash_helper-function-name";
+ packageName = "@babel/helper-function-name";
+ version = "7.10.4";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.10.4.tgz";
+ sha512 = "YdaSyz1n8gY44EmN7x44zBn9zQ1Ry2Y+3GTA+3vH6Mizke1Vw0aWDM66FOYEPw8//qKkmqOckrGgTYa+6sceqQ==";
+ };
+ };
+ "@babel/helper-get-function-arity-7.10.4" = {
+ name = "_at_babel_slash_helper-get-function-arity";
+ packageName = "@babel/helper-get-function-arity";
+ version = "7.10.4";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/@babel/helper-get-function-arity/-/helper-get-function-arity-7.10.4.tgz";
+ sha512 = "EkN3YDB+SRDgiIUnNgcmiD361ti+AVbL3f3Henf6dqqUyr5dMsorno0lJWJuLhDhkI5sYEpgj6y9kB8AOU1I2A==";
+ };
+ };
+ "@babel/helper-hoist-variables-7.10.4" = {
+ name = "_at_babel_slash_helper-hoist-variables";
+ packageName = "@babel/helper-hoist-variables";
+ version = "7.10.4";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/@babel/helper-hoist-variables/-/helper-hoist-variables-7.10.4.tgz";
+ sha512 = "wljroF5PgCk2juF69kanHVs6vrLwIPNp6DLD+Lrl3hoQ3PpPPikaDRNFA+0t81NOoMt2DL6WW/mdU8k4k6ZzuA==";
+ };
+ };
+ "@babel/helper-member-expression-to-functions-7.12.7" = {
+ name = "_at_babel_slash_helper-member-expression-to-functions";
+ packageName = "@babel/helper-member-expression-to-functions";
+ version = "7.12.7";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.12.7.tgz";
+ sha512 = "DCsuPyeWxeHgh1Dus7APn7iza42i/qXqiFPWyBDdOFtvS581JQePsc1F/nD+fHrcswhLlRc2UpYS1NwERxZhHw==";
+ };
+ };
+ "@babel/helper-module-imports-7.12.5" = {
+ name = "_at_babel_slash_helper-module-imports";
+ packageName = "@babel/helper-module-imports";
+ version = "7.12.5";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.12.5.tgz";
+ sha512 = "SR713Ogqg6++uexFRORf/+nPXMmWIn80TALu0uaFb+iQIUoR7bOC7zBWyzBs5b3tBBJXuyD0cRu1F15GyzjOWA==";
+ };
+ };
+ "@babel/helper-module-transforms-7.12.1" = {
+ name = "_at_babel_slash_helper-module-transforms";
+ packageName = "@babel/helper-module-transforms";
+ version = "7.12.1";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.12.1.tgz";
+ sha512 = "QQzehgFAZ2bbISiCpmVGfiGux8YVFXQ0abBic2Envhej22DVXV9nCFaS5hIQbkyo1AdGb+gNME2TSh3hYJVV/w==";
+ };
+ };
+ "@babel/helper-optimise-call-expression-7.12.7" = {
+ name = "_at_babel_slash_helper-optimise-call-expression";
+ packageName = "@babel/helper-optimise-call-expression";
+ version = "7.12.7";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.12.7.tgz";
+ sha512 = "I5xc9oSJ2h59OwyUqjv95HRyzxj53DAubUERgQMrpcCEYQyToeHA+NEcUEsVWB4j53RDeskeBJ0SgRAYHDBckw==";
+ };
+ };
+ "@babel/helper-plugin-utils-7.10.4" = {
+ name = "_at_babel_slash_helper-plugin-utils";
+ packageName = "@babel/helper-plugin-utils";
+ version = "7.10.4";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.10.4.tgz";
+ sha512 = "O4KCvQA6lLiMU9l2eawBPMf1xPP8xPfB3iEQw150hOVTqj/rfXz0ThTb4HEzqQfs2Bmo5Ay8BzxfzVtBrr9dVg==";
+ };
+ };
+ "@babel/helper-remap-async-to-generator-7.12.1" = {
+ name = "_at_babel_slash_helper-remap-async-to-generator";
+ packageName = "@babel/helper-remap-async-to-generator";
+ version = "7.12.1";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/@babel/helper-remap-async-to-generator/-/helper-remap-async-to-generator-7.12.1.tgz";
+ sha512 = "9d0KQCRM8clMPcDwo8SevNs+/9a8yWVVmaE80FGJcEP8N1qToREmWEGnBn8BUlJhYRFz6fqxeRL1sl5Ogsed7A==";
+ };
+ };
+ "@babel/helper-replace-supers-7.12.5" = {
+ name = "_at_babel_slash_helper-replace-supers";
+ packageName = "@babel/helper-replace-supers";
+ version = "7.12.5";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/@babel/helper-replace-supers/-/helper-replace-supers-7.12.5.tgz";
+ sha512 = "5YILoed0ZyIpF4gKcpZitEnXEJ9UoDRki1Ey6xz46rxOzfNMAhVIJMoune1hmPVxh40LRv1+oafz7UsWX+vyWA==";
+ };
+ };
+ "@babel/helper-simple-access-7.12.1" = {
+ name = "_at_babel_slash_helper-simple-access";
+ packageName = "@babel/helper-simple-access";
+ version = "7.12.1";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/@babel/helper-simple-access/-/helper-simple-access-7.12.1.tgz";
+ sha512 = "OxBp7pMrjVewSSC8fXDFrHrBcJATOOFssZwv16F3/6Xtc138GHybBfPbm9kfiqQHKhYQrlamWILwlDCeyMFEaA==";
+ };
+ };
+ "@babel/helper-skip-transparent-expression-wrappers-7.12.1" = {
+ name = "_at_babel_slash_helper-skip-transparent-expression-wrappers";
+ packageName = "@babel/helper-skip-transparent-expression-wrappers";
+ version = "7.12.1";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/@babel/helper-skip-transparent-expression-wrappers/-/helper-skip-transparent-expression-wrappers-7.12.1.tgz";
+ sha512 = "Mf5AUuhG1/OCChOJ/HcADmvcHM42WJockombn8ATJG3OnyiSxBK/Mm5x78BQWvmtXZKHgbjdGL2kin/HOLlZGA==";
+ };
+ };
+ "@babel/helper-split-export-declaration-7.11.0" = {
+ name = "_at_babel_slash_helper-split-export-declaration";
+ packageName = "@babel/helper-split-export-declaration";
+ version = "7.11.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.11.0.tgz";
+ sha512 = "74Vejvp6mHkGE+m+k5vHY93FX2cAtrw1zXrZXRlG4l410Nm9PxfEiVTn1PjDPV5SnmieiueY4AFg2xqhNFuuZg==";
+ };
+ };
+ "@babel/helper-validator-identifier-7.10.4" = {
+ name = "_at_babel_slash_helper-validator-identifier";
+ packageName = "@babel/helper-validator-identifier";
+ version = "7.10.4";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.10.4.tgz";
+ sha512 = "3U9y+43hz7ZM+rzG24Qe2mufW5KhvFg/NhnNph+i9mgCtdTCtMJuI1TMkrIUiK7Ix4PYlRF9I5dhqaLYA/ADXw==";
+ };
+ };
+ "@babel/helper-validator-option-7.12.1" = {
+ name = "_at_babel_slash_helper-validator-option";
+ packageName = "@babel/helper-validator-option";
+ version = "7.12.1";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/@babel/helper-validator-option/-/helper-validator-option-7.12.1.tgz";
+ sha512 = "YpJabsXlJVWP0USHjnC/AQDTLlZERbON577YUVO/wLpqyj6HAtVYnWaQaN0iUN+1/tWn3c+uKKXjRut5115Y2A==";
+ };
+ };
+ "@babel/helper-wrap-function-7.12.3" = {
+ name = "_at_babel_slash_helper-wrap-function";
+ packageName = "@babel/helper-wrap-function";
+ version = "7.12.3";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/@babel/helper-wrap-function/-/helper-wrap-function-7.12.3.tgz";
+ sha512 = "Cvb8IuJDln3rs6tzjW3Y8UeelAOdnpB8xtQ4sme2MSZ9wOxrbThporC0y/EtE16VAtoyEfLM404Xr1e0OOp+ow==";
+ };
+ };
+ "@babel/helpers-7.12.5" = {
+ name = "_at_babel_slash_helpers";
+ packageName = "@babel/helpers";
+ version = "7.12.5";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/@babel/helpers/-/helpers-7.12.5.tgz";
+ sha512 = "lgKGMQlKqA8meJqKsW6rUnc4MdUk35Ln0ATDqdM1a/UpARODdI4j5Y5lVfUScnSNkJcdCRAaWkspykNoFg9sJA==";
+ };
+ };
+ "@babel/highlight-7.10.4" = {
+ name = "_at_babel_slash_highlight";
+ packageName = "@babel/highlight";
+ version = "7.10.4";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/@babel/highlight/-/highlight-7.10.4.tgz";
+ sha512 = "i6rgnR/YgPEQzZZnbTHHuZdlE8qyoBNalD6F+q4vAFlcMEcqmkoG+mPqJYJCo63qPf74+Y1UZsl3l6f7/RIkmA==";
+ };
+ };
+ "@babel/parser-7.12.7" = {
+ name = "_at_babel_slash_parser";
+ packageName = "@babel/parser";
+ version = "7.12.7";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/@babel/parser/-/parser-7.12.7.tgz";
+ sha512 = "oWR02Ubp4xTLCAqPRiNIuMVgNO5Aif/xpXtabhzW2HWUD47XJsAB4Zd/Rg30+XeQA3juXigV7hlquOTmwqLiwg==";
+ };
+ };
+ "@babel/plugin-proposal-async-generator-functions-7.12.1" = {
+ name = "_at_babel_slash_plugin-proposal-async-generator-functions";
+ packageName = "@babel/plugin-proposal-async-generator-functions";
+ version = "7.12.1";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/@babel/plugin-proposal-async-generator-functions/-/plugin-proposal-async-generator-functions-7.12.1.tgz";
+ sha512 = "d+/o30tJxFxrA1lhzJqiUcEJdI6jKlNregCv5bASeGf2Q4MXmnwH7viDo7nhx1/ohf09oaH8j1GVYG/e3Yqk6A==";
+ };
+ };
+ "@babel/plugin-proposal-class-properties-7.12.1" = {
+ name = "_at_babel_slash_plugin-proposal-class-properties";
+ packageName = "@babel/plugin-proposal-class-properties";
+ version = "7.12.1";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/@babel/plugin-proposal-class-properties/-/plugin-proposal-class-properties-7.12.1.tgz";
+ sha512 = "cKp3dlQsFsEs5CWKnN7BnSHOd0EOW8EKpEjkoz1pO2E5KzIDNV9Ros1b0CnmbVgAGXJubOYVBOGCT1OmJwOI7w==";
+ };
+ };
+ "@babel/plugin-proposal-dynamic-import-7.12.1" = {
+ name = "_at_babel_slash_plugin-proposal-dynamic-import";
+ packageName = "@babel/plugin-proposal-dynamic-import";
+ version = "7.12.1";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/@babel/plugin-proposal-dynamic-import/-/plugin-proposal-dynamic-import-7.12.1.tgz";
+ sha512 = "a4rhUSZFuq5W8/OO8H7BL5zspjnc1FLd9hlOxIK/f7qG4a0qsqk8uvF/ywgBA8/OmjsapjpvaEOYItfGG1qIvQ==";
+ };
+ };
+ "@babel/plugin-proposal-export-namespace-from-7.12.1" = {
+ name = "_at_babel_slash_plugin-proposal-export-namespace-from";
+ packageName = "@babel/plugin-proposal-export-namespace-from";
+ version = "7.12.1";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/@babel/plugin-proposal-export-namespace-from/-/plugin-proposal-export-namespace-from-7.12.1.tgz";
+ sha512 = "6CThGf0irEkzujYS5LQcjBx8j/4aQGiVv7J9+2f7pGfxqyKh3WnmVJYW3hdrQjyksErMGBPQrCnHfOtna+WLbw==";
+ };
+ };
+ "@babel/plugin-proposal-json-strings-7.12.1" = {
+ name = "_at_babel_slash_plugin-proposal-json-strings";
+ packageName = "@babel/plugin-proposal-json-strings";
+ version = "7.12.1";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/@babel/plugin-proposal-json-strings/-/plugin-proposal-json-strings-7.12.1.tgz";
+ sha512 = "GoLDUi6U9ZLzlSda2Df++VSqDJg3CG+dR0+iWsv6XRw1rEq+zwt4DirM9yrxW6XWaTpmai1cWJLMfM8qQJf+yw==";
+ };
+ };
+ "@babel/plugin-proposal-logical-assignment-operators-7.12.1" = {
+ name = "_at_babel_slash_plugin-proposal-logical-assignment-operators";
+ packageName = "@babel/plugin-proposal-logical-assignment-operators";
+ version = "7.12.1";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/@babel/plugin-proposal-logical-assignment-operators/-/plugin-proposal-logical-assignment-operators-7.12.1.tgz";
+ sha512 = "k8ZmVv0JU+4gcUGeCDZOGd0lCIamU/sMtIiX3UWnUc5yzgq6YUGyEolNYD+MLYKfSzgECPcqetVcJP9Afe/aCA==";
+ };
+ };
+ "@babel/plugin-proposal-nullish-coalescing-operator-7.12.1" = {
+ name = "_at_babel_slash_plugin-proposal-nullish-coalescing-operator";
+ packageName = "@babel/plugin-proposal-nullish-coalescing-operator";
+ version = "7.12.1";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/@babel/plugin-proposal-nullish-coalescing-operator/-/plugin-proposal-nullish-coalescing-operator-7.12.1.tgz";
+ sha512 = "nZY0ESiaQDI1y96+jk6VxMOaL4LPo/QDHBqL+SF3/vl6dHkTwHlOI8L4ZwuRBHgakRBw5zsVylel7QPbbGuYgg==";
+ };
+ };
+ "@babel/plugin-proposal-numeric-separator-7.12.7" = {
+ name = "_at_babel_slash_plugin-proposal-numeric-separator";
+ packageName = "@babel/plugin-proposal-numeric-separator";
+ version = "7.12.7";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/@babel/plugin-proposal-numeric-separator/-/plugin-proposal-numeric-separator-7.12.7.tgz";
+ sha512 = "8c+uy0qmnRTeukiGsjLGy6uVs/TFjJchGXUeBqlG4VWYOdJWkhhVPdQ3uHwbmalfJwv2JsV0qffXP4asRfL2SQ==";
+ };
+ };
+ "@babel/plugin-proposal-object-rest-spread-7.12.1" = {
+ name = "_at_babel_slash_plugin-proposal-object-rest-spread";
+ packageName = "@babel/plugin-proposal-object-rest-spread";
+ version = "7.12.1";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.12.1.tgz";
+ sha512 = "s6SowJIjzlhx8o7lsFx5zmY4At6CTtDvgNQDdPzkBQucle58A6b/TTeEBYtyDgmcXjUTM+vE8YOGHZzzbc/ioA==";
+ };
+ };
+ "@babel/plugin-proposal-optional-catch-binding-7.12.1" = {
+ name = "_at_babel_slash_plugin-proposal-optional-catch-binding";
+ packageName = "@babel/plugin-proposal-optional-catch-binding";
+ version = "7.12.1";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/@babel/plugin-proposal-optional-catch-binding/-/plugin-proposal-optional-catch-binding-7.12.1.tgz";
+ sha512 = "hFvIjgprh9mMw5v42sJWLI1lzU5L2sznP805zeT6rySVRA0Y18StRhDqhSxlap0oVgItRsB6WSROp4YnJTJz0g==";
+ };
+ };
+ "@babel/plugin-proposal-optional-chaining-7.12.7" = {
+ name = "_at_babel_slash_plugin-proposal-optional-chaining";
+ packageName = "@babel/plugin-proposal-optional-chaining";
+ version = "7.12.7";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/@babel/plugin-proposal-optional-chaining/-/plugin-proposal-optional-chaining-7.12.7.tgz";
+ sha512 = "4ovylXZ0PWmwoOvhU2vhnzVNnm88/Sm9nx7V8BPgMvAzn5zDou3/Awy0EjglyubVHasJj+XCEkr/r1X3P5elCA==";
+ };
+ };
+ "@babel/plugin-proposal-private-methods-7.12.1" = {
+ name = "_at_babel_slash_plugin-proposal-private-methods";
+ packageName = "@babel/plugin-proposal-private-methods";
+ version = "7.12.1";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/@babel/plugin-proposal-private-methods/-/plugin-proposal-private-methods-7.12.1.tgz";
+ sha512 = "mwZ1phvH7/NHK6Kf8LP7MYDogGV+DKB1mryFOEwx5EBNQrosvIczzZFTUmWaeujd5xT6G1ELYWUz3CutMhjE1w==";
+ };
+ };
+ "@babel/plugin-proposal-unicode-property-regex-7.12.1" = {
+ name = "_at_babel_slash_plugin-proposal-unicode-property-regex";
+ packageName = "@babel/plugin-proposal-unicode-property-regex";
+ version = "7.12.1";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/@babel/plugin-proposal-unicode-property-regex/-/plugin-proposal-unicode-property-regex-7.12.1.tgz";
+ sha512 = "MYq+l+PvHuw/rKUz1at/vb6nCnQ2gmJBNaM62z0OgH7B2W1D9pvkpYtlti9bGtizNIU1K3zm4bZF9F91efVY0w==";
+ };
+ };
+ "@babel/plugin-syntax-async-generators-7.8.4" = {
+ name = "_at_babel_slash_plugin-syntax-async-generators";
+ packageName = "@babel/plugin-syntax-async-generators";
+ version = "7.8.4";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/@babel/plugin-syntax-async-generators/-/plugin-syntax-async-generators-7.8.4.tgz";
+ sha512 = "tycmZxkGfZaxhMRbXlPXuVFpdWlXpir2W4AMhSJgRKzk/eDlIXOhb2LHWoLpDF7TEHylV5zNhykX6KAgHJmTNw==";
+ };
+ };
+ "@babel/plugin-syntax-class-properties-7.12.1" = {
+ name = "_at_babel_slash_plugin-syntax-class-properties";
+ packageName = "@babel/plugin-syntax-class-properties";
+ version = "7.12.1";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/@babel/plugin-syntax-class-properties/-/plugin-syntax-class-properties-7.12.1.tgz";
+ sha512 = "U40A76x5gTwmESz+qiqssqmeEsKvcSyvtgktrm0uzcARAmM9I1jR221f6Oq+GmHrcD+LvZDag1UTOTe2fL3TeA==";
+ };
+ };
+ "@babel/plugin-syntax-dynamic-import-7.8.3" = {
+ name = "_at_babel_slash_plugin-syntax-dynamic-import";
+ packageName = "@babel/plugin-syntax-dynamic-import";
+ version = "7.8.3";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/@babel/plugin-syntax-dynamic-import/-/plugin-syntax-dynamic-import-7.8.3.tgz";
+ sha512 = "5gdGbFon+PszYzqs83S3E5mpi7/y/8M9eC90MRTZfduQOYW76ig6SOSPNe41IG5LoP3FGBn2N0RjVDSQiS94kQ==";
+ };
+ };
+ "@babel/plugin-syntax-export-namespace-from-7.8.3" = {
+ name = "_at_babel_slash_plugin-syntax-export-namespace-from";
+ packageName = "@babel/plugin-syntax-export-namespace-from";
+ version = "7.8.3";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/@babel/plugin-syntax-export-namespace-from/-/plugin-syntax-export-namespace-from-7.8.3.tgz";
+ sha512 = "MXf5laXo6c1IbEbegDmzGPwGNTsHZmEy6QGznu5Sh2UCWvueywb2ee+CCE4zQiZstxU9BMoQO9i6zUFSY0Kj0Q==";
+ };
+ };
+ "@babel/plugin-syntax-json-strings-7.8.3" = {
+ name = "_at_babel_slash_plugin-syntax-json-strings";
+ packageName = "@babel/plugin-syntax-json-strings";
+ version = "7.8.3";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/@babel/plugin-syntax-json-strings/-/plugin-syntax-json-strings-7.8.3.tgz";
+ sha512 = "lY6kdGpWHvjoe2vk4WrAapEuBR69EMxZl+RoGRhrFGNYVK8mOPAW8VfbT/ZgrFbXlDNiiaxQnAtgVCZ6jv30EA==";
+ };
+ };
+ "@babel/plugin-syntax-logical-assignment-operators-7.10.4" = {
+ name = "_at_babel_slash_plugin-syntax-logical-assignment-operators";
+ packageName = "@babel/plugin-syntax-logical-assignment-operators";
+ version = "7.10.4";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/@babel/plugin-syntax-logical-assignment-operators/-/plugin-syntax-logical-assignment-operators-7.10.4.tgz";
+ sha512 = "d8waShlpFDinQ5MtvGU9xDAOzKH47+FFoney2baFIoMr952hKOLp1HR7VszoZvOsV/4+RRszNY7D17ba0te0ig==";
+ };
+ };
+ "@babel/plugin-syntax-nullish-coalescing-operator-7.8.3" = {
+ name = "_at_babel_slash_plugin-syntax-nullish-coalescing-operator";
+ packageName = "@babel/plugin-syntax-nullish-coalescing-operator";
+ version = "7.8.3";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/@babel/plugin-syntax-nullish-coalescing-operator/-/plugin-syntax-nullish-coalescing-operator-7.8.3.tgz";
+ sha512 = "aSff4zPII1u2QD7y+F8oDsz19ew4IGEJg9SVW+bqwpwtfFleiQDMdzA/R+UlWDzfnHFCxxleFT0PMIrR36XLNQ==";
+ };
+ };
+ "@babel/plugin-syntax-numeric-separator-7.10.4" = {
+ name = "_at_babel_slash_plugin-syntax-numeric-separator";
+ packageName = "@babel/plugin-syntax-numeric-separator";
+ version = "7.10.4";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/@babel/plugin-syntax-numeric-separator/-/plugin-syntax-numeric-separator-7.10.4.tgz";
+ sha512 = "9H6YdfkcK/uOnY/K7/aA2xpzaAgkQn37yzWUMRK7OaPOqOpGS1+n0H5hxT9AUw9EsSjPW8SVyMJwYRtWs3X3ug==";
+ };
+ };
+ "@babel/plugin-syntax-object-rest-spread-7.8.3" = {
+ name = "_at_babel_slash_plugin-syntax-object-rest-spread";
+ packageName = "@babel/plugin-syntax-object-rest-spread";
+ version = "7.8.3";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/@babel/plugin-syntax-object-rest-spread/-/plugin-syntax-object-rest-spread-7.8.3.tgz";
+ sha512 = "XoqMijGZb9y3y2XskN+P1wUGiVwWZ5JmoDRwx5+3GmEplNyVM2s2Dg8ILFQm8rWM48orGy5YpI5Bl8U1y7ydlA==";
+ };
+ };
+ "@babel/plugin-syntax-optional-catch-binding-7.8.3" = {
+ name = "_at_babel_slash_plugin-syntax-optional-catch-binding";
+ packageName = "@babel/plugin-syntax-optional-catch-binding";
+ version = "7.8.3";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/@babel/plugin-syntax-optional-catch-binding/-/plugin-syntax-optional-catch-binding-7.8.3.tgz";
+ sha512 = "6VPD0Pc1lpTqw0aKoeRTMiB+kWhAoT24PA+ksWSBrFtl5SIRVpZlwN3NNPQjehA2E/91FV3RjLWoVTglWcSV3Q==";
+ };
+ };
+ "@babel/plugin-syntax-optional-chaining-7.8.3" = {
+ name = "_at_babel_slash_plugin-syntax-optional-chaining";
+ packageName = "@babel/plugin-syntax-optional-chaining";
+ version = "7.8.3";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/@babel/plugin-syntax-optional-chaining/-/plugin-syntax-optional-chaining-7.8.3.tgz";
+ sha512 = "KoK9ErH1MBlCPxV0VANkXW2/dw4vlbGDrFgz8bmUsBGYkFRcbRwMh6cIJubdPrkxRwuGdtCk0v/wPTKbQgBjkg==";
+ };
+ };
+ "@babel/plugin-syntax-top-level-await-7.12.1" = {
+ name = "_at_babel_slash_plugin-syntax-top-level-await";
+ packageName = "@babel/plugin-syntax-top-level-await";
+ version = "7.12.1";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/@babel/plugin-syntax-top-level-await/-/plugin-syntax-top-level-await-7.12.1.tgz";
+ sha512 = "i7ooMZFS+a/Om0crxZodrTzNEPJHZrlMVGMTEpFAj6rYY/bKCddB0Dk/YxfPuYXOopuhKk/e1jV6h+WUU9XN3A==";
+ };
+ };
+ "@babel/plugin-transform-arrow-functions-7.12.1" = {
+ name = "_at_babel_slash_plugin-transform-arrow-functions";
+ packageName = "@babel/plugin-transform-arrow-functions";
+ version = "7.12.1";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/@babel/plugin-transform-arrow-functions/-/plugin-transform-arrow-functions-7.12.1.tgz";
+ sha512 = "5QB50qyN44fzzz4/qxDPQMBCTHgxg3n0xRBLJUmBlLoU/sFvxVWGZF/ZUfMVDQuJUKXaBhbupxIzIfZ6Fwk/0A==";
+ };
+ };
+ "@babel/plugin-transform-async-to-generator-7.12.1" = {
+ name = "_at_babel_slash_plugin-transform-async-to-generator";
+ packageName = "@babel/plugin-transform-async-to-generator";
+ version = "7.12.1";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/@babel/plugin-transform-async-to-generator/-/plugin-transform-async-to-generator-7.12.1.tgz";
+ sha512 = "SDtqoEcarK1DFlRJ1hHRY5HvJUj5kX4qmtpMAm2QnhOlyuMC4TMdCRgW6WXpv93rZeYNeLP22y8Aq2dbcDRM1A==";
+ };
+ };
+ "@babel/plugin-transform-block-scoped-functions-7.12.1" = {
+ name = "_at_babel_slash_plugin-transform-block-scoped-functions";
+ packageName = "@babel/plugin-transform-block-scoped-functions";
+ version = "7.12.1";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/@babel/plugin-transform-block-scoped-functions/-/plugin-transform-block-scoped-functions-7.12.1.tgz";
+ sha512 = "5OpxfuYnSgPalRpo8EWGPzIYf0lHBWORCkj5M0oLBwHdlux9Ri36QqGW3/LR13RSVOAoUUMzoPI/jpE4ABcHoA==";
+ };
+ };
+ "@babel/plugin-transform-block-scoping-7.12.1" = {
+ name = "_at_babel_slash_plugin-transform-block-scoping";
+ packageName = "@babel/plugin-transform-block-scoping";
+ version = "7.12.1";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.12.1.tgz";
+ sha512 = "zJyAC9sZdE60r1nVQHblcfCj29Dh2Y0DOvlMkcqSo0ckqjiCwNiUezUKw+RjOCwGfpLRwnAeQ2XlLpsnGkvv9w==";
+ };
+ };
+ "@babel/plugin-transform-classes-7.12.1" = {
+ name = "_at_babel_slash_plugin-transform-classes";
+ packageName = "@babel/plugin-transform-classes";
+ version = "7.12.1";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/@babel/plugin-transform-classes/-/plugin-transform-classes-7.12.1.tgz";
+ sha512 = "/74xkA7bVdzQTBeSUhLLJgYIcxw/dpEpCdRDiHgPJ3Mv6uC11UhjpOhl72CgqbBCmt1qtssCyB2xnJm1+PFjog==";
+ };
+ };
+ "@babel/plugin-transform-computed-properties-7.12.1" = {
+ name = "_at_babel_slash_plugin-transform-computed-properties";
+ packageName = "@babel/plugin-transform-computed-properties";
+ version = "7.12.1";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/@babel/plugin-transform-computed-properties/-/plugin-transform-computed-properties-7.12.1.tgz";
+ sha512 = "vVUOYpPWB7BkgUWPo4C44mUQHpTZXakEqFjbv8rQMg7TC6S6ZhGZ3otQcRH6u7+adSlE5i0sp63eMC/XGffrzg==";
+ };
+ };
+ "@babel/plugin-transform-destructuring-7.12.1" = {
+ name = "_at_babel_slash_plugin-transform-destructuring";
+ packageName = "@babel/plugin-transform-destructuring";
+ version = "7.12.1";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.12.1.tgz";
+ sha512 = "fRMYFKuzi/rSiYb2uRLiUENJOKq4Gnl+6qOv5f8z0TZXg3llUwUhsNNwrwaT/6dUhJTzNpBr+CUvEWBtfNY1cw==";
+ };
+ };
+ "@babel/plugin-transform-dotall-regex-7.12.1" = {
+ name = "_at_babel_slash_plugin-transform-dotall-regex";
+ packageName = "@babel/plugin-transform-dotall-regex";
+ version = "7.12.1";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/@babel/plugin-transform-dotall-regex/-/plugin-transform-dotall-regex-7.12.1.tgz";
+ sha512 = "B2pXeRKoLszfEW7J4Hg9LoFaWEbr/kzo3teWHmtFCszjRNa/b40f9mfeqZsIDLLt/FjwQ6pz/Gdlwy85xNckBA==";
+ };
+ };
+ "@babel/plugin-transform-duplicate-keys-7.12.1" = {
+ name = "_at_babel_slash_plugin-transform-duplicate-keys";
+ packageName = "@babel/plugin-transform-duplicate-keys";
+ version = "7.12.1";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/@babel/plugin-transform-duplicate-keys/-/plugin-transform-duplicate-keys-7.12.1.tgz";
+ sha512 = "iRght0T0HztAb/CazveUpUQrZY+aGKKaWXMJ4uf9YJtqxSUe09j3wteztCUDRHs+SRAL7yMuFqUsLoAKKzgXjw==";
+ };
+ };
+ "@babel/plugin-transform-exponentiation-operator-7.12.1" = {
+ name = "_at_babel_slash_plugin-transform-exponentiation-operator";
+ packageName = "@babel/plugin-transform-exponentiation-operator";
+ version = "7.12.1";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/@babel/plugin-transform-exponentiation-operator/-/plugin-transform-exponentiation-operator-7.12.1.tgz";
+ sha512 = "7tqwy2bv48q+c1EHbXK0Zx3KXd2RVQp6OC7PbwFNt/dPTAV3Lu5sWtWuAj8owr5wqtWnqHfl2/mJlUmqkChKug==";
+ };
+ };
+ "@babel/plugin-transform-for-of-7.12.1" = {
+ name = "_at_babel_slash_plugin-transform-for-of";
+ packageName = "@babel/plugin-transform-for-of";
+ version = "7.12.1";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.12.1.tgz";
+ sha512 = "Zaeq10naAsuHo7heQvyV0ptj4dlZJwZgNAtBYBnu5nNKJoW62m0zKcIEyVECrUKErkUkg6ajMy4ZfnVZciSBhg==";
+ };
+ };
+ "@babel/plugin-transform-function-name-7.12.1" = {
+ name = "_at_babel_slash_plugin-transform-function-name";
+ packageName = "@babel/plugin-transform-function-name";
+ version = "7.12.1";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/@babel/plugin-transform-function-name/-/plugin-transform-function-name-7.12.1.tgz";
+ sha512 = "JF3UgJUILoFrFMEnOJLJkRHSk6LUSXLmEFsA23aR2O5CSLUxbeUX1IZ1YQ7Sn0aXb601Ncwjx73a+FVqgcljVw==";
+ };
+ };
+ "@babel/plugin-transform-literals-7.12.1" = {
+ name = "_at_babel_slash_plugin-transform-literals";
+ packageName = "@babel/plugin-transform-literals";
+ version = "7.12.1";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/@babel/plugin-transform-literals/-/plugin-transform-literals-7.12.1.tgz";
+ sha512 = "+PxVGA+2Ag6uGgL0A5f+9rklOnnMccwEBzwYFL3EUaKuiyVnUipyXncFcfjSkbimLrODoqki1U9XxZzTvfN7IQ==";
+ };
+ };
+ "@babel/plugin-transform-member-expression-literals-7.12.1" = {
+ name = "_at_babel_slash_plugin-transform-member-expression-literals";
+ packageName = "@babel/plugin-transform-member-expression-literals";
+ version = "7.12.1";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/@babel/plugin-transform-member-expression-literals/-/plugin-transform-member-expression-literals-7.12.1.tgz";
+ sha512 = "1sxePl6z9ad0gFMB9KqmYofk34flq62aqMt9NqliS/7hPEpURUCMbyHXrMPlo282iY7nAvUB1aQd5mg79UD9Jg==";
+ };
+ };
+ "@babel/plugin-transform-modules-amd-7.12.1" = {
+ name = "_at_babel_slash_plugin-transform-modules-amd";
+ packageName = "@babel/plugin-transform-modules-amd";
+ version = "7.12.1";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.12.1.tgz";
+ sha512 = "tDW8hMkzad5oDtzsB70HIQQRBiTKrhfgwC/KkJeGsaNFTdWhKNt/BiE8c5yj19XiGyrxpbkOfH87qkNg1YGlOQ==";
+ };
+ };
+ "@babel/plugin-transform-modules-commonjs-7.12.1" = {
+ name = "_at_babel_slash_plugin-transform-modules-commonjs";
+ packageName = "@babel/plugin-transform-modules-commonjs";
+ version = "7.12.1";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.12.1.tgz";
+ sha512 = "dY789wq6l0uLY8py9c1B48V8mVL5gZh/+PQ5ZPrylPYsnAvnEMjqsUXkuoDVPeVK+0VyGar+D08107LzDQ6pag==";
+ };
+ };
+ "@babel/plugin-transform-modules-systemjs-7.12.1" = {
+ name = "_at_babel_slash_plugin-transform-modules-systemjs";
+ packageName = "@babel/plugin-transform-modules-systemjs";
+ version = "7.12.1";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.12.1.tgz";
+ sha512 = "Hn7cVvOavVh8yvW6fLwveFqSnd7rbQN3zJvoPNyNaQSvgfKmDBO9U1YL9+PCXGRlZD9tNdWTy5ACKqMuzyn32Q==";
+ };
+ };
+ "@babel/plugin-transform-modules-umd-7.12.1" = {
+ name = "_at_babel_slash_plugin-transform-modules-umd";
+ packageName = "@babel/plugin-transform-modules-umd";
+ version = "7.12.1";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/@babel/plugin-transform-modules-umd/-/plugin-transform-modules-umd-7.12.1.tgz";
+ sha512 = "aEIubCS0KHKM0zUos5fIoQm+AZUMt1ZvMpqz0/H5qAQ7vWylr9+PLYurT+Ic7ID/bKLd4q8hDovaG3Zch2uz5Q==";
+ };
+ };
+ "@babel/plugin-transform-named-capturing-groups-regex-7.12.1" = {
+ name = "_at_babel_slash_plugin-transform-named-capturing-groups-regex";
+ packageName = "@babel/plugin-transform-named-capturing-groups-regex";
+ version = "7.12.1";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/@babel/plugin-transform-named-capturing-groups-regex/-/plugin-transform-named-capturing-groups-regex-7.12.1.tgz";
+ sha512 = "tB43uQ62RHcoDp9v2Nsf+dSM8sbNodbEicbQNA53zHz8pWUhsgHSJCGpt7daXxRydjb0KnfmB+ChXOv3oADp1Q==";
+ };
+ };
+ "@babel/plugin-transform-new-target-7.12.1" = {
+ name = "_at_babel_slash_plugin-transform-new-target";
+ packageName = "@babel/plugin-transform-new-target";
+ version = "7.12.1";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/@babel/plugin-transform-new-target/-/plugin-transform-new-target-7.12.1.tgz";
+ sha512 = "+eW/VLcUL5L9IvJH7rT1sT0CzkdUTvPrXC2PXTn/7z7tXLBuKvezYbGdxD5WMRoyvyaujOq2fWoKl869heKjhw==";
+ };
+ };
+ "@babel/plugin-transform-object-super-7.12.1" = {
+ name = "_at_babel_slash_plugin-transform-object-super";
+ packageName = "@babel/plugin-transform-object-super";
+ version = "7.12.1";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/@babel/plugin-transform-object-super/-/plugin-transform-object-super-7.12.1.tgz";
+ sha512 = "AvypiGJH9hsquNUn+RXVcBdeE3KHPZexWRdimhuV59cSoOt5kFBmqlByorAeUlGG2CJWd0U+4ZtNKga/TB0cAw==";
+ };
+ };
+ "@babel/plugin-transform-parameters-7.12.1" = {
+ name = "_at_babel_slash_plugin-transform-parameters";
+ packageName = "@babel/plugin-transform-parameters";
+ version = "7.12.1";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.12.1.tgz";
+ sha512 = "xq9C5EQhdPK23ZeCdMxl8bbRnAgHFrw5EOC3KJUsSylZqdkCaFEXxGSBuTSObOpiiHHNyb82es8M1QYgfQGfNg==";
+ };
+ };
+ "@babel/plugin-transform-property-literals-7.12.1" = {
+ name = "_at_babel_slash_plugin-transform-property-literals";
+ packageName = "@babel/plugin-transform-property-literals";
+ version = "7.12.1";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/@babel/plugin-transform-property-literals/-/plugin-transform-property-literals-7.12.1.tgz";
+ sha512 = "6MTCR/mZ1MQS+AwZLplX4cEySjCpnIF26ToWo942nqn8hXSm7McaHQNeGx/pt7suI1TWOWMfa/NgBhiqSnX0cQ==";
+ };
+ };
+ "@babel/plugin-transform-regenerator-7.12.1" = {
+ name = "_at_babel_slash_plugin-transform-regenerator";
+ packageName = "@babel/plugin-transform-regenerator";
+ version = "7.12.1";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.12.1.tgz";
+ sha512 = "gYrHqs5itw6i4PflFX3OdBPMQdPbF4bj2REIUxlMRUFk0/ZOAIpDFuViuxPjUL7YC8UPnf+XG7/utJvqXdPKng==";
+ };
+ };
+ "@babel/plugin-transform-reserved-words-7.12.1" = {
+ name = "_at_babel_slash_plugin-transform-reserved-words";
+ packageName = "@babel/plugin-transform-reserved-words";
+ version = "7.12.1";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/@babel/plugin-transform-reserved-words/-/plugin-transform-reserved-words-7.12.1.tgz";
+ sha512 = "pOnUfhyPKvZpVyBHhSBoX8vfA09b7r00Pmm1sH+29ae2hMTKVmSp4Ztsr8KBKjLjx17H0eJqaRC3bR2iThM54A==";
+ };
+ };
+ "@babel/plugin-transform-shorthand-properties-7.12.1" = {
+ name = "_at_babel_slash_plugin-transform-shorthand-properties";
+ packageName = "@babel/plugin-transform-shorthand-properties";
+ version = "7.12.1";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/@babel/plugin-transform-shorthand-properties/-/plugin-transform-shorthand-properties-7.12.1.tgz";
+ sha512 = "GFZS3c/MhX1OusqB1MZ1ct2xRzX5ppQh2JU1h2Pnfk88HtFTM+TWQqJNfwkmxtPQtb/s1tk87oENfXJlx7rSDw==";
+ };
+ };
+ "@babel/plugin-transform-spread-7.12.1" = {
+ name = "_at_babel_slash_plugin-transform-spread";
+ packageName = "@babel/plugin-transform-spread";
+ version = "7.12.1";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/@babel/plugin-transform-spread/-/plugin-transform-spread-7.12.1.tgz";
+ sha512 = "vuLp8CP0BE18zVYjsEBZ5xoCecMK6LBMMxYzJnh01rxQRvhNhH1csMMmBfNo5tGpGO+NhdSNW2mzIvBu3K1fng==";
+ };
+ };
+ "@babel/plugin-transform-sticky-regex-7.12.7" = {
+ name = "_at_babel_slash_plugin-transform-sticky-regex";
+ packageName = "@babel/plugin-transform-sticky-regex";
+ version = "7.12.7";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/@babel/plugin-transform-sticky-regex/-/plugin-transform-sticky-regex-7.12.7.tgz";
+ sha512 = "VEiqZL5N/QvDbdjfYQBhruN0HYjSPjC4XkeqW4ny/jNtH9gcbgaqBIXYEZCNnESMAGs0/K/R7oFGMhOyu/eIxg==";
+ };
+ };
+ "@babel/plugin-transform-template-literals-7.12.1" = {
+ name = "_at_babel_slash_plugin-transform-template-literals";
+ packageName = "@babel/plugin-transform-template-literals";
+ version = "7.12.1";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/@babel/plugin-transform-template-literals/-/plugin-transform-template-literals-7.12.1.tgz";
+ sha512 = "b4Zx3KHi+taXB1dVRBhVJtEPi9h1THCeKmae2qP0YdUHIFhVjtpqqNfxeVAa1xeHVhAy4SbHxEwx5cltAu5apw==";
+ };
+ };
+ "@babel/plugin-transform-typeof-symbol-7.12.1" = {
+ name = "_at_babel_slash_plugin-transform-typeof-symbol";
+ packageName = "@babel/plugin-transform-typeof-symbol";
+ version = "7.12.1";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/@babel/plugin-transform-typeof-symbol/-/plugin-transform-typeof-symbol-7.12.1.tgz";
+ sha512 = "EPGgpGy+O5Kg5pJFNDKuxt9RdmTgj5sgrus2XVeMp/ZIbOESadgILUbm50SNpghOh3/6yrbsH+NB5+WJTmsA7Q==";
+ };
+ };
+ "@babel/plugin-transform-unicode-escapes-7.12.1" = {
+ name = "_at_babel_slash_plugin-transform-unicode-escapes";
+ packageName = "@babel/plugin-transform-unicode-escapes";
+ version = "7.12.1";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/@babel/plugin-transform-unicode-escapes/-/plugin-transform-unicode-escapes-7.12.1.tgz";
+ sha512 = "I8gNHJLIc7GdApm7wkVnStWssPNbSRMPtgHdmH3sRM1zopz09UWPS4x5V4n1yz/MIWTVnJ9sp6IkuXdWM4w+2Q==";
+ };
+ };
+ "@babel/plugin-transform-unicode-regex-7.12.1" = {
+ name = "_at_babel_slash_plugin-transform-unicode-regex";
+ packageName = "@babel/plugin-transform-unicode-regex";
+ version = "7.12.1";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/@babel/plugin-transform-unicode-regex/-/plugin-transform-unicode-regex-7.12.1.tgz";
+ sha512 = "SqH4ClNngh/zGwHZOOQMTD+e8FGWexILV+ePMyiDJttAWRh5dhDL8rcl5lSgU3Huiq6Zn6pWTMvdPAb21Dwdyg==";
+ };
+ };
+ "@babel/preset-env-7.12.7" = {
+ name = "_at_babel_slash_preset-env";
+ packageName = "@babel/preset-env";
+ version = "7.12.7";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/@babel/preset-env/-/preset-env-7.12.7.tgz";
+ sha512 = "OnNdfAr1FUQg7ksb7bmbKoby4qFOHw6DKWWUNB9KqnnCldxhxJlP+21dpyaWFmf2h0rTbOkXJtAGevY3XW1eew==";
+ };
+ };
+ "@babel/preset-modules-0.1.4" = {
+ name = "_at_babel_slash_preset-modules";
+ packageName = "@babel/preset-modules";
+ version = "0.1.4";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/@babel/preset-modules/-/preset-modules-0.1.4.tgz";
+ sha512 = "J36NhwnfdzpmH41M1DrnkkgAqhZaqr/NBdPfQ677mLzlaXo+oDiv1deyCDtgAhz8p328otdob0Du7+xgHGZbKg==";
+ };
+ };
+ "@babel/runtime-7.12.5" = {
+ name = "_at_babel_slash_runtime";
+ packageName = "@babel/runtime";
+ version = "7.12.5";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/@babel/runtime/-/runtime-7.12.5.tgz";
+ sha512 = "plcc+hbExy3McchJCEQG3knOsuh3HH+Prx1P6cLIkET/0dLuQDEnrT+s27Axgc9bqfsmNUNHfscgMUdBpC9xfg==";
+ };
+ };
+ "@babel/template-7.12.7" = {
+ name = "_at_babel_slash_template";
+ packageName = "@babel/template";
+ version = "7.12.7";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/@babel/template/-/template-7.12.7.tgz";
+ sha512 = "GkDzmHS6GV7ZeXfJZ0tLRBhZcMcY0/Lnb+eEbXDBfCAcZCjrZKe6p3J4we/D24O9Y8enxWAg1cWwof59yLh2ow==";
+ };
+ };
+ "@babel/traverse-7.12.9" = {
+ name = "_at_babel_slash_traverse";
+ packageName = "@babel/traverse";
+ version = "7.12.9";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/@babel/traverse/-/traverse-7.12.9.tgz";
+ sha512 = "iX9ajqnLdoU1s1nHt36JDI9KG4k+vmI8WgjK5d+aDTwQbL2fUnzedNedssA645Ede3PM2ma1n8Q4h2ohwXgMXw==";
+ };
+ };
+ "@babel/types-7.12.7" = {
+ name = "_at_babel_slash_types";
+ packageName = "@babel/types";
+ version = "7.12.7";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/@babel/types/-/types-7.12.7.tgz";
+ sha512 = "MNyI92qZq6jrQkXvtIiykvl4WtoRrVV9MPn+ZfsoEENjiWcBQ3ZSHrkxnJWgWtLX3XXqX5hrSQ+X69wkmesXuQ==";
+ };
+ };
+ "@eslint/eslintrc-0.2.1" = {
+ name = "_at_eslint_slash_eslintrc";
+ packageName = "@eslint/eslintrc";
+ version = "0.2.1";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-0.2.1.tgz";
+ sha512 = "XRUeBZ5zBWLYgSANMpThFddrZZkEbGHgUdt5UJjZfnlN9BGCiUBrf+nvbRupSjMvqzwnQN0qwCmOxITt1cfywA==";
+ };
+ };
+ "@fortawesome/fontawesome-common-types-0.2.32" = {
+ name = "_at_fortawesome_slash_fontawesome-common-types";
+ packageName = "@fortawesome/fontawesome-common-types";
+ version = "0.2.32";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/@fortawesome/fontawesome-common-types/-/fontawesome-common-types-0.2.32.tgz";
+ sha512 = "ux2EDjKMpcdHBVLi/eWZynnPxs0BtFVXJkgHIxXRl+9ZFaHPvYamAfCzeeQFqHRjuJtX90wVnMRaMQAAlctz3w==";
+ };
+ };
+ "@fortawesome/fontawesome-svg-core-1.2.32" = {
+ name = "_at_fortawesome_slash_fontawesome-svg-core";
+ packageName = "@fortawesome/fontawesome-svg-core";
+ version = "1.2.32";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/@fortawesome/fontawesome-svg-core/-/fontawesome-svg-core-1.2.32.tgz";
+ sha512 = "XjqyeLCsR/c/usUpdWcOdVtWFVjPbDFBTQkn2fQRrWhhUoxriQohO2RWDxLyUM8XpD+Zzg5xwJ8gqTYGDLeGaQ==";
+ };
+ };
+ "@fortawesome/free-regular-svg-icons-5.15.1" = {
+ name = "_at_fortawesome_slash_free-regular-svg-icons";
+ packageName = "@fortawesome/free-regular-svg-icons";
+ version = "5.15.1";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/@fortawesome/free-regular-svg-icons/-/free-regular-svg-icons-5.15.1.tgz";
+ sha512 = "eD9NWFy89e7SVVtrLedJUxIpCBGhd4x7s7dhesokjyo1Tw62daqN5UcuAGu1NrepLLq1IeAYUVfWwnOjZ/j3HA==";
+ };
+ };
+ "@fortawesome/free-solid-svg-icons-5.15.1" = {
+ name = "_at_fortawesome_slash_free-solid-svg-icons";
+ packageName = "@fortawesome/free-solid-svg-icons";
+ version = "5.15.1";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/@fortawesome/free-solid-svg-icons/-/free-solid-svg-icons-5.15.1.tgz";
+ sha512 = "EFMuKtzRMNbvjab/SvJBaOOpaqJfdSap/Nl6hst7CgrJxwfORR1drdTV6q1Ib/JVzq4xObdTDcT6sqTaXMqfdg==";
+ };
+ };
+ "@types/anymatch-1.3.1" = {
+ name = "_at_types_slash_anymatch";
+ packageName = "@types/anymatch";
+ version = "1.3.1";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/@types/anymatch/-/anymatch-1.3.1.tgz";
+ sha512 = "/+CRPXpBDpo2RK9C68N3b2cOvO0Cf5B9aPijHsoDQTHivnGSObdOF2BRQOYjojWTDy6nQvMjmqRXIxH55VjxxA==";
+ };
+ };
+ "@types/eslint-7.2.5" = {
+ name = "_at_types_slash_eslint";
+ packageName = "@types/eslint";
+ version = "7.2.5";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/@types/eslint/-/eslint-7.2.5.tgz";
+ sha512 = "Dc6ar9x16BdaR3NSxSF7T4IjL9gxxViJq8RmFd+2UAyA+K6ck2W+gUwfgpG/y9TPyUuBL35109bbULpEynvltA==";
+ };
+ };
+ "@types/eslint-scope-3.7.0" = {
+ name = "_at_types_slash_eslint-scope";
+ packageName = "@types/eslint-scope";
+ version = "3.7.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/@types/eslint-scope/-/eslint-scope-3.7.0.tgz";
+ sha512 = "O/ql2+rrCUe2W2rs7wMR+GqPRcgB6UiqN5RhrR5xruFlY7l9YLMn0ZkDzjoHLeiFkR8MCQZVudUuuvQ2BLC9Qw==";
+ };
+ };
+ "@types/estree-0.0.45" = {
+ name = "_at_types_slash_estree";
+ packageName = "@types/estree";
+ version = "0.0.45";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/@types/estree/-/estree-0.0.45.tgz";
+ sha512 = "jnqIUKDUqJbDIUxm0Uj7bnlMnRm1T/eZ9N+AVMqhPgzrba2GhGG5o/jCTwmdPK709nEZsGoMzXEDUjcXHa3W0g==";
+ };
+ };
+ "@types/html-minifier-terser-5.1.1" = {
+ name = "_at_types_slash_html-minifier-terser";
+ packageName = "@types/html-minifier-terser";
+ version = "5.1.1";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/@types/html-minifier-terser/-/html-minifier-terser-5.1.1.tgz";
+ sha512 = "giAlZwstKbmvMk1OO7WXSj4OZ0keXAcl2TQq4LWHiiPH2ByaH7WeUzng+Qej8UPxxv+8lRTuouo0iaNDBuzIBA==";
+ };
+ };
+ "@types/json-schema-7.0.6" = {
+ name = "_at_types_slash_json-schema";
+ packageName = "@types/json-schema";
+ version = "7.0.6";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/@types/json-schema/-/json-schema-7.0.6.tgz";
+ sha512 = "3c+yGKvVP5Y9TYBEibGNR+kLtijnj7mYrXRg+WpFb2X9xm04g/DXYkfg4hmzJQosc9snFNUPkbYIhu+KAm6jJw==";
+ };
+ };
+ "@types/json5-0.0.29" = {
+ name = "_at_types_slash_json5";
+ packageName = "@types/json5";
+ version = "0.0.29";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/@types/json5/-/json5-0.0.29.tgz";
+ sha1 = "ee28707ae94e11d2b827bcbe5270bcea7f3e71ee";
+ };
+ };
+ "@types/node-14.14.9" = {
+ name = "_at_types_slash_node";
+ packageName = "@types/node";
+ version = "14.14.9";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/@types/node/-/node-14.14.9.tgz";
+ sha512 = "JsoLXFppG62tWTklIoO4knA+oDTYsmqWxHRvd4lpmfQRNhX6osheUOWETP2jMoV/2bEHuMra8Pp3Dmo/stBFcw==";
+ };
+ };
+ "@types/parse-json-4.0.0" = {
+ name = "_at_types_slash_parse-json";
+ packageName = "@types/parse-json";
+ version = "4.0.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/@types/parse-json/-/parse-json-4.0.0.tgz";
+ sha512 = "//oorEZjL6sbPcKUaCdIGlIUeH26mgzimjBB77G6XRgnDl/L5wOnpyBGRe/Mmf5CVW3PwEBE1NjiMZ/ssFh4wA==";
+ };
+ };
+ "@types/source-list-map-0.1.2" = {
+ name = "_at_types_slash_source-list-map";
+ packageName = "@types/source-list-map";
+ version = "0.1.2";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/@types/source-list-map/-/source-list-map-0.1.2.tgz";
+ sha512 = "K5K+yml8LTo9bWJI/rECfIPrGgxdpeNbj+d53lwN4QjW1MCwlkhUms+gtdzigTeUyBr09+u8BwOIY3MXvHdcsA==";
+ };
+ };
+ "@types/tapable-1.0.6" = {
+ name = "_at_types_slash_tapable";
+ packageName = "@types/tapable";
+ version = "1.0.6";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/@types/tapable/-/tapable-1.0.6.tgz";
+ sha512 = "W+bw9ds02rAQaMvaLYxAbJ6cvguW/iJXNT6lTssS1ps6QdrMKttqEAMEG/b5CR8TZl3/L7/lH0ZV5nNR1LXikA==";
+ };
+ };
+ "@types/uglify-js-3.11.1" = {
+ name = "_at_types_slash_uglify-js";
+ packageName = "@types/uglify-js";
+ version = "3.11.1";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/@types/uglify-js/-/uglify-js-3.11.1.tgz";
+ sha512 = "7npvPKV+jINLu1SpSYVWG8KvyJBhBa8tmzMMdDoVc2pWUYHN8KIXlPJhjJ4LT97c4dXJA2SHL/q6ADbDriZN+Q==";
+ };
+ };
+ "@types/webpack-4.41.25" = {
+ name = "_at_types_slash_webpack";
+ packageName = "@types/webpack";
+ version = "4.41.25";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/@types/webpack/-/webpack-4.41.25.tgz";
+ sha512 = "cr6kZ+4m9lp86ytQc1jPOJXgINQyz3kLLunZ57jznW+WIAL0JqZbGubQk4GlD42MuQL5JGOABrxdpqqWeovlVQ==";
+ };
+ };
+ "@types/webpack-sources-2.0.0" = {
+ name = "_at_types_slash_webpack-sources";
+ packageName = "@types/webpack-sources";
+ version = "2.0.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/@types/webpack-sources/-/webpack-sources-2.0.0.tgz";
+ sha512 = "a5kPx98CNFRKQ+wqawroFunvFqv7GHm/3KOI52NY9xWADgc8smu4R6prt4EU/M4QfVjvgBkMqU4fBhw3QfMVkg==";
+ };
+ };
+ "@webassemblyjs/ast-1.9.0" = {
+ name = "_at_webassemblyjs_slash_ast";
+ packageName = "@webassemblyjs/ast";
+ version = "1.9.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/@webassemblyjs/ast/-/ast-1.9.0.tgz";
+ sha512 = "C6wW5L+b7ogSDVqymbkkvuW9kruN//YisMED04xzeBBqjHa2FYnmvOlS6Xj68xWQRgWvI9cIglsjFowH/RJyEA==";
+ };
+ };
+ "@webassemblyjs/floating-point-hex-parser-1.9.0" = {
+ name = "_at_webassemblyjs_slash_floating-point-hex-parser";
+ packageName = "@webassemblyjs/floating-point-hex-parser";
+ version = "1.9.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/@webassemblyjs/floating-point-hex-parser/-/floating-point-hex-parser-1.9.0.tgz";
+ sha512 = "TG5qcFsS8QB4g4MhrxK5TqfdNe7Ey/7YL/xN+36rRjl/BlGE/NcBvJcqsRgCP6Z92mRE+7N50pRIi8SmKUbcQA==";
+ };
+ };
+ "@webassemblyjs/helper-api-error-1.9.0" = {
+ name = "_at_webassemblyjs_slash_helper-api-error";
+ packageName = "@webassemblyjs/helper-api-error";
+ version = "1.9.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/@webassemblyjs/helper-api-error/-/helper-api-error-1.9.0.tgz";
+ sha512 = "NcMLjoFMXpsASZFxJ5h2HZRcEhDkvnNFOAKneP5RbKRzaWJN36NC4jqQHKwStIhGXu5mUWlUUk7ygdtrO8lbmw==";
+ };
+ };
+ "@webassemblyjs/helper-buffer-1.9.0" = {
+ name = "_at_webassemblyjs_slash_helper-buffer";
+ packageName = "@webassemblyjs/helper-buffer";
+ version = "1.9.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/@webassemblyjs/helper-buffer/-/helper-buffer-1.9.0.tgz";
+ sha512 = "qZol43oqhq6yBPx7YM3m9Bv7WMV9Eevj6kMi6InKOuZxhw+q9hOkvq5e/PpKSiLfyetpaBnogSbNCfBwyB00CA==";
+ };
+ };
+ "@webassemblyjs/helper-code-frame-1.9.0" = {
+ name = "_at_webassemblyjs_slash_helper-code-frame";
+ packageName = "@webassemblyjs/helper-code-frame";
+ version = "1.9.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/@webassemblyjs/helper-code-frame/-/helper-code-frame-1.9.0.tgz";
+ sha512 = "ERCYdJBkD9Vu4vtjUYe8LZruWuNIToYq/ME22igL+2vj2dQ2OOujIZr3MEFvfEaqKoVqpsFKAGsRdBSBjrIvZA==";
+ };
+ };
+ "@webassemblyjs/helper-fsm-1.9.0" = {
+ name = "_at_webassemblyjs_slash_helper-fsm";
+ packageName = "@webassemblyjs/helper-fsm";
+ version = "1.9.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/@webassemblyjs/helper-fsm/-/helper-fsm-1.9.0.tgz";
+ sha512 = "OPRowhGbshCb5PxJ8LocpdX9Kl0uB4XsAjl6jH/dWKlk/mzsANvhwbiULsaiqT5GZGT9qinTICdj6PLuM5gslw==";
+ };
+ };
+ "@webassemblyjs/helper-module-context-1.9.0" = {
+ name = "_at_webassemblyjs_slash_helper-module-context";
+ packageName = "@webassemblyjs/helper-module-context";
+ version = "1.9.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/@webassemblyjs/helper-module-context/-/helper-module-context-1.9.0.tgz";
+ sha512 = "MJCW8iGC08tMk2enck1aPW+BE5Cw8/7ph/VGZxwyvGbJwjktKkDK7vy7gAmMDx88D7mhDTCNKAW5tED+gZ0W8g==";
+ };
+ };
+ "@webassemblyjs/helper-wasm-bytecode-1.9.0" = {
+ name = "_at_webassemblyjs_slash_helper-wasm-bytecode";
+ packageName = "@webassemblyjs/helper-wasm-bytecode";
+ version = "1.9.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/@webassemblyjs/helper-wasm-bytecode/-/helper-wasm-bytecode-1.9.0.tgz";
+ sha512 = "R7FStIzyNcd7xKxCZH5lE0Bqy+hGTwS3LJjuv1ZVxd9O7eHCedSdrId/hMOd20I+v8wDXEn+bjfKDLzTepoaUw==";
+ };
+ };
+ "@webassemblyjs/helper-wasm-section-1.9.0" = {
+ name = "_at_webassemblyjs_slash_helper-wasm-section";
+ packageName = "@webassemblyjs/helper-wasm-section";
+ version = "1.9.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/@webassemblyjs/helper-wasm-section/-/helper-wasm-section-1.9.0.tgz";
+ sha512 = "XnMB8l3ek4tvrKUUku+IVaXNHz2YsJyOOmz+MMkZvh8h1uSJpSen6vYnw3IoQ7WwEuAhL8Efjms1ZWjqh2agvw==";
+ };
+ };
+ "@webassemblyjs/ieee754-1.9.0" = {
+ name = "_at_webassemblyjs_slash_ieee754";
+ packageName = "@webassemblyjs/ieee754";
+ version = "1.9.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/@webassemblyjs/ieee754/-/ieee754-1.9.0.tgz";
+ sha512 = "dcX8JuYU/gvymzIHc9DgxTzUUTLexWwt8uCTWP3otys596io0L5aW02Gb1RjYpx2+0Jus1h4ZFqjla7umFniTg==";
+ };
+ };
+ "@webassemblyjs/leb128-1.9.0" = {
+ name = "_at_webassemblyjs_slash_leb128";
+ packageName = "@webassemblyjs/leb128";
+ version = "1.9.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/@webassemblyjs/leb128/-/leb128-1.9.0.tgz";
+ sha512 = "ENVzM5VwV1ojs9jam6vPys97B/S65YQtv/aanqnU7D8aSoHFX8GyhGg0CMfyKNIHBuAVjy3tlzd5QMMINa7wpw==";
+ };
+ };
+ "@webassemblyjs/utf8-1.9.0" = {
+ name = "_at_webassemblyjs_slash_utf8";
+ packageName = "@webassemblyjs/utf8";
+ version = "1.9.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/@webassemblyjs/utf8/-/utf8-1.9.0.tgz";
+ sha512 = "GZbQlWtopBTP0u7cHrEx+73yZKrQoBMpwkGEIqlacljhXCkVM1kMQge/Mf+csMJAjEdSwhOyLAS0AoR3AG5P8w==";
+ };
+ };
+ "@webassemblyjs/wasm-edit-1.9.0" = {
+ name = "_at_webassemblyjs_slash_wasm-edit";
+ packageName = "@webassemblyjs/wasm-edit";
+ version = "1.9.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/@webassemblyjs/wasm-edit/-/wasm-edit-1.9.0.tgz";
+ sha512 = "FgHzBm80uwz5M8WKnMTn6j/sVbqilPdQXTWraSjBwFXSYGirpkSWE2R9Qvz9tNiTKQvoKILpCuTjBKzOIm0nxw==";
+ };
+ };
+ "@webassemblyjs/wasm-gen-1.9.0" = {
+ name = "_at_webassemblyjs_slash_wasm-gen";
+ packageName = "@webassemblyjs/wasm-gen";
+ version = "1.9.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/@webassemblyjs/wasm-gen/-/wasm-gen-1.9.0.tgz";
+ sha512 = "cPE3o44YzOOHvlsb4+E9qSqjc9Qf9Na1OO/BHFy4OI91XDE14MjFN4lTMezzaIWdPqHnsTodGGNP+iRSYfGkjA==";
+ };
+ };
+ "@webassemblyjs/wasm-opt-1.9.0" = {
+ name = "_at_webassemblyjs_slash_wasm-opt";
+ packageName = "@webassemblyjs/wasm-opt";
+ version = "1.9.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/@webassemblyjs/wasm-opt/-/wasm-opt-1.9.0.tgz";
+ sha512 = "Qkjgm6Anhm+OMbIL0iokO7meajkzQD71ioelnfPEj6r4eOFuqm4YC3VBPqXjFyyNwowzbMD+hizmprP/Fwkl2A==";
+ };
+ };
+ "@webassemblyjs/wasm-parser-1.9.0" = {
+ name = "_at_webassemblyjs_slash_wasm-parser";
+ packageName = "@webassemblyjs/wasm-parser";
+ version = "1.9.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/@webassemblyjs/wasm-parser/-/wasm-parser-1.9.0.tgz";
+ sha512 = "9+wkMowR2AmdSWQzsPEjFU7njh8HTO5MqO8vjwEHuM+AMHioNqSBONRdr0NQQ3dVQrzp0s8lTcYqzUdb7YgELA==";
+ };
+ };
+ "@webassemblyjs/wast-parser-1.9.0" = {
+ name = "_at_webassemblyjs_slash_wast-parser";
+ packageName = "@webassemblyjs/wast-parser";
+ version = "1.9.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/@webassemblyjs/wast-parser/-/wast-parser-1.9.0.tgz";
+ sha512 = "qsqSAP3QQ3LyZjNC/0jBJ/ToSxfYJ8kYyuiGvtn/8MK89VrNEfwj7BPQzJVHi0jGTRK2dGdJ5PRqhtjzoww+bw==";
+ };
+ };
+ "@webassemblyjs/wast-printer-1.9.0" = {
+ name = "_at_webassemblyjs_slash_wast-printer";
+ packageName = "@webassemblyjs/wast-printer";
+ version = "1.9.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/@webassemblyjs/wast-printer/-/wast-printer-1.9.0.tgz";
+ sha512 = "2J0nE95rHXHyQ24cWjMKJ1tqB/ds8z/cyeOZxJhcb+rW+SQASVjuznUSmdz5GpVJTzU8JkhYut0D3siFDD6wsA==";
+ };
+ };
+ "@webpack-cli/info-1.1.0" = {
+ name = "_at_webpack-cli_slash_info";
+ packageName = "@webpack-cli/info";
+ version = "1.1.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/@webpack-cli/info/-/info-1.1.0.tgz";
+ sha512 = "uNWSdaYHc+f3LdIZNwhdhkjjLDDl3jP2+XBqAq9H8DjrJUvlOKdP8TNruy1yEaDfgpAIgbSAN7pye4FEHg9tYQ==";
+ };
+ };
+ "@webpack-cli/serve-1.1.0" = {
+ name = "_at_webpack-cli_slash_serve";
+ packageName = "@webpack-cli/serve";
+ version = "1.1.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/@webpack-cli/serve/-/serve-1.1.0.tgz";
+ sha512 = "7RfnMXCpJ/NThrhq4gYQYILB18xWyoQcBey81oIyVbmgbc6m5ZHHyFK+DyH7pLHJf0p14MxL4mTsoPAgBSTpIg==";
+ };
+ };
+ "@xtuc/ieee754-1.2.0" = {
+ name = "_at_xtuc_slash_ieee754";
+ packageName = "@xtuc/ieee754";
+ version = "1.2.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/@xtuc/ieee754/-/ieee754-1.2.0.tgz";
+ sha512 = "DX8nKgqcGwsc0eJSqYt5lwP4DH5FlHnmuWWBRy7X0NcaGR0ZtuyeESgMwTYVEtxmsNGY+qit4QYT/MIYTOTPeA==";
+ };
+ };
+ "@xtuc/long-4.2.2" = {
+ name = "_at_xtuc_slash_long";
+ packageName = "@xtuc/long";
+ version = "4.2.2";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/@xtuc/long/-/long-4.2.2.tgz";
+ sha512 = "NuHqBY1PB/D8xU6s/thBgOAiAP7HOYDQ32+BFZILJ8ivkUkAHQnWfn6WhL79Owj1qmUnoN/YPhktdIoucipkAQ==";
+ };
+ };
+ "acorn-7.4.1" = {
+ name = "acorn";
+ packageName = "acorn";
+ version = "7.4.1";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/acorn/-/acorn-7.4.1.tgz";
+ sha512 = "nQyp0o1/mNdbTO1PO6kHkwSrmgZ0MT/jCCpNiwbUjGoRN4dlBhqJtoQuCnEOKzgTVwg0ZWiCoQy6SxMebQVh8A==";
+ };
+ };
+ "acorn-8.0.4" = {
+ name = "acorn";
+ packageName = "acorn";
+ version = "8.0.4";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/acorn/-/acorn-8.0.4.tgz";
+ sha512 = "XNP0PqF1XD19ZlLKvB7cMmnZswW4C/03pRHgirB30uSJTaS3A3V1/P4sS3HPvFmjoriPCJQs+JDSbm4bL1TxGQ==";
+ };
+ };
+ "acorn-jsx-5.3.1" = {
+ name = "acorn-jsx";
+ packageName = "acorn-jsx";
+ version = "5.3.1";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/acorn-jsx/-/acorn-jsx-5.3.1.tgz";
+ sha512 = "K0Ptm/47OKfQRpNQ2J/oIN/3QYiK6FwW+eJbILhsdxh2WTLdl+30o8aGdTbm5JbffpFFAg/g+zi1E+jvJha5ng==";
+ };
+ };
+ "ajv-6.12.6" = {
+ name = "ajv";
+ packageName = "ajv";
+ version = "6.12.6";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz";
+ sha512 = "j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==";
+ };
+ };
+ "ajv-keywords-3.5.2" = {
+ name = "ajv-keywords";
+ packageName = "ajv-keywords";
+ version = "3.5.2";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-3.5.2.tgz";
+ sha512 = "5p6WTN0DdTGVQk6VjcEju19IgaHudalcfabD7yhDGeA6bcQnmL+CpveLJq/3hvfwd1aof6L386Ougkx6RfyMIQ==";
+ };
+ };
+ "ansi-colors-4.1.1" = {
+ name = "ansi-colors";
+ packageName = "ansi-colors";
+ version = "4.1.1";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/ansi-colors/-/ansi-colors-4.1.1.tgz";
+ sha512 = "JoX0apGbHaUJBNl6yF+p6JAFYZ666/hhCGKN5t9QFjbJQKUU/g8MNbFDbvfrgKXvI1QpZplPOnwIo99lX/AAmA==";
+ };
+ };
+ "ansi-regex-2.1.1" = {
+ name = "ansi-regex";
+ packageName = "ansi-regex";
+ version = "2.1.1";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz";
+ sha1 = "c3b33ab5ee360d86e0e628f0468ae7ef27d654df";
+ };
+ };
+ "ansi-regex-4.1.0" = {
+ name = "ansi-regex";
+ packageName = "ansi-regex";
+ version = "4.1.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.1.0.tgz";
+ sha512 = "1apePfXM1UOSqw0o9IiFAovVz9M5S1Dg+4TrDwfMewQ6p/rmMueb7tWZjQ1rx4Loy1ArBggoqGpfqqdI4rondg==";
+ };
+ };
+ "ansi-regex-5.0.0" = {
+ name = "ansi-regex";
+ packageName = "ansi-regex";
+ version = "5.0.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.0.tgz";
+ sha512 = "bY6fj56OUQ0hU1KjFNDQuJFezqKdrAyFdIevADiqrWHwSlbmBNMHp5ak2f40Pm8JTFyM2mqxkG6ngkHO11f/lg==";
+ };
+ };
+ "ansi-styles-3.2.1" = {
+ name = "ansi-styles";
+ packageName = "ansi-styles";
+ version = "3.2.1";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz";
+ sha512 = "VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==";
+ };
+ };
+ "ansi-styles-4.3.0" = {
+ name = "ansi-styles";
+ packageName = "ansi-styles";
+ version = "4.3.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz";
+ sha512 = "zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==";
+ };
+ };
+ "anymatch-3.1.1" = {
+ name = "anymatch";
+ packageName = "anymatch";
+ version = "3.1.1";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/anymatch/-/anymatch-3.1.1.tgz";
+ sha512 = "mM8522psRCqzV+6LhomX5wgp25YVibjh8Wj23I5RPkPppSVSjyKD2A2mBJmWGa+KN7f2D6LNh9jkBCeyLktzjg==";
+ };
+ };
+ "argparse-1.0.10" = {
+ name = "argparse";
+ packageName = "argparse";
+ version = "1.0.10";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/argparse/-/argparse-1.0.10.tgz";
+ sha512 = "o5Roy6tNG4SL/FOkCAN6RzjiakZS25RLYFrcMttJqbdd8BWrnA+fGz57iN5Pb06pvBGvl5gQ0B48dJlslXvoTg==";
+ };
+ };
+ "array-back-4.0.1" = {
+ name = "array-back";
+ packageName = "array-back";
+ version = "4.0.1";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/array-back/-/array-back-4.0.1.tgz";
+ sha512 = "Z/JnaVEXv+A9xabHzN43FiiiWEE7gPCRXMrVmRm00tWbjZRul1iHm7ECzlyNq1p4a4ATXz+G9FJ3GqGOkOV3fg==";
+ };
+ };
+ "array-includes-3.1.2" = {
+ name = "array-includes";
+ packageName = "array-includes";
+ version = "3.1.2";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/array-includes/-/array-includes-3.1.2.tgz";
+ sha512 = "w2GspexNQpx+PutG3QpT437/BenZBj0M/MZGn5mzv/MofYqo0xmRHzn4lFsoDlWJ+THYsGJmFlW68WlDFx7VRw==";
+ };
+ };
+ "array.prototype.flat-1.2.4" = {
+ name = "array.prototype.flat";
+ packageName = "array.prototype.flat";
+ version = "1.2.4";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/array.prototype.flat/-/array.prototype.flat-1.2.4.tgz";
+ sha512 = "4470Xi3GAPAjZqFcljX2xzckv1qeKPizoNkiS0+O4IoPR2ZNpcjE0pkhdihlDouK+x6QOast26B4Q/O9DJnwSg==";
+ };
+ };
+ "astral-regex-1.0.0" = {
+ name = "astral-regex";
+ packageName = "astral-regex";
+ version = "1.0.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/astral-regex/-/astral-regex-1.0.0.tgz";
+ sha512 = "+Ryf6g3BKoRc7jfp7ad8tM4TtMiaWvbF/1/sQcZPkkS7ag3D5nMBCe2UfOTONtAkaG0tO0ij3C5Lwmf1EiyjHg==";
+ };
+ };
+ "autoprefixer-10.0.2" = {
+ name = "autoprefixer";
+ packageName = "autoprefixer";
+ version = "10.0.2";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/autoprefixer/-/autoprefixer-10.0.2.tgz";
+ sha512 = "okBmu9OMdt6DNEcZmnl0IYVv8Xl/xYWRSnc2OJ9UJEOt1u30opG1B8aLsViqKryBaYv1SKB4f85fOGZs5zYxHQ==";
+ };
+ };
+ "babel-loader-8.2.1" = {
+ name = "babel-loader";
+ packageName = "babel-loader";
+ version = "8.2.1";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/babel-loader/-/babel-loader-8.2.1.tgz";
+ sha512 = "dMF8sb2KQ8kJl21GUjkW1HWmcsL39GOV5vnzjqrCzEPNY0S0UfMLnumidiwIajDSBmKhYf5iRW+HXaM4cvCKBw==";
+ };
+ };
+ "babel-plugin-dynamic-import-node-2.3.3" = {
+ name = "babel-plugin-dynamic-import-node";
+ packageName = "babel-plugin-dynamic-import-node";
+ version = "2.3.3";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/babel-plugin-dynamic-import-node/-/babel-plugin-dynamic-import-node-2.3.3.tgz";
+ sha512 = "jZVI+s9Zg3IqA/kdi0i6UDCybUI3aSBLnglhYbSSjKlV7yF1F/5LWv8MakQmvYpnbJDS6fcBL2KzHSxNCMtWSQ==";
+ };
+ };
+ "balanced-match-1.0.0" = {
+ name = "balanced-match";
+ packageName = "balanced-match";
+ version = "1.0.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.0.tgz";
+ sha1 = "89b4d199ab2bee49de164ea02b89ce462d71b767";
+ };
+ };
+ "big.js-5.2.2" = {
+ name = "big.js";
+ packageName = "big.js";
+ version = "5.2.2";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/big.js/-/big.js-5.2.2.tgz";
+ sha512 = "vyL2OymJxmarO8gxMr0mhChsO9QGwhynfuu4+MHTAW6czfq9humCB7rKpUjDd9YUiDPU4mzpyupFSvOClAwbmQ==";
+ };
+ };
+ "binary-extensions-2.1.0" = {
+ name = "binary-extensions";
+ packageName = "binary-extensions";
+ version = "2.1.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/binary-extensions/-/binary-extensions-2.1.0.tgz";
+ sha512 = "1Yj8h9Q+QDF5FzhMs/c9+6UntbD5MkRfRwac8DoEm9ZfUBZ7tZ55YcGVAzEe4bXsdQHEk+s9S5wsOKVdZrw0tQ==";
+ };
+ };
+ "boolbase-1.0.0" = {
+ name = "boolbase";
+ packageName = "boolbase";
+ version = "1.0.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/boolbase/-/boolbase-1.0.0.tgz";
+ sha1 = "68dff5fbe60c51eb37725ea9e3ed310dcc1e776e";
+ };
+ };
+ "bootstrap-4.5.3" = {
+ name = "bootstrap";
+ packageName = "bootstrap";
+ version = "4.5.3";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/bootstrap/-/bootstrap-4.5.3.tgz";
+ sha512 = "o9ppKQioXGqhw8Z7mah6KdTYpNQY//tipnkxppWhPbiSWdD+1raYsnhwEZjkTHYbGee4cVQ0Rx65EhOY/HNLcQ==";
+ };
+ };
+ "bootswatch-4.5.3" = {
+ name = "bootswatch";
+ packageName = "bootswatch";
+ version = "4.5.3";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/bootswatch/-/bootswatch-4.5.3.tgz";
+ sha512 = "gaB3gBSAegmYbk97aVELKcSKVdPjWsSY4yCITkUt/SqbqjtMU/HtIUszb4O9vzdbrfuVXThc/qCXzjoJaAPgiQ==";
+ };
+ };
+ "brace-expansion-1.1.11" = {
+ name = "brace-expansion";
+ packageName = "brace-expansion";
+ version = "1.1.11";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz";
+ sha512 = "iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==";
+ };
+ };
+ "braces-3.0.2" = {
+ name = "braces";
+ packageName = "braces";
+ version = "3.0.2";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/braces/-/braces-3.0.2.tgz";
+ sha512 = "b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==";
+ };
+ };
+ "browserslist-4.14.7" = {
+ name = "browserslist";
+ packageName = "browserslist";
+ version = "4.14.7";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/browserslist/-/browserslist-4.14.7.tgz";
+ sha512 = "BSVRLCeG3Xt/j/1cCGj1019Wbty0H+Yvu2AOuZSuoaUWn3RatbL33Cxk+Q4jRMRAbOm0p7SLravLjpnT6s0vzQ==";
+ };
+ };
+ "buffer-from-1.1.1" = {
+ name = "buffer-from";
+ packageName = "buffer-from";
+ version = "1.1.1";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/buffer-from/-/buffer-from-1.1.1.tgz";
+ sha512 = "MQcXEUbCKtEo7bhqEs6560Hyd4XaovZlO/k9V3hjVUF/zwW7KBVdSK4gIt/bzwS9MbR5qob+F5jusZsb0YQK2A==";
+ };
+ };
+ "call-bind-1.0.0" = {
+ name = "call-bind";
+ packageName = "call-bind";
+ version = "1.0.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/call-bind/-/call-bind-1.0.0.tgz";
+ sha512 = "AEXsYIyyDY3MCzbwdhzG3Jx1R0J2wetQyUynn6dYHAO+bg8l1k7jwZtRv4ryryFs7EP+NDlikJlVe59jr0cM2w==";
+ };
+ };
+ "callsites-3.1.0" = {
+ name = "callsites";
+ packageName = "callsites";
+ version = "3.1.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/callsites/-/callsites-3.1.0.tgz";
+ sha512 = "P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ==";
+ };
+ };
+ "camel-case-4.1.1" = {
+ name = "camel-case";
+ packageName = "camel-case";
+ version = "4.1.1";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/camel-case/-/camel-case-4.1.1.tgz";
+ sha512 = "7fa2WcG4fYFkclIvEmxBbTvmibwF2/agfEBc6q3lOpVu0A13ltLsA+Hr/8Hp6kp5f+G7hKi6t8lys6XxP+1K6Q==";
+ };
+ };
+ "camelcase-6.2.0" = {
+ name = "camelcase";
+ packageName = "camelcase";
+ version = "6.2.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/camelcase/-/camelcase-6.2.0.tgz";
+ sha512 = "c7wVvbw3f37nuobQNtgsgG9POC9qMbNuMQmTCqZv23b6MIz0fcYpBiOlv9gEN/hdLdnZTDQhg6e9Dq5M1vKvfg==";
+ };
+ };
+ "caniuse-lite-1.0.30001161" = {
+ name = "caniuse-lite";
+ packageName = "caniuse-lite";
+ version = "1.0.30001161";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001161.tgz";
+ sha512 = "JharrCDxOqPLBULF9/SPa6yMcBRTjZARJ6sc3cuKrPfyIk64JN6kuMINWqA99Xc8uElMFcROliwtz0n9pYej+g==";
+ };
+ };
+ "chalk-2.4.2" = {
+ name = "chalk";
+ packageName = "chalk";
+ version = "2.4.2";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz";
+ sha512 = "Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==";
+ };
+ };
+ "chalk-4.1.0" = {
+ name = "chalk";
+ packageName = "chalk";
+ version = "4.1.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/chalk/-/chalk-4.1.0.tgz";
+ sha512 = "qwx12AxXe2Q5xQ43Ac//I6v5aXTipYrSESdOgzrN+9XjgEpyjpKuvSGaN4qE93f7TQTlerQQ8S+EQ0EyDoVL1A==";
+ };
+ };
+ "chokidar-3.4.3" = {
+ name = "chokidar";
+ packageName = "chokidar";
+ version = "3.4.3";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/chokidar/-/chokidar-3.4.3.tgz";
+ sha512 = "DtM3g7juCXQxFVSNPNByEC2+NImtBuxQQvWlHunpJIS5Ocr0lG306cC7FCi7cEA0fzmybPUIl4txBIobk1gGOQ==";
+ };
+ };
+ "chrome-trace-event-1.0.2" = {
+ name = "chrome-trace-event";
+ packageName = "chrome-trace-event";
+ version = "1.0.2";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/chrome-trace-event/-/chrome-trace-event-1.0.2.tgz";
+ sha512 = "9e/zx1jw7B4CO+c/RXoCsfg/x1AfUBioy4owYH0bJprEYAx5hRFLRhWBqHAG57D0ZM4H7vxbP7bPe0VwhQRYDQ==";
+ };
+ };
+ "clean-css-4.2.3" = {
+ name = "clean-css";
+ packageName = "clean-css";
+ version = "4.2.3";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/clean-css/-/clean-css-4.2.3.tgz";
+ sha512 = "VcMWDN54ZN/DS+g58HYL5/n4Zrqe8vHJpGA8KdgUXFU4fuP/aHNw8eld9SyEIyabIMJX/0RaY/fplOo5hYLSFA==";
+ };
+ };
+ "color-convert-1.9.3" = {
+ name = "color-convert";
+ packageName = "color-convert";
+ version = "1.9.3";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz";
+ sha512 = "QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==";
+ };
+ };
+ "color-convert-2.0.1" = {
+ name = "color-convert";
+ packageName = "color-convert";
+ version = "2.0.1";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz";
+ sha512 = "RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==";
+ };
+ };
+ "color-name-1.1.3" = {
+ name = "color-name";
+ packageName = "color-name";
+ version = "1.1.3";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz";
+ sha1 = "a7d0558bd89c42f795dd42328f740831ca53bc25";
+ };
+ };
+ "color-name-1.1.4" = {
+ name = "color-name";
+ packageName = "color-name";
+ version = "1.1.4";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz";
+ sha512 = "dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==";
+ };
+ };
+ "colorette-1.2.1" = {
+ name = "colorette";
+ packageName = "colorette";
+ version = "1.2.1";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/colorette/-/colorette-1.2.1.tgz";
+ sha512 = "puCDz0CzydiSYOrnXpz/PKd69zRrribezjtE9yd4zvytoRc8+RY/KJPvtPFKZS3E3wP6neGyMe0vOTlHO5L3Pw==";
+ };
+ };
+ "command-line-usage-6.1.1" = {
+ name = "command-line-usage";
+ packageName = "command-line-usage";
+ version = "6.1.1";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/command-line-usage/-/command-line-usage-6.1.1.tgz";
+ sha512 = "F59pEuAR9o1SF/bD0dQBDluhpT4jJQNWUHEuVBqpDmCUo6gPjCi+m9fCWnWZVR/oG6cMTUms4h+3NPl74wGXvA==";
+ };
+ };
+ "commander-2.20.3" = {
+ name = "commander";
+ packageName = "commander";
+ version = "2.20.3";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/commander/-/commander-2.20.3.tgz";
+ sha512 = "GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ==";
+ };
+ };
+ "commander-4.1.1" = {
+ name = "commander";
+ packageName = "commander";
+ version = "4.1.1";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/commander/-/commander-4.1.1.tgz";
+ sha512 = "NOKm8xhkzAjzFx8B2v5OAHT+u5pRQc2UCa2Vq9jYL/31o2wi9mxBA7LIFs3sV5VSC49z6pEhfbMULvShKj26WA==";
+ };
+ };
+ "commander-6.2.0" = {
+ name = "commander";
+ packageName = "commander";
+ version = "6.2.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/commander/-/commander-6.2.0.tgz";
+ sha512 = "zP4jEKbe8SHzKJYQmq8Y9gYjtO/POJLgIdKgV7B9qNmABVFVc+ctqSX6iXh4mCpJfRBOabiZ2YKPg8ciDw6C+Q==";
+ };
+ };
+ "comment-parser-0.7.6" = {
+ name = "comment-parser";
+ packageName = "comment-parser";
+ version = "0.7.6";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/comment-parser/-/comment-parser-0.7.6.tgz";
+ sha512 = "GKNxVA7/iuTnAqGADlTWX4tkhzxZKXp5fLJqKTlQLHkE65XDUKutZ3BHaJC5IGcper2tT3QRD1xr4o3jNpgXXg==";
+ };
+ };
+ "commondir-1.0.1" = {
+ name = "commondir";
+ packageName = "commondir";
+ version = "1.0.1";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/commondir/-/commondir-1.0.1.tgz";
+ sha1 = "ddd800da0c66127393cca5950ea968a3aaf1253b";
+ };
+ };
+ "concat-map-0.0.1" = {
+ name = "concat-map";
+ packageName = "concat-map";
+ version = "0.0.1";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz";
+ sha1 = "d8a96bd77fd68df7793a73036a3ba0d5405d477b";
+ };
+ };
+ "contains-path-0.1.0" = {
+ name = "contains-path";
+ packageName = "contains-path";
+ version = "0.1.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/contains-path/-/contains-path-0.1.0.tgz";
+ sha1 = "fe8cf184ff6670b6baef01a9d4861a5cbec4120a";
+ };
+ };
+ "convert-source-map-1.7.0" = {
+ name = "convert-source-map";
+ packageName = "convert-source-map";
+ version = "1.7.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/convert-source-map/-/convert-source-map-1.7.0.tgz";
+ sha512 = "4FJkXzKXEDB1snCFZlLP4gpC3JILicCpGbzG9f9G7tGqGCzETQ2hWPrcinA9oU4wtf2biUaEH5065UnMeR33oA==";
+ };
+ };
+ "core-js-3.7.0" = {
+ name = "core-js";
+ packageName = "core-js";
+ version = "3.7.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/core-js/-/core-js-3.7.0.tgz";
+ sha512 = "NwS7fI5M5B85EwpWuIwJN4i/fbisQUwLwiSNUWeXlkAZ0sbBjLEvLvFLf1uzAUV66PcEPt4xCGCmOZSxVf3xzA==";
+ };
+ };
+ "core-js-compat-3.7.0" = {
+ name = "core-js-compat";
+ packageName = "core-js-compat";
+ version = "3.7.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/core-js-compat/-/core-js-compat-3.7.0.tgz";
+ sha512 = "V8yBI3+ZLDVomoWICO6kq/CD28Y4r1M7CWeO4AGpMdMfseu8bkSubBmUPySMGKRTS+su4XQ07zUkAsiu9FCWTg==";
+ };
+ };
+ "cosmiconfig-7.0.0" = {
+ name = "cosmiconfig";
+ packageName = "cosmiconfig";
+ version = "7.0.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/cosmiconfig/-/cosmiconfig-7.0.0.tgz";
+ sha512 = "pondGvTuVYDk++upghXJabWzL6Kxu6f26ljFw64Swq9v6sQPUL3EUlVDV56diOjpCayKihL6hVe8exIACU4XcA==";
+ };
+ };
+ "cross-spawn-7.0.3" = {
+ name = "cross-spawn";
+ packageName = "cross-spawn";
+ version = "7.0.3";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.3.tgz";
+ sha512 = "iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==";
+ };
+ };
+ "css-loader-5.0.1" = {
+ name = "css-loader";
+ packageName = "css-loader";
+ version = "5.0.1";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/css-loader/-/css-loader-5.0.1.tgz";
+ sha512 = "cXc2ti9V234cq7rJzFKhirb2L2iPy8ZjALeVJAozXYz9te3r4eqLSixNAbMDJSgJEQywqXzs8gonxaboeKqwiw==";
+ };
+ };
+ "css-select-1.2.0" = {
+ name = "css-select";
+ packageName = "css-select";
+ version = "1.2.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/css-select/-/css-select-1.2.0.tgz";
+ sha1 = "2b3a110539c5355f1cd8d314623e870b121ec858";
+ };
+ };
+ "css-what-2.1.3" = {
+ name = "css-what";
+ packageName = "css-what";
+ version = "2.1.3";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/css-what/-/css-what-2.1.3.tgz";
+ sha512 = "a+EPoD+uZiNfh+5fxw2nO9QwFa6nJe2Or35fGY6Ipw1R3R4AGz1d1TEZrCegvw2YTmZ0jXirGYlzxxpYSHwpEg==";
+ };
+ };
+ "cssesc-3.0.0" = {
+ name = "cssesc";
+ packageName = "cssesc";
+ version = "3.0.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/cssesc/-/cssesc-3.0.0.tgz";
+ sha512 = "/Tb/JcjK111nNScGob5MNtsntNM1aCNUDipB/TkwZFhyDrrE47SOx/18wF2bbjgc3ZzCSKW1T5nt5EbFoAz/Vg==";
+ };
+ };
+ "debug-2.6.9" = {
+ name = "debug";
+ packageName = "debug";
+ version = "2.6.9";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz";
+ sha512 = "bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==";
+ };
+ };
+ "debug-4.3.1" = {
+ name = "debug";
+ packageName = "debug";
+ version = "4.3.1";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/debug/-/debug-4.3.1.tgz";
+ sha512 = "doEwdvm4PCeK4K3RQN2ZC2BYUBaxwLARCqZmMjtF8a51J2Rb0xpVloFRnCODwqjpwnAoao4pelN8l3RJdv3gRQ==";
+ };
+ };
+ "deep-extend-0.6.0" = {
+ name = "deep-extend";
+ packageName = "deep-extend";
+ version = "0.6.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/deep-extend/-/deep-extend-0.6.0.tgz";
+ sha512 = "LOHxIOaPYdHlJRtCQfDIVZtfw/ufM8+rVj649RIHzcm/vGwQRXFt6OPqIFWsm2XEMrNIEtWR64sY1LEKD2vAOA==";
+ };
+ };
+ "deep-is-0.1.3" = {
+ name = "deep-is";
+ packageName = "deep-is";
+ version = "0.1.3";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/deep-is/-/deep-is-0.1.3.tgz";
+ sha1 = "b369d6fb5dbc13eecf524f91b070feedc357cf34";
+ };
+ };
+ "define-properties-1.1.3" = {
+ name = "define-properties";
+ packageName = "define-properties";
+ version = "1.1.3";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/define-properties/-/define-properties-1.1.3.tgz";
+ sha512 = "3MqfYKj2lLzdMSf8ZIZE/V+Zuy+BgD6f164e8K2w7dgnpKArBDerGYpM46IYYcjnkdPNMjPk9A6VFB8+3SKlXQ==";
+ };
+ };
+ "doctrine-1.5.0" = {
+ name = "doctrine";
+ packageName = "doctrine";
+ version = "1.5.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/doctrine/-/doctrine-1.5.0.tgz";
+ sha1 = "379dce730f6166f76cefa4e6707a159b02c5a6fa";
+ };
+ };
+ "doctrine-3.0.0" = {
+ name = "doctrine";
+ packageName = "doctrine";
+ version = "3.0.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/doctrine/-/doctrine-3.0.0.tgz";
+ sha512 = "yS+Q5i3hBf7GBkd4KG8a7eBNNWNGLTaEwwYWUijIYM7zrlYDM0BFXHjjPWlWZ1Rg7UaddZeIDmi9jF3HmqiQ2w==";
+ };
+ };
+ "dom-converter-0.2.0" = {
+ name = "dom-converter";
+ packageName = "dom-converter";
+ version = "0.2.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/dom-converter/-/dom-converter-0.2.0.tgz";
+ sha512 = "gd3ypIPfOMr9h5jIKq8E3sHOTCjeirnl0WK5ZdS1AW0Odt0b1PaWaHdJ4Qk4klv+YB9aJBS7mESXjFoDQPu6DA==";
+ };
+ };
+ "dom-serializer-0.2.2" = {
+ name = "dom-serializer";
+ packageName = "dom-serializer";
+ version = "0.2.2";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/dom-serializer/-/dom-serializer-0.2.2.tgz";
+ sha512 = "2/xPb3ORsQ42nHYiSunXkDjPLBaEj/xTwUO4B7XCZQTRk7EBtTOPaygh10YAAh2OI1Qrp6NWfpAhzswj0ydt9g==";
+ };
+ };
+ "domelementtype-1.3.1" = {
+ name = "domelementtype";
+ packageName = "domelementtype";
+ version = "1.3.1";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/domelementtype/-/domelementtype-1.3.1.tgz";
+ sha512 = "BSKB+TSpMpFI/HOxCNr1O8aMOTZ8hT3pM3GQ0w/mWRmkhEDSFJkkyzz4XQsBV44BChwGkrDfMyjVD0eA2aFV3w==";
+ };
+ };
+ "domelementtype-2.0.2" = {
+ name = "domelementtype";
+ packageName = "domelementtype";
+ version = "2.0.2";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/domelementtype/-/domelementtype-2.0.2.tgz";
+ sha512 = "wFwTwCVebUrMgGeAwRL/NhZtHAUyT9n9yg4IMDwf10+6iCMxSkVq9MGCVEH+QZWo1nNidy8kNvwmv4zWHDTqvA==";
+ };
+ };
+ "domhandler-2.4.2" = {
+ name = "domhandler";
+ packageName = "domhandler";
+ version = "2.4.2";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/domhandler/-/domhandler-2.4.2.tgz";
+ sha512 = "JiK04h0Ht5u/80fdLMCEmV4zkNh2BcoMFBmZ/91WtYZ8qVXSKjiw7fXMgFPnHcSZgOo3XdinHvmnDUeMf5R4wA==";
+ };
+ };
+ "domutils-1.5.1" = {
+ name = "domutils";
+ packageName = "domutils";
+ version = "1.5.1";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/domutils/-/domutils-1.5.1.tgz";
+ sha1 = "dcd8488a26f563d61079e48c9f7b7e32373682cf";
+ };
+ };
+ "dot-case-3.0.3" = {
+ name = "dot-case";
+ packageName = "dot-case";
+ version = "3.0.3";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/dot-case/-/dot-case-3.0.3.tgz";
+ sha512 = "7hwEmg6RiSQfm/GwPL4AAWXKy3YNNZA3oFv2Pdiey0mwkRCPZ9x6SZbkLcn8Ma5PYeVokzoD4Twv2n7LKp5WeA==";
+ };
+ };
+ "electron-to-chromium-1.3.607" = {
+ name = "electron-to-chromium";
+ packageName = "electron-to-chromium";
+ version = "1.3.607";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.607.tgz";
+ sha512 = "h2SYNaBnlplGS0YyXl8oJWokfcNxVjJANQfMCsQefG6OSuAuNIeW+A8yGT/ci+xRoBb3k2zq1FrOvkgoKBol8g==";
+ };
+ };
+ "emoji-regex-7.0.3" = {
+ name = "emoji-regex";
+ packageName = "emoji-regex";
+ version = "7.0.3";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/emoji-regex/-/emoji-regex-7.0.3.tgz";
+ sha512 = "CwBLREIQ7LvYFB0WyRvwhq5N5qPhc6PMjD6bYggFlI5YyDgl+0vxq5VHbMOFqLg7hfWzmu8T5Z1QofhmTIhItA==";
+ };
+ };
+ "emojis-list-3.0.0" = {
+ name = "emojis-list";
+ packageName = "emojis-list";
+ version = "3.0.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/emojis-list/-/emojis-list-3.0.0.tgz";
+ sha512 = "/kyM18EfinwXZbno9FyUGeFh87KC8HRQBQGildHZbEuRyWFOmv1U10o9BBp8XVZDVNNuQKyIGIu5ZYAAXJ0V2Q==";
+ };
+ };
+ "end-of-stream-1.4.4" = {
+ name = "end-of-stream";
+ packageName = "end-of-stream";
+ version = "1.4.4";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/end-of-stream/-/end-of-stream-1.4.4.tgz";
+ sha512 = "+uw1inIHVPQoaVuHzRyXd21icM+cnt4CzD5rW+NC1wjOUSTOs+Te7FOv7AhN7vS9x/oIyhLP5PR1H+phQAHu5Q==";
+ };
+ };
+ "enhanced-resolve-5.3.2" = {
+ name = "enhanced-resolve";
+ packageName = "enhanced-resolve";
+ version = "5.3.2";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-5.3.2.tgz";
+ sha512 = "G28GCrglCAH6+EqMN2D+Q2wCUS1O1vVQJBn8ME2I/Api41YBe4vLWWRBOUbwDH7vwzSZdljxwTRVqnf+sm6XqQ==";
+ };
+ };
+ "enquirer-2.3.6" = {
+ name = "enquirer";
+ packageName = "enquirer";
+ version = "2.3.6";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/enquirer/-/enquirer-2.3.6.tgz";
+ sha512 = "yjNnPr315/FjS4zIsUxYguYUPP2e1NK4d7E7ZOLiyYCcbFBiTMyID+2wvm2w6+pZ/odMA7cRkjhsPbltwBOrLg==";
+ };
+ };
+ "entities-1.1.2" = {
+ name = "entities";
+ packageName = "entities";
+ version = "1.1.2";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/entities/-/entities-1.1.2.tgz";
+ sha512 = "f2LZMYl1Fzu7YSBKg+RoROelpOaNrcGmE9AZubeDfrCEia483oW4MI4VyFd5VNHIgQ/7qm1I0wUHK1eJnn2y2w==";
+ };
+ };
+ "entities-2.1.0" = {
+ name = "entities";
+ packageName = "entities";
+ version = "2.1.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/entities/-/entities-2.1.0.tgz";
+ sha512 = "hCx1oky9PFrJ611mf0ifBLBRW8lUUVRlFolb5gWRfIELabBlbp9xZvrqZLZAs+NxFnbfQoeGd8wDkygjg7U85w==";
+ };
+ };
+ "envinfo-7.7.3" = {
+ name = "envinfo";
+ packageName = "envinfo";
+ version = "7.7.3";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/envinfo/-/envinfo-7.7.3.tgz";
+ sha512 = "46+j5QxbPWza0PB1i15nZx0xQ4I/EfQxg9J8Had3b408SV63nEtor2e+oiY63amTo9KTuh2a3XLObNwduxYwwA==";
+ };
+ };
+ "error-ex-1.3.2" = {
+ name = "error-ex";
+ packageName = "error-ex";
+ version = "1.3.2";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/error-ex/-/error-ex-1.3.2.tgz";
+ sha512 = "7dFHNmqeFSEt2ZBsCriorKnn3Z2pj+fd9kmI6QoWw4//DL+icEBfc0U7qJCisqrTsKTjw4fNFy2pW9OqStD84g==";
+ };
+ };
+ "es-abstract-1.17.7" = {
+ name = "es-abstract";
+ packageName = "es-abstract";
+ version = "1.17.7";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/es-abstract/-/es-abstract-1.17.7.tgz";
+ sha512 = "VBl/gnfcJ7OercKA9MVaegWsBHFjV492syMudcnQZvt/Dw8ezpcOHYZXa/J96O8vx+g4x65YKhxOwDUh63aS5g==";
+ };
+ };
+ "es-abstract-1.18.0-next.1" = {
+ name = "es-abstract";
+ packageName = "es-abstract";
+ version = "1.18.0-next.1";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/es-abstract/-/es-abstract-1.18.0-next.1.tgz";
+ sha512 = "I4UGspA0wpZXWENrdA0uHbnhte683t3qT/1VFH9aX2dA5PPSf6QW5HHXf5HImaqPmjXaVeVk4RGWnaylmV7uAA==";
+ };
+ };
+ "es-to-primitive-1.2.1" = {
+ name = "es-to-primitive";
+ packageName = "es-to-primitive";
+ version = "1.2.1";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/es-to-primitive/-/es-to-primitive-1.2.1.tgz";
+ sha512 = "QCOllgZJtaUo9miYBcLChTUaHNjJF3PYs1VidD7AwiEj1kYxKeQTctLAezAOH5ZKRH0g2IgPn6KwB4IT8iRpvA==";
+ };
+ };
+ "escalade-3.1.1" = {
+ name = "escalade";
+ packageName = "escalade";
+ version = "3.1.1";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/escalade/-/escalade-3.1.1.tgz";
+ sha512 = "k0er2gUkLf8O0zKJiAhmkTnJlTvINGv7ygDNPbeIsX/TJjGJZHuh9B2UxbsaEkmlEo9MfhrSzmhIlhRlI2GXnw==";
+ };
+ };
+ "escape-string-regexp-1.0.5" = {
+ name = "escape-string-regexp";
+ packageName = "escape-string-regexp";
+ version = "1.0.5";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz";
+ sha1 = "1b61c0562190a8dff6ae3bb2cf0200ca130b86d4";
+ };
+ };
+ "eslint-7.14.0" = {
+ name = "eslint";
+ packageName = "eslint";
+ version = "7.14.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/eslint/-/eslint-7.14.0.tgz";
+ sha512 = "5YubdnPXrlrYAFCKybPuHIAH++PINe1pmKNc5wQRB9HSbqIK1ywAnntE3Wwua4giKu0bjligf1gLF6qxMGOYRA==";
+ };
+ };
+ "eslint-import-resolver-node-0.3.4" = {
+ name = "eslint-import-resolver-node";
+ packageName = "eslint-import-resolver-node";
+ version = "0.3.4";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/eslint-import-resolver-node/-/eslint-import-resolver-node-0.3.4.tgz";
+ sha512 = "ogtf+5AB/O+nM6DIeBUNr2fuT7ot9Qg/1harBfBtaP13ekEWFQEEMP94BCB7zaNW3gyY+8SHYF00rnqYwXKWOA==";
+ };
+ };
+ "eslint-module-utils-2.6.0" = {
+ name = "eslint-module-utils";
+ packageName = "eslint-module-utils";
+ version = "2.6.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/eslint-module-utils/-/eslint-module-utils-2.6.0.tgz";
+ sha512 = "6j9xxegbqe8/kZY8cYpcp0xhbK0EgJlg3g9mib3/miLaExuuwc3n5UEfSnU6hWMbT0FAYVvDbL9RrRgpUeQIvA==";
+ };
+ };
+ "eslint-plugin-import-2.22.1" = {
+ name = "eslint-plugin-import";
+ packageName = "eslint-plugin-import";
+ version = "2.22.1";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/eslint-plugin-import/-/eslint-plugin-import-2.22.1.tgz";
+ sha512 = "8K7JjINHOpH64ozkAhpT3sd+FswIZTfMZTjdx052pnWrgRCVfp8op9tbjpAk3DdUeI/Ba4C8OjdC0r90erHEOw==";
+ };
+ };
+ "eslint-plugin-jquery-1.5.1" = {
+ name = "eslint-plugin-jquery";
+ packageName = "eslint-plugin-jquery";
+ version = "1.5.1";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/eslint-plugin-jquery/-/eslint-plugin-jquery-1.5.1.tgz";
+ sha512 = "L7v1eaK5t80C0lvUXPFP9MKnBOqPSKhCOYyzy4LZ0+iK+TJwN8S9gAkzzP1AOhypRIwA88HF6phQ9C7jnOpW8w==";
+ };
+ };
+ "eslint-plugin-jsdoc-30.7.8" = {
+ name = "eslint-plugin-jsdoc";
+ packageName = "eslint-plugin-jsdoc";
+ version = "30.7.8";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/eslint-plugin-jsdoc/-/eslint-plugin-jsdoc-30.7.8.tgz";
+ sha512 = "OWm2AYvXjCl7nRbpcw5xisfSVkpVAyp4lGqL9T+DeK4kaPm6ecnmTc/G5s1PtcRrwbaI8bIWGzwScqv5CdGyxA==";
+ };
+ };
+ "eslint-rule-composer-0.3.0" = {
+ name = "eslint-rule-composer";
+ packageName = "eslint-rule-composer";
+ version = "0.3.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/eslint-rule-composer/-/eslint-rule-composer-0.3.0.tgz";
+ sha512 = "bt+Sh8CtDmn2OajxvNO+BX7Wn4CIWMpTRm3MaiKPCQcnnlm0CS2mhui6QaoeQugs+3Kj2ESKEEGJUdVafwhiCg==";
+ };
+ };
+ "eslint-scope-5.1.0" = {
+ name = "eslint-scope";
+ packageName = "eslint-scope";
+ version = "5.1.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/eslint-scope/-/eslint-scope-5.1.0.tgz";
+ sha512 = "iiGRvtxWqgtx5m8EyQUJihBloE4EnYeGE/bz1wSPwJE6tZuJUtHlhqDM4Xj2ukE8Dyy1+HCZ4hE0fzIVMzb58w==";
+ };
+ };
+ "eslint-scope-5.1.1" = {
+ name = "eslint-scope";
+ packageName = "eslint-scope";
+ version = "5.1.1";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/eslint-scope/-/eslint-scope-5.1.1.tgz";
+ sha512 = "2NxwbF/hZ0KpepYN0cNbo+FN6XoK7GaHlQhgx/hIZl6Va0bF45RQOOwhLIy8lQDbuCiadSLCBnH2CFYquit5bw==";
+ };
+ };
+ "eslint-utils-2.1.0" = {
+ name = "eslint-utils";
+ packageName = "eslint-utils";
+ version = "2.1.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/eslint-utils/-/eslint-utils-2.1.0.tgz";
+ sha512 = "w94dQYoauyvlDc43XnGB8lU3Zt713vNChgt4EWwhXAP2XkBvndfxF0AgIqKOOasjPIPzj9JqgwkwbCYD0/V3Zg==";
+ };
+ };
+ "eslint-visitor-keys-1.3.0" = {
+ name = "eslint-visitor-keys";
+ packageName = "eslint-visitor-keys";
+ version = "1.3.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-1.3.0.tgz";
+ sha512 = "6J72N8UNa462wa/KFODt/PJ3IU60SDpC3QXC1Hjc1BXXpfL2C9R5+AU7jhe0F6GREqVMh4Juu+NY7xn+6dipUQ==";
+ };
+ };
+ "eslint-visitor-keys-2.0.0" = {
+ name = "eslint-visitor-keys";
+ packageName = "eslint-visitor-keys";
+ version = "2.0.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-2.0.0.tgz";
+ sha512 = "QudtT6av5WXels9WjIM7qz1XD1cWGvX4gGXvp/zBn9nXG02D0utdU3Em2m/QjTnrsk6bBjmCygl3rmj118msQQ==";
+ };
+ };
+ "espree-7.3.0" = {
+ name = "espree";
+ packageName = "espree";
+ version = "7.3.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/espree/-/espree-7.3.0.tgz";
+ sha512 = "dksIWsvKCixn1yrEXO8UosNSxaDoSYpq9reEjZSbHLpT5hpaCAKTLBwq0RHtLrIr+c0ByiYzWT8KTMRzoRCNlw==";
+ };
+ };
+ "esprima-4.0.1" = {
+ name = "esprima";
+ packageName = "esprima";
+ version = "4.0.1";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/esprima/-/esprima-4.0.1.tgz";
+ sha512 = "eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A==";
+ };
+ };
+ "esquery-1.3.1" = {
+ name = "esquery";
+ packageName = "esquery";
+ version = "1.3.1";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/esquery/-/esquery-1.3.1.tgz";
+ sha512 = "olpvt9QG0vniUBZspVRN6lwB7hOZoTRtT+jzR+tS4ffYx2mzbw+z0XCOk44aaLYKApNX5nMm+E+P6o25ip/DHQ==";
+ };
+ };
+ "esrecurse-4.3.0" = {
+ name = "esrecurse";
+ packageName = "esrecurse";
+ version = "4.3.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/esrecurse/-/esrecurse-4.3.0.tgz";
+ sha512 = "KmfKL3b6G+RXvP8N1vr3Tq1kL/oCFgn2NYXEtqP8/L3pKapUA4G8cFVaoF3SU323CD4XypR/ffioHmkti6/Tag==";
+ };
+ };
+ "estraverse-4.3.0" = {
+ name = "estraverse";
+ packageName = "estraverse";
+ version = "4.3.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/estraverse/-/estraverse-4.3.0.tgz";
+ sha512 = "39nnKffWz8xN1BU/2c79n9nB9HDzo0niYUqx6xyqUnyoAnQyyWpOTdZEeiCch8BBu515t4wp9ZmgVfVhn9EBpw==";
+ };
+ };
+ "estraverse-5.2.0" = {
+ name = "estraverse";
+ packageName = "estraverse";
+ version = "5.2.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/estraverse/-/estraverse-5.2.0.tgz";
+ sha512 = "BxbNGGNm0RyRYvUdHpIwv9IWzeM9XClbOxwoATuFdOE7ZE6wHL+HQ5T8hoPM+zHvmKzzsEqhgy0GrQ5X13afiQ==";
+ };
+ };
+ "esutils-2.0.3" = {
+ name = "esutils";
+ packageName = "esutils";
+ version = "2.0.3";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/esutils/-/esutils-2.0.3.tgz";
+ sha512 = "kVscqXk4OCp68SZ0dkgEKVi6/8ij300KBWTJq32P/dYeWTSwK41WyTxalN1eRmA5Z9UU/LX9D7FWSmV9SAYx6g==";
+ };
+ };
+ "events-3.2.0" = {
+ name = "events";
+ packageName = "events";
+ version = "3.2.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/events/-/events-3.2.0.tgz";
+ sha512 = "/46HWwbfCX2xTawVfkKLGxMifJYQBWMwY1mjywRtb4c9x8l5NP3KoJtnIOiL1hfdRkIuYhETxQlo62IF8tcnlg==";
+ };
+ };
+ "execa-4.1.0" = {
+ name = "execa";
+ packageName = "execa";
+ version = "4.1.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/execa/-/execa-4.1.0.tgz";
+ sha512 = "j5W0//W7f8UxAn8hXVnwG8tLwdiUy4FJLcSupCg6maBYZDpyBvTApK7KyuI4bKj8KOh1r2YH+6ucuYtJv1bTZA==";
+ };
+ };
+ "fast-deep-equal-3.1.3" = {
+ name = "fast-deep-equal";
+ packageName = "fast-deep-equal";
+ version = "3.1.3";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz";
+ sha512 = "f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==";
+ };
+ };
+ "fast-json-stable-stringify-2.1.0" = {
+ name = "fast-json-stable-stringify";
+ packageName = "fast-json-stable-stringify";
+ version = "2.1.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz";
+ sha512 = "lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw==";
+ };
+ };
+ "fast-levenshtein-2.0.6" = {
+ name = "fast-levenshtein";
+ packageName = "fast-levenshtein";
+ version = "2.0.6";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz";
+ sha1 = "3d8a5c66883a16a30ca8643e851f19baa7797917";
+ };
+ };
+ "file-entry-cache-5.0.1" = {
+ name = "file-entry-cache";
+ packageName = "file-entry-cache";
+ version = "5.0.1";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/file-entry-cache/-/file-entry-cache-5.0.1.tgz";
+ sha512 = "bCg29ictuBaKUwwArK4ouCaqDgLZcysCFLmM/Yn/FDoqndh/9vNuQfXRDvTuXKLxfD/JtZQGKFT8MGcJBK644g==";
+ };
+ };
+ "fill-range-7.0.1" = {
+ name = "fill-range";
+ packageName = "fill-range";
+ version = "7.0.1";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/fill-range/-/fill-range-7.0.1.tgz";
+ sha512 = "qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==";
+ };
+ };
+ "find-cache-dir-2.1.0" = {
+ name = "find-cache-dir";
+ packageName = "find-cache-dir";
+ version = "2.1.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/find-cache-dir/-/find-cache-dir-2.1.0.tgz";
+ sha512 = "Tq6PixE0w/VMFfCgbONnkiQIVol/JJL7nRMi20fqzA4NRs9AfeqMGeRdPi3wIhYkxjeBaWh2rxwapn5Tu3IqOQ==";
+ };
+ };
+ "find-up-2.1.0" = {
+ name = "find-up";
+ packageName = "find-up";
+ version = "2.1.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/find-up/-/find-up-2.1.0.tgz";
+ sha1 = "45d1b7e506c717ddd482775a2b77920a3c0c57a7";
+ };
+ };
+ "find-up-3.0.0" = {
+ name = "find-up";
+ packageName = "find-up";
+ version = "3.0.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/find-up/-/find-up-3.0.0.tgz";
+ sha512 = "1yD6RmLI1XBfxugvORwlck6f75tYL+iR0jqwsOrOxMZyGYqUuDhJ0l4AXdO1iX/FTs9cBAMEk1gWSEx1kSbylg==";
+ };
+ };
+ "find-up-4.1.0" = {
+ name = "find-up";
+ packageName = "find-up";
+ version = "4.1.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/find-up/-/find-up-4.1.0.tgz";
+ sha512 = "PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw==";
+ };
+ };
+ "flat-cache-2.0.1" = {
+ name = "flat-cache";
+ packageName = "flat-cache";
+ version = "2.0.1";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/flat-cache/-/flat-cache-2.0.1.tgz";
+ sha512 = "LoQe6yDuUMDzQAEH8sgmh4Md6oZnc/7PjtwjNFSzveXqSHt6ka9fPBuso7IGf9Rz4uqnSnWiFH2B/zj24a5ReA==";
+ };
+ };
+ "flatted-2.0.2" = {
+ name = "flatted";
+ packageName = "flatted";
+ version = "2.0.2";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/flatted/-/flatted-2.0.2.tgz";
+ sha512 = "r5wGx7YeOwNWNlCA0wQ86zKyDLMQr+/RB8xy74M4hTphfmjlijTSSXGuH8rnvKZnfT9i+75zmd8jcKdMR4O6jA==";
+ };
+ };
+ "fs.realpath-1.0.0" = {
+ name = "fs.realpath";
+ packageName = "fs.realpath";
+ version = "1.0.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz";
+ sha1 = "1504ad2523158caa40db4a2787cb01411994ea4f";
+ };
+ };
+ "fsevents-2.1.3" = {
+ name = "fsevents";
+ packageName = "fsevents";
+ version = "2.1.3";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/fsevents/-/fsevents-2.1.3.tgz";
+ sha512 = "Auw9a4AxqWpa9GUfj370BMPzzyncfBABW8Mab7BGWBYDj4Isgq+cDKtx0i6u9jcX9pQDnswsaaOTgTmA5pEjuQ==";
+ };
+ };
+ "function-bind-1.1.1" = {
+ name = "function-bind";
+ packageName = "function-bind";
+ version = "1.1.1";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/function-bind/-/function-bind-1.1.1.tgz";
+ sha512 = "yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A==";
+ };
+ };
+ "functional-red-black-tree-1.0.1" = {
+ name = "functional-red-black-tree";
+ packageName = "functional-red-black-tree";
+ version = "1.0.1";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/functional-red-black-tree/-/functional-red-black-tree-1.0.1.tgz";
+ sha1 = "1b0ab3bd553b2a0d6399d29c0e3ea0b252078327";
+ };
+ };
+ "gensync-1.0.0-beta.2" = {
+ name = "gensync";
+ packageName = "gensync";
+ version = "1.0.0-beta.2";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/gensync/-/gensync-1.0.0-beta.2.tgz";
+ sha512 = "3hN7NaskYvMDLQY55gnW3NQ+mesEAepTqlg+VEbj7zzqEMBVNhzcGYYeqFo/TlYz6eQiFcp1HcsCZO+nGgS8zg==";
+ };
+ };
+ "get-intrinsic-1.0.1" = {
+ name = "get-intrinsic";
+ packageName = "get-intrinsic";
+ version = "1.0.1";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.0.1.tgz";
+ sha512 = "ZnWP+AmS1VUaLgTRy47+zKtjTxz+0xMpx3I52i+aalBK1QP19ggLF3Db89KJX7kjfOfP2eoa01qc++GwPgufPg==";
+ };
+ };
+ "get-stream-5.2.0" = {
+ name = "get-stream";
+ packageName = "get-stream";
+ version = "5.2.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/get-stream/-/get-stream-5.2.0.tgz";
+ sha512 = "nBF+F1rAZVCu/p7rjzgA+Yb4lfYXrpl7a6VmJrU8wF9I1CKvP/QwPNZHnOlwbTkY6dvtFIzFMSyQXbLoTQPRpA==";
+ };
+ };
+ "glob-7.1.6" = {
+ name = "glob";
+ packageName = "glob";
+ version = "7.1.6";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/glob/-/glob-7.1.6.tgz";
+ sha512 = "LwaxwyZ72Lk7vZINtNNrywX0ZuLyStrdDtabefZKAY5ZGJhVtgdznluResxNmPitE0SAO+O26sWTHeKSI2wMBA==";
+ };
+ };
+ "glob-parent-5.1.1" = {
+ name = "glob-parent";
+ packageName = "glob-parent";
+ version = "5.1.1";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.1.tgz";
+ sha512 = "FnI+VGOpnlGHWZxthPGR+QhR78fuiK0sNLkHQv+bL9fQi57lNNdquIbna/WrfROrolq8GK5Ek6BiMwqL/voRYQ==";
+ };
+ };
+ "glob-to-regexp-0.4.1" = {
+ name = "glob-to-regexp";
+ packageName = "glob-to-regexp";
+ version = "0.4.1";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/glob-to-regexp/-/glob-to-regexp-0.4.1.tgz";
+ sha512 = "lkX1HJXwyMcprw/5YUZc2s7DrpAiHB21/V+E1rHUrVNokkvB6bqMzT0VfV6/86ZNabt1k14YOIaT7nDvOX3Iiw==";
+ };
+ };
+ "globals-11.12.0" = {
+ name = "globals";
+ packageName = "globals";
+ version = "11.12.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/globals/-/globals-11.12.0.tgz";
+ sha512 = "WOBp/EEGUiIsJSp7wcv/y6MO+lV9UoncWqxuFfm8eBwzWNgyfBd6Gz+IeKQ9jCmyhoH99g15M3T+QaVHFjizVA==";
+ };
+ };
+ "globals-12.4.0" = {
+ name = "globals";
+ packageName = "globals";
+ version = "12.4.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/globals/-/globals-12.4.0.tgz";
+ sha512 = "BWICuzzDvDoH54NHKCseDanAhE3CeDorgDL5MT6LMXXj2WCnd9UC2szdk4AWLfjdgNBCXLUanXYcpBBKOSWGwg==";
+ };
+ };
+ "graceful-fs-4.2.4" = {
+ name = "graceful-fs";
+ packageName = "graceful-fs";
+ version = "4.2.4";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.4.tgz";
+ sha512 = "WjKPNJF79dtJAVniUlGGWHYGz2jWxT6VhN/4m1NdkbZ2nOsEF+cI1Edgql5zCRhs/VsQYRvrXctxktVXZUkixw==";
+ };
+ };
+ "has-1.0.3" = {
+ name = "has";
+ packageName = "has";
+ version = "1.0.3";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/has/-/has-1.0.3.tgz";
+ sha512 = "f2dvO0VU6Oej7RkWJGrehjbzMAjFp5/VKPp5tTpWIV4JHHZK1/BxbFRtf/siA2SWTe09caDmVtYYzWEIbBS4zw==";
+ };
+ };
+ "has-flag-3.0.0" = {
+ name = "has-flag";
+ packageName = "has-flag";
+ version = "3.0.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz";
+ sha1 = "b5d454dc2199ae225699f3467e5a07f3b955bafd";
+ };
+ };
+ "has-flag-4.0.0" = {
+ name = "has-flag";
+ packageName = "has-flag";
+ version = "4.0.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz";
+ sha512 = "EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==";
+ };
+ };
+ "has-symbols-1.0.1" = {
+ name = "has-symbols";
+ packageName = "has-symbols";
+ version = "1.0.1";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.1.tgz";
+ sha512 = "PLcsoqu++dmEIZB+6totNFKq/7Do+Z0u4oT0zKOJNl3lYK6vGwwu2hjHs+68OEZbTjiUE9bgOABXbP/GvrS0Kg==";
+ };
+ };
+ "he-1.2.0" = {
+ name = "he";
+ packageName = "he";
+ version = "1.2.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/he/-/he-1.2.0.tgz";
+ sha512 = "F/1DnUGPopORZi0ni+CvrCgHQ5FyEAHRLSApuYWMmrbSwoN2Mn/7k+Gl38gJnR7yyDZk6WLXwiGod1JOWNDKGw==";
+ };
+ };
+ "hosted-git-info-2.8.8" = {
+ name = "hosted-git-info";
+ packageName = "hosted-git-info";
+ version = "2.8.8";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.8.8.tgz";
+ sha512 = "f/wzC2QaWBs7t9IYqB4T3sR1xviIViXJRJTWBlx2Gf3g0Xi5vI7Yy4koXQ1c9OYDGHN9sBy1DQ2AB8fqZBWhUg==";
+ };
+ };
+ "html-minifier-terser-5.1.1" = {
+ name = "html-minifier-terser";
+ packageName = "html-minifier-terser";
+ version = "5.1.1";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/html-minifier-terser/-/html-minifier-terser-5.1.1.tgz";
+ sha512 = "ZPr5MNObqnV/T9akshPKbVgyOqLmy+Bxo7juKCfTfnjNniTAMdy4hz21YQqoofMBJD2kdREaqPPdThoR78Tgxg==";
+ };
+ };
+ "html-webpack-plugin-4.5.0" = {
+ name = "html-webpack-plugin";
+ packageName = "html-webpack-plugin";
+ version = "4.5.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/html-webpack-plugin/-/html-webpack-plugin-4.5.0.tgz";
+ sha512 = "MouoXEYSjTzCrjIxWwg8gxL5fE2X2WZJLmBYXlaJhQUH5K/b5OrqmV7T4dB7iu0xkmJ6JlUuV6fFVtnqbPopZw==";
+ };
+ };
+ "htmlparser2-3.10.1" = {
+ name = "htmlparser2";
+ packageName = "htmlparser2";
+ version = "3.10.1";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/htmlparser2/-/htmlparser2-3.10.1.tgz";
+ sha512 = "IgieNijUMbkDovyoKObU1DUhm1iwNYE/fuifEoEHfd1oZKZDaONBSkal7Y01shxsM49R4XaMdGez3WnF9UfiCQ==";
+ };
+ };
+ "human-signals-1.1.1" = {
+ name = "human-signals";
+ packageName = "human-signals";
+ version = "1.1.1";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/human-signals/-/human-signals-1.1.1.tgz";
+ sha512 = "SEQu7vl8KjNL2eoGBLF3+wAjpsNfA9XMlXAYj/3EdaNfAlxKthD1xjEQfGOUhllCGGJVNY34bRr6lPINhNjyZw==";
+ };
+ };
+ "icss-utils-5.1.0" = {
+ name = "icss-utils";
+ packageName = "icss-utils";
+ version = "5.1.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/icss-utils/-/icss-utils-5.1.0.tgz";
+ sha512 = "soFhflCVWLfRNOPU3iv5Z9VUdT44xFRbzjLsEzSr5AQmgqPMTHdU3PMT1Cf1ssx8fLNJDA1juftYl+PUcv3MqA==";
+ };
+ };
+ "ignore-4.0.6" = {
+ name = "ignore";
+ packageName = "ignore";
+ version = "4.0.6";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/ignore/-/ignore-4.0.6.tgz";
+ sha512 = "cyFDKrqc/YdcWFniJhzI42+AzS+gNwmUzOSFcRCQYwySuBBBy/KjuxWLZ/FHEH6Moq1NizMOBWyTcv8O4OZIMg==";
+ };
+ };
+ "import-fresh-3.2.2" = {
+ name = "import-fresh";
+ packageName = "import-fresh";
+ version = "3.2.2";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/import-fresh/-/import-fresh-3.2.2.tgz";
+ sha512 = "cTPNrlvJT6twpYy+YmKUKrTSjWFs3bjYjAhCwm+z4EOCubZxAuO+hHpRN64TqjEaYSHs7tJAE0w1CKMGmsG/lw==";
+ };
+ };
+ "import-local-3.0.2" = {
+ name = "import-local";
+ packageName = "import-local";
+ version = "3.0.2";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/import-local/-/import-local-3.0.2.tgz";
+ sha512 = "vjL3+w0oulAVZ0hBHnxa/Nm5TAurf9YLQJDhqRZyqb+VKGOB6LU8t9H1Nr5CIo16vh9XfJTOoHwU0B71S557gA==";
+ };
+ };
+ "imurmurhash-0.1.4" = {
+ name = "imurmurhash";
+ packageName = "imurmurhash";
+ version = "0.1.4";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/imurmurhash/-/imurmurhash-0.1.4.tgz";
+ sha1 = "9218b9b2b928a238b13dc4fb6b6d576f231453ea";
+ };
+ };
+ "indexes-of-1.0.1" = {
+ name = "indexes-of";
+ packageName = "indexes-of";
+ version = "1.0.1";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/indexes-of/-/indexes-of-1.0.1.tgz";
+ sha1 = "f30f716c8e2bd346c7b67d3df3915566a7c05607";
+ };
+ };
+ "inflight-1.0.6" = {
+ name = "inflight";
+ packageName = "inflight";
+ version = "1.0.6";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz";
+ sha1 = "49bd6331d7d02d0c09bc910a1075ba8165b56df9";
+ };
+ };
+ "inherits-2.0.4" = {
+ name = "inherits";
+ packageName = "inherits";
+ version = "2.0.4";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz";
+ sha512 = "k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==";
+ };
+ };
+ "interpret-2.2.0" = {
+ name = "interpret";
+ packageName = "interpret";
+ version = "2.2.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/interpret/-/interpret-2.2.0.tgz";
+ sha512 = "Ju0Bz/cEia55xDwUWEa8+olFpCiQoypjnQySseKtmjNrnps3P+xfpUmGr90T7yjlVJmOtybRvPXhKMbHr+fWnw==";
+ };
+ };
+ "is-arrayish-0.2.1" = {
+ name = "is-arrayish";
+ packageName = "is-arrayish";
+ version = "0.2.1";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/is-arrayish/-/is-arrayish-0.2.1.tgz";
+ sha1 = "77c99840527aa8ecb1a8ba697b80645a7a926a9d";
+ };
+ };
+ "is-binary-path-2.1.0" = {
+ name = "is-binary-path";
+ packageName = "is-binary-path";
+ version = "2.1.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/is-binary-path/-/is-binary-path-2.1.0.tgz";
+ sha512 = "ZMERYes6pDydyuGidse7OsHxtbI7WVeUEozgR/g7rd0xUimYNlvZRE/K2MgZTjWy725IfelLeVcEM97mmtRGXw==";
+ };
+ };
+ "is-callable-1.2.2" = {
+ name = "is-callable";
+ packageName = "is-callable";
+ version = "1.2.2";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/is-callable/-/is-callable-1.2.2.tgz";
+ sha512 = "dnMqspv5nU3LoewK2N/y7KLtxtakvTuaCsU9FU50/QDmdbHNy/4/JuRtMHqRU22o3q+W89YQndQEeCVwK+3qrA==";
+ };
+ };
+ "is-core-module-2.1.0" = {
+ name = "is-core-module";
+ packageName = "is-core-module";
+ version = "2.1.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/is-core-module/-/is-core-module-2.1.0.tgz";
+ sha512 = "YcV7BgVMRFRua2FqQzKtTDMz8iCuLEyGKjr70q8Zm1yy2qKcurbFEd79PAdHV77oL3NrAaOVQIbMmiHQCHB7ZA==";
+ };
+ };
+ "is-date-object-1.0.2" = {
+ name = "is-date-object";
+ packageName = "is-date-object";
+ version = "1.0.2";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/is-date-object/-/is-date-object-1.0.2.tgz";
+ sha512 = "USlDT524woQ08aoZFzh3/Z6ch9Y/EWXEHQ/AaRN0SkKq4t2Jw2R2339tSXmwuVoY7LLlBCbOIlx2myP/L5zk0g==";
+ };
+ };
+ "is-extglob-2.1.1" = {
+ name = "is-extglob";
+ packageName = "is-extglob";
+ version = "2.1.1";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz";
+ sha1 = "a88c02535791f02ed37c76a1b9ea9773c833f8c2";
+ };
+ };
+ "is-fullwidth-code-point-2.0.0" = {
+ name = "is-fullwidth-code-point";
+ packageName = "is-fullwidth-code-point";
+ version = "2.0.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz";
+ sha1 = "a3b30a5c4f199183167aaab93beefae3ddfb654f";
+ };
+ };
+ "is-glob-4.0.1" = {
+ name = "is-glob";
+ packageName = "is-glob";
+ version = "4.0.1";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/is-glob/-/is-glob-4.0.1.tgz";
+ sha512 = "5G0tKtBTFImOqDnLB2hG6Bp2qcKEFduo4tZu9MT/H6NQv/ghhy30o55ufafxJ/LdH79LLs2Kfrn85TLKyA7BUg==";
+ };
+ };
+ "is-negative-zero-2.0.0" = {
+ name = "is-negative-zero";
+ packageName = "is-negative-zero";
+ version = "2.0.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/is-negative-zero/-/is-negative-zero-2.0.0.tgz";
+ sha1 = "9553b121b0fac28869da9ed459e20c7543788461";
+ };
+ };
+ "is-number-7.0.0" = {
+ name = "is-number";
+ packageName = "is-number";
+ version = "7.0.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz";
+ sha512 = "41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==";
+ };
+ };
+ "is-regex-1.1.1" = {
+ name = "is-regex";
+ packageName = "is-regex";
+ version = "1.1.1";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/is-regex/-/is-regex-1.1.1.tgz";
+ sha512 = "1+QkEcxiLlB7VEyFtyBg94e08OAsvq7FUBgApTq/w2ymCLyKJgDPsybBENVtA7XCQEgEXxKPonG+mvYRxh/LIg==";
+ };
+ };
+ "is-stream-2.0.0" = {
+ name = "is-stream";
+ packageName = "is-stream";
+ version = "2.0.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/is-stream/-/is-stream-2.0.0.tgz";
+ sha512 = "XCoy+WlUr7d1+Z8GgSuXmpuUFC9fOhRXglJMx+dwLKTkL44Cjd4W1Z5P+BQZpr+cR93aGP4S/s7Ftw6Nd/kiEw==";
+ };
+ };
+ "is-string-1.0.5" = {
+ name = "is-string";
+ packageName = "is-string";
+ version = "1.0.5";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/is-string/-/is-string-1.0.5.tgz";
+ sha512 = "buY6VNRjhQMiF1qWDouloZlQbRhDPCebwxSjxMjxgemYT46YMd2NR0/H+fBhEfWX4A/w9TBJ+ol+okqJKFE6vQ==";
+ };
+ };
+ "is-symbol-1.0.3" = {
+ name = "is-symbol";
+ packageName = "is-symbol";
+ version = "1.0.3";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/is-symbol/-/is-symbol-1.0.3.tgz";
+ sha512 = "OwijhaRSgqvhm/0ZdAcXNZt9lYdKFpcRDT5ULUuYXPoT794UNOdU+gpT6Rzo7b4V2HUl/op6GqY894AZwv9faQ==";
+ };
+ };
+ "isarray-1.0.0" = {
+ name = "isarray";
+ packageName = "isarray";
+ version = "1.0.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz";
+ sha1 = "bb935d48582cba168c06834957a54a3e07124f11";
+ };
+ };
+ "isexe-2.0.0" = {
+ name = "isexe";
+ packageName = "isexe";
+ version = "2.0.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz";
+ sha1 = "e8fbf374dc556ff8947a10dcb0572d633f2cfa10";
+ };
+ };
+ "jest-worker-26.6.2" = {
+ name = "jest-worker";
+ packageName = "jest-worker";
+ version = "26.6.2";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/jest-worker/-/jest-worker-26.6.2.tgz";
+ sha512 = "KWYVV1c4i+jbMpaBC+U++4Va0cp8OisU185o73T1vo99hqi7w8tSJfUXYswwqqrjzwxa6KpRK54WhPvwf5w6PQ==";
+ };
+ };
+ "jquery-3.5.1" = {
+ name = "jquery";
+ packageName = "jquery";
+ version = "3.5.1";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/jquery/-/jquery-3.5.1.tgz";
+ sha512 = "XwIBPqcMn57FxfT+Go5pzySnm4KWkT1Tv7gjrpT1srtf8Weynl6R273VJ5GjkRb51IzMp5nbaPjJXMWeju2MKg==";
+ };
+ };
+ "jquery-migrate-3.3.2" = {
+ name = "jquery-migrate";
+ packageName = "jquery-migrate";
+ version = "3.3.2";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/jquery-migrate/-/jquery-migrate-3.3.2.tgz";
+ sha512 = "L3gYhr7yEtLUSAeqXSicVa0vRD4aGwjw/bWY8YzrO2o/qDY1BaMyP3oB3bZf5Auy3Hu9ynliio0CTyDWCBPVDw==";
+ };
+ };
+ "js-tokens-4.0.0" = {
+ name = "js-tokens";
+ packageName = "js-tokens";
+ version = "4.0.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz";
+ sha512 = "RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ==";
+ };
+ };
+ "js-yaml-3.14.0" = {
+ name = "js-yaml";
+ packageName = "js-yaml";
+ version = "3.14.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/js-yaml/-/js-yaml-3.14.0.tgz";
+ sha512 = "/4IbIeHcD9VMHFqDR/gQ7EdZdLimOvW2DdcxFjdyyZ9NsbS+ccrXqVWDtab/lRl5AlUqmpBx8EhPaWR+OtY17A==";
+ };
+ };
+ "jsdoctypeparser-9.0.0" = {
+ name = "jsdoctypeparser";
+ packageName = "jsdoctypeparser";
+ version = "9.0.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/jsdoctypeparser/-/jsdoctypeparser-9.0.0.tgz";
+ sha512 = "jrTA2jJIL6/DAEILBEh2/w9QxCuwmvNXIry39Ay/HVfhE3o2yVV0U44blYkqdHA/OKloJEqvJy0xU+GSdE2SIw==";
+ };
+ };
+ "jsesc-0.5.0" = {
+ name = "jsesc";
+ packageName = "jsesc";
+ version = "0.5.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/jsesc/-/jsesc-0.5.0.tgz";
+ sha1 = "e7dee66e35d6fc16f710fe91d5cf69f70f08911d";
+ };
+ };
+ "jsesc-2.5.2" = {
+ name = "jsesc";
+ packageName = "jsesc";
+ version = "2.5.2";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/jsesc/-/jsesc-2.5.2.tgz";
+ sha512 = "OYu7XEzjkCQ3C5Ps3QIZsQfNpqoJyZZA99wd9aWd05NCtC5pWOkShK2mkL6HXQR6/Cy2lbNdPlZBpuQHXE63gA==";
+ };
+ };
+ "json-parse-better-errors-1.0.2" = {
+ name = "json-parse-better-errors";
+ packageName = "json-parse-better-errors";
+ version = "1.0.2";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/json-parse-better-errors/-/json-parse-better-errors-1.0.2.tgz";
+ sha512 = "mrqyZKfX5EhL7hvqcV6WG1yYjnjeuYDzDhhcAAUrq8Po85NBQBJP+ZDUT75qZQ98IkUoBqdkExkukOU7Ts2wrw==";
+ };
+ };
+ "json-parse-even-better-errors-2.3.1" = {
+ name = "json-parse-even-better-errors";
+ packageName = "json-parse-even-better-errors";
+ version = "2.3.1";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/json-parse-even-better-errors/-/json-parse-even-better-errors-2.3.1.tgz";
+ sha512 = "xyFwyhro/JEof6Ghe2iz2NcXoj2sloNsWr/XsERDK/oiPCfaNhl5ONfp+jQdAZRQQ0IJWNzH9zIZF7li91kh2w==";
+ };
+ };
+ "json-schema-traverse-0.4.1" = {
+ name = "json-schema-traverse";
+ packageName = "json-schema-traverse";
+ version = "0.4.1";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz";
+ sha512 = "xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==";
+ };
+ };
+ "json-stable-stringify-without-jsonify-1.0.1" = {
+ name = "json-stable-stringify-without-jsonify";
+ packageName = "json-stable-stringify-without-jsonify";
+ version = "1.0.1";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/json-stable-stringify-without-jsonify/-/json-stable-stringify-without-jsonify-1.0.1.tgz";
+ sha1 = "9db7b59496ad3f3cfef30a75142d2d930ad72651";
+ };
+ };
+ "json5-1.0.1" = {
+ name = "json5";
+ packageName = "json5";
+ version = "1.0.1";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/json5/-/json5-1.0.1.tgz";
+ sha512 = "aKS4WQjPenRxiQsC93MNfjx+nbF4PAdYzmd/1JIj8HYzqfbu86beTuNgXDzPknWk0n0uARlyewZo4s++ES36Ow==";
+ };
+ };
+ "json5-2.1.3" = {
+ name = "json5";
+ packageName = "json5";
+ version = "2.1.3";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/json5/-/json5-2.1.3.tgz";
+ sha512 = "KXPvOm8K9IJKFM0bmdn8QXh7udDh1g/giieX0NLCaMnb4hEiVFqnop2ImTXCc5e0/oHz3LTqmHGtExn5hfMkOA==";
+ };
+ };
+ "klona-2.0.4" = {
+ name = "klona";
+ packageName = "klona";
+ version = "2.0.4";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/klona/-/klona-2.0.4.tgz";
+ sha512 = "ZRbnvdg/NxqzC7L9Uyqzf4psi1OM4Cuc+sJAkQPjO6XkQIJTNbfK2Rsmbw8fx1p2mkZdp2FZYo2+LwXYY/uwIA==";
+ };
+ };
+ "leven-3.1.0" = {
+ name = "leven";
+ packageName = "leven";
+ version = "3.1.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/leven/-/leven-3.1.0.tgz";
+ sha512 = "qsda+H8jTaUaN/x5vzW2rzc+8Rw4TAQ/4KjB46IwK5VH+IlVeeeje/EoZRpiXvIqjFgK84QffqPztGI3VBLG1A==";
+ };
+ };
+ "levn-0.4.1" = {
+ name = "levn";
+ packageName = "levn";
+ version = "0.4.1";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/levn/-/levn-0.4.1.tgz";
+ sha512 = "+bT2uH4E5LGE7h/n3evcS/sQlJXCpIp6ym8OWJ5eV6+67Dsql/LaaT7qJBAt2rzfoa/5QBGBhxDix1dMt2kQKQ==";
+ };
+ };
+ "lines-and-columns-1.1.6" = {
+ name = "lines-and-columns";
+ packageName = "lines-and-columns";
+ version = "1.1.6";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/lines-and-columns/-/lines-and-columns-1.1.6.tgz";
+ sha1 = "1c00c743b433cd0a4e80758f7b64a57440d9ff00";
+ };
+ };
+ "load-json-file-2.0.0" = {
+ name = "load-json-file";
+ packageName = "load-json-file";
+ version = "2.0.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/load-json-file/-/load-json-file-2.0.0.tgz";
+ sha1 = "7947e42149af80d696cbf797bcaabcfe1fe29ca8";
+ };
+ };
+ "loader-runner-4.1.0" = {
+ name = "loader-runner";
+ packageName = "loader-runner";
+ version = "4.1.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/loader-runner/-/loader-runner-4.1.0.tgz";
+ sha512 = "oR4lB4WvwFoC70ocraKhn5nkKSs23t57h9udUgw8o0iH8hMXeEoRuUgfcvgUwAJ1ZpRqBvcou4N2SMvM1DwMrA==";
+ };
+ };
+ "loader-utils-1.4.0" = {
+ name = "loader-utils";
+ packageName = "loader-utils";
+ version = "1.4.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/loader-utils/-/loader-utils-1.4.0.tgz";
+ sha512 = "qH0WSMBtn/oHuwjy/NucEgbx5dbxxnxup9s4PVXJUDHZBQY+s0NWA9rJf53RBnQZxfch7euUui7hpoAPvALZdA==";
+ };
+ };
+ "loader-utils-2.0.0" = {
+ name = "loader-utils";
+ packageName = "loader-utils";
+ version = "2.0.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/loader-utils/-/loader-utils-2.0.0.tgz";
+ sha512 = "rP4F0h2RaWSvPEkD7BLDFQnvSf+nK+wr3ESUjNTyAGobqrijmW92zc+SO6d4p4B1wh7+B/Jg1mkQe5NYUEHtHQ==";
+ };
+ };
+ "locate-path-2.0.0" = {
+ name = "locate-path";
+ packageName = "locate-path";
+ version = "2.0.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/locate-path/-/locate-path-2.0.0.tgz";
+ sha1 = "2b568b265eec944c6d9c0de9c3dbbbca0354cd8e";
+ };
+ };
+ "locate-path-3.0.0" = {
+ name = "locate-path";
+ packageName = "locate-path";
+ version = "3.0.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/locate-path/-/locate-path-3.0.0.tgz";
+ sha512 = "7AO748wWnIhNqAuaty2ZWHkQHRSNfPVIsPIfwEOWO22AmaoVrWavlOcMR5nzTLNYvp36X220/maaRsrec1G65A==";
+ };
+ };
+ "locate-path-5.0.0" = {
+ name = "locate-path";
+ packageName = "locate-path";
+ version = "5.0.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/locate-path/-/locate-path-5.0.0.tgz";
+ sha512 = "t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g==";
+ };
+ };
+ "lodash-4.17.20" = {
+ name = "lodash";
+ packageName = "lodash";
+ version = "4.17.20";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/lodash/-/lodash-4.17.20.tgz";
+ sha512 = "PlhdFcillOINfeV7Ni6oF1TAEayyZBoZ8bcshTHqOYJYlrqzRK5hagpagky5o4HfCzzd1TRkXPMFq6cKk9rGmA==";
+ };
+ };
+ "lower-case-2.0.1" = {
+ name = "lower-case";
+ packageName = "lower-case";
+ version = "2.0.1";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/lower-case/-/lower-case-2.0.1.tgz";
+ sha512 = "LiWgfDLLb1dwbFQZsSglpRj+1ctGnayXz3Uv0/WO8n558JycT5fg6zkNcnW0G68Nn0aEldTFeEfmjCfmqry/rQ==";
+ };
+ };
+ "make-dir-2.1.0" = {
+ name = "make-dir";
+ packageName = "make-dir";
+ version = "2.1.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/make-dir/-/make-dir-2.1.0.tgz";
+ sha512 = "LS9X+dc8KLxXCb8dni79fLIIUA5VyZoyjSMCwTluaXA0o27cCK0bhXkpgw+sTXVpPy/lSO57ilRixqk0vDmtRA==";
+ };
+ };
+ "merge-stream-2.0.0" = {
+ name = "merge-stream";
+ packageName = "merge-stream";
+ version = "2.0.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/merge-stream/-/merge-stream-2.0.0.tgz";
+ sha512 = "abv/qOcuPfk3URPfDzmZU1LKmuw8kT+0nIHvKrKgFrwifol/doWcdA4ZqsWQ8ENrFKkd67Mfpo/LovbIUsbt3w==";
+ };
+ };
+ "mime-db-1.44.0" = {
+ name = "mime-db";
+ packageName = "mime-db";
+ version = "1.44.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/mime-db/-/mime-db-1.44.0.tgz";
+ sha512 = "/NOTfLrsPBVeH7YtFPgsVWveuL+4SjjYxaQ1xtM1KMFj7HdxlBlxeyNLzhyJVx7r4rZGJAZ/6lkKCitSc/Nmpg==";
+ };
+ };
+ "mime-types-2.1.27" = {
+ name = "mime-types";
+ packageName = "mime-types";
+ version = "2.1.27";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/mime-types/-/mime-types-2.1.27.tgz";
+ sha512 = "JIhqnCasI9yD+SsmkquHBxTSEuZdQX5BuQnS2Vc7puQQQ+8yiP5AY5uWhpdv4YL4VM5c6iliiYWPgJ/nJQLp7w==";
+ };
+ };
+ "mimic-fn-2.1.0" = {
+ name = "mimic-fn";
+ packageName = "mimic-fn";
+ version = "2.1.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/mimic-fn/-/mimic-fn-2.1.0.tgz";
+ sha512 = "OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg==";
+ };
+ };
+ "mini-css-extract-plugin-1.3.1" = {
+ name = "mini-css-extract-plugin";
+ packageName = "mini-css-extract-plugin";
+ version = "1.3.1";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/mini-css-extract-plugin/-/mini-css-extract-plugin-1.3.1.tgz";
+ sha512 = "jIOheqh9EU98rqj6ZaFTYNNDSFqdakNqaUZfkYwaXPjI9batmXVXX+K71NrqRAgtoGefELBMld1EQ7dqSAD5SQ==";
+ };
+ };
+ "minimatch-3.0.4" = {
+ name = "minimatch";
+ packageName = "minimatch";
+ version = "3.0.4";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz";
+ sha512 = "yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==";
+ };
+ };
+ "minimist-1.2.5" = {
+ name = "minimist";
+ packageName = "minimist";
+ version = "1.2.5";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/minimist/-/minimist-1.2.5.tgz";
+ sha512 = "FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw==";
+ };
+ };
+ "mkdirp-0.5.5" = {
+ name = "mkdirp";
+ packageName = "mkdirp";
+ version = "0.5.5";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.5.tgz";
+ sha512 = "NKmAlESf6jMGym1++R0Ra7wvhV+wFW63FaSOFPwRahvea0gMUcGUhVeAg/0BC0wiv9ih5NYPB1Wn1UEI1/L+xQ==";
+ };
+ };
+ "ms-2.0.0" = {
+ name = "ms";
+ packageName = "ms";
+ version = "2.0.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz";
+ sha1 = "5608aeadfc00be6c2901df5f9861788de0d597c8";
+ };
+ };
+ "ms-2.1.2" = {
+ name = "ms";
+ packageName = "ms";
+ version = "2.1.2";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz";
+ sha512 = "sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==";
+ };
+ };
+ "nanoid-3.1.18" = {
+ name = "nanoid";
+ packageName = "nanoid";
+ version = "3.1.18";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/nanoid/-/nanoid-3.1.18.tgz";
+ sha512 = "rndlDjbbHbcV3xi+R2fpJ+PbGMdfBxz5v1fATIQFq0DP64FsicQdwnKLy47K4kZHdRpmQXtz24eGsxQqamzYTA==";
+ };
+ };
+ "natural-compare-1.4.0" = {
+ name = "natural-compare";
+ packageName = "natural-compare";
+ version = "1.4.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/natural-compare/-/natural-compare-1.4.0.tgz";
+ sha1 = "4abebfeed7541f2c27acfb29bdbbd15c8d5ba4f7";
+ };
+ };
+ "neo-async-2.6.2" = {
+ name = "neo-async";
+ packageName = "neo-async";
+ version = "2.6.2";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/neo-async/-/neo-async-2.6.2.tgz";
+ sha512 = "Yd3UES5mWCSqR+qNT93S3UoYUkqAZ9lLg8a7g9rimsWmYGK8cVToA4/sF3RrshdyV3sAGMXVUmpMYOw+dLpOuw==";
+ };
+ };
+ "no-case-3.0.3" = {
+ name = "no-case";
+ packageName = "no-case";
+ version = "3.0.3";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/no-case/-/no-case-3.0.3.tgz";
+ sha512 = "ehY/mVQCf9BL0gKfsJBvFJen+1V//U+0HQMPrWct40ixE4jnv0bfvxDbWtAHL9EcaPEOJHVVYKoQn1TlZUB8Tw==";
+ };
+ };
+ "node-releases-1.1.67" = {
+ name = "node-releases";
+ packageName = "node-releases";
+ version = "1.1.67";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/node-releases/-/node-releases-1.1.67.tgz";
+ sha512 = "V5QF9noGFl3EymEwUYzO+3NTDpGfQB4ve6Qfnzf3UNydMhjQRVPR1DZTuvWiLzaFJYw2fmDwAfnRNEVb64hSIg==";
+ };
+ };
+ "normalize-package-data-2.5.0" = {
+ name = "normalize-package-data";
+ packageName = "normalize-package-data";
+ version = "2.5.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-2.5.0.tgz";
+ sha512 = "/5CMN3T0R4XTj4DcGaexo+roZSdSFW/0AOOTROrjxzCG1wrWXEsGbRKevjlIL+ZDE4sZlJr5ED4YW0yqmkK+eA==";
+ };
+ };
+ "normalize-path-3.0.0" = {
+ name = "normalize-path";
+ packageName = "normalize-path";
+ version = "3.0.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/normalize-path/-/normalize-path-3.0.0.tgz";
+ sha512 = "6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==";
+ };
+ };
+ "normalize-range-0.1.2" = {
+ name = "normalize-range";
+ packageName = "normalize-range";
+ version = "0.1.2";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/normalize-range/-/normalize-range-0.1.2.tgz";
+ sha1 = "2d10c06bdfd312ea9777695a4d28439456b75942";
+ };
+ };
+ "npm-run-path-4.0.1" = {
+ name = "npm-run-path";
+ packageName = "npm-run-path";
+ version = "4.0.1";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/npm-run-path/-/npm-run-path-4.0.1.tgz";
+ sha512 = "S48WzZW777zhNIrn7gxOlISNAqi9ZC/uQFnRdbeIHhZhCA6UqpkOT8T1G7BvfdgP4Er8gF4sUbaS0i7QvIfCWw==";
+ };
+ };
+ "nth-check-1.0.2" = {
+ name = "nth-check";
+ packageName = "nth-check";
+ version = "1.0.2";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/nth-check/-/nth-check-1.0.2.tgz";
+ sha512 = "WeBOdju8SnzPN5vTUJYxYUxLeXpCaVP5i5e0LF8fg7WORF2Wd7wFX/pk0tYZk7s8T+J7VLy0Da6J1+wCT0AtHg==";
+ };
+ };
+ "num2fraction-1.2.2" = {
+ name = "num2fraction";
+ packageName = "num2fraction";
+ version = "1.2.2";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/num2fraction/-/num2fraction-1.2.2.tgz";
+ sha1 = "6f682b6a027a4e9ddfa4564cd2589d1d4e669ede";
+ };
+ };
+ "object-inspect-1.8.0" = {
+ name = "object-inspect";
+ packageName = "object-inspect";
+ version = "1.8.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/object-inspect/-/object-inspect-1.8.0.tgz";
+ sha512 = "jLdtEOB112fORuypAyl/50VRVIBIdVQOSUUGQHzJ4xBSbit81zRarz7GThkEFZy1RceYrWYcPcBFPQwHyAc1gA==";
+ };
+ };
+ "object-keys-1.1.1" = {
+ name = "object-keys";
+ packageName = "object-keys";
+ version = "1.1.1";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/object-keys/-/object-keys-1.1.1.tgz";
+ sha512 = "NuAESUOUMrlIXOfHKzD6bpPu3tYt3xvjNdRIQ+FeT0lNb4K8WR70CaDxhuNguS2XG+GjkyMwOzsN5ZktImfhLA==";
+ };
+ };
+ "object.assign-4.1.2" = {
+ name = "object.assign";
+ packageName = "object.assign";
+ version = "4.1.2";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/object.assign/-/object.assign-4.1.2.tgz";
+ sha512 = "ixT2L5THXsApyiUPYKmW+2EHpXXe5Ii3M+f4e+aJFAHao5amFRW6J0OO6c/LU8Be47utCx2GL89hxGB6XSmKuQ==";
+ };
+ };
+ "object.getownpropertydescriptors-2.1.0" = {
+ name = "object.getownpropertydescriptors";
+ packageName = "object.getownpropertydescriptors";
+ version = "2.1.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/object.getownpropertydescriptors/-/object.getownpropertydescriptors-2.1.0.tgz";
+ sha512 = "Z53Oah9A3TdLoblT7VKJaTDdXdT+lQO+cNpKVnya5JDe9uLvzu1YyY1yFDFrcxrlRgWrEFH0jJtD/IbuwjcEVg==";
+ };
+ };
+ "object.values-1.1.1" = {
+ name = "object.values";
+ packageName = "object.values";
+ version = "1.1.1";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/object.values/-/object.values-1.1.1.tgz";
+ sha512 = "WTa54g2K8iu0kmS/us18jEmdv1a4Wi//BZ/DTVYEcH0XhLM5NYdpDHja3gt57VrZLcNAO2WGA+KpWsDBaHt6eA==";
+ };
+ };
+ "once-1.4.0" = {
+ name = "once";
+ packageName = "once";
+ version = "1.4.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/once/-/once-1.4.0.tgz";
+ sha1 = "583b1aa775961d4b113ac17d9c50baef9dd76bd1";
+ };
+ };
+ "onetime-5.1.2" = {
+ name = "onetime";
+ packageName = "onetime";
+ version = "5.1.2";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/onetime/-/onetime-5.1.2.tgz";
+ sha512 = "kbpaSSGJTWdAY5KPVeMOKXSrPtr8C8C7wodJbcsd51jRnmD+GZu8Y0VoU6Dm5Z4vWr0Ig/1NKuWRKf7j5aaYSg==";
+ };
+ };
+ "optionator-0.9.1" = {
+ name = "optionator";
+ packageName = "optionator";
+ version = "0.9.1";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/optionator/-/optionator-0.9.1.tgz";
+ sha512 = "74RlY5FCnhq4jRxVUPKDaRwrVNXMqsGsiW6AJw4XK8hmtm10wC0ypZBLw5IIp85NZMr91+qd1RvvENwg7jjRFw==";
+ };
+ };
+ "p-limit-1.3.0" = {
+ name = "p-limit";
+ packageName = "p-limit";
+ version = "1.3.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/p-limit/-/p-limit-1.3.0.tgz";
+ sha512 = "vvcXsLAJ9Dr5rQOPk7toZQZJApBl2K4J6dANSsEuh6QI41JYcsS/qhTGa9ErIUUgK3WNQoJYvylxvjqmiqEA9Q==";
+ };
+ };
+ "p-limit-2.3.0" = {
+ name = "p-limit";
+ packageName = "p-limit";
+ version = "2.3.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz";
+ sha512 = "//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==";
+ };
+ };
+ "p-limit-3.0.2" = {
+ name = "p-limit";
+ packageName = "p-limit";
+ version = "3.0.2";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/p-limit/-/p-limit-3.0.2.tgz";
+ sha512 = "iwqZSOoWIW+Ew4kAGUlN16J4M7OB3ysMLSZtnhmqx7njIHFPlxWBX8xo3lVTyFVq6mI/lL9qt2IsN1sHwaxJkg==";
+ };
+ };
+ "p-locate-2.0.0" = {
+ name = "p-locate";
+ packageName = "p-locate";
+ version = "2.0.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/p-locate/-/p-locate-2.0.0.tgz";
+ sha1 = "20a0103b222a70c8fd39cc2e580680f3dde5ec43";
+ };
+ };
+ "p-locate-3.0.0" = {
+ name = "p-locate";
+ packageName = "p-locate";
+ version = "3.0.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/p-locate/-/p-locate-3.0.0.tgz";
+ sha512 = "x+12w/To+4GFfgJhBEpiDcLozRJGegY+Ei7/z0tSLkMmxGZNybVMSfWj9aJn8Z5Fc7dBUNJOOVgPv2H7IwulSQ==";
+ };
+ };
+ "p-locate-4.1.0" = {
+ name = "p-locate";
+ packageName = "p-locate";
+ version = "4.1.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/p-locate/-/p-locate-4.1.0.tgz";
+ sha512 = "R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A==";
+ };
+ };
+ "p-try-1.0.0" = {
+ name = "p-try";
+ packageName = "p-try";
+ version = "1.0.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/p-try/-/p-try-1.0.0.tgz";
+ sha1 = "cbc79cdbaf8fd4228e13f621f2b1a237c1b207b3";
+ };
+ };
+ "p-try-2.2.0" = {
+ name = "p-try";
+ packageName = "p-try";
+ version = "2.2.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/p-try/-/p-try-2.2.0.tgz";
+ sha512 = "R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ==";
+ };
+ };
+ "param-case-3.0.3" = {
+ name = "param-case";
+ packageName = "param-case";
+ version = "3.0.3";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/param-case/-/param-case-3.0.3.tgz";
+ sha512 = "VWBVyimc1+QrzappRs7waeN2YmoZFCGXWASRYX1/rGHtXqEcrGEIDm+jqIwFa2fRXNgQEwrxaYuIrX0WcAguTA==";
+ };
+ };
+ "parent-module-1.0.1" = {
+ name = "parent-module";
+ packageName = "parent-module";
+ version = "1.0.1";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/parent-module/-/parent-module-1.0.1.tgz";
+ sha512 = "GQ2EWRpQV8/o+Aw8YqtfZZPfNRWZYkbidE9k5rpl/hC3vtHHBfGm2Ifi6qWV+coDGkrUKZAxE3Lot5kcsRlh+g==";
+ };
+ };
+ "parse-json-2.2.0" = {
+ name = "parse-json";
+ packageName = "parse-json";
+ version = "2.2.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/parse-json/-/parse-json-2.2.0.tgz";
+ sha1 = "f480f40434ef80741f8469099f8dea18f55a4dc9";
+ };
+ };
+ "parse-json-5.1.0" = {
+ name = "parse-json";
+ packageName = "parse-json";
+ version = "5.1.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/parse-json/-/parse-json-5.1.0.tgz";
+ sha512 = "+mi/lmVVNKFNVyLXV31ERiy2CY5E1/F6QtJFEzoChPRwwngMNXRDQ9GJ5WdE2Z2P4AujsOi0/+2qHID68KwfIQ==";
+ };
+ };
+ "pascal-case-3.1.1" = {
+ name = "pascal-case";
+ packageName = "pascal-case";
+ version = "3.1.1";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/pascal-case/-/pascal-case-3.1.1.tgz";
+ sha512 = "XIeHKqIrsquVTQL2crjq3NfJUxmdLasn3TYOU0VBM+UX2a6ztAWBlJQBePLGY7VHW8+2dRadeIPK5+KImwTxQA==";
+ };
+ };
+ "path-exists-3.0.0" = {
+ name = "path-exists";
+ packageName = "path-exists";
+ version = "3.0.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/path-exists/-/path-exists-3.0.0.tgz";
+ sha1 = "ce0ebeaa5f78cb18925ea7d810d7b59b010fd515";
+ };
+ };
+ "path-exists-4.0.0" = {
+ name = "path-exists";
+ packageName = "path-exists";
+ version = "4.0.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz";
+ sha512 = "ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==";
+ };
+ };
+ "path-is-absolute-1.0.1" = {
+ name = "path-is-absolute";
+ packageName = "path-is-absolute";
+ version = "1.0.1";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz";
+ sha1 = "174b9268735534ffbc7ace6bf53a5a9e1b5c5f5f";
+ };
+ };
+ "path-key-3.1.1" = {
+ name = "path-key";
+ packageName = "path-key";
+ version = "3.1.1";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/path-key/-/path-key-3.1.1.tgz";
+ sha512 = "ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==";
+ };
+ };
+ "path-parse-1.0.6" = {
+ name = "path-parse";
+ packageName = "path-parse";
+ version = "1.0.6";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/path-parse/-/path-parse-1.0.6.tgz";
+ sha512 = "GSmOT2EbHrINBf9SR7CDELwlJ8AENk3Qn7OikK4nFYAu3Ote2+JYNVvkpAEQm3/TLNEJFD/xZJjzyxg3KBWOzw==";
+ };
+ };
+ "path-type-2.0.0" = {
+ name = "path-type";
+ packageName = "path-type";
+ version = "2.0.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/path-type/-/path-type-2.0.0.tgz";
+ sha1 = "f012ccb8415b7096fc2daa1054c3d72389594c73";
+ };
+ };
+ "path-type-4.0.0" = {
+ name = "path-type";
+ packageName = "path-type";
+ version = "4.0.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/path-type/-/path-type-4.0.0.tgz";
+ sha512 = "gDKb8aZMDeD/tZWs9P6+q0J9Mwkdl6xMV8TjnGP3qJVJ06bdMgkbBlLU8IdfOsIsFz2BW1rNVT3XuNEl8zPAvw==";
+ };
+ };
+ "picomatch-2.2.2" = {
+ name = "picomatch";
+ packageName = "picomatch";
+ version = "2.2.2";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/picomatch/-/picomatch-2.2.2.tgz";
+ sha512 = "q0M/9eZHzmr0AulXyPwNfZjtwZ/RBZlbN3K3CErVrk50T2ASYI7Bye0EvekFY3IP1Nt2DHu0re+V2ZHIpMkuWg==";
+ };
+ };
+ "pify-2.3.0" = {
+ name = "pify";
+ packageName = "pify";
+ version = "2.3.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz";
+ sha1 = "ed141a6ac043a849ea588498e7dca8b15330e90c";
+ };
+ };
+ "pify-4.0.1" = {
+ name = "pify";
+ packageName = "pify";
+ version = "4.0.1";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/pify/-/pify-4.0.1.tgz";
+ sha512 = "uB80kBFb/tfd68bVleG9T5GGsGPjJrLAUpR5PZIrhBnIaRTQRjqdJSsIKkOP6OAIFbj7GOrcudc5pNjZ+geV2g==";
+ };
+ };
+ "pkg-dir-2.0.0" = {
+ name = "pkg-dir";
+ packageName = "pkg-dir";
+ version = "2.0.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/pkg-dir/-/pkg-dir-2.0.0.tgz";
+ sha1 = "f6d5d1109e19d63edf428e0bd57e12777615334b";
+ };
+ };
+ "pkg-dir-3.0.0" = {
+ name = "pkg-dir";
+ packageName = "pkg-dir";
+ version = "3.0.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/pkg-dir/-/pkg-dir-3.0.0.tgz";
+ sha512 = "/E57AYkoeQ25qkxMj5PBOVgF8Kiu/h7cYS30Z5+R7WaiCCBfLq58ZI/dSeaEKb9WVJV5n/03QwrN3IeWIFllvw==";
+ };
+ };
+ "pkg-dir-4.2.0" = {
+ name = "pkg-dir";
+ packageName = "pkg-dir";
+ version = "4.2.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/pkg-dir/-/pkg-dir-4.2.0.tgz";
+ sha512 = "HRDzbaKjC+AOWVXxAU/x54COGeIv9eb+6CkDSQoNTt4XyWoIJvuPsXizxu/Fr23EiekbtZwmh1IcIG/l/a10GQ==";
+ };
+ };
+ "popper.js-1.16.1" = {
+ name = "popper.js";
+ packageName = "popper.js";
+ version = "1.16.1";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/popper.js/-/popper.js-1.16.1.tgz";
+ sha512 = "Wb4p1J4zyFTbM+u6WuO4XstYx4Ky9Cewe4DWrel7B0w6VVICvPwdOpotjzcf6eD8TsckVnIMNONQyPIUFOUbCQ==";
+ };
+ };
+ "postcss-8.1.10" = {
+ name = "postcss";
+ packageName = "postcss";
+ version = "8.1.10";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/postcss/-/postcss-8.1.10.tgz";
+ sha512 = "iBXEV5VTTYaRRdxiFYzTtuv2lGMQBExqkZKSzkJe+Fl6rvQrA/49UVGKqB+LG54hpW/TtDBMGds8j33GFNW7pg==";
+ };
+ };
+ "postcss-loader-4.1.0" = {
+ name = "postcss-loader";
+ packageName = "postcss-loader";
+ version = "4.1.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/postcss-loader/-/postcss-loader-4.1.0.tgz";
+ sha512 = "vbCkP70F3Q9PIk6d47aBwjqAMI4LfkXCoyxj+7NPNuVIwfTGdzv2KVQes59/RuxMniIgsYQCFSY42P3+ykJfaw==";
+ };
+ };
+ "postcss-modules-extract-imports-3.0.0" = {
+ name = "postcss-modules-extract-imports";
+ packageName = "postcss-modules-extract-imports";
+ version = "3.0.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/postcss-modules-extract-imports/-/postcss-modules-extract-imports-3.0.0.tgz";
+ sha512 = "bdHleFnP3kZ4NYDhuGlVK+CMrQ/pqUm8bx/oGL93K6gVwiclvX5x0n76fYMKuIGKzlABOy13zsvqjb0f92TEXw==";
+ };
+ };
+ "postcss-modules-local-by-default-4.0.0" = {
+ name = "postcss-modules-local-by-default";
+ packageName = "postcss-modules-local-by-default";
+ version = "4.0.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/postcss-modules-local-by-default/-/postcss-modules-local-by-default-4.0.0.tgz";
+ sha512 = "sT7ihtmGSF9yhm6ggikHdV0hlziDTX7oFoXtuVWeDd3hHObNkcHRo9V3yg7vCAY7cONyxJC/XXCmmiHHcvX7bQ==";
+ };
+ };
+ "postcss-modules-scope-3.0.0" = {
+ name = "postcss-modules-scope";
+ packageName = "postcss-modules-scope";
+ version = "3.0.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/postcss-modules-scope/-/postcss-modules-scope-3.0.0.tgz";
+ sha512 = "hncihwFA2yPath8oZ15PZqvWGkWf+XUfQgUGamS4LqoP1anQLOsOJw0vr7J7IwLpoY9fatA2qiGUGmuZL0Iqlg==";
+ };
+ };
+ "postcss-modules-values-4.0.0" = {
+ name = "postcss-modules-values";
+ packageName = "postcss-modules-values";
+ version = "4.0.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/postcss-modules-values/-/postcss-modules-values-4.0.0.tgz";
+ sha512 = "RDxHkAiEGI78gS2ofyvCsu7iycRv7oqw5xMWn9iMoR0N/7mf9D50ecQqUo5BZ9Zh2vH4bCUR/ktCqbB9m8vJjQ==";
+ };
+ };
+ "postcss-selector-parser-6.0.4" = {
+ name = "postcss-selector-parser";
+ packageName = "postcss-selector-parser";
+ version = "6.0.4";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-6.0.4.tgz";
+ sha512 = "gjMeXBempyInaBqpp8gODmwZ52WaYsVOsfr4L4lDQ7n3ncD6mEyySiDtgzCT+NYC0mmeOLvtsF8iaEf0YT6dBw==";
+ };
+ };
+ "postcss-value-parser-4.1.0" = {
+ name = "postcss-value-parser";
+ packageName = "postcss-value-parser";
+ version = "4.1.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-4.1.0.tgz";
+ sha512 = "97DXOFbQJhk71ne5/Mt6cOu6yxsSfM0QGQyl0L25Gca4yGWEGJaig7l7gbCX623VqTBNGLRLaVUCnNkcedlRSQ==";
+ };
+ };
+ "prelude-ls-1.2.1" = {
+ name = "prelude-ls";
+ packageName = "prelude-ls";
+ version = "1.2.1";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/prelude-ls/-/prelude-ls-1.2.1.tgz";
+ sha512 = "vkcDPrRZo1QZLbn5RLGPpg/WmIQ65qoWWhcGKf/b5eplkkarX0m9z8ppCat4mlOqUsWpyNuYgO3VRyrYHSzX5g==";
+ };
+ };
+ "pretty-error-2.1.2" = {
+ name = "pretty-error";
+ packageName = "pretty-error";
+ version = "2.1.2";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/pretty-error/-/pretty-error-2.1.2.tgz";
+ sha512 = "EY5oDzmsX5wvuynAByrmY0P0hcp+QpnAKbJng2A2MPjVKXCxrDSUkzghVJ4ZGPIv+JC4gX8fPUWscC0RtjsWGw==";
+ };
+ };
+ "progress-2.0.3" = {
+ name = "progress";
+ packageName = "progress";
+ version = "2.0.3";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/progress/-/progress-2.0.3.tgz";
+ sha512 = "7PiHtLll5LdnKIMw100I+8xJXR5gW2QwWYkT6iJva0bXitZKa/XMrSbdmg3r2Xnaidz9Qumd0VPaMrZlF9V9sA==";
+ };
+ };
+ "pump-3.0.0" = {
+ name = "pump";
+ packageName = "pump";
+ version = "3.0.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/pump/-/pump-3.0.0.tgz";
+ sha512 = "LwZy+p3SFs1Pytd/jYct4wpv49HiYCqd9Rlc5ZVdk0V+8Yzv6jR5Blk3TRmPL1ft69TxP0IMZGJ+WPFU2BFhww==";
+ };
+ };
+ "punycode-2.1.1" = {
+ name = "punycode";
+ packageName = "punycode";
+ version = "2.1.1";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/punycode/-/punycode-2.1.1.tgz";
+ sha512 = "XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A==";
+ };
+ };
+ "randombytes-2.1.0" = {
+ name = "randombytes";
+ packageName = "randombytes";
+ version = "2.1.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/randombytes/-/randombytes-2.1.0.tgz";
+ sha512 = "vYl3iOX+4CKUWuxGi9Ukhie6fsqXqS9FE2Zaic4tNFD2N2QQaXOMFbuKK4QmDHC0JO6B1Zp41J0LpT0oR68amQ==";
+ };
+ };
+ "read-pkg-2.0.0" = {
+ name = "read-pkg";
+ packageName = "read-pkg";
+ version = "2.0.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/read-pkg/-/read-pkg-2.0.0.tgz";
+ sha1 = "8ef1c0623c6a6db0dc6713c4bfac46332b2368f8";
+ };
+ };
+ "read-pkg-up-2.0.0" = {
+ name = "read-pkg-up";
+ packageName = "read-pkg-up";
+ version = "2.0.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/read-pkg-up/-/read-pkg-up-2.0.0.tgz";
+ sha1 = "6b72a8048984e0c41e79510fd5e9fa99b3b549be";
+ };
+ };
+ "readable-stream-3.6.0" = {
+ name = "readable-stream";
+ packageName = "readable-stream";
+ version = "3.6.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.0.tgz";
+ sha512 = "BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA==";
+ };
+ };
+ "readdirp-3.5.0" = {
+ name = "readdirp";
+ packageName = "readdirp";
+ version = "3.5.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/readdirp/-/readdirp-3.5.0.tgz";
+ sha512 = "cMhu7c/8rdhkHXWsY+osBhfSy0JikwpHK/5+imo+LpeasTF8ouErHrlYkwT0++njiyuDvc7OFY5T3ukvZ8qmFQ==";
+ };
+ };
+ "rechoir-0.7.0" = {
+ name = "rechoir";
+ packageName = "rechoir";
+ version = "0.7.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/rechoir/-/rechoir-0.7.0.tgz";
+ sha512 = "ADsDEH2bvbjltXEP+hTIAmeFekTFK0V2BTxMkok6qILyAJEXV0AFfoWcAq4yfll5VdIMd/RVXq0lR+wQi5ZU3Q==";
+ };
+ };
+ "reduce-flatten-2.0.0" = {
+ name = "reduce-flatten";
+ packageName = "reduce-flatten";
+ version = "2.0.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/reduce-flatten/-/reduce-flatten-2.0.0.tgz";
+ sha512 = "EJ4UNY/U1t2P/2k6oqotuX2Cc3T6nxJwsM0N0asT7dhrtH1ltUxDn4NalSYmPE2rCkVpcf/X6R0wDwcFpzhd4w==";
+ };
+ };
+ "regenerate-1.4.2" = {
+ name = "regenerate";
+ packageName = "regenerate";
+ version = "1.4.2";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/regenerate/-/regenerate-1.4.2.tgz";
+ sha512 = "zrceR/XhGYU/d/opr2EKO7aRHUeiBI8qjtfHqADTwZd6Szfy16la6kqD0MIUs5z5hx6AaKa+PixpPrR289+I0A==";
+ };
+ };
+ "regenerate-unicode-properties-8.2.0" = {
+ name = "regenerate-unicode-properties";
+ packageName = "regenerate-unicode-properties";
+ version = "8.2.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/regenerate-unicode-properties/-/regenerate-unicode-properties-8.2.0.tgz";
+ sha512 = "F9DjY1vKLo/tPePDycuH3dn9H1OTPIkVD9Kz4LODu+F2C75mgjAJ7x/gwy6ZcSNRAAkhNlJSOHRe8k3p+K9WhA==";
+ };
+ };
+ "regenerator-runtime-0.13.7" = {
+ name = "regenerator-runtime";
+ packageName = "regenerator-runtime";
+ version = "0.13.7";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.13.7.tgz";
+ sha512 = "a54FxoJDIr27pgf7IgeQGxmqUNYrcV338lf/6gH456HZ/PhX+5BcwHXG9ajESmwe6WRO0tAzRUrRmNONWgkrew==";
+ };
+ };
+ "regenerator-transform-0.14.5" = {
+ name = "regenerator-transform";
+ packageName = "regenerator-transform";
+ version = "0.14.5";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/regenerator-transform/-/regenerator-transform-0.14.5.tgz";
+ sha512 = "eOf6vka5IO151Jfsw2NO9WpGX58W6wWmefK3I1zEGr0lOD0u8rwPaNqQL1aRxUaxLeKO3ArNh3VYg1KbaD+FFw==";
+ };
+ };
+ "regexpp-3.1.0" = {
+ name = "regexpp";
+ packageName = "regexpp";
+ version = "3.1.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/regexpp/-/regexpp-3.1.0.tgz";
+ sha512 = "ZOIzd8yVsQQA7j8GCSlPGXwg5PfmA1mrq0JP4nGhh54LaKN3xdai/vHUDu74pKwV8OxseMS65u2NImosQcSD0Q==";
+ };
+ };
+ "regexpu-core-4.7.1" = {
+ name = "regexpu-core";
+ packageName = "regexpu-core";
+ version = "4.7.1";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/regexpu-core/-/regexpu-core-4.7.1.tgz";
+ sha512 = "ywH2VUraA44DZQuRKzARmw6S66mr48pQVva4LBeRhcOltJ6hExvWly5ZjFLYo67xbIxb6W1q4bAGtgfEl20zfQ==";
+ };
+ };
+ "regextras-0.7.1" = {
+ name = "regextras";
+ packageName = "regextras";
+ version = "0.7.1";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/regextras/-/regextras-0.7.1.tgz";
+ sha512 = "9YXf6xtW+qzQ+hcMQXx95MOvfqXFgsKDZodX3qZB0x2n5Z94ioetIITsBtvJbiOyxa/6s9AtyweBLCdPmPko/w==";
+ };
+ };
+ "regjsgen-0.5.2" = {
+ name = "regjsgen";
+ packageName = "regjsgen";
+ version = "0.5.2";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/regjsgen/-/regjsgen-0.5.2.tgz";
+ sha512 = "OFFT3MfrH90xIW8OOSyUrk6QHD5E9JOTeGodiJeBS3J6IwlgzJMNE/1bZklWz5oTg+9dCMyEetclvCVXOPoN3A==";
+ };
+ };
+ "regjsparser-0.6.4" = {
+ name = "regjsparser";
+ packageName = "regjsparser";
+ version = "0.6.4";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/regjsparser/-/regjsparser-0.6.4.tgz";
+ sha512 = "64O87/dPDgfk8/RQqC4gkZoGyyWFIEUTTh80CU6CWuK5vkCGyekIx+oKcEIYtP/RAxSQltCZHCNu/mdd7fqlJw==";
+ };
+ };
+ "relateurl-0.2.7" = {
+ name = "relateurl";
+ packageName = "relateurl";
+ version = "0.2.7";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/relateurl/-/relateurl-0.2.7.tgz";
+ sha1 = "54dbf377e51440aca90a4cd274600d3ff2d888a9";
+ };
+ };
+ "renderkid-2.0.4" = {
+ name = "renderkid";
+ packageName = "renderkid";
+ version = "2.0.4";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/renderkid/-/renderkid-2.0.4.tgz";
+ sha512 = "K2eXrSOJdq+HuKzlcjOlGoOarUu5SDguDEhE7+Ah4zuOWL40j8A/oHvLlLob9PSTNvVnBd+/q0Er1QfpEuem5g==";
+ };
+ };
+ "resolve-1.19.0" = {
+ name = "resolve";
+ packageName = "resolve";
+ version = "1.19.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/resolve/-/resolve-1.19.0.tgz";
+ sha512 = "rArEXAgsBG4UgRGcynxWIWKFvh/XZCcS8UJdHhwy91zwAvCZIbcs+vAbflgBnNjYMs/i/i+/Ux6IZhML1yPvxg==";
+ };
+ };
+ "resolve-cwd-3.0.0" = {
+ name = "resolve-cwd";
+ packageName = "resolve-cwd";
+ version = "3.0.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/resolve-cwd/-/resolve-cwd-3.0.0.tgz";
+ sha512 = "OrZaX2Mb+rJCpH/6CpSqt9xFVpN++x01XnN2ie9g6P5/3xelLAkXWVADpdz1IHD/KFfEXyE6V0U01OQ3UO2rEg==";
+ };
+ };
+ "resolve-from-4.0.0" = {
+ name = "resolve-from";
+ packageName = "resolve-from";
+ version = "4.0.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/resolve-from/-/resolve-from-4.0.0.tgz";
+ sha512 = "pb/MYmXstAkysRFx8piNI1tGFNQIFA3vkE3Gq4EuA1dF6gHp/+vgZqsCGJapvy8N3Q+4o7FwvquPJcnZ7RYy4g==";
+ };
+ };
+ "resolve-from-5.0.0" = {
+ name = "resolve-from";
+ packageName = "resolve-from";
+ version = "5.0.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/resolve-from/-/resolve-from-5.0.0.tgz";
+ sha512 = "qYg9KP24dD5qka9J47d0aVky0N+b4fTU89LN9iDnjB5waksiC49rvMB0PrUJQGoTmH50XPiqOvAjDfaijGxYZw==";
+ };
+ };
+ "rimraf-2.6.3" = {
+ name = "rimraf";
+ packageName = "rimraf";
+ version = "2.6.3";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/rimraf/-/rimraf-2.6.3.tgz";
+ sha512 = "mwqeW5XsA2qAejG46gYdENaxXjx9onRNCfn7L0duuP4hCuTIi/QO7PDK07KJfp1d+izWPrzEJDcSqBa0OZQriA==";
+ };
+ };
+ "safe-buffer-5.1.2" = {
+ name = "safe-buffer";
+ packageName = "safe-buffer";
+ version = "5.1.2";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz";
+ sha512 = "Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==";
+ };
+ };
+ "safe-buffer-5.2.1" = {
+ name = "safe-buffer";
+ packageName = "safe-buffer";
+ version = "5.2.1";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz";
+ sha512 = "rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==";
+ };
+ };
+ "sass-1.29.0" = {
+ name = "sass";
+ packageName = "sass";
+ version = "1.29.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/sass/-/sass-1.29.0.tgz";
+ sha512 = "ZpwAUFgnvAUCdkjwPREny+17BpUj8nh5Yr6zKPGtLNTLrmtoRYIjm7njP24COhjJldjwW1dcv52Lpf4tNZVVRA==";
+ };
+ };
+ "sass-loader-10.1.0" = {
+ name = "sass-loader";
+ packageName = "sass-loader";
+ version = "10.1.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/sass-loader/-/sass-loader-10.1.0.tgz";
+ sha512 = "ZCKAlczLBbFd3aGAhowpYEy69Te3Z68cg8bnHHl6WnSCvnKpbM6pQrz957HWMa8LKVuhnD9uMplmMAHwGQtHeg==";
+ };
+ };
+ "schema-utils-2.7.1" = {
+ name = "schema-utils";
+ packageName = "schema-utils";
+ version = "2.7.1";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/schema-utils/-/schema-utils-2.7.1.tgz";
+ sha512 = "SHiNtMOUGWBQJwzISiVYKu82GiV4QYGePp3odlY1tuKO7gPtphAT5R/py0fA6xtbgLL/RvtJZnU9b8s0F1q0Xg==";
+ };
+ };
+ "schema-utils-3.0.0" = {
+ name = "schema-utils";
+ packageName = "schema-utils";
+ version = "3.0.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/schema-utils/-/schema-utils-3.0.0.tgz";
+ sha512 = "6D82/xSzO094ajanoOSbe4YvXWMfn2A//8Y1+MUqFAJul5Bs+yn36xbK9OtNDcRVSBJ9jjeoXftM6CfztsjOAA==";
+ };
+ };
+ "semver-5.7.1" = {
+ name = "semver";
+ packageName = "semver";
+ version = "5.7.1";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz";
+ sha512 = "sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==";
+ };
+ };
+ "semver-6.3.0" = {
+ name = "semver";
+ packageName = "semver";
+ version = "6.3.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz";
+ sha512 = "b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==";
+ };
+ };
+ "semver-7.0.0" = {
+ name = "semver";
+ packageName = "semver";
+ version = "7.0.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/semver/-/semver-7.0.0.tgz";
+ sha512 = "+GB6zVA9LWh6zovYQLALHwv5rb2PHGlJi3lfiqIHxR0uuwCgefcOJc59v9fv1w8GbStwxuuqqAjI9NMAOOgq1A==";
+ };
+ };
+ "semver-7.3.2" = {
+ name = "semver";
+ packageName = "semver";
+ version = "7.3.2";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/semver/-/semver-7.3.2.tgz";
+ sha512 = "OrOb32TeeambH6UrhtShmF7CRDqhL6/5XpPNp2DuRH6+9QLw/orhp72j87v8Qa1ScDkvrrBNpZcDejAirJmfXQ==";
+ };
+ };
+ "serialize-javascript-5.0.1" = {
+ name = "serialize-javascript";
+ packageName = "serialize-javascript";
+ version = "5.0.1";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-5.0.1.tgz";
+ sha512 = "SaaNal9imEO737H2c05Og0/8LUXG7EnsZyMa8MzkmuHoELfT6txuj0cMqRj6zfPKnmQ1yasR4PCJc8x+M4JSPA==";
+ };
+ };
+ "shebang-command-2.0.0" = {
+ name = "shebang-command";
+ packageName = "shebang-command";
+ version = "2.0.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/shebang-command/-/shebang-command-2.0.0.tgz";
+ sha512 = "kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA==";
+ };
+ };
+ "shebang-regex-3.0.0" = {
+ name = "shebang-regex";
+ packageName = "shebang-regex";
+ version = "3.0.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/shebang-regex/-/shebang-regex-3.0.0.tgz";
+ sha512 = "7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==";
+ };
+ };
+ "signal-exit-3.0.3" = {
+ name = "signal-exit";
+ packageName = "signal-exit";
+ version = "3.0.3";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.3.tgz";
+ sha512 = "VUJ49FC8U1OxwZLxIbTTrDvLnf/6TDgxZcK8wxR8zs13xpx7xbG60ndBlhNrFi2EMuFRoeDoJO7wthSLq42EjA==";
+ };
+ };
+ "slice-ansi-2.1.0" = {
+ name = "slice-ansi";
+ packageName = "slice-ansi";
+ version = "2.1.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/slice-ansi/-/slice-ansi-2.1.0.tgz";
+ sha512 = "Qu+VC3EwYLldKa1fCxuuvULvSJOKEgk9pi8dZeCVK7TqBfUNTH4sFkk4joj8afVSfAYgJoSOetjx9QWOJ5mYoQ==";
+ };
+ };
+ "source-list-map-2.0.1" = {
+ name = "source-list-map";
+ packageName = "source-list-map";
+ version = "2.0.1";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/source-list-map/-/source-list-map-2.0.1.tgz";
+ sha512 = "qnQ7gVMxGNxsiL4lEuJwe/To8UnK7fAnmbGEEH8RpLouuKbeEm0lhbQVFIrNSuB+G7tVrAlVsZgETT5nljf+Iw==";
+ };
+ };
+ "source-map-0.5.7" = {
+ name = "source-map";
+ packageName = "source-map";
+ version = "0.5.7";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz";
+ sha1 = "8a039d2d1021d22d1ea14c80d8ea468ba2ef3fcc";
+ };
+ };
+ "source-map-0.6.1" = {
+ name = "source-map";
+ packageName = "source-map";
+ version = "0.6.1";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz";
+ sha512 = "UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==";
+ };
+ };
+ "source-map-0.7.3" = {
+ name = "source-map";
+ packageName = "source-map";
+ version = "0.7.3";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/source-map/-/source-map-0.7.3.tgz";
+ sha512 = "CkCj6giN3S+n9qrYiBTX5gystlENnRW5jZeNLHpe6aue+SrHcG5VYwujhW9s4dY31mEGsxBDrHR6oI69fTXsaQ==";
+ };
+ };
+ "source-map-support-0.5.19" = {
+ name = "source-map-support";
+ packageName = "source-map-support";
+ version = "0.5.19";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.19.tgz";
+ sha512 = "Wonm7zOCIJzBGQdB+thsPar0kYuCIzYvxZwlBa87yi/Mdjv7Tip2cyVbLj5o0cFPN4EVkuTwb3GDDyUx2DGnGw==";
+ };
+ };
+ "spdx-correct-3.1.1" = {
+ name = "spdx-correct";
+ packageName = "spdx-correct";
+ version = "3.1.1";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/spdx-correct/-/spdx-correct-3.1.1.tgz";
+ sha512 = "cOYcUWwhCuHCXi49RhFRCyJEK3iPj1Ziz9DpViV3tbZOwXD49QzIN3MpOLJNxh2qwq2lJJZaKMVw9qNi4jTC0w==";
+ };
+ };
+ "spdx-exceptions-2.3.0" = {
+ name = "spdx-exceptions";
+ packageName = "spdx-exceptions";
+ version = "2.3.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/spdx-exceptions/-/spdx-exceptions-2.3.0.tgz";
+ sha512 = "/tTrYOC7PPI1nUAgx34hUpqXuyJG+DTHJTnIULG4rDygi4xu/tfgmq1e1cIRwRzwZgo4NLySi+ricLkZkw4i5A==";
+ };
+ };
+ "spdx-expression-parse-3.0.1" = {
+ name = "spdx-expression-parse";
+ packageName = "spdx-expression-parse";
+ version = "3.0.1";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/spdx-expression-parse/-/spdx-expression-parse-3.0.1.tgz";
+ sha512 = "cbqHunsQWnJNE6KhVSMsMeH5H/L9EpymbzqTQ3uLwNCLZ1Q481oWaofqH7nO6V07xlXwY6PhQdQ2IedWx/ZK4Q==";
+ };
+ };
+ "spdx-license-ids-3.0.6" = {
+ name = "spdx-license-ids";
+ packageName = "spdx-license-ids";
+ version = "3.0.6";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-3.0.6.tgz";
+ sha512 = "+orQK83kyMva3WyPf59k1+Y525csj5JejicWut55zeTWANuN17qSiSLUXWtzHeNWORSvT7GLDJ/E/XiIWoXBTw==";
+ };
+ };
+ "sprintf-js-1.0.3" = {
+ name = "sprintf-js";
+ packageName = "sprintf-js";
+ version = "1.0.3";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.0.3.tgz";
+ sha1 = "04e6926f662895354f3dd015203633b857297e2c";
+ };
+ };
+ "string-width-3.1.0" = {
+ name = "string-width";
+ packageName = "string-width";
+ version = "3.1.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/string-width/-/string-width-3.1.0.tgz";
+ sha512 = "vafcv6KjVZKSgz06oM/H6GDBrAtz8vdhQakGjFIvNrHA6y3HCF1CInLy+QLq8dTJPQ1b+KDUqDFctkdRW44e1w==";
+ };
+ };
+ "string.prototype.trimend-1.0.3" = {
+ name = "string.prototype.trimend";
+ packageName = "string.prototype.trimend";
+ version = "1.0.3";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/string.prototype.trimend/-/string.prototype.trimend-1.0.3.tgz";
+ sha512 = "ayH0pB+uf0U28CtjlLvL7NaohvR1amUvVZk+y3DYb0Ey2PUV5zPkkKy9+U1ndVEIXO8hNg18eIv9Jntbii+dKw==";
+ };
+ };
+ "string.prototype.trimstart-1.0.3" = {
+ name = "string.prototype.trimstart";
+ packageName = "string.prototype.trimstart";
+ version = "1.0.3";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/string.prototype.trimstart/-/string.prototype.trimstart-1.0.3.tgz";
+ sha512 = "oBIBUy5lea5tt0ovtOFiEQaBkoBBkyJhZXzJYrSmDo5IUUqbOPvVezuRs/agBIdZ2p2Eo1FD6bD9USyBLfl3xg==";
+ };
+ };
+ "string_decoder-1.3.0" = {
+ name = "string_decoder";
+ packageName = "string_decoder";
+ version = "1.3.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/string_decoder/-/string_decoder-1.3.0.tgz";
+ sha512 = "hkRX8U1WjJFd8LsDJ2yQ/wWWxaopEsABU1XfkM8A+j0+85JAGppt16cr1Whg6KIbb4okU6Mql6BOj+uup/wKeA==";
+ };
+ };
+ "strip-ansi-3.0.1" = {
+ name = "strip-ansi";
+ packageName = "strip-ansi";
+ version = "3.0.1";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz";
+ sha1 = "6a385fb8853d952d5ff05d0e8aaf94278dc63dcf";
+ };
+ };
+ "strip-ansi-5.2.0" = {
+ name = "strip-ansi";
+ packageName = "strip-ansi";
+ version = "5.2.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/strip-ansi/-/strip-ansi-5.2.0.tgz";
+ sha512 = "DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA==";
+ };
+ };
+ "strip-ansi-6.0.0" = {
+ name = "strip-ansi";
+ packageName = "strip-ansi";
+ version = "6.0.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.0.tgz";
+ sha512 = "AuvKTrTfQNYNIctbR1K/YGTR1756GycPsg7b9bdV9Duqur4gv6aKqHXah67Z8ImS7WEz5QVcOtlfW2rZEugt6w==";
+ };
+ };
+ "strip-bom-3.0.0" = {
+ name = "strip-bom";
+ packageName = "strip-bom";
+ version = "3.0.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/strip-bom/-/strip-bom-3.0.0.tgz";
+ sha1 = "2334c18e9c759f7bdd56fdef7e9ae3d588e68ed3";
+ };
+ };
+ "strip-final-newline-2.0.0" = {
+ name = "strip-final-newline";
+ packageName = "strip-final-newline";
+ version = "2.0.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/strip-final-newline/-/strip-final-newline-2.0.0.tgz";
+ sha512 = "BrpvfNAE3dcvq7ll3xVumzjKjZQ5tI1sEUIKr3Uoks0XUl45St3FlatVqef9prk4jRDzhW6WZg+3bk93y6pLjA==";
+ };
+ };
+ "strip-json-comments-3.1.1" = {
+ name = "strip-json-comments";
+ packageName = "strip-json-comments";
+ version = "3.1.1";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-3.1.1.tgz";
+ sha512 = "6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig==";
+ };
+ };
+ "supports-color-5.5.0" = {
+ name = "supports-color";
+ packageName = "supports-color";
+ version = "5.5.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz";
+ sha512 = "QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==";
+ };
+ };
+ "supports-color-7.2.0" = {
+ name = "supports-color";
+ packageName = "supports-color";
+ version = "7.2.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz";
+ sha512 = "qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==";
+ };
+ };
+ "table-5.4.6" = {
+ name = "table";
+ packageName = "table";
+ version = "5.4.6";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/table/-/table-5.4.6.tgz";
+ sha512 = "wmEc8m4fjnob4gt5riFRtTu/6+4rSe12TpAELNSqHMfF3IqnA+CH37USM6/YR3qRZv7e56kAEAtd6nKZaxe0Ug==";
+ };
+ };
+ "table-layout-1.0.1" = {
+ name = "table-layout";
+ packageName = "table-layout";
+ version = "1.0.1";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/table-layout/-/table-layout-1.0.1.tgz";
+ sha512 = "dEquqYNJiGwY7iPfZ3wbXDI944iqanTSchrACLL2nOB+1r+h1Nzu2eH+DuPPvWvm5Ry7iAPeFlgEtP5bIp5U7Q==";
+ };
+ };
+ "tapable-1.1.3" = {
+ name = "tapable";
+ packageName = "tapable";
+ version = "1.1.3";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/tapable/-/tapable-1.1.3.tgz";
+ sha512 = "4WK/bYZmj8xLr+HUCODHGF1ZFzsYffasLUgEiMBY4fgtltdO6B4WJtlSbPaDTLpYTcGVwM2qLnFTICEcNxs3kA==";
+ };
+ };
+ "tapable-2.1.1" = {
+ name = "tapable";
+ packageName = "tapable";
+ version = "2.1.1";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/tapable/-/tapable-2.1.1.tgz";
+ sha512 = "Wib1S8m2wdpLbmQz0RBEVosIyvb/ykfKXf3ZIDqvWoMg/zTNm6G/tDSuUM61J1kNCDXWJrLHGSFeMhAG+gAGpQ==";
+ };
+ };
+ "terser-4.8.0" = {
+ name = "terser";
+ packageName = "terser";
+ version = "4.8.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/terser/-/terser-4.8.0.tgz";
+ sha512 = "EAPipTNeWsb/3wLPeup1tVPaXfIaU68xMnVdPafIL1TV05OhASArYyIfFvnvJCNrR2NIOvDVNNTFRa+Re2MWyw==";
+ };
+ };
+ "terser-5.5.0" = {
+ name = "terser";
+ packageName = "terser";
+ version = "5.5.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/terser/-/terser-5.5.0.tgz";
+ sha512 = "eopt1Gf7/AQyPhpygdKePTzaet31TvQxXvrf7xYUvD/d8qkCJm4SKPDzu+GHK5ZaYTn8rvttfqaZc3swK21e5g==";
+ };
+ };
+ "terser-webpack-plugin-5.0.3" = {
+ name = "terser-webpack-plugin";
+ packageName = "terser-webpack-plugin";
+ version = "5.0.3";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/terser-webpack-plugin/-/terser-webpack-plugin-5.0.3.tgz";
+ sha512 = "zFdGk8Lh9ZJGPxxPE6jwysOlATWB8GMW8HcfGULWA/nPal+3VdATflQvSBSLQJRCmYZnfFJl6vkRTiwJGNgPiQ==";
+ };
+ };
+ "text-table-0.2.0" = {
+ name = "text-table";
+ packageName = "text-table";
+ version = "0.2.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/text-table/-/text-table-0.2.0.tgz";
+ sha1 = "7f5ee823ae805207c00af2df4a84ec3fcfa570b4";
+ };
+ };
+ "to-fast-properties-2.0.0" = {
+ name = "to-fast-properties";
+ packageName = "to-fast-properties";
+ version = "2.0.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/to-fast-properties/-/to-fast-properties-2.0.0.tgz";
+ sha1 = "dc5e698cbd079265bc73e0377681a4e4e83f616e";
+ };
+ };
+ "to-regex-range-5.0.1" = {
+ name = "to-regex-range";
+ packageName = "to-regex-range";
+ version = "5.0.1";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz";
+ sha512 = "65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==";
+ };
+ };
+ "tsconfig-paths-3.9.0" = {
+ name = "tsconfig-paths";
+ packageName = "tsconfig-paths";
+ version = "3.9.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/tsconfig-paths/-/tsconfig-paths-3.9.0.tgz";
+ sha512 = "dRcuzokWhajtZWkQsDVKbWyY+jgcLC5sqJhg2PSgf4ZkH2aHPvaOY8YWGhmjb68b5qqTfasSsDO9k7RUiEmZAw==";
+ };
+ };
+ "tslib-1.14.1" = {
+ name = "tslib";
+ packageName = "tslib";
+ version = "1.14.1";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz";
+ sha512 = "Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==";
+ };
+ };
+ "type-check-0.4.0" = {
+ name = "type-check";
+ packageName = "type-check";
+ version = "0.4.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/type-check/-/type-check-0.4.0.tgz";
+ sha512 = "XleUoc9uwGXqjWwXaUTZAmzMcFZ5858QA2vvx1Ur5xIcixXIP+8LnFDgRplU30us6teqdlskFfu+ae4K79Ooew==";
+ };
+ };
+ "type-fest-0.8.1" = {
+ name = "type-fest";
+ packageName = "type-fest";
+ version = "0.8.1";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/type-fest/-/type-fest-0.8.1.tgz";
+ sha512 = "4dbzIzqvjtgiM5rw1k5rEHtBANKmdudhGyBEajN01fEyhaAIhsoKNy6y7+IN93IfpFtwY9iqi7kD+xwKhQsNJA==";
+ };
+ };
+ "typical-5.2.0" = {
+ name = "typical";
+ packageName = "typical";
+ version = "5.2.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/typical/-/typical-5.2.0.tgz";
+ sha512 = "dvdQgNDNJo+8B2uBQoqdb11eUCE1JQXhvjC/CZtgvZseVd5TYMXnq0+vuUemXbd/Se29cTaUuPX3YIc2xgbvIg==";
+ };
+ };
+ "unicode-canonical-property-names-ecmascript-1.0.4" = {
+ name = "unicode-canonical-property-names-ecmascript";
+ packageName = "unicode-canonical-property-names-ecmascript";
+ version = "1.0.4";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/unicode-canonical-property-names-ecmascript/-/unicode-canonical-property-names-ecmascript-1.0.4.tgz";
+ sha512 = "jDrNnXWHd4oHiTZnx/ZG7gtUTVp+gCcTTKr8L0HjlwphROEW3+Him+IpvC+xcJEFegapiMZyZe02CyuOnRmbnQ==";
+ };
+ };
+ "unicode-match-property-ecmascript-1.0.4" = {
+ name = "unicode-match-property-ecmascript";
+ packageName = "unicode-match-property-ecmascript";
+ version = "1.0.4";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/unicode-match-property-ecmascript/-/unicode-match-property-ecmascript-1.0.4.tgz";
+ sha512 = "L4Qoh15vTfntsn4P1zqnHulG0LdXgjSO035fEpdtp6YxXhMT51Q6vgM5lYdG/5X3MjS+k/Y9Xw4SFCY9IkR0rg==";
+ };
+ };
+ "unicode-match-property-value-ecmascript-1.2.0" = {
+ name = "unicode-match-property-value-ecmascript";
+ packageName = "unicode-match-property-value-ecmascript";
+ version = "1.2.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/unicode-match-property-value-ecmascript/-/unicode-match-property-value-ecmascript-1.2.0.tgz";
+ sha512 = "wjuQHGQVofmSJv1uVISKLE5zO2rNGzM/KCYZch/QQvez7C1hUhBIuZ701fYXExuufJFMPhv2SyL8CyoIfMLbIQ==";
+ };
+ };
+ "unicode-property-aliases-ecmascript-1.1.0" = {
+ name = "unicode-property-aliases-ecmascript";
+ packageName = "unicode-property-aliases-ecmascript";
+ version = "1.1.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/unicode-property-aliases-ecmascript/-/unicode-property-aliases-ecmascript-1.1.0.tgz";
+ sha512 = "PqSoPh/pWetQ2phoj5RLiaqIk4kCNwoV3CI+LfGmWLKI3rE3kl1h59XpX2BjgDrmbxD9ARtQobPGU1SguCYuQg==";
+ };
+ };
+ "uniq-1.0.1" = {
+ name = "uniq";
+ packageName = "uniq";
+ version = "1.0.1";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/uniq/-/uniq-1.0.1.tgz";
+ sha1 = "b31c5ae8254844a3a8281541ce2b04b865a734ff";
+ };
+ };
+ "uri-js-4.4.0" = {
+ name = "uri-js";
+ packageName = "uri-js";
+ version = "4.4.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/uri-js/-/uri-js-4.4.0.tgz";
+ sha512 = "B0yRTzYdUCCn9n+F4+Gh4yIDtMQcaJsmYBDsTSG8g/OejKBodLQ2IHfN3bM7jUsRXndopT7OIXWdYqc1fjmV6g==";
+ };
+ };
+ "util-deprecate-1.0.2" = {
+ name = "util-deprecate";
+ packageName = "util-deprecate";
+ version = "1.0.2";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz";
+ sha1 = "450d4dc9fa70de732762fbd2d4a28981419a0ccf";
+ };
+ };
+ "util.promisify-1.0.0" = {
+ name = "util.promisify";
+ packageName = "util.promisify";
+ version = "1.0.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/util.promisify/-/util.promisify-1.0.0.tgz";
+ sha512 = "i+6qA2MPhvoKLuxnJNpXAGhg7HphQOSUq2LKMZD0m15EiskXUkMvKdF4Uui0WYeCUGea+o2cw/ZuwehtfsrNkA==";
+ };
+ };
+ "utila-0.4.0" = {
+ name = "utila";
+ packageName = "utila";
+ version = "0.4.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/utila/-/utila-0.4.0.tgz";
+ sha1 = "8a16a05d445657a3aea5eecc5b12a4fa5379772c";
+ };
+ };
+ "v8-compile-cache-2.2.0" = {
+ name = "v8-compile-cache";
+ packageName = "v8-compile-cache";
+ version = "2.2.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/v8-compile-cache/-/v8-compile-cache-2.2.0.tgz";
+ sha512 = "gTpR5XQNKFwOd4clxfnhaqvfqMpqEwr4tOtCyz4MtYZX2JYhfr1JvBFKdS+7K/9rfpZR3VLX+YWBbKoxCgS43Q==";
+ };
+ };
+ "validate-npm-package-license-3.0.4" = {
+ name = "validate-npm-package-license";
+ packageName = "validate-npm-package-license";
+ version = "3.0.4";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/validate-npm-package-license/-/validate-npm-package-license-3.0.4.tgz";
+ sha512 = "DpKm2Ui/xN7/HQKCtpZxoRWBhZ9Z0kqtygG8XCgNQ8ZlDnxuQmWhj566j8fN4Cu3/JmbhsDo7fcAJq4s9h27Ew==";
+ };
+ };
+ "vfile-location-3.2.0" = {
+ name = "vfile-location";
+ packageName = "vfile-location";
+ version = "3.2.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/vfile-location/-/vfile-location-3.2.0.tgz";
+ sha512 = "aLEIZKv/oxuCDZ8lkJGhuhztf/BW4M+iHdCwglA/eWc+vtuRFJj8EtgceYFX4LRjOhCAAiNHsKGssC6onJ+jbA==";
+ };
+ };
+ "watchpack-2.0.1" = {
+ name = "watchpack";
+ packageName = "watchpack";
+ version = "2.0.1";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/watchpack/-/watchpack-2.0.1.tgz";
+ sha512 = "vO8AKGX22ZRo6PiOFM9dC0re8IcKh8Kd/aH2zeqUc6w4/jBGlTy2P7fTC6ekT0NjVeGjgU2dGC5rNstKkeLEQg==";
+ };
+ };
+ "webpack-5.6.0" = {
+ name = "webpack";
+ packageName = "webpack";
+ version = "5.6.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/webpack/-/webpack-5.6.0.tgz";
+ sha512 = "SIeFuBhuheKElRbd84O35UhKc0nxlgSwtzm2ksZ0BVhRJqxVJxEguT/pYhfiR0le/pxTa1VsCp7EOYyTsa6XOA==";
+ };
+ };
+ "webpack-cli-4.2.0" = {
+ name = "webpack-cli";
+ packageName = "webpack-cli";
+ version = "4.2.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/webpack-cli/-/webpack-cli-4.2.0.tgz";
+ sha512 = "EIl3k88vaF4fSxWSgtAQR+VwicfLMTZ9amQtqS4o+TDPW9HGaEpbFBbAZ4A3ZOT5SOnMxNOzROsSTPiE8tBJPA==";
+ };
+ };
+ "webpack-merge-4.2.2" = {
+ name = "webpack-merge";
+ packageName = "webpack-merge";
+ version = "4.2.2";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/webpack-merge/-/webpack-merge-4.2.2.tgz";
+ sha512 = "TUE1UGoTX2Cd42j3krGYqObZbOD+xF7u28WB7tfUordytSjbWTIjK/8V0amkBfTYN4/pB/GIDlJZZ657BGG19g==";
+ };
+ };
+ "webpack-sources-1.4.3" = {
+ name = "webpack-sources";
+ packageName = "webpack-sources";
+ version = "1.4.3";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/webpack-sources/-/webpack-sources-1.4.3.tgz";
+ sha512 = "lgTS3Xhv1lCOKo7SA5TjKXMjpSM4sBjNV5+q2bqesbSPs5FjGmU6jjtBSkX9b4qW87vDIsCIlUPOEhbZrMdjeQ==";
+ };
+ };
+ "webpack-sources-2.2.0" = {
+ name = "webpack-sources";
+ packageName = "webpack-sources";
+ version = "2.2.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/webpack-sources/-/webpack-sources-2.2.0.tgz";
+ sha512 = "bQsA24JLwcnWGArOKUxYKhX3Mz/nK1Xf6hxullKERyktjNMC4x8koOeaDNTA2fEJ09BdWLbM/iTW0ithREUP0w==";
+ };
+ };
+ "which-2.0.2" = {
+ name = "which";
+ packageName = "which";
+ version = "2.0.2";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/which/-/which-2.0.2.tgz";
+ sha512 = "BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==";
+ };
+ };
+ "word-wrap-1.2.3" = {
+ name = "word-wrap";
+ packageName = "word-wrap";
+ version = "1.2.3";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/word-wrap/-/word-wrap-1.2.3.tgz";
+ sha512 = "Hz/mrNwitNRh/HUAtM/VT/5VH+ygD6DV7mYKZAtHOrbs8U7lvPS6xf7EJKMF0uW1KJCl0H701g3ZGus+muE5vQ==";
+ };
+ };
+ "wordwrapjs-4.0.0" = {
+ name = "wordwrapjs";
+ packageName = "wordwrapjs";
+ version = "4.0.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/wordwrapjs/-/wordwrapjs-4.0.0.tgz";
+ sha512 = "Svqw723a3R34KvsMgpjFBYCgNOSdcW3mQFK4wIfhGQhtaFVOJmdYoXgi63ne3dTlWgatVcUc7t4HtQ/+bUVIzQ==";
+ };
+ };
+ "wrappy-1.0.2" = {
+ name = "wrappy";
+ packageName = "wrappy";
+ version = "1.0.2";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz";
+ sha1 = "b5243d8f3ec1aa35f1364605bc0d1036e30ab69f";
+ };
+ };
+ "write-1.0.3" = {
+ name = "write";
+ packageName = "write";
+ version = "1.0.3";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/write/-/write-1.0.3.tgz";
+ sha512 = "/lg70HAjtkUgWPVZhZcm+T4hkL8Zbtp1nFNOn3lRrxnlv50SRBv7cR7RqR+GMsd3hUXy9hWBo4CHTbFTcOYwig==";
+ };
+ };
+ "yaml-1.10.0" = {
+ name = "yaml";
+ packageName = "yaml";
+ version = "1.10.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/yaml/-/yaml-1.10.0.tgz";
+ sha512 = "yr2icI4glYaNG+KWONODapy2/jDdMSDnrONSjblABjD9B4Z5LgiircSt8m8sRZFNi08kG9Sm0uSHtEmP3zaEGg==";
+ };
+ };
+ };
+ args = {
+ name = "botamusique";
+ packageName = "botamusique";
+ version = "0.0.0";
+ src = ../../../../../../../../run/user/1000/tmp.ioJA7NbZmp;
+ dependencies = [
+ sources."@babel/code-frame-7.10.4"
+ sources."@babel/compat-data-7.12.7"
+ sources."@babel/core-7.12.9"
+ (sources."@babel/eslint-parser-7.12.1" // {
+ dependencies = [
+ sources."semver-6.3.0"
+ ];
+ })
+ sources."@babel/eslint-plugin-7.12.1"
+ sources."@babel/generator-7.12.5"
+ sources."@babel/helper-annotate-as-pure-7.10.4"
+ sources."@babel/helper-builder-binary-assignment-operator-visitor-7.10.4"
+ sources."@babel/helper-compilation-targets-7.12.5"
+ sources."@babel/helper-create-class-features-plugin-7.12.1"
+ sources."@babel/helper-create-regexp-features-plugin-7.12.7"
+ sources."@babel/helper-define-map-7.10.5"
+ sources."@babel/helper-explode-assignable-expression-7.12.1"
+ sources."@babel/helper-function-name-7.10.4"
+ sources."@babel/helper-get-function-arity-7.10.4"
+ sources."@babel/helper-hoist-variables-7.10.4"
+ sources."@babel/helper-member-expression-to-functions-7.12.7"
+ sources."@babel/helper-module-imports-7.12.5"
+ sources."@babel/helper-module-transforms-7.12.1"
+ sources."@babel/helper-optimise-call-expression-7.12.7"
+ sources."@babel/helper-plugin-utils-7.10.4"
+ sources."@babel/helper-remap-async-to-generator-7.12.1"
+ sources."@babel/helper-replace-supers-7.12.5"
+ sources."@babel/helper-simple-access-7.12.1"
+ sources."@babel/helper-skip-transparent-expression-wrappers-7.12.1"
+ sources."@babel/helper-split-export-declaration-7.11.0"
+ sources."@babel/helper-validator-identifier-7.10.4"
+ sources."@babel/helper-validator-option-7.12.1"
+ sources."@babel/helper-wrap-function-7.12.3"
+ sources."@babel/helpers-7.12.5"
+ sources."@babel/highlight-7.10.4"
+ sources."@babel/parser-7.12.7"
+ sources."@babel/plugin-proposal-async-generator-functions-7.12.1"
+ sources."@babel/plugin-proposal-class-properties-7.12.1"
+ sources."@babel/plugin-proposal-dynamic-import-7.12.1"
+ sources."@babel/plugin-proposal-export-namespace-from-7.12.1"
+ sources."@babel/plugin-proposal-json-strings-7.12.1"
+ sources."@babel/plugin-proposal-logical-assignment-operators-7.12.1"
+ sources."@babel/plugin-proposal-nullish-coalescing-operator-7.12.1"
+ sources."@babel/plugin-proposal-numeric-separator-7.12.7"
+ sources."@babel/plugin-proposal-object-rest-spread-7.12.1"
+ sources."@babel/plugin-proposal-optional-catch-binding-7.12.1"
+ sources."@babel/plugin-proposal-optional-chaining-7.12.7"
+ sources."@babel/plugin-proposal-private-methods-7.12.1"
+ sources."@babel/plugin-proposal-unicode-property-regex-7.12.1"
+ sources."@babel/plugin-syntax-async-generators-7.8.4"
+ sources."@babel/plugin-syntax-class-properties-7.12.1"
+ sources."@babel/plugin-syntax-dynamic-import-7.8.3"
+ sources."@babel/plugin-syntax-export-namespace-from-7.8.3"
+ sources."@babel/plugin-syntax-json-strings-7.8.3"
+ sources."@babel/plugin-syntax-logical-assignment-operators-7.10.4"
+ sources."@babel/plugin-syntax-nullish-coalescing-operator-7.8.3"
+ sources."@babel/plugin-syntax-numeric-separator-7.10.4"
+ sources."@babel/plugin-syntax-object-rest-spread-7.8.3"
+ sources."@babel/plugin-syntax-optional-catch-binding-7.8.3"
+ sources."@babel/plugin-syntax-optional-chaining-7.8.3"
+ sources."@babel/plugin-syntax-top-level-await-7.12.1"
+ sources."@babel/plugin-transform-arrow-functions-7.12.1"
+ sources."@babel/plugin-transform-async-to-generator-7.12.1"
+ sources."@babel/plugin-transform-block-scoped-functions-7.12.1"
+ sources."@babel/plugin-transform-block-scoping-7.12.1"
+ sources."@babel/plugin-transform-classes-7.12.1"
+ sources."@babel/plugin-transform-computed-properties-7.12.1"
+ sources."@babel/plugin-transform-destructuring-7.12.1"
+ sources."@babel/plugin-transform-dotall-regex-7.12.1"
+ sources."@babel/plugin-transform-duplicate-keys-7.12.1"
+ sources."@babel/plugin-transform-exponentiation-operator-7.12.1"
+ sources."@babel/plugin-transform-for-of-7.12.1"
+ sources."@babel/plugin-transform-function-name-7.12.1"
+ sources."@babel/plugin-transform-literals-7.12.1"
+ sources."@babel/plugin-transform-member-expression-literals-7.12.1"
+ sources."@babel/plugin-transform-modules-amd-7.12.1"
+ sources."@babel/plugin-transform-modules-commonjs-7.12.1"
+ sources."@babel/plugin-transform-modules-systemjs-7.12.1"
+ sources."@babel/plugin-transform-modules-umd-7.12.1"
+ sources."@babel/plugin-transform-named-capturing-groups-regex-7.12.1"
+ sources."@babel/plugin-transform-new-target-7.12.1"
+ sources."@babel/plugin-transform-object-super-7.12.1"
+ sources."@babel/plugin-transform-parameters-7.12.1"
+ sources."@babel/plugin-transform-property-literals-7.12.1"
+ sources."@babel/plugin-transform-regenerator-7.12.1"
+ sources."@babel/plugin-transform-reserved-words-7.12.1"
+ sources."@babel/plugin-transform-shorthand-properties-7.12.1"
+ sources."@babel/plugin-transform-spread-7.12.1"
+ sources."@babel/plugin-transform-sticky-regex-7.12.7"
+ sources."@babel/plugin-transform-template-literals-7.12.1"
+ sources."@babel/plugin-transform-typeof-symbol-7.12.1"
+ sources."@babel/plugin-transform-unicode-escapes-7.12.1"
+ sources."@babel/plugin-transform-unicode-regex-7.12.1"
+ sources."@babel/preset-env-7.12.7"
+ sources."@babel/preset-modules-0.1.4"
+ sources."@babel/runtime-7.12.5"
+ sources."@babel/template-7.12.7"
+ sources."@babel/traverse-7.12.9"
+ sources."@babel/types-7.12.7"
+ (sources."@eslint/eslintrc-0.2.1" // {
+ dependencies = [
+ sources."globals-12.4.0"
+ ];
+ })
+ sources."@fortawesome/fontawesome-common-types-0.2.32"
+ sources."@fortawesome/fontawesome-svg-core-1.2.32"
+ sources."@fortawesome/free-regular-svg-icons-5.15.1"
+ sources."@fortawesome/free-solid-svg-icons-5.15.1"
+ sources."@types/anymatch-1.3.1"
+ sources."@types/eslint-7.2.5"
+ sources."@types/eslint-scope-3.7.0"
+ sources."@types/estree-0.0.45"
+ sources."@types/html-minifier-terser-5.1.1"
+ sources."@types/json-schema-7.0.6"
+ sources."@types/json5-0.0.29"
+ sources."@types/node-14.14.9"
+ sources."@types/parse-json-4.0.0"
+ sources."@types/source-list-map-0.1.2"
+ sources."@types/tapable-1.0.6"
+ (sources."@types/uglify-js-3.11.1" // {
+ dependencies = [
+ sources."source-map-0.6.1"
+ ];
+ })
+ (sources."@types/webpack-4.41.25" // {
+ dependencies = [
+ sources."source-map-0.6.1"
+ ];
+ })
+ (sources."@types/webpack-sources-2.0.0" // {
+ dependencies = [
+ sources."source-map-0.7.3"
+ ];
+ })
+ sources."@webassemblyjs/ast-1.9.0"
+ sources."@webassemblyjs/floating-point-hex-parser-1.9.0"
+ sources."@webassemblyjs/helper-api-error-1.9.0"
+ sources."@webassemblyjs/helper-buffer-1.9.0"
+ sources."@webassemblyjs/helper-code-frame-1.9.0"
+ sources."@webassemblyjs/helper-fsm-1.9.0"
+ sources."@webassemblyjs/helper-module-context-1.9.0"
+ sources."@webassemblyjs/helper-wasm-bytecode-1.9.0"
+ sources."@webassemblyjs/helper-wasm-section-1.9.0"
+ sources."@webassemblyjs/ieee754-1.9.0"
+ sources."@webassemblyjs/leb128-1.9.0"
+ sources."@webassemblyjs/utf8-1.9.0"
+ sources."@webassemblyjs/wasm-edit-1.9.0"
+ sources."@webassemblyjs/wasm-gen-1.9.0"
+ sources."@webassemblyjs/wasm-opt-1.9.0"
+ sources."@webassemblyjs/wasm-parser-1.9.0"
+ sources."@webassemblyjs/wast-parser-1.9.0"
+ sources."@webassemblyjs/wast-printer-1.9.0"
+ sources."@webpack-cli/info-1.1.0"
+ sources."@webpack-cli/serve-1.1.0"
+ sources."@xtuc/ieee754-1.2.0"
+ sources."@xtuc/long-4.2.2"
+ sources."acorn-7.4.1"
+ sources."acorn-jsx-5.3.1"
+ sources."ajv-6.12.6"
+ sources."ajv-keywords-3.5.2"
+ sources."ansi-colors-4.1.1"
+ sources."ansi-regex-5.0.0"
+ sources."ansi-styles-3.2.1"
+ sources."anymatch-3.1.1"
+ sources."argparse-1.0.10"
+ sources."array-back-4.0.1"
+ sources."array-includes-3.1.2"
+ sources."array.prototype.flat-1.2.4"
+ sources."astral-regex-1.0.0"
+ sources."autoprefixer-10.0.2"
+ sources."babel-loader-8.2.1"
+ sources."babel-plugin-dynamic-import-node-2.3.3"
+ sources."balanced-match-1.0.0"
+ sources."big.js-5.2.2"
+ sources."binary-extensions-2.1.0"
+ sources."boolbase-1.0.0"
+ sources."bootstrap-4.5.3"
+ sources."bootswatch-4.5.3"
+ sources."brace-expansion-1.1.11"
+ sources."braces-3.0.2"
+ sources."browserslist-4.14.7"
+ sources."buffer-from-1.1.1"
+ sources."call-bind-1.0.0"
+ sources."callsites-3.1.0"
+ sources."camel-case-4.1.1"
+ sources."camelcase-6.2.0"
+ sources."caniuse-lite-1.0.30001161"
+ sources."chalk-2.4.2"
+ sources."chokidar-3.4.3"
+ sources."chrome-trace-event-1.0.2"
+ (sources."clean-css-4.2.3" // {
+ dependencies = [
+ sources."source-map-0.6.1"
+ ];
+ })
+ sources."color-convert-1.9.3"
+ sources."color-name-1.1.3"
+ sources."colorette-1.2.1"
+ sources."command-line-usage-6.1.1"
+ sources."commander-4.1.1"
+ sources."comment-parser-0.7.6"
+ sources."commondir-1.0.1"
+ sources."concat-map-0.0.1"
+ sources."contains-path-0.1.0"
+ sources."convert-source-map-1.7.0"
+ sources."core-js-3.7.0"
+ (sources."core-js-compat-3.7.0" // {
+ dependencies = [
+ sources."semver-7.0.0"
+ ];
+ })
+ sources."cosmiconfig-7.0.0"
+ sources."cross-spawn-7.0.3"
+ (sources."css-loader-5.0.1" // {
+ dependencies = [
+ sources."loader-utils-2.0.0"
+ sources."schema-utils-3.0.0"
+ sources."semver-7.3.2"
+ ];
+ })
+ sources."css-select-1.2.0"
+ sources."css-what-2.1.3"
+ sources."cssesc-3.0.0"
+ sources."debug-4.3.1"
+ sources."deep-extend-0.6.0"
+ sources."deep-is-0.1.3"
+ sources."define-properties-1.1.3"
+ sources."doctrine-3.0.0"
+ sources."dom-converter-0.2.0"
+ (sources."dom-serializer-0.2.2" // {
+ dependencies = [
+ sources."domelementtype-2.0.2"
+ ];
+ })
+ sources."domelementtype-1.3.1"
+ sources."domhandler-2.4.2"
+ sources."domutils-1.5.1"
+ sources."dot-case-3.0.3"
+ sources."electron-to-chromium-1.3.607"
+ sources."emoji-regex-7.0.3"
+ sources."emojis-list-3.0.0"
+ sources."end-of-stream-1.4.4"
+ (sources."enhanced-resolve-5.3.2" // {
+ dependencies = [
+ sources."tapable-2.1.1"
+ ];
+ })
+ sources."enquirer-2.3.6"
+ sources."entities-2.1.0"
+ sources."envinfo-7.7.3"
+ sources."error-ex-1.3.2"
+ sources."es-abstract-1.18.0-next.1"
+ sources."es-to-primitive-1.2.1"
+ sources."escalade-3.1.1"
+ sources."escape-string-regexp-1.0.5"
+ (sources."eslint-7.14.0" // {
+ dependencies = [
+ sources."ansi-styles-4.3.0"
+ sources."chalk-4.1.0"
+ sources."color-convert-2.0.1"
+ sources."color-name-1.1.4"
+ sources."eslint-scope-5.1.1"
+ sources."eslint-visitor-keys-2.0.0"
+ sources."globals-12.4.0"
+ sources."has-flag-4.0.0"
+ sources."semver-7.3.2"
+ sources."supports-color-7.2.0"
+ ];
+ })
+ (sources."eslint-import-resolver-node-0.3.4" // {
+ dependencies = [
+ sources."debug-2.6.9"
+ sources."ms-2.0.0"
+ ];
+ })
+ (sources."eslint-module-utils-2.6.0" // {
+ dependencies = [
+ sources."debug-2.6.9"
+ sources."ms-2.0.0"
+ ];
+ })
+ (sources."eslint-plugin-import-2.22.1" // {
+ dependencies = [
+ sources."debug-2.6.9"
+ sources."doctrine-1.5.0"
+ sources."ms-2.0.0"
+ ];
+ })
+ sources."eslint-plugin-jquery-1.5.1"
+ (sources."eslint-plugin-jsdoc-30.7.8" // {
+ dependencies = [
+ sources."semver-7.3.2"
+ ];
+ })
+ sources."eslint-rule-composer-0.3.0"
+ sources."eslint-scope-5.1.0"
+ sources."eslint-utils-2.1.0"
+ sources."eslint-visitor-keys-1.3.0"
+ sources."espree-7.3.0"
+ sources."esprima-4.0.1"
+ (sources."esquery-1.3.1" // {
+ dependencies = [
+ sources."estraverse-5.2.0"
+ ];
+ })
+ (sources."esrecurse-4.3.0" // {
+ dependencies = [
+ sources."estraverse-5.2.0"
+ ];
+ })
+ sources."estraverse-4.3.0"
+ sources."esutils-2.0.3"
+ sources."events-3.2.0"
+ sources."execa-4.1.0"
+ sources."fast-deep-equal-3.1.3"
+ sources."fast-json-stable-stringify-2.1.0"
+ sources."fast-levenshtein-2.0.6"
+ sources."file-entry-cache-5.0.1"
+ sources."fill-range-7.0.1"
+ (sources."find-cache-dir-2.1.0" // {
+ dependencies = [
+ sources."find-up-3.0.0"
+ sources."locate-path-3.0.0"
+ sources."p-limit-2.3.0"
+ sources."p-locate-3.0.0"
+ sources."p-try-2.2.0"
+ sources."pkg-dir-3.0.0"
+ ];
+ })
+ sources."find-up-2.1.0"
+ sources."flat-cache-2.0.1"
+ sources."flatted-2.0.2"
+ sources."fs.realpath-1.0.0"
+ sources."fsevents-2.1.3"
+ sources."function-bind-1.1.1"
+ sources."functional-red-black-tree-1.0.1"
+ sources."gensync-1.0.0-beta.2"
+ sources."get-intrinsic-1.0.1"
+ sources."get-stream-5.2.0"
+ sources."glob-7.1.6"
+ sources."glob-parent-5.1.1"
+ sources."glob-to-regexp-0.4.1"
+ sources."globals-11.12.0"
+ sources."graceful-fs-4.2.4"
+ sources."has-1.0.3"
+ sources."has-flag-3.0.0"
+ sources."has-symbols-1.0.1"
+ sources."he-1.2.0"
+ sources."hosted-git-info-2.8.8"
+ sources."html-minifier-terser-5.1.1"
+ sources."html-webpack-plugin-4.5.0"
+ (sources."htmlparser2-3.10.1" // {
+ dependencies = [
+ sources."entities-1.1.2"
+ ];
+ })
+ sources."human-signals-1.1.1"
+ sources."icss-utils-5.1.0"
+ sources."ignore-4.0.6"
+ sources."import-fresh-3.2.2"
+ (sources."import-local-3.0.2" // {
+ dependencies = [
+ sources."find-up-4.1.0"
+ sources."locate-path-5.0.0"
+ sources."p-limit-2.3.0"
+ sources."p-locate-4.1.0"
+ sources."p-try-2.2.0"
+ sources."path-exists-4.0.0"
+ sources."pkg-dir-4.2.0"
+ ];
+ })
+ sources."imurmurhash-0.1.4"
+ sources."indexes-of-1.0.1"
+ sources."inflight-1.0.6"
+ sources."inherits-2.0.4"
+ sources."interpret-2.2.0"
+ sources."is-arrayish-0.2.1"
+ sources."is-binary-path-2.1.0"
+ sources."is-callable-1.2.2"
+ sources."is-core-module-2.1.0"
+ sources."is-date-object-1.0.2"
+ sources."is-extglob-2.1.1"
+ sources."is-fullwidth-code-point-2.0.0"
+ sources."is-glob-4.0.1"
+ sources."is-negative-zero-2.0.0"
+ sources."is-number-7.0.0"
+ sources."is-regex-1.1.1"
+ sources."is-stream-2.0.0"
+ sources."is-string-1.0.5"
+ sources."is-symbol-1.0.3"
+ sources."isarray-1.0.0"
+ sources."isexe-2.0.0"
+ (sources."jest-worker-26.6.2" // {
+ dependencies = [
+ sources."has-flag-4.0.0"
+ sources."supports-color-7.2.0"
+ ];
+ })
+ sources."jquery-3.5.1"
+ sources."jquery-migrate-3.3.2"
+ sources."js-tokens-4.0.0"
+ sources."js-yaml-3.14.0"
+ sources."jsdoctypeparser-9.0.0"
+ sources."jsesc-2.5.2"
+ sources."json-parse-better-errors-1.0.2"
+ sources."json-parse-even-better-errors-2.3.1"
+ sources."json-schema-traverse-0.4.1"
+ sources."json-stable-stringify-without-jsonify-1.0.1"
+ sources."json5-2.1.3"
+ sources."klona-2.0.4"
+ sources."leven-3.1.0"
+ sources."levn-0.4.1"
+ sources."lines-and-columns-1.1.6"
+ (sources."load-json-file-2.0.0" // {
+ dependencies = [
+ sources."parse-json-2.2.0"
+ sources."pify-2.3.0"
+ ];
+ })
+ sources."loader-runner-4.1.0"
+ (sources."loader-utils-1.4.0" // {
+ dependencies = [
+ sources."json5-1.0.1"
+ ];
+ })
+ sources."locate-path-2.0.0"
+ sources."lodash-4.17.20"
+ sources."lower-case-2.0.1"
+ sources."make-dir-2.1.0"
+ sources."merge-stream-2.0.0"
+ sources."mime-db-1.44.0"
+ sources."mime-types-2.1.27"
+ sources."mimic-fn-2.1.0"
+ (sources."mini-css-extract-plugin-1.3.1" // {
+ dependencies = [
+ sources."loader-utils-2.0.0"
+ sources."schema-utils-3.0.0"
+ ];
+ })
+ sources."minimatch-3.0.4"
+ sources."minimist-1.2.5"
+ sources."mkdirp-0.5.5"
+ sources."ms-2.1.2"
+ sources."nanoid-3.1.18"
+ sources."natural-compare-1.4.0"
+ sources."neo-async-2.6.2"
+ sources."no-case-3.0.3"
+ sources."node-releases-1.1.67"
+ sources."normalize-package-data-2.5.0"
+ sources."normalize-path-3.0.0"
+ sources."normalize-range-0.1.2"
+ sources."npm-run-path-4.0.1"
+ sources."nth-check-1.0.2"
+ sources."num2fraction-1.2.2"
+ sources."object-inspect-1.8.0"
+ sources."object-keys-1.1.1"
+ sources."object.assign-4.1.2"
+ (sources."object.getownpropertydescriptors-2.1.0" // {
+ dependencies = [
+ sources."es-abstract-1.17.7"
+ ];
+ })
+ (sources."object.values-1.1.1" // {
+ dependencies = [
+ sources."es-abstract-1.17.7"
+ ];
+ })
+ sources."once-1.4.0"
+ sources."onetime-5.1.2"
+ sources."optionator-0.9.1"
+ sources."p-limit-1.3.0"
+ sources."p-locate-2.0.0"
+ sources."p-try-1.0.0"
+ sources."param-case-3.0.3"
+ sources."parent-module-1.0.1"
+ sources."parse-json-5.1.0"
+ sources."pascal-case-3.1.1"
+ sources."path-exists-3.0.0"
+ sources."path-is-absolute-1.0.1"
+ sources."path-key-3.1.1"
+ sources."path-parse-1.0.6"
+ sources."path-type-4.0.0"
+ sources."picomatch-2.2.2"
+ sources."pify-4.0.1"
+ sources."pkg-dir-2.0.0"
+ sources."popper.js-1.16.1"
+ (sources."postcss-8.1.10" // {
+ dependencies = [
+ sources."source-map-0.6.1"
+ ];
+ })
+ (sources."postcss-loader-4.1.0" // {
+ dependencies = [
+ sources."loader-utils-2.0.0"
+ sources."schema-utils-3.0.0"
+ sources."semver-7.3.2"
+ ];
+ })
+ sources."postcss-modules-extract-imports-3.0.0"
+ sources."postcss-modules-local-by-default-4.0.0"
+ sources."postcss-modules-scope-3.0.0"
+ sources."postcss-modules-values-4.0.0"
+ sources."postcss-selector-parser-6.0.4"
+ sources."postcss-value-parser-4.1.0"
+ sources."prelude-ls-1.2.1"
+ sources."pretty-error-2.1.2"
+ sources."progress-2.0.3"
+ sources."pump-3.0.0"
+ sources."punycode-2.1.1"
+ sources."randombytes-2.1.0"
+ (sources."read-pkg-2.0.0" // {
+ dependencies = [
+ sources."path-type-2.0.0"
+ sources."pify-2.3.0"
+ ];
+ })
+ sources."read-pkg-up-2.0.0"
+ sources."readable-stream-3.6.0"
+ sources."readdirp-3.5.0"
+ sources."rechoir-0.7.0"
+ sources."reduce-flatten-2.0.0"
+ sources."regenerate-1.4.2"
+ sources."regenerate-unicode-properties-8.2.0"
+ sources."regenerator-runtime-0.13.7"
+ sources."regenerator-transform-0.14.5"
+ sources."regexpp-3.1.0"
+ sources."regexpu-core-4.7.1"
+ sources."regextras-0.7.1"
+ sources."regjsgen-0.5.2"
+ (sources."regjsparser-0.6.4" // {
+ dependencies = [
+ sources."jsesc-0.5.0"
+ ];
+ })
+ sources."relateurl-0.2.7"
+ (sources."renderkid-2.0.4" // {
+ dependencies = [
+ sources."ansi-regex-2.1.1"
+ sources."strip-ansi-3.0.1"
+ ];
+ })
+ sources."resolve-1.19.0"
+ (sources."resolve-cwd-3.0.0" // {
+ dependencies = [
+ sources."resolve-from-5.0.0"
+ ];
+ })
+ sources."resolve-from-4.0.0"
+ sources."rimraf-2.6.3"
+ sources."safe-buffer-5.1.2"
+ sources."sass-1.29.0"
+ (sources."sass-loader-10.1.0" // {
+ dependencies = [
+ sources."loader-utils-2.0.0"
+ sources."schema-utils-3.0.0"
+ sources."semver-7.3.2"
+ ];
+ })
+ sources."schema-utils-2.7.1"
+ sources."semver-5.7.1"
+ sources."serialize-javascript-5.0.1"
+ sources."shebang-command-2.0.0"
+ sources."shebang-regex-3.0.0"
+ sources."signal-exit-3.0.3"
+ sources."slice-ansi-2.1.0"
+ sources."source-list-map-2.0.1"
+ sources."source-map-0.5.7"
+ (sources."source-map-support-0.5.19" // {
+ dependencies = [
+ sources."source-map-0.6.1"
+ ];
+ })
+ sources."spdx-correct-3.1.1"
+ sources."spdx-exceptions-2.3.0"
+ sources."spdx-expression-parse-3.0.1"
+ sources."spdx-license-ids-3.0.6"
+ sources."sprintf-js-1.0.3"
+ (sources."string-width-3.1.0" // {
+ dependencies = [
+ sources."ansi-regex-4.1.0"
+ sources."strip-ansi-5.2.0"
+ ];
+ })
+ sources."string.prototype.trimend-1.0.3"
+ sources."string.prototype.trimstart-1.0.3"
+ (sources."string_decoder-1.3.0" // {
+ dependencies = [
+ sources."safe-buffer-5.2.1"
+ ];
+ })
+ sources."strip-ansi-6.0.0"
+ sources."strip-bom-3.0.0"
+ sources."strip-final-newline-2.0.0"
+ sources."strip-json-comments-3.1.1"
+ sources."supports-color-5.5.0"
+ sources."table-5.4.6"
+ sources."table-layout-1.0.1"
+ sources."tapable-1.1.3"
+ (sources."terser-4.8.0" // {
+ dependencies = [
+ sources."commander-2.20.3"
+ sources."source-map-0.6.1"
+ ];
+ })
+ (sources."terser-webpack-plugin-5.0.3" // {
+ dependencies = [
+ sources."commander-2.20.3"
+ sources."p-limit-3.0.2"
+ sources."p-try-2.2.0"
+ sources."schema-utils-3.0.0"
+ sources."source-map-0.6.1"
+ (sources."terser-5.5.0" // {
+ dependencies = [
+ sources."source-map-0.7.3"
+ ];
+ })
+ ];
+ })
+ sources."text-table-0.2.0"
+ sources."to-fast-properties-2.0.0"
+ sources."to-regex-range-5.0.1"
+ (sources."tsconfig-paths-3.9.0" // {
+ dependencies = [
+ sources."json5-1.0.1"
+ ];
+ })
+ sources."tslib-1.14.1"
+ sources."type-check-0.4.0"
+ sources."type-fest-0.8.1"
+ sources."typical-5.2.0"
+ sources."unicode-canonical-property-names-ecmascript-1.0.4"
+ sources."unicode-match-property-ecmascript-1.0.4"
+ sources."unicode-match-property-value-ecmascript-1.2.0"
+ sources."unicode-property-aliases-ecmascript-1.1.0"
+ sources."uniq-1.0.1"
+ sources."uri-js-4.4.0"
+ sources."util-deprecate-1.0.2"
+ sources."util.promisify-1.0.0"
+ sources."utila-0.4.0"
+ sources."v8-compile-cache-2.2.0"
+ sources."validate-npm-package-license-3.0.4"
+ sources."vfile-location-3.2.0"
+ sources."watchpack-2.0.1"
+ (sources."webpack-5.6.0" // {
+ dependencies = [
+ sources."acorn-8.0.4"
+ sources."eslint-scope-5.1.1"
+ sources."find-up-4.1.0"
+ sources."locate-path-5.0.0"
+ sources."p-limit-2.3.0"
+ sources."p-locate-4.1.0"
+ sources."p-try-2.2.0"
+ sources."path-exists-4.0.0"
+ sources."pkg-dir-4.2.0"
+ sources."schema-utils-3.0.0"
+ sources."source-map-0.6.1"
+ sources."tapable-2.1.1"
+ sources."webpack-sources-2.2.0"
+ ];
+ })
+ (sources."webpack-cli-4.2.0" // {
+ dependencies = [
+ sources."commander-6.2.0"
+ ];
+ })
+ sources."webpack-merge-4.2.2"
+ (sources."webpack-sources-1.4.3" // {
+ dependencies = [
+ sources."source-map-0.6.1"
+ ];
+ })
+ sources."which-2.0.2"
+ sources."word-wrap-1.2.3"
+ sources."wordwrapjs-4.0.0"
+ sources."wrappy-1.0.2"
+ sources."write-1.0.3"
+ sources."yaml-1.10.0"
+ ];
+ buildInputs = globalBuildInputs;
+ meta = {
+ homepage = "https://github.com/azlux/botamusique#readme";
+ license = "MIT";
+ };
+ production = false;
+ bypassCache = true;
+ reconstructLock = false;
+ };
+in
+{
+ args = args;
+ sources = sources;
+ tarball = nodeEnv.buildNodeSourceDist args;
+ package = nodeEnv.buildNodePackage args;
+ shell = nodeEnv.buildNodeShell args;
+ nodeDependencies = nodeEnv.buildNodeDependencies (lib.overrideExisting args {
+ src = stdenv.mkDerivation {
+ name = args.name + "-package-json";
+ src = nix-gitignore.gitignoreSourcePure [
+ "*"
+ "!package.json"
+ "!package-lock.json"
+ ] args.src;
+ dontBuild = true;
+ installPhase = "mkdir -p $out; cp -r ./* $out;";
+ };
+ });
+}
diff --git a/third_party/nixpkgs/pkgs/tools/audio/botamusique/src.json b/third_party/nixpkgs/pkgs/tools/audio/botamusique/src.json
new file mode 100644
index 0000000000..7f63d480a8
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/tools/audio/botamusique/src.json
@@ -0,0 +1,10 @@
+{
+ "url": "https://github.com/azlux/botamusique",
+ "rev": "df38c7dbd6d59c6790cf2364d1f344b7f6f72107",
+ "date": "2021-03-13T15:44:40+08:00",
+ "path": "/nix/store/30ds4gp7aldj9rqix1xf7j2ps5blrx8w-botamusique",
+ "sha256": "06xw1pif145zcm9z8l9kzl8ayl7vy5ywr0m3a5yswybcp2fzj087",
+ "fetchSubmodules": false,
+ "deepClone": false,
+ "leaveDotGit": false
+}
diff --git a/third_party/nixpkgs/pkgs/tools/audio/botamusique/unconditional-relative-state-paths.patch b/third_party/nixpkgs/pkgs/tools/audio/botamusique/unconditional-relative-state-paths.patch
new file mode 100644
index 0000000000..3642a034fc
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/tools/audio/botamusique/unconditional-relative-state-paths.patch
@@ -0,0 +1,22 @@
+diff --git a/util.py b/util.py
+index bfec1ed..0546772 100644
+--- a/util.py
++++ b/util.py
+@@ -22,16 +22,7 @@ log = logging.getLogger("bot")
+
+
+ def solve_filepath(path):
+- if not path:
+- return ''
+-
+- if path[0] == '/':
+- return path
+- elif os.path.exists(path):
+- return path
+- else:
+- mydir = os.path.dirname(os.path.realpath(__file__))
+- return mydir + '/' + path
++ return path
+
+
+ def get_recursive_file_list_sorted(path):
diff --git a/third_party/nixpkgs/pkgs/tools/backup/borg/default.nix b/third_party/nixpkgs/pkgs/tools/backup/borg/default.nix
index 4b8908448f..f07b19830d 100644
--- a/third_party/nixpkgs/pkgs/tools/backup/borg/default.nix
+++ b/third_party/nixpkgs/pkgs/tools/backup/borg/default.nix
@@ -1,20 +1,21 @@
-{ lib, stdenv, python3, acl, libb2, lz4, zstd, openssl, openssh }:
+{ lib, stdenv, python3, acl, libb2, lz4, zstd, openssl, openssh, nixosTests }:
python3.pkgs.buildPythonApplication rec {
pname = "borgbackup";
- version = "1.1.15";
+ version = "1.1.16";
src = python3.pkgs.fetchPypi {
inherit pname version;
- sha256 = "1g62sdzcw3zx4ccky125ciwnzx6z9kwyvskvp7ijmqxqk3nrxjs9";
+ sha256 = "0l1dqfwrd9l34rg30cmzmq5bs6yha6kg4vy313jq611jsqj94mmw";
};
nativeBuildInputs = with python3.pkgs; [
+ setuptools-scm
# For building documentation:
sphinx guzzle_sphinx_theme
];
buildInputs = [
- libb2 lz4 zstd openssl python3.pkgs.setuptools_scm
+ libb2 lz4 zstd openssl
] ++ lib.optionals stdenv.isLinux [ acl ];
propagatedBuildInputs = with python3.pkgs; [
cython llfuse
@@ -24,7 +25,7 @@ python3.pkgs.buildPythonApplication rec {
export BORG_OPENSSL_PREFIX="${openssl.dev}"
export BORG_LZ4_PREFIX="${lz4.dev}"
export BORG_LIBB2_PREFIX="${libb2}"
- export BORG_LIBZSTD_PREFIX="${zstd}"
+ export BORG_LIBZSTD_PREFIX="${zstd.dev}"
'';
makeWrapperArgs = [
@@ -61,6 +62,10 @@ python3.pkgs.buildPythonApplication rec {
# 64 failures, needs pytest-benchmark
doCheck = false;
+ passthru.tests = {
+ inherit (nixosTests) borgbackup;
+ };
+
meta = with lib; {
description = "Deduplicating archiver with compression and encryption";
homepage = "https://www.borgbackup.org";
diff --git a/third_party/nixpkgs/pkgs/tools/backup/bupstash/default.nix b/third_party/nixpkgs/pkgs/tools/backup/bupstash/default.nix
index 9eba33235b..54644ac3a0 100644
--- a/third_party/nixpkgs/pkgs/tools/backup/bupstash/default.nix
+++ b/third_party/nixpkgs/pkgs/tools/backup/bupstash/default.nix
@@ -1,22 +1,22 @@
{ lib, fetchFromGitHub, installShellFiles, rustPlatform, ronn, pkg-config, libsodium }:
rustPlatform.buildRustPackage rec {
pname = "bupstash";
- version = "0.7.0";
+ version = "0.8.0";
src = fetchFromGitHub {
owner = "andrewchambers";
repo = pname;
rev = "v${version}";
- sha256 = "sha256-4+Ra7rNvIL4SpdCkRbPBNrZeTb1dMbuwZx+D++1qsGs=";
+ sha256 = "sha256-zZHJlC0OICIc3G825t7GrZwdmkaaLQKzX2IwkKigkV4=";
};
- cargoSha256 = "sha256-cZSscmH3XPfH141hZhew79/UZHsqDZRN3EoNnYkW0wA=";
+ cargoSha256 = "sha256-KVeIF6x+gpb8vkqCtZptF5EX9G1Zv6q8L6tskN6HziM=";
nativeBuildInputs = [ ronn pkg-config installShellFiles ];
buildInputs = [ libsodium ];
postBuild = ''
- RUBYOPT="-KU -E utf-8:utf-8" ronn doc/man/*.md
+ RUBYOPT="-KU -E utf-8:utf-8" ronn -r doc/man/*.md
'';
postInstall = ''
diff --git a/third_party/nixpkgs/pkgs/tools/compression/dtrx/default.nix b/third_party/nixpkgs/pkgs/tools/compression/dtrx/default.nix
index 91d59a4de0..6c4f2f6e85 100644
--- a/third_party/nixpkgs/pkgs/tools/compression/dtrx/default.nix
+++ b/third_party/nixpkgs/pkgs/tools/compression/dtrx/default.nix
@@ -1,4 +1,4 @@
-{ lib, fetchurl, pythonPackages
+{ lib, fetchurl, python2Packages
, gnutar, unzip, lhasa, rpm, binutils, cpio, gzip, p7zip, cabextract, unrar, unshield
, bzip2, xz, lzip
# unzip is handled by p7zip
@@ -11,7 +11,7 @@ let
++ lib.optional (unrarSupport) unrar
++ [ bzip2 xz lzip ]);
-in pythonPackages.buildPythonApplication rec {
+in python2Packages.buildPythonApplication rec {
pname = "dtrx";
version = "7.1";
@@ -24,6 +24,17 @@ in pythonPackages.buildPythonApplication rec {
wrapProgram "$out/bin/dtrx" --prefix PATH : "${archivers}"
'';
+ checkPhase = ''
+ python2 tests/compare.py
+ '';
+
+ checkInputs = with python2Packages; [
+ pyyaml
+ ];
+
+ # custom test suite fails
+ doCheck = false;
+
meta = with lib; {
description = "Do The Right Extraction: A tool for taking the hassle out of extracting archives";
homepage = "https://brettcsmith.org/2007/dtrx/";
diff --git a/third_party/nixpkgs/pkgs/tools/filesystems/bindfs/default.nix b/third_party/nixpkgs/pkgs/tools/filesystems/bindfs/default.nix
index a6d2382a1a..12052100db 100644
--- a/third_party/nixpkgs/pkgs/tools/filesystems/bindfs/default.nix
+++ b/third_party/nixpkgs/pkgs/tools/filesystems/bindfs/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchurl, fuse, pkg-config, macfuse-stubs }:
+{ lib, stdenv, fetchurl, fuse, pkg-config }:
stdenv.mkDerivation rec {
version = "1.15.1";
@@ -10,9 +10,7 @@ stdenv.mkDerivation rec {
};
nativeBuildInputs = [ pkg-config ];
- buildInputs = if stdenv.isDarwin
- then [ macfuse-stubs ]
- else [ fuse ];
+ buildInputs = [ fuse ];
postFixup = ''
ln -s $out/bin/bindfs $out/bin/mount.fuse.bindfs
'';
diff --git a/third_party/nixpkgs/pkgs/tools/filesystems/cryfs/default.nix b/third_party/nixpkgs/pkgs/tools/filesystems/cryfs/default.nix
index 3777c4e7cb..eec257c44b 100644
--- a/third_party/nixpkgs/pkgs/tools/filesystems/cryfs/default.nix
+++ b/third_party/nixpkgs/pkgs/tools/filesystems/cryfs/default.nix
@@ -1,5 +1,5 @@
{ lib, stdenv, fetchFromGitHub, fetchpatch
-, cmake, pkg-config, python, gtest
+, cmake, pkg-config, python3, gtest
, boost, cryptopp, curl, fuse, openssl
}:
@@ -44,9 +44,11 @@ stdenv.mkDerivation rec {
--replace "(4.5L*1024*1024*1024)" "(0.5L*1024*1024*1024)"
'';
- nativeBuildInputs = [ cmake gtest pkg-config python ];
+ nativeBuildInputs = [ cmake pkg-config python3 ];
- buildInputs = [ boost cryptopp curl fuse openssl ];
+ strictDeps = true;
+
+ buildInputs = [ boost cryptopp curl fuse openssl gtest ];
cmakeFlags = [
"-DCRYFS_UPDATE_CHECKS:BOOL=FALSE"
diff --git a/third_party/nixpkgs/pkgs/tools/filesystems/fuse-overlayfs/default.nix b/third_party/nixpkgs/pkgs/tools/filesystems/fuse-overlayfs/default.nix
index 5522b63922..3631e52d87 100644
--- a/third_party/nixpkgs/pkgs/tools/filesystems/fuse-overlayfs/default.nix
+++ b/third_party/nixpkgs/pkgs/tools/filesystems/fuse-overlayfs/default.nix
@@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "fuse-overlayfs";
- version = "1.4.0";
+ version = "1.5.0";
src = fetchFromGitHub {
owner = "containers";
repo = pname;
rev = "v${version}";
- sha256 = "sha256-lus+1hkc4GxrTxtdfDJ0XqJp37dcjKp4/sI3CEh8cYA=";
+ sha256 = "sha256-/gdmrQhYsE4a/1sxtJ5IfVUWjh08wTVrOr4V7Fkn1i0=";
};
nativeBuildInputs = [ autoreconfHook pkg-config ];
diff --git a/third_party/nixpkgs/pkgs/tools/filesystems/s3fs/default.nix b/third_party/nixpkgs/pkgs/tools/filesystems/s3fs/default.nix
index 63a6153e8c..95b5b6ab34 100644
--- a/third_party/nixpkgs/pkgs/tools/filesystems/s3fs/default.nix
+++ b/third_party/nixpkgs/pkgs/tools/filesystems/s3fs/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkg-config, curl, openssl, libxml2, fuse, macfuse-stubs }:
+{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkg-config, curl, openssl, libxml2, fuse }:
stdenv.mkDerivation rec {
pname = "s3fs-fuse";
@@ -11,9 +11,7 @@ stdenv.mkDerivation rec {
sha256 = "sha256-Agb0tq7B98Ioe0G/XEZCYcFQKnMuYXX9x0yg4Gvu3/k=";
};
- buildInputs = [ curl openssl libxml2 ]
- ++ lib.optionals stdenv.isLinux [ fuse ]
- ++ lib.optionals stdenv.isDarwin [ macfuse-stubs ];
+ buildInputs = [ curl openssl libxml2 fuse ];
nativeBuildInputs = [ autoreconfHook pkg-config ];
configureFlags = [
diff --git a/third_party/nixpkgs/pkgs/tools/filesystems/unionfs-fuse/default.nix b/third_party/nixpkgs/pkgs/tools/filesystems/unionfs-fuse/default.nix
index acfd3b1e9a..6a34657d3d 100644
--- a/third_party/nixpkgs/pkgs/tools/filesystems/unionfs-fuse/default.nix
+++ b/third_party/nixpkgs/pkgs/tools/filesystems/unionfs-fuse/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchFromGitHub, cmake, fuse, macfuse-stubs }:
+{ lib, stdenv, fetchFromGitHub, cmake, fuse }:
stdenv.mkDerivation rec {
pname = "unionfs-fuse";
@@ -21,11 +21,11 @@ stdenv.mkDerivation rec {
postPatch = lib.optionalString stdenv.isDarwin ''
substituteInPlace CMakeLists.txt \
- --replace '/usr/local/include/osxfuse/fuse' '${macfuse-stubs}/include/fuse'
+ --replace '/usr/local/include/osxfuse/fuse' '${fuse}/include/fuse'
'';
nativeBuildInputs = [ cmake ];
- buildInputs = [ (if stdenv.isDarwin then macfuse-stubs else fuse) ];
+ buildInputs = [ fuse ];
# Put the unionfs mount helper in place as mount.unionfs-fuse. This makes it
# possible to do:
diff --git a/third_party/nixpkgs/pkgs/tools/games/ajour/default.nix b/third_party/nixpkgs/pkgs/tools/games/ajour/default.nix
index b2cbe58ce9..3bc87680c5 100644
--- a/third_party/nixpkgs/pkgs/tools/games/ajour/default.nix
+++ b/third_party/nixpkgs/pkgs/tools/games/ajour/default.nix
@@ -34,16 +34,16 @@ let
in rustPlatform.buildRustPackage rec {
pname = "Ajour";
- version = "0.7.2";
+ version = "1.0.0";
src = fetchFromGitHub {
owner = "casperstorm";
repo = "ajour";
rev = version;
- sha256 = "052qckag9vzcx6472pyk1324jq4qib0isx33z3m1m4923ydanbcz";
+ sha256 = "sha256-u48U4WGlrSl8T3YF7cjApyjNaUI4YyyHEy0TgJw7r/Y=";
};
- cargoSha256 = "1nsvx445jrycggidnynn9glpjjm5sh8nwsvqwyyd54k9xb4rqgj1";
+ cargoSha256 = "sha256-Hdid70AB4AKtSsQBsr6K/de4nvI3rvghEWIwM7mpRIA=";
nativeBuildInputs = [
autoPatchelfHook
diff --git a/third_party/nixpkgs/pkgs/tools/graphics/blockhash/default.nix b/third_party/nixpkgs/pkgs/tools/graphics/blockhash/default.nix
index a0ecdde382..b3426722f7 100644
--- a/third_party/nixpkgs/pkgs/tools/graphics/blockhash/default.nix
+++ b/third_party/nixpkgs/pkgs/tools/graphics/blockhash/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchFromGitHub, python, pkg-config, imagemagick, wafHook }:
+{ lib, stdenv, fetchFromGitHub, python2, pkg-config, imagemagick, wafHook }:
stdenv.mkDerivation rec {
pname = "blockhash";
@@ -11,9 +11,11 @@ stdenv.mkDerivation rec {
sha256 = "0m7ikppl42iicgmwsb7baajmag7v0p1ab06xckifvrr0zm21bq9p";
};
- nativeBuildInputs = [ python pkg-config wafHook ];
+ nativeBuildInputs = [ python2 pkg-config wafHook ];
buildInputs = [ imagemagick ];
+ strictDeps = true;
+
meta = with lib; {
homepage = "http://blockhash.io/";
description = ''
diff --git a/third_party/nixpkgs/pkgs/tools/graphics/escrotum/default.nix b/third_party/nixpkgs/pkgs/tools/graphics/escrotum/default.nix
index 4a887688c4..decb92615f 100644
--- a/third_party/nixpkgs/pkgs/tools/graphics/escrotum/default.nix
+++ b/third_party/nixpkgs/pkgs/tools/graphics/escrotum/default.nix
@@ -1,9 +1,7 @@
-{ lib, fetchFromGitHub, buildPythonApplication
-, pygtk
-, numpy ? null
+{ lib, python2Packages, fetchFromGitHub
}:
-buildPythonApplication {
+with python2Packages; buildPythonApplication {
name = "escrotum-2019-06-10";
src = fetchFromGitHub {
diff --git a/third_party/nixpkgs/pkgs/tools/inputmethods/fcitx5/fcitx5-mozc.nix b/third_party/nixpkgs/pkgs/tools/inputmethods/fcitx5/fcitx5-mozc.nix
index 08f43b87cf..d077b0a25c 100644
--- a/third_party/nixpkgs/pkgs/tools/inputmethods/fcitx5/fcitx5-mozc.nix
+++ b/third_party/nixpkgs/pkgs/tools/inputmethods/fcitx5/fcitx5-mozc.nix
@@ -9,17 +9,6 @@ let
rev = "e5b3425575734c323e1d947009dd74709437b684";
sha256 = "0pyrpz9c8nxccwpgyr36w314mi8h132cis8ijvlqmmhqxwsi30hm";
};
- # abseil-cpp in nixpkgs is too old
- abseil-cpp_2020923 = abseil-cpp.overrideAttrs (old: rec {
- version = "20200923.2";
- src = fetchFromGitHub {
- owner = "abseil";
- repo = "abseil-cpp";
- rev = version;
- sha256 = "G+wkaC4IPtyc/xCUyVFJOcHppPFU7KkhIHjv6uhVKGU=";
- };
- cmakeFlags = [ "-DCMAKE_CXX_STANDARD=17" "-DBUILD_SHARED_LIBS=ON" ];
- });
zipcode_rel = "202011";
jigyosyo = fetchurl {
url = "https://osdn.net/projects/ponsfoot-aur/storage/mozc/jigyosyo-${zipcode_rel}.zip";
@@ -44,7 +33,7 @@ in clangStdenv.mkDerivation rec {
nativeBuildInputs = [ gyp ninja mesa python pkg-config qt5.wrapQtAppsHook six which unzip ];
- buildInputs = [ protobuf zinnia qt5.qtbase fcitx5 abseil-cpp_2020923 jsoncpp gtest gtk2 ];
+ buildInputs = [ protobuf zinnia qt5.qtbase fcitx5 abseil-cpp jsoncpp gtest gtk2 ];
patches = [
# Support linking system abseil-cpp
diff --git a/third_party/nixpkgs/pkgs/tools/misc/chezmoi/default.nix b/third_party/nixpkgs/pkgs/tools/misc/chezmoi/default.nix
index 372ea2decf..626e7de1a4 100644
--- a/third_party/nixpkgs/pkgs/tools/misc/chezmoi/default.nix
+++ b/third_party/nixpkgs/pkgs/tools/misc/chezmoi/default.nix
@@ -2,13 +2,13 @@
buildGoModule rec {
pname = "chezmoi";
- version = "2.0.3";
+ version = "2.0.4";
src = fetchFromGitHub {
owner = "twpayne";
repo = "chezmoi";
rev = "v${version}";
- sha256 = "sha256-kOxA9FtVfS1lFSsV5E1+eGQF7D9C7TzhzLGw2r7LlOY=";
+ sha256 = "sha256-jvit6Z0SwxjDmpEqojmPUJ3TVmVmW3RC+3tfvG1ev4Q=";
};
vendorSha256 = "sha256-V05cCKQeqw6BEjLIYDeHeDePkA7rs7kjqPCys5eLefA=";
diff --git a/third_party/nixpkgs/pkgs/tools/misc/disper/default.nix b/third_party/nixpkgs/pkgs/tools/misc/disper/default.nix
index ecbf298132..3e78bc9773 100644
--- a/third_party/nixpkgs/pkgs/tools/misc/disper/default.nix
+++ b/third_party/nixpkgs/pkgs/tools/misc/disper/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchFromGitHub, python, xorg, makeWrapper }:
+{ lib, stdenv, fetchFromGitHub, python2, xorg, makeWrapper }:
stdenv.mkDerivation rec {
pname = "disper";
@@ -13,7 +13,9 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ makeWrapper ];
- buildInputs = [ python ];
+ strictDeps = true;
+
+ buildInputs = [ python2 ];
preConfigure = ''
export makeFlags="PREFIX=$out"
diff --git a/third_party/nixpkgs/pkgs/tools/misc/dpt-rp1-py/default.nix b/third_party/nixpkgs/pkgs/tools/misc/dpt-rp1-py/default.nix
index cf3a9a4240..d4ad2dffd8 100644
--- a/third_party/nixpkgs/pkgs/tools/misc/dpt-rp1-py/default.nix
+++ b/third_party/nixpkgs/pkgs/tools/misc/dpt-rp1-py/default.nix
@@ -19,11 +19,14 @@ python3Packages.buildPythonApplication rec {
pbkdf2
pyyaml
requests
+ setuptools
tqdm
urllib3
zeroconf
];
+ pythonImportsCheck = [ "dptrp1" ];
+
meta = with lib; {
homepage = "https://github.com/janten/dpt-rp1-py";
description = "Python script to manage Sony DPT-RP1 without Digital Paper App";
diff --git a/third_party/nixpkgs/pkgs/tools/misc/github-backup/default.nix b/third_party/nixpkgs/pkgs/tools/misc/github-backup/default.nix
new file mode 100644
index 0000000000..1fcaf3a471
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/tools/misc/github-backup/default.nix
@@ -0,0 +1,30 @@
+{ lib
+, python3
+, git
+, git-lfs
+}:
+
+python3.pkgs.buildPythonApplication rec {
+ pname = "github-backup";
+ version = "0.39.0";
+
+ src = python3.pkgs.fetchPypi {
+ inherit pname version;
+ sha256 = "71829df4bdbe5bd55c324a97008405a6b4c6113edb1a2a6a8b73a7059fe64a47";
+ };
+
+ makeWrapperArgs = [
+ "--prefix" "PATH" ":" (lib.makeBinPath [ git git-lfs ])
+ ];
+
+ # has no unit tests
+ doCheck = false;
+
+ meta = with lib; {
+ description = "Backup a github user or organization";
+ homepage = "https://github.com/josegonzalez/python-github-backup";
+ changelog = "https://github.com/josegonzalez/python-github-backup/blob/${version}/CHANGES.rst";
+ license = licenses.mit;
+ maintainers = with maintainers; [ dotlambda ];
+ };
+}
diff --git a/third_party/nixpkgs/pkgs/tools/misc/goreleaser/default.nix b/third_party/nixpkgs/pkgs/tools/misc/goreleaser/default.nix
index d4c0c6e214..7ec9070290 100644
--- a/third_party/nixpkgs/pkgs/tools/misc/goreleaser/default.nix
+++ b/third_party/nixpkgs/pkgs/tools/misc/goreleaser/default.nix
@@ -2,16 +2,16 @@
buildGoModule rec {
pname = "goreleaser";
- version = "0.160.0";
+ version = "0.161.1";
src = fetchFromGitHub {
owner = "goreleaser";
repo = pname;
rev = "v${version}";
- sha256 = "sha256-XrZlDYHGexBGxEhpFVjovUYE9Cpu/QaYp11JmBnqT8o=";
+ sha256 = "sha256-hCb9w8jyHJ7wGszseyweJDAVjnuxErXdwIRUGfXLRfI=";
};
- vendorSha256 = "sha256-mzT9PLthx08Hil0DBxtw6/ouZrZZSfyElWro1iyJsTY=";
+ vendorSha256 = "sha256-rQF9B5syexMzHji7zXSj7YVIJnOwMR0hzTrRzKCMGYw=";
buildFlagsArray = [
"-ldflags="
diff --git a/third_party/nixpkgs/pkgs/tools/misc/graylog/default.nix b/third_party/nixpkgs/pkgs/tools/misc/graylog/default.nix
index 8ebb2924b0..b41cc9cb06 100644
--- a/third_party/nixpkgs/pkgs/tools/misc/graylog/default.nix
+++ b/third_party/nixpkgs/pkgs/tools/misc/graylog/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchurl, makeWrapper, jre_headless, nixosTests }:
+{ lib, stdenv, fetchurl, makeWrapper, openjdk11_headless, nixosTests }:
stdenv.mkDerivation rec {
pname = "graylog";
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
dontStrip = true;
nativeBuildInputs = [ makeWrapper ];
- makeWrapperArgs = [ "--prefix" "PATH" ":" "${jre_headless}/bin" ];
+ makeWrapperArgs = [ "--set-default" "JAVA_HOME" "${openjdk11_headless}" ];
passthru.tests = { inherit (nixosTests) graylog; };
diff --git a/third_party/nixpkgs/pkgs/tools/misc/jdupes/default.nix b/third_party/nixpkgs/pkgs/tools/misc/jdupes/default.nix
index c42abee5e2..d06fc7aef6 100644
--- a/third_party/nixpkgs/pkgs/tools/misc/jdupes/default.nix
+++ b/third_party/nixpkgs/pkgs/tools/misc/jdupes/default.nix
@@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "jdupes";
- version = "1.19.1";
+ version = "1.19.2";
src = fetchFromGitHub {
owner = "jbruchon";
repo = "jdupes";
rev = "v${version}";
- sha256 = "sha256-1gx3rStqIxLt/iRgpdp5z7tX1/wA0miZ1y5WTeGQ1Vs=";
+ sha256 = "sha256-3lWrSybYp3RrUnydosgsNkGQjrk7JvxuxjMslN4cGfk=";
# Unicode file names lead to different checksums on HFS+ vs. other
# filesystems because of unicode normalisation. The testdir
# directories have such files and will be removed.
diff --git a/third_party/nixpkgs/pkgs/tools/misc/lazydocker/default.nix b/third_party/nixpkgs/pkgs/tools/misc/lazydocker/default.nix
index ed186772ab..2a63074c8d 100644
--- a/third_party/nixpkgs/pkgs/tools/misc/lazydocker/default.nix
+++ b/third_party/nixpkgs/pkgs/tools/misc/lazydocker/default.nix
@@ -2,13 +2,13 @@
buildGoPackage rec {
pname = "lazydocker";
- version = "0.10";
+ version = "0.12";
src = fetchFromGitHub {
owner = "jesseduffield";
repo = "lazydocker";
rev = "v${version}";
- sha256 = "04j5bcsxm2yf74zkphnjrg8j3w0v6bsny8sg2k4gbisgshl1i3p8";
+ sha256 = "sha256-bpc83DFAyrAQ3VI9saYe+10ZQqOHgscerRKRyjfYD4g=";
};
goPackagePath = "github.com/jesseduffield/lazydocker";
diff --git a/third_party/nixpkgs/pkgs/tools/misc/miniserve/default.nix b/third_party/nixpkgs/pkgs/tools/misc/miniserve/default.nix
index 7b40e21313..1223432ad7 100644
--- a/third_party/nixpkgs/pkgs/tools/misc/miniserve/default.nix
+++ b/third_party/nixpkgs/pkgs/tools/misc/miniserve/default.nix
@@ -2,6 +2,7 @@
, stdenv
, rustPlatform
, fetchFromGitHub
+, installShellFiles
, pkg-config
, zlib
, libiconv
@@ -10,22 +11,29 @@
rustPlatform.buildRustPackage rec {
pname = "miniserve";
- version = "0.12.0";
+ version = "0.13.0";
src = fetchFromGitHub {
owner = "svenstaro";
repo = "miniserve";
rev = "v${version}";
- sha256 = "sha256-hTNwEspM1qlQkC6lD7N947tvS7O7RCIUYACvj4KYsAY=";
+ sha256 = "sha256-1nXhAYvvvUQb0RcWidsRMQOhU8eXt7ngzodsMkYvqvg=";
};
- cargoSha256 = "sha256-7G+h+g00T/aJ1cQ1SChxy8dq3CWWdHlx5DAH77xM9Oc=";
+ cargoSha256 = "sha256-P5ukE7eXBRJMrc7+T9/TMq2uGs0AuZliHTtoqiZXNZw=";
- nativeBuildInputs = [ pkg-config zlib ];
+ nativeBuildInputs = [ installShellFiles pkg-config zlib ];
buildInputs = lib.optionals stdenv.isDarwin [ libiconv Security ];
checkFlags = [ "--skip=cant_navigate_up_the_root" ];
+ postInstall = ''
+ installShellCompletion --cmd miniserve \
+ --bash <($out/bin/miniserve --print-completions bash) \
+ --fish <($out/bin/miniserve --print-completions fish) \
+ --zsh <($out/bin/miniserve --print-completions zsh)
+ '';
+
meta = with 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/paperlike-go/default.nix b/third_party/nixpkgs/pkgs/tools/misc/paperlike-go/default.nix
new file mode 100644
index 0000000000..0278fb1f79
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/tools/misc/paperlike-go/default.nix
@@ -0,0 +1,28 @@
+{ lib
+, buildGoModule
+, fetchFromGitHub
+}:
+
+buildGoModule {
+ pname = "paperlike-go";
+ version = "unstable-2021-03-26";
+
+ src = fetchFromGitHub {
+ owner = "leoluk";
+ repo = "paperlike-go";
+ rev = "bd658d88ea9a3b21e1b301b96253abab7cf56d79";
+ sha256 = "1h0n2n5w5pn3r08qf6hbmiib5m71br27y66ki9ajnaa890377qaj";
+ };
+
+ subPackages = [ "cmd/paperlike-cli" ];
+
+ vendorSha256 = "00mn0zfivxp2h77s7gmyyjp8p5a1vysn73wwaalgajymvljxxx1r";
+
+ meta = {
+ description = "paperlike-go is a Linux Go library and CLI utility to control a Dasung Paperlike display via I2C DDC.";
+ homepage = "https://github.com/leoluk/paperlike-go";
+ license = lib.licenses.asl20;
+ maintainers = [ lib.maintainers.adisbladis ];
+ platforms = lib.platforms.linux;
+ };
+}
diff --git a/third_party/nixpkgs/pkgs/tools/misc/parallel/default.nix b/third_party/nixpkgs/pkgs/tools/misc/parallel/default.nix
index 1209ab9d25..0667327d06 100644
--- a/third_party/nixpkgs/pkgs/tools/misc/parallel/default.nix
+++ b/third_party/nixpkgs/pkgs/tools/misc/parallel/default.nix
@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "parallel";
- version = "20210222";
+ version = "20210322";
src = fetchurl {
url = "mirror://gnu/parallel/${pname}-${version}.tar.bz2";
- sha256 = "sha256-TmmwCuti906i/cZXnTHStKTMCmT+dc9hkmMSQC8b5ys=";
+ sha256 = "sha256-mPcbRFojoYu06bzk83S5PmptnezfiSvo0iRZ8iS4VpQ=";
};
outputs = [ "out" "man" "doc" ];
diff --git a/third_party/nixpkgs/pkgs/tools/misc/plowshare/default.nix b/third_party/nixpkgs/pkgs/tools/misc/plowshare/default.nix
index 0b5005b9c8..2cfbf5ae91 100644
--- a/third_party/nixpkgs/pkgs/tools/misc/plowshare/default.nix
+++ b/third_party/nixpkgs/pkgs/tools/misc/plowshare/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchFromGitHub, makeWrapper, curl, recode, spidermonkey_38 }:
+{ lib, stdenv, fetchFromGitHub, makeWrapper, curl, recode, spidermonkey_78 }:
stdenv.mkDerivation rec {
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
make PREFIX="$out" install
for fn in plow{del,down,list,mod,probe,up}; do
- wrapProgram "$out/bin/$fn" --prefix PATH : "${lib.makeBinPath [ curl recode spidermonkey_38 ]}"
+ wrapProgram "$out/bin/$fn" --prefix PATH : "${lib.makeBinPath [ curl recode spidermonkey_78 ]}"
done
'';
diff --git a/third_party/nixpkgs/pkgs/tools/misc/remind/default.nix b/third_party/nixpkgs/pkgs/tools/misc/remind/default.nix
index ef684aebe3..bbe96bf6c2 100644
--- a/third_party/nixpkgs/pkgs/tools/misc/remind/default.nix
+++ b/third_party/nixpkgs/pkgs/tools/misc/remind/default.nix
@@ -16,11 +16,11 @@ let
'';
in stdenv.mkDerivation rec {
pname = "remind";
- version = "03.03.01";
+ version = "03.03.05";
src = fetchurl {
url = "https://dianne.skoll.ca/projects/remind/download/remind-${version}.tar.gz";
- sha256 = "0y4l960529sl3sn4r4g36qpy3jk5h1x4algjy7an7sfiqb8n98fi";
+ sha256 = "sha256-Ye0X2Gvek/pyaNVxGKL773OWJvC4I6F5nEsRQgzWbsE=";
};
nativeBuildInputs = optional tkremind makeWrapper;
diff --git a/third_party/nixpkgs/pkgs/tools/misc/starship/default.nix b/third_party/nixpkgs/pkgs/tools/misc/starship/default.nix
index a3543c433a..c589590abc 100644
--- a/third_party/nixpkgs/pkgs/tools/misc/starship/default.nix
+++ b/third_party/nixpkgs/pkgs/tools/misc/starship/default.nix
@@ -11,13 +11,13 @@
rustPlatform.buildRustPackage rec {
pname = "starship";
- version = "0.50.0";
+ version = "0.51.0";
src = fetchFromGitHub {
owner = "starship";
repo = pname;
rev = "v${version}";
- sha256 = "1bnnqrxsmp3z2qksd8h4lfbq4kxxy1cg4yynadz66lxyzabv2v21";
+ sha256 = "1bmnwvjhw2ba7yqn9if83d57b8qbrbqgy2br8q2drz4ylk0gjirg";
};
nativeBuildInputs = [ installShellFiles ] ++ lib.optionals stdenv.isLinux [ pkg-config ];
@@ -32,7 +32,7 @@ rustPlatform.buildRustPackage rec {
done
'';
- cargoSha256 = "0plk47i2xrn3x5yr3gw3pq74maqf4krb8d6i4sf8gil4mnpcgxir";
+ cargoSha256 = "1d4ca8yzx437x53i7z2kddv9db89zy6ywbgl6y1cwwd6wscbrxcq";
preCheck = ''
HOME=$TMPDIR
diff --git a/third_party/nixpkgs/pkgs/tools/misc/svtplay-dl/default.nix b/third_party/nixpkgs/pkgs/tools/misc/svtplay-dl/default.nix
index 8d8e587879..8b5d49c461 100644
--- a/third_party/nixpkgs/pkgs/tools/misc/svtplay-dl/default.nix
+++ b/third_party/nixpkgs/pkgs/tools/misc/svtplay-dl/default.nix
@@ -8,13 +8,13 @@ let
in stdenv.mkDerivation rec {
pname = "svtplay-dl";
- version = "3.0";
+ version = "3.3";
src = fetchFromGitHub {
owner = "spaam";
repo = "svtplay-dl";
rev = version;
- sha256 = "1k7829sgvs2ihnf8d3zrqk99ifm9867wcn6f8zg628h8aqsif4fc";
+ sha256 = "00pz5vv39qjsw67fdlj6942371lyvv368lc82z17nnh723ck54yy";
};
pythonPaths = [ pycrypto pyyaml requests ];
diff --git a/third_party/nixpkgs/pkgs/tools/misc/tfk8s/default.nix b/third_party/nixpkgs/pkgs/tools/misc/tfk8s/default.nix
index b1e75f36b5..23ab5c16fb 100644
--- a/third_party/nixpkgs/pkgs/tools/misc/tfk8s/default.nix
+++ b/third_party/nixpkgs/pkgs/tools/misc/tfk8s/default.nix
@@ -2,16 +2,16 @@
buildGoModule rec {
pname = "tfk8s";
- version = "0.1.0";
+ version = "0.1.2";
src = fetchFromGitHub {
owner = "jrhouston";
repo = "tfk8s";
- rev = version;
- sha256 = "sha256-JzTWbkICOIfsHgMvpXz4bIWaXKKDAD8INSorMvnXiBw=";
+ rev = "v${version}";
+ sha256 = "sha256-gszvWetreafIP9I8hi9zz24TOTSsGzDsm/vXJS6n4Q4=";
};
- vendorSha256 = "sha256-r0c3y+nRc/hCTAT31DasQjxZN86BT8jnJmsLM7Ugrq4=";
+ vendorSha256 = "sha256-wS5diDQFkt8IAp13d8Yeh8ihLvKWdR0Mbw0fMZpqqKE=";
runVend = true;
buildFlagsArray = [
diff --git a/third_party/nixpkgs/pkgs/tools/misc/tz/default.nix b/third_party/nixpkgs/pkgs/tools/misc/tz/default.nix
new file mode 100644
index 0000000000..c0c6fe9ec3
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/tools/misc/tz/default.nix
@@ -0,0 +1,22 @@
+{ lib, buildGoModule, fetchFromGitHub }:
+
+buildGoModule rec {
+ pname = "tz";
+ version = "0.4";
+
+ src = fetchFromGitHub {
+ owner = "oz";
+ repo = "tz";
+ rev = "v${version}";
+ sha256 = "sha256-36nTau7xjABdeUOioHar28cuawFWW3DBaDH0YAvdufI=";
+ };
+
+ vendorSha256 = "sha256-Soa87I7oMa34LjYKxNAz9Limi0kQ6JUtb/zI4G7yZnw=";
+
+ meta = with lib; {
+ description = "A time zone helper";
+ homepage = "https://github.com/oz/tz";
+ license = licenses.gpl3Plus;
+ maintainers = with maintainers; [ siraben ];
+ };
+}
diff --git a/third_party/nixpkgs/pkgs/tools/misc/urjtag/default.nix b/third_party/nixpkgs/pkgs/tools/misc/urjtag/default.nix
index d75d462fc8..4630ec31eb 100644
--- a/third_party/nixpkgs/pkgs/tools/misc/urjtag/default.nix
+++ b/third_party/nixpkgs/pkgs/tools/misc/urjtag/default.nix
@@ -1,38 +1,57 @@
-{ lib, stdenv, autoconf, automake, pkg-config, gettext, libtool, bison
-, flex, which, subversion, fetchurl, makeWrapper, libftdi1, libusb-compat-0_1, readline
-, python3
-, svfSupport ? true
+{ lib
+, stdenv
+, fetchurl
+, autoconf
+, automake
+, autoreconfHook
+, gettext
+, libftdi1
+, libtool
+, libusb-compat-0_1
+, makeWrapper
+, pkg-config
+, readline
+, which
, bsdlSupport ? true
-, staplSupport ? true
, jedecSupport ? true
+, staplSupport ? true
+, svfSupport ? true
}:
stdenv.mkDerivation rec {
- version = "2019.12";
pname = "urjtag";
+ version = "2021.03";
src = fetchurl {
- url = "https://downloads.sourceforge.net/project/urjtag/urjtag/${version}/urjtag-${version}.tar.xz";
- sha256 = "1k2vmvvarik0q3llbfbk8ad35mcns7w1ln9gla1mn7z9c6x6x90r";
+ url = "mirror://sourceforge/project/${pname}/${pname}/${version}/${pname}-${version}.tar.xz";
+ hash = "sha256-sKLqokVROvCW3E13AQmDIzXGlMbBKqXpL++uhoVBbxw=";
};
- nativeBuildInputs = [ pkg-config ];
- buildInputs = [ gettext autoconf automake libtool bison flex which
- subversion makeWrapper readline libftdi1 libusb-compat-0_1 python3 ];
-
- configureFlags = [
- (lib.enableFeature svfSupport "svf")
- (lib.enableFeature bsdlSupport "bsdl")
- (lib.enableFeature staplSupport "stapl")
- (lib.enableFeature jedecSupport "jedec-exp")
+ nativeBuildInputs = [
+ autoreconfHook
+ pkg-config
+ which
+ gettext
+ ];
+ buildInputs = [
+ libftdi1
+ libtool
+ libusb-compat-0_1
+ readline
];
- meta = {
- description = "Enhanced, modern tool for communicating over JTAG with flash chips, CPUs,and many more";
+ configureFlags = [
+ (lib.enableFeature bsdlSupport "bsdl")
+ (lib.enableFeature jedecSupport "jedec-exp")
+ (lib.enableFeature staplSupport "stapl")
+ (lib.enableFeature svfSupport "svf")
+ ];
+
+ meta = with lib; {
homepage = "http://urjtag.org/";
- license = with lib.licenses; [ gpl2Plus lgpl21Plus ];
- platforms = lib.platforms.gnu ++ lib.platforms.linux; # arbitrary choice
- maintainers = with lib.maintainers; [ lowfatcomputing ];
+ description = "Universal JTAG library, server and tools";
+ license = with licenses; [ gpl2Plus lgpl21Plus ];
+ maintainers = with maintainers; [ AndersonTorres ];
+ platforms = platforms.linux;
};
}
-
diff --git a/third_party/nixpkgs/pkgs/tools/misc/uwuify/default.nix b/third_party/nixpkgs/pkgs/tools/misc/uwuify/default.nix
new file mode 100644
index 0000000000..b90bd8bb46
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/tools/misc/uwuify/default.nix
@@ -0,0 +1,23 @@
+{ lib, stdenv, fetchFromGitHub, rustPlatform, libiconv }:
+
+rustPlatform.buildRustPackage rec {
+ pname = "uwuify";
+ version = "0.2.1";
+
+ src = fetchFromGitHub {
+ owner = "Daniel-Liu-c0deb0t";
+ repo = "uwu";
+ rev = "v${version}";
+ sha256 = "sha256-tPmLqgrWi7wDoMjMrxodKp4S0ICwV9Kp7Pa151rHho0=";
+ };
+
+ cargoSha256 = "sha256-HUP6OEvoGJ/BtAl+yuGzqEp1bsxfGAh0UJtXz9/ZiK8=";
+ buildInputs = lib.optionals stdenv.isDarwin [ libiconv ];
+
+ meta = with lib; {
+ description = "Fast text uwuifier";
+ homepage = "https://github.com/Daniel-Liu-c0deb0t/uwu";
+ license = licenses.mit;
+ maintainers = with maintainers; [ siraben ];
+ };
+}
diff --git a/third_party/nixpkgs/pkgs/tools/misc/youtube-dl/default.nix b/third_party/nixpkgs/pkgs/tools/misc/youtube-dl/default.nix
index fc3b52878b..8586897789 100644
--- a/third_party/nixpkgs/pkgs/tools/misc/youtube-dl/default.nix
+++ b/third_party/nixpkgs/pkgs/tools/misc/youtube-dl/default.nix
@@ -18,11 +18,11 @@ buildPythonPackage rec {
# The websites youtube-dl deals with are a very moving target. That means that
# downloads break constantly. Because of that, updates should always be backported
# to the latest stable release.
- version = "2021.03.14";
+ version = "2021.03.25";
src = fetchurl {
url = "https://yt-dl.org/downloads/${version}/${pname}-${version}.tar.gz";
- sha256 = "1bh74f9q6dv17ah5x8zcxw03dq6jbh959xd39kw374cf9ifrgnd3";
+ sha256 = "0ps8ydx4hbj6sl0m760zdm9pvhccjmwvx680i4akz3lk4z9wy0x3";
};
nativeBuildInputs = [ installShellFiles makeWrapper ];
diff --git a/third_party/nixpkgs/pkgs/tools/misc/ytfzf/default.nix b/third_party/nixpkgs/pkgs/tools/misc/ytfzf/default.nix
index 56e139941b..df369147d3 100644
--- a/third_party/nixpkgs/pkgs/tools/misc/ytfzf/default.nix
+++ b/third_party/nixpkgs/pkgs/tools/misc/ytfzf/default.nix
@@ -16,13 +16,13 @@
stdenv.mkDerivation rec {
pname = "ytfzf";
- version = "1.1.0";
+ version = "1.1.1";
src = fetchFromGitHub {
owner = "pystardust";
repo = "ytfzf";
rev = "v${version}";
- sha256 = "sha256-ATQRXYaIp1MKCO/EAPsopzFEZeNJzdk73/OcgjsMdkg=";
+ sha256 = "sha256-286rN3g6leSnbZZ0VjWl43nhBAMPJDUMv7DhgVTsjKw=";
};
patches = [
diff --git a/third_party/nixpkgs/pkgs/tools/misc/ytfzf/no-update.patch b/third_party/nixpkgs/pkgs/tools/misc/ytfzf/no-update.patch
index 07ca62cd94..13e57abb49 100644
--- a/third_party/nixpkgs/pkgs/tools/misc/ytfzf/no-update.patch
+++ b/third_party/nixpkgs/pkgs/tools/misc/ytfzf/no-update.patch
@@ -1,13 +1,13 @@
diff --git a/ytfzf b/ytfzf
-index 5238682..c5c3a1a 100755
+index f7871c7..179c836 100755
--- a/ytfzf
+++ b/ytfzf
-@@ -757,23 +757,8 @@ clear_history () {
+@@ -829,23 +829,8 @@ send_notify () {
}
update_ytfzf () {
-- branch="$1"
-- updatefile="/tmp/ytfzf-update"
+- local branch="$1"
+- local updatefile="/tmp/ytfzf-update"
- curl -L "https://raw.githubusercontent.com/pystardust/ytfzf/$branch/ytfzf" -o "$updatefile"
-
- if sed -n '1p' < "$updatefile" | grep -q '#!/bin/sh' ; then
@@ -27,4 +27,4 @@ index 5238682..c5c3a1a 100755
+ exit 1
}
-
+ scrape_subscriptions () {
diff --git a/third_party/nixpkgs/pkgs/tools/networking/bud/default.nix b/third_party/nixpkgs/pkgs/tools/networking/bud/default.nix
index 724d25d49f..7a4bd5adcb 100644
--- a/third_party/nixpkgs/pkgs/tools/networking/bud/default.nix
+++ b/third_party/nixpkgs/pkgs/tools/networking/bud/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, fetchgit, python, gyp, util-linux }:
+{ stdenv, lib, fetchgit, python2, util-linux }:
stdenv.mkDerivation {
pname = "bud";
@@ -11,10 +11,12 @@ stdenv.mkDerivation {
sha256 = "08yr6l4lc2m6rng06253fcaznf6sq0v053wfr8bbym42c32z0xdh";
};
- buildInputs = [
- python gyp
+ nativeBuildInputs = [
+ python2 python2.pkgs.gyp
] ++ lib.optional stdenv.isLinux util-linux;
+ strictDeps = true;
+
buildPhase = ''
python ./gyp_bud -f make
make -C out
diff --git a/third_party/nixpkgs/pkgs/tools/networking/carddav-util/default.nix b/third_party/nixpkgs/pkgs/tools/networking/carddav-util/default.nix
index 112a95eccc..300e03761a 100644
--- a/third_party/nixpkgs/pkgs/tools/networking/carddav-util/default.nix
+++ b/third_party/nixpkgs/pkgs/tools/networking/carddav-util/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchgit, python, pythonPackages, makeWrapper }:
+{ lib, stdenv, fetchgit, python3Packages, makeWrapper }:
stdenv.mkDerivation {
@@ -12,7 +12,9 @@ stdenv.mkDerivation {
nativeBuildInputs = [ makeWrapper ];
- propagatedBuildInputs = with pythonPackages; [ requests vobject lxml ];
+ propagatedBuildInputs = with python3Packages; [ requests vobject lxml ];
+
+ strictDeps = true;
doCheck = false; # no test
@@ -20,7 +22,7 @@ stdenv.mkDerivation {
mkdir -p $out/bin
cp $src/carddav-util.py $out/bin
- pythondir="$out/lib/${python.libPrefix}/site-packages"
+ pythondir="$out/lib/${python3Packages.python.sitePackages}"
mkdir -p "$pythondir"
cp $src/carddav.py "$pythondir"
'';
diff --git a/third_party/nixpkgs/pkgs/tools/networking/ccnet/default.nix b/third_party/nixpkgs/pkgs/tools/networking/ccnet/default.nix
deleted file mode 100644
index b8fd067989..0000000000
--- a/third_party/nixpkgs/pkgs/tools/networking/ccnet/default.nix
+++ /dev/null
@@ -1,25 +0,0 @@
-{lib, stdenv, fetchurl, which, autoreconfHook, pkg-config, vala, python, libsearpc, libzdb, libuuid, libevent, sqlite, openssl}:
-
-stdenv.mkDerivation rec {
- version = "6.1.8";
- seafileVersion = "6.1.8";
- pname = "ccnet";
-
- src = fetchurl {
- url = "https://github.com/haiwen/ccnet/archive/v${version}.tar.gz";
- sha256 = "0qlpnrz30ldrqnvbj59d54qdghxpxc5lsq6kf3dw2b93jnzkcmmm";
- };
-
- nativeBuildInputs = [ pkg-config which autoreconfHook vala python ];
- propagatedBuildInputs = [ libsearpc libzdb libuuid libevent sqlite openssl ];
-
- configureFlags = [ "--enable-server" ];
-
- meta = with lib; {
- homepage = "https://github.com/haiwen/ccnet";
- description = "A framework for writing networked applications in C";
- license = licenses.gpl3Plus;
- platforms = platforms.linux;
- maintainers = [ ];
- };
-}
diff --git a/third_party/nixpkgs/pkgs/tools/networking/croc/default.nix b/third_party/nixpkgs/pkgs/tools/networking/croc/default.nix
index 8c57d94695..8e9097f2f9 100644
--- a/third_party/nixpkgs/pkgs/tools/networking/croc/default.nix
+++ b/third_party/nixpkgs/pkgs/tools/networking/croc/default.nix
@@ -2,16 +2,16 @@
buildGoModule rec {
pname = "croc";
- version = "8.6.11";
+ version = "8.6.12";
src = fetchFromGitHub {
owner = "schollz";
repo = pname;
rev = "v${version}";
- sha256 = "sha256-+ej6Q2XczWVcu7lMRjt+Sj2FZxlfFSepE6crCFgPuoc=";
+ sha256 = "sha256-Oad0JpeeCpIHfH9e1pTKtrnvZ+eFx3dR5GP6g6piFS0=";
};
- vendorSha256 = "sha256-50ESG3GL9BcTaGp1Q5rc1XklF3H7WKcyM1yq7SZa2QE=";
+ vendorSha256 = "sha256-LYMZFaCNlJg+9Hoh2VbY6tMHv6oT7r+JHBcQYpOceRQ=";
doCheck = false;
diff --git a/third_party/nixpkgs/pkgs/tools/networking/dd-agent/5.nix b/third_party/nixpkgs/pkgs/tools/networking/dd-agent/5.nix
index af4ae7ed76..f40ef295d1 100644
--- a/third_party/nixpkgs/pkgs/tools/networking/dd-agent/5.nix
+++ b/third_party/nixpkgs/pkgs/tools/networking/dd-agent/5.nix
@@ -1,7 +1,7 @@
-{ lib, stdenv, fetchFromGitHub, python
+{ lib, stdenv, fetchFromGitHub, python2
, unzip, makeWrapper }:
let
- python' = python.override {
+ python' = python2.override {
packageOverrides = self: super: {
docker = self.buildPythonPackage rec {
name = "docker-${version}";
@@ -82,7 +82,7 @@ in stdenv.mkDerivation rec {
cat > $out/bin/dd-jmxfetch < /dev/null
diff --git a/third_party/nixpkgs/pkgs/tools/networking/zs-apc-spdu-ctl/default.nix b/third_party/nixpkgs/pkgs/tools/networking/zs-apc-spdu-ctl/default.nix
index 275cc88e59..1a3d3ed7a3 100644
--- a/third_party/nixpkgs/pkgs/tools/networking/zs-apc-spdu-ctl/default.nix
+++ b/third_party/nixpkgs/pkgs/tools/networking/zs-apc-spdu-ctl/default.nix
@@ -20,11 +20,11 @@ stdenv.mkDerivation rec {
};
nativeBuildInputs = [ cmake ];
- buildInputs = [ fping libowlevelzs net-snmp ];
+ buildInputs = [ libowlevelzs net-snmp ];
postPatch = ''
substituteInPlace src/confent.cxx \
- --replace /usr/sbin/fping "${lib.makeBinPath [fping]}/fping"
+ --replace /usr/sbin/fping "${fping}/bin/fping"
'';
meta = with lib; {
diff --git a/third_party/nixpkgs/pkgs/tools/networking/zs-wait4host/default.nix b/third_party/nixpkgs/pkgs/tools/networking/zs-wait4host/default.nix
index 4c8342256c..b6b4c985df 100644
--- a/third_party/nixpkgs/pkgs/tools/networking/zs-wait4host/default.nix
+++ b/third_party/nixpkgs/pkgs/tools/networking/zs-wait4host/default.nix
@@ -1,4 +1,4 @@
-{ bash, coreutils, fetchurl, fping, lib, stdenvNoCC }:
+{ coreutils, fetchurl, fping, lib, stdenvNoCC }:
stdenvNoCC.mkDerivation rec {
pname = "zs-wait4host";
@@ -9,8 +9,6 @@ stdenvNoCC.mkDerivation rec {
sha256 = "9F1264BDoGlRR7bWlRXhfyvxWio4ydShKmabUQEIz9I=";
};
- buildInputs = [ bash coreutils fping ];
-
postPatch = ''
for i in zs-wait4host zs-wait4host-inf; do
substituteInPlace "$i" \
diff --git a/third_party/nixpkgs/pkgs/tools/nix/nixpkgs-fmt/default.nix b/third_party/nixpkgs/pkgs/tools/nix/nixpkgs-fmt/default.nix
index cfe8a9a1c7..f1ea25e3bf 100644
--- a/third_party/nixpkgs/pkgs/tools/nix/nixpkgs-fmt/default.nix
+++ b/third_party/nixpkgs/pkgs/tools/nix/nixpkgs-fmt/default.nix
@@ -1,16 +1,16 @@
{ lib, rustPlatform, fetchFromGitHub }:
rustPlatform.buildRustPackage rec {
pname = "nixpkgs-fmt";
- version = "1.1.0";
+ version = "1.2.0";
src = fetchFromGitHub {
owner = "nix-community";
repo = pname;
rev = "v${version}";
- sha256 = "sha256-99rYdyDLAdY2JCy/x4wYksrV8mhKPERYjWNh4UOtYrk=";
+ sha256 = "0dqirvn8pq6ssxjlf6rkqcsx6ndasws93lz2v9f9s01k9ny8x8mq";
};
- cargoSha256 = "sha256-9XmCZwLzaX61HJWRSi7wf7BdLCOMFYIVXiDNYYfUTlk=";
+ cargoSha256 = "138aq64rb08s96q3xqcmvl3ax78rhjkwfa6v9iz8ywl32066gahb";
meta = with lib; {
description = "Nix code formatter for nixpkgs";
diff --git a/third_party/nixpkgs/pkgs/tools/package-management/cargo-audit/default.nix b/third_party/nixpkgs/pkgs/tools/package-management/cargo-audit/default.nix
index 12bf27165f..d5be54b71b 100644
--- a/third_party/nixpkgs/pkgs/tools/package-management/cargo-audit/default.nix
+++ b/third_party/nixpkgs/pkgs/tools/package-management/cargo-audit/default.nix
@@ -15,6 +15,9 @@ rustPlatform.buildRustPackage rec {
buildInputs = [ openssl libiconv ] ++ lib.optionals stdenv.isDarwin [ Security ];
nativeBuildInputs = [ pkg-config ];
+ # enables `cargo audit fix`
+ cargoBuildFlags = [ "--features fix" ];
+
# The tests require network access which is not available in sandboxed Nix builds.
doCheck = false;
diff --git a/third_party/nixpkgs/pkgs/tools/package-management/disnix/DisnixWebService/default.nix b/third_party/nixpkgs/pkgs/tools/package-management/disnix/DisnixWebService/default.nix
new file mode 100644
index 0000000000..ba3c51822e
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/tools/package-management/disnix/DisnixWebService/default.nix
@@ -0,0 +1,28 @@
+{lib, stdenv, fetchurl, apacheAnt, jdk, axis2, dbus_java }:
+
+stdenv.mkDerivation {
+ name = "DisnixWebService-0.10";
+ src = fetchurl {
+ url = "https://github.com/svanderburg/DisnixWebService/releases/download/DisnixWebService-0.10/DisnixWebService-0.10.tar.gz";
+ sha256 = "0m451msd127ay09yb8rbflg68szm8s4hh65j99f7s3mz375vc114";
+ };
+ buildInputs = [ apacheAnt jdk ];
+ PREFIX = "\${env.out}";
+ AXIS2_LIB = "${axis2}/lib";
+ AXIS2_WEBAPP = "${axis2}/webapps/axis2";
+ DBUS_JAVA_LIB = "${dbus_java}/share/java";
+ prePatch = ''
+ sed -i -e "s|#JAVA_HOME=|JAVA_HOME=${jdk}|" \
+ -e "s|#AXIS2_LIB=|AXIS2_LIB=${axis2}/lib|" \
+ scripts/disnix-soap-client
+ '';
+ buildPhase = "ant";
+ installPhase = "ant install";
+
+ meta = {
+ description = "A SOAP interface and client for Disnix";
+ license = lib.licenses.mit;
+ maintainers = [ lib.maintainers.sander ];
+ platforms = lib.platforms.linux;
+ };
+}
diff --git a/third_party/nixpkgs/pkgs/tools/package-management/disnix/default.nix b/third_party/nixpkgs/pkgs/tools/package-management/disnix/default.nix
new file mode 100644
index 0000000000..14be0924f2
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/tools/package-management/disnix/default.nix
@@ -0,0 +1,20 @@
+{ lib, stdenv, fetchurl, pkg-config, glib, libxml2, libxslt, getopt, gettext, nixUnstable, dysnomia, libintl, libiconv, help2man, doclifter, docbook5, dblatex, doxygen, libnixxml, autoreconfHook }:
+
+stdenv.mkDerivation {
+ name = "disnix-0.10";
+
+ src = fetchurl {
+ url = "https://github.com/svanderburg/disnix/releases/download/disnix-0.10/disnix-0.10.tar.gz";
+ sha256 = "0mciqbc2h60nc0i6pd36w0m2yr96v97ybrzrqzh5f67ac1f0gqwg";
+ };
+
+ nativeBuildInputs = [ pkg-config ];
+ buildInputs = [ glib libxml2 libxslt getopt nixUnstable libintl libiconv dysnomia ];
+
+ meta = {
+ description = "A Nix-based distributed service deployment tool";
+ license = lib.licenses.lgpl21Plus;
+ maintainers = with lib.maintainers; [ sander tomberek ];
+ platforms = lib.platforms.unix;
+ };
+}
diff --git a/third_party/nixpkgs/pkgs/tools/package-management/disnix/disnixos/default.nix b/third_party/nixpkgs/pkgs/tools/package-management/disnix/disnixos/default.nix
new file mode 100644
index 0000000000..1b9d2eaefc
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/tools/package-management/disnix/disnixos/default.nix
@@ -0,0 +1,20 @@
+{ lib, stdenv, fetchurl, dysnomia, disnix, socat, pkg-config, getopt }:
+
+stdenv.mkDerivation {
+ name = "disnixos-0.9";
+
+ src = fetchurl {
+ url = "https://github.com/svanderburg/disnixos/releases/download/disnixos-0.9/disnixos-0.9.tar.gz";
+ sha256 = "0vllm5a8d9dvz5cjiq1mmkc4r4vnljabq42ng0ml85sjn0w7xvm7";
+ };
+
+ nativeBuildInputs = [ pkg-config ];
+ buildInputs = [ socat dysnomia disnix getopt ];
+
+ meta = {
+ description = "Provides complementary NixOS infrastructure deployment to Disnix";
+ license = lib.licenses.lgpl21Plus;
+ maintainers = [ lib.maintainers.sander ];
+ platforms = lib.platforms.linux;
+ };
+}
diff --git a/third_party/nixpkgs/pkgs/tools/package-management/disnix/dydisnix/default.nix b/third_party/nixpkgs/pkgs/tools/package-management/disnix/dydisnix/default.nix
new file mode 100644
index 0000000000..b4c3851a50
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/tools/package-management/disnix/dydisnix/default.nix
@@ -0,0 +1,27 @@
+{ lib, stdenv, fetchFromGitHub, autoconf, automake, libtool , pkg-config, glib, libxml2, libxslt, getopt, libiconv, gettext, nix, disnix, libnixxml }:
+
+stdenv.mkDerivation rec {
+ version="2020-07-04";
+ name = "dydisnix-${version}";
+
+ src = fetchFromGitHub {
+ owner = "svanderburg";
+ repo = "dydisnix";
+ rev = "e99091f1c2329d562097e35faedee80622d387f0";
+ sha256 = "sha256-XKab2hNGtWDkIEMxE1vMvqQBTP9BvHTabBVfzpH57h0=";
+ };
+
+ nativeBuildInputs = [ pkg-config autoconf automake libtool ];
+ buildInputs = [ glib libxml2 libxslt getopt nix disnix libiconv gettext libnixxml ];
+ preConfigure = ''
+ ./bootstrap
+ '';
+
+ meta = {
+ description = "A toolset enabling self-adaptive redeployment on top of Disnix";
+ longDescription = "Dynamic Disnix is a (very experimental!) prototype extension framework for Disnix supporting dynamic (re)deployment of service-oriented systems.";
+ license = lib.licenses.lgpl21Plus;
+ maintainers = [ lib.maintainers.tomberek ];
+ platforms = lib.platforms.unix;
+ };
+}
diff --git a/third_party/nixpkgs/pkgs/tools/package-management/disnix/dysnomia/default.nix b/third_party/nixpkgs/pkgs/tools/package-management/disnix/dysnomia/default.nix
new file mode 100644
index 0000000000..56ba16afb4
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/tools/package-management/disnix/dysnomia/default.nix
@@ -0,0 +1,71 @@
+{ lib, stdenv, fetchurl, netcat
+, systemd ? null, ejabberd ? null, mysql ? null, postgresql ? null, subversion ? null, mongodb ? null, mongodb-tools ? null, influxdb ? null, supervisor ? null, docker ? null
+, enableApacheWebApplication ? false
+, enableAxis2WebService ? false
+, enableEjabberdDump ? false
+, enableMySQLDatabase ? false
+, enablePostgreSQLDatabase ? false
+, enableSubversionRepository ? false
+, enableTomcatWebApplication ? false
+, enableMongoDatabase ? false
+, enableInfluxDatabase ? false
+, enableSupervisordProgram ? false
+, enableDockerContainer ? true
+, enableLegacy ? false
+, catalinaBaseDir ? "/var/tomcat"
+, jobTemplate ? "systemd"
+, getopt
+}:
+
+assert enableMySQLDatabase -> mysql != null;
+assert enablePostgreSQLDatabase -> postgresql != null;
+assert enableSubversionRepository -> subversion != null;
+assert enableEjabberdDump -> ejabberd != null;
+assert enableMongoDatabase -> (mongodb != null && mongodb-tools != null);
+assert enableInfluxDatabase -> influxdb != null;
+assert enableSupervisordProgram -> supervisor != null;
+assert enableDockerContainer -> docker != null;
+
+stdenv.mkDerivation {
+ name = "dysnomia-0.10";
+ src = fetchurl {
+ url = "https://github.com/svanderburg/dysnomia/releases/download/dysnomia-0.10/dysnomia-0.10.tar.gz";
+ sha256 = "19zg4nhn0f9v4i7c9hhan1i4xv3ljfpl2d0s84ph8byiscvhyrna";
+ };
+
+ preConfigure = if enableEjabberdDump then "export PATH=$PATH:${ejabberd}/sbin" else "";
+
+ configureFlags = [
+ (if enableApacheWebApplication then "--with-apache" else "--without-apache")
+ (if enableAxis2WebService then "--with-axis2" else "--without-axis2")
+ (if enableEjabberdDump then "--with-ejabberd" else "--without-ejabberd")
+ (if enableMySQLDatabase then "--with-mysql" else "--without-mysql")
+ (if enablePostgreSQLDatabase then "--with-postgresql" else "--without-postgresql")
+ (if enableSubversionRepository then "--with-subversion" else "--without-subversion")
+ (if enableTomcatWebApplication then "--with-tomcat=${catalinaBaseDir}" else "--without-tomcat")
+ (if enableMongoDatabase then "--with-mongodb" else "--without-mongodb")
+ (if enableInfluxDatabase then "--with-influxdb" else "--without-influxdb")
+ (if enableSupervisordProgram then "--with-supervisord" else "--without-supervisord")
+ (if enableDockerContainer then "--with-docker" else "--without-docker")
+ "--with-job-template=${jobTemplate}"
+ ] ++ lib.optional enableLegacy "--enable-legacy";
+
+ buildInputs = [ getopt netcat ]
+ ++ lib.optional stdenv.isLinux systemd
+ ++ lib.optional enableEjabberdDump ejabberd
+ ++ lib.optional enableMySQLDatabase mysql.out
+ ++ lib.optional enablePostgreSQLDatabase postgresql
+ ++ lib.optional enableSubversionRepository subversion
+ ++ lib.optional enableMongoDatabase mongodb
+ ++ lib.optional enableMongoDatabase mongodb-tools
+ ++ lib.optional enableInfluxDatabase influxdb
+ ++ lib.optional enableSupervisordProgram supervisor
+ ++ lib.optional enableDockerContainer docker;
+
+ meta = {
+ description = "Automated deployment of mutable components and services for Disnix";
+ license = lib.licenses.mit;
+ maintainers = [ lib.maintainers.sander ];
+ platforms = lib.platforms.unix;
+ };
+}
diff --git a/third_party/nixpkgs/pkgs/tools/package-management/emplace/default.nix b/third_party/nixpkgs/pkgs/tools/package-management/emplace/default.nix
index 1b8aa8fc3f..735c940f18 100644
--- a/third_party/nixpkgs/pkgs/tools/package-management/emplace/default.nix
+++ b/third_party/nixpkgs/pkgs/tools/package-management/emplace/default.nix
@@ -2,16 +2,16 @@
rustPlatform.buildRustPackage rec {
pname = "emplace";
- version = "1.4.0";
+ version = "1.4.1";
src = fetchFromGitHub {
owner = "tversteeg";
repo = pname;
rev = "v${version}";
- sha256 = "sha256-6dmXWqkf8Z+cc4wnOuVCe4+Byfk3VTYXehTN1MCiFLE=";
+ sha256 = "sha256-lBCGSeEVxlXrn1RHqMEYSXLOehJw/DiL+33nx4+rV2Y=";
};
- cargoSha256 = "sha256-uDoxMHSNoqH/AOixmkV6pwrDu/XSqXBCrAz4L7MMPU8=";
+ cargoSha256 = "sha256-QL71pJ5RBWRRse5DXwctMvu+z818jEEQjaNBXHLy20Y=";
meta = with lib; {
description = "Mirror installed software on multiple machines";
diff --git a/third_party/nixpkgs/pkgs/tools/package-management/nix/default.nix b/third_party/nixpkgs/pkgs/tools/package-management/nix/default.nix
index 352a6a5466..4a8cd9a1c6 100644
--- a/third_party/nixpkgs/pkgs/tools/package-management/nix/default.nix
+++ b/third_party/nixpkgs/pkgs/tools/package-management/nix/default.nix
@@ -10,7 +10,7 @@ let
common =
{ lib, stdenv, perl, curl, bzip2, sqlite, openssl ? null, xz
- , bash, coreutils, gzip, gnutar
+ , bash, coreutils, util-linuxMinimal, gzip, gnutar
, pkg-config, boehmgc, perlPackages, libsodium, brotli, boost, editline, nlohmann_json
, autoreconfHook, autoconf-archive, bison, flex
, jq, libarchive, libcpuid
@@ -41,6 +41,7 @@ common =
nativeBuildInputs =
[ pkg-config ]
+ ++ lib.optionals (is24 && stdenv.isLinux) [ util-linuxMinimal ]
++ lib.optionals is24
[ autoreconfHook
autoconf-archive
@@ -139,7 +140,7 @@ common =
doInstallCheck = true; # not cross
# socket path becomes too long otherwise
- preInstallCheck = lib.optional stdenv.isDarwin ''
+ preInstallCheck = lib.optionalString stdenv.isDarwin ''
export TMPDIR=$NIX_BUILD_TOP
'';
@@ -213,13 +214,13 @@ in rec {
nixUnstable = lib.lowPrio (callPackage common rec {
name = "nix-2.4${suffix}";
- suffix = "pre20210317_8a5203d";
+ suffix = "pre20210326_dd77f71";
src = fetchFromGitHub {
owner = "NixOS";
repo = "nix";
- rev = "8a5203d3b836497c2c5f157f85008aa8bcb6a1d2";
- sha256 = "IMzdmoWAX6Lerhslsf7h2814xjJolPnl2bICDixRgdk=";
+ rev = "dd77f71afe6733e9790dd001125c423cb648b7ce";
+ sha256 = "rVHzrsCtdiWjyLuHnDplG2mx+7dw5VyzZ9ReXxuCvHY=";
};
inherit storeDir stateDir confDir boehmgc;
diff --git a/third_party/nixpkgs/pkgs/tools/package-management/rpm/default.nix b/third_party/nixpkgs/pkgs/tools/package-management/rpm/default.nix
index 5c72dc0715..f942efe6dd 100644
--- a/third_party/nixpkgs/pkgs/tools/package-management/rpm/default.nix
+++ b/third_party/nixpkgs/pkgs/tools/package-management/rpm/default.nix
@@ -6,11 +6,11 @@
stdenv.mkDerivation rec {
pname = "rpm";
- version = "4.16.1.2";
+ version = "4.16.1.3";
src = fetchurl {
url = "http://ftp.rpm.org/releases/rpm-${lib.versions.majorMinor version}.x/rpm-${version}.tar.bz2";
- sha256 = "1k6ank2aad7r503w12m6m494mxr6iccj52wqhwbc94pwxsf34mw3";
+ sha256 = "07g2g0adgjm29wqy94iqhpp5dk0hacfw1yf7kzycrrxnfbwwfgai";
};
outputs = [ "out" "dev" "man" ];
@@ -73,8 +73,8 @@ stdenv.mkDerivation rec {
'';
meta = with lib; {
- homepage = "http://www.rpm.org/";
- license = licenses.gpl2;
+ homepage = "https://www.rpm.org/";
+ license = with licenses; [ gpl2Plus lgpl21Plus ];
description = "The RPM Package Manager";
maintainers = with maintainers; [ copumpkin ];
platforms = platforms.linux ++ platforms.darwin;
diff --git a/third_party/nixpkgs/pkgs/tools/security/bitwarden_rs/default.nix b/third_party/nixpkgs/pkgs/tools/security/bitwarden_rs/default.nix
index 2cce00693a..5676e4005c 100644
--- a/third_party/nixpkgs/pkgs/tools/security/bitwarden_rs/default.nix
+++ b/third_party/nixpkgs/pkgs/tools/security/bitwarden_rs/default.nix
@@ -8,13 +8,13 @@ let
in rustPlatform.buildRustPackage rec {
pname = "bitwarden_rs";
- version = "1.19.0";
+ version = "1.20.0";
src = fetchFromGitHub {
owner = "dani-garcia";
repo = pname;
rev = version;
- sha256 = "1iww8fhh4indmgw1j35whqyakd4bppmiyjpcdf2qrzg52x5binh0";
+ sha256 = "1ncy4iwmdzdp8rv1gc5i4s1rp97d94n4l4bh08v6w4zdpx0zn8b9";
};
nativeBuildInputs = [ pkg-config ];
@@ -25,7 +25,7 @@ in rustPlatform.buildRustPackage rec {
RUSTC_BOOTSTRAP = 1;
- cargoSha256 = "0ga7ahlszja8ilng8xsrwdy7zy6bbci4mf00lknladjhlw16wibf";
+ cargoSha256 = "139by5y2ma3v52nabzr5man1qy395rchs2dlivkj9xi829kg4mcr";
cargoBuildFlags = [ featuresFlag ];
checkPhase = ''
diff --git a/third_party/nixpkgs/pkgs/tools/security/bitwarden_rs/vault.nix b/third_party/nixpkgs/pkgs/tools/security/bitwarden_rs/vault.nix
index 57f52d91bb..2b0855b821 100644
--- a/third_party/nixpkgs/pkgs/tools/security/bitwarden_rs/vault.nix
+++ b/third_party/nixpkgs/pkgs/tools/security/bitwarden_rs/vault.nix
@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "bitwarden_rs-vault";
- version = "2.18.1b";
+ version = "2.19.0";
src = fetchurl {
url = "https://github.com/dani-garcia/bw_web_builds/releases/download/v${version}/bw_web_v${version}.tar.gz";
- sha256 = "sha256-MwHTx4ITr2GuBS6qXD4m3aCinpJHQa0Wp0Bbmgg7ATQ=";
+ sha256 = "sha256:0yrk2b2d5sld4z60siacafdz95gqikcv4snzd6hwhq1l6kz151az";
};
buildCommand = ''
diff --git a/third_party/nixpkgs/pkgs/tools/security/chipsec/default.nix b/third_party/nixpkgs/pkgs/tools/security/chipsec/default.nix
index 45d6349af4..7e00c0b07c 100644
--- a/third_party/nixpkgs/pkgs/tools/security/chipsec/default.nix
+++ b/third_party/nixpkgs/pkgs/tools/security/chipsec/default.nix
@@ -1,6 +1,6 @@
-{ stdenv, lib, fetchFromGitHub, pythonPackages, nasm, libelf
+{ stdenv, lib, fetchFromGitHub, python2Packages, nasm, libelf
, kernel ? null, withDriver ? false }:
-pythonPackages.buildPythonApplication rec {
+python2Packages.buildPythonApplication rec {
pname = "chipsec";
version = "1.5.1";
diff --git a/third_party/nixpkgs/pkgs/tools/security/cipherscan/default.nix b/third_party/nixpkgs/pkgs/tools/security/cipherscan/default.nix
index eae5a5256d..23022f92b6 100644
--- a/third_party/nixpkgs/pkgs/tools/security/cipherscan/default.nix
+++ b/third_party/nixpkgs/pkgs/tools/security/cipherscan/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, fetchFromGitHub, openssl, makeWrapper, python, coreutils }:
+{ stdenv, lib, fetchFromGitHub, openssl, makeWrapper, python3, coreutils }:
stdenv.mkDerivation rec {
pname = "cipherscan";
@@ -12,7 +12,9 @@ stdenv.mkDerivation rec {
};
nativeBuildInputs = [ makeWrapper ];
- buildInputs = [ python ];
+ buildInputs = [ python3 ];
+
+ strictDeps = true;
buildPhase = ''
substituteInPlace cipherscan --replace '$0' 'cipherscan'
diff --git a/third_party/nixpkgs/pkgs/tools/security/cosign/default.nix b/third_party/nixpkgs/pkgs/tools/security/cosign/default.nix
new file mode 100644
index 0000000000..a49123aded
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/tools/security/cosign/default.nix
@@ -0,0 +1,25 @@
+{ lib, buildGoModule, fetchFromGitHub }:
+
+buildGoModule rec {
+ pname = "cosign";
+ version = "0.1.0";
+
+ src = fetchFromGitHub {
+ owner = "sigstore";
+ repo = pname;
+ rev = "v${version}";
+ sha256 = "0rgq29vi0h378j0bqs53gjgp246rqxfpk6rwskzrmawgry0zr8pk";
+ };
+
+ vendorSha256 = "0pcp3wdvwq06ajdfbgadyq0ipfj65n276hj88p5v6wqfn821ahd6";
+
+ subPackages = [ "cmd/cosign" ];
+
+ meta = with lib; {
+ homepage = "https://github.com/sigstore/cosign";
+ changelog = "https://github.com/sigstore/cosign/releases/tag/v${version}";
+ description = "Container Signing CLI with support for ephemeral keys and Sigstore signing";
+ license = licenses.asl20;
+ maintainers = with maintainers; [ lesuisse ];
+ };
+}
diff --git a/third_party/nixpkgs/pkgs/tools/security/gopass/default.nix b/third_party/nixpkgs/pkgs/tools/security/gopass/default.nix
index ef4c673652..be9fe521e9 100644
--- a/third_party/nixpkgs/pkgs/tools/security/gopass/default.nix
+++ b/third_party/nixpkgs/pkgs/tools/security/gopass/default.nix
@@ -13,7 +13,7 @@
buildGoModule rec {
pname = "gopass";
- version = "1.12.4";
+ version = "1.12.5";
nativeBuildInputs = [ installShellFiles makeWrapper ];
@@ -21,10 +21,10 @@ buildGoModule rec {
owner = "gopasspw";
repo = pname;
rev = "v${version}";
- sha256 = "1cwmka6shyycp9gq5js1hnbamdhqzpmzraxdaniz1cdqhxcvdkcb";
+ sha256 = "06qc68q9px2g19iz23nbc4ay5dwqhgh99d1jj5l2dhb3mgknh19n";
};
- vendorSha256 = "1qnxdrqpav6ky6gs9w63l0hbhakh23rrc9197br1nmbg0slb8vcj";
+ vendorSha256 = "1jir1lb60p86fmk5sh92ywchqva59c31g1badlq9pjgd7jip5vnl";
subPackages = [ "." ];
diff --git a/third_party/nixpkgs/pkgs/tools/security/grype/default.nix b/third_party/nixpkgs/pkgs/tools/security/grype/default.nix
index 6d67f038e4..13bbdbb99d 100644
--- a/third_party/nixpkgs/pkgs/tools/security/grype/default.nix
+++ b/third_party/nixpkgs/pkgs/tools/security/grype/default.nix
@@ -1,25 +1,29 @@
-{ buildGoModule
+{ lib
+, buildGoModule
, docker
, fetchFromGitHub
-, lib
}:
buildGoModule rec {
pname = "grype";
- version = "0.8.0";
+ version = "0.9.0";
src = fetchFromGitHub {
owner = "anchore";
repo = pname;
rev = "v${version}";
- sha256 = "sha256-/OgAh33DF0UkBcc5GriGgeoZ7kae9GhGnUnIX6lGlys=";
+ sha256 = "sha256-X67TEHKmKKuTFGo55ZVkYVNw4f/d8aU2b/FQsq1OIJg=";
};
vendorSha256 = "sha256-SGO8RKSOK0PHqSIJfTdcuAmqMtFuo9MBdiEylDUpOFo=";
propagatedBuildInputs = [ docker ];
- # tests require a running Docker instance
+ preBuild = ''
+ buildFlagsArray+=("-ldflags" "-s -w -X github.com/anchore/grype/internal/version.version=${version}")
+ '';
+
+ # Tests require a running Docker instance
doCheck = false;
meta = with lib; {
diff --git a/third_party/nixpkgs/pkgs/tools/security/ibm-sw-tpm2/default.nix b/third_party/nixpkgs/pkgs/tools/security/ibm-sw-tpm2/default.nix
index c177726bbb..d556566a7d 100644
--- a/third_party/nixpkgs/pkgs/tools/security/ibm-sw-tpm2/default.nix
+++ b/third_party/nixpkgs/pkgs/tools/security/ibm-sw-tpm2/default.nix
@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "ibm-sw-tpm2";
- version = "1637";
+ version = "1661";
src = fetchurl {
url = "mirror://sourceforge/ibmswtpm2/ibmtpm${version}.tar.gz";
- sha256 = "09z3wbv38dc8wnw1q961s6bcd0kvz2xkjp6dxg4kn914fwzlqfnx";
+ sha256 = "sha256-VRRZKK0rJPNL5qDqz5+0kuEODqkZuEKMch+pcOhdYUc=";
};
buildInputs = [ openssl ];
diff --git a/third_party/nixpkgs/pkgs/tools/security/ldeep/default.nix b/third_party/nixpkgs/pkgs/tools/security/ldeep/default.nix
index 855ffc6fdb..db4d14ba3e 100644
--- a/third_party/nixpkgs/pkgs/tools/security/ldeep/default.nix
+++ b/third_party/nixpkgs/pkgs/tools/security/ldeep/default.nix
@@ -10,11 +10,11 @@
buildPythonApplication rec {
pname = "ldeep";
- version = "1.0.9";
+ version = "1.0.10";
src = fetchPypi {
inherit pname version;
- sha256 = "0n38idkn9hy31m5xkrc36dmw364d137c7phssvj76gr2gqsrqjy3";
+ sha256 = "sha256-/7mcmAj69NmuiK+xlQijAk39sMLDX8kHatmSI6XYbwE=";
};
propagatedBuildInputs = [
diff --git a/third_party/nixpkgs/pkgs/tools/security/metasploit/Gemfile b/third_party/nixpkgs/pkgs/tools/security/metasploit/Gemfile
index 8389f798bd..7c2f230266 100644
--- a/third_party/nixpkgs/pkgs/tools/security/metasploit/Gemfile
+++ b/third_party/nixpkgs/pkgs/tools/security/metasploit/Gemfile
@@ -1,4 +1,4 @@
# frozen_string_literal: true
source "https://rubygems.org"
-gem "metasploit-framework", git: "https://github.com/rapid7/metasploit-framework", ref: "refs/tags/6.0.36"
+gem "metasploit-framework", git: "https://github.com/rapid7/metasploit-framework", ref: "refs/tags/6.0.37"
diff --git a/third_party/nixpkgs/pkgs/tools/security/metasploit/Gemfile.lock b/third_party/nixpkgs/pkgs/tools/security/metasploit/Gemfile.lock
index 4e00f206c4..85d41fba9f 100644
--- a/third_party/nixpkgs/pkgs/tools/security/metasploit/Gemfile.lock
+++ b/third_party/nixpkgs/pkgs/tools/security/metasploit/Gemfile.lock
@@ -1,9 +1,9 @@
GIT
remote: https://github.com/rapid7/metasploit-framework
- revision: 49e599f499bd466af4d47d2d60a4dc80e158a52d
- ref: refs/tags/6.0.36
+ revision: eae71004c4a1720d9af1513ca750cfe116d99a7b
+ ref: refs/tags/6.0.37
specs:
- metasploit-framework (6.0.36)
+ metasploit-framework (6.0.37)
actionpack (~> 5.2.2)
activerecord (~> 5.2.2)
activesupport (~> 5.2.2)
@@ -30,9 +30,9 @@ GIT
metasploit-concern
metasploit-credential
metasploit-model
- metasploit-payloads (= 2.0.37)
+ metasploit-payloads (= 2.0.39)
metasploit_data_models
- metasploit_payloads-mettle (= 1.0.6)
+ metasploit_payloads-mettle (= 1.0.7)
mqtt
msgpack
nessus_rest
@@ -123,22 +123,22 @@ GEM
arel-helpers (2.12.0)
activerecord (>= 3.1.0, < 7)
aws-eventstream (1.1.1)
- aws-partitions (1.434.0)
+ aws-partitions (1.435.0)
aws-sdk-core (3.113.0)
aws-eventstream (~> 1, >= 1.0.2)
aws-partitions (~> 1, >= 1.239.0)
aws-sigv4 (~> 1.1)
jmespath (~> 1.0)
- aws-sdk-ec2 (1.229.0)
+ aws-sdk-ec2 (1.230.0)
aws-sdk-core (~> 3, >= 3.112.0)
aws-sigv4 (~> 1.1)
- aws-sdk-iam (1.50.0)
+ aws-sdk-iam (1.51.0)
aws-sdk-core (~> 3, >= 3.112.0)
aws-sigv4 (~> 1.1)
aws-sdk-kms (1.43.0)
aws-sdk-core (~> 3, >= 3.112.0)
aws-sigv4 (~> 1.1)
- aws-sdk-s3 (1.92.0)
+ aws-sdk-s3 (1.93.0)
aws-sdk-core (~> 3, >= 3.112.0)
aws-sdk-kms (~> 1)
aws-sigv4 (~> 1.1)
@@ -212,7 +212,7 @@ GEM
activemodel (~> 5.2.2)
activesupport (~> 5.2.2)
railties (~> 5.2.2)
- metasploit-payloads (2.0.37)
+ metasploit-payloads (2.0.39)
metasploit_data_models (4.1.2)
activerecord (~> 5.2.2)
activesupport (~> 5.2.2)
@@ -223,7 +223,7 @@ GEM
railties (~> 5.2.2)
recog (~> 2.0)
webrick
- metasploit_payloads-mettle (1.0.6)
+ metasploit_payloads-mettle (1.0.7)
method_source (1.0.0)
mini_portile2 (2.5.0)
minitest (5.14.4)
@@ -323,7 +323,7 @@ GEM
metasm
rex-core
rex-text
- rex-socket (0.1.26)
+ rex-socket (0.1.29)
rex-core
rex-sslscan (0.1.6)
rex-core
diff --git a/third_party/nixpkgs/pkgs/tools/security/metasploit/default.nix b/third_party/nixpkgs/pkgs/tools/security/metasploit/default.nix
index ed9180b67e..4a3da7d7f3 100644
--- a/third_party/nixpkgs/pkgs/tools/security/metasploit/default.nix
+++ b/third_party/nixpkgs/pkgs/tools/security/metasploit/default.nix
@@ -8,13 +8,13 @@ let
};
in stdenv.mkDerivation rec {
pname = "metasploit-framework";
- version = "6.0.36";
+ version = "6.0.37";
src = fetchFromGitHub {
owner = "rapid7";
repo = "metasploit-framework";
rev = version;
- sha256 = "sha256-c0OlZkTFgyfh4DVm93CRbFYPLeGTD/8QZo4p0luVbQ0=";
+ sha256 = "sha256-q6/1GW02C1z5nQwAKXU7xbVVviwXwS+XS7ZfNjJryiA=";
};
nativeBuildInputs = [ makeWrapper ];
diff --git a/third_party/nixpkgs/pkgs/tools/security/metasploit/gemset.nix b/third_party/nixpkgs/pkgs/tools/security/metasploit/gemset.nix
index d3f7efba9d..0be20b6876 100644
--- a/third_party/nixpkgs/pkgs/tools/security/metasploit/gemset.nix
+++ b/third_party/nixpkgs/pkgs/tools/security/metasploit/gemset.nix
@@ -114,10 +114,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "1ia9b013blnwzz46hbnrqgkzf77vj60i93hbmf7a51jy2fvrcjl1";
+ sha256 = "13hy3xhff1cqlzv5hi3lz7vb11wh10m6221hq471d8m94chmmkjs";
type = "gem";
};
- version = "1.434.0";
+ version = "1.435.0";
};
aws-sdk-core = {
groups = ["default"];
@@ -134,20 +134,20 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0xi63wz30zch7wnimb2l1qi85a5gdrp8qb7jl5ildygswjbwqcvj";
+ sha256 = "1c7qqly2f94db3643xwjj9mcb34vilx11awbv40v2f8z7xisvvz3";
type = "gem";
};
- version = "1.229.0";
+ version = "1.230.0";
};
aws-sdk-iam = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "046c7p26q63q33w9w5x4kgx75xq02v5g5isax2bp2hs05ix8wnql";
+ sha256 = "0x2768blsy8lpib9pi2f2d67flabar3bq6chmbj07iqzpwvpz569";
type = "gem";
};
- version = "1.50.0";
+ version = "1.51.0";
};
aws-sdk-kms = {
groups = ["default"];
@@ -164,10 +164,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "1zs7sa7sh6zqkqlmjr9xjpjgcn9iqlpnilnj7vvlmh057f2mjhgy";
+ sha256 = "0iy2f9z43pc6fgwmga2cz8nf9gy2pwcw4jib141vp8z8dhylqj94";
type = "gem";
};
- version = "1.92.0";
+ version = "1.93.0";
};
aws-sigv4 = {
groups = ["default"];
@@ -514,12 +514,12 @@
platforms = [];
source = {
fetchSubmodules = false;
- rev = "49e599f499bd466af4d47d2d60a4dc80e158a52d";
- sha256 = "03bdjmdx4acfcq8gy3wkw4nhymkcj5qgfrimw3hjg0y58ikaahvk";
+ rev = "eae71004c4a1720d9af1513ca750cfe116d99a7b";
+ sha256 = "086adcr3cpxn9fbjzh8p5jz5bdf57dsjj00ckpwmq2rndlczbbxb";
type = "git";
url = "https://github.com/rapid7/metasploit-framework";
};
- version = "6.0.36";
+ version = "6.0.37";
};
metasploit-model = {
groups = ["default"];
@@ -536,10 +536,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "1mf1c50j2gszxspnn9f2d356z8aaiv9s9x8lpdi05cf6syvhsa2k";
+ sha256 = "1ibvh45sbmzdn6gsd3dgj1a67mhgy6p3hvjbh9b2qb7ijc14gv49";
type = "gem";
};
- version = "2.0.37";
+ version = "2.0.39";
};
metasploit_data_models = {
groups = ["default"];
@@ -556,10 +556,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "1mxhybic6myh993fs4jmp0hz998ryf362y0b33wqanff1n8aj75k";
+ sha256 = "1ivxz2wl9k0j7ba7xas0bfm44c1iczfvlgyxhsgqbpqkqwc374vg";
type = "gem";
};
- version = "1.0.6";
+ version = "1.0.7";
};
method_source = {
groups = ["default"];
@@ -1066,10 +1066,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0mgk44f55w2g536nkxbg62qq5cfr05qxldglfr3yf94qkkanl2gg";
+ sha256 = "0ar9vm8pwjz7c11kr3pjnxbgk68f2i5k1r9j3r34pfq9n26s79gr";
type = "gem";
};
- version = "0.1.26";
+ version = "0.1.29";
};
rex-sslscan = {
groups = ["default"];
diff --git a/third_party/nixpkgs/pkgs/tools/security/nuclei/default.nix b/third_party/nixpkgs/pkgs/tools/security/nuclei/default.nix
index dd915a36e4..1c1b0e4106 100644
--- a/third_party/nixpkgs/pkgs/tools/security/nuclei/default.nix
+++ b/third_party/nixpkgs/pkgs/tools/security/nuclei/default.nix
@@ -5,16 +5,16 @@
buildGoModule rec {
pname = "nuclei";
- version = "2.3.1";
+ version = "2.3.2";
src = fetchFromGitHub {
owner = "projectdiscovery";
repo = pname;
rev = "v${version}";
- sha256 = "sha256-NM/Ggd5MKctQKE0MNawyE+Xciuj9++6DXXkMrrpfkhA=";
+ sha256 = "sha256-QF9w3ZrW+Mbl6EOC1n2848+q71AhxXTf0j//Us9L1r8=";
};
- vendorSha256 = "sha256-h+MuMfIKXgXzLU6hNMxfPXawic9UZrwzVlzjjRF7X3o=";
+ vendorSha256 = "sha256-qmuua7HXnwuy24CSqHKALqNDmXBvSIXYTVu3kaGVoeU=";
preBuild = ''
mv v2/* .
diff --git a/third_party/nixpkgs/pkgs/tools/security/prs/default.nix b/third_party/nixpkgs/pkgs/tools/security/prs/default.nix
index 936bd7eda9..ca3e1feef3 100644
--- a/third_party/nixpkgs/pkgs/tools/security/prs/default.nix
+++ b/third_party/nixpkgs/pkgs/tools/security/prs/default.nix
@@ -12,16 +12,16 @@
rustPlatform.buildRustPackage rec {
pname = "prs";
- version = "0.2.4";
+ version = "0.2.5";
src = fetchFromGitLab {
owner = "timvisee";
repo = "prs";
rev = "v${version}";
- sha256 = "sha256-8rISyZdxxGqpZlOc4ziY33tMRK/w4fiTVCiK5RVBDvw=";
+ sha256 = "sha256-XJcNhIMu60H5LmoRzMqhPq33cCU9PBPfIIUtaSnmrH8=";
};
- cargoSha256 = "sha256-sxYm6uNTvBZsjzHywduq0fhnqZMbECLqxq8yg3ZxtVU=";
+ cargoSha256 = "sha256-4l/KQMtGfZX5Rg35AJxvwzg3aAzuPK2iKrHDRgIw+bg=";
postPatch = ''
# The GPGME backend is recommended
diff --git a/third_party/nixpkgs/pkgs/tools/security/pwncat/default.nix b/third_party/nixpkgs/pkgs/tools/security/pwncat/default.nix
new file mode 100644
index 0000000000..559dc8d8e3
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/tools/security/pwncat/default.nix
@@ -0,0 +1,24 @@
+{ lib
+, buildPythonApplication
+, fetchPypi
+}:
+
+buildPythonApplication rec {
+ pname = "pwncat";
+ version = "0.1.0";
+
+ src = fetchPypi {
+ inherit pname version;
+ sha256 = "0sfdqphs0v3lj3vffda4w05r6sqir7qafa8lmlh0wr921wyiqwag";
+ };
+
+ # Tests requires to start containers
+ doCheck = false;
+
+ meta = with lib; {
+ description = " TCP/UDP communication suite";
+ homepage = "https://pwncat.org/";
+ license = with licenses; [ mit ];
+ maintainers = with maintainers; [ fab ];
+ };
+}
diff --git a/third_party/nixpkgs/pkgs/tools/security/sipvicious/default.nix b/third_party/nixpkgs/pkgs/tools/security/sipvicious/default.nix
new file mode 100644
index 0000000000..8403019a34
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/tools/security/sipvicious/default.nix
@@ -0,0 +1,27 @@
+{ lib
+, buildPythonApplication
+, fetchFromGitHub
+}:
+
+buildPythonApplication rec {
+ pname = "sipvicious";
+ version = "0.3.3";
+
+ src = fetchFromGitHub {
+ owner = "EnableSecurity";
+ repo = pname;
+ rev = "v${version}";
+ sha256 = "17f6w7qh33zvlhqwf22y9y7skha0xjs46yk66q8xm4brsv4lfxxa";
+ };
+
+ # Project has no tests
+ doCheck = false;
+ pythonImportsCheck = [ "sipvicious" ];
+
+ meta = with lib; {
+ description = " Set of tools to audit SIP based VoIP systems";
+ homepage = "https://github.com/EnableSecurity/sipvicious";
+ license = with licenses; [ gpl3Plus ];
+ maintainers = with maintainers; [ fab ];
+ };
+}
diff --git a/third_party/nixpkgs/pkgs/tools/security/slowhttptest/default.nix b/third_party/nixpkgs/pkgs/tools/security/slowhttptest/default.nix
new file mode 100644
index 0000000000..5dce5d5439
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/tools/security/slowhttptest/default.nix
@@ -0,0 +1,26 @@
+{ lib
+, stdenv
+, fetchFromGitHub
+, openssl
+}:
+
+stdenv.mkDerivation rec {
+ pname = "slowhttptest";
+ version = "1.8.2";
+
+ src = fetchFromGitHub {
+ owner = "shekyan";
+ repo = pname;
+ rev = "v${version}";
+ sha256 = "1xv2j3hl4zj0s2cxcsvlwgridh9ap4g84g7c4918d03id15wydcx";
+ };
+
+ buildInputs = [ openssl ];
+
+ meta = with lib; {
+ description = "Application Layer DoS attack simulator";
+ homepage = "https://github.com/shekyan/slowhttptest";
+ license = with licenses; [ asl20 ];
+ maintainers = with maintainers; [ fab ];
+ };
+}
diff --git a/third_party/nixpkgs/pkgs/tools/security/sops/default.nix b/third_party/nixpkgs/pkgs/tools/security/sops/default.nix
index ae6f000fe3..ec1ade20a1 100644
--- a/third_party/nixpkgs/pkgs/tools/security/sops/default.nix
+++ b/third_party/nixpkgs/pkgs/tools/security/sops/default.nix
@@ -2,22 +2,23 @@
buildGoModule rec {
pname = "sops";
- version = "3.6.1";
+ version = "3.7.0";
src = fetchFromGitHub {
rev = "v${version}";
owner = "mozilla";
repo = pname;
- sha256 = "0xl53rs8jzq5yz4wi0vzsr6ajsaf2x2n1h3x7krk02a9839y6f18";
+ sha256 = "1a0v1jgbz8n3dymzr2shg2ms9sxjwaci209ldzq8v4g737v10zgm";
};
- vendorSha256 = "1cpm06dyc6lb3a9apfggyi16alb2yijvyan1gbrl8r9fwlqvdpjk";
+ vendorSha256 = "1qaml2h3c8fhmi8ahp2fmd0hagqp5xqaf8jxjh4mfmbv2is3yz1l";
doCheck = false;
meta = with lib; {
homepage = "https://github.com/mozilla/sops";
description = "Mozilla sops (Secrets OPerationS) is an editor of encrypted files";
+ changelog = "https://github.com/mozilla/sops/raw/v${version}/CHANGELOG.rst";
maintainers = [ maintainers.marsam ];
license = licenses.mpl20;
};
diff --git a/third_party/nixpkgs/pkgs/tools/security/teler/default.nix b/third_party/nixpkgs/pkgs/tools/security/teler/default.nix
index 0ef2f7509b..4c94e2544c 100644
--- a/third_party/nixpkgs/pkgs/tools/security/teler/default.nix
+++ b/third_party/nixpkgs/pkgs/tools/security/teler/default.nix
@@ -5,16 +5,16 @@
buildGoModule rec {
pname = "teler";
- version = "1.1.1";
+ version = "1.2.1";
src = fetchFromGitHub {
owner = "kitabisa";
repo = "teler";
rev = "v${version}";
- sha256 = "sha256-FZG23j7LUwfJ0dSbU4xW0YyCKJxOjVf1uqkuGlrwnqs=";
+ sha256 = "sha256-lExZWFj0PQFUBJgfhahF8PfYaOndRxKyVHoMlubmEpc=";
};
- vendorSha256 = "sha256-KvUnDInUqFW7FypgsppIBQZKNu6HVsEeHtGwdqYtoys=";
+ vendorSha256 = "sha256-TQjwPem+RMuoF5T02CL/CTvBS6W7Q786gTvYUFIvxjE=";
preBuild = ''
buildFlagsArray+=("-ldflags" "-s -w -X ktbs.dev/teler/common.Version=${version}")
diff --git a/third_party/nixpkgs/pkgs/tools/security/vault/default.nix b/third_party/nixpkgs/pkgs/tools/security/vault/default.nix
index 0b6c95cafd..f8e831ef2c 100644
--- a/third_party/nixpkgs/pkgs/tools/security/vault/default.nix
+++ b/third_party/nixpkgs/pkgs/tools/security/vault/default.nix
@@ -2,13 +2,13 @@
buildGoPackage rec {
pname = "vault";
- version = "1.6.3";
+ version = "1.7.0";
src = fetchFromGitHub {
owner = "hashicorp";
repo = "vault";
rev = "v${version}";
- sha256 = "0ffynqk16bnc4nqnffbid4v72mxafzi0fy4cbrzfs9qfi56vcbm9";
+ sha256 = "1lsz8fyjcxamvs9n3m974q2jxhv828fb5p6qx8wlqdaahqgrc8qg";
};
goPackagePath = "github.com/hashicorp/vault";
diff --git a/third_party/nixpkgs/pkgs/tools/security/vault/vault-bin.nix b/third_party/nixpkgs/pkgs/tools/security/vault/vault-bin.nix
index 59082c89f7..fc8b2865f2 100644
--- a/third_party/nixpkgs/pkgs/tools/security/vault/vault-bin.nix
+++ b/third_party/nixpkgs/pkgs/tools/security/vault/vault-bin.nix
@@ -1,26 +1,26 @@
{ lib, stdenv, fetchurl, unzip }:
let
- version = "1.6.3";
+ version = "1.7.0";
sources = let
base = "https://releases.hashicorp.com/vault/${version}";
in {
x86_64-linux = fetchurl {
url = "${base}/vault_${version}_linux_amd64.zip";
- sha256 = "0ijc80r9rbbbblmf5s3j5b2kk6zsriyxwhsijhgy86rr6bvdljl4";
+ sha256 = "0d8wqxqilv1jdf4dl7w2jp3lfh0w0rawidmhjlj3ykpg6l3gblma";
};
i686-linux = fetchurl {
url = "${base}/vault_${version}_linux_386.zip";
- sha256 = "1blma0ywkmv8ykqc4sgcbk1g9jb9rjxqk2b6kmp5z31lilg4a7my";
+ sha256 = "128r0phm5i1cpayz0ia8qsmnk1ia3qylidy9f8iwk3l8r834s4yd";
};
x86_64-darwin = fetchurl {
url = "${base}/vault_${version}_darwin_amd64.zip";
- sha256 = "1mzkj7ixpzfhn9i4092qw8g38dx4lh3kzp6g4fr5x84sbs6anl3j";
+ sha256 = "01vxjv95his8jqin2cwcw691wdwn6p876rp021bmvr6diw6clkrp";
};
aarch64-linux = fetchurl {
url = "${base}/vault_${version}_linux_arm64.zip";
- sha256 = "14l8ic5hgsbq4q1b6832ss1wyrgqwyvgkrvcxbw5nqy5la95fl8i";
+ sha256 = "0ahdv14fz7ybl11b61z7j13nbjd6hp6fcpc5bk6y8lh4qj8x0pzg";
};
};
@@ -35,9 +35,13 @@ in stdenv.mkDerivation {
sourceRoot = ".";
installPhase = ''
+ runHook preInstall
+
mkdir -p $out/bin $out/share/bash-completion/completions
mv vault $out/bin
echo "complete -C $out/bin/vault vault" > $out/share/bash-completion/completions/vault
+
+ runHook postInstall
'';
meta = with lib; {
diff --git a/third_party/nixpkgs/pkgs/tools/security/zgrab2/default.nix b/third_party/nixpkgs/pkgs/tools/security/zgrab2/default.nix
new file mode 100644
index 0000000000..b8863a6a94
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/tools/security/zgrab2/default.nix
@@ -0,0 +1,28 @@
+{ lib
+, buildGoModule
+, fetchFromGitHub
+}:
+
+buildGoModule rec {
+ pname = "zgrab2";
+ version = "20210327-${lib.strings.substring 0 7 rev}";
+ rev = "17a5257565c758e2b817511d15476d330be0a17a";
+
+ src = fetchFromGitHub {
+ owner = "zmap";
+ repo = pname;
+ inherit rev;
+ sha256 = "1hxk2jggj8lww97lwmks46i001p5ycnxnck8yya6d0fd3ayxvw2w";
+ };
+
+ vendorSha256 = "1s0azy5b5hi5h24vs6a9f1n70l980vkid28ihqh10zq6ajmds2z3";
+
+ subPackages = [ "cmd/zgrab2" ];
+
+ meta = with lib; {
+ description = "Web application scanner";
+ homepage = "https://github.com/zmap/zgrab2";
+ license = with licenses; [ asl20 isc ];
+ maintainers = with maintainers; [ fab ];
+ };
+}
diff --git a/third_party/nixpkgs/pkgs/tools/system/evemu/default.nix b/third_party/nixpkgs/pkgs/tools/system/evemu/default.nix
index 5b3a584bd2..c01a909668 100644
--- a/third_party/nixpkgs/pkgs/tools/system/evemu/default.nix
+++ b/third_party/nixpkgs/pkgs/tools/system/evemu/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchgit, autoreconfHook, pkg-config, pythonPackages
+{ lib, stdenv, fetchgit, autoreconfHook, pkg-config, python3Packages
, libevdev
}:
@@ -14,9 +14,11 @@ stdenv.mkDerivation rec {
sha256 = "1m38fxwy2s82vb2qm9aqxinws12akmqqq7q66is931lc3awqkbah";
};
- nativeBuildInputs = [ pkg-config autoreconfHook ];
+ nativeBuildInputs = [ pkg-config autoreconfHook python3Packages.python ];
- buildInputs = [ pythonPackages.python pythonPackages.evdev libevdev ];
+ buildInputs = [ python3Packages.evdev libevdev ];
+
+ strictDeps = true;
meta = with lib; {
description = "Records and replays device descriptions and events to emulate input devices through the kernel's input system";
diff --git a/third_party/nixpkgs/pkgs/tools/system/fio/default.nix b/third_party/nixpkgs/pkgs/tools/system/fio/default.nix
index d34f0d4b73..fc4ea8d6b3 100644
--- a/third_party/nixpkgs/pkgs/tools/system/fio/default.nix
+++ b/third_party/nixpkgs/pkgs/tools/system/fio/default.nix
@@ -1,5 +1,5 @@
{ lib, stdenv, fetchFromGitHub, makeWrapper
-, libaio, python, zlib
+, libaio, python3, zlib
, withGnuplot ? false, gnuplot ? null }:
stdenv.mkDerivation rec {
@@ -13,11 +13,13 @@ stdenv.mkDerivation rec {
sha256 = "sha256-/Si0McndJ6Xp3ifDr+BStv89LmZyAgof95QkHGT8MGQ=";
};
- buildInputs = [ python zlib ]
+ buildInputs = [ python3 zlib ]
++ lib.optional (!stdenv.isDarwin) libaio;
nativeBuildInputs = [ makeWrapper ];
+ strictDeps = true;
+
enableParallelBuilding = true;
postPatch = ''
diff --git a/third_party/nixpkgs/pkgs/tools/system/gdu/default.nix b/third_party/nixpkgs/pkgs/tools/system/gdu/default.nix
index 303e78d82e..c57c276698 100644
--- a/third_party/nixpkgs/pkgs/tools/system/gdu/default.nix
+++ b/third_party/nixpkgs/pkgs/tools/system/gdu/default.nix
@@ -7,13 +7,13 @@
buildGoModule rec {
pname = "gdu";
- version = "4.8.1";
+ version = "4.9.0";
src = fetchFromGitHub {
owner = "dundee";
repo = pname;
rev = "v${version}";
- sha256 = "sha256-3qx9nL1lzVbtvVW3O9kQw4FoVuCqo8fxl8u1WXZNRFs=";
+ sha256 = "sha256-fQzKWgePF7SszYMwRSB3s59AmVjvzMvXPM49PXFTBGM=";
};
vendorSha256 = "sha256-QiO5p0x8kmIN6f0uYS0IR2MlWtRYTHeZpW6Nmupjias=";
diff --git a/third_party/nixpkgs/pkgs/tools/system/gptfdisk/default.nix b/third_party/nixpkgs/pkgs/tools/system/gptfdisk/default.nix
index b3b084fbe7..bf6589eb66 100644
--- a/third_party/nixpkgs/pkgs/tools/system/gptfdisk/default.nix
+++ b/third_party/nixpkgs/pkgs/tools/system/gptfdisk/default.nix
@@ -1,14 +1,14 @@
-{ fetchurl, lib, stdenv, libuuid, popt, icu, ncurses }:
+{ fetchurl, lib, stdenv, libuuid, popt, icu, ncurses, nixosTests }:
stdenv.mkDerivation rec {
pname = "gptfdisk";
- version = "1.0.6";
+ version = "1.0.7";
src = fetchurl {
# https://www.rodsbooks.com/gdisk/${name}.tar.gz also works, but the home
# page clearly implies a preference for using SourceForge's bandwidth:
url = "mirror://sourceforge/gptfdisk/${pname}-${version}.tar.gz";
- sha256 = "sha256-3cVR1kOlPwvURANF064yxJsEp5fpwBA26kYLa7QWjKg=";
+ sha256 = "sha256-dUAEt/hbJ5KHx6w8BGmx1+Dq4EOpei5YewVgyl84KMA=";
};
postPatch = ''
@@ -37,10 +37,15 @@ stdenv.mkDerivation rec {
done
'';
+ passthru.tests = lib.optionalAttrs stdenv.hostPlatform.isx86 {
+ installer-simpleLabels = nixosTests.installer.simpleLabels;
+ };
+
meta = with lib; {
description = "Set of text-mode partitioning tools for Globally Unique Identifier (GUID) Partition Table (GPT) disks";
license = licenses.gpl2;
homepage = "https://www.rodsbooks.com/gdisk/";
platforms = platforms.all;
+ maintainers = [ maintainers.ehmry ];
};
}
diff --git a/third_party/nixpkgs/pkgs/tools/system/ipmitool/default.nix b/third_party/nixpkgs/pkgs/tools/system/ipmitool/default.nix
index 2f0e2c600d..e7d6130ffa 100644
--- a/third_party/nixpkgs/pkgs/tools/system/ipmitool/default.nix
+++ b/third_party/nixpkgs/pkgs/tools/system/ipmitool/default.nix
@@ -22,6 +22,11 @@ stdenv.mkDerivation {
url = "https://github.com/ipmitool/ipmitool/commit/5db314f694f75c575cd7c9ffe9ee57aaf3a88866.patch";
sha256 = "01niwrgajhrdhl441gzmw6v1r1yc3i8kn98db4b6smfn5fwdp1pa";
})
+ (fetchpatch {
+ name = "CVE-2020-5208.patch";
+ url = "https://github.com/ipmitool/ipmitool/commit/e824c23316ae50beb7f7488f2055ac65e8b341f2.patch";
+ sha256 = "sha256-X7MnoX2fzByRpRY4p33xetT+V2aehlQ/qU+aeaqtTUY=";
+ })
];
buildInputs = [ openssl ];
diff --git a/third_party/nixpkgs/pkgs/tools/system/logrotate/default.nix b/third_party/nixpkgs/pkgs/tools/system/logrotate/default.nix
index f8f3cabdb9..b764202a58 100644
--- a/third_party/nixpkgs/pkgs/tools/system/logrotate/default.nix
+++ b/third_party/nixpkgs/pkgs/tools/system/logrotate/default.nix
@@ -1,5 +1,6 @@
{ lib, stdenv, fetchFromGitHub, gzip, popt, autoreconfHook
, mailutils ? null
+, aclSupport ? true, acl
}:
stdenv.mkDerivation rec {
@@ -22,7 +23,7 @@ stdenv.mkDerivation rec {
];
nativeBuildInputs = [ autoreconfHook ];
- buildInputs = [ popt ];
+ buildInputs = [ popt ] ++ lib.optionals aclSupport [ acl ];
meta = with lib; {
homepage = "https://fedorahosted.org/releases/l/o/logrotate/";
diff --git a/third_party/nixpkgs/pkgs/tools/system/rocm-smi/default.nix b/third_party/nixpkgs/pkgs/tools/system/rocm-smi/default.nix
index cd4eef8952..ac980e6c36 100644
--- a/third_party/nixpkgs/pkgs/tools/system/rocm-smi/default.nix
+++ b/third_party/nixpkgs/pkgs/tools/system/rocm-smi/default.nix
@@ -1,23 +1,45 @@
-{ lib, buildPythonApplication, fetchFromGitHub }:
+{ lib, stdenv, fetchFromGitHub, cmake, python3 }:
-buildPythonApplication rec {
+stdenv.mkDerivation rec {
pname = "rocm-smi";
- version = "4.0.0";
+ version = "4.1.0";
src = fetchFromGitHub {
owner = "RadeonOpenCompute";
- repo = "ROC-smi";
+ repo = "rocm_smi_lib";
rev = "rocm-${version}";
- hash = "sha256-0QqaBMkqRVEl89x3hvWQGAgt7LbtMZPhuf7KenQYHaQ=";
+ hash = "sha256-LEaC1XhmyoVWrpL05MhgN02LVT2rLKdnw9g2QdfM/uE=";
};
- format = "other";
+ nativeBuildInputs = [ cmake python3.pkgs.wrapPython ];
- dontConfigure = true;
- dontBuild = true;
+ postPatch = ''
+ # Upstream ROCm is installed in an /opt directory. For this reason,
+ # it does not completely follow FHS layout, creating top-level
+ # rocm_smi, oam, and bindings top-level directories. Since rocm-smi
+ # is a package that is typically installed, we change the paths to
+ # follow FHS more closely.
- installPhase = ''
- install -Dm0755 rocm_smi.py $out/bin/rocm-smi
+ # rocm_smi libraries and headers go into lib and include. Bindings
+ # go into lib/rocm_smi/bindings.
+ substituteInPlace rocm_smi/CMakeLists.txt \
+ --replace "DESTINATION rocm_smi/" "DESTINATION " \
+ --replace "DESTINATION bindings" "DESTINATION lib/rocm_smi/bindings" \
+ --replace "../rocm_smi/bindings/rsmiBindings.py" "../lib/rocm_smi/bindings/rsmiBindings.py" \
+ --replace 'DESTINATION ''${ROCM_SMI}/' "DESTINATION "
+
+ # oam libraries and headers go into lib and include.
+ substituteInPlace oam/CMakeLists.txt \
+ --replace "DESTINATION oam/" "DESTINATION " \
+ --replace 'DESTINATION ''${OAM_NAME}/' "DESTINATION "
+
+ # Update relative path to librocm_smi64 in the Python binding.
+ substituteInPlace python_smi_tools/rsmiBindings.py \
+ --replace "/../lib/librocm_smi64.so" "/../../librocm_smi64.so"
+ '';
+
+ postInstall = ''
+ wrapPythonProgramsIn $out/bin
'';
meta = with lib; {
@@ -25,6 +47,6 @@ buildPythonApplication rec {
homepage = "https://github.com/RadeonOpenCompute/ROC-smi";
license = with licenses; [ mit ];
maintainers = with maintainers; [ danieldk ];
- platforms = platforms.linux;
+ platforms = [ "x86_64-linux" ];
};
}
diff --git a/third_party/nixpkgs/pkgs/tools/system/sleuthkit/default.nix b/third_party/nixpkgs/pkgs/tools/system/sleuthkit/default.nix
index cf88dc846f..be4eaf5f07 100644
--- a/third_party/nixpkgs/pkgs/tools/system/sleuthkit/default.nix
+++ b/third_party/nixpkgs/pkgs/tools/system/sleuthkit/default.nix
@@ -1,14 +1,14 @@
{ lib, stdenv, fetchFromGitHub, autoreconfHook, libewf, afflib, openssl, zlib }:
stdenv.mkDerivation rec {
- version = "4.10.1";
+ version = "4.10.2";
pname = "sleuthkit";
src = fetchFromGitHub {
owner = "sleuthkit";
repo = "sleuthkit";
rev = "${pname}-${version}";
- sha256 = "142kkpkpawpqyc88pr6xdvlagw6djaah1schyjxq9qdq9cnqx0dw";
+ sha256 = "sha256-N0/spV/Bxk/UNULPot82Vw1uTIxy/Arf84wqUp6W2Tc=";
};
postPatch = ''
diff --git a/third_party/nixpkgs/pkgs/tools/system/tre-command/default.nix b/third_party/nixpkgs/pkgs/tools/system/tre-command/default.nix
index 168a6f8ec3..01590db0fd 100644
--- a/third_party/nixpkgs/pkgs/tools/system/tre-command/default.nix
+++ b/third_party/nixpkgs/pkgs/tools/system/tre-command/default.nix
@@ -2,16 +2,16 @@
rustPlatform.buildRustPackage rec {
pname = "tre-command";
- version = "0.3.5";
+ version = "0.3.6";
src = fetchFromGitHub {
owner = "dduan";
repo = "tre";
rev = "v${version}";
- sha256 = "1yhrawn8xdl84f5f56i8fikidrfbjnqw5ckjagk7f6ngpcjc0wxm";
+ sha256 = "1r84xzv3p0ml3wac2j7j5fkm7i93v2xvadb8f8al5wi57q39irj7";
};
- cargoSha256 = "03zvykjmb61bn8h4pm93iayhw1d53qv3l635jxfii1q7kzjbdnx9";
+ cargoSha256 = "1nbfgz7njc10b0abs6zwi6wzhlwllps3wah6abc1mj5yhrzwccmh";
nativeBuildInputs = [ installShellFiles ];
diff --git a/third_party/nixpkgs/pkgs/tools/text/jsawk/default.nix b/third_party/nixpkgs/pkgs/tools/text/jsawk/default.nix
index 951f236d04..4efaf56ccf 100644
--- a/third_party/nixpkgs/pkgs/tools/text/jsawk/default.nix
+++ b/third_party/nixpkgs/pkgs/tools/text/jsawk/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchFromGitHub, makeWrapper, spidermonkey_38 }:
+{ lib, stdenv, fetchFromGitHub, makeWrapper, spidermonkey_78 }:
stdenv.mkDerivation {
pname = "jsawk";
@@ -15,7 +15,7 @@ stdenv.mkDerivation {
mkdir -p $out/bin
cp $src/jsawk $out/bin/
wrapProgram $out/bin/jsawk \
- --prefix PATH : "${spidermonkey_38}/bin"
+ --prefix PATH : "${spidermonkey_78}/bin"
'';
meta = {
diff --git a/third_party/nixpkgs/pkgs/tools/text/miller/default.nix b/third_party/nixpkgs/pkgs/tools/text/miller/default.nix
index 9cc31be7ed..383c3603bc 100644
--- a/third_party/nixpkgs/pkgs/tools/text/miller/default.nix
+++ b/third_party/nixpkgs/pkgs/tools/text/miller/default.nix
@@ -3,13 +3,13 @@
stdenv.mkDerivation rec {
pname = "miller";
- version = "5.10.0";
+ version = "5.10.1";
src = fetchFromGitHub {
owner = "johnkerl";
repo = "miller";
rev = "v${version}";
- sha256 = "02jqbxnchljyqnmlbxjaf5zpdi03gxapfy38dfikl5j4f7yyxvjs";
+ sha256 = "sha256-S3OGc7rirNkP5aSnaASP6n7b7zYHSaDDWRVRWWTM2hc=";
};
nativeBuildInputs = [ autoreconfHook flex libtool ];
diff --git a/third_party/nixpkgs/pkgs/tools/text/vale/default.nix b/third_party/nixpkgs/pkgs/tools/text/vale/default.nix
index 59f5e7c0c0..0de5ea5377 100644
--- a/third_party/nixpkgs/pkgs/tools/text/vale/default.nix
+++ b/third_party/nixpkgs/pkgs/tools/text/vale/default.nix
@@ -2,7 +2,7 @@
buildGoModule rec {
pname = "vale";
- version = "2.9.1";
+ version = "2.10.2";
subPackages = [ "cmd/vale" ];
outputs = [ "out" "data" ];
@@ -11,10 +11,10 @@ buildGoModule rec {
owner = "errata-ai";
repo = "vale";
rev = "v${version}";
- sha256 = "sha256-ItkWmBq1mBVZfHcnqDp8koEAWBH3k9Et2bFA2mNYjVY=";
+ sha256 = "0cpq2pv6d67fdnm2qbb7p9amk0as8bm4knkywak8fsqadxfadx80";
};
- vendorSha256 = null;
+ vendorSha256 = "14zimsl0f7sxqqka00krix3q2mxdcpk8n2zh7bz8awjwzn4kg8m3";
postInstall = ''
mkdir -p $data/share/vale
@@ -24,7 +24,7 @@ buildGoModule rec {
buildFlagsArray = [ "-ldflags=-s -w -X main.version=${version}" ];
meta = with lib; {
- homepage = "https://errata-ai.gitbook.io/vale/";
+ homepage = "https://docs.errata.ai/vale/about";
description = "A syntax-aware linter for prose built with speed and extensibility in mind";
license = licenses.mit;
maintainers = [ maintainers.marsam ];
diff --git a/third_party/nixpkgs/pkgs/tools/text/zstxtns-utils/default.nix b/third_party/nixpkgs/pkgs/tools/text/zstxtns-utils/default.nix
index eebf078539..362f2fca84 100644
--- a/third_party/nixpkgs/pkgs/tools/text/zstxtns-utils/default.nix
+++ b/third_party/nixpkgs/pkgs/tools/text/zstxtns-utils/default.nix
@@ -1,5 +1,4 @@
-{ bash
-, coreutils
+{ coreutils
, fetchurl
, gnugrep
, lib
@@ -18,7 +17,6 @@ stdenvNoCC.mkDerivation rec {
};
nativeBuildInputs = [ makeWrapper ];
- buildInputs = [ bash coreutils gnugrep moreutils ];
installPhase = ''
runHook preInstall
@@ -27,8 +25,8 @@ stdenvNoCC.mkDerivation rec {
'';
postInstall = ''
- wrapProgram $out/bin/zstxtns-merge --prefix PATH ":" "${lib.makeBinPath [coreutils gnugrep moreutils]}"
- wrapProgram $out/bin/zstxtns-unmerge --prefix PATH ":" "${lib.makeBinPath [coreutils gnugrep]}"
+ wrapProgram $out/bin/zstxtns-merge --set PATH "${lib.makeBinPath [coreutils gnugrep moreutils]}"
+ wrapProgram $out/bin/zstxtns-unmerge --set PATH "${lib.makeBinPath [coreutils gnugrep]}"
'';
meta = with lib; {
diff --git a/third_party/nixpkgs/pkgs/tools/typesetting/biblatex-check/default.nix b/third_party/nixpkgs/pkgs/tools/typesetting/biblatex-check/default.nix
index 606e07730e..63bf7cf1d7 100644
--- a/third_party/nixpkgs/pkgs/tools/typesetting/biblatex-check/default.nix
+++ b/third_party/nixpkgs/pkgs/tools/typesetting/biblatex-check/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchFromGitHub, python }:
+{ lib, stdenv, fetchFromGitHub, python3 }:
stdenv.mkDerivation {
pname = "biblatex-check";
@@ -11,7 +11,9 @@ stdenv.mkDerivation {
sha256 = "1bq0yqckhssazwkivipdjmn1jpsf301i4ppyl88qhc5igx39wg25";
};
- buildInputs = [ python ];
+ buildInputs = [ python3 ];
+
+ strictDeps = true;
installPhase = ''
install -Dm755 biblatex_check.py $out/bin/biblatex-check
diff --git a/third_party/nixpkgs/pkgs/tools/typesetting/multimarkdown/default.nix b/third_party/nixpkgs/pkgs/tools/typesetting/multimarkdown/default.nix
index 45be070932..6dfbc82af3 100644
--- a/third_party/nixpkgs/pkgs/tools/typesetting/multimarkdown/default.nix
+++ b/third_party/nixpkgs/pkgs/tools/typesetting/multimarkdown/default.nix
@@ -1,25 +1,34 @@
-{ lib, stdenv, fetchgit, perl }:
+{ lib
+, stdenv
+, fetchFromGitHub
+, cmake
+, perl
+, pkg-config
+}:
-stdenv.mkDerivation {
+stdenv.mkDerivation rec {
pname = "multimarkdown";
- version = "4.7.1";
+ version = "6.6.0";
- src = fetchgit {
- url = "https://github.com/fletcher/MultiMarkdown-4.git";
- fetchSubmodules = true;
- rev = "dd060247518715ef2b52be22b8f49d0e6d2c3a8b";
- sha256 = "11f246r30q2fx4xw7valhqjj4mc4ydj5fv5f2kbl5h93y69q0bw7";
+ src = fetchFromGitHub {
+ owner = "fletcher";
+ repo = "MultiMarkdown-6";
+ rev = version;
+ hash = "sha256-emJbY0wucoc/GdjlILoeqjwuwuPpTjXTqZN0gUKOyLg=";
};
- preBuild = ''
- substituteInPlace enumsToPerl.pl --replace "/usr/bin/perl" "${perl}/bin/perl"
+ postPatch = ''
+ patchShebangs tools/enumsToPerl.pl
'';
- buildInputs = [ stdenv ];
- checkPhase = "make test-all";
- installPhase = "make pkg-install prefix='' DESTDIR=$out; make pkg-install-scripts prefix='' DESTDIR=$out";
+ nativeBuildInputs = [
+ cmake
+ perl
+ pkg-config
+ ];
meta = with lib; {
+ homepage = "https://fletcher.github.io/MultiMarkdown-6/introduction.html";
description = "A derivative of Markdown that adds new syntax features";
longDescription = ''
MultiMarkdown is a lightweight markup language created by
@@ -30,23 +39,20 @@ stdenv.mkDerivation {
It adds the following features to Markdown:
- footnotes
- tables
- citations and bibliography (works best in LaTeX using BibTeX)
- math support
- automatic cross-referencing ability
- smart typography, with support for multiple languages
- image attributes
- table and image captions
- definition lists
- glossary entries (LaTeX only)
- document metadata (e.g. title, author, date, etc.)
+ - footnotes
+ - tables
+ - citations and bibliography (works best in LaTeX using BibTeX)
+ - math support
+ - automatic cross-referencing ability
+ - smart typography, with support for multiple languages
+ - image attributes
+ - table and image captions
+ - definition lists
+ - glossary entries (LaTeX only)
+ - document metadata (e.g. title, author, date, etc.)
'';
- homepage = "https://fletcherpenney.net/multimarkdown/";
- # licensed under GPLv2+ or MIT:
- # https://raw.githubusercontent.com/fletcher/MultiMarkdown-4/master/LICENSE
- license = with lib.licenses; [ gpl2Plus mit ];
+ license = with licenses; [ mit ];
platforms = platforms.all;
- maintainers = with lib.maintainers; [ lowfatcomputing ];
+ maintainers = with maintainers; [ AndersonTorres ];
};
}
diff --git a/third_party/nixpkgs/pkgs/tools/virtualization/shipyard/default.nix b/third_party/nixpkgs/pkgs/tools/virtualization/shipyard/default.nix
index 14fda991f5..10a270b484 100644
--- a/third_party/nixpkgs/pkgs/tools/virtualization/shipyard/default.nix
+++ b/third_party/nixpkgs/pkgs/tools/virtualization/shipyard/default.nix
@@ -2,15 +2,15 @@
buildGoModule rec {
pname = "shipyard";
- version = "0.2.15";
+ version = "0.3.1";
src = fetchFromGitHub {
rev = "v${version}";
owner = "shipyard-run";
repo = pname;
- sha256 = "sha256-QJn1A2l9bK4jUObnKfzO9/2LxY9i+ueGlZiefqCYZKA=";
+ sha256 = "sha256-zN9anlm+KbSbFKphC8mLaK+w8cOuOSKrVw5YGNCjEeA=";
};
- vendorSha256 = "sha256-bpPFtyDPelLfpxU5OGkEPrp6EvERThg1TzAQ6otg8B0=";
+ vendorSha256 = "sha256-tTkPFftPDNXafIjAjNg6V6e/+2S/v5Do/YyAXPaGIqA=";
buildFlagsArray = [
"-ldflags=-s -w -X main.version=${version}"
diff --git a/third_party/nixpkgs/pkgs/tools/wayland/swaycwd/default.nix b/third_party/nixpkgs/pkgs/tools/wayland/swaycwd/default.nix
new file mode 100644
index 0000000000..36e223f8d4
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/tools/wayland/swaycwd/default.nix
@@ -0,0 +1,45 @@
+{ lib, nim, stdenv, fetchFromGitLab
+, enableShells ? [ "bash" "zsh" "fish" "sh" "posh" ]
+}:
+
+stdenv.mkDerivation {
+ name = "swaycwd";
+ version = "0.0.1";
+
+ src = fetchFromGitLab {
+ owner = "cab404";
+ repo = "swaycwd";
+ rev = "aca81695ec2102b9bca6f5bae364f69a8b9d399f";
+ hash = "sha256-MkyY3wWByQo0l0J28xKDfGtxfazVPRyZHCObl9Fszh4=";
+ };
+
+ configurePhase = ''
+ runHook preConfigure
+ {
+ echo 'let enabledShells: seq[string] = @${builtins.toJSON enableShells}'
+ echo 'export enabledShells'
+ } > shells.nim
+ runHook postConfigure
+ '';
+
+ nativeBuildInputs = [ nim ];
+
+ buildPhase = ''
+ export HOME=$TMPDIR
+ nim c --opt:speed -d:release swaycwd.nim
+ '';
+
+ installPhase = ''
+ runHook preInstall
+ install -D -m555 -t $out/bin swaycwd
+ runHook postInstall
+ '';
+
+ meta = with lib; {
+ homepage = "https://gitlab.com/cab404/swaycwd";
+ description = "Returns cwd for shell in currently focused sway window, or home directory if cannot find shell";
+ maintainers = with maintainers; [ cab404 ];
+ platforms = platforms.linux;
+ license = licenses.gpl3Only;
+ };
+}
diff --git a/third_party/nixpkgs/pkgs/top-level/aliases.nix b/third_party/nixpkgs/pkgs/top-level/aliases.nix
index 6795cedf94..0409146629 100644
--- a/third_party/nixpkgs/pkgs/top-level/aliases.nix
+++ b/third_party/nixpkgs/pkgs/top-level/aliases.nix
@@ -92,6 +92,7 @@ mapAliases ({
cargo-tree = throw "cargo-tree has been removed, use the builtin `cargo tree` command instead."; # added 2020-08-20
casperjs = throw "casperjs has been removed, it was abandoned by upstream and broken.";
catfish = xfce.catfish; # added 2019-12-22
+ ccnet = throw "ccnet has been removed because seafile does not depend on it anymore"; # added 2021-03-25
cgmanager = throw "cgmanager was deprecated by lxc and therefore removed from nixpkgs."; # added 2020-06-05
checkbashism = checkbashisms; # added 2016-08-16
chronos = throw "chronos has been removed from nixpkgs, as it was unmaintained"; # added 2020-08-15
@@ -99,6 +100,16 @@ mapAliases ({
cinepaint = throw "cinepaint has been removed from nixpkgs, as it was unmaintained"; # added 2019-12-10
cifs_utils = cifs-utils; # added 2016-08
ckb = ckb-next; # added 2018-10-21
+
+ # these are for convenience, not for backward compat and shouldn't expire
+ clang5Stdenv = lowPrio llvmPackages_5.stdenv;
+ clang6Stdenv = lowPrio llvmPackages_6.stdenv;
+ clang7Stdenv = lowPrio llvmPackages_7.stdenv;
+ clang8Stdenv = lowPrio llvmPackages_8.stdenv;
+ clang9Stdenv = lowPrio llvmPackages_9.stdenv;
+ clang10Stdenv = lowPrio llvmPackages_10.stdenv;
+ clang11Stdenv = lowPrio llvmPackages_11.stdenv;
+
clangAnalyzer = clang-analyzer; # added 2015-02-20
clawsMail = claws-mail; # added 2016-04-29
clutter_gtk = clutter-gtk; # added 2018-02-25
@@ -139,9 +150,6 @@ mapAliases ({
dbus_glib = dbus-glib; # added 2018-02-25
dbus_libs = dbus; # added 2018-04-25
diffuse = throw "diffuse has been removed from nixpkgs, as it's unmaintained"; # added 2019-12-10
- disnix = throw "disnix has been removed."; # added 2021-01-27
- disnixos = throw "disnixos has been removed."; # added 2021-01-27
- DisnixWebService = throw "DisnixWebService has been removed."; # added 2021-01-27
dbus_tools = dbus.out; # added 2018-04-25
deadbeef-mpris2-plugin = deadbeefPlugins.mpris2; # added 2018-02-23
deadpixi-sam = deadpixi-sam-unstable;
@@ -158,8 +166,6 @@ mapAliases ({
docker_compose = docker-compose; # 2018-11-10
draftsight = throw "draftsight has been removed, no longer available as freeware"; # added 2020-08-14
dvb_apps = throw "dvb_apps has been removed."; # added 2020-11-03
- dydisnix = throw "dydisnix has been removed."; # added 2021-01-27
- dysnomia = throw "dysnomia has been removed."; # added 2021-01-27
dwarf_fortress = dwarf-fortress; # added 2016-01-23
dwm-git = throw "dwm-git has been removed from nixpkgs, as it had no updates for 2 years not serving it's purpose."; # added 2021-02-07
elasticmq = throw "elasticmq has been removed in favour of elasticmq-server-bin"; # added 2021-01-17
@@ -302,6 +308,7 @@ mapAliases ({
inboxer = throw "inboxer has been removed as it is no longer maintained and no longer works as Google shut down the inbox service this package wrapped.";
infiniband-diags = rdma-core; # added 2019-08-09
inotifyTools = inotify-tools;
+ inter-ui = inter; # added 2021-03-27
i-score = throw "i-score has been removed: abandoned upstream."; # added 2020-11-21
jamomacore = throw "jamomacore has been removed: abandoned upstream."; # added 2020-11-21
jbidwatcher = throw "jbidwatcher was discontinued in march 2021"; # added 2021-03-15
@@ -564,6 +571,7 @@ mapAliases ({
procps-ng = procps; # added 2018-06-08
prometheus-cups-exporter = throw "outdated and broken by design; removed by developer."; # added 2021-03-16
pygmentex = texlive.bin.pygmentex; # added 2019-12-15
+ pyload = throw "pyload has been removed from nixpkgs, as it was unmaintained."; # added 2021-03-21
pyo3-pack = maturin;
pmenu = throw "pmenu has been removed from nixpkgs, as its maintainer is no longer interested in the package."; # added 2019-12-10
pulseaudioLight = pulseaudio; # added 2018-04-25
@@ -694,6 +702,7 @@ mapAliases ({
speedtest_cli = speedtest-cli; # added 2015-02-17
spice_gtk = spice-gtk; # added 2018-02-25
spice_protocol = spice-protocol; # added 2018-02-25
+ spidermonkey_38 = throw "spidermonkey_38 has been removed. Please use spidermonkey_78 instead."; # added 2021-03-21
spidermonkey_52 = throw "spidermonkey_52 has been removed. Please use spidermonkey_78 instead."; # added 2019-10-16
spidermonkey_60 = throw "spidermonkey_60 has been removed. Please use spidermonkey_78 instead."; # added 2021-03-21
spring-boot = spring-boot-cli; # added 2020-04-24
diff --git a/third_party/nixpkgs/pkgs/top-level/all-packages.nix b/third_party/nixpkgs/pkgs/top-level/all-packages.nix
index 0bdccaeb3f..6b22227ce4 100644
--- a/third_party/nixpkgs/pkgs/top-level/all-packages.nix
+++ b/third_party/nixpkgs/pkgs/top-level/all-packages.nix
@@ -168,6 +168,8 @@ in
breakpad = callPackage ../development/misc/breakpad { };
+ buf = callPackage ../development/tools/buf { };
+
# Zip file format only allows times after year 1980, which makes e.g. Python wheel building fail with:
# ValueError: ZIP does not support timestamps before 1980
ensureNewerSourcesForZipFilesHook = ensureNewerSourcesHook { year = "1980"; };
@@ -1046,6 +1048,8 @@ in
awslogs = callPackage ../tools/admin/awslogs { };
+ aws-lambda-rie = callPackage ../tools/admin/aws-lambda-runtime-interface-emulator { };
+
aws-env = callPackage ../tools/admin/aws-env { };
aws-google-auth = python3Packages.callPackage ../tools/admin/aws-google-auth { };
@@ -1130,6 +1134,8 @@ in
barman = python3Packages.callPackage ../tools/misc/barman { };
+ bashate = python3Packages.callPackage ../development/tools/bashate { };
+
bash-my-aws = callPackage ../tools/admin/bash-my-aws { };
bashcards = callPackage ../tools/misc/bashcards { };
@@ -1138,6 +1144,8 @@ in
bcachefs-tools = callPackage ../tools/filesystems/bcachefs-tools { };
+ bit = callPackage ../applications/version-management/git-and-tools/bit { };
+
bitwarden = callPackage ../tools/security/bitwarden { };
inherit (nodePackages) bitwarden-cli;
@@ -1161,6 +1169,8 @@ in
bonfire = callPackage ../tools/misc/bonfire { };
+ botamusique = callPackage ../tools/audio/botamusique { };
+
boulder = callPackage ../tools/admin/boulder { };
btrfs-heatmap = callPackage ../tools/filesystems/btrfs-heatmap { };
@@ -1227,6 +1237,8 @@ in
corsmisc = callPackage ../tools/security/corsmisc { };
+ cosign = callPackage ../tools/security/cosign { };
+
cozy = callPackage ../applications/audio/cozy-audiobooks { };
cpuid = callPackage ../os-specific/linux/cpuid { };
@@ -1605,7 +1617,7 @@ in
b3sum = callPackage ../tools/security/b3sum {};
- backblaze-b2 = python.pkgs.callPackage ../development/tools/backblaze-b2 { };
+ backblaze-b2 = callPackage ../development/tools/backblaze-b2 { };
bandwhich = callPackage ../tools/networking/bandwhich {
inherit (darwin.apple_sdk.frameworks) Security;
@@ -1932,8 +1944,6 @@ in
cbor-diag = callPackage ../development/tools/cbor-diag { };
- ccnet = callPackage ../tools/networking/ccnet { };
-
cassowary = callPackage ../tools/networking/cassowary { };
croc = callPackage ../tools/networking/croc { };
@@ -2040,6 +2050,8 @@ in
swaykbdd = callPackage ../tools/wayland/swaykbdd { };
+ swaycwd = callPackage ../tools/wayland/swaycwd { };
+
wayland-utils = callPackage ../tools/wayland/wayland-utils { };
wev = callPackage ../tools/wayland/wev { };
@@ -2379,6 +2391,8 @@ in
fileshelter = callPackage ../servers/web-apps/fileshelter { };
+ fioctl = callPackage ../tools/admin/fioctl { };
+
firecracker = callPackage ../applications/virtualization/firecracker { };
firectl = callPackage ../applications/virtualization/firectl { };
@@ -2832,6 +2846,7 @@ in
procs = callPackage ../tools/admin/procs {
inherit (darwin.apple_sdk.frameworks) Security;
+ inherit (darwin) libiconv;
};
psrecord = python3Packages.callPackage ../tools/misc/psrecord {};
@@ -3133,9 +3148,7 @@ in
librsync = librsync_0_9;
};
- bud = callPackage ../tools/networking/bud {
- inherit (pythonPackages) gyp;
- };
+ bud = callPackage ../tools/networking/bud { };
bump2version = python37Packages.callPackage ../applications/version-management/git-and-tools/bump2version { };
@@ -3261,6 +3274,7 @@ in
clementine = libsForQt514.callPackage ../applications/audio/clementine {
gst_plugins =
with gst_all_1; [ gst-plugins-base gst-plugins-good gst-plugins-ugly gst-libav ];
+ protobuf = protobuf3_14;
};
clementineUnfree = clementine.unfree;
@@ -3273,7 +3287,7 @@ in
circus = callPackage ../tools/networking/circus { };
- citrix_workspace = citrix_workspace_21_01_0;
+ citrix_workspace = citrix_workspace_21_03_0;
inherit (callPackage ../applications/networking/remote/citrix-workspace { })
citrix_workspace_20_04_0
@@ -3282,6 +3296,7 @@ in
citrix_workspace_20_10_0
citrix_workspace_20_12_0
citrix_workspace_21_01_0
+ citrix_workspace_21_03_0
;
citra = libsForQt5.callPackage ../misc/emulators/citra { };
@@ -3356,6 +3371,8 @@ in
usbview = callPackage ../tools/misc/usbview { };
+ uwuify = callPackage ../tools/misc/uwuify { };
+
anthy = callPackage ../tools/inputmethods/anthy { };
evdevremapkeys = callPackage ../tools/inputmethods/evdevremapkeys { };
@@ -3385,9 +3402,7 @@ in
skktools = callPackage ../tools/inputmethods/skk/skktools { };
skk-dicts = callPackage ../tools/inputmethods/skk/skk-dicts { };
- libkkc-data = callPackage ../data/misc/libkkc-data {
- inherit (pythonPackages) marisa;
- };
+ libkkc-data = callPackage ../data/misc/libkkc-data { };
libkkc = callPackage ../tools/inputmethods/libkkc { };
@@ -4031,6 +4046,7 @@ in
wrangler = callPackage ../development/tools/wrangler {
inherit (darwin.apple_sdk.frameworks) CoreFoundation CoreServices Security;
+ inherit (darwin) libiconv;
};
wsl-open = callPackage ../tools/misc/wsl-open { };
@@ -4152,9 +4168,7 @@ in
epsxe = callPackage ../misc/emulators/epsxe { };
- escrotum = callPackage ../tools/graphics/escrotum {
- inherit (pythonPackages) buildPythonApplication pygtk numpy;
- };
+ escrotum = callPackage ../tools/graphics/escrotum { };
etcher = callPackage ../tools/misc/etcher { };
@@ -4407,6 +4421,8 @@ in
flamegraph = callPackage ../development/tools/flamegraph { };
+ flawfinder = callPackage ../development/tools/flawfinder { };
+
flips = callPackage ../tools/compression/flips { };
fmbt = callPackage ../development/tools/fmbt {
@@ -4791,6 +4807,8 @@ in
gitfs = callPackage ../tools/filesystems/gitfs { };
+ github-backup = callPackage ../tools/misc/github-backup { };
+
gitin = callPackage ../applications/version-management/git-and-tools/gitin { };
gitinspector = callPackage ../applications/version-management/gitinspector { };
@@ -6858,6 +6876,8 @@ in
nzbhydra2 = callPackage ../servers/nzbhydra2 { };
+ oapi-codegen = callPackage ../tools/networking/oapi-codegen { };
+
oathToolkit = callPackage ../tools/security/oath-toolkit { };
oatpp = callPackage ../development/libraries/oatpp { };
@@ -6880,6 +6900,10 @@ in
openfortivpn = callPackage ../tools/networking/openfortivpn { };
+ opensnitch = callPackage ../tools/networking/opensnitch/daemon.nix { };
+
+ opensnitch-ui = libsForQt5.callPackage ../tools/networking/opensnitch/ui.nix { };
+
obexfs = callPackage ../tools/bluetooth/obexfs { };
obexftp = callPackage ../tools/bluetooth/obexftp { };
@@ -8086,6 +8110,8 @@ in
sipsak = callPackage ../tools/networking/sipsak { };
+ sipvicious = python3Packages.callPackage ../tools/security/sipvicious { };
+
siril = callPackage ../applications/science/astronomy/siril { };
sisco.lv2 = callPackage ../applications/audio/sisco.lv2 { };
@@ -8773,6 +8799,8 @@ in
tydra = callPackage ../tools/misc/tydra { };
+ tz = callPackage ../tools/misc/tz { };
+
u9fs = callPackage ../servers/u9fs { };
ua = callPackage ../tools/networking/ua { };
@@ -9671,6 +9699,24 @@ in
jdk = jdk8; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731
};
+ adoptopenjdk-bin-16-packages-linux = import ../development/compilers/adoptopenjdk-bin/jdk16-linux.nix;
+ adoptopenjdk-bin-16-packages-darwin = import ../development/compilers/adoptopenjdk-bin/jdk16-darwin.nix;
+
+ adoptopenjdk-hotspot-bin-16 = if stdenv.isLinux
+ then callPackage adoptopenjdk-bin-16-packages-linux.jdk-hotspot {}
+ else callPackage adoptopenjdk-bin-16-packages-darwin.jdk-hotspot {};
+ adoptopenjdk-jre-hotspot-bin-16 = if stdenv.isLinux
+ then callPackage adoptopenjdk-bin-16-packages-linux.jre-hotspot {}
+ else callPackage adoptopenjdk-bin-16-packages-darwin.jre-hotspot {};
+
+ adoptopenjdk-openj9-bin-16 = if stdenv.isLinux
+ then callPackage adoptopenjdk-bin-16-packages-linux.jdk-openj9 {}
+ else callPackage adoptopenjdk-bin-16-packages-darwin.jdk-openj9 {};
+
+ adoptopenjdk-jre-openj9-bin-16 = if stdenv.isLinux
+ then callPackage adoptopenjdk-bin-16-packages-linux.jre-openj9 {}
+ else callPackage adoptopenjdk-bin-16-packages-darwin.jre-openj9 {};
+
adoptopenjdk-bin-15-packages-linux = import ../development/compilers/adoptopenjdk-bin/jdk15-linux.nix;
adoptopenjdk-bin-15-packages-darwin = import ../development/compilers/adoptopenjdk-bin/jdk15-darwin.nix;
@@ -10392,10 +10438,13 @@ in
graphviz = graphviz-nox;
});
- inherit (callPackage ../development/compilers/haxe {
- ocamlPackages = ocaml-ng.ocamlPackages_4_05;
- }) haxe_3_2 haxe_3_4;
- haxe = haxe_3_4;
+ inherit (callPackage ../development/compilers/haxe { })
+ haxe_4_2
+ haxe_3_4
+ haxe_3_2
+ ;
+
+ haxe = haxe_4_2;
haxePackages = recurseIntoAttrs (callPackage ./haxe-packages.nix { });
inherit (haxePackages) hxcpp;
@@ -10743,7 +10792,7 @@ in
llvm_6 = llvmPackages_6.llvm;
llvm_5 = llvmPackages_5.llvm;
- llvmPackages = recurseIntoAttrs (with targetPlatform;
+ llvmPackages = with targetPlatform;
if isDarwin then
llvmPackages_7
else if isFreeBSD then
@@ -10753,55 +10802,55 @@ in
else if isWasm then
llvmPackages_8
else
- llvmPackages_latest);
+ llvmPackages_latest;
- llvmPackages_5 = callPackage ../development/compilers/llvm/5 {
+ llvmPackages_5 = recurseIntoAttrs (callPackage ../development/compilers/llvm/5 {
inherit (stdenvAdapters) overrideCC;
buildLlvmTools = buildPackages.llvmPackages_5.tools;
targetLlvmLibraries = targetPackages.llvmPackages_5.libraries;
- };
+ });
- llvmPackages_6 = callPackage ../development/compilers/llvm/6 {
+ llvmPackages_6 = recurseIntoAttrs (callPackage ../development/compilers/llvm/6 {
inherit (stdenvAdapters) overrideCC;
buildLlvmTools = buildPackages.llvmPackages_6.tools;
targetLlvmLibraries = targetPackages.llvmPackages_6.libraries;
- };
+ });
- llvmPackages_7 = callPackage ../development/compilers/llvm/7 {
+ llvmPackages_7 = recurseIntoAttrs (callPackage ../development/compilers/llvm/7 {
inherit (stdenvAdapters) overrideCC;
buildLlvmTools = buildPackages.llvmPackages_7.tools;
targetLlvmLibraries = targetPackages.llvmPackages_7.libraries;
- };
+ });
- llvmPackages_8 = callPackage ../development/compilers/llvm/8 {
+ llvmPackages_8 = recurseIntoAttrs (callPackage ../development/compilers/llvm/8 {
inherit (stdenvAdapters) overrideCC;
buildLlvmTools = buildPackages.llvmPackages_8.tools;
targetLlvmLibraries = targetPackages.llvmPackages_8.libraries;
- };
+ });
- llvmPackages_9 = callPackage ../development/compilers/llvm/9 {
+ llvmPackages_9 = recurseIntoAttrs (callPackage ../development/compilers/llvm/9 {
inherit (stdenvAdapters) overrideCC;
buildLlvmTools = buildPackages.llvmPackages_9.tools;
targetLlvmLibraries = targetPackages.llvmPackages_9.libraries;
- };
+ });
- llvmPackages_10 = callPackage ../development/compilers/llvm/10 {
+ llvmPackages_10 = recurseIntoAttrs (callPackage ../development/compilers/llvm/10 {
inherit (stdenvAdapters) overrideCC;
buildLlvmTools = buildPackages.llvmPackages_10.tools;
targetLlvmLibraries = targetPackages.llvmPackages_10.libraries;
- };
+ });
- llvmPackages_11 = callPackage ../development/compilers/llvm/11 ({
+ llvmPackages_11 = recurseIntoAttrs (callPackage ../development/compilers/llvm/11 ({
inherit (stdenvAdapters) overrideCC;
buildLlvmTools = buildPackages.llvmPackages_11.tools;
targetLlvmLibraries = targetPackages.llvmPackages_11.libraries;
} // lib.optionalAttrs (stdenv.hostPlatform.isi686 && buildPackages.stdenv.cc.isGNU) {
stdenv = gcc7Stdenv;
- });
+ }));
llvmPackages_latest = llvmPackages_11;
- llvmPackages_rocm = callPackage ../development/compilers/llvm/rocm { };
+ llvmPackages_rocm = recurseIntoAttrs (callPackage ../development/compilers/llvm/rocm { });
lorri = callPackage ../tools/misc/lorri {
inherit (darwin.apple_sdk.frameworks) CoreServices Security;
@@ -10875,9 +10924,8 @@ in
muon = callPackage ../development/compilers/muon { };
- nim = callPackage ../development/compilers/nim { };
- nim-unwrapped = nim.unwrapped;
- nimble-unwrapped = nim.nimble-unwrapped;
+ inherit (callPackages ../development/compilers/nim { })
+ nim-unwrapped nimble-unwrapped nim;
nrpl = callPackage ../development/tools/nrpl { };
@@ -11156,9 +11204,11 @@ in
sagittarius-scheme = callPackage ../development/compilers/sagittarius-scheme {};
sbclBootstrap = callPackage ../development/compilers/sbcl/bootstrap.nix {};
+ sbcl_2_0_8 = callPackage ../development/compilers/sbcl/2.0.8.nix {};
sbcl_2_0_9 = callPackage ../development/compilers/sbcl/2.0.9.nix {};
sbcl_2_1_1 = callPackage ../development/compilers/sbcl/2.1.1.nix {};
- sbcl = callPackage ../development/compilers/sbcl {};
+ sbcl_2_1_2 = callPackage ../development/compilers/sbcl/2.1.2.nix {};
+ sbcl = sbcl_2_1_2;
scala_2_10 = callPackage ../development/compilers/scala/2.x.nix { majorVersion = "2.10"; jre = jdk8; };
scala_2_11 = callPackage ../development/compilers/scala/2.x.nix { majorVersion = "2.11"; jre = jdk8; };
@@ -11206,7 +11256,9 @@ in
jdk = oraclejdk;
};
- sqlx-cli = callPackage ../development/tools/rust/sqlx-cli { };
+ sqlx-cli = callPackage ../development/tools/rust/sqlx-cli {
+ inherit (darwin.apple_sdk.frameworks) SystemConfiguration CoreFoundation Security;
+ };
squeak = callPackage ../development/compilers/squeak { };
@@ -11802,11 +11854,6 @@ in
sparkleshare = callPackage ../applications/version-management/sparkleshare { };
spidermonkey_1_8_5 = callPackage ../development/interpreters/spidermonkey/1.8.5.nix { };
- spidermonkey_38 = callPackage ../development/interpreters/spidermonkey/38.nix ({
- inherit (darwin) libobjc;
- } // (lib.optionalAttrs (stdenv.hostPlatform.isi686 && stdenv.cc.isGNU) {
- stdenv = gcc6Stdenv; # with gcc-7: undefined reference to `__divmoddi4'
- }));
spidermonkey_68 = callPackage ../development/interpreters/spidermonkey/68.nix { };
spidermonkey_78 = callPackage ../development/interpreters/spidermonkey/78.nix { };
@@ -12545,7 +12592,7 @@ in
jdk = jdk8; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731
};
- fedpkg = pythonPackages.callPackage ../development/tools/fedpkg { };
+ fedpkg = callPackage ../development/tools/fedpkg { };
flex_2_5_35 = callPackage ../development/tools/parsing/flex/2.5.35.nix { };
flex = callPackage ../development/tools/parsing/flex { };
@@ -13302,6 +13349,8 @@ in
vtable-dumper = callPackage ../development/tools/misc/vtable-dumper { };
+ whatsapp-for-linux = callPackage ../applications/networking/instant-messengers/whatsapp-for-linux { };
+
whatstyle = callPackage ../development/tools/misc/whatstyle {
inherit (llvmPackages) clang-unwrapped;
};
@@ -16771,7 +16820,7 @@ in
qt515 = recurseIntoAttrs (makeOverridable
(import ../development/libraries/qt-5/5.15) {
inherit newScope;
- inherit lib stdenv fetchurl fetchpatch fetchFromGitHub makeSetupHook makeWrapper;
+ inherit lib stdenv fetchurl fetchpatch fetchgit fetchFromGitHub makeSetupHook makeWrapper;
inherit bison;
inherit cups;
inherit dconf;
@@ -17905,6 +17954,10 @@ in
};
quicklispPackagesClisp = dontRecurseIntoAttrs (quicklispPackagesFor (wrapLisp clisp));
quicklispPackagesSBCL = dontRecurseIntoAttrs (quicklispPackagesFor (wrapLisp sbcl));
+ quicklispPackagesECL = dontRecurseIntoAttrs (quicklispPackagesFor (wrapLisp ecl));
+ quicklispPackagesCCL = dontRecurseIntoAttrs (quicklispPackagesFor (wrapLisp ccl));
+ quicklispPackagesABCL = dontRecurseIntoAttrs (quicklispPackagesFor (wrapLisp abcl));
+ quicklispPackagesGCL = dontRecurseIntoAttrs (quicklispPackagesFor (wrapLisp gcl));
quicklispPackages = quicklispPackagesSBCL;
### DEVELOPMENT / PERL MODULES
@@ -17998,7 +18051,7 @@ in
mod_dnssd = callPackage ../servers/http/apache-modules/mod_dnssd { };
- mod_evasive = callPackage ../servers/http/apache-modules/mod_evasive { };
+ mod_evasive = throw "mod_evasive is not supported on Apache httpd 2.4";
mod_perl = callPackage ../servers/http/apache-modules/mod_perl { };
@@ -18017,7 +18070,7 @@ in
subversion = pkgs.subversion.override { httpServer = true; inherit apacheHttpd; };
};
- apacheHttpdPackages_2_4 = dontRecurseIntoAttrs (apacheHttpdPackagesFor pkgs.apacheHttpd_2_4 pkgs.apacheHttpdPackages_2_4);
+ apacheHttpdPackages_2_4 = recurseIntoAttrs (apacheHttpdPackagesFor pkgs.apacheHttpd_2_4 pkgs.apacheHttpdPackages_2_4);
apacheHttpdPackages = apacheHttpdPackages_2_4;
appdaemon = callPackage ../servers/home-assistant/appdaemon.nix { };
@@ -19030,6 +19083,7 @@ in
zabbixFor = version: rec {
agent = (callPackages ../servers/monitoring/zabbix/agent.nix {}).${version};
+ agent2 = (callPackages ../servers/monitoring/zabbix/agent2.nix {}).${version};
proxy-mysql = (callPackages ../servers/monitoring/zabbix/proxy.nix { mysqlSupport = true; }).${version};
proxy-pgsql = (callPackages ../servers/monitoring/zabbix/proxy.nix { postgresqlSupport = true; }).${version};
proxy-sqlite = (callPackages ../servers/monitoring/zabbix/proxy.nix { sqliteSupport = true; }).${version};
@@ -19281,7 +19335,7 @@ in
fusePackages = dontRecurseIntoAttrs (callPackage ../os-specific/linux/fuse {
util-linux = util-linuxMinimal;
});
- fuse = lowPrio fusePackages.fuse_2;
+ fuse = lowPrio (if stdenv.isDarwin then macfuse-stubs else fusePackages.fuse_2);
fuse3 = fusePackages.fuse_3;
fuse-common = hiPrio fusePackages.fuse_3.common;
@@ -19420,12 +19474,15 @@ in
macfuse-stubs = callPackage ../os-specific/darwin/macfuse {
inherit (darwin) libtapi;
+ inherit (darwin.apple_sdk.frameworks) DiskArbitration;
};
osxsnarf = callPackage ../os-specific/darwin/osxsnarf { };
power-calibrate = callPackage ../os-specific/linux/power-calibrate { };
+ powercap = callPackage ../os-specific/linux/powercap { };
+
powerstat = callPackage ../os-specific/linux/powerstat { };
smemstat = callPackage ../os-specific/linux/smemstat { };
@@ -19879,7 +19936,7 @@ in
# Hardened Linux
hardenedLinuxPackagesFor = kernel': overrides:
let # Note: We use this hack since the hardened patches can lag behind and we don't want to delay updates:
- linux_latest_for_hardened = pkgs.linux_5_10;
+ linux_latest_for_hardened = pkgs.linux_5_11;
kernel = (if kernel' == pkgs.linux_latest then linux_latest_for_hardened else kernel').override overrides;
in linuxPackagesFor (kernel.override {
structuredExtraConfig = import ../os-specific/linux/kernel/hardened/config.nix {
@@ -20539,6 +20596,8 @@ in
v4l-utils = qt5.callPackage ../os-specific/linux/v4l-utils { };
+ vendir = callPackage ../development/tools/vendir { };
+
vndr = callPackage ../development/tools/vndr { };
windows = callPackages ../os-specific/windows {};
@@ -21140,6 +21199,8 @@ in
papis = with python3Packages; toPythonApplication papis;
+ paperlike-go = callPackage ../tools/misc/paperlike-go { };
+
paps = callPackage ../tools/misc/paps { };
pecita = callPackage ../data/fonts/pecita {};
@@ -21296,7 +21357,6 @@ in
maligned = callPackage ../development/tools/maligned { };
- inter-ui = callPackage ../data/fonts/inter-ui { };
inter = callPackage ../data/fonts/inter { };
scientifica = callPackage ../data/fonts/scientifica { };
@@ -21430,6 +21490,8 @@ in
vistafonts-chs = callPackage ../data/fonts/vista-fonts-chs { };
+ vollkorn = callPackage ../data/fonts/vollkorn { };
+
weather-icons = callPackage ../data/fonts/weather-icons { };
wireless-regdb = callPackage ../data/misc/wireless-regdb { };
@@ -21691,6 +21753,8 @@ in
bandwidth = callPackage ../tools/misc/bandwidth { };
+ banking = callPackage ../applications/office/banking { };
+
baresip = callPackage ../applications/networking/instant-messengers/baresip { };
barrier = libsForQt5.callPackage ../applications/misc/barrier {};
@@ -21849,6 +21913,8 @@ in
catfs = callPackage ../os-specific/linux/catfs { };
+ catgirl = callPackage ../applications/networking/irc/catgirl { };
+
catimg = callPackage ../tools/misc/catimg { };
catt = callPackage ../applications/video/catt { };
@@ -22557,6 +22623,14 @@ in
grandorgue = callPackage ../applications/audio/grandorgue { };
+ greetd = recurseIntoAttrs {
+ greetd = callPackage ../os-specific/linux/greetd { };
+ gtkgreet = callPackage ../os-specific/linux/gtkgreet { };
+ dlm = callPackage ../os-specific/linux/dlm { };
+ wlgreet = callPackage ../os-specific/linux/wlgreet { };
+ tuigreet = callPackage ../os-specific/linux/tuigreet { };
+ };
+
goldendict = libsForQt5.callPackage ../applications/misc/goldendict {
inherit (darwin) libiconv;
};
@@ -23635,6 +23709,8 @@ in
kubecfg = callPackage ../applications/networking/cluster/kubecfg { };
+ kube-score = callPackage ../applications/networking/cluster/kube-score { };
+
kubeval = callPackage ../applications/networking/cluster/kubeval { };
kubeval-schema = callPackage ../applications/networking/cluster/kubeval/schema.nix { };
@@ -23645,6 +23721,8 @@ in
kubernix = callPackage ../applications/networking/cluster/kubernix { };
+ kubeconform = callPackage ../applications/networking/cluster/kubeconform { };
+
kubectl = callPackage ../applications/networking/cluster/kubectl { };
kubectl-doctor = callPackage ../applications/networking/cluster/kubectl-doctor { };
@@ -25293,6 +25371,8 @@ in
slop = callPackage ../tools/misc/slop {};
+ slowhttptest = callPackage ../tools/security/slowhttptest { };
+
slrn = callPackage ../applications/networking/newsreaders/slrn { };
sniproxy = callPackage ../applications/networking/sniproxy { };
@@ -26167,10 +26247,10 @@ in
wayfireApplications = wayfireApplications-unwrapped.withPlugins (plugins: [ plugins.wf-shell ]);
inherit (wayfireApplications) wayfire wcm;
- wayfireApplications-unwrapped = callPackage ../applications/window-managers/wayfire/applications.nix { };
- wayfirePlugins = callPackage ../applications/window-managers/wayfire/plugins.nix {
+ wayfireApplications-unwrapped = recurseIntoAttrs (callPackage ../applications/window-managers/wayfire/applications.nix { });
+ wayfirePlugins = recurseIntoAttrs (callPackage ../applications/window-managers/wayfire/plugins.nix {
inherit (wayfireApplications-unwrapped) wayfire;
- };
+ });
wf-config = callPackage ../applications/window-managers/wayfire/wf-config.nix { };
waypipe = callPackage ../applications/networking/remote/waypipe { };
@@ -26668,6 +26748,8 @@ in
zathura = callPackage ../applications/misc/zathura { };
+ zerobin = callPackage ../applications/networking/zerobin { };
+
zeroc-ice = callPackage ../development/libraries/zeroc-ice {
inherit (darwin.apple_sdk.frameworks) Security;
};
@@ -26684,7 +26766,9 @@ in
autoconf = buildPackages.autoconf269;
};
- zgrviewer = callPackage ../applications/graphics/zgrviewer {};
+ zgrab2 = callPackage ../tools/security/zgrab2 { };
+
+ zgrviewer = callPackage ../applications/graphics/zgrviewer { };
zgv = callPackage ../applications/graphics/zgv {
# Enable the below line for terminal display. Note
@@ -26805,6 +26889,8 @@ in
lndconnect = callPackage ../applications/blockchains/lndconnect { };
+ lndmanage = callPackage ../applications/blockchains/lndmanage.nix { };
+
monero = callPackage ../applications/blockchains/monero {
inherit (darwin.apple_sdk.frameworks) CoreData IOKit PCSC;
boost = boost17x;
@@ -26831,6 +26917,8 @@ in
ethabi = callPackage ../applications/blockchains/ethabi.nix { };
+ pycoin = with python3Packages; toPythonApplication pycoin;
+
stellar-core = callPackage ../applications/blockchains/stellar-core.nix { };
sumokoin = callPackage ../applications/blockchains/sumokoin.nix { boost = boost165; };
@@ -27449,6 +27537,11 @@ in
boost = boost166;
};
+ pinball = callPackage ../games/pinball {
+ autoreconfHook = with buildPackages;
+ autoreconfHook.override { automake = automake115x; };
+ };
+
pingus = callPackage ../games/pingus {};
pioneer = callPackage ../games/pioneer { };
@@ -28061,6 +28154,8 @@ in
bayescan = callPackage ../applications/science/biology/bayescan { };
+ bedops = callPackage ../applications/science/biology/bedops { };
+
bedtools = callPackage ../applications/science/biology/bedtools { };
bcftools = callPackage ../applications/science/biology/bcftools { };
@@ -28354,7 +28449,9 @@ in
osi = callPackage ../development/libraries/science/math/osi { };
- or-tools = callPackage ../development/libraries/science/math/or-tools { };
+ or-tools = callPackage ../development/libraries/science/math/or-tools {
+ abseil-cpp = abseil-cpp.override { static = true; };
+ };
rubiks = callPackage ../development/libraries/science/math/rubiks { };
@@ -28434,10 +28531,14 @@ in
dcmtk = callPackage ../applications/science/medicine/dcmtk { };
+ xmedcon = callPackage ../applications/science/medicine/xmedcon { };
+
### SCIENCE/PHYSICS
elmerfem = callPackage ../applications/science/physics/elmerfem {};
+ professor = callPackage ../applications/science/physics/professor { };
+
sacrifice = callPackage ../applications/science/physics/sacrifice {};
sherpa = callPackage ../applications/science/physics/sherpa {};
@@ -29574,6 +29675,18 @@ in
solfege = python3Packages.callPackage ../misc/solfege { };
+ disnix = callPackage ../tools/package-management/disnix { };
+
+ dysnomia = callPackage ../tools/package-management/disnix/dysnomia (config.disnix or {
+ inherit (pythonPackages) supervisor;
+ });
+
+ dydisnix = callPackage ../tools/package-management/disnix/dydisnix { };
+
+ disnixos = callPackage ../tools/package-management/disnix/disnixos { };
+
+ DisnixWebService = callPackage ../tools/package-management/disnix/DisnixWebService { };
+
lkproof = callPackage ../tools/typesetting/tex/lkproof { };
lice = python3Packages.callPackage ../tools/misc/lice {};
@@ -29651,10 +29764,10 @@ in
pykms = callPackage ../tools/networking/pykms { };
- pyload = callPackage ../applications/networking/pyload {};
-
pyupgrade = with python3Packages; toPythonApplication pyupgrade;
+ pwncat = python3Packages.callPackage ../tools/security/pwncat { };
+
pwntools = with python3Packages; toPythonApplication pwntools;
uae = callPackage ../misc/emulators/uae { };
@@ -30009,6 +30122,8 @@ in
pythonPackages = python3Packages;
};
+ wiki-js = callPackage ../servers/web-apps/wiki-js { };
+
winePackagesFor = wineBuild: lib.makeExtensible (self: with self; {
callPackage = newScope self;
@@ -30472,7 +30587,6 @@ in
zettlr = callPackage ../applications/misc/zettlr {
texlive = texlive.combined.scheme-medium;
- inherit (haskellPackages) pandoc-citeproc;
};
unifi-poller = callPackage ../servers/monitoring/unifi-poller {};
diff --git a/third_party/nixpkgs/pkgs/top-level/coq-packages.nix b/third_party/nixpkgs/pkgs/top-level/coq-packages.nix
index 1ded50ce76..0da4fea8f4 100644
--- a/third_party/nixpkgs/pkgs/top-level/coq-packages.nix
+++ b/third_party/nixpkgs/pkgs/top-level/coq-packages.nix
@@ -33,6 +33,7 @@ let
equations = callPackage ../development/coq-modules/equations { };
fiat_HEAD = callPackage ../development/coq-modules/fiat/HEAD.nix {};
flocq = callPackage ../development/coq-modules/flocq {};
+ fourcolor = callPackage ../development/coq-modules/fourcolor {};
gappalib = callPackage ../development/coq-modules/gappalib {};
heq = callPackage ../development/coq-modules/heq {};
hierarchy-builder = callPackage ../development/coq-modules/hierarchy-builder {};
diff --git a/third_party/nixpkgs/pkgs/top-level/kodi-packages.nix b/third_party/nixpkgs/pkgs/top-level/kodi-packages.nix
index 03d70a32f6..38d1ed6b86 100644
--- a/third_party/nixpkgs/pkgs/top-level/kodi-packages.nix
+++ b/third_party/nixpkgs/pkgs/top-level/kodi-packages.nix
@@ -46,6 +46,8 @@ let self = rec {
# addon packages
+ a4ksubtitles = callPackage ../applications/video/kodi-packages/a4ksubtitles { };
+
controllers = {
default = callPackage ../applications/video/kodi-packages/controllers { controller = "default"; };
diff --git a/third_party/nixpkgs/pkgs/top-level/metrics.nix b/third_party/nixpkgs/pkgs/top-level/metrics.nix
index 2bfcb9d5d8..590a24fb2b 100644
--- a/third_party/nixpkgs/pkgs/top-level/metrics.nix
+++ b/third_party/nixpkgs/pkgs/top-level/metrics.nix
@@ -4,7 +4,8 @@ with pkgs;
runCommand "nixpkgs-metrics"
{ nativeBuildInputs = with pkgs.lib; map getBin [ nix time jq ];
- requiredSystemFeatures = [ "benchmark" ];
+ #FIXME: the job doesn't work, see issue #76776
+ #requiredSystemFeatures = [ "benchmark" ]; # dedicated machine, by @vcunat last time
}
''
export NIX_STATE_DIR=$TMPDIR
diff --git a/third_party/nixpkgs/pkgs/top-level/ocaml-packages.nix b/third_party/nixpkgs/pkgs/top-level/ocaml-packages.nix
index 30f6dca5f1..61728d1409 100644
--- a/third_party/nixpkgs/pkgs/top-level/ocaml-packages.nix
+++ b/third_party/nixpkgs/pkgs/top-level/ocaml-packages.nix
@@ -317,7 +317,15 @@ let
eliom = callPackage ../development/ocaml-modules/eliom { };
- elpi = callPackage ../development/ocaml-modules/elpi { };
+ elpi = callPackage ../development/ocaml-modules/elpi (
+ let ppxlib_0_15 = if lib.versionAtLeast ppxlib.version "0.15"
+ then ppxlib.override { version = "0.15.0"; }
+ else ppxlib; in
+ {
+ ppx_deriving = ppx_deriving.override { ppxlib = ppxlib_0_15; };
+ ppxlib = ppxlib_0_15;
+ }
+ );
encore = callPackage ../development/ocaml-modules/encore { };
@@ -626,7 +634,10 @@ let
menhir = callPackage ../development/ocaml-modules/menhir { };
- merlin = callPackage ../development/tools/ocaml/merlin { };
+ merlin =
+ if lib.versionAtLeast ocaml.version "4.11"
+ then callPackage ../development/tools/ocaml/merlin/4.x.nix { }
+ else callPackage ../development/tools/ocaml/merlin { };
merlin-extend = callPackage ../development/ocaml-modules/merlin-extend { };
@@ -777,6 +788,8 @@ let
ocamlfuse = callPackage ../development/ocaml-modules/ocamlfuse { };
+ ocaml-freestanding = callPackage ../development/ocaml-modules/ocaml-freestanding { };
+
ocaml_gettext = callPackage ../development/ocaml-modules/ocaml-gettext { };
gettext-stub = callPackage ../development/ocaml-modules/ocaml-gettext/stub.nix { };
@@ -1031,13 +1044,23 @@ let
ppx_deriving_protobuf = callPackage ../development/ocaml-modules/ppx_deriving_protobuf {};
- ppx_deriving_rpc = callPackage ../development/ocaml-modules/ppx_deriving_rpc { };
+ ppx_deriving_rpc = callPackage ../development/ocaml-modules/ppx_deriving_rpc {
+ ppxlib = ppxlib.override { version = "0.15.0"; };
+ };
ppx_deriving_yojson = callPackage ../development/ocaml-modules/ppx_deriving_yojson {};
ppx_gen_rec = callPackage ../development/ocaml-modules/ppx_gen_rec {};
- ppx_import = callPackage ../development/ocaml-modules/ppx_import {};
+ ppx_import = callPackage ../development/ocaml-modules/ppx_import (
+ let ppxlib_0_15 = if lib.versionAtLeast ppxlib.version "0.15"
+ then ppxlib.override { version = "0.15.0"; }
+ else ppxlib; in
+ {
+ ppx_deriving = ppx_deriving.override { ppxlib = ppxlib_0_15; };
+ ppxlib = ppxlib_0_15;
+ }
+ );
ppx_irmin = callPackage ../development/ocaml-modules/irmin/ppx.nix {
};
diff --git a/third_party/nixpkgs/pkgs/top-level/python-packages.nix b/third_party/nixpkgs/pkgs/top-level/python-packages.nix
index 66563b3aa1..5e925957e5 100644
--- a/third_party/nixpkgs/pkgs/top-level/python-packages.nix
+++ b/third_party/nixpkgs/pkgs/top-level/python-packages.nix
@@ -322,6 +322,8 @@ in {
aioshelly = callPackage ../development/python-modules/aioshelly { };
+ aiosmb = callPackage ../development/python-modules/aiosmb { };
+
aiosmtpd = callPackage ../development/python-modules/aiosmtpd { };
aiosqlite = callPackage ../development/python-modules/aiosqlite { };
@@ -370,6 +372,8 @@ in {
amqplib = callPackage ../development/python-modules/amqplib { };
+ android-backup = callPackage ../development/python-modules/android-backup { };
+
androidtv = callPackage ../development/python-modules/androidtv { };
androguard = callPackage ../development/python-modules/androguard { };
@@ -1608,10 +1612,10 @@ in {
cufflinks = callPackage ../development/python-modules/cufflinks { };
cupy = callPackage ../development/python-modules/cupy {
- cudatoolkit = pkgs.cudatoolkit_10_0;
- cudnn = pkgs.cudnn_cudatoolkit_10_0;
- nccl = pkgs.nccl_cudatoolkit_10;
- cutensor = pkgs.cutensor_cudatoolkit_10;
+ cudatoolkit = pkgs.cudatoolkit_11;
+ cudnn = pkgs.cudnn_cudatoolkit_11;
+ nccl = pkgs.nccl_cudatoolkit_11;
+ cutensor = pkgs.cutensor_cudatoolkit_11;
};
curio = callPackage ../development/python-modules/curio { };
@@ -3273,6 +3277,8 @@ in {
imgsize = callPackage ../development/python-modules/imgsize { };
+ iminuit = callPackage ../development/python-modules/iminuit { };
+
immutables = callPackage ../development/python-modules/immutables { };
impacket = callPackage ../development/python-modules/impacket { };
@@ -3706,6 +3712,8 @@ in {
labgrid = callPackage ../development/python-modules/labgrid { };
+ labmath = callPackage ../development/python-modules/labmath { };
+
lammps-cython = callPackage ../development/python-modules/lammps-cython { };
langcodes = callPackage ../development/python-modules/langcodes { };
@@ -3970,7 +3978,6 @@ in {
llfuse = callPackage ../development/python-modules/llfuse {
inherit (pkgs) fuse;
- inherit (pkgs.darwin.apple_sdk.frameworks) DiskArbitration;
};
llvmlite = callPackage ../development/python-modules/llvmlite {
@@ -4710,8 +4717,6 @@ in {
numpy-stl = callPackage ../development/python-modules/numpy-stl { };
- numtraits = callPackage ../development/python-modules/numtraits { };
-
nunavut = callPackage ../development/python-modules/nunavut { };
nvchecker = callPackage ../development/python-modules/nvchecker { };
@@ -5851,6 +5856,8 @@ in {
pykmtronic = callPackage ../development/python-modules/pykmtronic { };
+ pykodi = callPackage ../development/python-modules/pykodi { };
+
pykwalify = callPackage ../development/python-modules/pykwalify { };
pylacrosse = callPackage ../development/python-modules/pylacrosse { };
@@ -6150,6 +6157,8 @@ in {
pyrad = callPackage ../development/python-modules/pyrad { };
+ pyradios = callPackage ../development/python-modules/pyradios { };
+
py-radix = callPackage ../development/python-modules/py-radix { };
pyramid_beaker = callPackage ../development/python-modules/pyramid_beaker { };
@@ -7764,6 +7773,8 @@ in {
softlayer = callPackage ../development/python-modules/softlayer { };
+ solaredge = callPackage ../development/python-modules/solaredge { };
+
solax = callPackage ../development/python-modules/solax { };
solo-python = disabledIf (!pythonAtLeast "3.6") (callPackage ../development/python-modules/solo-python { });
@@ -7863,7 +7874,7 @@ in {
sphinx-argparse = callPackage ../development/python-modules/sphinx-argparse { };
- sphinx-autobuild = callPackage ../development/python-modules/sphinx-argparse { };
+ sphinx-autobuild = callPackage ../development/python-modules/sphinx-autobuild { };
sphinx-jinja = callPackage ../development/python-modules/sphinx-jinja { };
@@ -9056,8 +9067,6 @@ in {
python3 = python;
})).py;
- zerobin = callPackage ../development/python-modules/zerobin { };
-
zeroc-ice = callPackage ../development/python-modules/zeroc-ice { };
zeroconf = callPackage ../development/python-modules/zeroconf { };
diff --git a/third_party/nixpkgs/pkgs/top-level/ruby-packages.nix b/third_party/nixpkgs/pkgs/top-level/ruby-packages.nix
index 1268c43c07..13e91d5b0f 100644
--- a/third_party/nixpkgs/pkgs/top-level/ruby-packages.nix
+++ b/third_party/nixpkgs/pkgs/top-level/ruby-packages.nix
@@ -1238,10 +1238,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "1vmw752c26ny2jwl0npn0gbyqwgz4hdmlpxnsld9qi9xhk5b1qh7";
+ sha256 = "0jdbcjv4v7sj888bv3vc6d1dg4ackkh7ywlmn9ln2g9alk7kisar";
type = "gem";
};
- version = "2.3.0";
+ version = "2.3.1";
};
kramdown-parser-gfm = {
dependencies = ["kramdown"];