From 35a33570dd1ec9992a101ca51f89e120175cc91d Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 23 Mar 2021 00:53:26 +0000 Subject: [PATCH 001/230] digikam: 7.1.0 -> 7.2.0 --- pkgs/applications/graphics/digikam/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/graphics/digikam/default.nix b/pkgs/applications/graphics/digikam/default.nix index fcd871bf5ab..db23a181c5a 100644 --- a/pkgs/applications/graphics/digikam/default.nix +++ b/pkgs/applications/graphics/digikam/default.nix @@ -55,11 +55,11 @@ mkDerivation rec { pname = "digikam"; - version = "7.1.0"; + version = "7.2.0"; src = fetchurl { url = "mirror://kde/stable/${pname}/${version}/${pname}-${version}.tar.xz"; - sha256 = "1gmblnsm0aida3yynyddm6jdh59hx3w177hrhfar616z793ch0xi"; + sha256 = "sha256-zYfs4UOu+gLmkqSvXDw8wQe5pNYYBNefp33S40R5ihc="; }; nativeBuildInputs = [ cmake doxygen extra-cmake-modules kdoctools wrapGAppsHook ]; From 445aa4663f861500f32318f7e4038ad505157c15 Mon Sep 17 00:00:00 2001 From: Michael Francis Date: Fri, 26 Mar 2021 10:56:07 -0400 Subject: [PATCH 002/230] Added mime info path for mimemagic --- pkgs/development/ruby-modules/gem-config/default.nix | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/pkgs/development/ruby-modules/gem-config/default.nix b/pkgs/development/ruby-modules/gem-config/default.nix index 791ae3d0d31..a56ada73633 100644 --- a/pkgs/development/ruby-modules/gem-config/default.nix +++ b/pkgs/development/ruby-modules/gem-config/default.nix @@ -25,7 +25,7 @@ , cairo, re2, rake, gobject-introspection, gdk-pixbuf, zeromq, czmq, graphicsmagick, libcxx , file, libvirt, glib, vips, taglib, libopus, linux-pam, libidn, protobuf, fribidi, harfbuzz , bison, flex, pango, python3, patchelf, binutils, freetds, wrapGAppsHook, atk -, bundler, libsass, libselinux ? null, libsepol ? null +, bundler, libsass, libselinux ? null, libsepol ? null, shared-mime-info }@args: let @@ -378,6 +378,10 @@ in export HOME=$TMPDIR ''; }; + + mimemagic = attrs: { + FREEDESKTOP_MIME_TYPES_PATH="${shared-mime-info}"; + }; msgpack = attrs: { buildInputs = [ msgpack ]; From 0c79724680562d9f3533d65a78d64efd454a7b42 Mon Sep 17 00:00:00 2001 From: Michael Francis Date: Fri, 26 Mar 2021 10:58:35 -0400 Subject: [PATCH 003/230] remove whitespace --- pkgs/development/ruby-modules/gem-config/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/ruby-modules/gem-config/default.nix b/pkgs/development/ruby-modules/gem-config/default.nix index a56ada73633..8c7e7307cb6 100644 --- a/pkgs/development/ruby-modules/gem-config/default.nix +++ b/pkgs/development/ruby-modules/gem-config/default.nix @@ -378,7 +378,7 @@ in export HOME=$TMPDIR ''; }; - + mimemagic = attrs: { FREEDESKTOP_MIME_TYPES_PATH="${shared-mime-info}"; }; From cba7c22f61519ec483e839828a3e8ee8d31c5085 Mon Sep 17 00:00:00 2001 From: Michael Francis Date: Sat, 27 Mar 2021 04:51:32 +0800 Subject: [PATCH 004/230] Update pkgs/development/ruby-modules/gem-config/default.nix Co-authored-by: Sandro --- pkgs/development/ruby-modules/gem-config/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/ruby-modules/gem-config/default.nix b/pkgs/development/ruby-modules/gem-config/default.nix index 8c7e7307cb6..227194014d3 100644 --- a/pkgs/development/ruby-modules/gem-config/default.nix +++ b/pkgs/development/ruby-modules/gem-config/default.nix @@ -380,7 +380,7 @@ in }; mimemagic = attrs: { - FREEDESKTOP_MIME_TYPES_PATH="${shared-mime-info}"; + FREEDESKTOP_MIME_TYPES_PATH="${shared-mime-info}/share/mime/packages/freedesktop.org.xml"; }; msgpack = attrs: { From 72ab382fb6b729b0d654f2c03f5eb25b39f11fbb Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Thu, 1 Apr 2021 04:20:00 +0000 Subject: [PATCH 005/230] postgresql_9_5: drop PostgreSQL 9.5 has reached EOL on February 11, 2021. See https://www.postgresql.org/support/versioning/ --- nixos/doc/manual/release-notes/rl-2105.xml | 5 +++++ nixos/modules/services/databases/postgresql.nix | 3 +-- pkgs/servers/sql/postgresql/default.nix | 9 --------- pkgs/top-level/aliases.nix | 1 - pkgs/top-level/all-packages.nix | 1 - 5 files changed, 6 insertions(+), 13 deletions(-) diff --git a/nixos/doc/manual/release-notes/rl-2105.xml b/nixos/doc/manual/release-notes/rl-2105.xml index ace1bdccdc6..4ead00cf890 100644 --- a/nixos/doc/manual/release-notes/rl-2105.xml +++ b/nixos/doc/manual/release-notes/rl-2105.xml @@ -948,6 +948,11 @@ environment.systemPackages = [ boot.extraSystemdUnitPaths list. + + + PostgreSQL 9.5 is scheduled EOL during the 21.05 life cycle and has been removed. + + diff --git a/nixos/modules/services/databases/postgresql.nix b/nixos/modules/services/databases/postgresql.nix index ee8cdf2d285..fdc05312ece 100644 --- a/nixos/modules/services/databases/postgresql.nix +++ b/nixos/modules/services/databases/postgresql.nix @@ -295,8 +295,7 @@ in # systems! mkDefault (if versionAtLeast config.system.stateVersion "20.03" then pkgs.postgresql_11 else if versionAtLeast config.system.stateVersion "17.09" then pkgs.postgresql_9_6 - else if versionAtLeast config.system.stateVersion "16.03" then pkgs.postgresql_9_5 - else throw "postgresql_9_4 was removed, please upgrade your postgresql version."); + else throw "postgresql_9_5 was removed, please upgrade your postgresql version."); services.postgresql.dataDir = mkDefault "/var/lib/postgresql/${cfg.package.psqlSchema}"; diff --git a/pkgs/servers/sql/postgresql/default.nix b/pkgs/servers/sql/postgresql/default.nix index d3cc2304c63..35b46c673f8 100644 --- a/pkgs/servers/sql/postgresql/default.nix +++ b/pkgs/servers/sql/postgresql/default.nix @@ -191,15 +191,6 @@ let in self: { - postgresql_9_5 = self.callPackage generic { - version = "9.5.25"; - psqlSchema = "9.5"; - sha256 = "00yny0sskxrqk4ji2phgv3iqxd1aiy6rh660k73s4s1pn9gcaa3n"; - this = self.postgresql_9_5; - thisAttr = "postgresql_9_5"; - inherit self; - }; - postgresql_9_6 = self.callPackage generic { version = "9.6.21"; psqlSchema = "9.6"; diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index d05c81dcaa9..01257162a5a 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -552,7 +552,6 @@ mapAliases ({ pmtools = acpica-tools; # added 2018-11-01 polarssl = mbedtls; # added 2018-04-25 poppler_qt5 = libsForQt5.poppler; # added 2015-12-19 - postgresql95 = postgresql_9_5; postgresql96 = postgresql_9_6; postgresql100 = throw "postgresql100 was deprecated on 2018-10-21: use postgresql_10 instead"; # postgresql plugins diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 4d009d82b15..752e9fdc145 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -18931,7 +18931,6 @@ in timescaledb-tune = callPackage ../development/tools/database/timescaledb-tune { }; inherit (import ../servers/sql/postgresql pkgs) - postgresql_9_5 postgresql_9_6 postgresql_10 postgresql_11 From ecc293ff7aa443f95117294e31e7a670e76cd6c7 Mon Sep 17 00:00:00 2001 From: Viktor Kronvall Date: Tue, 30 Mar 2021 16:04:47 +0900 Subject: [PATCH 006/230] dockerTools: Implement merging of image tarballs The `docker load` command supports loading tarballs that contain multiple docker images with their respective image names and tags. This enables distributing these images as a single file which simplifies the release of software when an application requires multiple services to run. However, pkgs.dockerTools only create tarballs with a single docker image and there exists is no mechanism in nixpkgs to combine the created tarballs. This commit implements merging of tarballs in a way that is compatible with `docker load`. --- pkgs/build-support/docker/default.nix | 28 +++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) diff --git a/pkgs/build-support/docker/default.nix b/pkgs/build-support/docker/default.nix index b03bfcca87f..aebdb4a6fd8 100644 --- a/pkgs/build-support/docker/default.nix +++ b/pkgs/build-support/docker/default.nix @@ -682,6 +682,34 @@ rec { in result; + # Merge the tarballs of two images built with buildImage into a single + # tarball that contains both images. Running `docker load` on the resulting + # tarball with load both images into the docker daemon. + mergeImages = a: b: runCommand "merge-docker-images" + { + nativeBuildInputs = [ pigz jq ]; + } '' + mkdir a b image + # Extract images + tar -I pigz -xf ${a} -C a + tar -I pigz -xf ${b} -C b + # Make writable (to enable mv) + chmod -R +w a b + # Merge repositories objects (image:tag -> hash) + jq -s add a/repositories b/repositories > repositories + # Merge docker images manifests ([image]) + jq -s add a/manifest.json b/manifest.json > manifest.json + # Move layers to output directory + mv --no-clobber a/* image/ + mv --no-clobber b/* image/ + # Move merged repositories object and manifest list to output directory + mv repositories image/repositories + mv manifest.json image/manifest.json + # Create tarball and gzip + tar -C image --hard-dereference --sort=name --mtime="@$SOURCE_DATE_EPOCH" --owner=0 --group=0 --xform s:'^./':: -c . | pigz -nT > $out + ''; + + # Provide a /etc/passwd and /etc/group that contain root and nobody. # Useful when packaging binaries that insist on using nss to look up # username/groups (like nginx). From dcc9aef015ecf43917b36be45c911ca565f4f6a1 Mon Sep 17 00:00:00 2001 From: Viktor Kronvall Date: Tue, 30 Mar 2021 18:31:25 +0900 Subject: [PATCH 007/230] dockerTools: take a list of images in mergeImages --- pkgs/build-support/docker/default.nix | 33 +++++++++++++-------------- 1 file changed, 16 insertions(+), 17 deletions(-) diff --git a/pkgs/build-support/docker/default.nix b/pkgs/build-support/docker/default.nix index aebdb4a6fd8..36e8f3ad226 100644 --- a/pkgs/build-support/docker/default.nix +++ b/pkgs/build-support/docker/default.nix @@ -682,27 +682,26 @@ rec { in result; - # Merge the tarballs of two images built with buildImage into a single - # tarball that contains both images. Running `docker load` on the resulting - # tarball with load both images into the docker daemon. - mergeImages = a: b: runCommand "merge-docker-images" + # Merge the tarballs of images built with buildImage into a single + # tarball that contains all images. Running `docker load` on the resulting + # tarball will load the images into the docker daemon. + mergeImages = images: runCommand "merge-docker-images" { + inherit images; nativeBuildInputs = [ pigz jq ]; } '' - mkdir a b image + mkdir image inputs # Extract images - tar -I pigz -xf ${a} -C a - tar -I pigz -xf ${b} -C b - # Make writable (to enable mv) - chmod -R +w a b - # Merge repositories objects (image:tag -> hash) - jq -s add a/repositories b/repositories > repositories - # Merge docker images manifests ([image]) - jq -s add a/manifest.json b/manifest.json > manifest.json - # Move layers to output directory - mv --no-clobber a/* image/ - mv --no-clobber b/* image/ - # Move merged repositories object and manifest list to output directory + for item in $images; do + mkdir inputs/$(basename $item) + tar -I pigz -xf $item -C inputs/$(basename $item) + done + # Copy all layers from input images to output image directory + cp -R --no-clobber inputs/*/* image/ + # Merge repositories objects and manifests + jq -s add inputs/*/repositories > repositories + jq -s add inputs/*/manifest.json > manifest.json + # Replace output image repositories and manifest with merged versions mv repositories image/repositories mv manifest.json image/manifest.json # Create tarball and gzip From b2aa1f9d7a4f5474ce53cd4ce697a8d1abecc32b Mon Sep 17 00:00:00 2001 From: Viktor Kronvall Date: Wed, 31 Mar 2021 02:24:44 +0900 Subject: [PATCH 008/230] dockerTools: preserve order of images in manifest --- pkgs/build-support/docker/default.nix | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) diff --git a/pkgs/build-support/docker/default.nix b/pkgs/build-support/docker/default.nix index 36e8f3ad226..0e1aa179cab 100644 --- a/pkgs/build-support/docker/default.nix +++ b/pkgs/build-support/docker/default.nix @@ -692,15 +692,24 @@ rec { } '' mkdir image inputs # Extract images + repos=() + manifests=() for item in $images; do - mkdir inputs/$(basename $item) - tar -I pigz -xf $item -C inputs/$(basename $item) + name=$(basename $item) + mkdir inputs/$name + tar -I pigz -xf $item -C inputs/$name + if [ -f inputs/$name/repositories ]; then + repos+=(inputs/$name/repositories) + fi + if [ -f inputs/$name/manifest.json ]; then + manifests+=(inputs/$name/manifest.json) + fi done # Copy all layers from input images to output image directory cp -R --no-clobber inputs/*/* image/ # Merge repositories objects and manifests - jq -s add inputs/*/repositories > repositories - jq -s add inputs/*/manifest.json > manifest.json + jq -s add "''${repos[@]}" > repositories + jq -s add "''${manifests[@]}" > manifest.json # Replace output image repositories and manifest with merged versions mv repositories image/repositories mv manifest.json image/manifest.json From 5caed960d36a3f7b442b96e9664d243fd9ab1317 Mon Sep 17 00:00:00 2001 From: Viktor Kronvall Date: Tue, 30 Mar 2021 18:37:17 +0900 Subject: [PATCH 009/230] dockerTools: add merged example images --- pkgs/build-support/docker/examples.nix | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/pkgs/build-support/docker/examples.nix b/pkgs/build-support/docker/examples.nix index f6b468942fe..7dbee38feeb 100644 --- a/pkgs/build-support/docker/examples.nix +++ b/pkgs/build-support/docker/examples.nix @@ -497,4 +497,23 @@ rec { chown 1000 ./home/jane ''; }; + + # tarball consisting of both bash and redis images + mergedBashAndRedis = pkgs.dockerTools.mergeImages [ + bash + redis + ]; + + # tarball consisting of bash (without tag) and redis images + mergedBashNoTagAndRedis = pkgs.dockerTools.mergeImages [ + bashNoTag + redis + ]; + + # tarball consisting of bash and layered image with different owner of the + # /home/jane directory + mergedBashFakeRoot = pkgs.dockerTools.mergeImages [ + bash + layeredImageWithFakeRootCommands + ]; } From bcc3f8eab5cac2c6ddaeab9d1fdc7afc2c348964 Mon Sep 17 00:00:00 2001 From: Viktor Kronvall Date: Tue, 30 Mar 2021 18:53:29 +0900 Subject: [PATCH 010/230] dockerTools: test mergeImages --- nixos/tests/docker-tools.nix | 35 +++++++++++++++++++++++++++++++++++ 1 file changed, 35 insertions(+) diff --git a/nixos/tests/docker-tools.nix b/nixos/tests/docker-tools.nix index 80d527b453f..35b5504ea0f 100644 --- a/nixos/tests/docker-tools.nix +++ b/nixos/tests/docker-tools.nix @@ -321,5 +321,40 @@ import ./make-test-python.nix ({ pkgs, ... }: { docker.succeed( "docker run --rm ${examples.layeredImageWithFakeRootCommands.imageName} sh -c 'stat -c '%u' /home/jane | grep -E ^1000$'" ) + + with subtest("Ensure docker load on merged images loads all of the constituent images"): + docker.succeed( + "docker load --input='${examples.mergedBashAndRedis}'" + ) + docker.succeed( + "docker images --format '{{.Repository}}-{{.Tag}}' | grep -F '${examples.bash.imageName}-${examples.bash.imageTag}'" + ) + docker.succeed( + "docker images --format '{{.Repository}}-{{.Tag}}' | grep -F '${examples.redis.imageName}-${examples.redis.imageTag}'" + ) + docker.succeed("docker run --rm ${examples.bash.imageName} bash --version") + docker.succeed("docker run --rm ${examples.redis.imageName} redis-cli --version") + docker.succeed("docker rmi ${examples.bash.imageName}") + docker.succeed("docker rmi ${examples.redis.imageName}") + + with subtest( + "Ensure docker load on merged images loads all of the constituent images (missing tags)" + ): + docker.succeed( + "docker load --input='${examples.mergedBashNoTagAndRedis}'" + ) + docker.succeed( + "docker images --format '{{.Repository}}-{{.Tag}}' | grep -F '${examples.bashNoTag.imageName}-${examples.bashNoTag.imageTag}'" + ) + docker.succeed( + "docker images --format '{{.Repository}}-{{.Tag}}' | grep -F '${examples.redis.imageName}-${examples.redis.imageTag}'" + ) + # we need to explicitly specify the generated tag here + docker.succeed( + "docker run --rm ${examples.bashNoTag.imageName}:${examples.bashNoTag.imageTag} bash --version" + ) + docker.succeed("docker run --rm ${examples.redis.imageName} redis-cli --version") + docker.succeed("docker rmi ${examples.bashNoTag.imageName}:${examples.bashNoTag.imageTag}") + docker.succeed("docker rmi ${examples.redis.imageName}") ''; }) From 10019ab87995ec72e62af95a8b056db9a2e8a341 Mon Sep 17 00:00:00 2001 From: Viktor Kronvall Date: Wed, 7 Apr 2021 23:05:36 +0900 Subject: [PATCH 011/230] dockerTools: test that mergeImages preserves owner --- nixos/tests/docker-tools.nix | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/nixos/tests/docker-tools.nix b/nixos/tests/docker-tools.nix index 35b5504ea0f..96662b4540c 100644 --- a/nixos/tests/docker-tools.nix +++ b/nixos/tests/docker-tools.nix @@ -356,5 +356,13 @@ import ./make-test-python.nix ({ pkgs, ... }: { docker.succeed("docker run --rm ${examples.redis.imageName} redis-cli --version") docker.succeed("docker rmi ${examples.bashNoTag.imageName}:${examples.bashNoTag.imageTag}") docker.succeed("docker rmi ${examples.redis.imageName}") + + with subtest("mergeImages preserves owners of the original images"): + docker.succeed( + "docker load --input='${examples.mergedBashFakeRoot}'" + ) + docker.succeed( + "docker run --rm ${examples.layeredImageWithFakeRootCommands.imageName} sh -c 'stat -c '%u' /home/jane | grep -E ^1000$'" + ) ''; }) From 7377a1dfa63342aee1841e75139a1c391f2c93bc Mon Sep 17 00:00:00 2001 From: talyz Date: Fri, 9 Apr 2021 00:36:32 +0200 Subject: [PATCH 012/230] gitlab-shell: 13.15.1 -> 13.17.0 Only the version had been updated previously, not the hashes and patches. --- .../version-management/gitlab/default.nix | 5 +- .../gitlab/gitlab-shell/default.nix | 4 +- .../remove-hardcoded-locations.patch | 46 +++++++------------ 3 files changed, 23 insertions(+), 32 deletions(-) diff --git a/pkgs/applications/version-management/gitlab/default.nix b/pkgs/applications/version-management/gitlab/default.nix index 4cd64dc8ad9..5d2b923628b 100644 --- a/pkgs/applications/version-management/gitlab/default.nix +++ b/pkgs/applications/version-management/gitlab/default.nix @@ -122,7 +122,10 @@ stdenv.mkDerivation { rubyEnv rubyEnv.wrappedRuby rubyEnv.bundler tzdata git nettools ]; - patches = [ ./remove-hardcoded-locations.patch ]; + patches = [ + # Change hardcoded paths to the NixOS equivalent + ./remove-hardcoded-locations.patch + ]; postPatch = '' ${lib.optionalString (!gitlabEnterprise) '' diff --git a/pkgs/applications/version-management/gitlab/gitlab-shell/default.nix b/pkgs/applications/version-management/gitlab/gitlab-shell/default.nix index c86c63a5656..51e48958ab7 100644 --- a/pkgs/applications/version-management/gitlab/gitlab-shell/default.nix +++ b/pkgs/applications/version-management/gitlab/gitlab-shell/default.nix @@ -7,14 +7,14 @@ buildGoModule rec { owner = "gitlab-org"; repo = "gitlab-shell"; rev = "v${version}"; - sha256 = "sha256-wDZLcCBbWjG6wIcEj02eqwWVfAYy1TuAo/xvJB8tt+0="; + sha256 = "sha256-j/80AIIJdRSisu2fNXcqazb4oIzAQP5CfxHX3l6yijY="; }; buildInputs = [ ruby ]; patches = [ ./remove-hardcoded-locations.patch ]; - vendorSha256 = "16fa3bka0008x2yazahc6xxcv4fa6yqg74kk64v8lrp7snbvjf4d"; + vendorSha256 = "sha256-/jJTMtS5fcbQroWuaPPfvYxy6znNS0FOXVN7IcE/spQ="; postInstall = '' cp -r "$NIX_BUILD_TOP/source"/bin/* $out/bin diff --git a/pkgs/applications/version-management/gitlab/gitlab-shell/remove-hardcoded-locations.patch b/pkgs/applications/version-management/gitlab/gitlab-shell/remove-hardcoded-locations.patch index 888994adc92..8bbfd97e00e 100644 --- a/pkgs/applications/version-management/gitlab/gitlab-shell/remove-hardcoded-locations.patch +++ b/pkgs/applications/version-management/gitlab/gitlab-shell/remove-hardcoded-locations.patch @@ -1,34 +1,25 @@ diff --git a/internal/config/config.go b/internal/config/config.go -index 79c2a36..12ba31e 100644 +index 36f8625..72ede08 100644 --- a/internal/config/config.go +++ b/internal/config/config.go -@@ -3,7 +3,6 @@ package config - import ( - "io/ioutil" - "net/url" -- "os" - "path" - "path/filepath" +@@ -12,7 +12,7 @@ import ( + ) -@@ -59,16 +58,13 @@ func (c *Config) GetHttpClient() *client.HttpClient { - } + const ( +- configFile = "config.yml" ++ configFile = "shell-config.yml" + defaultSecretFileName = ".gitlab_shell_secret" + ) - func New() (*Config, error) { -- dir, err := os.Getwd() -- if err != nil { -- return nil, err -- } -+ dir := "/run/gitlab" - - return NewFromDir(dir) - } - - func NewFromDir(dir string) (*Config, error) { -- return newFromFile(path.Join(dir, configFile)) -+ return newFromFile("/run/gitlab/shell-config.yml") - } - - func newFromFile(filename string) (*Config, error) { +@@ -91,7 +91,7 @@ func (c *Config) GetHttpClient() *client.HttpClient { + // NewFromDirExternal returns a new config from a given root dir. It also applies defaults appropriate for + // gitlab-shell running in an external SSH server. + func NewFromDirExternal(dir string) (*Config, error) { +- cfg, err := newFromFile(filepath.Join(dir, configFile)) ++ cfg, err := newFromFile(filepath.Join("/run/gitlab", configFile)) + if err != nil { + return nil, err + } diff --git a/internal/keyline/key_line.go b/internal/keyline/key_line.go index c6f2422..fb0426b 100644 --- a/internal/keyline/key_line.go @@ -55,6 +46,3 @@ index 52ac5ee..d96baa3 100644 end def auth_file --- -2.28.0 - From 9375b5c7298e9fef1d11327715368a31de342593 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 9 Apr 2021 20:51:27 +0200 Subject: [PATCH 013/230] Stackage Nightly 2021-04-06 --- .../configuration-hackage2nix.yaml | 38 +++++++++---------- 1 file changed, 19 insertions(+), 19 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml index 62285754cd8..e3e3d65da01 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml @@ -99,7 +99,7 @@ default-package-overrides: - gi-secret < 0.0.13 - gi-vte < 2.91.28 - # Stackage Nightly 2021-04-02 + # Stackage Nightly 2021-04-06 - abstract-deque ==0.3 - abstract-par ==0.3.3 - AC-Angle ==1.0 @@ -330,7 +330,7 @@ default-package-overrides: - bech32 ==1.1.0 - bech32-th ==1.0.2 - bench ==1.0.12 - - benchpress ==0.2.2.15 + - benchpress ==0.2.2.16 - between ==0.11.0.0 - bibtex ==0.1.0.6 - bifunctors ==5.5.10 @@ -381,7 +381,7 @@ default-package-overrides: - boolsimplifier ==0.1.8 - boots ==0.2.0.1 - bordacount ==0.1.0.0 - - boring ==0.1.3 + - boring ==0.2 - both ==0.1.1.1 - bound ==2.0.3 - BoundedChan ==1.0.3.0 @@ -535,7 +535,7 @@ default-package-overrides: - composite-hashable ==0.7.4.0 - composite-tuple ==0.1.2.0 - composite-xstep ==0.1.0.0 - - composition ==1.0.2.1 + - composition ==1.0.2.2 - composition-extra ==2.0.0 - concise ==0.1.0.1 - concurrency ==1.11.0.1 @@ -661,7 +661,7 @@ default-package-overrides: - data-ordlist ==0.4.7.0 - data-ref ==0.0.2 - data-reify ==0.6.3 - - data-serializer ==0.3.4.1 + - data-serializer ==0.3.5 - data-textual ==0.3.0.3 - dataurl ==0.1.0.0 - DAV ==1.3.4 @@ -708,7 +708,7 @@ default-package-overrides: - distributed-closure ==0.4.2.0 - distribution-opensuse ==1.1.1 - distributive ==0.6.2.1 - - dl-fedora ==0.7.6 + - dl-fedora ==0.7.7 - dlist ==0.8.0.8 - dlist-instances ==0.1.1.1 - dlist-nonempty ==0.1.1 @@ -873,7 +873,7 @@ default-package-overrides: - fix-whitespace ==0.0.5 - flac ==0.2.0 - flac-picture ==0.1.2 - - flags-applicative ==0.1.0.2 + - flags-applicative ==0.1.0.3 - flat ==0.4.4 - flat-mcmc ==1.5.2 - flexible-defaults ==0.0.3 @@ -1043,7 +1043,7 @@ default-package-overrides: - graphite ==0.10.0.1 - graphql-client ==1.1.1 - graphs ==0.7.1 - - graphula ==2.0.0.3 + - graphula ==2.0.0.4 - graphviz ==2999.20.1.0 - graph-wrapper ==0.2.6.0 - gravatar ==0.8.0 @@ -1126,7 +1126,7 @@ default-package-overrides: - hformat ==0.3.3.1 - hfsevents ==0.1.6 - hgrev ==0.2.6 - - hidapi ==0.1.6 + - hidapi ==0.1.7 - hie-bios ==0.7.5 - hi-file-parser ==0.1.1.0 - higher-leveldb ==0.6.0.0 @@ -1162,7 +1162,7 @@ default-package-overrides: - hp2pretty ==0.10 - hpack ==0.34.4 - hpack-dhall ==0.5.2 - - hpc-codecov ==0.2.0.2 + - hpc-codecov ==0.3.0.0 - hpc-lcov ==1.0.1 - hprotoc ==2.4.17 - hruby ==0.3.8.1 @@ -1185,7 +1185,7 @@ default-package-overrides: - hslua-module-path ==0.1.0.1 - hslua-module-system ==0.2.2.1 - hslua-module-text ==0.3.0.1 - - HsOpenSSL ==0.11.6 + - HsOpenSSL ==0.11.6.1 - HsOpenSSL-x509-system ==0.1.0.4 - hsp ==0.10.0 - hspec ==2.7.9 @@ -1465,7 +1465,7 @@ default-package-overrides: - liboath-hs ==0.0.1.2 - libyaml ==0.1.2 - LibZip ==1.0.1 - - lifted-async ==0.10.1.3 + - lifted-async ==0.10.2 - lifted-base ==0.2.3.12 - lift-generics ==0.2 - line ==4.0.1 @@ -1629,7 +1629,7 @@ default-package-overrides: - mono-traversable ==1.0.15.1 - mono-traversable-instances ==0.1.1.0 - mono-traversable-keys ==0.1.0 - - more-containers ==0.2.2.0 + - more-containers ==0.2.2.2 - morpheus-graphql ==0.17.0 - morpheus-graphql-app ==0.17.0 - morpheus-graphql-client ==0.17.0 @@ -2069,7 +2069,7 @@ default-package-overrides: - rhine-gloss ==0.7.0 - rigel-viz ==0.2.0.0 - rio ==0.1.20.0 - - rio-orphans ==0.1.1.0 + - rio-orphans ==0.1.2.0 - rio-prettyprint ==0.1.1.0 - roc-id ==0.1.0.0 - rocksdb-haskell ==1.0.1 @@ -2163,7 +2163,7 @@ default-package-overrides: - servant-swagger ==1.1.10 - servant-swagger-ui ==0.3.4.3.37.2 - servant-swagger-ui-core ==0.3.4 - - serverless-haskell ==0.12.5 + - serverless-haskell ==0.12.6 - serversession ==1.0.2 - serversession-frontend-wai ==1.0 - ses-html ==0.4.0.0 @@ -2234,7 +2234,7 @@ default-package-overrides: - soap-tls ==0.1.1.4 - socket ==0.8.3.0 - socks ==0.6.1 - - some ==1.0.2 + - some ==1.0.3 - sop-core ==0.5.0.1 - sort ==1.0.0.0 - sorted-list ==0.2.1.0 @@ -2309,7 +2309,7 @@ default-package-overrides: - string-conversions ==0.4.0.1 - string-interpolate ==0.3.1.0 - string-qq ==0.0.4 - - string-random ==0.1.4.0 + - string-random ==0.1.4.1 - stringsearch ==0.3.6.6 - string-transform ==1.1.1 - stripe-concepts ==1.0.2.6 @@ -2362,7 +2362,7 @@ default-package-overrides: - tardis ==0.4.3.0 - tasty ==1.4.1 - tasty-ant-xml ==1.1.8 - - tasty-bench ==0.2.4 + - tasty-bench ==0.2.5 - tasty-dejafu ==2.0.0.7 - tasty-discover ==4.2.2 - tasty-expected-failure ==0.12.3 @@ -2741,7 +2741,7 @@ default-package-overrides: - yesod-sitemap ==1.6.0 - yesod-static ==1.6.1.0 - yesod-test ==1.6.12 - - yesod-websockets ==0.3.0.2 + - yesod-websockets ==0.3.0.3 - yes-precure5-command ==5.5.3 - yi-rope ==0.11 - yjsvg ==0.2.0.1 From 546af13867871c4f9fa1929b08a262775782c6fe Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 9 Apr 2021 20:51:58 +0200 Subject: [PATCH 014/230] hackage-packages.nix: automatic Haskell package set update This update was generated by hackage2nix v2.17.0-2-g2ef7e72 from Hackage revision https://github.com/commercialhaskell/all-cabal-hashes/commit/1aad60ed9679a7597f3fc3515a0fe26fdb896e55. --- .../haskell-modules/hackage-packages.nix | 337 +----------------- 1 file changed, 19 insertions(+), 318 deletions(-) diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index 3fa0fecb730..71933e3e20b 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -10836,8 +10836,8 @@ self: { ({ mkDerivation, base, bytestring, Cabal, network, openssl, time }: mkDerivation { pname = "HsOpenSSL"; - version = "0.11.6"; - sha256 = "1gkx6kk03ziz9wk6iwxcdpf1ig8a9whwv3yjbzmqrwkp7fh1wdrw"; + version = "0.11.6.1"; + sha256 = "0jmnmrhvm7rbspv0vw482i8wpmkzhnnwxswqwx75455w0mvdg62l"; setupHaskellDepends = [ base Cabal ]; libraryHaskellDepends = [ base bytestring network time ]; librarySystemDepends = [ openssl ]; @@ -39959,20 +39959,6 @@ self: { }) {}; "benchpress" = callPackage - ({ mkDerivation, base, bytestring, mtl, time }: - mkDerivation { - pname = "benchpress"; - version = "0.2.2.15"; - sha256 = "0bffchlwcyqgbnviqvm01lyj7zldvd3yj9yqnc8150lgxr29kvf9"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ base mtl time ]; - executableHaskellDepends = [ base bytestring time ]; - description = "Micro-benchmarking with detailed statistics"; - license = lib.licenses.bsd3; - }) {}; - - "benchpress_0_2_2_16" = callPackage ({ mkDerivation, base, bytestring, mtl, time }: mkDerivation { pname = "benchpress"; @@ -39984,7 +39970,6 @@ self: { executableHaskellDepends = [ base bytestring time ]; description = "Micro-benchmarking with detailed statistics"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "bencode" = callPackage @@ -45428,26 +45413,6 @@ self: { }) {}; "boring" = callPackage - ({ mkDerivation, adjunctions, base, base-compat, bin, constraints - , dec, fin, generics-sop, ral, singleton-bool, streams, tagged - , transformers, transformers-compat, vec - }: - mkDerivation { - pname = "boring"; - version = "0.1.3"; - sha256 = "1fljlkzc5016xbq9jykh0wr1mbyfcikh818pp54djws5vm66hh6d"; - revision = "2"; - editedCabalFile = "031vricyy2m7hg2hk3bj64lsz55k9qh36s2yfh09pgsfykr883ag"; - libraryHaskellDepends = [ - adjunctions base base-compat bin constraints dec fin generics-sop - ral singleton-bool streams tagged transformers transformers-compat - vec - ]; - description = "Boring and Absurd types"; - license = lib.licenses.bsd3; - }) {}; - - "boring_0_2" = callPackage ({ mkDerivation, base, tagged, transformers }: mkDerivation { pname = "boring"; @@ -45456,7 +45421,6 @@ self: { libraryHaskellDepends = [ base tagged transformers ]; description = "Boring and Absurd types"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "boring-game" = callPackage @@ -60613,16 +60577,6 @@ self: { }) {}; "composition" = callPackage - ({ mkDerivation }: - mkDerivation { - pname = "composition"; - version = "1.0.2.1"; - sha256 = "0smdyzcnfwiab1wnazmk4szali1ckh7dqcdp9vn7qnnabq7k08vi"; - description = "Combinators for unorthodox function composition"; - license = lib.licenses.bsd3; - }) {}; - - "composition_1_0_2_2" = callPackage ({ mkDerivation }: mkDerivation { pname = "composition"; @@ -60630,7 +60584,6 @@ self: { sha256 = "0bnl8kmaqbjnznqgnjj2gr2qygln6y6493prk0anpd8zdylzf2xm"; description = "Combinators for unorthodox function composition"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "composition-extra" = callPackage @@ -65270,7 +65223,7 @@ self: { license = lib.licenses.gpl3Only; hydraPlatforms = lib.platforms.none; broken = true; - }) {inherit (pkgs) python3;}; + }) {python3 = null;}; "cql" = callPackage ({ mkDerivation, base, bytestring, cereal, containers, Decimal @@ -70625,24 +70578,6 @@ self: { }) {}; "data-serializer" = callPackage - ({ mkDerivation, base, binary, bytestring, cereal, data-endian - , parsers, semigroups, split, tasty, tasty-quickcheck - }: - mkDerivation { - pname = "data-serializer"; - version = "0.3.4.1"; - sha256 = "1md6zkv1yqxmyca6mljw8y5g3xaqz3g087qd49qpi94w0x1lqgnk"; - libraryHaskellDepends = [ - base binary bytestring cereal data-endian parsers semigroups split - ]; - testHaskellDepends = [ - base binary bytestring cereal tasty tasty-quickcheck - ]; - description = "Common API for serialization libraries"; - license = lib.licenses.bsd3; - }) {}; - - "data-serializer_0_3_5" = callPackage ({ mkDerivation, base, binary, bytestring, cereal, data-endian , parsers, split, tasty, tasty-quickcheck }: @@ -70658,7 +70593,6 @@ self: { ]; description = "Common API for serialization libraries"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "data-size" = callPackage @@ -78044,8 +77978,8 @@ self: { }: mkDerivation { pname = "dl-fedora"; - version = "0.7.6"; - sha256 = "03npp2cq1259w590am87v0r4q48pfjq2zb2b04hymlr6hi3a8xw5"; + version = "0.7.7"; + sha256 = "0m4rf0h2hzsd00cgn14w1n8pyrqrikwnf9d232lzwx6qx3nf2nqp"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -78053,6 +77987,7 @@ self: { optparse-applicative regex-posix simple-cmd simple-cmd-args text time unix xdg-userdirs ]; + testHaskellDepends = [ base simple-cmd ]; description = "Fedora image download tool"; license = lib.licenses.gpl3Only; hydraPlatforms = lib.platforms.none; @@ -93037,22 +92972,6 @@ self: { }) {}; "flags-applicative" = callPackage - ({ mkDerivation, base, casing, containers, hspec, mtl, network - , text - }: - mkDerivation { - pname = "flags-applicative"; - version = "0.1.0.2"; - sha256 = "192yghdmylynn57l22ahb6dhrbl590dxmv2cdn755r22v7dbhsgf"; - libraryHaskellDepends = [ - base casing containers mtl network text - ]; - testHaskellDepends = [ base containers hspec text ]; - description = "Applicative flag parsing"; - license = lib.licenses.bsd3; - }) {}; - - "flags-applicative_0_1_0_3" = callPackage ({ mkDerivation, base, casing, containers, hspec, mtl, network , text }: @@ -93066,7 +92985,6 @@ self: { testHaskellDepends = [ base containers hspec text ]; description = "Applicative flag parsing"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "flamethrower" = callPackage @@ -111967,35 +111885,6 @@ self: { }) {}; "graphula" = callPackage - ({ mkDerivation, aeson, base, bytestring, containers, directory - , generics-eot, hspec, http-api-data, HUnit, markdown-unlit - , monad-logger, mtl, path-pieces, persistent, persistent-sqlite - , persistent-template, QuickCheck, random, resourcet, semigroups - , temporary, text, transformers, unliftio, unliftio-core, uuid - }: - mkDerivation { - pname = "graphula"; - version = "2.0.0.3"; - sha256 = "1hmay1g8j1b8pq98blq1sizc61h7lj782sajlwrllgvxc826rjm2"; - libraryHaskellDepends = [ - base containers directory generics-eot HUnit mtl persistent - QuickCheck random semigroups temporary text transformers unliftio - unliftio-core - ]; - testHaskellDepends = [ - aeson base bytestring containers hspec http-api-data markdown-unlit - monad-logger path-pieces persistent persistent-sqlite - persistent-template QuickCheck resourcet text transformers - unliftio-core uuid - ]; - testToolDepends = [ markdown-unlit ]; - description = "A declarative library for describing dependencies between data"; - license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; - broken = true; - }) {}; - - "graphula_2_0_0_4" = callPackage ({ mkDerivation, aeson, base, bytestring, containers, directory , generics-eot, hspec, http-api-data, HUnit, markdown-unlit , monad-logger, mtl, path-pieces, persistent, persistent-sqlite @@ -122606,8 +122495,8 @@ self: { }: mkDerivation { pname = "haskoin-store"; - version = "0.52.4"; - sha256 = "0qgiskx01rlwdmidv01k4mr9awb4sj6srhcrrsmiqd7fdnlaxb3s"; + version = "0.52.5"; + sha256 = "1vxm0y850bk3xhjy53rqx8231xvvdiw546izpz2x4ydnqg507w2b"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -122648,22 +122537,23 @@ self: { ({ mkDerivation, aeson, base, binary, bytes, bytestring, cereal , containers, data-default, deepseq, hashable, haskoin-core, hspec , hspec-discover, http-client, http-types, lens, mtl, network - , QuickCheck, scotty, string-conversions, text + , QuickCheck, scotty, string-conversions, text, time , unordered-containers, wreq }: mkDerivation { pname = "haskoin-store-data"; - version = "0.52.0"; - sha256 = "0fgjmyps858dvx8i2mzn8kqmms869wamldrdlmy2y27wcmrzzj51"; + version = "0.52.5"; + sha256 = "1yhjdvfbri1n900wkrql7j9h5d2igqap9yjpssvkb2wrxb22zmc1"; libraryHaskellDepends = [ aeson base binary bytes bytestring cereal containers data-default deepseq hashable haskoin-core http-client http-types lens mtl - network scotty string-conversions text unordered-containers wreq + network scotty string-conversions text time unordered-containers + wreq ]; testHaskellDepends = [ aeson base binary bytes bytestring cereal containers data-default deepseq hashable haskoin-core hspec http-client http-types lens mtl - network QuickCheck scotty string-conversions text + network QuickCheck scotty string-conversions text time unordered-containers wreq ]; testToolDepends = [ hspec-discover ]; @@ -129071,22 +128961,6 @@ self: { }) {}; "hidapi" = callPackage - ({ mkDerivation, base, bytestring, deepseq, deepseq-generics - , systemd - }: - mkDerivation { - pname = "hidapi"; - version = "0.1.6"; - sha256 = "1dy5sbfh8rkzrjpn5ls5xbr32ja0h6bgigzya512advc4c21af2b"; - libraryHaskellDepends = [ - base bytestring deepseq deepseq-generics - ]; - librarySystemDepends = [ systemd ]; - description = "Haskell bindings to HIDAPI"; - license = lib.licenses.mit; - }) {inherit (pkgs) systemd;}; - - "hidapi_0_1_7" = callPackage ({ mkDerivation, base, bytestring, deepseq, deepseq-generics , systemd }: @@ -129100,7 +128974,6 @@ self: { librarySystemDepends = [ systemd ]; description = "Haskell bindings to HIDAPI"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; }) {inherit (pkgs) systemd;}; "hidden-char" = callPackage @@ -134816,27 +134689,6 @@ self: { }) {}; "hpc-codecov" = callPackage - ({ mkDerivation, array, base, bytestring, directory, filepath, hpc - , tar, tasty, tasty-hunit - }: - mkDerivation { - pname = "hpc-codecov"; - version = "0.2.0.2"; - sha256 = "0x95ikxrymvgakpiycbl027nv23c8c7p369zvbbr2bv67jvb7fzv"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - array base bytestring directory filepath hpc - ]; - executableHaskellDepends = [ base ]; - testHaskellDepends = [ - base directory filepath tar tasty tasty-hunit - ]; - description = "Generate codecov report from hpc data"; - license = lib.licenses.bsd3; - }) {}; - - "hpc-codecov_0_3_0_0" = callPackage ({ mkDerivation, array, base, bytestring, directory, filepath, hpc , process, tasty, tasty-hunit }: @@ -134855,7 +134707,6 @@ self: { ]; description = "Generate codecov report from hpc data"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "hpc-coveralls" = callPackage @@ -154294,7 +154145,7 @@ self: { license = lib.licenses.mit; hydraPlatforms = lib.platforms.none; broken = true; - }) {inherit (pkgs) python;}; + }) {python = null;}; "json-qq" = callPackage ({ mkDerivation, base, haskell-src-meta, parsec, template-haskell @@ -164233,27 +164084,6 @@ self: { }) {}; "lifted-async" = callPackage - ({ mkDerivation, async, base, constraints, deepseq, HUnit - , lifted-base, monad-control, mtl, tasty, tasty-bench - , tasty-expected-failure, tasty-hunit, tasty-th, transformers-base - }: - mkDerivation { - pname = "lifted-async"; - version = "0.10.1.3"; - sha256 = "1hml672j8sqxhklxif3nwr8v59a596wwwbllq0zvvmlxcjdzlh7k"; - libraryHaskellDepends = [ - async base constraints lifted-base monad-control transformers-base - ]; - testHaskellDepends = [ - async base HUnit lifted-base monad-control mtl tasty - tasty-expected-failure tasty-hunit tasty-th - ]; - benchmarkHaskellDepends = [ async base deepseq tasty-bench ]; - description = "Run lifted IO operations asynchronously and wait for their results"; - license = lib.licenses.bsd3; - }) {}; - - "lifted-async_0_10_2" = callPackage ({ mkDerivation, async, base, constraints, deepseq, HUnit , lifted-base, monad-control, mtl, tasty, tasty-bench , tasty-expected-failure, tasty-hunit, tasty-th, transformers-base @@ -164272,7 +164102,6 @@ self: { benchmarkHaskellDepends = [ async base deepseq tasty-bench ]; description = "Run lifted IO operations asynchronously and wait for their results"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "lifted-base" = callPackage @@ -169898,7 +169727,7 @@ self: { ]; description = "LZMA/XZ compression and decompression"; license = lib.licenses.bsd3; - }) {inherit (pkgs) lzma;}; + }) {lzma = null;}; "lzma-clib" = callPackage ({ mkDerivation }: @@ -169953,7 +169782,7 @@ self: { license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; broken = true; - }) {inherit (pkgs) lzma;}; + }) {lzma = null;}; "lzma-static" = callPackage ({ mkDerivation, base, bytestring, HUnit, QuickCheck, tasty @@ -180233,18 +180062,6 @@ self: { }) {}; "more-containers" = callPackage - ({ mkDerivation, base, binary, containers, hspec }: - mkDerivation { - pname = "more-containers"; - version = "0.2.2.0"; - sha256 = "1i4klvfwgw608sy81mqqvd107b187gkib2rwsz6aqc4rh0vm0a87"; - libraryHaskellDepends = [ base binary containers ]; - testHaskellDepends = [ base binary containers hspec ]; - description = "A few more collections"; - license = lib.licenses.mit; - }) {}; - - "more-containers_0_2_2_2" = callPackage ({ mkDerivation, base, binary, containers, hspec }: mkDerivation { pname = "more-containers"; @@ -180254,7 +180071,6 @@ self: { testHaskellDepends = [ base binary containers hspec ]; description = "A few more collections"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; }) {}; "more-extensible-effects" = callPackage @@ -214266,7 +214082,7 @@ self: { license = lib.licenses.mit; hydraPlatforms = lib.platforms.none; broken = true; - }) {inherit (pkgs) python;}; + }) {python = null;}; "pyfi" = callPackage ({ mkDerivation, aeson, base, bytestring, containers, pureMD5 @@ -214284,7 +214100,7 @@ self: { license = lib.licenses.mit; hydraPlatforms = lib.platforms.none; broken = true; - }) {inherit (pkgs) python;}; + }) {python = null;}; "python-pickle" = callPackage ({ mkDerivation, attoparsec, base, bytestring, cereal, cmdargs @@ -225342,26 +225158,6 @@ self: { }) {}; "rio-orphans" = callPackage - ({ mkDerivation, base, exceptions, fast-logger, hspec - , monad-control, monad-logger, resourcet, rio, transformers-base - }: - mkDerivation { - pname = "rio-orphans"; - version = "0.1.1.0"; - sha256 = "0klbshdsv3gq3l7g1d6gq2wxdqjlqxbnwk1lbg5dpbz7yrnjr3by"; - libraryHaskellDepends = [ - base exceptions fast-logger monad-control monad-logger resourcet - rio transformers-base - ]; - testHaskellDepends = [ - base exceptions fast-logger hspec monad-control monad-logger - resourcet rio transformers-base - ]; - description = "Orphan instances for the RIO type in the rio package"; - license = lib.licenses.mit; - }) {}; - - "rio-orphans_0_1_2_0" = callPackage ({ mkDerivation, base, exceptions, fast-logger, hspec , monad-control, monad-logger, resourcet, rio, transformers-base , unliftio-core @@ -225380,7 +225176,6 @@ self: { ]; description = "Orphan instances for the RIO type in the rio package"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; }) {}; "rio-prettyprint" = callPackage @@ -235705,33 +235500,6 @@ self: { }) {}; "serverless-haskell" = callPackage - ({ mkDerivation, aeson, aeson-casing, amazonka-core - , amazonka-kinesis, amazonka-s3, base, bytestring, case-insensitive - , hspec, hspec-discover, http-client, http-types, iproute, lens - , raw-strings-qq, safe-exceptions, text, time, transformers, unix - , unordered-containers - }: - mkDerivation { - pname = "serverless-haskell"; - version = "0.12.5"; - sha256 = "1p15nzwjbwbjxnqgs6dzz7sb2cp5y3l69hr3n10zmwmgrq4x2nfa"; - libraryHaskellDepends = [ - aeson aeson-casing amazonka-core amazonka-kinesis amazonka-s3 base - bytestring case-insensitive http-client http-types iproute lens - safe-exceptions text time unix unordered-containers - ]; - testHaskellDepends = [ - aeson aeson-casing amazonka-core amazonka-kinesis amazonka-s3 base - bytestring case-insensitive hspec hspec-discover http-client - http-types iproute lens raw-strings-qq safe-exceptions text time - transformers unix unordered-containers - ]; - testToolDepends = [ hspec-discover ]; - description = "Deploying Haskell code onto AWS Lambda using Serverless"; - license = lib.licenses.mit; - }) {}; - - "serverless-haskell_0_12_6" = callPackage ({ mkDerivation, aeson, aeson-casing, amazonka-core , amazonka-kinesis, amazonka-s3, base, bytestring, case-insensitive , containers, hspec, hspec-discover, http-client, http-types @@ -235756,7 +235524,6 @@ self: { testToolDepends = [ hspec-discover ]; description = "Deploying Haskell code onto AWS Lambda using Serverless"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; }) {}; "serversession" = callPackage @@ -244193,18 +243960,6 @@ self: { }) {}; "some" = callPackage - ({ mkDerivation, base, deepseq }: - mkDerivation { - pname = "some"; - version = "1.0.2"; - sha256 = "12mv5gzcvl4n5rz685r2nmmiykvnkvrvx7k4cvwscdjjgnqa9y6c"; - libraryHaskellDepends = [ base deepseq ]; - testHaskellDepends = [ base ]; - description = "Existential type: Some"; - license = lib.licenses.bsd3; - }) {}; - - "some_1_0_3" = callPackage ({ mkDerivation, base, deepseq }: mkDerivation { pname = "some"; @@ -244214,7 +243969,6 @@ self: { testHaskellDepends = [ base ]; description = "Existential type: Some"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "sonic-visualiser" = callPackage @@ -250963,29 +250717,6 @@ self: { }) {}; "string-random" = callPackage - ({ mkDerivation, attoparsec, base, bytestring, containers - , optparse-applicative, pcre-heavy, QuickCheck, random, tasty - , tasty-hunit, tasty-quickcheck, text, transformers - }: - mkDerivation { - pname = "string-random"; - version = "0.1.4.0"; - sha256 = "09xv1jbhsz8hfxc6y54fj4pkhyxfbfh53i6kxy408zm3raa2nmii"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - attoparsec base containers random text transformers - ]; - executableHaskellDepends = [ base optparse-applicative text ]; - testHaskellDepends = [ - base bytestring pcre-heavy QuickCheck tasty tasty-hunit - tasty-quickcheck text - ]; - description = "A library for generating random string from a regular experession"; - license = lib.licenses.bsd3; - }) {}; - - "string-random_0_1_4_1" = callPackage ({ mkDerivation, attoparsec, base, bytestring, containers , optparse-applicative, pcre-heavy, QuickCheck, random, tasty , tasty-hunit, tasty-quickcheck, text, transformers @@ -251006,7 +250737,6 @@ self: { ]; description = "A library for generating random string from a regular experession"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "string-similarity" = callPackage @@ -256486,17 +256216,6 @@ self: { }) {}; "tasty-bench" = callPackage - ({ mkDerivation, base, containers, deepseq, tasty }: - mkDerivation { - pname = "tasty-bench"; - version = "0.2.4"; - sha256 = "11hkhlpwxzxxi6ny4jklaz70cd0ca905yxv9idacmwajbrliinna"; - libraryHaskellDepends = [ base containers deepseq tasty ]; - description = "Featherlight benchmark framework"; - license = lib.licenses.mit; - }) {}; - - "tasty-bench_0_2_5" = callPackage ({ mkDerivation, base, containers, deepseq, tasty }: mkDerivation { pname = "tasty-bench"; @@ -256505,7 +256224,6 @@ self: { libraryHaskellDepends = [ base containers deepseq tasty ]; description = "Featherlight benchmark framework"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; }) {}; "tasty-dejafu" = callPackage @@ -289919,22 +289637,6 @@ self: { }) {}; "yesod-websockets" = callPackage - ({ mkDerivation, base, conduit, mtl, transformers, unliftio - , wai-websockets, websockets, yesod-core - }: - mkDerivation { - pname = "yesod-websockets"; - version = "0.3.0.2"; - sha256 = "1k206l84g25xml8yg4q7i62x5aydxq2hni2fk2cc36dlvl0rgih1"; - libraryHaskellDepends = [ - base conduit mtl transformers unliftio wai-websockets websockets - yesod-core - ]; - description = "WebSockets support for Yesod"; - license = lib.licenses.mit; - }) {}; - - "yesod-websockets_0_3_0_3" = callPackage ({ mkDerivation, base, conduit, mtl, transformers, unliftio , wai-websockets, websockets, yesod-core }: @@ -289948,7 +289650,6 @@ self: { ]; description = "WebSockets support for Yesod"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; }) {}; "yesod-websockets-extra" = callPackage From c8ac41fafcbb938efbd1dd819eb318f15187530b Mon Sep 17 00:00:00 2001 From: "(cdep)illabout" Date: Sat, 10 Apr 2021 00:09:12 +0900 Subject: [PATCH 015/230] haskellPackages: add changelog argument to Haskell generic-builder.nix changelog was recently added as a new meta field in https://github.com/NixOS/nixpkgs/pull/60371. This commit adds similar support to the Haskell generic builder. --- pkgs/development/haskell-modules/generic-builder.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/haskell-modules/generic-builder.nix b/pkgs/development/haskell-modules/generic-builder.nix index 582cf6df010..faf80da0c7d 100644 --- a/pkgs/development/haskell-modules/generic-builder.nix +++ b/pkgs/development/haskell-modules/generic-builder.nix @@ -51,6 +51,7 @@ in , license , enableParallelBuilding ? true , maintainers ? null +, changelog ? null , doCoverage ? false , doHaddock ? !(ghc.isHaLVM or false) , passthru ? {} @@ -642,6 +643,7 @@ stdenv.mkDerivation ({ // optionalAttrs (args ? description) { inherit description; } // optionalAttrs (args ? maintainers) { inherit maintainers; } // optionalAttrs (args ? hydraPlatforms) { inherit hydraPlatforms; } + // optionalAttrs (args ? changelog) { inherit changelog; } ; } From 250ae4062c3ec7a9cccc86f8dda5ecb89970bfe1 Mon Sep 17 00:00:00 2001 From: "(cdep)illabout" Date: Sat, 10 Apr 2021 00:13:23 +0900 Subject: [PATCH 016/230] spago: make use of new changelog field for haskell generic builder --- pkgs/development/tools/purescript/spago/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/tools/purescript/spago/default.nix b/pkgs/development/tools/purescript/spago/default.nix index 6fef3dd8675..980bca0fa2d 100644 --- a/pkgs/development/tools/purescript/spago/default.nix +++ b/pkgs/development/tools/purescript/spago/default.nix @@ -17,6 +17,8 @@ let maintainers = (oldAttrs.maintainers or []) ++ [ lib.maintainers.cdepillabout ]; + changelog = + "https://github.com/purescript/spago/releases/tag/${oldAttrs.version}"; })); in From a84b250f7f23f4d9adc89c6a0d1d5bc90d7b2c12 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sun, 11 Apr 2021 02:30:31 +0200 Subject: [PATCH 017/230] hackage-packages.nix: automatic Haskell package set update This update was generated by hackage2nix v2.17.0-2-g2ef7e72 from Hackage revision https://github.com/commercialhaskell/all-cabal-hashes/commit/3601914c12f130f2ed460b8531502da57e7ef6b1. --- .../haskell-modules/hackage-packages.nix | 171 +++++++++++++----- 1 file changed, 126 insertions(+), 45 deletions(-) diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index 71933e3e20b..0b7d3cab5a9 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -8962,8 +8962,8 @@ self: { }: mkDerivation { pname = "HPDF"; - version = "1.5.2"; - sha256 = "0mp3lbyyp6iykqrnviam46wb5aab24c1ncivxp5c2v5hg89a1jrm"; + version = "1.5.3"; + sha256 = "12h3gx9gikzz4fwf11zk1nwzbpwqzzyavjz8mr27scy3s94vw41r"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -50485,8 +50485,8 @@ self: { }: mkDerivation { pname = "calamity"; - version = "0.1.27.0"; - sha256 = "1aslkqv8j5zq3pznlw4ga32gz8w29xd365rcjw3xbdj4cygpix40"; + version = "0.1.28.0"; + sha256 = "0szxkhg6wgz2yr1dwsnvcyia45jjcysjzb65jrswdy6y2q0hmqlf"; libraryHaskellDepends = [ aeson async base bytestring colour concurrent-extra connection containers data-default-class data-flags deepseq deque df1 di-core @@ -53848,10 +53848,8 @@ self: { }: mkDerivation { pname = "chassis"; - version = "0.0.4.0"; - sha256 = "1mvi7h6pp1j3x4yccqy962f8d3gbm4sj5fvnfwxygnxqqhmy1dvk"; - revision = "1"; - editedCabalFile = "15pncz2x3llb2sg2x4as4r0wbx528dvlp0gvc2rl9y9dxhv89d9h"; + version = "0.0.5.0"; + sha256 = "0f9iipl7l9jhi6754yysk9kkliiab60ds95k8r4gjcch3hh4zbcj"; libraryHaskellDepends = [ base bytestring comonad composite-base containers contravariant distributive either exceptions extra first-class-families path @@ -56672,8 +56670,8 @@ self: { }: mkDerivation { pname = "cli-extras"; - version = "0.1.0.1"; - sha256 = "1fggrnhdbr2ialdd93d0m81b85izs1gvcs8bkmwm8wdxgw4v7hsi"; + version = "0.1.0.2"; + sha256 = "1qcvphbimcclvy7qkqrz9djg4650axwqjfyq6nlbvmpivh14m9vq"; libraryHaskellDepends = [ aeson ansi-terminal base bytestring containers exceptions io-streams lens logging-effect monad-logger monad-loops mtl process @@ -56691,8 +56689,8 @@ self: { }: mkDerivation { pname = "cli-git"; - version = "0.1.0.1"; - sha256 = "0jchv1j7dgay6xzny9rinsybavs4ggk93450cka6sp7015z06ysr"; + version = "0.1.0.2"; + sha256 = "08gjhg2bc8i9i1clpxp5bzk4sp4izfbhjqmbmfmqqzv6ci0p5fxx"; libraryHaskellDepends = [ base cli-extras containers data-default exceptions lens logging-effect megaparsec mtl text @@ -96965,17 +96963,21 @@ self: { }) {}; "ftdi" = callPackage - ({ mkDerivation, base, base-unicode-symbols, bytestring, safe - , transformers, usb + ({ mkDerivation, async, base, base-unicode-symbols, bytestring + , generic-random, QuickCheck, random, tagged, test-framework + , test-framework-quickcheck2, transformers, usb, vector }: mkDerivation { pname = "ftdi"; - version = "0.2.0.1"; - sha256 = "1gnfbngn3jwva6nvrcrzmi2n2vy4k55yh41zvg0kyb61w7kgm4m8"; - isLibrary = true; - isExecutable = true; + version = "0.3.0.0"; + sha256 = "1yhcpd9jzhmvlmhidyv70s5mvakq6jn9lb3zh132lrqsrirbmpx8"; libraryHaskellDepends = [ - base base-unicode-symbols bytestring safe transformers usb + async base base-unicode-symbols bytestring transformers usb vector + ]; + testHaskellDepends = [ + base base-unicode-symbols bytestring generic-random QuickCheck + random tagged test-framework test-framework-quickcheck2 + transformers usb vector ]; description = "A thin layer over USB to communicate with FTDI chips"; license = lib.licenses.bsd3; @@ -106642,6 +106644,17 @@ self: { license = lib.licenses.bsd3; }) {}; + "gl3w" = callPackage + ({ mkDerivation, base }: + mkDerivation { + pname = "gl3w"; + version = "0.1.0"; + sha256 = "14wm8wp4jxi4fq75bvr6sl4xmsxjfw30yq7011v28xqpm9015ns0"; + libraryHaskellDepends = [ base ]; + description = "Haskell bindings for the gl3w library"; + license = lib.licenses.mit; + }) {}; + "glabrous" = callPackage ({ mkDerivation, aeson, aeson-pretty, attoparsec, base, bytestring , cereal, cereal-text, directory, either, hspec, text @@ -119511,32 +119524,33 @@ self: { }) {}; "haskell-awk" = callPackage - ({ mkDerivation, base, bytestring, containers, directory, doctest - , easy-file, exceptions, filepath, haskell-src-exts, hint, hspec - , HUnit, mtl, network, process, stringsearch, temporary - , test-framework, test-framework-hunit, time, transformers + ({ mkDerivation, aeson, attoparsec, base, bytestring, Cabal + , cabal-doctest, containers, directory, doctest, easy-file + , exceptions, extra, filelock, filepath, ghc, haskell-src-exts + , hint, hspec, HUnit, list-t, mtl, process, stringsearch + , template-haskell, temporary, test-framework, test-framework-hunit + , time, transformers }: mkDerivation { pname = "haskell-awk"; - version = "1.1.1"; - sha256 = "0s6vzfsqh2wwsp98l8zpg6cvh7jwz5wha44idz3yavhmy6z08zgd"; - revision = "2"; - editedCabalFile = "1nq69vqp5dphhkq3h94c1gw2hpgyn2snnsig6kjwm4z60ww87viw"; + version = "1.2"; + sha256 = "14jfw5s3xw7amwasw37mxfinzwvxd6pr64iypmy65z7bkx3l01cj"; isLibrary = true; isExecutable = true; + setupHaskellDepends = [ base Cabal cabal-doctest ]; libraryHaskellDepends = [ - base bytestring containers stringsearch + base bytestring containers ghc list-t stringsearch ]; executableHaskellDepends = [ - base bytestring containers directory easy-file exceptions filepath - haskell-src-exts hint mtl network process stringsearch time - transformers + base bytestring containers directory exceptions extra filelock + filepath ghc haskell-src-exts hint list-t mtl process stringsearch + template-haskell time transformers ]; testHaskellDepends = [ - base bytestring containers directory doctest easy-file exceptions - filepath haskell-src-exts hint hspec HUnit mtl network process - stringsearch temporary test-framework test-framework-hunit time - transformers + aeson attoparsec base bytestring containers directory doctest + easy-file exceptions extra filelock filepath ghc haskell-src-exts + hint hspec HUnit list-t mtl process stringsearch template-haskell + temporary test-framework test-framework-hunit time transformers ]; description = "Transform text from the command-line using Haskell expressions"; license = lib.licenses.asl20; @@ -122495,8 +122509,8 @@ self: { }: mkDerivation { pname = "haskoin-store"; - version = "0.52.5"; - sha256 = "1vxm0y850bk3xhjy53rqx8231xvvdiw546izpz2x4ydnqg507w2b"; + version = "0.52.6"; + sha256 = "19j4cvxnrqhckbyjnwg2z4ixavbkgcxlxspsxakawaffqhq49wq8"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -122542,8 +122556,8 @@ self: { }: mkDerivation { pname = "haskoin-store-data"; - version = "0.52.5"; - sha256 = "1yhjdvfbri1n900wkrql7j9h5d2igqap9yjpssvkb2wrxb22zmc1"; + version = "0.52.6"; + sha256 = "0npiib582rnbk3w9f0m71y84xpk7akzkypfxrd9n1s4h3dh0qsfw"; libraryHaskellDepends = [ aeson base binary bytes bytestring cereal containers data-default deepseq hashable haskoin-core http-client http-types lens mtl @@ -169790,8 +169804,8 @@ self: { }: mkDerivation { pname = "lzma-static"; - version = "5.2.5"; - sha256 = "13xgap430r2hpkwk56ra5ya8fparikpzy50mbyd0xdpvs02imwfp"; + version = "5.2.5.1"; + sha256 = "1hky1aa1bl6zxnhwgpghx1wf43g74x6f4xpi21l65a39sb25bqf0"; libraryHaskellDepends = [ base bytestring ]; testHaskellDepends = [ base bytestring HUnit QuickCheck tasty tasty-hunit tasty-quickcheck @@ -188341,8 +188355,8 @@ self: { }: mkDerivation { pname = "nix-thunk"; - version = "0.2.0.2"; - sha256 = "1jxdxb8ri0cd7ni9z80xlb86d81bb83c6ki5wj7jx7sn9inzz8z7"; + version = "0.2.0.3"; + sha256 = "1pcmn31hf81gxmmjyqc23pwpaafx03alvx2fgynd1isdsb0057my"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -214370,6 +214384,24 @@ self: { license = lib.licenses.mit; }) {}; + "qr" = callPackage + ({ mkDerivation, array, base, cairo, gtk, optparse-applicative + , transformers, utf8-string + }: + mkDerivation { + pname = "qr"; + version = "0.2.0.0"; + sha256 = "0mn33p9j87w5fq4ddrwn5nb32gcxzxli55y3jv1aaypsgi6vf3w7"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ array base utf8-string ]; + executableHaskellDepends = [ + array base cairo gtk optparse-applicative transformers + ]; + description = "Pure Haskell QR encoder library and command line tool"; + license = lib.licenses.bsd3; + }) {}; + "qr-imager" = callPackage ({ mkDerivation, base, binary, bytestring, cryptonite, directory , haskell-qrencode, hspec, jose-jwt, JuicyPixels, microlens @@ -224189,8 +224221,8 @@ self: { }: mkDerivation { pname = "retrie"; - version = "0.1.1.1"; - sha256 = "1l6pcvmf95i4r4b370j8dwqbvj3971xn6097lbw93agyrf704qpi"; + version = "1.0.0.0"; + sha256 = "1hrkx7gx7hwgljvx8zm1yhn7xvyif943hvxx5b27ali6grmndy9w"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -261245,6 +261277,8 @@ self: { pname = "th-utilities"; version = "0.2.4.2"; sha256 = "09rbs878gjhyg8n789p2c67lzxr4h1pg0zar47a7j8sg6ff5wcx2"; + revision = "1"; + editedCabalFile = "177hbrwcyalm6gbqq96b5xz974bxzch9g2mvffvksi1205z6v7dr"; libraryHaskellDepends = [ base bytestring containers directory filepath primitive syb template-haskell text th-abstraction th-orphans @@ -261257,6 +261291,28 @@ self: { license = lib.licenses.mit; }) {}; + "th-utilities_0_2_4_3" = callPackage + ({ mkDerivation, base, bytestring, containers, directory, filepath + , hspec, primitive, syb, template-haskell, text, th-abstraction + , th-orphans, vector + }: + mkDerivation { + pname = "th-utilities"; + version = "0.2.4.3"; + sha256 = "1krvn3xp7zicp6wqcgmgbgl2a894n677vxi6vhcna16cx03smic9"; + libraryHaskellDepends = [ + base bytestring containers directory filepath primitive syb + template-haskell text th-abstraction th-orphans + ]; + testHaskellDepends = [ + base bytestring containers directory filepath hspec primitive syb + template-haskell text th-abstraction th-orphans vector + ]; + description = "Collection of useful functions for use with Template Haskell"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + }) {}; + "thank-you-stars" = callPackage ({ mkDerivation, aeson, base, bytestring, Cabal, containers , directory, filepath, hackage-db, hspec, req, split, text @@ -279106,6 +279162,31 @@ self: { broken = true; }) {}; + "wai-session-redis" = callPackage + ({ mkDerivation, base, bytestring, cereal, data-default, hedis + , hspec, http-types, vault, wai, wai-session, warp + }: + mkDerivation { + pname = "wai-session-redis"; + version = "0.1.0.0"; + sha256 = "12l2r85xq8ryv6y660c20yfxa19n3rvkilmkb74bj1ch7jmm8d6n"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base bytestring cereal data-default hedis vault wai wai-session + ]; + executableHaskellDepends = [ + base bytestring cereal data-default hedis http-types vault wai + wai-session warp + ]; + testHaskellDepends = [ + base bytestring cereal data-default hedis hspec vault wai + wai-session + ]; + description = "Simple Redis backed wai-session backend"; + license = lib.licenses.bsd3; + }) {}; + "wai-session-tokyocabinet" = callPackage ({ mkDerivation, base, bytestring, cereal, errors , tokyocabinet-haskell, transformers, wai-session From 266a1baa49cddce934bc6baaa6c0edb0a632615d Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 11 Apr 2021 12:52:34 +0200 Subject: [PATCH 018/230] python3Packages.pycomfoconnect: init at 0.4 --- .../python-modules/pycomfoconnect/default.nix | 34 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 36 insertions(+) create mode 100644 pkgs/development/python-modules/pycomfoconnect/default.nix diff --git a/pkgs/development/python-modules/pycomfoconnect/default.nix b/pkgs/development/python-modules/pycomfoconnect/default.nix new file mode 100644 index 00000000000..cb40ec8f527 --- /dev/null +++ b/pkgs/development/python-modules/pycomfoconnect/default.nix @@ -0,0 +1,34 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, protobuf +, pytestCheckHook +}: + +buildPythonPackage rec { + pname = "pycomfoconnect"; + version = "0.4"; + + src = fetchFromGitHub { + owner = "michaelarnauts"; + repo = "comfoconnect"; + rev = version; + sha256 = "0bipzv68yw056iz9m2g9h40hzrwd058a7crxp0xbq4rw2d8j0jn6"; + }; + + propagatedBuildInputs = [ + protobuf + ]; + + # Project has no tests + doCheck = false; + + pythonImportsCheck = [ "pycomfoconnect" ]; + + meta = with lib; { + description = "Python module to interact with ComfoAir Q350/450/600 units"; + homepage = "https://github.com/michaelarnauts/comfoconnect"; + license = with licenses; [ mit ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 68832d87e9b..54bf55d1a31 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -5621,6 +5621,8 @@ in { pycollada = callPackage ../development/python-modules/pycollada { }; + pycomfoconnect = callPackage ../development/python-modules/pycomfoconnect { }; + pycontracts = callPackage ../development/python-modules/pycontracts { }; pycosat = callPackage ../development/python-modules/pycosat { }; From f87c12b6890ba1be555d8da799c737bd13950207 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 11 Apr 2021 12:54:09 +0200 Subject: [PATCH 019/230] home-assistant: update component-packages --- pkgs/servers/home-assistant/component-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/servers/home-assistant/component-packages.nix b/pkgs/servers/home-assistant/component-packages.nix index 0a801fa2c2f..9ccc4e45be2 100644 --- a/pkgs/servers/home-assistant/component-packages.nix +++ b/pkgs/servers/home-assistant/component-packages.nix @@ -131,7 +131,7 @@ "coinbase" = ps: with ps; [ ]; # missing inputs: coinbase "color_extractor" = ps: with ps; [ ]; # missing inputs: colorthief "comed_hourly_pricing" = ps: with ps; [ ]; - "comfoconnect" = ps: with ps; [ ]; # missing inputs: pycomfoconnect + "comfoconnect" = ps: with ps; [ pycomfoconnect ]; "command_line" = ps: with ps; [ ]; "concord232" = ps: with ps; [ ]; # missing inputs: concord232 "config" = ps: with ps; [ aiohttp-cors ]; From e9a0be7040e74080f9931b2fcc3f6fb560256417 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 11 Apr 2021 13:02:33 +0200 Subject: [PATCH 020/230] home-assistant: enable comfoconnect tests --- pkgs/servers/home-assistant/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/servers/home-assistant/default.nix b/pkgs/servers/home-assistant/default.nix index e0f7db7a577..d02cc41ea28 100644 --- a/pkgs/servers/home-assistant/default.nix +++ b/pkgs/servers/home-assistant/default.nix @@ -197,6 +197,7 @@ in with py.pkgs; buildPythonApplication rec { "cast" "climate" "cloud" + "comfoconnect" "command_line" "config" "configurator" From 797b39342845d0406cebdf9233497d4705c8c89d Mon Sep 17 00:00:00 2001 From: Guillaume Bouchard Date: Sun, 11 Apr 2021 13:51:02 +0200 Subject: [PATCH 021/230] haskellPackages.PyF: un mark as broken `PyF` is not broken, neither `krank` which depends on it. --- pkgs/development/haskell-modules/configuration-hackage2nix.yaml | 2 -- 1 file changed, 2 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml index e3e3d65da01..cc6df86a7a9 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml @@ -7490,7 +7490,6 @@ broken-packages: - kparams - kqueue - kraken - - krank - krapsh - Kriens - krpc @@ -9330,7 +9329,6 @@ broken-packages: - puzzle-draw - puzzle-draw-cmdline - pvd - - PyF - pyffi - pyfi - python-pickle From 3cb83409d2e88e86d51e57fc5213b3c2d32723f1 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Mon, 12 Apr 2021 00:00:57 +0200 Subject: [PATCH 022/230] Revert "nixos/home-assistant: use override before overridePythonAttrs" --- .../modules/services/misc/home-assistant.nix | 19 ++++++++----------- 1 file changed, 8 insertions(+), 11 deletions(-) diff --git a/nixos/modules/services/misc/home-assistant.nix b/nixos/modules/services/misc/home-assistant.nix index 2787c975b35..f6398c08397 100644 --- a/nixos/modules/services/misc/home-assistant.nix +++ b/nixos/modules/services/misc/home-assistant.nix @@ -50,15 +50,10 @@ let # List of components used in config extraComponents = filter useComponent availableComponents; - testedPackage = if (cfg.autoExtraComponents && cfg.config != null) + package = if (cfg.autoExtraComponents && cfg.config != null) then (cfg.package.override { inherit extraComponents; }) else cfg.package; - # overridePythonAttrs has to be applied after override - package = testedPackage.overridePythonAttrs (oldAttrs: { - doCheck = false; - }); - # If you are changing this, please update the description in applyDefaultConfig defaultConfig = { homeassistant.time_zone = config.time.timeZone; @@ -188,9 +183,13 @@ in { }; package = mkOption { - default = pkgs.home-assistant; + default = pkgs.home-assistant.overridePythonAttrs (oldAttrs: { + doCheck = false; + }); defaultText = literalExample '' - pkgs.home-assistant + pkgs.home-assistant.overridePythonAttrs (oldAttrs: { + doCheck = false; + }) ''; type = types.package; example = literalExample '' @@ -199,12 +198,10 @@ in { } ''; description = '' - Home Assistant package to use. Tests are automatically disabled, as they take a considerable amout of time to complete. + Home Assistant package to use. By default the tests are disabled, as they take a considerable amout of time to complete. Override extraPackages or extraComponents in order to add additional dependencies. If you specify and do not set to false, overriding extraComponents will have no effect. - Avoid home-assistant.overridePythonAttrs if you use - autoExtraComponents. ''; }; From 66b2aaf2ebb91cbaf9f90d71af27cb7558659fc2 Mon Sep 17 00:00:00 2001 From: Konrad Borowski Date: Mon, 12 Apr 2021 18:37:18 +0200 Subject: [PATCH 023/230] Revert "nixos/systemd: provide libidn2 for systemd-resolved" This patch is no longer necessary with systemd v247.3. This reverts commit c674a51382ce556f98c76f270275ecece3a4936a. --- nixos/modules/system/boot/resolved.nix | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/nixos/modules/system/boot/resolved.nix b/nixos/modules/system/boot/resolved.nix index 7fe8f4dfb7e..84bc9b78076 100644 --- a/nixos/modules/system/boot/resolved.nix +++ b/nixos/modules/system/boot/resolved.nix @@ -1,4 +1,4 @@ -{ config, pkgs, lib, ... }: +{ config, lib, ... }: with lib; let @@ -150,9 +150,6 @@ in wantedBy = [ "multi-user.target" ]; aliases = [ "dbus-org.freedesktop.resolve1.service" ]; restartTriggers = [ config.environment.etc."systemd/resolved.conf".source ]; - # Upstream bug: https://github.com/systemd/systemd/issues/18078 - # systemd-resolved without libidn2 is broken - environment.LD_LIBRARY_PATH = "${lib.getLib pkgs.libidn2}/lib"; }; environment.etc = { From 064b446fc0c7b79f05c6fac6b8da23eb18340d50 Mon Sep 17 00:00:00 2001 From: Fabian Geiselhart Date: Thu, 4 Feb 2021 20:20:58 +0100 Subject: [PATCH 024/230] nixos/quake3-server: Init --- nixos/modules/module-list.nix | 1 + .../modules/services/games/quake3-server.nix | 111 ++++++++++++++++++ 2 files changed, 112 insertions(+) create mode 100644 nixos/modules/services/games/quake3-server.nix diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index 0d26b7300d0..e3c5f35fad4 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -355,6 +355,7 @@ ./services/games/minecraft-server.nix ./services/games/minetest-server.nix ./services/games/openarena.nix + ./services/games/quake3-server.nix ./services/games/teeworlds.nix ./services/games/terraria.nix ./services/hardware/acpid.nix diff --git a/nixos/modules/services/games/quake3-server.nix b/nixos/modules/services/games/quake3-server.nix new file mode 100644 index 00000000000..1dc01260e8f --- /dev/null +++ b/nixos/modules/services/games/quake3-server.nix @@ -0,0 +1,111 @@ +{ config, pkgs, lib, ... }: +with lib; + +let + cfg = config.services.quake3-server; + configFile = pkgs.writeText "q3ds-extra.cfg" '' + set net_port ${builtins.toString cfg.port} + + ${cfg.extraConfig} + ''; + defaultBaseq3 = pkgs.requireFile rec { + name = "baseq3"; + hashMode = "recursive"; + sha256 = "5dd8ee09eabd45e80450f31d7a8b69b846f59738726929298d8a813ce5725ed3"; + message = '' + Unfortunately, we cannot download ${name} automatically. + Please purchase a legitimate copy of Quake 3 and change into the installation directory. + + You can either add all relevant files to the nix-store like this: + mkdir /tmp/baseq3 + cp baseq3/pak*.pk3 /tmp/baseq3 + nix-store --add-fixed sha256 --recursive /tmp/baseq3 + + Alternatively you can set services.quake3-server.baseq3 to a path and copy the baseq3 directory into + $services.quake3-server.baseq3/.q3a/ + ''; + }; + home = pkgs.runCommand "quake3-home" {} '' + mkdir -p $out/.q3a/baseq3 + + for file in ${cfg.baseq3}/*; do + ln -s $file $out/.q3a/baseq3/$(basename $file) + done + + ln -s ${configFile} $out/.q3a/baseq3/nix.cfg + ''; +in { + options = { + services.quake3-server = { + enable = mkEnableOption "Quake 3 dedicated server"; + + port = mkOption { + type = types.port; + default = 27960; + description = '' + UDP Port the server should listen on. + ''; + }; + + openFirewall = mkOption { + type = types.bool; + default = false; + description = '' + Open the firewall. + ''; + }; + + extraConfig = mkOption { + type = types.lines; + default = ""; + example = '' + seta rconPassword "superSecret" // sets RCON password for remote console + seta sv_hostname "My Quake 3 server" // name that appears in server list + ''; + description = '' + Extra configuration options. Note that options changed via RCON will not be persisted. To list all possible + options, use "cvarlist 1" via RCON. + ''; + }; + + baseq3 = mkOption { + type = types.either types.package types.path; + default = defaultBaseq3; + example = "/var/lib/q3ds"; + description = '' + Path to the baseq3 files (pak*.pk3). If this is on the nix store (type = package) all .pk3 files should be saved + in the top-level directory. If this is on another filesystem (e.g /var/lib/baseq3) the .pk3 files are searched in + $baseq3/.q3a/baseq3/ + ''; + }; + }; + }; + + config = let + baseq3InStore = builtins.typeOf cfg.baseq3 == "set"; + in mkIf cfg.enable { + networking.firewall.allowedUDPPorts = mkIf cfg.openFirewall [ cfg.port ]; + + systemd.services.q3ds = { + description = "Quake 3 dedicated server"; + wantedBy = [ "multi-user.target" ]; + after = [ "networking.target" ]; + + environment.HOME = if baseq3InStore then home else cfg.baseq3; + + serviceConfig = with lib; { + Restart = "always"; + DynamicUser = true; + WorkingDirectory = home; + + # It is possible to alter configuration files via RCON. To ensure reproducibility we have to prevent this + ReadOnlyPaths = if baseq3InStore then home else cfg.baseq3; + ExecStartPre = optionalString (!baseq3InStore) "+${pkgs.coreutils}/bin/cp ${configFile} ${cfg.baseq3}/.q3a/baseq3/nix.cfg"; + + ExecStart = "${pkgs.ioquake3}/ioq3ded.x86_64 +exec nix.cfg"; + }; + }; + }; + + meta.maintainers = with maintainers; [ f4814n ]; +} From 485034873f6d8bc8b86cb768c7144a9f9e789724 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Tue, 13 Apr 2021 22:46:36 +0200 Subject: [PATCH 025/230] Revert "nixos/home-assistant: use overridePythonAttrs" This reverts commit f9bd8b1b7bda019a823e93a0ecb719e15ac620cb. --- nixos/modules/services/misc/home-assistant.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/nixos/modules/services/misc/home-assistant.nix b/nixos/modules/services/misc/home-assistant.nix index f6398c08397..5cfadf81b97 100644 --- a/nixos/modules/services/misc/home-assistant.nix +++ b/nixos/modules/services/misc/home-assistant.nix @@ -183,12 +183,12 @@ in { }; package = mkOption { - default = pkgs.home-assistant.overridePythonAttrs (oldAttrs: { - doCheck = false; + default = pkgs.home-assistant.overrideAttrs (oldAttrs: { + doInstallCheck = false; }); defaultText = literalExample '' - pkgs.home-assistant.overridePythonAttrs (oldAttrs: { - doCheck = false; + pkgs.home-assistant.overrideAttrs (oldAttrs: { + doInstallCheck = false; }) ''; type = types.package; From f076e44d44e03ad6b7c49f69002f070c63b0fb2a Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Wed, 14 Apr 2021 04:20:00 +0000 Subject: [PATCH 026/230] postgresqlPackages.timescaledb: 2.1.1 -> 2.2.0 https://github.com/timescale/timescaledb/releases/tag/2.2.0 --- pkgs/servers/sql/postgresql/ext/timescaledb.nix | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/pkgs/servers/sql/postgresql/ext/timescaledb.nix b/pkgs/servers/sql/postgresql/ext/timescaledb.nix index 505aff66678..3d0cbcf5ace 100644 --- a/pkgs/servers/sql/postgresql/ext/timescaledb.nix +++ b/pkgs/servers/sql/postgresql/ext/timescaledb.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { pname = "timescaledb"; - version = "2.1.1"; + version = "2.2.0"; nativeBuildInputs = [ cmake ]; buildInputs = [ postgresql openssl ]; @@ -17,15 +17,15 @@ stdenv.mkDerivation rec { owner = "timescale"; repo = "timescaledb"; rev = "refs/tags/${version}"; - sha256 = "0mjqy0d60l62vqqbrayj6270173501i6aqgnkczywrqyzqw8522l"; + sha256 = "0gl2jjk9k0s5h7s4yq1qb60lvcqvhp88rh1fhlpyx1vm1hifhhik"; }; - # -DWARNINGS_AS_ERRORS=OFF to be removed once https://github.com/timescale/timescaledb/issues/2770 is fixed in upstream - cmakeFlags = [ "-DSEND_TELEMETRY_DEFAULT=OFF" "-DREGRESS_CHECKS=OFF" "-DWARNINGS_AS_ERRORS=OFF" ]; + cmakeFlags = [ "-DSEND_TELEMETRY_DEFAULT=OFF" "-DREGRESS_CHECKS=OFF" ] + ++ lib.optionals stdenv.isDarwin [ "-DLINTER=OFF" ]; # Fix the install phase which tries to install into the pgsql extension dir, # and cannot be manually overridden. This is rather fragile but works OK. - patchPhase = '' + postPatch = '' for x in CMakeLists.txt sql/CMakeLists.txt; do substituteInPlace "$x" \ --replace 'DESTINATION "''${PG_SHAREDIR}/extension"' "DESTINATION \"$out/share/postgresql/extension\"" @@ -40,6 +40,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Scales PostgreSQL for time-series data via automatic partitioning across time and space"; homepage = "https://www.timescale.com/"; + changelog = "https://github.com/timescale/timescaledb/raw/${version}/CHANGELOG.md"; maintainers = with maintainers; [ volth marsam ]; platforms = postgresql.meta.platforms; license = licenses.asl20; From 2cedaac1cb9f30827ddbd1718221537269eaf51f Mon Sep 17 00:00:00 2001 From: OPNA2608 Date: Fri, 19 Mar 2021 14:02:04 +0100 Subject: [PATCH 027/230] xa: add fallback download url, fix substitution, enable tests --- pkgs/development/compilers/xa/xa.nix | 26 ++++++++++++++++++++++---- 1 file changed, 22 insertions(+), 4 deletions(-) diff --git a/pkgs/development/compilers/xa/xa.nix b/pkgs/development/compilers/xa/xa.nix index c445940f5cd..dbeabe97b1a 100644 --- a/pkgs/development/compilers/xa/xa.nix +++ b/pkgs/development/compilers/xa/xa.nix @@ -1,6 +1,7 @@ { lib , stdenv , fetchurl +, perl }: stdenv.mkDerivation rec { @@ -8,22 +9,39 @@ stdenv.mkDerivation rec { version = "2.3.11"; src = fetchurl { - url = "https://www.floodgap.com/retrotech/xa/dists/${pname}-${version}.tar.gz"; + urls = [ + "https://www.floodgap.com/retrotech/xa/dists/${pname}-${version}.tar.gz" + "https://www.floodgap.com/retrotech/xa/dists/unsupported/${pname}-${version}.tar.gz" + ]; hash = "sha256-MvIWTJnjBSGOmSlwhW3Y4jCbXLasR1jXsq/jv+vJAS0="; }; + checkInputs = [ perl ]; + dontConfigure = true; postPatch = '' substituteInPlace Makefile \ - --replace "DESTDIR" "PREFIX" \ --replace "CC = gcc" "CC = ${stdenv.cc.targetPrefix}cc" \ - --replace "LDD = gcc" "LDD = ${stdenv.cc.targetPrefix}cc" \ + --replace "LD = gcc" "LD = ${stdenv.cc.targetPrefix}cc" \ --replace "CFLAGS = -O2" "CFLAGS ?=" \ --replace "LDFLAGS = -lc" "LDFLAGS ?= -lc" ''; - makeFlags = [ "PREFIX=${placeholder "out"}" ]; + makeFlags = [ + "DESTDIR:=${placeholder "out"}" + ]; + + enableParallelBuilding = true; + + doCheck = true; + + # Running tests in parallel does not work + enableParallelChecking = false; + + preCheck = '' + patchShebangs tests + ''; meta = with lib; { homepage = "https://www.floodgap.com/retrotech/xa/"; From f6519a5191e56ec7ff16e1218493503e735074e1 Mon Sep 17 00:00:00 2001 From: OPNA2608 Date: Fri, 19 Mar 2021 14:02:07 +0100 Subject: [PATCH 028/230] dxa: add fallback download url --- pkgs/development/compilers/xa/dxa.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/development/compilers/xa/dxa.nix b/pkgs/development/compilers/xa/dxa.nix index 03f2d054cc8..56661c1dbcc 100644 --- a/pkgs/development/compilers/xa/dxa.nix +++ b/pkgs/development/compilers/xa/dxa.nix @@ -9,7 +9,10 @@ stdenv.mkDerivation rec { version = "0.1.4"; src = fetchurl { - url = "https://www.floodgap.com/retrotech/xa/dists/${pname}-${version}.tar.gz"; + urls = [ + "https://www.floodgap.com/retrotech/xa/dists/${pname}-${version}.tar.gz" + "https://www.floodgap.com/retrotech/xa/dists/unsupported/${pname}-${version}.tar.gz" + ]; hash = "sha256-C0rgwK51Ij9EZCm9GeiVnWIkEkse0d60ok8G9hm2a5U="; }; From 9ee7244c60bc344ce0ab60e27cd749c997c5d84c Mon Sep 17 00:00:00 2001 From: OPNA2608 Date: Fri, 19 Mar 2021 14:02:09 +0100 Subject: [PATCH 029/230] libexsid: init at 2.1 --- .../libraries/libexsid/default.nix | 47 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 49 insertions(+) create mode 100644 pkgs/development/libraries/libexsid/default.nix diff --git a/pkgs/development/libraries/libexsid/default.nix b/pkgs/development/libraries/libexsid/default.nix new file mode 100644 index 00000000000..38cdfc84d4e --- /dev/null +++ b/pkgs/development/libraries/libexsid/default.nix @@ -0,0 +1,47 @@ +{ stdenv +, lib +, fetchFromGitHub +, autoreconfHook +, pkg-config +, docSupport ? true +, doxygen +, libftdi1 +}: + +stdenv.mkDerivation rec { + pname = "libexsid"; + version = "2.1"; + + src = fetchFromGitHub { + owner = "libsidplayfp"; + repo = "exsid-driver"; + rev = version; + sha256 = "1qbiri549fma8c72nmj3cpz3sn1vc256kfafnygkmkzg7wdmgi7r"; + }; + + outputs = [ "out" ] + ++ lib.optional docSupport "doc"; + + nativeBuildInputs = [ autoreconfHook pkg-config ] + ++ lib.optional docSupport doxygen; + + buildInputs = [ libftdi1 ]; + + enableParallelBuilding = true; + + installTargets = [ "install" ] + ++ lib.optional docSupport "doc"; + + postInstall = lib.optionalString docSupport '' + mkdir -p $doc/share/libexsid/doc + cp -r docs/html $doc/share/libexsid/doc/ + ''; + + meta = with lib; { + description = "Driver for exSID USB"; + homepage = "http://hacks.slashdirt.org/hw/exsid/"; + license = licenses.gpl2Plus; + maintainers = with maintainers; [ OPNA2608 ]; + platforms = platforms.all; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 10a4c799ebe..d4fbbe3c178 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -15505,6 +15505,8 @@ in libexosip = callPackage ../development/libraries/exosip {}; + libexsid = callPackage ../development/libraries/libexsid { }; + libextractor = callPackage ../development/libraries/libextractor { libmpeg2 = mpeg2dec; }; From 627450ee612c0e890fe63377b61a70792124b0de Mon Sep 17 00:00:00 2001 From: Karol Chmist Date: Wed, 14 Apr 2021 09:04:12 +0200 Subject: [PATCH 030/230] devilutionx: 1.2.0 -> 1.2.1 --- pkgs/games/devilutionx/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/games/devilutionx/default.nix b/pkgs/games/devilutionx/default.nix index 5edadbd6a83..fa457b1f1bc 100644 --- a/pkgs/games/devilutionx/default.nix +++ b/pkgs/games/devilutionx/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "devilutionx"; - version = "1.2.0"; + version = "1.2.1"; src = fetchFromGitHub { owner = "diasurgical"; repo = "devilutionX"; rev = version; - sha256 = "034xkz0a7j2nba17mh44r0kamcblvykdwfsjvjwaz2mrcsmzkr9z"; + sha256 = "sha256-PgYlNO1p78d0uiL474bDJOL++SxJfeBLK65czdaylHU="; }; postPatch = '' From 02085112e1e47b429714d24d0f58ce0a001a5bf7 Mon Sep 17 00:00:00 2001 From: Henner Zeller Date: Wed, 14 Apr 2021 00:20:03 -0700 Subject: [PATCH 031/230] maintainers: add hzeller Signed-off-by: Henner Zeller --- maintainers/maintainer-list.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index cbb7ef09dfb..3d861fa9c9a 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -4045,6 +4045,12 @@ githubId = 12491746; name = "Masato Yonekawa"; }; + hzeller = { + email = "h.zeller@acm.org"; + github = "hzeller"; + githubId = 140937; + name = "Henner Zeller"; + }; i077 = { email = "nixpkgs@imranhossa.in"; github = "i077"; From c52a769c7fc38aeebcca9546defd4e6fea5849d1 Mon Sep 17 00:00:00 2001 From: Ilya Fedin Date: Wed, 14 Apr 2021 08:42:41 +0400 Subject: [PATCH 032/230] kotatogram-desktop: 1.2 -> 1.4 --- .../telegram/kotatogram-desktop/default.nix | 60 +++++++++++++------ pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 43 insertions(+), 19 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/telegram/kotatogram-desktop/default.nix b/pkgs/applications/networking/instant-messengers/telegram/kotatogram-desktop/default.nix index bfd4f28d0c0..2f6594c1765 100644 --- a/pkgs/applications/networking/instant-messengers/telegram/kotatogram-desktop/default.nix +++ b/pkgs/applications/networking/instant-messengers/telegram/kotatogram-desktop/default.nix @@ -1,39 +1,62 @@ -{ mkDerivation, lib, fetchFromGitHub, pkg-config, python3, cmake, ninja -, qtbase, qtimageformats, libdbusmenu, hunspell, xdg-utils, ffmpeg_3, openalSoft -, xz, lz4, xxHash, zlib, minizip, openssl, libtgvoip, microsoft_gsl, tl-expected -, range-v3 +{ mkDerivation, lib, fetchFromGitHub, callPackage +, pkg-config, cmake, ninja, python3, wrapGAppsHook, wrapQtAppsHook +, qtbase, qtimageformats, gtk3, libsForQt5, lz4, xxHash +, ffmpeg, openalSoft, minizip, libopus, alsaLib, libpulseaudio, range-v3 +, tl-expected, hunspell, glibmm +# Transitive dependencies: +, pcre, xorg, util-linux, libselinux, libsepol, epoxy +, at-spi2-core, libXtst, libthai, libdatrie }: with lib; -mkDerivation rec { +let + tg_owt = callPackage ../tdesktop/tg_owt.nix {}; +in mkDerivation rec { pname = "kotatogram-desktop"; - version = "1.2"; + version = "1.4"; src = fetchFromGitHub { owner = "kotatogram"; repo = "kotatogram-desktop"; rev = "k${version}"; - sha256 = "00pdx3cjhrihf7ihhmszcf159jrzn1bcx20vwiiizs5r1qk8l210"; + sha256 = "0nhyjqxrbqiik4sgzplmpgx8msf8rykjiik0c2zr61rjm4fngkb3"; fetchSubmodules = true; }; - nativeBuildInputs = [ pkg-config python3 cmake ninja ]; + postPatch = '' + substituteInPlace Telegram/CMakeLists.txt \ + --replace '"''${TDESKTOP_LAUNCHER_BASENAME}.appdata.xml"' '"''${TDESKTOP_LAUNCHER_BASENAME}.metainfo.xml"' + ''; + + # We want to run wrapProgram manually (with additional parameters) + dontWrapGApps = true; + dontWrapQtApps = true; + + nativeBuildInputs = [ pkg-config cmake ninja python3 wrapGAppsHook wrapQtAppsHook ]; buildInputs = [ - qtbase qtimageformats ffmpeg_3 openalSoft xz lz4 xxHash libdbusmenu - zlib minizip openssl hunspell libtgvoip microsoft_gsl tl-expected range-v3 + qtbase qtimageformats gtk3 libsForQt5.kwayland libsForQt5.libdbusmenu lz4 xxHash + ffmpeg openalSoft minizip libopus alsaLib libpulseaudio range-v3 + tl-expected hunspell glibmm + tg_owt + # Transitive dependencies: + pcre xorg.libXdmcp util-linux libselinux libsepol epoxy + at-spi2-core libXtst libthai libdatrie ]; - qtWrapperArgs = [ - "--prefix PATH : ${xdg-utils}/bin" - ]; + cmakeFlags = [ "-DTDESKTOP_API_TEST=ON" ]; - cmakeFlags = [ - "-DTDESKTOP_API_TEST=ON" - "-DDESKTOP_APP_USE_PACKAGED_RLOTTIE=OFF" - "-DDESKTOP_APP_USE_PACKAGED_VARIANT=OFF" - ]; + postFixup = '' + # We also use gappsWrapperArgs from wrapGAppsHook. + wrapProgram $out/bin/kotatogram-desktop \ + "''${gappsWrapperArgs[@]}" \ + "''${qtWrapperArgs[@]}" + ''; + + passthru = { + inherit tg_owt; + }; meta = { description = "Kotatogram – experimental Telegram Desktop fork"; @@ -45,6 +68,7 @@ mkDerivation rec { license = licenses.gpl3; platforms = platforms.linux; homepage = "https://kotatogram.github.io"; + changelog = "https://github.com/kotatogram/kotatogram-desktop/releases/tag/k{ver}"; maintainers = with maintainers; [ ilya-fedin ]; }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 10a4c799ebe..3cb1ddaa4f2 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -23950,7 +23950,7 @@ in kooha = callPackage ../applications/video/kooha { }; - kotatogram-desktop = libsForQt514.callPackage ../applications/networking/instant-messengers/telegram/kotatogram-desktop { }; + kotatogram-desktop = libsForQt5.callPackage ../applications/networking/instant-messengers/telegram/kotatogram-desktop { }; kpt = callPackage ../applications/networking/cluster/kpt { }; From a3354dc39c44b8b05b49ff0276b1d86884e462cb Mon Sep 17 00:00:00 2001 From: Luflosi Date: Wed, 14 Apr 2021 18:53:09 +0200 Subject: [PATCH 033/230] pythonPackages.surt: init at 0.3.1 --- .../python-modules/surt/default.nix | 37 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 39 insertions(+) create mode 100644 pkgs/development/python-modules/surt/default.nix diff --git a/pkgs/development/python-modules/surt/default.nix b/pkgs/development/python-modules/surt/default.nix new file mode 100644 index 00000000000..21024c0ed02 --- /dev/null +++ b/pkgs/development/python-modules/surt/default.nix @@ -0,0 +1,37 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, six +, tldextract +, pytestCheckHook +}: + +buildPythonPackage rec { + pname = "surt"; + version = "0.3.1"; + + src = fetchFromGitHub { + owner = "internetarchive"; + repo = "surt"; + rev = "6934c321b3e2f66af9c001d882475949f00570c5"; # Has no git tag + sha256 = "sha256-pSMNpFfq2V0ANWNFPcb1DwPHccbfddo9P4xZ+ghwbz4="; + }; + + propagatedBuildInputs = [ + six + tldextract + ]; + + checkInputs = [ + pytestCheckHook + ]; + + pythonImportsCheck = [ "surt" ]; + + meta = with lib; { + description = "Sort-friendly URI Reordering Transform (SURT) python module"; + homepage = "https://github.com/internetarchive/surt"; + license = licenses.agpl3Only; + maintainers = with maintainers; [ Luflosi ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 444fdcc4b19..a09c4630210 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -8196,6 +8196,8 @@ in { surepy = callPackage ../development/python-modules/surepy { }; + surt = callPackage ../development/python-modules/surt { }; + survey = callPackage ../development/python-modules/survey { }; suseapi = callPackage ../development/python-modules/suseapi { }; From 29072962edecfc64d971e99fe82474b64031ae1e Mon Sep 17 00:00:00 2001 From: OPNA2608 Date: Fri, 19 Mar 2021 14:02:10 +0100 Subject: [PATCH 034/230] libsidplayfp: 2.0.5 -> 2.1.1 --- .../libraries/libsidplayfp/default.nix | 83 ++++++++++++++----- 1 file changed, 63 insertions(+), 20 deletions(-) diff --git a/pkgs/development/libraries/libsidplayfp/default.nix b/pkgs/development/libraries/libsidplayfp/default.nix index d5f8dd6e573..97991a0cffb 100644 --- a/pkgs/development/libraries/libsidplayfp/default.nix +++ b/pkgs/development/libraries/libsidplayfp/default.nix @@ -1,45 +1,88 @@ { stdenv , lib -, fetchurl +, fetchFromGitHub +, fetchpatch +, autoreconfHook , pkg-config +, perl +, unittest-cpp +, xa +, libgcrypt +, libexsid , docSupport ? true -, doxygen ? null -, graphviz ? null +, doxygen +, graphviz }: -assert docSupport -> doxygen != null && graphviz != null; -let - inherit (lib) optionals optionalString; - inherit (lib.versions) majorMinor; -in stdenv.mkDerivation rec { pname = "libsidplayfp"; - version = "2.0.5"; + version = "2.1.1"; - src = fetchurl { - url = "mirror://sourceforge/sidplay-residfp/${pname}/${majorMinor version}/${pname}-${version}.tar.gz"; - sha256 = "04vdrrkh5y9x9rrmj6gdp242ah70b4sslwqfby8wp2riis4hr9z0"; + src = fetchFromGitHub { + owner = "libsidplayfp"; + repo = "libsidplayfp"; + rev = "v${version}"; + fetchSubmodules = true; + sha256 = "0487gap2b0ypikyra74lk1qwqwr0vncldamk5xb1db2x97v504fd"; }; - nativeBuildInputs = [ pkg-config ] - ++ optionals docSupport [ doxygen graphviz ]; + # https://github.com/libsidplayfp/libsidplayfp/issues/13 + # Remove on next version bump + patches = [ + (fetchpatch { + url = "https://github.com/libsidplayfp/libsidplayfp/commit/84f5498f5653261ed84328e1b5676c31e3ba9e6e.patch"; + sha256 = "1vysbl4fkdzm11k40msng2ag6i6mb6z9jsw32vyj9calcfha5957"; + }) + (fetchpatch { + url = "https://github.com/libsidplayfp/libsidplayfp/commit/c1a1b732cc2e791d910522d58f47c6d094493c6d.patch"; + sha256 = "1d3sgdly0q9dysgkx5afxbwfas6p0m8n3lw1hmj4n6wm3j9sdz4g"; + }) + ]; + + postPatch = '' + patchShebangs . + ''; + + nativeBuildInputs = [ autoreconfHook pkg-config perl xa ] + ++ lib.optionals docSupport [ doxygen graphviz ]; + + buildInputs = [ libgcrypt libexsid ]; + + doCheck = true; + + checkInputs = [ unittest-cpp ]; + + enableParallelBuilding = true; installTargets = [ "install" ] - ++ optionals docSupport [ "doc" ]; + ++ lib.optionals docSupport [ "doc" ]; outputs = [ "out" ] - ++ optionals docSupport [ "doc" ]; + ++ lib.optionals docSupport [ "doc" ]; - postInstall = optionalString docSupport '' + configureFlags = [ + "--enable-hardsid" + "--with-gcrypt" + "--with-exsid" + ] + ++ lib.optional doCheck "--enable-tests"; + + postInstall = lib.optionalString docSupport '' mkdir -p $doc/share/doc/libsidplayfp mv docs/html $doc/share/doc/libsidplayfp/ ''; meta = with lib; { description = "A library to play Commodore 64 music derived from libsidplay2"; - homepage = "https://sourceforge.net/projects/sidplay-residfp/"; + longDescription = '' + libsidplayfp is a C64 music player library which integrates + the reSID SID chip emulation into a cycle-based emulator + environment, constantly aiming to improve emulation of the + C64 system and the SID chips. + ''; + homepage = "https://github.com/libsidplayfp/libsidplayfp"; license = with licenses; [ gpl2Plus ]; - maintainers = with maintainers; [ ramkromberg ]; - platforms = with platforms; unix; + maintainers = with maintainers; [ ramkromberg OPNA2608 ]; + platforms = platforms.all; }; } From b85a2687bf58f7e64abfdec3a373dffdbfc6d9fa Mon Sep 17 00:00:00 2001 From: OPNA2608 Date: Sun, 28 Mar 2021 14:24:39 +0200 Subject: [PATCH 035/230] sidplayfp: 2.0.2 -> 2.1.1 --- pkgs/applications/audio/sidplayfp/default.nix | 43 +++++++++++-------- 1 file changed, 25 insertions(+), 18 deletions(-) diff --git a/pkgs/applications/audio/sidplayfp/default.nix b/pkgs/applications/audio/sidplayfp/default.nix index cebf0d83e16..65f21c13612 100644 --- a/pkgs/applications/audio/sidplayfp/default.nix +++ b/pkgs/applications/audio/sidplayfp/default.nix @@ -1,40 +1,47 @@ { stdenv , lib -, fetchurl +, fetchFromGitHub +, autoreconfHook +, perl , pkg-config , libsidplayfp , alsaSupport ? stdenv.hostPlatform.isLinux , alsaLib , pulseSupport ? stdenv.hostPlatform.isLinux , libpulseaudio +, out123Support ? stdenv.hostPlatform.isDarwin +, mpg123 }: -assert alsaSupport -> alsaLib != null; -assert pulseSupport -> libpulseaudio != null; -let - inherit (lib) optional; - inherit (lib.versions) majorMinor; -in stdenv.mkDerivation rec { pname = "sidplayfp"; - version = "2.0.2"; + version = "2.1.1"; - src = fetchurl { - url = "mirror://sourceforge/sidplay-residfp/sidplayfp/${majorMinor version}/${pname}-${version}.tar.gz"; - sha256 = "1s2dfs9z1hwarpfzawg11wax9nh0zcqx4cafwq7iysckyg4scz4k"; + src = fetchFromGitHub { + owner = "libsidplayfp"; + repo = "sidplayfp"; + rev = "v${version}"; + sha256 = "0s3xmg3yzfqbsnlh2y46w7b5jim5zq7mshs6hx03q8wdr75cvwh4"; }; - nativeBuildInputs = [ pkg-config ] - ++ optional alsaSupport alsaLib - ++ optional pulseSupport libpulseaudio; + nativeBuildInputs = [ autoreconfHook perl pkg-config ]; - buildInputs = [ libsidplayfp ]; + buildInputs = [ libsidplayfp ] + ++ lib.optional alsaSupport alsaLib + ++ lib.optional pulseSupport libpulseaudio + ++ lib.optional out123Support mpg123; + + configureFlags = lib.optionals out123Support [ + "--with-out123" + ]; + + enableParallelBuilding = true; meta = with lib; { description = "A SID player using libsidplayfp"; - homepage = "https://sourceforge.net/projects/sidplay-residfp/"; + homepage = "https://github.com/libsidplayfp/sidplayfp"; license = with licenses; [ gpl2Plus ]; - maintainers = with maintainers; [ dezgeg ]; - platforms = with platforms; linux; + maintainers = with maintainers; [ dezgeg OPNA2608 ]; + platforms = platforms.all; }; } From 2c8dc8104a95e472a186ff98842c9709f7a77ada Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Sat, 2 Mar 2019 18:32:22 -0600 Subject: [PATCH 036/230] kronosnet: init at 1.20 --- .../libraries/kronosnet/default.nix | 33 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 35 insertions(+) create mode 100644 pkgs/development/libraries/kronosnet/default.nix diff --git a/pkgs/development/libraries/kronosnet/default.nix b/pkgs/development/libraries/kronosnet/default.nix new file mode 100644 index 00000000000..c74ff6716fe --- /dev/null +++ b/pkgs/development/libraries/kronosnet/default.nix @@ -0,0 +1,33 @@ +{ lib, stdenv, fetchFromGitHub +, autoreconfHook, pkg-config +, libqb, libxml2, libnl, lksctp-tools +, nss, openssl, bzip2, lzo, lz4, xz, zlib, zstd +, doxygen +}: + +stdenv.mkDerivation rec { + pname = "kronosnet"; + version = "1.20"; + + src = fetchFromGitHub { + owner = pname; + repo = pname; + rev = "v${version}"; + sha256 = "sha256-lP5W+4b9McU2Uqibh2SucIu2y4KluO3B1RpAJKgYq/M="; + }; + + nativeBuildInputs = [ autoreconfHook pkg-config doxygen ]; + + buildInputs = [ + libqb libxml2 libnl lksctp-tools + nss openssl + bzip2 lzo lz4 xz zlib zstd + ]; + + meta = with lib; { + description = "VPN on steroids"; + homepage = "https://kronosnet.org/"; + license = with licenses; [ lgpl21Plus gpl2Plus ]; + maintainers = with maintainers; [ ryantm ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 07a1b923ca3..e24c1d79d52 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -15050,6 +15050,8 @@ in krb5Full = krb5; libkrb5 = krb5.override { type = "lib"; }; + kronosnet = callPackage ../development/libraries/kronosnet { }; + l-smash = callPackage ../development/libraries/l-smash { stdenv = gccStdenv; }; From 91b52a5dcd862ff2b49cb68b6abc433f715b12e0 Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Sat, 2 Mar 2019 18:18:13 -0600 Subject: [PATCH 037/230] corosync: 2.4.5 -> 3.1.2 --- pkgs/servers/corosync/default.nix | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/pkgs/servers/corosync/default.nix b/pkgs/servers/corosync/default.nix index 5b4270a0a1c..97b9f12b8f9 100644 --- a/pkgs/servers/corosync/default.nix +++ b/pkgs/servers/corosync/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, makeWrapper, pkg-config, nss, nspr, libqb +{ lib, stdenv, fetchurl, makeWrapper, pkg-config, kronosnet, nss, nspr, libqb , dbus, rdma-core, libstatgrab, net-snmp , enableDbus ? false , enableInfiniBandRdma ? false @@ -10,17 +10,17 @@ with lib; stdenv.mkDerivation rec { pname = "corosync"; - version = "2.4.5"; + version = "3.1.2"; src = fetchurl { url = "http://build.clusterlabs.org/corosync/releases/${pname}-${version}.tar.gz"; - sha256 = "0pxs18vci9kq3qnqsg5i1h35jrxxiccwbm0mzja3g8j3izdsyvmb"; + sha256 = "sha256-eAypUbDeGa3GKF/wJ602dyTW5FlkvjWeCRXT6h0d4zw="; }; nativeBuildInputs = [ makeWrapper pkg-config ]; buildInputs = [ - nss nspr libqb + kronosnet nss nspr libqb ] ++ optional enableDbus dbus ++ optional enableInfiniBandRdma rdma-core ++ optional enableMonitoring libstatgrab @@ -45,6 +45,8 @@ stdenv.mkDerivation rec { "LOGROTATEDIR=$(out)/etc/logrotate.d" ]; + enableParallelBuilding = true; + preConfigure = optionalString enableInfiniBandRdma '' # configure looks for the pkg-config files # of librdmacm and libibverbs @@ -61,13 +63,11 @@ stdenv.mkDerivation rec { --prefix PATH ":" "$out/sbin:${libqb}/sbin" ''; - enableParallelBuilding = true; - meta = { homepage = "http://corosync.org/"; description = "A Group Communication System with features for implementing high availability within applications"; license = licenses.bsd3; platforms = platforms.linux; - maintainers = with maintainers; [ montag451 ]; + maintainers = with maintainers; [ montag451 ryantm ]; }; } From 5bb9bce7ed0e83f41d8db2542b086dbfc8fcbfff Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 14 Apr 2021 23:18:09 +0200 Subject: [PATCH 038/230] python3Packages.malduck: init at 4.1.0 --- .../python-modules/malduck/default.nix | 48 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 50 insertions(+) create mode 100644 pkgs/development/python-modules/malduck/default.nix diff --git a/pkgs/development/python-modules/malduck/default.nix b/pkgs/development/python-modules/malduck/default.nix new file mode 100644 index 00000000000..a9a8419a04d --- /dev/null +++ b/pkgs/development/python-modules/malduck/default.nix @@ -0,0 +1,48 @@ +{ lib +, buildPythonPackage +, capstone +, click +, cryptography +, fetchFromGitHub +, pefile +, pycryptodomex +, pyelftools +, pythonOlder +, typing-extensions +, yara-python +}: + +buildPythonPackage rec { + pname = "malduck"; + version = "4.1.0"; + disabled = pythonOlder "3.7"; + + src = fetchFromGitHub { + owner = "CERT-Polska"; + repo = pname; + rev = "v${version}"; + sha256 = "04d8bhzax9ynbl83hif9i8gcs29zrvcay2r6n7mcxiixlxcqciak"; + }; + + propagatedBuildInputs = [ + capstone + click + cryptography + pefile + pycryptodomex + pyelftools + typing-extensions + yara-python + ]; + + # Project has no tests. They will come with the next release + doCheck = false; + pythonImportsCheck = [ "malduck" ]; + + meta = with lib; { + description = "Helper for malware analysis"; + homepage = "https://github.com/CERT-Polska/malduck"; + license = with licenses; [ bsd3 ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 70e06433e92..ce0eda8e5e4 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -4154,6 +4154,8 @@ in { Mako = callPackage ../development/python-modules/Mako { }; + malduck= callPackage ../development/python-modules/malduck { }; + managesieve = callPackage ../development/python-modules/managesieve { }; manhole = callPackage ../development/python-modules/manhole { }; From 2cc36164f848079b4d470ad9ac5dac966ee4da1f Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 14 Apr 2021 23:01:13 +0200 Subject: [PATCH 039/230] python3Packages.karton-config-extractor: init at 1.0.0 --- .../karton-config-extractor/default.nix | 39 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 41 insertions(+) create mode 100644 pkgs/development/python-modules/karton-config-extractor/default.nix diff --git a/pkgs/development/python-modules/karton-config-extractor/default.nix b/pkgs/development/python-modules/karton-config-extractor/default.nix new file mode 100644 index 00000000000..bb2b9d4903b --- /dev/null +++ b/pkgs/development/python-modules/karton-config-extractor/default.nix @@ -0,0 +1,39 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, karton-core +, malduck +}: + +buildPythonPackage rec { + pname = "karton-config-extractor"; + version = "1.0.0"; + + src = fetchFromGitHub { + owner = "CERT-Polska"; + repo = pname; + rev = "v${version}"; + sha256 = "1v0zqa81yjz6hm17x9hp0iwkllymqzn84dd6r2yrhillbwnjg9bb"; + }; + + propagatedBuildInputs = [ + karton-core + malduck + ]; + + postPatch = '' + substituteInPlace requirements.txt \ + --replace "karton.core==4.0.5" "karton-core" + ''; + + # Project has no tests + doCheck = false; + pythonImportsCheck = [ "karton.config_extractor" ]; + + meta = with lib; { + description = "Static configuration extractor for the Karton framework"; + homepage = "https://github.com/CERT-Polska/karton-config-extractor"; + license = with licenses; [ bsd3 ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index ce0eda8e5e4..33572303756 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -3683,6 +3683,8 @@ in { karton-classifier = callPackage ../development/python-modules/karton-classifier { }; + karton-config-extractor = callPackage ../development/python-modules/karton-config-extractor { }; + karton-core = callPackage ../development/python-modules/karton-core { }; kazoo = callPackage ../development/python-modules/kazoo { }; From 6720b034aa7e6ae28da2e09d24b94525f2187782 Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Thu, 15 Apr 2021 00:37:24 +0200 Subject: [PATCH 040/230] chromium: 89.0.4389.128 -> 90.0.4430.72 https://chromereleases.googleblog.com/2021/04/stable-channel-update-for-desktop_14.html This update includes 37 security fixes. CVEs: CVE-2021-21201 CVE-2021-21202 CVE-2021-21203 CVE-2021-21204 CVE-2021-21205 CVE-2021-21221 CVE-2021-21207 CVE-2021-21208 CVE-2021-21209 CVE-2021-21210 CVE-2021-21211 CVE-2021-21212 CVE-2021-21213 CVE-2021-21214 CVE-2021-21215 CVE-2021-21216 CVE-2021-21217 CVE-2021-21218 CVE-2021-21219 --- .../browsers/chromium/upstream-info.json | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/pkgs/applications/networking/browsers/chromium/upstream-info.json b/pkgs/applications/networking/browsers/chromium/upstream-info.json index 61cd10df3d5..48ab02d0b96 100644 --- a/pkgs/applications/networking/browsers/chromium/upstream-info.json +++ b/pkgs/applications/networking/browsers/chromium/upstream-info.json @@ -1,20 +1,20 @@ { "stable": { - "version": "89.0.4389.128", - "sha256": "0nysvsck91yxcb3wf6v3nzar77k7j9bby7xfzsvd7wlqxdmflx8s", - "sha256bin64": "07m43yqq6j7mfhdnm127p29b2611l8lmbq87iszlgg6dgkqxa0qr", + "version": "90.0.4430.72", + "sha256": "0hw916j55lm3qnidfp92i8w6zywdd47rhihn9pn23b7ziz58ik55", + "sha256bin64": "0k1m786b94kh7r2c58qj8b9a39yr4m30kkrxk5d9q7dn1abl3wa3", "deps": { "gn": { - "version": "2021-01-07", + "version": "2021-02-09", "url": "https://gn.googlesource.com/gn", - "rev": "595e3be7c8381d4eeefce62a63ec12bae9ce5140", - "sha256": "08y7cjlgjdbzja5ij31wxc9i191845m01v1hc7y176svk9y0hj1d" + "rev": "dfcbc6fed0a8352696f92d67ccad54048ad182b3", + "sha256": "1941bzg37c4dpsk3sh6ga3696gpq6vjzpcw9rsnf6kdr9mcgdxvn" } }, "chromedriver": { - "version": "89.0.4389.23", - "sha256_linux": "169inx1xl7750mdd1g7yji72m33kvpk7h1dy4hyj0qignrifdm0r", - "sha256_darwin": "1a84nn4rnd215h4sjghmw03mdr49wyab8j4vlnv3xp516yn07gr3" + "version": "90.0.4430.24", + "sha256_linux": "0byibxrs4ggid8qn5h72mmnw8l4y8xya2q1jbc6z74pmw8r9hkj7", + "sha256_darwin": "0psll7vahj43jkj1wqq7mygf18l7ivp56ckc8wv4w5bnfmqv660k" } }, "beta": { From e18275de12715ec0296a1e7177bb6f8c583d769c Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Thu, 15 Apr 2021 00:00:00 +0000 Subject: [PATCH 041/230] terraform_0_15: init at 0.15.0 https://github.com/hashicorp/terraform/releases/tag/v0.15.0 --- .../networking/cluster/terraform/default.nix | 8 +++++++ .../terraform/provider-path-0_15.patch | 23 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 1 + 3 files changed, 32 insertions(+) create mode 100644 pkgs/applications/networking/cluster/terraform/provider-path-0_15.patch diff --git a/pkgs/applications/networking/cluster/terraform/default.nix b/pkgs/applications/networking/cluster/terraform/default.nix index 6cd2cf52efc..be331156eed 100644 --- a/pkgs/applications/networking/cluster/terraform/default.nix +++ b/pkgs/applications/networking/cluster/terraform/default.nix @@ -164,6 +164,14 @@ in rec { passthru = { inherit plugins; }; }); + terraform_0_15 = pluggable (generic { + version = "0.15.0"; + sha256 = "0d7hai57x6qczacdnzzvs3766180n6grmq0a7rlw5jp3zgzp8bmr"; + vendorSha256 = "1l67kkrk8jw7v1rqpwj6n0l7lvmfgf1ir430j1n96459s1dzf0cn"; + patches = [ ./provider-path-0_15.patch ]; + passthru = { inherit plugins; }; + }); + # Tests that the plugins are being used. Terraform looks at the specific # file pattern and if the plugin is not found it will try to download it # from the Internet. With sandboxing enable this test will fail if that is diff --git a/pkgs/applications/networking/cluster/terraform/provider-path-0_15.patch b/pkgs/applications/networking/cluster/terraform/provider-path-0_15.patch new file mode 100644 index 00000000000..1896d6018f0 --- /dev/null +++ b/pkgs/applications/networking/cluster/terraform/provider-path-0_15.patch @@ -0,0 +1,23 @@ +diff -Naur terraform.old/command/init.go terraform.new/command/init.go +--- terraform.old/command/init.go ++++ terraform.new/command/init.go +@@ -3,6 +3,7 @@ + import ( + "context" + "fmt" ++ "os" + "log" + "strings" + +@@ -55,6 +56,11 @@ + + var diags tfdiags.Diagnostics + ++ val, ok := os.LookupEnv("NIX_TERRAFORM_PLUGIN_DIR") ++ if ok { ++ flagPluginPath = append(flagPluginPath, val) ++ } ++ + if len(flagPluginPath) > 0 { + c.pluginPath = flagPluginPath + } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 2b0c876113b..0138146b526 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -30327,6 +30327,7 @@ in terraform_0_12 terraform_0_13 terraform_0_14 + terraform_0_15 terraform_plugins_test ; From c7fc19466bb76903cd214f02b63b0be74111d238 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 15 Apr 2021 01:27:53 +0200 Subject: [PATCH 042/230] python3Packages.cfn-lint: disable tests requiring network access --- pkgs/development/python-modules/cfn-lint/default.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/development/python-modules/cfn-lint/default.nix b/pkgs/development/python-modules/cfn-lint/default.nix index 5e8634f9fc6..a5f22908993 100644 --- a/pkgs/development/python-modules/cfn-lint/default.nix +++ b/pkgs/development/python-modules/cfn-lint/default.nix @@ -67,6 +67,9 @@ buildPythonPackage rec { "TestQuickStartTemplates" # requires git directory "test_update_docs" + # Tests depend on network access (fails in getaddrinfo) + "test_update_resource_specs_python_2" + "test_update_resource_specs_python_3" ]; pythonImportsCheck = [ From a812d1b7afdd4e8b26f986eaaa4e7621f337558e Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 15 Apr 2021 02:04:05 +0200 Subject: [PATCH 043/230] python3Packages.moto: relax idna pin --- pkgs/development/python-modules/moto/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/moto/default.nix b/pkgs/development/python-modules/moto/default.nix index ddc3896c6a5..7f9b7010c52 100644 --- a/pkgs/development/python-modules/moto/default.nix +++ b/pkgs/development/python-modules/moto/default.nix @@ -37,7 +37,8 @@ buildPythonPackage rec { postPatch = '' substituteInPlace setup.py \ - --replace "ecdsa<0.15" "ecdsa" + --replace "ecdsa<0.15" "ecdsa" \ + --replace "idna<3,>=2.5" "idna" \ ''; patches = [ From f29e5138348f6b667954ea9f1ca8eadb67b58637 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 15 Apr 2021 02:04:25 +0200 Subject: [PATCH 044/230] python3Packages.tensorboardx: fix build Adds missing optional soundfile dependency, that was ultimately required during tests. Move crc32 into propagatedBuildInputs. Both changes were recommended here: https://github.com/lanpa/tensorboardX/blob/v2.1/README.md#install Clean up the package, disable linting tests. --- .../python-modules/tensorboardx/default.nix | 60 +++++++++++++++---- 1 file changed, 49 insertions(+), 11 deletions(-) diff --git a/pkgs/development/python-modules/tensorboardx/default.nix b/pkgs/development/python-modules/tensorboardx/default.nix index 00ea276845d..f83467520c9 100644 --- a/pkgs/development/python-modules/tensorboardx/default.nix +++ b/pkgs/development/python-modules/tensorboardx/default.nix @@ -1,6 +1,20 @@ -{ boto3, buildPythonPackage, crc32c, fetchFromGitHub, lib, matplotlib, moto -, numpy, pillow, pytorch, protobuf, six, pytestCheckHook -, tensorflow-tensorboard, torchvision }: +{ boto3 +, buildPythonPackage +, crc32c +, fetchFromGitHub +, lib +, matplotlib +, moto +, numpy +, pillow +, protobuf +, pytestCheckHook +, pytorch +, six +, soundfile +, tensorflow-tensorboard +, torchvision +}: buildPythonPackage rec { pname = "tensorboardx"; @@ -13,19 +27,43 @@ buildPythonPackage rec { sha256 = "1palz91y0b39pcmwg6wdmqfal38hai99dd6r88i3imqxdbmjghih"; }; - checkInputs = [ - pytestCheckHook boto3 crc32c matplotlib moto pillow pytorch tensorflow-tensorboard torchvision - ]; - - propagatedBuildInputs = [ numpy protobuf six ]; - # apparently torch API changed a bit at 1.6 postPatch = '' - substituteInPlace tensorboardX/pytorch_graph.py --replace "torch.onnx.set_training(model, False)" "torch.onnx.select_model_mode_for_export(model, torch.onnx.TrainingMode.EVAL)" + substituteInPlace tensorboardX/pytorch_graph.py --replace \ + "torch.onnx.set_training(model, False)" \ + "torch.onnx.select_model_mode_for_export(model, torch.onnx.TrainingMode.EVAL)" ''; + propagatedBuildInputs = [ + crc32c + numpy + protobuf + six + soundfile + ]; - disabledTests = [ "test_TorchVis" "test_onnx_graph" ]; + checkInputs = [ + boto3 + matplotlib + moto + pillow + pytestCheckHook + pytorch + tensorflow-tensorboard + torchvision + ]; + + disabledTests = [ + # ImportError: Visdom visualization requires installation of Visdom + "test_TorchVis" + # Requires network access (FileNotFoundError: [Errno 2] No such file or directory: 'wget') + "test_onnx_graph" + ]; + + disabledTestPaths = [ + # we are not interested in linting errors + "tests/test_lint.py" + ]; meta = with lib; { description = "Library for writing tensorboard-compatible logs"; From 36e6c2888aa7845f9fee1b55ad0a542f92bc9cee Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 15 Apr 2021 02:11:17 +0200 Subject: [PATCH 045/230] python3Packages.twine: rely on importlib-metadata unconditionally Changed from conditional to unconditional in https://github.com/pypa/twine/commit/22aaa04a88780cfc67fc0e5b80eab9784e81c982 --- pkgs/development/python-modules/twine/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/twine/default.nix b/pkgs/development/python-modules/twine/default.nix index 67c66e623c3..9a246faff51 100644 --- a/pkgs/development/python-modules/twine/default.nix +++ b/pkgs/development/python-modules/twine/default.nix @@ -24,6 +24,7 @@ buildPythonPackage rec { nativeBuildInputs = [ setuptools_scm ]; propagatedBuildInputs = [ + importlib-metadata keyring pkginfo pyblake2 @@ -33,7 +34,7 @@ buildPythonPackage rec { tqdm colorama rfc3986 - ] ++ lib.optionals (pythonOlder "3.8") [ importlib-metadata ]; + ]; # Requires network doCheck = false; From b6f09d8b83c5ef4d6ba62a631eb66d065254c1b2 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 15 Apr 2021 02:30:39 +0200 Subject: [PATCH 046/230] hackage-packages.nix: automatic Haskell package set update This update was generated by hackage2nix v2.17.0-8-ge18310f from Hackage revision https://github.com/commercialhaskell/all-cabal-hashes/commit/46b74aa1f540799cf40a1b5481afab2bdac3084d. --- .../haskell-modules/hackage-packages.nix | 1070 ++++++++++++++--- 1 file changed, 933 insertions(+), 137 deletions(-) diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index 0b7d3cab5a9..ced1d5e40a5 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -6908,6 +6908,27 @@ self: { broken = true; }) {}; + "GPipe-Core" = callPackage + ({ mkDerivation, base, Boolean, containers, criterion + , exception-transformers, gl, hspec, hspec-discover, lens, linear + , text, transformers, unordered-containers + }: + mkDerivation { + pname = "GPipe-Core"; + version = "0.2.3.1"; + sha256 = "0yrqhm77bn8dwx335fpkjyxz5jm7i7g5hpxgk9xrrm6b3sm24w0j"; + enableSeparateDataOutput = true; + libraryHaskellDepends = [ + base Boolean containers exception-transformers gl lens linear text + transformers unordered-containers + ]; + testHaskellDepends = [ base hspec lens ]; + testToolDepends = [ hspec-discover ]; + benchmarkHaskellDepends = [ base criterion lens ]; + description = "Typesafe functional GPU graphics programming"; + license = lib.licenses.mit; + }) {}; + "GPipe-Examples" = callPackage ({ mkDerivation, base, GLUT, GPipe, GPipe-TextureLoad, haskell98 , Vec, Vec-Transform @@ -6941,6 +6962,35 @@ self: { broken = true; }) {}; + "GPipe-GLFW4" = callPackage + ({ mkDerivation, async, base, containers, criterion + , exception-transformers, GLFW-b, GPipe-Core, hspec, hspec-discover + , JuicyPixels, lens, stm, transformers + }: + mkDerivation { + pname = "GPipe-GLFW4"; + version = "2.0.0"; + sha256 = "1bzbnn7ip5n01kd7nydlmmp5xbzhnfpfhhcmlx1l9qjwzj4zf708"; + isLibrary = true; + isExecutable = true; + enableSeparateDataOutput = true; + libraryHaskellDepends = [ + async base containers GLFW-b GPipe-Core stm + ]; + executableHaskellDepends = [ + base exception-transformers GPipe-Core lens transformers + ]; + testHaskellDepends = [ + base exception-transformers GPipe-Core hspec lens transformers + ]; + testToolDepends = [ hspec-discover ]; + benchmarkHaskellDepends = [ + base criterion GPipe-Core JuicyPixels + ]; + description = "GLFW OpenGL context creation for GPipe"; + license = lib.licenses.mit; + }) {}; + "GPipe-TextureLoad" = callPackage ({ mkDerivation, base, bitmap, GPipe, stb-image }: mkDerivation { @@ -11254,6 +11304,25 @@ self: { license = lib.licenses.bsd3; }) {}; + "IPv6Addr_2_0_2" = callPackage + ({ mkDerivation, aeson, attoparsec, base, HUnit, iproute, network + , network-info, random, test-framework, test-framework-hunit, text + }: + mkDerivation { + pname = "IPv6Addr"; + version = "2.0.2"; + sha256 = "0r712250lv8brgy3ysdyj41snl0qbsx9h0p853w8n1aif0fsnxkw"; + libraryHaskellDepends = [ + aeson attoparsec base iproute network network-info random text + ]; + testHaskellDepends = [ + base HUnit test-framework test-framework-hunit text + ]; + description = "Library to deal with IPv6 address text representations"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "IPv6DB" = callPackage ({ mkDerivation, aeson, attoparsec, base, bytestring, fast-logger , hedis, hspec, http-client, http-types, IPv6Addr, mtl @@ -16461,8 +16530,6 @@ self: { ]; description = "Quasiquotations for a python like interpolated string formater"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "QIO" = callPackage @@ -19166,6 +19233,20 @@ self: { license = lib.licenses.bsd3; }) {}; + "Spintax_0_3_6" = callPackage + ({ mkDerivation, attoparsec, base, extra, mtl, mwc-random, text }: + mkDerivation { + pname = "Spintax"; + version = "0.3.6"; + sha256 = "000yprzvq72ia6wfk3hjarb8anx3wfm54rzpv8x7d2zf09pzxk6k"; + libraryHaskellDepends = [ + attoparsec base extra mtl mwc-random text + ]; + description = "Random text generation based on spintax"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "Spock" = callPackage ({ mkDerivation, base, base64-bytestring, bytestring, containers , cryptonite, focus, hashable, hspec, hspec-wai, http-types, hvect @@ -22157,8 +22238,8 @@ self: { }: mkDerivation { pname = "Z-MessagePack"; - version = "0.3.0.1"; - sha256 = "1xn3by0fkn8w9akldfk2rrfk8ns2r64zxqadrcsgga7nv88q49am"; + version = "0.4.0.1"; + sha256 = "1i1ycf1bhahbh7d9rvz4hl5jq16mld8sya2h2xrxlvg9yqab19hy"; libraryHaskellDepends = [ base containers deepseq hashable integer-gmp primitive QuickCheck scientific tagged time unordered-containers Z-Data Z-IO @@ -34751,12 +34832,12 @@ self: { , configurator, containers, cryptohash, hostname, http-client , http-client-tls, http-media, http-types, jwt, mtl, network , network-api-support, network-uri, snap, snap-core, split, text - , time, time-units, transformers, zlib + , time, time-units, transformers }: mkDerivation { pname = "atlassian-connect-core"; - version = "0.8.1.0"; - sha256 = "17xvqf2j77y8lqvl2k5a924yvjym4aqii6glwfs3rjvw6a08k9zp"; + version = "0.8.2.0"; + sha256 = "06wrbz8r4yc6spjrawqrdsc1nf3bc5nr40ssnrmyv00xzkhvjq2j"; enableSeparateDataOutput = true; libraryHaskellDepends = [ aeson atlassian-connect-descriptor base base64-bytestring @@ -34765,12 +34846,11 @@ self: { http-types jwt mtl network network-api-support network-uri snap snap-core split text time time-units transformers ]; - libraryPkgconfigDepends = [ zlib ]; description = "Atlassian Connect snaplet for the Snap Framework and helper code"; license = lib.licenses.asl20; hydraPlatforms = lib.platforms.none; broken = true; - }) {inherit (pkgs) zlib;}; + }) {}; "atlassian-connect-descriptor" = callPackage ({ mkDerivation, aeson, base, bytestring, Cabal, cases, HUnit @@ -50485,8 +50565,8 @@ self: { }: mkDerivation { pname = "calamity"; - version = "0.1.28.0"; - sha256 = "0szxkhg6wgz2yr1dwsnvcyia45jjcysjzb65jrswdy6y2q0hmqlf"; + version = "0.1.28.1"; + sha256 = "1zbxwz8qg7yqvl70x2bcd0nib6akd6ii6fa2mrrg1nd255q6cyjb"; libraryHaskellDepends = [ aeson async base bytestring colour concurrent-extra connection containers data-default-class data-flags deepseq deque df1 di-core @@ -52286,6 +52366,17 @@ self: { broken = true; }) {}; + "catalyst" = callPackage + ({ mkDerivation, base, profunctors }: + mkDerivation { + pname = "catalyst"; + version = "0.0.0.1"; + sha256 = "04vp18pblx88djjdiidhg2i52rry08kx43zzvf7nfap46zv51a6a"; + libraryHaskellDepends = [ base profunctors ]; + description = "A Category typeclass hierarchy powerful enough to encode full programs"; + license = lib.licenses.bsd3; + }) {}; + "catamorphism" = callPackage ({ mkDerivation, base, hspec, QuickCheck, template-haskell }: mkDerivation { @@ -52528,6 +52619,27 @@ self: { broken = true; }) {}; + "cayley-client_0_4_15" = callPackage + ({ mkDerivation, aeson, attoparsec, base, binary, bytestring + , exceptions, hspec, http-client, http-conduit, lens, lens-aeson + , mtl, text, transformers, unordered-containers, vector + }: + mkDerivation { + pname = "cayley-client"; + version = "0.4.15"; + sha256 = "18kr88g4dlzg1ny0v3ql5yc07s0xsgbgszc69hf583d9c196lzib"; + libraryHaskellDepends = [ + aeson attoparsec base binary bytestring exceptions http-client + http-conduit lens lens-aeson mtl text transformers + unordered-containers vector + ]; + testHaskellDepends = [ aeson base hspec unordered-containers ]; + description = "A Haskell client for the Cayley graph database"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; + }) {}; + "cayley-dickson" = callPackage ({ mkDerivation, base, random }: mkDerivation { @@ -58389,8 +58501,8 @@ self: { pname = "codeworld-api"; version = "0.7.0"; sha256 = "1l1w4mrw4b2njz4kmfvd94mlwn776vryy1y9x9cb3r69fw5qy2f3"; - revision = "1"; - editedCabalFile = "18npi0idydgzc59a5xvlch8kpkkwn0xfi6f95i3cnzy1h1q52grr"; + revision = "3"; + editedCabalFile = "0whbjs6j4fy4jk3bc1djx1bkxpsdyms3r3rf5167x0dhxnahwcgi"; libraryHaskellDepends = [ aeson base base64-bytestring blank-canvas bytestring cereal cereal-text containers deepseq dependent-sum ghc-prim hashable @@ -60376,6 +60488,34 @@ self: { license = lib.licenses.bsd3; }) {}; + "composite-aeson_0_7_5_0" = callPackage + ({ mkDerivation, aeson, aeson-better-errors, aeson-qq, base + , composite-base, containers, contravariant, generic-deriving + , hashable, hspec, lens, mmorph, mtl, profunctors, QuickCheck + , scientific, tagged, template-haskell, text, time + , unordered-containers, vector, vinyl + }: + mkDerivation { + pname = "composite-aeson"; + version = "0.7.5.0"; + sha256 = "0cxsjk3zwkhwb3bgq2ji1mvvapcwxzg333z7zfdv9ba3xgw3ngq0"; + libraryHaskellDepends = [ + aeson aeson-better-errors base composite-base containers + contravariant generic-deriving hashable lens mmorph mtl profunctors + scientific tagged template-haskell text time unordered-containers + vector vinyl + ]; + testHaskellDepends = [ + aeson aeson-better-errors aeson-qq base composite-base containers + contravariant generic-deriving hashable hspec lens mmorph mtl + profunctors QuickCheck scientific tagged template-haskell text time + unordered-containers vector vinyl + ]; + description = "JSON for Vinyl records"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "composite-aeson-cofree-list" = callPackage ({ mkDerivation, aeson, base, composite-aeson , composite-aeson-writeonly, free, vector @@ -60402,6 +60542,18 @@ self: { license = lib.licenses.bsd3; }) {}; + "composite-aeson-path_0_7_5_0" = callPackage + ({ mkDerivation, base, composite-aeson, path }: + mkDerivation { + pname = "composite-aeson-path"; + version = "0.7.5.0"; + sha256 = "0b013jpdansx6fmxq1sf33975vvnajhs870a92i1lwd2k2wsj600"; + libraryHaskellDepends = [ base composite-aeson path ]; + description = "Formatting data for the path library"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "composite-aeson-refined" = callPackage ({ mkDerivation, aeson-better-errors, base, composite-aeson, mtl , refined @@ -60417,6 +60569,22 @@ self: { license = lib.licenses.bsd3; }) {}; + "composite-aeson-refined_0_7_5_0" = callPackage + ({ mkDerivation, aeson-better-errors, base, composite-aeson, mtl + , refined + }: + mkDerivation { + pname = "composite-aeson-refined"; + version = "0.7.5.0"; + sha256 = "05iakig5cqy4zkfl1kvjf9ck7gw5m7bdlcwwnv0kc5znyj66fbif"; + libraryHaskellDepends = [ + aeson-better-errors base composite-aeson mtl refined + ]; + description = "composite-aeson support for Refined from the refined package"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "composite-aeson-throw" = callPackage ({ mkDerivation, aeson, aeson-better-errors, base, composite-aeson , exceptions @@ -60469,6 +60637,30 @@ self: { license = lib.licenses.bsd3; }) {}; + "composite-base_0_7_5_0" = callPackage + ({ mkDerivation, base, deepseq, exceptions, hspec, lens + , monad-control, mtl, profunctors, QuickCheck, template-haskell + , text, transformers, transformers-base, unliftio-core, vinyl + }: + mkDerivation { + pname = "composite-base"; + version = "0.7.5.0"; + sha256 = "12qaxm20kn2cf6d19xargxfg8jrvb5ix0glm3ba0641plxlssqrq"; + libraryHaskellDepends = [ + base deepseq exceptions lens monad-control mtl profunctors + template-haskell text transformers transformers-base unliftio-core + vinyl + ]; + testHaskellDepends = [ + base deepseq exceptions hspec lens monad-control mtl profunctors + QuickCheck template-haskell text transformers transformers-base + unliftio-core vinyl + ]; + description = "Shared utilities for composite-* packages"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "composite-binary" = callPackage ({ mkDerivation, base, binary, composite-base }: mkDerivation { @@ -60480,6 +60672,18 @@ self: { license = lib.licenses.bsd3; }) {}; + "composite-binary_0_7_5_0" = callPackage + ({ mkDerivation, base, binary, composite-base }: + mkDerivation { + pname = "composite-binary"; + version = "0.7.5.0"; + sha256 = "0pvmmb4m6ysgj468khmggvsgs5c0hjmcn46s0wam353abdw89i7m"; + libraryHaskellDepends = [ base binary composite-base ]; + description = "Orphan binary instances"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "composite-ekg" = callPackage ({ mkDerivation, base, composite-base, ekg-core, lens, text, vinyl }: @@ -60494,6 +60698,21 @@ self: { license = lib.licenses.bsd3; }) {}; + "composite-ekg_0_7_5_0" = callPackage + ({ mkDerivation, base, composite-base, ekg-core, lens, text, vinyl + }: + mkDerivation { + pname = "composite-ekg"; + version = "0.7.5.0"; + sha256 = "00a689laq9a2wyq33vvpw7l69wsw9g6d5jzmrsizwqld6a4wdicv"; + libraryHaskellDepends = [ + base composite-base ekg-core lens text vinyl + ]; + description = "EKG Metrics for Vinyl records"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "composite-hashable" = callPackage ({ mkDerivation, base, composite-base, hashable }: mkDerivation { @@ -60505,6 +60724,18 @@ self: { license = lib.licenses.bsd3; }) {}; + "composite-hashable_0_7_5_0" = callPackage + ({ mkDerivation, base, composite-base, hashable }: + mkDerivation { + pname = "composite-hashable"; + version = "0.7.5.0"; + sha256 = "1s4bnlr08fb1sszys1frkxrjrsi61jpcldh126mcwzlf6wlvqvjn"; + libraryHaskellDepends = [ base composite-base hashable ]; + description = "Orphan hashable instances"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "composite-opaleye" = callPackage ({ mkDerivation, base, bytestring, composite-base, hspec, lens , opaleye, postgresql-simple, product-profunctors, profunctors @@ -60512,8 +60743,8 @@ self: { }: mkDerivation { pname = "composite-opaleye"; - version = "0.7.4.0"; - sha256 = "0nzyslqgh7m9ryqw4rajq2m4kfknqzdq0aqnygyz0sblmgixn4hm"; + version = "0.7.5.0"; + sha256 = "1qmlhn1lj2l5qpykxdg23axvxwn8l2pvzvwqn261rj21qj90k093"; libraryHaskellDepends = [ base bytestring composite-base lens opaleye postgresql-simple product-profunctors profunctors template-haskell text vinyl @@ -60536,8 +60767,8 @@ self: { }: mkDerivation { pname = "composite-swagger"; - version = "0.7.4.0"; - sha256 = "0a7pcs06m0w0mq60y3hhgn4a36gx5daypc1nh1ndsm6x3q3d99q8"; + version = "0.7.5.0"; + sha256 = "1b6bcw7gq2smghp7mnkh9gymn3mh4b1xxkv97zhxjsb91wnmvyml"; libraryHaskellDepends = [ base composite-base insert-ordered-containers lens swagger2 template-haskell text vinyl @@ -73392,6 +73623,23 @@ self: { license = lib.licenses.bsd3; }) {}; + "depq_0_4_2" = callPackage + ({ mkDerivation, base, containers, deepseq, hspec, psqueues + , QuickCheck + }: + mkDerivation { + pname = "depq"; + version = "0.4.2"; + sha256 = "18q953cr93qwjdblr06w8z4ryijzlz7j48hff4xwrdc3yrqk351l"; + libraryHaskellDepends = [ + base containers deepseq psqueues QuickCheck + ]; + testHaskellDepends = [ base containers hspec QuickCheck ]; + description = "Double-ended priority queues"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "deptrack-core" = callPackage ({ mkDerivation, base, containers, dlist, mtl, parsec }: mkDerivation { @@ -84929,6 +85177,8 @@ self: { pname = "envy"; version = "2.1.0.0"; sha256 = "0s6jp2npnp0x5hndnhkjwc9bhdghzlpl0n38804afiwxai9bawy8"; + revision = "1"; + editedCabalFile = "1girkgynrr5md1fa892cpg2cyy21hs5g463p5rb0fkhsnvci52xm"; libraryHaskellDepends = [ base bytestring containers mtl text time transformers ]; @@ -85008,20 +85258,18 @@ self: { }) {}; "epi-sim" = callPackage - ({ mkDerivation, aeson, base, bytestring, cassava, hspec - , mwc-random, primitive, statistics, trifecta, vector + ({ mkDerivation, aeson, base, bytestring, hspec, mwc-random + , primitive, statistics, vector }: mkDerivation { pname = "epi-sim"; - version = "0.2.2.0"; - sha256 = "17pri7fynx5zi6hacglv2xww41837nrq0d355pv7rkvmqz5f8y3a"; + version = "0.4.2"; + sha256 = "0hwamynf66abhnipjdb292zpsf80hafpjjdv0yfq712qgjb9mgvp"; libraryHaskellDepends = [ - aeson base bytestring cassava hspec mwc-random primitive statistics - trifecta vector + aeson base bytestring hspec mwc-random primitive statistics vector ]; testHaskellDepends = [ - aeson base bytestring cassava hspec mwc-random primitive statistics - trifecta vector + aeson base bytestring hspec mwc-random primitive statistics vector ]; description = "A library for simulating epidemics as birth-death processes"; license = lib.licenses.mit; @@ -88339,6 +88587,20 @@ self: { license = lib.licenses.bsd3; }) {}; + "express_0_1_4" = callPackage + ({ mkDerivation, base, leancheck, template-haskell }: + mkDerivation { + pname = "express"; + version = "0.1.4"; + sha256 = "0rhrlynb950n2c79s3gz0vyd6b34crlhzlva0w91qbzn9dpfrays"; + libraryHaskellDepends = [ base template-haskell ]; + testHaskellDepends = [ base leancheck ]; + benchmarkHaskellDepends = [ base leancheck ]; + description = "Dynamically-typed expressions involving applications and variables"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "expression-parser" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -92506,6 +92768,21 @@ self: { license = lib.licenses.bsd3; }) {}; + "fixed-length_0_2_2_1" = callPackage + ({ mkDerivation, base, non-empty, storable-record, tfp, utility-ht + }: + mkDerivation { + pname = "fixed-length"; + version = "0.2.2.1"; + sha256 = "123iyy1id86h0j45jyc9jiz24hvjw7j3l57iv80b57gv4hd8a6q7"; + libraryHaskellDepends = [ + base non-empty storable-record tfp utility-ht + ]; + description = "Lists with statically known length based on non-empty package"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "fixed-list" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -98184,16 +98461,18 @@ self: { }) {}; "fuzzyfind" = callPackage - ({ mkDerivation, base, containers, criterion, deepseq, massiv, text + ({ mkDerivation, base, containers, criterion, deepseq, hspec + , massiv, QuickCheck, text }: mkDerivation { pname = "fuzzyfind"; - version = "2.1.0"; - sha256 = "0ah7kdbr2w0l06b28nprndx09fkdh5wk5sgl5gfb1f5iy090b8k1"; + version = "2.2.0"; + sha256 = "0rb96cd0lfk41gc5xc52adibjpi16xs82kifsymqykrpsgrgj525"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base containers massiv text ]; executableHaskellDepends = [ base criterion deepseq ]; + testHaskellDepends = [ base containers hspec QuickCheck ]; description = "Fuzzy text matching"; license = lib.licenses.mit; }) {}; @@ -98554,8 +98833,8 @@ self: { }: mkDerivation { pname = "gamgee"; - version = "1.2.1"; - sha256 = "0kfaqxwnrpp9g6iz6s33b7lngw00l8n9bv9ssvw73dhh3r0rsj2b"; + version = "1.2.2"; + sha256 = "13mkdva9mchp48c5rc55c9h2l6iyc6phs46ncvy2053r1p8j31ki"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -98816,8 +99095,10 @@ self: { ({ mkDerivation, base }: mkDerivation { pname = "gc"; - version = "0.0.3"; - sha256 = "0cql0csrwqddpw28qmpr47mcnszmdc2szwvbnardr86pmjhvgwph"; + version = "0.1"; + sha256 = "1k8gda9hs0xl19hyl81ysshs32sxp5w50h3kq7id6yqvkfvyii5p"; + revision = "1"; + editedCabalFile = "0b5ry13gcrg9lxhn4crv911z6ibfm9ha2y942s455hw1pxkw279i"; libraryHaskellDepends = [ base ]; description = "Poor Richard's Memory Manager"; license = lib.licenses.bsd3; @@ -103021,29 +103302,30 @@ self: { license = lib.licenses.asl20; }) {}; - "ghcide_1_1_0_0" = callPackage - ({ mkDerivation, aeson, array, async, base, base16-bytestring - , binary, bytestring, bytestring-encoding, case-insensitive - , containers, cryptohash-sha1, data-default, deepseq, dependent-map - , dependent-sum, Diff, directory, dlist, extra, filepath - , fingertree, fuzzy, ghc, ghc-boot, ghc-boot-th, ghc-check - , ghc-exactprint, ghc-paths, ghc-typelits-knownnat, gitrev, Glob - , haddock-library, hashable, heapsize, hie-bios, hie-compat, hiedb - , hls-plugin-api, hp2pretty, hslogger, implicit-hie - , implicit-hie-cradle, lens, lsp, lsp-test, lsp-types, mtl - , network-uri, opentelemetry, optparse-applicative, parallel - , prettyprinter, prettyprinter-ansi-terminal, process, QuickCheck - , quickcheck-instances, record-dot-preprocessor, record-hasfield - , regex-tdfa, retrie, rope-utf16-splay, safe, safe-exceptions - , shake, shake-bench, sorted-list, sqlite-simple, stm, syb, tasty - , tasty-expected-failure, tasty-hunit, tasty-quickcheck - , tasty-rerun, text, time, transformers, unix, unliftio - , unliftio-core, unordered-containers, utf8-string, vector, yaml + "ghcide_1_2_0_2" = callPackage + ({ mkDerivation, aeson, aeson-pretty, array, async, base + , base16-bytestring, binary, bytestring, bytestring-encoding + , case-insensitive, containers, cryptohash-sha1, data-default + , deepseq, dependent-map, dependent-sum, Diff, directory, dlist + , extra, filepath, fingertree, fuzzy, ghc, ghc-boot, ghc-boot-th + , ghc-check, ghc-exactprint, ghc-paths, ghc-trace-events + , ghc-typelits-knownnat, gitrev, Glob, haddock-library, hashable + , heapsize, hie-bios, hie-compat, hiedb, hls-plugin-api, hp2pretty + , hslogger, implicit-hie, implicit-hie-cradle, lens, lsp, lsp-test + , lsp-types, mtl, network-uri, opentelemetry, optparse-applicative + , parallel, prettyprinter, prettyprinter-ansi-terminal, process + , QuickCheck, quickcheck-instances, record-dot-preprocessor + , record-hasfield, regex-tdfa, retrie, rope-utf16-splay, safe + , safe-exceptions, shake, shake-bench, sorted-list, sqlite-simple + , stm, syb, tasty, tasty-expected-failure, tasty-hunit + , tasty-quickcheck, tasty-rerun, text, time, transformers, unix + , unliftio, unliftio-core, unordered-containers, utf8-string + , vector, yaml }: mkDerivation { pname = "ghcide"; - version = "1.1.0.0"; - sha256 = "1i2xyp2n4g4cpz50wpwmzmknrzqzxnv3b551ibmhdy41v2fh6y5l"; + version = "1.2.0.2"; + sha256 = "0r3n23i4b51bb92q6pch9knj079a26jbz0q70qfpv66154d00wld"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -103051,27 +103333,29 @@ self: { bytestring-encoding case-insensitive containers cryptohash-sha1 data-default deepseq dependent-map dependent-sum Diff directory dlist extra filepath fingertree fuzzy ghc ghc-boot ghc-boot-th - ghc-check ghc-exactprint ghc-paths Glob haddock-library hashable - heapsize hie-bios hie-compat hiedb hls-plugin-api hslogger - implicit-hie-cradle lens lsp lsp-types mtl network-uri - opentelemetry parallel prettyprinter prettyprinter-ansi-terminal - regex-tdfa retrie rope-utf16-splay safe safe-exceptions shake - sorted-list sqlite-simple stm syb text time transformers unix - unliftio unliftio-core unordered-containers utf8-string vector + ghc-check ghc-exactprint ghc-paths ghc-trace-events Glob + haddock-library hashable heapsize hie-bios hie-compat hiedb + hls-plugin-api hslogger implicit-hie-cradle lens lsp lsp-types mtl + network-uri opentelemetry optparse-applicative parallel + prettyprinter prettyprinter-ansi-terminal regex-tdfa retrie + rope-utf16-splay safe safe-exceptions shake sorted-list + sqlite-simple stm syb text time transformers unix unliftio + unliftio-core unordered-containers utf8-string vector ]; executableHaskellDepends = [ - aeson base bytestring containers data-default directory extra - filepath ghc gitrev hashable heapsize hie-bios hiedb hls-plugin-api - lens lsp lsp-test lsp-types optparse-applicative process - safe-exceptions shake text unordered-containers + aeson aeson-pretty base bytestring containers data-default + directory extra filepath ghc gitrev hashable heapsize hie-bios + hiedb hls-plugin-api lens lsp lsp-test lsp-types + optparse-applicative process safe-exceptions shake text + unordered-containers ]; testHaskellDepends = [ - aeson base binary bytestring containers data-default directory - extra filepath ghc ghc-typelits-knownnat haddock-library + aeson async base binary bytestring containers data-default + directory extra filepath ghc ghc-typelits-knownnat haddock-library hls-plugin-api lens lsp lsp-test lsp-types network-uri optparse-applicative process QuickCheck quickcheck-instances - record-dot-preprocessor record-hasfield rope-utf16-splay safe - safe-exceptions shake tasty tasty-expected-failure tasty-hunit + record-dot-preprocessor record-hasfield regex-tdfa rope-utf16-splay + safe safe-exceptions shake tasty tasty-expected-failure tasty-hunit tasty-quickcheck tasty-rerun text ]; testToolDepends = [ implicit-hie ]; @@ -103388,6 +103672,59 @@ self: { broken = true; }) {}; + "ghcup" = callPackage + ({ mkDerivation, aeson, aeson-pretty, ascii-string, async, base + , base16-bytestring, binary, bytestring, bz2, case-insensitive + , casing, concurrent-output, containers, cryptohash-sha256 + , generic-arbitrary, generics-sop, haskus-utils-types + , haskus-utils-variant, hpath, hpath-directory, hpath-filepath + , hpath-io, hpath-posix, hspec, hspec-golden-aeson, libarchive + , lzma-static, megaparsec, monad-logger, mtl, optics, optics-vl + , optparse-applicative, os-release, parsec, pretty, pretty-terminal + , QuickCheck, quickcheck-arbitrary-adt, regex-posix, resourcet + , safe, safe-exceptions, split, streamly, streamly-bytestring + , streamly-posix, strict-base, string-interpolate, template-haskell + , text, time, transformers, unix, unix-bytestring + , unordered-containers, uri-bytestring, utf8-string, vector + , versions, vty, word8, yaml, zlib + }: + mkDerivation { + pname = "ghcup"; + version = "0.1.14.1"; + sha256 = "1lx6ahn4mvjzs3x4qm32sdn1n8w4v7jqj2jslvan008zk664d5l2"; + revision = "1"; + editedCabalFile = "0a9c2ha61mlz9ci652djy4vmmzi4s1g8rwl1a2miymrw5b36zsmq"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson ascii-string async base base16-bytestring binary bytestring + bz2 case-insensitive casing concurrent-output containers + cryptohash-sha256 generics-sop haskus-utils-types + haskus-utils-variant hpath hpath-directory hpath-filepath hpath-io + hpath-posix libarchive lzma-static megaparsec monad-logger mtl + optics optics-vl os-release parsec pretty pretty-terminal + regex-posix resourcet safe safe-exceptions split streamly + streamly-bytestring streamly-posix strict-base string-interpolate + template-haskell text time transformers unix unix-bytestring + unordered-containers uri-bytestring utf8-string vector versions vty + word8 yaml zlib + ]; + executableHaskellDepends = [ + aeson aeson-pretty base bytestring containers haskus-utils-variant + hpath hpath-filepath hpath-io libarchive megaparsec monad-logger + mtl optics optparse-applicative pretty pretty-terminal regex-posix + resourcet safe safe-exceptions string-interpolate template-haskell + text transformers uri-bytestring utf8-string versions yaml + ]; + testHaskellDepends = [ + base bytestring containers generic-arbitrary hpath hspec + hspec-golden-aeson QuickCheck quickcheck-arbitrary-adt text + uri-bytestring versions + ]; + description = "ghc toolchain installer"; + license = lib.licenses.lgpl3Only; + }) {}; + "ghczdecode" = callPackage ({ mkDerivation, base, zenc }: mkDerivation { @@ -103731,21 +104068,21 @@ self: { license = lib.licenses.lgpl21Only; }) {inherit (pkgs) gdk-pixbuf;}; - "gi-gdkpixbuf_2_0_25" = callPackage + "gi-gdkpixbuf_2_0_26" = callPackage ({ mkDerivation, base, bytestring, Cabal, containers, gdk-pixbuf - , gi-gio, gi-glib, gi-gobject, haskell-gi, haskell-gi-base - , haskell-gi-overloading, text, transformers + , gi-gio, gi-glib, gi-gmodule, gi-gobject, haskell-gi + , haskell-gi-base, haskell-gi-overloading, text, transformers }: mkDerivation { pname = "gi-gdkpixbuf"; - version = "2.0.25"; - sha256 = "18iz6rmqcf5q098hzv8p8hhk6ib8k99phmmnzp64j37c3x71c27b"; + version = "2.0.26"; + sha256 = "1g11pyrf1bzn0qrd9w52qhjq6qas4d3ycnprhwrglaffmaf0p9s8"; setupHaskellDepends = [ - base Cabal gi-gio gi-glib gi-gobject haskell-gi + base Cabal gi-gio gi-glib gi-gmodule gi-gobject haskell-gi ]; libraryHaskellDepends = [ - base bytestring containers gi-gio gi-glib gi-gobject haskell-gi - haskell-gi-base haskell-gi-overloading text transformers + base bytestring containers gi-gio gi-glib gi-gmodule gi-gobject + haskell-gi haskell-gi-base haskell-gi-overloading text transformers ]; libraryPkgconfigDepends = [ gdk-pixbuf ]; description = "GdkPixbuf bindings"; @@ -103958,6 +104295,25 @@ self: { hydraPlatforms = lib.platforms.none; }) {inherit (pkgs) glib;}; + "gi-gmodule" = callPackage + ({ mkDerivation, base, bytestring, Cabal, containers, gi-glib + , gmodule, haskell-gi, haskell-gi-base, haskell-gi-overloading + , text, transformers + }: + mkDerivation { + pname = "gi-gmodule"; + version = "2.0.1"; + sha256 = "16x0gpbs92l250ly9k52z6y85i78ycfsg0zbksfpsym4w45zjpbp"; + setupHaskellDepends = [ base Cabal gi-glib haskell-gi ]; + libraryHaskellDepends = [ + base bytestring containers gi-glib haskell-gi haskell-gi-base + haskell-gi-overloading text transformers + ]; + libraryPkgconfigDepends = [ gmodule ]; + description = "GModule bindings"; + license = lib.licenses.lgpl21Only; + }) {gmodule = null;}; + "gi-gobject" = callPackage ({ mkDerivation, base, bytestring, Cabal, containers, gi-glib, glib , haskell-gi, haskell-gi-base, haskell-gi-overloading, text @@ -106675,6 +107031,27 @@ self: { license = lib.licenses.bsd3; }) {}; + "glabrous_2_0_3" = callPackage + ({ mkDerivation, aeson, aeson-pretty, attoparsec, base, bytestring + , cereal, cereal-text, directory, either, hspec, text + , unordered-containers + }: + mkDerivation { + pname = "glabrous"; + version = "2.0.3"; + sha256 = "06bpazshc07rg1w06sl171k12mry708512hrdckqw7winwfrwwkh"; + libraryHaskellDepends = [ + aeson aeson-pretty attoparsec base bytestring cereal cereal-text + either text unordered-containers + ]; + testHaskellDepends = [ + base directory either hspec text unordered-containers + ]; + description = "A template DSL library"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "glade" = callPackage ({ mkDerivation, base, Cabal, glib, gtk, gtk2hs-buildtools , libglade @@ -116195,8 +116572,8 @@ self: { }: mkDerivation { pname = "hakyll-agda"; - version = "0.1.12"; - sha256 = "0fa2pw3zaqrxr2in3bb63w7wmch7345lmn84z25s80z0if9qv2x3"; + version = "0.1.13"; + sha256 = "1fylx5h0w774j0wwp3g1mhfyifiyrbclydipg9i8v98br9xcnspb"; libraryHaskellDepends = [ Agda base containers directory filepath hakyll mtl pandoc text transformers xhtml @@ -116626,19 +117003,22 @@ self: { "hal" = callPackage ({ mkDerivation, aeson, base, base64-bytestring, bytestring , case-insensitive, conduit, conduit-extra, containers, envy - , exceptions, http-client, http-conduit, http-types, mtl, text - , time, unordered-containers + , exceptions, hspec, http-client, http-types, mtl, text, time + , unordered-containers }: mkDerivation { pname = "hal"; - version = "0.4.6"; - sha256 = "07xzkb9yavrh17d64gm3pc08jr8cb53lm5fdw6apcn7826ys76vh"; + version = "0.4.7"; + sha256 = "1bf2d4djbw8gpkcgrvjm52hsyw8hv20rsk0qdxfi8aml6mp152k5"; revision = "1"; - editedCabalFile = "01mx3i40i3xhn9i1bbdppp20df2l305zgzl9r4y02dfzcsy3xff5"; + editedCabalFile = "19hic5cgxyk2nz8nnrz091hv79al49q7ah9pv9d7fwagjzi027ch"; libraryHaskellDepends = [ aeson base base64-bytestring bytestring case-insensitive conduit - conduit-extra containers envy exceptions http-client http-conduit - http-types mtl text time unordered-containers + conduit-extra containers envy exceptions http-client http-types mtl + text time unordered-containers + ]; + testHaskellDepends = [ + aeson base containers hspec http-client http-types time ]; description = "A runtime environment for Haskell applications running on AWS Lambda"; license = lib.licenses.bsd3; @@ -119660,8 +120040,8 @@ self: { }: mkDerivation { pname = "haskell-ci"; - version = "0.12"; - sha256 = "17ccxpsi483fkiyp98m09nzqds9n78y53naii5x18nvdxv9fssam"; + version = "0.12.1"; + sha256 = "0bdb3x2kk5nqm6ly2ycdpx6xw7pspgg67x73cjscqj6pxcx1wjzf"; isLibrary = false; isExecutable = true; libraryHaskellDepends = [ @@ -122509,8 +122889,8 @@ self: { }: mkDerivation { pname = "haskoin-store"; - version = "0.52.6"; - sha256 = "19j4cvxnrqhckbyjnwg2z4ixavbkgcxlxspsxakawaffqhq49wq8"; + version = "0.52.8"; + sha256 = "14qwdh0fwyqhb3pgykprgp1vs78y4ixn2dn55bsi9x53cjjvp1qp"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -131493,6 +131873,26 @@ self: { broken = true; }) {}; + "hls-brittany-plugin" = callPackage + ({ mkDerivation, base, brittany, bytestring, filepath, ghc + , ghc-boot-th, ghcide, hls-plugin-api, hls-test-utils, lens + , lsp-types, text, transformers + }: + mkDerivation { + pname = "hls-brittany-plugin"; + version = "1.0.0.1"; + sha256 = "1lfhgvxs0bvs67raxalvj8pr4qln1yvi7i7wlp33gpk2x89bwaqy"; + libraryHaskellDepends = [ + base brittany filepath ghc ghc-boot-th ghcide hls-plugin-api lens + lsp-types text transformers + ]; + testHaskellDepends = [ base bytestring hls-test-utils text ]; + description = "Integration with the Brittany code formatter"; + license = lib.licenses.asl20; + hydraPlatforms = lib.platforms.none; + broken = true; + }) {hls-test-utils = null;}; + "hls-class-plugin" = callPackage ({ mkDerivation, aeson, base, containers, ghc, ghc-exactprint , ghcide, hls-plugin-api, lens, lsp, shake, text, transformers @@ -131558,10 +131958,8 @@ self: { }: mkDerivation { pname = "hls-explicit-imports-plugin"; - version = "1.0.0.0"; - sha256 = "14j89l8pkxrffllg06fj6215xqdswrbndyv5xa22f0g00acmwi6w"; - revision = "1"; - editedCabalFile = "0gch9wkz1h4g06xc48jhvs06jji9d0npa2zrj2gv1cbf6hjs0s92"; + version = "1.0.0.1"; + sha256 = "1ygs667pkc3zn66yqz6ssrxifhrc906sddmcgjnkprk7zappk2nc"; libraryHaskellDepends = [ aeson base containers deepseq ghc ghcide hls-plugin-api lsp lsp-types shake text unordered-containers @@ -131615,8 +132013,8 @@ self: { }: mkDerivation { pname = "hls-plugin-api"; - version = "1.0.0.0"; - sha256 = "03pj0irgf9p84jn5kfd4cfyqk4xyfdf9pfrwqhb0c1ipnm4l7wal"; + version = "1.1.0.0"; + sha256 = "1i18a5gxa409882zpviy4paldaq43j4z1zmgr9mag2mn64vplrxy"; libraryHaskellDepends = [ aeson base containers data-default dependent-map dependent-sum Diff dlist hashable hslogger lens lsp opentelemetry process regex-tdfa @@ -131644,15 +132042,15 @@ self: { license = lib.licenses.asl20; }) {}; - "hls-retrie-plugin_1_0_0_1" = callPackage + "hls-retrie-plugin_1_0_0_2" = callPackage ({ mkDerivation, aeson, base, containers, deepseq, directory, extra , ghc, ghcide, hashable, hls-plugin-api, lsp, lsp-types, retrie , safe-exceptions, shake, text, transformers, unordered-containers }: mkDerivation { pname = "hls-retrie-plugin"; - version = "1.0.0.1"; - sha256 = "0vshnnh8x2n0kn7hh04z00mkdmw3130b3mmfrm3z4ygia852hzmq"; + version = "1.0.0.2"; + sha256 = "0jw1q0dk5jl80wbyvi1a6vszj9x3s7d2bnsbnyycbh4zgl33agwb"; libraryHaskellDepends = [ aeson base containers deepseq directory extra ghc ghcide hashable hls-plugin-api lsp lsp-types retrie safe-exceptions shake text @@ -141168,22 +141566,23 @@ self: { license = lib.licenses.mit; }) {}; - "http-client_0_7_6" = callPackage + "http-client_0_7_7" = callPackage ({ mkDerivation, array, async, base, base64-bytestring , blaze-builder, bytestring, case-insensitive, containers, cookie , deepseq, directory, exceptions, filepath, ghc-prim, hspec - , http-types, mime-types, monad-control, network, network-uri - , random, stm, streaming-commons, text, time, transformers, zlib + , http-types, iproute, mime-types, monad-control, network + , network-uri, random, stm, streaming-commons, text, time + , transformers, zlib }: mkDerivation { pname = "http-client"; - version = "0.7.6"; - sha256 = "1458mq5kh5fjlkhk9cgaz6sc6533l2nm4r2jz80diy8qc6bpiwrk"; + version = "0.7.7"; + sha256 = "0sbjfxfnj5b594klc7h7zmw27gssrbcsacld9lw9p0bpmgx73lvn"; libraryHaskellDepends = [ array base base64-bytestring blaze-builder bytestring case-insensitive containers cookie deepseq exceptions filepath - ghc-prim http-types mime-types network network-uri random stm - streaming-commons text time transformers + ghc-prim http-types iproute mime-types network network-uri random + stm streaming-commons text time transformers ]; testHaskellDepends = [ async base blaze-builder bytestring case-insensitive containers @@ -145639,8 +146038,8 @@ self: { ({ mkDerivation, base, containers, QuickCheck, text }: mkDerivation { pname = "hzenhan"; - version = "0.0.4"; - sha256 = "1gbrzjjdihgzj63sp2h4762zybyhd5rxa8rpvsjra21qvvch12mx"; + version = "0.0.5"; + sha256 = "1zrxcbazask9dg9rqkdfkm8q055p1wl9834a3yslyxq0h39acc61"; libraryHaskellDepends = [ base containers text ]; testHaskellDepends = [ base containers QuickCheck text ]; description = "Zenhan library for Haskell"; @@ -151114,22 +151513,20 @@ self: { "ircbot" = callPackage ({ mkDerivation, base, bytestring, containers, directory, filepath - , irc, mtl, network, parsec, random, SafeSemaphore, stm, time, unix + , irc, mtl, network, optparse-applicative, parsec, random + , SafeSemaphore, stm, time, unix }: mkDerivation { pname = "ircbot"; - version = "0.6.6"; - sha256 = "1nmqgimmmxry4pj1y5mfsp662hkivn0vr9n8rx1yn0aldlzrxdm8"; + version = "0.6.6.1"; + sha256 = "00dw9ay5x4hb8p2jvxwgcxqlny7cpm6lk5kqaw9yc9c6m6705fqc"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base bytestring containers directory filepath irc mtl network - parsec random SafeSemaphore stm time unix - ]; - executableHaskellDepends = [ - base bytestring containers directory filepath irc mtl network - parsec random SafeSemaphore stm time unix + optparse-applicative parsec random SafeSemaphore stm time unix ]; + executableHaskellDepends = [ base ]; description = "A library for writing IRC bots"; license = lib.licenses.bsd3; }) {}; @@ -157686,8 +158083,6 @@ self: { ]; description = "Krank checks your code source comments for important markers"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "krapsh" = callPackage @@ -169725,8 +170120,8 @@ self: { }) {}; "lzma" = callPackage - ({ mkDerivation, base, bytestring, HUnit, lzma, QuickCheck, tasty - , tasty-hunit, tasty-quickcheck + ({ mkDerivation, base, bytestring, HUnit, QuickCheck, tasty + , tasty-hunit, tasty-quickcheck, xz }: mkDerivation { pname = "lzma"; @@ -169735,13 +170130,13 @@ self: { revision = "6"; editedCabalFile = "1sh2g5wkh0m6646cxnii0k20f0crwdcnprfl9jfg7gxn5875bkip"; libraryHaskellDepends = [ base bytestring ]; - librarySystemDepends = [ lzma ]; + librarySystemDepends = [ xz ]; testHaskellDepends = [ base bytestring HUnit QuickCheck tasty tasty-hunit tasty-quickcheck ]; description = "LZMA/XZ compression and decompression"; license = lib.licenses.bsd3; - }) {lzma = null;}; + }) {inherit (pkgs) xz;}; "lzma-clib" = callPackage ({ mkDerivation }: @@ -169777,8 +170172,8 @@ self: { "lzma-enumerator" = callPackage ({ mkDerivation, base, bindings-DSL, bytestring, enumerator, HUnit - , lzma, mtl, QuickCheck, test-framework, test-framework-hunit - , test-framework-quickcheck2 + , mtl, QuickCheck, test-framework, test-framework-hunit + , test-framework-quickcheck2, xz }: mkDerivation { pname = "lzma-enumerator"; @@ -169787,7 +170182,7 @@ self: { libraryHaskellDepends = [ base bindings-DSL bytestring enumerator mtl ]; - librarySystemDepends = [ lzma ]; + librarySystemDepends = [ xz ]; testHaskellDepends = [ base bytestring enumerator HUnit QuickCheck test-framework test-framework-hunit test-framework-quickcheck2 @@ -169796,7 +170191,7 @@ self: { license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; broken = true; - }) {lzma = null;}; + }) {inherit (pkgs) xz;}; "lzma-static" = callPackage ({ mkDerivation, base, bytestring, HUnit, QuickCheck, tasty @@ -169804,8 +170199,8 @@ self: { }: mkDerivation { pname = "lzma-static"; - version = "5.2.5.1"; - sha256 = "1hky1aa1bl6zxnhwgpghx1wf43g74x6f4xpi21l65a39sb25bqf0"; + version = "5.2.5.2"; + sha256 = "12na1ycwrd7p50g19kgnb6kdgswnkwgzynaf0lyrv30qicpd8a5z"; libraryHaskellDepends = [ base bytestring ]; testHaskellDepends = [ base bytestring HUnit QuickCheck tasty tasty-hunit tasty-quickcheck @@ -173101,6 +173496,21 @@ self: { broken = true; }) {}; + "mcaeson" = callPackage + ({ mkDerivation, base }: + mkDerivation { + pname = "mcaeson"; + version = "0.0.0.1"; + sha256 = "0gkwqkyp5apwkzlqwm4h1fy112fy2ywg5qq2ma4s5agz9574h73q"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ base ]; + executableHaskellDepends = [ base ]; + testHaskellDepends = [ base ]; + description = "An Aeson parsing toolkit"; + license = lib.licenses.bsd3; + }) {}; + "mcl" = callPackage ({ mkDerivation, base, binary, bytestring, Cabal, criterion , deepseq, ghc-prim, gmpxx, groups, integer-gmp, mcl, openssl @@ -177468,6 +177878,28 @@ self: { license = lib.licenses.mit; }) {}; + "mod_0_1_2_2" = callPackage + ({ mkDerivation, base, deepseq, integer-gmp, primitive + , quickcheck-classes, quickcheck-classes-base, semirings, tasty + , tasty-bench, tasty-quickcheck, vector + }: + mkDerivation { + pname = "mod"; + version = "0.1.2.2"; + sha256 = "0m92yd323kjjwnphqlima2aj0hh7i1gnpblc8a29ks25gj0sv66v"; + libraryHaskellDepends = [ + base deepseq integer-gmp primitive semirings vector + ]; + testHaskellDepends = [ + base primitive quickcheck-classes quickcheck-classes-base semirings + tasty tasty-quickcheck vector + ]; + benchmarkHaskellDepends = [ base tasty-bench ]; + description = "Fast type-safe modular arithmetic"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + }) {}; + "modbus-tcp" = callPackage ({ mkDerivation, base, bytestring, cereal, mtl, transformers }: mkDerivation { @@ -189169,6 +189601,19 @@ self: { license = lib.licenses.mit; }) {}; + "nonempty-zipper_1_0_0_2" = callPackage + ({ mkDerivation, base, comonad, deepseq, doctest, Glob, safe }: + mkDerivation { + pname = "nonempty-zipper"; + version = "1.0.0.2"; + sha256 = "10fj56ry851npkhrkw9gb1sckhx764l2s2c5x83cnylxlg7cfijj"; + libraryHaskellDepends = [ base comonad deepseq safe ]; + testHaskellDepends = [ base comonad deepseq doctest Glob safe ]; + description = "A non-empty comonadic list zipper"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + }) {}; + "nonemptymap" = callPackage ({ mkDerivation, base, containers, semigroupoids }: mkDerivation { @@ -189714,6 +190159,33 @@ self: { license = lib.licenses.bsd3; }) {}; + "nri-prelude_0_5_0_3" = callPackage + ({ mkDerivation, aeson, aeson-pretty, async, auto-update, base + , bytestring, containers, directory, exceptions, filepath, ghc + , hedgehog, junit-xml, pretty-diff, pretty-show, safe-coloured-text + , safe-exceptions, terminal-size, text, time, vector + }: + mkDerivation { + pname = "nri-prelude"; + version = "0.5.0.3"; + sha256 = "0k4mhgyazjc74hwf2xgznhhkryqhdmsc2pv1v9d32706qkr796wn"; + libraryHaskellDepends = [ + aeson aeson-pretty async auto-update base bytestring containers + directory exceptions filepath ghc hedgehog junit-xml pretty-diff + pretty-show safe-coloured-text safe-exceptions terminal-size text + time vector + ]; + testHaskellDepends = [ + aeson aeson-pretty async auto-update base bytestring containers + directory exceptions filepath ghc hedgehog junit-xml pretty-diff + pretty-show safe-coloured-text safe-exceptions terminal-size text + time vector + ]; + description = "A Prelude inspired by the Elm programming language"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "nsis" = callPackage ({ mkDerivation, base, directory, process, transformers, uniplate }: @@ -204226,6 +204698,8 @@ self: { pname = "pixiv"; version = "0.1.0"; sha256 = "001pfzijh7ibcyinmw0l8yvw0kxsvmniw993qx9b6zlzf689cpp6"; + revision = "1"; + editedCabalFile = "03wfjj0a074n02mpa02gncfy35m53qdmij465dk8g6qjnjah8a01"; libraryHaskellDepends = [ aeson base base16-bytestring bytestring cryptohash-md5 directory exceptions filepath http-client http-client-tls lens monad-control @@ -215124,6 +215598,29 @@ self: { license = lib.licenses.bsd3; }) {}; + "quickcheck-classes_0_6_5_0" = callPackage + ({ mkDerivation, aeson, base, base-orphans, containers, primitive + , primitive-addr, QuickCheck, quickcheck-classes-base + , semigroupoids, semirings, tagged, tasty, tasty-quickcheck + , transformers, vector + }: + mkDerivation { + pname = "quickcheck-classes"; + version = "0.6.5.0"; + sha256 = "19iw15mvb7gws3ljdxqwsbb4pmfc0sfflf8szgmrhiqr3k82mqv2"; + libraryHaskellDepends = [ + aeson base containers primitive primitive-addr QuickCheck + quickcheck-classes-base semigroupoids semirings transformers vector + ]; + testHaskellDepends = [ + aeson base base-orphans containers primitive QuickCheck + semigroupoids tagged tasty tasty-quickcheck transformers vector + ]; + description = "QuickCheck common typeclasses"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "quickcheck-classes-base" = callPackage ({ mkDerivation, base, base-orphans, bifunctors, containers , contravariant, fail, QuickCheck, tagged, transformers @@ -215140,6 +215637,20 @@ self: { license = lib.licenses.bsd3; }) {}; + "quickcheck-classes-base_0_6_2_0" = callPackage + ({ mkDerivation, base, containers, QuickCheck, transformers }: + mkDerivation { + pname = "quickcheck-classes-base"; + version = "0.6.2.0"; + sha256 = "16c6gq4cqpkwnq1pzkhm6r7mrwk4an50ha5w77bmiia2qkhla6ch"; + libraryHaskellDepends = [ + base containers QuickCheck transformers + ]; + description = "QuickCheck common typeclasses from `base`"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "quickcheck-combinators" = callPackage ({ mkDerivation, base, QuickCheck, unfoldable-restricted }: mkDerivation { @@ -228041,6 +228552,30 @@ self: { license = lib.licenses.publicDomain; }) {}; + "safecopy_0_10_4_2" = callPackage + ({ mkDerivation, array, base, bytestring, cereal, containers + , generic-data, HUnit, lens, lens-action, old-time, QuickCheck + , quickcheck-instances, tasty, tasty-quickcheck, template-haskell + , text, time, transformers, vector + }: + mkDerivation { + pname = "safecopy"; + version = "0.10.4.2"; + sha256 = "0r2mf0p82gf8vnldx477b5ykrj1x7hyg13nqfn6gzb50japs6h3i"; + libraryHaskellDepends = [ + array base bytestring cereal containers generic-data old-time + template-haskell text time transformers vector + ]; + testHaskellDepends = [ + array base bytestring cereal containers HUnit lens lens-action + QuickCheck quickcheck-instances tasty tasty-quickcheck + template-haskell time vector + ]; + description = "Binary serialization with version control"; + license = lib.licenses.publicDomain; + hydraPlatforms = lib.platforms.none; + }) {}; + "safecopy-migrate" = callPackage ({ mkDerivation, base, base-prelude, cereal, containers, extra , haskell-src-meta, microlens, safecopy, template-haskell @@ -228254,8 +228789,8 @@ self: { }: mkDerivation { pname = "sak"; - version = "0.1.3.0"; - sha256 = "1khws0z9v91vz722k6y0b99ffy2vd04myvpww4p1i32396dhczln"; + version = "0.1.3.1"; + sha256 = "12vharmp5f0ffxy4j5kjwqnffc87y4wmzvgcfvp6prqyjfh87qfy"; isLibrary = false; isExecutable = true; enableSeparateDataOutput = true; @@ -228706,6 +229241,122 @@ self: { broken = true; }) {}; + "sandwich" = callPackage + ({ mkDerivation, aeson, ansi-terminal, async, base, brick + , bytestring, colour, containers, directory, exceptions, filepath + , free, haskell-src-exts, lens, lifted-async, microlens + , microlens-th, monad-control, monad-logger, mtl + , optparse-applicative, pretty-show, process, safe, safe-exceptions + , stm, string-interpolate, template-haskell, text, time + , transformers, transformers-base, unix, unliftio-core, vector, vty + }: + mkDerivation { + pname = "sandwich"; + version = "0.1.0.2"; + sha256 = "1xcw3mdl85brj6pvynz58aclaf3ya0aq0y038cps9dsz58bqhbka"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson ansi-terminal async base brick bytestring colour containers + directory exceptions filepath free haskell-src-exts lens + lifted-async microlens microlens-th monad-control monad-logger mtl + optparse-applicative pretty-show process safe safe-exceptions stm + string-interpolate template-haskell text time transformers + transformers-base unix unliftio-core vector vty + ]; + executableHaskellDepends = [ + aeson ansi-terminal async base brick bytestring colour containers + directory exceptions filepath free haskell-src-exts lens + lifted-async microlens microlens-th monad-control monad-logger mtl + optparse-applicative pretty-show process safe safe-exceptions stm + string-interpolate template-haskell text time transformers + transformers-base unix unliftio-core vector vty + ]; + testHaskellDepends = [ + aeson ansi-terminal async base brick bytestring colour containers + directory exceptions filepath free haskell-src-exts lens + lifted-async microlens microlens-th monad-control monad-logger mtl + optparse-applicative pretty-show process safe safe-exceptions stm + string-interpolate template-haskell text time transformers + transformers-base unix unliftio-core vector vty + ]; + description = "Yet another test framework for Haskell"; + license = lib.licenses.bsd3; + }) {}; + + "sandwich-slack" = callPackage + ({ mkDerivation, aeson, base, bytestring, containers, lens + , lens-aeson, monad-logger, mtl, safe, safe-exceptions, sandwich + , stm, string-interpolate, text, time, vector, wreq + }: + mkDerivation { + pname = "sandwich-slack"; + version = "0.1.0.1"; + sha256 = "1c7csrdfq342733rgrfwx5rc6v14jhfb9wb44gn699pgzzj031kz"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson base bytestring containers lens lens-aeson monad-logger mtl + safe safe-exceptions sandwich stm string-interpolate text time + vector wreq + ]; + executableHaskellDepends = [ + aeson base bytestring containers lens lens-aeson monad-logger mtl + safe safe-exceptions sandwich stm string-interpolate text time + vector wreq + ]; + testHaskellDepends = [ + aeson base bytestring containers lens lens-aeson monad-logger mtl + safe safe-exceptions sandwich stm string-interpolate text time + vector wreq + ]; + description = "Sandwich integration with Slack"; + license = lib.licenses.bsd3; + }) {}; + + "sandwich-webdriver" = callPackage + ({ mkDerivation, aeson, base, containers, convertible, data-default + , directory, exceptions, filepath, http-client, http-client-tls + , http-conduit, lifted-base, microlens, microlens-aeson + , monad-control, monad-logger, mtl, network, process, random, retry + , safe, safe-exceptions, sandwich, string-interpolate, temporary + , text, time, transformers, unix, unordered-containers, vector + , webdriver, X11 + }: + mkDerivation { + pname = "sandwich-webdriver"; + version = "0.1.0.1"; + sha256 = "10s0zb3al4ii9gm3b6by8czvr8i3s424mlfk81v2hpdv5i7a0yqb"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson base containers convertible data-default directory exceptions + filepath http-client http-client-tls http-conduit lifted-base + microlens microlens-aeson monad-control monad-logger mtl network + process random retry safe safe-exceptions sandwich + string-interpolate temporary text time transformers unix + unordered-containers vector webdriver X11 + ]; + executableHaskellDepends = [ + aeson base containers convertible data-default directory exceptions + filepath http-client http-client-tls http-conduit lifted-base + microlens microlens-aeson monad-control monad-logger mtl network + process random retry safe safe-exceptions sandwich + string-interpolate temporary text time transformers unix + unordered-containers vector webdriver X11 + ]; + testHaskellDepends = [ + aeson base containers convertible data-default directory exceptions + filepath http-client http-client-tls http-conduit lifted-base + microlens microlens-aeson monad-control monad-logger mtl network + process random retry safe safe-exceptions sandwich + string-interpolate temporary text time transformers unix + unordered-containers vector webdriver X11 + ]; + description = "Sandwich integration with Selenium WebDriver"; + license = lib.licenses.bsd3; + }) {}; + "sarasvati" = callPackage ({ mkDerivation, base, deepseq, portaudio }: mkDerivation { @@ -240504,8 +241155,8 @@ self: { ({ mkDerivation, base, containers, lucid, skylighting-core, text }: mkDerivation { pname = "skylighting-lucid"; - version = "1.0.0"; - sha256 = "09wh0dh8glnb051hdbcf4q4v3nflikgc585acqin8kq7zny7ps72"; + version = "1.0.1"; + sha256 = "0igimymq8pcizl4wdmyjafjgdw8xi2059jzmcw64ij18rn6bip8d"; libraryHaskellDepends = [ base containers lucid skylighting-core text ]; @@ -242902,18 +243553,18 @@ self: { "snaplet-redis" = callPackage ({ mkDerivation, base, bytestring, cereal, clientsession - , configurator, hedis, lens, mtl, network, snap, snap-core, text - , time, transformers, unordered-containers + , configurator, hedis, lens, mtl, snap, snap-core, text, time + , unordered-containers }: mkDerivation { pname = "snaplet-redis"; - version = "0.1.6"; - sha256 = "09ba0jmbjk121c2cvnd83328w9h2d5rzwvmpxs2pi93x6jqpd9qw"; + version = "0.1.6.1"; + sha256 = "07wwh2gpbsg60p0a4qxf4knbchpq7bvh8bdckzw5f39k5xcaibsy"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base bytestring cereal clientsession configurator hedis lens mtl - network snap snap-core text time transformers unordered-containers + snap snap-core text time unordered-containers ]; description = "Redis support for Snap Framework"; license = lib.licenses.bsd3; @@ -244149,6 +244800,29 @@ self: { broken = true; }) {}; + "souffle-dsl" = callPackage + ({ mkDerivation, base, containers, directory, filepath, hedgehog + , hspec, hspec-hedgehog, mtl, neat-interpolation, process + , souffle-haskell, template-haskell, temporary, text + , type-errors-pretty + }: + mkDerivation { + pname = "souffle-dsl"; + version = "0.1.0"; + sha256 = "1j3g4nwl0v5szphvyv0jp7qcmnpfmynr8dbkwwh4lwacldgnhbnr"; + libraryHaskellDepends = [ + base containers directory filepath mtl process souffle-haskell + template-haskell temporary text type-errors-pretty + ]; + testHaskellDepends = [ + base containers directory filepath hedgehog hspec hspec-hedgehog + mtl neat-interpolation process souffle-haskell template-haskell + temporary text type-errors-pretty + ]; + description = "Haskell EDSL for Souffle"; + license = lib.licenses.mit; + }) {}; + "souffle-haskell" = callPackage ({ mkDerivation, array, base, containers, deepseq, directory , filepath, hedgehog, hspec, hspec-hedgehog, mtl @@ -244734,6 +245408,24 @@ self: { broken = true; }) {}; + "spartacon" = callPackage + ({ mkDerivation, base, config-schema, config-value, containers + , either, mtl, relation, text, X11 + }: + mkDerivation { + pname = "spartacon"; + version = "0.1.0.0"; + sha256 = "1mabp5gfwj7zv30rdnr1zwl4fv29128vg08izjcj8sym0hldzj81"; + isLibrary = false; + isExecutable = true; + executableHaskellDepends = [ + base config-schema config-value containers either mtl relation text + X11 + ]; + description = "A unix-style (read from stdin, write to stdout) global hotkey daemon"; + license = lib.licenses.bsd3; + }) {}; + "spata" = callPackage ({ mkDerivation, base, dlist, mps, mtl }: mkDerivation { @@ -244974,6 +245666,22 @@ self: { license = lib.licenses.bsd3; }) {}; + "speculate_0_4_4" = callPackage + ({ mkDerivation, base, cmdargs, containers, express, leancheck }: + mkDerivation { + pname = "speculate"; + version = "0.4.4"; + sha256 = "0vmxi8rapbld7b3llw2v6fz1v6vqyv90rpbnzjdfa29kdza4m5sf"; + libraryHaskellDepends = [ + base cmdargs containers express leancheck + ]; + testHaskellDepends = [ base express leancheck ]; + benchmarkHaskellDepends = [ base express leancheck ]; + description = "discovery of properties about Haskell functions"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "speculation" = callPackage ({ mkDerivation, base, ghc-prim, stm, transformers }: mkDerivation { @@ -256253,6 +256961,8 @@ self: { pname = "tasty-bench"; version = "0.2.5"; sha256 = "146i1vkp9008hik7qyi8m9qq3ij5kji84qscsf598rzjmjga7igd"; + revision = "1"; + editedCabalFile = "0rcsdiwri52wng5dj30k3c5qrn8qfr14qs53cs1y99mbqfpzs02g"; libraryHaskellDepends = [ base containers deepseq tasty ]; description = "Featherlight benchmark framework"; license = lib.licenses.mit; @@ -258757,8 +259467,8 @@ self: { }: mkDerivation { pname = "tesla"; - version = "0.3.1.0"; - sha256 = "1fwrhmxqpliyq92v1j6jcqxi5iyh7s8rj17mybvgkwh5aprwsdp8"; + version = "0.4.1.0"; + sha256 = "0rnzgcwkgwnpjlf2r47a28zwkbnsb75wfmdiwnq4w99i2f519dnd"; libraryHaskellDepends = [ aeson base base64-bytestring bytestring casing containers cryptonite exceptions generic-deriving lens lens-aeson memory @@ -260148,6 +260858,23 @@ self: { license = lib.licenses.asl20; }) {}; + "text-regex-replace_0_1_1_4" = callPackage + ({ mkDerivation, attoparsec, base, hspec, QuickCheck, smallcheck + , text, text-icu + }: + mkDerivation { + pname = "text-regex-replace"; + version = "0.1.1.4"; + sha256 = "19n7zwnrm4da8ifhwlqwrx969pni0njj5f69j30gp71fi9ihjgsb"; + libraryHaskellDepends = [ attoparsec base text text-icu ]; + testHaskellDepends = [ + base hspec QuickCheck smallcheck text text-icu + ]; + description = "Easy replacement when using text-icu regexes"; + license = lib.licenses.asl20; + hydraPlatforms = lib.platforms.none; + }) {}; + "text-region" = callPackage ({ mkDerivation, aeson, base, base-unicode-symbols, bytestring , groups, hspec, lens, text @@ -262228,6 +262955,29 @@ self: { license = lib.licenses.gpl3Only; }) {}; + "tidal_1_7_3" = callPackage + ({ mkDerivation, base, bifunctors, bytestring, clock, colour + , containers, criterion, deepseq, hosc, microspec, network, parsec + , primitive, random, text, transformers, weigh + }: + mkDerivation { + pname = "tidal"; + version = "1.7.3"; + sha256 = "0z0brlicisn7xpwag20vdrq6ympczxcyd886pm6am5phmifkmfif"; + enableSeparateDataOutput = true; + libraryHaskellDepends = [ + base bifunctors bytestring clock colour containers deepseq hosc + network parsec primitive random text transformers + ]; + testHaskellDepends = [ + base containers deepseq hosc microspec parsec + ]; + benchmarkHaskellDepends = [ base criterion weigh ]; + description = "Pattern language for improvised music"; + license = lib.licenses.gpl3Only; + hydraPlatforms = lib.platforms.none; + }) {}; + "tidal-midi" = callPackage ({ mkDerivation, base, containers, PortMidi, tidal, time , transformers @@ -265349,6 +266099,8 @@ self: { pname = "trackit"; version = "0.7.2"; sha256 = "1ha28wdc4dabr9qxkbpg9fasfnplicb2pyrn9zmija204nigbcdj"; + revision = "1"; + editedCabalFile = "0l9hi5f90nixayzahksgxrs4zij76767x64irql890ph6qzsq13c"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -275438,6 +276190,24 @@ self: { license = lib.licenses.bsd3; }) {}; + "vector-binary-instances_0_2_5_2" = callPackage + ({ mkDerivation, base, binary, bytestring, deepseq, tasty + , tasty-bench, tasty-quickcheck, vector + }: + mkDerivation { + pname = "vector-binary-instances"; + version = "0.2.5.2"; + sha256 = "0kgmlb4rf89b18d348cf2k06xfhdpamhmvq7iz5pab5014hknbmp"; + libraryHaskellDepends = [ base binary vector ]; + testHaskellDepends = [ base binary tasty tasty-quickcheck vector ]; + benchmarkHaskellDepends = [ + base binary bytestring deepseq tasty-bench vector + ]; + description = "Instances of Data.Binary for vector"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "vector-buffer" = callPackage ({ mkDerivation, base, deepseq, vector }: mkDerivation { @@ -288994,6 +289764,32 @@ self: { broken = true; }) {}; + "yesod-page-cursor_2_0_0_6" = callPackage + ({ mkDerivation, aeson, base, bytestring, containers, hspec + , hspec-expectations-lifted, http-link-header, http-types, lens + , lens-aeson, monad-logger, mtl, network-uri, persistent + , persistent-sqlite, persistent-template, scientific, text, time + , unliftio, unliftio-core, wai-extra, yesod, yesod-core, yesod-test + }: + mkDerivation { + pname = "yesod-page-cursor"; + version = "2.0.0.6"; + sha256 = "0if4pwpzpr48cz1vixk234fdl4lj3895ma9ak8x917sc3cgp2kv1"; + libraryHaskellDepends = [ + aeson base bytestring containers http-link-header network-uri text + unliftio yesod-core + ]; + testHaskellDepends = [ + aeson base bytestring hspec hspec-expectations-lifted + http-link-header http-types lens lens-aeson monad-logger mtl + persistent persistent-sqlite persistent-template scientific text + time unliftio unliftio-core wai-extra yesod yesod-core yesod-test + ]; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; + }) {}; + "yesod-paginate" = callPackage ({ mkDerivation, base, template-haskell, yesod }: mkDerivation { From b49be812b505e4afe8ea75056e7915b021615192 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 15 Apr 2021 02:42:30 +0200 Subject: [PATCH 047/230] python3Packages.python-utils: fix build Tests have been excluded from the pypi package, hence we fetch the source from GitHub now. Disable coverage and linting, drop unused dependencies. --- .../python-modules/python-utils/default.nix | 33 ++++++++++++++----- 1 file changed, 24 insertions(+), 9 deletions(-) diff --git a/pkgs/development/python-modules/python-utils/default.nix b/pkgs/development/python-modules/python-utils/default.nix index 637c25cc5aa..f11ce745fed 100644 --- a/pkgs/development/python-modules/python-utils/default.nix +++ b/pkgs/development/python-modules/python-utils/default.nix @@ -1,23 +1,38 @@ -{ lib, buildPythonPackage, fetchPypi, pytestCheckHook, pytestrunner, pytestcov, pytest-flakes, sphinx, six }: +{ lib +, buildPythonPackage +, fetchFromGitHub +, pytestCheckHook +, six +}: buildPythonPackage rec { pname = "python-utils"; version = "2.5.6"; - src = fetchPypi { - inherit pname version; - sha256 = "352d5b1febeebf9b3cdb9f3c87a3b26ef22d3c9e274a8ec1e7048ecd2fac4349"; + src = fetchFromGitHub { + owner = "WoLpH"; + repo = pname; + rev = "v${version}"; + sha256 = "0gd2jana5w6bn7z58di4a8dwcxvc8rx282jawbw7ws7qm2a5klz3"; }; + # disable coverage and linting postPatch = '' - rm -r tests/__pycache__ - rm tests/*.pyc - substituteInPlace pytest.ini --replace "--pep8" "" + sed -i '/--cov/d' pytest.ini + sed -i '/--flake8/d' pytest.ini ''; - checkInputs = [ pytestCheckHook pytestrunner pytestcov pytest-flakes sphinx ]; + propagatedBuildInputs = [ + six + ]; - propagatedBuildInputs = [ six ]; + checkInputs = [ + pytestCheckHook + ]; + + pytestFlagsArray = [ + "_python_utils_tests" + ]; meta = with lib; { description = "Module with some convenient utilities"; From c920f18e00e255e5c725eef03b7f5b53c805f0b8 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Thu, 15 Apr 2021 01:38:06 +0000 Subject: [PATCH 048/230] httpx: 1.0.4 -> 1.0.5 --- pkgs/tools/security/httpx/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/security/httpx/default.nix b/pkgs/tools/security/httpx/default.nix index 129395912f9..e8ddf6bb0bc 100644 --- a/pkgs/tools/security/httpx/default.nix +++ b/pkgs/tools/security/httpx/default.nix @@ -5,13 +5,13 @@ buildGoModule rec { pname = "httpx"; - version = "1.0.4"; + version = "1.0.5"; src = fetchFromGitHub { owner = "projectdiscovery"; repo = "httpx"; rev = "v${version}"; - sha256 = "sha256-w5CNvtlhvm1SyAKaoA7Fw8ZSY9Z78MentrSNS4mpr1Q="; + sha256 = "sha256-E7HGE+ZVUF6AK+4qVsO2t+/B8hRMd14/bZW2WXA6p6E="; }; vendorSha256 = "sha256-VBxGapvC2QE/0slsAiCBzmwOSMeGepZU0pYVDepSrwg="; From 5ddeda6e19be1bc998be7c323b5bc9345d0a3aee Mon Sep 17 00:00:00 2001 From: Sandro Date: Thu, 15 Apr 2021 03:47:42 +0200 Subject: [PATCH 049/230] phpPackages.couchbase: Remove extra emptry array --- pkgs/development/php-packages/couchbase/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/php-packages/couchbase/default.nix b/pkgs/development/php-packages/couchbase/default.nix index 3566c7916e5..24d4e02a328 100644 --- a/pkgs/development/php-packages/couchbase/default.nix +++ b/pkgs/development/php-packages/couchbase/default.nix @@ -17,7 +17,7 @@ buildPecl { broken = lib.versionAtLeast php.version "8.0"; buildInputs = [ libcouchbase zlib ]; - internalDeps = [] ++ lib.optionals (lib.versionOlder php.version "8.0") [ php.extensions.json ]; + internalDeps = lib.optionals (lib.versionOlder php.version "8.0") [ php.extensions.json ]; peclDeps = [ php.extensions.igbinary ]; patches = [ From 03b236db055b29992554f61ee57ccdb98663a007 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 15 Apr 2021 03:35:41 +0200 Subject: [PATCH 050/230] tts: 0.0.9 -> 0.0.11 Migrate to new upstream after Mozilla dropped the project. --- pkgs/tools/audio/tts/default.nix | 55 +++++++++++++++++--------------- 1 file changed, 29 insertions(+), 26 deletions(-) diff --git a/pkgs/tools/audio/tts/default.nix b/pkgs/tools/audio/tts/default.nix index 325039d6865..59cb9caf55e 100644 --- a/pkgs/tools/audio/tts/default.nix +++ b/pkgs/tools/audio/tts/default.nix @@ -12,19 +12,18 @@ # For now, for deployment check the systemd unit in the pull request: # https://github.com/NixOS/nixpkgs/pull/103851#issue-521121136 # +# Check the latest release for compatible models: +# https://github.com/coqui-ai/TTS/releases/tag/v0.0.11 python3Packages.buildPythonApplication rec { pname = "tts"; - # until https://github.com/mozilla/TTS/issues/424 is resolved - # we treat released models as released versions: - # https://github.com/mozilla/TTS/wiki/Released-Models - version = "0.0.9"; + version = "0.0.11"; src = fetchFromGitHub { - owner = "mozilla"; + owner = "coqui-ai"; repo = "TTS"; - rev = "df5899daf4ba4ec89544edf94f9c2e105c544461"; - sha256 = "sha256-lklG8DqG04LKJY93z2axeYhW8gtpbRG41o9ow2gJjuA="; + rev = "v${version}"; + sha256 = "0kk9bgiw2x5ybwz0v3zrfaxajl3lnccc9xmrwc295n2rfkmwxsis"; }; preBuild = '' @@ -37,6 +36,8 @@ python3Packages.buildPythonApplication rec { sed -i -e 's!unidecode==[^"]*!unidecode!' requirements.txt setup.py sed -i -e 's!bokeh==[^"]*!bokeh!' requirements.txt setup.py sed -i -e 's!numba==[^"]*!numba!' requirements.txt setup.py + sed -i -e 's!numpy==[^"]*!numpy!' requirements.txt setup.py + sed -i -e 's!umap-learn==[^"]*!umap-learn!' requirements.txt setup.py # Not required for building/installation but for their development/ci workflow sed -i -e '/pylint/d' requirements.txt sed -i -e '/cardboardlint/d' requirements.txt setup.py @@ -45,24 +46,25 @@ python3Packages.buildPythonApplication rec { nativeBuildInputs = [ python3Packages.cython ]; propagatedBuildInputs = with python3Packages; [ - matplotlib - scipy - pytorch - flask attrdict bokeh - soundfile - tqdm - librosa - unidecode - umap-learn - phonemizer - tensorboardx + flask fuzzywuzzy - inflect gdown + inflect + jieba + librosa + matplotlib + phonemizer + pypinyin pysbd - pyworld + pytorch + scipy + soundfile + tensorboardx + tqdm + umap-learn + unidecode ]; postInstall = '' @@ -92,16 +94,17 @@ python3Packages.buildPythonApplication rec { mv TTS{,.old} ''; - pytestFlagsArray = [ + disabledTestPaths = [ # requires tensorflow - "--ignore=tests/test_tacotron2_tf_model.py" - "--ignore=tests/test_vocoder_tf_melgan_generator.py" - "--ignore=tests/test_vocoder_tf_pqmf.py" + "tests/test_tacotron2_tf_model.py" + "tests/test_vocoder_tf_melgan_generator.py" + "tests/test_vocoder_tf_pqmf.py" ]; meta = with lib; { - homepage = "https://github.com/mozilla/TTS"; - description = "Deep learning for Text to Speech"; + homepage = "https://github.com/coqui-ai/TTS"; + changelog = "https://github.com/coqui-ai/TTS/releases/tag/v${version}"; + description = "Deep learning toolkit for Text-to-Speech, battle-tested in research and production"; license = licenses.mpl20; maintainers = with maintainers; [ hexa mic92 ]; }; From 5cf4e89fefc11c82e669f9b05b6f901b97fa9252 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 15 Apr 2021 03:58:51 +0200 Subject: [PATCH 051/230] python3Packages.pypinyin: init at 0.41.0 --- .../python-modules/pypinyin/default.nix | 38 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 40 insertions(+) create mode 100644 pkgs/development/python-modules/pypinyin/default.nix diff --git a/pkgs/development/python-modules/pypinyin/default.nix b/pkgs/development/python-modules/pypinyin/default.nix new file mode 100644 index 00000000000..9615e07d7c7 --- /dev/null +++ b/pkgs/development/python-modules/pypinyin/default.nix @@ -0,0 +1,38 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, pytestCheckHook +}: + +buildPythonPackage rec { + pname = "pypinyin"; + version = "0.41.0"; + + src = fetchFromGitHub { + owner = "mozillazg"; + repo = "python-pinyin"; + rev = "v${version}"; + sha256 = "1s01dd5n6cgjg24dmji0abxkyvr1yi18lx4rpm9z54v0q3wkccg9"; + }; + + postPatch = '' + substituteInPlace pytest.ini --replace \ + "--cov-report term-missing" "" + ''; + + checkInputs = [ + pytestCheckHook + ]; + + pytestFlagsArray = [ + "tests" + ]; + + meta = with lib; { + description = "Chinese Characters to Pinyin - 汉字转拼音"; + homepage = "https://github.com/mozillazg/python-pinyin"; + changelog = "https://github.com/mozillazg/python-pinyin/blob/master/CHANGELOG.rst"; + license = licenses.mit; + maintainers = with maintainers; [ hexa mic92 ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index b032c553a57..6a8d489c062 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -6210,6 +6210,8 @@ in { pypillowfight = callPackage ../development/python-modules/pypillowfight { }; + pypinyin = callPackage ../development/python-modules/pypinyin { }; + pyplaato = callPackage ../development/python-modules/pyplaato { }; pyplatec = callPackage ../development/python-modules/pyplatec { }; From e53421e1956420b34c6ef5ac6b3c85f8d7a63ab6 Mon Sep 17 00:00:00 2001 From: Henner Zeller Date: Tue, 13 Apr 2021 23:51:55 -0700 Subject: [PATCH 052/230] timg: init at v1.4.0 Timg is an image and video viewer for the terminal, useful to look at images without leaving the comfort of the shell or if remotely logged in to a shell. https://timg.sh/ I am the maintainer of timg. Signed-off-by: Henner Zeller --- pkgs/tools/graphics/timg/default.nix | 33 ++++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 35 insertions(+) create mode 100644 pkgs/tools/graphics/timg/default.nix diff --git a/pkgs/tools/graphics/timg/default.nix b/pkgs/tools/graphics/timg/default.nix new file mode 100644 index 00000000000..5acbaa7ffd2 --- /dev/null +++ b/pkgs/tools/graphics/timg/default.nix @@ -0,0 +1,33 @@ +{ lib, stdenv, fetchFromGitHub, cmake, pkg-config, graphicsmagick, libjpeg +, ffmpeg, zlib, libexif }: + +stdenv.mkDerivation rec { + pname = "timg"; + version = "1.4.0"; + + src = fetchFromGitHub { + owner = "hzeller"; + repo = "timg"; + rev = "v${version}"; + sha256 = "10qhjfkbazncmj07y0a6cpmi7ki0l10qzpvi2zh8369yycqqxr8y"; + }; + + buildInputs = [ graphicsmagick ffmpeg libexif libjpeg zlib ]; + + nativeBuildInputs = [ cmake pkg-config ]; + + cmakeFlags = [ + "-DTIMG_VERSION_FROM_GIT=Off" + "-DWITH_VIDEO_DECODING=On" + "-DWITH_VIDEO_DEVICE=On" + "-DWITH_OPENSLIDE_SUPPORT=Off" # https://openslide.org/ lib not yet in nix + ]; + + meta = with lib; { + homepage = "https://timg.sh/"; + description = "A terminal image and video viewer"; + license = licenses.gpl2Only; + platforms = platforms.unix; + maintainers = with maintainers; [ hzeller ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 10a4c799ebe..3b84184d166 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -26089,6 +26089,8 @@ in timewarrior = callPackage ../applications/misc/timewarrior { }; + timg = callPackage ../tools/graphics/timg { }; + timidity = callPackage ../tools/misc/timidity { }; tint2 = callPackage ../applications/misc/tint2 { }; From 06d591d87efe8e7ae200e7fc6a8cf1e50743690b Mon Sep 17 00:00:00 2001 From: JesusMtnez Date: Thu, 15 Apr 2021 06:03:37 +0200 Subject: [PATCH 053/230] vscx/ms-vsliveshare-vsliveshare: 1.0.4116 -> 1.0.4131 --- .../vscode-extensions/ms-vsliveshare-vsliveshare/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/misc/vscode-extensions/ms-vsliveshare-vsliveshare/default.nix b/pkgs/misc/vscode-extensions/ms-vsliveshare-vsliveshare/default.nix index 3023642e77c..fb58c94cde9 100644 --- a/pkgs/misc/vscode-extensions/ms-vsliveshare-vsliveshare/default.nix +++ b/pkgs/misc/vscode-extensions/ms-vsliveshare-vsliveshare/default.nix @@ -38,8 +38,8 @@ in ((vscode-utils.override { stdenv = gccStdenv; }).buildVscodeMarketplaceExtens mktplcRef = { name = "vsliveshare"; publisher = "ms-vsliveshare"; - version = "1.0.4116"; - sha256 = "1wrqmsrrc80agrw5ii4vcp2v6gzps9hvpjizwn30p0vf43mmw3mj"; + version = "1.0.4131"; + sha256 = "167fwb1nri9xs5bx14zdg2q3fsmlbihcvnk90fv9av8zirpwa3vs"; }; }).overrideAttrs({ nativeBuildInputs ? [], buildInputs ? [], ... }: { nativeBuildInputs = nativeBuildInputs ++ [ From 5f84ac20bcc47572e71a8e05b58d34488cbd36c2 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Thu, 15 Apr 2021 04:20:00 +0000 Subject: [PATCH 054/230] docker-slim: 1.34.0 -> 1.35.0 https://github.com/docker-slim/docker-slim/releases/tag/1.35.0 --- pkgs/applications/virtualization/docker-slim/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/virtualization/docker-slim/default.nix b/pkgs/applications/virtualization/docker-slim/default.nix index 889752b2703..e965b397f9f 100644 --- a/pkgs/applications/virtualization/docker-slim/default.nix +++ b/pkgs/applications/virtualization/docker-slim/default.nix @@ -6,7 +6,7 @@ buildGoPackage rec { pname = "docker-slim"; - version = "1.34.0"; + version = "1.35.0"; goPackagePath = "github.com/docker-slim/docker-slim"; @@ -14,7 +14,7 @@ buildGoPackage rec { owner = "docker-slim"; repo = "docker-slim"; rev = version; - sha256 = "1ynpd6yb1xc18y528sshd5k9nkz48h1zifj2w4sjh5n0864lna7b"; + sha256 = "0j350rhyav844vhaa1f5idffflgs5h3c5zcazly9s5sf4invm49y"; }; subPackages = [ "cmd/docker-slim" "cmd/docker-slim-sensor" ]; From a2650e125701ab20730bb79ab28072c749919a51 Mon Sep 17 00:00:00 2001 From: John Ericson Date: Tue, 19 May 2020 21:57:03 -0400 Subject: [PATCH 055/230] lib: Adjust NetBSD example systems Deprecate the odd one so no breaking change. --- lib/systems/examples.nix | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/lib/systems/examples.nix b/lib/systems/examples.nix index 838b648e582..654d6f69af0 100644 --- a/lib/systems/examples.nix +++ b/lib/systems/examples.nix @@ -248,11 +248,20 @@ rec { # BSDs - amd64-netbsd = { + # Deprecate + amd64-netbsd = x86_64-netbsd; + + x86_64-netbsd = { config = "x86_64-unknown-netbsd"; libc = "nblibc"; }; + x86_64-netbsd-llvm = { + config = "x86_64-unknown-netbsd"; + libc = "nblibc"; + useLLVM = true; + }; + # # WASM # From fd75d3b722fa6bfd5c696e8d7ea53609841ba214 Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Thu, 8 Apr 2021 07:12:49 +0200 Subject: [PATCH 056/230] =?UTF-8?q?ocamlPackages.safepass:=203.0=20?= =?UTF-8?q?=E2=86=92=203.1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/development/ocaml-modules/safepass/default.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/development/ocaml-modules/safepass/default.nix b/pkgs/development/ocaml-modules/safepass/default.nix index 04c494403be..e8a50f45119 100644 --- a/pkgs/development/ocaml-modules/safepass/default.nix +++ b/pkgs/development/ocaml-modules/safepass/default.nix @@ -2,13 +2,15 @@ buildDunePackage rec { pname = "safepass"; - version = "3.0"; + version = "3.1"; + + useDune2 = true; src = fetchFromGitHub { owner = "darioteixeira"; repo = "ocaml-safepass"; rev = "v${version}"; - sha256 = "0i127gs9x23wzwa1q3dxa2j6hby07hvxdg1c98fc3j09rg6vy2bs"; + sha256 = "1cwslwdb1774lfmhcclj9kymvidbcpjx1vp16jnjirqdqgl4zs5q"; }; meta = { From bdf2f668629e32fdffc63f77fc9b6d92254c42a5 Mon Sep 17 00:00:00 2001 From: joachimschmidt557 Date: Tue, 13 Apr 2021 20:55:02 +0200 Subject: [PATCH 057/230] nimmm: 0.1.2 -> 0.2.0 --- pkgs/applications/terminal-emulators/nimmm/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/terminal-emulators/nimmm/default.nix b/pkgs/applications/terminal-emulators/nimmm/default.nix index 648a3906fb5..bb09fa776b6 100644 --- a/pkgs/applications/terminal-emulators/nimmm/default.nix +++ b/pkgs/applications/terminal-emulators/nimmm/default.nix @@ -4,8 +4,8 @@ let noise = fetchFromGitHub { owner = "jangko"; repo = "nim-noise"; - rev = "db1e86e312413e4348fa82c02340784316a89cc1"; - sha256 = "0n9l2dww5smrsl1xfqxjnxz3f1srb72lc1wl3pdvs6xfyf44qzlh"; + rev = "v0.1.14"; + sha256 = "0wndiphznfyb1pac6zysi3bqljwlfwj6ziarcwnpf00sw2zni449"; }; nimbox = fetchFromGitHub { @@ -24,13 +24,13 @@ let in stdenv.mkDerivation rec { pname = "nimmm"; - version = "0.1.2"; + version = "0.2.0"; src = fetchFromGitHub { owner = "joachimschmidt557"; repo = "nimmm"; rev = "v${version}"; - sha256 = "1zpq181iz6g7yfi298gjwv33b89l4fpnkjprimykah7py5cpw67w"; + sha256 = "168n61avphbxsxfq8qzcnlqx6wgvz5yrjvs14g25cg3k46hj4xqg"; }; nativeBuildInputs = [ nim ]; From 73438d7cd530381b0941c9f53d98bff6d4bc22b3 Mon Sep 17 00:00:00 2001 From: Raghav Sood Date: Thu, 8 Apr 2021 16:48:37 +0000 Subject: [PATCH 058/230] rippled: 1.6.0 -> 1.7.0 --- pkgs/servers/rippled/default.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/servers/rippled/default.nix b/pkgs/servers/rippled/default.nix index 6bedb891b57..8c5f5c0e402 100644 --- a/pkgs/servers/rippled/default.nix +++ b/pkgs/servers/rippled/default.nix @@ -31,8 +31,8 @@ let nudb = fetchgit rec { url = "https://github.com/CPPAlliance/NuDB.git"; - rev = "2.0.3"; - sha256 = "0imd9sh6knydwa3pxa5bbvjs3bmb8650dnsvj04qgns6bynwlqh1"; + rev = "2.0.5"; + sha256 = "02zbd07qvdjjsm4ivvhxah5n466bncvm6m03vmq0qdbbrlnp6s37"; leaveDotGit = true; fetchSubmodules = true; postFetch = "cd $out && git tag ${rev}"; @@ -40,8 +40,8 @@ let rocksdb = fetchgit rec { url = "https://github.com/facebook/rocksdb.git"; - rev = "v6.5.3"; - sha256 = "11kbwqph1i3w6rbhr0kl2aq4jidhai24gw420y9qi9ab7zl0zcqg"; + rev = "v6.7.3"; + sha256 = "16qb636qs2yxqmz30hmvq8mllf038s80p37b0vyc0bazwlr93d9z"; deepClone = true; fetchSubmodules = false; leaveDotGit = true; @@ -116,12 +116,12 @@ let }; in stdenv.mkDerivation rec { pname = "rippled"; - version = "1.6.0"; + version = "1.7.0"; src = fetchgit { url = "https://github.com/ripple/rippled.git"; rev = version; - sha256 = "176i3dm98zp5jllslpzfhh52bd2lapq9i8r7m45v8sg9icvsmyz7"; + sha256 = "1rr5kxks9hsxyxrz90dw259b6fs9lywdlqv0bj2g21a6f7g60v2v"; leaveDotGit = true; fetchSubmodules = true; }; From 150ad4ec587b38343af9fb6c51c5418f8464d31d Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Thu, 15 Apr 2021 01:13:22 +0000 Subject: [PATCH 059/230] grit: 0.2.0 -> 0.3.0 --- pkgs/tools/misc/grit/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/misc/grit/default.nix b/pkgs/tools/misc/grit/default.nix index f1b4b43280b..a793ed7ebed 100644 --- a/pkgs/tools/misc/grit/default.nix +++ b/pkgs/tools/misc/grit/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "grit"; - version = "0.2.0"; + version = "0.3.0"; src = fetchFromGitHub { owner = "climech"; repo = "grit"; rev = "v${version}"; - sha256 = "0v4i8xdf1pgkmwad5jb6n6s4rx48zk57wij0ppzg6zb725wy7r8a"; + sha256 = "sha256-c8wBwmXFjpst6UxL5zmTxMR4bhzpHYljQHiJFKiNDms="; }; - vendorSha256 = "0a1lqfn710fgvrvbimd92102fhjs1wa7r8i0l7s5m7jxks629hw8"; + vendorSha256 = "sha256-iMMkjJ5dnlr0oSCifBQPWkInQBCp1bh23s+BcKzDNCg="; meta = with lib; { description = "A multitree-based personal task manager"; From 13ff90fa440ede27d5c57a3d5cb971f08033757c Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Thu, 15 Apr 2021 00:14:04 +0000 Subject: [PATCH 060/230] fly: 7.1.0 -> 7.2.0 --- .../tools/continuous-integration/fly/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/continuous-integration/fly/default.nix b/pkgs/development/tools/continuous-integration/fly/default.nix index 895d12ecb4d..76f0d86ae5c 100644 --- a/pkgs/development/tools/continuous-integration/fly/default.nix +++ b/pkgs/development/tools/continuous-integration/fly/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "fly"; - version = "7.1.0"; + version = "7.2.0"; src = fetchFromGitHub { owner = "concourse"; repo = "concourse"; rev = "v${version}"; - sha256 = "sha256-M0Jo4DyvPghhVLK3eFdew10lGUJJODxKoL+v16y9CW8="; + sha256 = "sha256-uKzN5h2gJqsD25ETgfYqu4ijC2b0ZLGdMGTiliFOatA="; }; - vendorSha256 = "sha256-W6m+nDNcZBVfa1OTkOHWf4E9LmEUewsTLT/56Iyp6+Y="; + vendorSha256 = "sha256-2PvXylOPVA0/mIQhhKv8o65bfAxkvKP6FPunzTWwVtI="; doCheck = false; From 12ac4de46a48ce8c0a9952f69a091dd539eb64bf Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Wed, 14 Apr 2021 23:30:23 +0000 Subject: [PATCH 061/230] entt: 3.7.0 -> 3.7.1 --- pkgs/development/libraries/entt/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/entt/default.nix b/pkgs/development/libraries/entt/default.nix index 8efc9c05ca3..34a4f93bb86 100644 --- a/pkgs/development/libraries/entt/default.nix +++ b/pkgs/development/libraries/entt/default.nix @@ -1,13 +1,13 @@ { lib, stdenv, fetchFromGitHub, cmake }: stdenv.mkDerivation rec { pname = "entt"; - version = "3.7.0"; + version = "3.7.1"; src = fetchFromGitHub { owner = "skypjack"; repo = "entt"; rev = "v${version}"; - sha256 = "sha256-qDjt74nijZhXW7F7GW0CSv6JWOc/kXN7ndbkwSO0+1s="; + sha256 = "sha256-t1QRqasb82W277XEV2FG5JrsQWIWZ0G5V7wLI+p4MpQ="; }; nativeBuildInputs = [ cmake ]; From 818c982c20c19e40bd1107c0c320f7216006cf8f Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Wed, 14 Apr 2021 22:21:42 +0000 Subject: [PATCH 062/230] carla: 2.2.0 -> 2.3.0 --- pkgs/applications/audio/carla/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/audio/carla/default.nix b/pkgs/applications/audio/carla/default.nix index 40fb0cfda59..a9c0ffdfb64 100644 --- a/pkgs/applications/audio/carla/default.nix +++ b/pkgs/applications/audio/carla/default.nix @@ -15,13 +15,13 @@ assert withGtk3 -> gtk3 != null; stdenv.mkDerivation rec { pname = "carla"; - version = "2.2.0"; + version = "2.3.0"; src = fetchFromGitHub { owner = "falkTX"; repo = pname; rev = "v${version}"; - sha256 = "B4xoRuNEW4Lz9haP8fqxOTcysGTNEXFOq9UXqUJLSFw="; + sha256 = "sha256-724EFBpbmPMuU1m3T0XMaeohURJA5JcxHfUPYbZ/2LE="; }; nativeBuildInputs = [ From 402e17aef3f23dce3511cce6131939510134cd7e Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Wed, 14 Apr 2021 18:12:52 +0200 Subject: [PATCH 063/230] lf: 21 -> 22 --- pkgs/tools/misc/lf/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/misc/lf/default.nix b/pkgs/tools/misc/lf/default.nix index 7ec9d0d407a..fdc91e36a34 100644 --- a/pkgs/tools/misc/lf/default.nix +++ b/pkgs/tools/misc/lf/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "lf"; - version = "21"; + version = "22"; src = fetchFromGitHub { owner = "gokcehan"; repo = "lf"; rev = "r${version}"; - sha256 = "0j7c21lsgcc39ng9ni94y3zfcqwyf9jc52fi8mcpkp0lpcx5ava9"; + sha256 = "10zmac9xza2v7l13zkavmc34ppcpmb82v8dxvrv4ggm261ns1abr"; }; - vendorSha256 = "15fl9v69wkzwzpq6x4xhcd5g6xyck3mlpbz1bbb61l75jjzg913m"; + vendorSha256 = "1yjsig2x6zrxdjnds6nqqq3r3g5lq8g9dvmz60nbifqhcx112bcw"; nativeBuildInputs = [ installShellFiles ]; From 7bf3b1fe952dcc59a8d3e9c5f6c99d6401ee49c7 Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Wed, 14 Apr 2021 18:17:18 +0200 Subject: [PATCH 064/230] lf: Remove myself as maintainer I'm not really using it anymore. --- pkgs/tools/misc/lf/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/tools/misc/lf/default.nix b/pkgs/tools/misc/lf/default.nix index fdc91e36a34..0d684b16be5 100644 --- a/pkgs/tools/misc/lf/default.nix +++ b/pkgs/tools/misc/lf/default.nix @@ -35,6 +35,6 @@ buildGoModule rec { changelog = "https://github.com/gokcehan/lf/releases/tag/r${version}"; license = licenses.mit; platforms = platforms.unix; - maintainers = with maintainers; [ primeos ]; + maintainers = with maintainers; [ ]; }; } From f028bddd421f44bdace86458c07018827526b78e Mon Sep 17 00:00:00 2001 From: OPNA2608 Date: Thu, 15 Apr 2021 08:54:14 +0200 Subject: [PATCH 065/230] sayonara: 1.6.0-beta6 -> 1.6.0-beta7, add python & update script --- pkgs/applications/audio/sayonara/default.nix | 20 +++++++++++++++++--- 1 file changed, 17 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/audio/sayonara/default.nix b/pkgs/applications/audio/sayonara/default.nix index 722333134d9..651ac20db22 100644 --- a/pkgs/applications/audio/sayonara/default.nix +++ b/pkgs/applications/audio/sayonara/default.nix @@ -1,6 +1,7 @@ { mkDerivation , cmake , fetchFromGitLab +, nix-update-script , gst_all_1 , lib , libpulseaudio @@ -11,17 +12,23 @@ , qttools , taglib , zlib +, python3 }: +let + py = python3.withPackages (ps: with ps; [ + pydbus + ]); +in mkDerivation rec { - pname = "sayonara-player"; - version = "1.6.0-beta6"; + pname = "sayonara"; + version = "1.6.0-beta7"; src = fetchFromGitLab { owner = "luciocarreras"; repo = "sayonara-player"; rev = version; - sha256 = "sha256-SbJS0DQvbW++CNXbuDHQxFlLRb1kTtDdIdHOqu0YxeQ="; + sha256 = "14svszfldx32vn937rszd21rgl31vb5kzs0hnrg41ygx0br61rvd"; }; nativeBuildInputs = [ cmake ninja pkg-config qttools ]; @@ -32,6 +39,7 @@ mkDerivation rec { qtbase taglib zlib + py ] ++ (with gst_all_1; [ gstreamer @@ -54,6 +62,12 @@ mkDerivation rec { qtWrapperArgs+=(--prefix GST_PLUGIN_SYSTEM_PATH_1_0 : "$GST_PLUGIN_SYSTEM_PATH_1_0") ''; + passthru = { + updateScript = nix-update-script { + attrPath = pname; + }; + }; + meta = with lib; { description = "Sayonara music player"; homepage = "https://sayonara-player.com/"; From b29ed560497abcbb31ad4cf72163fb9e336de2e5 Mon Sep 17 00:00:00 2001 From: Yurii Matsiuk Date: Mon, 29 Mar 2021 12:27:51 +0200 Subject: [PATCH 066/230] nixos/fprintd: add TOD support Co-authored-by: Sandro Signed-off-by: Yurii Matsiuk --- nixos/modules/services/security/fprintd.nix | 30 ++++++++++++------- .../libfprint-2-tod1-goodix/default.nix | 2 ++ 2 files changed, 22 insertions(+), 10 deletions(-) diff --git a/nixos/modules/services/security/fprintd.nix b/nixos/modules/services/security/fprintd.nix index 48f8a9616c3..fe0fba5b45d 100644 --- a/nixos/modules/services/security/fprintd.nix +++ b/nixos/modules/services/security/fprintd.nix @@ -5,6 +5,7 @@ with lib; let cfg = config.services.fprintd; + fprintdPkg = if cfg.tod.enable then pkgs.fprintd-tod else pkgs.fprintd; in @@ -17,25 +18,30 @@ in services.fprintd = { - enable = mkOption { - type = types.bool; - default = false; - description = '' - Whether to enable fprintd daemon and PAM module for fingerprint readers handling. - ''; - }; + enable = mkEnableOption "fprintd daemon and PAM module for fingerprint readers handling"; package = mkOption { type = types.package; - default = pkgs.fprintd; - defaultText = "pkgs.fprintd"; + default = fprintdPkg; + defaultText = "if cfg.tod.enable then pkgs.fprintd-tod else pkgs.fprintd"; description = '' fprintd package to use. ''; }; - }; + tod = { + enable = mkEnableOption "Touch OEM Drivers library support"; + + driver = mkOption { + type = types.package; + example = literalExample "pkgs.libfprint-2-tod1-goodix"; + description = '' + Touch OEM Drivers (TOD) package to use. + ''; + }; + }; + }; }; @@ -49,6 +55,10 @@ in systemd.packages = [ cfg.package ]; + systemd.services.fprintd.environment = mkIf cfg.tod.enable { + FP_TOD_DRIVERS_DIR = "${cfg.tod.driver}${cfg.tod.driver.driverPath}"; + }; + }; } diff --git a/pkgs/development/libraries/libfprint-2-tod1-goodix/default.nix b/pkgs/development/libraries/libfprint-2-tod1-goodix/default.nix index 3fa68353969..347bf6fc48c 100644 --- a/pkgs/development/libraries/libfprint-2-tod1-goodix/default.nix +++ b/pkgs/development/libraries/libfprint-2-tod1-goodix/default.nix @@ -25,6 +25,8 @@ stdenv.mkDerivation { cp lib/udev/rules.d/60-libfprint-2-tod1-goodix.rules "$out/usr/lib/udev/rules.d/" ''; + passthru.driverPath = "/usr/lib/libfprint-2/tod-1"; + meta = with lib; { description = "Goodix driver module for libfprint-2-tod Touch OEM Driver"; homepage = "https://git.launchpad.net/~oem-solutions-engineers/libfprint-2-tod1-goodix/+git/libfprint-2-tod1-goodix/"; From 1c552c29ca9b5af13070f1959b88c4f8d1f8c788 Mon Sep 17 00:00:00 2001 From: Yurii Matsiuk Date: Mon, 12 Apr 2021 12:25:45 +0200 Subject: [PATCH 067/230] libfprint-2-tod1-goodix: fix driver path Signed-off-by: Yurii Matsiuk --- .../libraries/libfprint-2-tod1-goodix/default.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/development/libraries/libfprint-2-tod1-goodix/default.nix b/pkgs/development/libraries/libfprint-2-tod1-goodix/default.nix index 347bf6fc48c..e4121bc9e90 100644 --- a/pkgs/development/libraries/libfprint-2-tod1-goodix/default.nix +++ b/pkgs/development/libraries/libfprint-2-tod1-goodix/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation { src = fetchgit { url = "https://git.launchpad.net/~oem-solutions-engineers/libfprint-2-tod1-goodix/+git/libfprint-2-tod1-goodix"; - rev = "882735c6366fbe30149eea5cfd6d0ddff880f0e4"; # droped-lp1880058 on 20202-11-25 + rev = "882735c6366fbe30149eea5cfd6d0ddff880f0e4"; # droped-lp1880058 on 2020-11-25 sha256 = "sha256-Uv+Rr4V31DyaZFOj79Lpyfl3G6zVWShh20roI0AvMPU="; }; @@ -18,14 +18,14 @@ stdenv.mkDerivation { ''; installPhase = '' - mkdir -p "$out/usr/lib/libfprint-2/tod-1/" - mkdir -p "$out/usr/lib/udev/rules.d/" + mkdir -p "$out/lib/libfprint-2/tod-1/" + mkdir -p "$out/lib/udev/rules.d/" - cp usr/lib/x86_64-linux-gnu/libfprint-2/tod-1/libfprint-tod-goodix-53xc-$version.so "$out/usr/lib/libfprint-2/tod-1/" - cp lib/udev/rules.d/60-libfprint-2-tod1-goodix.rules "$out/usr/lib/udev/rules.d/" + cp usr/lib/x86_64-linux-gnu/libfprint-2/tod-1/libfprint-tod-goodix-53xc-$version.so "$out/lib/libfprint-2/tod-1/" + cp lib/udev/rules.d/60-libfprint-2-tod1-goodix.rules "$out/lib/udev/rules.d/" ''; - passthru.driverPath = "/usr/lib/libfprint-2/tod-1"; + passthru.driverPath = "/lib/libfprint-2/tod-1"; meta = with lib; { description = "Goodix driver module for libfprint-2-tod Touch OEM Driver"; From 54ac23c6b92f7ced5ee3892255996f7947ab9a96 Mon Sep 17 00:00:00 2001 From: Thomas Gerbet Date: Thu, 15 Apr 2021 10:18:55 +0200 Subject: [PATCH 068/230] mujs: 1.0.9 -> 1.1.1 --- pkgs/development/interpreters/mujs/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/interpreters/mujs/default.nix b/pkgs/development/interpreters/mujs/default.nix index a0e23614ebc..d9b52af9254 100644 --- a/pkgs/development/interpreters/mujs/default.nix +++ b/pkgs/development/interpreters/mujs/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "mujs"; - version = "1.0.9"; + version = "1.1.1"; src = fetchurl { url = "https://mujs.com/downloads/mujs-${version}.tar.xz"; - sha256 = "sha256-zKjWafQtO2OEPelF370s5KkArbT+gQv3lQQpYdGw6HY="; + sha256 = "sha256-meYfyWGfHVULVjVyA7NJ2Ih9CjbffblWc1yijU/3e7A="; }; buildInputs = [ readline ]; @@ -18,6 +18,6 @@ stdenv.mkDerivation rec { description = "A lightweight, embeddable Javascript interpreter"; platforms = platforms.unix; maintainers = with maintainers; [ pSub ]; - license = licenses.gpl3; + license = licenses.isc; }; } From 9c8cb61854439b7ce67272d7449314c51dd71fc4 Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Thu, 15 Apr 2021 16:19:18 +1000 Subject: [PATCH 069/230] gh: 1.8.1 -> 1.9.0 https://github.com/cli/cli/releases/tag/v1.9.0 --- .../git-and-tools/gh/default.nix | 19 ++++++++++++++----- 1 file changed, 14 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/version-management/git-and-tools/gh/default.nix b/pkgs/applications/version-management/git-and-tools/gh/default.nix index 6b79d152380..d8b4e414f1c 100644 --- a/pkgs/applications/version-management/git-and-tools/gh/default.nix +++ b/pkgs/applications/version-management/git-and-tools/gh/default.nix @@ -2,25 +2,33 @@ buildGoModule rec { pname = "gh"; - version = "1.8.1"; + version = "1.9.0"; src = fetchFromGitHub { owner = "cli"; repo = "cli"; rev = "v${version}"; - sha256 = "1q0vc9wr4n813mxkf7jjj3prw1n7xv4l985qd57pg4a2js1dqa1y"; + sha256 = "03i1x1j07vpq81c9dmpvpya21hwz9q54zm4przvc12jadgb31y1i"; }; - vendorSha256 = "1wv30z0jg195nkpz3rwvhixyw81lg2wzwwajq9g6s3rfjj8gs9v2"; + vendorSha256 = "0j2jy7n7hca5ybwwgh7cvm77j96ngaq1a1l5bl70vjpd8hz2qapc"; nativeBuildInputs = [ installShellFiles ]; + # upstream unsets these to handle cross but it breaks our build + postPatch = '' + substituteInPlace Makefile \ + --replace "GOOS= GOARCH= GOARM= GOFLAGS= CGO_ENABLED=" "" + ''; + buildPhase = '' - export GO_LDFLAGS="-s -w" - make GH_VERSION=${version} bin/gh manpages + runHook preBuild + make GO_LDFLAGS="-s -w" GH_VERSION=${version} bin/gh manpages + runHook postBuild ''; installPhase = '' + runHook preInstall install -Dm755 bin/gh -t $out/bin installManPage share/man/*/*.[1-9] @@ -28,6 +36,7 @@ buildGoModule rec { $out/bin/gh completion -s $shell > gh.$shell installShellCompletion gh.$shell done + runHook postInstall ''; # fails with `unable to find git executable in PATH` From 87e667540abcc2a37be9e00aac01a08d104b58fa Mon Sep 17 00:00:00 2001 From: Atemu Date: Sat, 10 Apr 2021 13:14:31 +0200 Subject: [PATCH 070/230] zen-kernels: 5.11.13 -> 5.11.14 --- pkgs/os-specific/linux/kernel/linux-lqx.nix | 4 ++-- pkgs/os-specific/linux/kernel/linux-zen.nix | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-lqx.nix b/pkgs/os-specific/linux/kernel/linux-lqx.nix index cf295acd741..5e4d752f1d7 100644 --- a/pkgs/os-specific/linux/kernel/linux-lqx.nix +++ b/pkgs/os-specific/linux/kernel/linux-lqx.nix @@ -1,7 +1,7 @@ { lib, fetchFromGitHub, buildLinux, linux_zen, ... } @ args: let - version = "5.11.13"; + version = "5.11.14"; suffix = "lqx1"; in @@ -14,7 +14,7 @@ buildLinux (args // { owner = "zen-kernel"; repo = "zen-kernel"; rev = "v${version}-${suffix}"; - sha256 = "1yx0l90happm6g2cx1ar4lbhfv3a2aalpwhjqyzc8b15af0h0ddv"; + sha256 = "0kgr6c3mpc9nmg4m2qfk58bji95paq3jwqsyl3h55xk40gshka32"; }; extraMeta = { diff --git a/pkgs/os-specific/linux/kernel/linux-zen.nix b/pkgs/os-specific/linux/kernel/linux-zen.nix index 80bb0c7ae50..d97e4d6aa0e 100644 --- a/pkgs/os-specific/linux/kernel/linux-zen.nix +++ b/pkgs/os-specific/linux/kernel/linux-zen.nix @@ -1,7 +1,7 @@ { lib, fetchFromGitHub, buildLinux, ... } @ args: let - version = "5.11.13"; + version = "5.11.14"; suffix = "zen1"; in @@ -14,7 +14,7 @@ buildLinux (args // { owner = "zen-kernel"; repo = "zen-kernel"; rev = "v${version}-${suffix}"; - sha256 = "1m95kqi2njm4cdixy7rwmycdbg386nidrk3xr4qqm64wych9bqn8"; + sha256 = "1n49h9s3jyvrdy662b6j9xjbmhxxdczk980vrlgs09fg5ny0k59a"; }; extraMeta = { From 79e8069df882ac42e8c47f46cdf9d7d31abd30a6 Mon Sep 17 00:00:00 2001 From: Peter Hoeg Date: Fri, 9 Apr 2021 15:52:25 +0800 Subject: [PATCH 071/230] librtlsdr: init at 0.8.0 --- .../libraries/librtlsdr/default.nix | 39 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 41 insertions(+) create mode 100644 pkgs/development/libraries/librtlsdr/default.nix diff --git a/pkgs/development/libraries/librtlsdr/default.nix b/pkgs/development/libraries/librtlsdr/default.nix new file mode 100644 index 00000000000..d0bb379a70d --- /dev/null +++ b/pkgs/development/libraries/librtlsdr/default.nix @@ -0,0 +1,39 @@ +{ lib +, stdenv +, fetchFromGitHub +, cmake +, pkg-config +, libusb1 +}: + +stdenv.mkDerivation rec { + pname = "librtlsdr"; + version = "0.8.0"; + + src = fetchFromGitHub { + owner = "librtlsdr"; + repo = "librtlsdr"; + rev = "v${version}"; + sha256 = "sha256-s03h+3EfC5c7yRYBM6aCRWtmstwRJWuBywuyVt+k/bk="; + }; + + postPatch = '' + substituteInPlace CMakeLists.txt \ + --replace '/etc/udev/rules.d' "$out/etc/udev/rules.d" + + substituteInPlace rtl-sdr.rules \ + --replace 'MODE:="0666"' 'ENV{ID_SOFTWARE_RADIO}="1", MODE="0660", GROUP="plugdev"' + ''; + + nativeBuildInputs = [ pkg-config cmake ]; + + buildInputs = [ libusb1 ]; + + meta = with lib; { + description = "Turns your Realtek RTL2832 based DVB dongle into a SDR receiver"; + homepage = "http://github.com/librtlsdr/librtlsdr"; + license = licenses.gpl2Plus; + maintainers = with maintainers; [ bjornfor ]; + platforms = platforms.linux ++ platforms.darwin; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 7cdaa42612a..7649839ace8 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -25593,7 +25593,9 @@ in rtl-ais = callPackage ../applications/radio/rtl-ais { }; + # librtlsdr is a friendly fork with additional features rtl-sdr = callPackage ../applications/radio/rtl-sdr { }; + librtlsdr = callPackage ../development/libraries/librtlsdr { }; rtv = callPackage ../applications/misc/rtv { }; From 4be05878ea1b1e74f78dbd5216622d87e93518fb Mon Sep 17 00:00:00 2001 From: Peter Hoeg Date: Fri, 9 Apr 2021 15:18:40 +0800 Subject: [PATCH 072/230] rtl-sdr: minor build fixes --- pkgs/applications/radio/rtl-sdr/default.nix | 39 ++++++++++----------- 1 file changed, 18 insertions(+), 21 deletions(-) diff --git a/pkgs/applications/radio/rtl-sdr/default.nix b/pkgs/applications/radio/rtl-sdr/default.nix index 2fe57eaf296..2df7c3829c8 100644 --- a/pkgs/applications/radio/rtl-sdr/default.nix +++ b/pkgs/applications/radio/rtl-sdr/default.nix @@ -1,4 +1,10 @@ -{ lib, stdenv, fetchgit, fetchpatch, cmake, pkg-config, libusb1 }: +{ lib +, stdenv +, fetchgit +, cmake +, pkg-config +, libusb1 +}: stdenv.mkDerivation rec { pname = "rtl-sdr"; @@ -10,34 +16,25 @@ stdenv.mkDerivation rec { sha256 = "0lmvsnb4xw4hmz6zs0z5ilsah5hjz29g1s0050n59fllskqr3b8k"; }; - patches = [ (fetchpatch { - name = "hardened-udev-rules.patch"; - url = "https://osmocom.org/projects/rtl-sdr/repository/revisions/b2814731563be4d5a0a68554ece6454a2c63af12/diff?format=diff"; - sha256 = "0ns740s2rys4glq4la4bh0sxfv1mn61yfjns2yllhx70rsb2fqrn"; - }) ]; + postPatch = '' + substituteInPlace CMakeLists.txt \ + --replace '/etc/udev/rules.d' "$out/etc/udev/rules.d" + + substituteInPlace rtl-sdr.rules \ + --replace 'MODE:="0666"' 'ENV{ID_SOFTWARE_RADIO}="1", MODE="0660", GROUP="plugdev"' + ''; nativeBuildInputs = [ pkg-config cmake ]; + buildInputs = [ libusb1 ]; - # TODO: get these fixes upstream: - # * Building with -DINSTALL_UDEV_RULES=ON tries to install udev rules to - # /etc/udev/rules.d/, and there is no option to install elsewhere. So install - # rules manually. - # * Propagate libusb-1.0 dependency in pkg-config file. - postInstall = lib.optionalString stdenv.isLinux '' - mkdir -p "$out/etc/udev/rules.d/" - cp ../rtl-sdr.rules "$out/etc/udev/rules.d/99-rtl-sdr.rules" - - pcfile="$out"/lib/pkgconfig/librtlsdr.pc - grep -q "Requires:" "$pcfile" && { echo "Upstream has added 'Requires:' in $(basename "$pcfile"); update nix expression."; exit 1; } - echo "Requires: libusb-1.0" >> "$pcfile" - ''; + cmakeFlags = lib.optional stdenv.isLinux "-DINSTALL_UDEV_RULES=ON"; meta = with lib; { description = "Turns your Realtek RTL2832 based DVB dongle into a SDR receiver"; - homepage = "http://sdr.osmocom.org/trac/wiki/rtl-sdr"; + homepage = "http://github.com/librtlsdr/librtlsdr"; license = licenses.gpl2Plus; + maintainers = with maintainers; [ bjornfor ]; platforms = platforms.linux ++ platforms.darwin; - maintainers = [ maintainers.bjornfor ]; }; } From 22c7e4f3d9e1a08e9083d4df160322c8b1d9ee19 Mon Sep 17 00:00:00 2001 From: Peter Hoeg Date: Fri, 9 Apr 2021 15:52:40 +0800 Subject: [PATCH 073/230] sdrangel: 6.4.0 -> 6.8.0 --- pkgs/applications/radio/sdrangel/default.nix | 100 ++++++++++++------- 1 file changed, 62 insertions(+), 38 deletions(-) diff --git a/pkgs/applications/radio/sdrangel/default.nix b/pkgs/applications/radio/sdrangel/default.nix index 6f723971c8e..ff3ca497c7f 100644 --- a/pkgs/applications/radio/sdrangel/default.nix +++ b/pkgs/applications/radio/sdrangel/default.nix @@ -1,54 +1,78 @@ -{ -airspy, -boost, -cm256cc, -cmake, -codec2, -fetchFromGitHub, -fftwFloat, -glew, -hackrf, -lib, -ffmpeg, -libiio, -libopus, -libpulseaudio, -libusb1, -limesuite, -libbladeRF, -mkDerivation, -ocl-icd, -opencv3, -pkg-config, -qtbase, -qtmultimedia, -qtserialport, -qtwebsockets, -rtl-sdr, -serialdv, -soapysdr-with-plugins, -uhd +{ airspy +, boost +, cm256cc +, cmake +, codec2 +, fetchFromGitHub +, fftwFloat +, glew +, hackrf +, lib +, ffmpeg +, libiio +, libopus +, libpulseaudio +, libusb1 +, limesuite +, libbladeRF +, mkDerivation +, ocl-icd +, opencv3 +, pkg-config +, qtcharts +, qtlocation +, qtmultimedia +, qtserialport +, qtspeech +, qtwebsockets +, rtl-sdr +, serialdv +, soapysdr-with-plugins +, uhd }: mkDerivation rec { pname = "sdrangel"; - version = "6.4.0"; + version = "6.8.0"; src = fetchFromGitHub { owner = "f4exb"; repo = "sdrangel"; rev = "v${version}"; - sha256 = "4iJoKs0BHmBR6JRFuTIqs0GW3SjhPRMPRlqdyTI38T4="; + sha256 = "sha256-dFWwEs2nvcaCWpM4tA3/w8PbmNXn/R7JvxP3XEHasSQ="; fetchSubmodules = false; }; nativeBuildInputs = [ cmake pkg-config ]; + buildInputs = [ - glew opencv3 libusb1 boost libopus limesuite ffmpeg libiio libpulseaudio - qtbase qtwebsockets qtmultimedia rtl-sdr airspy hackrf - fftwFloat codec2 cm256cc serialdv qtserialport - libbladeRF uhd soapysdr-with-plugins + airspy + boost + cm256cc + codec2 + ffmpeg + fftwFloat + glew + hackrf + libbladeRF + libiio + libopus + libpulseaudio + libusb1 + limesuite + opencv3 + qtcharts + qtlocation + qtmultimedia + qtserialport + qtspeech + qtwebsockets + rtl-sdr + serialdv + soapysdr-with-plugins + uhd ]; + cmakeFlags = [ "-DLIBSERIALDV_INCLUDE_DIR:PATH=${serialdv}/include/serialdv" "-DLIMESUITE_INCLUDE_DIR:PATH=${limesuite}/include" @@ -61,11 +85,11 @@ mkDerivation rec { meta = with lib; { description = "Software defined radio (SDR) software"; longDescription = '' - SDRangel is an Open Source Qt5 / OpenGL 3.0+ SDR and signal analyzer frontend to various hardware. + SDRangel is an Open Source Qt5 / OpenGL 3.0+ SDR and signal analyzer frontend to various hardware. ''; homepage = "https://github.com/f4exb/sdrangel"; license = licenses.gpl3Plus; - platforms = platforms.linux; maintainers = with maintainers; [ alkeryn ]; + platforms = platforms.linux; }; } From ea50a8c811c66d5cc9e85735b5831710ae972b3c Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Thu, 15 Apr 2021 09:24:14 +0000 Subject: [PATCH 074/230] netbsd.man: fix hash This was identical to the hash for "misc" above, so was obviously just a copy and paste error. --- pkgs/os-specific/bsd/netbsd/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/os-specific/bsd/netbsd/default.nix b/pkgs/os-specific/bsd/netbsd/default.nix index b86891352f0..2aed04c41bd 100644 --- a/pkgs/os-specific/bsd/netbsd/default.nix +++ b/pkgs/os-specific/bsd/netbsd/default.nix @@ -664,7 +664,7 @@ let path = "share/man"; noCC = true; version = "8.0"; - sha256 = "0d34b3irjbqsqfk8v8aaj36fjyvwyx410igl26jcx2ryh3ispch0"; + sha256 = "0yp48syf3y5psm0mymxp6va6spym5izjym0ybr628iqwji21cqdz"; makeFlags = [ "FILESDIR=$(out)/share" ]; }; # From c81bfad2790bae95bc6b75a57535b58368177a99 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 15 Apr 2021 11:34:48 +0200 Subject: [PATCH 075/230] siege: 4.0.7 -> 4.0.8 --- pkgs/tools/networking/siege/default.nix | 19 ++++++++++++++----- 1 file changed, 14 insertions(+), 5 deletions(-) diff --git a/pkgs/tools/networking/siege/default.nix b/pkgs/tools/networking/siege/default.nix index 92e46b451b8..beddd11e903 100644 --- a/pkgs/tools/networking/siege/default.nix +++ b/pkgs/tools/networking/siege/default.nix @@ -1,16 +1,25 @@ -{ lib, stdenv, fetchurl, openssl, zlib }: +{ lib +, stdenv +, fetchurl +, openssl +, zlib +}: stdenv.mkDerivation rec { - name = "siege-4.0.7"; + pname = "siege"; + version = "4.0.8"; src = fetchurl { - url = "http://download.joedog.org/siege/${name}.tar.gz"; - sha256 = "1y3dnl1ziw0c0d4nw30aj0sdmjvarn4xfxgfkswffwnkm8z5p9xz"; + url = "http://download.joedog.org/siege/${pname}-${version}.tar.gz"; + sha256 = "01qhw52kyqwidp5bckw4xmz4ldqdwkjci7k421qm68kk0mx9l48g"; }; NIX_LDFLAGS = lib.optionalString stdenv.isLinux "-lgcc_s"; - buildInputs = [ openssl zlib ]; + buildInputs = [ + openssl + zlib + ]; prePatch = '' sed -i -e 's/u_int32_t/uint32_t/g' -e '1i#include ' src/hash.c From 894b606945ed4f6f0a24e14e88ce4427f4765c74 Mon Sep 17 00:00:00 2001 From: sternenseemann <0rpkxez4ksa01gb3typccl0i@systemli.org> Date: Wed, 14 Apr 2021 16:13:57 +0200 Subject: [PATCH 076/230] ocamlPackages.wayland: init at 0.2 --- .../ocaml-modules/wayland/default.nix | 49 +++++++++++++++++++ pkgs/top-level/ocaml-packages.nix | 2 + 2 files changed, 51 insertions(+) create mode 100644 pkgs/development/ocaml-modules/wayland/default.nix diff --git a/pkgs/development/ocaml-modules/wayland/default.nix b/pkgs/development/ocaml-modules/wayland/default.nix new file mode 100644 index 00000000000..82764af64f5 --- /dev/null +++ b/pkgs/development/ocaml-modules/wayland/default.nix @@ -0,0 +1,49 @@ +{ lib +, buildDunePackage +, fetchurl +, xmlm +, lwt +, logs +, fmt +, cstruct +, cmdliner +, alcotest-lwt +}: + +buildDunePackage rec { + pname = "wayland"; + version = "0.2"; + + minimumOCamlVersion = "4.08"; + + useDune2 = true; + + src = fetchurl { + url = "https://github.com/talex5/ocaml-wayland/releases/download/v${version}/wayland-v${version}.tbz"; + sha256 = "4eb323e42a8c64e9e49b15a588342bfcc1e99640305cb261d128c75612d9458c"; + }; + + propagatedBuildInputs = [ + lwt + logs + fmt + cstruct + ]; + + buildInputs = [ + cmdliner + xmlm + ]; + + checkInputs = [ + alcotest-lwt + ]; + doCheck = true; + + meta = { + description = "Pure OCaml Wayland protocol library"; + license = lib.licenses.asl20; + maintainers = [ lib.maintainers.sternenseemann ]; + homepage = "https://github.com/talex5/ocaml-wayland"; + }; +} diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix index 5aa7482fdc6..b8c8b0a9d93 100644 --- a/pkgs/top-level/ocaml-packages.nix +++ b/pkgs/top-level/ocaml-packages.nix @@ -1195,6 +1195,8 @@ let wasm = callPackage ../development/ocaml-modules/wasm { }; + wayland = callPackage ../development/ocaml-modules/wayland { }; + webbrowser = callPackage ../development/ocaml-modules/webbrowser { }; webmachine = callPackage ../development/ocaml-modules/webmachine { }; From c0fdf1fd41b54aa8d3aa5d34f248d6af2fbbe8d1 Mon Sep 17 00:00:00 2001 From: 06kellyjac Date: Thu, 15 Apr 2021 11:36:18 +0100 Subject: [PATCH 077/230] starboard-octant-plugin: 0.9.2 -> 0.10.0 --- .../cluster/octant/plugins/starboard-octant-plugin.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/cluster/octant/plugins/starboard-octant-plugin.nix b/pkgs/applications/networking/cluster/octant/plugins/starboard-octant-plugin.nix index 988b2d02df9..ff9ce970227 100644 --- a/pkgs/applications/networking/cluster/octant/plugins/starboard-octant-plugin.nix +++ b/pkgs/applications/networking/cluster/octant/plugins/starboard-octant-plugin.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "starboard-octant-plugin"; - version = "0.9.2"; + version = "0.10.0"; src = fetchFromGitHub { owner = "aquasecurity"; repo = pname; rev = "v${version}"; - sha256 = "sha256-wis2ECCVXQeD7GiCMJQai+wDM8QJ1j5dPnE5O/I3wpM="; + sha256 = "sha256-3BifigdAFuOCrhJRv/w4k7pT4BTHfINuEkeG6zaI0v8="; }; - vendorSha256 = "sha256-T0wDbAl5GXphZIBrM36OwRCojnJ/cbXNqsjtCzUDZ6s="; + vendorSha256 = "sha256-1NTneOGU4R1xzR9hAI9MJWYuYTPgYtLa5vH1H5wyHcM="; buildFlagsArray = [ "-ldflags=" "-s" "-w" ]; From 781e69d19c45c9acb1c3dc4b5bd2f981b78895cf Mon Sep 17 00:00:00 2001 From: sternenseemann <0rpkxez4ksa01gb3typccl0i@systemli.org> Date: Thu, 15 Apr 2021 12:44:05 +0200 Subject: [PATCH 078/230] llvmPackages_12: reorganize files Restructure pkgs/development/compilers/llvm/12 in a similar spirit as #117433 to mirror the other llvm directories. --- .../compiler-rt-X86-support-extension.patch | 0 .../12/{ => compiler-rt}/compiler-rt-armv7l.patch | 0 .../12/{ => compiler-rt}/compiler-rt-codesign.patch | 0 .../12/{compiler-rt.nix => compiler-rt/default.nix} | 0 .../12/{ => compiler-rt}/sanitizers-nongnu.patch | 0 pkgs/development/compilers/llvm/12/default.nix | 12 ++++++------ .../llvm/12/{libc++abi.nix => libc++abi/default.nix} | 2 +- .../llvm/12/{ => libc++abi}/libcxxabi-wasm.patch | 0 .../llvm/12/{libunwind.nix => libunwind/default.nix} | 0 .../compilers/llvm/12/{lld.nix => lld/default.nix} | 0 .../compilers/llvm/12/{lldb.nix => lldb/default.nix} | 0 .../compilers/llvm/12/{ => lldb}/lldb-procfs.patch | 0 .../compilers/llvm/12/{llvm.nix => llvm/default.nix} | 2 +- .../compilers/llvm/12/{ => llvm}/llvm-outputs.patch | 0 14 files changed, 8 insertions(+), 8 deletions(-) rename pkgs/development/compilers/llvm/12/{ => compiler-rt}/compiler-rt-X86-support-extension.patch (100%) rename pkgs/development/compilers/llvm/12/{ => compiler-rt}/compiler-rt-armv7l.patch (100%) rename pkgs/development/compilers/llvm/12/{ => compiler-rt}/compiler-rt-codesign.patch (100%) rename pkgs/development/compilers/llvm/12/{compiler-rt.nix => compiler-rt/default.nix} (100%) rename pkgs/development/compilers/llvm/12/{ => compiler-rt}/sanitizers-nongnu.patch (100%) rename pkgs/development/compilers/llvm/12/{libc++abi.nix => libc++abi/default.nix} (97%) rename pkgs/development/compilers/llvm/12/{ => libc++abi}/libcxxabi-wasm.patch (100%) rename pkgs/development/compilers/llvm/12/{libunwind.nix => libunwind/default.nix} (100%) rename pkgs/development/compilers/llvm/12/{lld.nix => lld/default.nix} (100%) rename pkgs/development/compilers/llvm/12/{lldb.nix => lldb/default.nix} (100%) rename pkgs/development/compilers/llvm/12/{ => lldb}/lldb-procfs.patch (100%) rename pkgs/development/compilers/llvm/12/{llvm.nix => llvm/default.nix} (99%) rename pkgs/development/compilers/llvm/12/{ => llvm}/llvm-outputs.patch (100%) diff --git a/pkgs/development/compilers/llvm/12/compiler-rt-X86-support-extension.patch b/pkgs/development/compilers/llvm/12/compiler-rt/compiler-rt-X86-support-extension.patch similarity index 100% rename from pkgs/development/compilers/llvm/12/compiler-rt-X86-support-extension.patch rename to pkgs/development/compilers/llvm/12/compiler-rt/compiler-rt-X86-support-extension.patch diff --git a/pkgs/development/compilers/llvm/12/compiler-rt-armv7l.patch b/pkgs/development/compilers/llvm/12/compiler-rt/compiler-rt-armv7l.patch similarity index 100% rename from pkgs/development/compilers/llvm/12/compiler-rt-armv7l.patch rename to pkgs/development/compilers/llvm/12/compiler-rt/compiler-rt-armv7l.patch diff --git a/pkgs/development/compilers/llvm/12/compiler-rt-codesign.patch b/pkgs/development/compilers/llvm/12/compiler-rt/compiler-rt-codesign.patch similarity index 100% rename from pkgs/development/compilers/llvm/12/compiler-rt-codesign.patch rename to pkgs/development/compilers/llvm/12/compiler-rt/compiler-rt-codesign.patch diff --git a/pkgs/development/compilers/llvm/12/compiler-rt.nix b/pkgs/development/compilers/llvm/12/compiler-rt/default.nix similarity index 100% rename from pkgs/development/compilers/llvm/12/compiler-rt.nix rename to pkgs/development/compilers/llvm/12/compiler-rt/default.nix diff --git a/pkgs/development/compilers/llvm/12/sanitizers-nongnu.patch b/pkgs/development/compilers/llvm/12/compiler-rt/sanitizers-nongnu.patch similarity index 100% rename from pkgs/development/compilers/llvm/12/sanitizers-nongnu.patch rename to pkgs/development/compilers/llvm/12/compiler-rt/sanitizers-nongnu.patch diff --git a/pkgs/development/compilers/llvm/12/default.nix b/pkgs/development/compilers/llvm/12/default.nix index 593db716ac6..ad7121c36a8 100644 --- a/pkgs/development/compilers/llvm/12/default.nix +++ b/pkgs/development/compilers/llvm/12/default.nix @@ -32,7 +32,7 @@ let ''; in { - llvm = callPackage ./llvm.nix { }; + llvm = callPackage ./llvm { }; clang-unwrapped = callPackage ./clang { inherit (tools) lld; @@ -80,11 +80,11 @@ let extraBuildCommands = mkExtraBuildCommands cc; }; - lld = callPackage ./lld.nix { + lld = callPackage ./lld { libunwind = libraries.libunwind; }; - lldb = callPackage ./lldb.nix { + lldb = callPackage ./lldb { inherit (darwin) libobjc bootstrap_cmds; inherit (darwin.apple_sdk.libs) xpc; inherit (darwin.apple_sdk.frameworks) Foundation Carbon Cocoa; @@ -172,7 +172,7 @@ let callPackage = newScope (libraries // buildLlvmTools // { inherit stdenv cmake libxml2 python3 isl release_version version fetch; }); in { - compiler-rt = callPackage ./compiler-rt.nix ({} // + compiler-rt = callPackage ./compiler-rt ({} // (lib.optionalAttrs (stdenv.hostPlatform.useLLVM or false) { stdenv = overrideCC stdenv buildLlvmTools.lldClangNoCompilerRt; })); @@ -186,7 +186,7 @@ let stdenv = overrideCC stdenv buildLlvmTools.lldClangNoLibcxx; })); - libcxxabi = callPackage ./libc++abi.nix ({} // + libcxxabi = callPackage ./libc++abi ({} // (lib.optionalAttrs (stdenv.hostPlatform.useLLVM or false) { stdenv = overrideCC stdenv buildLlvmTools.lldClangNoLibcxx; libunwind = libraries.libunwind; @@ -194,7 +194,7 @@ let openmp = callPackage ./openmp.nix {}; - libunwind = callPackage ./libunwind.nix ({} // + libunwind = callPackage ./libunwind ({} // (lib.optionalAttrs (stdenv.hostPlatform.useLLVM or false) { stdenv = overrideCC stdenv buildLlvmTools.lldClangNoLibcxx; })); diff --git a/pkgs/development/compilers/llvm/12/libc++abi.nix b/pkgs/development/compilers/llvm/12/libc++abi/default.nix similarity index 97% rename from pkgs/development/compilers/llvm/12/libc++abi.nix rename to pkgs/development/compilers/llvm/12/libc++abi/default.nix index e35480c7bf2..c5e9aa954b3 100644 --- a/pkgs/development/compilers/llvm/12/libc++abi.nix +++ b/pkgs/development/compilers/llvm/12/libc++abi/default.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation { '' + lib.optionalString stdenv.isDarwin '' export TRIPLE=x86_64-apple-darwin '' + lib.optionalString stdenv.hostPlatform.isMusl '' - patch -p1 -d libcxx -i ${../libcxx-0001-musl-hacks.patch} + patch -p1 -d libcxx -i ${../../libcxx-0001-musl-hacks.patch} '' + lib.optionalString stdenv.hostPlatform.isWasm '' patch -p1 -d llvm -i ${./libcxxabi-wasm.patch} ''; diff --git a/pkgs/development/compilers/llvm/12/libcxxabi-wasm.patch b/pkgs/development/compilers/llvm/12/libc++abi/libcxxabi-wasm.patch similarity index 100% rename from pkgs/development/compilers/llvm/12/libcxxabi-wasm.patch rename to pkgs/development/compilers/llvm/12/libc++abi/libcxxabi-wasm.patch diff --git a/pkgs/development/compilers/llvm/12/libunwind.nix b/pkgs/development/compilers/llvm/12/libunwind/default.nix similarity index 100% rename from pkgs/development/compilers/llvm/12/libunwind.nix rename to pkgs/development/compilers/llvm/12/libunwind/default.nix diff --git a/pkgs/development/compilers/llvm/12/lld.nix b/pkgs/development/compilers/llvm/12/lld/default.nix similarity index 100% rename from pkgs/development/compilers/llvm/12/lld.nix rename to pkgs/development/compilers/llvm/12/lld/default.nix diff --git a/pkgs/development/compilers/llvm/12/lldb.nix b/pkgs/development/compilers/llvm/12/lldb/default.nix similarity index 100% rename from pkgs/development/compilers/llvm/12/lldb.nix rename to pkgs/development/compilers/llvm/12/lldb/default.nix diff --git a/pkgs/development/compilers/llvm/12/lldb-procfs.patch b/pkgs/development/compilers/llvm/12/lldb/lldb-procfs.patch similarity index 100% rename from pkgs/development/compilers/llvm/12/lldb-procfs.patch rename to pkgs/development/compilers/llvm/12/lldb/lldb-procfs.patch diff --git a/pkgs/development/compilers/llvm/12/llvm.nix b/pkgs/development/compilers/llvm/12/llvm/default.nix similarity index 99% rename from pkgs/development/compilers/llvm/12/llvm.nix rename to pkgs/development/compilers/llvm/12/llvm/default.nix index 6e6127ba949..6075f9d8d55 100644 --- a/pkgs/development/compilers/llvm/12/llvm.nix +++ b/pkgs/development/compilers/llvm/12/llvm/default.nix @@ -73,7 +73,7 @@ in stdenv.mkDerivation (rec { --replace "PassBuilderCallbacksTest.cpp" "" rm unittests/IR/PassBuilderCallbacksTest.cpp '' + optionalString stdenv.hostPlatform.isMusl '' - patch -p1 -i ${../TLI-musl.patch} + patch -p1 -i ${../../TLI-musl.patch} substituteInPlace unittests/Support/CMakeLists.txt \ --replace "add_subdirectory(DynamicLibrary)" "" rm unittests/Support/DynamicLibrary/DynamicLibraryTest.cpp diff --git a/pkgs/development/compilers/llvm/12/llvm-outputs.patch b/pkgs/development/compilers/llvm/12/llvm/llvm-outputs.patch similarity index 100% rename from pkgs/development/compilers/llvm/12/llvm-outputs.patch rename to pkgs/development/compilers/llvm/12/llvm/llvm-outputs.patch From 9767460d0067d824a4e5071ba0e490e54b1d4939 Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Thu, 15 Apr 2021 09:18:08 +0000 Subject: [PATCH 079/230] lib.systems.examples.amd64-netbsd: add warning Otherwise, nobody will know it's deprecated! --- lib/systems/examples.nix | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/lib/systems/examples.nix b/lib/systems/examples.nix index 654d6f69af0..f5cba8bcd63 100644 --- a/lib/systems/examples.nix +++ b/lib/systems/examples.nix @@ -248,8 +248,7 @@ rec { # BSDs - # Deprecate - amd64-netbsd = x86_64-netbsd; + amd64-netbsd = lib.warn "The amd64-netbsd system example is deprecated. Use x86_64-netbsd instead." x86_64-netbsd; x86_64-netbsd = { config = "x86_64-unknown-netbsd"; From 62ec3db0174a454280e369fee98818ada0de607e Mon Sep 17 00:00:00 2001 From: sternenseemann <0rpkxez4ksa01gb3typccl0i@systemli.org> Date: Sat, 10 Apr 2021 21:25:46 +0200 Subject: [PATCH 080/230] stdenv/freebsd/cc: make overrideable fixing nixpkgs eval stdenv.cc didn't have an override attribute on FreeBSD previously, breaking evaluation of all-packages.nix consequently. Resolves #119075. --- pkgs/stdenv/freebsd/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/stdenv/freebsd/default.nix b/pkgs/stdenv/freebsd/default.nix index 5aadfd81a20..9a890532b79 100644 --- a/pkgs/stdenv/freebsd/default.nix +++ b/pkgs/stdenv/freebsd/default.nix @@ -238,7 +238,7 @@ in buildPlatform hostPlatform targetPlatform initialPath shell fetchurlBoot; - cc = import ../../build-support/cc-wrapper { + cc = lib.makeOverridable (import ../../build-support/cc-wrapper) { inherit lib; nativeTools = true; nativePrefix = "/usr"; From 317b0b864a60a09004f323a1cb34dd278ce050f0 Mon Sep 17 00:00:00 2001 From: James Landrein Date: Thu, 15 Apr 2021 13:19:42 +0200 Subject: [PATCH 081/230] velero: 1.5.4 -> 1.6.0 --- .../networking/cluster/velero/default.nix | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/networking/cluster/velero/default.nix b/pkgs/applications/networking/cluster/velero/default.nix index 65826683d5f..b38787e2968 100644 --- a/pkgs/applications/networking/cluster/velero/default.nix +++ b/pkgs/applications/networking/cluster/velero/default.nix @@ -2,24 +2,27 @@ buildGoModule rec { pname = "velero"; - version = "1.5.4"; + # When updating, change the commit underneath + version = "1.6.0"; + commit = "5bd70fd8eef316d220317245e46dc6016c348dce"; + src = fetchFromGitHub { rev = "v${version}"; owner = "vmware-tanzu"; repo = "velero"; - sha256 = "sha256-YHBqIM3NV2L13w9WCzldUWmdBMec7ZndzYgGHblS8Dg="; + sha256 = "sha256-2d4xsffh5DpxGahmzXpgUBRFAt5CsDnHCm8xU1ksqyQ="; }; buildFlagsArray = '' -ldflags= -s -w -X github.com/vmware-tanzu/velero/pkg/buildinfo.Version=${version} - -X github.com/vmware-tanzu/velero/pkg/buildinfo.GitSHA=456eb19668f8da603756353d9179b59b5a7bfa04 + -X github.com/vmware-tanzu/velero/pkg/buildinfo.GitSHA=${commit} -X github.com/vmware-tanzu/velero/pkg/buildinfo.GitTreeState=clean ''; - vendorSha256 = "sha256-m/zShJeclZ1k8Fr9faK2x1Mpwbwun674iMPJhMw/9Mc="; + vendorSha256 = "sha256-aQjtebIyV69nRwc/zvK/9v0mX3pAPKfOunSL/FpFZJU="; excludedPackages = [ "issue-template-gen" ]; From 081b9423d4ae18836c7564b634627b214049f80e Mon Sep 17 00:00:00 2001 From: sternenseemann <0rpkxez4ksa01gb3typccl0i@systemli.org> Date: Thu, 15 Apr 2021 12:15:07 +0200 Subject: [PATCH 082/230] llvmPackages*: fix paths to libcxx-0001-musl-hacks.patch This patches are included from libcxx and libcxxabi when stdenv.hostPlatform.isMusl. After #117433 the patchs to that patch wasn't adjusted for the new structure, likely because it doesn't come up during normal eval. This fixes (among other attribute paths): * pkgsMusl.llvmPackages_12.libcxxabi * pkgsMusl.llvmPackages_12.libcxx * pkgsMusl.llvmPackages_11.libcxxabi * pkgsMusl.llvmPackages_11.libcxx * pkgsMusl.llvmPackages_10.libcxxabi * pkgsMusl.llvmPackages_10.libcxx * pkgsMusl.llvmPackages_9.libcxxabi * pkgsMusl.llvmPackages_9.libcxx * pkgsMusl.llvmPackages_8.libcxxabi * pkgsMusl.llvmPackages_8.libcxx * pkgsMusl.llvmPackages_7.libcxxabi * pkgsMusl.llvmPackages_7.libcxx * pkgsMusl.llvmPackages_6.libcxxabi * pkgsMusl.llvmPackages_6.libcxx * pkgsMusl.llvmPackages_5.libcxxabi * pkgsMusl.llvmPackages_5.libcxx Only evaluation was tested, not compilation though. --- pkgs/development/compilers/llvm/10/libc++abi/default.nix | 2 +- pkgs/development/compilers/llvm/11/libc++abi/default.nix | 2 +- pkgs/development/compilers/llvm/5/libc++abi/default.nix | 2 +- pkgs/development/compilers/llvm/6/libc++abi/default.nix | 2 +- pkgs/development/compilers/llvm/7/libc++abi/default.nix | 2 +- pkgs/development/compilers/llvm/8/libc++abi/default.nix | 2 +- pkgs/development/compilers/llvm/9/libc++abi/default.nix | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/pkgs/development/compilers/llvm/10/libc++abi/default.nix b/pkgs/development/compilers/llvm/10/libc++abi/default.nix index 7541cee1a54..1909996614d 100644 --- a/pkgs/development/compilers/llvm/10/libc++abi/default.nix +++ b/pkgs/development/compilers/llvm/10/libc++abi/default.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation { '' + lib.optionalString stdenv.isDarwin '' export TRIPLE=x86_64-apple-darwin '' + lib.optionalString stdenv.hostPlatform.isMusl '' - patch -p1 -d $(ls -d libcxx-*) -i ${../libcxx-0001-musl-hacks.patch} + patch -p1 -d $(ls -d libcxx-*) -i ${../../libcxx-0001-musl-hacks.patch} '' + lib.optionalString stdenv.hostPlatform.isWasm '' patch -p1 -d $(ls -d llvm-*) -i ${./wasm.patch} ''; diff --git a/pkgs/development/compilers/llvm/11/libc++abi/default.nix b/pkgs/development/compilers/llvm/11/libc++abi/default.nix index a95a3051415..c35ec706a02 100644 --- a/pkgs/development/compilers/llvm/11/libc++abi/default.nix +++ b/pkgs/development/compilers/llvm/11/libc++abi/default.nix @@ -31,7 +31,7 @@ stdenv.mkDerivation { '' + lib.optionalString stdenv.isDarwin '' export TRIPLE=x86_64-apple-darwin '' + lib.optionalString stdenv.hostPlatform.isMusl '' - patch -p1 -d libcxx -i ${../libcxx-0001-musl-hacks.patch} + patch -p1 -d libcxx -i ${../../libcxx-0001-musl-hacks.patch} '' + lib.optionalString stdenv.hostPlatform.isWasm '' patch -p1 -d llvm -i ${./wasm.patch} ''; diff --git a/pkgs/development/compilers/llvm/5/libc++abi/default.nix b/pkgs/development/compilers/llvm/5/libc++abi/default.nix index 8fc9ef9fded..dd148a8917f 100644 --- a/pkgs/development/compilers/llvm/5/libc++abi/default.nix +++ b/pkgs/development/compilers/llvm/5/libc++abi/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation { '' + lib.optionalString stdenv.isDarwin '' export TRIPLE=x86_64-apple-darwin '' + lib.optionalString stdenv.hostPlatform.isMusl '' - patch -p1 -d $(ls -d libcxx-*) -i ${../libcxx-0001-musl-hacks.patch} + patch -p1 -d $(ls -d libcxx-*) -i ${../../libcxx-0001-musl-hacks.patch} ''; installPhase = if stdenv.isDarwin diff --git a/pkgs/development/compilers/llvm/6/libc++abi/default.nix b/pkgs/development/compilers/llvm/6/libc++abi/default.nix index 6e99f2d287a..c0d90f6c8e4 100644 --- a/pkgs/development/compilers/llvm/6/libc++abi/default.nix +++ b/pkgs/development/compilers/llvm/6/libc++abi/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation { '' + lib.optionalString stdenv.isDarwin '' export TRIPLE=x86_64-apple-darwin '' + lib.optionalString stdenv.hostPlatform.isMusl '' - patch -p1 -d $(ls -d libcxx-*) -i ${../libcxx-0001-musl-hacks.patch} + patch -p1 -d $(ls -d libcxx-*) -i ${../../libcxx-0001-musl-hacks.patch} ''; installPhase = if stdenv.isDarwin diff --git a/pkgs/development/compilers/llvm/7/libc++abi/default.nix b/pkgs/development/compilers/llvm/7/libc++abi/default.nix index 61879be91da..84c47865141 100644 --- a/pkgs/development/compilers/llvm/7/libc++abi/default.nix +++ b/pkgs/development/compilers/llvm/7/libc++abi/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation { '' + lib.optionalString stdenv.isDarwin '' export TRIPLE=x86_64-apple-darwin '' + lib.optionalString stdenv.hostPlatform.isMusl '' - patch -p1 -d $(ls -d libcxx-*) -i ${../libcxx-0001-musl-hacks.patch} + patch -p1 -d $(ls -d libcxx-*) -i ${../../libcxx-0001-musl-hacks.patch} ''; cmakeFlags = diff --git a/pkgs/development/compilers/llvm/8/libc++abi/default.nix b/pkgs/development/compilers/llvm/8/libc++abi/default.nix index 411b94e6275..bde67f86640 100644 --- a/pkgs/development/compilers/llvm/8/libc++abi/default.nix +++ b/pkgs/development/compilers/llvm/8/libc++abi/default.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation { '' + lib.optionalString stdenv.isDarwin '' export TRIPLE=x86_64-apple-darwin '' + lib.optionalString stdenv.hostPlatform.isMusl '' - patch -p1 -d $(ls -d libcxx-*) -i ${../libcxx-0001-musl-hacks.patch} + patch -p1 -d $(ls -d libcxx-*) -i ${../../libcxx-0001-musl-hacks.patch} '' + lib.optionalString stdenv.hostPlatform.isWasm '' patch -p1 -d $(ls -d llvm-*) -i ${./wasm.patch} ''; diff --git a/pkgs/development/compilers/llvm/9/libc++abi/default.nix b/pkgs/development/compilers/llvm/9/libc++abi/default.nix index ceb83d252a8..99d3918b89d 100644 --- a/pkgs/development/compilers/llvm/9/libc++abi/default.nix +++ b/pkgs/development/compilers/llvm/9/libc++abi/default.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation { '' + lib.optionalString stdenv.isDarwin '' export TRIPLE=x86_64-apple-darwin '' + lib.optionalString stdenv.hostPlatform.isMusl '' - patch -p1 -d $(ls -d libcxx-*) -i ${../libcxx-0001-musl-hacks.patch} + patch -p1 -d $(ls -d libcxx-*) -i ${../../libcxx-0001-musl-hacks.patch} '' + lib.optionalString stdenv.hostPlatform.isWasm '' patch -p1 -d $(ls -d llvm-*) -i ${./wasm.patch} ''; From 08fc7507cee8214626425663478f8433b44515d7 Mon Sep 17 00:00:00 2001 From: Dmitry Ivankov Date: Thu, 15 Apr 2021 13:28:21 +0200 Subject: [PATCH 083/230] cargo-raze: 0.2.10 -> 0.12.0 --- pkgs/development/tools/rust/cargo-raze/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/rust/cargo-raze/default.nix b/pkgs/development/tools/rust/cargo-raze/default.nix index 11a52e6ea08..2e75c08b42b 100644 --- a/pkgs/development/tools/rust/cargo-raze/default.nix +++ b/pkgs/development/tools/rust/cargo-raze/default.nix @@ -3,17 +3,17 @@ rustPlatform.buildRustPackage rec { pname = "cargo-raze"; - version = "0.2.10"; + version = "0.12.0"; src = fetchFromGitHub { owner = "google"; repo = pname; rev = "v${version}"; - sha256 = "1fznh8jygzyzphw7762qc2jv0370z7qjqk1vkql0g246iqby8pq9"; + sha256 = "161m4y6i4sgqi9mg3f3348f5cr0m45vhix4a4bcw54wnmhiklnnl"; }; sourceRoot = "source/impl"; - cargoSha256 = "1z20xc508a3slc1ii3hy09swvlyib14zwf9akxc0h24d5m48as1c"; + cargoSha256 = "1vlywdq0bx6b1k3w1grisca0hvv2s4s88yxq7bil8nhm5ghjgxdr"; nativeBuildInputs = [ pkg-config ]; buildInputs = [ curl libgit2 openssl ] From bfe415121972683c4b78666679198c5336fa6095 Mon Sep 17 00:00:00 2001 From: oxalica Date: Thu, 15 Apr 2021 02:01:52 +0800 Subject: [PATCH 084/230] dotnetCorePackages.sdk_5_0: 5.0.200 -> 5.0.202 This fix NuGet issue https://github.com/NuGet/Home/issues/10491 --- pkgs/development/compilers/dotnet/default.nix | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/pkgs/development/compilers/dotnet/default.nix b/pkgs/development/compilers/dotnet/default.nix index 143782d9301..f78c546542a 100644 --- a/pkgs/development/compilers/dotnet/default.nix +++ b/pkgs/development/compilers/dotnet/default.nix @@ -1,6 +1,9 @@ /* How to combine packages for use in development: dotnetCombined = with dotnetCorePackages; combinePackages [ sdk_3_1 sdk_2_2 sdk_3_0 sdk aspnetcore_2_1 ]; + +Hashes below are retrived from: +https://dotnet.microsoft.com/download/dotnet */ { callPackage }: let @@ -124,11 +127,11 @@ rec { }; sdk_5_0 = buildNetCoreSdk { - version = "5.0.200"; + version = "5.0.202"; sha512 = { - x86_64-linux = "0g7zcmkcdwc11h42m6hq8d0w55nnvnsmj3dc16829q55cp7l7kggmjljnd9slx7r7nrsyi7yy8brwh8n4kfi5998pdyb09fzhq5w60d"; - aarch64-linux = "2zy6nxiw313g2sbmnkg76r64llbk2w2wcsa6frq535zbviw52zf163jvw2687rpiw4szdizf337l3b0qa0396abw5dhq2czqlxjyjv8"; - x86_64-darwin = "2p0yxplafhi5ks38pq8nyi43kpv4l4npa718rvcvl57qs76j0dqlk1s4wdw7msx8g7xxy1aal47zy9rxvlypmgwx4dnp339cmbd6mf6"; + x86_64-linux = "Ae1Z8jYYSYdAVnPSSUDVXOKdgw59u8GVVv3AOJMDnmBGcS3m+QHcmREEeg3uT9FTGbfpT4ox32uYH6Nb2T2YOA=="; + aarch64-linux = "JuwSWgY35xrK0gOGR034mhAemulIkhtd4M00P0vA6EtOeyMY4Vl4cj6zudMh6Jt5DD8EJKQ8KbABX8byuePp2Q=="; + x86_64-darwin = "jxnfTbQUb0dJ2/NX2pu8Pi/F/e4EaDm2Ta5U+6sSYj/s6nNp6NHxtEn7BzhQ9/EVLszl/oXi3lL0d/BPbzldEA=="; }; }; } From 939dc2da35268521eee29a605fd8d9c3b1fc6d75 Mon Sep 17 00:00:00 2001 From: oxalica Date: Thu, 15 Apr 2021 02:04:16 +0800 Subject: [PATCH 085/230] osu-lazer: 2021.331.0 -> 2021.410.0 --- pkgs/games/osu-lazer/default.nix | 4 ++-- pkgs/games/osu-lazer/deps.nix | 28 ++++++++++++++-------------- pkgs/games/osu-lazer/update.sh | 15 +-------------- 3 files changed, 17 insertions(+), 30 deletions(-) diff --git a/pkgs/games/osu-lazer/default.nix b/pkgs/games/osu-lazer/default.nix index 2d90dafb28d..81f50e96822 100644 --- a/pkgs/games/osu-lazer/default.nix +++ b/pkgs/games/osu-lazer/default.nix @@ -16,13 +16,13 @@ let in stdenv.mkDerivation rec { pname = "osu-lazer"; - version = "2021.331.0"; + version = "2021.410.0"; src = fetchFromGitHub { owner = "ppy"; repo = "osu"; rev = version; - sha256 = "dCKBxVDBBhJ7LEawmMOU7PKh0yxmDgVw6PL2F0qA5RU="; + sha256 = "twKg9iZdY+zgwEQeHMOlRZKXxAHic7GnoqH0jOdW7fw="; }; patches = [ ./bypass-tamper-detection.patch ]; diff --git a/pkgs/games/osu-lazer/deps.nix b/pkgs/games/osu-lazer/deps.nix index a956f9efb2e..f30ac9b13f4 100644 --- a/pkgs/games/osu-lazer/deps.nix +++ b/pkgs/games/osu-lazer/deps.nix @@ -261,8 +261,8 @@ }) (fetchNuGet { name = "JetBrains.Annotations"; - version = "2020.3.0"; - sha256 = "04xlfqnfg3069f014q8f0vx7y70m8nldbf9fia4b50bp3rry2lv2"; + version = "2021.1.0"; + sha256 = "07pnhxxlgx8spmwmakz37nmbvgyb6yjrbrhad5rrn6y767z5r1gb"; }) (fetchNuGet { name = "ManagedBass"; @@ -296,8 +296,8 @@ }) (fetchNuGet { name = "Microsoft.AspNetCore.App.Runtime.linux-x64"; - version = "5.0.0"; - sha256 = "14njzl0907wzcbsnxl62m4y6mv9pdirm68bj8qbbip0q5a6xgidw"; + version = "5.0.5"; + sha256 = "026m19pddhkx5idwpi6mp1yl9yfcfgm2qjp1jh54mdja1d7ng0vk"; }) (fetchNuGet { name = "Microsoft.AspNetCore.Connections.Abstractions"; @@ -551,8 +551,8 @@ }) (fetchNuGet { name = "Microsoft.Extensions.ObjectPool"; - version = "5.0.4"; - sha256 = "07kyqbm7f7k4bv3fa54b826b87z00385pqgjzd4s8l26j6p39rrm"; + version = "5.0.5"; + sha256 = "0hh0xm14hp479dsd0gb9igz0vbbn3sak27v39phpyilxvk7ky5z1"; }) (fetchNuGet { name = "Microsoft.Extensions.Options"; @@ -576,8 +576,8 @@ }) (fetchNuGet { name = "Microsoft.NETCore.App.Runtime.linux-x64"; - version = "5.0.0"; - sha256 = "1k9yxklzdnjfkqysg54dz0mr75yg29fhlls9alh5qlfpsfpk32yq"; + version = "5.0.5"; + sha256 = "1h5yry6k9bpqqis2fb1901csb8kipm7anm174fjj41r317vzfjfa"; }) (fetchNuGet { name = "Microsoft.NETCore.Platforms"; @@ -721,8 +721,8 @@ }) (fetchNuGet { name = "ppy.osu.Framework"; - version = "2021.330.0"; - sha256 = "01v319nd9szq5z5qq6pa348y1mv93pnhw0vrgbrjwvcs797h7mjl"; + version = "2021.410.0"; + sha256 = "1vwdrspdpal44hyspv3rsax8mkszvbnc2xl1xswczx9mzj6qs4by"; }) (fetchNuGet { name = "ppy.osu.Framework.NativeLibs"; @@ -731,8 +731,8 @@ }) (fetchNuGet { name = "ppy.osu.Game.Resources"; - version = "2021.211.1"; - sha256 = "0rqv5blmyzvcpk0b1r6fzr1bla62kr2fwkr1f9ahir9zafvk2wmm"; + version = "2021.410.0"; + sha256 = "1a5qia4595n0b21dj63sl71ar56m9x1glqwky7a9bb0dqpvfivya"; }) (fetchNuGet { name = "ppy.osuTK.NS20"; @@ -741,8 +741,8 @@ }) (fetchNuGet { name = "ppy.SDL2-CS"; - version = "1.0.82"; - sha256 = "0hdfih1hjpqxgblwc947inyfhskkj85f061cagf8gdl69xsp2l1b"; + version = "1.0.225-alpha"; + sha256 = "1x8hvk9kikwi7wrvwxdxk3pkbs491iss2mvqgiw844zld5izihqc"; }) (fetchNuGet { name = "ppy.squirrel.windows"; diff --git a/pkgs/games/osu-lazer/update.sh b/pkgs/games/osu-lazer/update.sh index 44a4bb3821d..b5c8208fe41 100755 --- a/pkgs/games/osu-lazer/update.sh +++ b/pkgs/games/osu-lazer/update.sh @@ -22,21 +22,8 @@ chmod -R +w "$src" pushd "$src" -# Setup empty nuget package folder to force reinstall. mkdir ./nuget_tmp.packages -cat >./nuget_tmp.config < - - - - - - - - -EOF - -dotnet restore osu.Desktop --configfile ./nuget_tmp.config --runtime linux-x64 +dotnet restore osu.Desktop --packages ./nuget_tmp.packages --runtime linux-x64 echo "{ fetchNuGet }: [" >"$deps_file" while read pkg_spec; do From 1d2ea5bceb7c9696b66986396a2287b512ede1a0 Mon Sep 17 00:00:00 2001 From: oxalica Date: Thu, 15 Apr 2021 03:24:18 +0800 Subject: [PATCH 086/230] roslyn: regenerate deps --- pkgs/development/compilers/roslyn/deps.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/compilers/roslyn/deps.nix b/pkgs/development/compilers/roslyn/deps.nix index 0afb482350b..deb72e522cd 100644 --- a/pkgs/development/compilers/roslyn/deps.nix +++ b/pkgs/development/compilers/roslyn/deps.nix @@ -137,10 +137,10 @@ } { name = "microsoft.netcore.app.host.linux-x64"; - version = "3.1.12"; + version = "3.1.14"; src = fetchurl { - url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.netcore.app.host.linux-x64/3.1.12/microsoft.netcore.app.host.linux-x64.3.1.12.nupkg"; - sha256 = "1kp1sb7n1sb012v4k1xfv97n0x7k5r2rn0za8y8nbxjb2a4i4a8n"; + url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.netcore.app.host.linux-x64/3.1.14/microsoft.netcore.app.host.linux-x64.3.1.14.nupkg"; + sha256 = "11rqnascx9asfyxgxzwgxgr9gxxndm552k4dn4p1s57ciz7vkg9h"; }; } { From 5bea018a9c223c377757582bb7f2572291850716 Mon Sep 17 00:00:00 2001 From: oxalica Date: Thu, 15 Apr 2021 03:43:24 +0800 Subject: [PATCH 087/230] ryujinx: 1.0.6807 -> 1.0.6835 --- pkgs/misc/emulators/ryujinx/default.nix | 6 +- pkgs/misc/emulators/ryujinx/deps.nix | 416 ++++++++++++------------ 2 files changed, 206 insertions(+), 216 deletions(-) diff --git a/pkgs/misc/emulators/ryujinx/default.nix b/pkgs/misc/emulators/ryujinx/default.nix index 8bad6b3cd9e..db3b87b7b59 100644 --- a/pkgs/misc/emulators/ryujinx/default.nix +++ b/pkgs/misc/emulators/ryujinx/default.nix @@ -16,13 +16,13 @@ let ]; in stdenv.mkDerivation rec { pname = "ryujinx"; - version = "1.0.6807"; # Versioning is based off of the official appveyor builds: https://ci.appveyor.com/project/gdkchan/ryujinx + version = "1.0.6835"; # Versioning is based off of the official appveyor builds: https://ci.appveyor.com/project/gdkchan/ryujinx src = fetchFromGitHub { owner = "Ryujinx"; repo = "Ryujinx"; - rev = "0ee314fb3b9d476d0d207a3595bde24af9c4b69b"; - sha256 = "1yyjy5qblsdg186hr81qpc07n0cqla67q3hjf2rrzq5pyb10bldy"; + rev = "e520eecb5ba682d4b51bb782e3bc99fb1d6afe04"; + sha256 = "1yy1xslnvvl0m7g0jszj2pjwdwf0pbv53crzfkhla3n68kvfy00f"; }; nativeBuildInputs = [ dotnet-sdk_5 dotnetPackages.Nuget cacert makeWrapper wrapGAppsHook gobject-introspection gdk-pixbuf ]; diff --git a/pkgs/misc/emulators/ryujinx/deps.nix b/pkgs/misc/emulators/ryujinx/deps.nix index 5e3f1a4944f..1ccd7c9b38f 100644 --- a/pkgs/misc/emulators/ryujinx/deps.nix +++ b/pkgs/misc/emulators/ryujinx/deps.nix @@ -45,20 +45,15 @@ sha256 = "1j8i5izk97ga30z1qpd765zqd2q5w71y8bhnkqq4bj59768fyxp5"; }) (fetchNuGet { - name = "GLWidget"; - version = "1.0.2"; - sha256 = "0nb46jiscnsywwdfy7zhx1bw4jfmca3s6l8dhbi99gc4bvp8ar7p"; + name = "GtkSharp"; + version = "3.22.25.128"; + sha256 = "0z0wx0p3gc02r8d7y88k1rw307sb2vapbr1k1yc5qdc38fxz5jsy"; }) (fetchNuGet { name = "GtkSharp.Dependencies"; version = "1.1.0"; sha256 = "1g1rhcn38ww97638rds6l5bysra43hkhv47fy71fvq89623zgyxn"; }) - (fetchNuGet { - name = "GtkSharp"; - version = "3.22.25.128"; - sha256 = "0z0wx0p3gc02r8d7y88k1rw307sb2vapbr1k1yc5qdc38fxz5jsy"; - }) (fetchNuGet { name = "LibHac"; version = "0.12.0"; @@ -66,18 +61,18 @@ }) (fetchNuGet { name = "Microsoft.AspNetCore.App.Runtime.linux-x64"; - version = "5.0.0"; - sha256 = "14njzl0907wzcbsnxl62m4y6mv9pdirm68bj8qbbip0q5a6xgidw"; + version = "5.0.5"; + sha256 = "026m19pddhkx5idwpi6mp1yl9yfcfgm2qjp1jh54mdja1d7ng0vk"; }) (fetchNuGet { name = "Microsoft.AspNetCore.App.Runtime.osx-x64"; - version = "5.0.0"; - sha256 = "1mmklq1fwq4km9y9jgk63wmwjlarx4npkpvjaiwdzv83vdv104ja"; + version = "5.0.5"; + sha256 = "09nsi9fa8kb3jpnim0hdap3jabskvpr4fmpvnj5wsh3gp91vqvgb"; }) (fetchNuGet { name = "Microsoft.AspNetCore.App.Runtime.win-x64"; - version = "5.0.0"; - sha256 = "0k7q89w3nky4m0j5jsk95c8gczlyp5jl9982gf1hli3gqpl2q4jr"; + version = "5.0.5"; + sha256 = "10g2vdsz685agqbd7h7dd9gvs584prpai0zv37r59wzlynj1assl"; }) (fetchNuGet { name = "Microsoft.CodeCoverage"; @@ -94,35 +89,30 @@ version = "1.0.0"; sha256 = "0mp8ihqlb7fsa789frjzidrfjc1lrhk88qp3xm5qvr7vf4wy4z8x"; }) - (fetchNuGet { - name = "Microsoft.NET.Test.Sdk"; - version = "16.8.0"; - sha256 = "1ln2mva7j2mpsj9rdhpk8vhm3pgd8wn563xqdcwd38avnhp74rm9"; - }) (fetchNuGet { name = "Microsoft.NETCore.App.Host.osx-x64"; - version = "5.0.0"; - sha256 = "1nirb155gzn2ws1ayaqspjmjaizw87jq2684mzkn18jv4si0hbpf"; + version = "5.0.5"; + sha256 = "14d6wz593dwm2j3apd3ny10idk8bfxqgfrparhc1q7q4i66y21ws"; }) (fetchNuGet { name = "Microsoft.NETCore.App.Host.win-x64"; - version = "5.0.0"; - sha256 = "0nghghcapc28ixg21wb30ccjirc9wz83h0y3bn5zyfanxv2m2ypx"; + version = "5.0.5"; + sha256 = "1233y31z46yqzjgwpa6mmb1h63iqp6wbly6mbwkjqm2adx1wkp47"; }) (fetchNuGet { name = "Microsoft.NETCore.App.Runtime.linux-x64"; - version = "5.0.0"; - sha256 = "1k9yxklzdnjfkqysg54dz0mr75yg29fhlls9alh5qlfpsfpk32yq"; + version = "5.0.5"; + sha256 = "1h5yry6k9bpqqis2fb1901csb8kipm7anm174fjj41r317vzfjfa"; }) (fetchNuGet { name = "Microsoft.NETCore.App.Runtime.osx-x64"; - version = "5.0.0"; - sha256 = "0lvpf4zz617y94zz3zsmzrg6zcdd6z3z9gz2bd5kq1l8y1pmq77y"; + version = "5.0.5"; + sha256 = "1a1ijdk61l0h25sj9ypcf96vz1c08ca7q5809g82qpi9m34kw8b8"; }) (fetchNuGet { name = "Microsoft.NETCore.App.Runtime.win-x64"; - version = "5.0.0"; - sha256 = "1486654z369857h45v73jz8pwr8ibb97fiw5mfm7f01kdbyjdsdd"; + version = "5.0.5"; + sha256 = "1gc4msk61jgj9ill4icp0mn523g411iqpxphp0fykfvqdpqyqg46"; }) (fetchNuGet { name = "Microsoft.NETCore.Platforms"; @@ -139,11 +129,6 @@ version = "2.0.0"; sha256 = "1fk2fk2639i7nzy58m9dvpdnzql4vb8yl8vr19r2fp8lmj9w2jr0"; }) - (fetchNuGet { - name = "Microsoft.NETCore.Platforms"; - version = "3.1.0"; - sha256 = "1gc1x8f95wk8yhgznkwsg80adk1lc65v9n5rx4yaa4bc5dva0z3j"; - }) (fetchNuGet { name = "Microsoft.NETCore.Platforms"; version = "5.0.0"; @@ -159,6 +144,11 @@ version = "1.1.0"; sha256 = "193xwf33fbm0ni3idxzbr5fdq3i2dlfgihsac9jj7whj0gd902nh"; }) + (fetchNuGet { + name = "Microsoft.NET.Test.Sdk"; + version = "16.8.0"; + sha256 = "1ln2mva7j2mpsj9rdhpk8vhm3pgd8wn563xqdcwd38avnhp74rm9"; + }) (fetchNuGet { name = "Microsoft.TestPlatform.ObjectModel"; version = "16.8.0"; @@ -189,21 +179,11 @@ version = "4.5.0"; sha256 = "1zapbz161ji8h82xiajgriq6zgzmb1f3ar517p2h63plhsq5gh2q"; }) - (fetchNuGet { - name = "Microsoft.Win32.Registry"; - version = "4.7.0"; - sha256 = "0bx21jjbs7l5ydyw4p6cn07chryxpmchq2nl5pirzz4l3b0q4dgs"; - }) (fetchNuGet { name = "Microsoft.Win32.Registry"; version = "5.0.0"; sha256 = "102hvhq2gmlcbq8y2cb7hdr2dnmjzfp2k3asr1ycwrfacwyaak7n"; }) - (fetchNuGet { - name = "Microsoft.Win32.SystemEvents"; - version = "4.5.0"; - sha256 = "0fnkv3ky12227zqg4zshx4kw2mvysq2ppxjibfw02cc3iprv4njq"; - }) (fetchNuGet { name = "Microsoft.Win32.SystemEvents"; version = "5.0.0"; @@ -255,15 +235,35 @@ sha256 = "0kxc6z3b8ccdrcyqz88jm5yh5ch9nbg303v67q8sp5hhs8rl8nk6"; }) (fetchNuGet { - name = "OpenTK.NetStandard"; - version = "1.0.5.32"; - sha256 = "12y8kg73llmq3zibcp6j3hhiw04g7mqlm1nslmb74gfkzx0b4m9f"; + name = "OpenTK.Core"; + version = "4.5.0"; + sha256 = "06qxczikp0aah20d4skk3g588dgh2vn2xffn0ajyyv0475m61s9m"; + }) + (fetchNuGet { + name = "OpenTK.Graphics"; + version = "4.5.0"; + sha256 = "180g5c92fhhhpmwl6paihx4h1bil7akaihlz2qy124n28pf4s988"; + }) + (fetchNuGet { + name = "OpenTK.Mathematics"; + version = "4.5.0"; + sha256 = "1h9dxhq1llxdbgdzsi87ijqgj2ilr3rv0zkxhaa65xrc5x8j8fva"; + }) + (fetchNuGet { + name = "OpenTK.OpenAL"; + version = "4.5.0"; + sha256 = "0lqxpc3vnxglql42x2frvq5bpkl5cf3dpnf9nx6pr3q6qnhigkfb"; }) (fetchNuGet { name = "PangoSharp"; version = "3.22.25.128"; sha256 = "0dkl9j0yd65s5ds9xj5z6yb7yca7wlycqz25m8dng20d13sqr1zp"; }) + (fetchNuGet { + name = "ppy.SDL2-CS"; + version = "1.0.225-alpha"; + sha256 = "1x8hvk9kikwi7wrvwxdxk3pkbs491iss2mvqgiw844zld5izihqc"; + }) (fetchNuGet { name = "runtime.any.System.Collections"; version = "4.3.0"; @@ -279,21 +279,26 @@ version = "4.3.0"; sha256 = "00j6nv2xgmd3bi347k00m7wr542wjlig53rmj28pmw7ddcn97jbn"; }) - (fetchNuGet { - name = "runtime.any.System.Globalization.Calendars"; - version = "4.3.0"; - sha256 = "1ghhhk5psqxcg6w88sxkqrc35bxcz27zbqm2y5p5298pv3v7g201"; - }) (fetchNuGet { name = "runtime.any.System.Globalization"; version = "4.3.0"; sha256 = "1daqf33hssad94lamzg01y49xwndy2q97i2lrb7mgn28656qia1x"; }) + (fetchNuGet { + name = "runtime.any.System.Globalization.Calendars"; + version = "4.3.0"; + sha256 = "1ghhhk5psqxcg6w88sxkqrc35bxcz27zbqm2y5p5298pv3v7g201"; + }) (fetchNuGet { name = "runtime.any.System.IO"; version = "4.3.0"; sha256 = "0l8xz8zn46w4d10bcn3l4yyn4vhb3lrj2zw8llvz7jk14k4zps5x"; }) + (fetchNuGet { + name = "runtime.any.System.Reflection"; + version = "4.3.0"; + sha256 = "02c9h3y35pylc0zfq3wcsvc5nqci95nrkq0mszifc0sjx7xrzkly"; + }) (fetchNuGet { name = "runtime.any.System.Reflection.Extensions"; version = "4.3.0"; @@ -304,16 +309,16 @@ version = "4.3.0"; sha256 = "0x1mm8c6iy8rlxm8w9vqw7gb7s1ljadrn049fmf70cyh42vdfhrf"; }) - (fetchNuGet { - name = "runtime.any.System.Reflection"; - version = "4.3.0"; - sha256 = "02c9h3y35pylc0zfq3wcsvc5nqci95nrkq0mszifc0sjx7xrzkly"; - }) (fetchNuGet { name = "runtime.any.System.Resources.ResourceManager"; version = "4.3.0"; sha256 = "03kickal0iiby82wa5flar18kyv82s9s6d4xhk5h4bi5kfcyfjzl"; }) + (fetchNuGet { + name = "runtime.any.System.Runtime"; + version = "4.3.0"; + sha256 = "1cqh1sv3h5j7ixyb7axxbdkqx6cxy00p4np4j91kpm492rf4s25b"; + }) (fetchNuGet { name = "runtime.any.System.Runtime.Handles"; version = "4.3.0"; @@ -325,20 +330,15 @@ sha256 = "0c3g3g3jmhlhw4klrc86ka9fjbl7i59ds1fadsb2l8nqf8z3kb19"; }) (fetchNuGet { - name = "runtime.any.System.Runtime"; + name = "runtime.any.System.Text.Encoding"; version = "4.3.0"; - sha256 = "1cqh1sv3h5j7ixyb7axxbdkqx6cxy00p4np4j91kpm492rf4s25b"; + sha256 = "0aqqi1v4wx51h51mk956y783wzags13wa7mgqyclacmsmpv02ps3"; }) (fetchNuGet { name = "runtime.any.System.Text.Encoding.Extensions"; version = "4.3.0"; sha256 = "0lqhgqi0i8194ryqq6v2gqx0fb86db2gqknbm0aq31wb378j7ip8"; }) - (fetchNuGet { - name = "runtime.any.System.Text.Encoding"; - version = "4.3.0"; - sha256 = "0aqqi1v4wx51h51mk956y783wzags13wa7mgqyclacmsmpv02ps3"; - }) (fetchNuGet { name = "runtime.any.System.Threading.Tasks"; version = "4.3.0"; @@ -364,6 +364,16 @@ version = "4.3.0"; sha256 = "0c2p354hjx58xhhz7wv6div8xpi90sc6ibdm40qin21bvi7ymcaa"; }) + (fetchNuGet { + name = "runtime.native.System"; + version = "4.0.0"; + sha256 = "1ppk69xk59ggacj9n7g6fyxvzmk1g5p4fkijm0d7xqfkig98qrkf"; + }) + (fetchNuGet { + name = "runtime.native.System"; + version = "4.3.0"; + sha256 = "15hgf6zaq9b8br2wi1i3x0zvmk410nlmsmva9p0bbg73v6hml5k4"; + }) (fetchNuGet { name = "runtime.native.System.IO.Compression"; version = "4.1.0"; @@ -374,25 +384,15 @@ version = "4.0.1"; sha256 = "1hgv2bmbaskx77v8glh7waxws973jn4ah35zysnkxmf0196sfxg6"; }) - (fetchNuGet { - name = "runtime.native.System.Security.Cryptography.OpenSsl"; - version = "4.3.0"; - sha256 = "18pzfdlwsg2nb1jjjjzyb5qlgy6xjxzmhnfaijq5s2jw3cm3ab97"; - }) (fetchNuGet { name = "runtime.native.System.Security.Cryptography"; version = "4.0.0"; sha256 = "0k57aa2c3b10wl3hfqbgrl7xq7g8hh3a3ir44b31dn5p61iiw3z9"; }) (fetchNuGet { - name = "runtime.native.System"; - version = "4.0.0"; - sha256 = "1ppk69xk59ggacj9n7g6fyxvzmk1g5p4fkijm0d7xqfkig98qrkf"; - }) - (fetchNuGet { - name = "runtime.native.System"; + name = "runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; - sha256 = "15hgf6zaq9b8br2wi1i3x0zvmk410nlmsmva9p0bbg73v6hml5k4"; + sha256 = "18pzfdlwsg2nb1jjjjzyb5qlgy6xjxzmhnfaijq5s2jw3cm3ab97"; }) (fetchNuGet { name = "runtime.opensuse.13.2-x64.runtime.native.System.Security.Cryptography.OpenSsl"; @@ -524,15 +524,20 @@ version = "1.0.0-beta0013"; sha256 = "0r0aw8xxd32rwcawawcz6asiyggz02hnzg5hvz8gimq8hvwx1wql"; }) + (fetchNuGet { + name = "SixLabors.ImageSharp"; + version = "1.0.2"; + sha256 = "0fhk9sn8k18slfb26wz8mal0j699f7djwhxgv97snz6b10wynfaj"; + }) (fetchNuGet { name = "SixLabors.ImageSharp.Drawing"; version = "1.0.0-beta11"; sha256 = "0hl0rs3kr1zdnx3gdssxgli6fyvmwzcfp99f4db71s0i8j8b2bp5"; }) (fetchNuGet { - name = "SixLabors.ImageSharp"; - version = "1.0.2"; - sha256 = "0fhk9sn8k18slfb26wz8mal0j699f7djwhxgv97snz6b10wynfaj"; + name = "SPB"; + version = "0.0.2"; + sha256 = "178z9mi7zlk0laj79nkjh75ych47jjajiaj33hnh7zfmz05d8h6r"; }) (fetchNuGet { name = "System.AppContext"; @@ -559,6 +564,16 @@ version = "5.0.0"; sha256 = "14zs2wqkmdlxzj8ikx19n321lsbarx5vl2a8wrachymxn8zb5njh"; }) + (fetchNuGet { + name = "System.Collections"; + version = "4.0.11"; + sha256 = "1ga40f5lrwldiyw6vy67d0sg7jd7ww6kgwbksm19wrvq9hr0bsm6"; + }) + (fetchNuGet { + name = "System.Collections"; + version = "4.3.0"; + sha256 = "19r4y64dqyrq6k4706dnyhhw7fs24kpp3awak7whzss39dakpxk9"; + }) (fetchNuGet { name = "System.Collections.Concurrent"; version = "4.0.12"; @@ -575,14 +590,9 @@ sha256 = "1sdwkma4f6j85m3dpb53v9vcgd0zyc9jb33f8g63byvijcj39n20"; }) (fetchNuGet { - name = "System.Collections"; - version = "4.0.11"; - sha256 = "1ga40f5lrwldiyw6vy67d0sg7jd7ww6kgwbksm19wrvq9hr0bsm6"; - }) - (fetchNuGet { - name = "System.Collections"; + name = "System.ComponentModel"; version = "4.3.0"; - sha256 = "19r4y64dqyrq6k4706dnyhhw7fs24kpp3awak7whzss39dakpxk9"; + sha256 = "0986b10ww3nshy30x9sjyzm0jx339dkjxjj3401r3q0f6fx2wkcb"; }) (fetchNuGet { name = "System.ComponentModel.EventBasedAsync"; @@ -599,11 +609,6 @@ version = "4.3.0"; sha256 = "17ng0p7v3nbrg3kycz10aqrrlw4lz9hzhws09pfh8gkwicyy481x"; }) - (fetchNuGet { - name = "System.ComponentModel"; - version = "4.3.0"; - sha256 = "0986b10ww3nshy30x9sjyzm0jx339dkjxjj3401r3q0f6fx2wkcb"; - }) (fetchNuGet { name = "System.Console"; version = "4.0.0"; @@ -644,11 +649,6 @@ version = "4.3.0"; sha256 = "1m3bx6c2s958qligl67q7grkwfz3w53hpy7nc97mh6f7j5k168c4"; }) - (fetchNuGet { - name = "System.Drawing.Common"; - version = "4.5.0"; - sha256 = "0knqa0zsm91nfr34br8gx5kjqq4v81zdhqkacvs2hzc8nqk0ddhc"; - }) (fetchNuGet { name = "System.Drawing.Common"; version = "5.0.1"; @@ -659,6 +659,16 @@ version = "4.0.11"; sha256 = "1pla2dx8gkidf7xkciig6nifdsb494axjvzvann8g2lp3dbqasm9"; }) + (fetchNuGet { + name = "System.Globalization"; + version = "4.0.11"; + sha256 = "070c5jbas2v7smm660zaf1gh0489xanjqymkvafcs4f8cdrs1d5d"; + }) + (fetchNuGet { + name = "System.Globalization"; + version = "4.3.0"; + sha256 = "1cp68vv683n6ic2zqh2s1fn4c2sd87g5hpp6l4d4nj4536jz98ki"; + }) (fetchNuGet { name = "System.Globalization.Calendars"; version = "4.0.1"; @@ -675,19 +685,14 @@ sha256 = "02a5zfxavhv3jd437bsncbhd2fp1zv4gxzakp1an9l6kdq1mcqls"; }) (fetchNuGet { - name = "System.Globalization"; - version = "4.0.11"; - sha256 = "070c5jbas2v7smm660zaf1gh0489xanjqymkvafcs4f8cdrs1d5d"; + name = "System.IO"; + version = "4.1.0"; + sha256 = "1g0yb8p11vfd0kbkyzlfsbsp5z44lwsvyc0h3dpw6vqnbi035ajp"; }) (fetchNuGet { - name = "System.Globalization"; + name = "System.IO"; version = "4.3.0"; - sha256 = "1cp68vv683n6ic2zqh2s1fn4c2sd87g5hpp6l4d4nj4536jz98ki"; - }) - (fetchNuGet { - name = "System.IO.Compression.ZipFile"; - version = "4.0.1"; - sha256 = "0h72znbagmgvswzr46mihn7xm7chfk2fhrp5krzkjf29pz0i6z82"; + sha256 = "05l9qdrzhm4s5dixmx68kxwif4l99ll5gqmh7rqgw554fx0agv5f"; }) (fetchNuGet { name = "System.IO.Compression"; @@ -695,14 +700,9 @@ sha256 = "0iym7s3jkl8n0vzm3jd6xqg9zjjjqni05x45dwxyjr2dy88hlgji"; }) (fetchNuGet { - name = "System.IO.FileSystem.Primitives"; + name = "System.IO.Compression.ZipFile"; version = "4.0.1"; - sha256 = "1s0mniajj3lvbyf7vfb5shp4ink5yibsx945k6lvxa96r8la1612"; - }) - (fetchNuGet { - name = "System.IO.FileSystem.Primitives"; - version = "4.3.0"; - sha256 = "0j6ndgglcf4brg2lz4wzsh1av1gh8xrzdsn9f0yznskhqn1xzj9c"; + sha256 = "0h72znbagmgvswzr46mihn7xm7chfk2fhrp5krzkjf29pz0i6z82"; }) (fetchNuGet { name = "System.IO.FileSystem"; @@ -715,19 +715,14 @@ sha256 = "0z2dfrbra9i6y16mm9v1v6k47f0fm617vlb7s5iybjjsz6g1ilmw"; }) (fetchNuGet { - name = "System.IO"; - version = "4.1.0"; - sha256 = "1g0yb8p11vfd0kbkyzlfsbsp5z44lwsvyc0h3dpw6vqnbi035ajp"; + name = "System.IO.FileSystem.Primitives"; + version = "4.0.1"; + sha256 = "1s0mniajj3lvbyf7vfb5shp4ink5yibsx945k6lvxa96r8la1612"; }) (fetchNuGet { - name = "System.IO"; + name = "System.IO.FileSystem.Primitives"; version = "4.3.0"; - sha256 = "05l9qdrzhm4s5dixmx68kxwif4l99ll5gqmh7rqgw554fx0agv5f"; - }) - (fetchNuGet { - name = "System.Linq.Expressions"; - version = "4.1.0"; - sha256 = "1gpdxl6ip06cnab7n3zlcg6mqp7kknf73s8wjinzi4p0apw82fpg"; + sha256 = "0j6ndgglcf4brg2lz4wzsh1av1gh8xrzdsn9f0yznskhqn1xzj9c"; }) (fetchNuGet { name = "System.Linq"; @@ -739,6 +734,11 @@ version = "4.3.0"; sha256 = "1w0gmba695rbr80l1k2h4mrwzbzsyfl2z4klmpbsvsg5pm4a56s7"; }) + (fetchNuGet { + name = "System.Linq.Expressions"; + version = "4.1.0"; + sha256 = "1gpdxl6ip06cnab7n3zlcg6mqp7kknf73s8wjinzi4p0apw82fpg"; + }) (fetchNuGet { name = "System.Management"; version = "5.0.0"; @@ -784,6 +784,26 @@ version = "4.3.0"; sha256 = "04r1lkdnsznin0fj4ya1zikxiqr0h6r6a1ww2dsm60gqhdrf0mvx"; }) + (fetchNuGet { + name = "System.Reflection"; + version = "4.1.0"; + sha256 = "1js89429pfw79mxvbzp8p3q93il6rdff332hddhzi5wqglc4gml9"; + }) + (fetchNuGet { + name = "System.Reflection"; + version = "4.3.0"; + sha256 = "0xl55k0mw8cd8ra6dxzh974nxif58s3k1rjv1vbd7gjbjr39j11m"; + }) + (fetchNuGet { + name = "System.Reflection.Emit"; + version = "4.0.1"; + sha256 = "0ydqcsvh6smi41gyaakglnv252625hf29f7kywy2c70nhii2ylqp"; + }) + (fetchNuGet { + name = "System.Reflection.Emit"; + version = "4.3.0"; + sha256 = "11f8y3qfysfcrscjpjym9msk7lsfxkk4fmz9qq95kn3jd0769f74"; + }) (fetchNuGet { name = "System.Reflection.Emit.ILGeneration"; version = "4.0.1"; @@ -804,16 +824,6 @@ version = "4.3.0"; sha256 = "0ql7lcakycrvzgi9kxz1b3lljd990az1x6c4jsiwcacrvimpib5c"; }) - (fetchNuGet { - name = "System.Reflection.Emit"; - version = "4.0.1"; - sha256 = "0ydqcsvh6smi41gyaakglnv252625hf29f7kywy2c70nhii2ylqp"; - }) - (fetchNuGet { - name = "System.Reflection.Emit"; - version = "4.3.0"; - sha256 = "11f8y3qfysfcrscjpjym9msk7lsfxkk4fmz9qq95kn3jd0769f74"; - }) (fetchNuGet { name = "System.Reflection.Extensions"; version = "4.0.1"; @@ -844,16 +854,6 @@ version = "4.3.0"; sha256 = "0y2ssg08d817p0vdag98vn238gyrrynjdj4181hdg780sif3ykp1"; }) - (fetchNuGet { - name = "System.Reflection"; - version = "4.1.0"; - sha256 = "1js89429pfw79mxvbzp8p3q93il6rdff332hddhzi5wqglc4gml9"; - }) - (fetchNuGet { - name = "System.Reflection"; - version = "4.3.0"; - sha256 = "0xl55k0mw8cd8ra6dxzh974nxif58s3k1rjv1vbd7gjbjr39j11m"; - }) (fetchNuGet { name = "System.Resources.ResourceManager"; version = "4.0.1"; @@ -864,6 +864,16 @@ version = "4.3.0"; sha256 = "0sjqlzsryb0mg4y4xzf35xi523s4is4hz9q4qgdvlvgivl7qxn49"; }) + (fetchNuGet { + name = "System.Runtime"; + version = "4.1.0"; + sha256 = "02hdkgk13rvsd6r9yafbwzss8kr55wnj8d5c7xjnp8gqrwc8sn0m"; + }) + (fetchNuGet { + name = "System.Runtime"; + version = "4.3.0"; + sha256 = "066ixvgbf2c929kgknshcxqj6539ax7b9m570cp8n179cpfkapz7"; + }) (fetchNuGet { name = "System.Runtime.CompilerServices.Unsafe"; version = "4.7.0"; @@ -894,16 +904,6 @@ version = "4.3.0"; sha256 = "0sw2gfj2xr7sw9qjn0j3l9yw07x73lcs97p8xfc9w1x9h5g5m7i8"; }) - (fetchNuGet { - name = "System.Runtime.InteropServices.RuntimeInformation"; - version = "4.0.0"; - sha256 = "0glmvarf3jz5xh22iy3w9v3wyragcm4hfdr17v90vs7vcrm7fgp6"; - }) - (fetchNuGet { - name = "System.Runtime.InteropServices.RuntimeInformation"; - version = "4.3.0"; - sha256 = "0q18r1sh4vn7bvqgd6dmqlw5v28flbpj349mkdish2vjyvmnb2ii"; - }) (fetchNuGet { name = "System.Runtime.InteropServices"; version = "4.1.0"; @@ -914,6 +914,16 @@ version = "4.3.0"; sha256 = "00hywrn4g7hva1b2qri2s6rabzwgxnbpw9zfxmz28z09cpwwgh7j"; }) + (fetchNuGet { + name = "System.Runtime.InteropServices.RuntimeInformation"; + version = "4.0.0"; + sha256 = "0glmvarf3jz5xh22iy3w9v3wyragcm4hfdr17v90vs7vcrm7fgp6"; + }) + (fetchNuGet { + name = "System.Runtime.InteropServices.RuntimeInformation"; + version = "4.3.0"; + sha256 = "0q18r1sh4vn7bvqgd6dmqlw5v28flbpj349mkdish2vjyvmnb2ii"; + }) (fetchNuGet { name = "System.Runtime.Numerics"; version = "4.0.1"; @@ -924,26 +934,11 @@ version = "4.1.1"; sha256 = "042rfjixknlr6r10vx2pgf56yming8lkjikamg3g4v29ikk78h7k"; }) - (fetchNuGet { - name = "System.Runtime"; - version = "4.1.0"; - sha256 = "02hdkgk13rvsd6r9yafbwzss8kr55wnj8d5c7xjnp8gqrwc8sn0m"; - }) - (fetchNuGet { - name = "System.Runtime"; - version = "4.3.0"; - sha256 = "066ixvgbf2c929kgknshcxqj6539ax7b9m570cp8n179cpfkapz7"; - }) (fetchNuGet { name = "System.Security.AccessControl"; version = "4.5.0"; sha256 = "1wvwanz33fzzbnd2jalar0p0z3x0ba53vzx1kazlskp7pwyhlnq0"; }) - (fetchNuGet { - name = "System.Security.AccessControl"; - version = "4.7.0"; - sha256 = "0n0k0w44flkd8j0xw7g3g3vhw7dijfm51f75xkm1qxnbh4y45mpz"; - }) (fetchNuGet { name = "System.Security.AccessControl"; version = "5.0.0"; @@ -989,6 +984,11 @@ version = "4.1.0"; sha256 = "0clg1bv55mfv5dq00m19cp634zx6inm31kf8ppbq1jgyjf2185dh"; }) + (fetchNuGet { + name = "System.Security.Principal"; + version = "4.3.0"; + sha256 = "12cm2zws06z4lfc4dn31iqv7072zyi4m910d4r6wm8yx85arsfxf"; + }) (fetchNuGet { name = "System.Security.Principal.Windows"; version = "4.3.0"; @@ -999,31 +999,11 @@ version = "4.5.0"; sha256 = "0rmj89wsl5yzwh0kqjgx45vzf694v9p92r4x4q6yxldk1cv1hi86"; }) - (fetchNuGet { - name = "System.Security.Principal.Windows"; - version = "4.7.0"; - sha256 = "1a56ls5a9sr3ya0nr086sdpa9qv0abv31dd6fp27maqa9zclqq5d"; - }) (fetchNuGet { name = "System.Security.Principal.Windows"; version = "5.0.0"; sha256 = "1mpk7xj76lxgz97a5yg93wi8lj0l8p157a5d50mmjy3gbz1904q8"; }) - (fetchNuGet { - name = "System.Security.Principal"; - version = "4.3.0"; - sha256 = "12cm2zws06z4lfc4dn31iqv7072zyi4m910d4r6wm8yx85arsfxf"; - }) - (fetchNuGet { - name = "System.Text.Encoding.Extensions"; - version = "4.0.11"; - sha256 = "08nsfrpiwsg9x5ml4xyl3zyvjfdi4mvbqf93kjdh11j4fwkznizs"; - }) - (fetchNuGet { - name = "System.Text.Encoding.Extensions"; - version = "4.3.0"; - sha256 = "11q1y8hh5hrp5a3kw25cb6l00v5l5dvirkz8jr3sq00h1xgcgrxy"; - }) (fetchNuGet { name = "System.Text.Encoding"; version = "4.0.11"; @@ -1034,6 +1014,16 @@ version = "4.3.0"; sha256 = "1f04lkir4iladpp51sdgmis9dj4y8v08cka0mbmsy0frc9a4gjqr"; }) + (fetchNuGet { + name = "System.Text.Encoding.Extensions"; + version = "4.0.11"; + sha256 = "08nsfrpiwsg9x5ml4xyl3zyvjfdi4mvbqf93kjdh11j4fwkznizs"; + }) + (fetchNuGet { + name = "System.Text.Encoding.Extensions"; + version = "4.3.0"; + sha256 = "11q1y8hh5hrp5a3kw25cb6l00v5l5dvirkz8jr3sq00h1xgcgrxy"; + }) (fetchNuGet { name = "System.Text.RegularExpressions"; version = "4.1.0"; @@ -1044,21 +1034,21 @@ version = "4.3.0"; sha256 = "1bgq51k7fwld0njylfn7qc5fmwrk2137gdq7djqdsw347paa9c2l"; }) + (fetchNuGet { + name = "System.Threading"; + version = "4.0.11"; + sha256 = "19x946h926bzvbsgj28csn46gak2crv2skpwsx80hbgazmkgb1ls"; + }) + (fetchNuGet { + name = "System.Threading"; + version = "4.3.0"; + sha256 = "0rw9wfamvhayp5zh3j7p1yfmx9b5khbf4q50d8k5rk993rskfd34"; + }) (fetchNuGet { name = "System.Threading.Overlapped"; version = "4.3.0"; sha256 = "1nahikhqh9nk756dh8p011j36rlcp1bzz3vwi2b4m1l2s3vz8idm"; }) - (fetchNuGet { - name = "System.Threading.Tasks.Extensions"; - version = "4.0.0"; - sha256 = "1cb51z062mvc2i8blpzmpn9d9mm4y307xrwi65di8ri18cz5r1zr"; - }) - (fetchNuGet { - name = "System.Threading.Tasks.Extensions"; - version = "4.3.0"; - sha256 = "1xxcx2xh8jin360yjwm4x4cf5y3a2bwpn2ygkfkwkicz7zk50s2z"; - }) (fetchNuGet { name = "System.Threading.Tasks"; version = "4.0.11"; @@ -1069,6 +1059,16 @@ version = "4.3.0"; sha256 = "134z3v9abw3a6jsw17xl3f6hqjpak5l682k2vz39spj4kmydg6k7"; }) + (fetchNuGet { + name = "System.Threading.Tasks.Extensions"; + version = "4.0.0"; + sha256 = "1cb51z062mvc2i8blpzmpn9d9mm4y307xrwi65di8ri18cz5r1zr"; + }) + (fetchNuGet { + name = "System.Threading.Tasks.Extensions"; + version = "4.3.0"; + sha256 = "1xxcx2xh8jin360yjwm4x4cf5y3a2bwpn2ygkfkwkicz7zk50s2z"; + }) (fetchNuGet { name = "System.Threading.Thread"; version = "4.3.0"; @@ -1084,16 +1084,6 @@ version = "4.0.1"; sha256 = "15n54f1f8nn3mjcjrlzdg6q3520571y012mx7v991x2fvp73lmg6"; }) - (fetchNuGet { - name = "System.Threading"; - version = "4.0.11"; - sha256 = "19x946h926bzvbsgj28csn46gak2crv2skpwsx80hbgazmkgb1ls"; - }) - (fetchNuGet { - name = "System.Threading"; - version = "4.3.0"; - sha256 = "0rw9wfamvhayp5zh3j7p1yfmx9b5khbf4q50d8k5rk993rskfd34"; - }) (fetchNuGet { name = "System.Xml.ReaderWriter"; version = "4.0.11"; @@ -1114,14 +1104,14 @@ version = "4.3.0"; sha256 = "0bmz1l06dihx52jxjr22dyv5mxv6pj4852lx68grjm7bivhrbfwi"; }) - (fetchNuGet { - name = "System.Xml.XPath.XmlDocument"; - version = "4.3.0"; - sha256 = "1h9lh7qkp0lff33z847sdfjj8yaz98ylbnkbxlnsbflhj9xyfqrm"; - }) (fetchNuGet { name = "System.Xml.XPath"; version = "4.3.0"; sha256 = "1cv2m0p70774a0sd1zxc8fm8jk3i5zk2bla3riqvi8gsm0r4kpci"; }) + (fetchNuGet { + name = "System.Xml.XPath.XmlDocument"; + version = "4.3.0"; + sha256 = "1h9lh7qkp0lff33z847sdfjj8yaz98ylbnkbxlnsbflhj9xyfqrm"; + }) ] From fc0daf4bd36d758306239c29038a28c22382daa3 Mon Sep 17 00:00:00 2001 From: fortuneteller2k Date: Thu, 15 Apr 2021 19:56:59 +0800 Subject: [PATCH 088/230] linux_xanmod: 5.11.13 -> 5.11.14 --- pkgs/os-specific/linux/kernel/linux-xanmod.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-xanmod.nix b/pkgs/os-specific/linux/kernel/linux-xanmod.nix index 0aad78531ba..1057d8cb471 100644 --- a/pkgs/os-specific/linux/kernel/linux-xanmod.nix +++ b/pkgs/os-specific/linux/kernel/linux-xanmod.nix @@ -1,7 +1,7 @@ { lib, stdenv, buildLinux, fetchFromGitHub, ... } @ args: let - version = "5.11.13"; + version = "5.11.14"; suffix = "xanmod1-cacule"; in buildLinux (args // rec { @@ -12,7 +12,7 @@ in owner = "xanmod"; repo = "linux"; rev = modDirVersion; - sha256 = "sha256-LUbkccAfDS0/FnNhHn64bkC8qwBD0NKcdZRzNoSw4uA="; + sha256 = "sha256-kRbU1jheZi2U6mfNyhBFn3FJ7fjYkNUVwkx3w/DZNQI="; extraPostFetch = '' rm $out/.config ''; From 01940a7328373a7a02670ff0d2d5e8f0e25c97ef Mon Sep 17 00:00:00 2001 From: 06kellyjac Date: Thu, 15 Apr 2021 12:58:14 +0100 Subject: [PATCH 089/230] boundary: 0.1.8 -> 0.2.0 --- pkgs/tools/networking/boundary/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/tools/networking/boundary/default.nix b/pkgs/tools/networking/boundary/default.nix index 50b3fa07782..1eb445cfd3e 100644 --- a/pkgs/tools/networking/boundary/default.nix +++ b/pkgs/tools/networking/boundary/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { pname = "boundary"; - version = "0.1.8"; + version = "0.2.0"; src = let @@ -18,9 +18,9 @@ stdenv.mkDerivation rec { }; in fetchsrc version { - x86_64-linux = "sha256-CZueZqN1XoSmqOsocGwUoIZ5878uSHFYW2KDURWRHhM="; - aarch64-linux = "sha256-/pl9MzR4GFjiefc7Sde+jTGi/QaY3U/An8J5+KQR/68="; - x86_64-darwin = "sha256-kkqROFXvEpxRySByGtmGtFJPBr5Dw3BOPQ+bArqLxAA="; + x86_64-linux = "sha256-4h1Lx+Et1AfX75Cn0YUhV4MkEtzP6ICqAHVKex3PBpg="; + aarch64-linux = "sha256-i7gzv8GdDgikPT1tMia4xltEYiIZ/VNRbAiGF2o8oKA="; + x86_64-darwin = "sha256-tleIY1loPE61n59Qc9CJeropRUvTBbcIA8xmB1SaMt8="; }; dontConfigure = true; From 66495af8d6c2211f8e0a4c201e8b9d78b4e36816 Mon Sep 17 00:00:00 2001 From: 06kellyjac Date: Thu, 15 Apr 2021 13:13:26 +0100 Subject: [PATCH 090/230] nerdctl: 0.7.3 -> 0.8.0 --- pkgs/applications/networking/cluster/nerdctl/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/cluster/nerdctl/default.nix b/pkgs/applications/networking/cluster/nerdctl/default.nix index ef025dfc6a7..357424cdddf 100644 --- a/pkgs/applications/networking/cluster/nerdctl/default.nix +++ b/pkgs/applications/networking/cluster/nerdctl/default.nix @@ -10,16 +10,16 @@ buildGoModule rec { pname = "nerdctl"; - version = "0.7.3"; + version = "0.8.0"; src = fetchFromGitHub { owner = "containerd"; repo = pname; rev = "v${version}"; - sha256 = "sha256-4NIyit2HnDXWnHALGzz5KWxe4PU8CwMRwCoIlN/WX78="; + sha256 = "sha256-It/p2Hk4/fkYgHTPynf7p7zs4ajjo0Fv3yTzhrWUusE="; }; - vendorSha256 = "sha256-qwUAC8LURsn6C3zKzcsuFsOTurjPV9V8Z/1Y9G0eohk="; + vendorSha256 = "sha256-Vg6SHyQkeUvd2hT0JV32y+F0t/qb81MrgOFcr785a8M="; nativeBuildInputs = [ makeWrapper installShellFiles ]; From 0ff3276d279a4f50ae0bf96f0864482e0fc9b965 Mon Sep 17 00:00:00 2001 From: 06kellyjac Date: Thu, 15 Apr 2021 13:24:52 +0100 Subject: [PATCH 091/230] terragrunt: 0.28.20 -> 0.28.22 --- pkgs/applications/networking/cluster/terragrunt/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/cluster/terragrunt/default.nix b/pkgs/applications/networking/cluster/terragrunt/default.nix index 718b0680ebc..a95ea55666b 100644 --- a/pkgs/applications/networking/cluster/terragrunt/default.nix +++ b/pkgs/applications/networking/cluster/terragrunt/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "terragrunt"; - version = "0.28.20"; + version = "0.28.22"; src = fetchFromGitHub { owner = "gruntwork-io"; repo = pname; rev = "v${version}"; - sha256 = "sha256-Hg4eeLFNm2cXUjp3T2VK6q+mgawqkHju9P3Vq9wnB9c="; + sha256 = "sha256-tFM9kRdr98Jm2n6i5QDUKlLsI96RZ+e7MeYc7Y+ryUE="; }; - vendorSha256 = "sha256-kcRM76xfajtQist1aJTmaRludxRlfvHQ9ucB3LOgnBk="; + vendorSha256 = "sha256-qlSCQtiGHmlk3DyETMoQbbSYhuUSZTsvAnBKuDJI8x8="; doCheck = false; From 4461230cc5e11952407f8ddd205df9834786e6e4 Mon Sep 17 00:00:00 2001 From: sternenseemann <0rpkxez4ksa01gb3typccl0i@systemli.org> Date: Thu, 15 Apr 2021 10:19:52 +0200 Subject: [PATCH 092/230] man-pages-posix: rename from posix_man_pages Make attribute name match upstream name. --- pkgs/top-level/aliases.nix | 2 ++ pkgs/top-level/all-packages.nix | 4 ++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 557c083c5f0..cb219cc84ed 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -940,6 +940,8 @@ mapAliases ({ zplugin = zinit; # Added 2021-01-30 + posix_man_pages = man-pages-posix; # Added 2021-04-15 + /* If these are in the scope of all-packages.nix, they cause collisions between mixed versions of qt. See: https://github.com/NixOS/nixpkgs/pull/101369 */ diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 7649839ace8..ab2ef5d68f4 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -21301,6 +21301,8 @@ in man-pages = callPackage ../data/documentation/man-pages { }; + man-pages-posix = callPackage ../data/documentation/man-pages-posix { }; + manrope = callPackage ../data/fonts/manrope { }; marwaita = callPackage ../data/themes/marwaita { }; @@ -21474,8 +21476,6 @@ in inherit (plasma5Packages) breeze-icons; }; - posix_man_pages = callPackage ../data/documentation/man-pages-posix { }; - powerline-fonts = callPackage ../data/fonts/powerline-fonts { }; powerline-symbols = callPackage ../data/fonts/powerline-symbols { }; From b4279a32094814ff33111b70aa96c4aa0961ee57 Mon Sep 17 00:00:00 2001 From: sternenseemann <0rpkxez4ksa01gb3typccl0i@systemli.org> Date: Thu, 15 Apr 2021 10:13:19 +0200 Subject: [PATCH 093/230] man-pages-posix: 2013-a -> 2017-a * Add myself as maintainer * Refactor nix expression (use pname, version, makeFlags attribute) --- .../documentation/man-pages-posix/default.nix | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/pkgs/data/documentation/man-pages-posix/default.nix b/pkgs/data/documentation/man-pages-posix/default.nix index a65b176f88f..ca7fdf1d4be 100644 --- a/pkgs/data/documentation/man-pages-posix/default.nix +++ b/pkgs/data/documentation/man-pages-posix/default.nix @@ -1,21 +1,22 @@ {lib, stdenv, fetchurl}: stdenv.mkDerivation rec { - name = "man-pages-posix-2013-a"; + pname = "man-pages-posix"; + version = "2017-a"; src = fetchurl { - url = "mirror://kernel/linux/docs/man-pages/man-pages-posix/${name}.tar.xz"; - sha256 = "0258j05zdrxpgdj8nndbyi7bvrs8fxdksb0xbfrylzgzfmf3lqqr"; + url = "mirror://kernel/linux/docs/man-pages/man-pages-posix/${pname}-${version}.tar.xz"; + sha256 = "ce67bb25b5048b20dad772e405a83f4bc70faf051afa289361c81f9660318bc3"; }; - preBuild = - '' - makeFlagsArray=(MANDIR=$out/share/man) - ''; + makeFlags = [ + "MANDIR=${placeholder "out"}/share/man" + ]; meta = { description = "POSIX man-pages (0p, 1p, 3p)"; homepage = "https://www.kernel.org/doc/man-pages/"; platforms = lib.platforms.unix; + maintainers = [ lib.maintainers.sternenseemann ]; }; } From f735bdfc0b71debefb80efcb5362f08843944dcc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Thu, 15 Apr 2021 14:18:37 +0200 Subject: [PATCH 094/230] python3Packages.aioimaplib: 0.7.18 -> 0.8.0 --- .../development/python-modules/aioimaplib/default.nix | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/pkgs/development/python-modules/aioimaplib/default.nix b/pkgs/development/python-modules/aioimaplib/default.nix index 6345755bffc..df9748f1c84 100644 --- a/pkgs/development/python-modules/aioimaplib/default.nix +++ b/pkgs/development/python-modules/aioimaplib/default.nix @@ -8,20 +8,22 @@ , nose , pyopenssl , pytestCheckHook -, pythonOlder +, pythonAtLeast , pytz , tzlocal }: buildPythonPackage rec { pname = "aioimaplib"; - version = "0.7.18"; + version = "0.8.0"; + + disabled = pythonAtLeast "3.9"; src = fetchFromGitHub { owner = "bamthomas"; repo = pname; rev = version; - sha256 = "037fxwmkdfb95cqcykrhn37p138wg9pvlsgdf45vyn1mhz5crky5"; + sha256 = "sha256-ume25EwLNB6szokHXonDXHGKVK76CiZYOBXVUf37/x8="; }; checkInputs = [ @@ -36,9 +38,6 @@ buildPythonPackage rec { tzlocal ]; - # Project is using asynctest with doesn't work with Python 3.8 and above - # https://github.com/bamthomas/aioimaplib/issues/54 - doCheck = pythonOlder "3.8"; pythonImportsCheck = [ "aioimaplib" ]; meta = with lib; { From e754546ef7c3a7d5890f17dab7e6d03db16c1e1f Mon Sep 17 00:00:00 2001 From: Ajeet D'Souza <98ajeet@gmail.com> Date: Thu, 15 Apr 2021 18:24:07 +0530 Subject: [PATCH 095/230] zoxide: remove shell checkInputs remove unused shell check inputs --- pkgs/tools/misc/zoxide/default.nix | 24 ------------------------ 1 file changed, 24 deletions(-) diff --git a/pkgs/tools/misc/zoxide/default.nix b/pkgs/tools/misc/zoxide/default.nix index 5cad350f498..a454a73384b 100644 --- a/pkgs/tools/misc/zoxide/default.nix +++ b/pkgs/tools/misc/zoxide/default.nix @@ -5,13 +5,6 @@ , withFzf ? true , fzf , libiconv - # checkInputs -, fish -, powershell -, shellcheck -, shfmt -, xonsh -, zsh }: rustPlatform.buildRustPackage rec { @@ -27,23 +20,6 @@ rustPlatform.buildRustPackage rec { buildInputs = lib.optionals stdenv.isDarwin [ libiconv ]; - # tests are broken on darwin - doCheck = !stdenv.isDarwin; - - # fish needs a writable HOME for whatever reason - preCheck = '' - export HOME=$(mktemp -d) - ''; - - checkInputs = [ - fish - powershell - shellcheck - shfmt - xonsh - zsh - ]; - postPatch = lib.optionalString withFzf '' substituteInPlace src/fzf.rs \ --replace '"fzf"' '"${fzf}/bin/fzf"' From 04f094a18add13bc72d06b9427d7fa0632e42d4f Mon Sep 17 00:00:00 2001 From: Pavol Rusnak Date: Thu, 15 Apr 2021 15:21:05 +0200 Subject: [PATCH 096/230] electrs: 0.8.7 -> 0.8.9 --- pkgs/applications/blockchains/electrs.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/blockchains/electrs.nix b/pkgs/applications/blockchains/electrs.nix index b43a6edc5e5..30742f8d719 100644 --- a/pkgs/applications/blockchains/electrs.nix +++ b/pkgs/applications/blockchains/electrs.nix @@ -6,20 +6,20 @@ rustPlatform.buildRustPackage rec { pname = "electrs"; - version = "0.8.7"; + version = "0.8.9"; src = fetchFromGitHub { owner = "romanz"; repo = pname; rev = "v${version}"; - sha256 = "101prhxg7dr701gwm4s15maxb7cf65hf85hc7ai53b404v39vm71"; + sha256 = "01fli2k5yh4iwlds97p5c36q19s3zxrqhkzp9dsjbgsf7sv35r3y"; }; # needed for librocksdb-sys nativeBuildInputs = [ llvmPackages.clang ]; LIBCLANG_PATH = "${llvmPackages.libclang}/lib"; - cargoSha256 = "12ypx0rkpbjl4awzx8ga30qhiqqd56a24q4jwlxxnfpw9ks1z252"; + cargoSha256 = "1rqpadlr9r4z2z825li6vi5a21hivc3bsn5ibxshrdrwiycyyxz8"; meta = with lib; { description = "An efficient re-implementation of Electrum Server in Rust"; From 96fc3c38802696486693d30c7a783e294eee4e3b Mon Sep 17 00:00:00 2001 From: devhell Date: Sat, 3 Apr 2021 16:04:34 +0100 Subject: [PATCH 097/230] cpufetch: init at 0.94 A "[s]implistic yet fancy CPU architecture fetching tool", similar to neofetch, screenfetch, etc. --- pkgs/tools/misc/cpufetch/default.nix | 34 ++++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 36 insertions(+) create mode 100644 pkgs/tools/misc/cpufetch/default.nix diff --git a/pkgs/tools/misc/cpufetch/default.nix b/pkgs/tools/misc/cpufetch/default.nix new file mode 100644 index 00000000000..37a6dfdc9dd --- /dev/null +++ b/pkgs/tools/misc/cpufetch/default.nix @@ -0,0 +1,34 @@ +{ stdenv, lib, fetchFromGitHub, installShellFiles }: + +stdenv.mkDerivation rec { + pname = "cpufetch"; + version = "0.94"; + + src = fetchFromGitHub { + owner = "Dr-Noob"; + repo = "cpufetch"; + rev = "v${version}"; + sha256 = "1gncgkhqd8bnz254qa30yyl10qm28dwx6aif0dwrj38z5ql40ck9"; + }; + + nativeBuildInputs = [ installShellFiles ]; + + installPhase = '' + runHook preInstall + + mkdir $out + install -Dm755 cpufetch $out/bin/cpufetch + install -Dm644 LICENSE $out/share/licenses/cpufetch/LICENSE + installManPage cpufetch.8 + + runHook postInstall + ''; + + meta = with lib; { + description = "Simplistic yet fancy CPU architecture fetching tool"; + license = licenses.mit; + homepage = "https://github.com/Dr-Noob/cpufetch"; + changelog = "https://github.com/Dr-Noob/cpufetch/releases/tag/v${version}"; + maintainers = with maintainers; [ devhell ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index b77e6df6f0e..f73a6465019 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3577,6 +3577,8 @@ in cpio = callPackage ../tools/archivers/cpio { }; + cpufetch = callPackage ../tools/misc/cpufetch { }; + crackxls = callPackage ../tools/security/crackxls { }; create-cycle-app = nodePackages.create-cycle-app; From 2c2e8662b91d3ffaa802350cfaa05fc756b6afa7 Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Thu, 15 Apr 2021 16:28:00 +0200 Subject: [PATCH 098/230] llvmPackages_12: 12.0.0-rc5 -> 12.0.0 Release notes: https://releases.llvm.org/12.0.0/docs/ReleaseNotes.html --- pkgs/development/compilers/llvm/12/clang/default.nix | 2 +- pkgs/development/compilers/llvm/12/compiler-rt/default.nix | 2 +- pkgs/development/compilers/llvm/12/default.nix | 4 ++-- pkgs/development/compilers/llvm/12/libc++/default.nix | 2 +- pkgs/development/compilers/llvm/12/libc++abi/default.nix | 2 +- pkgs/development/compilers/llvm/12/libunwind/default.nix | 2 +- pkgs/development/compilers/llvm/12/lld/default.nix | 2 +- pkgs/development/compilers/llvm/12/lldb/default.nix | 2 +- pkgs/development/compilers/llvm/12/llvm/default.nix | 4 ++-- pkgs/development/compilers/llvm/12/openmp.nix | 2 +- 10 files changed, 12 insertions(+), 12 deletions(-) diff --git a/pkgs/development/compilers/llvm/12/clang/default.nix b/pkgs/development/compilers/llvm/12/clang/default.nix index d90d019e6d5..169f2f27306 100644 --- a/pkgs/development/compilers/llvm/12/clang/default.nix +++ b/pkgs/development/compilers/llvm/12/clang/default.nix @@ -8,7 +8,7 @@ let pname = "clang"; inherit version; - src = fetch "clang" "185r9rr254v75ja33nmm53j85lcnkj7bzsl18wvnd37jmz2nfxa5"; + src = fetch "clang" "1vd9rhhrd8ghdg111lac7w8by71y9l14yh5zxfijsm6lj4p4avp2"; inherit clang-tools-extra_src; unpackPhase = '' diff --git a/pkgs/development/compilers/llvm/12/compiler-rt/default.nix b/pkgs/development/compilers/llvm/12/compiler-rt/default.nix index e6ac77b7d26..e4c2295a0d7 100644 --- a/pkgs/development/compilers/llvm/12/compiler-rt/default.nix +++ b/pkgs/development/compilers/llvm/12/compiler-rt/default.nix @@ -11,7 +11,7 @@ in stdenv.mkDerivation rec { pname = "compiler-rt"; inherit version; - src = fetch pname "1x0z875nbdpzhr4qb7linm6r9swvdf6dvwqy1s22pbn4wdcw0cvf"; + src = fetch pname "0d444qihq9jhqnfv003cr704v363va72zl6qaw2algj1c85cva45"; nativeBuildInputs = [ cmake python3 llvm ]; buildInputs = lib.optional stdenv.hostPlatform.isDarwin libcxxabi; diff --git a/pkgs/development/compilers/llvm/12/default.nix b/pkgs/development/compilers/llvm/12/default.nix index ad7121c36a8..c3e9cc5b499 100644 --- a/pkgs/development/compilers/llvm/12/default.nix +++ b/pkgs/development/compilers/llvm/12/default.nix @@ -8,7 +8,7 @@ let release_version = "12.0.0"; - candidate = "rc5"; # empty or "rcN" + candidate = ""; # empty or "rcN" dash-candidate = lib.optionalString (candidate != "") "-${candidate}"; version = "${release_version}${dash-candidate}"; # differentiating these (variables) is important for RCs targetConfig = stdenv.targetPlatform.config; @@ -18,7 +18,7 @@ let inherit sha256; }; - clang-tools-extra_src = fetch "clang-tools-extra" "1hga9k5m60ywmr7m69jf1v6vj1ra1n6ybv1abzlz94f5q22i1a02"; + clang-tools-extra_src = fetch "clang-tools-extra" "0p3dzr0qa7mar83y66xa5m5apynf6ia0lsdsq6axwnm64ysy0hdd"; tools = lib.makeExtensible (tools: let callPackage = newScope (tools // { inherit stdenv cmake libxml2 python3 isl release_version version fetch; }); diff --git a/pkgs/development/compilers/llvm/12/libc++/default.nix b/pkgs/development/compilers/llvm/12/libc++/default.nix index 757651c0f4c..ef845e0f7b0 100644 --- a/pkgs/development/compilers/llvm/12/libc++/default.nix +++ b/pkgs/development/compilers/llvm/12/libc++/default.nix @@ -6,7 +6,7 @@ stdenv.mkDerivation { pname = "libc++"; inherit version; - src = fetch "libcxx" "01abh553dvjgk5cjzzp0ghmg00laqbr4ar4frdhyhpbwhhmwc880"; + src = fetch "libcxx" "1wf3ww29xkx7prs7pdwicy5qqfapib26110jgmkjrbka9z57bjvx"; postUnpack = '' unpackFile ${libcxxabi.src} diff --git a/pkgs/development/compilers/llvm/12/libc++abi/default.nix b/pkgs/development/compilers/llvm/12/libc++abi/default.nix index c5e9aa954b3..6aff7872753 100644 --- a/pkgs/development/compilers/llvm/12/libc++abi/default.nix +++ b/pkgs/development/compilers/llvm/12/libc++abi/default.nix @@ -6,7 +6,7 @@ stdenv.mkDerivation { pname = "libc++abi"; inherit version; - src = fetch "libcxxabi" "0mjj4f63ix4j1b72bgzpcki7mzf3qszrq7snqhiq0c5s73skkwx0"; + src = fetch "libcxxabi" "1cbmzspwjlr8f6sp73pw6ivf4dpg6rpc61by0q1m2zca2k6yif3a"; nativeBuildInputs = [ cmake python3 ]; buildInputs = lib.optional (!stdenv.isDarwin && !stdenv.isFreeBSD && !stdenv.hostPlatform.isWasm) libunwind; diff --git a/pkgs/development/compilers/llvm/12/libunwind/default.nix b/pkgs/development/compilers/llvm/12/libunwind/default.nix index 83e76c0c56c..56ee98176d2 100644 --- a/pkgs/development/compilers/llvm/12/libunwind/default.nix +++ b/pkgs/development/compilers/llvm/12/libunwind/default.nix @@ -6,7 +6,7 @@ stdenv.mkDerivation rec { pname = "libunwind"; inherit version; - src = fetch pname "0kaq75ygzv9dqfsx27pi5a0clipdjq6a9vghhb89d8k1rf20lslh"; + src = fetch pname "1x8wpmsrsgnwj2v5ih52ylni7r6n8gzkcj6hx65zbxski2rablly"; postUnpack = '' unpackFile ${libcxx.src} diff --git a/pkgs/development/compilers/llvm/12/lld/default.nix b/pkgs/development/compilers/llvm/12/lld/default.nix index a5e4ab834ec..1d983f13c0f 100644 --- a/pkgs/development/compilers/llvm/12/lld/default.nix +++ b/pkgs/development/compilers/llvm/12/lld/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { pname = "lld"; inherit version; - src = fetch pname "044lv1d9am2xmbc3pvssxkkiyxyv72n2xkgk8z3p9k72h3ay00q3"; + src = fetch pname "1zakyxk5bwnh7jarckcd4rbmzi58jgn2dbah5j5cwcyfyfbx9drc"; nativeBuildInputs = [ cmake ]; buildInputs = [ llvm libxml2 ]; diff --git a/pkgs/development/compilers/llvm/12/lldb/default.nix b/pkgs/development/compilers/llvm/12/lldb/default.nix index 67de0c18741..7996487a2a8 100644 --- a/pkgs/development/compilers/llvm/12/lldb/default.nix +++ b/pkgs/development/compilers/llvm/12/lldb/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation (rec { pname = "lldb"; inherit version; - src = fetch pname "0q4p4s5ws1zszs3i4da5w5fnxkpny0q3fr1s1sh7jp9wcwxbxiqq"; + src = fetch pname "1v85qyq3snk81vjmwq5q7xikyyqsfpqy2c4qmr81mps4avsw1g0l"; patches = [ ./lldb-procfs.patch ]; diff --git a/pkgs/development/compilers/llvm/12/llvm/default.nix b/pkgs/development/compilers/llvm/12/llvm/default.nix index 6075f9d8d55..351b5b87940 100644 --- a/pkgs/development/compilers/llvm/12/llvm/default.nix +++ b/pkgs/development/compilers/llvm/12/llvm/default.nix @@ -32,8 +32,8 @@ in stdenv.mkDerivation (rec { pname = "llvm"; inherit version; - src = fetch pname "088dyv7hppidl3rqfsjdibvn4d3a74896fg2sz4dwaxlg19way93"; - polly_src = fetch "polly" "1qj7gkfr1yrsrz6j086l9p6d2kyyln15fmfiab4isn96g1dhsfb5"; + src = fetch pname "0l4b79gwfvxild974aigcq1yigypjsk2j5p59syhl6ksd744gp29"; + polly_src = fetch "polly" "1ixl9yj526n8iqh9ckyiah2vzravs9d1akybqq7rvy32n9vgr6hd"; unpackPhase = '' unpackFile $src diff --git a/pkgs/development/compilers/llvm/12/openmp.nix b/pkgs/development/compilers/llvm/12/openmp.nix index 1e4618e4a1b..07c1c2b0aed 100644 --- a/pkgs/development/compilers/llvm/12/openmp.nix +++ b/pkgs/development/compilers/llvm/12/openmp.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { pname = "openmp"; inherit version; - src = fetch pname "1d16r5whjb2n4n28rg8wn2g9krlc92q6nb0qmnnbzhqhx0rbkjfb"; + src = fetch pname "0z8n1wanby6aq3i7d91mgk72hb33zfl5blayk0a22cs7l8i706zb"; nativeBuildInputs = [ cmake perl ]; buildInputs = [ llvm ]; From 4aede51a08d75711cca023c4ffbb84bef9fe6f6a Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Thu, 15 Apr 2021 11:12:02 -0400 Subject: [PATCH 099/230] python3Packages.botocore: 1.20.49 -> 1.20.52 --- pkgs/development/python-modules/botocore/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/botocore/default.nix b/pkgs/development/python-modules/botocore/default.nix index 391a4a8b539..f34cc34334d 100644 --- a/pkgs/development/python-modules/botocore/default.nix +++ b/pkgs/development/python-modules/botocore/default.nix @@ -13,11 +13,11 @@ buildPythonPackage rec { pname = "botocore"; - version = "1.20.49"; # N.B: if you change this, change boto3 and awscli to a matching version + version = "1.20.52"; # N.B: if you change this, change boto3 and awscli to a matching version src = fetchPypi { inherit pname version; - sha256 = "sha256-9/ED+gZRxp3TYMfQ7Nh0hUMD3lzAhp4MvCgYpSuqzGk="; + sha256 = "sha256-3V9YCOxIqZm5Y0s4etarehojuh+XEqh1Bm0jSAj4qmI="; }; propagatedBuildInputs = [ From b417e57f7d7a29b7b1dd29b0895238dbd1949477 Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Thu, 15 Apr 2021 11:13:05 -0400 Subject: [PATCH 100/230] python3Packages.boto3: 1.17.49 -> 1.17.52 --- pkgs/development/python-modules/boto3/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/boto3/default.nix b/pkgs/development/python-modules/boto3/default.nix index b7988d47e8d..a85ea398420 100644 --- a/pkgs/development/python-modules/boto3/default.nix +++ b/pkgs/development/python-modules/boto3/default.nix @@ -13,11 +13,11 @@ buildPythonPackage rec { pname = "boto3"; - version = "1.17.49"; # N.B: if you change this, change botocore and awscli to a matching version + version = "1.17.52"; # N.B: if you change this, change botocore and awscli to a matching version src = fetchPypi { inherit pname version; - sha256 = "sha256-pIITXDD6B+r0NwMU3Q+0kRciKiZtBCOyB1rtODXtHwQ="; + sha256 = "sha256-7WQMF8l68om+RpN0DBy/laRW6cSV45c6Htb1GjloRtI="; }; propagatedBuildInputs = [ botocore jmespath s3transfer ] ++ lib.optionals (!isPy3k) [ futures ]; From f8da9ce9fc90ea884cab89b8d15d87b34950a82e Mon Sep 17 00:00:00 2001 From: Lancelot SIX Date: Tue, 13 Apr 2021 21:50:04 +0100 Subject: [PATCH 101/230] qgis: 3.10.13 -> 3.16.5 The file has been reformated using nixpkgs-fmt. --- pkgs/applications/gis/qgis/unwrapped.nix | 86 +++++++++++++++++------- 1 file changed, 61 insertions(+), 25 deletions(-) diff --git a/pkgs/applications/gis/qgis/unwrapped.nix b/pkgs/applications/gis/qgis/unwrapped.nix index 6f395640f50..49c442ee6d2 100644 --- a/pkgs/applications/gis/qgis/unwrapped.nix +++ b/pkgs/applications/gis/qgis/unwrapped.nix @@ -1,25 +1,38 @@ -{ mkDerivation, lib, fetchFromGitHub, cmake, ninja, flex, bison, proj, geos, xlibsWrapper, sqlite, gsl -, qwt, fcgi, python3Packages, libspatialindex, libspatialite, postgresql -, txt2tags, openssl, libzip, hdf5, netcdf, exiv2 -, qtbase, qtsensors, qca-qt5, qtkeychain, qscintilla, qtserialport, qtxmlpatterns -, withGrass ? true, grass -, withWebKit ? true, qtwebkit -}: +{ mkDerivation, lib, fetchFromGitHub, cmake, ninja, flex, bison, proj, geos +, xlibsWrapper, sqlite, gsl, qwt, fcgi, python3Packages, libspatialindex +, libspatialite, postgresql, txt2tags, openssl, libzip, hdf5, netcdf, exiv2 +, protobuf, qtbase, qtsensors, qca-qt5, qtkeychain, qscintilla, qtserialport +, qtxmlpatterns, withGrass ? true, grass, withWebKit ? true, qtwebkit }: with lib; let - pythonBuildInputs = with python3Packages; - [ qscintilla-qt5 gdal jinja2 numpy psycopg2 - chardet dateutil pyyaml pytz requests urllib3 pygments pyqt5 sip owslib six ]; + pythonBuildInputs = with python3Packages; [ + qscintilla-qt5 + gdal + jinja2 + numpy + psycopg2 + chardet + dateutil + pyyaml + pytz + requests + urllib3 + pygments + pyqt5 + sip + owslib + six + ]; in mkDerivation rec { - version = "3.10.13"; + version = "3.16.5"; pname = "qgis"; name = "${pname}-unwrapped-${version}"; src = fetchFromGitHub { owner = "qgis"; repo = "QGIS"; - rev = "final-${lib.replaceStrings ["."] ["_"] version}"; - sha256 = "0za77znk1phrxzy2cgxpwrld3d0pi0xvhsg78rg4wkb23vaqv6zb"; + rev = "final-${lib.replaceStrings [ "." ] [ "_" ] version}"; + sha256 = "1xkvgj1v2jgp107jyh9xmk1dzbbqxwkqy69z56vsaa8lf9gwgn5h"; }; passthru = { @@ -27,10 +40,32 @@ in mkDerivation rec { inherit python3Packages; }; - buildInputs = [ openssl proj geos xlibsWrapper sqlite gsl qwt exiv2 - fcgi libspatialindex libspatialite postgresql txt2tags libzip hdf5 netcdf - qtbase qtsensors qca-qt5 qtkeychain qscintilla qtserialport qtxmlpatterns ] - ++ lib.optional withGrass grass + buildInputs = [ + openssl + proj + geos + xlibsWrapper + sqlite + gsl + qwt + exiv2 + protobuf + fcgi + libspatialindex + libspatialite + postgresql + txt2tags + libzip + hdf5 + netcdf + qtbase + qtsensors + qca-qt5 + qtkeychain + qscintilla + qtserialport + qtxmlpatterns + ] ++ lib.optional withGrass grass ++ lib.optional withWebKit qtwebkit ++ pythonBuildInputs; @@ -41,15 +76,16 @@ in mkDerivation rec { # TODO: Correct PyQt5 to provide the expected directory and fix # build to use PYQT5_SIP_DIR consistently. postPatch = '' - substituteInPlace cmake/FindPyQt5.py \ - --replace 'sip_dir = cfg.default_sip_dir' 'sip_dir = "${python3Packages.pyqt5}/share/sip/PyQt5"' - ''; + substituteInPlace cmake/FindPyQt5.py \ + --replace 'sip_dir = cfg.default_sip_dir' 'sip_dir = "${python3Packages.pyqt5}/share/sip/PyQt5"' + ''; - cmakeFlags = [ "-DCMAKE_SKIP_BUILD_RPATH=OFF" - "-DPYQT5_SIP_DIR=${python3Packages.pyqt5}/share/sip/PyQt5" - "-DQSCI_SIP_DIR=${python3Packages.qscintilla-qt5}/share/sip/PyQt5" ] - ++ lib.optional (!withWebKit) "-DWITH_QTWEBKIT=OFF" - ++ lib.optional withGrass "-DGRASS_PREFIX7=${grass}/${grass.name}"; + cmakeFlags = [ + "-DCMAKE_SKIP_BUILD_RPATH=OFF" + "-DPYQT5_SIP_DIR=${python3Packages.pyqt5}/share/sip/PyQt5" + "-DQSCI_SIP_DIR=${python3Packages.qscintilla-qt5}/share/sip/PyQt5" + ] ++ lib.optional (!withWebKit) "-DWITH_QTWEBKIT=OFF" + ++ lib.optional withGrass "-DGRASS_PREFIX7=${grass}/${grass.name}"; meta = { description = "A Free and Open Source Geographic Information System"; From 4e28cd42c44b2eccec6eeca8aac83d4f1682fa89 Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Thu, 15 Apr 2021 11:14:36 -0400 Subject: [PATCH 102/230] awscli: 1.19.49 -> 1.19.52 --- pkgs/tools/admin/awscli/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/admin/awscli/default.nix b/pkgs/tools/admin/awscli/default.nix index 7eb5dc6a8a7..c5b426e463b 100644 --- a/pkgs/tools/admin/awscli/default.nix +++ b/pkgs/tools/admin/awscli/default.nix @@ -21,11 +21,11 @@ let in with py.pkgs; buildPythonApplication rec { pname = "awscli"; - version = "1.19.49"; # N.B: if you change this, change botocore and boto3 to a matching version too + version = "1.19.52"; # N.B: if you change this, change botocore and boto3 to a matching version too src = fetchPypi { inherit pname version; - sha256 = "sha256-SiE3t26giRwNMJHGpeSzEO0nFjXS+bms4pRydOGWQyI="; + sha256 = "sha256-keKyuNeDC/90pn89KjoDTO8AGsmI8nqfDNSeGyM6iHQ="; }; # https://github.com/aws/aws-cli/issues/4837 From 4a30b500f28f7407b0717d896ec88ed2374d384f Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Thu, 15 Apr 2021 11:15:40 -0400 Subject: [PATCH 103/230] python3Packages.sagemaker: 2.34.0 -> 2.35.0 --- pkgs/development/python-modules/sagemaker/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/sagemaker/default.nix b/pkgs/development/python-modules/sagemaker/default.nix index 7b173e7a9c2..f0e7b6233dd 100644 --- a/pkgs/development/python-modules/sagemaker/default.nix +++ b/pkgs/development/python-modules/sagemaker/default.nix @@ -15,11 +15,11 @@ buildPythonPackage rec { pname = "sagemaker"; - version = "2.34.0"; + version = "2.35.0"; src = fetchPypi { inherit pname version; - sha256 = "sha256-j0YlFh5SG1PlBN5vWZ9bLuOKcO03pDwoOB44CMyvXPk="; + sha256 = "sha256-12YYUZbctM6oRaC7Sr/hOghAM+s/Cdm5XWHaVU5Gg6Q="; }; pythonImportsCheck = [ From 5c3a1c28086b8d4f1443fb39d6c4bd26e2e2c7a6 Mon Sep 17 00:00:00 2001 From: Nikolay Korotkiy Date: Tue, 13 Apr 2021 09:38:37 +0300 Subject: [PATCH 104/230] =?UTF-8?q?nnn:=203.6=20=E2=86=92=204.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/applications/misc/nnn/default.nix | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/misc/nnn/default.nix b/pkgs/applications/misc/nnn/default.nix index a39e8267cf7..6fd68779f4f 100644 --- a/pkgs/applications/misc/nnn/default.nix +++ b/pkgs/applications/misc/nnn/default.nix @@ -1,4 +1,5 @@ -{ lib, stdenv, fetchFromGitHub, pkg-config, ncurses, readline +{ lib, stdenv, fetchFromGitHub, pkg-config, makeWrapper, ncurses, readline +, archivemount, atool, fzf, libarchive, rclone, sshfs, unzip, vlock , conf ? null, withIcons ? false, withNerdIcons ? false }: # Mutually exclusive options @@ -7,19 +8,19 @@ assert withNerdIcons -> withIcons == false; stdenv.mkDerivation rec { pname = "nnn"; - version = "3.6"; + version = "4.0"; src = fetchFromGitHub { owner = "jarun"; repo = pname; rev = "v${version}"; - sha256 = "1hwv7ncp8pmzdir30877ni4qlmczmb3yjdkbfd1pssr08y1srsc7"; + sha256 = "0cbxgss9j0bvsp3czjx1kpm9id7c5xxmjfnvjyk3pfd69ygif2kl"; }; configFile = lib.optionalString (conf != null) (builtins.toFile "nnn.h" conf); preBuild = lib.optionalString (conf != null) "cp ${configFile} src/nnn.h"; - nativeBuildInputs = [ pkg-config ]; + nativeBuildInputs = [ pkg-config makeWrapper ]; buildInputs = [ readline ncurses ]; makeFlags = [ "PREFIX=$(out)" ] @@ -31,6 +32,9 @@ stdenv.mkDerivation rec { install -Dm555 misc/auto-completion/bash/nnn-completion.bash $out/share/bash-completion/completions/nnn.bash install -Dm555 misc/auto-completion/zsh/_nnn -t $out/share/zsh/site-functions install -Dm555 misc/auto-completion/fish/nnn.fish -t $out/share/fish/vendor_completions.d + + wrapProgram $out/bin/nnn \ + --prefix PATH : ${lib.makeBinPath [ archivemount atool fzf libarchive rclone sshfs unzip vlock ]} ''; meta = with lib; { From 33042340a70b8b0aa8a01dfd83798c285d99d013 Mon Sep 17 00:00:00 2001 From: sternenseemann <0rpkxez4ksa01gb3typccl0i@systemli.org> Date: Thu, 15 Apr 2021 18:22:49 +0200 Subject: [PATCH 105/230] haskellPackages.essence-of-live-coding-warp: fix eval and build No idea why essence-of-live-coding-warp constrains on >= 0.2.5, but if it breaks something jailbreaking this then it's on them for not following PVP, I guess. --- pkgs/development/haskell-modules/configuration-common.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index c228527d0cc..4338d58a69a 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -1563,9 +1563,9 @@ self: super: { ); # 2020-12-05: http-client is fixed on too old version - essence-of-live-coding-warp = super.essence-of-live-coding-warp.override { - http-client = self.http-client_0_7_6; - }; + essence-of-live-coding-warp = doJailbreak (super.essence-of-live-coding-warp.override { + http-client = self.http-client_0_7_7; + }); # 2020-12-06: Restrictive upper bounds w.r.t. pandoc-types (https://github.com/owickstrom/pandoc-include-code/issues/27) pandoc-include-code = doJailbreak super.pandoc-include-code; From be4d9d61551dc4ada7e2c18594d88a1c96840fd0 Mon Sep 17 00:00:00 2001 From: Payas Relekar Date: Thu, 15 Apr 2021 21:54:55 +0530 Subject: [PATCH 106/230] go-org: 1.4.0 -> 1.5.0 --- pkgs/applications/misc/go-org/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/go-org/default.nix b/pkgs/applications/misc/go-org/default.nix index cc2225af07c..3e3bc67e897 100644 --- a/pkgs/applications/misc/go-org/default.nix +++ b/pkgs/applications/misc/go-org/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "go-org"; - version = "1.4.0"; + version = "1.5.0"; src = fetchFromGitHub { owner = "niklasfasching"; repo = pname; rev = "v${version}"; - sha256 = "sha256-nMZzRbu3lxunIlnnmb49Ljt8oSiYpj+8gZ0u/OFRRDM="; + sha256 = "sha256-Wp8WEfRcrtn+VdcbehYcOJI5FkPQiyo6nLsTDvR7riE="; }; vendorSha256 = "sha256-njx89Ims7GZql8sbVmH/E9gM/ONRWiPRLVs+FzsCSzI="; From 28887e7fe535dd71a5b1ad636aacf64cede6cc46 Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Thu, 15 Apr 2021 18:41:38 +0200 Subject: [PATCH 107/230] llvmPackages_12: Improve and extend the meta attributes --- .../compilers/llvm/12/clang/default.nix | 25 +++++++++++----- .../compilers/llvm/12/compiler-rt/default.nix | 17 ++++++++++- .../development/compilers/llvm/12/default.nix | 25 +++++++++++----- .../compilers/llvm/12/libc++/default.nix | 15 ++++++---- .../compilers/llvm/12/libc++abi/default.nix | 16 ++++++---- .../compilers/llvm/12/libunwind/default.nix | 14 ++++++++- .../compilers/llvm/12/lld/default.nix | 18 ++++++++---- .../compilers/llvm/12/lldb/default.nix | 18 ++++++++---- .../compilers/llvm/12/llvm/default.nix | 29 ++++++++++++++----- pkgs/development/compilers/llvm/12/openmp.nix | 19 ++++++++---- 10 files changed, 144 insertions(+), 52 deletions(-) diff --git a/pkgs/development/compilers/llvm/12/clang/default.nix b/pkgs/development/compilers/llvm/12/clang/default.nix index 169f2f27306..ab329e3d85d 100644 --- a/pkgs/development/compilers/llvm/12/clang/default.nix +++ b/pkgs/development/compilers/llvm/12/clang/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetch, cmake, libxml2, llvm, version, clang-tools-extra_src, python3, lld +{ lib, stdenv, llvm_meta, fetch, cmake, libxml2, llvm, version, clang-tools-extra_src, python3, lld , fixDarwinDylibNames , enableManpages ? false }: @@ -82,11 +82,20 @@ let inherit llvm; }; - meta = { - description = "A c, c++, objective-c, and objective-c++ frontend for the llvm compiler"; - homepage = "https://llvm.org/"; - license = lib.licenses.ncsa; - platforms = lib.platforms.all; + meta = llvm_meta // { + homepage = "https://clang.llvm.org/"; + description = "A C language family frontend for LLVM"; + longDescription = '' + The Clang project provides a language front-end and tooling + infrastructure for languages in the C language family (C, C++, Objective + C/C++, OpenCL, CUDA, and RenderScript) for the LLVM project. + It aims to deliver amazingly fast compiles, extremely useful error and + warning messages and to provide a platform for building great source + level tools. The Clang Static Analyzer and clang-tidy are tools that + automatically find bugs in your code, and are great examples of the sort + of tools that can be built using the Clang frontend as a library to + parse C/C++ code. + ''; }; } // lib.optionalAttrs enableManpages { pname = "clang-manpages"; @@ -105,6 +114,8 @@ let doCheck = false; - meta.description = "man page for Clang ${version}"; + meta = llvm_meta // { + description = "man page for Clang ${version}"; + }; }); in self diff --git a/pkgs/development/compilers/llvm/12/compiler-rt/default.nix b/pkgs/development/compilers/llvm/12/compiler-rt/default.nix index e4c2295a0d7..bf7f4bc4312 100644 --- a/pkgs/development/compilers/llvm/12/compiler-rt/default.nix +++ b/pkgs/development/compilers/llvm/12/compiler-rt/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, version, fetch, cmake, python3, llvm, libcxxabi }: +{ lib, stdenv, llvm_meta, version, fetch, cmake, python3, llvm, libcxxabi }: let @@ -87,4 +87,19 @@ stdenv.mkDerivation rec { ln -s $out/lib/*/clang_rt.crtend_shared-*.o $out/lib/crtendS.o ''; + meta = llvm_meta // { + homepage = "https://compiler-rt.llvm.org/"; + description = "Compiler runtime libraries"; + longDescription = '' + The compiler-rt project provides highly tuned implementations of the + low-level code generator support routines like "__fixunsdfdi" and other + calls generated when a target doesn't have a short sequence of native + instructions to implement a core IR operation. It also provides + implementations of run-time libraries for dynamic testing tools such as + AddressSanitizer, ThreadSanitizer, MemorySanitizer, and DataFlowSanitizer. + ''; + # "All of the code in the compiler-rt project is dual licensed under the MIT + # license and the UIUC License (a BSD-like license)": + license = with lib.licenses; [ mit ncsa ]; + }; } diff --git a/pkgs/development/compilers/llvm/12/default.nix b/pkgs/development/compilers/llvm/12/default.nix index c3e9cc5b499..00922ed96e2 100644 --- a/pkgs/development/compilers/llvm/12/default.nix +++ b/pkgs/development/compilers/llvm/12/default.nix @@ -20,6 +20,12 @@ let clang-tools-extra_src = fetch "clang-tools-extra" "0p3dzr0qa7mar83y66xa5m5apynf6ia0lsdsq6axwnm64ysy0hdd"; + llvm_meta = { + license = lib.licenses.ncsa; + maintainers = with lib.maintainers; [ lovek323 raskin dtzWill primeos ]; + platforms = lib.platforms.all; + }; + tools = lib.makeExtensible (tools: let callPackage = newScope (tools // { inherit stdenv cmake libxml2 python3 isl release_version version fetch; }); mkExtraBuildCommands = cc: '' @@ -30,13 +36,16 @@ let ln -s "${targetLlvmLibraries.compiler-rt.out}/share" "$rsrc/share" echo "-resource-dir=$rsrc" >> $out/nix-support/cc-cflags ''; + in { - llvm = callPackage ./llvm { }; + llvm = callPackage ./llvm { + inherit llvm_meta; + }; clang-unwrapped = callPackage ./clang { inherit (tools) lld; - inherit clang-tools-extra_src; + inherit clang-tools-extra_src llvm_meta; }; # disabled until recommonmark supports sphinx 3 @@ -81,10 +90,12 @@ let }; lld = callPackage ./lld { + inherit llvm_meta; libunwind = libraries.libunwind; }; lldb = callPackage ./lldb { + inherit llvm_meta; inherit (darwin) libobjc bootstrap_cmds; inherit (darwin.apple_sdk.libs) xpc; inherit (darwin.apple_sdk.frameworks) Foundation Carbon Cocoa; @@ -172,7 +183,7 @@ let callPackage = newScope (libraries // buildLlvmTools // { inherit stdenv cmake libxml2 python3 isl release_version version fetch; }); in { - compiler-rt = callPackage ./compiler-rt ({} // + compiler-rt = callPackage ./compiler-rt ({ inherit llvm_meta; } // (lib.optionalAttrs (stdenv.hostPlatform.useLLVM or false) { stdenv = overrideCC stdenv buildLlvmTools.lldClangNoCompilerRt; })); @@ -181,20 +192,20 @@ let libcxxStdenv = overrideCC stdenv buildLlvmTools.libcxxClang; - libcxx = callPackage ./libc++ ({} // + libcxx = callPackage ./libc++ ({ inherit llvm_meta; } // (lib.optionalAttrs (stdenv.hostPlatform.useLLVM or false) { stdenv = overrideCC stdenv buildLlvmTools.lldClangNoLibcxx; })); - libcxxabi = callPackage ./libc++abi ({} // + libcxxabi = callPackage ./libc++abi ({ inherit llvm_meta; } // (lib.optionalAttrs (stdenv.hostPlatform.useLLVM or false) { stdenv = overrideCC stdenv buildLlvmTools.lldClangNoLibcxx; libunwind = libraries.libunwind; })); - openmp = callPackage ./openmp.nix {}; + openmp = callPackage ./openmp.nix { inherit llvm_meta; }; - libunwind = callPackage ./libunwind ({} // + libunwind = callPackage ./libunwind ({ inherit llvm_meta; } // (lib.optionalAttrs (stdenv.hostPlatform.useLLVM or false) { stdenv = overrideCC stdenv buildLlvmTools.lldClangNoLibcxx; })); diff --git a/pkgs/development/compilers/llvm/12/libc++/default.nix b/pkgs/development/compilers/llvm/12/libc++/default.nix index ef845e0f7b0..d85d890879e 100644 --- a/pkgs/development/compilers/llvm/12/libc++/default.nix +++ b/pkgs/development/compilers/llvm/12/libc++/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetch, fetchpatch, cmake, python3, libcxxabi, llvm, fixDarwinDylibNames, version +{ lib, stdenv, llvm_meta, fetch, cmake, python3, libcxxabi, llvm, fixDarwinDylibNames, version , enableShared ? !stdenv.hostPlatform.isStatic }: @@ -40,10 +40,15 @@ stdenv.mkDerivation { isLLVM = true; }; - meta = { + meta = llvm_meta // { homepage = "https://libcxx.llvm.org/"; - description = "A new implementation of the C++ standard library, targeting C++11"; - license = with lib.licenses; [ ncsa mit ]; - platforms = lib.platforms.all; + description = "C++ standard library"; + longDescription = '' + libc++ is an implementation of the C++ standard library, targeting C++11, + C++14 and above. + ''; + # "All of the code in libc++ is dual licensed under the MIT license and the + # UIUC License (a BSD-like license)": + license = with lib.licenses; [ mit ncsa ]; }; } diff --git a/pkgs/development/compilers/llvm/12/libc++abi/default.nix b/pkgs/development/compilers/llvm/12/libc++abi/default.nix index 6aff7872753..22ec211a3b0 100644 --- a/pkgs/development/compilers/llvm/12/libc++abi/default.nix +++ b/pkgs/development/compilers/llvm/12/libc++abi/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, cmake, python3, fetch, libcxx, libunwind, llvm, version +{ lib, stdenv, llvm_meta, cmake, python3, fetch, libcxx, libunwind, llvm, version , enableShared ? !stdenv.hostPlatform.isStatic }: @@ -57,11 +57,15 @@ stdenv.mkDerivation { ln -s libc++abi.so.1.0 $out/lib/libc++abi.so.1 ''; - meta = { + meta = llvm_meta // { homepage = "https://libcxxabi.llvm.org/"; - description = "A new implementation of low level support for a standard C++ library"; - license = with lib.licenses; [ ncsa mit ]; - maintainers = with lib.maintainers; [ vlstill ]; - platforms = lib.platforms.all; + description = "Provides C++ standard library support"; + longDescription = '' + libc++abi is a new implementation of low level support for a standard C++ library. + ''; + # "All of the code in libc++abi is dual licensed under the MIT license and + # the UIUC License (a BSD-like license)": + license = with lib.licenses; [ mit ncsa ]; + maintainers = llvm_meta.maintainers ++ [ lib.maintainers.vlstill ]; }; } diff --git a/pkgs/development/compilers/llvm/12/libunwind/default.nix b/pkgs/development/compilers/llvm/12/libunwind/default.nix index 56ee98176d2..8b75146d7b2 100644 --- a/pkgs/development/compilers/llvm/12/libunwind/default.nix +++ b/pkgs/development/compilers/llvm/12/libunwind/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, version, fetch, libcxx, llvm, cmake +{ lib, stdenv, llvm_meta, version, fetch, libcxx, llvm, cmake , enableShared ? !stdenv.hostPlatform.isStatic }: @@ -18,4 +18,16 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake ]; cmakeFlags = lib.optional (!enableShared) "-DLIBUNWIND_ENABLE_SHARED=OFF"; + + meta = llvm_meta // { + # Details: https://github.com/llvm/llvm-project/blob/main/libunwind/docs/index.rst + homepage = "https://clang.llvm.org/docs/Toolchain.html#unwind-library"; + description = "LLVM's unwinder library"; + longDescription = '' + The unwind library provides a family of _Unwind_* functions implementing + the language-neutral stack unwinding portion of the Itanium C++ ABI (Level + I). It is a dependency of the C++ ABI library, and sometimes is a + dependency of other runtimes. + ''; + }; } diff --git a/pkgs/development/compilers/llvm/12/lld/default.nix b/pkgs/development/compilers/llvm/12/lld/default.nix index 1d983f13c0f..18b72a90407 100644 --- a/pkgs/development/compilers/llvm/12/lld/default.nix +++ b/pkgs/development/compilers/llvm/12/lld/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib, stdenv, llvm_meta , fetch , libunwind , cmake @@ -30,10 +30,16 @@ stdenv.mkDerivation rec { moveToOutput lib "$dev" ''; - meta = { - description = "The LLVM Linker"; - homepage = "https://lld.llvm.org/"; - license = lib.licenses.ncsa; - platforms = lib.platforms.all; + meta = llvm_meta // { + homepage = "https://lld.llvm.org/"; + description = "The LLVM linker"; + longDescription = '' + LLD is a linker from the LLVM project that is a drop-in replacement for + system linkers and runs much faster than them. It also provides features + that are useful for toolchain developers. + The linker supports ELF (Unix), PE/COFF (Windows), Mach-O (macOS) and + WebAssembly in descending order of completeness. Internally, LLD consists + of several different linkers. + ''; }; } diff --git a/pkgs/development/compilers/llvm/12/lldb/default.nix b/pkgs/development/compilers/llvm/12/lldb/default.nix index 7996487a2a8..1fce82d7990 100644 --- a/pkgs/development/compilers/llvm/12/lldb/default.nix +++ b/pkgs/development/compilers/llvm/12/lldb/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib, stdenv, llvm_meta , fetch , cmake , zlib @@ -72,11 +72,15 @@ stdenv.mkDerivation (rec { ln -s $out/bin/lldb-vscode $out/share/vscode/extensions/llvm-org.lldb-vscode-0.1.0/bin ''; - meta = with lib; { + meta = llvm_meta // { + homepage = "https://lldb.llvm.org/"; description = "A next-generation high-performance debugger"; - homepage = "https://lldb.llvm.org"; - license = licenses.ncsa; - platforms = platforms.all; + longDescription = '' + LLDB is a next generation, high-performance debugger. It is built as a set + of reusable components which highly leverage existing libraries in the + larger LLVM Project, such as the Clang expression parser and LLVM + disassembler. + ''; }; } // lib.optionalAttrs enableManpages { pname = "lldb-manpages"; @@ -99,5 +103,7 @@ stdenv.mkDerivation (rec { doCheck = false; - meta.description = "man pages for LLDB ${version}"; + meta = llvm_meta // { + description = "man pages for LLDB ${version}"; + }; }) diff --git a/pkgs/development/compilers/llvm/12/llvm/default.nix b/pkgs/development/compilers/llvm/12/llvm/default.nix index 351b5b87940..0d0075fddc7 100644 --- a/pkgs/development/compilers/llvm/12/llvm/default.nix +++ b/pkgs/development/compilers/llvm/12/llvm/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib, stdenv, llvm_meta , fetch , cmake , python3 @@ -160,12 +160,23 @@ in stdenv.mkDerivation (rec { checkTarget = "check-all"; requiredSystemFeatures = [ "big-parallel" ]; - meta = { - description = "Collection of modular and reusable compiler and toolchain technologies"; - homepage = "https://llvm.org/"; - license = lib.licenses.ncsa; - maintainers = with lib.maintainers; [ lovek323 raskin dtzWill primeos ]; - platforms = lib.platforms.all; + meta = llvm_meta // { + homepage = "https://llvm.org/"; + description = "A collection of modular and reusable compiler and toolchain technologies"; + longDescription = '' + The LLVM Project is a collection of modular and reusable compiler and + toolchain technologies. Despite its name, LLVM has little to do with + traditional virtual machines. The name "LLVM" itself is not an acronym; it + is the full name of the project. + LLVM began as a research project at the University of Illinois, with the + goal of providing a modern, SSA-based compilation strategy capable of + supporting both static and dynamic compilation of arbitrary programming + languages. Since then, LLVM has grown to be an umbrella project consisting + of a number of subprojects, many of which are being used in production by + a wide variety of commercial and open source projects as well as being + widely used in academic research. Code in the LLVM project is licensed + under the "Apache 2.0 License with LLVM exceptions". + ''; }; } // lib.optionalAttrs enableManpages { pname = "llvm-manpages"; @@ -185,5 +196,7 @@ in stdenv.mkDerivation (rec { doCheck = false; - meta.description = "man pages for LLVM ${version}"; + meta = llvm_meta // { + description = "man pages for LLVM ${version}"; + }; }) diff --git a/pkgs/development/compilers/llvm/12/openmp.nix b/pkgs/development/compilers/llvm/12/openmp.nix index 07c1c2b0aed..c107258dd18 100644 --- a/pkgs/development/compilers/llvm/12/openmp.nix +++ b/pkgs/development/compilers/llvm/12/openmp.nix @@ -1,5 +1,6 @@ { lib , stdenv +, llvm_meta , fetch , cmake , llvm @@ -16,10 +17,18 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake perl ]; buildInputs = [ llvm ]; - meta = { - description = "Components required to build an executable OpenMP program"; - homepage = "https://openmp.llvm.org/"; - license = lib.licenses.mit; - platforms = lib.platforms.all; + meta = llvm_meta // { + homepage = "https://openmp.llvm.org/"; + description = "Support for the OpenMP language"; + longDescription = '' + The OpenMP subproject of LLVM contains the components required to build an + executable OpenMP program that are outside the compiler itself. + Contains the code for the runtime library against which code compiled by + "clang -fopenmp" must be linked before it can run and the library that + supports offload to target devices. + ''; + # "All of the code is dual licensed under the MIT license and the UIUC + # License (a BSD-like license)": + license = with lib.licenses; [ mit ncsa ]; }; } From 80e725f3dc9daff0b720b4cb7d7088cdc65e015d Mon Sep 17 00:00:00 2001 From: Mathnerd314 Date: Wed, 31 Mar 2021 16:58:36 -0600 Subject: [PATCH 108/230] sphinx_rtd_theme: 0.4.3 -> 0.5.1 --- .../python-modules/sphinx_rtd_theme/default.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/sphinx_rtd_theme/default.nix b/pkgs/development/python-modules/sphinx_rtd_theme/default.nix index 3062f35669e..06338ec118f 100644 --- a/pkgs/development/python-modules/sphinx_rtd_theme/default.nix +++ b/pkgs/development/python-modules/sphinx_rtd_theme/default.nix @@ -12,12 +12,13 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "eda689eda0c7301a80cf122dad28b1861e5605cbf455558f3775e1e8200e83a5"; + sha256 = "19c31qhfiqbm6y7mamglrc2mc7l6n4lasb8jry01lc67l3nqk9pd"; }; propagatedBuildInputs = [ sphinx ]; checkInputs = [ readthedocs-sphinx-ext pytest ]; + CI=1; # Don't use NPM to fetch assets. Assets are included in sdist. checkPhase = '' py.test @@ -25,8 +26,8 @@ buildPythonPackage rec { meta = with lib; { description = "ReadTheDocs.org theme for Sphinx"; - homepage = "https://github.com/snide/sphinx_rtd_theme/"; - license = licenses.bsd3; + homepage = "https://github.com/readthedocs/sphinx_rtd_theme"; + license = licenses.mit; platforms = platforms.unix; }; From ebf3d444cbad5a31a5b772fd50928c994ef27e25 Mon Sep 17 00:00:00 2001 From: Doron Behar Date: Thu, 15 Apr 2021 09:04:59 +0300 Subject: [PATCH 109/230] mailspring: 1.8.0 -> 1.9.0 - Remove now unneeded override for gtk3. - Add pre and post hooks for explicit phases. - Add doronbehar as maintainer. - Update license, see: https://community.getmailspring.com/t/a-free-open-source-future-for-mailspring/484 --- .../mailreaders/mailspring/default.nix | 24 ++++++++++++------- 1 file changed, 15 insertions(+), 9 deletions(-) diff --git a/pkgs/applications/networking/mailreaders/mailspring/default.nix b/pkgs/applications/networking/mailreaders/mailspring/default.nix index f0f3bdb3ff4..9389b7576c3 100644 --- a/pkgs/applications/networking/mailreaders/mailspring/default.nix +++ b/pkgs/applications/networking/mailreaders/mailspring/default.nix @@ -18,11 +18,11 @@ stdenv.mkDerivation rec { pname = "mailspring"; - version = "1.8.0"; + version = "1.9.0"; src = fetchurl { url = "https://github.com/Foundry376/Mailspring/releases/download/${version}/mailspring-${version}-amd64.deb"; - sha256 = "BtzYcHN87qH7s3GiBrsDfmuy9v2xdhCeSShu8+T9T3E="; + sha256 = "ISwNFR8M377+J7WoG9MlblF8r5yRTgCxEGszZCjqW/k="; }; nativeBuildInputs = [ @@ -34,9 +34,7 @@ stdenv.mkDerivation rec { alsaLib db glib - # We don't know why with trackerSupport the executable fail to launch, See: - # https://github.com/NixOS/nixpkgs/issues/106732 - (gtk3.override {trackerSupport = false; }) + gtk3 libkrb5 libsecret nss @@ -52,10 +50,16 @@ stdenv.mkDerivation rec { ]; unpackPhase = '' + runHook preUnpack + dpkg -x $src . + + runHook postUnpack ''; installPhase = '' + runHook preInstall + mkdir -p $out/{bin,lib} cp -ar ./usr/share $out @@ -64,11 +68,13 @@ stdenv.mkDerivation rec { ln -s $out/share/mailspring/mailspring $out/bin/mailspring ln -s ${openssl.out}/lib/libcrypto.so $out/lib/libcrypto.so.1.0.0 + + runHook postInstall ''; postFixup = /* sh */ '' - substituteInPlace $out/share/applications/mailspring.desktop \ - --replace /usr/bin $out/bin + substituteInPlace $out/share/applications/Mailspring.desktop \ + --replace Exec=mailspring Exec=$out/bin/mailspring ''; meta = with lib; { @@ -77,8 +83,8 @@ stdenv.mkDerivation rec { Mailspring is an open-source mail client forked from Nylas Mail and built with Electron. Mailspring's sync engine runs locally, but its source is not open. ''; - license = licenses.unfree; - maintainers = with maintainers; [ toschmidt ]; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ toschmidt doronbehar ]; homepage = "https://getmailspring.com"; downloadPage = "https://github.com/Foundry376/Mailspring"; platforms = platforms.x86_64; From 99c55b865d01702c6f00ae565cf4a395527e8409 Mon Sep 17 00:00:00 2001 From: Austin Seipp Date: Thu, 15 Apr 2021 12:50:29 -0500 Subject: [PATCH 110/230] firecracker: 0.23.0 -> 0.24.2 Signed-off-by: Austin Seipp --- .../virtualization/firecracker/default.nix | 29 ++++++++----------- 1 file changed, 12 insertions(+), 17 deletions(-) diff --git a/pkgs/applications/virtualization/firecracker/default.nix b/pkgs/applications/virtualization/firecracker/default.nix index f041ea7460c..a632640e900 100644 --- a/pkgs/applications/virtualization/firecracker/default.nix +++ b/pkgs/applications/virtualization/firecracker/default.nix @@ -1,7 +1,7 @@ { fetchurl, lib, stdenv }: let - version = "0.23.0"; + version = "0.24.2"; suffix = { x86_64-linux = "x86_64"; @@ -9,33 +9,28 @@ let }."${stdenv.hostPlatform.system}" or (throw "Unsupported system: ${stdenv.hostPlatform.system}"); baseurl = "https://github.com/firecracker-microvm/firecracker/releases/download"; - fetchbin = name: sha256: fetchurl { - url = "${baseurl}/v${version}/${name}-v${version}-${suffix}"; + + dlbin = sha256: fetchurl { + url = "${baseurl}/v${version}/firecracker-v${version}-${suffix}.tgz"; sha256 = sha256."${stdenv.hostPlatform.system}"; }; - firecracker-bin = fetchbin "firecracker" { - x86_64-linux = "11h6qkq55y1w0mlkfkbnpxxai73rzxkiz07i747m7a9azbrmldp8"; - aarch64-linux = "0zyx7md54w0fhqk1anfyjfdqrkg2mjyy17y9jk17p34yrw8j9y29"; - }; - - jailer-bin = fetchbin "jailer" { - x86_64-linux = "15slr2azqvyqlhvlh7zk1n0rkfq282kj0pllp19r0yl1w8ns1gw5"; - aarch64-linux = "1d92jhd6fb7w7ciz15rcfp8jf74r2503w2fl1b6pznpc8h4qscfd"; - }; - in stdenv.mkDerivation { pname = "firecracker"; inherit version; - srcs = [ firecracker-bin jailer-bin ]; - unpackPhase = ":"; + sourceRoot = "."; + src = dlbin { + x86_64-linux = "0l7x9sfyx52n0mwrmicdcnhm8z10q57kk1a5wf459l8lvp59xw08"; + aarch64-linux = "0m7xs12g97z1ipzaf7dgknf3azlah0p6bdr9i454azvzg955238b"; + }; + configurePhase = ":"; buildPhase = '' - cp ${firecracker-bin} firecracker - cp ${jailer-bin} jailer + mv firecracker-* firecracker + mv jailer-* jailer chmod +x firecracker jailer ''; From 9f9ca66df66d7ff0760a2d210cdfdf3a6805f6e2 Mon Sep 17 00:00:00 2001 From: Alex Wied Date: Thu, 15 Apr 2021 14:25:02 -0400 Subject: [PATCH 111/230] openethereum: 3.2.1 -> 3.2.3 See: https://github.com/openethereum/openethereum/pull/366 --- pkgs/applications/blockchains/openethereum/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/blockchains/openethereum/default.nix b/pkgs/applications/blockchains/openethereum/default.nix index e4d8d72fb4c..6c70a10810f 100644 --- a/pkgs/applications/blockchains/openethereum/default.nix +++ b/pkgs/applications/blockchains/openethereum/default.nix @@ -12,16 +12,16 @@ rustPlatform.buildRustPackage rec { pname = "openethereum"; - version = "3.2.1"; + version = "3.2.3"; src = fetchFromGitHub { owner = "openethereum"; repo = "openethereum"; rev = "v${version}"; - sha256 = "sha256-+bzMo0s+wdp8T/YjPk6mrPSPid1G8WScB8FJhXdL9JQ="; + sha256 = "1j7wfgpnvf9pcprd53sbd3pa7yz9588z81i1bx12wmj1fja3xa0j"; }; - cargoSha256 = "sha256-ibjjJ5zGF6wbO24/RoYKsTYsMNXHb1EdekDwSICPc5g="; + cargoSha256 = "1qgl15sd32s0r4q5xmx7lyp92sc81hd4ddc18ynbxjdxgl7knm4k"; LIBCLANG_PATH = "${llvmPackages.libclang}/lib"; nativeBuildInputs = [ From 692e6c9cf55c55e3b62b717f1f83a417017b76ce Mon Sep 17 00:00:00 2001 From: ajs124 Date: Thu, 15 Apr 2021 20:39:02 +0200 Subject: [PATCH 112/230] Revert "Merge pull request #117702 from edude03/patch-4" This reverts commit bc5c0c559f1c93ccea9a7f21066b6314831bea3d, reversing changes made to 44dac5f5c69c2c72f3b2018ec681e477e0fc6a6c. --- pkgs/development/ruby-modules/gem-config/default.nix | 4 ---- 1 file changed, 4 deletions(-) diff --git a/pkgs/development/ruby-modules/gem-config/default.nix b/pkgs/development/ruby-modules/gem-config/default.nix index 6a374ad246a..99c535fa338 100644 --- a/pkgs/development/ruby-modules/gem-config/default.nix +++ b/pkgs/development/ruby-modules/gem-config/default.nix @@ -394,10 +394,6 @@ in ''; }; - mimemagic = attrs: { - FREEDESKTOP_MIME_TYPES_PATH="${shared-mime-info}/share/mime/packages/freedesktop.org.xml"; - }; - msgpack = attrs: { buildInputs = [ msgpack ]; }; From 2299a2f3cc8721d36ddbfbac6c84d007183ac01b Mon Sep 17 00:00:00 2001 From: Alex Wied Date: Thu, 15 Apr 2021 14:48:29 -0400 Subject: [PATCH 113/230] openethereum: Update Cargo hash --- pkgs/applications/blockchains/openethereum/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/blockchains/openethereum/default.nix b/pkgs/applications/blockchains/openethereum/default.nix index 6c70a10810f..5b51d162d0f 100644 --- a/pkgs/applications/blockchains/openethereum/default.nix +++ b/pkgs/applications/blockchains/openethereum/default.nix @@ -21,7 +21,7 @@ rustPlatform.buildRustPackage rec { sha256 = "1j7wfgpnvf9pcprd53sbd3pa7yz9588z81i1bx12wmj1fja3xa0j"; }; - cargoSha256 = "1qgl15sd32s0r4q5xmx7lyp92sc81hd4ddc18ynbxjdxgl7knm4k"; + cargoSha256 = "0ha18caw8mxzrh984y2z148cmdijrjxf0rc8j4ccwvmrbdsaz1xn"; LIBCLANG_PATH = "${llvmPackages.libclang}/lib"; nativeBuildInputs = [ From 33ffc32fb4f86c844c70304f1164dacdec8971d1 Mon Sep 17 00:00:00 2001 From: fortuneteller2k Date: Thu, 15 Apr 2021 12:49:33 +0800 Subject: [PATCH 114/230] neocomp: 2019-03-12 -> unstable-2021-04-06 --- .../window-managers/neocomp/default.nix | 31 ++++++++++--------- 1 file changed, 17 insertions(+), 14 deletions(-) diff --git a/pkgs/applications/window-managers/neocomp/default.nix b/pkgs/applications/window-managers/neocomp/default.nix index bf017ae085a..e878f4f088e 100644 --- a/pkgs/applications/window-managers/neocomp/default.nix +++ b/pkgs/applications/window-managers/neocomp/default.nix @@ -16,27 +16,30 @@ , libXinerama , libXrandr , libXrender +, libXres , pcre , pkg-config }: -let - rev = "v0.6-17-g271e784"; -in + stdenv.mkDerivation rec { - pname = "neocomp-unstable"; - version = "2019-03-12"; + pname = "neocomp"; + version = "unstable-2021-04-06"; src = fetchFromGitHub { - inherit rev; - owner = "DelusionalLogic"; - repo = "NeoComp"; - sha256 = "1mp338vz1jm5pwf7pi5azx4hzykmvpkwzx1kw6a9anj272f32zpg"; + owner = "DelusionalLogic"; + repo = "NeoComp"; + rev = "ccd340d7b2dcd3f828aff958a638cc23686aee6f"; + sha256 = "sha256-tLLEwpAGNVTC+N41bM7pfskIli4Yvc95wH2/NT0OZ+8="; }; - buildInputs = [ + nativeBuildInputs = [ asciidoc docbook_xml_dtd_45 docbook_xsl + pkg-config + ]; + + buildInputs = [ freetype judy libGL @@ -50,15 +53,15 @@ stdenv.mkDerivation rec { libXinerama libXrandr libXrender + libXres pcre - pkg-config ]; makeFlags = [ "PREFIX=${placeholder "out"}" "CFGDIR=${placeholder "out"}/etc/xdg/neocomp" "ASTDIR=${placeholder "out"}/share/neocomp/assets" - "COMPTON_VERSION=git-${rev}-${version}" + "COMPTON_VERSION=${version}" ]; postPatch = '' @@ -72,8 +75,8 @@ stdenv.mkDerivation rec { meta = with lib; { homepage = "https://github.com/DelusionalLogic/NeoComp"; - license = licenses.gpl3; - maintainers = with maintainers; [ twey ]; + license = licenses.gpl3Only; + maintainers = with maintainers; [ twey fortuneteller2k ]; platforms = platforms.linux; description = "A fork of Compton, a compositor for X11"; longDescription = '' From 9c6b229442a667cbaab070b3920091ea6eeac30a Mon Sep 17 00:00:00 2001 From: Serval Date: Fri, 16 Apr 2021 03:20:06 +0800 Subject: [PATCH 115/230] v2ray: 4.37.0 -> 4.37.3 --- pkgs/tools/networking/v2ray/default.nix | 14 +++++++------- pkgs/top-level/all-packages.nix | 4 +--- 2 files changed, 8 insertions(+), 10 deletions(-) diff --git a/pkgs/tools/networking/v2ray/default.nix b/pkgs/tools/networking/v2ray/default.nix index 5181216e1c0..b525f78c424 100644 --- a/pkgs/tools/networking/v2ray/default.nix +++ b/pkgs/tools/networking/v2ray/default.nix @@ -3,22 +3,22 @@ }: let - version = "4.37.0"; + version = "4.37.3"; src = fetchFromGitHub { owner = "v2fly"; repo = "v2ray-core"; rev = "v${version}"; - sha256 = "00bw91n7210gsnc7bw2spl6k1yl2i7d1j55w98qf4rvn80z9d59r"; + sha256 = "0gbkjlrx4ddaxb5f21m3sxbb55ilvm5kqlrys6ckrx0xyz9hj38y"; }; - vendorSha256 = "sha256-sc001qWdmhhaUh0nmvaqwwVE2Ee8IFWYi4K8aAURWBE="; + vendorSha256 = "sha256-hPzIAXImAEJux1VRqCgslgn8giTf9BgZBcEZyF4Ut9Y="; assets = { # MIT licensed "geoip.dat" = let - geoipRev = "202104010913"; - geoipSha256 = "1kq6d68ii9hr2w0caxacqh5q8jran154b99aik4g7ripgx7lckpr"; + geoipRev = "202104150006"; + geoipSha256 = "0ppm5r4bycjm7q0vnxj62q8639kp06sfkkkrkk5gibyrwisr4vrp"; in fetchurl { url = "https://github.com/v2fly/geoip/releases/download/${geoipRev}/geoip.dat"; sha256 = geoipSha256; @@ -26,8 +26,8 @@ let # MIT licensed "geosite.dat" = let - geositeRev = "20210403111045"; - geositeSha256 = "1b64yci0dmvw9divfv3njpzczz2ag3cnvyr29c2mk8y85vp05ysc"; + geositeRev = "20210415054336"; + geositeSha256 = "0vs9fjbw45ipi7minh0r8zgh3pbwxqlrhwahpwyc6s0hyxgdi40w"; in fetchurl { url = "https://github.com/v2fly/domain-list-community/releases/download/${geositeRev}/dlc.dat"; sha256 = geositeSha256; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 17c84cbd0e4..94fbc684d91 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -9033,9 +9033,7 @@ in uwsgi = callPackage ../servers/uwsgi { }; - v2ray = callPackage ../tools/networking/v2ray { - buildGoModule = buildGo115Module; - }; + v2ray = callPackage ../tools/networking/v2ray { }; vacuum = callPackage ../applications/networking/instant-messengers/vacuum {}; From 004e80f8ae429b4b267942907d01d34f256f141f Mon Sep 17 00:00:00 2001 From: Felix Tenley Date: Thu, 15 Apr 2021 20:45:08 +0200 Subject: [PATCH 116/230] nixos/etebase-server: set users.users.etebase-server.isSystemUser - setting users.users.name.{isSystemUser,isNormalUser} is required since #115332 --- nixos/modules/services/misc/etebase-server.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/nixos/modules/services/misc/etebase-server.nix b/nixos/modules/services/misc/etebase-server.nix index 31e0952b5b9..32a5a3ad8bd 100644 --- a/nixos/modules/services/misc/etebase-server.nix +++ b/nixos/modules/services/misc/etebase-server.nix @@ -211,6 +211,7 @@ in users = optionalAttrs (cfg.user == defaultUser) { users.${defaultUser} = { + isSystemUser = true; group = defaultUser; home = cfg.dataDir; }; From 6a71d0b6bf9344b92c9db60643bd17605d23ef56 Mon Sep 17 00:00:00 2001 From: AndersonTorres Date: Thu, 15 Apr 2021 11:49:02 -0300 Subject: [PATCH 117/230] guile-cairo: rewrite --- .../guile-modules/guile-cairo/default.nix | 26 ++++++++++++++----- 1 file changed, 20 insertions(+), 6 deletions(-) diff --git a/pkgs/development/guile-modules/guile-cairo/default.nix b/pkgs/development/guile-modules/guile-cairo/default.nix index 15e3ccbb972..1ea76cb237d 100644 --- a/pkgs/development/guile-modules/guile-cairo/default.nix +++ b/pkgs/development/guile-modules/guile-cairo/default.nix @@ -1,23 +1,38 @@ -{ lib, stdenv, fetchurl, pkg-config, guile, guile-lib, cairo, expat }: +{ lib +, stdenv +, fetchurl +, cairo +, expat +, guile +, guile-lib +, pkg-config +}: stdenv.mkDerivation rec { pname = "guile-cairo"; version = "1.11.2"; src = fetchurl { - url = "mirror://savannah/guile-cairo/${pname}-${version}.tar.gz"; - sha256 = "0yx0844p61ljd4d3d63qrawiygiw6ks02fwv2cqx7nav5kfd8ck2"; + url = "mirror://savannah/${pname}/${pname}-${version}.tar.gz"; + hash = "sha256-YjLU3Cxb2dMxE5s7AfQ0PD4fucp4mDYaaZIGcwlBoHs="; }; - nativeBuildInputs = [ pkg-config ]; + nativeBuildInputs = [ + pkg-config + ]; + buildInputs = [ + cairo + expat + guile + ]; - buildInputs = [ guile cairo expat ]; enableParallelBuilding = true; doCheck = false; # Cannot find unit-test module from guile-lib checkInputs = [ guile-lib ]; meta = with lib; { + homepage = "https://www.nongnu.org/guile-cairo/"; description = "Cairo bindings for GNU Guile"; longDescription = '' Guile-Cairo wraps the Cairo graphics library for Guile Scheme. @@ -28,7 +43,6 @@ stdenv.mkDerivation rec { maintained graphics library with all of the benefits of Scheme: memory management, exceptions, macros, and a dynamic programming environment. ''; - homepage = "https://www.nongnu.org/guile-cairo/"; license = licenses.lgpl3Plus; maintainers = with maintainers; [ vyp ]; platforms = platforms.linux; From 9d8fa10f60e49b07d28bb85cd56cb7783c66f9b1 Mon Sep 17 00:00:00 2001 From: AndersonTorres Date: Thu, 15 Apr 2021 11:50:41 -0300 Subject: [PATCH 118/230] guile-fibers: rewrite --- .../guile-modules/guile-fibers/default.nix | 29 +++++++++++++------ 1 file changed, 20 insertions(+), 9 deletions(-) diff --git a/pkgs/development/guile-modules/guile-fibers/default.nix b/pkgs/development/guile-modules/guile-fibers/default.nix index 3521853187c..ccc51a5a769 100644 --- a/pkgs/development/guile-modules/guile-fibers/default.nix +++ b/pkgs/development/guile-modules/guile-fibers/default.nix @@ -1,26 +1,37 @@ -{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkg-config, guile, texinfo }: +{ lib +, stdenv +, fetchFromGitHub +, autoreconfHook +, guile +, pkg-config +, texinfo +}: -let +stdenv.mkDerivation rec { + pname = "guile-fibers"; version = "1.0.0"; - name = "guile-fibers-${version}"; -in stdenv.mkDerivation { - inherit name; src = fetchFromGitHub { owner = "wingo"; repo = "fibers"; rev = "v${version}"; - sha256 = "1r47m1m112kxf23xny99f0qkqsk6626iyc5jp7vzndfiyp5yskwi"; + hash = "sha256-kU/ty/XRNfv3ubIwH40wZmo8MXApeduHcH2KEGqoh+Q="; }; - nativeBuildInputs = [ autoreconfHook pkg-config ]; - buildInputs = [ guile texinfo ]; + nativeBuildInputs = [ + autoreconfHook + pkg-config + ]; + buildInputs = [ + guile + texinfo + ]; autoreconfPhase = "./autogen.sh"; meta = with lib; { - description = "Concurrent ML-like concurrency for Guile"; homepage = "https://github.com/wingo/fibers"; + description = "Concurrent ML-like concurrency for Guile"; license = licenses.lgpl3Plus; maintainers = with maintainers; [ vyp ]; platforms = platforms.linux; From 03ba2b5039abfe90d22ae00059726ca257d3bbae Mon Sep 17 00:00:00 2001 From: AndersonTorres Date: Thu, 15 Apr 2021 11:56:58 -0300 Subject: [PATCH 119/230] guile-gnome: rewrite --- .../guile-modules/guile-gnome/default.nix | 48 +++++++++++++++---- 1 file changed, 39 insertions(+), 9 deletions(-) diff --git a/pkgs/development/guile-modules/guile-gnome/default.nix b/pkgs/development/guile-modules/guile-gnome/default.nix index 2dc07deac5c..ead08ce0231 100644 --- a/pkgs/development/guile-modules/guile-gnome/default.nix +++ b/pkgs/development/guile-modules/guile-gnome/default.nix @@ -1,7 +1,21 @@ -{ fetchurl, lib, stdenv, guile, guile-lib, gwrap -, pkg-config, gconf, glib, gnome_vfs, gtk2 -, libglade, libgnome, libgnomecanvas, libgnomeui -, pango, guile-cairo, texinfo +{ lib +, stdenv +, fetchurl +, gconf +, glib +, gnome_vfs +, gtk2 +, guile +, guile-cairo +, guile-lib +, gwrap +, libglade +, libgnome +, libgnomecanvas +, libgnomeui +, pango +, pkg-config +, texinfo }: stdenv.mkDerivation rec { @@ -10,20 +24,37 @@ stdenv.mkDerivation rec { src = fetchurl { url = "mirror://gnu/guile-gnome/${pname}/${pname}-${version}.tar.gz"; - sha256 = "adabd48ed5993d8528fd604e0aa0d96ad81a61d06da6cdd68323572ad6c216c3"; + hash = "sha256-ravUjtWZPYUo/WBOCqDZatgaYdBtps3WgyNXKtbCFsM="; }; + nativeBuildInputs = [ + pkg-config + texinfo + ]; buildInputs = [ - texinfo guile gwrap pkg-config gconf glib gnome_vfs gtk2 - libglade libgnome libgnomecanvas libgnomeui pango guile-cairo + gconf + glib + gnome_vfs + gtk2 + guile + guile-cairo + gwrap + libglade + libgnome + libgnomecanvas + libgnomeui + pango ] ++ lib.optional doCheck guile-lib; # The test suite tries to open an X display, which fails. doCheck = false; - GUILE_AUTO_COMPILE = 0; + makeFlags = [ + "GUILE_AUTO_COMPILE=0" + ]; meta = with lib; { + homepage = "https://www.gnu.org/software/guile-gnome/"; description = "GNOME bindings for GNU Guile"; longDescription = '' GNU guile-gnome brings the power of Scheme to your graphical application. @@ -32,7 +63,6 @@ stdenv.mkDerivation rec { guile-gnome a comprehensive environment for developing modern applications. ''; - homepage = "https://www.gnu.org/software/guile-gnome/"; license = licenses.gpl2Plus; maintainers = with maintainers; [ vyp ]; platforms = platforms.linux; From 08b221fa0d2e3c1241ada2ca3672abd0c469de07 Mon Sep 17 00:00:00 2001 From: AndersonTorres Date: Thu, 15 Apr 2021 11:57:17 -0300 Subject: [PATCH 120/230] guile-lib: rewrite --- .../guile-modules/guile-lib/default.nix | 29 ++++++++++++------- 1 file changed, 19 insertions(+), 10 deletions(-) diff --git a/pkgs/development/guile-modules/guile-lib/default.nix b/pkgs/development/guile-modules/guile-lib/default.nix index 34299b345ee..50c6a1daefb 100644 --- a/pkgs/development/guile-modules/guile-lib/default.nix +++ b/pkgs/development/guile-modules/guile-lib/default.nix @@ -1,20 +1,29 @@ -{ lib, stdenv, fetchurl, guile, texinfo, pkg-config }: +{ lib +, stdenv +, fetchurl +, guile +, pkg-config +, texinfo +}: assert stdenv ? cc && stdenv.cc.isGNU; -let - name = "guile-lib-${version}"; +stdenv.mkDerivation rec { + pname = "guile-lib"; version = "0.2.6.1"; -in stdenv.mkDerivation { - inherit name; src = fetchurl { - url = "mirror://savannah/guile-lib/${name}.tar.gz"; - sha256 = "0aizxdif5dpch9cvs8zz5g8ds5s4xhfnwza2il5ji7fv2h7ks7bd"; + url = "mirror://savannah/${pname}/${pname}-${version}.tar.gz"; + hash = "sha256-bR09DxTbnSgLjUJ9bh3sRBfd0Cv/I71Zguy24mLrPyo="; }; - nativeBuildInputs = [ pkg-config ]; - buildInputs = [ guile texinfo ]; + nativeBuildInputs = [ + pkg-config + ]; + buildInputs = [ + guile + texinfo + ]; doCheck = true; @@ -25,6 +34,7 @@ in stdenv.mkDerivation { ''; meta = with lib; { + homepage = "https://www.nongnu.org/guile-lib/"; description = "A collection of useful Guile Scheme modules"; longDescription = '' guile-lib is intended as an accumulation place for pure-scheme Guile @@ -32,7 +42,6 @@ in stdenv.mkDerivation { modules into a coherent library. Think "a down-scaled, limited-scope CPAN for Guile". ''; - homepage = "https://www.nongnu.org/guile-lib/"; license = licenses.gpl3Plus; maintainers = with maintainers; [ vyp ]; platforms = platforms.gnu ++ platforms.linux; From 08694d24f119432709099a7cd93097906303072d Mon Sep 17 00:00:00 2001 From: AndersonTorres Date: Thu, 15 Apr 2021 11:57:47 -0300 Subject: [PATCH 121/230] guile-ncurses: rewrite --- .../guile-modules/guile-ncurses/default.nix | 31 +++++++++++++------ 1 file changed, 21 insertions(+), 10 deletions(-) diff --git a/pkgs/development/guile-modules/guile-ncurses/default.nix b/pkgs/development/guile-modules/guile-ncurses/default.nix index 8f879249a23..1e6418b0c3c 100644 --- a/pkgs/development/guile-modules/guile-ncurses/default.nix +++ b/pkgs/development/guile-modules/guile-ncurses/default.nix @@ -1,18 +1,29 @@ -{ lib, stdenv, fetchurl, pkg-config, guile, ncurses, libffi }: +{ lib +, stdenv +, fetchurl +, pkg-config +, guile +, libffi +, ncurses +}: -let - name = "guile-ncurses-${version}"; +stdenv.mkDerivation rec { + pname = "guile-ncurses"; version = "1.7"; -in stdenv.mkDerivation { - inherit name; src = fetchurl { - url = "mirror://gnu/guile-ncurses/${name}.tar.gz"; - sha256 = "153vv75gb7l62sp3666rc97i63rnaqbx2rjar7d9b5w81fhwv4r5"; + url = "mirror://gnu/${pname}/${pname}-${version}.tar.gz"; + hash = "sha256-JZPNoQuIl5XayUpm0RdWNg8TT2LZGDOuFoae9crZe5Q="; }; - nativeBuildInputs = [ pkg-config ]; - buildInputs = [ guile ncurses libffi ]; + nativeBuildInputs = [ + pkg-config + ]; + buildInputs = [ + guile + libffi + ncurses + ]; preConfigure = '' configureFlags="$configureFlags --with-guilesitedir=$out/share/guile/site" @@ -29,6 +40,7 @@ in stdenv.mkDerivation { doCheck = false; meta = with lib; { + homepage = "https://www.gnu.org/software/guile-ncurses/"; description = "Scheme interface to the NCurses libraries"; longDescription = '' GNU Guile-Ncurses is a library for the Guile Scheme interpreter that @@ -36,7 +48,6 @@ in stdenv.mkDerivation { interface functionality is built on the ncurses libraries: curses, form, panel, and menu. ''; - homepage = "https://www.gnu.org/software/guile-ncurses/"; license = licenses.lgpl3Plus; maintainers = with maintainers; [ vyp ]; platforms = platforms.gnu ++ platforms.linux; From 210d5c7d003e43d1f962d78acfba64de13adea70 Mon Sep 17 00:00:00 2001 From: AndersonTorres Date: Thu, 15 Apr 2021 11:58:14 -0300 Subject: [PATCH 122/230] guile-opengl: rewrite --- .../guile-modules/guile-opengl/default.nix | 24 ++++++++++++------- 1 file changed, 15 insertions(+), 9 deletions(-) diff --git a/pkgs/development/guile-modules/guile-opengl/default.nix b/pkgs/development/guile-modules/guile-opengl/default.nix index 5ada5d41c7d..437af0f4edf 100644 --- a/pkgs/development/guile-modules/guile-opengl/default.nix +++ b/pkgs/development/guile-modules/guile-opengl/default.nix @@ -1,21 +1,27 @@ -{ lib, stdenv, fetchurl, pkg-config, guile }: +{ lib +, stdenv +, fetchurl +, guile +, pkg-config +}: -let - name = "guile-opengl-${version}"; +stdenv.mkDerivation rec { + pname = "guile-opengl"; version = "0.1.0"; -in stdenv.mkDerivation { - inherit name; src = fetchurl { - url = "mirror://gnu/guile-opengl/${name}.tar.gz"; - sha256 = "13qfx4xh8baryxqrv986l848ygd0piqwm6s2s90pxk9c0m9vklim"; + url = "mirror://gnu/${pname}/${pname}-${version}.tar.gz"; + hash = "sha256-NdK5UwUszX5B0kKbynG8oD2PCKIGpZ1x91ktBDvpDo8="; }; - nativeBuildInputs = [ pkg-config guile ]; + nativeBuildInputs = [ + pkg-config + guile + ]; meta = with lib; { - description = "Guile bindings for the OpenGL graphics API"; homepage = "https://www.gnu.org/software/guile-opengl/"; + description = "Guile bindings for the OpenGL graphics API"; license = licenses.gpl3Plus; maintainers = with maintainers; [ vyp ]; platforms = platforms.unix; From 397fc14c1e57974b553df05a31305f04a75f86df Mon Sep 17 00:00:00 2001 From: AndersonTorres Date: Thu, 15 Apr 2021 11:59:15 -0300 Subject: [PATCH 123/230] guile-reader: rewrite --- .../guile-modules/guile-reader/default.nix | 43 ++++++++++++------- 1 file changed, 28 insertions(+), 15 deletions(-) diff --git a/pkgs/development/guile-modules/guile-reader/default.nix b/pkgs/development/guile-modules/guile-reader/default.nix index eaf402a8605..1675ac0e333 100644 --- a/pkgs/development/guile-modules/guile-reader/default.nix +++ b/pkgs/development/guile-modules/guile-reader/default.nix @@ -1,36 +1,49 @@ -{ lib, stdenv, fetchurl, fetchpatch, pkg-config -, gperf, guile, guile-lib, libffi }: +{ lib +, stdenv +, fetchurl +, fetchpatch +, gperf +, guile +, guile-lib +, libffi +, pkg-config +}: stdenv.mkDerivation rec { - pname = "guile-reader"; version = "0.6.3"; src = fetchurl { - url = "http://download.savannah.nongnu.org/releases/guile-reader/${pname}-${version}.tar.gz"; - sha256 = "sha256-OMK0ROrbuMDKt42QpE7D6/9CvUEMW4SpEBjO5+tk0rs="; + url = "http://download.savannah.nongnu.org/releases/${pname}/${pname}-${version}.tar.gz"; + hash = "sha256-OMK0ROrbuMDKt42QpE7D6/9CvUEMW4SpEBjO5+tk0rs="; }; - nativeBuildInputs = [ pkg-config ]; - buildInputs = [ gperf guile guile-lib libffi ]; + nativeBuildInputs = [ + pkg-config + ]; + buildInputs = [ + gperf + guile + guile-lib + libffi + ]; GUILE_SITE="${guile-lib}/share/guile/site"; configureFlags = [ "--with-guilemoduledir=$(out)/share/guile/site" ]; meta = with lib; { + homepage = "https://www.nongnu.org/guile-reader/"; description = "A simple framework for building readers for GNU Guile"; longDescription = '' - Guile-Reader is a simple framework for building readers for GNU - Guile. + Guile-Reader is a simple framework for building readers for GNU Guile. - The idea is to make it easy to build procedures that extend - Guile's read procedure. Readers supporting various syntax - variants can easily be written, possibly by re-using existing - "token readers" of a standard Scheme readers. For example, it - is used to implement Skribilo's R5RS-derived document syntax. + The idea is to make it easy to build procedures that extend Guile's read + procedure. Readers supporting various syntax variants can easily be + written, possibly by re-using existing "token readers" of a standard + Scheme readers. For example, it is used to implement Skribilo's + R5RS-derived document syntax. ''; - homepage = "https://www.nongnu.org/guile-reader/"; license = licenses.lgpl3Plus; maintainers = with maintainers; [ AndersonTorres ]; platforms = platforms.gnu; From 60fcd0705f2349dc9a074be243ea5b638c9eb9bd Mon Sep 17 00:00:00 2001 From: AndersonTorres Date: Thu, 15 Apr 2021 11:59:41 -0300 Subject: [PATCH 124/230] guile-sdl: rewrite --- .../guile-modules/guile-sdl/default.nix | 38 +++++++++++++------ 1 file changed, 27 insertions(+), 11 deletions(-) diff --git a/pkgs/development/guile-modules/guile-sdl/default.nix b/pkgs/development/guile-modules/guile-sdl/default.nix index 8816e7b4ffc..c6e250e6d71 100644 --- a/pkgs/development/guile-modules/guile-sdl/default.nix +++ b/pkgs/development/guile-modules/guile-sdl/default.nix @@ -1,5 +1,13 @@ -{ lib, stdenv, fetchurl, pkg-config, guile, buildEnv -, SDL, SDL_image, SDL_ttf, SDL_mixer +{ lib +, stdenv +, fetchurl +, SDL +, SDL_image +, SDL_mixer +, SDL_ttf +, buildEnv +, guile +, pkg-config }: stdenv.mkDerivation rec { @@ -8,25 +16,33 @@ stdenv.mkDerivation rec { src = fetchurl { url = "mirror://gnu/${pname}/${pname}-${version}.tar.xz"; - sha256 = "0cjgs012a9922hn6xqwj66w6qmfs3nycnm56hyykx5n3g5p7ag01"; + hash = "sha256-ATx1bnnDlj69h6ZUy7wd2lVsuDGS424sFCIlJQLQTzI="; }; - nativeBuildInputs = [ pkg-config guile ]; - - buildInputs = [ SDL.dev SDL_image SDL_ttf SDL_mixer ]; - - GUILE_AUTO_COMPILE = 0; + nativeBuildInputs = [ + guile + pkg-config + ]; + buildInputs = [ + SDL.dev + SDL_image + SDL_mixer + SDL_ttf + ]; makeFlags = let - sdl = buildEnv { + sdl-env = buildEnv { name = "sdl-env"; paths = buildInputs; }; - in [ "SDLMINUSI=-I${sdl}/include/SDL" ]; + in [ + "GUILE_AUTO_COMPILE=0" + "SDLMINUSI=-I${sdl-env}/include/SDL" + ]; meta = with lib; { - description = "Guile bindings for SDL"; homepage = "https://www.gnu.org/software/guile-sdl/"; + description = "Guile bindings for SDL"; license = licenses.gpl3Plus; maintainers = with maintainers; [ vyp ]; platforms = platforms.linux; From 120f478e422ea261490f898222ecd04d71524b05 Mon Sep 17 00:00:00 2001 From: AndersonTorres Date: Thu, 15 Apr 2021 11:59:56 -0300 Subject: [PATCH 125/230] guile-sdl2: rewrite --- .../guile-modules/guile-sdl2/default.nix | 42 ++++++++++++------- 1 file changed, 28 insertions(+), 14 deletions(-) diff --git a/pkgs/development/guile-modules/guile-sdl2/default.nix b/pkgs/development/guile-modules/guile-sdl2/default.nix index c3f5fdaefbd..c6fbba93de4 100644 --- a/pkgs/development/guile-modules/guile-sdl2/default.nix +++ b/pkgs/development/guile-modules/guile-sdl2/default.nix @@ -1,36 +1,50 @@ -{ lib, stdenv, fetchurl, guile, libtool, pkg-config -, SDL2, SDL2_image, SDL2_ttf, SDL2_mixer +{ lib +, stdenv +, fetchurl +, SDL2 +, SDL2_image +, SDL2_mixer +, SDL2_ttf +, guile +, libtool +, pkg-config }: -let - name = "${pname}-${version}"; +stdenv.mkDerivation rec { pname = "guile-sdl2"; version = "0.5.0"; -in stdenv.mkDerivation { - inherit name; src = fetchurl { - url = "https://files.dthompson.us/${pname}/${name}.tar.gz"; - sha256 = "118x0cg7fzbsyrfhy5f9ab7dqp9czgia0ycgzp6sn3nlsdrcnr4m"; + url = "https://files.dthompson.us/${pname}/${pname}-${version}.tar.gz"; + hash = "sha256-lWTLctPUDqvN/Y95oOL7LF3czlLJFQ9d9np9dx4DHYU="; }; - nativeBuildInputs = [ libtool pkg-config ]; + nativeBuildInputs = [ + pkg-config + libtool + ]; buildInputs = [ - guile SDL2 SDL2_image SDL2_ttf SDL2_mixer + SDL2 + SDL2_image + SDL2_mixer + SDL2_ttf + guile ]; configureFlags = [ - "--with-libsdl2-prefix=${SDL2}" "--with-libsdl2-image-prefix=${SDL2_image}" - "--with-libsdl2-ttf-prefix=${SDL2_ttf}" "--with-libsdl2-mixer-prefix=${SDL2_mixer}" + "--with-libsdl2-prefix=${SDL2}" + "--with-libsdl2-ttf-prefix=${SDL2_ttf}" ]; - makeFlags = [ "GUILE_AUTO_COMPILE=0" ]; + makeFlags = [ + "GUILE_AUTO_COMPILE=0" + ]; meta = with lib; { - description = "Bindings to SDL2 for GNU Guile"; homepage = "https://dthompson.us/projects/guile-sdl2.html"; + description = "Bindings to SDL2 for GNU Guile"; license = licenses.lgpl3Plus; maintainers = with maintainers; [ seppeljordan vyp ]; platforms = platforms.all; From 1da34ac3c4cddc60fc72773ed9f048c3464b80a4 Mon Sep 17 00:00:00 2001 From: AndersonTorres Date: Thu, 15 Apr 2021 12:06:35 -0300 Subject: [PATCH 126/230] guile-xcb: rewrite --- .../guile-modules/guile-xcb/default.nix | 39 +++++++++++-------- 1 file changed, 23 insertions(+), 16 deletions(-) diff --git a/pkgs/development/guile-modules/guile-xcb/default.nix b/pkgs/development/guile-modules/guile-xcb/default.nix index 2de44524425..72066313eca 100644 --- a/pkgs/development/guile-modules/guile-xcb/default.nix +++ b/pkgs/development/guile-modules/guile-xcb/default.nix @@ -1,29 +1,36 @@ -{ lib, stdenv, fetchurl, pkg-config, guile, texinfo }: +{ lib +, stdenv +, fetchurl +, guile +, pkg-config +, texinfo +}: -let - name = "guile-xcb-${version}"; +stdenv.mkDerivation rec { + pname = "guile-xcb"; version = "1.3"; -in stdenv.mkDerivation { - inherit name; src = fetchurl { - url = "http://www.markwitmer.com/dist/${name}.tar.gz"; - sha256 = "04dvbqdrrs67490gn4gkq9zk8mqy3mkls2818ha4p0ckhh0pm149"; + url = "http://www.markwitmer.com/dist/${pname}-${version}.tar.gz"; + hash = "sha256-iYR6AYSTgUsURAEJTWcdHlc0f8LzEftAIsfonBteuxE="; }; - nativeBuildInputs = [ pkg-config ]; - buildInputs = [ guile texinfo ]; + nativeBuildInputs = [ + pkg-config + ]; + buildInputs = [ + guile + texinfo + ]; - preConfigure = '' - configureFlags=" - --with-guile-site-dir=$out/share/guile/site - --with-guile-site-ccache-dir=$out/share/guile/site - "; - ''; + configureFlags = [ + "--with-guile-site-dir=$out/share/guile/site" + "--with-guile-site-ccache-dir=$out/share/guile/site" + ]; meta = with lib; { - description = "XCB bindings for Guile"; homepage = "http://www.markwitmer.com/guile-xcb/guile-xcb.html"; + description = "XCB bindings for Guile"; license = licenses.gpl3Plus; maintainers = with maintainers; [ vyp ]; platforms = platforms.linux; From 449365497b3f26863c1cc7c210e057e259f89eaa Mon Sep 17 00:00:00 2001 From: AndersonTorres Date: Thu, 15 Apr 2021 10:32:48 -0300 Subject: [PATCH 127/230] Reorder guile.* expressions in top-level/all-packages.nix This commit groups together the guile.* calls together. --- pkgs/top-level/all-packages.nix | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index ab2ef5d68f4..1b58eb7378b 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -11650,15 +11650,6 @@ in groovy = callPackage ../development/interpreters/groovy { }; - guile_1_8 = callPackage ../development/interpreters/guile/1.8.nix { }; - - # Needed for autogen - guile_2_0 = callPackage ../development/interpreters/guile/2.0.nix { }; - - guile_2_2 = callPackage ../development/interpreters/guile { }; - - guile = guile_2_2; - inherit (callPackages ../applications/networking/cluster/hadoop { jre = jre8; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731 }) @@ -12080,6 +12071,15 @@ in gImageReader = callPackage ../applications/misc/gImageReader { }; + guile_1_8 = callPackage ../development/interpreters/guile/1.8.nix { }; + + # Needed for autogen + guile_2_0 = callPackage ../development/interpreters/guile/2.0.nix { }; + + guile_2_2 = callPackage ../development/interpreters/guile { }; + + guile = guile_2_2; + guile-cairo = callPackage ../development/guile-modules/guile-cairo { }; guile-fibers = callPackage ../development/guile-modules/guile-fibers { }; From 30b6835d6d643d2b5dfec7eb6168a4c894af413a Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Thu, 8 Apr 2021 14:53:55 +0200 Subject: [PATCH 128/230] =?UTF-8?q?scheherazade-new:=203.000=20=E2=86=92?= =?UTF-8?q?=203.100?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/data/fonts/scheherazade/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/data/fonts/scheherazade/default.nix b/pkgs/data/fonts/scheherazade/default.nix index 8639d29066c..848daa899ed 100644 --- a/pkgs/data/fonts/scheherazade/default.nix +++ b/pkgs/data/fonts/scheherazade/default.nix @@ -1,10 +1,10 @@ -{ lib, fetchzip, version ? "3.000" }: +{ lib, fetchzip, version ? "3.100" }: let new = lib.versionAtLeast version "3.000"; sha256 = { "2.100" = "1g5f5f9gzamkq3kqyf7vbzvl4rdj3wmjf6chdrbxksrm3rnb926z"; - "3.000" = "12sd2mjqb80ijc73y7p0iw6j3wy9i60a3aar3ywrxz4khpya48jw"; + "3.100" = "0svnc7l3z3vvm27zx6msyx56n2fpv6ywb5lm75bym48slkccypn7"; }."${version}"; in fetchzip rec { From 5e3b5d5b672e947477f5fe5c8c81430bcf0f38b1 Mon Sep 17 00:00:00 2001 From: AndersonTorres Date: Thu, 15 Apr 2021 10:30:13 -0300 Subject: [PATCH 129/230] guile-commonmark: init at 0.1.2 --- .../guile-commonmark/default.nix | 42 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 44 insertions(+) create mode 100644 pkgs/development/guile-modules/guile-commonmark/default.nix diff --git a/pkgs/development/guile-modules/guile-commonmark/default.nix b/pkgs/development/guile-modules/guile-commonmark/default.nix new file mode 100644 index 00000000000..113fad13600 --- /dev/null +++ b/pkgs/development/guile-modules/guile-commonmark/default.nix @@ -0,0 +1,42 @@ +{ lib +, stdenv +, fetchFromGitHub +, autoreconfHook +, guile +, pkg-config +}: + +stdenv.mkDerivation rec { + pname = "guile-commonmark"; + version = "0.1.2"; + + src = fetchFromGitHub { + owner = "OrangeShark"; + repo = pname; + rev = "v${version}"; + hash = "sha256-qYDcIiObKOU8lmcfk327LMPx/2Px9ecI3QLrSWWLxMo="; + }; + + nativeBuildInputs = [ + autoreconfHook + pkg-config + ]; + buildInputs = [ + guile + ]; + + # https://github.com/OrangeShark/guile-commonmark/issues/20 + doCheck = false; + + makeFlags = [ + "GUILE_AUTO_COMPILE=0" + ]; + + meta = with lib; { + homepage = "https://github.com/OrangeShark/guile-commonmark"; + description = "Implementation of CommonMark for Guile"; + license = licenses.lgpl3Plus; + maintainers = with maintainers; [ AndersonTorres ]; + platforms = guile.meta.platforms; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 1b58eb7378b..f52218b476b 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -12082,6 +12082,8 @@ in guile-cairo = callPackage ../development/guile-modules/guile-cairo { }; + guile-commonmark = callPackage ../development/guile-modules/guile-commonmark { }; + guile-fibers = callPackage ../development/guile-modules/guile-fibers { }; guile-gnome = callPackage ../development/guile-modules/guile-gnome { From e3733c89ed725a7131626c5854fe4a9a74a2f53d Mon Sep 17 00:00:00 2001 From: AndersonTorres Date: Thu, 15 Apr 2021 01:12:38 -0300 Subject: [PATCH 130/230] haunt: init at 0.2.4 --- pkgs/applications/misc/haunt/default.nix | 59 ++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 61 insertions(+) create mode 100644 pkgs/applications/misc/haunt/default.nix diff --git a/pkgs/applications/misc/haunt/default.nix b/pkgs/applications/misc/haunt/default.nix new file mode 100644 index 00000000000..124e441a5af --- /dev/null +++ b/pkgs/applications/misc/haunt/default.nix @@ -0,0 +1,59 @@ +{ lib +, stdenv +, fetchurl +, guile +, guile-commonmark +, guile-reader +, makeWrapper +, pkg-config +}: + +stdenv.mkDerivation rec { + pname = "haunt"; + version = "0.2.4"; + + src = fetchurl { + url = "https://files.dthompson.us/${pname}/${pname}-${version}.tar.gz"; + hash = "sha256-zOkICg7KmJJhPWPtJRT3C9sYB1Oig1xLtgPNGe0n3xQ="; + }; + + nativeBuildInputs = [ + makeWrapper + pkg-config + ]; + buildInputs = [ + guile + guile-commonmark + guile-reader + ]; + + postInstall = '' + wrapProgram $out/bin/haunt \ + --prefix GUILE_LOAD_PATH : "$out/share/guile/site:${guile-commonmark}/share/guile/site:${guile-reader}/share/guile/site" \ + --prefix GUILE_LOAD_COMPILED_PATH : "$out/share/guile/site:${guile-commonmark}/share/guile/site:${guile-reader}/share/guile/site" + ''; + + meta = with lib; { + homepage = "https://dthompson.us/projects/haunt.html"; + description = "Guile-based static site generator"; + longDescription = '' + Haunt is a simple, functional, hackable static site generator that gives + authors the ability to treat websites as Scheme programs. + + By giving authors the full expressive power of Scheme, they are able to + control every aspect of the site generation process. Haunt provides a + simple, functional build system that can be easily extended for this + purpose. + + Haunt has no opinion about what markup language authors should use to + write posts, though it comes with support for the popular Markdown + format. Likewise, Haunt has no opinion about how authors structure their + sites. Though it comes with support for building simple blogs or Atom + feeds, authors should feel empowered to tweak, replace, or create builders + to do things that aren't provided out-of-the-box. + ''; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ AndersonTorres ]; + platforms = guile.meta.platforms; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index f52218b476b..e502023e125 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -23506,6 +23506,8 @@ in wxGTK = wxGTK30; }; + haunt = callPackage ../applications/misc/haunt { }; + hugo = callPackage ../applications/misc/hugo { }; go-org = callPackage ../applications/misc/go-org { }; From 575af60b3dd8b5481d73e4c64bfa091fd13d677f Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Fri, 16 Apr 2021 06:18:20 +1000 Subject: [PATCH 131/230] skopeo: 1.2.2 -> 1.2.3 https://github.com/containers/skopeo/releases/tag/v1.2.3 --- pkgs/development/tools/skopeo/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/skopeo/default.nix b/pkgs/development/tools/skopeo/default.nix index 489ab85a249..db43c7f8e47 100644 --- a/pkgs/development/tools/skopeo/default.nix +++ b/pkgs/development/tools/skopeo/default.nix @@ -14,13 +14,13 @@ buildGoModule rec { pname = "skopeo"; - version = "1.2.2"; + version = "1.2.3"; src = fetchFromGitHub { rev = "v${version}"; owner = "containers"; repo = "skopeo"; - sha256 = "sha256-7FHfqDgc91BdtbvcElZDWj2jXD2LcMPo9RLnYZe3Xw8="; + sha256 = "sha256-GhLw8wt5eDixKNGtxGA0Fjw3auQ3AsjKa+0M4mLTQlg="; }; outputs = [ "out" "man" ]; From 2f8a54eb09038d127e94b37a6b132b26e040c23b Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Fri, 16 Apr 2021 06:19:34 +1000 Subject: [PATCH 132/230] gh: 1.9.0 -> 1.9.1 https://github.com/cli/cli/releases/tag/v1.9.1 --- .../version-management/git-and-tools/gh/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/version-management/git-and-tools/gh/default.nix b/pkgs/applications/version-management/git-and-tools/gh/default.nix index d8b4e414f1c..f7ea37ff408 100644 --- a/pkgs/applications/version-management/git-and-tools/gh/default.nix +++ b/pkgs/applications/version-management/git-and-tools/gh/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "gh"; - version = "1.9.0"; + version = "1.9.1"; src = fetchFromGitHub { owner = "cli"; repo = "cli"; rev = "v${version}"; - sha256 = "03i1x1j07vpq81c9dmpvpya21hwz9q54zm4przvc12jadgb31y1i"; + sha256 = "1nrbz049nizrrfxdpws05gj0bqk47l4mrl4wcvfb6nwispc74ib0"; }; vendorSha256 = "0j2jy7n7hca5ybwwgh7cvm77j96ngaq1a1l5bl70vjpd8hz2qapc"; From 94cb97abee9735446844c247622f4a3695b78a8a Mon Sep 17 00:00:00 2001 From: IvarWithoutBones Date: Mon, 12 Apr 2021 20:14:23 +0200 Subject: [PATCH 133/230] agi: init at 1.1.0-dev-20210413 --- pkgs/tools/graphics/agi/default.nix | 69 +++++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 71 insertions(+) create mode 100644 pkgs/tools/graphics/agi/default.nix diff --git a/pkgs/tools/graphics/agi/default.nix b/pkgs/tools/graphics/agi/default.nix new file mode 100644 index 00000000000..3fe6698846e --- /dev/null +++ b/pkgs/tools/graphics/agi/default.nix @@ -0,0 +1,69 @@ +{ lib +, stdenv +, fetchzip +, autoPatchelfHook +, makeWrapper +, makeDesktopItem +, copyDesktopItems +, wrapGAppsHook +, gobject-introspection +, gdk-pixbuf +, jre +, androidenv +}: + +stdenv.mkDerivation rec { + pname = "agi"; + version = "1.1.0-dev-20210413"; + + src = fetchzip { + url = "https://github.com/google/agi-dev-releases/releases/download/v${version}/agi-${version}-linux.zip"; + sha256 = "13i6n95d0cjrhx68qsich6xzk5f9ga0y3m19k4z2d58s164rnh0v"; + }; + + nativeBuildInputs = [ + autoPatchelfHook + makeWrapper + wrapGAppsHook + gdk-pixbuf + gobject-introspection + copyDesktopItems + ]; + + buildInputs = [ + stdenv.cc.cc.lib + ]; + + installPhase = '' + runHook preInstall + mkdir -p $out/{bin,lib} + cp ./{agi,gapis,gapir,gapit,device-info} $out/bin + cp lib/gapic.jar $out/lib + wrapProgram $out/bin/agi \ + --add-flags "--vm ${jre}/bin/java" \ + --add-flags "--jar $out/lib/gapic.jar" \ + --add-flags "--adb ${androidenv.androidPkgs_9_0.platform-tools}/bin/adb" + for i in 16 32 48 64 96 128 256 512 1024; do + install -D ${src}/icon.png $out/share/icons/hicolor/''${i}x$i/apps/agi.png + done + runHook postInstall + ''; + + desktopItems = [(makeDesktopItem { + name = "agi"; + desktopName = "Android GPU Inspector"; + exec = "$out/bin/agi"; + icon = "agi"; + type = "Application"; + categories = "Development;Debugger;Graphics;3DGraphics"; + terminal = "false"; + })]; + + meta = with lib; { + homepage = "https://github.com/google/agi/"; + description = "Android GPU Inspector"; + license = licenses.asl20; + platforms = [ "x86_64-linux" ]; + maintainers = [ maintainers.ivar ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 29e801eb11d..cffb67060db 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -749,6 +749,8 @@ in agda-pkg = callPackage ../development/tools/agda-pkg { }; + agi = callPackage ../tools/graphics/agi { }; + agrep = callPackage ../tools/text/agrep { }; aha = callPackage ../tools/text/aha { }; From ea9d7e302ec04521ea0f6956121c6a961b2ca92a Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 15 Apr 2021 23:04:25 +0200 Subject: [PATCH 134/230] python3Packages.tinydb: 4.1.1 -> 4.4.0 --- .../python-modules/tinydb/default.nix | 32 ++++++++++++++----- 1 file changed, 24 insertions(+), 8 deletions(-) diff --git a/pkgs/development/python-modules/tinydb/default.nix b/pkgs/development/python-modules/tinydb/default.nix index b267fa82854..db162ecc2ac 100644 --- a/pkgs/development/python-modules/tinydb/default.nix +++ b/pkgs/development/python-modules/tinydb/default.nix @@ -2,17 +2,16 @@ , buildPythonPackage , pythonOlder , fetchFromGitHub -, poetry +, poetry-core +, fetchpatch , pytestCheckHook -, pytestcov -, pytestrunner , pycodestyle , pyyaml }: buildPythonPackage rec { pname = "tinydb"; - version = "4.1.1"; + version = "4.4.0"; disabled = pythonOlder "3.5"; format = "pyproject"; @@ -20,20 +19,37 @@ buildPythonPackage rec { owner = "msiemens"; repo = pname; rev = "v${version}"; - sha256 = "09cwdmpj91c6q7jympip1lrcd3idbm9cqblgvmrh0v1vy1iv2ki7"; + sha256 = "sha256-3FbsnLU7G4VVhI5NYRqCEQgo51zDeAkEhH69H52zr/w="; }; - nativeBuildInputs = [ poetry ]; + nativeBuildInputs = [ + poetry-core + ]; + + patches = [ + # Switch to poetry-core, https://github.com/msiemens/tinydb/pull/391 + (fetchpatch { + name = "switch-to-peotry-core.patch"; + url = "https://github.com/msiemens/tinydb/commit/5b547c18e7ce9f5925d5943dfa47d408435a0da5.patch"; + sha256 = "19ma9ib020b82sn1mcr7sfysqbj8h6nbb365bih1x1wn3ym8xlbc"; + }) + ]; + + postPatch = '' + substituteInPlace pytest.ini \ + --replace "--cov-append --cov-report term --cov tinydb" "" + ''; checkInputs = [ pytestCheckHook - pytestcov pycodestyle pyyaml ]; + pythonImportsCheck = [ "tinydb" ]; + meta = with lib; { - description = "A lightweight document oriented database written in pure Python with no external dependencies"; + description = "Lightweight document oriented database written in Python"; homepage = "https://tinydb.readthedocs.org/"; changelog = "https://tinydb.readthedocs.io/en/latest/changelog.html"; license = licenses.mit; From 9dde9d8b9ee4b7a4dfbb0ab1204d9f6f4a188360 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Milan=20P=C3=A4ssler?= Date: Thu, 18 Mar 2021 09:55:02 +0100 Subject: [PATCH 135/230] jdk: 15.0.1-ga -> 16+36 --- .../compilers/openjdk/{default.nix => 15.nix} | 4 +- pkgs/development/compilers/openjdk/16.nix | 164 ++++++++++++++++++ pkgs/top-level/all-packages.nix | 44 +++-- 3 files changed, 191 insertions(+), 21 deletions(-) rename pkgs/development/compilers/openjdk/{default.nix => 15.nix} (97%) create mode 100644 pkgs/development/compilers/openjdk/16.nix diff --git a/pkgs/development/compilers/openjdk/default.nix b/pkgs/development/compilers/openjdk/15.nix similarity index 97% rename from pkgs/development/compilers/openjdk/default.nix rename to pkgs/development/compilers/openjdk/15.nix index 5606059c62d..ddd523ad787 100644 --- a/pkgs/development/compilers/openjdk/default.nix +++ b/pkgs/development/compilers/openjdk/15.nix @@ -22,9 +22,9 @@ let sha256 = "1h8n5figc9q0k9p8b0qggyhvqagvxanfih1lj5j492c74cd1mx1l"; }; - nativeBuildInputs = [ pkg-config autoconf unzip ]; + nativeBuildInputs = [ pkg-config autoconf ]; buildInputs = [ - cpio file which zip perl zlib cups freetype alsaLib libjpeg giflib + cpio file which unzip zip perl zlib cups freetype alsaLib libjpeg giflib libpng zlib lcms2 libX11 libICE libXrender libXext libXtst libXt libXtst libXi libXinerama libXcursor libXrandr fontconfig openjdk15-bootstrap ] ++ lib.optionals (!headless && enableGnome2) [ diff --git a/pkgs/development/compilers/openjdk/16.nix b/pkgs/development/compilers/openjdk/16.nix new file mode 100644 index 00000000000..e35369e75c5 --- /dev/null +++ b/pkgs/development/compilers/openjdk/16.nix @@ -0,0 +1,164 @@ +{ stdenv, lib, fetchurl, fetchFromGitHub, bash, pkg-config, autoconf, cpio +, file, which, unzip, zip, perl, cups, freetype, alsaLib, libjpeg, giflib +, libpng, zlib, lcms2, libX11, libICE, libXrender, libXext, libXt, libXtst +, libXi, libXinerama, libXcursor, libXrandr, fontconfig, openjdk16-bootstrap +, setJavaClassPath +, headless ? false +, enableJavaFX ? openjfx.meta.available, openjfx +, enableGnome2 ? true, gtk3, gnome_vfs, glib, GConf +}: + +let + version = { + feature = "16"; + interim = "0"; + build = "36"; + }; + + openjdk = stdenv.mkDerivation { + pname = "openjdk" + lib.optionalString headless "-headless"; + version = "${version.feature}+${version.build}"; + + src = fetchFromGitHub { + owner = "openjdk"; + repo = "jdk${version.feature}u"; + rev = "jdk-${version.feature}+${version.build}"; + sha256 = "165nr15dqfcxzsl5z95g4iklln4rlfkgdigdma576mx8813ldi44"; + }; + + nativeBuildInputs = [ pkg-config autoconf unzip ]; + buildInputs = [ + cpio file which zip perl zlib cups freetype alsaLib libjpeg giflib + libpng zlib lcms2 libX11 libICE libXrender libXext libXtst libXt libXtst + libXi libXinerama libXcursor libXrandr fontconfig openjdk16-bootstrap + ] ++ lib.optionals (!headless && enableGnome2) [ + gtk3 gnome_vfs GConf glib + ]; + + patches = [ + ./fix-java-home-jdk10.patch + ./read-truststore-from-env-jdk10.patch + ./currency-date-range-jdk10.patch + ./increase-javadoc-heap-jdk13.patch + # -Wformat etc. are stricter in newer gccs, per + # https://gcc.gnu.org/bugzilla/show_bug.cgi?id=79677 + # so grab the work-around from + # https://src.fedoraproject.org/rpms/java-openjdk/pull-request/24 + (fetchurl { + url = "https://src.fedoraproject.org/rpms/java-openjdk/raw/06c001c7d87f2e9fe4fedeef2d993bcd5d7afa2a/f/rh1673833-remove_removal_of_wformat_during_test_compilation.patch"; + sha256 = "082lmc30x64x583vqq00c8y0wqih3y4r0mp1c4bqq36l22qv6b6r"; + }) + ] ++ lib.optionals (!headless && enableGnome2) [ + ./swing-use-gtk-jdk13.patch + ]; + + prePatch = '' + chmod +x configure + patchShebangs --build configure + ''; + + configureFlags = [ + "--with-boot-jdk=${openjdk16-bootstrap.home}" + "--with-version-build=${version.build}" + "--with-version-opt=nixos" + "--with-version-pre=" + "--enable-unlimited-crypto" + "--with-native-debug-symbols=internal" + "--with-libjpeg=system" + "--with-giflib=system" + "--with-libpng=system" + "--with-zlib=system" + "--with-lcms=system" + "--with-stdc++lib=dynamic" + ] ++ lib.optional stdenv.isx86_64 "--with-jvm-features=zgc" + ++ lib.optional headless "--enable-headless-only" + ++ lib.optional (!headless && enableJavaFX) "--with-import-modules=${openjfx}"; + + separateDebugInfo = true; + + NIX_CFLAGS_COMPILE = "-Wno-error"; + + NIX_LDFLAGS = toString (lib.optionals (!headless) [ + "-lfontconfig" "-lcups" "-lXinerama" "-lXrandr" "-lmagic" + ] ++ lib.optionals (!headless && enableGnome2) [ + "-lgtk-3" "-lgio-2.0" "-lgnomevfs-2" "-lgconf-2" + ]); + + buildFlags = [ "all" ]; + + installPhase = '' + mkdir -p $out/lib + + mv build/*/images/jdk $out/lib/openjdk + + # Remove some broken manpages. + rm -rf $out/lib/openjdk/man/ja* + + # Mirror some stuff in top-level. + mkdir -p $out/share + ln -s $out/lib/openjdk/include $out/include + ln -s $out/lib/openjdk/man $out/share/man + ln -s $out/lib/openjdk/lib/src.zip $out/lib/src.zip + + # jni.h expects jni_md.h to be in the header search path. + ln -s $out/include/linux/*_md.h $out/include/ + + # Remove crap from the installation. + rm -rf $out/lib/openjdk/demo + ${lib.optionalString headless '' + rm $out/lib/openjdk/lib/{libjsound,libfontmanager}.so + ''} + + ln -s $out/lib/openjdk/bin $out/bin + ''; + + preFixup = '' + # Propagate the setJavaClassPath setup hook so that any package + # that depends on the JDK has $CLASSPATH set up properly. + mkdir -p $out/nix-support + #TODO or printWords? cf https://github.com/NixOS/nixpkgs/pull/27427#issuecomment-317293040 + echo -n "${setJavaClassPath}" > $out/nix-support/propagated-build-inputs + + # Set JAVA_HOME automatically. + mkdir -p $out/nix-support + cat < $out/nix-support/setup-hook + if [ -z "\''${JAVA_HOME-}" ]; then export JAVA_HOME=$out/lib/openjdk; fi + EOF + ''; + + postFixup = '' + # Build the set of output library directories to rpath against + LIBDIRS="" + for output in $outputs; do + if [ "$output" = debug ]; then continue; fi + LIBDIRS="$(find $(eval echo \$$output) -name \*.so\* -exec dirname {} \+ | sort | uniq | tr '\n' ':'):$LIBDIRS" + done + # Add the local library paths to remove dependencies on the bootstrap + for output in $outputs; do + if [ "$output" = debug ]; then continue; fi + OUTPUTDIR=$(eval echo \$$output) + BINLIBS=$(find $OUTPUTDIR/bin/ -type f; find $OUTPUTDIR -name \*.so\*) + echo "$BINLIBS" | while read i; do + patchelf --set-rpath "$LIBDIRS:$(patchelf --print-rpath "$i")" "$i" || true + patchelf --shrink-rpath "$i" || true + done + done + ''; + + disallowedReferences = [ openjdk16-bootstrap ]; + + meta = with lib; { + homepage = "https://openjdk.java.net/"; + license = licenses.gpl2; + description = "The open-source Java Development Kit"; + maintainers = with maintainers; [ edwtjo ]; + platforms = [ "i686-linux" "x86_64-linux" "aarch64-linux" "armv7l-linux" "armv6l-linux" ]; + }; + + passthru = { + architecture = ""; + home = "${openjdk}/lib/openjdk"; + inherit gtk3; + }; + }; +in openjdk diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 289682b2255..e60e3c50bb2 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -10738,27 +10738,33 @@ in else openjdk11.override { headless = true; }; - openjdk15-bootstrap = - if adoptopenjdk-hotspot-bin-14.meta.available then - adoptopenjdk-hotspot-bin-14 + openjdk16-bootstrap = + if adoptopenjdk-hotspot-bin-15.meta.available then + adoptopenjdk-hotspot-bin-15 else /* adoptopenjdk not available for i686, so fall back to our old builds of 12, 13, & 14 for bootstrapping */ - callPackage ../development/compilers/openjdk/14.nix { + callPackage ../development/compilers/openjdk/15.nix { openjfx = openjfx11; /* need this despite next line :-( */ enableJavaFX = false; headless = true; inherit (gnome2) GConf gnome_vfs; - openjdk14-bootstrap = callPackage ../development/compilers/openjdk/13.nix { + openjdk15-bootstrap = callPackage ../development/compilers/openjdk/14.nix { openjfx = openjfx11; /* need this despite next line :-( */ enableJavaFX = false; headless = true; inherit (gnome2) GConf gnome_vfs; - openjdk13-bootstrap = callPackage ../development/compilers/openjdk/12.nix { - stdenv = gcc8Stdenv; /* build segfaults with gcc9 or newer, so use gcc8 like Debian does */ + openjdk14-bootstrap = callPackage ../development/compilers/openjdk/13.nix { openjfx = openjfx11; /* need this despite next line :-( */ enableJavaFX = false; headless = true; inherit (gnome2) GConf gnome_vfs; + openjdk13-bootstrap = callPackage ../development/compilers/openjdk/12.nix { + stdenv = gcc8Stdenv; /* build segfaults with gcc9 or newer, so use gcc8 like Debian does */ + openjfx = openjfx11; /* need this despite next line :-( */ + enableJavaFX = false; + headless = true; + inherit (gnome2) GConf gnome_vfs; + }; }; }; }; @@ -10767,27 +10773,27 @@ in jdk11_headless = openjdk11_headless; /* Latest JDK */ - openjdk15 = + openjdk16 = if stdenv.isDarwin then callPackage ../development/compilers/openjdk/darwin { } else - callPackage ../development/compilers/openjdk { + callPackage ../development/compilers/openjdk/16.nix { openjfx = openjfx15; inherit (gnome2) GConf gnome_vfs; }; - openjdk15_headless = + openjdk16_headless = if stdenv.isDarwin then - openjdk15 + openjdk16 else - openjdk15.override { headless = true; }; + openjdk16.override { headless = true; }; - jdk15 = openjdk15; - jdk15_headless = openjdk15_headless; + jdk16 = openjdk16; + jdk16_headless = openjdk16_headless; /* default JDK */ - jdk = jdk15; + jdk = jdk16; # Since the introduction of the Java Platform Module System in Java 9, Java # no longer ships a separate JRE package. @@ -10796,13 +10802,13 @@ in # 'jre_minimal' to build a bespoke JRE containing only the modules you need. # # For a general-purpose system, 'jre' defaults to the full JDK: - jre = jdk15; - jre_headless = jdk15_headless; + jre = jdk16; + jre_headless = jdk16_headless; jre_minimal = callPackage ../development/compilers/openjdk/jre.nix { }; - openjdk = openjdk15; - openjdk_headless = openjdk15_headless; + openjdk = openjdk16; + openjdk_headless = openjdk16_headless; inherit (callPackages ../development/compilers/graalvm { gcc = if stdenv.targetPlatform.isDarwin then gcc8 else gcc; From 893972affbd9d827365f3c71a5e8e8f6195a44e4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Milan=20P=C3=A4ssler?= Date: Wed, 14 Apr 2021 22:57:40 +0200 Subject: [PATCH 136/230] jdk: update darwin to 16 as well --- pkgs/development/compilers/openjdk/darwin/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/compilers/openjdk/darwin/default.nix b/pkgs/development/compilers/openjdk/darwin/default.nix index 93821054760..731ff4d56de 100644 --- a/pkgs/development/compilers/openjdk/darwin/default.nix +++ b/pkgs/development/compilers/openjdk/darwin/default.nix @@ -7,12 +7,12 @@ let }; jdk = stdenv.mkDerivation rec { - pname = "zulu15.28.51-ca-jdk"; - version = "15.0.1"; + pname = "zulu16.28.11-ca-jdk"; + version = "16.0.0"; src = fetchurl { url = "https://cdn.azul.com/zulu/bin/${pname}${version}-macosx_x64.tar.gz"; - sha256 = "0h738pbnwcn7pjp0qyryzazqj5nw5sy2f8l0ycl39crm9ia6akvh"; + sha256 = "6d47ef22dc56ce1f5a102ed39e21d9a97320f0bb786818e2c686393109d79bc5"; curlOpts = "-H Referer:https://www.azul.com/downloads/zulu/"; }; From 1a4bb860356054f28028fc3843e6ea7fdbb09f95 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 15 Apr 2021 23:15:40 +0200 Subject: [PATCH 137/230] archivy: 1.1.1 -> 1.1.4 --- pkgs/applications/misc/archivy/default.nix | 29 +++++++++++++++++----- 1 file changed, 23 insertions(+), 6 deletions(-) diff --git a/pkgs/applications/misc/archivy/default.nix b/pkgs/applications/misc/archivy/default.nix index 70b3c71c0b3..6af4f67d8c6 100644 --- a/pkgs/applications/misc/archivy/default.nix +++ b/pkgs/applications/misc/archivy/default.nix @@ -1,15 +1,31 @@ -{ lib, buildPythonApplication, fetchPypi, appdirs, attrs -, beautifulsoup4, click-plugins, elasticsearch, flask-compress -, flask_login, flask_wtf, html2text, python-dotenv, python-frontmatter -, requests, tinydb, validators, werkzeug, wtforms }: +{ lib +, buildPythonApplication +, fetchPypi +, appdirs +, attrs +, beautifulsoup4 +, click-plugins +, elasticsearch +, flask-compress +, flask_login +, flask_wtf +, html2text +, python-dotenv +, python-frontmatter +, requests +, tinydb +, validators +, werkzeug +, wtforms +}: buildPythonApplication rec { pname = "archivy"; - version = "1.1.1"; + version = "1.1.4"; src = fetchPypi { inherit pname version; - sha256 = "sha256-yUXsTPb5oJYZA9MlHz7eLowRjD/ltq5VLTHeOMqcL/M="; + sha256 = "sha256-oSmwQcKvp9RABmc7aq6fdLOZapMauIi6+7azVTXVb30="; }; # Relax some dependencies @@ -22,6 +38,7 @@ buildPythonApplication rec { --replace 'python_frontmatter == 0.5.0' 'python_frontmatter' \ --replace 'requests ==' 'requests >=' \ --replace 'validators ==' 'validators >=' \ + --replace 'tinydb ==' 'tinydb >=' ''; propagatedBuildInputs = [ From 010125af00c653587d1d739231c06635af46dc96 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 15 Apr 2021 23:21:24 +0200 Subject: [PATCH 138/230] metasploit: 6.0.39 -> 6.0.40 --- pkgs/tools/security/metasploit/Gemfile | 2 +- pkgs/tools/security/metasploit/Gemfile.lock | 20 ++++++++-------- pkgs/tools/security/metasploit/default.nix | 4 ++-- pkgs/tools/security/metasploit/gemset.nix | 26 ++++++++++----------- 4 files changed, 26 insertions(+), 26 deletions(-) diff --git a/pkgs/tools/security/metasploit/Gemfile b/pkgs/tools/security/metasploit/Gemfile index 247e2b66904..8c57845e79b 100644 --- a/pkgs/tools/security/metasploit/Gemfile +++ b/pkgs/tools/security/metasploit/Gemfile @@ -1,4 +1,4 @@ # frozen_string_literal: true source "https://rubygems.org" -gem "metasploit-framework", git: "https://github.com/rapid7/metasploit-framework", ref: "refs/tags/6.0.39" +gem "metasploit-framework", git: "https://github.com/rapid7/metasploit-framework", ref: "refs/tags/6.0.40" diff --git a/pkgs/tools/security/metasploit/Gemfile.lock b/pkgs/tools/security/metasploit/Gemfile.lock index 97e7b9962ab..df2feb42ad3 100644 --- a/pkgs/tools/security/metasploit/Gemfile.lock +++ b/pkgs/tools/security/metasploit/Gemfile.lock @@ -1,9 +1,9 @@ GIT remote: https://github.com/rapid7/metasploit-framework - revision: 5cba6ecd3c745f45290400f0705400f26913852e - ref: refs/tags/6.0.39 + revision: fb842915658f23b8997aa2cab4c3a62f3170cbbd + ref: refs/tags/6.0.40 specs: - metasploit-framework (6.0.39) + metasploit-framework (6.0.40) actionpack (~> 5.2.2) activerecord (~> 5.2.2) activesupport (~> 5.2.2) @@ -30,9 +30,9 @@ GIT metasploit-concern (~> 3.0.0) metasploit-credential (~> 4.0.0) metasploit-model (~> 3.1.0) - metasploit-payloads (= 2.0.41) + metasploit-payloads (= 2.0.43) metasploit_data_models (~> 4.1.0) - metasploit_payloads-mettle (= 1.0.8) + metasploit_payloads-mettle (= 1.0.9) mqtt msgpack nessus_rest @@ -123,8 +123,8 @@ GEM arel-helpers (2.12.0) activerecord (>= 3.1.0, < 7) aws-eventstream (1.1.1) - aws-partitions (1.443.0) - aws-sdk-core (3.113.1) + aws-partitions (1.445.0) + aws-sdk-core (3.114.0) aws-eventstream (~> 1, >= 1.0.2) aws-partitions (~> 1, >= 1.239.0) aws-sigv4 (~> 1.1) @@ -138,7 +138,7 @@ GEM aws-sdk-kms (1.43.0) aws-sdk-core (~> 3, >= 3.112.0) aws-sigv4 (~> 1.1) - aws-sdk-s3 (1.93.0) + aws-sdk-s3 (1.93.1) 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.41) + metasploit-payloads (2.0.43) metasploit_data_models (4.1.3) 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.8) + metasploit_payloads-mettle (1.0.9) method_source (1.0.0) mini_portile2 (2.5.0) minitest (5.14.4) diff --git a/pkgs/tools/security/metasploit/default.nix b/pkgs/tools/security/metasploit/default.nix index 6232c85a2f2..19d53b1bb21 100644 --- a/pkgs/tools/security/metasploit/default.nix +++ b/pkgs/tools/security/metasploit/default.nix @@ -8,13 +8,13 @@ let }; in stdenv.mkDerivation rec { pname = "metasploit-framework"; - version = "6.0.39"; + version = "6.0.40"; src = fetchFromGitHub { owner = "rapid7"; repo = "metasploit-framework"; rev = version; - sha256 = "sha256-9uoxxcuEJudJGRQfkVBUWDHoZ1sxaIb+Hjf/sEpcqik="; + sha256 = "sha256-QEaTHGCgBl1Lh6zZO1OSY3kS+6+xOr1lbHPNeS1DZZ8="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/tools/security/metasploit/gemset.nix b/pkgs/tools/security/metasploit/gemset.nix index 3e195ffcc10..7440eae07c1 100644 --- a/pkgs/tools/security/metasploit/gemset.nix +++ b/pkgs/tools/security/metasploit/gemset.nix @@ -114,20 +114,20 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0vvav3449v3m0nyflcw07sbxlpgqf4pwa2fmirgjvc9r9asssi79"; + sha256 = "1yvjc0vpcycr5plvkh63cjpivqi0slzq6sj60jllz8p99kli4xrj"; type = "gem"; }; - version = "1.443.0"; + version = "1.445.0"; }; aws-sdk-core = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0i3x8p9gymc9977dcdkz5ca6mrmh7ym6p2mrscbh49nfd9gi5zg0"; + sha256 = "09asbdcg96l165kq4hrks0hsk4hwr16h1qx22az4m7ld0ylvz3jc"; type = "gem"; }; - version = "3.113.1"; + version = "3.114.0"; }; aws-sdk-ec2 = { groups = ["default"]; @@ -164,10 +164,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0iy2f9z43pc6fgwmga2cz8nf9gy2pwcw4jib141vp8z8dhylqj94"; + sha256 = "1x424hn32ipwxy21bhqn2wziz890w2gdr1xsli9lv2rrs1ibpnq7"; type = "gem"; }; - version = "1.93.0"; + version = "1.93.1"; }; aws-sigv4 = { groups = ["default"]; @@ -514,12 +514,12 @@ platforms = []; source = { fetchSubmodules = false; - rev = "5cba6ecd3c745f45290400f0705400f26913852e"; - sha256 = "0adabi5b1zrp3vz8cs1ibdkyhcaqai8927ql354yf9l4rg2k3spn"; + rev = "fb842915658f23b8997aa2cab4c3a62f3170cbbd"; + sha256 = "17v58cnpkkbkdijvsfmimzxi4yb3j99kpndchx5ms1m0c0f96ij0"; type = "git"; url = "https://github.com/rapid7/metasploit-framework"; }; - version = "6.0.39"; + version = "6.0.40"; }; metasploit-model = { groups = ["default"]; @@ -536,10 +536,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1nnb6kidfm39qyhv694m7skbvmsp5sjw52633v89zq0ym4y5wld5"; + sha256 = "1rr6g3gqjsvdjkqfbgpc3wfzpq367dk9zn3rzm8h9kd09hy3i760"; type = "gem"; }; - version = "2.0.41"; + version = "2.0.43"; }; metasploit_data_models = { groups = ["default"]; @@ -556,10 +556,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0nq6wxsaghj0yqwn988z71d9f0qwglcrliwkgqr9f16vbbv33p36"; + sha256 = "07l2ahb4c5ay6s5vbcfmipmya2qdj8i29blxk9vdmvs27yzkc8jk"; type = "gem"; }; - version = "1.0.8"; + version = "1.0.9"; }; method_source = { groups = ["default"]; From 6d22c594347dad7b295908cdd8c286095ed9654d Mon Sep 17 00:00:00 2001 From: austinbutler Date: Thu, 15 Apr 2021 14:30:38 -0700 Subject: [PATCH 139/230] courier-prime: init at unstable-2019-12-05 (#119190) Co-authored-by: Sandro --- pkgs/data/fonts/courier-prime/default.nix | 24 +++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 26 insertions(+) create mode 100644 pkgs/data/fonts/courier-prime/default.nix diff --git a/pkgs/data/fonts/courier-prime/default.nix b/pkgs/data/fonts/courier-prime/default.nix new file mode 100644 index 00000000000..81788b322cf --- /dev/null +++ b/pkgs/data/fonts/courier-prime/default.nix @@ -0,0 +1,24 @@ +{ lib, fetchzip }: + +let + version = "unstable-2019-12-05"; + repo = "CourierPrime"; + rev = "7f6d46a766acd9391d899090de467c53fd9c9cb0"; +in fetchzip rec { + name = "courier-prime-${version}"; + url = "https://github.com/quoteunquoteapps/${repo}/archive/${rev}/${name}.zip"; + sha256 = "1xh4pkksm6zrafhb69q4lq093q6pl245zi9qhqw3x6c1ab718704"; + + postFetch = '' + unzip $downloadedFile + install -m444 -Dt $out/share/fonts/truetype ${repo}-${rev}/fonts/ttf/*.ttf + ''; + + meta = with lib; { + description = "Monospaced font designed specifically for screenplays"; + homepage = "https://github.com/quoteunquoteapps/CourierPrime"; + license = licenses.ofl; + maintainers = [ maintainers.austinbutler ]; + platforms = platforms.all; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index e60e3c50bb2..931d81f5264 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -20990,6 +20990,8 @@ in corefonts = callPackage ../data/fonts/corefonts { }; + courier-prime = callPackage ../data/fonts/courier-prime { }; + cozette = callPackage ../data/fonts/cozette { }; culmus = callPackage ../data/fonts/culmus { }; From a7e6653290a0e19f9ddd7789909c0d6d2d3f953f Mon Sep 17 00:00:00 2001 From: Ben Darwin Date: Thu, 15 Apr 2021 16:58:33 -0400 Subject: [PATCH 140/230] libminc: hdf5 -> hdf5_1_10 - unbreaks build broken by merge of #117584/669636256265f6e47cc75126b7b003c4554d0acb - needed due to libminc test segfault (https://github.com/BIC-MNI/libminc/issues/114) --- pkgs/top-level/all-packages.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 289682b2255..a1747b4aad0 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -15860,7 +15860,9 @@ in libmilter = callPackage ../development/libraries/libmilter { }; - libminc = callPackage ../development/libraries/libminc { }; + libminc = callPackage ../development/libraries/libminc { + hdf5 = hdf5_1_10; + }; libmirage = callPackage ../misc/emulators/cdemu/libmirage.nix { }; From e91e8bcdf28dab8d8496079fb4486d3508ac6555 Mon Sep 17 00:00:00 2001 From: TredwellGit Date: Thu, 15 Apr 2021 21:38:28 +0000 Subject: [PATCH 141/230] electron_12: 12.0.2 -> 12.0.4 https://github.com/electron/electron/releases/tag/v12.0.3 https://github.com/electron/electron/releases/tag/v12.0.4 --- pkgs/development/tools/electron/default.nix | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/pkgs/development/tools/electron/default.nix b/pkgs/development/tools/electron/default.nix index 518eef2d1a0..9ebb8ef7b43 100644 --- a/pkgs/development/tools/electron/default.nix +++ b/pkgs/development/tools/electron/default.nix @@ -104,12 +104,12 @@ rec { headers = "1bpsmmlxl4gk9yn5w7f8m6g8k1gmvwk0jwpqlk5islpkcy6x7107"; }; - 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"; + electron_12 = mkElectron "12.0.4" { + x86_64-linux = "6419716f614f396954981e6432afe77277dff2b64ecb84e2bbd6d740362ea01c"; + x86_64-darwin = "3072f1854eb5b91d5f24e03a313583bb85d696cda48381bdf3e40ee2c93dfe34"; + i686-linux = "fa241874aacca8fe4b4f940fa9133fe65fdcf9ef0847322332f0c67ee7b42aa0"; + armv7l-linux = "8d88d13bf117820bc3b46501d34004f18ebf402f2817836a2a7ba4fc60433653"; + aarch64-linux = "c5cbcbb5b397407e45e682480b30da4fcf94154ac92d8f6eea4c79a50d56626a"; + headers = "121falvhz0bfxc2h7wwvyfqdagr3aznida4f4phzqp0ja3rznxf3"; }; } From af8be16988bf687b567961e94da0a47cec481e02 Mon Sep 17 00:00:00 2001 From: TredwellGit Date: Thu, 15 Apr 2021 21:40:40 +0000 Subject: [PATCH 142/230] electron_11: 11.4.1 -> 11.4.3 https://github.com/electron/electron/releases/tag/v11.4.2 https://github.com/electron/electron/releases/tag/v11.4.3 --- pkgs/development/tools/electron/default.nix | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/pkgs/development/tools/electron/default.nix b/pkgs/development/tools/electron/default.nix index 9ebb8ef7b43..9ffa2be3353 100644 --- a/pkgs/development/tools/electron/default.nix +++ b/pkgs/development/tools/electron/default.nix @@ -95,13 +95,13 @@ rec { headers = "13cpkblkvhvd3sww8n1gw4rhva84x2fkkg81yr3n2mb0virlfgpn"; }; - 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_11 = mkElectron "11.4.3" { + x86_64-linux = "222e7aa51d5516796d532f784c574f07315bad4bf29efb0ce687014f93ba5fa5"; + x86_64-darwin = "6cccbaf8dca7eb3819b0ac3044686f6705c5d51c88ee1361d8573c2b83c8dc0a"; + i686-linux = "1910729fd6088e9c914db9fdd6c42ce6747fcb048947dd83fa2cdf564c786353"; + armv7l-linux = "e0e1375bdb79a6917467490683e49bb59da9260b73d7b710a5e4e4535c1c5e80"; + aarch64-linux = "9fb287ed8bcc7782775bd615fe1c31db4a8b6d548209fd15ef5312ac72a04d07"; + headers = "00gln9jlb621gvxx1z7s212wakjbdigdqv02vx1pjvkg62aazg8j"; }; electron_12 = mkElectron "12.0.4" { From 55853a8e9c6f32fc3f7d1a4ea2902dc7b8f63708 Mon Sep 17 00:00:00 2001 From: TredwellGit Date: Thu, 15 Apr 2021 21:42:10 +0000 Subject: [PATCH 143/230] electron_10: 10.4.2 -> 10.4.3 https://github.com/electron/electron/releases/tag/v10.4.3 --- pkgs/development/tools/electron/default.nix | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/pkgs/development/tools/electron/default.nix b/pkgs/development/tools/electron/default.nix index 9ffa2be3353..ddd51f268e2 100644 --- a/pkgs/development/tools/electron/default.nix +++ b/pkgs/development/tools/electron/default.nix @@ -86,13 +86,13 @@ rec { headers = "0yx8mkrm15ha977hzh7g2sc5fab9sdvlk1bk3yxignhxrqqbw885"; }; - 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_10 = mkElectron "10.4.3" { + x86_64-linux = "48793fc6c6d3bfb8df81cd29f6c52e68c8c6b901693c6ba4ed505799fa673e9f"; + x86_64-darwin = "28cbacf51e0528e0d4ba30a2c56efd6a8e7f836104786733aae0c5fc99dc2615"; + i686-linux = "b9b7fd9b91630350dafe97a31c918f941ab15b044f0b4e9b2a705482447fe78f"; + armv7l-linux = "b1e1b4d0620eae647915c95d21656d21c00efe89f44198938d9fd9fba045e39c"; + aarch64-linux = "aa9177becf787920cef4cde27a6ed08e2e23976678162a3cd6b77615b1582c05"; + headers = "0phv08myxq226blrqzg3fza3mh3ivgfmcja98b7377pc3x7bv76g"; }; electron_11 = mkElectron "11.4.3" { From 1fb145c0b2da361b4da648d7d108994b9f525b64 Mon Sep 17 00:00:00 2001 From: Drew Risinger Date: Thu, 15 Apr 2021 18:02:41 -0400 Subject: [PATCH 144/230] python3Packages.sparse: 0.11.2 -> 0.12.0 --- .../python-modules/sparse/default.nix | 23 ++++++++++--------- 1 file changed, 12 insertions(+), 11 deletions(-) diff --git a/pkgs/development/python-modules/sparse/default.nix b/pkgs/development/python-modules/sparse/default.nix index 93ffa89c76c..d958fd2ed70 100644 --- a/pkgs/development/python-modules/sparse/default.nix +++ b/pkgs/development/python-modules/sparse/default.nix @@ -2,38 +2,39 @@ , buildPythonPackage , fetchPypi , isPy3k -, dask +, numba , numpy , scipy -, numba -, pytest + # Test Inputs +, pytestCheckHook +, dask }: buildPythonPackage rec { pname = "sparse"; - version = "0.11.2"; + version = "0.12.0"; disabled = !isPy3k; src = fetchPypi { inherit pname version; - sha256 = "bc5c35dbc81242237feb7a8e1f7d9c5e9dd9bb0910f6ec55f50dcc379082864f"; + sha256 = "2c95c3b8ee00211a5aa4ef5e46006d25bf35009a66e406b7ea9b25b327fb9516"; }; - checkInputs = [ pytest dask ]; propagatedBuildInputs = [ + numba numpy scipy - numba ]; + checkInputs = [ pytestCheckHook dask ]; - checkPhase = '' - pytest sparse - ''; + pythonImportsCheck = [ "sparse" ]; meta = with lib; { description = "Sparse n-dimensional arrays computations"; - homepage = "https://github.com/pydata/sparse/"; + homepage = "https://sparse.pydata.org/en/stable/"; + changelog = "https://sparse.pydata.org/en/stable/changelog.html"; + downloadPage = "https://github.com/pydata/sparse/releases/tag/${version}"; license = licenses.bsd3; maintainers = [ maintainers.costrouc ]; }; From 35c8995dabeab33a23b8a3c06c216c737f2375d3 Mon Sep 17 00:00:00 2001 From: hjones2199 Date: Thu, 15 Apr 2021 17:02:55 -0500 Subject: [PATCH 145/230] wcslib: 7.5 -> 7.6 (#119504) Co-authored-by: Sandro --- .../libraries/science/astronomy/wcslib/default.nix | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/pkgs/development/libraries/science/astronomy/wcslib/default.nix b/pkgs/development/libraries/science/astronomy/wcslib/default.nix index b16ba1117f4..58c2744605a 100644 --- a/pkgs/development/libraries/science/astronomy/wcslib/default.nix +++ b/pkgs/development/libraries/science/astronomy/wcslib/default.nix @@ -2,22 +2,19 @@ stdenv.mkDerivation rec { pname = "wcslib"; - version = "7.5"; + version = "7.6"; src = fetchurl { url = "ftp://ftp.atnf.csiro.au/pub/software/wcslib/${pname}-${version}.tar.bz2"; - sha256 = "1536gmcpm6pckn9xrb6j8s4pm1vryjhzvhfaj9wx3jwxcpbdy0dw"; + sha256 = "sha256-VLuMkhZ6fxP4qnP8S4oJeFJW0smCE0Z968eigqQxMYs="; }; - buildInputs = [ flex ]; - - prePatch = '' - substituteInPlace GNUmakefile --replace 2775 0775 - substituteInPlace C/GNUmakefile --replace 2775 0775 - ''; + nativeBuildInputs = [ flex ]; enableParallelBuilding = true; + outputs = [ "out" "man" ]; + meta = with lib; { homepage = "https://www.atnf.csiro.au/people/mcalabre/WCS/"; description = "World Coordinate System library for astronomy"; From 3cee82ace355697555105624f3bb97d0649aa5e6 Mon Sep 17 00:00:00 2001 From: Technical27 <38222826+Technical27@users.noreply.github.com> Date: Thu, 15 Apr 2021 18:11:52 -0400 Subject: [PATCH 146/230] lunar-client: 2.4.0 -> 2.6.0 (#119355) * lunar-client: add Technical27 to maintainers * lunar-client: 2.4.0 -> 2.6.0 --- pkgs/games/lunar-client/default.nix | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/pkgs/games/lunar-client/default.nix b/pkgs/games/lunar-client/default.nix index 0635ab8aed8..8ca8c3f8552 100644 --- a/pkgs/games/lunar-client/default.nix +++ b/pkgs/games/lunar-client/default.nix @@ -1,13 +1,14 @@ { appimageTools, lib, fetchurl, makeDesktopItem }: + let name = "lunar-client"; - version = "2.4.0"; + version = "2.6.0"; desktopItem = makeDesktopItem { name = "Lunar Client"; exec = "lunar-client"; icon = "lunarclient"; - comment = "Optimized Minecraft Client for 1.7.10 and 1.8.9"; + comment = "Minecraft 1.7, 1.8, 1.12, 1.15, and 1.16 Client"; desktopName = "Lunar Client"; genericName = "Minecraft Client"; categories = "Game;"; @@ -20,7 +21,7 @@ let src = fetchurl { url = "https://launcherupdates.lunarclientcdn.com/Lunar%20Client-${version}.AppImage"; name = "lunar-client.AppImage"; - sha256 = "bb85a62127a9b3848cc60796c20ac75655794f1d3cd17cb6b5499bbf19d16019"; + sha256 = "1pmblnnvs5jv5v7y5nnxr3liw9xfp5h6l44x7pln8kr9zg85dzma"; }; in appimageTools.wrapType1 rec { inherit name src; @@ -31,11 +32,13 @@ in appimageTools.wrapType1 rec { cp -r ${appimageContents}/usr/share/icons/ $out/share/ ''; + extraPkgs = pkgs: [ pkgs.libpulseaudio ]; + meta = with lib; { - description = "Minecraft 1.7.10 & 1.8.9 PVP Client"; + description = "Minecraft 1.7, 1.8, 1.12, 1.15, and 1.16 Client"; homepage = "https://www.lunarclient.com/"; license = with licenses; [ unfree ]; - maintainers = with maintainers; [ zyansheep ]; + maintainers = with maintainers; [ zyansheep Technical27 ]; platforms = [ "x86_64-linux" ]; }; } From 0681bd9e9a7d9619096d7e92644d0a2ccb75b625 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 15 Apr 2021 23:58:35 +0200 Subject: [PATCH 147/230] python3Packages.beautifultable: init at 1.0.1 --- .../python-modules/beautifultable/default.nix | 32 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 34 insertions(+) create mode 100644 pkgs/development/python-modules/beautifultable/default.nix diff --git a/pkgs/development/python-modules/beautifultable/default.nix b/pkgs/development/python-modules/beautifultable/default.nix new file mode 100644 index 00000000000..def8f207ee8 --- /dev/null +++ b/pkgs/development/python-modules/beautifultable/default.nix @@ -0,0 +1,32 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, pytestCheckHook +}: + +buildPythonPackage rec { + pname = "beautifultable"; + version = "1.0.1"; + + src = fetchFromGitHub { + owner = "pri22296"; + repo = pname; + rev = "v${version}"; + sha256 = "12ci6jy8qmbphsvzvj98466nlhclfzs0a0pmbsv3mf5bfcdwvbh7"; + }; + + checkInputs = [ + pytestCheckHook + ]; + + pytestFlagsArray = [ "test.py" ]; + + pythonImportsCheck = [ "beautifultable" ]; + + meta = with lib; { + description = "Python package for printing visually appealing tables"; + homepage = "https://github.com/CERT-Polska/mwdblib"; + license = with licenses; [ mit ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index a6a269bafa1..393dcfeb0f6 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -992,6 +992,8 @@ in { beautifulsoup4 = callPackage ../development/python-modules/beautifulsoup4 { }; + beautifultable = callPackage ../development/python-modules/beautifultable { }; + bedup = callPackage ../development/python-modules/bedup { }; behave = callPackage ../development/python-modules/behave { }; From d9f87b224fdfb810e04099556bda91b6f822c6a5 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 16 Apr 2021 00:02:01 +0200 Subject: [PATCH 148/230] python3Packages.mwdblib: init at 3.4.0 --- .../python-modules/mwdblib/default.nix | 49 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 51 insertions(+) create mode 100644 pkgs/development/python-modules/mwdblib/default.nix diff --git a/pkgs/development/python-modules/mwdblib/default.nix b/pkgs/development/python-modules/mwdblib/default.nix new file mode 100644 index 00000000000..e73cf06194f --- /dev/null +++ b/pkgs/development/python-modules/mwdblib/default.nix @@ -0,0 +1,49 @@ +{ lib +, beautifultable +, buildPythonPackage +, click +, click-default-group +, fetchFromGitHub +, humanize +, keyring +, python +, python-dateutil +, requests +}: + +buildPythonPackage rec { + pname = "mwdblib"; + version = "3.4.0"; + + src = fetchFromGitHub { + owner = "CERT-Polska"; + repo = pname; + rev = "v${version}"; + sha256 = "0dbdmps4a3mav02m4h37bj2bw8pg6h52yf3gpdkhi3k9hl9f942h"; + }; + + propagatedBuildInputs = [ + beautifultable + click + click-default-group + humanize + keyring + python-dateutil + requests + ]; + + checkPhase = '' + runHook preCheck + ${python.interpreter} -m unittest discover + runHook postCheck + ''; + + pythonImportsCheck = [ "mwdblib" ]; + + meta = with lib; { + description = "Python client library for the mwdb service"; + homepage = "https://github.com/CERT-Polska/mwdblib"; + license = with licenses; [ bsd3 ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 393dcfeb0f6..7b3941bd6a8 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -4518,6 +4518,8 @@ in { mwclient = callPackage ../development/python-modules/mwclient { }; + mwdblib = callPackage ../development/python-modules/mwdblib { }; + mwlib = callPackage ../development/python-modules/mwlib { }; mwlib-ext = callPackage ../development/python-modules/mwlib-ext { }; From 06c63c21188bbd3ec1cea2efacd37e79dc710e0f Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 16 Apr 2021 00:15:38 +0200 Subject: [PATCH 149/230] python3Packages.karton-mwdb-reporter: init at 1.0.0 --- .../karton-mwdb-reporter/default.nix | 42 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 44 insertions(+) create mode 100644 pkgs/development/python-modules/karton-mwdb-reporter/default.nix diff --git a/pkgs/development/python-modules/karton-mwdb-reporter/default.nix b/pkgs/development/python-modules/karton-mwdb-reporter/default.nix new file mode 100644 index 00000000000..9f4c1ee6709 --- /dev/null +++ b/pkgs/development/python-modules/karton-mwdb-reporter/default.nix @@ -0,0 +1,42 @@ +{ lib +, buildPythonPackage +, chardet +, fetchFromGitHub +, karton-core +, mwdblib +, python +}: + +buildPythonPackage rec { + pname = "karton-mwdb-reporter"; + version = "1.0.0"; + + src = fetchFromGitHub { + owner = "CERT-Polska"; + repo = pname; + rev = "v${version}"; + sha256 = "0ks8jrc4v87q6zhwqg40w6xv2wfkzslmnfmsmmkfjj8mak8nk70f"; + }; + + propagatedBuildInputs = [ + karton-core + mwdblib + ]; + + postPatch = '' + substituteInPlace requirements.txt \ + --replace "karton-core==4.0.4" "karton-core" \ + --replace "mwdblib==3.3.1" "mwdblib" + ''; + + # Project has no tests + doCheck = false; + pythonImportsCheck = [ "karton.mwdb_reporter" ]; + + meta = with lib; { + description = "Karton service that uploads analyzed artifacts and metadata to MWDB Core"; + homepage = "https://github.com/CERT-Polska/karton-mwdb-reporter"; + license = with licenses; [ bsd3 ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 7b3941bd6a8..07516ce1b2b 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -3689,6 +3689,8 @@ in { karton-core = callPackage ../development/python-modules/karton-core { }; + karton-mwdb-reporter = callPackage ../development/python-modules/karton-mwdb-reporter { }; + karton-yaramatcher = callPackage ../development/python-modules/karton-yaramatcher { }; kazoo = callPackage ../development/python-modules/kazoo { }; From 6637ce9fd8dda284bf3dec346ee2cb7a66ff80f6 Mon Sep 17 00:00:00 2001 From: ajs124 Date: Fri, 16 Apr 2021 00:42:43 +0200 Subject: [PATCH 150/230] nixos/dovecot: set isSystemUser for mailUser needed after 7a87973b4ced86e1ba94ee84449979d6afebc9ea --- nixos/modules/services/mail/dovecot.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/services/mail/dovecot.nix b/nixos/modules/services/mail/dovecot.nix index a2298152b02..1ccfb357750 100644 --- a/nixos/modules/services/mail/dovecot.nix +++ b/nixos/modules/services/mail/dovecot.nix @@ -405,7 +405,7 @@ in }; } // optionalAttrs (cfg.createMailUser && cfg.mailUser != null) { ${cfg.mailUser} = - { description = "Virtual Mail User"; } // optionalAttrs (cfg.mailGroup != null) + { description = "Virtual Mail User"; isSystemUser = true; } // optionalAttrs (cfg.mailGroup != null) { group = cfg.mailGroup; }; }; From 90f6033984eac0029e0c090788f4babfbd03ab51 Mon Sep 17 00:00:00 2001 From: ajs124 Date: Fri, 16 Apr 2021 00:43:11 +0200 Subject: [PATCH 151/230] nixos/tests/dovecot: set mailUser and mailGroup --- nixos/tests/dovecot.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/nixos/tests/dovecot.nix b/nixos/tests/dovecot.nix index 1129e3b45d9..8913c2a6a7e 100644 --- a/nixos/tests/dovecot.nix +++ b/nixos/tests/dovecot.nix @@ -8,6 +8,8 @@ import ./make-test-python.nix { enable = true; protocols = [ "imap" "pop3" ]; modules = [ pkgs.dovecot_pigeonhole ]; + mailUser = "vmail"; + mailGroup = "vmail"; }; environment.systemPackages = let sendTestMail = pkgs.writeScriptBin "send-testmail" '' From c07ddf1df589162a0cf0a99dc5a619d6700e2a23 Mon Sep 17 00:00:00 2001 From: AndersonTorres Date: Thu, 15 Apr 2021 19:28:23 -0300 Subject: [PATCH 152/230] org mode: 20210322 -> 20210412 --- .../editors/emacs-modes/org-generated.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/applications/editors/emacs-modes/org-generated.nix b/pkgs/applications/editors/emacs-modes/org-generated.nix index 01ad01f9049..0114f4dc180 100644 --- a/pkgs/applications/editors/emacs-modes/org-generated.nix +++ b/pkgs/applications/editors/emacs-modes/org-generated.nix @@ -4,10 +4,10 @@ elpaBuild { pname = "org"; ename = "org"; - version = "20210322"; + version = "20210412"; src = fetchurl { - url = "https://orgmode.org/elpa/org-20210322.tar"; - sha256 = "0iv54rhwa0972yr1wqzmlkggs5vc6qajz8mmyfhynp65ap088g6v"; + url = "https://orgmode.org/elpa/org-20210412.tar"; + sha256 = "17hj4y0c9hjqqa7inzjadz9z64vh621lm4cb0asm13r7d1v186yf"; }; packageRequires = []; meta = { @@ -19,10 +19,10 @@ elpaBuild { pname = "org-plus-contrib"; ename = "org-plus-contrib"; - version = "20210322"; + version = "20210412"; src = fetchurl { - url = "https://orgmode.org/elpa/org-plus-contrib-20210322.tar"; - sha256 = "0riswc3ira8hsawm37yypji55z47bw2477kaw3qx7ghz3n62r9nf"; + url = "https://orgmode.org/elpa/org-plus-contrib-20210412.tar"; + sha256 = "162nl1a62l9d4nazply93sx4lih11845z87hxmpfd0n7i7s290mh"; }; packageRequires = []; meta = { From c3bd8d5569d53070e8f766f7ac6427e5507a839c Mon Sep 17 00:00:00 2001 From: AndersonTorres Date: Thu, 15 Apr 2021 19:42:36 -0300 Subject: [PATCH 153/230] Update melpa recipes --- .../emacs-modes/recipes-archive-melpa.json | 2877 ++++++++++------- 1 file changed, 1678 insertions(+), 1199 deletions(-) diff --git a/pkgs/applications/editors/emacs-modes/recipes-archive-melpa.json b/pkgs/applications/editors/emacs-modes/recipes-archive-melpa.json index 7703579db80..b24f79ed260 100644 --- a/pkgs/applications/editors/emacs-modes/recipes-archive-melpa.json +++ b/pkgs/applications/editors/emacs-modes/recipes-archive-melpa.json @@ -201,8 +201,8 @@ 20210316, 2027 ], - "commit": "af9d405a0f6ea078ae5b6567f664f4166f9f0ab0", - "sha256": "0jsnvnpvrrz5b4vh9jf3sjjm0pgh4241zw54bjkqa1ld9vvxwkxn" + "commit": "e2b3edafd7aafa8c47833a70984d7404c607626c", + "sha256": "0xg651vfjnq5dywg855wf7ld34gnfspql4b0b0413kydhh15fmxi" }, "stable": { "version": [ @@ -302,16 +302,16 @@ "repo": "abstools/abs-mode", "unstable": { "version": [ - 20210303, - 1059 + 20210411, + 1013 ], "deps": [ "erlang", "flymake", "maude-mode" ], - "commit": "5a766c734fcdf3b6c2ad88bbeb5c1cd79cdeaf44", - "sha256": "10ywyz0g4nnkap66xc7ynr9lq9z9jpsd0i3qwxs3fqkjwixwylz5" + "commit": "c9b7a2af3232aad8a51138194544c9a427cf46ca", + "sha256": "0h8assjgwwcgnqhlndsc86z9lc1nzlglhvhzxdnkz2ksk90n85q1" }, "stable": { "version": [ @@ -510,15 +510,15 @@ "repo": "atilaneves/ac-dcd", "unstable": { "version": [ - 20190902, - 1124 + 20210329, + 1928 ], "deps": [ "auto-complete", "flycheck-dmd-dub" ], - "commit": "d378d33c7bedc6c108eda7f674bd0aa1d8664857", - "sha256": "1gpqxfc83p7gzjrhs95gimwg46v9pq58m81m0fhz6slk7i005mdl" + "commit": "56cdead8c9d2ca64db1f24c59d005ba8b3780bd5", + "sha256": "1z38mg76376xac3rnamzhhmx4h4yzn89xycx7kk51vkcjffjzvg6" }, "stable": { "version": [ @@ -1133,8 +1133,8 @@ "auto-complete", "rtags" ], - "commit": "aa4c827b417f5448c12401c33acdab1325917c13", - "sha256": "02jqcbrpxm4sv15l8kyvsw9pwkmamj065cgifj68x242fw2f0sam" + "commit": "63f18acb21e664fd92fbc19465f0b5df085b5e93", + "sha256": "0wzyn9qzyly71yfwhlk5m94ygjnbk459pgbpgkhp9fqgchx12p1r" }, "stable": { "version": [ @@ -1918,8 +1918,8 @@ "annotation", "eri" ], - "commit": "ecb93230ad9327991e542731756cbe1405c85d5f", - "sha256": "1acs54ngr26qw5hbhq7xdw4wspqhhmr97gj6rnwxhz4yx02wxd9w" + "commit": "3e079614f2b4810ff5920ae69a389da91c855217", + "sha256": "1jn0kp33b77lskhi02d0jm0rpcgxhrpxdj82bmr7vi7m199p5jn0" }, "stable": { "version": [ @@ -2378,11 +2378,11 @@ "repo": "domtronn/all-the-icons.el", "unstable": { "version": [ - 20210313, - 2205 + 20210411, + 1650 ], - "commit": "a8c84176af7f3b97019423ebf3e02f983f4ebdf9", - "sha256": "07vscdf28wjjxsqaich694r94rf9iffjbqsvmqcq8h0qhqzfp2pq" + "commit": "07a4f7315bf5dd609f95e18390a9707b5a29fe9c", + "sha256": "0z0bqs2cqwndkjaiv301l1n4i1g7h6v89cl95inilfxxkyxhbzig" }, "stable": { "version": [ @@ -2405,14 +2405,14 @@ "repo": "wyuenho/all-the-icons-dired", "unstable": { "version": [ - 20210302, - 1410 + 20210411, + 1226 ], "deps": [ "all-the-icons" ], - "commit": "f401fe289cd93936e7747b1541aa98117b7ca96f", - "sha256": "1j5vbrsxy6blickkbblagyn6binvpalc2kxr7b438xhx8mgfbapv" + "commit": "07f035d2f6df4f1e840572784a96f5b407a74680", + "sha256": "134p5wz5jgbwfri6ihwf4p8xxbdmwwzpkklxn195gl46r2zqnnwx" } }, { @@ -2504,15 +2504,15 @@ "repo": "seagle0128/all-the-icons-ivy-rich", "unstable": { "version": [ - 20210303, - 1747 + 20210405, + 1824 ], "deps": [ "all-the-icons", "ivy-rich" ], - "commit": "2efbbf231ea3b3248177051a10c52c151686c4b4", - "sha256": "1rrnanmmq07jx83w51b9gpwv2al1xw01xqb6xbpzd4bi2gjlayy5" + "commit": "e7775f85a2bb9c13a4c55417ae8d6f16477e3ca0", + "sha256": "0jys6kvwgkf04cyzxh5r2g38qfcpqas4qqyqqkmp8z8vc68fnwz0" }, "stable": { "version": [ @@ -2790,8 +2790,8 @@ "repo": "pythonic-emacs/anaconda-mode", "unstable": { "version": [ - 20210304, - 1723 + 20210409, + 1536 ], "deps": [ "dash", @@ -2799,8 +2799,8 @@ "pythonic", "s" ], - "commit": "344727c9e07e108896740c782689bf3588edcce5", - "sha256": "020ix7jlzx3k9g9flwcq8ddgplby62gcfj28wxhq0pcngy8fnqjz" + "commit": "4f367c768a84465070c44327444b17015091d08d", + "sha256": "1lvijddzzfsr295w327vdnfpz51zaqm0g24gn2wjqny3nc7kyaz4" }, "stable": { "version": [ @@ -3146,8 +3146,8 @@ 20200914, 644 ], - "commit": "ecb93230ad9327991e542731756cbe1405c85d5f", - "sha256": "1acs54ngr26qw5hbhq7xdw4wspqhhmr97gj6rnwxhz4yx02wxd9w" + "commit": "3e079614f2b4810ff5920ae69a389da91c855217", + "sha256": "1jn0kp33b77lskhi02d0jm0rpcgxhrpxdj82bmr7vi7m199p5jn0" }, "stable": { "version": [ @@ -3644,11 +3644,11 @@ "repo": "waymondo/apropospriate-theme", "unstable": { "version": [ - 20210316, - 2156 + 20210408, + 1935 ], - "commit": "22b394e3c9fc8db3a33c0f7fa36263ce44b0dec5", - "sha256": "1075f1gp9q210h4varmrj69g35wf8dygamzwsgfp38kqggdqdrxq" + "commit": "a21c143b7cc92a0d8402955d079fc78c4140c2ff", + "sha256": "04zs9785b7j16gcgbi26xcl6bhmclprz5pj1jzb40igy7f2kwyqs" }, "stable": { "version": [ @@ -4237,8 +4237,8 @@ "repo": "jyp/attrap", "unstable": { "version": [ - 20210219, - 1001 + 20210407, + 1826 ], "deps": [ "dash", @@ -4246,8 +4246,8 @@ "flycheck", "s" ], - "commit": "778382eba8e1a449862b1573e90c1e79cf5caeb1", - "sha256": "0a2n1p2nasd2ikv86p3sm5sn4qb3avj2sni9gja3yn6kdqn8s8jp" + "commit": "4b088698ec81f7cd0f715b30e280b37e3881b91d", + "sha256": "1jil04a69fx946vh6f81x3ki84jmmdfz7g3c9v4phddz58clb1sb" }, "stable": { "version": [ @@ -5216,11 +5216,14 @@ "url": "https://git.sr.ht/~zge/autocrypt", "unstable": { "version": [ - 20201115, - 912 + 20210411, + 1759 ], - "commit": "050d4967162dff6de5ef480db8a22c5896d483c7", - "sha256": "1f5h7ln78rvjg428vpqddr4ahz8yxfsr471p1qib1kh3zahjy2iy" + "deps": [ + "cl-generic" + ], + "commit": "39c06eb4020c38de8f282340449691210cc23bb8", + "sha256": "0gvdjgfnisx1acy5jmzs82yngmnmiimq1ralbvw9a28knlsdbnig" } }, { @@ -5454,8 +5457,8 @@ "avy", "embark" ], - "commit": "49cd0aff39e7bc9173ec49d1c14d7ab8d9d25355", - "sha256": "19ihm3v7ck5rx4wff5hkrrzqbjk9g9vm8j0axvdf77hr6vzjsak8" + "commit": "a005eef82a63950927a68a5ef79b33d25245687b", + "sha256": "1dy01y87bqjddsdjqhmp6m144azn72yswsj0prywm5alxypck9lg" }, "stable": { "version": [ @@ -5948,11 +5951,11 @@ "url": "https://git.sr.ht/~zge/bang", "unstable": { "version": [ - 20200924, - 1601 + 20210405, + 1640 ], - "commit": "a2077ecf974fb8299fef0f008aa974d782245ec8", - "sha256": "1l9915ir87d3iabrz1af2hrk1yp1dmq1i763117aln5b5mbmvn5a" + "commit": "b5252a77aed6d1c533367fde0f11d6901bf23d96", + "sha256": "1m0wmcm1akdk19vf132y1g6wjdx9kgschf66qgggd97gl50za5ab" }, "stable": { "version": [ @@ -6040,11 +6043,11 @@ "repo": "belak/base16-emacs", "unstable": { "version": [ - 20210320, - 519 + 20210406, + 1956 ], - "commit": "0c3aa33520ae4cb467c76ce53d438827df77eb1a", - "sha256": "0ibwxwyncyrgbpvhcx523813njdgln34wmqf0x826qv4hh4ai0yw" + "commit": "b35d21ae0d46856416b64851ccbb5e44ee9498d0", + "sha256": "04vs50a5wh0ziq34hh9li5d84nv39p3akaync1i9sbmr4kxkhr1l" }, "stable": { "version": [ @@ -6228,11 +6231,11 @@ "repo": "bazelbuild/emacs-bazel-mode", "unstable": { "version": [ - 20200627, - 1625 + 20210410, + 1645 ], - "commit": "43026c5e09dfca86fb84b9a857708ad419f2215f", - "sha256": "0bwabpx56ybk114456x0p4k8xqh0s060ig40jdsqibq89h6m1nab" + "commit": "fd1a8c53fabdf2ee1ada9338b3feb08d154ccbc9", + "sha256": "1jrla85sbj0cbrqifqhc6zx66bhagb6r62hwhgdc4vh3srmadiqx" }, "stable": { "version": [ @@ -6955,6 +6958,24 @@ "sha256": "0vcdi0q6rbs3qqlpccy9hdv82zrx61gdj3fn444qashk84s085vf" } }, + { + "ename": "bibtex-actions", + "commit": "a6050cc5f04343c5a0e3992d223eca3b50acec7c", + "sha256": "1yfrs54gb38877322rmg6p7lqy91km33vil867qgbyj016ss4x7s", + "fetcher": "github", + "repo": "bdarcus/bibtex-actions", + "unstable": { + "version": [ + 20210411, + 1846 + ], + "deps": [ + "bibtex-completion" + ], + "commit": "516cbdb63810bcb571e41436e2c568c328fc8980", + "sha256": "0n3byfv1khn2lr9c1r619gc52993hf01nwl5c7ih7nmrr5q3rckk" + } + }, { "ename": "bibtex-completion", "commit": "873ae2af16e03c8e10494be3f0e7840eb27172a3", @@ -6963,8 +6984,8 @@ "repo": "tmalsburg/helm-bibtex", "unstable": { "version": [ - 20210223, - 840 + 20210408, + 1649 ], "deps": [ "biblio", @@ -6974,8 +6995,8 @@ "parsebib", "s" ], - "commit": "ca09076c3d6e51cc4ffe208c8176fccf3710fcc6", - "sha256": "1jf2zapmkg2fdn9ldq8cn3aw02iqpjh26h6yjj93q3h0clsk5ia2" + "commit": "9870333cdd4a54b309e2709af647cda6f4070a42", + "sha256": "02cpg60hif4rz6va2ynh3wc9dwj0nyig4fa0l6jchmzz8v2zvf86" }, "stable": { "version": [ @@ -7362,11 +7383,11 @@ "repo": "pythonic-emacs/blacken", "unstable": { "version": [ - 20200626, - 2018 + 20210406, + 813 ], - "commit": "784da60033fe3743336d1da0f33239f1bf514266", - "sha256": "1s7isvih1xl4l6say8xa69r9lf3prq9sd6d9fmn1n8g8p3w09cnq" + "commit": "880cf502198753643a3e2ccd4131ee6973be2e8a", + "sha256": "1285hmdwixsw2jfyf5xzwmalc9v8w4iyc1q9f60im2zzigff5y5b" } }, { @@ -7853,15 +7874,15 @@ "repo": "emacscollective/borg", "unstable": { "version": [ - 20210105, - 1045 + 20210330, + 1213 ], "deps": [ "epkg", "magit" ], - "commit": "d0283edfaead36564ba4e64dcf8785f6d65f288c", - "sha256": "076n6jh084f6pra12cbl3fp1gv3229rj5nxbpcmr9rpp50x2c790" + "commit": "7f6642c297044ffa10a287a5a74748ce0b3f8c27", + "sha256": "1alr4wx5ldr07ifkdansgvrvdbwqs9zli99flbjq5zjwwy5f142a" }, "stable": { "version": [ @@ -8115,16 +8136,16 @@ "repo": "rmuslimov/browse-at-remote", "unstable": { "version": [ - 20200820, - 654 + 20210405, + 430 ], "deps": [ "cl-lib", "f", "s" ], - "commit": "fadf99d6d8e891f3b112e36c772e0eea0b9bc7f2", - "sha256": "15x32g8g90jjxlxj8h6yzyi1k9dgnk8an2c66ibj93dzcfci28m9" + "commit": "e02ad2189c87da33f80bf4967a968772ce3e4431", + "sha256": "0vn53zlwmhi4d6i81840i9pmrs8w4j6az2p0b4hw99xvk68grfiz" }, "stable": { "version": [ @@ -9613,15 +9634,15 @@ "repo": "kwrooijen/cargo.el", "unstable": { "version": [ - 20210217, - 904 + 20210327, + 1821 ], "deps": [ "markdown-mode", "rust-mode" ], - "commit": "9442af81d64f73935d3590948c97594f0bc79d4a", - "sha256": "1xci8kx10vxaniyzxgzzs0zd7m7s0grd0bbrxaxhyjjdvic77mq1" + "commit": "4846373bf1ed6268f1a1d9f9c489f8740351d8bb", + "sha256": "0y4wxddjp055kisv7yx6zs9bzggw65b08aa1g3y0vlaafrps8bga" }, "stable": { "version": [ @@ -9708,8 +9729,8 @@ "repo": "cask/cask", "unstable": { "version": [ - 20210319, - 2155 + 20210410, + 2057 ], "deps": [ "ansi", @@ -9720,8 +9741,8 @@ "s", "shut-up" ], - "commit": "7ae2d54004b26ebb891f7a011c86cff706acbf1a", - "sha256": "1ksw4rcbghjjni7v622cdfd84312fs39xhiyzbk7xmh57clrbx4f" + "commit": "dce91052dc8fae386a1898fd88d554b5cb527fdc", + "sha256": "1j853gbdc50s1csvsi2a0f6i2vakgnd8afb97qkkj5alpwq8883p" }, "stable": { "version": [ @@ -9916,11 +9937,11 @@ "repo": "skk-dev/ddskk", "unstable": { "version": [ - 20200904, - 1431 + 20210403, + 1958 ], - "commit": "cec99365fb3ad725c44514b918696ab153596b8d", - "sha256": "0q1vxcm163cs0pwnpnbjanpm49hshiyfx4m915i1wxsa7q9vvv67" + "commit": "a266f70eb99ffb657b7821c2e1de49f5184a59ed", + "sha256": "0j1gcsi40yrfy9saqjdhxnwsvmqf32l9mnwfvhbbfxm82ddhwxnk" } }, { @@ -9968,8 +9989,8 @@ 20200904, 1431 ], - "commit": "cec99365fb3ad725c44514b918696ab153596b8d", - "sha256": "0q1vxcm163cs0pwnpnbjanpm49hshiyfx4m915i1wxsa7q9vvv67" + "commit": "a266f70eb99ffb657b7821c2e1de49f5184a59ed", + "sha256": "0j1gcsi40yrfy9saqjdhxnwsvmqf32l9mnwfvhbbfxm82ddhwxnk" } }, { @@ -10238,8 +10259,8 @@ 20171115, 2108 ], - "commit": "9914e9c951e1598bafb6bce8cf5ad5cbe260d290", - "sha256": "1ziq8xq94nys5g95jrng1w33rsmhfi0k3bfbsfh8ifvz2lhd1ai5" + "commit": "02478862ea707ed51223c1d5d2d8cd8d61d2915d", + "sha256": "0vf94pkd2slwkrgv93yqh2qb2y72bzya9nq5gmqd0g08nb6kdmjx" }, "stable": { "version": [ @@ -10973,8 +10994,8 @@ "repo": "clojure-emacs/cider", "unstable": { "version": [ - 20210325, - 825 + 20210408, + 1212 ], "deps": [ "clojure-mode", @@ -10985,8 +11006,8 @@ "sesman", "spinner" ], - "commit": "4278d7cf0b54af5cc84f4a521ee1ed6e81a96adc", - "sha256": "1538cfygk1yr8nr5axjqa29jd2n8v6mwk6plgvnrdrp1msspcvm2" + "commit": "fd2bb0c64eb3590cffa91188644d1e40fbbc634b", + "sha256": "0mhscf5cpcqs68c863ns6rbjwr1p71wb7kp80ds5qzar8x2k2qwn" }, "stable": { "version": [ @@ -11684,8 +11705,8 @@ "repo": "clojure-emacs/clj-refactor.el", "unstable": { "version": [ - 20210322, - 2122 + 20210407, + 724 ], "deps": [ "cider", @@ -11698,8 +11719,8 @@ "seq", "yasnippet" ], - "commit": "9f3e7357117e96135de051b78deabc0a327c7b06", - "sha256": "1k9w8bzl92cz0dl7lly6ba3i2vcvdfngqk0abji00pmpgrkla1rk" + "commit": "9f88174878d62e3906be5b04b8ba7788e6ca4570", + "sha256": "155lhb3myzxpxnnp257p3rxhgw9xmr3l2h39gj23q5sr0hhsnm5s" }, "stable": { "version": [ @@ -12279,8 +12300,8 @@ 20210104, 1831 ], - "commit": "b22c800604e22a0ffdb13aa5fd4cfb7ee26896a4", - "sha256": "1gf0l4jwhm0xf4j1gnnb8158g8cycv2m2ijxbpc5fhwdbcfdfc13" + "commit": "b1c739ad8bcacae6d66d88514102dcd4423c2dcb", + "sha256": "1jwkscld38b6b6f4w3hw1m9dgdvcvbbwwfx2dd5v7548mp3wpxrj" }, "stable": { "version": [ @@ -13244,17 +13265,17 @@ }, { "ename": "company", - "commit": "96e7b4184497d0d0db532947f2801398b72432e4", - "sha256": "0v4x038ly970lkzb0n8fbqssfqwx1p46xldr7nss32jiqvavr4m4", + "commit": "f42849df31122aa293edcbcbed834260d21037b2", + "sha256": "0fci8v7grd2c6vfky0fdsrxi0874jfkw52zba4ap43bbx1mb2166", "fetcher": "github", "repo": "company-mode/company-mode", "unstable": { "version": [ - 20210327, - 150 + 20210411, + 2221 ], - "commit": "7207cb143829edbcaa2a4b4c0011090747d2207c", - "sha256": "017rjccvidcjsc5pbb36hwdssnvpnfm4wjciv75aaq6d5jhj0889" + "commit": "4037e82cf82b459b6a1d8529f2a3bb3e310fbdf7", + "sha256": "0hqm4529cng2zwj5nlm9b5k1yngf0viywmrq7k052g3fpx21b4l2" }, "stable": { "version": [ @@ -13424,8 +13445,8 @@ "repo": "sebastiencs/company-box", "unstable": { "version": [ - 20210103, - 1605 + 20210330, + 1155 ], "deps": [ "company", @@ -13433,8 +13454,8 @@ "dash-functional", "frame-local" ], - "commit": "ec8f44674dc10dd4d50785a1f97820b29d392ea2", - "sha256": "1bzmwf6nv10pipaa3934kkly4vyzdc7hcb4r7ygimqxxcx0zvipj" + "commit": "aa5f09a5492344e3cc831f0f169a6a8345dec358", + "sha256": "15wbhf04qj8wplf03hbwixhwbrw3r3vb2ih2lvxjhgpg0lq1gjz5" } }, { @@ -13771,16 +13792,16 @@ "repo": "jcs-elpa/company-fuzzy", "unstable": { "version": [ - 20210123, - 1814 + 20210329, + 1543 ], "deps": [ "company", "ht", "s" ], - "commit": "4d6d56a8b92af72aa3b1e0af1a7e7add965bf468", - "sha256": "1yr050zgygjvhwjmm2yd5p889y24vars90cr4pyqc4zhmgzrdkw5" + "commit": "a90e45ee69bac18205418aea68d981c12835eb81", + "sha256": "0rm2nw5h74qhc5sqrwgw7l94x32kp35fw3xdpfpglr6bmqyqjbmz" }, "stable": { "version": [ @@ -14020,8 +14041,8 @@ "lean-mode", "s" ], - "commit": "5c50338ac149ca5225fc737be291db1f63c45f1d", - "sha256": "13vrg0pp7ca0lh4j9cyg4pgfnbvf2kvbrgvvcmn1h7l9py2n8alj" + "commit": "5a2a36356e73c74a42e49fad19a71f4f12929a90", + "sha256": "18lswxxwvp85yzg1kc9vxn4dpmxmj40j6g64c8ns83nb7hw9lszg" } }, { @@ -14434,15 +14455,15 @@ "repo": "tumashu/company-posframe", "unstable": { "version": [ - 20201214, - 52 + 20210331, + 325 ], "deps": [ "company", "posframe" ], - "commit": "5ea0b565972ca8d80f29a40068c65bab97384748", - "sha256": "18zlwcp1vcz82573nmkix1rixv54p9sjj0fhddmf3yc8hsy2mp4g" + "commit": "a28f38213a2a30ce68fdb0b124cadc68ebbcb24f", + "sha256": "1ys40y62c0aqs8nlyhnkahb67slh0i4dpvxvj8mcvcmp68aiih3f" }, "stable": { "version": [ @@ -14473,8 +14494,8 @@ "company", "prescient" ], - "commit": "8573df977eaceffc6607b7242ff8c0dab02aad65", - "sha256": "0kfbcicflg7dj9nzvvkgrxsb6p03a7cq26jfk7h6hsnrajy5y4sc" + "commit": "ed2b762241bbea03e374dc9dcd4fbe207c6b2ea4", + "sha256": "03c0dmblixh5mx8365b6608l7z3vcgp6pzdflwqf8nfwj2c5rm0w" }, "stable": { "version": [ @@ -14516,15 +14537,15 @@ "repo": "company-mode/company-quickhelp", "unstable": { "version": [ - 20201208, - 2308 + 20210329, + 1602 ], "deps": [ "company", "pos-tip" ], - "commit": "b13ff1ba0d6176825f165920b17625948f1256c5", - "sha256": "0kbingznnzmd4qfck2pg696ixrzxlqzqv2vgq77cvbf1ijld1rgh" + "commit": "8c667a9d7c06782340ebe91cd94f490e44dd2547", + "sha256": "0vmypqlh2b1qjbrp0mw2c1ikdpm2d02chpqc1qps9j27yvv6y27w" }, "stable": { "version": [ @@ -14662,8 +14683,8 @@ "company", "rtags" ], - "commit": "aa4c827b417f5448c12401c33acdab1325917c13", - "sha256": "02jqcbrpxm4sv15l8kyvsw9pwkmamj065cgifj68x242fw2f0sam" + "commit": "63f18acb21e664fd92fbc19465f0b5df085b5e93", + "sha256": "0wzyn9qzyly71yfwhlk5m94ygjnbk459pgbpgkhp9fqgchx12p1r" }, "stable": { "version": [ @@ -14728,8 +14749,8 @@ "company", "solidity-mode" ], - "commit": "b4fd719715be098921b6cbfb2ff9da31f3bd0d05", - "sha256": "0gsgj5485k7415wzq73xbj3ax9hh2l1j46ma5d0xkww3md3c3kca" + "commit": "b83354943626ea7c50011d5806b17be17077d1c4", + "sha256": "0h4fyyv2k44x67nwqflh3zpazfkcf5zbgdzwjxbwjgvvxm1hdqlx" }, "stable": { "version": [ @@ -15264,8 +15285,8 @@ "repo": "necaris/conda.el", "unstable": { "version": [ - 20210114, - 123 + 20210409, + 37 ], "deps": [ "dash", @@ -15273,8 +15294,8 @@ "pythonic", "s" ], - "commit": "dce431b25f5a13af58cc7cacfa7968b5a888609c", - "sha256": "1q4hnb42kp73ida37cgrrwi5dxl8vjdl1ibj8l51h47l2rlcrn09" + "commit": "6db0720b6dc8880d7d6e7dc2953b4769ca6bbf71", + "sha256": "1p44pnjy9gyjhnqg986ab5qv4dm1cfz3mr7n6r4kvy0xkilk8ikx" }, "stable": { "version": [ @@ -15446,11 +15467,11 @@ "repo": "minad/consult", "unstable": { "version": [ - 20210323, - 1627 + 20210411, + 2120 ], - "commit": "19540d37783dc34bdb98d7cea24e8bb57090dab4", - "sha256": "0vsgxfxb9bhgncxyhrvxpaan4pwca2vwvpr4qjcgqh1bb147rrkr" + "commit": "812204b647b1f45cc9d04d7d2f565061940f5e70", + "sha256": "11jpmswhx5x69wsrl5mg9wmxm49hqkdn2r9swz9z7hikk7485mx8" }, "stable": { "version": [ @@ -15469,15 +15490,15 @@ "repo": "minad/consult", "unstable": { "version": [ - 20210301, - 2310 + 20210410, + 1355 ], "deps": [ "consult", "flycheck" ], - "commit": "19540d37783dc34bdb98d7cea24e8bb57090dab4", - "sha256": "0vsgxfxb9bhgncxyhrvxpaan4pwca2vwvpr4qjcgqh1bb147rrkr" + "commit": "812204b647b1f45cc9d04d7d2f565061940f5e70", + "sha256": "11jpmswhx5x69wsrl5mg9wmxm49hqkdn2r9swz9z7hikk7485mx8" }, "stable": { "version": [ @@ -15523,6 +15544,24 @@ "sha256": "1s9glbwdwk29pp5nj4ab6giakhjqx4rcy4zbf7ml7h83qi59sd68" } }, + { + "ename": "consult-recoll", + "commit": "e570f099cb90817115609b960f4f31ca21545b74", + "sha256": "1iw1bj207wyga9nflgg9lk36brd3qdmin1pn1r004kfq9jfcds82", + "fetcher": "git", + "url": "https://codeberg.org/jao/consult-recoll.git", + "unstable": { + "version": [ + 20210411, + 1300 + ], + "deps": [ + "consult" + ], + "commit": "9038cfa4222f428e28bdafa0aeb57362104a873d", + "sha256": "0sqwczfvplmlwkjmpd3l8i6gjsfw180kafyvkzdkdig4cwa39yks" + } + }, { "ename": "consult-spotify", "commit": "fb515b013942cf5ef4590e7cbc17f11f10c7692f", @@ -15531,16 +15570,16 @@ "url": "https://codeberg.org/jao/espotify", "unstable": { "version": [ - 20210220, - 2229 + 20210411, + 1305 ], "deps": [ "consult", "espotify", "marginalia" ], - "commit": "b70b4737ece5a081411069eb08103ddbbf8e584a", - "sha256": "1kplm8rhyp5fssfi8pswafnck96m6zjkyvqjcwil459liy8lpw46" + "commit": "22b81067ebcaef2cea633f967a4b55454af9326a", + "sha256": "0b93a8km80r1c3gbinnsigkkq8yc127jwrqj8s8z130b79ch91hn" } }, { @@ -15856,15 +15895,15 @@ "repo": "abo-abo/swiper", "unstable": { "version": [ - 20210322, - 24 + 20210404, + 1716 ], "deps": [ "ivy", "swiper" ], - "commit": "47b496544e238041bca5e3c9ca55848648344312", - "sha256": "0n26hpffp7lljhwjbr4r470ynaff3swnkxmj7g2rjw78rw2qjmlm" + "commit": "471d644d6bdd7d5dc6ca4efb405e6a6389dff245", + "sha256": "0zw5sypr9kwb65627b8wrgl542gyq0xh7pwhghbkwfpwx7rjvk36" }, "stable": { "version": [ @@ -16058,14 +16097,14 @@ "repo": "redguardtoo/counsel-etags", "unstable": { "version": [ - 20210226, - 1218 + 20210410, + 1256 ], "deps": [ "counsel" ], - "commit": "e41a39cd07c594b5fa1c6757e9464be56a3dadea", - "sha256": "1dcph2ak1r5yrw0hfygrb6d80y3jkx1fsj1rrp7sg3p37rnfhq94" + "commit": "5d7ee6776ed5c314472e2af2797ebfdc725e6a70", + "sha256": "116yylad46sjfvadpl3lj3sb17ariswyp6k1ihh8ba5jn9f9hl5h" }, "stable": { "version": [ @@ -16155,15 +16194,15 @@ "repo": "200ok-ch/counsel-jq", "unstable": { "version": [ - 20201230, - 1703 + 20210329, + 749 ], "deps": [ "ivy", "swiper" ], - "commit": "153d70b576df1d572c56d84039cb40749310cfe7", - "sha256": "1r8bbdbvxczbcw8359v9s451fnpcsna0hqg43k26cbwba137vxl7" + "commit": "8cadd2e96470402ede4881b4e955872976443689", + "sha256": "1chfrzkqfsw1rlwkb3k7v827fwipg0cish22rr3sxxydxr7kysx5" }, "stable": { "version": [ @@ -16434,16 +16473,16 @@ "repo": "AdamNiederer/cov", "unstable": { "version": [ - 20210320, - 1641 + 20210330, + 44 ], "deps": [ "elquery", "f", "s" ], - "commit": "766b09cbe92cb5b689a36a9c136013a51da95712", - "sha256": "1p5b39574dpw0lljhm4l200if65fjpgnnbqsimf31r0y4rm1pr0d" + "commit": "62a4650f97eddebf6cd04b662a69b15ba72472c1", + "sha256": "01l38yfgzh4apvj9ipl50b5shf6vnyqdciklpbajciynz118p19q" } }, { @@ -16545,14 +16584,14 @@ "repo": "emacsorphanage/cpp-auto-include", "unstable": { "version": [ - 20191221, - 2319 + 20210318, + 2217 ], "deps": [ "cl-lib" ], - "commit": "08208ca7b9dc4ac940ce9ca1f79424d2f3d3d391", - "sha256": "0yspf51h5b7wbqvi9lbd22chyw799n5d05xdzl5axg0i33lzk7bq" + "commit": "0ce829f27d466c083e78b9fe210dcfa61fb417f4", + "sha256": "0160hxapdmbj7nc0wksk69xhc3r3lcpjxlbfkygi3z8d4xv48ccp" }, "stable": { "version": [ @@ -16973,16 +17012,16 @@ "repo": "emacs-csharp/csharp-mode", "unstable": { "version": [ - 20210321, - 914 + 20210328, + 2004 ], "deps": [ "tree-sitter", "tree-sitter-indent", "tree-sitter-langs" ], - "commit": "f977800161ccdb58d5650a8ca60017c83863d80a", - "sha256": "1j173ir1c95jhj5671yah6jmz2qfk3sfspl0naz48s0bs2n5bxcw" + "commit": "33e3042535e70a284389f8da1c495958fed8a826", + "sha256": "009qizx0cc97if0bdxrmw3l1slddwwhb21fq6npchg7dwswpnai4" }, "stable": { "version": [ @@ -17219,11 +17258,11 @@ "repo": "raxod502/ctrlf", "unstable": { "version": [ - 20210308, - 25 + 20210404, + 1704 ], - "commit": "f9ef7a5e1b53f5ea9d486c93d47806e7d7f432ef", - "sha256": "0b5kyfr7qyv5id61d16r07k37yn690sx42rjnj2jk6q2rwib5zj7" + "commit": "45026a8655fb170004959f83b984589224cc156e", + "sha256": "0ij830jpkrp29rrpapmr9cglnjsdiycp3j620sd10s069wavbmcr" }, "stable": { "version": [ @@ -17651,8 +17690,8 @@ 20190111, 2150 ], - "commit": "8609e0fa7d361f1392823ff6e1a618720cd62df3", - "sha256": "101nvcjf6x38fbcg8fhg5xryid3plncmj36i7137gnhsn1r9fsdv" + "commit": "8cef4203124241911f63dc171f5536665f324507", + "sha256": "0qm605xkr294yrmrkzsqq9bhdqyg9nxiwxwg1br6hzcj01wvgjqf" }, "stable": { "version": [ @@ -17803,11 +17842,11 @@ "repo": "rails-to-cosmos/danneskjold-theme", "unstable": { "version": [ - 20210325, - 935 + 20210407, + 1942 ], - "commit": "ca13f96e5dfa319ceb7b094ee452ddf55b67905c", - "sha256": "0cyl8g5gbdypj44yk91sq4frkqahpwkgvnk1i3zda79m453dzg06" + "commit": "cd45635155aa6bae941156043217ce11531deca9", + "sha256": "1j2fr8gcy5pxzvaf3xh9z2k6bsdbw5z0a2ciys1zy8629sfx6w83" } }, { @@ -17859,8 +17898,8 @@ "repo": "emacs-lsp/dap-mode", "unstable": { "version": [ - 20210317, - 151 + 20210405, + 1739 ], "deps": [ "bui", @@ -17872,8 +17911,8 @@ "posframe", "s" ], - "commit": "ae395aa991d55eaddb2d2b80cd469089b9d19bb7", - "sha256": "1bxpnaj466n6sw00zc4fbw7i7nmkr0b6g8qvai6vql503lmm5f89" + "commit": "2cb49bb2ec22a7d6d4fd403bd4e2cc468f512501", + "sha256": "0zymjabd6xpsdy3jr72rag8dmd7c1hsr1d973yjmvwj1awh9d0dd" }, "stable": { "version": [ @@ -18126,11 +18165,11 @@ "repo": "magnars/dash.el", "unstable": { "version": [ - 20210308, - 2109 + 20210330, + 1544 ], - "commit": "a17b6b5409825891423b3867cd7bea84852d6ddd", - "sha256": "0swjqkz5bq1f9vphjc6a1mwr7b3rlr8j9jg56f9gwj9gcv9mgjab" + "commit": "b9286a84975874b10493f1cb4ea051c501f51273", + "sha256": "13qmv5h2fvy1aqcc3xg7am3phpraw4jliz6qjcx0fjfshndkh5xl" }, "stable": { "version": [ @@ -18205,8 +18244,8 @@ "deps": [ "dash" ], - "commit": "a17b6b5409825891423b3867cd7bea84852d6ddd", - "sha256": "0swjqkz5bq1f9vphjc6a1mwr7b3rlr8j9jg56f9gwj9gcv9mgjab" + "commit": "b9286a84975874b10493f1cb4ea051c501f51273", + "sha256": "13qmv5h2fvy1aqcc3xg7am3phpraw4jliz6qjcx0fjfshndkh5xl" }, "stable": { "version": [ @@ -18575,8 +18614,8 @@ "ccc", "cdb" ], - "commit": "cec99365fb3ad725c44514b918696ab153596b8d", - "sha256": "0q1vxcm163cs0pwnpnbjanpm49hshiyfx4m915i1wxsa7q9vvv67" + "commit": "a266f70eb99ffb657b7821c2e1de49f5184a59ed", + "sha256": "0j1gcsi40yrfy9saqjdhxnwsvmqf32l9mnwfvhbbfxm82ddhwxnk" } }, { @@ -19308,11 +19347,11 @@ "repo": "raxod502/diary-manager", "unstable": { "version": [ - 20210226, - 416 + 20210404, + 1821 ], - "commit": "12f194bd411e52b72bdf555e48e9a831e5ff8357", - "sha256": "0mn90abd2ak5f9b1s3q5h3l2lfhi91mwx4j50hs8q91s0r43hixz" + "commit": "0fa122be62dd296cefe23bcf5074cc6159bd9868", + "sha256": "0zhhfba9ak7j713xp2qhxfdc3h9a9a1grp1nprlz7qnz3pkl2rjj" }, "stable": { "version": [ @@ -19453,14 +19492,14 @@ "repo": "dgutov/diff-hl", "unstable": { "version": [ - 20210318, - 1413 + 20210410, + 130 ], "deps": [ "cl-lib" ], - "commit": "1af31fe1c177646ef7419c95b5d9c25655187ceb", - "sha256": "10gh6fl0j41ga612kk2yh82zh67hbd86rg640r1fk6gc0lcmwqih" + "commit": "8f4c2358ac00e32d261f7e77b29af60adfdf0e41", + "sha256": "1grd6pzbirdq42qcwxis3q97cxlx6r3m20lqg0lb77vk6k75y619" }, "stable": { "version": [ @@ -19710,14 +19749,14 @@ "repo": "dylan-lang/dylan-emacs-support", "unstable": { "version": [ - 20210319, - 1414 + 20210329, + 604 ], "deps": [ "dylan" ], - "commit": "c51cdb2d947494d8161a429134f9e9d23070a173", - "sha256": "0p4kp2gp27xgs4fw0cfd4qz06yp6kvn0k1pq902arzcxkrqz6lj3" + "commit": "040c8ebc884305fd4ff980d21c68946fa74b095a", + "sha256": "1f99wn0lgknvnplp7nk2lylf17yak2hw53n9a0vkxng01xhf50d2" } }, { @@ -19903,8 +19942,8 @@ "dash", "dired-hacks-utils" ], - "commit": "d1a2bda6aa8f890cb367297ed93aee6d3b5ba388", - "sha256": "12m81a9kjhs4cyq3lym0vp5nx6z3sfnypyzrnia76x6rjvixjf6y" + "commit": "7c0ef09d57a80068a11edc74c3568e5ead5cc15a", + "sha256": "0qqj16r7p6pidlyj7fi0s3xhi13065642j20hlnply8nrq782vpj" } }, { @@ -19915,16 +19954,16 @@ "repo": "Fuco1/dired-hacks", "unstable": { "version": [ - 20210110, - 1714 + 20210403, + 1230 ], "deps": [ "dash", "dired-hacks-utils", "f" ], - "commit": "d1a2bda6aa8f890cb367297ed93aee6d3b5ba388", - "sha256": "12m81a9kjhs4cyq3lym0vp5nx6z3sfnypyzrnia76x6rjvixjf6y" + "commit": "7c0ef09d57a80068a11edc74c3568e5ead5cc15a", + "sha256": "0qqj16r7p6pidlyj7fi0s3xhi13065642j20hlnply8nrq782vpj" } }, { @@ -20050,8 +20089,8 @@ "dired-hacks-utils", "f" ], - "commit": "d1a2bda6aa8f890cb367297ed93aee6d3b5ba388", - "sha256": "12m81a9kjhs4cyq3lym0vp5nx6z3sfnypyzrnia76x6rjvixjf6y" + "commit": "7c0ef09d57a80068a11edc74c3568e5ead5cc15a", + "sha256": "0qqj16r7p6pidlyj7fi0s3xhi13065642j20hlnply8nrq782vpj" } }, { @@ -20089,8 +20128,8 @@ "deps": [ "dash" ], - "commit": "d1a2bda6aa8f890cb367297ed93aee6d3b5ba388", - "sha256": "12m81a9kjhs4cyq3lym0vp5nx6z3sfnypyzrnia76x6rjvixjf6y" + "commit": "7c0ef09d57a80068a11edc74c3568e5ead5cc15a", + "sha256": "0qqj16r7p6pidlyj7fi0s3xhi13065642j20hlnply8nrq782vpj" } }, { @@ -20240,8 +20279,8 @@ "dash", "dired-hacks-utils" ], - "commit": "d1a2bda6aa8f890cb367297ed93aee6d3b5ba388", - "sha256": "12m81a9kjhs4cyq3lym0vp5nx6z3sfnypyzrnia76x6rjvixjf6y" + "commit": "7c0ef09d57a80068a11edc74c3568e5ead5cc15a", + "sha256": "0qqj16r7p6pidlyj7fi0s3xhi13065642j20hlnply8nrq782vpj" } }, { @@ -20259,8 +20298,8 @@ "dash", "dired-hacks-utils" ], - "commit": "d1a2bda6aa8f890cb367297ed93aee6d3b5ba388", - "sha256": "12m81a9kjhs4cyq3lym0vp5nx6z3sfnypyzrnia76x6rjvixjf6y" + "commit": "7c0ef09d57a80068a11edc74c3568e5ead5cc15a", + "sha256": "0qqj16r7p6pidlyj7fi0s3xhi13065642j20hlnply8nrq782vpj" } }, { @@ -20337,8 +20376,8 @@ "dash", "dired-hacks-utils" ], - "commit": "d1a2bda6aa8f890cb367297ed93aee6d3b5ba388", - "sha256": "12m81a9kjhs4cyq3lym0vp5nx6z3sfnypyzrnia76x6rjvixjf6y" + "commit": "7c0ef09d57a80068a11edc74c3568e5ead5cc15a", + "sha256": "0qqj16r7p6pidlyj7fi0s3xhi13065642j20hlnply8nrq782vpj" } }, { @@ -20356,8 +20395,8 @@ "dash", "dired-hacks-utils" ], - "commit": "d1a2bda6aa8f890cb367297ed93aee6d3b5ba388", - "sha256": "12m81a9kjhs4cyq3lym0vp5nx6z3sfnypyzrnia76x6rjvixjf6y" + "commit": "7c0ef09d57a80068a11edc74c3568e5ead5cc15a", + "sha256": "0qqj16r7p6pidlyj7fi0s3xhi13065642j20hlnply8nrq782vpj" } }, { @@ -20513,8 +20552,8 @@ "dash", "dired-hacks-utils" ], - "commit": "d1a2bda6aa8f890cb367297ed93aee6d3b5ba388", - "sha256": "12m81a9kjhs4cyq3lym0vp5nx6z3sfnypyzrnia76x6rjvixjf6y" + "commit": "7c0ef09d57a80068a11edc74c3568e5ead5cc15a", + "sha256": "0qqj16r7p6pidlyj7fi0s3xhi13065642j20hlnply8nrq782vpj" } }, { @@ -21416,8 +21455,8 @@ "repo": "Silex/docker.el", "unstable": { "version": [ - 20210313, - 1943 + 20210404, + 1000 ], "deps": [ "dash", @@ -21427,8 +21466,8 @@ "tablist", "transient" ], - "commit": "ed0cdf08597ceb3a1f85e065d1b2b7aefd7e35ee", - "sha256": "1p0281gaj09jpavlkv24dzvf0gdh9r7ki1z53x0q49dm1fcday6m" + "commit": "ba55e1e52c20daa0063ccabce2ccc973d58b1669", + "sha256": "1r0fjdn7qrb3in8lgwihxi9zdzc325l21f8cs00mbipflss20si4" }, "stable": { "version": [ @@ -21561,11 +21600,11 @@ "repo": "spotify/dockerfile-mode", "unstable": { "version": [ - 20210326, - 1812 + 20210404, + 2224 ], - "commit": "3b1374563f62d71aec11ebd33d37109459e54571", - "sha256": "1gvsibvg543jby99b7r13x0q4d9n21nl5sh0y2rb7alk0chx3pmx" + "commit": "ad06a41259ff2961d603bf23a3a8fbd22dde2161", + "sha256": "0p6byqjfzlq3g5ql77zghljj9vmnm9q2ffkjls1rv6q5rdj7p8c1" }, "stable": { "version": [ @@ -21622,14 +21661,14 @@ "repo": "jcs-elpa/docstr", "unstable": { "version": [ - 20210317, - 1612 + 20210410, + 1249 ], "deps": [ "s" ], - "commit": "5ce0d758dbabb6c250f761fcb6754930cd793c2a", - "sha256": "0x9sxcp40p83isjc6smhg00n42056q5dsf0w71gglb1gc5rqhhl6" + "commit": "67a219425d1fe9a29ad3beae0677d5ca0047bd53", + "sha256": "0irqfn5cxb8gkxvdmikmjz2j9km6k7057r7yw5aypgaxm89a404x" }, "stable": { "version": [ @@ -21652,11 +21691,11 @@ "repo": "progfolio/doct", "unstable": { "version": [ - 20210126, - 310 + 20210329, + 2337 ], - "commit": "8ac08633ae413a6605b6506d2739eece7475272e", - "sha256": "09nmxq66cmwpbqc4l8p9f76pn6dmckfvpkj9fk99zsnhan4d8870" + "commit": "67fc46c8a68989b932bce879fbaa62c6a2456a1f", + "sha256": "0ax7lhfk98vmlf5ll7jdm0lb0axckvhji461aa3whccwjgbinif8" } }, { @@ -21771,16 +21810,16 @@ "repo": "seagle0128/doom-modeline", "unstable": { "version": [ - 20210322, - 1517 + 20210330, + 1522 ], "deps": [ "all-the-icons", "dash", "shrink-path" ], - "commit": "00bc89b8ded4c452ccf65edce5dce6f9a1e41611", - "sha256": "1k5qhxjh7h6hwdjxgjb1vxj9kclpli9wrrv350z5f40l4fwzawlw" + "commit": "669cac3839271f84ccfed06eddaad206224ca831", + "sha256": "1p5w5qbz6dgsk1dcy4fspdqwh03h4cxs175ng6zm6590dk0xs5bb" }, "stable": { "version": [ @@ -22473,8 +22512,8 @@ 20210213, 757 ], - "commit": "a88ce5bbc996b550071c8df890276eb1b10e778c", - "sha256": "1957i1d2lv9jfd8ck22vj0wd59sk5gd04xi5qbvzw1y9dl9xshp7" + "commit": "65404cf973aa7ffc0e9dd7d05c9dd3709c7db2d4", + "sha256": "13v4i59f0m5syjz49g5xh4nnr7k2wck0nf0pc5hgsv6g61gkpwvj" }, "stable": { "version": [ @@ -22524,11 +22563,11 @@ "repo": "integral-dw/dw-passphrase-generator", "unstable": { "version": [ - 20210307, - 1834 + 20210331, + 2246 ], - "commit": "8c5b5c9d435de97ce9b95b9280feb1c0a57a60f8", - "sha256": "1793bwfn3c2f9dxcs8mmps3riy25y5baz1fvbpdr9pq19sl58bj5" + "commit": "61c5718ba64ace4c9e29de18aa2690ecc3f0f258", + "sha256": "14nd544ispfj165ys6lv9bpy41p9j8kf4lwy73qigr4c7qlf43by" }, "stable": { "version": [ @@ -22566,11 +22605,11 @@ "repo": "dylan-lang/dylan-emacs-support", "unstable": { "version": [ - 20210317, - 1405 + 20210329, + 604 ], - "commit": "c51cdb2d947494d8161a429134f9e9d23070a173", - "sha256": "0p4kp2gp27xgs4fw0cfd4qz06yp6kvn0k1pq902arzcxkrqz6lj3" + "commit": "040c8ebc884305fd4ff980d21c68946fa74b095a", + "sha256": "1f99wn0lgknvnplp7nk2lylf17yak2hw53n9a0vkxng01xhf50d2" } }, { @@ -23144,14 +23183,14 @@ "repo": "joostkremers/ebib", "unstable": { "version": [ - 20210316, - 840 + 20210407, + 2146 ], "deps": [ "parsebib" ], - "commit": "1a23ce943991d5dce4a3c3d71d7b5d6b6f9897fe", - "sha256": "1wwgfgcr83mvjp9w1yizg49j85j92kd2fyiyyl6x9v8bs4xsn4pi" + "commit": "bd1c9dcda79f734f6302e7c81ee0f13106a3a9e1", + "sha256": "1bd6hqiq178h1z8x0hjyrxg6l0h2inkzmrg6fadfj3ly1hbs5157" }, "stable": { "version": [ @@ -23633,15 +23672,15 @@ "repo": "editorconfig/editorconfig-emacs", "unstable": { "version": [ - 20210309, - 1345 + 20210407, + 407 ], "deps": [ "cl-lib", "nadvice" ], - "commit": "9da2dab6474e1f735a2e9fbc7f26a553497c58c2", - "sha256": "0vpspvng3g0l2lqig3fvmxhxl4dqqs9zcyfgymjak03nfcilm394" + "commit": "e10fa22b1304c5801b026c10cc5d65a97ccc0a48", + "sha256": "15a0269qbymkvbqgdmv5d4pb7bhw1cplbwra4ydhgwnvwv5c5q9v" }, "stable": { "version": [ @@ -23992,8 +24031,8 @@ "repo": "joaotavora/eglot", "unstable": { "version": [ - 20210326, - 1008 + 20210410, + 1942 ], "deps": [ "eldoc", @@ -24002,8 +24041,8 @@ "project", "xref" ], - "commit": "2fbcab293e11e1502a0128ca5f59de0ea7888a75", - "sha256": "0fsar0ab0wj74jkbgkbigcg4ia6hg574yvqr2wq2s8lw7m22j8c4" + "commit": "8a5598d06a0539492ec30fc90201a263ea6a03e6", + "sha256": "0jlqskw08zlqhckhz64w2c0a14kk100lmnadwf4li5h2b2clmr7l" }, "stable": { "version": [ @@ -24029,16 +24068,16 @@ "repo": "fsharp/emacs-fsharp-mode", "unstable": { "version": [ - 20210126, - 454 + 20210330, + 1442 ], "deps": [ "eglot", "fsharp-mode", "jsonrpc" ], - "commit": "78898a1535878394d83643c383f4320e7b5fcefd", - "sha256": "0d60jfaf8av0b7vx44lbqzb7v70dszvr2w1yjh1cxn71dnjphp4j" + "commit": "93b1fbc31d73286a18640a36fc2be87d1736e0f2", + "sha256": "0lq1izdlrkwp5xiqjp71adi12jy0xj3fsmn6fg2sv0451bwxghra" }, "stable": { "version": [ @@ -24153,8 +24192,8 @@ "repo": "millejoh/emacs-ipython-notebook", "unstable": { "version": [ - 20210322, - 1150 + 20210330, + 1531 ], "deps": [ "anaphora", @@ -24165,8 +24204,8 @@ "websocket", "with-editor" ], - "commit": "142ff5078b3074ce3ac8bf90abd8c38d9733253e", - "sha256": "05b4gqxfjap6bhfcxjj6v6kv2bhni5a1mzh9ylril5f81xj323gy" + "commit": "608c3cbfd58a626aab3cea6aa5b31d8a4032cf10", + "sha256": "103sg5wzzr7zp0x181nardc8r63cyx1f7s1l5drig5dwzp4dnd60" }, "stable": { "version": [ @@ -24446,11 +24485,11 @@ "repo": "raxod502/el-patch", "unstable": { "version": [ - 20210226, - 411 + 20210411, + 1954 ], - "commit": "5e823dc9a29e3be22597d93912f06119c38030d6", - "sha256": "0i7gvjy97cbfll93h5b9zyr1p075lklx7rdahkdy46c4kw6vy5py" + "commit": "14c35cee52b415fe9892440014c4b8dc045103df", + "sha256": "1v4wbfrr09n08lf8l72jmmg2ckhybagcyvk9jrsfarl0d9mxgd7v" }, "stable": { "version": [ @@ -24712,11 +24751,11 @@ "repo": "doublep/eldev", "unstable": { "version": [ - 20210325, - 2223 + 20210410, + 1721 ], - "commit": "a7211e47c1dd543ca5d84b7b85ca205fc6315abe", - "sha256": "0806wzrmcl58rp1gs2d3z0dz68h3jigwi0azf8rypz1fp5dkks7j" + "commit": "635744890ba2d55d9569a66cb72b13870418a513", + "sha256": "1hlsnd9ppw18p0kbjgf2g5xwikipjkzzqcvql63pn9ds5zr1gn6q" }, "stable": { "version": [ @@ -24736,11 +24775,11 @@ "repo": "casouri/eldoc-box", "unstable": { "version": [ - 20210313, - 1824 + 20210402, + 2039 ], - "commit": "d4574ee392b9a8c537bec895be37468b600c25ac", - "sha256": "08fscq9amwqap741i25j7swb0gwzipkczqrvrgg3430jb3i0d663" + "commit": "f66f8d0641a0025d65da1ec21141ea594d6883da", + "sha256": "1y9ns6kmhgzi176z251cymplqc9bdk0axhhcvh4mn21vi5igz4pz" }, "stable": { "version": [ @@ -25082,15 +25121,15 @@ "repo": "fasheng/elfeed-protocol", "unstable": { "version": [ - 20201013, - 751 + 20210401, + 100 ], "deps": [ "cl-lib", "elfeed" ], - "commit": "4a59e26216ceb6eb466781f15b6ac770b90437f6", - "sha256": "07r1qlldgd0kfikd0y737y5n42ab3nkw2s5jx7frimj41yandbdp" + "commit": "2b2aaf2f3b92e7c27827e0f280598cb52db558e0", + "sha256": "1nffhs0mnc0j87wfk6siw3zaj6p1dm1hxz55p54v9895x8c5bakv" }, "stable": { "version": [ @@ -25890,8 +25929,8 @@ "repo": "jorgenschaefer/elpy", "unstable": { "version": [ - 20210227, - 56 + 20210328, + 1852 ], "deps": [ "company", @@ -25900,8 +25939,8 @@ "s", "yasnippet" ], - "commit": "c31cd91325595573c489b92ad58e492a839d2dec", - "sha256": "0myypqnb4001zf9rpn6sakq900kn6mqhyjkp8vvc5y3j6123gj07" + "commit": "2203597e1254eba345d6873daa40c7b9d144931c", + "sha256": "0rzqmcbrq7xdk748cwy5ikzbg7f13g57jf7rhxyfy6j5pwn8q7k7" }, "stable": { "version": [ @@ -26161,8 +26200,8 @@ 20180809, 1612 ], - "commit": "c3a7e31564256b9755b1ab9fb40d32ad78cd1ad2", - "sha256": "0dxa8g49fq4h1ab3sawnbgy1fxaxxsdac3l6im34qfw4km8brp9y" + "commit": "a13fcaf209d803e2e450ca2bf80dea94b40a0141", + "sha256": "1zcmqi2jmg5mah6n4i10gdnr9lwmap1iblbp23bks20cmv64q9hn" } }, { @@ -26524,11 +26563,11 @@ "repo": "oantolin/embark", "unstable": { "version": [ - 20210326, - 1428 + 20210411, + 1954 ], - "commit": "49cd0aff39e7bc9173ec49d1c14d7ab8d9d25355", - "sha256": "19ihm3v7ck5rx4wff5hkrrzqbjk9g9vm8j0axvdf77hr6vzjsak8" + "commit": "a005eef82a63950927a68a5ef79b33d25245687b", + "sha256": "1dy01y87bqjddsdjqhmp6m144azn72yswsj0prywm5alxypck9lg" }, "stable": { "version": [ @@ -26547,15 +26586,15 @@ "repo": "oantolin/embark", "unstable": { "version": [ - 20210308, - 1615 + 20210411, + 1808 ], "deps": [ "consult", "embark" ], - "commit": "49cd0aff39e7bc9173ec49d1c14d7ab8d9d25355", - "sha256": "19ihm3v7ck5rx4wff5hkrrzqbjk9g9vm8j0axvdf77hr6vzjsak8" + "commit": "a005eef82a63950927a68a5ef79b33d25245687b", + "sha256": "1dy01y87bqjddsdjqhmp6m144azn72yswsj0prywm5alxypck9lg" }, "stable": { "version": [ @@ -26722,15 +26761,15 @@ "url": "https://git.savannah.gnu.org/git/emms.git", "unstable": { "version": [ - 20210310, - 2103 + 20210407, + 1604 ], "deps": [ "cl-lib", "seq" ], - "commit": "de0c4079ccdf3e17b722e3ddf2a275e66703b6bb", - "sha256": "1m334c1c1b6jfh100xfdxfqs89i5q1vw6dwjf4alydl0d08q91lc" + "commit": "f79343bf03f6ece09638ec27eeb831c0abe59667", + "sha256": "1ki2hd38fxvd4112bhgfifr3raar3yz345h9hya7dn8aw9hscr14" }, "stable": { "version": [ @@ -27434,6 +27473,21 @@ "sha256": "0mvg52f2y3725hlzqcn2mh8jihnbg68wlqmq951sa3qfma7m40pp" } }, + { + "ename": "eping", + "commit": "d9c23f7274c0754cf45c73b1741ff10720f33893", + "sha256": "0l507kwsls1il9ik4nb5iay4fxwwq4fq4lk2r476d5640lknxlwr", + "fetcher": "github", + "repo": "sean-hut/eping", + "unstable": { + "version": [ + 20201027, + 2149 + ], + "commit": "99d3a4b6973d5b09864e0af7425a61f99c19b90a", + "sha256": "0k6isn6szbwc6jc7kzfq82p8w737z7iyn2yi9aqf6j54a6xa5aka" + } + }, { "ename": "epkg", "commit": "2df16abf56e53d4a1cc267a78797419520ff8a1c", @@ -27601,11 +27655,11 @@ "repo": "fossegrim/eradio", "unstable": { "version": [ - 20201220, - 1010 + 20210327, + 1000 ], - "commit": "d9dcf81cfc5b0278a2ae51e77b3d44fa50e92ce8", - "sha256": "0i20g5c8sx8m5slldb765lbsxg3qdda1dqjl61s9idncp8dlllcl" + "commit": "47769986c79def84307921f0277e9bb2714756c2", + "sha256": "0lks2pph44qxc9l34nr55ha667974r8ckxdwmvcp6v9mnm05317s" } }, { @@ -28043,15 +28097,15 @@ "repo": "ergoemacs/ergoemacs-mode", "unstable": { "version": [ - 20201114, - 2201 + 20210402, + 1642 ], "deps": [ "cl-lib", "undo-tree" ], - "commit": "ad3ec45ebbfdfaca052253c550102fd665b3bd1b", - "sha256": "06l7sx9bcvsm3p4jy6l4l5lgl357nrvr54491ignz7c9j403x6lm" + "commit": "f9d6e3f7d99b877a63fa6f5ab61e6ba05a7075c8", + "sha256": "0xw99i47mmry205aps4mha1ninnnzir652s7jh81fdsys8y5j7w1" }, "stable": { "version": [ @@ -28098,8 +28152,8 @@ 20200914, 644 ], - "commit": "ecb93230ad9327991e542731756cbe1405c85d5f", - "sha256": "1acs54ngr26qw5hbhq7xdw4wspqhhmr97gj6rnwxhz4yx02wxd9w" + "commit": "3e079614f2b4810ff5920ae69a389da91c855217", + "sha256": "1jn0kp33b77lskhi02d0jm0rpcgxhrpxdj82bmr7vi7m199p5jn0" }, "stable": { "version": [ @@ -28123,8 +28177,8 @@ 20210315, 1640 ], - "commit": "94c9738e10326554af80d128c76e4bded1c7b983", - "sha256": "1vyk87yy9vpscrxvcd0f14fvbd200af0fiwgw26fdd5f5j6iz2hk" + "commit": "165f8fe9354aaf23c166b5c54f352b3024da9bd3", + "sha256": "102dbzpfcysq7pinli2jcdff1mxh2af0s79qmia1wfm8jmzh0zhf" }, "stable": { "version": [ @@ -28446,8 +28500,8 @@ "deps": [ "company" ], - "commit": "0f144815ebcc1f911a6a7e6df170f8cc10744c92", - "sha256": "1lss6q24pdkzbxdn3lj85xci1md9bs28j8ib3qsk1cmv6m691y28" + "commit": "30203fc7b8b63a489f34f74ca8b041bf61f4358f", + "sha256": "0w34m9va83grw5j566i5sdgkz475fhf3hibx9p1m0a92p1mg9v8s" }, "stable": { "version": [ @@ -28726,14 +28780,14 @@ "repo": "4DA/eshell-toggle", "unstable": { "version": [ - 20201112, - 1008 + 20210407, + 2039 ], "deps": [ "dash" ], - "commit": "bbf69e54ba97f23ae281f5c455c194e8a236549c", - "sha256": "1f3i9cr4qibjkg8bh719ayb7p3nr5y3hmzlvyflb9vi3108kspb8" + "commit": "7160518ca56444fead841b8acff59aeffc7cebb3", + "sha256": "0g0cg71n0cp1576i2qkgvg729gw1927vq0js3s64v5b8p9hmb1kq" } }, { @@ -28747,8 +28801,8 @@ 20170425, 1737 ], - "commit": "9c100bae5c3020e8d9307e4332d3b64e7dc28519", - "sha256": "00zdbcncjabgj5mp47l1chymx5na18v2g4kj730dgmj3rnl3iz2q" + "commit": "ff84e6069b98f2ed00857a0f78bff19d96e4955c", + "sha256": "1mb576prni644ls7p133ahjgi7jkmclb37wsj8ws3m8r0ls3w76z" }, "stable": { "version": [ @@ -28870,11 +28924,11 @@ "url": "https://codeberg.org/jao/espotify", "unstable": { "version": [ - 20210224, - 126 + 20210405, + 1808 ], - "commit": "b70b4737ece5a081411069eb08103ddbbf8e584a", - "sha256": "1kplm8rhyp5fssfi8pswafnck96m6zjkyvqjcwil459liy8lpw46" + "commit": "22b81067ebcaef2cea633f967a4b55454af9326a", + "sha256": "0b93a8km80r1c3gbinnsigkkq8yc127jwrqj8s8z130b79ch91hn" } }, { @@ -28986,11 +29040,11 @@ "repo": "emacs-ess/ESS", "unstable": { "version": [ - 20210326, - 1730 + 20210403, + 520 ], - "commit": "c101d44bd70a3f51bf546e18e74e98f62f4a3eba", - "sha256": "06b056fmkbvsdzf0l7zywghkax3fqszbkywv822qr3hiwb62lc21" + "commit": "b501beec408b66e2f2a8c4f3117e0c84ee1b0262", + "sha256": "03rd1qp9d8br36cynxm73ajac0f2kyyjnffnciix3vf7w5lpsily" }, "stable": { "version": [ @@ -29075,14 +29129,14 @@ "repo": "genovese/ess-smart-equals", "unstable": { "version": [ - 20190204, - 449 + 20210411, + 1333 ], "deps": [ "ess" ], - "commit": "746cf9e78c3b86cbbf78d69c335a8a4ff3da79d6", - "sha256": "1by8bzw3yl86mqzh7lwz5dca243n956jnd2rz4vilpgbh5cka2l3" + "commit": "fea9eea4b59c3e9559b379508e3500076ca99ef1", + "sha256": "1kfyvhvma31ym3xzld2msbmxvvl69wf6s0l3nj6rmrfvrlhqlnrd" }, "stable": { "version": [ @@ -29387,15 +29441,18 @@ "repo": "zzkt/ethermacs", "unstable": { "version": [ - 20210124, - 1110 + 20210401, + 1213 ], "deps": [ + "0xc", "let-alist", - "request" + "parsec", + "request", + "websocket" ], - "commit": "6d9c86dac6ab569d1842fcfa8bbe63ee9de8cd71", - "sha256": "0pawqmwv3cmr2fw5w0nvq36ms882k68w61nyb1d0bvzbjvrbbc03" + "commit": "fc7de212b34c34d93f5f0f19af846924404e38ae", + "sha256": "0a8d66na4c02mdvkcbldac44hhzsv18imz04yqqp8qn4cdamfi4g" } }, { @@ -29573,15 +29630,15 @@ "repo": "emacs-evil/evil", "unstable": { "version": [ - 20210325, - 2108 + 20210411, + 2050 ], "deps": [ "cl-lib", "goto-chg" ], - "commit": "7eace67fc6d1f992e447f216baf9a8b7be634c1e", - "sha256": "13cgja2ss5afrpabz0rlhrh89vaw7dzaf1gh43b3hdbma8gh9li8" + "commit": "d998a8195e404b01e2ea62a455c3dec74d0823c3", + "sha256": "0d4839nqdhr858nzb2cqj3wak2g8ynm5l8ak3467p1k9sn4d487a" }, "stable": { "version": [ @@ -29775,15 +29832,15 @@ "repo": "emacs-evil/evil-collection", "unstable": { "version": [ - 20210323, - 310 + 20210401, + 1012 ], "deps": [ "annalist", "evil" ], - "commit": "b45ec5b3156d27a18a949e4bf55643107a21abc2", - "sha256": "09sxky26kpdxjdc52vpabxq8h88fx9rnarykn1d2a063bpldz2rp" + "commit": "f2be91297029ae002d15e23510f9f686d848d7a8", + "sha256": "0ikb3ic84bxj9rzvkjhcvzgiwjpwmhfi6xli5yh03li7qdqsg5j5" }, "stable": { "version": [ @@ -30600,14 +30657,14 @@ "repo": "mamapanda/evil-owl", "unstable": { "version": [ - 20201115, - 130 + 20210408, + 32 ], "deps": [ "evil" ], - "commit": "7d21ba71685b4b829c733288865054cc12783b8f", - "sha256": "1087rfvvqv9bp33vjbiwka511iha7468y86xigyvmy5wa729blzd" + "commit": "949ab1331ed9ff65d04930b215e033ef19f3696e", + "sha256": "1nkqxpzczlpw7yn8jjr9lqs2izdbw86x7nz0y67x9yy49aj19v6q" }, "stable": { "version": [ @@ -31098,8 +31155,8 @@ "deps": [ "evil" ], - "commit": "7eace67fc6d1f992e447f216baf9a8b7be634c1e", - "sha256": "13cgja2ss5afrpabz0rlhrh89vaw7dzaf1gh43b3hdbma8gh9li8" + "commit": "d998a8195e404b01e2ea62a455c3dec74d0823c3", + "sha256": "0d4839nqdhr858nzb2cqj3wak2g8ynm5l8ak3467p1k9sn4d487a" }, "stable": { "version": [ @@ -32083,10 +32140,11 @@ "repo": "tumashu/exwm-x", "unstable": { "version": [ - 20190224, - 1152 + 20210411, + 1120 ], "deps": [ + "async", "bind-key", "cl-lib", "counsel", @@ -32095,8 +32153,8 @@ "swiper", "switch-window" ], - "commit": "02ec31cd8996b1b3fe305405fef7334c4d08e72b", - "sha256": "18cgfnh7bp152gi4zv2skrkjbxs0v2zn6jk35rc48y8nfivps2f4" + "commit": "7bc7a930998117a714cf1f2940dcab12bcac9b73", + "sha256": "1zs2sixp77q6dd9pdsk3w4y3nj1iz8j74q7nn5rsdmk0ja8i9sws" }, "stable": { "version": [ @@ -32389,11 +32447,11 @@ "repo": "WJCFerguson/emacs-faff-theme", "unstable": { "version": [ - 20210324, - 1332 + 20210331, + 233 ], - "commit": "38cddb422572ca6f7dc004583bb8ba6a99b3315a", - "sha256": "19c0n5yjannz7sqwmw65j7clvwx6idnzy5lmc01ayghf3w2ksir2" + "commit": "ef7efae7a86979e9267f9a600ef1482e0f6a2aa3", + "sha256": "0dl9i2l8186ir56v9vx32rw30pj9xgd7zhf24y6sqfjxn80hkdz8" }, "stable": { "version": [ @@ -32864,11 +32922,15 @@ "repo": "technomancy/fennel-mode", "unstable": { "version": [ - 20210322, - 1527 + 20210410, + 1942 ], - "commit": "ba14a7ddc21f8bc2b9bc58abd1655abbe12118d7", - "sha256": "0lypgn8hppivq3w8jddgbyfs7x67xjkbx2j0is96lfdb0zykp9b9" + "commit": "59ab02344f569069b9899a3a5ffdca4a30093df4", + "error": [ + "exited abnormally with code 1\n", + "", + "warning: unknown setting 'experimental-features'\nwarning: unable to download 'https://gitlab.com/technomancy/fennel-mode/repository/archive.tar.gz?ref=59ab02344f569069b9899a3a5ffdca4a30093df4': HTTP error 503; retrying in 262 ms\nwarning: unable to download 'https://gitlab.com/technomancy/fennel-mode/repository/archive.tar.gz?ref=59ab02344f569069b9899a3a5ffdca4a30093df4': HTTP error 503; retrying in 704 ms\nwarning: unable to download 'https://gitlab.com/technomancy/fennel-mode/repository/archive.tar.gz?ref=59ab02344f569069b9899a3a5ffdca4a30093df4': HTTP error 503; retrying in 1035 ms\nwarning: unable to download 'https://gitlab.com/technomancy/fennel-mode/repository/archive.tar.gz?ref=59ab02344f569069b9899a3a5ffdca4a30093df4': HTTP error 503; retrying in 2286 ms\nerror: unable to download 'https://gitlab.com/technomancy/fennel-mode/repository/archive.tar.gz?ref=59ab02344f569069b9899a3a5ffdca4a30093df4': HTTP error 503\n" + ] }, "stable": { "version": [ @@ -33006,6 +33068,14 @@ "sha256": "15557rkbi3d40q2zs5vkgkpbya4c4ksnh2a07d8l7x457zah4fbn" } }, + { + "ename": "filetree", + "commit": "b4714ecde7200de934165d8e3b7f94ab5d711fa6", + "sha256": "0d8ryxq7xa95av36fc25dxrrdxbm69iik22q52fjl9pzivrzlz58", + "error": "Not in archive", + "fetcher": "github", + "repo": "knpatel401/filetree" + }, { "ename": "fill-column-indicator", "commit": "a3c6e6adb1a63534275f9d3d3d0fe0f5e85c549b", @@ -34825,15 +34895,15 @@ "repo": "atilaneves/flycheck-dmd-dub", "unstable": { "version": [ - 20200824, - 852 + 20210329, + 1926 ], "deps": [ "f", "flycheck" ], - "commit": "39f7fc3f80ea7567a49012d235d22cf640fb0dfa", - "sha256": "12vcf4lrpj852lygpz8533m2h8zf54xs05gna2izigj7jqhmqy2y" + "commit": "0799b16872829405e9da4e806ffffa42ad51fa36", + "sha256": "07jip6x59h439m714kx0fs6xfqi9p7yfl47js2py0q51hr51k2ij" }, "stable": { "version": [ @@ -35179,15 +35249,15 @@ "repo": "emacs-grammarly/flycheck-grammarly", "unstable": { "version": [ - 20210217, - 909 + 20210405, + 1319 ], "deps": [ "flycheck", "grammarly" ], - "commit": "67c1135193f98cfa4ee1ff83cc502dc11f648334", - "sha256": "1ns5rrpxxwf1n0g568g1dajvpr5i49hnv8v4i4g2sfxyszkijyj7" + "commit": "192109f43ca5508709a49875ff5f99c25b7f1696", + "sha256": "0ymnypijbivncjncs57dsn096wjccl7vwslv2pa8fl9hjl4y34r0" }, "stable": { "version": [ @@ -35577,14 +35647,14 @@ "repo": "whirm/flycheck-kotlin", "unstable": { "version": [ - 20190808, - 630 + 20210406, + 1148 ], "deps": [ "flycheck" ], - "commit": "5104ee9a3fdb7f0a0a3d3bcfd8dd3c45a9929310", - "sha256": "193l9amk45b0bkrqqm6cxx8y4a6jvm0mcncwq6kvhq2kj9slw7g2" + "commit": "bf1b398bdde128806a0a7479ebbe369bbaa40dae", + "sha256": "1dr2y8imd6blxkpwbpds7mzn5abqpfzl8nh5zrxykrkalq2px7f2" }, "stable": { "version": [ @@ -36321,8 +36391,8 @@ "flycheck", "rtags" ], - "commit": "aa4c827b417f5448c12401c33acdab1325917c13", - "sha256": "02jqcbrpxm4sv15l8kyvsw9pwkmamj065cgifj68x242fw2f0sam" + "commit": "63f18acb21e664fd92fbc19465f0b5df085b5e93", + "sha256": "0wzyn9qzyly71yfwhlk5m94ygjnbk459pgbpgkhp9fqgchx12p1r" }, "stable": { "version": [ @@ -36960,6 +37030,24 @@ "sha256": "1pkigdarkjk2gpqjrfavg68bwihaazjzf1rr9fmrqkgis5hz3zf7" } }, + { + "ename": "flymake-flycheck", + "commit": "034eb68ae6c115ec0ad156df0ef174d45630f322", + "sha256": "13v65aywl0nq2xld8kjjr3lxh491a7h03c1xsjqkbhwhjw8m0ism", + "fetcher": "github", + "repo": "purcell/flymake-flycheck", + "unstable": { + "version": [ + 20210404, + 2128 + ], + "deps": [ + "flycheck" + ], + "commit": "fd5e801b49a0dd085bc23fd6ea32b0e3be9edea7", + "sha256": "1rvrxnqplwxm2havrsfsv3nrfv0zgz574rh18dkz5ixlbscjcpx7" + } + }, { "ename": "flymake-gjshint", "commit": "b4673825b15519e9eb2204ade5cc045751771c52", @@ -37055,14 +37143,14 @@ "repo": "emacs-grammarly/flymake-grammarly", "unstable": { "version": [ - 20210217, - 909 + 20210403, + 1349 ], "deps": [ "grammarly" ], - "commit": "41d10f26a76208612fa184d1155ab40130f4cbf0", - "sha256": "1f5vflanpq0kdqnp2jz6aj5v0v4wvmr01rlgxjz3yz31bp444a0d" + "commit": "f09caa56254e6c639993afba29f5a4b8b9f9c73e", + "sha256": "0djjxnmy2bkkc6nyl5iq3axnp0marpzpnb8cgh79w1fch300avrf" }, "stable": { "version": [ @@ -38282,15 +38370,15 @@ "repo": "rolandwalker/font-utils", "unstable": { "version": [ - 20210124, - 43 + 20210405, + 1149 ], "deps": [ "pcache", "persistent-soft" ], - "commit": "88fb9b046e7094303e4f5b43e84b0f5d5283c508", - "sha256": "1qhrvmx8pcjb2hg3y3ra07nv3bcga3ckqxd9i89wrgay5kk7avcy" + "commit": "abc572eb0dc30a26584c0058c3fe6c7273a10003", + "sha256": "0hx3k2zx2kdavivr1b957jq7kcwk301yzw77aprxzbs7jz73a35x" }, "stable": { "version": [ @@ -38445,8 +38533,8 @@ "repo": "magit/forge", "unstable": { "version": [ - 20210314, - 2238 + 20210406, + 1356 ], "deps": [ "closql", @@ -38458,8 +38546,8 @@ "markdown-mode", "transient" ], - "commit": "f4c95dd0e633b3dd332d6f91122c864ab3640912", - "sha256": "02jhimj1ykz0mfg63iwaaxg1i9fdijczcd1g5fz02zwj1v2dgqgh" + "commit": "ab3be5a703f319e6de7e76ed292d20deb60cb2d7", + "sha256": "1flpxzmxyz94vl0y2mw437nmcsls1fncapa75kqnbbcf641nidhy" }, "stable": { "version": [ @@ -38659,14 +38747,14 @@ "repo": "rnkn/fountain-mode", "unstable": { "version": [ - 20210225, - 1517 + 20210411, + 1308 ], "deps": [ "seq" ], - "commit": "9b0079c10c73e5f0785a8e727c1240ea9a781a5d", - "sha256": "02qxrq582cmcc6wmflh314z724kzxfp2l31h5b71372lck3f0slq" + "commit": "3416d8cbf17af8b6f9118ae1963f203bf9b2509d", + "sha256": "1a9w6l46fs3dq52vih5dlm3163iy3dghz08d7c5xfg17c1b98yg8" }, "stable": { "version": [ @@ -38881,16 +38969,16 @@ "url": "https://git.launchpad.net/frecentf.el", "unstable": { "version": [ - 20210211, - 1630 + 20210330, + 1521 ], "deps": [ "async", "frecency", "persist" ], - "commit": "b385061a3103890df2d4b2e46a8b3ac775aeec00", - "sha256": "09s6fkshkd3mfhf0zynl50p70cnpx67qigi55is2byvhh5950fx5" + "commit": "19e2c48a8b8c8ee8cae5c93b58b57a0aa81a8c46", + "sha256": "1gjzis2jshsq5sdi5rv3a29cmk4iv7y6k2awxlddq3biyf80ialb" } }, { @@ -39210,14 +39298,14 @@ "repo": "fsharp/emacs-fsharp-mode", "unstable": { "version": [ - 20210131, - 1150 + 20210331, + 1931 ], "deps": [ "s" ], - "commit": "78898a1535878394d83643c383f4320e7b5fcefd", - "sha256": "0d60jfaf8av0b7vx44lbqzb7v70dszvr2w1yjh1cxn71dnjphp4j" + "commit": "93b1fbc31d73286a18640a36fc2be87d1736e0f2", + "sha256": "0lq1izdlrkwp5xiqjp71adi12jy0xj3fsmn6fg2sv0451bwxghra" }, "stable": { "version": [ @@ -39283,8 +39371,8 @@ "deps": [ "cl-lib" ], - "commit": "5bfeab6c0e13bfefddb98b30b6e60489a1574d8e", - "sha256": "193wbn2y0562gm08yaq8dim1y52vvxvz6vxh3gpxgk95zrr0ll1s" + "commit": "43dfeb07bd3932f9d42c2b964413001cf32f0d50", + "sha256": "16an39w1ycbw90d6l0d2mcvyndah1j21b2jf7iwnqipwsac9f1qm" }, "stable": { "version": [ @@ -39782,11 +39870,11 @@ "repo": "godotengine/emacs-gdscript-mode", "unstable": { "version": [ - 20210131, - 1551 + 20210328, + 2037 ], - "commit": "16c631cd6f2f2eeb11730442c9897008e1e10f7a", - "sha256": "1ygwvavwrhpjrgw58psawcwp01y8j0xhsvc2bywiz8a1d2pngn1q" + "commit": "b7bfa6a3b294039f5093f85e4ff809ff05333abd", + "sha256": "1197cvf42b3191vd01gv5jj0781954p3b6w4clcxb1c5wxxlb07b" }, "stable": { "version": [ @@ -39877,17 +39965,21 @@ }, { "ename": "geiser", - "commit": "67dc8d6e33f3522043f96761b23ea68c9c27084e", - "sha256": "1g7z6c3lfa7slwrxk7q8awqs39qibcv2kc4c2fwlwvgbcfhkw085", + "commit": "4f305d3a7823c69455aad9088789afef73477c7a", + "sha256": "0k0jv5a3qlad5qp72m80yi5xws3gdf38pj06azvdg4kzvhgrxpgz", "fetcher": "gitlab", - "repo": "jaor/geiser", + "repo": "emacs-geiser/geiser", "unstable": { "version": [ - 20210303, - 1351 + 20210410, + 2304 ], - "commit": "8e61c27b628373523b7c467d5f71aac8c873258b", - "sha256": "1hnfyr4sbznmmqamk6zwwyq8z4a8vi628a0wfxmj8lyzjb2dqyi1" + "commit": "aa26163aa81b5af3bc5bbf23bec8b5776de3a8bc", + "error": [ + "exited abnormally with code 1\n", + "", + "warning: unknown setting 'experimental-features'\nwarning: unable to download 'https://gitlab.com/emacs-geiser/geiser/repository/archive.tar.gz?ref=aa26163aa81b5af3bc5bbf23bec8b5776de3a8bc': HTTP error 503; retrying in 278 ms\nwarning: unable to download 'https://gitlab.com/emacs-geiser/geiser/repository/archive.tar.gz?ref=aa26163aa81b5af3bc5bbf23bec8b5776de3a8bc': HTTP error 503; retrying in 535 ms\nwarning: unable to download 'https://gitlab.com/emacs-geiser/geiser/repository/archive.tar.gz?ref=aa26163aa81b5af3bc5bbf23bec8b5776de3a8bc': HTTP error 503; retrying in 1141 ms\nwarning: unable to download 'https://gitlab.com/emacs-geiser/geiser/repository/archive.tar.gz?ref=aa26163aa81b5af3bc5bbf23bec8b5776de3a8bc': HTTP error 503; retrying in 2003 ms\nerror: unable to download 'https://gitlab.com/emacs-geiser/geiser/repository/archive.tar.gz?ref=aa26163aa81b5af3bc5bbf23bec8b5776de3a8bc': HTTP error 503\n" + ] }, "stable": { "version": [ @@ -39898,6 +39990,94 @@ "sha256": "0n718xpys7v94zaf9lpmsx97qgn6qxif1acr718wyvpmfr4hiv08" } }, + { + "ename": "geiser-chez", + "commit": "6c2ee4d4fbde853481aa66925763845daadd5439", + "sha256": "1csx76zgg26wqbq6q10v4yqj5hadsww0jw17dbz718521906a4ql", + "fetcher": "gitlab", + "repo": "emacs-geiser/chez", + "unstable": { + "version": [ + 20210405, + 1922 + ], + "deps": [ + "geiser" + ], + "commit": "4cb7f2667ea1c53da53f0144910fbbd67bccbf4d", + "error": [ + "exited abnormally with code 1\n", + "", + "warning: unknown setting 'experimental-features'\nwarning: unable to download 'https://gitlab.com/emacs-geiser/chez/repository/archive.tar.gz?ref=4cb7f2667ea1c53da53f0144910fbbd67bccbf4d': HTTP error 503; retrying in 257 ms\nwarning: unable to download 'https://gitlab.com/emacs-geiser/chez/repository/archive.tar.gz?ref=4cb7f2667ea1c53da53f0144910fbbd67bccbf4d': HTTP error 503; retrying in 677 ms\nwarning: unable to download 'https://gitlab.com/emacs-geiser/chez/repository/archive.tar.gz?ref=4cb7f2667ea1c53da53f0144910fbbd67bccbf4d': HTTP error 503; retrying in 1142 ms\nwarning: unable to download 'https://gitlab.com/emacs-geiser/chez/repository/archive.tar.gz?ref=4cb7f2667ea1c53da53f0144910fbbd67bccbf4d': HTTP error 503; retrying in 2316 ms\nerror: unable to download 'https://gitlab.com/emacs-geiser/chez/repository/archive.tar.gz?ref=4cb7f2667ea1c53da53f0144910fbbd67bccbf4d': HTTP error 503\n" + ] + } + }, + { + "ename": "geiser-chibi", + "commit": "29aa9f96fa0826e8e26e2e1219b78c73f9af66fb", + "sha256": "17zkic298ckq8mdmlc25ycafcx2yy11xfdlfjnyy20p7nqqw8njj", + "fetcher": "gitlab", + "repo": "emacs-geiser/chibi", + "unstable": { + "version": [ + 20210405, + 1924 + ], + "deps": [ + "geiser" + ], + "commit": "54e7f384618c73d8fb675b5289d443a8ee3e4dc8", + "error": [ + "exited abnormally with code 1\n", + "", + "warning: unknown setting 'experimental-features'\nwarning: unable to download 'https://gitlab.com/emacs-geiser/chibi/repository/archive.tar.gz?ref=54e7f384618c73d8fb675b5289d443a8ee3e4dc8': HTTP error 503; retrying in 250 ms\nwarning: unable to download 'https://gitlab.com/emacs-geiser/chibi/repository/archive.tar.gz?ref=54e7f384618c73d8fb675b5289d443a8ee3e4dc8': HTTP error 503; retrying in 530 ms\nwarning: unable to download 'https://gitlab.com/emacs-geiser/chibi/repository/archive.tar.gz?ref=54e7f384618c73d8fb675b5289d443a8ee3e4dc8': HTTP error 503; retrying in 1321 ms\nwarning: unable to download 'https://gitlab.com/emacs-geiser/chibi/repository/archive.tar.gz?ref=54e7f384618c73d8fb675b5289d443a8ee3e4dc8': HTTP error 503; retrying in 2133 ms\nerror: unable to download 'https://gitlab.com/emacs-geiser/chibi/repository/archive.tar.gz?ref=54e7f384618c73d8fb675b5289d443a8ee3e4dc8': HTTP error 503\n" + ] + } + }, + { + "ename": "geiser-chicken", + "commit": "cfc698ce9f759b5664217a4866a91605c11c13f6", + "sha256": "0pmy5gxsvp33m3dd5fnanxbjmds2vvaq649hp0nrjixykqhg9gf4", + "fetcher": "gitlab", + "repo": "emacs-geiser/chicken", + "unstable": { + "version": [ + 20210405, + 1931 + ], + "deps": [ + "geiser" + ], + "commit": "47be5b43b35d3bf35b0f668b4c08715ea41fb97d", + "error": [ + "exited abnormally with code 1\n", + "", + "warning: unknown setting 'experimental-features'\nwarning: unable to download 'https://gitlab.com/emacs-geiser/chicken/repository/archive.tar.gz?ref=47be5b43b35d3bf35b0f668b4c08715ea41fb97d': HTTP error 503; retrying in 302 ms\nwarning: unable to download 'https://gitlab.com/emacs-geiser/chicken/repository/archive.tar.gz?ref=47be5b43b35d3bf35b0f668b4c08715ea41fb97d': HTTP error 503; retrying in 546 ms\nwarning: unable to download 'https://gitlab.com/emacs-geiser/chicken/repository/archive.tar.gz?ref=47be5b43b35d3bf35b0f668b4c08715ea41fb97d': HTTP error 503; retrying in 1206 ms\nwarning: unable to download 'https://gitlab.com/emacs-geiser/chicken/repository/archive.tar.gz?ref=47be5b43b35d3bf35b0f668b4c08715ea41fb97d': HTTP error 503; retrying in 2316 ms\nerror: unable to download 'https://gitlab.com/emacs-geiser/chicken/repository/archive.tar.gz?ref=47be5b43b35d3bf35b0f668b4c08715ea41fb97d': HTTP error 503\n" + ] + } + }, + { + "ename": "geiser-gambit", + "commit": "3b4af6c41cf776dff3bcb09ae08f6f3acc880b33", + "sha256": "0vjq5b1warybr57kc855lbmda109vv4kbysn4s4zfi0mz45y0lbx", + "fetcher": "gitlab", + "repo": "emacs-geiser/gambit", + "unstable": { + "version": [ + 20210405, + 1925 + ], + "deps": [ + "geiser" + ], + "commit": "0ee4156640988497779345452c3aa0417356e606", + "error": [ + "exited abnormally with code 1\n", + "", + "warning: unknown setting 'experimental-features'\nwarning: unable to download 'https://gitlab.com/emacs-geiser/gambit/repository/archive.tar.gz?ref=0ee4156640988497779345452c3aa0417356e606': HTTP error 503; retrying in 251 ms\nwarning: unable to download 'https://gitlab.com/emacs-geiser/gambit/repository/archive.tar.gz?ref=0ee4156640988497779345452c3aa0417356e606': HTTP error 503; retrying in 559 ms\nwarning: unable to download 'https://gitlab.com/emacs-geiser/gambit/repository/archive.tar.gz?ref=0ee4156640988497779345452c3aa0417356e606': HTTP error 503; retrying in 1131 ms\nwarning: unable to download 'https://gitlab.com/emacs-geiser/gambit/repository/archive.tar.gz?ref=0ee4156640988497779345452c3aa0417356e606': HTTP error 503; retrying in 2010 ms\nerror: unable to download 'https://gitlab.com/emacs-geiser/gambit/repository/archive.tar.gz?ref=0ee4156640988497779345452c3aa0417356e606': HTTP error 503\n" + ] + } + }, { "ename": "geiser-gauche", "commit": "1cb02b836748f31be26013d2e43ada6d68f35c90", @@ -39928,6 +40108,28 @@ "sha256": "0rxncnzx7qgcpvc8nz0sd8r0hwrplazzraahdwhbpq0q6z8ywqgg" } }, + { + "ename": "geiser-guile", + "commit": "779ebb6fa2f9ee7a86425c4364ae8141f66a0f4f", + "sha256": "18w8spn3ys3ggnqic4isy6ggzdjjsvsc1rbpq346mmb1xdy5bjna", + "fetcher": "gitlab", + "repo": "emacs-geiser/guile", + "unstable": { + "version": [ + 20210405, + 1917 + ], + "deps": [ + "geiser" + ], + "commit": "93ef7101fdfcc7eac6f465b4b9788c384a323c14", + "error": [ + "exited abnormally with code 1\n", + "", + "warning: unknown setting 'experimental-features'\nwarning: unable to download 'https://gitlab.com/emacs-geiser/guile/repository/archive.tar.gz?ref=93ef7101fdfcc7eac6f465b4b9788c384a323c14': HTTP error 503; retrying in 250 ms\nwarning: unable to download 'https://gitlab.com/emacs-geiser/guile/repository/archive.tar.gz?ref=93ef7101fdfcc7eac6f465b4b9788c384a323c14': HTTP error 503; retrying in 632 ms\nwarning: unable to download 'https://gitlab.com/emacs-geiser/guile/repository/archive.tar.gz?ref=93ef7101fdfcc7eac6f465b4b9788c384a323c14': HTTP error 503; retrying in 1153 ms\nwarning: unable to download 'https://gitlab.com/emacs-geiser/guile/repository/archive.tar.gz?ref=93ef7101fdfcc7eac6f465b4b9788c384a323c14': HTTP error 503; retrying in 2774 ms\nerror: unable to download 'https://gitlab.com/emacs-geiser/guile/repository/archive.tar.gz?ref=93ef7101fdfcc7eac6f465b4b9788c384a323c14': HTTP error 503\n" + ] + } + }, { "ename": "geiser-kawa", "commit": "68690d6b011c95197af6b5a87cc21c4dbe97ff00", @@ -39954,14 +40156,40 @@ "repo": "emacs-geiser/mit", "unstable": { "version": [ - 20210308, - 257 + 20210405, + 1920 ], "deps": [ "geiser" ], - "commit": "1caea838ddbbf3d8e0c6f39656f8ff3b445e371a", - "sha256": "0r3ycjcrqbfnlci31bzr7l4nqrfklj839k3ba0c19vfga8wyakfq" + "commit": "d17394f577aaa2854a74a1a0039cb8f73378b400", + "error": [ + "exited abnormally with code 1\n", + "", + "warning: unknown setting 'experimental-features'\nwarning: unable to download 'https://gitlab.com/emacs-geiser/mit/repository/archive.tar.gz?ref=d17394f577aaa2854a74a1a0039cb8f73378b400': HTTP error 503; retrying in 286 ms\nwarning: unable to download 'https://gitlab.com/emacs-geiser/mit/repository/archive.tar.gz?ref=d17394f577aaa2854a74a1a0039cb8f73378b400': HTTP error 503; retrying in 541 ms\nwarning: unable to download 'https://gitlab.com/emacs-geiser/mit/repository/archive.tar.gz?ref=d17394f577aaa2854a74a1a0039cb8f73378b400': HTTP error 503; retrying in 1159 ms\nwarning: unable to download 'https://gitlab.com/emacs-geiser/mit/repository/archive.tar.gz?ref=d17394f577aaa2854a74a1a0039cb8f73378b400': HTTP error 503; retrying in 2059 ms\nerror: unable to download 'https://gitlab.com/emacs-geiser/mit/repository/archive.tar.gz?ref=d17394f577aaa2854a74a1a0039cb8f73378b400': HTTP error 503\n" + ] + } + }, + { + "ename": "geiser-racket", + "commit": "eddf5704aa4c2373dbe7b7b89934f6db3737a769", + "sha256": "13m7xkimn7qn03cxdp8h1b5g1cnkn5pviq48zlw394xlaz67vn3m", + "fetcher": "gitlab", + "repo": "emacs-geiser/racket", + "unstable": { + "version": [ + 20210405, + 1929 + ], + "deps": [ + "geiser" + ], + "commit": "a87fd449cc6c7b0b17a0b08268e78d3f038f3351", + "error": [ + "exited abnormally with code 1\n", + "", + "warning: unknown setting 'experimental-features'\nwarning: unable to download 'https://gitlab.com/emacs-geiser/racket/repository/archive.tar.gz?ref=a87fd449cc6c7b0b17a0b08268e78d3f038f3351': HTTP error 503; retrying in 346 ms\nwarning: unable to download 'https://gitlab.com/emacs-geiser/racket/repository/archive.tar.gz?ref=a87fd449cc6c7b0b17a0b08268e78d3f038f3351': HTTP error 503; retrying in 544 ms\nwarning: unable to download 'https://gitlab.com/emacs-geiser/racket/repository/archive.tar.gz?ref=a87fd449cc6c7b0b17a0b08268e78d3f038f3351': HTTP error 503; retrying in 1082 ms\nwarning: unable to download 'https://gitlab.com/emacs-geiser/racket/repository/archive.tar.gz?ref=a87fd449cc6c7b0b17a0b08268e78d3f038f3351': HTTP error 503; retrying in 2114 ms\nerror: unable to download 'https://gitlab.com/emacs-geiser/racket/repository/archive.tar.gz?ref=a87fd449cc6c7b0b17a0b08268e78d3f038f3351': HTTP error 503\n" + ] } }, { @@ -40121,8 +40349,8 @@ "repo": "thisch/gerrit.el", "unstable": { "version": [ - 20210219, - 806 + 20210329, + 817 ], "deps": [ "dash", @@ -40130,8 +40358,8 @@ "magit", "s" ], - "commit": "19a8d6805541cede2523b70fa6601667b420f32f", - "sha256": "1aqcqyi4933p4cixrmjb2g1yghbdshir61q3l90igw6h6nfwbiiq" + "commit": "63ca93be02f830f8d65905ebde72d60a2280687a", + "sha256": "08s7q7br8a68gs7w55g6i4g0d6ky2mksl1ws8iigiavkh64sihkb" } }, { @@ -40389,15 +40617,15 @@ "repo": "magit/ghub", "unstable": { "version": [ - 20210227, - 1925 + 20210327, + 1647 ], "deps": [ "let-alist", "treepy" ], - "commit": "f26c1f7e575209da047e77c18d415f9dc11015e2", - "sha256": "1cvsslki8nkfh7j7fy0j3f21mf0qc5cz7hv0dm3hw7k25wkrbvb9" + "commit": "2273c3b49a08cde0498b3b2cfae6c764629a4c93", + "sha256": "1pg46ycllg900cd8q5bsgv9b9mcc0bm0z5g2bw9gf5nnbw556jla" }, "stable": { "version": [ @@ -40452,11 +40680,15 @@ "repo": "Ambrevar/emacs-gif-screencast", "unstable": { "version": [ - 20201110, - 1613 + 20210401, + 656 ], - "commit": "1145e676b160e7b1e5756f5b0f30dd31de252e1f", - "sha256": "0nn5wqsk6czx3ca917bk7c4n16rs59n5l0925fdklhp532hhgd2r" + "commit": "fa81e915c256271fa10b807a2935d5eaa4700dff", + "error": [ + "exited abnormally with code 1\n", + "", + "warning: unknown setting 'experimental-features'\nwarning: unable to download 'https://gitlab.com/Ambrevar/emacs-gif-screencast/repository/archive.tar.gz?ref=fa81e915c256271fa10b807a2935d5eaa4700dff': HTTP error 503; retrying in 272 ms\nwarning: unable to download 'https://gitlab.com/Ambrevar/emacs-gif-screencast/repository/archive.tar.gz?ref=fa81e915c256271fa10b807a2935d5eaa4700dff': HTTP error 503; retrying in 546 ms\nwarning: unable to download 'https://gitlab.com/Ambrevar/emacs-gif-screencast/repository/archive.tar.gz?ref=fa81e915c256271fa10b807a2935d5eaa4700dff': HTTP error 503; retrying in 1078 ms\nwarning: unable to download 'https://gitlab.com/Ambrevar/emacs-gif-screencast/repository/archive.tar.gz?ref=fa81e915c256271fa10b807a2935d5eaa4700dff': HTTP error 503; retrying in 2648 ms\nerror: unable to download 'https://gitlab.com/Ambrevar/emacs-gif-screencast/repository/archive.tar.gz?ref=fa81e915c256271fa10b807a2935d5eaa4700dff': HTTP error 503\n" + ] }, "stable": { "version": [ @@ -40755,16 +40987,16 @@ "repo": "magit/magit", "unstable": { "version": [ - 20210309, - 1106 + 20210328, + 1730 ], "deps": [ "dash", "transient", "with-editor" ], - "commit": "527842a3b0fd868bd0c193c430a6ad290dd62053", - "sha256": "0cxnvi2vkk5nrcd2iir34bv76rsakijsim1rgxxh03xjc7fqyvj3" + "commit": "5882df245d3388cd6f443bc11df219a838104df2", + "sha256": "08yisn699gg2mfapc1h1rfb90vm9p10vk1c9xzd4h30xa6c0299h" }, "stable": { "version": [ @@ -41415,11 +41647,11 @@ "repo": "TxGVNN/github-explorer", "unstable": { "version": [ - 20210113, - 1307 + 20210402, + 1246 ], - "commit": "b083d0615dd88d9ec4f116015c98b5e3326f77a5", - "sha256": "09slgwmv59vwz34b5mcz46360a979h6k3pnqr3pmbakn7ysbdmqs" + "commit": "633b7371a6a00660422e195795c4b79f16bf29ae", + "sha256": "1wqnar0y6migb5n4hkz98r5bpxxx9m4qn15wg9cz213jpnykfkyy" }, "stable": { "version": [ @@ -43287,11 +43519,11 @@ "repo": "io12/good-scroll.el", "unstable": { "version": [ - 20210123, - 159 + 20210404, + 321 ], - "commit": "5d0479e5a0fe1589fe549f2fc1966f80a4718a4f", - "sha256": "046iimmkljbfcz66cj73cnizxn15hw7bzi3glls2h6vh8sxak7d7" + "commit": "fb01f121c4c77db3e6750303894d57b31e410b14", + "sha256": "0jz4p6xa8nb36g96a8pbhpc4l16jzwryddlw2c442vmkngwy9s1j" }, "stable": { "version": [ @@ -43329,8 +43561,8 @@ 20180130, 1736 ], - "commit": "6e239d7f906ee456b926be229f3e4ee6bad53e42", - "sha256": "04mz13p5n6az94mq0mhd1zw7jdpf26sm4mk0p2r92vfy2xqnjqnd" + "commit": "845e4f9a15a794071457e74c1fa99be2c68d75fe", + "sha256": "130bjw6bpizf0wq48d8n1cvgpdrq31d8ryd6wmah8a5vbwnczf6y" } }, { @@ -43407,11 +43639,11 @@ "repo": "atykhonov/google-translate", "unstable": { "version": [ - 20200809, - 1430 + 20210406, + 1138 ], - "commit": "6f7b75b2aa1ff4e50b6f1579cafddafae5705dbd", - "sha256": "1mcmv1p879nbbhwcimya5licq1mq0wkw5dgil7kqwicz5zzb8p2g" + "commit": "0f7f48a09bca064999ecea03102a7c96f52cbd1b", + "sha256": "13iznf7gpczqvgkxbqpmzyvyrj9pib6wly1pvsqhi2k8lmmf5yxf" }, "stable": { "version": [ @@ -43689,8 +43921,8 @@ "magit-popup", "s" ], - "commit": "7ce0a83a88e6cca59d10df0e7824739854558bd2", - "sha256": "0jhy8flny9dlddw8fhymxm7s5c9sl3yxnqh8icdwb9vhgq754wcy" + "commit": "52c75aa6b3d8eeacfede11b314e20514ca7c75a4", + "sha256": "1a2nzbxhqwpjxfm4sr1l2pyjxhvfwd3ralxmldgsdpssqx64lvsn" }, "stable": { "version": [ @@ -44562,16 +44794,16 @@ "repo": "wbolster/emacs-gsettings", "unstable": { "version": [ - 20210208, - 2042 + 20210407, + 2045 ], "deps": [ "dash", "gvariant", "s" ], - "commit": "1bd1909a22121a8200cca678302f1533856b9008", - "sha256": "1g195dg359iff4cq5ywwd5jjxwhvwd4qj6j8631g7wkjz1rx7bxb" + "commit": "9f9fb1fe946bbba46307c26355f355225ea7262a", + "sha256": "1pq18kz6dqk45ib70sch38ql63smpv7s80ik478ajjysks3882rc" }, "stable": { "version": [ @@ -44926,14 +45158,14 @@ "repo": "hhvm/hack-mode", "unstable": { "version": [ - 20201006, - 43 + 20210410, + 134 ], "deps": [ "s" ], - "commit": "847fd910e9d0ac76e2cfeb87512e6923a39d7d5f", - "sha256": "1h2j1gbs47l5njny174146b2naf1wv3bgwv932abhjamj7vl06mq" + "commit": "8b59e20197ddab21d41d8828ff5ab298bde18294", + "sha256": "01iwdpm8nzr8fiqz8shvlwj8cl0r1d5jw77kkfx33vai0nh8m94y" }, "stable": { "version": [ @@ -45374,11 +45606,11 @@ "repo": "haskell/haskell-mode", "unstable": { "version": [ - 20210325, - 2112 + 20210407, + 214 ], - "commit": "1baa12abfa2c81128e5b13d1351f2978a4a54b4f", - "sha256": "12lalrjbf018wkc40pqmpc2jrm64avk0smkili4cqkhspcidci8s" + "commit": "426e28bbee7853734664d75a7e5f960c6c15ee67", + "sha256": "01qrrbb2rgr780xna4a1ncv92y8af76kvj0hjdl3qa1mdn0ypc3j" }, "stable": { "version": [ @@ -45708,16 +45940,16 @@ "repo": "emacs-helm/helm", "unstable": { "version": [ - 20210326, - 1959 + 20210409, + 1016 ], "deps": [ "async", "helm-core", "popup" ], - "commit": "98af298c517148fbb31774a548c85ecdc1bcf8ab", - "sha256": "0gdi08krvk648fq4hk2b3aiks6plff9cpixghwsgin6rl3k33h67" + "commit": "4f16ec21f5ac4d0b9e36768c27abd453a959388d", + "sha256": "07v5gr61pvm5nh8xfi79i7ps6hjicm07zkg98m14z424dc8x6kl4" }, "stable": { "version": [ @@ -46010,8 +46242,8 @@ "cl-lib", "helm" ], - "commit": "ca09076c3d6e51cc4ffe208c8176fccf3710fcc6", - "sha256": "1jf2zapmkg2fdn9ldq8cn3aw02iqpjh26h6yjj93q3h0clsk5ia2" + "commit": "9870333cdd4a54b309e2709af647cda6f4070a42", + "sha256": "02cpg60hif4rz6va2ynh3wc9dwj0nyig4fa0l6jchmzz8v2zvf86" }, "stable": { "version": [ @@ -46252,15 +46484,15 @@ "repo": "emacs-jp/helm-c-yasnippet", "unstable": { "version": [ - 20201118, - 1009 + 20210330, + 16 ], "deps": [ "helm", "yasnippet" ], - "commit": "28699d9a9caa8b4d37fd66368d93b6c65828c235", - "sha256": "15f4bdarr66jlr7a31r9zn37l6v3fmrqhizz41lqcllkwz0nqh6h" + "commit": "e214eec8b2875d8a7cd09006dfb6a8e15e9e4079", + "sha256": "1hhbc56vcjz6xkqzmx8zgi0zi6w5xv85rbg68d70jfzmx6n516fq" }, "stable": { "version": [ @@ -46622,8 +46854,8 @@ "deps": [ "async" ], - "commit": "98af298c517148fbb31774a548c85ecdc1bcf8ab", - "sha256": "0gdi08krvk648fq4hk2b3aiks6plff9cpixghwsgin6rl3k33h67" + "commit": "4f16ec21f5ac4d0b9e36768c27abd453a959388d", + "sha256": "07v5gr61pvm5nh8xfi79i7ps6hjicm07zkg98m14z424dc8x6kl4" }, "stable": { "version": [ @@ -47204,15 +47436,15 @@ "repo": "emacs-helm/helm-firefox", "unstable": { "version": [ - 20200612, - 800 + 20210331, + 1900 ], "deps": [ "cl-lib", "helm" ], - "commit": "8ecf5bcb815d1650bf184deffeef10b1277e0e1e", - "sha256": "00is30ijsh2aqvrkk5cxl46mbcj3q2fzc02hb55mj3gq4h6lb1bq" + "commit": "58a7ff023c76857ca9cd82075c8743446a50c055", + "sha256": "06ihkw61ivgghasxignalr0zrfrh5nayky9adrqid9bgmiah3q9y" }, "stable": { "version": [ @@ -47915,16 +48147,16 @@ "repo": "yyoncho/helm-icons", "unstable": { "version": [ - 20210315, - 1339 + 20210330, + 1216 ], "deps": [ "dash", "f", "treemacs" ], - "commit": "7e8d1e213a164aa63b868e610ef8a4fd1ff58769", - "sha256": "0g5n9f8vfv3zbylxh6w2xrym4fzd4jqx5n4g6gjp8sscaw5zaxkd" + "commit": "8d2f5e705c8b78a390677cf242024739c932fc95", + "sha256": "0q220a0knzmm2xk7hjcz6wkdk39ni2qndvnnsrc2vg04r5k12lm7" } }, { @@ -48159,8 +48391,8 @@ "helm", "lean-mode" ], - "commit": "5c50338ac149ca5225fc737be291db1f63c45f1d", - "sha256": "13vrg0pp7ca0lh4j9cyg4pgfnbvf2kvbrgvvcmn1h7l9py2n8alj" + "commit": "5a2a36356e73c74a42e49fad19a71f4f12929a90", + "sha256": "18lswxxwvp85yzg1kc9vxn4dpmxmj40j6g64c8ns83nb7hw9lszg" } }, { @@ -49457,8 +49689,8 @@ "helm", "rtags" ], - "commit": "aa4c827b417f5448c12401c33acdab1325917c13", - "sha256": "02jqcbrpxm4sv15l8kyvsw9pwkmamj065cgifj68x242fw2f0sam" + "commit": "63f18acb21e664fd92fbc19465f0b5df085b5e93", + "sha256": "0wzyn9qzyly71yfwhlk5m94ygjnbk459pgbpgkhp9fqgchx12p1r" }, "stable": { "version": [ @@ -50795,11 +51027,11 @@ "repo": "Fanael/highlight-defined", "unstable": { "version": [ - 20181106, - 1718 + 20210411, + 222 ], - "commit": "8e05be23e555ab05edc6fb188f5ce28ef495c946", - "sha256": "1xqs8shzka47ns4a60ba2i2kgjcq9vl9w1518ffhb4x2x41lr4ri" + "commit": "4420bdda419875dacb065468aafe273b2022580e", + "sha256": "0a9nn1jnbgv93kz1iz5iay34d0p7lkpd8ic619ysk8qcksc0yn2i" }, "stable": { "version": [ @@ -50963,14 +51195,11 @@ "url": "https://git.sr.ht/~tsdh/highlight-parentheses.el", "unstable": { "version": [ - 20210104, - 1625 + 20210410, + 1932 ], - "deps": [ - "cl-lib" - ], - "commit": "723abf9b6092d7e19548316de1f907ed0d67c780", - "sha256": "1kkxxq5cw090vw3cddzdq51f208vxw326hsqb1zi8f6z3vsm2h7s" + "commit": "fdabfda5f6300f8dd4d2a62c49359605798cc001", + "sha256": "0x833ahd5m4rlqrgr7n5xj477vbs7mmp267in22hw0cxi9aan08q" }, "stable": { "version": [ @@ -52213,11 +52442,11 @@ "repo": "nflath/hungry-delete", "unstable": { "version": [ - 20201007, - 2024 + 20210409, + 1643 ], - "commit": "0513152525c38519a5597db2d6495b56dd9cc3f0", - "sha256": "0250s6snh5z3w1g98rfgahzh8ys51gl3l5sk7b2wi39h2rdlzcqg" + "commit": "d919e555e5c13a2edf4570f3ceec84f0ade71657", + "sha256": "1hjihncj6q971zj1xfnfmyvx8wv19wdnglnmz1278fwsgrcs050d" }, "stable": { "version": [ @@ -52755,11 +52984,11 @@ "repo": "oantolin/icomplete-vertical", "unstable": { "version": [ - 20210227, - 2146 + 20210411, + 1913 ], - "commit": "e490b01f7420bc15bc8e7b4594964208c3d31107", - "sha256": "1b069vnjlwnwk62332ndwizjp44dhjxvajv2nndpxqrkpqg9s8jb" + "commit": "a258ff1033dd3d3cb894a039ac13ff3a85b96f57", + "sha256": "1r6cpq6nm3hhxhim4i0alcwmrvq17n7gh5dri9lfpcq6c7wqf0qi" }, "stable": { "version": [ @@ -53362,11 +53591,11 @@ "repo": "victorhge/iedit", "unstable": { "version": [ - 20210203, - 23 + 20210402, + 854 ], - "commit": "0d6d2387188763a88cdf84f749e6f32d5a72bbd6", - "sha256": "0v34zqbfr7z3mr5c9nyksxkdgmnyvvsr9zaq202hhq25lwlhrkpq" + "commit": "ff68c2065316aa5fb72662428f8d5812ec8da83a", + "sha256": "1c5qxms26q2pd5g7p8zayqbbgypjix5ayk074kk07a4km4wx31h8" }, "stable": { "version": [ @@ -53665,8 +53894,8 @@ 20201229, 1035 ], - "commit": "68b0aaaefc18b267e4e383df36a8dfb7448bc83c", - "sha256": "1mf8drn4acf0r2sjpprbjp4wv75jzy5j8b9p9snnj3991fk66yby" + "commit": "a8d867e7cc446afcd4dc71d4f528e58d639840e1", + "sha256": "1c64cbxzm287k8hhm1plwphvipf96dp9zb0kyl78ng5c072wmryf" }, "stable": { "version": [ @@ -53686,14 +53915,11 @@ "repo": "bmag/imenu-list", "unstable": { "version": [ - 20210325, - 1536 + 20210411, + 1703 ], - "deps": [ - "cl-lib" - ], - "commit": "b03b86aee6ac30067906dddc385db8188657d023", - "sha256": "0vi4cj6cijra3d0khiqc185iqzhkzillbwnhglxi82r4zrzwnyzg" + "commit": "1447cdc8c0268e332fb4adc0c643702245d31bde", + "sha256": "1fhfxwwf622mjl3slnzyj0zzmbx15qhq6xv8p7fpw88dx1dki113" }, "stable": { "version": [ @@ -53977,11 +54203,11 @@ "repo": "jcs-elpa/indent-control", "unstable": { "version": [ - 20210309, - 1151 + 20210404, + 727 ], - "commit": "383ea506a6e6145bbb6327a7b1e509b40edf446b", - "sha256": "1828wh72ij2dhrvlwzx70j6q2gjqs96dk2h6wk508pphqw3yn29x" + "commit": "5048c685e7071631dbad52988dbf91ffc67a4af3", + "sha256": "0clj2rm5lsyd6c3087j0z5ndg20pji5c7yqd6r1jnpclrvvwb04w" }, "stable": { "version": [ @@ -54192,8 +54418,8 @@ "deps": [ "clojure-mode" ], - "commit": "1e99b8246bb1fe7666d613a9ae566e2a939fc2bb", - "sha256": "0bqznd3mn0fd8km5in9k2i87pxcjv6wszdgjp4ajzw742dznkb2f" + "commit": "c3ff2f40fdcedf3357cde868c278474767b65adb", + "sha256": "0ljxpjhm3v0wb851zfqvkr5cv4hblg29rz3a5lw48jwz9ijpapq9" }, "stable": { "version": [ @@ -55487,11 +55713,11 @@ "repo": "abo-abo/swiper", "unstable": { "version": [ - 20210311, - 1638 + 20210404, + 1241 ], - "commit": "47b496544e238041bca5e3c9ca55848648344312", - "sha256": "0n26hpffp7lljhwjbr4r470ynaff3swnkxmj7g2rjw78rw2qjmlm" + "commit": "471d644d6bdd7d5dc6ca4efb405e6a6389dff245", + "sha256": "0zw5sypr9kwb65627b8wrgl542gyq0xh7pwhghbkwfpwx7rjvk36" }, "stable": { "version": [ @@ -55518,8 +55744,8 @@ "avy", "ivy" ], - "commit": "47b496544e238041bca5e3c9ca55848648344312", - "sha256": "0n26hpffp7lljhwjbr4r470ynaff3swnkxmj7g2rjw78rw2qjmlm" + "commit": "471d644d6bdd7d5dc6ca4efb405e6a6389dff245", + "sha256": "0zw5sypr9kwb65627b8wrgl542gyq0xh7pwhghbkwfpwx7rjvk36" }, "stable": { "version": [ @@ -55551,8 +55777,8 @@ "cl-lib", "swiper" ], - "commit": "ca09076c3d6e51cc4ffe208c8176fccf3710fcc6", - "sha256": "1jf2zapmkg2fdn9ldq8cn3aw02iqpjh26h6yjj93q3h0clsk5ia2" + "commit": "9870333cdd4a54b309e2709af647cda6f4070a42", + "sha256": "02cpg60hif4rz6va2ynh3wc9dwj0nyig4fa0l6jchmzz8v2zvf86" }, "stable": { "version": [ @@ -55886,8 +56112,8 @@ "hydra", "ivy" ], - "commit": "47b496544e238041bca5e3c9ca55848648344312", - "sha256": "0n26hpffp7lljhwjbr4r470ynaff3swnkxmj7g2rjw78rw2qjmlm" + "commit": "471d644d6bdd7d5dc6ca4efb405e6a6389dff245", + "sha256": "0zw5sypr9kwb65627b8wrgl542gyq0xh7pwhghbkwfpwx7rjvk36" }, "stable": { "version": [ @@ -56053,15 +56279,15 @@ "repo": "tumashu/ivy-posframe", "unstable": { "version": [ - 20210122, - 45 + 20210410, + 530 ], "deps": [ "ivy", "posframe" ], - "commit": "3132719a9a7c04431fe65f1dced8acafe789bdf6", - "sha256": "133l0rd3iwphj9xcgww5m54mmyfd7icr46s792awlpc1ch7748c3" + "commit": "7f1ab7890040c4b8dc4e9645c824cd35210e1121", + "sha256": "053irrmqvlzs7597grsq0fn06w3apqkgma45xv5pfb2wqin2kx2w" }, "stable": { "version": [ @@ -56092,8 +56318,8 @@ "ivy", "prescient" ], - "commit": "8573df977eaceffc6607b7242ff8c0dab02aad65", - "sha256": "0kfbcicflg7dj9nzvvkgrxsb6p03a7cq26jfk7h6hsnrajy5y4sc" + "commit": "ed2b762241bbea03e374dc9dcd4fbe207c6b2ea4", + "sha256": "03c0dmblixh5mx8365b6608l7z3vcgp6pzdflwqf8nfwj2c5rm0w" }, "stable": { "version": [ @@ -56147,14 +56373,14 @@ "repo": "Yevgnen/ivy-rich", "unstable": { "version": [ - 20210212, - 1441 + 20210409, + 931 ], "deps": [ "ivy" ], - "commit": "7b9b7b20c3ead81da90232cd6707dfad3c1f1eb3", - "sha256": "03p13z609ighdq4axls93alqfl7pclx12g4vdd7lwpcy0r0cgyf8" + "commit": "600b8183ed0be8668dcc548cc2c8cb94b001363b", + "sha256": "1dv6vr7fv32v5m04zdy02sdajpvrnpc4i3pbh2dwfv73ff8d8yxm" }, "stable": { "version": [ @@ -56184,8 +56410,8 @@ "ivy", "rtags" ], - "commit": "aa4c827b417f5448c12401c33acdab1325917c13", - "sha256": "02jqcbrpxm4sv15l8kyvsw9pwkmamj065cgifj68x242fw2f0sam" + "commit": "63f18acb21e664fd92fbc19465f0b5df085b5e93", + "sha256": "0wzyn9qzyly71yfwhlk5m94ygjnbk459pgbpgkhp9fqgchx12p1r" }, "stable": { "version": [ @@ -56236,6 +56462,25 @@ "sha256": "1qsbbpmk3211lm29mks7r3dfphyikbkkj94028748y6ngwqk1vb4" } }, + { + "ename": "ivy-spotify", + "commit": "380125490f47bd150218280c2e16c01be9054a60", + "sha256": "1mrwwlx3nwvvbwlbp4diz7ylsxl76dp51pfgsb2xay2yq0ia34w8", + "fetcher": "git", + "url": "https://codeberg.org/jao/espotify", + "unstable": { + "version": [ + 20210329, + 312 + ], + "deps": [ + "espotify", + "ivy" + ], + "commit": "22b81067ebcaef2cea633f967a4b55454af9326a", + "sha256": "0b93a8km80r1c3gbinnsigkkq8yc127jwrqj8s8z130b79ch91hn" + } + }, { "ename": "ivy-todo", "commit": "e608f40d00a3b2a80a6997da00e7d04f76d8ef0d", @@ -57214,11 +57459,11 @@ "repo": "Michael-Allan/Java_Mode_Tamed", "unstable": { "version": [ - 20210305, - 646 + 20210404, + 1924 ], - "commit": "2e5e85392532fea07848000089137d51d008f42a", - "sha256": "0dcgs0p01hk9aljmv8z36gxqcpcw4p77yl2nvz1gql66lb4p7h6s" + "commit": "9e7b841083c7bb1c76772e8a58428d59ea2fd0f4", + "sha256": "0l3qcnbdh7n4racd2b548h1f8plz1r78n1crcnsqnl7gpxxn1fmk" } }, { @@ -57393,8 +57638,8 @@ 20180807, 1352 ], - "commit": "aa3175de7da5e1243dfd1ad9a17dcfe85740415e", - "sha256": "01z9nq0yp47qcps7c7jzrb1fmcx7qbhr7ig056sp20jq7yn9r3dy" + "commit": "2cb7131e9cda6179541cfc7e3703c426ef3f8024", + "sha256": "1na2n607bdp5l9wg74i77rbd6wq6z4mcw2yp1b66xkzgmjhpndj6" }, "stable": { "version": [ @@ -57949,14 +58194,14 @@ "repo": "tminor/jsonnet-mode", "unstable": { "version": [ - 20201207, - 1825 + 20210407, + 2013 ], "deps": [ "dash" ], - "commit": "e93a1f55e5f9bc2b34b025c6f7a60a6f159268d1", - "sha256": "0vi7415n90d1z2ww1hld0gdp6v7z4rd6f70h476dp2x4hydk293i" + "commit": "9bb6f86dfe6418ccccb929e8a03fb4bb24a9ac0e", + "sha256": "1rx7kr4pdhrmpcm5rm0h9kawk7czgdy1w5z3w4a2jw0v442bhx44" }, "stable": { "version": [ @@ -58057,14 +58302,14 @@ "repo": "tpapp/julia-repl", "unstable": { "version": [ - 20210124, - 923 + 20210408, + 639 ], "deps": [ "s" ], - "commit": "7ce38a9caf2a9c105afe66f464a2f30e816d69f3", - "sha256": "11vpqqnxqj9nxh8kccj4y6h3f8lib6jxnsk6vxc2j2fqw6alnafm" + "commit": "79e686e3ebf164bd39fc2ea5cf09d38d0e1d763a", + "sha256": "1dn1n726lp5m744s4qib6rgcp2an01qblj7ynams3drgca6j6076" }, "stable": { "version": [ @@ -58105,8 +58350,8 @@ "repo": "gcv/julia-snail", "unstable": { "version": [ - 20201128, - 135 + 20210330, + 1901 ], "deps": [ "dash", @@ -58115,8 +58360,8 @@ "spinner", "vterm" ], - "commit": "83f1110a41748cf15ad88924a13f943e58da1409", - "sha256": "1f8nxdiq508m2y7r9wbx0gpab03n4zz546qd1x40czxh2xv932ib" + "commit": "03b4296ba7151963eb3c850f3314b02644101f51", + "sha256": "1jgs0pz8bzqg8116kyw3z7jwbf6karrl89ks028q091ylc00nm8b" }, "stable": { "version": [ @@ -58145,14 +58390,14 @@ "repo": "shg/julia-vterm.el", "unstable": { "version": [ - 20210327, - 657 + 20210410, + 40 ], "deps": [ "vterm" ], - "commit": "1d70c7f9fb91654e38fc868baf0ef72399f75ded", - "sha256": "1zhc71vsc7xjkabqkpv3pbf8hippqiqrd3ng1ws4b9fn1kv68av3" + "commit": "b8a749f19bef179c58068d3fa5cd53c3db5d1ecf", + "sha256": "1bp3dc915zq1qd7zycz8bdjq4pz172r3zbzjn8k4rsw0lz9j6w88" }, "stable": { "version": [ @@ -58298,8 +58543,8 @@ "repo": "nnicandro/emacs-jupyter", "unstable": { "version": [ - 20210116, - 255 + 20210407, + 212 ], "deps": [ "cl-lib", @@ -58307,8 +58552,8 @@ "websocket", "zmq" ], - "commit": "6ce8d01e3a550a3268b415bf9d9b635d4dba5940", - "sha256": "1l0a6abyshrr6wb9xhgwgkdcarnhxj929rg52zf63xix351dlqi9" + "commit": "7735d2b8fb32434992467f0d4d9d59c1a1a5dc0c", + "sha256": "12q70b249yygqr30l1vhgxzlbfxkcil9xaixzj8zy3xbd3vsjdns" }, "stable": { "version": [ @@ -58539,16 +58784,16 @@ "repo": "jmorag/kakoune.el", "unstable": { "version": [ - 20210212, - 2031 + 20210220, + 1858 ], "deps": [ "expand-region", "multiple-cursors", "ryo-modal" ], - "commit": "34af1bc1225b044d9a15d8c276b7e33b12cb8720", - "sha256": "08b1r4yz7ikzwxn4hlip75vmd77hc8nsmiphdw46a9h6w9aw0v30" + "commit": "c39f278811945dbf0958ca8cf81d7b03c39efbcf", + "sha256": "0ajh4nk8brwi41rsbd9dn5gbf7i2mkaxm3aal09r2wgmgxigsiqp" } }, { @@ -58679,15 +58924,15 @@ "repo": "ogdenwebb/emacs-kaolin-themes", "unstable": { "version": [ - 20210315, - 1754 + 20210403, + 749 ], "deps": [ "autothemer", "cl-lib" ], - "commit": "80d0a5824fedb332432d5999af9842316b7dc3f2", - "sha256": "0309vmrbw7a4r0gnsdd5jyfql2fl3lbh3gsnagynvq7rzv9ryr1c" + "commit": "367429c39e330cf2b87e8af0ca7c8883baa21ea3", + "sha256": "0hj21jmkcsjv7rxpfq6n77jsmm894rfgsdn80qymh6nyxznq93ym" }, "stable": { "version": [ @@ -59464,8 +59709,8 @@ 20210318, 2106 ], - "commit": "09c957050af1c37d381d855ac886fb2aa2896d39", - "sha256": "1lfbl1kvnw09qbcsxks14kj9ya1gsahs9wmgznn100d7nqnjwhsc" + "commit": "53b655b0ef4bdfe8bf81a2bef8f09179a4917076", + "sha256": "095z6dkqz6iw28ighqbl2c60i6bm6qyrkxl93yg9b31cd6yzlzin" }, "stable": { "version": [ @@ -60007,16 +60252,16 @@ "repo": "tecosaur/LaTeX-auto-activating-snippets", "unstable": { "version": [ - 20210308, - 336 + 20210327, + 1230 ], "deps": [ "aas", "auctex", "yasnippet" ], - "commit": "78b10f0e1629283f8ba0f5bd1e28cf9a606362fd", - "sha256": "077hnz3gzqzp1pnfksr88p2q33l4ghz6rlxlqajnmb42cv64rxv1" + "commit": "654ea30aa0263e85891ddcabc0b7a0f0144b9e27", + "sha256": "1z5pw9xhp4gh156n9n3yq92zm6z8gw2ik7nfrvgnip2v3yr31pfb" }, "stable": { "version": [ @@ -60108,16 +60353,16 @@ "repo": "Deducteam/lambdapi", "unstable": { "version": [ - 20210325, - 1344 + 20210407, + 1529 ], "deps": [ "eglot", "highlight", "math-symbol-lists" ], - "commit": "5a3c307928438afec317bbb88d56fd67ae89f87c", - "sha256": "1y3szymdb8xf6kv6g9hlmf89bcy3r8c1qzf9gh968yml2gqzrfhb" + "commit": "8609ec2101777362f45df493c593e0e125fe0824", + "sha256": "142v2yccbh5aiwy6xzxnz9656p9zj3j2vmmyy70x7vxn2jair3bl" } }, { @@ -60224,14 +60469,14 @@ "repo": "lassik/emacs-language-id", "unstable": { "version": [ - 20210207, - 1829 + 20210411, + 1332 ], "deps": [ "cl-lib" ], - "commit": "2c99ce29b86fc635649f4e89723912dc1cc4f36c", - "sha256": "12fzzdc4jns440gb71iydsicni646gciaxv50p0wrfk9mbppidck" + "commit": "30a5bc267af7de167d0a835ead828016e6e7e14c", + "sha256": "1wkppwh72zs8b4jqdxqpf3gikh11la03nkj8nna9bg7k8n0a4vaq" }, "stable": { "version": [ @@ -60759,8 +61004,8 @@ "repo": "leanprover/lean-mode", "unstable": { "version": [ - 20210305, - 1705 + 20210406, + 1038 ], "deps": [ "dash", @@ -60768,8 +61013,8 @@ "flycheck", "s" ], - "commit": "5c50338ac149ca5225fc737be291db1f63c45f1d", - "sha256": "13vrg0pp7ca0lh4j9cyg4pgfnbvf2kvbrgvvcmn1h7l9py2n8alj" + "commit": "5a2a36356e73c74a42e49fad19a71f4f12929a90", + "sha256": "18lswxxwvp85yzg1kc9vxn4dpmxmj40j6g64c8ns83nb7hw9lszg" } }, { @@ -60865,11 +61110,11 @@ "repo": "ledger/ledger-mode", "unstable": { "version": [ - 20210322, - 2306 + 20210329, + 2024 ], - "commit": "32fef097970e66b6cc75ee8233a7edaeee6431df", - "sha256": "1yv2lb3wpnck5ig8n4z7nwlksi6frnfjlh6fqslwqnxyz5n3xsr0" + "commit": "3b0fa5c22bd196dbe31a19f4b2ebbdf8f4081b20", + "sha256": "1igg1dmsn90crggm11xnlhrc36szr3dfc4463dn65cagwlck3g3k" }, "stable": { "version": [ @@ -61105,8 +61350,8 @@ 20201207, 2103 ], - "commit": "898c1426c29abbb1c86a715b1323669e30d4699e", - "sha256": "0ijd0p6k9c2va19wrp1kpj2x4bzyj3vh244ka8jdmsmwmqfmvb2z" + "commit": "a1154d65bf33ae34ea944b9e59d95b601fea7169", + "sha256": "0ibh09iz1m2m752rkk9dbyvmczrzv401gi4k18vlh67hz7vd5la0" }, "stable": { "version": [ @@ -61178,8 +61423,8 @@ 20201007, 2214 ], - "commit": "339021e29a50c71045736f322e961efbfc37bd99", - "sha256": "0416fcd1jnvhfj1bm3x60yi8n9cbxyyz11ri5k1g7b454pw54yb5" + "commit": "5677410abffa1d1bc66b867be8918f1423fd586b", + "sha256": "1lcyd7gh2d72vx47dh375d50qcf7xnx888xrx76yc5zfx2df4p80" }, "stable": { "version": [ @@ -61425,8 +61670,12 @@ 20210303, 1751 ], - "commit": "cadaa46a6eafa305e9b176f6decc649708e6fec9", - "sha256": "04imm0j7d8f7xcfbha8vhyf66hsq1sv0y3r1i582r91psrzhlai6" + "commit": "d029f4d1738dad616df1a56b570cdf1e725cd967", + "error": [ + "exited abnormally with code 1\n", + "", + "warning: unknown setting 'experimental-features'\nwarning: unable to download 'https://gitlab.com/ligolang/ligo/repository/archive.tar.gz?ref=d029f4d1738dad616df1a56b570cdf1e725cd967': HTTP error 503; retrying in 286 ms\nwarning: unable to download 'https://gitlab.com/ligolang/ligo/repository/archive.tar.gz?ref=d029f4d1738dad616df1a56b570cdf1e725cd967': HTTP error 503; retrying in 612 ms\nwarning: unable to download 'https://gitlab.com/ligolang/ligo/repository/archive.tar.gz?ref=d029f4d1738dad616df1a56b570cdf1e725cd967': HTTP error 503; retrying in 1232 ms\nwarning: unable to download 'https://gitlab.com/ligolang/ligo/repository/archive.tar.gz?ref=d029f4d1738dad616df1a56b570cdf1e725cd967': HTTP error 503; retrying in 2325 ms\nerror: unable to download 'https://gitlab.com/ligolang/ligo/repository/archive.tar.gz?ref=d029f4d1738dad616df1a56b570cdf1e725cd967': HTTP error 503\n" + ] }, "stable": { "version": [ @@ -61584,14 +61833,14 @@ "repo": "noctuid/link-hint.el", "unstable": { "version": [ - 20201127, - 2144 + 20210410, + 1506 ], "deps": [ "avy" ], - "commit": "09ba5727d8ba4a2e5d4f5ce924aaebbc7478ff13", - "sha256": "1qw9msvmmb2mzjw4frpnnhp63n5jcwgwxpbbpbaxwbm0pv33zjah" + "commit": "ae73db6a5948c8d109fc1d570760bcafa3f07175", + "sha256": "1rlbxlh9a0hnlaxpgfjvjjvmhnzwc84p9xiqi740xv82cd27wcnl" } }, { @@ -62209,11 +62458,11 @@ "repo": "donkirkby/live-py-plugin", "unstable": { "version": [ - 20210101, - 1827 + 20210411, + 244 ], - "commit": "d489fafd824d3fbd26fadb7b60dd2533d32478a9", - "sha256": "13m65xvh172rs7pc4yshz41289h93fz4isrpracy2zi409ji3h37" + "commit": "23b4308caddf02cc0312ebe4d971e3bfab22f3f8", + "sha256": "1zfqdbbknjdg73g1jdy758dln6hgi1rq6j0xpyasyasj169j1nxh" }, "stable": { "version": [ @@ -62841,8 +63090,8 @@ "repo": "emacs-lsp/lsp-dart", "unstable": { "version": [ - 20210313, - 1940 + 20210406, + 2012 ], "deps": [ "dap-mode", @@ -62853,8 +63102,8 @@ "lsp-treemacs", "pkg-info" ], - "commit": "f3b70ec0e6adf3a51e15f9a3effb182c2363493d", - "sha256": "0iyp844wnvxjrp860dgkr10qrfsaj2rcssj8dv93hhv8pg91fhsk" + "commit": "10e309acc31648ec9bf7ffeef0fc2ad16b2a8584", + "sha256": "1wm0lxllazfxrrv4cgalcnsf7g88g1cwz7b69dxfgirlcybcw9il" }, "stable": { "version": [ @@ -62883,15 +63132,15 @@ "repo": "emacs-lsp/lsp-docker", "unstable": { "version": [ - 20210217, - 1102 + 20210404, + 1717 ], "deps": [ "dash", "lsp-mode" ], - "commit": "a5b9ae58fc46b683bccd97d6722f9bd1663fd79a", - "sha256": "0gddfn5rxf7n4l9llziad95cmnn2zlyam7fwh1jbirrhwidg024q" + "commit": "5a9c7e39905756d6cd58b686f6aa203f31c2271c", + "sha256": "1v9nqr6xpq6hqpaw8k5gx3nvxk7yjmkwyprw2009ckgb84icl8hi" } }, { @@ -62934,19 +63183,18 @@ "repo": "emacs-grammarly/lsp-grammarly", "unstable": { "version": [ - 20210317, - 538 + 20210404, + 645 ], "deps": [ "grammarly", "ht", - "keytar", "lsp-mode", "request", "s" ], - "commit": "f5675c58ba80258331dda99072c5bfac524dbf48", - "sha256": "0ziv51c9fq4yv8ll7087cd2bwqkl309b1a0gds67d160pj9swwhh" + "commit": "aa2e70eec5755651ed6c9d9f4063542634760c91", + "sha256": "0qisz5117ifravbwvnaq2ci62v3sxl2dd1bd9giacscvshx2hw2c" }, "stable": { "version": [ @@ -63011,16 +63259,16 @@ "repo": "emacs-lsp/lsp-ivy", "unstable": { "version": [ - 20210320, - 913 + 20210407, + 856 ], "deps": [ "dash", "ivy", "lsp-mode" ], - "commit": "515e5977b3d1f6cb521984f084868f28efd47e72", - "sha256": "1m05c80bf7d7kkk58c91c2f3lyln0wh6mvxbyi856fh1clb5gv13" + "commit": "4dcb63533558a83de4a1b830835687e69474cd88", + "sha256": "0y2116lqalipgc841kz4gangnx9xmihg3x28gv8n6myslphc45ma" }, "stable": { "version": [ @@ -63137,15 +63385,15 @@ "repo": "non-Jedi/lsp-julia", "unstable": { "version": [ - 20210310, - 1116 + 20210329, + 1551 ], "deps": [ "julia-mode", "lsp-mode" ], - "commit": "c487ed715c49d863e8a8e76d13b37b6e694520d4", - "sha256": "0dqf34gq8rnskqj7m3vp8pxmzysg5bdchbyfhfz6h5yc0p52rvr4" + "commit": "81f7de5b9fe8e8e0e1e3a3ccc677f052edad140d", + "sha256": "1hwkx5ssix2si7jpsbfcg1i65v3z265l39158qjm31cxf8pk52dw" }, "stable": { "version": [ @@ -63199,8 +63447,8 @@ "repo": "emacs-lsp/lsp-metals", "unstable": { "version": [ - 20210217, - 1027 + 20210410, + 615 ], "deps": [ "dap-mode", @@ -63211,8 +63459,8 @@ "lsp-treemacs", "treemacs" ], - "commit": "51a89c1861eb505882c20393227f303ac33276e4", - "sha256": "1l4ic84qpcn2z54knzhw1mj61s699gpyg6a01vbq9mbpx1sxs9lf" + "commit": "a603e9ec3d5f926774a8facb045f33eaa6df9037", + "sha256": "1pxfvmkk64v0sd7ghwj3dmhf7bbfh8wk2apxvckdq76l1wrd8izs" }, "stable": { "version": [ @@ -63241,8 +63489,8 @@ "repo": "emacs-lsp/lsp-mode", "unstable": { "version": [ - 20210326, - 1728 + 20210410, + 1801 ], "deps": [ "dash", @@ -63252,8 +63500,8 @@ "markdown-mode", "spinner" ], - "commit": "7d72c9e79b17bb96477326bc97a9251bf64eb0fb", - "sha256": "0ngz46b1b4zilgbf90ghzcni7qz9qdwhmng4jpdqs3hv9a4n5c15" + "commit": "65fb3e8d071406c4596dcc13e3f0230e1f730ec6", + "sha256": "1cdhgmqzg9dj491jqwfnqjdjkl4ki3gkpfn386mb5hwfl5aiv5pf" }, "stable": { "version": [ @@ -63421,14 +63669,14 @@ "repo": "emacs-lsp/lsp-python-ms", "unstable": { "version": [ - 20210217, - 1823 + 20210405, + 1922 ], "deps": [ "lsp-mode" ], - "commit": "689f6cf815c8ee2ca2332f31dfda8ddefb0b7e26", - "sha256": "13vc2pwxl2cl2qa3gjkpa6si3760y7xyrlg1ygk3g1633w756h80" + "commit": "8d228b0f6dde3a4d1327650c17b21539ff4a08ee", + "sha256": "1kjif1vhm9fcxcyid14n9lw7mkq1yshf2ai1nk76bdnar45w9860" }, "stable": { "version": [ @@ -63485,14 +63733,14 @@ "repo": "emacs-lsp/lsp-sourcekit", "unstable": { "version": [ - 20181216, - 1450 + 20210404, + 1624 ], "deps": [ "lsp-mode" ], - "commit": "ff204ed820df8c3035ebdc4b5a583640d52caeeb", - "sha256": "1q9ml3r827am27fhs9vlrgsxnq43k3zjb3h5mi999da1nhqwcs49" + "commit": "aafa9878a3df2f08e5a9c846d91fd53350ce3c99", + "sha256": "1la4mfaykd6vi7d0nw45a2ia8zwr8xflqhc4a9rmdl8biyrp47kj" } }, { @@ -63503,14 +63751,14 @@ "repo": "merrickluo/lsp-tailwindcss", "unstable": { "version": [ - 20210315, - 624 + 20210330, + 323 ], "deps": [ "lsp-mode" ], - "commit": "d11cdc25be8e20400a1f9005f716648dd2ce4a3f", - "sha256": "1gls3c2ai2axnsl2dh4vy8l6hr1fyzv4hxi6yss5fw0xs8rqq7c5" + "commit": "5df10c36d3162982f5100b8c66af957dd05712cf", + "sha256": "0vl5gajg1w5qrzafvkqrbkb9dlja4ina2i3gs6pfv1jrn473h8p7" } }, { @@ -63521,8 +63769,8 @@ "repo": "emacs-lsp/lsp-treemacs", "unstable": { "version": [ - 20210216, - 1250 + 20210411, + 1507 ], "deps": [ "dash", @@ -63531,8 +63779,8 @@ "lsp-mode", "treemacs" ], - "commit": "3bae4a91e05d55d5ca92da272ffcd497f370e9df", - "sha256": "03dvf5vf74p3vjzv98csidw6hzpx2w7f20xmyy12cpiip76wanf0" + "commit": "4cfb46d7fe69cc537a8a86389c5d8d9fd3fbfabe", + "sha256": "0ca20xdmk0c5w3hpimly6pl355sjvzjaq3nwfaw3p6qr9sx1sy9w" }, "stable": { "version": [ @@ -63559,16 +63807,16 @@ "repo": "emacs-lsp/lsp-ui", "unstable": { "version": [ - 20210326, - 507 + 20210330, + 428 ], "deps": [ "dash", "lsp-mode", "markdown-mode" ], - "commit": "1dbea9ff206a626d5c2d735e3f8fcdac59827963", - "sha256": "175am5hycgxmd4329mnwgcjfpyycxyjip5wl96n297zxnb4m94wb" + "commit": "efae00eb6a733d5271cb33e9d92c3d8c2fa98dde", + "sha256": "01y5yl16kvhmwziza08q88l1dva76nzbm6ln0qymalfkxipjcxrn" }, "stable": { "version": [ @@ -64031,8 +64279,8 @@ "repo": "magit/magit", "unstable": { "version": [ - 20210326, - 329 + 20210411, + 2036 ], "deps": [ "dash", @@ -64040,8 +64288,8 @@ "transient", "with-editor" ], - "commit": "527842a3b0fd868bd0c193c430a6ad290dd62053", - "sha256": "0cxnvi2vkk5nrcd2iir34bv76rsakijsim1rgxxh03xjc7fqyvj3" + "commit": "5882df245d3388cd6f443bc11df219a838104df2", + "sha256": "08yisn699gg2mfapc1h1rfb90vm9p10vk1c9xzd4h30xa6c0299h" }, "stable": { "version": [ @@ -64215,10 +64463,10 @@ }, { "ename": "magit-gerrit", - "commit": "f7cc000debed666ad6800e31c114eedb7384317c", - "sha256": "1iwvg10ly6dlf8llz9f8d4qfdbvd3s28wf48qgn1wjlxpka6zrd4", + "commit": "13cb198a53accc698bcf6ac105c13006989faa83", + "sha256": "11l68phimyh1ny4h8bwi51zh8924h043g0l6dq746f60kdi801zc", "fetcher": "github", - "repo": "terranpro/magit-gerrit", + "repo": "emacsorphanage/magit-gerrit", "unstable": { "version": [ 20160226, @@ -64387,8 +64635,8 @@ "libgit", "magit" ], - "commit": "527842a3b0fd868bd0c193c430a6ad290dd62053", - "sha256": "0cxnvi2vkk5nrcd2iir34bv76rsakijsim1rgxxh03xjc7fqyvj3" + "commit": "5882df245d3388cd6f443bc11df219a838104df2", + "sha256": "08yisn699gg2mfapc1h1rfb90vm9p10vk1c9xzd4h30xa6c0299h" } }, { @@ -64542,8 +64790,8 @@ "deps": [ "dash" ], - "commit": "527842a3b0fd868bd0c193c430a6ad290dd62053", - "sha256": "0cxnvi2vkk5nrcd2iir34bv76rsakijsim1rgxxh03xjc7fqyvj3" + "commit": "5882df245d3388cd6f443bc11df219a838104df2", + "sha256": "08yisn699gg2mfapc1h1rfb90vm9p10vk1c9xzd4h30xa6c0299h" }, "stable": { "version": [ @@ -64828,8 +65076,8 @@ "repo": "p3r7/magrant", "unstable": { "version": [ - 20200917, - 857 + 20210328, + 956 ], "deps": [ "dash", @@ -64838,8 +65086,8 @@ "tablist", "transient" ], - "commit": "9e1ba1fb13af6e62a2f40ebbe049e81267292a0d", - "sha256": "1x354bmpdj1mhjk2rapczqv57x0vn12csc8x38yyb6w1rxqbdycz" + "commit": "afb563e66fc1639feda22845049492e09cf65327", + "sha256": "0k3fx44xdnvlqmszqs6aj6b436s1y7grpyx52k0rbgmxf5w2c05x" } }, { @@ -65332,11 +65580,11 @@ "repo": "minad/marginalia", "unstable": { "version": [ - 20210324, - 906 + 20210409, + 2305 ], - "commit": "5ce5a0e6d23d92391167a49d994f093764ee0dee", - "sha256": "009ki4m5i0lvh9ml2jz93j4sbjab51c4qazz1858mq888hldpwr9" + "commit": "668265af921285c726b2239dae32459bd1064d03", + "sha256": "1kl516mzcpdam787x5k55s0crspacvxnz2zqz5m32b13xl2pr847" }, "stable": { "version": [ @@ -65452,11 +65700,11 @@ "repo": "jrblevin/markdown-mode", "unstable": { "version": [ - 20210220, - 1301 + 20210405, + 1349 ], - "commit": "051734091aba17a54af96b81beebdbfc84c26459", - "sha256": "11qybgasg4im76j4kryynqvqbqpxm1xfs5dxgjhr3whn3wiqba51" + "commit": "ac9ea26b941eef512a3c206375a6404625c229ed", + "sha256": "0nszqrx6nfdzlib3w6l5pmzmgnrwzmvzlz7hv46x4iqzyxjg2jsn" }, "stable": { "version": [ @@ -65881,11 +66129,11 @@ "url": "https://git.code.sf.net/p/matlab-emacs/src", "unstable": { "version": [ - 20210302, - 1630 + 20210410, + 1340 ], - "commit": "a47515461ae22fcb90b6f8e45a6304bcb44b953c", - "sha256": "0wffq7hn5vmgvyysvhkgngcp77mq5fddia1q3n90rmb0ql2z2qg2" + "commit": "587ad073069e8c932388d6f4ab8e7689b52bc6ad", + "sha256": "1lnwax7m105h9djvbyhwcxg6av9i04myq02dxhb1gw64w6i3vas8" } }, { @@ -66402,31 +66650,31 @@ "repo": "DogLooksGood/meow", "unstable": { "version": [ - 20210326, - 1659 + 20210410, + 1837 ], "deps": [ "cl-lib", "dash", "s" ], - "commit": "28b9f855f175b390cb00c35a0e55cc50725a0938", - "sha256": "12j1l48ahipw1w10kqg54ikfclib8a178cg9q6k9sn2q4v9bx0j6" + "commit": "6eb10d223fb7e0d87ac7ab7063fdb3951934e94c", + "sha256": "0b1s51yfklm52j2g0gnrwdahr1jql1fv93sn7inm5c1ygx3agc7c" } }, { "ename": "merlin", - "commit": "9338298a79b7f2d654df90b0f553aeed1428de13", - "sha256": "0r4wc5ann6239bagj364yyzw4y3lcpkl5nnn0vmx4hgkwdg509fn", + "commit": "17598d9a0e9f88db28014019769f3181c863e99e", + "sha256": "05n6ack61impmnqn1gflkm0x085s98qlac4b4yg11r98cvsvcz04", "fetcher": "github", "repo": "ocaml/merlin", "unstable": { "version": [ - 20210129, - 1443 + 20210408, + 1014 ], - "commit": "cc17ed60630fb1831ad950fe62970b1c7a7f4c8b", - "sha256": "0mfvxg74h9mcs8pp9p3m498vflnpncvsa514qf36kajmbdbxn0sk" + "commit": "cb1094ee0aeb5bd2bf5530911157c61cb316e6f3", + "sha256": "1bvym9p120sdiwc4lr2f13bhfmxr14vr3scf3g90dj6swa9k9ww8" }, "stable": { "version": [ @@ -66437,6 +66685,44 @@ "sha256": "1lsrn6739736gr72c83hnxdynqmvjbs8pq3spb74v39k7xixmh99" } }, + { + "ename": "merlin-ac", + "commit": "17598d9a0e9f88db28014019769f3181c863e99e", + "sha256": "1karr74id6c5gcc7cga488czlgy53j4yhnb662zvv61r037li987", + "fetcher": "github", + "repo": "ocaml/merlin", + "unstable": { + "version": [ + 20210409, + 1323 + ], + "deps": [ + "auto-complete", + "merlin" + ], + "commit": "cb1094ee0aeb5bd2bf5530911157c61cb316e6f3", + "sha256": "1bvym9p120sdiwc4lr2f13bhfmxr14vr3scf3g90dj6swa9k9ww8" + } + }, + { + "ename": "merlin-company", + "commit": "17598d9a0e9f88db28014019769f3181c863e99e", + "sha256": "1gsq5ykkp1wbjh825jsd60wfb96m4idnzfg3wacr3y4x258idn7m", + "fetcher": "github", + "repo": "ocaml/merlin", + "unstable": { + "version": [ + 20210409, + 1323 + ], + "deps": [ + "company", + "merlin" + ], + "commit": "cb1094ee0aeb5bd2bf5530911157c61cb316e6f3", + "sha256": "1bvym9p120sdiwc4lr2f13bhfmxr14vr3scf3g90dj6swa9k9ww8" + } + }, { "ename": "merlin-eldoc", "commit": "35763febad20f29320d459394f810668db6c3353", @@ -66466,6 +66752,25 @@ "sha256": "11gggay8srycpckclqvcmad6ym3lx2sxgj670z89br91jdwmkr2f" } }, + { + "ename": "merlin-iedit", + "commit": "17598d9a0e9f88db28014019769f3181c863e99e", + "sha256": "0j6bz803ryfm5jnjrll5cschkb1qjdq9jv59g10pgiv1dxiwm0pv", + "fetcher": "github", + "repo": "ocaml/merlin", + "unstable": { + "version": [ + 20210409, + 1323 + ], + "deps": [ + "iedit", + "merlin" + ], + "commit": "cb1094ee0aeb5bd2bf5530911157c61cb316e6f3", + "sha256": "1bvym9p120sdiwc4lr2f13bhfmxr14vr3scf3g90dj6swa9k9ww8" + } + }, { "ename": "mermaid-mode", "commit": "8729575400003db47638b4c45c425608e15c333d", @@ -66474,14 +66779,14 @@ "repo": "abrochard/mermaid-mode", "unstable": { "version": [ - 20210327, - 7 + 20210329, + 2328 ], "deps": [ "f" ], - "commit": "b8847cc15eee1a7e3c7e0eefc91f2296256f84b9", - "sha256": "002bv1z8hr5h30dp9m8jq0h8lzi668lj2asx89jigfsrz4z6k4kg" + "commit": "b650649a9f28629154a041ef187c21c5128530f2", + "sha256": "0pffhrxw91p82gkyhf3bwcs910pjw8f7y94lsyqz5jzs469b0lcy" } }, { @@ -67334,11 +67639,15 @@ "repo": "jabranham/mixed-pitch", "unstable": { "version": [ - 20210203, - 2211 + 20210304, + 1900 ], - "commit": "d5f64b967d831ea776f07aa2c80cc5fa88a3e869", - "sha256": "0gs5pmpkfm4skycmq6agy1hdxjwzw6wvfdkvczdygzvn8hjq2inn" + "commit": "519e05f74825abf04b7d2e0e38ec040d013a125a", + "error": [ + "exited abnormally with code 1\n", + "", + "warning: unknown setting 'experimental-features'\nwarning: unable to download 'https://gitlab.com/jabranham/mixed-pitch/repository/archive.tar.gz?ref=519e05f74825abf04b7d2e0e38ec040d013a125a': HTTP error 503; retrying in 301 ms\nwarning: unable to download 'https://gitlab.com/jabranham/mixed-pitch/repository/archive.tar.gz?ref=519e05f74825abf04b7d2e0e38ec040d013a125a': HTTP error 503; retrying in 515 ms\nwarning: unable to download 'https://gitlab.com/jabranham/mixed-pitch/repository/archive.tar.gz?ref=519e05f74825abf04b7d2e0e38ec040d013a125a': HTTP error 503; retrying in 1011 ms\nwarning: unable to download 'https://gitlab.com/jabranham/mixed-pitch/repository/archive.tar.gz?ref=519e05f74825abf04b7d2e0e38ec040d013a125a': HTTP error 503; retrying in 2434 ms\nerror: unable to download 'https://gitlab.com/jabranham/mixed-pitch/repository/archive.tar.gz?ref=519e05f74825abf04b7d2e0e38ec040d013a125a': HTTP error 503\n" + ] }, "stable": { "version": [ @@ -67368,21 +67677,6 @@ "sha256": "1d08i2cfn1q446nyyji0hi9vlw7bzkpxhn6653jz2k77vd2y0wmk" } }, - { - "ename": "mlso-theme", - "commit": "2e026e2511ead77022cf8ed9d45d0d5a5aa104b9", - "sha256": "1abv6zhz28x5yk0rjn19wjxwvdq0ps3j2sx45n0dlbqfrqgw86d1", - "fetcher": "github", - "repo": "Mulling/mlso-theme", - "unstable": { - "version": [ - 20210215, - 1755 - ], - "commit": "177a269d1f16dc5902f08d56d12a084ea028c8ab", - "sha256": "000h78k729irpn31xykq1r6kdnrcfvv5m9cc8g9l1lfp6pjhmd9c" - } - }, { "ename": "mmm-jinja2", "commit": "721b9a6f16fb8efd4d339ac7953cc07d7a234b53", @@ -67728,11 +68022,11 @@ "repo": "ludwigpacifici/modern-cpp-font-lock", "unstable": { "version": [ - 20200530, - 1010 + 20210405, + 1155 ], - "commit": "865955d0035382a17a7f03add0d00d0bd812b103", - "sha256": "1x04jgc94gpdci24rahb1awvkjii1vdv7bdr9gyiksbry75dsxi1" + "commit": "43c6b68ff58fccdf9deef11674a172e4eaa8455c", + "sha256": "1wp90225g1pm8sr3hlknwr2q29iq90wds4n6vf1ls4cf2b71nnq2" }, "stable": { "version": [ @@ -67824,11 +68118,15 @@ "repo": "protesilaos/modus-themes", "unstable": { "version": [ - 20210326, - 1916 + 20210411, + 751 ], - "commit": "e07461ca01b04a6536961eb538769f9889813852", - "sha256": "18gwyy5an1k9pf9n6ccygs4k7nbrv6scp7wyvaabayzxqv50lhsn" + "commit": "3c9b98f61e9b781f756ac7a329005156406cae5a", + "error": [ + "exited abnormally with code 1\n", + "", + "warning: unknown setting 'experimental-features'\nwarning: unable to download 'https://gitlab.com/protesilaos/modus-themes/repository/archive.tar.gz?ref=3c9b98f61e9b781f756ac7a329005156406cae5a': HTTP error 503; retrying in 250 ms\nwarning: unable to download 'https://gitlab.com/protesilaos/modus-themes/repository/archive.tar.gz?ref=3c9b98f61e9b781f756ac7a329005156406cae5a': HTTP error 503; retrying in 595 ms\nwarning: unable to download 'https://gitlab.com/protesilaos/modus-themes/repository/archive.tar.gz?ref=3c9b98f61e9b781f756ac7a329005156406cae5a': HTTP error 503; retrying in 1101 ms\nwarning: unable to download 'https://gitlab.com/protesilaos/modus-themes/repository/archive.tar.gz?ref=3c9b98f61e9b781f756ac7a329005156406cae5a': HTTP error 503; retrying in 2792 ms\nerror: unable to download 'https://gitlab.com/protesilaos/modus-themes/repository/archive.tar.gz?ref=3c9b98f61e9b781f756ac7a329005156406cae5a': HTTP error 503\n" + ] }, "stable": { "version": [ @@ -67864,6 +68162,21 @@ "sha256": "14higsv6h0pka90gr25a3yxh95xn65l6qxb39mmdzkfdlnzsg664" } }, + { + "ename": "molar-mass", + "commit": "54b15912234932315ac5f7d1fe2cc5cf37c925bc", + "sha256": "1mhwcs9v2zl8x82axgcivgw4wp6z1gpxrj0f2m33pzwi6j3biybj", + "fetcher": "github", + "repo": "sergiruiztrepat/molar-mass", + "unstable": { + "version": [ + 20210324, + 1832 + ], + "commit": "5b7d1d0004d27580e980fe8532658cd09174342e", + "sha256": "18s2np5wflbg0y6ffnjcbljyh3b5qsnjkma6dcl3razfr55mzmgn" + } + }, { "ename": "molecule", "commit": "2e8e1a5169f0841db4980aebe97235845bbe7183", @@ -67953,8 +68266,8 @@ "deps": [ "scrollable-quick-peek" ], - "commit": "0e949d08198c0bd003f1d5c8cdceb7e36bef22f7", - "sha256": "0fgnfslhg10q96lyxfnpa7s8dvw5gjlll7p6qji2jfz3kncwhf5l" + "commit": "f64b1580f8516ddbf5f71688fb9ace2cd1631b41", + "sha256": "0ia90br12szcqxvsf5i7nj3y2rmmw1pq4hchi181sx5m4qrhssv1" }, "stable": { "version": [ @@ -68515,8 +68828,8 @@ 20210306, 1053 ], - "commit": "473a26ccd17304f6c64eaac8c61090659bcdb936", - "sha256": "114nimj1q9dn18in2bdzkswkxd3rm0xxzxiix4jv6hzhsm8rznw8" + "commit": "1ddec765e033d22079627dc14a06a204134e1b28", + "sha256": "0is1il0xws1k31p67s4xvpql7qm4rrv23fj2szdmfdds9f7qpp18" }, "stable": { "version": [ @@ -70460,14 +70773,14 @@ "repo": "nicehiro/netease-music", "unstable": { "version": [ - 20190708, - 215 + 20210411, + 603 ], "deps": [ "names" ], - "commit": "39a7d7a15f63435d9efaf469ea7c971069c07acb", - "sha256": "01wkd8ifsa5l6jh4xdmj40xfx0hyxv4c0a8s6z5ynmqvmbxvbw5n" + "commit": "db7f1eef2d8544983509db679be1cbe6a5678071", + "sha256": "13vylyywsp6h4w04g56af5fav8d11sbf90h78b6mv81vp850842p" }, "stable": { "version": [ @@ -70819,8 +71132,8 @@ 20181024, 1439 ], - "commit": "8cd25aa78c2ff2ca8b3712f8c3630d1a095856d9", - "sha256": "0qq1p2pjpnvhrblbsh80k43ksrzb1nw48gw8srw32vih91pv02x5" + "commit": "ce700488e01af33bc478bc986e261e306180b993", + "sha256": "0xraqmi9cx8z2wdwk2d8z9yr0b0csx7xwv012k531zqmhk81srpq" }, "stable": { "version": [ @@ -71524,8 +71837,8 @@ 20210205, 1412 ], - "commit": "4e209ca99ac8084a357c6fc8d7773f6207cfa16d", - "sha256": "07ygvb6skrz0vxvvswjf35qdgps2p8cfhmjxqprkj1x59k7dvwi6" + "commit": "1459217e17e94277495c5c644b5a4ca1651c9452", + "sha256": "1p1g816ansbq388pqclckcjs0cgl38p0gc77rrgmab3mccdvib2r" }, "stable": { "version": [ @@ -71801,6 +72114,25 @@ "sha256": "1l07nrlfd5qj8jnqacjba7mb6prapg8d8h3881l3kb66sn02ahgy" } }, + { + "ename": "nroam", + "commit": "55bc37011ae1754549b910be84fa25ca28a8e6fe", + "sha256": "0g6d4nhj08hr6b6aiy1mlszz1k90vk3bw4kgnwzxmlmv43qxbcx4", + "fetcher": "github", + "repo": "NicolasPetton/nroam", + "unstable": { + "version": [ + 20210325, + 2015 + ], + "deps": [ + "org", + "org-roam" + ], + "commit": "a5508d9958c2148c04ec32d7b3a9f72423e4b0aa", + "sha256": "1d1snvxbdv0mh48jmi6dx0yr4hmblcq1aajxb1z56714702ycdgj" + } + }, { "ename": "ns-auto-titlebar", "commit": "d22ebb5ef16df0c56d6031cb1c7f312dca514482", @@ -72001,8 +72333,8 @@ "dash", "s" ], - "commit": "a8bc2a58220e7eb92d61a637c2c6d8cb2ccb270b", - "sha256": "1c2nhg00naqj2m4avjsk03bpdbkspsjkng5fdhf6nx58ny9xdj5p" + "commit": "ddd7d54fc66ace3a56ff839ccd1993e2f40a7412", + "sha256": "0zbqnraynz25gj3ca1iqvn36xkgh8x24hzk3pm1c6ga395xpq0ki" }, "stable": { "version": [ @@ -73264,8 +73596,8 @@ 20201204, 945 ], - "commit": "448ac7c1496e2a6e83d63a7bcd9cf4e35bb2b1fb", - "sha256": "0rgh3c17h3k5bj897by7v64xbpf9pqpkg1kicka3w4g8gc0mb3v8" + "commit": "fd078c3a37cb679dfffe890995a4e6a1f63ece15", + "sha256": "0vq3nnjk76i947wjmfddbr1fs6m8dkddlrqcdsvsf2xw2xfpsfvs" }, "stable": { "version": [ @@ -73458,14 +73790,18 @@ "repo": "oer/oer-reveal", "unstable": { "version": [ - 20210223, - 1351 + 20210405, + 820 ], "deps": [ "org-re-reveal" ], - "commit": "e880c4f65ad20e22ab845fc2918ca74cc37bf39a", - "sha256": "197fn08xhk6cbvi4hqf51v40x0ki5n8h1896g3bpl4fasfy5zicp" + "commit": "1150feb761047e241af1c5e67333665e729a4a63", + "error": [ + "exited abnormally with code 1\n", + "", + "warning: unknown setting 'experimental-features'\nwarning: unable to download 'https://gitlab.com/oer/oer-reveal/repository/archive.tar.gz?ref=1150feb761047e241af1c5e67333665e729a4a63': HTTP error 503; retrying in 298 ms\nwarning: unable to download 'https://gitlab.com/oer/oer-reveal/repository/archive.tar.gz?ref=1150feb761047e241af1c5e67333665e729a4a63': HTTP error 503; retrying in 617 ms\nwarning: unable to download 'https://gitlab.com/oer/oer-reveal/repository/archive.tar.gz?ref=1150feb761047e241af1c5e67333665e729a4a63': HTTP error 503; retrying in 1257 ms\nwarning: unable to download 'https://gitlab.com/oer/oer-reveal/repository/archive.tar.gz?ref=1150feb761047e241af1c5e67333665e729a4a63': HTTP error 503; retrying in 2660 ms\nerror: unable to download 'https://gitlab.com/oer/oer-reveal/repository/archive.tar.gz?ref=1150feb761047e241af1c5e67333665e729a4a63': HTTP error 503\n" + ] }, "stable": { "version": [ @@ -74150,11 +74486,11 @@ "repo": "oantolin/orderless", "unstable": { "version": [ - 20210323, - 2341 + 20210407, + 1548 ], - "commit": "44935d8962be5724d8a3a4358ce0a4222450ee26", - "sha256": "1f76k6cp0m6r47s91za3sad09vrka41x9vwxh40bi9achwc3538q" + "commit": "87ab7e47e343285f7afd42779c78551332b8fd84", + "sha256": "117lwgw5z980pay656pmgyfqdpvi0cxj69x3c7dcmz451n57ap9j" }, "stable": { "version": [ @@ -74338,11 +74674,14 @@ "repo": "awth13/org-appear", "unstable": { "version": [ - 20210307, - 1335 + 20210401, + 2114 ], - "commit": "0b3b029d5851c77ee792727b280f062eaf2c22c7", - "sha256": "136z40r0i9q9wqbj4yxa8d4c2ygx7dzp9i126ra56sm6cdkvz0cj" + "deps": [ + "org" + ], + "commit": "2380562fbec8a17ec193891da755a502a2ccd252", + "sha256": "14b1x446zwdsqy8lvmz3iw1byaq1rn92v19ib5zyk18g9lf9ma7i" } }, { @@ -74527,8 +74866,8 @@ "repo": "lepisma/org-books", "unstable": { "version": [ - 20200905, - 740 + 20210408, + 1913 ], "deps": [ "dash", @@ -74538,8 +74877,8 @@ "org", "s" ], - "commit": "a88d39e364757594c6b3830cc36f342ee0d1b8ab", - "sha256": "1axzhb9k1i8l9rksk14bb04v4q4mx498f5psnalxwvn0563ngs5r" + "commit": "9f4ec4a981bfc5eebff993c3ad49a4bed26aebd1", + "sha256": "1sgckvpjdaig9r2clcvs6ckgf2kx7amikkpq26y30jbnfnbskf0v" }, "stable": { "version": [ @@ -75167,11 +75506,11 @@ "repo": "guanyilun/org-elp", "unstable": { "version": [ - 20210201, - 1544 + 20210329, + 1535 ], - "commit": "983fd7af4244835601be090211344ed92c36d360", - "sha256": "0v2cgw360sigl0jm8fm1hld71xbcjw9j8xjlr176cn4g308zw1sa" + "commit": "36b5ab2ed3fa3b5917f058e3acf8dff2df69efae", + "sha256": "00qbabnac6i994ilrq1b7li1211ikc0frm5ilfafmh9v0y9k2spa" }, "stable": { "version": [ @@ -75286,8 +75625,8 @@ "repo": "kidd/org-gcal.el", "unstable": { "version": [ - 20210313, - 420 + 20210407, + 57 ], "deps": [ "alert", @@ -75295,8 +75634,8 @@ "request", "request-deferred" ], - "commit": "d38acdad70883dc3fe34a4cd41024e5a8099ddb2", - "sha256": "17lnsn045l99w787mbrq623div40w3c59rgryvx04px085bb2i5g" + "commit": "161465b9448a6413466f1dfe77844f5591fbdeae", + "sha256": "0pwi537cg1yb76bwx2sn1w8vkjgsjq38f7lbqvd159g9rbng7v21" }, "stable": { "version": [ @@ -75579,16 +75918,16 @@ "repo": "ahungry/org-jira", "unstable": { "version": [ - 20210325, - 424 + 20210330, + 246 ], "deps": [ "cl-lib", "dash", "request" ], - "commit": "7beb2023c36106aefe1a260a7618e285d52eb0a1", - "sha256": "0srn5z0r3g8mjb8pibwipzjm5p3w8dwzldfdmlyli1a6akcinsxv" + "commit": "c8b2e592150c05ab53af8ee155ac169f58b963ee", + "sha256": "1rid2dl3r7p4c0sag9xcd74rj15pxapvrii286ilipkak6yhg2z2" }, "stable": { "version": [ @@ -75711,8 +76050,8 @@ "repo": "yangsheng6810/org-latex-impatient", "unstable": { "version": [ - 20210312, - 2250 + 20210409, + 2251 ], "deps": [ "dash", @@ -75720,8 +76059,8 @@ "posframe", "s" ], - "commit": "a27ec1491c7d897904e84d9b9db380e1a4c7914a", - "sha256": "0r0yn0z4d5y5mzc8awg8wcb3lvb058c7gk7v5mghnwln50zvqqia" + "commit": "39f22dc98cb8268af67c6df71778ec5784d2b683", + "sha256": "14rjgdl941kja3hndc55q3c65fi7plviirxihffkw498h0vkbyhs" } }, { @@ -75910,16 +76249,16 @@ "repo": "ndwarshuis/org-ml", "unstable": { "version": [ - 20210224, - 2308 + 20210328, + 1655 ], "deps": [ "dash", "org", "s" ], - "commit": "1b02583a5cdb8f6b7cd82b31ec80b53753cb7729", - "sha256": "1p1k5zmc0dklbvnck0zhsxqmndask822ikaa40d1ik105w1vx3bz" + "commit": "9d8c26d12c972a60b94bcc3b364d857db997cfa3", + "sha256": "102lrlf25i30xbpszr1mh6mkxd6wwgbwg32dafccxm4dmj3v9hqq" }, "stable": { "version": [ @@ -75962,11 +76301,11 @@ "repo": "unhammer/org-mru-clock", "unstable": { "version": [ - 20210216, - 1141 + 20210408, + 1259 ], - "commit": "99ac0c85060f9e4710de73db4a19120a0a23c39e", - "sha256": "1xqb9pcj6hw1z6anvy5hm78a90m442cg868d62yyynwkzjyns64q" + "commit": "229461b92ff89fd96cd7730df9fd589a8b0ef949", + "sha256": "1gl63m7h7zisjqljlckcqr0f16zkadfw9jr9h54kypm51alpjzkm" }, "stable": { "version": [ @@ -75986,14 +76325,14 @@ "repo": "jeremy-compostella/org-msg", "unstable": { "version": [ - 20210209, - 2056 + 20210409, + 1813 ], "deps": [ "htmlize" ], - "commit": "89e746c0a864031eef940758230bc7263a6f2289", - "sha256": "15gd5zbxvdallyra9lmpb9i1r2mmwz0j0i0ra7j9imnbfiz3ln9r" + "commit": "e57af9c057d97d14536cef08aca7a19bdf194830", + "sha256": "19m1y686jppl1j7ibigw1h6n518swgdcfgrk84r1nvd7x83vd8v0" } }, { @@ -76241,10 +76580,10 @@ }, { "ename": "org-page", - "commit": "97287dd40d3ebd80c9804589e93626faad88fb91", - "sha256": "0680fbcq0vv1w4kyk99crrcx5rhm8qpz7bgaab2gxndw1za7nxfm", + "commit": "80c4f9e9f3e398dd6d230068ae2a42b060bd84cd", + "sha256": "0pf7rjdaiz9y1kr8sc3bb2bz3bzmd4msziya5h4cfkmzx6pq8a3n", "fetcher": "github", - "repo": "sillykelvin/org-page", + "repo": "emacsorphanage/org-page", "unstable": { "version": [ 20170807, @@ -76260,8 +76599,8 @@ "org", "simple-httpd" ], - "commit": "d0e55416174a60d3305e97ca193b333f4cccba4f", - "sha256": "0l1jkap8wjprsaglys5hy5ijhaxfv8bzry9axqcfg6xr0bmbyhm7" + "commit": "b25c3ef41da233306c157634c1f0b019d8b6adc0", + "sha256": "06hh1g3rxadscjjn1ym358m2c8qn3s2x7ik0msadvm1zgx7ng4v5" }, "stable": { "version": [ @@ -76683,15 +77022,19 @@ "repo": "oer/org-re-reveal", "unstable": { "version": [ - 20210121, - 1011 + 20210405, + 1309 ], "deps": [ "htmlize", "org" ], - "commit": "18a2456befcfda5f681b2b4041f3262f93e52cba", - "sha256": "1274zq6qhzl8l7hpbh2spgmf9hqrilcm31m3mbybj6gm085g17dz" + "commit": "4d8a63cba537705f4ecf3f45838e3cfc83fa2369", + "error": [ + "exited abnormally with code 1\n", + "", + "warning: unknown setting 'experimental-features'\nwarning: unable to download 'https://gitlab.com/oer/org-re-reveal/repository/archive.tar.gz?ref=4d8a63cba537705f4ecf3f45838e3cfc83fa2369': HTTP error 503; retrying in 327 ms\nwarning: unable to download 'https://gitlab.com/oer/org-re-reveal/repository/archive.tar.gz?ref=4d8a63cba537705f4ecf3f45838e3cfc83fa2369': HTTP error 503; retrying in 591 ms\nwarning: unable to download 'https://gitlab.com/oer/org-re-reveal/repository/archive.tar.gz?ref=4d8a63cba537705f4ecf3f45838e3cfc83fa2369': HTTP error 503; retrying in 1200 ms\nwarning: unable to download 'https://gitlab.com/oer/org-re-reveal/repository/archive.tar.gz?ref=4d8a63cba537705f4ecf3f45838e3cfc83fa2369': HTTP error 503; retrying in 2118 ms\nerror: unable to download 'https://gitlab.com/oer/org-re-reveal/repository/archive.tar.gz?ref=4d8a63cba537705f4ecf3f45838e3cfc83fa2369': HTTP error 503\n" + ] }, "stable": { "version": [ @@ -76788,8 +77131,8 @@ "deps": [ "org" ], - "commit": "ae20a538b2b4dcec139089bb44f1e4abc5b04f72", - "sha256": "1x0gpq7n8crn48nfj2hmbfxd4yj5implgh5mvfnr0k1d89r6gwcn" + "commit": "4f25a5be2eaaedb84c78abf9457b9745a9396bcb", + "sha256": "1nrzm07jmbh52brsb2nmpaw5mpr6bqy3g4xhksrx1gwyyjj321f1" } }, { @@ -76958,8 +77301,8 @@ "repo": "org-roam/org-roam", "unstable": { "version": [ - 20210308, - 457 + 20210411, + 650 ], "deps": [ "dash", @@ -76969,8 +77312,8 @@ "org", "s" ], - "commit": "8ad57b121831eda8d226faa14ff2ba7ab652849c", - "sha256": "162qhb6rkpl1n0l8yhnwgagsx56ykaj9lchsny1id5z1257kgw9w" + "commit": "997ddcbf4b0373bb449d09f1db6cf5de6983de5e", + "sha256": "0dh325syjn1dkblydbdxqqy24pbyk4h3rcmr8506lycyz1xg2m2k" }, "stable": { "version": [ @@ -76998,16 +77341,16 @@ "repo": "org-roam/org-roam-bibtex", "unstable": { "version": [ - 20210322, - 2231 + 20210330, + 852 ], "deps": [ "bibtex-completion", "org-ref", "org-roam" ], - "commit": "ffe0cdbcfd7421c10268fb3437fc5bd6ceadcbd2", - "sha256": "1a9k9nxcqzyfip06m59la1rq8siswhg9zys3y6i3iz5wfy5vd0lk" + "commit": "8d80bf980776df6ead53e917eb482ec8e309a1d7", + "sha256": "1rricy4kxny78cvryrfxcjb656ryq3rgx4na5d5kks8xhdjsckwf" }, "stable": { "version": [ @@ -77280,8 +77623,8 @@ "repo": "ndwarshuis/org-sql", "unstable": { "version": [ - 20210306, - 329 + 20210404, + 1839 ], "deps": [ "dash", @@ -77289,8 +77632,8 @@ "org-ml", "s" ], - "commit": "c93834332a333f6a602d3bbe0b39c79abb2f78cb", - "sha256": "1wp3d3b1wdw8v5drwbrfxrbq8psf82bs9cwjin2psfgb4n1166dy" + "commit": "71b6e01ff94be4c68cfeb17a34518bf1f118cf95", + "sha256": "05c1hgzq69lnw59x1w5bybrdhnyli8d9pzjczixklrrahmx4ig8k" }, "stable": { "version": [ @@ -77379,11 +77722,11 @@ "repo": "bastibe/org-static-blog", "unstable": { "version": [ - 20210321, - 2008 + 20210329, + 848 ], - "commit": "e0265c97dd9d014760eb6280be6c8bb81793cdf5", - "sha256": "0g0mwgc5mrwchqj679b8jzxn2j4pfnysyp3xlpx41gk24hakpfqh" + "commit": "c000cdff0cf3c10ac756bd7c5b5729965cfce876", + "sha256": "0vff4wh9vlkzix47kxqxabcl29glnxbmmpmppkp6cfk42zb6sw1g" }, "stable": { "version": [ @@ -77946,17 +78289,16 @@ "unstable": { "version": [ 20210314, - 1856 + 1901 ], "deps": [ "dash", - "dash-functional", "deferred", "request-deferred", "s" ], - "commit": "0435d77cd32cf475ce71b81cda4bb48066c44f31", - "sha256": "1nnii5d5qf0bgfpywmhzprh6f1hk39k2wnhnjl0ahqm99bl46fps" + "commit": "9c1c94dff1a46631669023286078b887d077c305", + "sha256": "0s3amkc193b3csffa6gqi6kyr7x6fmc3sviirqwnygjfl42788ck" }, "stable": { "version": [ @@ -78075,16 +78417,16 @@ "repo": "akhramov/org-wild-notifier.el", "unstable": { "version": [ - 20210308, - 1348 + 20210330, + 304 ], "deps": [ "alert", "async", "dash" ], - "commit": "b616924f9b6e2c26c21e07ad6bccfc26826b7be3", - "sha256": "0ps3kzi95ybr7adrspmhflw9jw3h5d6lf0kl5cn45myyyjapckjj" + "commit": "772806f9d46fb93cabe9409c7a559eb7b9cda3d3", + "sha256": "0cp7gr0b83s830q1fzd4gwwz4x1n5cyh4r4v73w2cfml3kqf8nz1" }, "stable": { "version": [ @@ -79218,14 +79560,14 @@ "repo": "anticomputer/ovpn-mode", "unstable": { "version": [ - 20200509, - 236 + 20210403, + 440 ], "deps": [ "cl-lib" ], - "commit": "3fb9b09506f06cfc7678a93b5401f49d2bf538bc", - "sha256": "099pa85v3jqrfk3frkj03xbxcli8gfimaz17dn3a8p6wjcrn3w6v" + "commit": "4492098c771d094dd0661a5bc6906f65fb530825", + "sha256": "1dqy50mvnffhsmfnrkf6n4xic7699dhx4ky2chmcsr6yly3gvwj1" } }, { @@ -79481,14 +79823,14 @@ "repo": "kaushalmodi/ox-hugo", "unstable": { "version": [ - 20210129, - 2241 + 20210330, + 1758 ], "deps": [ "org" ], - "commit": "02140a294a8d0d15ca42a1956af794fd7ec18140", - "sha256": "1sjfiypk3707jh4r4ndym8chiahw0imlawkx7hsrv2ld65hc78lp" + "commit": "7a93b0f4b3e8e240d9451f1fa5704acfc494e9aa", + "sha256": "0dvhc559r9jhc8d91mv5an3vfklrfyfrpr32dqvphgk1i85kqvw4" }, "stable": { "version": [ @@ -79841,14 +80183,14 @@ "repo": "yjwen/org-reveal", "unstable": { "version": [ - 20210215, - 1605 + 20210411, + 1138 ], "deps": [ "org" ], - "commit": "499c5777174dbc7318e3f32fd50357c2823b228a", - "sha256": "1sf7ksda0898lgig1qhdzqm9v2jgrr033ainpb9406ij1v63gsh7" + "commit": "58540c7dde7dbf4e922209d7fb3e6739570f49b5", + "sha256": "10v9bs5jksrliisb3yf37hm2dk3iqjf12yfpf6a26zjvxsaxah4n" } }, { @@ -79914,14 +80256,14 @@ "repo": "balddotcat/ox-slimhtml", "unstable": { "version": [ - 20200302, - 728 + 20210330, + 1941 ], "deps": [ "cl-lib" ], - "commit": "6f774398d189430593c93e503bf0f3cd0e8bcc25", - "sha256": "12axvwqadv0qlvnzrvbi85p94c10r5w6f3gixck0cbz7p8qz678r" + "commit": "72cffc4292c82d5f3a24717ed386a953862485d8", + "sha256": "0p22dmyrcny82k0r1w84kcwi513xy03h848knzhm9zj7360dlkiw" }, "stable": { "version": [ @@ -81018,8 +81360,8 @@ 20210325, 1714 ], - "commit": "f130fa04ec75131686872f24a253d0a1d5522fa4", - "sha256": "1i85c00cjvj79i104xswg5xjz7wkvcgar04fgjc9zphrihnp409x" + "commit": "a92e39e86ec24fbc536c68765b4af6f4c6ff24c5", + "sha256": "1l4xvyx4r7ld7d8k18x4khagiivp5a7m647zv7fvg7ivhkq2crqd" }, "stable": { "version": [ @@ -81302,11 +81644,11 @@ "repo": "vandrlexay/emacs-password-genarator", "unstable": { "version": [ - 20210224, - 1705 + 20210327, + 1140 ], - "commit": "778f98d507d337f916bb3251fae6e351ebe50aa2", - "sha256": "07k2jsjfl3cyk0piikvn03280hbmggvkwkfin8s1wz54495504g5" + "commit": "de391a83e6a11f810f0141b7b4758dd978478234", + "sha256": "10yh56jlvnn01swb4pfq2gqpj2shxfp716fzij8c2c0hi52rgnbz" } }, { @@ -82264,14 +82606,14 @@ "repo": "nex3/perspective-el", "unstable": { "version": [ - 20210310, - 25 + 20210401, + 1950 ], "deps": [ "cl-lib" ], - "commit": "cbdc3e5dc77ccb681f8719db0a85af8850b757d2", - "sha256": "0q5sxwf0dkm1glnwsgm8387vzfxjj14g48ih72dpvarxysrrv2ql" + "commit": "dd2a380ac71edf1321a6462f14668baf99879e80", + "sha256": "0l9i7ky25d9ii04w2brgxc8dk2rky50naba8lbfqi7hcc34z8pp6" }, "stable": { "version": [ @@ -83671,11 +84013,11 @@ "repo": "thomasluquet/playerctl.el", "unstable": { "version": [ - 20210221, - 1956 + 20210411, + 1442 ], - "commit": "f480cd30bad76e4bc337e4be0cac6300e8154fce", - "sha256": "0f2f9dpi1yxckicybmdp7ns8x1hqhdygcvw8b7z0mhbwwxc7ml6m" + "commit": "41564d453c9f936a4ce2699afacc6d1dff974f1c", + "sha256": "0fbnfxhfyam5zvf2ild5bxq489dnpyrzclnfwq0lhzgswjj70hw6" } }, { @@ -84536,8 +84878,8 @@ 20200606, 1106 ], - "commit": "b3871e946d278a256d95a3bd4615b1df234ad75a", - "sha256": "08xn2my8n5m9mqr7zd1956vybakys17kldb6dijax1651fdjy772" + "commit": "9f4fa7971634f560e83d44b30aefc4d76d261943", + "sha256": "1dp3688kj89r2ywv4zwrji2qv1b0y1cj3dwhzxx1ihb9vx0bjwjn" }, "stable": { "version": [ @@ -84822,16 +85164,16 @@ "repo": "ancane/popup-imenu", "unstable": { "version": [ - 20170326, - 1040 + 20210404, + 1153 ], "deps": [ "dash", "flx-ido", "popup" ], - "commit": "c5e2e69adbd3a630e4cb750965a1aee8c10c1f09", - "sha256": "0vn0jli0ya7xnapifkgzynbnh3rpnzb82j5k9bla2j4miqfc6cg8" + "commit": "b00c4d503cbbaf01c136b1647329e6a6257d012c", + "sha256": "0q081lw6zqzpbmscpk1yzyfpalr9ld5qwh962dwwy04rc5f0aq3s" }, "stable": { "version": [ @@ -84874,15 +85216,16 @@ "repo": "kostafey/popup-switcher", "unstable": { "version": [ - 20201216, - 2229 + 20210402, + 1208 ], "deps": [ "cl-lib", + "dash", "popup" ], - "commit": "166a90c13310b829bd392235bf7cc1e45188faff", - "sha256": "1sgsryc5g2sxsr0mz8r8gs5i4kfh2mnxqs0vpkbmlsbcl40inm0k" + "commit": "94e01b9ea7970e86ed0f2fbeaa8cd320b60ae821", + "sha256": "14a43iv6sr52dh1qqcz58qinx20dxkrfznb7lvh35bihjj819m51" } }, { @@ -84994,11 +85337,11 @@ "repo": "tumashu/posframe", "unstable": { "version": [ - 20210311, - 937 + 20210410, + 528 ], - "commit": "fff21ccb706b576f4074883f9fa87d2bcc534096", - "sha256": "1r9i3jsdvzvbr8kggfradvk65i1d0wq96shs4dhfsr3pw7phaxv3" + "commit": "ae3c4ddfce698f4e24a0fcab938267e41e74da90", + "sha256": "1agzfliz6vk9zwvl0gm074xwzlywqrhkva9nz3d3581cjfanxqd1" }, "stable": { "version": [ @@ -85277,11 +85620,11 @@ "repo": "raxod502/prescient.el", "unstable": { "version": [ - 20210227, - 600 + 20210411, + 2007 ], - "commit": "8573df977eaceffc6607b7242ff8c0dab02aad65", - "sha256": "0kfbcicflg7dj9nzvvkgrxsb6p03a7cq26jfk7h6hsnrajy5y4sc" + "commit": "ed2b762241bbea03e374dc9dcd4fbe207c6b2ea4", + "sha256": "03c0dmblixh5mx8365b6608l7z3vcgp6pzdflwqf8nfwj2c5rm0w" }, "stable": { "version": [ @@ -85910,14 +86253,14 @@ "repo": "bbatsov/projectile", "unstable": { "version": [ - 20210309, - 722 + 20210407, + 707 ], "deps": [ "pkg-info" ], - "commit": "1528ed4f082e7aaca19f22394eb4bed879645b7c", - "sha256": "04x9gjjw1c4fiy631fkvwdp677s1p0yj1s4d5bw68832i1i5fq8y" + "commit": "513228f473910128efcad13f46dfc22a74976675", + "sha256": "19yblhr88affwmlrfmf3bi7wypf2abgy56xfxgisvwx5d5xi6v25" }, "stable": { "version": [ @@ -86321,11 +86664,11 @@ "repo": "ProofGeneral/PG", "unstable": { "version": [ - 20210321, - 2132 + 20210408, + 1454 ], - "commit": "f0f0476d07401aba2cf428a71f7ee960cd1b3154", - "sha256": "1h6bwk1l3fm34xx8nbwh2s3g8ab5zbnx1givgaf64hf3z7r44xic" + "commit": "d0acb626eba17023c55b002921870d60e48527a5", + "sha256": "0yn66lxx906nry53dr7msjfha2i85yiq2zw8g25d7y1f3mhjsjpz" }, "stable": { "version": [ @@ -86428,8 +86771,8 @@ 20200619, 1742 ], - "commit": "aedb8d726c8d2a371d999354d44ca7e1bdbb1e73", - "sha256": "1qw9mmkxrv78062zw8bvrhp4nc4mhz8j76j534flvdy5w5cwv38q" + "commit": "ee04809540c098718121e092107fbc0abc231725", + "sha256": "053j9j2axr2x7837xcvfgmdl3ddbw2px3fzflbna52fnk9bh2wkc" }, "stable": { "version": [ @@ -86862,8 +87205,8 @@ "deps": [ "pkg-info" ], - "commit": "ab25cf379236f4e1bd4bc9c1d77a93c95800e9bf", - "sha256": "0djrq3wl7crpjd2p1zzzz1spqfdrfzf7991g5fi8zwbf3pi79gpd" + "commit": "71bcd383f20a457e8ad34e0e08ec47f8e1b64263", + "sha256": "1zgz1gs42ak29q7p3020ah9sm7bgfsagszia80bgiw1lc7wg77ni" }, "stable": { "version": [ @@ -87433,11 +87776,11 @@ "repo": "PyCQA/pylint", "unstable": { "version": [ - 20200503, - 1624 + 20210411, + 1931 ], - "commit": "5d5f65727829240ffcb84b7be8c5d1e4dcefa0ed", - "sha256": "1j4a7fwbsyjsz0lh7vrw2kyw8khqbaskzqnx03a91br8q3dv0xba" + "commit": "38d15c98316359c7b0b190f2245a3b2e2bf62109", + "sha256": "1iipx981kz25iznb2p90a3cag71abw6np96r0mf99g44z8ghaapd" } }, { @@ -87678,11 +88021,15 @@ "repo": "python-mode-devs/python-mode", "unstable": { "version": [ - 20210301, - 812 + 20210408, + 800 ], - "commit": "fe7656a7c701eb988c2ec9192f1ce298818b5a92", - "sha256": "1ds4avwadwv20r8ihallyhg79r8cshgxnb2dv7kj0dgn9401djqj" + "commit": "710ffadeb43136d400de0a4c9e4a94c8b7ff36f0", + "error": [ + "exited abnormally with code 1\n", + "", + "warning: unknown setting 'experimental-features'\nwarning: unable to download 'https://gitlab.com/python-mode-devs/python-mode/repository/archive.tar.gz?ref=710ffadeb43136d400de0a4c9e4a94c8b7ff36f0': HTTP error 503; retrying in 326 ms\nwarning: unable to download 'https://gitlab.com/python-mode-devs/python-mode/repository/archive.tar.gz?ref=710ffadeb43136d400de0a4c9e4a94c8b7ff36f0': HTTP error 503; retrying in 558 ms\nwarning: unable to download 'https://gitlab.com/python-mode-devs/python-mode/repository/archive.tar.gz?ref=710ffadeb43136d400de0a4c9e4a94c8b7ff36f0': HTTP error 503; retrying in 1272 ms\nwarning: unable to download 'https://gitlab.com/python-mode-devs/python-mode/repository/archive.tar.gz?ref=710ffadeb43136d400de0a4c9e4a94c8b7ff36f0': HTTP error 503; retrying in 2702 ms\nerror: unable to download 'https://gitlab.com/python-mode-devs/python-mode/repository/archive.tar.gz?ref=710ffadeb43136d400de0a4c9e4a94c8b7ff36f0': HTTP error 503\n" + ] }, "stable": { "version": [ @@ -87994,11 +88341,11 @@ "repo": "quelpa/quelpa", "unstable": { "version": [ - 20210317, - 1221 + 20210329, + 639 ], - "commit": "ec61039dfd50967ca545cb955bf1dd349682dcf3", - "sha256": "0hlcckp9vc5rpxp7w30l25ncz7wxywx5jkr12836zcz2mzc8jbhp" + "commit": "9acc440f8c200b1e6134f53e219d84360ee1b6b7", + "sha256": "1qk7x9fdcvr84hhrmpvx4lq798n9xlw2fi7zpqgfp1mci9qks0z1" }, "stable": { "version": [ @@ -88160,11 +88507,11 @@ "repo": "emacsorphanage/quickrun", "unstable": { "version": [ - 20210327, - 141 + 20210330, + 654 ], - "commit": "57db985c6d293747dc8c40c4e08b465e148613a8", - "sha256": "02fzzfq5z4qabas75ihfbvz9pkz9ya2rblrzck8wk0fswzdq32nw" + "commit": "35e91f4b6cfbb8dd2adea4d8cf53ae76db7d00d9", + "sha256": "15xlcnimaaqgchjcs5jv8g3l36fga7zp11fj901x9nziwwis4jx1" }, "stable": { "version": [ @@ -88322,15 +88669,15 @@ "repo": "greghendershott/racket-mode", "unstable": { "version": [ - 20210326, - 1308 + 20210328, + 2038 ], "deps": [ "faceup", "pos-tip" ], - "commit": "5115c4786075b39525008755a5fb843c397ca743", - "sha256": "0am68bv4wg1lw20k9y83529zkg5d7ql8q9ibgpw1qlx2ll4zxgla" + "commit": "045a871d61e930c2eea8647822df39b8319018e1", + "sha256": "0lpy4nmn21jzmf54avkl9yr8j6w62aqmi5yhmssfhq3x0l5srsjq" } }, { @@ -89001,16 +89348,16 @@ "repo": "realgud/realgud", "unstable": { "version": [ - 20201221, - 1435 + 20210411, + 1241 ], "deps": [ "load-relative", "loc-changes", "test-simple" ], - "commit": "f73c039a340579a98e6716c901fd4e80e7eaa2eb", - "sha256": "0v6dysd9rzhb8aw3ws3wayprrx9ll59g3isib7ni2fl6krmvyjlx" + "commit": "a854b8d4344e4606e77c7e73cc414991e53253d5", + "sha256": "0f5av8ldmh54cmqzniifl853mz9mdg6wn3i0wbm7v1m6d79nli88" }, "stable": { "version": [ @@ -89460,11 +89807,15 @@ "repo": "ideasman42/emacs-recomplete", "unstable": { "version": [ - 20201202, - 126 + 20210404, + 716 ], - "commit": "f831f61797e03a0a1df8d99637a8738ba84d7cdd", - "sha256": "0lfpqzbrxs261cpb1hpmszcck13zkmqs67qf736cg2zx9ypfhx1g" + "commit": "802c85b02d99bce4cf540ed4b716eaa39df45c4a", + "error": [ + "exited abnormally with code 1\n", + "", + "warning: unknown setting 'experimental-features'\nwarning: unable to download 'https://gitlab.com/ideasman42/emacs-recomplete/repository/archive.tar.gz?ref=802c85b02d99bce4cf540ed4b716eaa39df45c4a': HTTP error 503; retrying in 301 ms\nwarning: unable to download 'https://gitlab.com/ideasman42/emacs-recomplete/repository/archive.tar.gz?ref=802c85b02d99bce4cf540ed4b716eaa39df45c4a': HTTP error 503; retrying in 505 ms\nwarning: unable to download 'https://gitlab.com/ideasman42/emacs-recomplete/repository/archive.tar.gz?ref=802c85b02d99bce4cf540ed4b716eaa39df45c4a': HTTP error 503; retrying in 1324 ms\nwarning: unable to download 'https://gitlab.com/ideasman42/emacs-recomplete/repository/archive.tar.gz?ref=802c85b02d99bce4cf540ed4b716eaa39df45c4a': HTTP error 503; retrying in 2228 ms\nerror: unable to download 'https://gitlab.com/ideasman42/emacs-recomplete/repository/archive.tar.gz?ref=802c85b02d99bce4cf540ed4b716eaa39df45c4a': HTTP error 503\n" + ] } }, { @@ -90254,11 +90605,11 @@ "repo": "tkf/emacs-request", "unstable": { "version": [ - 20210214, - 37 + 20210410, + 2218 ], - "commit": "accd430ee706f5b10fb20003b06bd8209bcdaa82", - "sha256": "0ffbc6x340whbrcfi5n0k81134x6knfc9g7z299fn47b2ihgd6jc" + "commit": "f3a5b4352e9f444ace2a332939abff504b573887", + "sha256": "0jdha6qjc1ngprmi4nqj8d8hs1dsjkpa39rk85z2132yhaca6lga" }, "stable": { "version": [ @@ -90285,8 +90636,8 @@ "deferred", "request" ], - "commit": "accd430ee706f5b10fb20003b06bd8209bcdaa82", - "sha256": "0ffbc6x340whbrcfi5n0k81134x6knfc9g7z299fn47b2ihgd6jc" + "commit": "f3a5b4352e9f444ace2a332939abff504b573887", + "sha256": "0jdha6qjc1ngprmi4nqj8d8hs1dsjkpa39rk85z2132yhaca6lga" }, "stable": { "version": [ @@ -90839,6 +91190,21 @@ "sha256": "0p044wg9d4i6f5x7bdshmisgwvw424y16lixac93q6v5bh3xmab5" } }, + { + "ename": "rii", + "commit": "8a2928c7a773cae7ebb5a9a55d7521bf15232feb", + "sha256": "19vv8m9shyhvrgz5gxh6jy7sjb1k5l74l2j9x59hanzy48zrrr94", + "fetcher": "github", + "repo": "ROCKTAKEY/rii", + "unstable": { + "version": [ + 20210317, + 1330 + ], + "commit": "d0cc3599129db735c23abe74d0876286a2fd6b6a", + "sha256": "1g0na5zjsy4600jzi5zr752nggndbwkr6ihxcmq1w82w0b3600rv" + } + }, { "ename": "rime", "commit": "0144879cf0dfe4f0447c5da7cd061f7aac91d4fe", @@ -91062,14 +91428,14 @@ "repo": "dgutov/robe", "unstable": { "version": [ - 20210202, - 111 + 20210328, + 1228 ], "deps": [ "inf-ruby" ], - "commit": "126650a06224f1a616b10c02bd9ad8a763a512ef", - "sha256": "11yhl9dpf7ni4l9qpr8akpzr2y6j99n3w5hx4yp8v9gppgb1q37w" + "commit": "0bc2645d140f65215a42f2b9365f1983cc949c6c", + "sha256": "0ff8zminjpgyi2lp2pmjh7cc7bgb15hii2r89zmy5xkq47slr2j4" }, "stable": { "version": [ @@ -91309,11 +91675,11 @@ "repo": "Andersbakken/rtags", "unstable": { "version": [ - 20201218, - 1821 + 20210313, + 1541 ], - "commit": "aa4c827b417f5448c12401c33acdab1325917c13", - "sha256": "02jqcbrpxm4sv15l8kyvsw9pwkmamj065cgifj68x242fw2f0sam" + "commit": "63f18acb21e664fd92fbc19465f0b5df085b5e93", + "sha256": "0wzyn9qzyly71yfwhlk5m94ygjnbk459pgbpgkhp9fqgchx12p1r" }, "stable": { "version": [ @@ -91338,8 +91704,8 @@ "deps": [ "rtags" ], - "commit": "aa4c827b417f5448c12401c33acdab1325917c13", - "sha256": "02jqcbrpxm4sv15l8kyvsw9pwkmamj065cgifj68x242fw2f0sam" + "commit": "63f18acb21e664fd92fbc19465f0b5df085b5e93", + "sha256": "0wzyn9qzyly71yfwhlk5m94ygjnbk459pgbpgkhp9fqgchx12p1r" }, "stable": { "version": [ @@ -91872,8 +92238,8 @@ "repo": "brotzeit/rustic", "unstable": { "version": [ - 20210315, - 1728 + 20210328, + 1426 ], "deps": [ "dash", @@ -91886,8 +92252,8 @@ "spinner", "xterm-color" ], - "commit": "d97ec8623c4c7e7ad3bb32e3d3773ba29a34bb0d", - "sha256": "1mimrn4aaplmdrwmgp6wax489vp0njd7j95abdnjf0ggc7qbgzcv" + "commit": "07d4d9af2c169d6cce6e2117628dfa3192937fb0", + "sha256": "1hv059nac1czpv367bs42qqw8lf6phpbzbiyk90n6mq996cinwrq" } }, { @@ -91940,8 +92306,8 @@ 20180406, 808 ], - "commit": "43ba8b563bee3426cead0e6d4ddc09398e1a349d", - "sha256": "0bqdlcg5pah9a50dww8n5n0lzc8bzmpc230fdkinw8zrxph13p12" + "commit": "3a5166c81ac9e50eaccf5490c5c632f93452287e", + "sha256": "131z1g43xh6z20069s6lccm08srwhwgpbiwb7fp2h29pxp41g30z" }, "stable": { "version": [ @@ -92330,11 +92696,11 @@ "repo": "hvesalai/emacs-sbt-mode", "unstable": { "version": [ - 20210306, - 1603 + 20210409, + 1528 ], - "commit": "0bdc36ba3b3955c1106a5cda69be98bd38195cb6", - "sha256": "03wikgh94a0qc3xyvrvzxi4rrrd713ykpgva8z4ly85mh193215s" + "commit": "9a6a8e47b657adeada41c445c9fcda301dbdb9b3", + "sha256": "1h8iqamz5crflhjpxfzgjxspwwkks8cp9m3bf4b42jqsffqkypnb" }, "stable": { "version": [ @@ -92357,8 +92723,8 @@ 20200830, 301 ], - "commit": "3413825c2de675c087fbb39f9aeec4145495fad1", - "sha256": "036ffrfkdakix7z8ksfw78wk1plqnkcf26acn9sksbxcyk4lbjnk" + "commit": "5078c5c5e22f509338d20b7ae448b2bbe02e08f9", + "sha256": "03brsgbhsaynjc8xp5wpmla6cf0v4r7qc5hg0jdbp2ihnwp17i2f" } }, { @@ -92387,11 +92753,11 @@ "repo": "hvesalai/emacs-scala-mode", "unstable": { "version": [ - 20210205, - 851 + 20210409, + 1441 ], - "commit": "1ab5f645606e40db07b813a1600835d1442c060a", - "sha256": "1hzlgypb5pp8rpylm8qbbcqya5b0kjgq44m4n2wq6bix77iphsd8" + "commit": "6966328dbfcbd1dfb166ff46e5deb9a68379cdf1", + "sha256": "0pmix0km9b7r28jxh31ig1h5j9vvvz4871irzlavzn7kl3qiqwgw" }, "stable": { "version": [ @@ -93161,11 +93527,11 @@ "repo": "raxod502/selectrum", "unstable": { "version": [ - 20210325, - 1415 + 20210411, + 1153 ], - "commit": "f5a1f6b6c89719f80c29388c2c784d6b4e346081", - "sha256": "1p3da5pzmzhbqgcgzkii6hh1klrdfch6fnq4g3pa9mxrnis8v4py" + "commit": "35665560c217fc7c39ec7ef006edc6d556a4d3cf", + "sha256": "1w2iiparzs88z2zg8ylqdidgn6qb73x68hjl53yfqqgvrz8krs2f" }, "stable": { "version": [ @@ -93184,15 +93550,15 @@ "repo": "raxod502/prescient.el", "unstable": { "version": [ - 20210321, - 1927 + 20210411, + 2007 ], "deps": [ "prescient", "selectrum" ], - "commit": "8573df977eaceffc6607b7242ff8c0dab02aad65", - "sha256": "0kfbcicflg7dj9nzvvkgrxsb6p03a7cq26jfk7h6hsnrajy5y4sc" + "commit": "ed2b762241bbea03e374dc9dcd4fbe207c6b2ea4", + "sha256": "03c0dmblixh5mx8365b6608l7z3vcgp6pzdflwqf8nfwj2c5rm0w" }, "stable": { "version": [ @@ -93369,15 +93735,15 @@ "repo": "twlz0ne/separedit.el", "unstable": { "version": [ - 20210323, - 905 + 20210403, + 1354 ], "deps": [ "dash", "edit-indirect" ], - "commit": "bebc27121d6d2da900810d552cd5e423ca870bee", - "sha256": "1b87pqvx4p8kwmc63scw9n4v1qj2rp0avx32jl5v3lbgbhvsr3zz" + "commit": "588a5dba2b38e57b88870efbc0cd2482202f28c8", + "sha256": "1m3kb6lvdr8manvlvi2avhba94lw16lvxy9p7vksk1gsmdmkgc0j" } }, { @@ -93835,14 +94201,14 @@ "repo": "sebasmonia/sharper", "unstable": { "version": [ - 20201120, - 124 + 20210328, + 1533 ], "deps": [ "transient" ], - "commit": "d610b839dbb907cc0a49b7edfe7fe39aa3f9dd6d", - "sha256": "07npr8bhbfvm7kqywrm9k4rd938babdln2c4nyx4yk7xxsl1cbml" + "commit": "70ae6071478f3e451ed9318d67a5d024c01235e0", + "sha256": "1fw2qn88b84v0fkaigyyipyvvhhllkw1s1h6fgv2xl2h19i8r0gd" } }, { @@ -94162,11 +94528,11 @@ "repo": "emacs-w3m/emacs-w3m", "unstable": { "version": [ - 20210218, - 2329 + 20210329, + 149 ], - "commit": "7da7afc51aec1ab02056512b921e29a8c68615c9", - "sha256": "1fcfmzahmamrxrklbwrrig4gv745lpznpbxx5rlmb7wpndf2cpdy" + "commit": "8bab3dc89d36b55ba26ae5941f294c57805d24b2", + "sha256": "15kp2lsfci6p8wkrda12m4vf12p13xd9x5rh3ypc6yvz1snypgyy" } }, { @@ -94477,14 +94843,14 @@ "repo": "cask/shut-up", "unstable": { "version": [ - 20180628, - 1830 + 20210403, + 1249 ], "deps": [ "cl-lib" ], - "commit": "081d6b01e3ba0e60326558e545c4019219e046ce", - "sha256": "1bnmrwrhra6cpc3jjgwwzrydj5ps7q2dlkh2ag4j7rkyv4dlk351" + "commit": "ff6f06f3b080ee833a25a22da8cb5b96e911dc77", + "sha256": "1kghm1vwy38k9l4a4jjabhqi49v4p27abk82q6yfpm304ygw816v" }, "stable": { "version": [ @@ -94835,11 +95201,11 @@ "repo": "rolandwalker/simpleclip", "unstable": { "version": [ - 20200210, - 1406 + 20210406, + 1221 ], - "commit": "970159c788d38877f55f6fe93fe590642d45fb47", - "sha256": "0divawrww9py1r3yd7v0574lhf186f1d227gsmmal5m9zzi7pk7k" + "commit": "67c8c17adbbe6d9407a5ce4159d097a8b8bf6adb", + "sha256": "0lggdlgkcxzl1myddis7xy7x2qi1q91grgxpq2rlkkz70rz0xcv0" }, "stable": { "version": [ @@ -95458,15 +95824,15 @@ "repo": "mmgeorge/sly-asdf", "unstable": { "version": [ - 20210308, - 332 + 20210407, + 600 ], "deps": [ "popup", "sly" ], - "commit": "bcaeba9b73b582ae1c4fadc23c71ee7e38d9a64e", - "sha256": "09gs99244g45v4bkvl4a5wshjr24cvwd8dg2w7y6j6aw2aikczrh" + "commit": "95ca71ddeb6132c413e1e4352b136f41ed9254f1", + "sha256": "1dvjwdan3qd3x716zgziy5vbq2972rz8pdqi7b40haqg01f33qf4" }, "stable": { "version": [ @@ -95942,15 +96308,15 @@ "repo": "Fuco1/smartparens", "unstable": { "version": [ - 20210213, - 1851 + 20210330, + 850 ], "deps": [ "cl-lib", "dash" ], - "commit": "fb1ce4b4013fe6f86dde9dd5bd5d4c032ab0d45b", - "sha256": "0wl3fg761ddigqfcbgprgn8d03qapbsh803qp36pq09mgi29s161" + "commit": "25f4d6d1b732f4deabf922059d22a0a7dc04bd0a", + "sha256": "0jaa81fk6376fpxx6k4c9nsv0dhsyk23v9c5jbhkqj3zkf1dcj4x" }, "stable": { "version": [ @@ -96262,6 +96628,26 @@ "sha256": "1x0dn9hd8b0mxdfw0nrsgj4bz4ljf7i9af566iv5fqym1c4wxkhf" } }, + { + "ename": "smudge", + "commit": "5c0ad3fb20e3e85e8fdebbeaeb1e074899950ab8", + "sha256": "14qlz61y4azayxpg3pkzng97gsa19f5ivyp85gr1pk84p2sp01ya", + "fetcher": "github", + "repo": "danielfm/smudge", + "unstable": { + "version": [ + 20210326, + 2222 + ], + "deps": [ + "oauth2", + "request", + "simple-httpd" + ], + "commit": "808f0ef172a80cf4a8ae6d58dfe385d28ecde28e", + "sha256": "0cm02r0bgmj2dr6njdm1059q0gjx12c13cs1yxx0zqr6294jiby6" + } + }, { "ename": "smyx-theme", "commit": "40a1aeabb75438252ebea0332fe1deaf028c956d", @@ -96384,6 +96770,25 @@ "sha256": "0gykymah4ap7zgjr7fkir21avcdhgy6n88nwxl1iynim3vkq441v" } }, + { + "ename": "sniem", + "commit": "12fdb5bf30e09aca915581e81250778b8a76998a", + "sha256": "009fad3igrwgql8xw452czz5wlkmmzbvx6fr9i7hmnmhz977ch1j", + "fetcher": "github", + "repo": "SpringHan/sniem", + "unstable": { + "version": [ + 20210410, + 1115 + ], + "deps": [ + "dash", + "s" + ], + "commit": "7518cf3e1d6ca67e9ee8d9d1e930e1866f460c92", + "sha256": "05ncmknzrqsx8l3c1r3lm4b810m6hnrixbbzkik2brnyzqpqfphj" + } + }, { "ename": "snitch", "commit": "8d08307e483c328075bbf933b2ea0c03bffe8b7c", @@ -96557,14 +96962,14 @@ "repo": "hlissner/emacs-solaire-mode", "unstable": { "version": [ - 20210309, - 2115 + 20210327, + 2155 ], "deps": [ "cl-lib" ], - "commit": "a8fe09d8f5a9cb541c59dcd75a136f1d2a06b8bd", - "sha256": "1fwjy5m66nz2ipshmr7dky8v4pdwynq54282anb0rfa34dim4mrh" + "commit": "9d143db85428c5a7798e429f3b8abd2bf3f80747", + "sha256": "1g5cph02m07dxpmzd72xrzm56l62zdngis6xgz385zdfj67vi9a2" }, "stable": { "version": [ @@ -96618,15 +97023,16 @@ "repo": "ethereum/emacs-solidity", "unstable": { "version": [ - 20210122, - 1746 + 20210411, + 758 ], "deps": [ + "dash", "flycheck", "solidity-mode" ], - "commit": "b4fd719715be098921b6cbfb2ff9da31f3bd0d05", - "sha256": "0gsgj5485k7415wzq73xbj3ax9hh2l1j46ma5d0xkww3md3c3kca" + "commit": "b83354943626ea7c50011d5806b17be17077d1c4", + "sha256": "0h4fyyv2k44x67nwqflh3zpazfkcf5zbgdzwjxbwjgvvxm1hdqlx" }, "stable": { "version": [ @@ -96650,11 +97056,11 @@ "repo": "ethereum/emacs-solidity", "unstable": { "version": [ - 20200529, - 1924 + 20210331, + 1709 ], - "commit": "b4fd719715be098921b6cbfb2ff9da31f3bd0d05", - "sha256": "0gsgj5485k7415wzq73xbj3ax9hh2l1j46ma5d0xkww3md3c3kca" + "commit": "b83354943626ea7c50011d5806b17be17077d1c4", + "sha256": "0h4fyyv2k44x67nwqflh3zpazfkcf5zbgdzwjxbwjgvvxm1hdqlx" }, "stable": { "version": [ @@ -97431,11 +97837,15 @@ "repo": "ideasman42/emacs-spell-fu", "unstable": { "version": [ - 20210324, - 1207 + 20210328, + 413 ], - "commit": "30c5eea9440915c2795670ecdbf836f3cb9dcc1b", - "sha256": "0h2gsq4ms1236nzardhd06b2090v21i0xyljri0lkpj0p3f6p986" + "commit": "c566ed568aae0a73202a51e97a73c5e4af0053d2", + "error": [ + "exited abnormally with code 1\n", + "", + "warning: unknown setting 'experimental-features'\nwarning: unable to download 'https://gitlab.com/ideasman42/emacs-spell-fu/repository/archive.tar.gz?ref=c566ed568aae0a73202a51e97a73c5e4af0053d2': HTTP error 503; retrying in 265 ms\nwarning: unable to download 'https://gitlab.com/ideasman42/emacs-spell-fu/repository/archive.tar.gz?ref=c566ed568aae0a73202a51e97a73c5e4af0053d2': HTTP error 503; retrying in 703 ms\nwarning: unable to download 'https://gitlab.com/ideasman42/emacs-spell-fu/repository/archive.tar.gz?ref=c566ed568aae0a73202a51e97a73c5e4af0053d2': HTTP error 503; retrying in 1251 ms\nwarning: unable to download 'https://gitlab.com/ideasman42/emacs-spell-fu/repository/archive.tar.gz?ref=c566ed568aae0a73202a51e97a73c5e4af0053d2': HTTP error 503; retrying in 2299 ms\nerror: unable to download 'https://gitlab.com/ideasman42/emacs-spell-fu/repository/archive.tar.gz?ref=c566ed568aae0a73202a51e97a73c5e4af0053d2': HTTP error 503\n" + ] } }, { @@ -98136,11 +98546,11 @@ "repo": "jhgorrell/ssh-config-mode-el", "unstable": { "version": [ - 20210217, - 1051 + 20210401, + 243 ], - "commit": "820f60af17e71898303f4f3c2576f0619528a492", - "sha256": "1haypfhpbxsv2rm1wpskjdm0ddv34qvaiiyw8qhy1nn64q4b5xx0" + "commit": "6d4f8d12c6a7e7ff776271f3656be5f3ba5a784e", + "sha256": "1pxpm24rlrrdzmy129c6naz9zxfsjrk6hgx3qcizd25kq86sfy4g" } }, { @@ -98151,10 +98561,10 @@ "repo": "cjohansson/emacs-ssh-deploy", "unstable": { "version": [ - 20201006, - 1213 + 20201016, + 1439 ], - "commit": "cc91b56a7f07ae63fcf78a040001491d040ec9ba", + "commit": "fce4ea35f09ed5899c1a2dfa3527bc2dd5ca3ba5", "sha256": "10banrq8p0v10237yy2f04i0vvpjdz0by9cp92ambw94c3l3ii8f" }, "stable": { @@ -98396,14 +98806,14 @@ "repo": "Kungsgeten/steam.el", "unstable": { "version": [ - 20210307, - 1756 + 20210404, + 1658 ], "deps": [ "cl-lib" ], - "commit": "b0b79d9bd8f1f15c43ab60997f5a341a769651af", - "sha256": "144kkh1k09hfi7c8rn750m7p70jka4m0h8cakr16avkprrrpmxxc" + "commit": "2b24198844e7296c68f870490fabe896ed101baa", + "sha256": "0vcqpsz843djc2blkbjwqhr8km8chckfl8fgr78ii5zg9wdlvbrp" } }, { @@ -98447,8 +98857,8 @@ 20200606, 1308 ], - "commit": "c0a2d92567d024c2136e9a25ce720fb0b565d31c", - "sha256": "192c1j33d6b1j2wdz6js70lql4ysl6d3vjnw3sqzcp22cgjlb2pp" + "commit": "6af99af232c90d1629ac71be500eef2241245c81", + "sha256": "03wl804pacmzr2gjdz6ssq0l03hs68hadlgjdn6hinp2k0r90pxw" }, "stable": { "version": [ @@ -98489,6 +98899,21 @@ "sha256": "16dxjsr5nj20blww4xpd4jzgjprzzh1nwvb810ggdmp9paf4iy0g" } }, + { + "ename": "stimmung-themes", + "commit": "ded562018552f74bcf1a346858c0a93089a4359e", + "sha256": "1lfi24vy98d0rjhi9fxz6fj4x2qj19cnq35ndfglm0p2z504gg4k", + "fetcher": "github", + "repo": "motform/stimmung-themes", + "unstable": { + "version": [ + 20210331, + 1140 + ], + "commit": "0dc71ec178c3dab8973c90758fa730c70df01554", + "sha256": "0glp3h5anrsvm89zs99gdyp3rpc0g41va30nxw5pn02yv7cqz7hd" + } + }, { "ename": "stock-ticker", "commit": "75e654f7b3f785bdfead3c594fdc09730c5d33b9", @@ -98567,14 +98992,14 @@ "repo": "magnars/string-edit.el", "unstable": { "version": [ - 20160411, - 656 + 20210405, + 1836 ], "deps": [ "dash" ], - "commit": "c44b65b4c5e9f52be9c14d88ca2f402a18d9e1dd", - "sha256": "1xm7bb3cp99ahr5jrwi0p0258qcvlbddy98wmbq00kk5pihqbzsg" + "commit": "0e225df6f8740467231c787a50025e4552b3eddb", + "sha256": "1x5b3iq1c25c74jb77qw3zijblp6zx9kp9hzsb0wfx66lp4wn2wi" }, "stable": { "version": [ @@ -98904,14 +99329,14 @@ "url": "https://git.sr.ht/~amk/subsonic.el", "unstable": { "version": [ - 20210321, - 1937 + 20210331, + 1845 ], "deps": [ "transient" ], - "commit": "cb7c6c14f00367188a5565fed9c23a857f27a4d0", - "sha256": "1k69c0zhfjy90y7hvvlsppjvan5zrif4p48i4ih7wiy47giwicb4" + "commit": "9764405dede46791e411cdcc7963808f76201529", + "sha256": "1d4yda1vv1sfjc36b5aaf811jmlcifc8labglmkx1xvjmc7bggsp" } }, { @@ -99416,16 +99841,16 @@ "repo": "danielmartin/swift-helpful", "unstable": { "version": [ - 20201031, - 1654 + 20210405, + 1727 ], "deps": [ "dash", "lsp-mode", "swift-mode" ], - "commit": "b609fd94ae66832d41fcb70709042c19ef37879f", - "sha256": "09q46ip155wkdz1vp4vsal1lhfzgm4lz052b0q6vdgfz4k8ncbz7" + "commit": "ed36ea3d8cd80159f7f90b144c4503411b74ae3e", + "sha256": "0bcrnslqhgz122mv6br6w848a3x3g4jkz1pkdpb4726xssfzz8zk" }, "stable": { "version": [ @@ -99449,14 +99874,14 @@ "repo": "swift-emacs/swift-mode", "unstable": { "version": [ - 20201231, - 1204 + 20210410, + 723 ], "deps": [ "seq" ], - "commit": "95ff0041370660e839ed06aa92330694d8590d62", - "sha256": "14yfdcz78iygxzykwv21fy059ml2kwm9khrn0ysyjwnxnddvpc50" + "commit": "fd3c824c3622aef4ad29983667f34ebad91e9f69", + "sha256": "1s60j7778n8vl53capi1bs5mbb1g2vwaaa4y7wdv6ajrlxh95a5x" }, "stable": { "version": [ @@ -99533,14 +99958,14 @@ "repo": "abo-abo/swiper", "unstable": { "version": [ - 20210310, - 1230 + 20210404, + 1302 ], "deps": [ "ivy" ], - "commit": "47b496544e238041bca5e3c9ca55848648344312", - "sha256": "0n26hpffp7lljhwjbr4r470ynaff3swnkxmj7g2rjw78rw2qjmlm" + "commit": "471d644d6bdd7d5dc6ca4efb405e6a6389dff245", + "sha256": "0zw5sypr9kwb65627b8wrgl542gyq0xh7pwhghbkwfpwx7rjvk36" }, "stable": { "version": [ @@ -99634,11 +100059,11 @@ "repo": "dimitri/switch-window", "unstable": { "version": [ - 20201019, - 823 + 20210331, + 911 ], - "commit": "5bba78073bc18197392f4d86eb1fe284f906219c", - "sha256": "1slrimhdl7frncsszpa8m17j2y11zbr3dwqvsmkayy85sfiq5345" + "commit": "2801d9b3a9d7bf0b64cd8b2f2e572124ed2ff9ad", + "sha256": "0x9sz14m433fi77slkwir9b0dwaglswckygk8vfkckcraxw14dhh" }, "stable": { "version": [ @@ -99855,8 +100280,8 @@ "repo": "countvajhula/symex.el", "unstable": { "version": [ - 20210327, - 20 + 20210408, + 1839 ], "deps": [ "evil", @@ -99868,8 +100293,8 @@ "seq", "undo-tree" ], - "commit": "a3d6d74089e0fa0031cdef5114393d2f569d68d9", - "sha256": "1qfn95mbq92p31g9yw68sf8854v3jk2251xy6asxqv8n9ckkhji9" + "commit": "feaf6d847bbff6642cd3c4926899eee3cbac261b", + "sha256": "1k4b8aqwglgavj3rsjj0macmppjsgb5ykpl388434crn067rlfpz" }, "stable": { "version": [ @@ -100731,15 +101156,15 @@ "repo": "zevlg/telega.el", "unstable": { "version": [ - 20210326, - 1352 + 20210409, + 2343 ], "deps": [ "rainbow-identifiers", "visual-fill-column" ], - "commit": "c047b20cf3c367d06fba097e4c8a58967524d7ab", - "sha256": "0h29jscvmyw4s11wkpy538v71c87badz6ac8whs6nk3g04scsv8n" + "commit": "88e10161e1aa2a7c83ebc41ba8492d84d8e64e26", + "sha256": "010jlhbidl3vny9z4dp4mhix827p2aa76ja2v822sdlszcb8vh9x" }, "stable": { "version": [ @@ -100870,11 +101295,11 @@ "repo": "clarete/templatel", "unstable": { "version": [ - 20210319, - 2222 + 20210327, + 2307 ], - "commit": "ef93f4190c785166b49a310bf2d8695d3227ab40", - "sha256": "13hwa7v5yyji98g9rz2m4ql89nx2wi0hhhikm9y552l25qayrgxz" + "commit": "dd7e76919f36da9f8efe7f9e3d84098f3c7c6644", + "sha256": "0apv1r756d984a47d9pvqzgcs652fdwy3swf4js9dki3nzljy756" }, "stable": { "version": [ @@ -101640,11 +102065,11 @@ "repo": "GongYiLiao/theme-anchor", "unstable": { "version": [ - 20210327, - 340 + 20210408, + 2149 ], - "commit": "a6f5986a9569a4647fd4e3b6533b50efaf5aa1fd", - "sha256": "10fg2si0s5lavk8ljnycb0942fkl3dpkny5n6arir3jd17ypp3sv" + "commit": "ec7f522ec25c7f8342dfd067b7d9f6862c828c93", + "sha256": "00bar56lswvdp9rwa55y4m83av7a3g95b0qz6h0wbqi1v0gbpm5n" } }, { @@ -101822,8 +102247,8 @@ 20200212, 1903 ], - "commit": "3b42e95dc9167a28554991af0d172543475f2003", - "sha256": "1gw54kpzqdldivr4kyw08n12mpqkg303wxhc2wqjnn95dhmxql07" + "commit": "9c6323483c9feaa9ffba8ceb98f54281733ed50c", + "sha256": "0qjx9arygjh7h3wjrfcwc7jw1jxah2jf6wfinprv7b6jg1n8k6vy" }, "stable": { "version": [ @@ -101889,8 +102314,8 @@ "deps": [ "haskell-mode" ], - "commit": "f26eb3062cca9369b2a05bd208633e8b4f91c28e", - "sha256": "0vx4nfpcan9c6qi9x0z1a03sm33ifrclnvd0rs43fjb6s05xhwwq" + "commit": "4f7bbb325631968d6e7b82b25ece810959d4b87f", + "sha256": "1p4w48zz25fym40l3wijr06qfd4drhkynbhf2nx2yh766yv8icmg" }, "stable": { "version": [ @@ -101913,8 +102338,8 @@ "repo": "ananthakumaran/tide", "unstable": { "version": [ - 20210323, - 1647 + 20210327, + 1928 ], "deps": [ "cl-lib", @@ -101923,8 +102348,8 @@ "s", "typescript-mode" ], - "commit": "2a3ac4f38472d66e2d8a6bbe5dadb52bc008acbd", - "sha256": "1fj2fghiycnzds2zxfxgj1d9mdzsvs9rvl9bwy2f1vwawqk1m48w" + "commit": "ad6fa78911d5d7e85c0851c0c1afc01f3cbde7c1", + "sha256": "1b815gxmn31x5b59mmlv5di72mz3vdm19crrpcnvb18vl2ak2vw3" }, "stable": { "version": [ @@ -102699,8 +103124,8 @@ "deps": [ "w32-ime" ], - "commit": "8fd8ae64f71d1d69d7e1bcc47a6f65aa7f8e6993", - "sha256": "020qvjszwkx5klgh865vs5z17ym651i4zzq7c4sz6qwv361ygfm8" + "commit": "809215eccfe8ff33d461c7ff980ed64c621a84bb", + "sha256": "1915v2x45cx9ydb53aw98da00wmqymn96af0wan9k46527ck54lg" }, "stable": { "version": [ @@ -103119,14 +103544,14 @@ "repo": "ubolonton/emacs-tree-sitter", "unstable": { "version": [ - 20210320, - 1052 + 20210328, + 434 ], "deps": [ "tsc" ], - "commit": "3a600d769bd5da95bf46bec58893934370c6c04f", - "sha256": "15y0wjnck8rbfhl0xrl71ci7clbcp11lhqil5l8ykprsdjv0c2as" + "commit": "7f5d0938002092ec08830a73f64961021303e1e9", + "sha256": "17dwr2lmqi0ssg04a0a99igck60hmrk2a566bprwlwqga3cbkrzm" }, "stable": { "version": [ @@ -103246,8 +103671,8 @@ "repo": "Alexander-Miller/treemacs", "unstable": { "version": [ - 20210324, - 2101 + 20210411, + 1031 ], "deps": [ "ace-window", @@ -103259,8 +103684,8 @@ "pfuture", "s" ], - "commit": "9eaef270de9fde50ef029c12db6d8b89cc4580d8", - "sha256": "0w3pr60hlw2v8c552lylpm6ab9qirdv8nrg5cr98zsm16b4likfp" + "commit": "b92d43aa6974c8581ea7a4f4b3586041a7f44f32", + "sha256": "18laa2ym4zqwl218flj73ik1s0ffiq3q7nszzp7qphhv4bkqjdik" }, "stable": { "version": [ @@ -103289,15 +103714,15 @@ "repo": "Alexander-Miller/treemacs", "unstable": { "version": [ - 20210324, - 2101 + 20210408, + 2051 ], "deps": [ "all-the-icons", "treemacs" ], - "commit": "9eaef270de9fde50ef029c12db6d8b89cc4580d8", - "sha256": "0w3pr60hlw2v8c552lylpm6ab9qirdv8nrg5cr98zsm16b4likfp" + "commit": "b92d43aa6974c8581ea7a4f4b3586041a7f44f32", + "sha256": "18laa2ym4zqwl218flj73ik1s0ffiq3q7nszzp7qphhv4bkqjdik" } }, { @@ -103315,8 +103740,8 @@ "evil", "treemacs" ], - "commit": "9eaef270de9fde50ef029c12db6d8b89cc4580d8", - "sha256": "0w3pr60hlw2v8c552lylpm6ab9qirdv8nrg5cr98zsm16b4likfp" + "commit": "b92d43aa6974c8581ea7a4f4b3586041a7f44f32", + "sha256": "18laa2ym4zqwl218flj73ik1s0ffiq3q7nszzp7qphhv4bkqjdik" }, "stable": { "version": [ @@ -103345,8 +103770,8 @@ "deps": [ "treemacs" ], - "commit": "9eaef270de9fde50ef029c12db6d8b89cc4580d8", - "sha256": "0w3pr60hlw2v8c552lylpm6ab9qirdv8nrg5cr98zsm16b4likfp" + "commit": "b92d43aa6974c8581ea7a4f4b3586041a7f44f32", + "sha256": "18laa2ym4zqwl218flj73ik1s0ffiq3q7nszzp7qphhv4bkqjdik" }, "stable": { "version": [ @@ -103377,8 +103802,8 @@ "pfuture", "treemacs" ], - "commit": "9eaef270de9fde50ef029c12db6d8b89cc4580d8", - "sha256": "0w3pr60hlw2v8c552lylpm6ab9qirdv8nrg5cr98zsm16b4likfp" + "commit": "b92d43aa6974c8581ea7a4f4b3586041a7f44f32", + "sha256": "18laa2ym4zqwl218flj73ik1s0ffiq3q7nszzp7qphhv4bkqjdik" }, "stable": { "version": [ @@ -103410,8 +103835,8 @@ "persp-mode", "treemacs" ], - "commit": "9eaef270de9fde50ef029c12db6d8b89cc4580d8", - "sha256": "0w3pr60hlw2v8c552lylpm6ab9qirdv8nrg5cr98zsm16b4likfp" + "commit": "b92d43aa6974c8581ea7a4f4b3586041a7f44f32", + "sha256": "18laa2ym4zqwl218flj73ik1s0ffiq3q7nszzp7qphhv4bkqjdik" }, "stable": { "version": [ @@ -103443,8 +103868,8 @@ "perspective", "treemacs" ], - "commit": "9eaef270de9fde50ef029c12db6d8b89cc4580d8", - "sha256": "0w3pr60hlw2v8c552lylpm6ab9qirdv8nrg5cr98zsm16b4likfp" + "commit": "b92d43aa6974c8581ea7a4f4b3586041a7f44f32", + "sha256": "18laa2ym4zqwl218flj73ik1s0ffiq3q7nszzp7qphhv4bkqjdik" } }, { @@ -103462,8 +103887,8 @@ "projectile", "treemacs" ], - "commit": "9eaef270de9fde50ef029c12db6d8b89cc4580d8", - "sha256": "0w3pr60hlw2v8c552lylpm6ab9qirdv8nrg5cr98zsm16b4likfp" + "commit": "b92d43aa6974c8581ea7a4f4b3586041a7f44f32", + "sha256": "18laa2ym4zqwl218flj73ik1s0ffiq3q7nszzp7qphhv4bkqjdik" }, "stable": { "version": [ @@ -103720,8 +104145,8 @@ 20210320, 1052 ], - "commit": "3a600d769bd5da95bf46bec58893934370c6c04f", - "sha256": "15y0wjnck8rbfhl0xrl71ci7clbcp11lhqil5l8ykprsdjv0c2as" + "commit": "7f5d0938002092ec08830a73f64961021303e1e9", + "sha256": "17dwr2lmqi0ssg04a0a99igck60hmrk2a566bprwlwqga3cbkrzm" }, "stable": { "version": [ @@ -104464,8 +104889,12 @@ 20200701, 1435 ], - "commit": "f4db4c9b9875134df6f5279281099361ae11c2e9", - "sha256": "0s88mz3x9iwz4hj1n4l4nmya473hcv8wsps8dyx4mmgzgpdb1lvf" + "commit": "7cbc3f852bcc1a22ce279cf36c89328841692493", + "error": [ + "exited abnormally with code 1\n", + "", + "warning: unknown setting 'experimental-features'\nwarning: unable to download 'https://gitlab.com/ideasman42/emacs-undo-fu/repository/archive.tar.gz?ref=7cbc3f852bcc1a22ce279cf36c89328841692493': HTTP error 503; retrying in 296 ms\nwarning: unable to download 'https://gitlab.com/ideasman42/emacs-undo-fu/repository/archive.tar.gz?ref=7cbc3f852bcc1a22ce279cf36c89328841692493': HTTP error 503; retrying in 553 ms\nwarning: unable to download 'https://gitlab.com/ideasman42/emacs-undo-fu/repository/archive.tar.gz?ref=7cbc3f852bcc1a22ce279cf36c89328841692493': HTTP error 503; retrying in 1293 ms\nwarning: unable to download 'https://gitlab.com/ideasman42/emacs-undo-fu/repository/archive.tar.gz?ref=7cbc3f852bcc1a22ce279cf36c89328841692493': HTTP error 503; retrying in 2555 ms\nerror: unable to download 'https://gitlab.com/ideasman42/emacs-undo-fu/repository/archive.tar.gz?ref=7cbc3f852bcc1a22ce279cf36c89328841692493': HTTP error 503\n" + ] } }, { @@ -104476,11 +104905,15 @@ "repo": "ideasman42/emacs-undo-fu-session", "unstable": { "version": [ - 20201218, - 400 + 20210407, + 326 ], - "commit": "a0389147365c10c974ad68b797b185affb935fe3", - "sha256": "0qdls5h0ryh93ziwd5gibhknz8n9v66fyp55iwjk8zblgahnm6ym" + "commit": "b2d8874bc8ce892a6702b4136626bd65e0ad7760", + "error": [ + "exited abnormally with code 1\n", + "", + "warning: unknown setting 'experimental-features'\nwarning: unable to download 'https://gitlab.com/ideasman42/emacs-undo-fu-session/repository/archive.tar.gz?ref=b2d8874bc8ce892a6702b4136626bd65e0ad7760': HTTP error 503; retrying in 283 ms\nwarning: unable to download 'https://gitlab.com/ideasman42/emacs-undo-fu-session/repository/archive.tar.gz?ref=b2d8874bc8ce892a6702b4136626bd65e0ad7760': HTTP error 503; retrying in 562 ms\nwarning: unable to download 'https://gitlab.com/ideasman42/emacs-undo-fu-session/repository/archive.tar.gz?ref=b2d8874bc8ce892a6702b4136626bd65e0ad7760': HTTP error 503; retrying in 1339 ms\nwarning: unable to download 'https://gitlab.com/ideasman42/emacs-undo-fu-session/repository/archive.tar.gz?ref=b2d8874bc8ce892a6702b4136626bd65e0ad7760': HTTP error 503; retrying in 2016 ms\nerror: unable to download 'https://gitlab.com/ideasman42/emacs-undo-fu-session/repository/archive.tar.gz?ref=b2d8874bc8ce892a6702b4136626bd65e0ad7760': HTTP error 503\n" + ] } }, { @@ -105360,11 +105793,14 @@ "repo": "diml/utop", "unstable": { "version": [ - 20190715, - 1836 + 20210404, + 318 ], - "commit": "a5ff52bbf608e1112b5c0d41a36e3267f39f4084", - "sha256": "125cv7kwvr1xj52yfb5qlra2li2hikbqnqvqdasn0rq3pkj7f02b" + "deps": [ + "tuareg" + ], + "commit": "711c24661ce625070f8981fab9c6f31ce72b0a52", + "sha256": "0xwc14blqzrsyp7mzza0vavbp622a86bz9na8dks5zir2fgmmaxm" }, "stable": { "version": [ @@ -106032,15 +106468,15 @@ "repo": "applied-science/emacs-vega-view", "unstable": { "version": [ - 20210227, - 1507 + 20210401, + 1115 ], "deps": [ "cider", "parseedn" ], - "commit": "bb8159ad25886d81fcc2d3a9ec5af7ef669a87a6", - "sha256": "18g0fygi8dgwj2harnrqvilv0v3rrrdphqybmnshjmnfngkak55s" + "commit": "3793025a523a86acc6255b4183b12ebfc95e1116", + "sha256": "0w8v0ivwq3i42mxfxk5zvlx1lz4di06dpd93j2j13ns5h46vxhc0" } }, { @@ -106051,11 +106487,11 @@ "repo": "federicotdn/verb", "unstable": { "version": [ - 20210315, - 1753 + 20210402, + 1621 ], - "commit": "9c5e9baf43388d5a69ea2fb216d9936628b36a84", - "sha256": "1jl4b1ka1xaavfm4gpqgg01f76mlvy0g0rdifmwwz9w8apw306j0" + "commit": "f9e69bf42eb8108aeee020ed3f58f456e042967f", + "sha256": "1hycs3aaqw6ss3ccbjd8p3fpb4aslm9hk3b9cwqnz4lxcxvqbfvj" }, "stable": { "version": [ @@ -106485,8 +106921,8 @@ "dash", "s" ], - "commit": "107e7e0bf923f44d217712772cd58b414d0065cb", - "sha256": "1qqfcif4by8psc4kp9wnna7pm321a7d0xjkwznq2fwc5cqgbp0vz" + "commit": "c7e84505db4142fd1beebf38ffe37c3f42444ca3", + "sha256": "0kkhbw8c9c7nfhz7i0wwwcrbk0a91yvq7n5n89ndsk5iwisr92vp" }, "stable": { "version": [ @@ -106548,11 +106984,11 @@ "repo": "joostkremers/visual-fill-column", "unstable": { "version": [ - 20210323, - 2039 + 20210404, + 2152 ], - "commit": "a93dc5fc64340d8abda1272f67d46d4cc09a4c85", - "sha256": "1csybmfm5zgn2jpl9g3cb49vd26ds7x972wxiig3ri4zrmyn7y2l" + "commit": "6854932d7fe689caf5cbc1ab65271fcfd46590bd", + "sha256": "02ijylplnv8qzh6r2ci6h4sdm61vn0d2iajmbqyn91hs0695661j" }, "stable": { "version": [ @@ -106814,11 +107250,11 @@ "repo": "ianpan870102/vscode-dark-plus-emacs-theme", "unstable": { "version": [ - 20210325, - 917 + 20210331, + 1541 ], - "commit": "6e7a02b624628d05fd5cfb5f26d044618a00c905", - "sha256": "1xdb6pwl8p6rzb7l6qf8nz2rn6ggjg9krimqsl167551bkjri4gw" + "commit": "3c349f64ff8f12348b865b8c6896db05386cdc49", + "sha256": "0f2dlgjczy45dygyw6was5m74fldrbf3l29bss370qcaj3h2bm3z" }, "stable": { "version": [ @@ -106853,11 +107289,11 @@ "repo": "akermu/emacs-libvterm", "unstable": { "version": [ - 20210326, - 1458 + 20210409, + 1558 ], - "commit": "1bc4516f53955dcbf397cf999f38e67eec835d8c", - "sha256": "0lvdr7ifb3cb5ll8pl0lyw4qzg0v1plzl4fg5drn3z6aanznva38" + "commit": "2b1392cb2b14ec5bd0b7355197d5f353aa5d3983", + "sha256": "0cz0zfq5lannqq2ivmp6zv9r3fybkykx2vl4vn614rij23lylbwc" } }, { @@ -106996,16 +107432,16 @@ "repo": "d12frosted/vulpea", "unstable": { "version": [ - 20210314, - 1818 + 20210329, + 605 ], "deps": [ "org", "org-roam", "s" ], - "commit": "ee35c562768a3a46b9d2c2f28dd2def105c05446", - "sha256": "19gx5i6jdb8dgpwaw0vmmla1v451svixahyf1pnfk6615rsb3m08" + "commit": "b394b82cb463f67932dae0fbe3a67daa4d647ea6", + "sha256": "0ssh12jrqfk7llfcfdf6dn9pq0hiqi5f7zp75v1j56qfpijzcbl0" }, "stable": { "version": [ @@ -107088,11 +107524,11 @@ "repo": "emacs-w3m/emacs-w3m", "unstable": { "version": [ - 20210321, - 2346 + 20210409, + 626 ], - "commit": "7da7afc51aec1ab02056512b921e29a8c68615c9", - "sha256": "1fcfmzahmamrxrklbwrrig4gv745lpznpbxx5rlmb7wpndf2cpdy" + "commit": "8bab3dc89d36b55ba26ae5941f294c57805d24b2", + "sha256": "15kp2lsfci6p8wkrda12m4vf12p13xd9x5rh3ypc6yvz1snypgyy" } }, { @@ -107705,14 +108141,14 @@ "repo": "emacs-love/weblorg", "unstable": { "version": [ - 20210308, - 109 + 20210410, + 421 ], "deps": [ "templatel" ], - "commit": "faf78dfe01f25a3f32d6dcf199b5944cfc46b2c7", - "sha256": "0j9hnk5kymwq81qskn5l319qiilk5zck9134r44z0wx3bl0rc5gf" + "commit": "66bf957ace451ad0140e77d2fea235aefcd9ae26", + "sha256": "0qjrwpdi1zg8xbi9xnq5kpiw8dns1g899jh9vrsfqmkvr9vsm220" }, "stable": { "version": [ @@ -107891,11 +108327,11 @@ "repo": "jstaursky/weyland-yutani-theme", "unstable": { "version": [ - 20210327, - 311 + 20210331, + 1857 ], - "commit": "782b45736c36dcd48e614167d46ff7fc0edd2a7b", - "sha256": "0m6mpwvhvhb02rk2lkylw5w7q9nqm3sqdyzyz5bcqm3layck4pcv" + "commit": "998c171becf2e589e65aae0283ebfee90c03d6df", + "sha256": "18zbawhrv9904frg686hlvqr4zqx62ay85igrwm8fr41wipxxhz6" } }, { @@ -108065,11 +108501,11 @@ "repo": "justbur/emacs-which-key", "unstable": { "version": [ - 20210324, - 1821 + 20210407, + 28 ], - "commit": "c632dbf27a77c1c73ce559041b3a78ec5f78b187", - "sha256": "1dsr7x0mbw8jmdm26278a9lqmh3mkrkzr24fp6ssf316hh51cc3v" + "commit": "5fb30301cb3b4fca5a0e1ce8ec1ef59290b79199", + "sha256": "1wgygby4zwlbx6ry6asraaixl169qdz092zgk1brvg63w7f8vkkb" }, "stable": { "version": [ @@ -108576,15 +109012,15 @@ "repo": "bmag/emacs-purpose", "unstable": { "version": [ - 20210315, - 1848 + 20210411, + 1700 ], "deps": [ "imenu-list", "let-alist" ], - "commit": "aa4e7376ab72b7f67cf8ad46b67a2eaec2f8cd61", - "sha256": "1l7nrms211jslxibq18wxxdx7rv6i18by8lzhk692fp6s5af2fi3" + "commit": "dc4f8a00a8b0c1cf6242e1bf47f82e08c508a51e", + "sha256": "0h5s448dgpqi24fpmkbalw4w96jf9ny5gar8qjw0kqmcfxxny9b0" }, "stable": { "version": [ @@ -108764,6 +109200,21 @@ "sha256": "0v1qmw3svydk7dlqbcymy1g1bygkfpb2h4b97zdp12xvd8mww9ny" } }, + { + "ename": "wisp-mode", + "commit": "9ca9ed447dcced3e82dc65e655adc8286ce6301e", + "sha256": "1al272dwbbnj8wvvn2hb8k8k72hknjwr4kgj6r237hg1m8s21l5j", + "fetcher": "hg", + "url": "https://hg.sr.ht/~arnebab/wisp", + "unstable": { + "version": [ + 20210405, + 1410 + ], + "commit": "4b4a8f05401bd08092518ddccdf35461f1124f5a", + "sha256": "16aknbzmh3a4lb0bzkljl70yx8v8g74vfji4h4iqvx013vwvqyp2" + } + }, { "ename": "wispjs-mode", "commit": "a628330ee8deeab2bd5c2d4b61b33f119c4549d8", @@ -109179,11 +109630,11 @@ "repo": "pashinin/workgroups2", "unstable": { "version": [ - 20210325, - 939 + 20210402, + 1450 ], - "commit": "808248353b7617fd5b307defc3e1e8ccfed45045", - "sha256": "1akxxh3400j9rd7zagmhjfrvvg14g4mlzzgbc1y0n2l33k690fz4" + "commit": "b182bf853ec408de014ba35527177c7cab90d620", + "sha256": "11rmv6wc7brw1la73y9dvmmx2pqaxxwm4087qkgr9vjg5h02k67d" }, "stable": { "version": [ @@ -109443,11 +109894,11 @@ "repo": "ag91/writer-word-goals", "unstable": { "version": [ - 20210314, - 2101 + 20210405, + 1155 ], - "commit": "d62ece22ab7c8c46d874f5ae61712aa517b25ce2", - "sha256": "16m77snvipr7blwsd12p7biqxqq9hchq3qmd0h79h9kci1990j2r" + "commit": "77435ca396e7cc2685f4962e959070dbe1f70db1", + "sha256": "0kblcf1qfa06bwqm6pwwdmmpcipn3yjcjw09hmryipzhgf97zfxa" } }, { @@ -109510,14 +109961,14 @@ "repo": "jobbflykt/x509-mode", "unstable": { "version": [ - 20180921, - 803 + 20210407, + 627 ], "deps": [ "cl-lib" ], - "commit": "9eb24c8721dcad9888b70213d06d770bc2386db7", - "sha256": "1gr099bn4qn2b5jasbs4r04pf6wqsnpf2632vzvshzm9nkz4qnhg" + "commit": "470769edba111aed8eabce58a3f2a02da0767624", + "sha256": "19xvfzmsnc271a2zhjbnspb269c5mnps4l94ifrdlqn7y886qr4r" } }, { @@ -109528,14 +109979,14 @@ "repo": "skeeto/x86-lookup", "unstable": { "version": [ - 20180528, - 1635 + 20210409, + 2313 ], "deps": [ "cl-lib" ], - "commit": "609b2ba70dc5a246ac9b4b5f89eb5ef4331519bf", - "sha256": "19zgq7mcc3wx847xc911fibvphbsws99m2l3k54xdjp8mb5qfdzm" + "commit": "5e194fdac8a1e12d87b8ed4edeb887eb5543c34d", + "sha256": "0f76qsb8hiryfgwkpymw5sicbmz1p48s0dxai1fmjlvaimrw56mm" }, "stable": { "version": [ @@ -109603,11 +110054,11 @@ "repo": "xahlee/xah-fly-keys", "unstable": { "version": [ - 20210319, - 1553 + 20210404, + 2149 ], - "commit": "f35ef2e8cb8208c30a7ba02df52f32d915073fe6", - "sha256": "13xf12ci1anm6r8j90i6mj8pfmb8ffvhyzinz42046achhpymwnl" + "commit": "1caaf974574298700d0671e7f8f4bc5652b10fcf", + "sha256": "0pafihkaajan3k28394vf1g9q3ihwywmc62zbh1b0ycj23lgjcii" } }, { @@ -109648,11 +110099,11 @@ "repo": "xahlee/xah-math-input", "unstable": { "version": [ - 20200217, - 740 + 20210403, + 2312 ], - "commit": "c1e72c4578a134e9aa3ec9ef425038d8c16fba94", - "sha256": "0laq440vk8mnjbdjz0h4n18qh72n83hxqmwjm124ykzclzjcdknh" + "commit": "bc1ff04a11be7c3b728aa012324377305d48e087", + "sha256": "0q9civwf4mxapmq6hzrf3wimc7pfp28yipx007abchwimpdxvwws" } }, { @@ -110108,8 +110559,12 @@ 20210320, 1123 ], - "commit": "f5bcb89e026562abb8da4ea337457d43fed2e71b", - "sha256": "0hhhah6aq5wc6jqvf836h8ysmym1jk78acrdf6n486ck537zh5i3" + "commit": "8d8e00352e6f7e86d38d9ea4330f6cb2380fb2ec", + "error": [ + "exited abnormally with code 1\n", + "", + "warning: unknown setting 'experimental-features'\nwarning: unable to download 'https://gitlab.com/ideasman42/emacs-xref-rst/repository/archive.tar.gz?ref=8d8e00352e6f7e86d38d9ea4330f6cb2380fb2ec': HTTP error 503; retrying in 322 ms\nwarning: unable to download 'https://gitlab.com/ideasman42/emacs-xref-rst/repository/archive.tar.gz?ref=8d8e00352e6f7e86d38d9ea4330f6cb2380fb2ec': HTTP error 503; retrying in 540 ms\nwarning: unable to download 'https://gitlab.com/ideasman42/emacs-xref-rst/repository/archive.tar.gz?ref=8d8e00352e6f7e86d38d9ea4330f6cb2380fb2ec': HTTP error 503; retrying in 1079 ms\nwarning: unable to download 'https://gitlab.com/ideasman42/emacs-xref-rst/repository/archive.tar.gz?ref=8d8e00352e6f7e86d38d9ea4330f6cb2380fb2ec': HTTP error 503; retrying in 2268 ms\nerror: unable to download 'https://gitlab.com/ideasman42/emacs-xref-rst/repository/archive.tar.gz?ref=8d8e00352e6f7e86d38d9ea4330f6cb2380fb2ec': HTTP error 503\n" + ] } }, { @@ -110404,11 +110859,11 @@ "repo": "zkry/yaml.el", "unstable": { "version": [ - 20210326, - 533 + 20210406, + 156 ], - "commit": "9ebddb55238d746dc5a5d46db04c9f360c140b99", - "sha256": "124lv7jjscaq7pgn72gk7zhrl54c27zqnyh8z51mn8j8mbpvf68a" + "commit": "d8ac09e8cad7f67339e19c53e77da1cd0ff98d36", + "sha256": "0wkrvhb5yhb38sf7w1njxij1x0pfxp56hn97j2bk4w58dz94fxir" } }, { @@ -110725,14 +111180,14 @@ "repo": "AndreaCrotti/yasnippet-snippets", "unstable": { "version": [ - 20210105, - 1346 + 20210408, + 1234 ], "deps": [ "yasnippet" ], - "commit": "899c027f442587e0f8ef90761f58b27907ca64b4", - "sha256": "1vl2y271y4vlgpnjb1fa24fsd77zmzha2miyqwnf9n9pdd96brjg" + "commit": "be823d7e1a1a46454d60a9f3dabb16b68b5dd853", + "sha256": "0ak0drxlg3m2v4ya5chpgl82rcl7ic2nmnybhpw1qk51mcmv643y" }, "stable": { "version": [ @@ -111425,15 +111880,15 @@ "repo": "EFLS/zetteldeft", "unstable": { "version": [ - 20210326, - 942 + 20210409, + 2126 ], "deps": [ "ace-window", "deft" ], - "commit": "293d406203c5c060ceb64874812bc193ac91fb74", - "sha256": "08r0ipi6wbqfna4jwpvyp64vkzy3jdrjy0vac43gi2s3cbxl3wmg" + "commit": "c21705202180d16fa9f3a652e6e3af9ddc868a3b", + "sha256": "1ghrbz9azzddmgidbiqg3c0mqidgsjhryy03id0ln3bnv1z51vwn" }, "stable": { "version": [ @@ -111557,14 +112012,14 @@ "repo": "nnicandro/emacs-zmq", "unstable": { "version": [ - 20200912, - 1126 + 20210402, + 2340 ], "deps": [ "cl-lib" ], - "commit": "eb4e01715cbf2f356a8ae5e678ffec3380a907dc", - "sha256": "0s21w3yc41hvrd881f5y8w6jczyd3bq7nbw5m13xr96yrv1d24mz" + "commit": "0a186a732b78aeb86599ea8123b36c4885789c7d", + "sha256": "0i6ghqwh35gnyz5b8ipbk030byibcmiy207pvplgszz39sjjjfp6" }, "stable": { "version": [ @@ -111824,6 +112279,30 @@ "sha256": "0qwdbzfi8mddmchdd9ab9ms1ynlc8dx08i6g2mf3za1sbcivdqsr" } }, + { + "ename": "zotero", + "commit": "13b0e96af19eeface7b3b91679b8406e45320ab3", + "sha256": "1vdq1im79jdbwps43zfnnxpqwcrp87r8k2fb4q6jr9ccdx2c6b33", + "fetcher": "gitlab", + "repo": "fvdbeek/emacs-zotero", + "unstable": { + "version": [ + 20210406, + 2204 + ], + "deps": [ + "ht", + "oauth", + "s" + ], + "commit": "bee8196c5db26b75abc1359a5a7cb8a2b1f192ad", + "error": [ + "exited abnormally with code 1\n", + "", + "warning: unknown setting 'experimental-features'\nwarning: unable to download 'https://gitlab.com/fvdbeek/emacs-zotero/repository/archive.tar.gz?ref=bee8196c5db26b75abc1359a5a7cb8a2b1f192ad': HTTP error 503; retrying in 324 ms\nwarning: unable to download 'https://gitlab.com/fvdbeek/emacs-zotero/repository/archive.tar.gz?ref=bee8196c5db26b75abc1359a5a7cb8a2b1f192ad': HTTP error 503; retrying in 632 ms\nwarning: unable to download 'https://gitlab.com/fvdbeek/emacs-zotero/repository/archive.tar.gz?ref=bee8196c5db26b75abc1359a5a7cb8a2b1f192ad': HTTP error 503; retrying in 1159 ms\nwarning: unable to download 'https://gitlab.com/fvdbeek/emacs-zotero/repository/archive.tar.gz?ref=bee8196c5db26b75abc1359a5a7cb8a2b1f192ad': HTTP error 503; retrying in 2278 ms\nerror: unable to download 'https://gitlab.com/fvdbeek/emacs-zotero/repository/archive.tar.gz?ref=bee8196c5db26b75abc1359a5a7cb8a2b1f192ad': HTTP error 503\n" + ] + } + }, { "ename": "zotxt", "commit": "b633453e77a719f6b6b6564e66c1c1260db38aa6", @@ -111938,14 +112417,14 @@ "repo": "fourier/ztree", "unstable": { "version": [ - 20210215, - 2111 + 20210409, + 1841 ], "deps": [ "cl-lib" ], - "commit": "dc5f76923436ea87b802b56a54185b6888177a8c", - "sha256": "17y1hjhygh2kq487ab1s8n2ba9npdmqg6354jv3gha6ar3mib1qi" + "commit": "c9ad9136d52ca5a81475693864e255d29448f43f", + "sha256": "03i5pa3nfdz6g0yrdk7r2qcn679w0s85cc5kcmgrwlnhdzakgr80" } }, { From 6055c5909657394604b81f49896ede8c73e089b9 Mon Sep 17 00:00:00 2001 From: AndersonTorres Date: Thu, 15 Apr 2021 19:58:53 -0300 Subject: [PATCH 154/230] Update elpa recipes --- .../editors/emacs-modes/elpa-generated.nix | 135 ++++++++++++------ 1 file changed, 90 insertions(+), 45 deletions(-) diff --git a/pkgs/applications/editors/emacs-modes/elpa-generated.nix b/pkgs/applications/editors/emacs-modes/elpa-generated.nix index 857b0562c00..f7876f84140 100644 --- a/pkgs/applications/editors/emacs-modes/elpa-generated.nix +++ b/pkgs/applications/editors/emacs-modes/elpa-generated.nix @@ -110,6 +110,21 @@ license = lib.licenses.free; }; }) {}; + aggressive-completion = callPackage ({ elpaBuild, emacs, fetchurl, lib }: + elpaBuild { + pname = "aggressive-completion"; + ename = "aggressive-completion"; + version = "1.5"; + src = fetchurl { + url = "https://elpa.gnu.org/packages/aggressive-completion-1.5.tar"; + sha256 = "1gy0q5yc1a0w31qpyb92f672zcfgxbp5s104ycgk11jxk4y17nw9"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://elpa.gnu.org/packages/aggressive-completion.html"; + license = lib.licenses.free; + }; + }) {}; aggressive-indent = callPackage ({ cl-lib ? null , elpaBuild , emacs @@ -219,16 +234,16 @@ license = lib.licenses.free; }; }) {}; - auctex = callPackage ({ cl-lib ? null, elpaBuild, emacs, fetchurl, lib }: + auctex = callPackage ({ elpaBuild, emacs, fetchurl, lib }: elpaBuild { pname = "auctex"; ename = "auctex"; - version = "13.0.5"; + version = "13.0.6"; src = fetchurl { - url = "https://elpa.gnu.org/packages/auctex-13.0.5.tar"; - sha256 = "072wwsqfl8n2gi2inbp0s8k1ydr6fh1zyvc3rgynwzibjjniy319"; + url = "https://elpa.gnu.org/packages/auctex-13.0.6.tar"; + sha256 = "00wp388rh2nnk8fam53kilykg90jylps31qxv9ijy1lsp1hqdjys"; }; - packageRequires = [ cl-lib emacs ]; + packageRequires = [ emacs ]; meta = { homepage = "https://elpa.gnu.org/packages/auctex.html"; license = lib.licenses.free; @@ -925,10 +940,10 @@ elpaBuild { pname = "dts-mode"; ename = "dts-mode"; - version = "0.1.0"; + version = "0.1.1"; src = fetchurl { - url = "https://elpa.gnu.org/packages/dts-mode-0.1.0.el"; - sha256 = "08xwqbdg0gwipc3gfacs3gpc6zz6lhkw7pyj7n9qhg020c4qv7hq"; + url = "https://elpa.gnu.org/packages/dts-mode-0.1.1.tar"; + sha256 = "1hdbf7snfbg3pfg1vhbak1gq5smaklvaqj1y9mjcnxyipqi47q28"; }; packageRequires = []; meta = { @@ -1133,10 +1148,10 @@ elpaBuild { pname = "emms"; ename = "emms"; - version = "6.3"; + version = "7.1"; src = fetchurl { - url = "https://elpa.gnu.org/packages/emms-6.3.tar"; - sha256 = "12cfq503li0gcqmm5bmqz8yjvfdif5xvz0l9vx3g5jl6ljygwgmf"; + url = "https://elpa.gnu.org/packages/emms-7.1.tar"; + sha256 = "1dng8dy0w0wsdvvnjnrllwv5a8wq3kj20jik994b7prdx5dn6y52"; }; packageRequires = [ cl-lib seq ]; meta = { @@ -1205,10 +1220,10 @@ elpaBuild { pname = "excorporate"; ename = "excorporate"; - version = "0.9.3"; + version = "0.9.5"; src = fetchurl { - url = "https://elpa.gnu.org/packages/excorporate-0.9.3.tar"; - sha256 = "1ybj0ww7x7l7ymykk6hs720whabavmwnrwq7x8dkn41wma181zzy"; + url = "https://elpa.gnu.org/packages/excorporate-0.9.5.tar"; + sha256 = "0z5x8lqvxh8zra23nmh36cdnr2yk855i4fc3mlbwaj5sdy9sqpf5"; }; packageRequires = [ emacs fsm nadvice soap-client url-http-ntlm ]; meta = { @@ -1366,16 +1381,16 @@ license = lib.licenses.free; }; }) {}; - ggtags = callPackage ({ cl-lib ? null, elpaBuild, emacs, fetchurl, lib }: + ggtags = callPackage ({ elpaBuild, emacs, fetchurl, lib }: elpaBuild { pname = "ggtags"; ename = "ggtags"; - version = "0.8.13"; + version = "0.9.0"; src = fetchurl { - url = "https://elpa.gnu.org/packages/ggtags-0.8.13.el"; - sha256 = "1qa7lcrcmf76sf6dy8sxbg4adq7rg59fm0n5848w3qxgsr0h45fg"; + url = "https://elpa.gnu.org/packages/ggtags-0.9.0.tar"; + sha256 = "0p79x9g94jynl83ndvqp9349vhgkzxzhnc517r8hn44iqxqf6ghg"; }; - packageRequires = [ cl-lib emacs ]; + packageRequires = [ emacs ]; meta = { homepage = "https://elpa.gnu.org/packages/ggtags.html"; license = lib.licenses.free; @@ -1779,10 +1794,10 @@ elpaBuild { pname = "ivy-posframe"; ename = "ivy-posframe"; - version = "0.5.5"; + version = "0.6.0"; src = fetchurl { - url = "https://elpa.gnu.org/packages/ivy-posframe-0.5.5.tar"; - sha256 = "184730grclxmlw6nfs41d4g6fvz9c6xnclvwgqx1ii0xm7p9xy95"; + url = "https://elpa.gnu.org/packages/ivy-posframe-0.6.0.tar"; + sha256 = "07dzglrcdl54lkznyphw97xwd9bcwzdcgzkav0vqfk7f5cwh1wkf"; }; packageRequires = [ emacs ivy posframe ]; meta = { @@ -2497,16 +2512,16 @@ license = lib.licenses.free; }; }) {}; - org = callPackage ({ elpaBuild, fetchurl, lib }: + org = callPackage ({ elpaBuild, emacs, fetchurl, lib }: elpaBuild { pname = "org"; ename = "org"; - version = "9.4.4"; + version = "9.4.5"; src = fetchurl { - url = "https://elpa.gnu.org/packages/org-9.4.4.tar"; - sha256 = "05ma8n6hr10323d85ay8ai0xrpc9q2m93n8avqh7j9fmmb3bhr0b"; + url = "https://elpa.gnu.org/packages/org-9.4.5.tar"; + sha256 = "0h5qhrd984vf17qc227wz68191xfgbpq32dyhw0lcz2d9i0pl3xk"; }; - packageRequires = []; + packageRequires = [ emacs ]; meta = { homepage = "https://elpa.gnu.org/packages/org.html"; license = lib.licenses.free; @@ -2561,10 +2576,10 @@ elpaBuild { pname = "osc"; ename = "osc"; - version = "0.2"; + version = "0.4"; src = fetchurl { - url = "https://elpa.gnu.org/packages/osc-0.2.el"; - sha256 = "1b1ck9kb9mkyd7nlj4cqahsshar6h8mpvqss6n3dp4cl3r6dk1sw"; + url = "https://elpa.gnu.org/packages/osc-0.4.tar"; + sha256 = "0zfrzxalvvf9wwwhwsqgl3v2ca6m2rfl5hd7sz662s6gmbwawqqa"; }; packageRequires = []; meta = { @@ -2726,10 +2741,10 @@ elpaBuild { pname = "posframe"; ename = "posframe"; - version = "0.8.8"; + version = "1.0.0"; src = fetchurl { - url = "https://elpa.gnu.org/packages/posframe-0.8.8.tar"; - sha256 = "1ij6brzcxv9viz37qafcinlfx5l20w8x8s6786r1rsda5n1xsmvd"; + url = "https://elpa.gnu.org/packages/posframe-1.0.0.tar"; + sha256 = "1k06dbh9xqn2vix5qkcapl57v0c21b344r8dx6j5qr4jxirsn2x5"; }; packageRequires = [ emacs ]; meta = { @@ -3293,6 +3308,21 @@ license = lib.licenses.free; }; }) {}; + shell-command-plus = callPackage ({ elpaBuild, emacs, fetchurl, lib }: + elpaBuild { + pname = "shell-command-plus"; + ename = "shell-command+"; + version = "2.0.0"; + src = fetchurl { + url = "https://elpa.gnu.org/packages/shell-command+-2.0.0.tar"; + sha256 = "1l8lwami4rbp94sbb1k4dvv7z0dvf51s0992xragpn9b9jbx5qd6"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://elpa.gnu.org/packages/shell-command+.html"; + license = lib.licenses.free; + }; + }) {}; shen-mode = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild { pname = "shen-mode"; @@ -3676,10 +3706,10 @@ elpaBuild { pname = "tramp"; ename = "tramp"; - version = "2.5.0.2"; + version = "2.5.0.3"; src = fetchurl { - url = "https://elpa.gnu.org/packages/tramp-2.5.0.2.tar"; - sha256 = "16f782rjkmxxs5sz3wv4d46i7hbl483ashmrkvljf7lpnrl91s93"; + url = "https://elpa.gnu.org/packages/tramp-2.5.0.3.tar"; + sha256 = "0c77d1ihn17lzk9jb7ss346ryprnbii1zmijl6zj0kk4lm8fpfl3"; }; packageRequires = [ emacs ]; meta = { @@ -3897,10 +3927,10 @@ elpaBuild { pname = "verilog-mode"; ename = "verilog-mode"; - version = "2021.2.2.263931197"; + version = "2021.4.12.188864585"; src = fetchurl { - url = "https://elpa.gnu.org/packages/verilog-mode-2021.2.2.263931197.tar"; - sha256 = "0rizadyzrsprc3mw3h2ag4760wapx5gxzsr11rgrllwzzqwin1ks"; + url = "https://elpa.gnu.org/packages/verilog-mode-2021.4.12.188864585.tar"; + sha256 = "0np2q0jhf1fbb1nl5nx1q9hw40yg62bhlddp2raqryxbkvsh0nbv"; }; packageRequires = []; meta = { @@ -3908,6 +3938,21 @@ license = lib.licenses.free; }; }) {}; + vertico = callPackage ({ elpaBuild, emacs, fetchurl, lib }: + elpaBuild { + pname = "vertico"; + ename = "vertico"; + version = "0.4"; + src = fetchurl { + url = "https://elpa.gnu.org/packages/vertico-0.4.tar"; + sha256 = "1af9ri51i7pn1pcsmbavnwqafrn46vbxrbqjzfi6a7q6n5yv77im"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://elpa.gnu.org/packages/vertico.html"; + license = lib.licenses.free; + }; + }) {}; vigenere = callPackage ({ elpaBuild, emacs, fetchurl, lib }: elpaBuild { pname = "vigenere"; @@ -3930,10 +3975,10 @@ elpaBuild { pname = "visual-filename-abbrev"; ename = "visual-filename-abbrev"; - version = "1.0"; + version = "1.1"; src = fetchurl { - url = "https://elpa.gnu.org/packages/visual-filename-abbrev-1.0.el"; - sha256 = "086cmyv08jd3qadjrd14b7c932i8msxjdvxxa36pyac18d3i50kj"; + url = "https://elpa.gnu.org/packages/visual-filename-abbrev-1.1.tar"; + sha256 = "1l2wq7q28lcl78flxqvsxc9h96whpynqq8kpmbiy3nzlw2mrgr8g"; }; packageRequires = [ emacs ]; meta = { @@ -4268,10 +4313,10 @@ elpaBuild { pname = "ztree"; ename = "ztree"; - version = "1.0.5"; + version = "1.0.6"; src = fetchurl { - url = "https://elpa.gnu.org/packages/ztree-1.0.5.tar"; - sha256 = "14pbbsyav1dzz8m8waqdcmcx9bhw5g8m2kh1ahpxc3i2lfhdan1x"; + url = "https://elpa.gnu.org/packages/ztree-1.0.6.tar"; + sha256 = "1cyd31az566dmh3lyp7czw7kkkih7drr4c88b7da1xzbfkvibm2j"; }; packageRequires = [ cl-lib ]; meta = { From 1046b6cebfa86280d2a96d7554463d47e31c3888 Mon Sep 17 00:00:00 2001 From: AndersonTorres Date: Thu, 15 Apr 2021 20:16:33 -0300 Subject: [PATCH 155/230] Manual fixup of shell-command-plus autogeneration --- .../editors/emacs-modes/elpa-generated.nix | 15 --------------- 1 file changed, 15 deletions(-) diff --git a/pkgs/applications/editors/emacs-modes/elpa-generated.nix b/pkgs/applications/editors/emacs-modes/elpa-generated.nix index f7876f84140..ca76e43e413 100644 --- a/pkgs/applications/editors/emacs-modes/elpa-generated.nix +++ b/pkgs/applications/editors/emacs-modes/elpa-generated.nix @@ -3308,21 +3308,6 @@ license = lib.licenses.free; }; }) {}; - shell-command-plus = callPackage ({ elpaBuild, emacs, fetchurl, lib }: - elpaBuild { - pname = "shell-command-plus"; - ename = "shell-command+"; - version = "2.0.0"; - src = fetchurl { - url = "https://elpa.gnu.org/packages/shell-command+-2.0.0.tar"; - sha256 = "1l8lwami4rbp94sbb1k4dvv7z0dvf51s0992xragpn9b9jbx5qd6"; - }; - packageRequires = [ emacs ]; - meta = { - homepage = "https://elpa.gnu.org/packages/shell-command+.html"; - license = lib.licenses.free; - }; - }) {}; shen-mode = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild { pname = "shen-mode"; From 22fb4458c0087ae5b50228e8a5f9fff408fcc7c3 Mon Sep 17 00:00:00 2001 From: Alex Wied Date: Thu, 15 Apr 2021 19:25:59 -0400 Subject: [PATCH 156/230] zcash: 4.3.0 -> 4.4.0 (#119579) Co-authored-by: Alex Wied --- .../blockchains/zcash/default.nix | 26 +++++++------------ 1 file changed, 10 insertions(+), 16 deletions(-) diff --git a/pkgs/applications/blockchains/zcash/default.nix b/pkgs/applications/blockchains/zcash/default.nix index 77601aa3d56..a899071fe58 100644 --- a/pkgs/applications/blockchains/zcash/default.nix +++ b/pkgs/applications/blockchains/zcash/default.nix @@ -1,25 +1,26 @@ { rust, rustPlatform, stdenv, lib, fetchFromGitHub, autoreconfHook, makeWrapper -, fetchpatch, cargo, pkg-config, curl, coreutils, boost174, db62, hexdump -, libsodium, libevent, utf8cpp, util-linux, withWallet ? true, withDaemon ? true -, withUtils ? true +, cargo, pkg-config, curl, coreutils, boost174, db62, hexdump, libsodium +, libevent, utf8cpp, util-linux, withDaemon ? true, withMining ? true +, withUtils ? true, withWallet ? true, withZmq ? true, zeromq }: rustPlatform.buildRustPackage.override { stdenv = stdenv; } rec { pname = "zcash"; - version = "4.3.0"; + version = "4.4.0"; src = fetchFromGitHub { owner = "zcash"; repo = "zcash"; rev = "v${version}"; - sha256 = "00pn1jw8j90y7i8nc92b51znz4gczphvdzbkbcjx63cf6vk7v4ks"; + sha256 = "19vhblyqkaf1lapx8s4v88xjpslqmrd1jnar46rschzcz0mm9sq4"; }; - cargoSha256 = "1rl9sjbvpfrv1mlyb04vw1935qx0kz9cs177xl7izdva1ixk9blr"; + cargoSha256 = "1yiy1506ijndxb9bx79p7fkfvw1c5zdsljil4m55xz1mv8dzhbgm"; nativeBuildInputs = [ autoreconfHook cargo hexdump makeWrapper pkg-config ]; buildInputs = [ boost174 libevent libsodium utf8cpp ] - ++ lib.optional withWallet db62; + ++ lib.optional withWallet db62 + ++ lib.optional withZmq zeromq; # Use the stdenv default phases (./configure; make) instead of the # ones from buildRustPackage. @@ -28,14 +29,6 @@ rustPlatform.buildRustPackage.override { stdenv = stdenv; } rec { checkPhase = "checkPhase"; installPhase = "installPhase"; - patches = [ - # See https://github.com/zcash/zcash/pull/5015 - (fetchpatch { - url = "https://github.com/zcash/zcash/commit/a0ac27ec6ed434a233c7ad2468258f6e6e7e9688.patch"; - sha256 = "0pmx1spql9p8vvpjgw7qf3qy46f4mh9ni16bq4ss1xz1z9zgjc4k"; - }) - ]; - postPatch = '' # Have to do this here instead of in preConfigure because # cargoDepsCopy gets unset after postPatch. @@ -49,7 +42,8 @@ rustPlatform.buildRustPackage.override { stdenv = stdenv; } rec { "RUST_TARGET=${rust.toRustTargetSpec stdenv.hostPlatform}" ] ++ lib.optional (!withWallet) "--disable-wallet" ++ lib.optional (!withDaemon) "--without-daemon" - ++ lib.optional (!withUtils) "--without-utils"; + ++ lib.optional (!withUtils) "--without-utils" + ++ lib.optional (!withMining) "--disable-mining"; enableParallelBuilding = true; From c638a195765000c2e4765dce068496f8ae68fefe Mon Sep 17 00:00:00 2001 From: Samuel Ainsworth Date: Thu, 15 Apr 2021 20:47:20 -0700 Subject: [PATCH 157/230] nodePackages.remod-cli: init at 1.0.1 --- .../node-packages/node-packages.json | 1 + .../node-packages/node-packages.nix | 1307 ++++++++++------- 2 files changed, 763 insertions(+), 545 deletions(-) diff --git a/pkgs/development/node-packages/node-packages.json b/pkgs/development/node-packages/node-packages.json index 9ee15fcc4d6..40079afe143 100644 --- a/pkgs/development/node-packages/node-packages.json +++ b/pkgs/development/node-packages/node-packages.json @@ -195,6 +195,7 @@ , "react-tools" , "readability-cli" , "redoc-cli" +, "remod-cli" , "reveal.js" , "rimraf" , "rollup" diff --git a/pkgs/development/node-packages/node-packages.nix b/pkgs/development/node-packages/node-packages.nix index 7b5c0a15071..3f049bc582a 100644 --- a/pkgs/development/node-packages/node-packages.nix +++ b/pkgs/development/node-packages/node-packages.nix @@ -49,13 +49,13 @@ let sha512 = "o/xdK8b4P0t/xpCARgWXAeaiWeh9jeua6bP1jrcbfN39+Z4zC4x2jg4NysHNhz6spRG8dJFH3kJIUoIbs0Ckww=="; }; }; - "@angular-devkit/architect-0.1102.8" = { + "@angular-devkit/architect-0.1102.9" = { name = "_at_angular-devkit_slash_architect"; packageName = "@angular-devkit/architect"; - version = "0.1102.8"; + version = "0.1102.9"; src = fetchurl { - url = "https://registry.npmjs.org/@angular-devkit/architect/-/architect-0.1102.8.tgz"; - sha512 = "EMl81SRyTntjE9U9m4piGvlbs2PdmBTVl2LS8GK3fimunlIzebu9WhDwAmqZdm4HEXiYmiBcCbVaHkYTU8k0Kg=="; + url = "https://registry.npmjs.org/@angular-devkit/architect/-/architect-0.1102.9.tgz"; + sha512 = "AU7i0VqWUwBc04oyT98Pp6sMDMp67JTZd/Cfrz5AM4MqrCZsDJMsTlWH26fAbESSLHgNst7H91Eq0cnC8rCmOQ=="; }; }; "@angular-devkit/core-11.2.4" = { @@ -76,13 +76,13 @@ let sha512 = "3dA0Z6sIIxCDjZS/DucgmIKti7EZ/LgHoHgCO72Q50H5ZXbUSNBz5wGl5hVq2+gzrnFgU/0u40MIs6eptk30ZA=="; }; }; - "@angular-devkit/core-11.2.8" = { + "@angular-devkit/core-11.2.9" = { name = "_at_angular-devkit_slash_core"; packageName = "@angular-devkit/core"; - version = "11.2.8"; + version = "11.2.9"; src = fetchurl { - url = "https://registry.npmjs.org/@angular-devkit/core/-/core-11.2.8.tgz"; - sha512 = "iNodaySWW1JrF+oGZCi0rYDJXO96T4K7H6BLz6xapSwFxkY+Xr4CBuTqEp2DKzAZ+sjYFmsItLmNedwOOBnwfA=="; + url = "https://registry.npmjs.org/@angular-devkit/core/-/core-11.2.9.tgz"; + sha512 = "TqihgUEKjX4C1hSd8RgUyCwuezFRdput9Ctcq8c4VgOcseEnXq3BkCSJbXtUh4Fln8WPxM7WHM8HClcWya/41g=="; }; }; "@angular-devkit/schematics-11.2.4" = { @@ -103,13 +103,13 @@ let sha512 = "bhi2+5xtVAjtr3bsXKT8pnoBamQrArd/Y20ueA4Od7cd38YT97nzTA1wyHBFG0vWd0HMyg42ZS0aycNBuOebaA=="; }; }; - "@angular-devkit/schematics-11.2.8" = { + "@angular-devkit/schematics-11.2.9" = { name = "_at_angular-devkit_slash_schematics"; packageName = "@angular-devkit/schematics"; - version = "11.2.8"; + version = "11.2.9"; src = fetchurl { - url = "https://registry.npmjs.org/@angular-devkit/schematics/-/schematics-11.2.8.tgz"; - sha512 = "EoCgDPr4VfDajoCW5/XDTyxEnaNjE+9XXVp9mXWYMMSBxKCZIrbieN4+SpjxyKDBl2ZKtTtZU1zWJ2Yerk66Cg=="; + url = "https://registry.npmjs.org/@angular-devkit/schematics/-/schematics-11.2.9.tgz"; + sha512 = "NqcBMK9ZbfXykj+2/cSlZcLVmbep/N+yYb+dUSfvRup3rW3uYSpMMJAnys3ro0m7TnUrI7h7t0UTgX8oxjlCow=="; }; }; "@angular-devkit/schematics-cli-0.1102.6" = { @@ -1966,22 +1966,22 @@ let sha512 = "Ydf4LidRB/EBI+YrB+cVLqIseiRfjUI/AeHBgjGMtq3GroraDu81OV7zqophRgupngoL3iS3JUMDMnxO7g39qA=="; }; }; - "@expo/config-3.3.35" = { + "@expo/config-3.3.36" = { name = "_at_expo_slash_config"; packageName = "@expo/config"; - version = "3.3.35"; + version = "3.3.36"; src = fetchurl { - url = "https://registry.npmjs.org/@expo/config/-/config-3.3.35.tgz"; - sha512 = "0jYSYBCge8s9TqvUbky64lWvpdAHKB9V+e4OrKOmxF8MILmBq2fYHiHkywn5VU7OaWiJQJixhrNUEBHWLJm4ig=="; + url = "https://registry.npmjs.org/@expo/config/-/config-3.3.36.tgz"; + sha512 = "qUaq3Ct3O2uML3ISsjekol3UNTQUvJm2AMrRjlwYXHzxG2EVIHNaWseOZoFtXxrfAj3IqWXEtS9avfho+nbgBg=="; }; }; - "@expo/config-plugins-1.0.25" = { + "@expo/config-plugins-1.0.26" = { name = "_at_expo_slash_config-plugins"; packageName = "@expo/config-plugins"; - version = "1.0.25"; + version = "1.0.26"; src = fetchurl { - url = "https://registry.npmjs.org/@expo/config-plugins/-/config-plugins-1.0.25.tgz"; - sha512 = "iRoBWnkMsGxrSxfXUXWpVfxpGjTUipI60+w9vO/QdXH02wFrS4k/jcZ4OSlPJMxpU/Lv5kgvgjvcJ22/SJpRow=="; + url = "https://registry.npmjs.org/@expo/config-plugins/-/config-plugins-1.0.26.tgz"; + sha512 = "zfdNL7FgM2yCYSX0sq7PUkcE9pk+w6GfgCnnXuYH5JOOi2UYtiOu0FgYc0M+ZmUlhNkTtiBZDt8aPGcikopwpw=="; }; }; "@expo/config-types-40.0.0-beta.2" = { @@ -2002,22 +2002,22 @@ let sha512 = "HsukM03X5/EXSucVsLN/oLqyFq/1jAjpADkgU1HLaezFpkr+TOquI6yDwdDp1450kcm891PE/SYJ+mCdPxzDLw=="; }; }; - "@expo/dev-server-0.1.61" = { + "@expo/dev-server-0.1.62" = { name = "_at_expo_slash_dev-server"; packageName = "@expo/dev-server"; - version = "0.1.61"; + version = "0.1.62"; src = fetchurl { - url = "https://registry.npmjs.org/@expo/dev-server/-/dev-server-0.1.61.tgz"; - sha512 = "Jo2WN5by6XvOu75cZMySTupo3izlPYFT3mITckaG1pMZnU76cAjC5C8Nd2gKPsZ+GHDilJ9eoZBt4JhG+wqDyw=="; + url = "https://registry.npmjs.org/@expo/dev-server/-/dev-server-0.1.62.tgz"; + sha512 = "ZNBQI/Q9Di19TjU7QT2lNxT+VEf8Aq6puwCNVQx2ohdKQjqh4+YSlvvChXY+x25SG1CorWc8SfLjTtXnIcheJg=="; }; }; - "@expo/dev-tools-0.13.90" = { + "@expo/dev-tools-0.13.92" = { name = "_at_expo_slash_dev-tools"; packageName = "@expo/dev-tools"; - version = "0.13.90"; + version = "0.13.92"; src = fetchurl { - url = "https://registry.npmjs.org/@expo/dev-tools/-/dev-tools-0.13.90.tgz"; - sha512 = "ANLi8TjjzZA1m4k0PFANMYj/NROMuRQUx92M8VG2CRjd/tl/5GOlJhfbVe0W3M+MOZZ+roLxl7c+TvbneZ7zsg=="; + url = "https://registry.npmjs.org/@expo/dev-tools/-/dev-tools-0.13.92.tgz"; + sha512 = "Fu5Bw5lk3Pl1aj9XMOSNP8trzksrmb4w969qiBzCGxVrrSql93xBPDwpd40oOiAesk+X7Qg6eF/IIJpYNfgUCg=="; }; }; "@expo/devcert-1.0.0" = { @@ -2047,13 +2047,13 @@ let sha512 = "C28McDuCIOmCmp6e2ZgIpNaT/fZG+L3/WFv5x2DCrooOQmamrkLSH/4Dib0NUmLgWVhgIhXL2hU4RB+LjzVvkQ=="; }; }; - "@expo/metro-config-0.1.61" = { + "@expo/metro-config-0.1.62" = { name = "_at_expo_slash_metro-config"; packageName = "@expo/metro-config"; - version = "0.1.61"; + version = "0.1.62"; src = fetchurl { - url = "https://registry.npmjs.org/@expo/metro-config/-/metro-config-0.1.61.tgz"; - sha512 = "Fig2G+Nqw42qzWBRylBF8sPlrQXo9aBIZx+17uVQzjGVs668zblIe+04k3BiIeLvGmKPvZSl7SIf767yaIP+dg=="; + url = "https://registry.npmjs.org/@expo/metro-config/-/metro-config-0.1.62.tgz"; + sha512 = "CvEtzryyLCDky9faY0/+rilkF4wS/KlbdtCbRk5esu5eH3dc0hztEap6TrIP4axQJ481uHRxy/dN2FBivQfLdg=="; }; }; "@expo/osascript-2.0.25" = { @@ -2065,13 +2065,13 @@ let sha512 = "rB+RLHCp72q0OBWmisoBswfTpyzc91OJMs3UQVWJP9mXVNJhemONt7PKjE+FinBm33uH1HCC6U7JPGigpVsJBg=="; }; }; - "@expo/package-manager-0.0.39" = { + "@expo/package-manager-0.0.40" = { name = "_at_expo_slash_package-manager"; packageName = "@expo/package-manager"; - version = "0.0.39"; + version = "0.0.40"; src = fetchurl { - url = "https://registry.npmjs.org/@expo/package-manager/-/package-manager-0.0.39.tgz"; - sha512 = "2KSx1jjdDmWsnkZfWZL4TwveeIyAcORQna5VOZdd+sBalK8taMtPQEdchwAGD4mOFsFFPmpbQHwboRfXoSlbOQ=="; + url = "https://registry.npmjs.org/@expo/package-manager/-/package-manager-0.0.40.tgz"; + sha512 = "JE5i/IYQ7ActzugX1MgzK5vUjAJHtEm+btEyNtZyf8SQKOlk+DMeSUdQuC6h07IgTlFIfqFiw1O8GW/x8RD77A=="; }; }; "@expo/plist-0.0.12" = { @@ -2119,13 +2119,13 @@ let sha512 = "LB7jWkqrHo+5fJHNrLAFdimuSXQ2MQ4lA7SQW5bf/HbsXuV2VrT/jN/M8f/KoWt0uJMGN4k/j7Opx4AvOOxSew=="; }; }; - "@expo/webpack-config-0.12.65" = { + "@expo/webpack-config-0.12.66" = { name = "_at_expo_slash_webpack-config"; packageName = "@expo/webpack-config"; - version = "0.12.65"; + version = "0.12.66"; src = fetchurl { - url = "https://registry.npmjs.org/@expo/webpack-config/-/webpack-config-0.12.65.tgz"; - sha512 = "+mrAWBVyiJQCReC7OPPuJD/qwlCI5gPxR3XrhuzTxXkm9v0sXTJsCOxCwWM6KF0ytSnUu/LNAA5VkbG19kpOlA=="; + url = "https://registry.npmjs.org/@expo/webpack-config/-/webpack-config-0.12.66.tgz"; + sha512 = "8U3m44Q2VMmoOl9Gw9djOsdCIX5yT8yD5ZnVyfyQHMGILz9uXkqn3kM0QNFFWhT8TZN/zCP6YkmYrH8yL3rTkg=="; }; }; "@expo/xcpretty-2.0.0" = { @@ -2182,13 +2182,13 @@ let sha512 = "T4eQ0uqhbTScsoXVx10Tlp0C2RgNdAzlbe52qJ0Tn288/Nuztda5Z/aTCRd5Rp5MRYBycjAf4iNot6ZHAP864g=="; }; }; - "@fluentui/react-7.166.2" = { + "@fluentui/react-7.167.0" = { name = "_at_fluentui_slash_react"; packageName = "@fluentui/react"; - version = "7.166.2"; + version = "7.167.0"; src = fetchurl { - url = "https://registry.npmjs.org/@fluentui/react/-/react-7.166.2.tgz"; - sha512 = "iZaApIEmzLy4vh+Ilwwb03Y/Ga6ETKf1Bv27JlpKfhxUH4Tv8FJy6qn3BbZRnSs2soQ6OAL7TX7xKjADCEIscQ=="; + url = "https://registry.npmjs.org/@fluentui/react/-/react-7.167.0.tgz"; + sha512 = "NuEywkYUvNouuqXuR6u/r8Dl2vo6RTbXCAm+WRDnSnwqsF8hablYdZL9ImgHczKOsRs6XK6X4lk//eiyE/Gtpw=="; }; }; "@fluentui/react-focus-7.17.6" = { @@ -2254,13 +2254,13 @@ let sha512 = "d4VSA86eL/AFTe5xtyZX+ePUjE8dIFu2T8zmdeNBSa5/kNgXPCx/o/wbFNHAGLJdGnk1vddRuMESD9HbOC8irw=="; }; }; - "@google-cloud/pubsub-2.10.0" = { + "@google-cloud/pubsub-2.11.0" = { name = "_at_google-cloud_slash_pubsub"; packageName = "@google-cloud/pubsub"; - version = "2.10.0"; + version = "2.11.0"; src = fetchurl { - url = "https://registry.npmjs.org/@google-cloud/pubsub/-/pubsub-2.10.0.tgz"; - sha512 = "XM/Fc6/W/LYzGH2pnhGLDR5E6JNZFMfzyUFP5bWgC4FK1KqIZ4g6hrnCCO38G4JfH2i1IuSQuefPF7FrZZo9tw=="; + url = "https://registry.npmjs.org/@google-cloud/pubsub/-/pubsub-2.11.0.tgz"; + sha512 = "j9sIjVLFqSEVrAZdrGbmu4GVVuCW70Sg6/EBKSMjNKhN/ctQsgcP6kUVLVnnrrTWVF0+FfdlfuCHtdYxGy7mfw=="; }; }; "@graphql-cli/common-4.1.0" = { @@ -2335,13 +2335,13 @@ let sha512 = "FlQC50VELwRxoWUbJMMMs5gG0Dl8BaQYMrXUHTsxwqR7UmksUYnysC21rdousvs6jVZ7pf4unZfZFtBjz+8Edg=="; }; }; - "@graphql-tools/merge-6.2.11" = { + "@graphql-tools/merge-6.2.12" = { name = "_at_graphql-tools_slash_merge"; packageName = "@graphql-tools/merge"; - version = "6.2.11"; + version = "6.2.12"; src = fetchurl { - url = "https://registry.npmjs.org/@graphql-tools/merge/-/merge-6.2.11.tgz"; - sha512 = "temQABWkDTZb/qJwcIdrEbyJ5WkhaWZQeYxiuxGqZWlIOoFkYfqzfAP2qKl2Ry+ZkN+Q/Yozr1/ap//xjpwAlA=="; + url = "https://registry.npmjs.org/@graphql-tools/merge/-/merge-6.2.12.tgz"; + sha512 = "SWq09Nv04QN/A5TlB54gKn8K3qmRIilyYWFTfyMTfKWWIaJFJG7XDWB1ZNDFTRb1h9XvKr0LCi4nL/Po8zMbSg=="; }; }; "@graphql-tools/schema-7.1.3" = { @@ -2371,13 +2371,13 @@ let sha512 = "ybgZ9EIJE3JMOtTrTd2VcIpTXtDrn2q6eiYkeYMKRVh3K41+LZa6YnR2zKERTXqTWqhobROwLt4BZbw2O3Aeeg=="; }; }; - "@graphql-tools/utils-7.7.2" = { + "@graphql-tools/utils-7.7.3" = { name = "_at_graphql-tools_slash_utils"; packageName = "@graphql-tools/utils"; - version = "7.7.2"; + version = "7.7.3"; src = fetchurl { - url = "https://registry.npmjs.org/@graphql-tools/utils/-/utils-7.7.2.tgz"; - sha512 = "whR/2gAt76njm0x7nLdTs3GG9uSSU9bx7oVurVGWgfEbhYuDaVRVsvfMhx9T1Zz9ICcmGMwzBquc1ng9mlG/WA=="; + url = "https://registry.npmjs.org/@graphql-tools/utils/-/utils-7.7.3.tgz"; + sha512 = "zF8Ll1v7DOFfCsZVYGkJqvi3Zpwfga8NutOZkToXrumMlTPaMhEDFkiuwoIK4lV2PMVUke5ZCmpn9pc5pqy4Tw=="; }; }; "@graphql-tools/wrap-7.0.5" = { @@ -2416,6 +2416,15 @@ let sha512 = "DT14xgw3PSzPxwS13auTEwxhMMOoz33DPUKNtmYK/QYbBSpLXJy78FGGs5yVoxVobEqPm4iW9MOIoz0A3bLTRQ=="; }; }; + "@grpc/proto-loader-0.6.0" = { + name = "_at_grpc_slash_proto-loader"; + packageName = "@grpc/proto-loader"; + version = "0.6.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@grpc/proto-loader/-/proto-loader-0.6.0.tgz"; + sha512 = "JwWZwGuN1nQuPdeL1d94hNGtnRtiOuy+SkdVUU8IwwQzksvdWvgKHyGDCesvAD0tndQTm1YUZHJw+JDTIDALyQ=="; + }; + }; "@gulp-sourcemaps/identity-map-1.0.2" = { name = "_at_gulp-sourcemaps_slash_identity-map"; packageName = "@gulp-sourcemaps/identity-map"; @@ -3667,13 +3676,13 @@ let sha512 = "/NdX1Ql8hKNM0vHFJnEr/bcw6BG0ULHD3HhInpniZw5ixpl+n/QIRfMEEmLCn7acedbM1zGdZvU5ZMbn9kcF5Q=="; }; }; - "@microsoft/load-themed-styles-1.10.160" = { + "@microsoft/load-themed-styles-1.10.161" = { name = "_at_microsoft_slash_load-themed-styles"; packageName = "@microsoft/load-themed-styles"; - version = "1.10.160"; + version = "1.10.161"; src = fetchurl { - url = "https://registry.npmjs.org/@microsoft/load-themed-styles/-/load-themed-styles-1.10.160.tgz"; - sha512 = "5m2yNw5lznr4odMulqQ9+caKWZzItECWKM5yQzAHnNIClvbQXymsX5q/nCrR/K89L2hHfTCpNSg1l5bkQqsgNw=="; + url = "https://registry.npmjs.org/@microsoft/load-themed-styles/-/load-themed-styles-1.10.161.tgz"; + sha512 = "ReHtvRknb3iYVUPl4c2PDEUWp18Jzh5x5MQE9zqHtSvYzpG6TGCWaqVBHKablshELqHv0dMf69929RB6VXiqyA=="; }; }; "@mitmaro/errors-1.0.0" = { @@ -3739,13 +3748,13 @@ let sha512 = "b+MGNyP9/LXkapreJzNUzcvuzZslj/RGgdVVJ16P2wSlYatfLycPObImqVJSmNAdyeShvNeM/pl3sVZsObFueg=="; }; }; - "@netlify/build-10.2.7" = { + "@netlify/build-11.0.2" = { name = "_at_netlify_slash_build"; packageName = "@netlify/build"; - version = "10.2.7"; + version = "11.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/@netlify/build/-/build-10.2.7.tgz"; - sha512 = "RdyIKPLYci5r/JeTdtqrZxnWQeEMVjQ0YVqbwxdZDXOUP9j4TCG3wrqJDfYScKkD+FcKJ0CLYihV906BWGJc0g=="; + url = "https://registry.npmjs.org/@netlify/build/-/build-11.0.2.tgz"; + sha512 = "VfuYi1IeMXlZZTwUpfc4GN2q18Icb03r3GSRO1Aw5XbH4Z+9yKWVup9w+pDz3LTlsf24FlrDi/K9/vXVIKjByQ=="; }; }; "@netlify/cache-utils-1.0.7" = { @@ -3757,13 +3766,13 @@ let sha512 = "yrdrnQkzg/qMovoFYwQ24UVt/OyHtP+t0KpQFd7eBl6gnuuGGgxFocaFFv6eKpMVwzHTsOwx/y9B/FcC3/6cfA=="; }; }; - "@netlify/config-5.12.0" = { + "@netlify/config-6.0.1" = { name = "_at_netlify_slash_config"; packageName = "@netlify/config"; - version = "5.12.0"; + version = "6.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/@netlify/config/-/config-5.12.0.tgz"; - sha512 = "PSe3lwRhchP4IuLdR9Csi98dHf2fvzn9zlywuWpdftWEflNhpwySZ/cV8sy8YJ3Xz6aAKT4wxwc0Tb5DV10Y9g=="; + url = "https://registry.npmjs.org/@netlify/config/-/config-6.0.1.tgz"; + sha512 = "rytv9UUW0QkBqwd0OkNF9SyEZLbGIbLmSms6h2Ob6pGiMUQd1wUwuX0PyS3ueIF/ZFB3PVKE8gUHNBC4wxyUrg=="; }; }; "@netlify/framework-info-3.3.0" = { @@ -3775,13 +3784,13 @@ let sha512 = "oWlP+sWfnr0tXSqd3nfma9Abq1NvZc4lFbHPMvxU6UhAcrBOpizsMaVT9sUK0UcMwzR8xwESdskZajtFoHA28g=="; }; }; - "@netlify/functions-utils-1.3.23" = { + "@netlify/functions-utils-1.3.24" = { name = "_at_netlify_slash_functions-utils"; packageName = "@netlify/functions-utils"; - version = "1.3.23"; + version = "1.3.24"; src = fetchurl { - url = "https://registry.npmjs.org/@netlify/functions-utils/-/functions-utils-1.3.23.tgz"; - sha512 = "+wSSFEUQz1c54ADcceCQzhrvfmsI2eHXO4B6+SLLub1XDvT2oBgtamJoyKpzjPvvQSjmIKVY0cv/AqYpbO5mVA=="; + url = "https://registry.npmjs.org/@netlify/functions-utils/-/functions-utils-1.3.24.tgz"; + sha512 = "rz2dGF6ViMGXPmERGdEq4WjQvGH77qXOI7JfSftKAyfpOWMlLmY6MrGdDNLlkOqNVv7xh9cxsfmXtN25Q5YHIg=="; }; }; "@netlify/git-utils-1.0.8" = { @@ -3865,13 +3874,13 @@ let sha512 = "ea6S9ik5X0TlA2e+jXk5D7lfvArPZjyQoIBEo7G1Tjw/vUU5Fx6KLfXv1iy7eJy+ENTLoyidscAjJ2wXlHI47g=="; }; }; - "@netlify/zip-it-and-ship-it-3.2.1" = { + "@netlify/zip-it-and-ship-it-3.4.0" = { name = "_at_netlify_slash_zip-it-and-ship-it"; packageName = "@netlify/zip-it-and-ship-it"; - version = "3.2.1"; + version = "3.4.0"; src = fetchurl { - url = "https://registry.npmjs.org/@netlify/zip-it-and-ship-it/-/zip-it-and-ship-it-3.2.1.tgz"; - sha512 = "0onx8AUjPWTybwphux8YNCLYg6c471XqfnT/a2kd1IKMBI2cdnGyGOt3xpEQmPoxz0qBG2aU62BAaFzMPYh89w=="; + url = "https://registry.npmjs.org/@netlify/zip-it-and-ship-it/-/zip-it-and-ship-it-3.4.0.tgz"; + sha512 = "/wHeHVcpVyo8nD93VdmluSJeipQrTt4mXp08krqQbPZPgA2HyupyYT4ZgjWKCh00Mrh2/k1XRbbxJYRc70lzkw=="; }; }; "@node-red/editor-api-1.3.2" = { @@ -3973,13 +3982,13 @@ let sha512 = "oN3y7FAROHhrAt7Rr7PnTSwrHrZVRTS2ZbyxeQwSSYD0ifwM3YNgQqbaRmjcWoPyq77MjchusjJDspbzMmip1Q=="; }; }; - "@npmcli/git-2.0.7" = { + "@npmcli/git-2.0.8" = { name = "_at_npmcli_slash_git"; packageName = "@npmcli/git"; - version = "2.0.7"; + version = "2.0.8"; src = fetchurl { - url = "https://registry.npmjs.org/@npmcli/git/-/git-2.0.7.tgz"; - sha512 = "HUSqNDWYsTpboc7yV1C4yPd/jbaGXfWVmGoTyB+h3QQSKMpYPzTXLrqUMpz+LEA6Dt9usUeRtjytwcrfoBMJpg=="; + url = "https://registry.npmjs.org/@npmcli/git/-/git-2.0.8.tgz"; + sha512 = "LPnzyBZ+1p7+JzHVwwKycMF8M3lr1ze3wxGRnxn/QxJtk++Y3prSJQrdBDGCxJyRpFsup6J3lrRBVYBhJVrM8Q=="; }; }; "@npmcli/installed-package-contents-1.0.7" = { @@ -4351,58 +4360,22 @@ let sha512 = "PffXX2AL8Sh0VHQ52jJC4u3T0H6wDK6N/4bg7xh4ngMYOIi13aR1kzVvX1sVDBgfGwDOkMbl4c54Xm3tlPx/+A=="; }; }; - "@opentelemetry/api-0.12.0" = { + "@opentelemetry/api-0.18.1" = { name = "_at_opentelemetry_slash_api"; packageName = "@opentelemetry/api"; - version = "0.12.0"; + version = "0.18.1"; src = fetchurl { - url = "https://registry.npmjs.org/@opentelemetry/api/-/api-0.12.0.tgz"; - sha512 = "Dn4vU5GlaBrIWzLpsM6xbJwKHdlpwBQ4Bd+cL9ofJP3hKT8jBXpBpribmyaqAzrajzzl2Yt8uTa9rFVLfjDAvw=="; + url = "https://registry.npmjs.org/@opentelemetry/api/-/api-0.18.1.tgz"; + sha512 = "pKNxHe3AJ5T2N5G3AlT9gx6FyF5K2FS9ZNc+FipC+f1CpVF/EY+JHTJ749dnM2kWIgZTbDJFiGMuc0FYjNSCOg=="; }; }; - "@opentelemetry/context-base-0.12.0" = { - name = "_at_opentelemetry_slash_context-base"; - packageName = "@opentelemetry/context-base"; - version = "0.12.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@opentelemetry/context-base/-/context-base-0.12.0.tgz"; - sha512 = "UXwSsXo3F3yZ1dIBOG9ID8v2r9e+bqLWoizCtTb8rXtwF+N5TM7hzzvQz72o3nBU+zrI/D5e+OqAYK8ZgDd3DA=="; - }; - }; - "@opentelemetry/core-0.12.0" = { - name = "_at_opentelemetry_slash_core"; - packageName = "@opentelemetry/core"; - version = "0.12.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@opentelemetry/core/-/core-0.12.0.tgz"; - sha512 = "oLZIkmTNWTJXzo1eA4dGu/S7wOVtylsgnEsCmhSJGhrJVDXm1eW/aGuNs3DVBeuxp0ZvQLAul3/PThsC3YrnzA=="; - }; - }; - "@opentelemetry/resources-0.12.0" = { - name = "_at_opentelemetry_slash_resources"; - packageName = "@opentelemetry/resources"; - version = "0.12.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@opentelemetry/resources/-/resources-0.12.0.tgz"; - sha512 = "8cYvIKB68cyupc7D6SWzkLtt13mbjgxMahL4JKCM6hWPyiGSJlPFEAey4XFXI5LLpPZRYTPHLVoLqI/xwCFZZA=="; - }; - }; - "@opentelemetry/semantic-conventions-0.12.0" = { + "@opentelemetry/semantic-conventions-0.18.2" = { name = "_at_opentelemetry_slash_semantic-conventions"; packageName = "@opentelemetry/semantic-conventions"; - version = "0.12.0"; + version = "0.18.2"; src = fetchurl { - url = "https://registry.npmjs.org/@opentelemetry/semantic-conventions/-/semantic-conventions-0.12.0.tgz"; - sha512 = "BuCcDW0uLNYYTns0/LwXkJ8lp8aDm7kpS+WunEmPAPRSCe6ciOYRvzn5reqJfX93rf+6A3U2SgrBnCTH+0qoQQ=="; - }; - }; - "@opentelemetry/tracing-0.12.0" = { - name = "_at_opentelemetry_slash_tracing"; - packageName = "@opentelemetry/tracing"; - version = "0.12.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@opentelemetry/tracing/-/tracing-0.12.0.tgz"; - sha512 = "2TUGhTGkhgnxTciHCNAILPSeyXageJewRqfP9wOrx65sKd/jgvNYoY8nYf4EVWVMirDOxKDsmYgUkjdQrwb2dg=="; + url = "https://registry.npmjs.org/@opentelemetry/semantic-conventions/-/semantic-conventions-0.18.2.tgz"; + sha512 = "+0P+PrP9qSFVaayNdek4P1OAGE+PEl2SsufuHDRmUpOY25Wzjo7Atyar56Trjc32jkNy4lID6ZFT6BahsR9P9A=="; }; }; "@ot-builder/bin-composite-types-1.0.4" = { @@ -4900,13 +4873,13 @@ let sha1 = "a777360b5b39a1a2e5106f8e858f2fd2d060c570"; }; }; - "@putdotio/api-client-8.15.2" = { + "@putdotio/api-client-8.15.3" = { name = "_at_putdotio_slash_api-client"; packageName = "@putdotio/api-client"; - version = "8.15.2"; + version = "8.15.3"; src = fetchurl { - url = "https://registry.npmjs.org/@putdotio/api-client/-/api-client-8.15.2.tgz"; - sha512 = "Z4KrAxOMsVA+SULZQ/2syOmXVoQakeKZ0pk4gtvbYnNMNrvcCF0OKSO0QgH2XwdFssm37KWNBjlYO3XucbHKNw=="; + url = "https://registry.npmjs.org/@putdotio/api-client/-/api-client-8.15.3.tgz"; + sha512 = "Z1MK912OTC+InURygDElVFAbnAdA8x9in+6GSHb/8rzWmp5iDA7PjU85OCOYH8hBfAwKlWINhR372tUUnUHImg=="; }; }; "@react-native-community/cli-debugger-ui-4.13.1" = { @@ -5044,13 +5017,13 @@ let sha512 = "c/qwwcHyafOQuVQJj0IlBjf5yYgBI7YPJ77k4fOJYesb41jio65eaJODRUmfYKhTOFBrIZ66kgvGPlNbjuoRdQ=="; }; }; - "@schematics/angular-11.2.8" = { + "@schematics/angular-11.2.9" = { name = "_at_schematics_slash_angular"; packageName = "@schematics/angular"; - version = "11.2.8"; + version = "11.2.9"; src = fetchurl { - url = "https://registry.npmjs.org/@schematics/angular/-/angular-11.2.8.tgz"; - sha512 = "5iJSzkFC3P4t47I9cbIuiaIm3Hkmr6YsXSPE6t8lmUjdcG+sX/AXlSgHmvE9RqoEWAlo1YiXPmQsQH/QIE0qPQ=="; + url = "https://registry.npmjs.org/@schematics/angular/-/angular-11.2.9.tgz"; + sha512 = "yiuWCf+naAaS8cib2a9KKAhkwLx4LVnxE4lpF1Q2mEE5znQ7npYwzQYxgMHD70eMuSrki/L5nM9s7ZdVr5OKyg=="; }; }; "@schematics/schematics-0.1102.6" = { @@ -5062,13 +5035,13 @@ let sha512 = "x77kbJL/HqR4gx0tbt35VCOGLyMvB7jD/x7eB1njhQRF8E/xynEOk3i+7A5VmK67QP5NJxU8BQKlPkJ55tBDmg=="; }; }; - "@schematics/update-0.1102.8" = { + "@schematics/update-0.1102.9" = { name = "_at_schematics_slash_update"; packageName = "@schematics/update"; - version = "0.1102.8"; + version = "0.1102.9"; src = fetchurl { - url = "https://registry.npmjs.org/@schematics/update/-/update-0.1102.8.tgz"; - sha512 = "advLOzXtlA71XP+XCkvN4HCDTFfSUAfUcEFWLSxIFu456ED6smGex8ydkH6YcWx9LM+auhyHiJmTNYFDI0vxig=="; + url = "https://registry.npmjs.org/@schematics/update/-/update-0.1102.9.tgz"; + sha512 = "JIbuvX4a87h7G9d3lsKTUceKXhE/lXtJEkGaQ2jv2sxFRxBkmMO2o2OmsKRDpIMtSRs7VTUTccK6RAOVZJX66w=="; }; }; "@segment/loosely-validate-event-2.0.0" = { @@ -5098,13 +5071,13 @@ let sha512 = "lOUyRopNTKJYVEU9T6stp2irwlTDsYMmUKBOUjnMcwGveuUfIJqrCOtFLtIPPj3XJlbZy5F68l4KP9rZ8Ipang=="; }; }; - "@serverless/components-3.8.2" = { + "@serverless/components-3.8.3" = { name = "_at_serverless_slash_components"; packageName = "@serverless/components"; - version = "3.8.2"; + version = "3.8.3"; src = fetchurl { - url = "https://registry.npmjs.org/@serverless/components/-/components-3.8.2.tgz"; - sha512 = "pelB/blbB329hDFr+2itkJh2KmTtAWX8CHvEA/28weG9TPgb+rsQuvbM3s1VWDvYqfscZcnv/M8fuWXWopEc6Q=="; + url = "https://registry.npmjs.org/@serverless/components/-/components-3.8.3.tgz"; + sha512 = "rdteMdPgsnJdfL8AcCguB1aFEII3cL2GL5XoOLwYUTJIZyJCC0kCkYl/gbN1H67XDASr5KD0eDyf8Dw0oCyfNA=="; }; }; "@serverless/core-1.1.2" = { @@ -5350,13 +5323,13 @@ let sha512 = "ca2JKOnSRzYHJkhOB9gYmdRZHmd02b/uBd/S0D5W+L9nIMS7sUBV5jfhKwVgrYPIpVNIc0XCI9rxK4TfkQRpiA=="; }; }; - "@snyk/code-client-3.4.0" = { + "@snyk/code-client-3.4.1" = { name = "_at_snyk_slash_code-client"; packageName = "@snyk/code-client"; - version = "3.4.0"; + version = "3.4.1"; src = fetchurl { - url = "https://registry.npmjs.org/@snyk/code-client/-/code-client-3.4.0.tgz"; - sha512 = "RY2IftAiWB7tp36Mcq7WiEwqoD8A/mqrD6N7oDWTxBOIqsH0t4djo/UibiWDJotaffO9aXXndOf3iZ/kTt+Rdg=="; + url = "https://registry.npmjs.org/@snyk/code-client/-/code-client-3.4.1.tgz"; + sha512 = "XJ7tUdX1iQyzN/BmHac7p+Oyw1SyTcqSkCNExwBJxyQdlnUAKK6QKIWLXS81tTpZ79FgCdT+0fdS0AjsyS99eA=="; }; }; "@snyk/composer-lockfile-parser-1.4.1" = { @@ -5395,13 +5368,13 @@ let sha512 = "E/Pfdze/WFfxwyuTFcfhQN1SwyUsc43yuCoW63RVBCaxTD6OzhVD2Pvc/Sy7BjiWUfmelzyKkIBpoow8zZX7Zg=="; }; }; - "@snyk/fix-1.526.0" = { + "@snyk/fix-1.539.0" = { name = "_at_snyk_slash_fix"; packageName = "@snyk/fix"; - version = "1.526.0"; + version = "1.539.0"; src = fetchurl { - url = "https://registry.npmjs.org/@snyk/fix/-/fix-1.526.0.tgz"; - sha512 = "+aMUNRhOdoN4YPGxXlN9+NwvKOr/DNBCGgC8DnNSujcJ9Nj1M8oHrnVoTy56/tgbJ8qyw/zwmCKAm383CfURKg=="; + url = "https://registry.npmjs.org/@snyk/fix/-/fix-1.539.0.tgz"; + sha512 = "oZ3BdRgbkyp/3P2DyLsz11n5xbRzvhIySDv9Qg0UWyjByh9SbR70CCqa7VOCXuTCRpFXIZf15GYNpNLBdOJ2Rw=="; }; }; "@snyk/gemfile-1.2.0" = { @@ -6052,15 +6025,6 @@ let sha512 = "C7srjHiVG3Ey1nR6d511dtDkCEjxuN9W1HWAEjGq8kpcwmNM6JJkpC0xvabM7BXTG2wDq8Eu33iH9aQKa7IvLQ=="; }; }; - "@types/cors-2.8.8" = { - name = "_at_types_slash_cors"; - packageName = "@types/cors"; - version = "2.8.8"; - src = fetchurl { - url = "https://registry.npmjs.org/@types/cors/-/cors-2.8.8.tgz"; - sha512 = "fO3gf3DxU2Trcbr75O7obVndW/X5k8rJNZkLXlQWStTHhP71PkRqjwPIEI0yMnJdg9R9OasjU+Bsr+Hr1xy/0w=="; - }; - }; "@types/debug-4.1.5" = { name = "_at_types_slash_debug"; packageName = "@types/debug"; @@ -6124,13 +6088,13 @@ let sha512 = "DLVpLEGTEZGBXOYoYoagHSxXkDHONc0fZouF2ayw7Q18aRu1Afwci+1CFKvPpouCUOVWP+dmCaAWpQjswe7kpg=="; }; }; - "@types/eslint-7.2.9" = { + "@types/eslint-7.2.10" = { name = "_at_types_slash_eslint"; packageName = "@types/eslint"; - version = "7.2.9"; + version = "7.2.10"; src = fetchurl { - url = "https://registry.npmjs.org/@types/eslint/-/eslint-7.2.9.tgz"; - sha512 = "SdAAXZNvWfhtf3X3y1cbbCZhP3xyPh7mfTvzV6CgfWc/ZhiHpyr9bVroe2/RCHIf7gczaNcprhaBLsx0CCJHQA=="; + url = "https://registry.npmjs.org/@types/eslint/-/eslint-7.2.10.tgz"; + sha512 = "kUEPnMKrqbtpCq/KTaGFFKAcz6Ethm2EjCoKIDaCmfRBWLbFuTcOJfTlorwbnboXBzahqWLgUp1BQeKHiJzPUQ=="; }; }; "@types/eslint-scope-3.7.0" = { @@ -6412,6 +6376,15 @@ let sha512 = "k4ih8ayQ65e26vhCxeMTKtZ808DzC0RFQ4unBvPEy9bcFhS4aPm3oXgWWZNmZ4u+H2WzHQDCNrRC5iNX+afiZw=="; }; }; + "@types/json-patch-0.0.30" = { + name = "_at_types_slash_json-patch"; + packageName = "@types/json-patch"; + version = "0.0.30"; + src = fetchurl { + url = "https://registry.npmjs.org/@types/json-patch/-/json-patch-0.0.30.tgz"; + sha512 = "MhCUjojzDhVLnZnxwPwa+rETFRDQ0ffjxYdrqOP6TBO2O0/Z64PV5tNeYApo4bc4y4frbWOrRwv/eEkXlI13Rw=="; + }; + }; "@types/json-schema-7.0.7" = { name = "_at_types_slash_json-schema"; packageName = "@types/json-schema"; @@ -6664,13 +6637,13 @@ let sha512 = "fh+pAqt4xRzPfqA6eh3Z2y6fyZavRIumvjhaCL753+TVkGKGhpPeyrJG2JftD0T9q4GF00KjefsQ+PQNDdWQaQ=="; }; }; - "@types/node-10.17.56" = { + "@types/node-10.17.58" = { name = "_at_types_slash_node"; packageName = "@types/node"; - version = "10.17.56"; + version = "10.17.58"; src = fetchurl { - url = "https://registry.npmjs.org/@types/node/-/node-10.17.56.tgz"; - sha512 = "LuAa6t1t0Bfw4CuSR0UITsm1hP17YL+u82kfHGrHUWdhlBtH7sa7jGY5z7glGaIj/WDYDkRtgGd+KCjCzxBW1w=="; + url = "https://registry.npmjs.org/@types/node/-/node-10.17.58.tgz"; + sha512 = "Dn5RBxLohjdHFj17dVVw3rtrZAeXeWg+LQfvxDIW/fdPkSiuQk7h3frKMYtsQhtIW42wkErDcy9UMVxhGW4O7w=="; }; }; "@types/node-12.12.70" = { @@ -6682,13 +6655,13 @@ let sha512 = "i5y7HTbvhonZQE+GnUM2rz1Bi8QkzxdQmEv1LKOv4nWyaQk/gdeiTApuQR3PDJHX7WomAbpx2wlWSEpxXGZ/UQ=="; }; }; - "@types/node-13.13.48" = { + "@types/node-13.13.50" = { name = "_at_types_slash_node"; packageName = "@types/node"; - version = "13.13.48"; + version = "13.13.50"; src = fetchurl { - url = "https://registry.npmjs.org/@types/node/-/node-13.13.48.tgz"; - sha512 = "z8wvSsgWQzkr4sVuMEEOvwMdOQjiRY2Y/ZW4fDfjfe3+TfQrZqFKOthBgk2RnVEmtOKrkwdZ7uTvsxTBLjKGDQ=="; + url = "https://registry.npmjs.org/@types/node/-/node-13.13.50.tgz"; + sha512 = "y7kkh+hX/0jZNxMyBR/6asG0QMSaPSzgeVK63dhWHl4QAXCQB8lExXmzLL6SzmOgKHydtawpMnNhlDbv7DXPEA=="; }; }; "@types/node-14.11.1" = { @@ -6718,6 +6691,15 @@ let sha512 = "XYmBiy+ohOR4Lh5jE379fV2IU+6Jn4g5qASinhitfyO71b/sCo6MKsMLF5tc7Zf2CE8hViVQyYSobJNke8OvUw=="; }; }; + "@types/node-14.14.41" = { + name = "_at_types_slash_node"; + packageName = "@types/node"; + version = "14.14.41"; + src = fetchurl { + url = "https://registry.npmjs.org/@types/node/-/node-14.14.41.tgz"; + sha512 = "dueRKfaJL4RTtSa7bWeTK1M+VH+Gns73oCgzvYfHZywRCoPSd8EkXBL0mZ9unPTveBn+D9phZBaxuzpwjWkW0g=="; + }; + }; "@types/node-6.14.13" = { name = "_at_types_slash_node"; packageName = "@types/node"; @@ -9310,13 +9292,13 @@ let sha512 = "SfjKaccrhRzUQ8TAke9FrYppp4pZV3Rp8KCs+4Ox3kGtbco68acRPJkiYYtSVc4idR8XNAUOOVfAEZVNHdZQKQ=="; }; }; - "apollo-server-core-2.22.2" = { + "apollo-server-core-2.23.0" = { name = "apollo-server-core"; packageName = "apollo-server-core"; - version = "2.22.2"; + version = "2.23.0"; src = fetchurl { - url = "https://registry.npmjs.org/apollo-server-core/-/apollo-server-core-2.22.2.tgz"; - sha512 = "YPrhfN+I5vUerc4c0I6pd89fdqP5UNYCt/+MGv4bDA/a0kOCLvzylkQ3NlEepK1fewtqf4QO+S1LscC8vMmYdg=="; + url = "https://registry.npmjs.org/apollo-server-core/-/apollo-server-core-2.23.0.tgz"; + sha512 = "3/a4LPgRADc8CdT/nRh7W0CAqQv3Q4DJvakWQgKqGSqDEb/0u4IBynYjlQKuPBi4wwKdeK2Hb1wiQLl+zu4StQ=="; }; }; "apollo-server-env-3.0.0" = { @@ -9328,22 +9310,22 @@ let sha512 = "tPSN+VttnPsoQAl/SBVUpGbLA97MXG990XIwq6YUnJyAixrrsjW1xYG7RlaOqetxm80y5mBZKLrRDiiSsW/vog=="; }; }; - "apollo-server-errors-2.4.2" = { + "apollo-server-errors-2.5.0" = { name = "apollo-server-errors"; packageName = "apollo-server-errors"; - version = "2.4.2"; + version = "2.5.0"; src = fetchurl { - url = "https://registry.npmjs.org/apollo-server-errors/-/apollo-server-errors-2.4.2.tgz"; - sha512 = "FeGxW3Batn6sUtX3OVVUm7o56EgjxDlmgpTLNyWcLb0j6P8mw9oLNyAm3B+deHA4KNdNHO5BmHS2g1SJYjqPCQ=="; + url = "https://registry.npmjs.org/apollo-server-errors/-/apollo-server-errors-2.5.0.tgz"; + sha512 = "lO5oTjgiC3vlVg2RKr3RiXIIQ5pGXBFxYGGUkKDhTud3jMIhs+gel8L8zsEjKaKxkjHhCQAA/bcEfYiKkGQIvA=="; }; }; - "apollo-server-express-2.22.2" = { + "apollo-server-express-2.23.0" = { name = "apollo-server-express"; packageName = "apollo-server-express"; - version = "2.22.2"; + version = "2.23.0"; src = fetchurl { - url = "https://registry.npmjs.org/apollo-server-express/-/apollo-server-express-2.22.2.tgz"; - sha512 = "MRiWF/oT6toUz909iq1I08vKfRxaqRMKS/v9kzyEXcnuudUCQ5WnxrjZEh/iMEfr7RHSQ4STjY7E/ZooPnueqA=="; + url = "https://registry.npmjs.org/apollo-server-express/-/apollo-server-express-2.23.0.tgz"; + sha512 = "tzil7c51ODH0rT1Bc5VMksdWzHrYGavdLtnDz4M0ePiTm18Gc81HD7X/4DPczorerEpfwwkf2YlADtPQfRSxlw=="; }; }; "apollo-server-plugin-base-0.11.0" = { @@ -10759,13 +10741,13 @@ let sha512 = "+KBkqH7t/XE91Fqn8eyJeNIWsnhSWL8bSUqFD7TfE3FN07MTlC0nprGYp+2WfcYNz5i8Bus1vY2DHNVhtTImnw=="; }; }; - "aws-sdk-2.886.0" = { + "aws-sdk-2.888.0" = { name = "aws-sdk"; packageName = "aws-sdk"; - version = "2.886.0"; + version = "2.888.0"; src = fetchurl { - url = "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.886.0.tgz"; - sha512 = "GK2TiijM/sX3PMOvPbZFPBeL7hW5S0RstwgplEABVxCMPXLkk8ws5ENOwS/c74nrTQKSxZMn/3sThNEtb3J7Ew=="; + url = "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.888.0.tgz"; + sha512 = "9Rg14eneXnrs5Wh5FL42qGEXf7QaqaV/gMHU9SfvAA0SEM390QnwVjCSKF5YAReWjSuJriKJTDiodMI39J+Nrg=="; }; }; "aws-sign2-0.6.0" = { @@ -16844,13 +16826,13 @@ let sha1 = "0e790b3abfef90f6ecb77ae8585db9099caf7578"; }; }; - "contentful-management-7.14.1" = { + "contentful-management-7.15.1" = { name = "contentful-management"; packageName = "contentful-management"; - version = "7.14.1"; + version = "7.15.1"; src = fetchurl { - url = "https://registry.npmjs.org/contentful-management/-/contentful-management-7.14.1.tgz"; - sha512 = "s8Jisju/GI9n0zvkBQDix8jo8Grq3dfv0VPicc4cRXUopxjy8O+zH+nBiiU+M9TPS4RxtivDzwNH64smweDkbg=="; + url = "https://registry.npmjs.org/contentful-management/-/contentful-management-7.15.1.tgz"; + sha512 = "Wk4gpoNDXThkof49W0S3WgdW42T9kKQZj+7V7aDs+VrW0/WfTiNh5fMiMt0rxLqkWjxFrsa1TMAxR0WzT3lLyQ=="; }; }; "contentful-sdk-core-6.7.0" = { @@ -18626,13 +18608,13 @@ let sha512 = "LbeEvGgIb8UMcAa0EATLNX0lelKWGYDQiPdHj+gLblGVhGLyNbaCn3EvrJf0A3Y/uOOU5aD6MTh5ZFCdEwGiCw=="; }; }; - "d3-scale-3.2.4" = { + "d3-scale-3.3.0" = { name = "d3-scale"; packageName = "d3-scale"; - version = "3.2.4"; + version = "3.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/d3-scale/-/d3-scale-3.2.4.tgz"; - sha512 = "PG6gtpbPCFqKbvdBEswQcJcTzHC8VEd/XzezF5e68KlkT4/ggELw/nR1tv863jY6ufKTvDlzCMZvhe06codbbA=="; + url = "https://registry.npmjs.org/d3-scale/-/d3-scale-3.3.0.tgz"; + sha512 = "1JGp44NQCt5d1g+Yy+GeOnZP7xHo0ii8zsQp6PGzd+C1/dl0KGsp9A7Mxwp+1D1o4unbTTxVdU/ZOIEBoeZPbQ=="; }; }; "d3-scale-chromatic-1.5.0" = { @@ -21362,13 +21344,13 @@ let sha512 = "1sQ1DRtQGpglFhc3urD4olMJzt/wxlbnAAsf+WY2xHf5c50ZovivZvCXSpVgTOP9f4TzOMvelWyspyfhxQKHzQ=="; }; }; - "electron-to-chromium-1.3.713" = { + "electron-to-chromium-1.3.717" = { name = "electron-to-chromium"; packageName = "electron-to-chromium"; - version = "1.3.713"; + version = "1.3.717"; src = fetchurl { - url = "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.713.tgz"; - sha512 = "HWgkyX4xTHmxcWWlvv7a87RHSINEcpKYZmDMxkUlHcY+CJcfx7xEfBHuXVsO1rzyYs1WQJ7EgDp2CoErakBIow=="; + url = "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.717.tgz"; + sha512 = "OfzVPIqD1MkJ7fX+yTl2nKyOE4FReeVfMCzzxQS+Kp43hZYwHwThlGP+EGIZRXJsxCM7dqo8Y65NOX/HP12iXQ=="; }; }; "electrum-client-git://github.com/janoside/electrum-client" = { @@ -22237,13 +22219,13 @@ let sha512 = "p5um32HOTO1kP+w7PRnB+5lQ43Z6muuMuIMffvDN8ZB4GcnjLBV6zGStpbASIMk4DCAvEaamhe2zhyCb/QXXsA=="; }; }; - "esbuild-0.11.10" = { + "esbuild-0.11.11" = { name = "esbuild"; packageName = "esbuild"; - version = "0.11.10"; + version = "0.11.11"; src = fetchurl { - url = "https://registry.npmjs.org/esbuild/-/esbuild-0.11.10.tgz"; - sha512 = "XvGbf+UreVFA24Tlk6sNOqNcvF2z49XAZt4E7A4H80+yqn944QOLTTxaU0lkdYNtZKFiITNea+VxmtrfjvnLPA=="; + url = "https://registry.npmjs.org/esbuild/-/esbuild-0.11.11.tgz"; + sha512 = "iq5YdV63vY/nUAFIvY92BXVkYjMbOchnofLKoLKMPZIa4uuIJAJG9WRA+ZRjQBZbrsORUwvZcANeG2d3p46PJQ=="; }; }; "esc-exit-2.0.2" = { @@ -23083,6 +23065,15 @@ let sha512 = "Kd3EgYfODHueq6GzVfs/VUolh2EgJsS8hkO3KpnDrxVjU3eq63eXM2ujXkhPP+OkeUOhL8CxdfZbQXzryb5C4g=="; }; }; + "events-to-array-1.1.2" = { + name = "events-to-array"; + packageName = "events-to-array"; + version = "1.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/events-to-array/-/events-to-array-1.1.2.tgz"; + sha1 = "2d41f563e1fe400ed4962fe1a4d5c6a7539df7f6"; + }; + }; "events.node-0.4.9" = { name = "events.node"; packageName = "events.node"; @@ -23380,13 +23371,13 @@ let sha1 = "a793d3ac0cad4c6ab571e9968fbbab6cb2532929"; }; }; - "expo-pwa-0.0.71" = { + "expo-pwa-0.0.72" = { name = "expo-pwa"; packageName = "expo-pwa"; - version = "0.0.71"; + version = "0.0.72"; src = fetchurl { - url = "https://registry.npmjs.org/expo-pwa/-/expo-pwa-0.0.71.tgz"; - sha512 = "qmW7fw9QzELiOWu8YD+NZlxLoZfmwNEbzQ83Wk4ZHrs1bod6tr67Mz4G/lgg9p4s8XHQKwF40xqEUF4qe4RA3A=="; + url = "https://registry.npmjs.org/expo-pwa/-/expo-pwa-0.0.72.tgz"; + sha512 = "Mhyl8aqUwncBDo+zBWpqoXIFe38cfK0A4axKmJaiy8IIZd+ficVqo4zXrYVeuKpBY+P+eqEbXLbhTJlktkMhow=="; }; }; "express-2.5.11" = { @@ -24487,13 +24478,13 @@ let sha512 = "LpCHtPQ3sFx67z+uh2HnSyWSLLu5Jxo21795uRDuar/EOuYWXib5EmPaGIBuSnRqH2IODiKA2k5re/K9OnN/Yg=="; }; }; - "filesize-6.2.1" = { + "filesize-6.2.2" = { name = "filesize"; packageName = "filesize"; - version = "6.2.1"; + version = "6.2.2"; src = fetchurl { - url = "https://registry.npmjs.org/filesize/-/filesize-6.2.1.tgz"; - sha512 = "neMilKeMJQ0zUWuxAciRVhtncuxF/Gkhig4+8FrL4g7ppqN7JEGRb1uZFjVid7OJk7CE3ulZuO7V+nB2WDJW+A=="; + url = "https://registry.npmjs.org/filesize/-/filesize-6.2.2.tgz"; + sha512 = "yMYcRU6K9yNRSYZWfrXOuNiQQx0aJiXJsJYAR2R2andmIFo5IJrfqoXw+2h1W8zLRxy612LwwY1sH0zuxUsz0g=="; }; }; "filestream-5.0.0" = { @@ -24919,13 +24910,13 @@ let sha512 = "jlbUu0XkbpXeXhan5xyTqVK1jmEKNxE8hpzznI3TThHTr76GiFwK0iRzhDo4KNy+S9h/KxHaqVhTP86vA6wHCg=="; }; }; - "flow-parser-0.148.0" = { + "flow-parser-0.149.0" = { name = "flow-parser"; packageName = "flow-parser"; - version = "0.148.0"; + version = "0.149.0"; src = fetchurl { - url = "https://registry.npmjs.org/flow-parser/-/flow-parser-0.148.0.tgz"; - sha512 = "m7YX6L2y0bW+bC+lH8mq3bWNS8zLdfXSkZR1Rrd9313abmBjEVYLez+D3NhYx8TnVcpJiiT28jbRVTnz/eG4ug=="; + url = "https://registry.npmjs.org/flow-parser/-/flow-parser-0.149.0.tgz"; + sha512 = "ruUVkZuM9oFQjhSsLO/OJYRYpGnuXJpTnIZmgzna6DyLFb3CLpeO27oJbWyeXaa830hmKf0JRzpcdFsFS8lmpg=="; }; }; "fluent-ffmpeg-2.1.2" = { @@ -25360,13 +25351,13 @@ let sha512 = "wJaE62fLaB3jCYvY2ZHjZvmKK2iiLiiehX38rz5QZxtdN8fVPJDeZUiVvJrHStdTc+23LHlyZuSEKgFc0pxi2g=="; }; }; - "fp-ts-2.9.5" = { + "fp-ts-2.10.2" = { name = "fp-ts"; packageName = "fp-ts"; - version = "2.9.5"; + version = "2.10.2"; src = fetchurl { - url = "https://registry.npmjs.org/fp-ts/-/fp-ts-2.9.5.tgz"; - sha512 = "MiHrA5teO6t8zKArE3DdMPT/Db6v2GUt5yfWnhBTrrsVfeCJUUnV6sgFvjGNBKDmEMqVwRFkEePL7wPwqrLKKA=="; + url = "https://registry.npmjs.org/fp-ts/-/fp-ts-2.10.2.tgz"; + sha512 = "YB/FSwESW8C3kVCbbyFiZSXXoQEJ/SaeHHorL6KCKHoPIPV6v/hyfMiXBPMjW7O7D9jfxlRs6VeCRonfqi1Tcg=="; }; }; "fragment-cache-0.2.1" = { @@ -26242,13 +26233,13 @@ let sha512 = "nBF+F1rAZVCu/p7rjzgA+Yb4lfYXrpl7a6VmJrU8wF9I1CKvP/QwPNZHnOlwbTkY6dvtFIzFMSyQXbLoTQPRpA=="; }; }; - "get-stream-6.0.0" = { + "get-stream-6.0.1" = { name = "get-stream"; packageName = "get-stream"; - version = "6.0.0"; + version = "6.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/get-stream/-/get-stream-6.0.0.tgz"; - sha512 = "A1B3Bh1UmL0bidM/YX2NsCOTnGJePL9rO/M+Mw3m9f2gUpfokS0hi5Eah0WSUEWZdZhIZtMjkIYS7mDfOqNHbg=="; + url = "https://registry.npmjs.org/get-stream/-/get-stream-6.0.1.tgz"; + sha512 = "ts6Wi+2j3jQjqi70w5AlN8DFnkSwC+MqmxEzdEALB2qXZYV3X/b1CTfgPLGJNMeAWxdPfU8FO1ms3NUfaHCPYg=="; }; }; "get-uri-3.0.2" = { @@ -28818,13 +28809,13 @@ let sha512 = "yHYTgWMQO8VvwNS22eLLloAkvungsKdKTLO8AJlftYIKNfJr3GK3zK0ZCfzDDGUBttdGc8xFy1mCitvNKQtC3Q=="; }; }; - "http-proxy-middleware-1.1.1" = { + "http-proxy-middleware-1.1.2" = { name = "http-proxy-middleware"; packageName = "http-proxy-middleware"; - version = "1.1.1"; + version = "1.1.2"; src = fetchurl { - url = "https://registry.npmjs.org/http-proxy-middleware/-/http-proxy-middleware-1.1.1.tgz"; - sha512 = "FIDg9zPvOwMhQ3XKB2+vdxK6WWbVAH7s5QpqQCif7a1TNL76GNAATWA1sy6q2gSfss8UJ/Nwza3N6QnFkKclpA=="; + url = "https://registry.npmjs.org/http-proxy-middleware/-/http-proxy-middleware-1.1.2.tgz"; + sha512 = "YRFUeOG3q85FJjAaYVJUoNRW9a73SDlOtAyQOS5PHLr18QeZ/vEhxywNoOPiEO8BxCegz4RXzTHcvyLEGB78UA=="; }; }; "http-signature-0.11.0" = { @@ -29610,6 +29601,15 @@ let sha512 = "PO64kVeArePvhX7Ff0jVWkpnE1DfGRvaWcStYrPugcJz9twQGYibagKJuIMHCX7ENcp0M6LJlcjLBuLD5KeJMg=="; }; }; + "ink-2.7.1" = { + name = "ink"; + packageName = "ink"; + version = "2.7.1"; + src = fetchurl { + url = "https://registry.npmjs.org/ink/-/ink-2.7.1.tgz"; + sha512 = "s7lJuQDJEdjqtaIWhp3KYHl6WV3J04U9zoQ6wVc+Xoa06XM27SXUY57qC5DO46xkF0CfgXMKkKNcgvSu/SAEpA=="; + }; + }; "ink-3.0.8" = { name = "ink"; packageName = "ink"; @@ -32031,13 +32031,13 @@ let sha512 = "0soPJif+yjmzmOF+4cF2hyhxUWWpXpQntsm2joJXFFoRcQiPzsG4dbLKYqYPT3Fc6PjZ8MaLtCkDqqckVSfmRw=="; }; }; - "jitdb-3.0.2" = { + "jitdb-3.0.3" = { name = "jitdb"; packageName = "jitdb"; - version = "3.0.2"; + version = "3.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/jitdb/-/jitdb-3.0.2.tgz"; - sha512 = "8wsv+QlJNaYPH6RHb3HlwheqAKAxsTlFezhF3oTpYLyvrWroX2XDWbXdLOmDb27JviHvjwDV4CXw9mlL/q1new=="; + url = "https://registry.npmjs.org/jitdb/-/jitdb-3.0.3.tgz"; + sha512 = "BTXAauBdig83EUkBFdWY9dzdf8wB5DlJ4aa/uCMwmf2eki7DhQBT7rrJFuscR/Mkmqt00G1oxiqa4gnA+oPJ6Q=="; }; }; "jju-1.4.0" = { @@ -32175,13 +32175,13 @@ let sha512 = "pZe//GGmwJndub7ZghVHz7vjb2LgC1m8B07Au3eYqeqv9emhESByMXxaEgkUkEqJe87oBbSniGYoQNIBklc7IQ=="; }; }; - "js-beautify-1.13.8" = { + "js-beautify-1.13.11" = { name = "js-beautify"; packageName = "js-beautify"; - version = "1.13.8"; + version = "1.13.11"; src = fetchurl { - url = "https://registry.npmjs.org/js-beautify/-/js-beautify-1.13.8.tgz"; - sha512 = "nTlinr+SgOkFXT984l+Lyj/vrqU5D8W6Szdipq4+H1dWvNOp35CUnrBRCLNZpxseIyJnB1VTgI+on4j9tmU5OQ=="; + url = "https://registry.npmjs.org/js-beautify/-/js-beautify-1.13.11.tgz"; + sha512 = "+3CW1fQqkV7aXIvprevNYfSrKrASQf02IstAZCVSNh+/IS5ciaOtE7erfjyowdMYZZmP2A7SMFkcJ28qCl84+A=="; }; }; "js-git-0.7.8" = { @@ -32319,6 +32319,15 @@ let sha512 = "pqon0s+4ScYUvX30wxQi3PogGFAlUyH0awepWvwkj4jD4v+ova3RiYw8bmA6x2rDrEaj8i/oWKoRxpVNW+Re8Q=="; }; }; + "js-yaml-4.1.0" = { + name = "js-yaml"; + packageName = "js-yaml"; + version = "4.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/js-yaml/-/js-yaml-4.1.0.tgz"; + sha512 = "wpxZs9NoxZaJESJGIZTyDEaYpl0FKSA+FB9aJiyemKhMwkxQg63h4T1KJgUGHpTqPDNRcmmYLugrRjJlBtWvRA=="; + }; + }; "js2xmlparser-4.0.1" = { name = "js2xmlparser"; packageName = "js2xmlparser"; @@ -33427,13 +33436,13 @@ let sha512 = "zdGa2TOpSZPq5mU6iowDARnMBZgtCqJ11dJROFi6tg6kTn4nuUdU09lFyLFSaHrWqpIJ+EBq4E8/Dc0Vx5vLdA=="; }; }; - "khroma-1.3.0" = { + "khroma-1.4.0" = { name = "khroma"; packageName = "khroma"; - version = "1.3.0"; + version = "1.4.0"; src = fetchurl { - url = "https://registry.npmjs.org/khroma/-/khroma-1.3.0.tgz"; - sha512 = "fpi0vIulP3FrM3BQOsEs+0ujWUNrg/YyHtEAcnvPxIHbASHNXEKEsDHtU2mADnJss7KvEdz7z2pUCQAEfFaFbA=="; + url = "https://registry.npmjs.org/khroma/-/khroma-1.4.0.tgz"; + sha512 = "C34rnH/WgniJBhbj/bXNYowRUtiNDwSdnjLraHwindnZIeZ3NOvymRMNHmj4KeZWFTbn+cVxj2iT/jsonG2Xrg=="; }; }; "killable-1.0.1" = { @@ -34138,13 +34147,13 @@ let sha512 = "lzj7oODpX7XS/4qHGBG/VAMirBDK/rbWS8S9pTCSUV9ZknuXg2loCkDyPQuB3vC2MMt1QOsXn4oQUtxpPtSa1g=="; }; }; - "lightning-3.3.2" = { + "lightning-3.3.4" = { name = "lightning"; packageName = "lightning"; - version = "3.3.2"; + version = "3.3.4"; src = fetchurl { - url = "https://registry.npmjs.org/lightning/-/lightning-3.3.2.tgz"; - sha512 = "DPZc9695RCNYivfO9/rhQuQ9B5Fn5N89ct2UrqJiuB43VocBOjn+KLjhSGcxbzCLtFtmGuZupvJFbNXnCVEICw=="; + url = "https://registry.npmjs.org/lightning/-/lightning-3.3.4.tgz"; + sha512 = "VpkNbaWlsmTgaWWJPGyYb2dm2v5b+wPQWmfZBJ7V5znL17Q+ef7Csj8PTTgnIccAWE429QL9/OyOzn/JVnZ/PA=="; }; }; "limit-spawn-0.0.3" = { @@ -34291,13 +34300,13 @@ let sha512 = "Q22CcKJ+52mExGNvOmeEVBza82LGdbLkFVzfMjC9oPlP5DikS+sdlK5GZM/Dc5HFN5pwK7y9Ke7gRue/UxHwbw=="; }; }; - "ln-service-51.6.0" = { + "ln-service-51.7.0" = { name = "ln-service"; packageName = "ln-service"; - version = "51.6.0"; + version = "51.7.0"; src = fetchurl { - url = "https://registry.npmjs.org/ln-service/-/ln-service-51.6.0.tgz"; - sha512 = "Bzvn8yv6mnlxJewWbloZOKpX4MEGRjCrALpDHOvA9EVnz5xeu5zbKmVyWElAhFIB5iXwX0xz6/8qhaJVFSyF9A=="; + url = "https://registry.npmjs.org/ln-service/-/ln-service-51.7.0.tgz"; + sha512 = "n0Ib9fjVL8x3ymdOax6gjmR0Nq59vIhQ89en1XpgxIWbowWhiJUXPolTEgiA8vpeoG72CZN3nYaPXgil9uNVLg=="; }; }; "ln-sync-0.4.5" = { @@ -36307,6 +36316,15 @@ let sha1 = "d637764ea33a929bd00f34d2a23c2256d0d5fb5b"; }; }; + "lt_donthave-1.0.1" = { + name = "lt_donthave"; + packageName = "lt_donthave"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/lt_donthave/-/lt_donthave-1.0.1.tgz"; + sha512 = "PfOXfDN9GnUjlNHjjxKQuMxPC8s12iSrnmg+Ff1BU1uLn7S1BFAKzpZCu6Gwg3WsCUvTZrZoDSHvy6B/j+N4/Q=="; + }; + }; "ltgt-2.2.1" = { name = "ltgt"; packageName = "ltgt"; @@ -36469,13 +36487,13 @@ let sha512 = "ZpqciThlbvE6KkyT5oxAup/6CwjePw1hdtR8NU5+vq2hn9Sp5b7w3bRiJRvo9fMHUj2dWSuVCdkqt9p4ed1V9Q=="; }; }; - "magnet-uri-6.1.0" = { + "magnet-uri-6.1.1" = { name = "magnet-uri"; packageName = "magnet-uri"; - version = "6.1.0"; + version = "6.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/magnet-uri/-/magnet-uri-6.1.0.tgz"; - sha512 = "731qLviHaqN/Ni96wm6gNKuvoip+QHWTznjHNz/4qDlsHh3/CWJoL8fZ18IIRhGJgnWoKJp8RVE5lZvQ60Khhw=="; + url = "https://registry.npmjs.org/magnet-uri/-/magnet-uri-6.1.1.tgz"; + sha512 = "TUyzaLB36TqqIHzgvkMrlZUPN6mfoLX/+2do5YJH3gjBQL2auEtivT+99npIiA77YepJ6pYA/AzWhboXTAAm0w=="; }; }; "make-dir-1.3.0" = { @@ -36685,13 +36703,13 @@ let sha512 = "aU1TzmBKcWNNYvH9pjq6u92BML+Hz3h5S/QpfTFwiQF852pLT+9qHsrhM9JYipkOXZxGn+sGH8oyJE9FD9WezQ=="; }; }; - "markdown-it-12.0.4" = { + "markdown-it-12.0.5" = { name = "markdown-it"; packageName = "markdown-it"; - version = "12.0.4"; + version = "12.0.5"; src = fetchurl { - url = "https://registry.npmjs.org/markdown-it/-/markdown-it-12.0.4.tgz"; - sha512 = "34RwOXZT8kyuOJy25oJNJoulO8L0bTHYWXcdZBYZqFnjIy3NgjeoM3FmPXIOFQ26/lSHYMr8oc62B6adxXcb3Q=="; + url = "https://registry.npmjs.org/markdown-it/-/markdown-it-12.0.5.tgz"; + sha512 = "9KB992Yy2TedaoKETgZPL2n3bmqqZxzUsZ4fxe2ho+/AYuQUz+iDKpfjLgKbg/lHcG6cGOj+L3gDrn9S2CxoRg=="; }; }; "markdown-it-8.4.2" = { @@ -36784,13 +36802,13 @@ let sha512 = "HyxjAu6BRsdt6Xcv6TKVQnkz/E70TdGXEFHRYBGLncRE9lBFwDNLVtFojKxjJWgJ+5XxUwLaHXy+2sGBbDn+4A=="; }; }; - "markdown-it-multimd-table-4.0.3" = { + "markdown-it-multimd-table-4.1.0" = { name = "markdown-it-multimd-table"; packageName = "markdown-it-multimd-table"; - version = "4.0.3"; + version = "4.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/markdown-it-multimd-table/-/markdown-it-multimd-table-4.0.3.tgz"; - sha512 = "uVLriNj6doq1dGyJppQdwbaGcK6uSzbrk7osxRHjOmZBeShgMtPS6/d+pnIKkohOjaRyP9e5kwTAlAIe/lEaIQ=="; + url = "https://registry.npmjs.org/markdown-it-multimd-table/-/markdown-it-multimd-table-4.1.0.tgz"; + sha512 = "YNR7Td1gK3O+jLezL6Zfl80WNRn9iLAyXmCVAUSsTJ61drmJdHr7cWqr2CuWaSffBtnM0Zh0QBRUdmICoy+CDg=="; }; }; "markdown-it-sub-1.0.0" = { @@ -39818,22 +39836,22 @@ let sha512 = "AO81vsIO1k1sM4Zrd6Hu7regmJN1NSiAja10gc4bX3F0wd+9rQmcuHQaHVQCYIEC8iFXnE+mavh23GOt7wBgug=="; }; }; - "netlify-6.1.17" = { + "netlify-6.1.18" = { name = "netlify"; packageName = "netlify"; - version = "6.1.17"; + version = "6.1.18"; src = fetchurl { - url = "https://registry.npmjs.org/netlify/-/netlify-6.1.17.tgz"; - sha512 = "NWb4/b/7Q7D/mJlIW+vjyMZn8lxUam0iC3F59XNQeNfYyAmEAfcbsy7hDfywm1ADZ648izfwFn/whYvgpPthrw=="; + url = "https://registry.npmjs.org/netlify/-/netlify-6.1.18.tgz"; + sha512 = "hVOf6l67ldiVfJPsMp4Ztunvv81hbGr5RGw2WUlR6b7Hp1bM1oaydEx/MrsLtVVDwy2KEYxkwcMY3m7CiHnh5g=="; }; }; - "netlify-redirect-parser-3.0.14" = { + "netlify-redirect-parser-3.0.15" = { name = "netlify-redirect-parser"; packageName = "netlify-redirect-parser"; - version = "3.0.14"; + version = "3.0.15"; src = fetchurl { - url = "https://registry.npmjs.org/netlify-redirect-parser/-/netlify-redirect-parser-3.0.14.tgz"; - sha512 = "6/y5A7mLQAzmKdyj+nVKvZIwhj4j4xjkzEz8FlX0khBw6Vm4LYh2xnyhsrMz3K+FlDSDxx4TU58hIJBwQD98uQ=="; + url = "https://registry.npmjs.org/netlify-redirect-parser/-/netlify-redirect-parser-3.0.15.tgz"; + sha512 = "AWciaJpE83idl6VRPkZBW0TIOUZIPL30poFfruo/xMUJJuvgHw+wfExBnEpgXQ1sAdIWcZajhfKeLEXl1jWDLw=="; }; }; "netlify-redirector-0.2.1" = { @@ -41674,13 +41692,13 @@ let sha512 = "fZ4qZdQ2nxJvtcasX7Ghl+WlWS/d9IgnBIwFZXVNNZUmzpno91SX5bc5vuxiuKoCtK78XxGGNuSCrDC7xYB3OQ=="; }; }; - "office-ui-fabric-react-7.166.2" = { + "office-ui-fabric-react-7.167.0" = { name = "office-ui-fabric-react"; packageName = "office-ui-fabric-react"; - version = "7.166.2"; + version = "7.167.0"; src = fetchurl { - url = "https://registry.npmjs.org/office-ui-fabric-react/-/office-ui-fabric-react-7.166.2.tgz"; - sha512 = "8BJ++wmoulTd03Dd6F1DIbcokfUTk8tGDtaYHsDvy73jz7vt5+p/cHgBZMRHTtOktUtKQwaWUMwQjVG1li2Hyg=="; + url = "https://registry.npmjs.org/office-ui-fabric-react/-/office-ui-fabric-react-7.167.0.tgz"; + sha512 = "PDMijULVRgqrB8eBZi31Qw2rrY8rrFTm7mt6YodxUzM0NyqNUA1UJMPrBwOeV857PFK0C6kO89CwLNtcZWRobw=="; }; }; "omggif-1.0.10" = { @@ -45437,15 +45455,6 @@ let sha512 = "aaLVANlj4HgZweKttFNUVNRxDukytuIuxeK2boIMHjagNJCiVKWFsKF4tCE3ql3GbrD2tExPQ7/pwtEJcHNZeg=="; }; }; - "prebuild-install-5.3.6" = { - name = "prebuild-install"; - packageName = "prebuild-install"; - version = "5.3.6"; - src = fetchurl { - url = "https://registry.npmjs.org/prebuild-install/-/prebuild-install-5.3.6.tgz"; - sha512 = "s8Aai8++QQGi4sSbs/M1Qku62PFK49Jm1CbgXklGz4nmHveDq0wzJkg7Na5QbnO1uNH8K7iqx2EQ/mV0MZEmOg=="; - }; - }; "prebuild-install-6.1.1" = { name = "prebuild-install"; packageName = "prebuild-install"; @@ -48020,13 +48029,13 @@ let sha512 = "dx0LvIGHcOPtKbeiSUM4jqpBl3TcY7CDjZdfOIcKeznE7BWr9dg0iPG90G5yfVQ+p/rGNMXdbfStvzQZEVEi4A=="; }; }; - "react-devtools-core-4.12.0" = { + "react-devtools-core-4.12.1" = { name = "react-devtools-core"; packageName = "react-devtools-core"; - version = "4.12.0"; + version = "4.12.1"; src = fetchurl { - url = "https://registry.npmjs.org/react-devtools-core/-/react-devtools-core-4.12.0.tgz"; - sha512 = "MN7zE3UpccJQLs+tTKGoM1GQFZLJki4PhT4Us0JJgn6MK1m5ZOQnmJZy+cp21LqUBFPXxqmpqeu65/gTRbxK5Q=="; + url = "https://registry.npmjs.org/react-devtools-core/-/react-devtools-core-4.12.1.tgz"; + sha512 = "d12z3rBMXn6+LI+tAcvTny++1sSf/MA51CHmsMGFIN211NJupPsgVDLGddNvrvZg6OL+vYznpjd5mhzdrGGg7A=="; }; }; "react-dom-16.14.0" = { @@ -49568,13 +49577,13 @@ let sha512 = "W8LucSynKUIDu9ylraa7ueVZ7hc0uAgJBxVsQSKOXOyle8a93qXhcz+XAXZ8bIq2d6i4Ehddn6Evt+0/UwKk6Q=="; }; }; - "resolve-alpn-1.1.1" = { + "resolve-alpn-1.1.2" = { name = "resolve-alpn"; packageName = "resolve-alpn"; - version = "1.1.1"; + version = "1.1.2"; src = fetchurl { - url = "https://registry.npmjs.org/resolve-alpn/-/resolve-alpn-1.1.1.tgz"; - sha512 = "0KbFjFPR2bnJhNx1t8Ad6RqVc8+QPJC4y561FYyC/Q/6OzB3fhUzB5PEgitYhPK6aifwR5gXBSnDMllaDWixGQ=="; + url = "https://registry.npmjs.org/resolve-alpn/-/resolve-alpn-1.1.2.tgz"; + sha512 = "8OyfzhAtA32LVUsJSke3auIyINcwdh5l3cvYKdKO0nvsYSKuiLfTM5i78PJswFPT8y6cPW+L1v6/hE95chcpDA=="; }; }; "resolve-cwd-2.0.0" = { @@ -51665,13 +51674,13 @@ let sha512 = "rohCHmEjD/ESXFLxF4bVeqgdb4Awc65ZyyuCKl3f7BvgMbZOBa/Ye3HN/GFnvruiUOAWWNupxhz3Rz5/3vJLTg=="; }; }; - "simple-git-2.37.0" = { + "simple-git-2.38.0" = { name = "simple-git"; packageName = "simple-git"; - version = "2.37.0"; + version = "2.38.0"; src = fetchurl { - url = "https://registry.npmjs.org/simple-git/-/simple-git-2.37.0.tgz"; - sha512 = "ZK6qRnP+Xa2v23UEZDNHUfzswsuNCDHOQpWZRkpqNaXn7V5wVBBx3zRJLji3pROJGzrzA7mXwY7preL5EKuAaQ=="; + url = "https://registry.npmjs.org/simple-git/-/simple-git-2.38.0.tgz"; + sha512 = "CORjrfirWMEGbJAxaXDH/PjZVOeATeG2bkafM9DsLVcFkbF9sXQGIIpEI6FeyXpvUsFK69T/pa4+4FKY9TUJMQ=="; }; }; "simple-markdown-0.4.4" = { @@ -53267,13 +53276,13 @@ let sha512 = "pJAFizB6OcuJLX4RJJuU9HWyPwM2CqLi/vs08lhVIR3TGxacxpavvK5LzbxT+Y3iWkBchOTKS5hHCigA5aaung=="; }; }; - "ssb-db2-2.0.0" = { + "ssb-db2-2.0.2" = { name = "ssb-db2"; packageName = "ssb-db2"; - version = "2.0.0"; + version = "2.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/ssb-db2/-/ssb-db2-2.0.0.tgz"; - sha512 = "xDl3GyhLNC62KDfzGa+ueCLUL0uIvu92n282E5vVnPTG+pJg1qCDSqVG6tZBbcVKLrSgar6j0yLcT9QjrKR2VQ=="; + url = "https://registry.npmjs.org/ssb-db2/-/ssb-db2-2.0.2.tgz"; + sha512 = "ylN4uqh18gJjDrkaYWsuEEMV4rCLcKuYIkL26hgtAVJm9AfuOTBIdhZZHdfeAMd2ZkcqAmIR62XUeQL3czvOsA=="; }; }; "ssb-ebt-5.6.7" = { @@ -54041,13 +54050,13 @@ let sha512 = "+TSkfINHDo4J+ZobQLWiMouQYB+UVYFttRA94FpEzzJ7ZdqcL4uUUQ7WkdkI4DSozGmgBUE/a47L+38PenXhUw=="; }; }; - "stream-http-3.1.1" = { + "stream-http-3.2.0" = { name = "stream-http"; packageName = "stream-http"; - version = "3.1.1"; + version = "3.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/stream-http/-/stream-http-3.1.1.tgz"; - sha512 = "S7OqaYu0EkFpgeGFb/NPOoPLxFko7TPqtEeFg5DXPB4v/KETHG0Ln6fRFrNezoelpaDKmycEmmZ81cC9DAwgYg=="; + url = "https://registry.npmjs.org/stream-http/-/stream-http-3.2.0.tgz"; + sha512 = "Oq1bLqisTyK3TSCXpPbT4sdeYNdmyZJv1LxpEm2vu1ZhK89kSE5YXwZc3cWk0MagGaKriBh9mCFbVGtO+vY29A=="; }; }; "stream-json-1.1.3" = { @@ -55337,13 +55346,13 @@ let sha512 = "xk5CMbwoQVI53rTq9o/iMojAqXP5NT4/+TMeTP4uXWDIH18pB9AXgO5Olqt0RXuf3jH032DA4DS4qzem6XdXAw=="; }; }; - "swagger-ui-dist-3.46.0" = { + "swagger-ui-dist-3.47.1" = { name = "swagger-ui-dist"; packageName = "swagger-ui-dist"; - version = "3.46.0"; + version = "3.47.1"; src = fetchurl { - url = "https://registry.npmjs.org/swagger-ui-dist/-/swagger-ui-dist-3.46.0.tgz"; - sha512 = "ueaZ45OHhHvGKmocvCkxFY8VCfbP5PgcxutoQxy9j8/VZeDoLDvg8FBf4SO6NxHhieNAdYPUd0O6G9FjJO2fqw=="; + url = "https://registry.npmjs.org/swagger-ui-dist/-/swagger-ui-dist-3.47.1.tgz"; + sha512 = "7b9iHDC/GGC9SJLd3HiV/3EnsJ3wu7xN8Q4MpOPfQO8UG7TQFG2TMTDkvvy0SNeqxQY0tGQY0ppZC9a95tW3kg=="; }; }; "swagger2openapi-6.2.3" = { @@ -55517,6 +55526,15 @@ let sha512 = "F3cLs9a3hL1Z7N4+EkSscsel3z55XT950AvB05bwayrNg5T1/gykXtigioTAjbltvbMSJvvhFCbnf6mX+ntnJQ=="; }; }; + "table-6.1.0" = { + name = "table"; + packageName = "table"; + version = "6.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/table/-/table-6.1.0.tgz"; + sha512 = "T4G5KMmqIk6X87gLKWyU5exPpTjLjY5KyrFWaIjv3SvgaIUGXV7UEzGEnZJdTA38/yUS6f9PlKezQ0bYXG3iIQ=="; + }; + }; "table-layout-0.4.5" = { name = "table-layout"; packageName = "table-layout"; @@ -55599,6 +55617,24 @@ let sha1 = "b4d4f0deed206ae7df775b129ea2ca6de52f26dd"; }; }; + "tap-bail-1.0.0" = { + name = "tap-bail"; + packageName = "tap-bail"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/tap-bail/-/tap-bail-1.0.0.tgz"; + sha1 = "c5a8cc71191f037938cd567f97bda3ca9700199a"; + }; + }; + "tap-parser-5.4.0" = { + name = "tap-parser"; + packageName = "tap-parser"; + version = "5.4.0"; + src = fetchurl { + url = "https://registry.npmjs.org/tap-parser/-/tap-parser-5.4.0.tgz"; + sha512 = "BIsIaGqv7uTQgTW1KLTMNPSEQf4zDDPgYOBRdgOfuB+JFOLRBfEu6cLa/KvMvmqggu1FKXDfitjLwsq4827RvA=="; + }; + }; "tapable-0.2.9" = { name = "tapable"; packageName = "tapable"; @@ -58245,13 +58281,13 @@ let sha512 = "N4P+Q/BuyuEKFJ43B9gYuOj4TQUHXX+j2FqguVOpjkssLUUrnJofCcBccJSCoeturDoZU6GorDTHSvUDlSQbTg=="; }; }; - "underscore-1.13.0" = { + "underscore-1.13.1" = { name = "underscore"; packageName = "underscore"; - version = "1.13.0"; + version = "1.13.1"; src = fetchurl { - url = "https://registry.npmjs.org/underscore/-/underscore-1.13.0.tgz"; - sha512 = "sCs4H3pCytsb5K7i072FAEC9YlSYFIbosvM0tAKAlpSSUgD7yC1iXSEGdl5XrDKQ1YUB+p/HDzYrSG2H2Vl36g=="; + url = "https://registry.npmjs.org/underscore/-/underscore-1.13.1.tgz"; + sha512 = "hzSoAVtJF+3ZtiFX0VgfFPHEDRm7Y/QPjGyNo4TVdnDTdft3tr8hEkD25a1jC+TjTuE7tkHGKkhwCgs9dgBB2g=="; }; }; "underscore-1.2.1" = { @@ -61495,13 +61531,13 @@ let sha512 = "OqedPIGOfsDlo31UNwYbCFMSaO9m9G/0faIHj5/dZFDMFqPTcx6UwqyOy3COEaEOg/9VsGIpdqn62W5KhoKSpg=="; }; }; - "webtorrent-0.116.2" = { + "webtorrent-0.117.0" = { name = "webtorrent"; packageName = "webtorrent"; - version = "0.116.2"; + version = "0.117.0"; src = fetchurl { - url = "https://registry.npmjs.org/webtorrent/-/webtorrent-0.116.2.tgz"; - sha512 = "u6ctyPEwUvbFKZsT9HRU1Q+SSqKWoNMlXWbaPTUlGsPrNZ3mCCeHtn8Hcf61jr1e4hna5oQBtVjg2N5/2V8d9g=="; + url = "https://registry.npmjs.org/webtorrent/-/webtorrent-0.117.0.tgz"; + sha512 = "CeBZP6rr1n0qAq747YjXZcDwMmUIi0d3x38qtEb8zrjjURSDd81vmtT1Y9LPJoYsY55jaYtUHGp4Ht6agQ3vWg=="; }; }; "well-known-symbols-2.0.0" = { @@ -62503,13 +62539,13 @@ let sha512 = "N1XQngeqMBoj9wM4ZFadVV2MymImeiFfYD+fJrNlcVcOHsJFFQe7n3b+aBoTPwARuq2HQxukfzVpQmAk1gN4sQ=="; }; }; - "xdl-59.0.30" = { + "xdl-59.0.32" = { name = "xdl"; packageName = "xdl"; - version = "59.0.30"; + version = "59.0.32"; src = fetchurl { - url = "https://registry.npmjs.org/xdl/-/xdl-59.0.30.tgz"; - sha512 = "BNbOgInsM5/bE8EnIkoI6FRzDOSwjjrxaOeATevz3RosoZa6DMiTXU4HtSba0JkdMHKFgZaNxbj8nTQFxgg3AA=="; + url = "https://registry.npmjs.org/xdl/-/xdl-59.0.32.tgz"; + sha512 = "BY6tKRFueOlyua1btLEhdO5O7HdR/JfbCkMnRN9/slqHSPt7riL2maCKYYeT/HtvEXiww8Wrj0g6sJ97gqG/7g=="; }; }; "xenvar-0.5.1" = { @@ -63503,13 +63539,13 @@ let sha512 = "Yj3yXweRc8LdRMrCC8nIc4kkjWecPAUVh0TI0OUrWXx6aX790vLcDlWca6I4vsyCGH3LpWxq0dJRcMOFoVqmeg=="; }; }; - "zeromq-5.2.0" = { + "zeromq-5.2.4" = { name = "zeromq"; packageName = "zeromq"; - version = "5.2.0"; + version = "5.2.4"; src = fetchurl { - url = "https://registry.npmjs.org/zeromq/-/zeromq-5.2.0.tgz"; - sha512 = "qsckhCmrg6et6zrAJytC971SSN/4iLxKgkXK1Wqn2Gij5KXMY+TA+3cy/iFwehaWdU5usg5HNOOgaBdjSqtCVw=="; + url = "https://registry.npmjs.org/zeromq/-/zeromq-5.2.4.tgz"; + sha512 = "aRTlXSBiuCMiLnLliY0YT8hdJCjKwZ+rYCeacjvlCeBK8WD+EsLr8v3fnj6nIk5LbYFdgX8uFFWu/sw3+ED65g=="; }; }; "zerr-1.0.4" = { @@ -63590,17 +63626,17 @@ in "@angular/cli" = nodeEnv.buildNodePackage { name = "_at_angular_slash_cli"; packageName = "@angular/cli"; - version = "11.2.8"; + version = "11.2.9"; src = fetchurl { - url = "https://registry.npmjs.org/@angular/cli/-/cli-11.2.8.tgz"; - sha512 = "9TWNPKqaOrg+C5DR8jz4LNVzu/wCV0Hqt3JF4ILm9fv93bh2MgqetUKyHdQNAijtHMlOO1uh0EM2Emjlp5JvXQ=="; + url = "https://registry.npmjs.org/@angular/cli/-/cli-11.2.9.tgz"; + sha512 = "jSX8HFRYSbbamKLhzgPZ2zEsXDtJzspwnzFROJfOpe9fQkMFo8wiOkmY2amyaNzAMyooHXerRcRDWkRTyQj3Jg=="; }; dependencies = [ - sources."@angular-devkit/architect-0.1102.8" - sources."@angular-devkit/core-11.2.8" - sources."@angular-devkit/schematics-11.2.8" + sources."@angular-devkit/architect-0.1102.9" + sources."@angular-devkit/core-11.2.9" + sources."@angular-devkit/schematics-11.2.9" sources."@npmcli/ci-detect-1.3.0" - (sources."@npmcli/git-2.0.7" // { + (sources."@npmcli/git-2.0.8" // { dependencies = [ sources."hosted-git-info-4.0.2" sources."npm-package-arg-8.1.2" @@ -63618,8 +63654,8 @@ in sources."read-package-json-fast-2.0.2" ]; }) - sources."@schematics/angular-11.2.8" - sources."@schematics/update-0.1102.8" + sources."@schematics/angular-11.2.9" + sources."@schematics/update-0.1102.9" sources."@tootallnate/once-1.1.2" sources."@yarnpkg/lockfile-1.1.0" sources."abbrev-1.1.1" @@ -64441,12 +64477,12 @@ in ]; }) sources."@schematics/schematics-0.1102.6" - sources."@types/eslint-7.2.9" + sources."@types/eslint-7.2.10" sources."@types/eslint-scope-3.7.0" sources."@types/estree-0.0.46" sources."@types/json-schema-7.0.7" sources."@types/json5-0.0.29" - sources."@types/node-14.14.37" + sources."@types/node-14.14.41" sources."@types/parse-json-4.0.0" sources."@webassemblyjs/ast-1.11.0" sources."@webassemblyjs/floating-point-hex-parser-1.11.0" @@ -64504,7 +64540,7 @@ in sources."cross-spawn-7.0.3" sources."deepmerge-4.2.2" sources."defaults-1.0.3" - sources."electron-to-chromium-1.3.713" + sources."electron-to-chromium-1.3.717" sources."emoji-regex-8.0.0" sources."end-of-stream-1.4.4" (sources."enhanced-resolve-5.7.0" // { @@ -64736,7 +64772,7 @@ in sources."@akryum/winattr-3.0.0" (sources."@apollo/protobufjs-1.0.5" // { dependencies = [ - sources."@types/node-10.17.56" + sources."@types/node-10.17.58" ]; }) sources."@apollographql/apollo-tools-0.4.9" @@ -64879,7 +64915,7 @@ in sources."@types/connect-3.4.34" sources."@types/content-disposition-0.5.3" sources."@types/cookies-0.7.6" - sources."@types/cors-2.8.8" + sources."@types/cors-2.8.10" sources."@types/ejs-2.7.0" sources."@types/express-4.17.11" sources."@types/express-serve-static-core-4.17.19" @@ -64901,7 +64937,7 @@ in sources."@types/long-4.0.1" sources."@types/mime-1.3.2" sources."@types/minimatch-3.0.4" - sources."@types/node-14.14.37" + sources."@types/node-14.14.41" (sources."@types/node-fetch-2.5.7" // { dependencies = [ sources."form-data-3.0.1" @@ -64956,15 +64992,15 @@ in sources."lru-cache-6.0.0" ]; }) - (sources."apollo-server-core-2.22.2" // { + (sources."apollo-server-core-2.23.0" // { dependencies = [ sources."lru-cache-6.0.0" sources."uuid-8.3.2" ]; }) sources."apollo-server-env-3.0.0" - sources."apollo-server-errors-2.4.2" - sources."apollo-server-express-2.22.2" + sources."apollo-server-errors-2.5.0" + sources."apollo-server-express-2.23.0" sources."apollo-server-plugin-base-0.11.0" sources."apollo-server-types-0.7.0" sources."apollo-tracing-0.13.0" @@ -65180,7 +65216,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.713" + sources."electron-to-chromium-1.3.717" sources."emoji-regex-7.0.3" sources."encodeurl-1.0.2" sources."end-of-stream-1.4.4" @@ -65263,7 +65299,7 @@ in }) sources."find-up-3.0.0" sources."fkill-6.2.0" - sources."flow-parser-0.148.0" + sources."flow-parser-0.149.0" sources."for-each-0.3.3" sources."for-in-1.0.2" sources."forever-agent-0.6.1" @@ -66207,7 +66243,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.713" + sources."electron-to-chromium-1.3.717" sources."ensure-posix-path-1.1.1" sources."escalade-3.1.1" sources."escape-string-regexp-1.0.5" @@ -66301,7 +66337,7 @@ in dependencies = [ sources."@types/glob-7.1.3" sources."@types/minimatch-3.0.4" - sources."@types/node-14.14.37" + sources."@types/node-14.14.41" sources."balanced-match-1.0.2" sources."brace-expansion-1.1.11" sources."chromium-pickle-js-0.2.0" @@ -66336,7 +66372,7 @@ in }; dependencies = [ sources."@tootallnate/once-1.1.2" - sources."@types/node-14.14.37" + sources."@types/node-14.14.41" sources."@types/yauzl-2.9.1" sources."agent-base-6.0.2" sources."ansi-escapes-4.3.2" @@ -66347,7 +66383,7 @@ in sources."tslib-2.2.0" ]; }) - (sources."aws-sdk-2.886.0" // { + (sources."aws-sdk-2.888.0" // { dependencies = [ sources."uuid-3.3.2" ]; @@ -66536,10 +66572,10 @@ in balanceofsatoshis = nodeEnv.buildNodePackage { name = "balanceofsatoshis"; packageName = "balanceofsatoshis"; - version = "8.0.5"; + version = "8.0.6"; src = fetchurl { - url = "https://registry.npmjs.org/balanceofsatoshis/-/balanceofsatoshis-8.0.5.tgz"; - sha512 = "bhv1ttu6JK1UrU59Z78K+o/dPbP1i5Du2+UGzqIcPkesdItM3e0GCmWcFxZpTvkETP8rGvuYz5Xt1SzdWKYQ1w=="; + url = "https://registry.npmjs.org/balanceofsatoshis/-/balanceofsatoshis-8.0.6.tgz"; + sha512 = "sl/gbf3fqpdnbzeBxlxN8epCQfYbTTMAj0Pix721LC0OGmLq0ePeXJIPvLrObYTU2AB57p0jV6NEWWf9eVKkcQ=="; }; dependencies = [ sources."@alexbosworth/html2unicode-1.1.5" @@ -66552,7 +66588,7 @@ in sources."@cto.af/textdecoder-0.0.0" (sources."@grpc/grpc-js-1.2.12" // { dependencies = [ - sources."@types/node-14.14.37" + sources."@types/node-14.14.41" ]; }) sources."@grpc/proto-loader-0.5.6" @@ -66712,6 +66748,14 @@ in sources."cli-cursor-1.0.2" sources."cli-table3-0.5.1" sources."cli-width-2.2.1" + (sources."cliui-7.0.4" // { + dependencies = [ + sources."ansi-regex-5.0.0" + sources."is-fullwidth-code-point-3.0.0" + sources."string-width-4.2.2" + sources."strip-ansi-6.0.0" + ]; + }) sources."clone-response-1.0.2" sources."code-point-at-1.1.0" sources."color-convert-2.0.1" @@ -66763,6 +66807,7 @@ in sources."emoji-regex-8.0.0" sources."encodeurl-1.0.2" sources."end-of-stream-1.4.4" + sources."escalade-3.1.1" sources."escape-goat-2.1.1" sources."escape-html-1.0.3" sources."escape-string-regexp-1.0.5" @@ -66794,6 +66839,7 @@ in sources."gauge-1.2.7" sources."gaxios-4.2.0" sources."gcp-metadata-4.2.1" + sources."get-caller-file-2.0.5" sources."get-intrinsic-1.1.1" sources."get-stream-4.1.0" sources."getpass-0.1.7" @@ -66938,13 +66984,14 @@ in sources."ln-service-51.5.0" ]; }) - (sources."ln-service-51.6.0" // { + (sources."ln-service-51.7.0" // { dependencies = [ + sources."@grpc/proto-loader-0.6.0" sources."@types/node-14.14.37" sources."@types/ws-7.4.1" sources."bn.js-5.2.0" sources."bolt09-0.1.4" - sources."lightning-3.3.2" + sources."lightning-3.3.4" ]; }) (sources."ln-sync-0.4.5" // { @@ -67053,7 +67100,7 @@ in sources."process-nextick-args-2.0.1" (sources."protobufjs-6.10.2" // { dependencies = [ - sources."@types/node-13.13.48" + sources."@types/node-13.13.50" ]; }) sources."proxy-addr-2.0.6" @@ -67080,6 +67127,7 @@ in sources."readable-stream-3.6.0" sources."registry-auth-token-4.2.1" sources."registry-url-5.1.0" + sources."require-directory-2.1.1" sources."require-from-string-2.0.2" sources."responselike-1.0.2" sources."restore-cursor-1.0.1" @@ -67213,7 +67261,17 @@ in sources."write-file-atomic-3.0.3" sources."ws-7.4.4" sources."xdg-basedir-4.0.0" + sources."y18n-5.0.8" sources."yallist-4.0.0" + (sources."yargs-16.2.0" // { + dependencies = [ + sources."ansi-regex-5.0.0" + sources."is-fullwidth-code-point-3.0.0" + sources."string-width-4.2.2" + sources."strip-ansi-6.0.0" + ]; + }) + sources."yargs-parser-20.2.7" ]; buildInputs = globalBuildInputs; meta = { @@ -67705,7 +67763,7 @@ in ]; }) sources."stream-combiner2-1.1.1" - (sources."stream-http-3.1.1" // { + (sources."stream-http-3.2.0" // { dependencies = [ sources."readable-stream-3.6.0" ]; @@ -67750,10 +67808,10 @@ in btc-rpc-explorer = nodeEnv.buildNodePackage { name = "btc-rpc-explorer"; packageName = "btc-rpc-explorer"; - version = "3.0.0"; + version = "3.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/btc-rpc-explorer/-/btc-rpc-explorer-3.0.0.tgz"; - sha512 = "W54w48slAxBKQRHlhsuNPZk+yct7s8ptF/pg97DQ7VLnFbsZo9ZALB3CjJKLnqO0rPHivH6E56JgAfngrA6r9Q=="; + url = "https://registry.npmjs.org/btc-rpc-explorer/-/btc-rpc-explorer-3.1.0.tgz"; + sha512 = "LKY3+CWOAe6A7SaXRYHZSu27TNeBrUl3LkYTOvRZAIatNNwaM1dTCxUjNRBsnsHCp0Tp9/UGLncLaf2wJ1BLcg=="; }; dependencies = [ sources."@babel/code-frame-7.12.13" @@ -67834,6 +67892,13 @@ in sources."color-convert-1.9.3" sources."color-name-1.1.3" sources."combined-stream-1.0.8" + sources."compressible-2.0.18" + (sources."compression-1.7.4" // { + dependencies = [ + sources."bytes-3.0.0" + sources."debug-2.6.9" + ]; + }) sources."concat-map-0.0.1" sources."constantinople-4.0.1" sources."content-disposition-0.5.3" @@ -67983,7 +68048,7 @@ in sources."lodash-4.17.21" sources."lru-cache-6.0.0" sources."map-obj-4.2.1" - (sources."markdown-it-12.0.4" // { + (sources."markdown-it-12.0.5" // { dependencies = [ sources."argparse-2.0.1" sources."entities-2.1.0" @@ -68121,7 +68186,7 @@ in sources."set-blocking-2.0.0" sources."setprototypeof-1.1.1" sources."sha.js-2.4.11" - sources."simple-git-2.37.0" + sources."simple-git-2.38.0" sources."spdx-correct-3.1.1" sources."spdx-exceptions-2.3.0" sources."spdx-expression-parse-3.0.1" @@ -68211,7 +68276,7 @@ in sources."@protobufjs/pool-1.1.0" sources."@protobufjs/utf8-1.1.0" sources."@types/long-4.0.1" - sources."@types/node-13.13.48" + sources."@types/node-13.13.50" sources."addr-to-ip-port-1.5.1" sources."airplay-js-0.2.16" sources."ajv-6.12.6" @@ -68624,7 +68689,7 @@ in }; dependencies = [ sources."@jsii/spec-1.28.0" - sources."@types/node-10.17.56" + sources."@types/node-10.17.58" sources."ansi-regex-5.0.0" sources."ansi-styles-4.3.0" sources."array-filter-1.0.0" @@ -68820,7 +68885,7 @@ in sources."@jsii/spec-1.28.0" sources."@skorfmann/ink-confirm-input-3.0.0" sources."@skorfmann/terraform-cloud-1.9.1" - sources."@types/node-14.14.37" + sources."@types/node-14.14.41" sources."@types/node-fetch-2.5.10" sources."@types/yoga-layout-1.9.2" (sources."ansi-escapes-4.3.2" // { @@ -69047,7 +69112,7 @@ in sources."prop-types-15.7.2" sources."quick-lru-4.0.1" sources."react-16.14.0" - sources."react-devtools-core-4.12.0" + sources."react-devtools-core-4.12.1" sources."react-is-16.13.1" sources."react-reconciler-0.24.0" sources."readable-stream-3.6.0" @@ -69373,10 +69438,10 @@ in coc-explorer = nodeEnv.buildNodePackage { name = "coc-explorer"; packageName = "coc-explorer"; - version = "0.17.1"; + version = "0.17.2"; src = fetchurl { - url = "https://registry.npmjs.org/coc-explorer/-/coc-explorer-0.17.1.tgz"; - sha512 = "rojcQAJIxD8ObvlFq5HPZjyESKLzyUrRHmTQbvvsltEi8v4ztOOqTmRqYNtP+9wD4KRjTYmZGA6hgqQqXZlWqA=="; + url = "https://registry.npmjs.org/coc-explorer/-/coc-explorer-0.17.2.tgz"; + sha512 = "XXMjJMweK5qAmOFd569HpdSgcFTziumnNWjPYO1Fze3aJ75KtemSWjrKKy6waFTzQH0sWHmq8g/cRs1pjhQckQ=="; }; dependencies = [ sources."@sindresorhus/df-3.1.1" @@ -69696,7 +69761,7 @@ in sources."fb-watchman-2.0.1" sources."flatted-2.0.2" sources."follow-redirects-1.13.3" - sources."fp-ts-2.9.5" + sources."fp-ts-2.10.2" sources."fs-extra-8.1.0" sources."fs-minipass-2.1.0" sources."fs.realpath-1.0.0" @@ -70037,7 +70102,7 @@ in sources."domutils-1.7.0" sources."dot-prop-5.3.0" sources."duplexer3-0.1.4" - sources."electron-to-chromium-1.3.713" + sources."electron-to-chromium-1.3.717" sources."emoji-regex-8.0.0" sources."end-of-stream-1.4.4" sources."enquirer-2.3.6" @@ -70705,7 +70770,7 @@ in sources."sugarss-1.0.1" sources."supports-color-5.5.0" sources."svg-tags-1.0.0" - (sources."table-6.0.9" // { + (sources."table-6.1.0" // { dependencies = [ sources."ajv-8.1.0" sources."json-schema-traverse-1.0.0" @@ -71083,7 +71148,7 @@ in sources."domelementtype-1.3.1" sources."domhandler-2.4.2" sources."domutils-1.7.0" - sources."electron-to-chromium-1.3.713" + sources."electron-to-chromium-1.3.717" sources."emoji-regex-8.0.0" sources."entities-1.1.2" sources."error-ex-1.3.2" @@ -71288,7 +71353,7 @@ in sources."sugarss-2.0.0" sources."supports-color-5.5.0" sources."svg-tags-1.0.0" - sources."table-6.0.9" + sources."table-6.1.0" sources."to-fast-properties-2.0.0" sources."to-regex-range-5.0.1" sources."trim-newlines-3.0.0" @@ -71643,7 +71708,7 @@ in sources."strip-ansi-6.0.0" sources."strip-json-comments-3.1.1" sources."supports-color-5.5.0" - (sources."table-6.0.9" // { + (sources."table-6.1.0" // { dependencies = [ sources."ajv-8.1.0" sources."json-schema-traverse-1.0.0" @@ -71956,7 +72021,7 @@ in sources."@nodelib/fs.stat-2.0.4" sources."@nodelib/fs.walk-1.2.6" sources."@npmcli/ci-detect-1.3.0" - sources."@npmcli/git-2.0.7" + sources."@npmcli/git-2.0.8" sources."@npmcli/installed-package-contents-1.0.7" sources."@npmcli/move-file-1.1.2" sources."@npmcli/node-gyp-1.0.2" @@ -72489,7 +72554,7 @@ in sources."type-fest-0.8.1" sources."type-is-1.6.18" sources."typedarray-to-buffer-3.1.5" - sources."underscore-1.13.0" + sources."underscore-1.13.1" sources."unique-filename-1.1.1" sources."unique-slug-2.0.2" sources."unique-string-2.0.0" @@ -72566,7 +72631,7 @@ in sources."@types/glob-7.1.3" sources."@types/minimatch-3.0.4" sources."@types/minimist-1.2.1" - sources."@types/node-14.14.37" + sources."@types/node-14.14.41" sources."@types/normalize-package-data-2.4.0" sources."aggregate-error-3.1.0" sources."ansi-styles-3.2.1" @@ -72937,7 +73002,7 @@ in sources."@cycle/run-3.4.0" sources."@cycle/time-0.10.1" sources."@types/cookiejar-2.1.2" - sources."@types/node-14.14.37" + sources."@types/node-14.14.41" sources."@types/superagent-3.8.2" sources."ansi-escapes-3.2.0" sources."ansi-regex-2.1.1" @@ -74047,7 +74112,7 @@ in dependencies = [ sources."@fast-csv/format-4.3.5" sources."@fast-csv/parse-4.3.6" - sources."@types/node-14.14.37" + sources."@types/node-14.14.41" sources."JSONStream-1.3.5" sources."ajv-6.12.6" sources."asn1-0.2.4" @@ -74240,7 +74305,7 @@ in sources."@types/http-cache-semantics-4.0.0" sources."@types/keyv-3.1.1" sources."@types/minimatch-3.0.4" - sources."@types/node-14.14.37" + sources."@types/node-14.14.41" sources."@types/responselike-1.0.0" sources."@types/yauzl-2.9.1" sources."abbrev-1.1.1" @@ -74661,7 +74726,7 @@ in sources."request-2.88.2" sources."require-directory-2.1.1" sources."resolve-1.20.0" - sources."resolve-alpn-1.1.1" + sources."resolve-alpn-1.1.2" sources."resolve-dir-1.0.1" sources."resolve-package-1.0.1" sources."responselike-2.0.0" @@ -74859,7 +74924,7 @@ in sources."@types/http-cache-semantics-4.0.0" sources."@types/keyv-3.1.1" sources."@types/minimist-1.2.1" - sources."@types/node-14.14.37" + sources."@types/node-14.14.41" sources."@types/normalize-package-data-2.4.0" sources."@types/responselike-1.0.0" sources."@types/yoga-layout-1.9.2" @@ -74931,7 +74996,7 @@ in }) sources."defer-to-connect-2.0.1" sources."dot-prop-5.3.0" - sources."electron-to-chromium-1.3.713" + sources."electron-to-chromium-1.3.717" sources."emoji-regex-8.0.0" sources."emojilib-2.4.0" sources."end-of-stream-1.4.4" @@ -75065,7 +75130,7 @@ in sources."punycode-2.1.1" sources."quick-lru-5.1.1" sources."react-16.14.0" - sources."react-devtools-core-4.12.0" + sources."react-devtools-core-4.12.1" sources."react-is-16.13.1" sources."react-reconciler-0.24.0" (sources."read-pkg-5.2.0" // { @@ -75084,7 +75149,7 @@ in }) sources."redent-3.0.0" sources."resolve-1.20.0" - sources."resolve-alpn-1.1.1" + sources."resolve-alpn-1.1.2" sources."resolve-from-3.0.0" sources."responselike-2.0.0" sources."restore-cursor-3.1.0" @@ -75192,7 +75257,7 @@ in sources."@fluentui/date-time-utilities-7.9.1" sources."@fluentui/dom-utilities-1.1.2" sources."@fluentui/keyboard-key-0.2.16" - sources."@fluentui/react-7.166.2" + sources."@fluentui/react-7.167.0" sources."@fluentui/react-focus-7.17.6" sources."@fluentui/react-window-provider-1.0.2" sources."@fluentui/theme-1.7.4" @@ -75206,7 +75271,7 @@ in sources."normalize-path-2.1.1" ]; }) - sources."@microsoft/load-themed-styles-1.10.160" + sources."@microsoft/load-themed-styles-1.10.161" sources."@nodelib/fs.scandir-2.1.4" sources."@nodelib/fs.stat-2.0.4" sources."@nodelib/fs.walk-1.2.6" @@ -76233,7 +76298,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.166.2" + sources."office-ui-fabric-react-7.167.0" sources."on-finished-2.3.0" sources."on-headers-1.0.2" sources."once-1.4.0" @@ -76592,7 +76657,7 @@ in }) sources."stream-each-1.2.3" sources."stream-exhaust-1.0.2" - (sources."stream-http-3.1.1" // { + (sources."stream-http-3.2.0" // { dependencies = [ sources."inherits-2.0.4" ]; @@ -77013,7 +77078,7 @@ in sources."strip-ansi-6.0.0" sources."strip-json-comments-3.1.1" sources."supports-color-5.5.0" - (sources."table-6.0.9" // { + (sources."table-6.1.0" // { dependencies = [ sources."ajv-8.1.0" sources."json-schema-traverse-1.0.0" @@ -77192,7 +77257,7 @@ in sources."strip-ansi-6.0.0" sources."strip-json-comments-3.1.1" sources."supports-color-8.1.1" - (sources."table-6.0.9" // { + (sources."table-6.1.0" // { dependencies = [ sources."ajv-8.1.0" sources."json-schema-traverse-1.0.0" @@ -77238,10 +77303,10 @@ in expo-cli = nodeEnv.buildNodePackage { name = "expo-cli"; packageName = "expo-cli"; - version = "4.3.5"; + version = "4.4.1"; src = fetchurl { - url = "https://registry.npmjs.org/expo-cli/-/expo-cli-4.3.5.tgz"; - sha512 = "UqfLz0ZoKmROfPkvD54H3Misr37Oihz+BXZXQB9Q5XSlydTjabcB8Ir7L5kE/iGfNn23N270o1omTXFplJl0vg=="; + url = "https://registry.npmjs.org/expo-cli/-/expo-cli-4.4.1.tgz"; + sha512 = "yJS0aHxzkaKmd55hppBxn+s7KCxRXFbqlZF5r2v2eE3vmLlDEnPWI8WQ//algAZO52nYCJtZBOa2EswESdK66g=="; }; dependencies = [ sources."@babel/code-frame-7.12.13" @@ -77377,8 +77442,8 @@ in sources."@babel/types-7.13.14" sources."@expo/apple-utils-0.0.0-alpha.17" sources."@expo/bunyan-4.0.0" - sources."@expo/config-3.3.35" - sources."@expo/config-plugins-1.0.25" + sources."@expo/config-3.3.36" + sources."@expo/config-plugins-1.0.26" sources."@expo/config-types-40.0.0-beta.2" (sources."@expo/configure-splash-screen-0.3.4" // { dependencies = [ @@ -77386,7 +77451,7 @@ in sources."pngjs-5.0.0" ]; }) - (sources."@expo/dev-server-0.1.61" // { + (sources."@expo/dev-server-0.1.62" // { dependencies = [ sources."body-parser-1.19.0" sources."bytes-3.1.0" @@ -77401,7 +77466,7 @@ in sources."statuses-1.5.0" ]; }) - sources."@expo/dev-tools-0.13.90" + sources."@expo/dev-tools-0.13.92" (sources."@expo/devcert-1.0.0" // { dependencies = [ sources."debug-3.2.7" @@ -77420,9 +77485,9 @@ in sources."json5-1.0.1" ]; }) - sources."@expo/metro-config-0.1.61" + sources."@expo/metro-config-0.1.62" sources."@expo/osascript-2.0.25" - (sources."@expo/package-manager-0.0.39" // { + (sources."@expo/package-manager-0.0.40" // { dependencies = [ sources."npm-package-arg-7.0.0" sources."rimraf-3.0.2" @@ -77444,7 +77509,7 @@ in }) sources."@expo/simple-spinner-1.0.2" sources."@expo/spawn-async-1.5.0" - (sources."@expo/webpack-config-0.12.65" // { + (sources."@expo/webpack-config-0.12.66" // { dependencies = [ sources."@babel/runtime-7.9.0" sources."react-refresh-0.8.3" @@ -77506,7 +77571,7 @@ in sources."@nodelib/fs.stat-2.0.4" sources."@nodelib/fs.walk-1.2.6" sources."@npmcli/ci-detect-1.3.0" - (sources."@npmcli/git-2.0.7" // { + (sources."@npmcli/git-2.0.8" // { dependencies = [ sources."mkdirp-1.0.4" sources."semver-7.3.5" @@ -78065,7 +78130,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.713" + sources."electron-to-chromium-1.3.717" (sources."elliptic-6.5.4" // { dependencies = [ sources."bn.js-4.12.0" @@ -78147,7 +78212,7 @@ in sources."ms-2.0.0" ]; }) - (sources."expo-pwa-0.0.71" // { + (sources."expo-pwa-0.0.72" // { dependencies = [ sources."commander-2.20.0" ]; @@ -79142,7 +79207,7 @@ in }) sources."requires-port-1.0.0" sources."resolve-1.20.0" - sources."resolve-alpn-1.1.1" + sources."resolve-alpn-1.1.2" (sources."resolve-cwd-2.0.0" // { dependencies = [ sources."resolve-from-3.0.0" @@ -79709,7 +79774,7 @@ in sources."uuid-7.0.3" ]; }) - (sources."xdl-59.0.30" // { + (sources."xdl-59.0.32" // { dependencies = [ sources."chownr-1.1.4" sources."fs-minipass-1.2.7" @@ -80511,10 +80576,10 @@ in firebase-tools = nodeEnv.buildNodePackage { name = "firebase-tools"; packageName = "firebase-tools"; - version = "9.9.0"; + version = "9.10.0"; src = fetchurl { - url = "https://registry.npmjs.org/firebase-tools/-/firebase-tools-9.9.0.tgz"; - sha512 = "LM4HaLHg/UYJ1CB3VEzneRWk+BMJXH/9Id+v9nYeNzYFPRTxAxfWez2Etd2c+kFreLhCoMtSC4yx44zorqdkSA=="; + url = "https://registry.npmjs.org/firebase-tools/-/firebase-tools-9.10.0.tgz"; + sha512 = "0HoQEB6K5WiD/p/ca7KxzGZHCxtuVdck888N924TPkjkZ6YxYT8xJtuoKXCLRjJgw4yovJ/LnxZoU66w8JD1cQ=="; }; dependencies = [ sources."@apidevtools/json-schema-ref-parser-9.0.7" @@ -80523,7 +80588,7 @@ in sources."@google-cloud/precise-date-2.0.3" sources."@google-cloud/projectify-2.0.1" sources."@google-cloud/promisify-2.0.3" - (sources."@google-cloud/pubsub-2.10.0" // { + (sources."@google-cloud/pubsub-2.11.0" // { dependencies = [ sources."google-auth-library-7.0.4" ]; @@ -80535,16 +80600,8 @@ in }) sources."@grpc/proto-loader-0.5.6" sources."@jsdevtools/ono-7.1.3" - sources."@opentelemetry/api-0.12.0" - sources."@opentelemetry/context-base-0.12.0" - (sources."@opentelemetry/core-0.12.0" // { - dependencies = [ - sources."semver-7.3.5" - ]; - }) - sources."@opentelemetry/resources-0.12.0" - sources."@opentelemetry/semantic-conventions-0.12.0" - sources."@opentelemetry/tracing-0.12.0" + sources."@opentelemetry/api-0.18.1" + sources."@opentelemetry/semantic-conventions-0.18.2" sources."@protobufjs/aspromise-1.1.2" sources."@protobufjs/base64-1.1.2" sources."@protobufjs/codegen-2.0.4" @@ -80563,7 +80620,7 @@ in sources."@types/glob-7.1.3" sources."@types/long-4.0.1" sources."@types/minimatch-3.0.4" - sources."@types/node-14.14.37" + sources."@types/node-14.14.41" sources."JSONStream-1.3.5" sources."abbrev-1.1.1" sources."abort-controller-3.0.0" @@ -80818,7 +80875,7 @@ in sources."fecha-4.2.1" sources."figures-2.0.0" sources."file-uri-to-path-2.0.0" - sources."filesize-6.2.1" + sources."filesize-6.2.2" sources."fill-range-7.0.1" (sources."finalhandler-1.1.2" // { dependencies = [ @@ -81027,7 +81084,7 @@ in }) sources."merge-descriptors-1.0.1" sources."methods-1.1.2" - sources."mime-1.6.0" + sources."mime-2.5.2" sources."mime-db-1.47.0" sources."mime-types-2.1.30" sources."mimic-fn-1.2.0" @@ -81113,7 +81170,7 @@ in sources."promise-breaker-5.0.0" (sources."protobufjs-6.10.2" // { dependencies = [ - sources."@types/node-13.13.48" + sources."@types/node-13.13.50" ]; }) sources."proxy-addr-2.0.6" @@ -81178,6 +81235,7 @@ in sources."ms-2.0.0" ]; }) + sources."mime-1.6.0" sources."ms-2.1.1" ]; }) @@ -81457,7 +81515,7 @@ in sources."find-up-4.1.0" sources."fkill-7.1.1" sources."function-bind-1.1.1" - sources."get-stream-6.0.0" + sources."get-stream-6.0.1" sources."hard-rejection-2.1.0" sources."has-1.0.3" sources."has-flag-4.0.0" @@ -81590,7 +81648,7 @@ in dependencies = [ sources."@types/atob-2.1.2" sources."@types/inquirer-6.5.0" - sources."@types/node-14.14.37" + sources."@types/node-14.14.41" sources."@types/through-0.0.30" sources."ajv-6.12.6" sources."ansi-escapes-4.3.2" @@ -82311,7 +82369,7 @@ in sources."@babel/traverse-7.13.15" sources."@babel/types-7.13.14" sources."@graphql-tools/schema-7.1.3" - (sources."@graphql-tools/utils-7.7.2" // { + (sources."@graphql-tools/utils-7.7.3" // { dependencies = [ sources."tslib-2.2.0" ]; @@ -82349,7 +82407,8 @@ in sources."@types/istanbul-lib-coverage-2.0.3" sources."@types/istanbul-lib-report-3.0.0" sources."@types/istanbul-reports-1.1.2" - sources."@types/node-14.14.37" + sources."@types/json-patch-0.0.30" + sources."@types/node-14.14.41" sources."@types/node-fetch-2.5.10" sources."@types/readable-stream-2.3.9" sources."@types/unist-2.0.3" @@ -82467,7 +82526,7 @@ in ]; }) sources."content-type-1.0.4" - sources."contentful-management-7.14.1" + sources."contentful-management-7.15.1" sources."contentful-sdk-core-6.7.0" sources."convert-hrtime-3.0.0" (sources."convert-source-map-1.7.0" // { @@ -82517,7 +82576,7 @@ in sources."dotenv-8.2.0" sources."duplexer3-0.1.4" sources."ee-first-1.1.1" - sources."electron-to-chromium-1.3.713" + sources."electron-to-chromium-1.3.717" sources."emoji-regex-7.0.3" sources."encodeurl-1.0.2" sources."end-of-stream-1.4.4" @@ -83391,7 +83450,7 @@ in sources."find-up-3.0.0" sources."function-bind-1.1.1" sources."fuse.js-6.4.6" - sources."get-stream-6.0.0" + sources."get-stream-6.0.1" sources."global-dirs-3.0.0" (sources."got-9.6.0" // { dependencies = [ @@ -83610,7 +83669,7 @@ in sources."@graphql-cli/init-4.1.0" (sources."@graphql-tools/batch-execute-7.1.0" // { dependencies = [ - (sources."@graphql-tools/utils-7.7.2" // { + (sources."@graphql-tools/utils-7.7.3" // { dependencies = [ sources."tslib-2.2.0" ]; @@ -83620,13 +83679,13 @@ in }) (sources."@graphql-tools/delegate-7.1.2" // { dependencies = [ - sources."@graphql-tools/utils-7.7.2" + sources."@graphql-tools/utils-7.7.3" sources."tslib-2.2.0" ]; }) (sources."@graphql-tools/graphql-file-loader-6.2.7" // { dependencies = [ - (sources."@graphql-tools/utils-7.7.2" // { + (sources."@graphql-tools/utils-7.7.3" // { dependencies = [ sources."tslib-2.2.0" ]; @@ -83641,7 +83700,7 @@ in }) (sources."@graphql-tools/json-file-loader-6.2.6" // { dependencies = [ - (sources."@graphql-tools/utils-7.7.2" // { + (sources."@graphql-tools/utils-7.7.3" // { dependencies = [ sources."tslib-2.2.0" ]; @@ -83649,19 +83708,15 @@ in ]; }) sources."@graphql-tools/load-6.2.4" - (sources."@graphql-tools/merge-6.2.11" // { + (sources."@graphql-tools/merge-6.2.12" // { dependencies = [ - (sources."@graphql-tools/utils-7.7.2" // { - dependencies = [ - sources."tslib-2.2.0" - ]; - }) - sources."tslib-2.1.0" + sources."@graphql-tools/utils-7.7.3" + sources."tslib-2.2.0" ]; }) (sources."@graphql-tools/schema-7.1.3" // { dependencies = [ - (sources."@graphql-tools/utils-7.7.2" // { + (sources."@graphql-tools/utils-7.7.3" // { dependencies = [ sources."tslib-2.2.0" ]; @@ -83671,7 +83726,7 @@ in }) (sources."@graphql-tools/url-loader-6.8.2" // { dependencies = [ - (sources."@graphql-tools/utils-7.7.2" // { + (sources."@graphql-tools/utils-7.7.3" // { dependencies = [ sources."tslib-2.2.0" ]; @@ -83692,7 +83747,7 @@ in }) (sources."@graphql-tools/wrap-7.0.5" // { dependencies = [ - (sources."@graphql-tools/utils-7.7.2" // { + (sources."@graphql-tools/utils-7.7.3" // { dependencies = [ sources."tslib-2.2.0" ]; @@ -83706,7 +83761,7 @@ in sources."@nodelib/fs.walk-1.2.6" sources."@sindresorhus/is-0.14.0" sources."@szmarczak/http-timer-1.1.2" - sources."@types/node-14.14.37" + sources."@types/node-14.14.41" sources."@types/parse-json-4.0.0" sources."@types/websocket-1.0.2" sources."aggregate-error-3.1.0" @@ -85728,7 +85783,7 @@ in sources."number-is-nan-1.0.1" sources."object-assign-4.1.1" sources."once-1.4.0" - sources."prebuild-install-5.3.6" + sources."prebuild-install-6.1.1" sources."process-nextick-args-2.0.1" sources."pump-3.0.0" sources."rc-1.2.8" @@ -85752,10 +85807,9 @@ in sources."tunnel-agent-0.6.0" sources."util-deprecate-1.0.2" sources."uuid-3.4.0" - sources."which-pm-runs-1.0.0" sources."wide-align-1.1.3" sources."wrappy-1.0.2" - sources."zeromq-5.2.0" + sources."zeromq-5.2.4" ]; buildInputs = globalBuildInputs; meta = { @@ -86902,7 +86956,7 @@ in sources."async-mutex-0.1.4" sources."asynckit-0.4.0" sources."atob-2.1.2" - (sources."aws-sdk-2.886.0" // { + (sources."aws-sdk-2.888.0" // { dependencies = [ sources."sax-1.2.1" sources."uuid-3.3.2" @@ -87202,7 +87256,7 @@ in ]; }) sources."keytar-7.6.0" - sources."khroma-1.3.0" + sources."khroma-1.4.0" sources."klaw-1.3.1" sources."lazyness-1.2.0" sources."levenshtein-1.0.5" @@ -87237,7 +87291,7 @@ in sources."markdown-it-footnote-3.0.2" sources."markdown-it-ins-3.0.1" sources."markdown-it-mark-3.0.1" - (sources."markdown-it-multimd-table-4.0.3" // { + (sources."markdown-it-multimd-table-4.1.0" // { dependencies = [ sources."entities-2.0.3" sources."linkify-it-3.0.2" @@ -87576,10 +87630,10 @@ in js-beautify = nodeEnv.buildNodePackage { name = "js-beautify"; packageName = "js-beautify"; - version = "1.13.6"; + version = "1.13.11"; src = fetchurl { - url = "https://registry.npmjs.org/js-beautify/-/js-beautify-1.13.6.tgz"; - sha512 = "xS23BW6AVCIpxtUPJRXjTG/KhFGJyDR1TAT2l/sC+m7oFiLMLkU/QShmd3Z0p4WcZXj+MnjhBkA9ljtq8/OkhQ=="; + url = "https://registry.npmjs.org/js-beautify/-/js-beautify-1.13.11.tgz"; + sha512 = "+3CW1fQqkV7aXIvprevNYfSrKrASQf02IstAZCVSNh+/IS5ciaOtE7erfjyowdMYZZmP2A7SMFkcJ28qCl84+A=="; }; dependencies = [ sources."abbrev-1.1.1" @@ -87620,10 +87674,10 @@ in js-yaml = nodeEnv.buildNodePackage { name = "js-yaml"; packageName = "js-yaml"; - version = "4.0.0"; + version = "4.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/js-yaml/-/js-yaml-4.0.0.tgz"; - sha512 = "pqon0s+4ScYUvX30wxQi3PogGFAlUyH0awepWvwkj4jD4v+ova3RiYw8bmA6x2rDrEaj8i/oWKoRxpVNW+Re8Q=="; + url = "https://registry.npmjs.org/js-yaml/-/js-yaml-4.1.0.tgz"; + sha512 = "wpxZs9NoxZaJESJGIZTyDEaYpl0FKSA+FB9aJiyemKhMwkxQg63h4T1KJgUGHpTqPDNRcmmYLugrRjJlBtWvRA=="; }; dependencies = [ sources."argparse-2.0.1" @@ -88153,7 +88207,7 @@ in ]; }) sources."@oclif/screen-1.0.4" - sources."@putdotio/api-client-8.15.2" + sources."@putdotio/api-client-8.15.3" sources."ajv-6.12.6" sources."ansi-escapes-4.3.2" sources."ansi-regex-5.0.0" @@ -88371,7 +88425,7 @@ in sources."@types/component-emitter-1.2.10" sources."@types/cookie-0.4.0" sources."@types/cors-2.8.10" - sources."@types/node-14.14.37" + sources."@types/node-14.14.41" sources."accepts-1.3.7" sources."ansi-regex-5.0.0" sources."ansi-styles-4.3.0" @@ -89220,7 +89274,7 @@ in sources."@nodelib/fs.stat-2.0.4" sources."@nodelib/fs.walk-1.2.6" sources."@npmcli/ci-detect-1.3.0" - sources."@npmcli/git-2.0.7" + sources."@npmcli/git-2.0.8" sources."@npmcli/installed-package-contents-1.0.7" sources."@npmcli/move-file-1.1.2" sources."@npmcli/node-gyp-1.0.2" @@ -89445,7 +89499,7 @@ in }) sources."get-port-5.1.1" sources."get-stdin-4.0.1" - sources."get-stream-6.0.0" + sources."get-stream-6.0.1" sources."getpass-0.1.7" sources."git-raw-commits-2.0.10" (sources."git-remote-origin-url-2.0.0" // { @@ -90915,7 +90969,7 @@ in sources."@types/istanbul-lib-report-3.0.0" sources."@types/istanbul-reports-1.1.2" sources."@types/json-schema-7.0.7" - sources."@types/node-14.14.37" + sources."@types/node-14.14.41" sources."@types/normalize-package-data-2.4.0" sources."@types/resolve-0.0.8" sources."@types/yargs-15.0.13" @@ -91212,7 +91266,7 @@ in sources."duplexer2-0.1.4" sources."duplexify-3.7.1" sources."ecc-jsbn-0.1.2" - sources."electron-to-chromium-1.3.713" + sources."electron-to-chromium-1.3.717" (sources."elliptic-6.5.4" // { dependencies = [ sources."bn.js-4.12.0" @@ -91749,7 +91803,7 @@ in sources."stream-browserify-2.0.2" sources."stream-combiner2-1.1.1" sources."stream-each-1.2.3" - (sources."stream-http-3.1.1" // { + (sources."stream-http-3.2.0" // { dependencies = [ sources."readable-stream-3.6.0" ]; @@ -92408,7 +92462,7 @@ in }; dependencies = [ sources."@braintree/sanitize-url-3.1.0" - sources."@types/node-14.14.37" + sources."@types/node-14.14.41" sources."@types/yauzl-2.9.1" sources."agent-base-6.0.2" sources."ansi-styles-4.3.0" @@ -92490,7 +92544,7 @@ in sources."ieee754-1.2.1" sources."inflight-1.0.6" sources."inherits-2.0.4" - sources."khroma-1.3.0" + sources."khroma-1.4.0" sources."locate-path-5.0.0" sources."lodash-4.17.21" sources."lower-case-1.1.4" @@ -92566,11 +92620,11 @@ in sources."@fluentui/date-time-utilities-7.9.1" sources."@fluentui/dom-utilities-1.1.2" sources."@fluentui/keyboard-key-0.2.16" - sources."@fluentui/react-7.166.2" + sources."@fluentui/react-7.167.0" sources."@fluentui/react-focus-7.17.6" sources."@fluentui/react-window-provider-1.0.2" sources."@fluentui/theme-1.7.4" - sources."@microsoft/load-themed-styles-1.10.160" + sources."@microsoft/load-themed-styles-1.10.161" sources."@sindresorhus/is-0.14.0" sources."@szmarczak/http-timer-1.1.2" sources."@uifabric/foundation-7.9.26" @@ -92706,7 +92760,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.166.2" + sources."office-ui-fabric-react-7.167.0" sources."on-finished-2.3.0" sources."on-headers-1.0.2" sources."once-1.4.0" @@ -92777,7 +92831,7 @@ in sources."source-map-support-0.5.19" sources."sprintf-js-1.0.3" sources."statuses-1.5.0" - (sources."stream-http-3.1.1" // { + (sources."stream-http-3.2.0" // { dependencies = [ sources."inherits-2.0.4" ]; @@ -92797,7 +92851,7 @@ in sources."strip-json-comments-2.0.1" sources."supports-color-2.0.0" sources."swagger-schema-official-2.0.0-bab6bed" - sources."swagger-ui-dist-3.46.0" + sources."swagger-ui-dist-3.47.1" sources."tail-2.2.2" sources."through-2.3.8" sources."tmp-0.0.33" @@ -93082,10 +93136,10 @@ in netlify-cli = nodeEnv.buildNodePackage { name = "netlify-cli"; packageName = "netlify-cli"; - version = "3.17.2"; + version = "3.18.2"; src = fetchurl { - url = "https://registry.npmjs.org/netlify-cli/-/netlify-cli-3.17.2.tgz"; - sha512 = "PhSxSj/VvDEBSWwWSGY9xpDtxJjTUej8Ak1MZJFpRevtH/v4/RbuhUeapTTidDWO5bbzG+hyes0sa7R6oQySEg=="; + url = "https://registry.npmjs.org/netlify-cli/-/netlify-cli-3.18.2.tgz"; + sha512 = "PfsSVVLbVX7L9ZvvUL52gslq8FByh6U/fmlDe0Gv8FVnCzMl0SlSdcrG8OhW8QayE0KgV9lMOu9Mrvv/UaRwtQ=="; }; dependencies = [ sources."@babel/code-frame-7.12.13" @@ -93207,7 +93261,7 @@ in sources."@dabh/diagnostics-2.0.2" sources."@jest/types-24.9.0" sources."@mrmlnc/readdir-enhanced-2.2.1" - (sources."@netlify/build-10.2.7" // { + (sources."@netlify/build-11.0.2" // { dependencies = [ sources."ansi-styles-4.3.0" sources."chalk-3.0.0" @@ -93222,7 +93276,7 @@ in sources."locate-path-5.0.0" ]; }) - (sources."@netlify/config-5.12.0" // { + (sources."@netlify/config-6.0.1" // { dependencies = [ sources."ansi-styles-4.3.0" sources."chalk-3.0.0" @@ -93234,7 +93288,7 @@ in sources."locate-path-5.0.0" ]; }) - sources."@netlify/functions-utils-1.3.23" + sources."@netlify/functions-utils-1.3.24" (sources."@netlify/git-utils-1.0.8" // { dependencies = [ sources."braces-3.0.2" @@ -93275,7 +93329,7 @@ in sources."@netlify/traffic-mesh-agent-darwin-x64-0.27.10" sources."@netlify/traffic-mesh-agent-linux-x64-0.27.10" sources."@netlify/traffic-mesh-agent-win32-x64-0.27.10" - (sources."@netlify/zip-it-and-ship-it-3.2.1" // { + (sources."@netlify/zip-it-and-ship-it-3.4.0" // { dependencies = [ sources."locate-path-5.0.0" sources."resolve-2.0.0-next.3" @@ -93474,7 +93528,7 @@ in sources."@types/keyv-3.1.1" sources."@types/minimatch-3.0.4" sources."@types/mkdirp-0.5.2" - sources."@types/node-14.14.37" + sources."@types/node-14.14.41" sources."@types/node-fetch-2.5.10" sources."@types/normalize-package-data-2.4.0" sources."@types/resolve-1.17.1" @@ -93545,7 +93599,7 @@ in sources."at-least-node-1.0.0" sources."atob-2.1.2" sources."atob-lite-2.0.0" - (sources."aws-sdk-2.886.0" // { + (sources."aws-sdk-2.888.0" // { dependencies = [ sources."buffer-4.9.2" sources."ieee754-1.1.13" @@ -93863,15 +93917,13 @@ in sources."normalize-url-2.0.1" sources."p-cancelable-0.4.1" sources."p-event-2.3.1" - sources."p-finally-1.0.0" - sources."p-timeout-2.0.1" sources."pify-3.0.0" sources."sort-keys-2.0.0" ]; }) sources."duplexer3-0.1.4" sources."ee-first-1.1.1" - sources."electron-to-chromium-1.3.713" + sources."electron-to-chromium-1.3.717" sources."elegant-spinner-1.0.1" sources."elf-cam-0.1.1" sources."emoji-regex-8.0.0" @@ -93882,7 +93934,7 @@ in sources."envinfo-7.8.1" sources."error-ex-1.3.2" sources."error-stack-parser-2.0.6" - sources."esbuild-0.11.10" + sources."esbuild-0.11.11" sources."escalade-3.1.1" sources."escape-goat-2.1.1" sources."escape-html-1.0.3" @@ -93902,7 +93954,7 @@ in sources."events-1.1.1" (sources."execa-5.0.0" // { dependencies = [ - sources."get-stream-6.0.0" + sources."get-stream-6.0.1" sources."human-signals-2.1.0" ]; }) @@ -94137,7 +94189,7 @@ in ]; }) sources."http-proxy-1.18.1" - (sources."http-proxy-middleware-1.1.1" // { + (sources."http-proxy-middleware-1.1.2" // { dependencies = [ sources."braces-3.0.2" sources."fill-range-7.0.1" @@ -94240,7 +94292,7 @@ in sources."jmespath-0.15.0" sources."js-string-escape-1.0.1" sources."js-tokens-4.0.0" - sources."js-yaml-4.0.0" + sources."js-yaml-4.1.0" sources."jsesc-2.5.2" sources."json-buffer-3.0.0" sources."json-parse-better-errors-1.0.2" @@ -94423,12 +94475,12 @@ in sources."natural-orderby-2.0.3" sources."negotiator-0.6.2" sources."nested-error-stacks-2.1.0" - (sources."netlify-6.1.17" // { + (sources."netlify-6.1.18" // { dependencies = [ sources."qs-6.10.1" ]; }) - sources."netlify-redirect-parser-3.0.14" + sources."netlify-redirect-parser-3.0.15" sources."netlify-redirector-0.2.1" sources."nice-try-1.0.5" sources."node-fetch-2.6.1" @@ -94471,6 +94523,7 @@ in sources."pify-3.0.0" ]; }) + sources."npm-normalize-package-bin-1.0.1" sources."npm-run-path-4.0.1" sources."number-is-nan-1.0.1" sources."object-assign-4.1.1" @@ -94529,7 +94582,12 @@ in ]; }) sources."p-cancelable-1.1.0" - sources."p-event-4.2.0" + (sources."p-event-4.2.0" // { + dependencies = [ + sources."p-finally-1.0.0" + sources."p-timeout-3.2.0" + ]; + }) (sources."p-every-2.0.0" // { dependencies = [ sources."p-map-2.1.0" @@ -94546,13 +94604,18 @@ in sources."p-locate-4.1.0" sources."p-map-3.0.0" sources."p-reduce-2.1.0" - (sources."p-timeout-3.2.0" // { + (sources."p-timeout-2.0.1" // { dependencies = [ sources."p-finally-1.0.0" ]; }) sources."p-try-2.2.0" - sources."p-wait-for-3.2.0" + (sources."p-wait-for-3.2.0" // { + dependencies = [ + sources."p-finally-1.0.0" + sources."p-timeout-3.2.0" + ]; + }) (sources."package-json-6.5.0" // { dependencies = [ sources."semver-6.3.0" @@ -94639,6 +94702,7 @@ in }) sources."rc-1.2.8" sources."react-is-16.13.1" + sources."read-package-json-fast-2.0.2" (sources."read-pkg-5.2.0" // { dependencies = [ sources."type-fest-0.6.0" @@ -96435,7 +96499,7 @@ in sources."@types/http-cache-semantics-4.0.0" sources."@types/keyv-3.1.1" sources."@types/minimist-1.2.1" - sources."@types/node-14.14.37" + sources."@types/node-14.14.41" sources."@types/normalize-package-data-2.4.0" sources."@types/parse-json-4.0.0" sources."@types/responselike-1.0.0" @@ -96541,7 +96605,7 @@ in sources."find-up-4.1.0" sources."fs.realpath-1.0.0" sources."function-bind-1.1.1" - sources."get-stream-6.0.0" + sources."get-stream-6.0.1" sources."github-url-from-git-1.5.0" sources."glob-7.1.6" sources."glob-parent-5.1.2" @@ -96938,10 +97002,10 @@ in npm = nodeEnv.buildNodePackage { name = "npm"; packageName = "npm"; - version = "7.9.0"; + version = "7.10.0"; src = fetchurl { - url = "https://registry.npmjs.org/npm/-/npm-7.9.0.tgz"; - sha512 = "GW9RbueF717kJ4ZUVsTlhKBEY7AqX28OwQCsfIAkRZclfeeqQDnsoJz6WWuYTMpGBJnB2xknF8Dp364c93FDYA=="; + url = "https://registry.npmjs.org/npm/-/npm-7.10.0.tgz"; + sha512 = "DD4eEB71HGVt6pS6n4LmFD4eHsrglJ+QtLhv/kP2UWNKkJalL8TPfsiw9p8LmWKa6ed61LHPw5FE6krS3aGv0A=="; }; buildInputs = globalBuildInputs; meta = { @@ -96966,7 +97030,7 @@ in sources."@nodelib/fs.stat-2.0.4" sources."@nodelib/fs.walk-1.2.6" sources."@npmcli/ci-detect-1.3.0" - sources."@npmcli/git-2.0.7" + sources."@npmcli/git-2.0.8" sources."@npmcli/installed-package-contents-1.0.7" sources."@npmcli/move-file-1.1.2" sources."@npmcli/node-gyp-1.0.2" @@ -97125,7 +97189,7 @@ in sources."isexe-2.0.0" sources."isstream-0.1.2" sources."jju-1.4.0" - sources."js-yaml-4.0.0" + sources."js-yaml-4.1.0" sources."jsbn-0.1.1" sources."json-buffer-3.0.0" sources."json-parse-even-better-errors-2.3.1" @@ -97920,7 +97984,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.713" + sources."electron-to-chromium-1.3.717" (sources."elliptic-6.5.4" // { dependencies = [ sources."bn.js-4.12.0" @@ -100242,7 +100306,7 @@ in sources."sourcemap-codec-1.4.8" sources."stream-browserify-2.0.2" sources."stream-combiner2-1.1.1" - (sources."stream-http-3.1.1" // { + (sources."stream-http-3.2.0" // { dependencies = [ sources."readable-stream-3.6.0" ]; @@ -100942,11 +101006,11 @@ in sources."@redocly/ajv-6.12.4" (sources."@redocly/openapi-core-1.0.0-beta.44" // { dependencies = [ - sources."@types/node-14.14.37" + sources."@types/node-14.14.41" ]; }) sources."@redocly/react-dropdown-aria-2.0.11" - sources."@types/node-13.13.48" + sources."@types/node-13.13.50" (sources."ajv-5.5.2" // { dependencies = [ sources."fast-deep-equal-1.1.0" @@ -101271,6 +101335,146 @@ in bypassCache = true; reconstructLock = true; }; + remod-cli = nodeEnv.buildNodePackage { + name = "remod-cli"; + packageName = "remod-cli"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/remod-cli/-/remod-cli-1.0.1.tgz"; + sha512 = "QxvCtwgDBTeBC9V+niO9WPrnNKVEIa0osvdKhw2JkhOjFY0PK/vcFL5jrj7di6GurLIzdweXJgTWnQz2VljdQQ=="; + }; + dependencies = [ + sources."@types/yoga-layout-1.9.2" + sources."ansi-escapes-4.3.2" + sources."ansi-regex-5.0.0" + sources."ansi-styles-4.3.0" + sources."array-find-index-1.0.2" + sources."arrify-2.0.1" + sources."astral-regex-2.0.0" + sources."auto-bind-4.0.0" + sources."camelcase-4.1.0" + sources."camelcase-keys-4.2.0" + sources."chalk-3.0.0" + sources."ci-info-2.0.0" + sources."cli-cursor-3.1.0" + sources."cli-truncate-2.1.0" + sources."color-convert-2.0.1" + sources."color-name-1.1.4" + sources."currently-unhandled-0.4.1" + sources."decamelize-1.2.0" + (sources."decamelize-keys-1.1.0" // { + dependencies = [ + sources."map-obj-1.0.1" + ]; + }) + sources."emoji-regex-8.0.0" + sources."error-ex-1.3.2" + sources."escape-string-regexp-1.0.5" + sources."figures-3.2.0" + sources."find-up-2.1.0" + sources."function-bind-1.1.1" + sources."graceful-fs-4.2.6" + sources."has-1.0.3" + sources."has-flag-4.0.0" + sources."hosted-git-info-2.8.9" + sources."indent-string-3.2.0" + sources."ink-2.7.1" + sources."is-arrayish-0.2.1" + sources."is-ci-2.0.0" + sources."is-core-module-2.2.0" + sources."is-fullwidth-code-point-3.0.0" + sources."is-plain-obj-1.1.0" + sources."js-tokens-4.0.0" + sources."json-parse-better-errors-1.0.2" + sources."load-json-file-4.0.0" + sources."locate-path-2.0.0" + sources."lodash.throttle-4.1.1" + (sources."log-update-3.4.0" // { + dependencies = [ + sources."ansi-escapes-3.2.0" + sources."ansi-regex-4.1.0" + sources."ansi-styles-3.2.1" + sources."cli-cursor-2.1.0" + sources."color-convert-1.9.3" + sources."color-name-1.1.3" + sources."emoji-regex-7.0.3" + sources."is-fullwidth-code-point-2.0.0" + sources."mimic-fn-1.2.0" + sources."onetime-2.0.1" + sources."restore-cursor-2.0.0" + sources."string-width-3.1.0" + sources."strip-ansi-5.2.0" + sources."wrap-ansi-5.1.0" + ]; + }) + sources."loose-envify-1.4.0" + sources."loud-rejection-1.6.0" + sources."map-obj-2.0.0" + sources."meow-5.0.0" + sources."mimic-fn-2.1.0" + (sources."minimist-options-3.0.2" // { + dependencies = [ + sources."arrify-1.0.1" + ]; + }) + sources."normalize-package-data-2.5.0" + sources."object-assign-4.1.1" + sources."onetime-5.1.2" + sources."p-limit-1.3.0" + sources."p-locate-2.0.0" + sources."p-try-1.0.0" + sources."parse-json-4.0.0" + sources."path-exists-3.0.0" + sources."path-parse-1.0.6" + sources."path-type-3.0.0" + sources."pify-3.0.0" + sources."prop-types-15.7.2" + sources."quick-lru-1.1.0" + sources."react-16.14.0" + sources."react-is-16.13.1" + sources."react-reconciler-0.24.0" + sources."read-pkg-3.0.0" + sources."read-pkg-up-3.0.0" + sources."redent-2.0.0" + sources."resolve-1.20.0" + sources."restore-cursor-3.1.0" + sources."scheduler-0.18.0" + sources."semver-5.7.1" + sources."signal-exit-3.0.3" + sources."slice-ansi-3.0.0" + 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.7" + (sources."string-length-3.1.0" // { + dependencies = [ + sources."ansi-regex-4.1.0" + sources."astral-regex-1.0.0" + sources."strip-ansi-5.2.0" + ]; + }) + sources."string-width-4.2.2" + sources."strip-ansi-6.0.0" + sources."strip-bom-3.0.0" + sources."strip-indent-2.0.0" + sources."supports-color-7.2.0" + sources."trim-newlines-2.0.0" + sources."type-fest-0.21.3" + sources."validate-npm-package-license-3.0.4" + sources."widest-line-3.1.0" + sources."wrap-ansi-6.2.0" + sources."yargs-parser-10.1.0" + sources."yoga-layout-prebuilt-1.10.0" + ]; + buildInputs = globalBuildInputs; + meta = { + description = "chmod for human beings!"; + license = "MIT"; + }; + production = true; + bypassCache = true; + reconstructLock = true; + }; "reveal.js" = nodeEnv.buildNodePackage { name = "reveal.js"; packageName = "reveal.js"; @@ -101683,7 +101887,7 @@ in sources."strip-ansi-6.0.0" sources."strip-json-comments-3.1.1" sources."supports-color-5.5.0" - (sources."table-6.0.9" // { + (sources."table-6.1.0" // { dependencies = [ sources."ajv-8.1.0" sources."json-schema-traverse-1.0.0" @@ -102092,7 +102296,7 @@ in ]; }) sources."@serverless/component-metrics-1.0.8" - (sources."@serverless/components-3.8.2" // { + (sources."@serverless/components-3.8.3" // { dependencies = [ sources."ansi-regex-5.0.0" sources."js-yaml-3.14.1" @@ -102137,7 +102341,7 @@ in sources."@types/keyv-3.1.1" sources."@types/lodash-4.14.168" sources."@types/long-4.0.1" - sources."@types/node-14.14.37" + sources."@types/node-14.14.41" sources."@types/request-2.48.5" sources."@types/request-promise-native-1.0.17" sources."@types/responselike-1.0.0" @@ -102198,7 +102402,7 @@ in sources."async-2.6.3" sources."asynckit-0.4.0" sources."at-least-node-1.0.0" - (sources."aws-sdk-2.886.0" // { + (sources."aws-sdk-2.888.0" // { dependencies = [ sources."buffer-4.9.2" sources."ieee754-1.1.13" @@ -102433,7 +102637,7 @@ in sources."file-uri-to-path-1.0.0" sources."filename-reserved-regex-2.0.0" sources."filenamify-3.0.0" - sources."filesize-6.2.1" + sources."filesize-6.2.2" sources."fill-range-7.0.1" sources."find-requires-1.0.0" sources."flat-5.0.2" @@ -102551,7 +102755,7 @@ in sources."isstream-0.1.2" sources."isurl-1.0.0" sources."jmespath-0.15.0" - (sources."js-yaml-4.0.0" // { + (sources."js-yaml-4.1.0" // { dependencies = [ sources."argparse-2.0.1" ]; @@ -102706,7 +102910,7 @@ in sources."promise-queue-2.2.5" (sources."protobufjs-6.10.2" // { dependencies = [ - sources."@types/node-13.13.48" + sources."@types/node-13.13.50" sources."long-4.0.0" ]; }) @@ -102735,7 +102939,7 @@ in }) sources."request-promise-core-1.1.4" sources."request-promise-native-1.0.9" - sources."resolve-alpn-1.1.1" + sources."resolve-alpn-1.1.2" sources."responselike-1.0.2" sources."restore-cursor-3.1.0" sources."retry-0.10.1" @@ -102757,7 +102961,7 @@ in sources."signal-exit-3.0.3" sources."simple-concat-1.0.1" sources."simple-get-2.8.1" - (sources."simple-git-2.37.0" // { + (sources."simple-git-2.38.0" // { dependencies = [ sources."debug-4.3.2" sources."ms-2.1.2" @@ -103567,10 +103771,10 @@ in snyk = nodeEnv.buildNodePackage { name = "snyk"; packageName = "snyk"; - version = "1.538.0"; + version = "1.543.0"; src = fetchurl { - url = "https://registry.npmjs.org/snyk/-/snyk-1.538.0.tgz"; - sha512 = "lq2/Ykzec9XacniZpkZaJPQDyBDWqgUsdugn6Kcm+ba2RJU72Dr6VSnIQPQ9ebe9nbNriABmURnLmH9aApiWew=="; + url = "https://registry.npmjs.org/snyk/-/snyk-1.543.0.tgz"; + sha512 = "6PiGHbALrZGLrsgPgocxOUjFa8o2lWfoZiYLpFyFXOQmYP5mzV1Y9S6IoANxVXNmPpRTdwJamlWG1v6g0YSYhA=="; }; dependencies = [ sources."@arcanis/slice-ansi-1.0.2" @@ -103584,7 +103788,7 @@ in sources."@snyk/cli-interface-2.11.0" sources."@snyk/cloud-config-parser-1.9.2" sources."@snyk/cocoapods-lockfile-parser-3.6.2" - (sources."@snyk/code-client-3.4.0" // { + (sources."@snyk/code-client-3.4.1" // { dependencies = [ sources."uuid-8.3.2" ]; @@ -103597,7 +103801,7 @@ in }) sources."@snyk/docker-registry-v2-client-1.13.9" sources."@snyk/fast-glob-3.2.6-patch" - (sources."@snyk/fix-1.526.0" // { + (sources."@snyk/fix-1.539.0" // { dependencies = [ sources."chalk-4.1.0" sources."strip-ansi-6.0.0" @@ -103655,7 +103859,7 @@ in sources."@types/lodash.omit-4.5.6" sources."@types/lodash.union-4.6.6" sources."@types/micromatch-4.0.1" - sources."@types/node-14.14.37" + sources."@types/node-14.14.41" sources."@types/responselike-1.0.0" sources."@types/sarif-2.1.3" sources."@types/semver-7.3.4" @@ -103682,7 +103886,7 @@ in sources."@yarnpkg/parsers-2.3.0" (sources."@yarnpkg/pnp-2.3.2" // { dependencies = [ - sources."@types/node-13.13.48" + sources."@types/node-13.13.50" ]; }) (sources."@yarnpkg/shell-2.4.1" // { @@ -104057,7 +104261,7 @@ in sources."readable-stream-3.6.0" sources."registry-auth-token-4.2.1" sources."registry-url-5.1.0" - sources."resolve-alpn-1.1.1" + sources."resolve-alpn-1.1.2" sources."responselike-2.0.0" sources."restore-cursor-3.1.0" sources."reusify-1.0.4" @@ -104304,7 +104508,7 @@ in sources."@types/component-emitter-1.2.10" sources."@types/cookie-0.4.0" sources."@types/cors-2.8.10" - sources."@types/node-14.14.37" + sources."@types/node-14.14.41" sources."accepts-1.3.7" sources."base64-arraybuffer-0.1.4" sources."base64id-2.0.0" @@ -104532,6 +104736,7 @@ in sources."ansi-styles-2.2.1" sources."anymatch-1.3.2" sources."append-batch-0.0.2" + sources."argparse-1.0.10" sources."arr-diff-2.0.0" sources."arr-flatten-1.1.0" sources."arr-union-3.1.0" @@ -104690,6 +104895,8 @@ in }) sources."es-to-primitive-1.2.1" sources."escape-string-regexp-1.0.5" + sources."esprima-4.0.1" + sources."events-to-array-1.1.2" (sources."execa-4.1.0" // { dependencies = [ sources."cross-spawn-7.0.3" @@ -104867,13 +105074,14 @@ in sources."isarray-1.0.0" sources."isexe-2.0.0" sources."isobject-2.1.0" - (sources."jitdb-3.0.2" // { + (sources."jitdb-3.0.3" // { dependencies = [ sources."mkdirp-1.0.4" sources."push-stream-11.0.0" sources."typedarray-to-buffer-4.0.0" ]; }) + sources."js-yaml-3.14.1" sources."jsesc-3.0.2" sources."json-buffer-2.0.11" sources."kind-of-3.2.2" @@ -105294,12 +105502,13 @@ in sources."source-map-url-0.4.1" sources."split-buffer-1.0.0" sources."split-string-3.1.0" + sources."sprintf-js-1.0.3" sources."ssb-blobs-1.2.2" sources."ssb-caps-1.1.0" sources."ssb-client-4.9.0" sources."ssb-config-3.4.5" sources."ssb-db-19.2.0" - (sources."ssb-db2-2.0.0" // { + (sources."ssb-db2-2.0.2" // { dependencies = [ sources."abstract-leveldown-6.2.3" (sources."flumecodec-0.0.1" // { @@ -105396,6 +105605,8 @@ in sources."strip-final-newline-2.0.0" sources."strip-json-comments-2.0.1" sources."supports-color-2.0.0" + sources."tap-bail-1.0.0" + sources."tap-parser-5.4.0" (sources."tape-4.13.3" // { dependencies = [ sources."glob-7.1.6" @@ -105567,7 +105778,7 @@ in sources."async-1.5.2" sources."async-limiter-1.0.1" sources."asynckit-0.4.0" - (sources."aws-sdk-2.886.0" // { + (sources."aws-sdk-2.888.0" // { dependencies = [ sources."uuid-3.3.2" ]; @@ -106433,7 +106644,7 @@ in sources."domelementtype-1.3.1" sources."domhandler-2.4.2" sources."domutils-1.7.0" - sources."electron-to-chromium-1.3.713" + sources."electron-to-chromium-1.3.717" sources."emoji-regex-8.0.0" sources."entities-1.1.2" sources."error-ex-1.3.2" @@ -106635,7 +106846,7 @@ in sources."sugarss-2.0.0" sources."supports-color-5.5.0" sources."svg-tags-1.0.0" - sources."table-6.0.9" + sources."table-6.1.0" sources."to-fast-properties-2.0.0" sources."to-regex-range-5.0.1" sources."trim-newlines-3.0.0" @@ -106683,7 +106894,7 @@ in sources."@emmetio/abbreviation-2.2.2" sources."@emmetio/css-abbreviation-2.1.4" sources."@emmetio/scanner-1.0.0" - sources."@types/node-14.14.37" + sources."@types/node-14.14.41" sources."@types/pug-2.0.4" sources."@types/sass-1.16.0" sources."anymatch-3.1.2" @@ -108687,7 +108898,7 @@ in sources."@types/debug-4.1.5" sources."@types/http-cache-semantics-4.0.0" sources."@types/keyv-3.1.1" - sources."@types/node-14.14.37" + sources."@types/node-14.14.41" sources."@types/responselike-1.0.0" sources."abbrev-1.1.1" sources."abstract-logging-2.0.1" @@ -109014,7 +109225,7 @@ in sources."uuid-3.4.0" ]; }) - sources."resolve-alpn-1.1.1" + sources."resolve-alpn-1.1.2" sources."responselike-2.0.0" sources."rimraf-2.7.1" sources."safe-buffer-5.2.1" @@ -109657,7 +109868,7 @@ in sources."@types/component-emitter-1.2.10" sources."@types/cookie-0.4.0" sources."@types/cors-2.8.10" - sources."@types/node-14.14.37" + sources."@types/node-14.14.41" sources."abbrev-1.1.1" sources."accepts-1.3.7" sources."ansi-regex-5.0.0" @@ -109974,7 +110185,7 @@ in sources."d3-interpolate-2.0.1" sources."d3-path-2.0.0" sources."d3-quadtree-2.0.0" - sources."d3-scale-3.2.4" + sources."d3-scale-3.3.0" sources."d3-shape-2.1.0" sources."d3-time-2.1.1" sources."d3-time-format-3.0.0" @@ -111454,7 +111665,7 @@ in sources."@starptech/rehype-webparser-0.10.0" sources."@starptech/webparser-0.10.0" sources."@szmarczak/http-timer-1.1.2" - sources."@types/node-14.14.37" + sources."@types/node-14.14.41" sources."@types/unist-2.0.3" sources."@types/vfile-3.0.2" sources."@types/vfile-message-2.0.0" @@ -111837,7 +112048,7 @@ in sources."isarray-1.0.0" sources."isexe-2.0.0" sources."isobject-3.0.1" - (sources."js-beautify-1.13.8" // { + (sources."js-beautify-1.13.11" // { dependencies = [ sources."mkdirp-1.0.4" ]; @@ -112397,7 +112608,7 @@ in sources."@sindresorhus/is-0.14.0" sources."@szmarczak/http-timer-1.1.2" sources."@types/minimatch-3.0.4" - sources."@types/node-14.14.37" + sources."@types/node-14.14.41" sources."@types/yauzl-2.9.1" sources."acorn-7.4.1" sources."acorn-jsx-5.3.1" @@ -112931,7 +113142,7 @@ in sources."strip-final-newline-2.0.0" sources."strip-json-comments-3.1.1" sources."supports-color-7.2.0" - (sources."table-6.0.9" // { + (sources."table-6.1.0" // { dependencies = [ sources."ajv-8.1.0" sources."json-schema-traverse-1.0.0" @@ -113007,17 +113218,17 @@ in webpack = nodeEnv.buildNodePackage { name = "webpack"; packageName = "webpack"; - version = "5.32.0"; + version = "5.33.2"; src = fetchurl { - url = "https://registry.npmjs.org/webpack/-/webpack-5.32.0.tgz"; - sha512 = "jB9PrNMFnPRiZGnm/j3qfNqJmP3ViRzkuQMIf8za0dgOYvSLi/cgA+UEEGvik9EQHX1KYyGng5PgBTTzGrH9xg=="; + url = "https://registry.npmjs.org/webpack/-/webpack-5.33.2.tgz"; + sha512 = "X4b7F1sYBmJx8mlh2B7mV5szEkE0jYNJ2y3akgAP0ERi0vLCG1VvdsIxt8lFd4st6SUy0lf7W0CCQS566MBpJg=="; }; dependencies = [ - sources."@types/eslint-7.2.9" + sources."@types/eslint-7.2.10" sources."@types/eslint-scope-3.7.0" sources."@types/estree-0.0.46" sources."@types/json-schema-7.0.7" - sources."@types/node-14.14.37" + sources."@types/node-14.14.41" sources."@webassemblyjs/ast-1.11.0" sources."@webassemblyjs/floating-point-hex-parser-1.11.0" sources."@webassemblyjs/helper-api-error-1.11.0" @@ -113044,7 +113255,7 @@ in sources."chrome-trace-event-1.0.3" sources."colorette-1.2.2" sources."commander-2.20.3" - sources."electron-to-chromium-1.3.713" + sources."electron-to-chromium-1.3.717" sources."enhanced-resolve-5.7.0" sources."es-module-lexer-0.4.1" sources."escalade-3.1.1" @@ -113126,7 +113337,7 @@ in sources."fastest-levenshtein-1.0.12" sources."find-up-4.1.0" sources."function-bind-1.1.1" - sources."get-stream-6.0.0" + sources."get-stream-6.0.1" sources."has-1.0.3" sources."human-signals-2.1.0" sources."import-local-3.0.2" @@ -113183,7 +113394,7 @@ in dependencies = [ sources."@types/glob-7.1.3" sources."@types/minimatch-3.0.4" - sources."@types/node-14.14.37" + sources."@types/node-14.14.41" sources."accepts-1.3.7" sources."ajv-6.12.6" sources."ajv-errors-1.0.1" @@ -113832,7 +114043,7 @@ in sources."@protobufjs/pool-1.1.0" sources."@protobufjs/utf8-1.1.0" sources."@types/long-4.0.1" - sources."@types/node-13.13.48" + sources."@types/node-13.13.50" sources."addr-to-ip-port-1.5.1" sources."airplay-js-0.3.0" sources."balanced-match-1.0.2" @@ -113969,6 +114180,12 @@ in }) sources."long-4.0.0" sources."lru-3.1.0" + (sources."lt_donthave-1.0.1" // { + dependencies = [ + sources."debug-4.3.2" + sources."ms-2.1.2" + ]; + }) sources."magnet-uri-5.4.0" sources."mdns-js-0.5.0" sources."mdns-js-packet-0.2.0" @@ -114101,12 +114318,12 @@ in sources."utp-native-2.4.0" sources."videostream-3.2.2" sources."vlc-command-1.2.0" - (sources."webtorrent-0.116.2" // { + (sources."webtorrent-0.117.0" // { dependencies = [ sources."debug-4.3.2" sources."decompress-response-6.0.0" sources."get-stdin-8.0.0" - sources."magnet-uri-6.1.0" + sources."magnet-uri-6.1.1" sources."mimic-response-3.1.0" sources."ms-2.1.2" sources."parse-torrent-9.1.3" @@ -114284,10 +114501,10 @@ in yaml-language-server = nodeEnv.buildNodePackage { name = "yaml-language-server"; packageName = "yaml-language-server"; - version = "0.17.0"; + version = "0.18.0"; src = fetchurl { - url = "https://registry.npmjs.org/yaml-language-server/-/yaml-language-server-0.17.0.tgz"; - sha512 = "jugQKTXkLDMq9J6ZN2hl+pTR2lDdSHV+bb8sCGO7//BSX7HFXlX2C5M4jghFeL4AAodBZ5WEHUzHoI7llm5p6g=="; + url = "https://registry.npmjs.org/yaml-language-server/-/yaml-language-server-0.18.0.tgz"; + sha512 = "Cm3UKlaEzvd+my1L4lf5NKfCqDCkdxLmuvq8jRWOPjtrGEdY41EtuY1V+lRdRREVXyurgy4NPVFWzarcl5CltQ=="; }; dependencies = [ sources."agent-base-4.3.0" @@ -114364,7 +114581,7 @@ in sources."@sindresorhus/is-0.7.0" sources."@types/glob-7.1.3" sources."@types/minimatch-3.0.4" - sources."@types/node-14.14.37" + sources."@types/node-14.14.41" sources."@types/normalize-package-data-2.4.0" sources."JSONStream-1.3.5" sources."aggregate-error-3.1.0" From 8a91c70ec1431b5063462e8191026ef9c91ac4dd Mon Sep 17 00:00:00 2001 From: Ben Wolsieffer Date: Thu, 15 Apr 2021 23:47:25 -0400 Subject: [PATCH 158/230] gnutls: remove upstreamed armv7l patch --- pkgs/development/libraries/gnutls/default.nix | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/pkgs/development/libraries/gnutls/default.nix b/pkgs/development/libraries/gnutls/default.nix index e97630871a9..2b3e873cc59 100644 --- a/pkgs/development/libraries/gnutls/default.nix +++ b/pkgs/development/libraries/gnutls/default.nix @@ -34,10 +34,7 @@ stdenv.mkDerivation { patches = [ ./nix-ssl-cert-file.patch ] # Disable native add_system_trust. - ++ lib.optional (isDarwin && !withSecurity) ./no-security-framework.patch - # fix gnulib tests on 32-bit ARM. Included on gnutls master. - # https://lists.gnu.org/r/bug-gnulib/2020-08/msg00225.html - ++ lib.optional stdenv.hostPlatform.isAarch32 ./fix-gnulib-tests-arm.patch; + ++ lib.optional (isDarwin && !withSecurity) ./no-security-framework.patch; # Skip some tests: # - pkg-config: building against the result won't work before installing (3.5.11) From 54a942426e6b62c0501e0b11f53ee4b4acb5c1a4 Mon Sep 17 00:00:00 2001 From: Kasper Date: Fri, 16 Apr 2021 08:48:27 +0200 Subject: [PATCH 159/230] gnutls: fix build with musl (#119569) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnutls: fix build with musl * gnutls: don't handle old versions Co-authored-by: Kasper Gałkowski --- pkgs/development/libraries/gnutls/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/gnutls/default.nix b/pkgs/development/libraries/gnutls/default.nix index 2b3e873cc59..bec366b8e16 100644 --- a/pkgs/development/libraries/gnutls/default.nix +++ b/pkgs/development/libraries/gnutls/default.nix @@ -47,7 +47,7 @@ stdenv.mkDerivation { sed '/^void doit(void)/,/^{/ s/{/{ exit(77);/' -i tests/{trust-store,psk-file}.c sed 's:/usr/lib64/pkcs11/ /usr/lib/pkcs11/ /usr/lib/x86_64-linux-gnu/pkcs11/:`pkg-config --variable=p11_module_path p11-kit-1`:' -i tests/p11-kit-trust.sh '' + lib.optionalString stdenv.hostPlatform.isMusl '' # See https://gitlab.com/gnutls/gnutls/-/issues/945 - sed '2iecho "certtool tests skipped in musl build"\nexit 0' -i tests/cert-tests/certtool + sed '2iecho "certtool tests skipped in musl build"\nexit 0' -i tests/cert-tests/certtool.sh ''; preConfigure = "patchShebangs ."; From 01fa878ebc52b55cc511de3eb06910ee43903b63 Mon Sep 17 00:00:00 2001 From: kolaente Date: Fri, 16 Apr 2021 08:48:50 +0200 Subject: [PATCH 160/230] gitea: 1.14.0 -> 1.14.1 --- pkgs/applications/version-management/gitea/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/version-management/gitea/default.nix b/pkgs/applications/version-management/gitea/default.nix index f71235025d5..e67965f77d3 100644 --- a/pkgs/applications/version-management/gitea/default.nix +++ b/pkgs/applications/version-management/gitea/default.nix @@ -16,12 +16,12 @@ with lib; buildGoPackage rec { pname = "gitea"; - version = "1.14.0"; + version = "1.14.1"; # 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 = "sha256-SE+YqcRNkhRQXDzgv72YrQX9bG/URYj4NAFvTg4bE3Y="; + sha256 = "1hpwc5jmkbnn6qf3li8g38qz2l87vk6jq2zxijq92jyfp54kj03p"; }; unpackPhase = '' From 72255d3fef193fefeb1d3117e5386b51894b5dfc Mon Sep 17 00:00:00 2001 From: Henner Zeller Date: Thu, 15 Apr 2021 18:02:14 -0700 Subject: [PATCH 161/230] gmrender-resurrect: 0.0.8 -> 0.0.9 Updating the latest version of gmrender-resurrect lets us skip adding the cherrypick patch, as this is already included in 0.0.9. (Note, I am not maintainer of this nix package, but maintainer of gmrender-resurrect) Signed-off-by: Henner Zeller --- .../networking/gmrender-resurrect/default.nix | 18 +++++------------- 1 file changed, 5 insertions(+), 13 deletions(-) diff --git a/pkgs/tools/networking/gmrender-resurrect/default.nix b/pkgs/tools/networking/gmrender-resurrect/default.nix index acaeb3bc4cc..d4fc1b22e8f 100644 --- a/pkgs/tools/networking/gmrender-resurrect/default.nix +++ b/pkgs/tools/networking/gmrender-resurrect/default.nix @@ -1,8 +1,8 @@ -{ lib, stdenv, fetchFromGitHub, fetchpatch, autoreconfHook, pkg-config, makeWrapper, gstreamer +{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkg-config, makeWrapper, gstreamer , gst-plugins-base, gst-plugins-good, gst-plugins-bad, gst-plugins-ugly, gst-libav, libupnp }: let - version = "0.0.8"; + version = "0.0.9"; makePluginPath = plugins: builtins.concatStringsSep ":" (map (p: p + "/lib/gstreamer-1.0") plugins); @@ -16,17 +16,9 @@ in owner = "hzeller"; repo = "gmrender-resurrect"; rev = "v${version}"; - sha256 = "14i5jrry6qiap5l2x2jqj7arymllajl3wgnk29ccvr8d45zp4jn1"; + sha256 = "0byxd28hnhkhf3lqsad43n6czfajvc1ksg9zikxb95wwk4ljqv1q"; }; - patches = [ - (fetchpatch { - url = "https://github.com/hzeller/gmrender-resurrect/commit/dc8c4d4dc234311b3099e7f1efadf5d9733c81e9.patch"; - sha256 = "0fqi58viaq9jg5h5j1725qrach4c3wmfmh0q43q4r8az2pn7dszw"; - name = "libupnp.patch"; - }) - ]; - buildInputs = [ gstreamer libupnp ]; nativeBuildInputs = [ autoreconfHook pkg-config makeWrapper ]; @@ -39,8 +31,8 @@ in meta = with lib; { description = "Resource efficient UPnP/DLNA renderer, optimal for Raspberry Pi, CuBox or a general MediaServer"; homepage = "https://github.com/hzeller/gmrender-resurrect"; - license = licenses.gpl2; + license = licenses.gpl2Plus; platforms = platforms.linux; - maintainers = with maintainers; [ koral ashkitten ]; + maintainers = with maintainers; [ koral hzeller ]; }; } From 93dfed39d278cdf4e0ba118ca355c5dbf709f83d Mon Sep 17 00:00:00 2001 From: Johannes Schleifenbaum Date: Fri, 16 Apr 2021 09:20:14 +0200 Subject: [PATCH 162/230] haruna: init at 0.6.1 --- pkgs/applications/video/haruna/default.nix | 71 ++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 73 insertions(+) create mode 100644 pkgs/applications/video/haruna/default.nix diff --git a/pkgs/applications/video/haruna/default.nix b/pkgs/applications/video/haruna/default.nix new file mode 100644 index 00000000000..661c72b5605 --- /dev/null +++ b/pkgs/applications/video/haruna/default.nix @@ -0,0 +1,71 @@ +{ lib +, fetchFromGitHub +, mkDerivation +, breeze-icons +, breeze-qt5 +, cmake +, extra-cmake-modules +, kcodecs +, kconfig +, kcoreaddons +, kfilemetadata +, ki18n +, kiconthemes +, kio +, kio-extras +, kirigami2 +, kxmlgui +, mpv +, pkg-config +, qqc2-desktop-style +, qtbase +, qtquickcontrols2 +, qtwayland +, youtube-dl +}: + +mkDerivation rec { + pname = "haruna"; + version = "0.6.1"; + + src = fetchFromGitHub { + owner = "g-fb"; + repo = "haruna"; + rev = version; + sha256 = "sha256-8MauKmvQUwzq4Ssmm6g7/y6ADkye+eg/zyR3v/Wu848="; + }; + + buildInputs = [ + breeze-icons + breeze-qt5 + kcodecs + kconfig + kcoreaddons + kfilemetadata + ki18n + kiconthemes + kio + kio-extras + kirigami2 + kxmlgui + mpv + qqc2-desktop-style + qtbase + qtquickcontrols2 + qtwayland + youtube-dl + ]; + + nativeBuildInputs = [ + cmake + extra-cmake-modules + pkg-config + ]; + + meta = with lib; { + homepage = "https://github.com/g-fb/haruna"; + description = "Open source video player built with Qt/QML and libmpv"; + license = with licenses; [ bsd3 cc-by-40 gpl3Plus wtfpl ]; + maintainers = with maintainers; [ jojosch ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 13be95c1d87..8173405d190 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -22667,6 +22667,8 @@ in gspeech = callPackage ../applications/audio/gspeech { }; + haruna = libsForQt5.callPackage ../applications/video/haruna { }; + icesl = callPackage ../applications/misc/icesl { }; keepassx = callPackage ../applications/misc/keepassx { }; From a7ee5158ab295f1749b1e728b3a035e3d0f9ae71 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Fri, 16 Apr 2021 09:33:04 +0200 Subject: [PATCH 163/230] tts: 0.0.11 -> 0.0.12 --- pkgs/tools/audio/tts/default.nix | 22 +++++++++++++++++----- 1 file changed, 17 insertions(+), 5 deletions(-) diff --git a/pkgs/tools/audio/tts/default.nix b/pkgs/tools/audio/tts/default.nix index 59cb9caf55e..3a10881b605 100644 --- a/pkgs/tools/audio/tts/default.nix +++ b/pkgs/tools/audio/tts/default.nix @@ -2,6 +2,7 @@ , python3Packages , fetchFromGitHub , python3 +, fetchpatch }: # USAGE: @@ -9,23 +10,32 @@ # # pick your favorite vocoder/tts model # $ tts-server --model_name tts_models/en/ljspeech/glow-tts --vocoder_name vocoder_models/universal/libri-tts/fullband-melgan # +# If you upgrade from an old version you may have to delete old models from ~/.local/share/tts +# Also note that your tts version might not support all available models so check: +# https://github.com/coqui-ai/TTS/releases/tag/v0.0.12 +# # For now, for deployment check the systemd unit in the pull request: # https://github.com/NixOS/nixpkgs/pull/103851#issue-521121136 -# -# Check the latest release for compatible models: -# https://github.com/coqui-ai/TTS/releases/tag/v0.0.11 python3Packages.buildPythonApplication rec { pname = "tts"; - version = "0.0.11"; + version = "0.0.12"; src = fetchFromGitHub { owner = "coqui-ai"; repo = "TTS"; rev = "v${version}"; - sha256 = "0kk9bgiw2x5ybwz0v3zrfaxajl3lnccc9xmrwc295n2rfkmwxsis"; + sha256 = "sha256-0M9wcdBmuTK+NvEGsXEdoYiVFjw8G2MRUwmi1PJgmzI="; }; + patches = [ + # https://github.com/coqui-ai/TTS/pull/435 + (fetchpatch { + url = "https://github.com/coqui-ai/TTS/commit/97f98e4c4584ef14ed2f4885aa02c162d9364a00.patch"; + sha256 = "sha256-DAZYOOAe+6TYBF5ukFq5HRwm49askEvNEivuwb/oCWM="; + }) + ]; + preBuild = '' # numba jit tries to write to its cache directory export HOME=$TMPDIR @@ -39,6 +49,8 @@ python3Packages.buildPythonApplication rec { sed -i -e 's!numpy==[^"]*!numpy!' requirements.txt setup.py sed -i -e 's!umap-learn==[^"]*!umap-learn!' requirements.txt setup.py # Not required for building/installation but for their development/ci workflow + sed -i -e '/black/d' requirements.txt + sed -i -e '/isor/d' requirements.txt sed -i -e '/pylint/d' requirements.txt sed -i -e '/cardboardlint/d' requirements.txt setup.py ''; From 0fce3c1237c9f7c571bd0dc16d923a7f00dcaa26 Mon Sep 17 00:00:00 2001 From: Patrick Hilhorst Date: Thu, 15 Apr 2021 21:34:47 +0200 Subject: [PATCH 164/230] waybar: 0.9.5 -> 0.9.7 --- pkgs/applications/misc/waybar/default.nix | 16 ++-------------- 1 file changed, 2 insertions(+), 14 deletions(-) diff --git a/pkgs/applications/misc/waybar/default.nix b/pkgs/applications/misc/waybar/default.nix index d730f966347..6a3f33db27e 100644 --- a/pkgs/applications/misc/waybar/default.nix +++ b/pkgs/applications/misc/waybar/default.nix @@ -1,7 +1,6 @@ { lib , stdenv , fetchFromGitHub -, fetchpatch , meson , pkg-config , ninja @@ -28,26 +27,15 @@ stdenv.mkDerivation rec { pname = "waybar"; - version = "0.9.5"; + version = "0.9.7"; src = fetchFromGitHub { owner = "Alexays"; repo = "Waybar"; rev = version; - sha256 = "1kzrgqaclfk6gcwhknxn28xl74gm5swipgn8kk8avacb4nsw1l9q"; + sha256 = "17cn4d3dx92v40jd9vl41smp8hh3gf5chd1j2f7l1lrpfpnllg5x"; }; - patches = [ - # XXX: REMOVE ON NEXT VERSION BUMP - # Fixes compatibility of the bluetooth and network modules with linux kernel - # >=5.11 - # c.f. https://github.com/Alexays/Waybar/issues/994 - (fetchpatch { - url = "https://patch-diff.githubusercontent.com/raw/Alexays/Waybar/pull/1015.patch"; - sha256 = "sha256-jQZEM3Yru2yxcXAzapU47DoAv4ZoabrV80dH42I2OFk="; - }) - ]; - nativeBuildInputs = [ meson ninja pkg-config scdoc wrapGAppsHook cmake ] ++ lib.optional withMediaPlayer gobject-introspection; From e3aa8c650b5bde425c935296f40b4455a0655742 Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Thu, 8 Apr 2021 15:58:09 +0200 Subject: [PATCH 165/230] ocamlPackages.lablgtk3: use Dune 2 --- pkgs/development/ocaml-modules/lablgtk3/default.nix | 5 ++++- pkgs/development/ocaml-modules/lablgtk3/gtkspell3.nix | 2 +- pkgs/development/ocaml-modules/lablgtk3/sourceview3.nix | 2 +- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/pkgs/development/ocaml-modules/lablgtk3/default.nix b/pkgs/development/ocaml-modules/lablgtk3/default.nix index 1f6b0ad76b9..b14f5b736b4 100644 --- a/pkgs/development/ocaml-modules/lablgtk3/default.nix +++ b/pkgs/development/ocaml-modules/lablgtk3/default.nix @@ -1,9 +1,11 @@ -{ lib, fetchurl, pkg-config, buildDunePackage, gtk3, cairo2 }: +{ lib, fetchurl, pkg-config, buildDunePackage, dune-configurator, gtk3, cairo2 }: buildDunePackage rec { version = "3.1.1"; pname = "lablgtk3"; + useDune2 = true; + minimumOCamlVersion = "4.05"; src = fetchurl { @@ -12,6 +14,7 @@ buildDunePackage rec { }; nativeBuildInputs = [ pkg-config ]; + buildInputs = [ dune-configurator ]; propagatedBuildInputs = [ gtk3 cairo2 ]; meta = { diff --git a/pkgs/development/ocaml-modules/lablgtk3/gtkspell3.nix b/pkgs/development/ocaml-modules/lablgtk3/gtkspell3.nix index be57c7e7146..b037f7d989f 100644 --- a/pkgs/development/ocaml-modules/lablgtk3/gtkspell3.nix +++ b/pkgs/development/ocaml-modules/lablgtk3/gtkspell3.nix @@ -4,5 +4,5 @@ buildDunePackage { pname = "lablgtk3-gtkspell3"; buildInputs = [ gtkspell3 ] ++ lablgtk3.buildInputs; propagatedBuildInputs = [ lablgtk3 ]; - inherit (lablgtk3) src version meta nativeBuildInputs; + inherit (lablgtk3) src version useDune2 meta nativeBuildInputs; } diff --git a/pkgs/development/ocaml-modules/lablgtk3/sourceview3.nix b/pkgs/development/ocaml-modules/lablgtk3/sourceview3.nix index 0e8ba3ef3ff..a0560029880 100644 --- a/pkgs/development/ocaml-modules/lablgtk3/sourceview3.nix +++ b/pkgs/development/ocaml-modules/lablgtk3/sourceview3.nix @@ -4,5 +4,5 @@ buildDunePackage { pname = "lablgtk3-sourceview3"; buildInputs = lablgtk3.buildInputs ++ [ gtksourceview ]; propagatedBuildInputs = [ lablgtk3 ]; - inherit (lablgtk3) src version meta nativeBuildInputs; + inherit (lablgtk3) src version useDune2 meta nativeBuildInputs; } From 982bdad58472ab5275569da12a2953d2bc86f344 Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Thu, 8 Apr 2021 15:35:07 +0200 Subject: [PATCH 166/230] ocamlPackages.cairo2: use Dune 2 --- pkgs/development/ocaml-modules/cairo2/default.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/development/ocaml-modules/cairo2/default.nix b/pkgs/development/ocaml-modules/cairo2/default.nix index 93de77fb322..020006b19c5 100644 --- a/pkgs/development/ocaml-modules/cairo2/default.nix +++ b/pkgs/development/ocaml-modules/cairo2/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchurl, buildDunePackage, ocaml +{ stdenv, lib, fetchurl, buildDunePackage, ocaml, dune-configurator , pkg-config, cairo }: @@ -6,13 +6,15 @@ buildDunePackage rec { pname = "cairo2"; version = "0.6.1"; + useDune2 = true; + src = fetchurl { url = "https://github.com/Chris00/ocaml-cairo/releases/download/${version}/cairo2-${version}.tbz"; sha256 = "1ik4qf4b9443sliq2z7x9acd40rmzvyzjh3bh98wvjklxbb84a9i"; }; nativeBuildInputs = [ pkg-config ]; - buildInputs = [ cairo ]; + buildInputs = [ cairo dune-configurator ]; doCheck = !(stdenv.isDarwin # https://github.com/Chris00/ocaml-cairo/issues/19 From a26f8d20ea722a37e4cb492635805064970c812c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Milan=20P=C3=A4ssler?= Date: Fri, 16 Apr 2021 11:25:50 +0200 Subject: [PATCH 167/230] kodi: use LTS jdk11 --- pkgs/top-level/all-packages.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 13be95c1d87..2cd4f95ee65 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -26831,7 +26831,9 @@ in kodiPackages = recurseIntoAttrs (kodi.packages); - kodi = callPackage ../applications/video/kodi { }; + kodi = callPackage ../applications/video/kodi { + jre_headless = jdk11_headless; + }; kodi-wayland = callPackage ../applications/video/kodi { waylandSupport = true; From 37f8212780cb360de213cfd7dda48c0c8fa80eab Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Fri, 16 Apr 2021 11:45:24 +0200 Subject: [PATCH 168/230] chromiumDev: 91.0.4469.4 -> 91.0.4472.10 --- .../networking/browsers/chromium/upstream-info.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/browsers/chromium/upstream-info.json b/pkgs/applications/networking/browsers/chromium/upstream-info.json index 48ab02d0b96..dd22d989963 100644 --- a/pkgs/applications/networking/browsers/chromium/upstream-info.json +++ b/pkgs/applications/networking/browsers/chromium/upstream-info.json @@ -31,9 +31,9 @@ } }, "dev": { - "version": "91.0.4469.4", - "sha256": "08lffqjfcszniwwshililab553a0dvycaa72h1dklxvxf360nz5f", - "sha256bin64": "14xyzjwzcyp6idscq6i87yh2fibjamkz5xfsb2y0hrf2diaqijw1", + "version": "91.0.4472.10", + "sha256": "168121aznynks5waj3mm2m036mbrlmqmp2kmnn9r4ibq2x01dpxm", + "sha256bin64": "05bk6gmmfsh50jjlb6lmwqhhbs0v0hlijsmxpk9crdx2gw071rlr", "deps": { "gn": { "version": "2021-04-06", From 2ed0f723c713c67ef281af0b22119481f52086dd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Milan=20P=C3=A4ssler?= Date: Thu, 15 Apr 2021 21:04:48 +0200 Subject: [PATCH 169/230] nixos/mailman: add http listener for uwsgi With the config suggested in the module docs both Mailman core and Hyperkitty are running, but Mailman core can not connect to Hyperkitty, since the default hyperkitty.baseUrl is not set up by the module. This adds a http listener to the uwsgi config and changes the default hyperkitty.baseUrl to connect to this http listener. --- nixos/modules/services/mail/mailman.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/nixos/modules/services/mail/mailman.nix b/nixos/modules/services/mail/mailman.nix index a5b17be349c..84b0fbc5f6e 100644 --- a/nixos/modules/services/mail/mailman.nix +++ b/nixos/modules/services/mail/mailman.nix @@ -165,7 +165,7 @@ in { baseUrl = mkOption { type = types.str; - default = "http://localhost/hyperkitty/"; + default = "http://localhost:18507/archives/"; description = '' Where can Mailman connect to Hyperkitty's internal API, preferably on localhost? @@ -391,6 +391,7 @@ in { plugins = ["python3"]; home = pythonEnv; module = "mailman_web.wsgi"; + http = "127.0.0.1:18507"; }; uwsgiConfigFile = pkgs.writeText "uwsgi-mailman.json" (builtins.toJSON uwsgiConfig); in { From 31f5263929ff2abde261eabcdfae6963194f0d26 Mon Sep 17 00:00:00 2001 From: Shaw Vrana Date: Fri, 16 Apr 2021 03:35:14 -0700 Subject: [PATCH 170/230] qutebrowser: 2.1.1 -> 2.2.0 (#119376) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * pdfjs: 2.6.347 -> 2.8.335 * set QUTE_QTWEBENGINE_VERSION_OVERRIDE Co-authored-by: Robert Schütz --- .../browsers/qutebrowser/default.nix | 20 +++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/pkgs/applications/networking/browsers/qutebrowser/default.nix b/pkgs/applications/networking/browsers/qutebrowser/default.nix index a94b7eb7605..5c3bbeb3c04 100644 --- a/pkgs/applications/networking/browsers/qutebrowser/default.nix +++ b/pkgs/applications/networking/browsers/qutebrowser/default.nix @@ -1,5 +1,5 @@ -{ lib, fetchpatch, fetchurl, fetchzip, python3 -, mkDerivationWith, wrapQtAppsHook, wrapGAppsHook, qtbase, glib-networking +{ lib, fetchurl, fetchzip, fetchpatch, python3 +, mkDerivationWith, wrapQtAppsHook, wrapGAppsHook, qtbase, qtwebengine, glib-networking , asciidoc, docbook_xml_dtd_45, docbook_xsl, libxml2 , libxslt, gst_all_1 ? null , withPdfReader ? true @@ -12,12 +12,12 @@ assert withMediaPlayback -> gst_all_1 != null; let python3Packages = python3.pkgs; pdfjs = let - version = "2.6.347"; + version = "2.8.335"; in fetchzip rec { name = "pdfjs-${version}"; url = "https://github.com/mozilla/pdf.js/releases/download/v${version}/${name}-dist.zip"; - sha256 = "0d016fyg81cq464li01xlkf9rxrb3rpsvmk5gh9m4d5yzmcakkfm"; + sha256 = "1zschfpxnhdinn9nasl5in4s62ad0h1g369cglamjgxx36x27zly"; stripRoot = false; }; @@ -31,12 +31,12 @@ let in mkDerivationWith python3Packages.buildPythonApplication rec { pname = "qutebrowser"; - version = "2.1.1"; + version = "2.2.0"; # the release tarballs are different from the git checkout! src = fetchurl { url = "https://github.com/qutebrowser/qutebrowser/releases/download/v${version}/${pname}-${version}.tar.gz"; - sha256 = "sha256-txsArX1JiRGXjlu9FTpt0EUKxq3j5b85j8luFTKDQs4="; + sha256 = "sha256:0anxhrkxqb35mxr7jr820xcfw0v514s92wffsiqap2a2sqaj0pgs"; }; # Needs tox @@ -70,10 +70,9 @@ in mkDerivationWith python3Packages.buildPythonApplication rec { patches = [ ./fix-restart.patch (fetchpatch { - name = "fix-version-parsing.patch"; - url = "https://github.com/qutebrowser/qutebrowser/commit/c3d1b71c6f08607f47353f406aca0168bb3062a1.patch"; - excludes = [ "doc/changelog.asciidoc" ]; - sha256 = "1vm2yjvmrw4cyn8mpwfwvvcihn74f60ql3qh1rjj8n0wak8z1ir6"; + name = "add-qtwebengine-version-override.patch"; + url = "https://github.com/qutebrowser/qutebrowser/commit/febb921040b6670d9b1694a6ce55ae39384d1306.patch"; + sha256 = "15p11kk8via7c7m14jiqgzc63qwxxzayr2bkl93jd10l2gx7pk9v"; }) ]; @@ -123,6 +122,7 @@ in mkDerivationWith python3Packages.buildPythonApplication rec { "''${gappsWrapperArgs[@]}" "''${qtWrapperArgs[@]}" --add-flags '--backend ${backend}' + --set QUTE_QTWEBENGINE_VERSION_OVERRIDE "${lib.getVersion qtwebengine}" ) ''; From c25e8e8c967d3c910e1749a39326168e903f960b Mon Sep 17 00:00:00 2001 From: Felix Tenley Date: Fri, 16 Apr 2021 12:15:18 +0200 Subject: [PATCH 171/230] nixos/etebase-server: do not prompt for input during automatic upgrade --- nixos/modules/services/misc/etebase-server.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/nixos/modules/services/misc/etebase-server.nix b/nixos/modules/services/misc/etebase-server.nix index 32a5a3ad8bd..b6bd6e9fd37 100644 --- a/nixos/modules/services/misc/etebase-server.nix +++ b/nixos/modules/services/misc/etebase-server.nix @@ -192,8 +192,8 @@ in # Auto-migrate on first run or if the package has changed versionFile="${cfg.dataDir}/src-version" if [[ $(cat "$versionFile" 2>/dev/null) != ${pkgs.etebase-server} ]]; then - ${pythonEnv}/bin/etebase-server migrate - ${pythonEnv}/bin/etebase-server collectstatic + ${pythonEnv}/bin/etebase-server migrate --no-input + ${pythonEnv}/bin/etebase-server collectstatic --no-input --clear echo ${pkgs.etebase-server} > "$versionFile" fi ''; From 2db1ae068d6eba2a7aa028167ac62ecd076477b4 Mon Sep 17 00:00:00 2001 From: talyz Date: Thu, 15 Apr 2021 13:19:53 +0200 Subject: [PATCH 172/230] discourse: 2.6.3 -> 2.6.5 --- pkgs/servers/web-apps/discourse/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/web-apps/discourse/default.nix b/pkgs/servers/web-apps/discourse/default.nix index 900d6921092..4bcbee1d428 100644 --- a/pkgs/servers/web-apps/discourse/default.nix +++ b/pkgs/servers/web-apps/discourse/default.nix @@ -6,13 +6,13 @@ }: let - version = "2.6.3"; + version = "2.6.5"; src = fetchFromGitHub { owner = "discourse"; repo = "discourse"; rev = "v${version}"; - sha256 = "sha256-lAIhVxvmjxEiru1KNxbFV+eDMLUGza/Dma3WU0ex0xs="; + sha256 = "sha256-JQUgHxs2Cl2LBpg/6JLhZxje4RmPREL1IPta84kXwPw="; }; runtimeDeps = [ From 515fb48312f6cb8e51bf0f24438b0faf92790afd Mon Sep 17 00:00:00 2001 From: talyz Date: Thu, 15 Apr 2021 13:20:22 +0200 Subject: [PATCH 173/230] nixos/discourse: Fail on file errors Bash doesn't handle subshell errors properly if the result is used as input to a command. To cause the services to fail when the files can't be read, we need to assign the value to a variable, then export it separately. --- nixos/modules/services/web-apps/discourse.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/nixos/modules/services/web-apps/discourse.nix b/nixos/modules/services/web-apps/discourse.nix index 03ea002c9de..38ca08c4759 100644 --- a/nixos/modules/services/web-apps/discourse.nix +++ b/nixos/modules/services/web-apps/discourse.nix @@ -726,7 +726,8 @@ in export ADMIN_EMAIL="${cfg.admin.email}" export ADMIN_NAME="${cfg.admin.fullName}" export ADMIN_USERNAME="${cfg.admin.username}" - export ADMIN_PASSWORD="$(<${cfg.admin.passwordFile})" + ADMIN_PASSWORD="$(<${cfg.admin.passwordFile})" + export ADMIN_PASSWORD discourse-rake admin:create_noninteractively discourse-rake themes:update @@ -938,7 +939,8 @@ in set -o errexit -o pipefail -o nounset -o errtrace shopt -s inherit_errexit - export api_key=$(<'${apiKeyPath}') + api_key=$(<'${apiKeyPath}') + export api_key jq <${mail-receiver-json} \ '.DISCOURSE_API_KEY = $ENV.api_key' \ From 7310dd0da8e13c542cd18c7601c2adfc4ad319de Mon Sep 17 00:00:00 2001 From: talyz Date: Fri, 16 Apr 2021 09:35:08 +0200 Subject: [PATCH 174/230] nixos/discourse: Fix plugin linking When linking multiple plugins, the `ln` runs need to be separated by newlines.. Fixes #119584. --- nixos/modules/services/web-apps/discourse.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/services/web-apps/discourse.nix b/nixos/modules/services/web-apps/discourse.nix index 38ca08c4759..00b58d50257 100644 --- a/nixos/modules/services/web-apps/discourse.nix +++ b/nixos/modules/services/web-apps/discourse.nix @@ -702,7 +702,7 @@ in cp -r ${cfg.package}/share/discourse/config.dist/* /run/discourse/config/ cp -r ${cfg.package}/share/discourse/public.dist/* /run/discourse/public/ cp -r ${cfg.package}/share/discourse/plugins.dist/* /run/discourse/plugins/ - ${lib.concatMapStrings (p: "ln -sf ${p} /run/discourse/plugins/") cfg.plugins} + ${lib.concatMapStringsSep "\n" (p: "ln -sf ${p} /run/discourse/plugins/") cfg.plugins} ln -sf /var/lib/discourse/uploads /run/discourse/public/uploads ln -sf /var/lib/discourse/backups /run/discourse/public/backups From d2c4c7ab8b737d03097ea22363647940ca3f453d Mon Sep 17 00:00:00 2001 From: happysalada Date: Fri, 16 Apr 2021 21:37:59 +0900 Subject: [PATCH 175/230] wrangler: 1.15.0 -> 1.16.0 --- pkgs/development/tools/wrangler/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/wrangler/default.nix b/pkgs/development/tools/wrangler/default.nix index 5fc7b6a1807..84c335820ad 100644 --- a/pkgs/development/tools/wrangler/default.nix +++ b/pkgs/development/tools/wrangler/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "wrangler"; - version = "1.15.0"; + version = "1.16.0"; src = fetchFromGitHub { owner = "cloudflare"; repo = pname; rev = "v${version}"; - sha256 = "sha256-/5iIdEUbesX+IRQQzeJazt3i/xAtghblct718EmYci4="; + sha256 = "sha256-ZOkoUMkpp89ON60xgz0ZzL9RAZeHstKTTl/UEc/y3Ls="; }; - cargoSha256 = "sha256-6XWFhfY8QIl4S6zDyyM2YvFUoGMnKZQ3d/GT4yQWb7A="; + cargoSha256 = "sha256-Cppj3sRJzH8UiyM8lXT2dWqsWr83EApYKqYq3nJQZi8="; nativeBuildInputs = [ pkg-config ]; From 53b88f966e01b6a51e40d3298c68be2d22243e3a Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Tue, 13 Apr 2021 00:10:06 +0000 Subject: [PATCH 176/230] bmake: add setupHook With this change, nativeBuildInputs = [ bmake ]; will cause bmake to be used instead of GNU make, but with the usual stdenv API. Packages using bmake will no longer need to implement their own {build,check,dist}Phase. --- .../tools/build-managers/bmake/default.nix | 2 + .../tools/build-managers/bmake/setup-hook.sh | 117 ++++++++++++++++++ 2 files changed, 119 insertions(+) create mode 100644 pkgs/development/tools/build-managers/bmake/setup-hook.sh diff --git a/pkgs/development/tools/build-managers/bmake/default.nix b/pkgs/development/tools/build-managers/bmake/default.nix index e1e9b348503..e79e06a71f4 100644 --- a/pkgs/development/tools/build-managers/bmake/default.nix +++ b/pkgs/development/tools/build-managers/bmake/default.nix @@ -18,6 +18,8 @@ stdenv.mkDerivation rec { ./fix-unexport-env-test.patch ]; + setupHook = ./setup-hook.sh; + meta = with lib; { description = "Portable version of NetBSD 'make'"; homepage = "http://www.crufty.net/help/sjg/bmake.html"; diff --git a/pkgs/development/tools/build-managers/bmake/setup-hook.sh b/pkgs/development/tools/build-managers/bmake/setup-hook.sh new file mode 100644 index 00000000000..ae8f78ec90f --- /dev/null +++ b/pkgs/development/tools/build-managers/bmake/setup-hook.sh @@ -0,0 +1,117 @@ +bmakeBuildPhase() { + runHook preBuild + + local flagsArray=( + ${enableParallelBuilding:+-j${NIX_BUILD_CORES}} + SHELL=$SHELL + $makeFlags ${makeFlagsArray+"${makeFlagsArray[@]}"} + $buildFlags ${buildFlagsArray+"${buildFlagsArray[@]}"} + ) + + echoCmd 'build flags' "${flagsArray[@]}" + bmake ${makefile:+-f $makefile} "${flagsArray[@]}" + unset flagsArray + + runHook postBuild +} + +if [ -z "${dontUseBmakeBuild-}" -a -z "${buildPhase-}" ]; then + buildPhase=bmakeBuildPhase +fi + +bmakeCheckPhase() { + runHook preCheck + + if [ -z "${checkTarget:-}" ]; then + #TODO(@oxij): should flagsArray influence make -n? + if bmake -n ${makefile:+-f $makefile} check >/dev/null 2>&1; then + checkTarget=check + elif bmake -n ${makefile:+-f $makefile} test >/dev/null 2>&1; then + checkTarget=test + fi + fi + + if [ -z "${checkTarget:-}" ]; then + echo "no test target found in bmake, doing nothing" + else + # shellcheck disable=SC2086 + local flagsArray=( + ${enableParallelChecking:+-j${NIX_BUILD_CORES}} + SHELL=$SHELL + # Old bash empty array hack + $makeFlags ${makeFlagsArray+"${makeFlagsArray[@]}"} + ${checkFlags:-VERBOSE=y} ${checkFlagsArray+"${checkFlagsArray[@]}"} + ${checkTarget} + ) + + echoCmd 'check flags' "${flagsArray[@]}" + bmake ${makefile:+-f $makefile} "${flagsArray[@]}" + + unset flagsArray + fi + + runHook postCheck +} + +if [ -z "${dontUseBmakeCheck-}" -a -z "${checkPhase-}" ]; then + checkPhase=bmakeCheckPhase +fi + +bmakeInstallPhase() { + runHook preInstall + + if [ -n "$prefix" ]; then + mkdir -p "$prefix" + fi + + # shellcheck disable=SC2086 + local flagsArray=( + SHELL=$SHELL + # Old bash empty array hack + $makeFlags ${makeFlagsArray+"${makeFlagsArray[@]}"} + $installFlags ${installFlagsArray+"${installFlagsArray[@]}"} + ${installTargets:-install} + ) + + echoCmd 'install flags' "${flagsArray[@]}" + bmake ${makefile:+-f $makefile} "${flagsArray[@]}" + unset flagsArray + + runHook postInstall +} + +if [ -z "${dontUseBmakeInstall-}" -a -z "${installPhase-}" ]; then + installPhase=bmakeInstallPhase +fi + +bmakeDistPhase() { + runHook preDist + + if [ -n "$prefix" ]; then + mkdir -p "$prefix" + fi + + # Old bash empty array hack + # shellcheck disable=SC2086 + local flagsArray=( + $distFlags ${distFlagsArray+"${distFlagsArray[@]}"} ${distTarget:-dist} + ) + + echo 'dist flags: %q' "${flagsArray[@]}" + bmake ${makefile:+-f $makefile} "${flagsArray[@]}" + + if [ "${dontCopyDist:-0}" != 1 ]; then + mkdir -p "$out/tarballs" + + # Note: don't quote $tarballs, since we explicitly permit + # wildcards in there. + # shellcheck disable=SC2086 + cp -pvd ${tarballs:-*.tar.gz} "$out/tarballs" + fi + + runHook postDist +} + +if [ -z "${dontUseBmakeDist-}" -a -z "${distPhase-}" ]; then + distPhase=bmakeDistPhase +fi From 952842352e0d77d5fd3589ae7ac496775f8c2e45 Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Sun, 11 Apr 2021 13:46:02 +0000 Subject: [PATCH 177/230] hikari: use bmake setupHook for build+install phase --- .../window-managers/hikari/default.nix | 14 ++------------ 1 file changed, 2 insertions(+), 12 deletions(-) diff --git a/pkgs/applications/window-managers/hikari/default.nix b/pkgs/applications/window-managers/hikari/default.nix index 2325deaf37c..614012c4712 100644 --- a/pkgs/applications/window-managers/hikari/default.nix +++ b/pkgs/applications/window-managers/hikari/default.nix @@ -42,14 +42,11 @@ stdenv.mkDerivation { enableParallelBuilding = true; - # Must replace GNU Make by bmake - buildPhase = with lib; concatStringsSep " " ( - [ "bmake" "-j$NIX_BUILD_CORES" "PREFIX=$out" ] + makeFlags = with lib; [ "PREFIX=$(out)" ] ++ optional stdenv.isLinux "WITH_POSIX_C_SOURCE=YES" ++ mapAttrsToList (feat: enabled: optionalString enabled "WITH_${toUpper feat}=YES" - ) features - ); + ) features; # Can't suid in nix store # Run hikari as root (it will drop privileges as early as possible), or create @@ -58,13 +55,6 @@ stdenv.mkDerivation { substituteInPlace Makefile --replace '4555' '555' ''; - installPhase = '' - bmake \ - PREFIX=$out \ - install - runHook postInstall - ''; - meta = with lib; { description = "Stacking Wayland compositor which is actively developed on FreeBSD but also supports Linux"; homepage = "https://hikari.acmelabs.space"; From 18632f10aed181cdb2c37d23057e6c3dffc8f0c4 Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Sun, 11 Apr 2021 13:48:27 +0000 Subject: [PATCH 178/230] libfsm: use bmake setupHook for build+install phase --- pkgs/development/libraries/libfsm/default.nix | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/pkgs/development/libraries/libfsm/default.nix b/pkgs/development/libraries/libfsm/default.nix index 5e3c40da82c..f1e704448de 100644 --- a/pkgs/development/libraries/libfsm/default.nix +++ b/pkgs/development/libraries/libfsm/default.nix @@ -22,11 +22,7 @@ stdenv.mkDerivation rec { # if we use stdenv vs clangStdenv, we don't know which, and CC=cc in all # cases.) it's unclear exactly what should be done if we want those flags, # but the defaults work fine. - buildPhase = "PREFIX=$out bmake -r -j$NIX_BUILD_CORES"; - installPhase = '' - PREFIX=$out bmake -r install - runHook postInstall - ''; + makeFlags = [ "-r" "PREFIX=$(out)" ]; # fix up multi-output install. we also have to fix the pkg-config libdir # file; it uses prefix=$out; libdir=${prefix}/lib, which is wrong in From d4827fcb1d54743cc3945486a116efda54cddd55 Mon Sep 17 00:00:00 2001 From: Thomas Gerbet Date: Fri, 16 Apr 2021 15:14:11 +0200 Subject: [PATCH 179/230] python3Packages.pyvmomi: fix the build --- pkgs/development/python-modules/pyvmomi/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pyvmomi/default.nix b/pkgs/development/python-modules/pyvmomi/default.nix index 8f8ca6f1d7a..b6a775327f4 100644 --- a/pkgs/development/python-modules/pyvmomi/default.nix +++ b/pkgs/development/python-modules/pyvmomi/default.nix @@ -1,4 +1,4 @@ -{ lib, buildPythonPackage, fetchFromGitHub, requests }: +{ lib, buildPythonPackage, fetchFromGitHub, requests, six }: buildPythonPackage rec { pname = "pyvmomi"; @@ -14,7 +14,7 @@ buildPythonPackage rec { # requires old version of vcrpy doCheck = false; - propagatedBuildInputs = [ requests ]; + propagatedBuildInputs = [ requests six ]; meta = with lib; { description = "Python SDK for the VMware vSphere API that allows you to manage ESX, ESXi, and vCenter"; From f9a798375983332b8ebdabf1dd872a092e2e0f22 Mon Sep 17 00:00:00 2001 From: Ryan Horiguchi Date: Fri, 16 Apr 2021 15:56:51 +0200 Subject: [PATCH 180/230] vscode-extensions.gruntfuggly.todo-tree: 0.0.209 -> 0.0.211 --- pkgs/misc/vscode-extensions/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/misc/vscode-extensions/default.nix b/pkgs/misc/vscode-extensions/default.nix index 6d6ca873d28..4eda2f6df88 100644 --- a/pkgs/misc/vscode-extensions/default.nix +++ b/pkgs/misc/vscode-extensions/default.nix @@ -465,8 +465,8 @@ let mktplcRef = { name = "todo-tree"; publisher = "Gruntfuggly"; - version = "0.0.209"; - sha256 = "1i0wq8zwax4kmy69hh0hclx9a47ycm3qp3gspjq8xpmcq3nmbfaq"; + version = "0.0.211"; + sha256 = "1di2v1bhlhl1yi9rrmbq0r9gypiydl8xvj24yw64vsnkqs9yxbp3"; }; meta = with lib; { license = licenses.mit; From 2e6b1f573f013d8a87c35031c598eabd33efd7a5 Mon Sep 17 00:00:00 2001 From: Sebastian Jordan Date: Fri, 16 Apr 2021 15:58:49 +0200 Subject: [PATCH 181/230] pythonPackages.tqdm: Fix build on i686 architecture (#119608) --- pkgs/development/python-modules/tqdm/default.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/tqdm/default.nix b/pkgs/development/python-modules/tqdm/default.nix index 950a618a527..70893dc541f 100644 --- a/pkgs/development/python-modules/tqdm/default.nix +++ b/pkgs/development/python-modules/tqdm/default.nix @@ -1,4 +1,5 @@ { lib +, stdenv , buildPythonPackage , fetchPypi , setuptools_scm @@ -30,10 +31,11 @@ buildPythonPackage rec { pytest-timeout # tests of optional features numpy - pandas rich tkinter - ]; + ] ++ + # pandas is not supported on i686 + lib.optional (!stdenv.isi686) pandas; # Remove performance testing. # Too sensitive for on Hydra. From 9ad3ceaea4a6c3ab4bc2660850fb2583b3ac5d0b Mon Sep 17 00:00:00 2001 From: Ryan Horiguchi Date: Fri, 16 Apr 2021 16:04:24 +0200 Subject: [PATCH 182/230] gnomeExtensions.unite: 49 -> 50 --- pkgs/desktops/gnome-3/extensions/unite/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/gnome-3/extensions/unite/default.nix b/pkgs/desktops/gnome-3/extensions/unite/default.nix index 715e2a70cc7..efb793cb1bd 100644 --- a/pkgs/desktops/gnome-3/extensions/unite/default.nix +++ b/pkgs/desktops/gnome-3/extensions/unite/default.nix @@ -1,13 +1,13 @@ { lib, stdenv, gnome3, fetchFromGitHub, xprop, glib }: stdenv.mkDerivation rec { pname = "gnome-shell-extension-unite"; - version = "49"; + version = "50"; src = fetchFromGitHub { owner = "hardpixel"; repo = "unite-shell"; rev = "v${version}"; - sha256 = "12kjljw253hshaz6x886kg3mc93lb4pxwd05qihww6m5k4lqjcy5"; + sha256 = "14n9lrjbxcmvcjnh6zbwlc1paqfhbg81lj0y2d35sh1c2fbsb7d9"; }; uuid = "unite@hardpixel.eu"; From f16b70941f3ea6215056387036cce02a8d9b6b29 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 16 Apr 2021 16:25:42 +0200 Subject: [PATCH 183/230] hackage-packages.nix: automatic Haskell package set update This update was generated by hackage2nix v2.17.0-8-ge18310f from Hackage revision https://github.com/commercialhaskell/all-cabal-hashes/commit/3970dc533574340f58270c6685cbb38caab8d0e1. --- .../haskell-modules/hackage-packages.nix | 488 ++++++++++++++++-- 1 file changed, 440 insertions(+), 48 deletions(-) diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index ced1d5e40a5..e5132fd5fbd 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -50565,8 +50565,8 @@ self: { }: mkDerivation { pname = "calamity"; - version = "0.1.28.1"; - sha256 = "1zbxwz8qg7yqvl70x2bcd0nib6akd6ii6fa2mrrg1nd255q6cyjb"; + version = "0.1.28.2"; + sha256 = "0hy29d34w06n7pyjycp7n3f4l6717n2z9yzjq39df05bf8xnigkj"; libraryHaskellDepends = [ aeson async base bytestring colour concurrent-extra connection containers data-default-class data-flags deepseq deque df1 di-core @@ -72766,6 +72766,29 @@ self: { broken = true; }) {}; + "deepl" = callPackage + ({ mkDerivation, aeson, base, bytestring, cmdargs, foldl, lens + , lens-aeson, protolude, resourcet, streaming, streaming-bytestring + , wreq + }: + mkDerivation { + pname = "deepl"; + version = "0.1.0.0"; + sha256 = "1wckhfq5g5aqzh2ybw4bbq39hn1yc1yzb8akd5vvhcip8afkkqsa"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson base bytestring cmdargs foldl lens lens-aeson protolude + resourcet streaming streaming-bytestring wreq + ]; + executableHaskellDepends = [ + aeson base bytestring cmdargs foldl lens lens-aeson protolude + resourcet streaming streaming-bytestring wreq + ]; + description = "Call DeepL to translate you files"; + license = lib.licenses.bsd3; + }) {}; + "deeplearning-hs" = callPackage ({ mkDerivation, accelerate, base, mtl, QuickCheck, repa , repa-algorithms, test-framework, test-framework-quickcheck2 @@ -73482,8 +73505,8 @@ self: { }: mkDerivation { pname = "dependent-monoidal-map"; - version = "0.1.1.1"; - sha256 = "0i3zgngcdli6hw09h985ca4n7l9cpsrxalbhg8lbq32hwh7dim89"; + version = "0.1.1.2"; + sha256 = "11qcrxji3lvq4blzh1qk9wkhhzjkvz3maxfv63zgby98dpmkxa2x"; libraryHaskellDepends = [ aeson base constraints constraints-extras dependent-map dependent-sum dependent-sum-aeson-orphans @@ -73538,8 +73561,8 @@ self: { }: mkDerivation { pname = "dependent-sum-aeson-orphans"; - version = "0.3.0.0"; - sha256 = "1wpjrynv9zva3hw1wgmqd5pmhhpa491yh85p1dnbpkj7h0g1pl1a"; + version = "0.3.1.0"; + sha256 = "1psjd7va8k53vq9kh4pclsf27798mc1ggk1csjk39c8d97vm41qz"; libraryHaskellDepends = [ aeson base constraints constraints-extras dependent-map dependent-sum some @@ -80844,8 +80867,8 @@ self: { }: mkDerivation { pname = "duckling"; - version = "0.1.6.1"; - sha256 = "0lvvp13f5zcnf3cnl40avnfh3mgj304d5qfw08mbnwqz1bqp94xy"; + version = "0.2.0.0"; + sha256 = "0hr3dwfksi04is2wqykfx04da40sa85147fnfnmazw5czd20xwya"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -80862,8 +80885,7 @@ self: { aeson base tasty tasty-hunit text time unordered-containers ]; description = "A Haskell library for parsing text into structured data"; - license = "unknown"; - hydraPlatforms = lib.platforms.none; + license = lib.licenses.bsd3; }) {}; "duet" = callPackage @@ -98251,6 +98273,8 @@ self: { pname = "futhark"; version = "0.19.4"; sha256 = "1d4704pmknv39yw2bjxkp5n2wl9a14n3pn221m3src5z237lchq7"; + revision = "1"; + editedCabalFile = "1d8vwgdvj1dib7l4a3lhn03ri2mbnm57wnd3pki6m7y8sr3xk730"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -98466,8 +98490,8 @@ self: { }: mkDerivation { pname = "fuzzyfind"; - version = "2.2.0"; - sha256 = "0rb96cd0lfk41gc5xc52adibjpi16xs82kifsymqykrpsgrgj525"; + version = "3.0.0"; + sha256 = "0vkjqgsa0qv8sz4bwwi49zf17fl23vckwvmr1agsd20rbhw4ivyr"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base containers massiv text ]; @@ -139066,6 +139090,22 @@ self: { license = lib.licenses.mit; }) {}; + "hspec_2_7_10" = callPackage + ({ mkDerivation, base, hspec-core, hspec-discover + , hspec-expectations, QuickCheck + }: + mkDerivation { + pname = "hspec"; + version = "2.7.10"; + sha256 = "0z0lwrmrqkglr78n6k2c36n4h68142bh785ys0x4jaibjshvs6rw"; + libraryHaskellDepends = [ + base hspec-core hspec-discover hspec-expectations QuickCheck + ]; + description = "A Testing Framework for Haskell"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + }) {}; + "hspec-attoparsec" = callPackage ({ mkDerivation, attoparsec, base, bytestring, hspec , hspec-expectations, text @@ -139148,6 +139188,34 @@ self: { license = lib.licenses.mit; }) {}; + "hspec-core_2_7_10" = callPackage + ({ mkDerivation, ansi-terminal, array, base, call-stack, clock + , deepseq, directory, filepath, hspec-expectations, hspec-meta + , HUnit, process, QuickCheck, quickcheck-io, random, setenv + , silently, stm, temporary, tf-random, transformers + }: + mkDerivation { + pname = "hspec-core"; + version = "2.7.10"; + sha256 = "12k9yp5gznrda449ir60d5wv3xl7nnyffkb5mhfc0svw9f8lxlv1"; + libraryHaskellDepends = [ + ansi-terminal array base call-stack clock deepseq directory + filepath hspec-expectations HUnit QuickCheck quickcheck-io random + setenv stm tf-random transformers + ]; + testHaskellDepends = [ + ansi-terminal array base call-stack clock deepseq directory + filepath hspec-expectations hspec-meta HUnit process QuickCheck + quickcheck-io random setenv silently stm temporary tf-random + transformers + ]; + testToolDepends = [ hspec-meta ]; + testTarget = "--test-option=--skip --test-option='Test.Hspec.Core.Runner.hspecResult runs specs in parallel'"; + description = "A Testing Framework for Haskell"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + }) {}; + "hspec-dirstream" = callPackage ({ mkDerivation, base, dirstream, filepath, hspec, hspec-core , pipes, pipes-safe, system-filepath, text @@ -139185,6 +139253,26 @@ self: { license = lib.licenses.mit; }) {}; + "hspec-discover_2_7_10" = callPackage + ({ mkDerivation, base, directory, filepath, hspec-meta, QuickCheck + }: + mkDerivation { + pname = "hspec-discover"; + version = "2.7.10"; + sha256 = "13yzvd3b679skvs1insk4s0wc4zvmz6hs38kc8q0j6vzqq06smqa"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ base directory filepath ]; + executableHaskellDepends = [ base directory filepath ]; + testHaskellDepends = [ + base directory filepath hspec-meta QuickCheck + ]; + testToolDepends = [ hspec-meta ]; + description = "Automatically discover and run Hspec tests"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + }) {}; + "hspec-expectations" = callPackage ({ mkDerivation, base, call-stack, HUnit, nanospec }: mkDerivation { @@ -142617,6 +142705,41 @@ self: { license = lib.licenses.bsd3; }) {}; + "http2_3_0_0" = callPackage + ({ mkDerivation, aeson, aeson-pretty, array, async, base + , base16-bytestring, bytestring, case-insensitive, containers + , cryptonite, directory, filepath, gauge, Glob, heaps, hspec + , hspec-discover, http-types, mwc-random, network + , network-byte-order, network-run, psqueues, stm, text + , time-manager, typed-process, unix-time, unordered-containers + , vector + }: + mkDerivation { + pname = "http2"; + version = "3.0.0"; + sha256 = "17j4p2apyiiznkwdn9a8pdb43vcwbnpzyff2wqlzpbf9habb8idf"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + array base bytestring case-insensitive containers http-types + network network-byte-order psqueues stm time-manager unix-time + ]; + testHaskellDepends = [ + aeson aeson-pretty async base base16-bytestring bytestring + cryptonite directory filepath Glob hspec http-types + network-byte-order network-run text typed-process + unordered-containers vector + ]; + testToolDepends = [ hspec-discover ]; + benchmarkHaskellDepends = [ + array base bytestring case-insensitive containers gauge heaps + mwc-random network-byte-order psqueues stm + ]; + description = "HTTP/2 library"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "http2-client" = callPackage ({ mkDerivation, async, base, bytestring, containers, deepseq , http2, lifted-async, lifted-base, mtl, network, stm, time, tls @@ -157914,6 +158037,17 @@ self: { broken = true; }) {}; + "koji" = callPackage + ({ mkDerivation, base, haxr, mtl }: + mkDerivation { + pname = "koji"; + version = "0.0.1"; + sha256 = "0yxx6xk5xld7jf7ph4x0r7k4bqcg02yl7597awbgbq82x97gyfb8"; + libraryHaskellDepends = [ base haxr mtl ]; + description = "Koji buildsystem XML-RPC API bindings"; + license = lib.licenses.gpl2Only; + }) {}; + "kontra-config" = callPackage ({ mkDerivation, base, bytestring, data-default, exceptions, text , transformers-base, unjson, utf8-string, yaml @@ -175101,8 +175235,8 @@ self: { ({ mkDerivation, base, hspec, hspec-discover, rio, transformers }: mkDerivation { pname = "method"; - version = "0.3.0.0"; - sha256 = "1a5i9sd5zz5kjpjpar3r5ak61x8fz5rrbb1iak1r2dcwlyk6rq25"; + version = "0.3.1.0"; + sha256 = "0a96av07vbh3mvyczh2jiziqb098q81jx6q0c5kgn7pmlxijw1ba"; libraryHaskellDepends = [ base rio transformers ]; testHaskellDepends = [ base hspec rio transformers ]; testToolDepends = [ hspec-discover ]; @@ -188787,8 +188921,8 @@ self: { }: mkDerivation { pname = "nix-thunk"; - version = "0.2.0.3"; - sha256 = "1pcmn31hf81gxmmjyqc23pwpaafx03alvx2fgynd1isdsb0057my"; + version = "0.3.0.0"; + sha256 = "11fn65swyj7b3l7xs6rws81nnccr2hcf81igqmna5bwck3g2gklw"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -190109,6 +190243,21 @@ self: { license = lib.licenses.bsd3; }) {}; + "nri-env-parser_0_1_0_7" = callPackage + ({ mkDerivation, base, modern-uri, network-uri, nri-prelude, text + }: + mkDerivation { + pname = "nri-env-parser"; + version = "0.1.0.7"; + sha256 = "1mm879mqpgl040p789wcjm5bhrqia5czn18c5dgni8bwa4y61ank"; + libraryHaskellDepends = [ + base modern-uri network-uri nri-prelude text + ]; + description = "Read environment variables as settings to build 12-factor apps"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "nri-observability" = callPackage ({ mkDerivation, aeson, aeson-pretty, async, base, bugsnag-hs , bytestring, directory, hostname, http-client, http-client-tls @@ -190133,6 +190282,31 @@ self: { license = lib.licenses.bsd3; }) {}; + "nri-observability_0_1_0_2" = callPackage + ({ mkDerivation, aeson, aeson-pretty, async, base, bugsnag-hs + , bytestring, directory, hostname, http-client, http-client-tls + , nri-env-parser, nri-prelude, random, safe-exceptions, stm, text + , time, unordered-containers + }: + mkDerivation { + pname = "nri-observability"; + version = "0.1.0.2"; + sha256 = "19nil7vyjbvbjlapvrxky8fkxdl3f2xhqdi3a5m5i5lyawm74b6z"; + libraryHaskellDepends = [ + aeson aeson-pretty async base bugsnag-hs bytestring directory + hostname http-client http-client-tls nri-env-parser nri-prelude + random safe-exceptions stm text time unordered-containers + ]; + testHaskellDepends = [ + aeson aeson-pretty async base bugsnag-hs bytestring directory + hostname http-client http-client-tls nri-env-parser nri-prelude + random safe-exceptions stm text time unordered-containers + ]; + description = "Report log spans collected by nri-prelude"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "nri-prelude" = callPackage ({ mkDerivation, aeson, aeson-pretty, async, auto-update, base , bytestring, containers, directory, exceptions, filepath, ghc @@ -190159,7 +190333,7 @@ self: { license = lib.licenses.bsd3; }) {}; - "nri-prelude_0_5_0_3" = callPackage + "nri-prelude_0_6_0_0" = callPackage ({ mkDerivation, aeson, aeson-pretty, async, auto-update, base , bytestring, containers, directory, exceptions, filepath, ghc , hedgehog, junit-xml, pretty-diff, pretty-show, safe-coloured-text @@ -190167,8 +190341,8 @@ self: { }: mkDerivation { pname = "nri-prelude"; - version = "0.5.0.3"; - sha256 = "0k4mhgyazjc74hwf2xgznhhkryqhdmsc2pv1v9d32706qkr796wn"; + version = "0.6.0.0"; + sha256 = "02v83n08zxz8521skijgrn407a0mlkjc3fjn5q04gn932wf29g5s"; libraryHaskellDepends = [ aeson aeson-pretty async auto-update base bytestring containers directory exceptions filepath ghc hedgehog junit-xml pretty-diff @@ -198622,6 +198796,8 @@ self: { pname = "patch"; version = "0.0.3.2"; sha256 = "1b819d1iramxb0sf0zm4ry8mrd74y35iffbb6qys3a2xq1d382xa"; + revision = "2"; + editedCabalFile = "09v23qakrdjscwvzjarkssikkp7xmq9jbpp5hh1y857l02r3fz5c"; libraryHaskellDepends = [ base constraints-extras containers dependent-map dependent-sum lens monoidal-containers semialign semigroupoids these transformers @@ -206444,31 +206620,28 @@ self: { "polysemy-http" = callPackage ({ mkDerivation, aeson, ansi-terminal, base, bytestring - , case-insensitive, co-log-core, co-log-polysemy, composition - , containers, data-default, either, hedgehog, http-client - , http-client-tls, http-types, lens, network, polysemy - , polysemy-log, polysemy-plugin, relude, servant, servant-client - , servant-server, string-interpolate, tasty, tasty-hedgehog - , template-haskell, text, time, warp + , case-insensitive, composition, containers, data-default, either + , hedgehog, http-client, http-client-tls, http-types, lens, network + , polysemy, polysemy-log, polysemy-plugin, relude, servant + , servant-client, servant-server, string-interpolate, tasty + , tasty-hedgehog, template-haskell, text, time, warp }: mkDerivation { pname = "polysemy-http"; - version = "0.4.0.2"; - sha256 = "0xxl33iydycw1n2q9wvbx3jlhzsw9yhbm4v0a8v2ic05nqlmaw4l"; + version = "0.4.0.3"; + sha256 = "0sp4s8spf0nzqs8cw9swnsxd2wxa0g4cnz236n7m6z73450ih3c7"; libraryHaskellDepends = [ - aeson ansi-terminal base bytestring case-insensitive co-log-core - co-log-polysemy composition containers data-default either - http-client http-client-tls http-types lens polysemy polysemy-log - polysemy-plugin relude string-interpolate template-haskell text - time + aeson ansi-terminal base bytestring case-insensitive composition + containers data-default either http-client http-client-tls + http-types lens polysemy polysemy-log polysemy-plugin relude + string-interpolate template-haskell text time ]; testHaskellDepends = [ - aeson ansi-terminal base bytestring case-insensitive co-log-core - co-log-polysemy composition containers data-default either hedgehog - http-client http-client-tls http-types lens network polysemy - polysemy-log polysemy-plugin relude servant servant-client - servant-server string-interpolate tasty tasty-hedgehog - template-haskell text time warp + aeson ansi-terminal base bytestring case-insensitive composition + containers data-default either hedgehog http-client http-client-tls + http-types lens network polysemy polysemy-log polysemy-plugin + relude servant servant-client servant-server string-interpolate + tasty tasty-hedgehog template-haskell text time warp ]; description = "Polysemy effect for http-client"; license = "BSD-2-Clause-Patent"; @@ -220582,8 +220755,8 @@ self: { }: mkDerivation { pname = "reflex"; - version = "0.8.0.0"; - sha256 = "14pw033ljs6x5bi5657cm5lpwwj6gkfgskbv5lpdi2hp7svzayql"; + version = "0.8.1.0"; + sha256 = "0p27dj7fckkvw9li69whcfrv1cd59kkp6qbvfmndzx8fbh44ggbp"; libraryHaskellDepends = [ base bifunctors comonad constraints-extras containers data-default dependent-map dependent-sum exception-transformers haskell-src-exts @@ -220704,6 +220877,8 @@ self: { pname = "reflex-dom"; version = "0.6.1.0"; sha256 = "190g56y16xvj508qdp3znlbbv4gb3ska38jbjpblvq8cz2d4nkdc"; + revision = "1"; + editedCabalFile = "0xi2bn6d4bgbfqngl2y9gva4nxii65v3hzrik74wzdsf17wyrmv9"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -220766,8 +220941,8 @@ self: { }: mkDerivation { pname = "reflex-dom-core"; - version = "0.6.1.0"; - sha256 = "072bkjjmz6mjw42gchlbswhjhr9xs0vaybf6mvdycs618lb1zhf0"; + version = "0.6.2.0"; + sha256 = "067m8ifgkknafy0nxzmns89dqjzpsc983pm3gaq7dg618jp1dzy4"; libraryHaskellDepends = [ aeson base bifunctors bimap blaze-builder bytestring case-insensitive constraints containers contravariant data-default @@ -254726,8 +254901,8 @@ self: { }: mkDerivation { pname = "syntactic"; - version = "3.8.2"; - sha256 = "04lv8v42bs4qjjcia39grfxmabiv41dipgg5b58xgiv4ay884nfm"; + version = "3.8.3"; + sha256 = "1ksznzw5g01xgbr2zs83m0lclbhvhs6lyaszhxykni10lxyxy7v8"; libraryHaskellDepends = [ base constraints containers data-hash deepseq mtl syb template-haskell tree-view @@ -276962,6 +277137,27 @@ self: { license = lib.licenses.bsd3; }) {}; + "versions_5_0_0" = callPackage + ({ mkDerivation, base, deepseq, hashable, megaparsec, microlens + , parser-combinators, QuickCheck, tasty, tasty-hunit + , tasty-quickcheck, text + }: + mkDerivation { + pname = "versions"; + version = "5.0.0"; + sha256 = "1rfxjivdsaqc6w7dfqdycy3a81rsajvpfyi5si9ssc0w3ljfsbzr"; + libraryHaskellDepends = [ + base deepseq hashable megaparsec parser-combinators text + ]; + testHaskellDepends = [ + base megaparsec microlens QuickCheck tasty tasty-hunit + tasty-quickcheck text + ]; + description = "Types and parsers for software version numbers"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "vflow-types" = callPackage ({ mkDerivation, aeson, base, bytestring, ip, json-alt , json-autotype, neat-interpolation, QuickCheck, quickcheck-classes @@ -278645,6 +278841,23 @@ self: { broken = true; }) {inherit (pkgs) fcgi;}; + "wai-handler-hal" = callPackage + ({ mkDerivation, base, base64-bytestring, bytestring + , case-insensitive, hal, http-types, network, text + , unordered-containers, vault, wai + }: + mkDerivation { + pname = "wai-handler-hal"; + version = "0.1.0.0"; + sha256 = "0sjw01k5dyhdi33ld1pd4mf9plpij0spzxf2b228cjyc8x5zx7rj"; + libraryHaskellDepends = [ + base base64-bytestring bytestring case-insensitive hal http-types + network text unordered-containers vault wai + ]; + description = "Wrap WAI applications to run on AWS Lambda"; + license = lib.licenses.bsd3; + }) {}; + "wai-handler-launch" = callPackage ({ mkDerivation, async, base, bytestring, http-types, process , streaming-commons, transformers, wai, warp @@ -280314,6 +280527,40 @@ self: { license = lib.licenses.mit; }) {}; + "warp_3_3_15" = callPackage + ({ mkDerivation, array, async, auto-update, base, bsb-http-chunked + , bytestring, case-insensitive, containers, directory, gauge + , ghc-prim, hashable, hspec, http-client, http-date, http-types + , http2, HUnit, iproute, lifted-base, network, process, QuickCheck + , simple-sendfile, stm, streaming-commons, text, time, time-manager + , unix, unix-compat, vault, wai, word8, x509 + }: + mkDerivation { + pname = "warp"; + version = "3.3.15"; + sha256 = "0nj4xxzjcy33hyfdagpc2ij6ga71r1fmc248rjgwsyfflial63bz"; + libraryHaskellDepends = [ + array async auto-update base bsb-http-chunked bytestring + case-insensitive containers ghc-prim hashable http-date http-types + http2 iproute network simple-sendfile stm streaming-commons text + time-manager unix unix-compat vault wai word8 x509 + ]; + testHaskellDepends = [ + array async auto-update base bsb-http-chunked bytestring + case-insensitive containers directory ghc-prim hashable hspec + http-client http-date http-types http2 HUnit iproute lifted-base + network process QuickCheck simple-sendfile stm streaming-commons + text time time-manager unix unix-compat vault wai word8 x509 + ]; + benchmarkHaskellDepends = [ + auto-update base bytestring containers gauge hashable http-date + http-types network time-manager unix unix-compat x509 + ]; + description = "A fast, light-weight web server for WAI applications"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + }) {}; + "warp-dynamic" = callPackage ({ mkDerivation, base, data-default, dyre, http-types, wai, warp }: mkDerivation { @@ -285534,6 +285781,31 @@ self: { license = lib.licenses.mit; }) {}; + "xml-conduit_1_9_1_1" = callPackage + ({ mkDerivation, attoparsec, base, blaze-html, blaze-markup + , bytestring, Cabal, cabal-doctest, conduit, conduit-extra + , containers, data-default-class, deepseq, doctest, hspec, HUnit + , resourcet, text, transformers, xml-types + }: + mkDerivation { + pname = "xml-conduit"; + version = "1.9.1.1"; + sha256 = "1zzh7xnmbm68dab1vqsjkr6ghxqgnla5nik4amrwlmhbdih1gcdx"; + setupHaskellDepends = [ base Cabal cabal-doctest ]; + libraryHaskellDepends = [ + attoparsec base blaze-html blaze-markup bytestring conduit + conduit-extra containers data-default-class deepseq resourcet text + transformers xml-types + ]; + testHaskellDepends = [ + base blaze-markup bytestring conduit conduit-extra containers + doctest hspec HUnit resourcet text transformers xml-types + ]; + description = "Pure-Haskell utilities for dealing with XML with the conduit package"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + }) {}; + "xml-conduit-decode" = callPackage ({ mkDerivation, base, bifunctors, data-default, lens, semigroups , tasty, tasty-hunit, text, time, xml-conduit, xml-types @@ -288411,6 +288683,28 @@ self: { license = lib.licenses.mit; }) {}; + "yesod_1_6_1_1" = callPackage + ({ mkDerivation, aeson, base, bytestring, conduit + , data-default-class, directory, fast-logger, file-embed + , monad-logger, shakespeare, streaming-commons, template-haskell + , text, unix, unordered-containers, wai, wai-extra, wai-logger + , warp, yaml, yesod-core, yesod-form, yesod-persistent + }: + mkDerivation { + pname = "yesod"; + version = "1.6.1.1"; + sha256 = "1iiaixd1xrqjcvknl9g3yvr26nbpfa2amh2ayfxmnpjlxvdhfnyn"; + libraryHaskellDepends = [ + aeson base bytestring conduit data-default-class directory + fast-logger file-embed monad-logger shakespeare streaming-commons + template-haskell text unix unordered-containers wai wai-extra + wai-logger warp yaml yesod-core yesod-form yesod-persistent + ]; + description = "Creation of type-safe, RESTful web applications"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + }) {}; + "yesod-alerts" = callPackage ({ mkDerivation, alerts, base, blaze-html, blaze-markup, safe, text , yesod-core @@ -288517,6 +288811,35 @@ self: { license = lib.licenses.mit; }) {}; + "yesod-auth_1_6_10_3" = callPackage + ({ mkDerivation, aeson, authenticate, base, base16-bytestring + , base64-bytestring, binary, blaze-builder, blaze-html + , blaze-markup, bytestring, conduit, conduit-extra, containers + , cryptonite, data-default, email-validate, file-embed, http-client + , http-client-tls, http-conduit, http-types, memory, network-uri + , nonce, persistent, random, safe, shakespeare, template-haskell + , text, time, transformers, unliftio, unliftio-core + , unordered-containers, wai, yesod-core, yesod-form + , yesod-persistent + }: + mkDerivation { + pname = "yesod-auth"; + version = "1.6.10.3"; + sha256 = "00a7gbp2czg6ixxx62k2nmrj5g1la6cjh697y8vg9xhxq7vpyshg"; + libraryHaskellDepends = [ + aeson authenticate base base16-bytestring base64-bytestring binary + blaze-builder blaze-html blaze-markup bytestring conduit + conduit-extra containers cryptonite data-default email-validate + file-embed http-client http-client-tls http-conduit http-types + memory network-uri nonce persistent random safe shakespeare + template-haskell text time transformers unliftio unliftio-core + unordered-containers wai yesod-core yesod-form yesod-persistent + ]; + description = "Authentication for Yesod"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + }) {}; + "yesod-auth-account" = callPackage ({ mkDerivation, base, blaze-html, bytestring, hspec, monad-logger , mtl, nonce, persistent, persistent-sqlite, pwstore-fast @@ -288685,6 +289008,32 @@ self: { license = lib.licenses.mit; }) {}; + "yesod-auth-hashdb_1_7_1_6" = callPackage + ({ mkDerivation, aeson, base, basic-prelude, bytestring, containers + , hspec, http-conduit, http-types, monad-logger, network-uri + , persistent, persistent-sqlite, resourcet, text + , unordered-containers, wai-extra, yesod, yesod-auth, yesod-core + , yesod-form, yesod-persistent, yesod-test + }: + mkDerivation { + pname = "yesod-auth-hashdb"; + version = "1.7.1.6"; + sha256 = "062f2fv4ixr5bd5xcs208xfg2i18z25g3imf86qrziv0yxxg5qpc"; + libraryHaskellDepends = [ + aeson base bytestring persistent text yesod-auth yesod-core + yesod-form yesod-persistent + ]; + testHaskellDepends = [ + aeson base basic-prelude bytestring containers hspec http-conduit + http-types monad-logger network-uri persistent-sqlite resourcet + text unordered-containers wai-extra yesod yesod-auth yesod-core + yesod-test + ]; + description = "Authentication plugin for Yesod"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + }) {}; + "yesod-auth-hmac-keccak" = callPackage ({ mkDerivation, aeson, base, bytestring, cryptonite, mtl , persistent, random, shakespeare, text, yesod-auth, yesod-core @@ -288826,8 +289175,8 @@ self: { }: mkDerivation { pname = "yesod-auth-oauth"; - version = "1.6.0.2"; - sha256 = "1rr21vclcvy4lrv6r3v6f6sslmwg49jr7jiad63snn81nz854da1"; + version = "1.6.0.3"; + sha256 = "0y57d5y0l0fzmk6zxrpf2xf8y00hp2i0lk3xh5sqlb77a57r109s"; libraryHaskellDepends = [ authenticate-oauth base bytestring text unliftio yesod-auth yesod-core yesod-form @@ -289427,6 +289776,29 @@ self: { license = lib.licenses.mit; }) {}; + "yesod-form_1_7_0" = callPackage + ({ mkDerivation, aeson, attoparsec, base, blaze-builder, blaze-html + , blaze-markup, byteable, bytestring, containers, data-default + , email-validate, hspec, network-uri, persistent, resourcet + , shakespeare, text, time, transformers, wai, xss-sanitize + , yesod-core, yesod-persistent + }: + mkDerivation { + pname = "yesod-form"; + version = "1.7.0"; + sha256 = "170gby381h5pg9njn908cyx2931yiv79x3rc5npg2rd74kif06vi"; + libraryHaskellDepends = [ + aeson attoparsec base blaze-builder blaze-html blaze-markup + byteable bytestring containers data-default email-validate + network-uri persistent resourcet shakespeare text time transformers + wai xss-sanitize yesod-core yesod-persistent + ]; + testHaskellDepends = [ base hspec text time ]; + description = "Form handling support for Yesod Web Framework"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + }) {}; + "yesod-form-bootstrap4" = callPackage ({ mkDerivation, base, blaze-html, blaze-markup, shakespeare, text , yesod-core, yesod-form @@ -289487,8 +289859,8 @@ self: { }: mkDerivation { pname = "yesod-form-multi"; - version = "1.7.0.1"; - sha256 = "0dpcyq6l28zbm12rzjp18bhjaghf38jhjzj6qp40qyvb5f8yx9dp"; + version = "1.7.0.2"; + sha256 = "1kx27680mgplmqnfjygbcf6a2bv0i9rcxbys986aaa3x785dfj02"; libraryHaskellDepends = [ base containers network-uri shakespeare text transformers yesod-core yesod-form @@ -289704,6 +290076,26 @@ self: { broken = true; }) {}; + "yesod-markdown_0_12_6_9" = callPackage + ({ mkDerivation, base, blaze-html, blaze-markup, bytestring + , directory, hspec, pandoc, persistent, shakespeare, text + , xss-sanitize, yesod-core, yesod-form + }: + mkDerivation { + pname = "yesod-markdown"; + version = "0.12.6.9"; + sha256 = "05s63nx27f823b47yy70p9kqxi1cvfk226zgb0qhs5a2q70nxj7z"; + libraryHaskellDepends = [ + base blaze-html blaze-markup bytestring directory pandoc persistent + shakespeare text xss-sanitize yesod-core yesod-form + ]; + testHaskellDepends = [ base blaze-html hspec text ]; + description = "Tools for using markdown in a yesod application"; + license = lib.licenses.gpl2Only; + hydraPlatforms = lib.platforms.none; + broken = true; + }) {}; + "yesod-media-simple" = callPackage ({ mkDerivation, base, bytestring, diagrams-cairo, diagrams-core , diagrams-lib, directory, JuicyPixels, vector, yesod From 55f76ad8fdf8cf787bb99e73754f25fd2efe5f8d Mon Sep 17 00:00:00 2001 From: 06kellyjac Date: Fri, 16 Apr 2021 15:49:44 +0100 Subject: [PATCH 184/230] terragrunt: 0.28.22 -> 0.28.24 --- pkgs/applications/networking/cluster/terragrunt/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/cluster/terragrunt/default.nix b/pkgs/applications/networking/cluster/terragrunt/default.nix index a95ea55666b..94026992c3d 100644 --- a/pkgs/applications/networking/cluster/terragrunt/default.nix +++ b/pkgs/applications/networking/cluster/terragrunt/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "terragrunt"; - version = "0.28.22"; + version = "0.28.24"; src = fetchFromGitHub { owner = "gruntwork-io"; repo = pname; rev = "v${version}"; - sha256 = "sha256-tFM9kRdr98Jm2n6i5QDUKlLsI96RZ+e7MeYc7Y+ryUE="; + sha256 = "sha256-7wfBKXO4uUrFjEklmgfgzIECARsOolwXjNFOFqfn1ds="; }; vendorSha256 = "sha256-qlSCQtiGHmlk3DyETMoQbbSYhuUSZTsvAnBKuDJI8x8="; From 4c71d57c99495ea405b29bf3fa7ed8f73d3d26cf Mon Sep 17 00:00:00 2001 From: Malte Brandy Date: Fri, 16 Apr 2021 17:04:45 +0200 Subject: [PATCH 185/230] haskellPackages.haskell-language-server: Fix more deps to stay compat with 1.0.0 --- .../configuration-hackage2nix.yaml | 2 + .../haskell-modules/hackage-packages.nix | 39 +++++++++++++++++++ 2 files changed, 41 insertions(+) diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml index cc6df86a7a9..b6a24ac6727 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml @@ -82,6 +82,8 @@ default-package-overrides: - hls-retrie-plugin < 1.0.0.1 - lsp < 1.2 - lsp-types < 1.2 + - hls-plugin-api < 1.1.0.0 + - hls-explicit-imports-plugin < 1.0.0.1 # 2021-04-02: Stackage Nighlty has haskell-gi* < 0.25, # so we need to restrict these to compatible versions # Remove these as soon as haskell-gi{,-base} are 0.25.* diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index e5132fd5fbd..ad2fa8e7dae 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -131977,6 +131977,24 @@ self: { }) {}; "hls-explicit-imports-plugin" = callPackage + ({ mkDerivation, aeson, base, containers, deepseq, ghc, ghcide + , hls-plugin-api, lsp, lsp-types, shake, text, unordered-containers + }: + mkDerivation { + pname = "hls-explicit-imports-plugin"; + version = "1.0.0.0"; + sha256 = "14j89l8pkxrffllg06fj6215xqdswrbndyv5xa22f0g00acmwi6w"; + revision = "1"; + editedCabalFile = "0gch9wkz1h4g06xc48jhvs06jji9d0npa2zrj2gv1cbf6hjs0s92"; + libraryHaskellDepends = [ + aeson base containers deepseq ghc ghcide hls-plugin-api lsp + lsp-types shake text unordered-containers + ]; + description = "Explicit imports plugin for Haskell Language Server"; + license = lib.licenses.asl20; + }) {}; + + "hls-explicit-imports-plugin_1_0_0_1" = callPackage ({ mkDerivation, aeson, base, containers, deepseq, ghc, ghcide , hls-plugin-api, lsp, lsp-types, shake, text, unordered-containers }: @@ -131990,6 +132008,7 @@ self: { ]; description = "Explicit imports plugin for Haskell Language Server"; license = lib.licenses.asl20; + hydraPlatforms = lib.platforms.none; }) {}; "hls-haddock-comments-plugin" = callPackage @@ -132030,6 +132049,25 @@ self: { }) {}; "hls-plugin-api" = callPackage + ({ mkDerivation, aeson, base, containers, data-default + , dependent-map, dependent-sum, Diff, dlist, hashable, hslogger + , lens, lsp, opentelemetry, process, regex-tdfa, shake, text, unix + , unordered-containers + }: + mkDerivation { + pname = "hls-plugin-api"; + version = "1.0.0.0"; + sha256 = "03pj0irgf9p84jn5kfd4cfyqk4xyfdf9pfrwqhb0c1ipnm4l7wal"; + libraryHaskellDepends = [ + aeson base containers data-default dependent-map dependent-sum Diff + dlist hashable hslogger lens lsp opentelemetry process regex-tdfa + shake text unix unordered-containers + ]; + description = "Haskell Language Server API for plugin communication"; + license = lib.licenses.asl20; + }) {}; + + "hls-plugin-api_1_1_0_0" = callPackage ({ mkDerivation, aeson, base, containers, data-default , dependent-map, dependent-sum, Diff, dlist, hashable, hslogger , lens, lsp, opentelemetry, process, regex-tdfa, shake, text, unix @@ -132046,6 +132084,7 @@ self: { ]; description = "Haskell Language Server API for plugin communication"; license = lib.licenses.asl20; + hydraPlatforms = lib.platforms.none; }) {}; "hls-retrie-plugin" = callPackage From b77c77debbc6d0f7ce96196748ebd647d0fae5db Mon Sep 17 00:00:00 2001 From: Claudio Bley Date: Tue, 13 Apr 2021 09:47:15 +0200 Subject: [PATCH 186/230] kupfer: 319 -> 321 * add itstool to nativeBuildTools for building help pages in different languages * add desktop-file-utils and shared-mime-info to nativeBuildTools which are needed when building --- pkgs/applications/misc/kupfer/default.nix | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/misc/kupfer/default.nix b/pkgs/applications/misc/kupfer/default.nix index 243583b8762..07ff7c17f69 100644 --- a/pkgs/applications/misc/kupfer/default.nix +++ b/pkgs/applications/misc/kupfer/default.nix @@ -4,8 +4,11 @@ , python3Packages , gobject-introspection , gtk3 +, itstool , libwnck3 , keybinder3 +, desktop-file-utils +, shared-mime-info , wrapGAppsHook , wafHook }: @@ -14,19 +17,22 @@ with python3Packages; buildPythonApplication rec { pname = "kupfer"; - version = "319"; + version = "321"; format = "other"; src = fetchurl { - url = "https://github.com/kupferlauncher/kupfer/releases/download/v${version}/kupfer-v${version}.tar.xz"; - sha256 = "0c9xjx13r8ckfr4az116bhxsd3pk78v04c3lz6lqhraak0rp4d92"; + url = "https://github.com/kupferlauncher/kupfer/releases/download/v${version}/kupfer-v${version}.tar.bz2"; + sha256 = "0nagjp63gxkvsgzrpjk78cbqx9a7rbnjivj1avzb2fkhrlxa90c7"; }; nativeBuildInputs = [ wrapGAppsHook intltool # For setup hook gobject-introspection wafHook + itstool # for help pages + desktop-file-utils # for update-desktop-database + shared-mime-info # for update-mime-info ]; buildInputs = [ docutils libwnck3 keybinder3 ]; propagatedBuildInputs = [ pygobject3 gtk3 pyxdg dbus-python pycairo ]; From 4f3907fc0f84a39aebd8e48ef1dd2fb85efa84b5 Mon Sep 17 00:00:00 2001 From: Pascal Bach Date: Fri, 16 Apr 2021 17:25:28 +0200 Subject: [PATCH 187/230] cryptomator: 1.5.13 -> 1.5.14 --- pkgs/tools/security/cryptomator/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/tools/security/cryptomator/default.nix b/pkgs/tools/security/cryptomator/default.nix index c866a527768..1cc0045a5b2 100644 --- a/pkgs/tools/security/cryptomator/default.nix +++ b/pkgs/tools/security/cryptomator/default.nix @@ -6,20 +6,20 @@ let pname = "cryptomator"; - version = "1.5.13"; + version = "1.5.14"; src = fetchFromGitHub { owner = "cryptomator"; repo = "cryptomator"; rev = version; - sha256 = "1s9jl3nl6yfjzmilz9b8azk8592nd39xflzfdf38v6s4iiq86r8j"; + sha256 = "05zgan1i2dzipzw8x510lg2l40dz9hvk43nrwpi0kg9l1qs9sxrq"; }; icons = fetchFromGitHub { owner = "cryptomator"; repo = "cryptomator-linux"; rev = version; - sha256 = "1x6h6wp6yxnj576874xj3d2jm8jmb7918wprqvlz4sryxhlcssa7"; + sha256 = "0gb5sd5bkpxv4hff1i09rxr90pi5d15vjsfrk9m8221xiypqmccp"; }; # perform fake build to make a fixed-output derivation out of the files downloaded from maven central (120MB) @@ -44,7 +44,7 @@ let outputHashAlgo = "sha256"; outputHashMode = "recursive"; - outputHash = "06q8bqdz3c4i84wxl9z5861zwdsw8jzcvsbgxqrnh8rwi7500sa7"; + outputHash = "0gvpjc77g99vcwk77nknvg8z33xbskcfwx3015nhhc089b2frq02"; }; in stdenv.mkDerivation rec { From 4130abfe1295836a5971caa5a92434f8459e52df Mon Sep 17 00:00:00 2001 From: Reed Date: Fri, 16 Apr 2021 10:06:29 -0400 Subject: [PATCH 188/230] neofetch: wrap with pciutils --- pkgs/tools/misc/neofetch/default.nix | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/pkgs/tools/misc/neofetch/default.nix b/pkgs/tools/misc/neofetch/default.nix index 1826d6846d4..30fd40a1080 100644 --- a/pkgs/tools/misc/neofetch/default.nix +++ b/pkgs/tools/misc/neofetch/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenvNoCC, fetchFromGitHub, bash }: +{ lib, stdenvNoCC, fetchFromGitHub, bash, makeWrapper, pciutils }: stdenvNoCC.mkDerivation rec { pname = "neofetch"; @@ -13,10 +13,16 @@ stdenvNoCC.mkDerivation rec { strictDeps = true; buildInputs = [ bash ]; + nativeBuildInputs = [ makeWrapper ]; postPatch = '' patchShebangs --host neofetch ''; + postInstall = '' + wrapProgram $out/bin/neofetch \ + --prefix PATH : ${lib.makeBinPath [ pciutils ]} + ''; + makeFlags = [ "PREFIX=${placeholder "out"}" "SYSCONFDIR=${placeholder "out"}/etc" From dba0cfb2d9bf4d0b0db113e896c094e3d1fefd34 Mon Sep 17 00:00:00 2001 From: Marc 'risson' Schmitt Date: Fri, 16 Apr 2021 17:56:26 +0200 Subject: [PATCH 189/230] yubioath-desktop: 5.0.4 -> 5.0.5 Signed-off-by: Marc 'risson' Schmitt --- ...place-git-with-normal-python-package.patch | 24 ------------------- .../misc/yubioath-desktop/default.nix | 8 ++----- 2 files changed, 2 insertions(+), 30 deletions(-) delete mode 100644 pkgs/applications/misc/yubioath-desktop/0001-replace-git-with-normal-python-package.patch diff --git a/pkgs/applications/misc/yubioath-desktop/0001-replace-git-with-normal-python-package.patch b/pkgs/applications/misc/yubioath-desktop/0001-replace-git-with-normal-python-package.patch deleted file mode 100644 index d56a6cfab07..00000000000 --- a/pkgs/applications/misc/yubioath-desktop/0001-replace-git-with-normal-python-package.patch +++ /dev/null @@ -1,24 +0,0 @@ -From 5eb4d6a384753896d495b09d8651c48672ef234d Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= -Date: Wed, 25 Nov 2020 11:26:49 +0100 -Subject: [PATCH] replace git with normal python package -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Signed-off-by: Jörg Thalheim ---- - requirements.txt | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/requirements.txt b/requirements.txt -index ef25aad..b4246a4 100644 ---- a/requirements.txt -+++ b/requirements.txt -@@ -1,2 +1,2 @@ --git+https://github.com/Yubico/yubikey-manager.git -+yubikey-manager - ./py/qr --- -2.29.2 - diff --git a/pkgs/applications/misc/yubioath-desktop/default.nix b/pkgs/applications/misc/yubioath-desktop/default.nix index dbd33db16f9..bb4b5afe1b2 100644 --- a/pkgs/applications/misc/yubioath-desktop/default.nix +++ b/pkgs/applications/misc/yubioath-desktop/default.nix @@ -6,11 +6,11 @@ mkDerivation rec { pname = "yubioath-desktop"; - version = "5.0.4"; + version = "5.0.5"; src = fetchurl { url = "https://developers.yubico.com/yubioath-desktop/Releases/yubioath-desktop-${version}.tar.gz"; - sha256 = "1aw88xvg6gjsfwmmlcrdcgyycn2cp7b8vxjzj14h7igcj02xh84h"; + sha256 = "05xs6xh9pi50h0668arirj0gnz11adpixgsdkds072077gasdm0g"; }; doCheck = false; @@ -19,10 +19,6 @@ mkDerivation rec { nativeBuildInputs = [ qmake makeWrapper python3.pkgs.wrapPython ]; - patches = [ - ./0001-replace-git-with-normal-python-package.patch - ]; - postPatch = '' substituteInPlace deployment.pri \ --replace '/usr/bin' "$out/bin" From 7dc5c0f1e1d9fd973f880e966f1bfdaf6f68a169 Mon Sep 17 00:00:00 2001 From: Yurii Matsiuk <24990891+ymatsiuk@users.noreply.github.com> Date: Fri, 16 Apr 2021 18:11:37 +0200 Subject: [PATCH 190/230] bluejeans: 2.19.0 -> 2.21.3 (#119599) Co-authored-by: Sandro Co-authored-by: Yurii Matsiuk --- .../instant-messengers/bluejeans/default.nix | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/bluejeans/default.nix b/pkgs/applications/networking/instant-messengers/bluejeans/default.nix index d80ccf0a8fa..b3cd9d8c140 100644 --- a/pkgs/applications/networking/instant-messengers/bluejeans/default.nix +++ b/pkgs/applications/networking/instant-messengers/bluejeans/default.nix @@ -35,16 +35,17 @@ , alsaLib , pulseaudio , makeWrapper +, xdg-utils }: stdenv.mkDerivation rec { pname = "bluejeans"; - version = "2.19.0"; - buildNumber = "61"; + version = "2.21.3"; + buildNumber = "2"; src = fetchurl { url = "https://swdl.bluejeans.com/desktop-app/linux/${version}/BlueJeans_${version}.${buildNumber}.rpm"; - sha256 = "163p67dqry256d454qzk4k4b692kz8s9fcvaxd6gi7zvnsd48ikr"; + sha256 = "sha256-a/REuxkqZmLLa7N3CUgUAdq74VMD9D10a/Sx2jOj1QA="; }; nativeBuildInputs = [ rpmextract makeWrapper ]; @@ -100,6 +101,7 @@ stdenv.mkDerivation rec { --set-interpreter $(cat $NIX_CC/nix-support/dynamic-linker) \ --replace-needed libudev.so.0 libudev.so.1 \ opt/BlueJeans/bluejeans-v2 + patchelf \ --set-interpreter $(cat $NIX_CC/nix-support/dynamic-linker) \ opt/BlueJeans/resources/BluejeansHelper @@ -108,7 +110,8 @@ stdenv.mkDerivation rec { makeWrapper $out/opt/BlueJeans/bluejeans-v2 $out/bin/bluejeans \ --set LD_LIBRARY_PATH "${libPath}":"${placeholder "out"}"/opt/BlueJeans \ - --set LD_PRELOAD "$out"/opt/BlueJeans/liblocaltime64_stub.so + --set LD_PRELOAD "$out"/opt/BlueJeans/liblocaltime64_stub.so \ + --prefix PATH : ${lib.makeBinPath [ xdg-utils ]} substituteInPlace "$out"/share/applications/bluejeans-v2.desktop \ --replace "/opt/BlueJeans/bluejeans-v2" "$out/bin/bluejeans" From ecfd3d4c53476885ea3de59b82ccc17a660024b9 Mon Sep 17 00:00:00 2001 From: sternenseemann <0rpkxez4ksa01gb3typccl0i@systemli.org> Date: Fri, 16 Apr 2021 18:13:25 +0200 Subject: [PATCH 191/230] nixos/services/matrix-synapse: fix eval errors in manual example --- nixos/modules/services/misc/matrix-synapse.xml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/nixos/modules/services/misc/matrix-synapse.xml b/nixos/modules/services/misc/matrix-synapse.xml index 358b631eb48..41a56df0f2b 100644 --- a/nixos/modules/services/misc/matrix-synapse.xml +++ b/nixos/modules/services/misc/matrix-synapse.xml @@ -33,11 +33,11 @@ installation instructions of Synapse . -{ pkgs, ... }: +{ pkgs, lib, ... }: let fqdn = let - join = hostName: domain: hostName + optionalString (domain != null) ".${domain}"; + join = hostName: domain: hostName + lib.optionalString (domain != null) ".${domain}"; in join config.networking.hostName config.networking.domain; in { networking = { @@ -132,7 +132,7 @@ in { } ]; }; -}; +} From 93ad4bae790f77239a6e6344eeb506af3aceb97d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Milan=20P=C3=A4ssler?= Date: Fri, 16 Apr 2021 17:49:43 +0200 Subject: [PATCH 192/230] mindustry: mark as broken The Mindustry source code makes heavy use of internal Java APIs that were deprecated in Java 6 and removed in Java 16. It also makes use of features that require Java >=14. The author is not ready to provide compatibility with any maintained Java version at this time. --- pkgs/games/mindustry/default.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/games/mindustry/default.nix b/pkgs/games/mindustry/default.nix index af8ff5f24f9..7e1a0cba176 100644 --- a/pkgs/games/mindustry/default.nix +++ b/pkgs/games/mindustry/default.nix @@ -191,6 +191,8 @@ stdenv.mkDerivation rec { platforms = platforms.x86_64; # Hash mismatch on darwin: # https://github.com/NixOS/nixpkgs/pull/105590#issuecomment-737120293 - broken = stdenv.isDarwin; + broken = stdenv.isDarwin + # does not work with any maintained java version (https://github.com/Anuken/Mindustry/issues/5114) + || true; }; } From 591ef853c741213c6f81d7b2935e64afac00701b Mon Sep 17 00:00:00 2001 From: sternenseemann <0rpkxez4ksa01gb3typccl0i@systemli.org> Date: Fri, 16 Apr 2021 19:21:41 +0200 Subject: [PATCH 193/230] haskellPackages.lzma-static: unbreak --- pkgs/development/haskell-modules/configuration-common.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 4338d58a69a..5048002f088 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -1811,4 +1811,8 @@ self: super: { # PR pending https://github.com/zohl/cereal-time/pull/2 cereal-time = doJailbreak super.cereal-time; + # 2021-04-16: too strict bounds on QuickCheck and tasty + # https://github.com/hasufell/lzma-static/issues/1 + lzma-static = doJailbreak super.lzma-static; + } // import ./configuration-tensorflow.nix {inherit pkgs haskellLib;} self super From d5a4dec5d28729d25756345c9fe9c38b4139c340 Mon Sep 17 00:00:00 2001 From: 06kellyjac Date: Fri, 16 Apr 2021 18:24:08 +0100 Subject: [PATCH 194/230] agate: fix cargoSha256 change --- pkgs/servers/gemini/agate/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/servers/gemini/agate/default.nix b/pkgs/servers/gemini/agate/default.nix index a52e759bb35..b41153caeb8 100644 --- a/pkgs/servers/gemini/agate/default.nix +++ b/pkgs/servers/gemini/agate/default.nix @@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec { sha256 = "sha256-+X1ibnYAUB34u8+oNBSkjLtsArxlrg0Nq5zJrXi7Rfk="; }; - cargoSha256 = "sha256-ZVu7wQFe+FHWX2wevVYct1dQSE9rFET8bkmv85wNV8A="; + cargoSha256 = "sha256-EOxklOiazxhhIIv6c+N4uuItY/oFMAG0r/ATZ3Anlko="; buildInputs = lib.optionals stdenv.isDarwin [ Security ]; From 12d590ba3d51ac13830ccc942f997490def549ec Mon Sep 17 00:00:00 2001 From: SEbbaDK Date: Fri, 16 Apr 2021 19:30:40 +0200 Subject: [PATCH 195/230] kakounePlugins: Add pandoc.kak --- pkgs/applications/editors/kakoune/plugins/kakoune-plugin-names | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/applications/editors/kakoune/plugins/kakoune-plugin-names b/pkgs/applications/editors/kakoune/plugins/kakoune-plugin-names index b1874146089..7b6f4859304 100644 --- a/pkgs/applications/editors/kakoune/plugins/kakoune-plugin-names +++ b/pkgs/applications/editors/kakoune/plugins/kakoune-plugin-names @@ -3,6 +3,7 @@ alexherbo2/replace-mode.kak alexherbo2/sleuth.kak andreyorst/fzf.kak andreyorst/powerline.kak +basbebe/pandoc.kak danr/kakoune-easymotion Delapouite/kakoune-buffers Delapouite/kakoune-registers From 8416de54751561be6ac14e9555047dcf1d47ddc7 Mon Sep 17 00:00:00 2001 From: "\"SEbbaDK\"" <"sebbadk@gmail.com"> Date: Fri, 16 Apr 2021 19:31:10 +0200 Subject: [PATCH 196/230] kakounePlugins: update --- .../editors/kakoune/plugins/generated.nix | 42 ++++++++++++------- 1 file changed, 27 insertions(+), 15 deletions(-) diff --git a/pkgs/applications/editors/kakoune/plugins/generated.nix b/pkgs/applications/editors/kakoune/plugins/generated.nix index 4fada31a0f5..5b1fc2be77d 100644 --- a/pkgs/applications/editors/kakoune/plugins/generated.nix +++ b/pkgs/applications/editors/kakoune/plugins/generated.nix @@ -17,12 +17,12 @@ let auto-pairs-kak = buildKakounePluginFrom2Nix { pname = "auto-pairs-kak"; - version = "2020-10-04"; + version = "2021-03-28"; src = fetchFromGitHub { owner = "alexherbo2"; repo = "auto-pairs.kak"; - rev = "fd735ec149ef0d9ca5f628a95b1e52858b5afbdc"; - sha256 = "07795kv9njlnp6mckwv141ny2ns6wyf5r0dfjaxh9ngd105zgif1"; + rev = "526779a26a5cf5f48e7c4f5c5fecca274968a737"; + sha256 = "0gkhvwxyh8pdfydrj7zkfidk0drrbhvdi1fq3pkzllna3vz8q181"; }; meta.homepage = "https://github.com/alexherbo2/auto-pairs.kak/"; }; @@ -41,12 +41,12 @@ let fzf-kak = buildKakounePluginFrom2Nix { pname = "fzf-kak"; - version = "2021-03-15"; + version = "2021-04-03"; src = fetchFromGitHub { owner = "andreyorst"; repo = "fzf.kak"; - rev = "4e6c9a857511fccdbbc835a1c9acb205b6486a4c"; - sha256 = "0syhhdlsm7vg6hcd2n2acag9g562z49rbb5smh5p2gnplhmp93i0"; + rev = "1b3a3beebbe7134e671fde2ef2f4242b34ae2c60"; + sha256 = "0rsd65zcizbq3isy8576gqw7mcml5ixw84padaz6ndwfif5fv701"; }; meta.homepage = "https://github.com/andreyorst/fzf.kak/"; }; @@ -65,12 +65,12 @@ let kakoune-buffers = buildKakounePluginFrom2Nix { pname = "kakoune-buffers"; - version = "2020-06-11"; + version = "2021-04-02"; src = fetchFromGitHub { owner = "Delapouite"; repo = "kakoune-buffers"; - rev = "67959fbad727ba8470fe8cd6361169560f4fb532"; - sha256 = "09prhzz4yzf6ryw0npd1gpcfp77681vgawpp1ilfvbf25xgbbz33"; + rev = "7832ea7a4528363482f5684f16cbcebcbec0adfd"; + sha256 = "196d36jww6asf5zr03l1rwg49kkv16s2d4zyryb2m3zvy7prf2bb"; }; meta.homepage = "https://github.com/Delapouite/kakoune-buffers/"; }; @@ -147,14 +147,26 @@ let meta.homepage = "https://github.com/mayjs/openscad.kak/"; }; + pandoc-kak = buildKakounePluginFrom2Nix { + pname = "pandoc-kak"; + version = "2020-11-30"; + src = fetchFromGitHub { + owner = "basbebe"; + repo = "pandoc.kak"; + rev = "63979f7e08b86d80436bbe2d9dba173a56057b97"; + sha256 = "16pmmnpyxf8r7gpj8g1lwa960nscjmcl52n1a7s6xcqkp9856wxs"; + }; + meta.homepage = "https://github.com/basbebe/pandoc.kak/"; + }; + powerline-kak = buildKakounePluginFrom2Nix { pname = "powerline-kak"; - version = "2021-02-25"; + version = "2021-04-06"; src = fetchFromGitHub { owner = "andreyorst"; repo = "powerline.kak"; - rev = "64ad98b6c85e63345563671b043960464d51c4b0"; - sha256 = "09w2sk19qi64hgsyg4gb407vyppnlgk272mqbinz2r3apy6szkl3"; + rev = "6fa5ad383f2884f201d6e3ef07a4687c606df525"; + sha256 = "1s7ggjby0bymq48njzhdvkkarmzl44803xv0dlnzrj7q9c3xv27a"; }; meta.homepage = "https://github.com/andreyorst/powerline.kak/"; }; @@ -197,12 +209,12 @@ let tabs-kak = buildKakounePluginFrom2Nix { pname = "tabs-kak"; - version = "2021-02-16"; + version = "2021-04-14"; src = fetchFromGitHub { owner = "enricozb"; repo = "tabs.kak"; - rev = "1aaa8cd89e404cbbd76d44ff8089de0951612fbf"; - sha256 = "0dfz6j6yxl65jbh4xvpiy2abr2sdjyalynzhl28y7l1gzqv4ni3j"; + rev = "048f83455ea7c671ab06e9b9578ac25e5de1d6fb"; + sha256 = "0xswpsdf1bj54inl6vf2lzbjkxfc6g0fyv5kd6y9ahlh5irij8z0"; }; meta.homepage = "https://github.com/enricozb/tabs.kak/"; }; From 087f1e1daf12b873c568292cfc3cf50fa0683f65 Mon Sep 17 00:00:00 2001 From: Francesco Gazzetta Date: Fri, 16 Apr 2021 17:36:11 +0000 Subject: [PATCH 197/230] pikchr: init at unstable-2021-04-07 (#119006) --- pkgs/tools/graphics/pikchr/default.nix | 36 ++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 38 insertions(+) create mode 100644 pkgs/tools/graphics/pikchr/default.nix diff --git a/pkgs/tools/graphics/pikchr/default.nix b/pkgs/tools/graphics/pikchr/default.nix new file mode 100644 index 00000000000..9b06d062913 --- /dev/null +++ b/pkgs/tools/graphics/pikchr/default.nix @@ -0,0 +1,36 @@ +{ lib +, stdenv +, fetchurl +}: + +stdenv.mkDerivation { + pname = "pikchr"; + version = "unstable-2021-04-07"; + + src = fetchurl { + url = "https://pikchr.org/home/tarball/90b6d5b4a3834ff0/pikchr.tar.gz"; + sha256 = "1cqpnljy12gl82rcbb7mwhgv9szcliwkbwwh67hzdv020h1scxym"; + }; + + # can't open generated html files + postPatch = '' + substituteInPlace Makefile --replace open "test -f" + ''; + + installPhase = '' + install -Dm755 pikchr $out/bin/pikchr + install -Dm755 pikchr.out $out/lib/pikchr.o + install -Dm644 pikchr.h $out/include/pikchr.h + ''; + + doCheck = true; + checkTarget = "test"; + + meta = with lib; { + description = "A PIC-like markup language for diagrams in technical documentation"; + homepage = "https://pikchr.org"; + license = licenses.bsd0; + maintainers = with maintainers; [ fgaz ]; + platforms = platforms.all; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 95ea8405c49..d0a49403b0f 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -870,6 +870,8 @@ in nimmm = callPackage ../applications/terminal-emulators/nimmm { }; + pikchr = callPackage ../tools/graphics/pikchr { }; + roxterm = callPackage ../applications/terminal-emulators/roxterm { }; rxvt = callPackage ../applications/terminal-emulators/rxvt { }; From e8635f55b48ced909f679d9c28f0201de234d4a9 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 16 Apr 2021 16:55:24 +0200 Subject: [PATCH 198/230] home-assistant: 2021.4.4 -> 2021.4.5 --- pkgs/servers/home-assistant/component-packages.nix | 2 +- pkgs/servers/home-assistant/default.nix | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/home-assistant/component-packages.nix b/pkgs/servers/home-assistant/component-packages.nix index 32ceda4bbeb..973b73d4d16 100644 --- a/pkgs/servers/home-assistant/component-packages.nix +++ b/pkgs/servers/home-assistant/component-packages.nix @@ -2,7 +2,7 @@ # Do not edit! { - version = "2021.4.4"; + version = "2021.4.5"; components = { "abode" = ps: with ps; [ abodepy ]; "accuweather" = ps: with ps; [ accuweather ]; diff --git a/pkgs/servers/home-assistant/default.nix b/pkgs/servers/home-assistant/default.nix index 4321fb72c79..59b7f1135cd 100644 --- a/pkgs/servers/home-assistant/default.nix +++ b/pkgs/servers/home-assistant/default.nix @@ -108,7 +108,7 @@ let extraBuildInputs = extraPackages py.pkgs; # Don't forget to run parse-requirements.py after updating - hassVersion = "2021.4.4"; + hassVersion = "2021.4.5"; in with py.pkgs; buildPythonApplication rec { pname = "homeassistant"; @@ -127,7 +127,7 @@ in with py.pkgs; buildPythonApplication rec { owner = "home-assistant"; repo = "core"; rev = version; - sha256 = "1p36ymjhirl32ax3xxdg9ia089jw1klww5imq18r6ksajafr78ys"; + sha256 = "106d1n9z8pfcnqm594vkhczrrrjap801w6fdr0psv5vhdxrqh4sj"; }; # leave this in, so users don't have to constantly update their downstream patch handling From 1a11337ccf2b071e166ec2f22a79edeb68494e5c Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 16 Apr 2021 19:54:30 +0200 Subject: [PATCH 199/230] python3Packages.pycomfoconnect: drop unused pytestCheckHook input --- pkgs/development/python-modules/pycomfoconnect/default.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/pkgs/development/python-modules/pycomfoconnect/default.nix b/pkgs/development/python-modules/pycomfoconnect/default.nix index cb40ec8f527..0c35dc4d5ba 100644 --- a/pkgs/development/python-modules/pycomfoconnect/default.nix +++ b/pkgs/development/python-modules/pycomfoconnect/default.nix @@ -2,7 +2,6 @@ , buildPythonPackage , fetchFromGitHub , protobuf -, pytestCheckHook }: buildPythonPackage rec { From c9bee598311d3d3c5d897a65f843f7341671ba1b Mon Sep 17 00:00:00 2001 From: Malte Brandy Date: Fri, 16 Apr 2021 19:59:01 +0200 Subject: [PATCH 200/230] haskellPackages.reflex*: Fix various dependencies --- .../haskell-modules/configuration-common.nix | 32 ++----------------- 1 file changed, 3 insertions(+), 29 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 5048002f088..b964a5c101a 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -1242,13 +1242,7 @@ self: super: { patch = doJailbreak super.patch; # Tests disabled and broken override needed because of missing lib chrome-test-utils: https://github.com/reflex-frp/reflex-dom/issues/392 - reflex-dom-core = doDistribute (unmarkBroken (dontCheck (appendPatch (doJailbreak super.reflex-dom-core) (pkgs.fetchpatch { - url = https://github.com/reflex-frp/reflex-dom/commit/6aed7b7ebb70372778f1a29a724fcb4de815ba04.patch; - sha256 = "1g7lgwj7rpziilif2gian412iy05gqbzwx9w0m6ajq3clxs5zs7l"; - stripLen = 2; - extraPrefix = ""; - includes = ["reflex-dom-core.cabal" ]; - })))); + reflex-dom-core = doDistribute (unmarkBroken (dontCheck (doJailbreak super.reflex-dom-core))); # Tests disabled and broken override needed because of missing lib chrome-test-utils: https://github.com/reflex-frp/reflex-dom/issues/392 reflex-dom = appendPatch super.reflex-dom (pkgs.fetchpatch { @@ -1475,14 +1469,6 @@ self: super: { # https://github.com/obsidiansystems/dependent-sum/issues/55 dependent-sum = doJailbreak super.dependent-sum; - # Overspecified constraint on 'constraints'. Kinda funny, huh? - dependent-sum-aeson-orphans = appendPatch (doJailbreak super.dependent-sum-aeson-orphans) (pkgs.fetchpatch { - # 2020-11-18: https://github.com/obsidiansystems/dependent-sum-aeson-orphans/pull/9 - # Bump version bounds for ghc 8.10 - url = https://github.com/obsidiansystems/dependent-sum-aeson-orphans/commit/e1f5898116222a1bc557d41f3395066f83736093.patch; - sha256 = "01fj29xdblxpz4drasaygf9875fipylpj8w164lb0cszd1vmqwnb"; - }); - # 2020-11-18: https://github.com/srid/rib/issues/169 # aeson bound out of sync rib-core = doJailbreak super.rib-core; @@ -1491,20 +1477,8 @@ self: super: { # base upper bound is incompatible with ghc 8.10 neuron = doJailbreak super.neuron; - reflex = dontCheck (doJailbreak (appendPatches super.reflex [ - # https://github.com/reflex-frp/reflex/pull/444 - # Fixes for ghc 8.10 - (pkgs.fetchpatch { - url = https://github.com/reflex-frp/reflex/commit/d230632427fc1b7031163567c97f20050610c122.patch; - sha256 = "0gafqqi6q16m5y4mrc2f7lhahmazvcbiadn2v84y9p3zvx2v26xy"; - }) - # https://github.com/reflex-frp/reflex/pull/444 - # Bound bumps for ghc 8.10 - (pkgs.fetchpatch { - url = https://patch-diff.githubusercontent.com/raw/reflex-frp/reflex/pull/448.patch; - sha256 = "0a8gcq9g8dyyafkvs54mi3fnisff20r0x0qzmhxcp9md61nkf7gq"; - }) - ])); + # 2020-04-16: https://github.com/reflex-frp/reflex/issues/449 + reflex = dontCheck (doJailbreak super.reflex); # 2020-11-19: jailbreaking because of pretty-simple bound out of date # https://github.com/kowainik/stan/issues/408 From c1535b26ef6fd0cc04958698c7fbcd82aa460d15 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 16 Apr 2021 20:03:12 +0200 Subject: [PATCH 201/230] hackage2nix: update list of broken packages to fix evaluation errors --- .../development/haskell-modules/configuration-hackage2nix.yaml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml index b6a24ac6727..f1b953553b8 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml @@ -5696,6 +5696,7 @@ broken-packages: - ghcjs-xhr - ghclive - ghcprofview + - ghcup - ght - gi-cairo-again - gi-graphene @@ -10379,6 +10380,7 @@ broken-packages: - sorted - sorting - sorty + - souffle-dsl - souffle-haskell - sound-collage - sounddelay @@ -11454,6 +11456,7 @@ broken-packages: - wai-graceful - wai-handler-devel - wai-handler-fastcgi + - wai-handler-hal - wai-handler-scgi - wai-handler-snap - wai-handler-webkit From b70a9c2fc7723724059b2a820657e868a844821d Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 16 Apr 2021 20:06:42 +0200 Subject: [PATCH 202/230] hackage-packages.nix: automatic Haskell package set update This update was generated by hackage2nix v2.17.0-8-ge18310f from Hackage revision https://github.com/commercialhaskell/all-cabal-hashes/commit/604db45cba2a8dcd9a7b3ac991e1bfef8c2eb116. --- .../haskell-modules/hackage-packages.nix | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index ad2fa8e7dae..a4581a2a570 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -42592,8 +42592,8 @@ self: { }: mkDerivation { pname = "birch-beer"; - version = "0.3.1.1"; - sha256 = "0v2202zrnli49z4vw4zc6cgxvfqrv51b6p0svp0fdd2f9add4rvm"; + version = "0.4.1.0"; + sha256 = "07l9y57if58047d54g52vhpk4372aj563brbds62c3fgb5wjpdc6"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -50565,8 +50565,8 @@ self: { }: mkDerivation { pname = "calamity"; - version = "0.1.28.2"; - sha256 = "0hy29d34w06n7pyjycp7n3f4l6717n2z9yzjq39df05bf8xnigkj"; + version = "0.1.28.3"; + sha256 = "0w7jcq6jplr31ljdvj9cqimg1xxz9pjnsdqkncdsiywa10ngww10"; libraryHaskellDepends = [ aeson async base bytestring colour concurrent-extra connection containers data-default-class data-flags deepseq deque df1 di-core @@ -72773,8 +72773,8 @@ self: { }: mkDerivation { pname = "deepl"; - version = "0.1.0.0"; - sha256 = "1wckhfq5g5aqzh2ybw4bbq39hn1yc1yzb8akd5vvhcip8afkkqsa"; + version = "0.1.0.1"; + sha256 = "042xkvfs3ny0gchk0a1l427hg6sd5dngw43sdwzp6c1k969s4cda"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -103747,6 +103747,8 @@ self: { ]; description = "ghc toolchain installer"; license = lib.licenses.lgpl3Only; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "ghczdecode" = callPackage @@ -245035,6 +245037,8 @@ self: { ]; description = "Haskell EDSL for Souffle"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "souffle-haskell" = callPackage @@ -278895,6 +278899,8 @@ self: { ]; description = "Wrap WAI applications to run on AWS Lambda"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "wai-handler-launch" = callPackage From 0d8e34906c87fad89ede376e5f1fe2e4c5150f82 Mon Sep 17 00:00:00 2001 From: 0x4A6F <0x4A6F@users.noreply.github.com> Date: Fri, 16 Apr 2021 19:54:40 +0200 Subject: [PATCH 203/230] dasel: 1.14.0 -> 1.14.1 --- pkgs/applications/misc/dasel/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/dasel/default.nix b/pkgs/applications/misc/dasel/default.nix index d482e40328c..3f4e77bdd04 100644 --- a/pkgs/applications/misc/dasel/default.nix +++ b/pkgs/applications/misc/dasel/default.nix @@ -5,13 +5,13 @@ buildGoModule rec { pname = "dasel"; - version = "1.14.0"; + version = "1.14.1"; src = fetchFromGitHub { owner = "TomWright"; repo = pname; rev = "v${version}"; - sha256 = "1g4a001k86myfln0xlzy8w9krwamvfchnvywpr1p3x6iw95z46w8"; + sha256 = "0nxdyd0zg4w1zr8p9z2x88h36vbn7ryk7160zszdiwh5qmdlv47v"; }; vendorSha256 = "sha256-BdX4DO77mIf/+aBdkNVFUzClsIml1UMcgvikDbbdgcY="; From a5aa71ee47347ec7dc6dff24c3aebe9c84a875db Mon Sep 17 00:00:00 2001 From: Akshat Agarwal Date: Thu, 8 Apr 2021 20:04:11 +0530 Subject: [PATCH 204/230] tremor-rs: 0.10.1 -> 0.11.0 Co-authored-by: Sandro --- pkgs/tools/misc/tremor-rs/default.nix | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/pkgs/tools/misc/tremor-rs/default.nix b/pkgs/tools/misc/tremor-rs/default.nix index fb1268acc6f..ca3f3058755 100644 --- a/pkgs/tools/misc/tremor-rs/default.nix +++ b/pkgs/tools/misc/tremor-rs/default.nix @@ -3,22 +3,26 @@ rustPlatform.buildRustPackage rec { pname = "tremor"; - version = "0.10.1"; + version = "0.11.0"; src = fetchFromGitHub { owner = "tremor-rs"; repo = "tremor-runtime"; rev = "v${version}"; - sha256 = "1z1khxfdj2j0xf7dp0x2cd9kl6r4qicp7kc4p4sdky2yib66512y"; + sha256 = "19g0ijkclrza6s0qcbwwh3lhlkisy00ffcl0c0d7dfqwrcisgz57"; }; - cargoSha256 = "sha256-rN/d6BL2d0D0ichQR6v0543Bh/Y2ktz8ExMH50M8B8c="; + cargoSha256 = "1xv205czb2z6qpqi6vslyrx2n21510qqa11i2hwya3jdcc9lkrsd"; nativeBuildInputs = [ cmake pkg-config installShellFiles ]; buildInputs = [ openssl ]; + # TODO export TREMOR_PATH($out/lib) variable postInstall = '' + # Copy the standard library to $out/lib + cp -r ${src}/tremor-script/lib/ $out + installShellCompletion --cmd tremor \ --bash <($out/bin/tremor completions bash) \ --fish <($out/bin/tremor completions fish) \ @@ -30,7 +34,7 @@ rustPlatform.buildRustPackage rec { # OPENSSL_NO_VENDOR - If set, always find OpenSSL in the system, even if the vendored feature is enabled. OPENSSL_NO_VENDOR = 1; - cargoBuildFlags = [ "--all" ]; + cargoBuildFlags = [ "-p tremor-cli" ]; meta = with lib; { description = "Early stage event processing system for unstructured data with rich support for structural pattern matching, filtering and transformation"; From b1c71eb215b7833afc074da11924af5b3a425815 Mon Sep 17 00:00:00 2001 From: Alex Wied Date: Fri, 16 Apr 2021 10:57:59 -0400 Subject: [PATCH 205/230] openethereum: 3.2.3 -> 3.2.4 See: https://github.com/openethereum/openethereum/releases/tag/v3.2.4 --- pkgs/applications/blockchains/openethereum/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/blockchains/openethereum/default.nix b/pkgs/applications/blockchains/openethereum/default.nix index 5b51d162d0f..82b6f2c1adb 100644 --- a/pkgs/applications/blockchains/openethereum/default.nix +++ b/pkgs/applications/blockchains/openethereum/default.nix @@ -12,16 +12,16 @@ rustPlatform.buildRustPackage rec { pname = "openethereum"; - version = "3.2.3"; + version = "3.2.4"; src = fetchFromGitHub { owner = "openethereum"; repo = "openethereum"; rev = "v${version}"; - sha256 = "1j7wfgpnvf9pcprd53sbd3pa7yz9588z81i1bx12wmj1fja3xa0j"; + sha256 = "143w0b0ff1s73qzr844l25w90d2y2z0b3w2fr5kkbc1wsnpcq7jp"; }; - cargoSha256 = "0ha18caw8mxzrh984y2z148cmdijrjxf0rc8j4ccwvmrbdsaz1xn"; + cargoSha256 = "1gm02pcfll362add8a0dcb0sk0mag8z0q23b87yb6fs870bqvhib"; LIBCLANG_PATH = "${llvmPackages.libclang}/lib"; nativeBuildInputs = [ From fbffc54ac81497653cdcaddabfd446b7292b7eee Mon Sep 17 00:00:00 2001 From: devhell Date: Fri, 16 Apr 2021 20:16:02 +0100 Subject: [PATCH 206/230] profanity: Enable clipboard support Clipboard support was actually introduced in version `0.8.0`, and this change flew completely over my head. Now the /paste command should actually work by default and as expected. --- .../networking/instant-messengers/profanity/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/networking/instant-messengers/profanity/default.nix b/pkgs/applications/networking/instant-messengers/profanity/default.nix index 5aaed6eb211..e7f8a9e7726 100644 --- a/pkgs/applications/networking/instant-messengers/profanity/default.nix +++ b/pkgs/applications/networking/instant-messengers/profanity/default.nix @@ -53,7 +53,7 @@ stdenv.mkDerivation rec { # Enable feature flags, so that build fail if libs are missing configureFlags = [ "--enable-c-plugins" "--enable-otr" ] ++ optionals notifySupport [ "--enable-notifications" ] - ++ optionals traySupport [ "--enable-icons" ] + ++ optionals traySupport [ "--enable-icons-and-clipboard" ] ++ optionals pgpSupport [ "--enable-pgp" ] ++ optionals pythonPluginSupport [ "--enable-python-plugins" ] ++ optionals omemoSupport [ "--enable-omemo" ]; From b623794aba1915e0dfa1d7731f28d59967ae6c9d Mon Sep 17 00:00:00 2001 From: JonathanILevi <35940342+JonathanILevi@users.noreply.github.com> Date: Fri, 16 Apr 2021 14:33:08 -0500 Subject: [PATCH 207/230] dmd: mark unbroken (#119647) It is building fine locally, tested by myself and @SuperSandro2000 (who had added the broken tag). Should this be tested on hydra before removing it? I don't know if that is even possible. --- pkgs/development/compilers/dmd/default.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/pkgs/development/compilers/dmd/default.nix b/pkgs/development/compilers/dmd/default.nix index 51f30dbabda..3ae72e5862f 100644 --- a/pkgs/development/compilers/dmd/default.nix +++ b/pkgs/development/compilers/dmd/default.nix @@ -170,6 +170,5 @@ stdenv.mkDerivation rec { maintainers = with maintainers; [ ThomasMader lionello ]; platforms = [ "x86_64-linux" "i686-linux" "x86_64-darwin" ]; # many tests are failing - broken = true; }; } From 1766f30971795e524eac5138bfa53c676ffaedad Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Fri, 16 Apr 2021 21:45:43 +0200 Subject: [PATCH 208/230] yubioath-desktop: fix icon --- pkgs/applications/misc/yubioath-desktop/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/misc/yubioath-desktop/default.nix b/pkgs/applications/misc/yubioath-desktop/default.nix index bb4b5afe1b2..9cfd7650c49 100644 --- a/pkgs/applications/misc/yubioath-desktop/default.nix +++ b/pkgs/applications/misc/yubioath-desktop/default.nix @@ -44,7 +44,7 @@ mkDerivation rec { cp resources/icons/*.{icns,ico,png,svg} $out/share/yubioath/icons substituteInPlace $out/share/applications/com.yubico.yubioath.desktop \ --replace 'Exec=yubioath-desktop' "Exec=$out/bin/yubioath-desktop" \ - --replace 'Icon=yubioath' "Icon=$out/share/yubioath/icons/com.yubico.yubioath.png" + --replace 'Icon=com.yubico.yubioath' "Icon=$out/share/yubioath/icons/com.yubico.yubioath.png" ''; meta = with lib; { From dfb0999f7355c9caa40eee45b87bfc9071e09fdc Mon Sep 17 00:00:00 2001 From: Philip Potter Date: Fri, 16 Apr 2021 16:19:18 +0100 Subject: [PATCH 209/230] yubikey-agent: fix systemd unit I was getting problems with the unit failing to start due to NAMESPACE or CAPABILITIES permissions. Upstream now provides a systemd unit file in the repo, we should use that one, and that one works for me. --- pkgs/tools/security/yubikey-agent/default.nix | 10 +++--- .../yubikey-agent/yubikey-agent.service | 35 ------------------- 2 files changed, 5 insertions(+), 40 deletions(-) delete mode 100644 pkgs/tools/security/yubikey-agent/yubikey-agent.service diff --git a/pkgs/tools/security/yubikey-agent/default.nix b/pkgs/tools/security/yubikey-agent/default.nix index d4f3e1567ca..305f5a4fe79 100644 --- a/pkgs/tools/security/yubikey-agent/default.nix +++ b/pkgs/tools/security/yubikey-agent/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "yubikey-agent"; - version = "0.1.3"; + version = "unstable-2021-02-18"; src = fetchFromGitHub { owner = "FiloSottile"; repo = pname; - rev = "v${version}"; - sha256 = "07gix5wrakn4z846zhvl66lzwx58djrfnn6m8v7vc69l9jr3kihr"; + rev = "8cadc13d107757f8084d9d2b93ea64ff0c1748e8"; + sha256 = "1lklgq9qkqil5s0g56wbhs0vpr9c1bd4ir7bkrjwqj75ygxim8ml"; }; buildInputs = @@ -25,7 +25,7 @@ buildGoModule rec { substituteInPlace main.go --replace 'notify-send' ${libnotify}/bin/notify-send ''; - vendorSha256 = "128mlsagj3im6h0p0ndhzk29ya47g19im9dldx3nmddf2jlccj2h"; + vendorSha256 = "1zx1w2is61471v4dlmr4wf714zqsc8sppik671p7s4fis5vccsca"; doCheck = false; @@ -42,7 +42,7 @@ buildGoModule rec { # See https://github.com/FiloSottile/yubikey-agent/pull/43 + lib.optionalString stdenv.isLinux '' mkdir -p $out/lib/systemd/user - substitute ${./yubikey-agent.service} $out/lib/systemd/user/yubikey-agent.service \ + substitute contrib/systemd/user/yubikey-agent.service $out/lib/systemd/user/yubikey-agent.service \ --replace 'ExecStart=yubikey-agent' "ExecStart=$out/bin/yubikey-agent" ''; diff --git a/pkgs/tools/security/yubikey-agent/yubikey-agent.service b/pkgs/tools/security/yubikey-agent/yubikey-agent.service deleted file mode 100644 index 7a91f902544..00000000000 --- a/pkgs/tools/security/yubikey-agent/yubikey-agent.service +++ /dev/null @@ -1,35 +0,0 @@ -[Unit] -Description=Seamless ssh-agent for YubiKeys -Documentation=https://filippo.io/yubikey-agent - -[Service] -ExecStart=yubikey-agent -l %t/yubikey-agent/yubikey-agent.sock -ExecReload=/bin/kill -HUP $MAINPID -ProtectSystem=strict -ProtectKernelLogs=yes -ProtectKernelModules=yes -ProtectKernelTunables=yes -ProtectControlGroups=yes -ProtectClock=yes -ProtectHostname=yes -PrivateTmp=yes -PrivateDevices=yes -PrivateUsers=yes -IPAddressDeny=any -RestrictAddressFamilies=AF_UNIX -RestrictNamespaces=yes -RestrictRealtime=yes -RestrictSUIDSGID=yes -LockPersonality=yes -CapabilityBoundingSet= -SystemCallFilter=@system-service -SystemCallFilter=~@privileged @resources -SystemCallErrorNumber=EPERM -SystemCallArchitectures=native -NoNewPrivileges=yes -KeyringMode=private -UMask=0177 -RuntimeDirectory=yubikey-agent - -[Install] -WantedBy=default.target From 0f1e22421ee476f79edd948c7d83dd38750f4233 Mon Sep 17 00:00:00 2001 From: Maxine Aubrey Date: Thu, 15 Apr 2021 00:47:42 +0200 Subject: [PATCH 210/230] go_1_16: 1.16.2 -> 1.16.3 --- pkgs/development/compilers/go/1.16.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/compilers/go/1.16.nix b/pkgs/development/compilers/go/1.16.nix index d6690a71088..f82a0d72b7a 100644 --- a/pkgs/development/compilers/go/1.16.nix +++ b/pkgs/development/compilers/go/1.16.nix @@ -11,7 +11,7 @@ let inherit (lib) optionals optionalString; - version = "1.16.2"; + version = "1.16.3"; go_bootstrap = buildPackages.callPackage ./bootstrap.nix { }; @@ -45,7 +45,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "https://dl.google.com/go/go${version}.src.tar.gz"; - sha256 = "1sl33wkhp6pi9f15f6khp5a7l7xwmpc3sp1zmji8pjr3g8l19jip"; + sha256 = "sha256-spjSnekjbKR6Aj44IxO8wtLu0x36cGtgoEEDzoOnGiU="; }; # perl is used for testing go vet From ab16ad87649b6ea845be46fa7df7e9466ed4e05d Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Mon, 12 Apr 2021 21:52:54 +0200 Subject: [PATCH 211/230] =?UTF-8?q?coq=5F8=5F13:=208.13.1=20=E2=86=92=208.?= =?UTF-8?q?13.2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/applications/science/logic/coq/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/applications/science/logic/coq/default.nix b/pkgs/applications/science/logic/coq/default.nix index 560e8dd733a..20a17b11221 100644 --- a/pkgs/applications/science/logic/coq/default.nix +++ b/pkgs/applications/science/logic/coq/default.nix @@ -43,6 +43,7 @@ let "8.12.2".sha256 = "18gscfm039pqhq4msq01nraig5dm9ab98bjca94zldf8jvdv0x2n"; "8.13.0".sha256 = "0sjbqmz6qcvnz0hv87xha80qbhvmmyd675wyc5z4rgr34j2l1ymd"; "8.13.1".sha256 = "0xx2ns84mlip9bg2mkahy3pmc5zfcgrjxsviq9yijbzy1r95wf0n"; + "8.13.2".sha256 = "1884vbmwmqwn9ngibax6dhnqh4cc02l0s2ajc6jb1xgr0i60whjk"; }; releaseRev = v: "V${v}"; fetched = import ../../../../build-support/coq/meta-fetch/default.nix From f31864112f27d7a168f285b3147307649e68cca6 Mon Sep 17 00:00:00 2001 From: AndersonTorres Date: Fri, 16 Apr 2021 17:56:14 -0300 Subject: [PATCH 212/230] libcaca: refactor Also add AndersonTorres as maintainer --- .../development/libraries/libcaca/default.nix | 61 +++++++++++++++---- 1 file changed, 48 insertions(+), 13 deletions(-) diff --git a/pkgs/development/libraries/libcaca/default.nix b/pkgs/development/libraries/libcaca/default.nix index ca879a60c7a..f12409f271f 100644 --- a/pkgs/development/libraries/libcaca/default.nix +++ b/pkgs/development/libraries/libcaca/default.nix @@ -1,40 +1,75 @@ -{ lib, stdenv, fetchurl, ncurses, zlib, pkg-config, imlib2 -, x11Support ? !stdenv.isDarwin, libX11, libXext +{ lib +, stdenv +, fetchurl +, imlib2 +, libX11 +, libXext +, ncurses +, pkg-config +, x11Support ? !stdenv.isDarwin +, zlib }: stdenv.mkDerivation rec { - name = "libcaca-0.99.beta19"; + pname = "libcaca"; + version = "0.99.beta19"; src = fetchurl { urls = [ - "http://fossies.org/linux/privat/${name}.tar.gz" - "http://caca.zoy.org/files/libcaca/${name}.tar.gz" + "http://fossies.org/linux/privat/${pname}-${version}.tar.gz" + "http://caca.zoy.org/files/libcaca/${pname}-${version}.tar.gz" ]; - sha256 = "1x3j6yfyxl52adgnabycr0n38j9hx2j74la0hz0n8cnh9ry4d2qj"; + hash = "sha256-EotGfE7QMmTBh0BRcqToMEk0LMjML2VfU6LQ7p03cvQ="; }; outputs = [ "bin" "dev" "out" "man" ]; configureFlags = [ (if x11Support then "--enable-x11" else "--disable-x11") - ]; + ]; NIX_CFLAGS_COMPILE = lib.optionalString (!x11Support) "-DX_DISPLAY_MISSING"; enableParallelBuilding = true; - propagatedBuildInputs = [ ncurses zlib pkg-config (imlib2.override { inherit x11Support; }) ] - ++ lib.optionals x11Support [ libX11 libXext ]; + nativeBuildInputs = [ + pkg-config + ]; + buildInputs = [ + ncurses + zlib + (imlib2.override { inherit x11Support; }) + ] ++ lib.optionals x11Support [ + libX11 + libXext + ]; postInstall = '' mkdir -p $dev/bin mv $bin/bin/caca-config $dev/bin/caca-config ''; - meta = { - homepage = "http://libcaca.zoy.org/"; + meta = with lib; { + homepage = "http://caca.zoy.org/wiki/libcaca"; description = "A graphics library that outputs text instead of pixels"; - license = lib.licenses.wtfpl; - platforms = lib.platforms.unix; + longDescription = '' + libcaca is a graphics library that outputs text instead of pixels, so that + it can work on older video cards or text terminals. It is not unlike the + famous ​AAlib library, with the following improvements: + + - Unicode support + - 2048 available colours (some devices can only handle 16) + - dithering of colour images + - advanced text canvas operations (blitting, rotations) + + Libcaca works in a text terminal (and should thus work on all Unix systems + including Mac OS X) using the S-Lang or ncurses libraries. It also works + natively on DOS and Windows. + + Libcaca was written by Sam Hocevar and Jean-Yves Lamoureux. + ''; + license = licenses.wtfpl; + maintainers = with maintainers; [ AndersonTorres ]; + platforms = platforms.unix; }; } From 12268047412f56657c4366c82471333c9783bfd7 Mon Sep 17 00:00:00 2001 From: 1000101 Date: Fri, 16 Apr 2021 19:33:43 +0200 Subject: [PATCH 213/230] stretchly: 1.5.0 -> 1.6.0 --- pkgs/applications/misc/stretchly/default.nix | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/misc/stretchly/default.nix b/pkgs/applications/misc/stretchly/default.nix index 6480fd6b267..52c5f542b27 100644 --- a/pkgs/applications/misc/stretchly/default.nix +++ b/pkgs/applications/misc/stretchly/default.nix @@ -5,18 +5,17 @@ , electron , common-updater-scripts , writeShellScript -, jq , makeDesktopItem }: stdenv.mkDerivation rec { pname = "stretchly"; - version = "1.5.0"; + version = "1.6.0"; src = fetchurl { url = "https://github.com/hovancik/stretchly/releases/download/v${version}/stretchly-${version}.tar.xz"; - sha256 = "19czwmwqsn82zdzln9zqqyl9sb3dm95gp58dqn1459gyinkzpvda"; + sha256 = "1q0ihp6cd65lnscbr7xj3yyb06qds77r4s6m1xbk5l9vs2rw923d"; }; icon = fetchurl { From c95c22129fc597e509d1377befbb59fe7c316728 Mon Sep 17 00:00:00 2001 From: David Birks Date: Fri, 16 Apr 2021 18:04:30 -0400 Subject: [PATCH 214/230] vscode-extensons.github.github-vscode-theme: 3.0.0 -> 4.0.2 --- pkgs/misc/vscode-extensions/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/misc/vscode-extensions/default.nix b/pkgs/misc/vscode-extensions/default.nix index 197aacb48a0..c49c2b89dbd 100644 --- a/pkgs/misc/vscode-extensions/default.nix +++ b/pkgs/misc/vscode-extensions/default.nix @@ -427,8 +427,8 @@ let mktplcRef = { name = "github-vscode-theme"; publisher = "github"; - version = "3.0.0"; - sha256 = "1a77mbx75xfsfdlhgzghj9i7ik080bppc3jm8c00xp6781987fpa"; + version = "4.0.2"; + sha256 = "06mysdwjh7km874rrk0xc0xxaqx15b4a7x1i8dly440h8w3ng5bs"; }; meta = with lib; { description = "GitHub theme for VS Code"; From 0139874db9bca4be6f54c52f2da40e8ac7c5237b Mon Sep 17 00:00:00 2001 From: Sandro Date: Sat, 17 Apr 2021 00:25:03 +0200 Subject: [PATCH 215/230] nixos/nginx: add upstreams examples (#118447) * nixos/nginx: add upstreams examples I am not fully sure if they are fully correct but they deployed the right syntax. * nixos/nginx: use literal example * Update nixos/modules/services/web-servers/nginx/default.nix * Update nixos/modules/services/web-servers/nginx/default.nix --- nixos/modules/services/web-servers/nginx/default.nix | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/nixos/modules/services/web-servers/nginx/default.nix b/nixos/modules/services/web-servers/nginx/default.nix index 7591ad0c3d2..389911ffcce 100644 --- a/nixos/modules/services/web-servers/nginx/default.nix +++ b/nixos/modules/services/web-servers/nginx/default.nix @@ -676,6 +676,7 @@ in Defines the address and other parameters of the upstream servers. ''; default = {}; + example = { "127.0.0.1:8000" = {}; }; }; extraConfig = mkOption { type = types.lines; @@ -690,6 +691,14 @@ in Defines a group of servers to use as proxy target. ''; default = {}; + example = literalExample '' + "backend_server" = { + servers = { "127.0.0.1:8000" = {}; }; + extraConfig = '''' + keepalive 16; + ''''; + }; + ''; }; virtualHosts = mkOption { From 0aa8f9e52068b03e3dca9944007dc159f6820a1e Mon Sep 17 00:00:00 2001 From: Milan Date: Sat, 17 Apr 2021 00:38:33 +0200 Subject: [PATCH 216/230] kodi{-wayland,-gbm}: use LTS jdk11 (#119611) --- pkgs/top-level/all-packages.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 34cf48f154d..54d1dcb1a39 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -26843,10 +26843,12 @@ in }; kodi-wayland = callPackage ../applications/video/kodi { + jre_headless = jdk11_headless; waylandSupport = true; }; kodi-gbm = callPackage ../applications/video/kodi { + jre_headless = jdk11_headless; gbmSupport = true; }; From f7cb740de8df969ae4cecd21684b822823830093 Mon Sep 17 00:00:00 2001 From: Marc Seeger Date: Fri, 16 Apr 2021 15:43:03 -0700 Subject: [PATCH 217/230] ntp: set platforms to unix (#119644) Co-authored-by: Sandro --- pkgs/tools/networking/ntp/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/tools/networking/ntp/default.nix b/pkgs/tools/networking/ntp/default.nix index 28144104932..8c62e3b0d64 100644 --- a/pkgs/tools/networking/ntp/default.nix +++ b/pkgs/tools/networking/ntp/default.nix @@ -47,6 +47,6 @@ stdenv.mkDerivation rec { url = "https://www.eecis.udel.edu/~mills/ntp/html/copyright.html"; }; maintainers = with maintainers; [ eelco thoughtpolice ]; - platforms = platforms.linux; + platforms = platforms.unix; }; } From 1d9f619311e9fa28a63ce0b65ae93a9273709114 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Sat, 17 Apr 2021 02:20:07 +0200 Subject: [PATCH 218/230] nixos/home-assistant: warn about `overridePythonAttrs` in package option --- nixos/modules/services/misc/home-assistant.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/nixos/modules/services/misc/home-assistant.nix b/nixos/modules/services/misc/home-assistant.nix index 5cfadf81b97..0590f54ae60 100644 --- a/nixos/modules/services/misc/home-assistant.nix +++ b/nixos/modules/services/misc/home-assistant.nix @@ -202,6 +202,7 @@ in { Override extraPackages or extraComponents in order to add additional dependencies. If you specify and do not set to false, overriding extraComponents will have no effect. + Avoid home-assistant.overridePythonAttrs if you use autoExtraComponents. ''; }; From cc10432418239080ea1348de857d9bfa75a44619 Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Sat, 17 Apr 2021 01:07:38 +0000 Subject: [PATCH 219/230] mailman: add myself as a maintainer all around --- nixos/modules/services/mail/mailman.nix | 2 +- pkgs/development/python-modules/django-mailman3/default.nix | 2 +- pkgs/development/python-modules/mailman-hyperkitty/default.nix | 2 +- pkgs/development/python-modules/mailmanclient/default.nix | 2 +- pkgs/servers/mail/mailman/default.nix | 2 +- pkgs/servers/mail/mailman/hyperkitty.nix | 2 +- pkgs/servers/mail/mailman/postorius.nix | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/nixos/modules/services/mail/mailman.nix b/nixos/modules/services/mail/mailman.nix index 84b0fbc5f6e..f75d6183c3e 100644 --- a/nixos/modules/services/mail/mailman.nix +++ b/nixos/modules/services/mail/mailman.nix @@ -454,7 +454,7 @@ in { }; meta = { - maintainers = with lib.maintainers; [ lheckemann ]; + maintainers = with lib.maintainers; [ lheckemann qyliss ]; doc = ./mailman.xml; }; diff --git a/pkgs/development/python-modules/django-mailman3/default.nix b/pkgs/development/python-modules/django-mailman3/default.nix index 54cde59a4bd..7e99d22693f 100644 --- a/pkgs/development/python-modules/django-mailman3/default.nix +++ b/pkgs/development/python-modules/django-mailman3/default.nix @@ -27,6 +27,6 @@ buildPythonPackage rec { description = "Django library for Mailman UIs"; homepage = "https://gitlab.com/mailman/django-mailman3"; license = licenses.gpl3Plus; - maintainers = with maintainers; [ globin peti ]; + maintainers = with maintainers; [ globin peti qyliss ]; }; } diff --git a/pkgs/development/python-modules/mailman-hyperkitty/default.nix b/pkgs/development/python-modules/mailman-hyperkitty/default.nix index 1d3b69f6bf2..d5bf6457336 100644 --- a/pkgs/development/python-modules/mailman-hyperkitty/default.nix +++ b/pkgs/development/python-modules/mailman-hyperkitty/default.nix @@ -21,6 +21,6 @@ buildPythonPackage rec { description = "Mailman archiver plugin for HyperKitty"; homepage = "https://gitlab.com/mailman/mailman-hyperkitty"; license = licenses.gpl3; - maintainers = with maintainers; [ globin peti ]; + maintainers = with maintainers; [ globin peti qyliss ]; }; } diff --git a/pkgs/development/python-modules/mailmanclient/default.nix b/pkgs/development/python-modules/mailmanclient/default.nix index 0c981a6789d..c19daed1b9f 100644 --- a/pkgs/development/python-modules/mailmanclient/default.nix +++ b/pkgs/development/python-modules/mailmanclient/default.nix @@ -17,6 +17,6 @@ buildPythonPackage rec { description = "REST client for driving Mailman 3"; license = licenses.lgpl3; platforms = platforms.linux; - maintainers = with maintainers; [ peti globin ]; + maintainers = with maintainers; [ peti globin qyliss ]; }; } diff --git a/pkgs/servers/mail/mailman/default.nix b/pkgs/servers/mail/mailman/default.nix index 7f1e02fd76e..392239a7140 100644 --- a/pkgs/servers/mail/mailman/default.nix +++ b/pkgs/servers/mail/mailman/default.nix @@ -54,6 +54,6 @@ buildPythonPackage rec { homepage = "https://www.gnu.org/software/mailman/"; description = "Free software for managing electronic mail discussion and newsletter lists"; license = lib.licenses.gpl3Plus; - maintainers = with lib.maintainers; [ peti ]; + maintainers = with lib.maintainers; [ peti qyliss ]; }; } diff --git a/pkgs/servers/mail/mailman/hyperkitty.nix b/pkgs/servers/mail/mailman/hyperkitty.nix index 054d9dcf91a..5500f465852 100644 --- a/pkgs/servers/mail/mailman/hyperkitty.nix +++ b/pkgs/servers/mail/mailman/hyperkitty.nix @@ -42,6 +42,6 @@ buildPythonPackage rec { description = "Archiver for GNU Mailman v3"; license = lib.licenses.gpl3; platforms = lib.platforms.linux; - maintainers = with lib.maintainers; [ peti globin ]; + maintainers = with lib.maintainers; [ peti globin qyliss ]; }; } diff --git a/pkgs/servers/mail/mailman/postorius.nix b/pkgs/servers/mail/mailman/postorius.nix index 189e152fce0..222a21bcb7f 100644 --- a/pkgs/servers/mail/mailman/postorius.nix +++ b/pkgs/servers/mail/mailman/postorius.nix @@ -23,6 +23,6 @@ buildPythonPackage rec { homepage = "https://docs.mailman3.org/projects/postorius"; description = "Web-based user interface for managing GNU Mailman"; license = licenses.gpl3Plus; - maintainers = with maintainers; [ globin peti ]; + maintainers = with maintainers; [ globin peti qyliss ]; }; } From af2b2fe34a5cadd8907ebd348789bccddaf3e9de Mon Sep 17 00:00:00 2001 From: AndersonTorres Date: Fri, 16 Apr 2021 22:55:32 -0300 Subject: [PATCH 220/230] with-shell: 2016-08-20 -> 2018-03-20 --- pkgs/applications/misc/with-shell/default.nix | 76 ++++++++++++++++--- 1 file changed, 66 insertions(+), 10 deletions(-) diff --git a/pkgs/applications/misc/with-shell/default.nix b/pkgs/applications/misc/with-shell/default.nix index daf697c1661..cf52d194f61 100644 --- a/pkgs/applications/misc/with-shell/default.nix +++ b/pkgs/applications/misc/with-shell/default.nix @@ -1,20 +1,76 @@ -{ lib, stdenv, fetchFromGitHub }: -stdenv.mkDerivation { - name = "with-2016-08-20"; +{ lib +, stdenv +, fetchFromGitHub +, installShellFiles +}: + +stdenv.mkDerivation rec { + pname = "with"; + version = "unstable-2018-03-20"; + src = fetchFromGitHub { owner = "mchav"; repo = "With"; - rev = "cc2828bddd92297147d4365765f4ef36385f050a"; - sha256 = "10m2xv6icrdp6lfprw3a9hsrzb3bip19ipkbmscap0niddqgcl9b"; + rev = "28eb40bbc08d171daabf0210f420477ad75e16d6"; + hash = "sha256-mKHsLHs9/I+NUdb1t9wZWkPxXcsBlVWSj8fgZckXFXk="; }; + + nativeBuildInputs = [ installShellFiles ]; + installPhase = '' - mkdir -p $out/bin - cp with $out/bin/with + runHook preInstall + install -D with $out/bin/with + installShellCompletion --bash --name with.bash with.bash-completion + runHook postInstall ''; - meta = { + + meta = with lib; { homepage = "https://github.com/mchav/With"; description = "Command prefixing for continuous workflow using a single tool"; - license = lib.licenses.asl20; - platforms = lib.platforms.unix; + longDescription = '' + with is a Bash script that starts an interactive shell with where every + command is prefixed using . + + For example: + + $ with git + git> add . + git> commit -a -m "Commited" + git> push + + Can also be used for compound commands. + + $ with java Primes + java Primes> 1 + 2 + java Primes> 4 + 7 + + And to repeat commands: + + $ with gcc -o output input.c + gcc -o -output input.c> + + Compiling... + gcc -o -output input.c> + + To execute a shell command proper prefix line with :. + + git> :ls + + You can also drop, add, and replace different commands. + + git> +add + git add> + git add> !commit + git commit> + git commit> - + git> + + To exit use either :q or :exit. + ''; + license = licenses.asl20; + maintainers = with maintainers; [ AndersonTorres ]; + platforms = platforms.unix; }; } From 67c4ab77be9daaca447c14ec5c3fdcb62f581ad0 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Sat, 17 Apr 2021 04:20:00 +0000 Subject: [PATCH 221/230] podman: 3.1.0 -> 3.1.1 https://github.com/containers/podman/releases/tag/v3.1.1 --- pkgs/applications/virtualization/podman/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/virtualization/podman/default.nix b/pkgs/applications/virtualization/podman/default.nix index b64fc82f532..956baea8856 100644 --- a/pkgs/applications/virtualization/podman/default.nix +++ b/pkgs/applications/virtualization/podman/default.nix @@ -16,13 +16,13 @@ buildGoModule rec { pname = "podman"; - version = "3.1.0"; + version = "3.1.1"; src = fetchFromGitHub { owner = "containers"; repo = "podman"; rev = "v${version}"; - sha256 = "sha256-Cql9ikk0lo/LeWNykEJSKgfGnBSUU5vOh/zUIEvMapk="; + sha256 = "1ihpz50c50frw9nrjp0vna2lg50kwlar6y6vr4s5sjiwza1qv2d2"; }; patches = [ From 2a441ee408ea9cc784cf0d28c0f55c9be06b7c9e Mon Sep 17 00:00:00 2001 From: Bruno Bigras Date: Sat, 17 Apr 2021 02:24:58 -0400 Subject: [PATCH 222/230] bat-extras: 20200515-dev -> 2021.04.06 --- pkgs/tools/misc/bat-extras/default.nix | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/pkgs/tools/misc/bat-extras/default.nix b/pkgs/tools/misc/bat-extras/default.nix index 323099f02c6..4fb09f4d8dc 100644 --- a/pkgs/tools/misc/bat-extras/default.nix +++ b/pkgs/tools/misc/bat-extras/default.nix @@ -21,15 +21,13 @@ let # This includes the complete source so the per-script derivations can run the tests. core = stdenv.mkDerivation rec { pname = "bat-extras"; - # there hasn't been a release since 2020-05-01 but there are important bugfixes - # to the test suite so we'll pull the latest commit as of 2020-06-17. - version = "20200515-dev"; # latest commit was dated 2020-05-15 + version = "2021.04.06"; src = fetchFromGitHub { owner = "eth-p"; repo = pname; - rev = "3029b6749f61f7514e9eef30e035cfab0e31eb1d"; - sha256 = "08mb94k2n182ql97c5s5j1v7np25ivynn5g0418whrx11ra41wr7"; + rev = "v${version}"; + sha256 = "sha256-MphI2n+oHZrw8bPohNGeGdST5LS1c6s/rKqtpcR9cLo="; fetchSubmodules = true; }; From c6cc128f30ccf2a5570aa9efce57ac015e65341e Mon Sep 17 00:00:00 2001 From: Thomas Gerbet Date: Sat, 17 Apr 2021 10:31:50 +0200 Subject: [PATCH 223/230] python3Packages.py: fix homepage link --- pkgs/development/python-modules/py/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/py/default.nix b/pkgs/development/python-modules/py/default.nix index aa12deabb37..3ccf853d7c6 100644 --- a/pkgs/development/python-modules/py/default.nix +++ b/pkgs/development/python-modules/py/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { meta = with lib; { description = "Library with cross-python path, ini-parsing, io, code, log facilities"; - homepage = "https://pylib.readthedocs.org/"; + homepage = "https://py.readthedocs.io/"; license = licenses.mit; }; } From 2918f537ea5ee682ddf4a71dba76543dc8f0545f Mon Sep 17 00:00:00 2001 From: Malte Brandy Date: Sat, 17 Apr 2021 11:00:15 +0200 Subject: [PATCH 224/230] haskellPackages.reflex-dom: Remove obsolete override do fix build --- .../development/haskell-modules/configuration-common.nix | 9 --------- 1 file changed, 9 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index b964a5c101a..f313d65508d 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -1244,15 +1244,6 @@ self: super: { # Tests disabled and broken override needed because of missing lib chrome-test-utils: https://github.com/reflex-frp/reflex-dom/issues/392 reflex-dom-core = doDistribute (unmarkBroken (dontCheck (doJailbreak super.reflex-dom-core))); - # Tests disabled and broken override needed because of missing lib chrome-test-utils: https://github.com/reflex-frp/reflex-dom/issues/392 - reflex-dom = appendPatch super.reflex-dom (pkgs.fetchpatch { - url = https://github.com/reflex-frp/reflex-dom/commit/6aed7b7ebb70372778f1a29a724fcb4de815ba04.patch; - sha256 = "1ndqw5r85axynmx55ld6qr8ik1i1mkh6wrnkzpxbwyil2ms8mxn0"; - stripLen = 2; - extraPrefix = ""; - includes = ["reflex-dom.cabal" ]; - }); - # add unreleased commit fixing version constraint as a patch # Can be removed if https://github.com/lpeterse/haskell-utc/issues/8 is resolved utc = appendPatch super.utc (pkgs.fetchpatch { From ec6d5ef4f087369326cbbf34df8e24e170cc55c6 Mon Sep 17 00:00:00 2001 From: Jonas Heinrich Date: Sat, 17 Apr 2021 12:12:09 +0200 Subject: [PATCH 225/230] libtransmission: init at 3.00 (#118998) --- pkgs/applications/networking/p2p/transmission/default.nix | 2 ++ pkgs/top-level/all-packages.nix | 5 +++++ 2 files changed, 7 insertions(+) diff --git a/pkgs/applications/networking/p2p/transmission/default.nix b/pkgs/applications/networking/p2p/transmission/default.nix index 7e8b6b671cd..363e5f7cfbe 100644 --- a/pkgs/applications/networking/p2p/transmission/default.nix +++ b/pkgs/applications/networking/p2p/transmission/default.nix @@ -20,6 +20,7 @@ , enableSystemd ? stdenv.isLinux , enableDaemon ? true , enableCli ? true +, installLib ? false }: let @@ -47,6 +48,7 @@ in stdenv.mkDerivation { "-DENABLE_QT=${mkFlag enableQt}" "-DENABLE_DAEMON=${mkFlag enableDaemon}" "-DENABLE_CLI=${mkFlag enableCli}" + "-DINSTALL_LIB=${mkFlag installLib}" ]; nativeBuildInputs = [ diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 039a95b6c0d..b786733b8eb 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -26209,6 +26209,11 @@ in transcode = callPackage ../applications/audio/transcode { }; transmission = callPackage ../applications/networking/p2p/transmission { }; + libtransmission = transmission.override { + installLib = true; + enableDaemon = false; + enableCli = false; + }; transmission-gtk = transmission.override { enableGTK3 = true; }; transmission-qt = transmission.override { enableQt = true; }; From 6c961dddd13b195c7425d33637551f21576f310d Mon Sep 17 00:00:00 2001 From: Florian Klink Date: Sat, 17 Apr 2021 12:28:05 +0200 Subject: [PATCH 226/230] nixos/nullmailer: set isSystemUser setting users.users.name.{isSystemUser,isNormalUser} is required since #115332 --- nixos/modules/services/mail/nullmailer.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/nixos/modules/services/mail/nullmailer.nix b/nixos/modules/services/mail/nullmailer.nix index fe3f8ef9b39..09874ca0ed7 100644 --- a/nixos/modules/services/mail/nullmailer.nix +++ b/nixos/modules/services/mail/nullmailer.nix @@ -204,6 +204,7 @@ with lib; users.${cfg.user} = { description = "Nullmailer relay-only mta user"; group = cfg.group; + isSystemUser = true; }; groups.${cfg.group} = { }; From 8db8975228581cb80f2b7581fd445afa4aab43f9 Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Sat, 10 Apr 2021 08:01:26 +0200 Subject: [PATCH 227/230] =?UTF-8?q?ocamlPackages.ezxmlm:=201.0.2=20?= =?UTF-8?q?=E2=86=92=201.1.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../development/ocaml-modules/ezxmlm/default.nix | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/pkgs/development/ocaml-modules/ezxmlm/default.nix b/pkgs/development/ocaml-modules/ezxmlm/default.nix index 6d5fe28a8c0..b146b2349cd 100644 --- a/pkgs/development/ocaml-modules/ezxmlm/default.nix +++ b/pkgs/development/ocaml-modules/ezxmlm/default.nix @@ -1,14 +1,14 @@ -{ lib, fetchFromGitHub, buildDunePackage, xmlm }: +{ lib, fetchurl, buildDunePackage, xmlm }: buildDunePackage rec { pname = "ezxmlm"; - version = "1.0.2"; + version = "1.1.0"; - src = fetchFromGitHub { - owner = "avsm"; - repo = pname; - rev = "v${version}"; - sha256 = "1dgr61f0hymywikn67inq908x5adrzl3fjx3v14l9k46x7kkacl9"; + useDune2 = true; + + src = fetchurl { + url = "https://github.com/mirage/ezxmlm/releases/download/v${version}/ezxmlm-v${version}.tbz"; + sha256 = "123dn4h993mlng9gzf4nc6mw75ja7ndcxkbkwfs48j5jk1z05j6d"; }; propagatedBuildInputs = [ xmlm ]; @@ -27,7 +27,7 @@ buildDunePackage rec { just fine with it if you decide to switch over. ''; maintainers = [ maintainers.carlosdagos ]; - inherit (src.meta) homepage; + homepage = "https://github.com/mirage/ezxmlm/"; license = licenses.isc; }; } From 4cd296cf91c8fb05da111aef3cd3fbcead967a36 Mon Sep 17 00:00:00 2001 From: Hernawan Fa'iz Abdillah Date: Sat, 17 Apr 2021 13:57:03 +0700 Subject: [PATCH 228/230] gnome3.metacity: Fix missing xdamage --- pkgs/desktops/gnome-3/misc/metacity/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/desktops/gnome-3/misc/metacity/default.nix b/pkgs/desktops/gnome-3/misc/metacity/default.nix index d1b1aeec4c4..c74d57d9f4d 100644 --- a/pkgs/desktops/gnome-3/misc/metacity/default.nix +++ b/pkgs/desktops/gnome-3/misc/metacity/default.nix @@ -42,6 +42,7 @@ stdenv.mkDerivation rec { buildInputs = [ xorg.libXres xorg.libXpresent + xorg.libXdamage glib gsettings-desktop-schemas gtk3 From 8b4e8f0f95646e127a0dc962913cf9ad58fa5d13 Mon Sep 17 00:00:00 2001 From: Hernawan Fa'iz Abdillah Date: Sat, 17 Apr 2021 13:57:24 +0700 Subject: [PATCH 229/230] gnome3.gnome-shell: Fix missing mesa --- pkgs/desktops/gnome-3/core/gnome-shell/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/desktops/gnome-3/core/gnome-shell/default.nix b/pkgs/desktops/gnome-3/core/gnome-shell/default.nix index 2cd22e3ceaa..97a72e379a5 100644 --- a/pkgs/desktops/gnome-3/core/gnome-shell/default.nix +++ b/pkgs/desktops/gnome-3/core/gnome-shell/default.nix @@ -57,6 +57,7 @@ , gnome-autoar , asciidoc-full , bash-completion +, mesa }: # http://sources.gentoo.org/cgi-bin/viewvc.cgi/gentoo-x86/gnome-base/gnome-shell/gnome-shell-3.10.2.1.ebuild?revision=1.3&view=markup @@ -147,6 +148,7 @@ stdenv.mkDerivation rec { gnome-desktop gnome-settings-daemon gobject-introspection + mesa # recording pipewire From 85d9aa3a8b1fef006d0c30f7619a6c0701471604 Mon Sep 17 00:00:00 2001 From: Hernawan Fa'iz Abdillah Date: Sat, 17 Apr 2021 13:58:29 +0700 Subject: [PATCH 230/230] gnome3.gnome-flashback: Fix missing xxf86vm --- pkgs/desktops/gnome-3/misc/gnome-flashback/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/desktops/gnome-3/misc/gnome-flashback/default.nix b/pkgs/desktops/gnome-3/misc/gnome-flashback/default.nix index b65d27bb757..935778aa649 100644 --- a/pkgs/desktops/gnome-3/misc/gnome-flashback/default.nix +++ b/pkgs/desktops/gnome-3/misc/gnome-flashback/default.nix @@ -25,6 +25,7 @@ , writeTextFile , writeShellScriptBin , xkeyboard_config +, xorg , runCommand }: let @@ -101,6 +102,7 @@ let libcanberra-gtk3 libpulseaudio libxkbfile + xorg.libXxf86vm polkit gdm gnome-panel