diff options
| author | Alyssa Ross <hi@alyssa.is> | 2021-07-09 12:30:28 +0000 |
|---|---|---|
| committer | Alyssa Ross <hi@alyssa.is> | 2021-07-23 09:11:31 +0000 |
| commit | 55cc63c079f49e81d695a25bc2f5b3902f2bd290 (patch) | |
| tree | e705335d97f50b927c76ccb4a3fbde9fab8372b9 /nixpkgs/pkgs/development | |
| parent | c26eb6f74d9393127a21eee7a9620a920769f613 (diff) | |
| parent | 87807e64a5ef5206b745a40af118c7be8db73681 (diff) | |
| download | nixlib-55cc63c079f49e81d695a25bc2f5b3902f2bd290.tar nixlib-55cc63c079f49e81d695a25bc2f5b3902f2bd290.tar.gz nixlib-55cc63c079f49e81d695a25bc2f5b3902f2bd290.tar.bz2 nixlib-55cc63c079f49e81d695a25bc2f5b3902f2bd290.tar.lz nixlib-55cc63c079f49e81d695a25bc2f5b3902f2bd290.tar.xz nixlib-55cc63c079f49e81d695a25bc2f5b3902f2bd290.tar.zst nixlib-55cc63c079f49e81d695a25bc2f5b3902f2bd290.zip | |
Merge commit '87807e64a5ef5206b745a40af118c7be8db73681'
Diffstat (limited to 'nixpkgs/pkgs/development')
491 files changed, 7255 insertions, 4973 deletions
diff --git a/nixpkgs/pkgs/development/arduino/arduino-cli/default.nix b/nixpkgs/pkgs/development/arduino/arduino-cli/default.nix index 9629d90a3453..84c39dba9000 100644 --- a/nixpkgs/pkgs/development/arduino/arduino-cli/default.nix +++ b/nixpkgs/pkgs/development/arduino/arduino-cli/default.nix @@ -46,6 +46,10 @@ if stdenv.isLinux then extraInstallCommands = '' mv $out/bin/$name $out/bin/arduino-cli ''; + + targetPkgs = pkgs: with pkgs; [ + zlib + ]; } else pkg diff --git a/nixpkgs/pkgs/development/beam-modules/default.nix b/nixpkgs/pkgs/development/beam-modules/default.nix index 6c33298ff926..6cfa2721bfcd 100644 --- a/nixpkgs/pkgs/development/beam-modules/default.nix +++ b/nixpkgs/pkgs/development/beam-modules/default.nix @@ -38,6 +38,7 @@ let mixRelease = callPackage ./mix-release.nix { }; erlang-ls = callPackage ./erlang-ls { }; + erlfmt = callPackage ./erlfmt { }; # BEAM-based languages. elixir = elixir_1_12; diff --git a/nixpkgs/pkgs/development/beam-modules/erlfmt/default.nix b/nixpkgs/pkgs/development/beam-modules/erlfmt/default.nix new file mode 100644 index 000000000000..c903906802e3 --- /dev/null +++ b/nixpkgs/pkgs/development/beam-modules/erlfmt/default.nix @@ -0,0 +1,20 @@ +{ fetchFromGitHub, rebar3Relx, lib }: + +rebar3Relx rec { + name = "erlfmt"; + version = "1.0.0"; + releaseType = "escript"; + src = fetchFromGitHub { + owner = "WhatsApp"; + repo = "erlfmt"; + sha256 = "19apbs9xr4j8qjb3sv9ilknqjw4a7bvp8jvwrjiwvwnxzzm2kjm6"; + rev = "v${version}"; + }; + meta = with lib; { + homepage = "https://github.com/WhatsApp/erlfmt"; + description = "An automated code formatter for Erlang"; + platforms = platforms.unix; + license = licenses.asl20; + maintainers = with lib.maintainers; [ dlesl ]; + }; +} diff --git a/nixpkgs/pkgs/development/beam-modules/rebar3-nix/default.nix b/nixpkgs/pkgs/development/beam-modules/rebar3-nix/default.nix index ff248700d783..50bd29658354 100644 --- a/nixpkgs/pkgs/development/beam-modules/rebar3-nix/default.nix +++ b/nixpkgs/pkgs/development/beam-modules/rebar3-nix/default.nix @@ -1,12 +1,12 @@ { lib, buildRebar3, fetchFromGitHub }: buildRebar3 rec { name = "rebar3_nix"; - version = "0.1.0"; + version = "0.1.1"; src = fetchFromGitHub { owner = "erlang-nix"; repo = name; rev = "v${version}"; - sha256 = "17w8m4aqqgvhpx3xyc7x2qzsrd3ybzc83ay50zs1gyd1b8csh2wf"; + sha256 = "10ijc06qvv5hqv0qy3w7mbv9pshdb8bvy0f3phr1vd5hksbk731y"; }; meta = { diff --git a/nixpkgs/pkgs/development/beam-modules/rebar3-release.nix b/nixpkgs/pkgs/development/beam-modules/rebar3-release.nix index 98d10cb87c4f..16344f2f194c 100644 --- a/nixpkgs/pkgs/development/beam-modules/rebar3-release.nix +++ b/nixpkgs/pkgs/development/beam-modules/rebar3-release.nix @@ -93,10 +93,10 @@ let inherit (erlang.meta) platforms; } // meta; - passthru = { + passthru = ({ packageName = name; env = shell self; - }; + } // (if attrs ? passthru then attrs.passthru else {})); } // customPhases); in fix pkg diff --git a/nixpkgs/pkgs/development/compilers/adoptopenjdk-bin/sources.json b/nixpkgs/pkgs/development/compilers/adoptopenjdk-bin/sources.json index 22a893c72427..b4a8ff4892e2 100644 --- a/nixpkgs/pkgs/development/compilers/adoptopenjdk-bin/sources.json +++ b/nixpkgs/pkgs/development/compilers/adoptopenjdk-bin/sources.json @@ -5,45 +5,45 @@ "hotspot": { "aarch64": { "build": "9", - "sha256": "420c5d1e5dc66b2ed7dedd30a7bdf94bfaed10d5e1b07dc579722bf60a8114a9", - "url": "https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.10%2B9/OpenJDK11U-jdk_aarch64_linux_hotspot_11.0.10_9.tar.gz", - "version": "11.0.10" + "sha256": "4966b0df9406b7041e14316e04c9579806832fafa02c5d3bd1842163b7f2353a", + "url": "https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.11%2B9/OpenJDK11U-jdk_aarch64_linux_hotspot_11.0.11_9.tar.gz", + "version": "11.0.11" }, "armv6l": { "build": "9", - "sha256": "34908da9c200f5ef71b8766398b79fd166f8be44d87f97510667698b456c8d44", - "url": "https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.10%2B9/OpenJDK11U-jdk_arm_linux_hotspot_11.0.10_9.tar.gz", - "version": "11.0.10" + "sha256": "2d7aba0b9ea287145ad437d4b3035fc84f7508e78c6fec99be4ff59fe1b6fc0d", + "url": "https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.11%2B9/OpenJDK11U-jdk_arm_linux_hotspot_11.0.11_9.tar.gz", + "version": "11.0.11" }, "armv7l": { "build": "9", - "sha256": "34908da9c200f5ef71b8766398b79fd166f8be44d87f97510667698b456c8d44", - "url": "https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.10%2B9/OpenJDK11U-jdk_arm_linux_hotspot_11.0.10_9.tar.gz", - "version": "11.0.10" + "sha256": "2d7aba0b9ea287145ad437d4b3035fc84f7508e78c6fec99be4ff59fe1b6fc0d", + "url": "https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.11%2B9/OpenJDK11U-jdk_arm_linux_hotspot_11.0.11_9.tar.gz", + "version": "11.0.11" }, "packageType": "jdk", "vmType": "hotspot", "x86_64": { "build": "9", - "sha256": "ae78aa45f84642545c01e8ef786dfd700d2226f8b12881c844d6a1f71789cb99", - "url": "https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.10%2B9/OpenJDK11U-jdk_x64_linux_hotspot_11.0.10_9.tar.gz", - "version": "11.0.10" + "sha256": "e99b98f851541202ab64401594901e583b764e368814320eba442095251e78cb", + "url": "https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.11%2B9/OpenJDK11U-jdk_x64_linux_hotspot_11.0.11_9.tar.gz", + "version": "11.0.11" } }, "openj9": { "aarch64": { "build": "9", - "sha256": "0ce9a8c38d154540610dfe03e59389734deb91c5cb9258408404c5026d4afa41", - "url": "https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.10%2B9_openj9-0.24.0/OpenJDK11U-jdk_aarch64_linux_openj9_11.0.10_9_openj9-0.24.0.tar.gz", - "version": "11.0.10-ea" + "sha256": "31242e10bb826679aae3ed303be17ad3ef3c2551afbbd19f031ada87dd73258f", + "url": "https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.11%2B9_openj9-0.26.0/OpenJDK11U-jdk_aarch64_linux_openj9_11.0.11_9_openj9-0.26.0.tar.gz", + "version": "11.0.11-ea" }, "packageType": "jdk", "vmType": "openj9", "x86_64": { "build": "9", - "sha256": "941d5df125d2ad426391340f539408b13d61d00ed31dd79142ff1ac84864a79f", - "url": "https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.10%2B9_openj9-0.24.0/OpenJDK11U-jdk_x64_linux_openj9_11.0.10_9_openj9-0.24.0.tar.gz", - "version": "11.0.10" + "sha256": "a605ab06f76533d44ce0828bd96836cc9c0e71ec3df3f8672052ea98dcbcca22", + "url": "https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.11%2B9_openj9-0.26.0/OpenJDK11U-jdk_x64_linux_openj9_11.0.11_9_openj9-0.26.0.tar.gz", + "version": "11.0.11" } } }, @@ -51,45 +51,45 @@ "hotspot": { "aarch64": { "build": "9", - "sha256": "5f9a894bd694f598f2befa4a605169685ac8bcb8ec68d25e587e8db4d2307b74", - "url": "https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.10%2B9/OpenJDK11U-jre_aarch64_linux_hotspot_11.0.10_9.tar.gz", - "version": "11.0.10" + "sha256": "fde6b29df23b6e7ed6e16a237a0f44273fb9e267fdfbd0b3de5add98e55649f6", + "url": "https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.11%2B9/OpenJDK11U-jre_aarch64_linux_hotspot_11.0.11_9.tar.gz", + "version": "11.0.11" }, "armv6l": { "build": "9", - "sha256": "2f2da2149c089c84f00b0eda63c31b77c8b51a1c080e18a70ecb5a78ba40d8c6", - "url": "https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.10%2B9/OpenJDK11U-jre_arm_linux_hotspot_11.0.10_9.tar.gz", - "version": "11.0.10" + "sha256": "ad02656f800fd64c2b090b23ad24a099d9cd1054948ecb0e9851bc39c51c8be8", + "url": "https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.11%2B9/OpenJDK11U-jre_arm_linux_hotspot_11.0.11_9.tar.gz", + "version": "11.0.11" }, "armv7l": { "build": "9", - "sha256": "2f2da2149c089c84f00b0eda63c31b77c8b51a1c080e18a70ecb5a78ba40d8c6", - "url": "https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.10%2B9/OpenJDK11U-jre_arm_linux_hotspot_11.0.10_9.tar.gz", - "version": "11.0.10" + "sha256": "ad02656f800fd64c2b090b23ad24a099d9cd1054948ecb0e9851bc39c51c8be8", + "url": "https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.11%2B9/OpenJDK11U-jre_arm_linux_hotspot_11.0.11_9.tar.gz", + "version": "11.0.11" }, "packageType": "jre", "vmType": "hotspot", "x86_64": { "build": "9", - "sha256": "25fdcf9427095ac27c8bdfc82096ad2e615693a3f6ea06c700fca7ffb271131a", - "url": "https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.10%2B9/OpenJDK11U-jre_x64_linux_hotspot_11.0.10_9.tar.gz", - "version": "11.0.10" + "sha256": "144f2c6bcf64faa32016f2474b6c01031be75d25325e9c3097aed6589bc5d548", + "url": "https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.11%2B9/OpenJDK11U-jre_x64_linux_hotspot_11.0.11_9.tar.gz", + "version": "11.0.11" } }, "openj9": { "aarch64": { "build": "9", - "sha256": "c48d2b19bf7040c74dfdcac9e395ba7b8f937522ee756c820465f2e8e3dffec2", - "url": "https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.10%2B9_openj9-0.24.0/OpenJDK11U-jre_aarch64_linux_openj9_11.0.10_9_openj9-0.24.0.tar.gz", - "version": "11.0.10-ea" + "sha256": "434219d233bdb8f1bee024b1ca5accfc3f1f832320b5221ded715eed101e705f", + "url": "https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.11%2B9_openj9-0.26.0/OpenJDK11U-jre_aarch64_linux_openj9_11.0.11_9_openj9-0.26.0.tar.gz", + "version": "11.0.11-ea" }, "packageType": "jre", "vmType": "openj9", "x86_64": { "build": "9", - "sha256": "7e5f97071f8b86c22c36ddfd7f821c3e8ec531c1128e2e6c931b2e64118a517a", - "url": "https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.10%2B9_openj9-0.24.0/OpenJDK11U-jre_x64_linux_openj9_11.0.10_9_openj9-0.24.0.tar.gz", - "version": "11.0.10" + "sha256": "152bf992d965ed018e9e1c3c2eb2c1771f92e0b6485b9a1f2c6d84d282117715", + "url": "https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.11%2B9_openj9-0.26.0/OpenJDK11U-jre_x64_linux_openj9_11.0.11_9_openj9-0.26.0.tar.gz", + "version": "11.0.11" } } } @@ -101,9 +101,9 @@ "vmType": "hotspot", "x86_64": { "build": "9", - "sha256": "ee7c98c9d79689aca6e717965747b8bf4eec5413e89d5444cc2bd6dbd59e3811", - "url": "https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.10%2B9/OpenJDK11U-jdk_x64_mac_hotspot_11.0.10_9.tar.gz", - "version": "11.0.10" + "sha256": "d851a220e77473a4b483d8bd6b6570e04fd83fdd48d6584b58b041f5997186c2", + "url": "https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.11%2B9/OpenJDK11U-jdk_x64_mac_hotspot_11.0.11_9.tar.gz", + "version": "11.0.11" } }, "openj9": { @@ -111,9 +111,9 @@ "vmType": "openj9", "x86_64": { "build": "9", - "sha256": "58f931dc30160b04da2d94af32e0dfa384f4b2cf92b7217c0937fd057e668d54", - "url": "https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.10%2B9_openj9-0.24.0/OpenJDK11U-jdk_x64_mac_openj9_11.0.10_9_openj9-0.24.0.tar.gz", - "version": "11.0.10" + "sha256": "797cee6b9f6e18bcc026ee9dcebbce81d62ca897038402d247630b25d41efe15", + "url": "https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.11%2B9_openj9-0.26.0/OpenJDK11U-jdk_x64_mac_openj9_11.0.11_9_openj9-0.26.0.tar.gz", + "version": "11.0.11" } } }, @@ -123,9 +123,9 @@ "vmType": "hotspot", "x86_64": { "build": "9", - "sha256": "215e94323d7c74fe31e5383261e3bfc8e9ca3dc03212738c48d29868b02fe875", - "url": "https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.10%2B9/OpenJDK11U-jre_x64_mac_hotspot_11.0.10_9.tar.gz", - "version": "11.0.10" + "sha256": "ccb38c0b73bd0ba7006d00234a51eee9504ec8108c835e1f1763191806374707", + "url": "https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.11%2B9/OpenJDK11U-jre_x64_mac_hotspot_11.0.11_9.tar.gz", + "version": "11.0.11" } }, "openj9": { @@ -133,9 +133,9 @@ "vmType": "openj9", "x86_64": { "build": "9", - "sha256": "6e353f0b38a7192ad3e0522009065c7c24356e0d9329899477b21e39d2a7a8da", - "url": "https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.10%2B9_openj9-0.24.0/OpenJDK11U-jre_x64_mac_openj9_11.0.10_9_openj9-0.24.0.tar.gz", - "version": "11.0.10" + "sha256": "80a0c03f0b603d6008e29c651f884878743fcaa90fc05aef15f3411749da94e7", + "url": "https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.11%2B9_openj9-0.26.0/OpenJDK11U-jre_x64_mac_openj9_11.0.11_9_openj9-0.26.0.tar.gz", + "version": "11.0.11" } } } @@ -536,92 +536,92 @@ "jdk": { "hotspot": { "aarch64": { - "build": "36", - "sha256": "7217a9f9be3b0c8dfc78538f95fd2deb493eb651152d975062920566492b2574", - "url": "https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk-16%2B36/OpenJDK16-jdk_aarch64_linux_hotspot_16_36.tar.gz", - "version": "16.0.0" + "build": "9", + "sha256": "3447ec27a6dbd4f3a6180a0d4371bb09aa428c16eea9983e515a7400cc9f5c85", + "url": "https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk-16.0.1%2B9/OpenJDK16U-jdk_aarch64_linux_hotspot_16.0.1_9.tar.gz", + "version": "16.0.1" }, "armv6l": { - "build": "36", - "sha256": "f1d32ba01a40c98889f31368c0e987d6bbda65a7c50b8c088623b48e3a90104a", - "url": "https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk-16%2B36/OpenJDK16-jdk_arm_linux_hotspot_16_36.tar.gz", - "version": "16.0.0" + "build": "9", + "sha256": "20fc395d8ea2659e6407cd4ec233dc4399f61b7610f3a16495deb23c1e3b81df", + "url": "https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk-16.0.1%2B9/OpenJDK16U-jdk_arm_linux_hotspot_16.0.1_9.tar.gz", + "version": "16.0.1" }, "armv7l": { - "build": "36", - "sha256": "f1d32ba01a40c98889f31368c0e987d6bbda65a7c50b8c088623b48e3a90104a", - "url": "https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk-16%2B36/OpenJDK16-jdk_arm_linux_hotspot_16_36.tar.gz", - "version": "16.0.0" + "build": "9", + "sha256": "20fc395d8ea2659e6407cd4ec233dc4399f61b7610f3a16495deb23c1e3b81df", + "url": "https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk-16.0.1%2B9/OpenJDK16U-jdk_arm_linux_hotspot_16.0.1_9.tar.gz", + "version": "16.0.1" }, "packageType": "jdk", "vmType": "hotspot", "x86_64": { - "build": "36", - "sha256": "2e031cf37018161c9e59b45fa4b98ff2ce4ce9297b824c512989d579a70f8422", - "url": "https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk-16%2B36/OpenJDK16-jdk_x64_linux_hotspot_16_36.tar.gz", - "version": "16.0.0" + "build": "9", + "sha256": "7fdda042207efcedd30cd76d6295ed56b9c2e248cb3682c50898a560d4aa1c6f", + "url": "https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk-16.0.1%2B9/OpenJDK16U-jdk_x64_linux_hotspot_16.0.1_9.tar.gz", + "version": "16.0.1" } }, "openj9": { "aarch64": { - "build": "36", - "sha256": "f4d4e0c0e9e0a4d0f14172878cee5e1a0ae73170058e1c183a452f8d97331ac0", - "url": "https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk-16%2B36_openj9-0.25.0/OpenJDK16-jdk_aarch64_linux_openj9_16_36_openj9-0.25.0.tar.gz", - "version": "16.0.0-ea" + "build": "9", + "sha256": "abc56cd266b4acc96cc700b166ad016907dac97d7a593bd5c369d54efc4b4acd", + "url": "https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk-16.0.1%2B9_openj9-0.26.0/OpenJDK16U-jdk_aarch64_linux_openj9_16.0.1_9_openj9-0.26.0.tar.gz", + "version": "16.0.1-ea" }, "packageType": "jdk", "vmType": "openj9", "x86_64": { - "build": "36", - "sha256": "9f9b327d08cbc71b32f28004ae9d9c2c84ff9bc335cac3068c5a5737bfa4606f", - "url": "https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk-16%2B36_openj9-0.25.0/OpenJDK16-jdk_x64_linux_openj9_16_36_openj9-0.25.0.tar.gz", - "version": "16.0.0" + "build": "9", + "sha256": "7395aaa479a7410bbe5bd5efc43d2669718c61ba146b06657315dbd467b98bf1", + "url": "https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk-16.0.1%2B9_openj9-0.26.0/OpenJDK16U-jdk_x64_linux_openj9_16.0.1_9_openj9-0.26.0.tar.gz", + "version": "16.0.1" } } }, "jre": { "hotspot": { "aarch64": { - "build": "36", - "sha256": "947b02342513b085946b2e7c376cc1f1cfe89600bc3d30455160f88d41da3509", - "url": "https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk-16%2B36/OpenJDK16-jre_aarch64_linux_hotspot_16_36.tar.gz", - "version": "16.0.0" + "build": "9", + "sha256": "4e47f1cbf46190727be74cd73445ec2b693f5ba4a74542c554d6b3285811cab5", + "url": "https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk-16.0.1%2B9/OpenJDK16U-jre_aarch64_linux_hotspot_16.0.1_9.tar.gz", + "version": "16.0.1" }, "armv6l": { - "build": "36", - "sha256": "4d3f351a161792779417ee2730413a976258c4cc5f323526f1fbc0cca82aca6e", - "url": "https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk-16%2B36/OpenJDK16-jre_arm_linux_hotspot_16_36.tar.gz", - "version": "16.0.0" + "build": "9", + "sha256": "c1f88f3ce955cb2e9a4236a916cc6660ef55231d29c4390b1a4398ebbca358b7", + "url": "https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk-16.0.1%2B9/OpenJDK16U-jre_arm_linux_hotspot_16.0.1_9.tar.gz", + "version": "16.0.1" }, "armv7l": { - "build": "36", - "sha256": "4d3f351a161792779417ee2730413a976258c4cc5f323526f1fbc0cca82aca6e", - "url": "https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk-16%2B36/OpenJDK16-jre_arm_linux_hotspot_16_36.tar.gz", - "version": "16.0.0" + "build": "9", + "sha256": "c1f88f3ce955cb2e9a4236a916cc6660ef55231d29c4390b1a4398ebbca358b7", + "url": "https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk-16.0.1%2B9/OpenJDK16U-jre_arm_linux_hotspot_16.0.1_9.tar.gz", + "version": "16.0.1" }, "packageType": "jre", "vmType": "hotspot", "x86_64": { - "build": "36", - "sha256": "4aa99cbe5a6838c3ed29fa7aa7bee95c39ddd41e3f7544178dcd257b15a9359e", - "url": "https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk-16%2B36/OpenJDK16-jre_x64_linux_hotspot_16_36.tar.gz", - "version": "16.0.0" + "build": "9", + "sha256": "5eca19d406c6d130e9c3a4b932b9cb0a6e9cd45932450668c3e911bded4bcf40", + "url": "https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk-16.0.1%2B9/OpenJDK16U-jre_x64_linux_hotspot_16.0.1_9.tar.gz", + "version": "16.0.1" } }, "openj9": { "aarch64": { - "build": "36", - "sha256": "13ae42f5040d4e5d97b8809e27ebfdf8f7326604771963d85b2c1385abe13742", - "url": "https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk-16%2B36_openj9-0.25.0/OpenJDK16-jre_aarch64_linux_openj9_16_36_openj9-0.25.0.tar.gz", - "version": "16.0.0-ea" + "build": "9", + "sha256": "01d8337d1069b8bfdcdf096b30cc24d1df42ffeede676da99fed77bef2670454", + "url": "https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk-16.0.1%2B9_openj9-0.26.0/OpenJDK16U-jre_aarch64_linux_openj9_16.0.1_9_openj9-0.26.0.tar.gz", + "version": "16.0.1-ea" }, "packageType": "jre", "vmType": "openj9", "x86_64": { - "build": "36", - "sha256": "302b8b9bba4f51d0a9ac087ed91929dbd3ae52cf5a5b6c150373563012db60d9", - "url": "https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk-16%2B36_openj9-0.25.0/OpenJDK16-jre_x64_linux_openj9_16_36_openj9-0.25.0.tar.gz", - "version": "16.0.0" + "build": "9", + "sha256": "fab572dd1a2ef00fd18ad4f5a4c373d0cf140045e61f9104cd5b8dbf6b3a517d", + "url": "https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk-16.0.1%2B9_openj9-0.26.0/OpenJDK16U-jre_x64_linux_openj9_16.0.1_9_openj9-0.26.0.tar.gz", + "version": "16.0.1" } } } @@ -632,20 +632,20 @@ "packageType": "jdk", "vmType": "hotspot", "x86_64": { - "build": "36", - "sha256": "b66761b55fd493ed2a5f4df35a32b338ec34a9e0a1244439e3156561ab27c511", - "url": "https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk-16%2B36/OpenJDK16-jdk_x64_mac_hotspot_16_36.tar.gz", - "version": "16.0.0" + "build": "9", + "sha256": "3be78eb2b0bf0a6edef2a8f543958d6e249a70c71e4d7347f9edb831135a16b8", + "url": "https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk-16.0.1%2B9/OpenJDK16U-jdk_x64_mac_hotspot_16.0.1_9.tar.gz", + "version": "16.0.1" } }, "openj9": { "packageType": "jdk", "vmType": "openj9", "x86_64": { - "build": "36", - "sha256": "e6075cbe939b4de165cc8b4b91352f8885d549873f5cd419e75eba737502542e", - "url": "https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk-16%2B36_openj9-0.25.0/OpenJDK16-jdk_x64_mac_openj9_16_36_openj9-0.25.0.tar.gz", - "version": "16.0.0" + "build": "9", + "sha256": "6d4241c6ede2167fb71bd57f7a770a74564ee007c06bcae98e1abc3c1de4756f", + "url": "https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk-16.0.1%2B9_openj9-0.26.0/OpenJDK16U-jdk_x64_mac_openj9_16.0.1_9_openj9-0.26.0.tar.gz", + "version": "16.0.1" } } }, @@ -654,20 +654,20 @@ "packageType": "jre", "vmType": "hotspot", "x86_64": { - "build": "36", - "sha256": "92cb07e9e9d075996d1a9e0ccfc1d35e6f97f7e188e9bb78088ee1066062a428", - "url": "https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk-16%2B36/OpenJDK16-jre_x64_mac_hotspot_16_36.tar.gz", - "version": "16.0.0" + "build": "9", + "sha256": "33eeccbeea75e70b09610ba12e9591386a0e42248525b8358c9ae683bce82779", + "url": "https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk-16.0.1%2B9/OpenJDK16U-jre_x64_mac_hotspot_16.0.1_9.tar.gz", + "version": "16.0.1" } }, "openj9": { "packageType": "jre", "vmType": "openj9", "x86_64": { - "build": "36", - "sha256": "9e5c31582778ca5c08fc221e185dc0f4dbce2091cbc69966a1e2617344b722f1", - "url": "https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk-16%2B36_openj9-0.25.0/OpenJDK16-jre_x64_mac_openj9_16_36_openj9-0.25.0.tar.gz", - "version": "16.0.0" + "build": "9", + "sha256": "f57a6f04cf21a8470bb6f9488c57031d89db73c8b24997d74812855372f4e6b8", + "url": "https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk-16.0.1%2B9_openj9-0.26.0/OpenJDK16U-jre_x64_mac_openj9_16.0.1_9_openj9-0.26.0.tar.gz", + "version": "16.0.1" } } } @@ -678,92 +678,92 @@ "jdk": { "hotspot": { "aarch64": { - "build": "8", - "sha256": "9c07cf2099bbc6c850c46fd870bd243f5fcb6635181eabb312bdffe43ffc5080", - "url": "https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u282-b08/OpenJDK8U-jdk_aarch64_linux_hotspot_jdk8u282-b08.tar.gz", - "version": "8.0.282" + "build": "10", + "sha256": "a29edaf66221f7a51353d3f28e1ecf4221268848260417bc562d797e514082a8", + "url": "https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u292-b10/OpenJDK8U-jdk_aarch64_linux_hotspot_8u292b10.tar.gz", + "version": "8.0.292" }, "armv6l": { - "build": "1", - "sha256": "e2e41a8705061dfcc766bfb6b7edd4c699e94aac68e4deeb28c8e76734a46fb7", - "url": "https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u275-b01/OpenJDK8U-jdk_arm_linux_hotspot_8u275b01.tar.gz", - "version": "8.0.275" + "build": "10", + "sha256": "0de107b7df38314c1daab78571383b8b39fdc506790aaef5d870b3e70048881b", + "url": "https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u292-b10/OpenJDK8U-jdk_arm_linux_hotspot_8u292b10.tar.gz", + "version": "8.0.292" }, "armv7l": { - "build": "1", - "sha256": "e2e41a8705061dfcc766bfb6b7edd4c699e94aac68e4deeb28c8e76734a46fb7", - "url": "https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u275-b01/OpenJDK8U-jdk_arm_linux_hotspot_8u275b01.tar.gz", - "version": "8.0.275" + "build": "10", + "sha256": "0de107b7df38314c1daab78571383b8b39fdc506790aaef5d870b3e70048881b", + "url": "https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u292-b10/OpenJDK8U-jdk_arm_linux_hotspot_8u292b10.tar.gz", + "version": "8.0.292" }, "packageType": "jdk", "vmType": "hotspot", "x86_64": { - "build": "8", - "sha256": "e6e6e0356649b9696fa5082cfcb0663d4bef159fc22d406e3a012e71fce83a5c", - "url": "https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u282-b08/OpenJDK8U-jdk_x64_linux_hotspot_8u282b08.tar.gz", - "version": "8.0.282" + "build": "10", + "sha256": "0949505fcf42a1765558048451bb2a22e84b3635b1a31dd6191780eeccaa4ada", + "url": "https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u292-b10/OpenJDK8U-jdk_x64_linux_hotspot_8u292b10.tar.gz", + "version": "8.0.292" } }, "openj9": { "aarch64": { - "build": "8", - "sha256": "e107d3b8092f71ee042284b0fc0f0430ef214916812ce02aa6d549aa81b6dc70", - "url": "https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u282-b08_openj9-0.24.0/OpenJDK8U-jdk_aarch64_linux_openj9_8u282b08_openj9-0.24.0.tar.gz", - "version": "8.0.282-ea" + "build": "10", + "sha256": "b168245ddc18b85135c15ed6baea5cbcc06192b49af04dcfa698458373efc061", + "url": "https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u292-b10_openj9-0.26.0/OpenJDK8U-jdk_aarch64_linux_openj9_8u292b10_openj9-0.26.0.tar.gz", + "version": "8.0.292-ea" }, "packageType": "jdk", "vmType": "openj9", "x86_64": { - "build": "8", - "sha256": "ef10c776dccdff02da6222002a3c023c1cc47d50dd1f6f81314da3d1fe28d13e", - "url": "https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u282-b08_openj9-0.24.0/OpenJDK8U-jdk_x64_linux_openj9_8u282b08_openj9-0.24.0.tar.gz", - "version": "8.0.282" + "build": "10", + "sha256": "06d6c9421778575cf59d50f69b7ac6a7bb237485b3a3c2f89cfb61a056c7b2de", + "url": "https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u292-b10_openj9-0.26.0/OpenJDK8U-jdk_x64_linux_openj9_8u292b10_openj9-0.26.0.tar.gz", + "version": "8.0.292" } } }, "jre": { "hotspot": { "aarch64": { - "build": "8", - "sha256": "5ffa116636b90bac486faba2882a2121aca1398a5426ef3e4ad0d913985e680d", - "url": "https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u282-b08/OpenJDK8U-jre_aarch64_linux_hotspot_jdk8u282-b08.tar.gz", - "version": "8.0.282" + "build": "10", + "sha256": "b062ec775e6c2961532d9afeae4027fe3ac2cf4344cbc912a401be5bfb6ca221", + "url": "https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u292-b10/OpenJDK8U-jre_aarch64_linux_hotspot_8u292b10.tar.gz", + "version": "8.0.292" }, "armv6l": { - "build": "1", - "sha256": "2e228d39d00ba8d974fd8ccdaaee0225833e79594251b64c724485c4fc94870f", - "url": "https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u275-b01/OpenJDK8U-jre_arm_linux_hotspot_8u275b01.tar.gz", - "version": "8.0.275" + "build": "10", + "sha256": "7f7707a7a3998737d2221080ea65d50ea96f5dde5226961ebcebd3ec99a82a32", + "url": "https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u292-b10/OpenJDK8U-jre_arm_linux_hotspot_8u292b10.tar.gz", + "version": "8.0.292" }, "armv7l": { - "build": "1", - "sha256": "2e228d39d00ba8d974fd8ccdaaee0225833e79594251b64c724485c4fc94870f", - "url": "https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u275-b01/OpenJDK8U-jre_arm_linux_hotspot_8u275b01.tar.gz", - "version": "8.0.275" + "build": "10", + "sha256": "7f7707a7a3998737d2221080ea65d50ea96f5dde5226961ebcebd3ec99a82a32", + "url": "https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u292-b10/OpenJDK8U-jre_arm_linux_hotspot_8u292b10.tar.gz", + "version": "8.0.292" }, "packageType": "jre", "vmType": "hotspot", "x86_64": { - "build": "8", - "sha256": "3b2e2c6ad3ee04a58ffb8d629e3e242b0ae87b38cfd06425e4446b1f9490f521", - "url": "https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u282-b08/OpenJDK8U-jre_x64_linux_hotspot_8u282b08.tar.gz", - "version": "8.0.282" + "build": "10", + "sha256": "cad66f48f90167ed19030c71f8f0580702c43cce5ce5a0d76833f7a5ae7c402a", + "url": "https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u292-b10/OpenJDK8U-jre_x64_linux_hotspot_8u292b10.tar.gz", + "version": "8.0.292" } }, "openj9": { "aarch64": { - "build": "8", - "sha256": "1ffc7ac14546ee5e16e0efd616073baaf1b80f55abf61257095f132ded9da1e5", - "url": "https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u282-b08_openj9-0.24.0/OpenJDK8U-jre_aarch64_linux_openj9_8u282b08_openj9-0.24.0.tar.gz", - "version": "8.0.282-ea" + "build": "10", + "sha256": "f87f90673e25c3ce9e868e96a6059b22665f12d05e389813f75dfbc95d970393", + "url": "https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u292-b10_openj9-0.26.0/OpenJDK8U-jre_aarch64_linux_openj9_8u292b10_openj9-0.26.0.tar.gz", + "version": "8.0.292-ea" }, "packageType": "jre", "vmType": "openj9", "x86_64": { - "build": "8", - "sha256": "4fad259c32eb23ec98925c8b2cf28aaacbdb55e034db74c31a7636e75b6af08d", - "url": "https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u282-b08_openj9-0.24.0/OpenJDK8U-jre_x64_linux_openj9_8u282b08_openj9-0.24.0.tar.gz", - "version": "8.0.282" + "build": "10", + "sha256": "6d5b67979e0935febe893895b622647bf8a59df6093ae57074db11d2ac9373ea", + "url": "https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u292-b10_openj9-0.26.0/OpenJDK8U-jre_x64_linux_openj9_8u292b10_openj9-0.26.0.tar.gz", + "version": "8.0.292" } } } @@ -774,20 +774,20 @@ "packageType": "jdk", "vmType": "hotspot", "x86_64": { - "build": "8", - "sha256": "1766d756f6e4a5d41b539f2ecf83e5a33e9336bd75f1602e8f4b4afbb8f47aaa", - "url": "https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u282-b08/OpenJDK8U-jdk_x64_mac_hotspot_8u282b08.tar.gz", - "version": "8.0.282" + "build": "10", + "sha256": "5646fbe9e4138c902c910bb7014d41463976598097ad03919e4848634c7e8007", + "url": "https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u292-b10/OpenJDK8U-jdk_x64_mac_hotspot_8u292b10.tar.gz", + "version": "8.0.292" } }, "openj9": { "packageType": "jdk", "vmType": "openj9", "x86_64": { - "build": "8", - "sha256": "265d4fb01b61ed7a3a9fae6a50bcf6322687b5f08de8598d8e42263cbd8b5772", - "url": "https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u282-b08_openj9-0.24.0/OpenJDK8U-jdk_x64_mac_openj9_8u282b08_openj9-0.24.0.tar.gz", - "version": "8.0.282" + "build": "10", + "sha256": "d262bc226895e80b7e80d61905e65fe043ca0a3e3b930f7b88ddfacb8835e939", + "url": "https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u292-b10_openj9-0.26.0/OpenJDK8U-jdk_x64_mac_openj9_8u292b10_openj9-0.26.0.tar.gz", + "version": "8.0.292" } } }, @@ -796,20 +796,20 @@ "packageType": "jre", "vmType": "hotspot", "x86_64": { - "build": "8", - "sha256": "9e7a40d570d5151aae23a2fb017359248f5fb82c547c3ecd860c992770228afb", - "url": "https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u282-b08/OpenJDK8U-jre_x64_mac_hotspot_8u282b08.tar.gz", - "version": "8.0.282" + "build": "10", + "sha256": "bfe1cecf686b4d129594916b0f10d98b71c8d2caec1b96bbbee7f40aa053f1c8", + "url": "https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u292-b10/OpenJDK8U-jre_x64_mac_hotspot_8u292b10.tar.gz", + "version": "8.0.292" } }, "openj9": { "packageType": "jre", "vmType": "openj9", "x86_64": { - "build": "8", - "sha256": "884aa20b3aaed504b18ee21575c8da20838f80fb96036e78e70ff6ef613a5283", - "url": "https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u282-b08_openj9-0.24.0/OpenJDK8U-jre_x64_mac_openj9_8u282b08_openj9-0.24.0.tar.gz", - "version": "8.0.282" + "build": "10", + "sha256": "50cbc5ef48d0167d649d3ba2c2b8d71553541bffb98914418f4a26e0c5f69aca", + "url": "https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u292-b10_openj9-0.26.0/OpenJDK8U-jre_x64_mac_openj9_8u292b10_openj9-0.26.0.tar.gz", + "version": "8.0.292" } } } diff --git a/nixpkgs/pkgs/development/compilers/chicken/5/chicken.nix b/nixpkgs/pkgs/development/compilers/chicken/5/chicken.nix index eb2ec5cbe33b..136140359f0a 100644 --- a/nixpkgs/pkgs/development/compilers/chicken/5/chicken.nix +++ b/nixpkgs/pkgs/development/compilers/chicken/5/chicken.nix @@ -41,7 +41,7 @@ stdenv.mkDerivation rec { for f in $out/bin/* do wrapProgram $f \ - --prefix PATH : ${stdenv.cc}/bin + --prefix PATH : ${lib.makeBinPath [ stdenv.cc ]} done ''; diff --git a/nixpkgs/pkgs/development/compilers/gleam/default.nix b/nixpkgs/pkgs/development/compilers/gleam/default.nix index 5c88be00ba8f..af8758997ea3 100644 --- a/nixpkgs/pkgs/development/compilers/gleam/default.nix +++ b/nixpkgs/pkgs/development/compilers/gleam/default.nix @@ -2,13 +2,13 @@ rustPlatform.buildRustPackage rec { pname = "gleam"; - version = "0.16.0"; + version = "0.16.1"; src = fetchFromGitHub { owner = "gleam-lang"; repo = pname; rev = "v${version}"; - sha256 = "sha256-QcJudP4zhtY1CxV3XLkiC06hrKOqlLdb+X6lHvqc7ZA="; + sha256 = "sha256-JivBYBhXTti285pO4HNhalj0WeR/Hly3IjxpA+qauWY="; }; nativeBuildInputs = [ pkg-config ]; @@ -16,7 +16,7 @@ rustPlatform.buildRustPackage rec { buildInputs = [ openssl ] ++ lib.optionals stdenv.isDarwin [ Security libiconv ]; - cargoSha256 = "sha256-een2aI6gDVx450mQcwF1uRG/tn9FzahTMWpPdvUBumE="; + cargoSha256 = "sha256-SemHpvZ0lMqyMcgHPnmqI4C1krAJMM0hKCNNVMrulfI="; meta = with lib; { description = "A statically typed language for the Erlang VM"; diff --git a/nixpkgs/pkgs/development/compilers/jrsonnet/default.nix b/nixpkgs/pkgs/development/compilers/jrsonnet/default.nix index 82e15db66858..a8b4a76b7dea 100644 --- a/nixpkgs/pkgs/development/compilers/jrsonnet/default.nix +++ b/nixpkgs/pkgs/development/compilers/jrsonnet/default.nix @@ -2,20 +2,20 @@ rustPlatform.buildRustPackage rec { pname = "jrsonnet"; - version = "0.3.8"; + version = "0.4.1"; src = fetchFromGitHub { rev = "v${version}"; owner = "CertainLach"; repo = "jrsonnet"; - sha256 = "sha256-u6P/j7j6S7iPQQh00YFtp2G9Kt4xdWJGsxbuBjvHHZ4="; + sha256 = "sha256-vDZpb5Z8XOVc6EJ1Nul07kC8ppqcGzKPb4DEarqq2yg="; }; postInstall = '' ln -s $out/bin/jrsonnet $out/bin/jsonnet ''; - cargoSha256 = "sha256-KGQ3n3BBgLCT3ITIM8p9AxNa62ek4GHymqoD0eQSVKQ="; + cargoSha256 = "sha256-SR3m2meW8mTaxiYgeY/m7HFPrHGVtium/VRU6vWKxys="; meta = { description = "Purely-functional configuration language that helps you define JSON data"; diff --git a/nixpkgs/pkgs/development/compilers/jsonnet/default.nix b/nixpkgs/pkgs/development/compilers/jsonnet/default.nix index be03f53a76ee..e85404c58b55 100644 --- a/nixpkgs/pkgs/development/compilers/jsonnet/default.nix +++ b/nixpkgs/pkgs/development/compilers/jsonnet/default.nix @@ -1,8 +1,9 @@ -{ stdenv, lib, fetchFromGitHub }: +{ stdenv, lib, jekyll, fetchFromGitHub }: stdenv.mkDerivation rec { pname = "jsonnet"; version = "0.17.0"; + outputs = ["out" "doc"]; src = fetchFromGitHub { rev = "v${version}"; @@ -11,6 +12,8 @@ stdenv.mkDerivation rec { sha256 = "1ddz14699v5lqx3dh0mb7hfffr6fk5zhmzn3z8yxkqqvriqnciim"; }; + nativeBuildInputs = [ jekyll ]; + enableParallelBuilding = true; makeFlags = [ @@ -19,12 +22,19 @@ stdenv.mkDerivation rec { "libjsonnet.so" ]; + # Upstream writes documentation in html, not in markdown/rst, so no + # other output formats, sorry. + preBuild = '' + jekyll build --source ./doc --destination ./html + ''; + installPhase = '' - mkdir -p $out/bin $out/lib $out/include + mkdir -p $out/bin $out/lib $out/include $out/share/doc/jsonnet cp jsonnet $out/bin/ cp jsonnetfmt $out/bin/ cp libjsonnet*.so $out/lib/ cp -a include/*.h $out/include/ + cp -r ./html $out/share/doc/jsonnet ''; meta = { diff --git a/nixpkgs/pkgs/development/compilers/koka/default.nix b/nixpkgs/pkgs/development/compilers/koka/default.nix index 30e273271ae3..0b88bc1ab1c9 100644 --- a/nixpkgs/pkgs/development/compilers/koka/default.nix +++ b/nixpkgs/pkgs/development/compilers/koka/default.nix @@ -4,12 +4,12 @@ , parsec, process, regex-compat, text, time }: let - version = "2.1.4"; + version = "2.1.9"; src = fetchFromGitHub { owner = "koka-lang"; repo = "koka"; rev = "v${version}"; - sha256 = "sha256-MPMA8ZErEKv1SrkliLsy35k88GrdsPqIK6yokQreIjE="; + sha256 = "0xny4x1a2lzwgmng60bni7rxfjx5ns70qbfp703qwms54clvj5wy"; fetchSubmodules = true; }; kklib = stdenv.mkDerivation { diff --git a/nixpkgs/pkgs/development/compilers/llvm/12/clang/default.nix b/nixpkgs/pkgs/development/compilers/llvm/12/clang/default.nix index dbd6ea1e1ac4..87cdca834ea7 100644 --- a/nixpkgs/pkgs/development/compilers/llvm/12/clang/default.nix +++ b/nixpkgs/pkgs/development/compilers/llvm/12/clang/default.nix @@ -17,6 +17,9 @@ let mv clang-* clang sourceRoot=$PWD/clang unpackFile ${clang-tools-extra_src} + mv clang-tools-extra-* $sourceRoot/tools/extra + substituteInPlace $sourceRoot/tools/extra/clangd/quality/CompletionModel.cmake \ + --replace ' ''${CMAKE_SOURCE_DIR}/../clang-tools-extra' ' ''${CMAKE_SOURCE_DIR}/tools/extra' ''; nativeBuildInputs = [ cmake python3 ] diff --git a/nixpkgs/pkgs/development/compilers/llvm/rocm/clang.nix b/nixpkgs/pkgs/development/compilers/llvm/rocm/clang.nix index 6ab0f894ca9c..45c0bfda1922 100644 --- a/nixpkgs/pkgs/development/compilers/llvm/rocm/clang.nix +++ b/nixpkgs/pkgs/development/compilers/llvm/rocm/clang.nix @@ -65,7 +65,7 @@ stdenv.mkDerivation rec { description = "ROCm fork of the clang C/C++/Objective-C/Objective-C++ LLVM compiler frontend"; homepage = "https://llvm.org/"; license = with licenses; [ ncsa ]; - maintainers = with maintainers; [ danieldk ]; + maintainers = with maintainers; [ ]; platforms = platforms.linux; }; } diff --git a/nixpkgs/pkgs/development/compilers/llvm/rocm/lld/default.nix b/nixpkgs/pkgs/development/compilers/llvm/rocm/lld/default.nix index ef60747b0138..c8ca83f76c12 100644 --- a/nixpkgs/pkgs/development/compilers/llvm/rocm/lld/default.nix +++ b/nixpkgs/pkgs/development/compilers/llvm/rocm/lld/default.nix @@ -39,7 +39,7 @@ stdenv.mkDerivation rec { description = "ROCm fork of the LLVM Linker"; homepage = "https://github.com/RadeonOpenCompute/llvm-project"; license = licenses.ncsa; - maintainers = with maintainers; [ danieldk ]; + maintainers = with maintainers; [ ]; platforms = platforms.linux; }; } diff --git a/nixpkgs/pkgs/development/compilers/llvm/rocm/llvm/default.nix b/nixpkgs/pkgs/development/compilers/llvm/rocm/llvm/default.nix index b3e8c06195ff..6d1ff664972d 100644 --- a/nixpkgs/pkgs/development/compilers/llvm/rocm/llvm/default.nix +++ b/nixpkgs/pkgs/development/compilers/llvm/rocm/llvm/default.nix @@ -91,7 +91,7 @@ in stdenv.mkDerivation rec { description = "ROCm fork of the LLVM compiler infrastructure"; homepage = "https://github.com/RadeonOpenCompute/llvm-project"; license = with licenses; [ ncsa ]; - maintainers = with maintainers; [ danieldk ]; + maintainers = with maintainers; [ ]; platforms = platforms.linux; }; } diff --git a/nixpkgs/pkgs/development/compilers/odin/default.nix b/nixpkgs/pkgs/development/compilers/odin/default.nix new file mode 100644 index 000000000000..5845be142b62 --- /dev/null +++ b/nixpkgs/pkgs/development/compilers/odin/default.nix @@ -0,0 +1,57 @@ +{ lib +, fetchFromGitHub +, llvmPackages +, makeWrapper +, libiconv +}: + +let + inherit (llvmPackages) stdenv; +in stdenv.mkDerivation rec { + pname = "odin"; + version = "0.13.0"; + + src = fetchFromGitHub { + owner = "odin-lang"; + repo = "Odin"; + rev = "v${version}"; + sha256 = "ke2HPxVtF/Lh74Tv6XbpM9iLBuXLdH1+IE78MAacfYY="; + }; + + nativeBuildInputs = [ + makeWrapper + ]; + + buildInputs = lib.optional stdenv.isDarwin libiconv; + + postPatch = '' + sed -i 's/^GIT_SHA=.*$/GIT_SHA=/' Makefile + ''; + + dontConfigure = true; + + buildFlags = [ + "release" + ]; + + installPhase = '' + mkdir -p $out/bin + cp odin $out/bin/odin + cp -r core $out/bin/core + + wrapProgram $out/bin/odin --prefix PATH : ${lib.makeBinPath (with llvmPackages; [ + bintools + llvm + clang + lld + ])} + ''; + + meta = with lib; { + description = "A fast, concise, readable, pragmatic and open sourced programming language"; + homepage = "https://odin-lang.org/"; + license = licenses.bsd2; + maintainers = with maintainers; [ luc65r ]; + platforms = platforms.x86_64; + }; +} diff --git a/nixpkgs/pkgs/development/compilers/openjdk/11.nix b/nixpkgs/pkgs/development/compilers/openjdk/11.nix index d7aaf2dcb55e..bf85fd353350 100644 --- a/nixpkgs/pkgs/development/compilers/openjdk/11.nix +++ b/nixpkgs/pkgs/development/compilers/openjdk/11.nix @@ -11,7 +11,7 @@ let major = "11"; minor = "0"; - update = "10"; + update = "11"; build = "9"; openjdk = stdenv.mkDerivation rec { @@ -22,7 +22,7 @@ let owner = "openjdk"; repo = "jdk${major}u"; rev = "jdk-${version}"; - sha256 = "06pm3hpz4ggiqwvkgzxr39y9kga7vk4flakfznz5979bvgb926vw"; + sha256 = "0jncsj424340xjfwv6sx5hy9sas80qa3ymkx0ng3by3z01y5rgfx"; }; nativeBuildInputs = [ pkg-config autoconf unzip ]; diff --git a/nixpkgs/pkgs/development/compilers/rust/1_52.nix b/nixpkgs/pkgs/development/compilers/rust/1_53.nix index 49176ad3fedd..dda6d3931903 100644 --- a/nixpkgs/pkgs/development/compilers/rust/1_52.nix +++ b/nixpkgs/pkgs/development/compilers/rust/1_53.nix @@ -20,8 +20,8 @@ } @ args: import ./default.nix { - rustcVersion = "1.52.1"; - rustcSha256 = "sha256-Om8jom0Oj4erv78yxc19qgwLcdCYar78Vrml+/vQv5g="; + rustcVersion = "1.53.0"; + rustcSha256 = "1f95p259dfp5ca118bg107rj3rqwlswy65dxn3hg8sqgl4wwmxsw"; llvmSharedForBuild = pkgsBuildBuild.llvmPackages_12.libllvm.override { enableSharedLibraries = true; }; llvmSharedForHost = pkgsBuildHost.llvmPackages_12.libllvm.override { enableSharedLibraries = true; }; @@ -34,24 +34,24 @@ import ./default.nix { # Note: the version MUST be one version prior to the version we're # building - bootstrapVersion = "1.51.0"; + bootstrapVersion = "1.52.1"; # fetch hashes by running `print-hashes.sh ${bootstrapVersion}` bootstrapHashes = { - i686-unknown-linux-gnu = "de2e8ef724d89ba6f567f07ebacf5a244c7cdae30ee559f1913310eda38d9cd1"; - x86_64-unknown-linux-gnu = "9e125977aa13f012a68fdc6663629c685745091ae244f0587dd55ea4e3a3e42f"; - x86_64-unknown-linux-musl = "cb65c3a19ba0e09a94ccfd8551e648efaa1db52b0db19ae475d35a46f8750871"; - arm-unknown-linux-gnueabihf = "ab26464947ce80b4c361b08242dc215a5664f9f4ad23f66891ec27d55a0440b7"; - armv7-unknown-linux-gnueabihf = "5d381b7ee16c559efefedfac7ec4d392e838fddaf50049255844dcff2b2614dd"; - aarch64-unknown-linux-gnu = "fd31c78fffad52c03cac5a7c1ee5db3f34b2a77d7bc862707c0f71e209180a84"; - aarch64-unknown-linux-musl = "06cdaa1117dcdd392ede938b655b9bc45cf2a76bd42870ca223189e6eb29d435"; - x86_64-apple-darwin = "765212098a415996b767d1e372ce266caf94027402b269fec33291fffc085ca4"; - aarch64-apple-darwin = "95d0410bbd20b05f8b7d5adf70e8737873995bc86611a90e643d7081ca35147f"; - powerpc64le-unknown-linux-gnu = "7362f561104d7be4836507d3a53cd39444efcdf065813d559beb1f54ce9f7680"; - riscv64gc-unknown-linux-gnu = "9d0c2c4ab2397e78758de8b6b57051482bcf20b6748e0e16d9d5bd23ce73d72a"; + i686-unknown-linux-gnu = "c91f0431c8137a4e98e097ab47b49846820531aafb6e9c249b71b770771832e9"; + x86_64-unknown-linux-gnu = "617ae06e212cb65bc4abbf52b158b0328b9f1a6c2f822c27c95b274d6fbc0627"; + x86_64-unknown-linux-musl = "c3eae6e78ee29e03416897f89b54448b2a03d063f07a78cde41757ad2e02c2f0"; + arm-unknown-linux-gnueabihf = "ef412d923a0c5a9fa54422f40cde62f2e85a62339057cb8b986a545b108d3347"; + armv7-unknown-linux-gnueabihf = "ec47b3f5c801f8a4df7180e088dcc1817ee160df34ef64ddac4fa50f714f119f"; + aarch64-unknown-linux-gnu = "17d9aa7bb73b819ef70d81013498727b7218533ee6cf3bd802c4eac29137fbcb"; + aarch64-unknown-linux-musl = "f2bae2b32f05a90eec041352d9329deb3e907f5560b9fda525788df3b8008b6b"; + x86_64-apple-darwin = "cfa73228ea54e2c94f75d1b142ea41444c463f4ee8562a3eca1b11b2fe8af95a"; + aarch64-apple-darwin = "217e9723f828c5359467d69b363a342d702bdcbbcc4107be907e6bc4531f4912"; + powerpc64le-unknown-linux-gnu = "f258c5d7d6d9022108672b7383412d930a5f59d7644d148e413c3ab0ae45604f"; + riscv64gc-unknown-linux-gnu = "c1c98ccc8bb4147a819411a10162c8f8ce1aaa5c65cf2c74802dce4dacd6e64b"; }; - selectRustPackage = pkgs: pkgs.rust_1_52; + selectRustPackage = pkgs: pkgs.rust_1_53; rustcPatches = [ ]; diff --git a/nixpkgs/pkgs/development/compilers/rust/rustc.nix b/nixpkgs/pkgs/development/compilers/rust/rustc.nix index b8fca884edcf..dae944092409 100644 --- a/nixpkgs/pkgs/development/compilers/rust/rustc.nix +++ b/nixpkgs/pkgs/development/compilers/rust/rustc.nix @@ -159,6 +159,9 @@ in stdenv.mkDerivation rec { # remove references to llvm-config in lib/rustlib/x86_64-unknown-linux-gnu/codegen-backends/librustc_codegen_llvm-llvm.so # and thus a transitive dependency on ncurses find $out/lib -name "*.so" -type f -exec remove-references-to -t ${llvmShared} '{}' '+' + + # remove uninstall script that doesn't really make sense for Nix. + rm $out/lib/rustlib/uninstall.sh ''; configurePlatforms = []; diff --git a/nixpkgs/pkgs/development/compilers/vala/default.nix b/nixpkgs/pkgs/development/compilers/vala/default.nix index 3703225489dd..69d5789bfb0b 100644 --- a/nixpkgs/pkgs/development/compilers/vala/default.nix +++ b/nixpkgs/pkgs/development/compilers/vala/default.nix @@ -116,18 +116,18 @@ in rec { }; vala_0_48 = generic { - version = "0.48.17"; - sha256 = "1wlb4vd7k6hg10s09npglbhfcgjzxkywd4v0l96qhn19m9b8cszj"; + version = "0.48.18"; + sha256 = "1pbz4nyrrf9wp8rp953sczx545s4g0h5mars9ynkn788dzs2h3wy"; }; vala_0_50 = generic { - version = "0.50.4"; - sha256 = "1353j852h04d1x6b4n6lbg3ay40ph0adb9yi25dh74pligx33z2q"; + version = "0.50.9"; + sha256 = "0w5ngs90rq7vy21nqfq8drqyb33kxm17j161qvakwpsbjsidv1mn"; }; vala_0_52 = generic { - version = "0.52.2"; - sha256 = "sha256-OjxGCAO6Zh5RO+PQmEtYPgVHP2AsdfqY6RdVUDcUqXs="; + version = "0.52.4"; + sha256 = "0cfz3xshc9azxx4fn25x9gadnph6jvf1r2wzd7p5krk0a4755ppc"; }; vala = vala_0_52; diff --git a/nixpkgs/pkgs/development/coq-modules/itauto/default.nix b/nixpkgs/pkgs/development/coq-modules/itauto/default.nix new file mode 100644 index 000000000000..66791b130614 --- /dev/null +++ b/nixpkgs/pkgs/development/coq-modules/itauto/default.nix @@ -0,0 +1,24 @@ +{ lib, mkCoqDerivation, coq, version ? null }: +with lib; + +mkCoqDerivation rec { + pname = "itauto"; + owner = "fbesson"; + domain = "gitlab.inria.fr"; + + release."8.13+no".sha256 = "sha256-gXoxtLcHPoyjJkt7WqvzfCMCQlh6kL2KtCGe3N6RC/A="; + inherit version; + defaultVersion = with versions; switch coq.coq-version [ + { case = isGe "8.13"; out = "8.13+no"; } + ] null; + + mlPlugin = true; + extraBuildInputs = (with coq.ocamlPackages; [ ocamlbuild ]); + enableParallelBuilding = false; + + meta = { + description = "A reflexive SAT solver parameterised by a leaf tactic and Nelson-Oppen support"; + maintainers = with maintainers; [ siraben ]; + license = licenses.gpl3Plus; + }; +} diff --git a/nixpkgs/pkgs/development/coq-modules/semantics/default.nix b/nixpkgs/pkgs/development/coq-modules/semantics/default.nix new file mode 100644 index 000000000000..1fb01312e666 --- /dev/null +++ b/nixpkgs/pkgs/development/coq-modules/semantics/default.nix @@ -0,0 +1,46 @@ +{ lib, mkCoqDerivation, coq, version ? null }: +with lib; + +mkCoqDerivation rec { + pname = "semantics"; + owner = "coq-community"; + releaseRev = v: "v${v}"; + + release."8.13.0".sha256 = "sha256-8bDr/Ovl6s8BFaRcHeS5H33/K/pYdeKfSN+krVuKulQ="; + release."8.11.1".sha256 = "sha256-jTPgcXSNn1G2mMDC7ocFcmqs8svB7Yo1emXP15iuxiU="; + release."8.9.0".sha256 = "sha256-UBsvzlDEZsZsVkbUI0GbFEhpxnnLCiaqlqDyWVC5I6s="; + release."8.8.0".sha256 = "sha256-k2nQyNw9KT3wY7bGy8KGILF44sLxkBYqdFpzFE9fgyw="; + release."8.7.0".sha256 = "sha256-k2nQyNw9KT3wY7bGy8KGILF44sLxkBYqdFpzFE9fgyw="; + release."8.6.0".sha256 = "sha256-GltkGQ3tJqUPAbdDkqqvKLLhMOap50XvGaCkjshiNdY="; + + inherit version; + defaultVersion = with versions; switch coq.coq-version [ + { case = isGe "8.13"; out = "8.13.0"; } + { case = "8.11"; out = "8.11.1"; } + { case = "8.9"; out = "8.9.0"; } + { case = "8.8"; out = "8.8.0"; } + { case = "8.7"; out = "8.7.0"; } + { case = "8.6"; out = "8.6.0"; } + ] null; + + mlPlugin = true; + extraBuildInputs = (with coq.ocamlPackages; [ num ocamlbuild ]); + + postPatch = '' + for p in Make Makefile.coq.local + do + substituteInPlace $p --replace "-libs nums" "-use-ocamlfind -package num" || true + done + ''; + + meta = { + description = "A survey of programming language semantics styles in Coq"; + longDescription = '' + A survey of semantics styles in Coq, from natural semantics through + structural operational, axiomatic, and denotational semantics, to + abstract interpretation + ''; + maintainers = with maintainers; [ siraben ]; + license = licenses.mit; + }; +} diff --git a/nixpkgs/pkgs/development/go-modules/generic/default.nix b/nixpkgs/pkgs/development/go-modules/generic/default.nix index 7533d52c989e..cda43ebf0ed6 100644 --- a/nixpkgs/pkgs/development/go-modules/generic/default.nix +++ b/nixpkgs/pkgs/development/go-modules/generic/default.nix @@ -216,7 +216,7 @@ let runHook preCheck for pkg in $(getGoDirs test); do - buildGoDir test "$pkg" + buildGoDir test $checkFlags "$pkg" done runHook postCheck @@ -238,6 +238,8 @@ let passthru = passthru // { inherit go go-modules vendorSha256 ; }; + enableParallelBuilding = enableParallelBuilding; + meta = { # Add default meta information platforms = go.meta.platforms or lib.platforms.all; diff --git a/nixpkgs/pkgs/development/go-packages/generic/default.nix b/nixpkgs/pkgs/development/go-packages/generic/default.nix index 88d7acb42fc9..0fb51b68eca6 100644 --- a/nixpkgs/pkgs/development/go-packages/generic/default.nix +++ b/nixpkgs/pkgs/development/go-packages/generic/default.nix @@ -210,7 +210,7 @@ let runHook preCheck for pkg in $(getGoDirs test); do - buildGoDir test "$pkg" + buildGoDir test $checkFlags "$pkg" done runHook postCheck diff --git a/nixpkgs/pkgs/development/haskell-modules/configuration-common.nix b/nixpkgs/pkgs/development/haskell-modules/configuration-common.nix index 1c3cbbbbe31f..b6e5274be003 100644 --- a/nixpkgs/pkgs/development/haskell-modules/configuration-common.nix +++ b/nixpkgs/pkgs/development/haskell-modules/configuration-common.nix @@ -706,10 +706,6 @@ self: super: { uuid-types = doJailbreak super.uuid-types; uuid = doJailbreak super.uuid; - # Bypass version check for random < 1.2 (1.2 works fine). - # https://github.com/yeyan/xmonad-wallpaper/issues/2 - xmonad-wallpaper = doJailbreak super.xmonad-wallpaper; - # The tests spuriously fail libmpd = dontCheck super.libmpd; @@ -1936,4 +1932,12 @@ EOT # https://github.com/dagit/zenc/issues/5 zenc = doJailbreak super.zenc; + # Indeterministic tests + # Fixed on upstream: https://github.com/softwarefactory-project/matrix-client-haskell/commit/4ca4963cfd06379d9bdce49742af854aed6a0d37 + matrix-client = dontCheck super.matrix-client; + + # Flakey tests + # upstream https://github.com/circuithub/rel8/issues/86 + rel8 = dontCheck super.rel8; + } // import ./configuration-tensorflow.nix {inherit pkgs haskellLib;} self super diff --git a/nixpkgs/pkgs/development/haskell-modules/configuration-darwin.nix b/nixpkgs/pkgs/development/haskell-modules/configuration-darwin.nix index 0c4b46360ba7..492af32edb14 100644 --- a/nixpkgs/pkgs/development/haskell-modules/configuration-darwin.nix +++ b/nixpkgs/pkgs/development/haskell-modules/configuration-darwin.nix @@ -173,6 +173,7 @@ self: super: { hls-brittany-plugin = dontCheck super.hls-brittany-plugin; hls-fourmolu-plugin = dontCheck super.hls-fourmolu-plugin; hls-module-name-plugin = dontCheck super.hls-module-name-plugin; + hls-splice-plugin = dontCheck super.hls-splice-plugin; # We are lacking pure pgrep at the moment for tests to work tmp-postgres = dontCheck super.tmp-postgres; diff --git a/nixpkgs/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml b/nixpkgs/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml index d960d4ed8f07..f21266e5004d 100644 --- a/nixpkgs/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml +++ b/nixpkgs/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml @@ -617,6 +617,7 @@ broken-packages: - chunky - church - church-maybe + - churros - cielo - cil - cinvoke @@ -1640,7 +1641,6 @@ broken-packages: - gitter - git-vogue - gi-vips - - gi-wnck - glade - glapp - Gleam @@ -2289,6 +2289,7 @@ broken-packages: - hs-rs-notify - hs-scrape - hsseccomp + - hssh - hs-snowtify - hs-speedscope - hsSqlite3 @@ -2453,6 +2454,7 @@ broken-packages: - initialize - inject-function - inline-asm + - inline-r - inserts - instana-haskell-trace-sdk - instance-map @@ -2963,6 +2965,7 @@ broken-packages: - mi - miconix-test - microbase + - microformats2-parser - microgroove - microlens-each - micrologger @@ -3597,6 +3600,7 @@ broken-packages: - plat - platinum-parsing - PlayingCards + - plex - plist - plist-buddy - plot-gtk @@ -3979,6 +3983,7 @@ broken-packages: - reversi - ReviewBoard - rewrite-inspector + - rfc - rfc-prelude - rhbzquery - ribbit @@ -4869,6 +4874,7 @@ broken-packages: - turing-music - turtle-options - tweak + - twee - twentefp-websockets - twfy-api-client - twhs diff --git a/nixpkgs/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml b/nixpkgs/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml index fa4e798d1d3b..45d0bdcd0cbb 100644 --- a/nixpkgs/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml +++ b/nixpkgs/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml @@ -218,6 +218,7 @@ package-maintainers: - hlint - hmatrix - iCalendar + - matrix-client - neuron - optics - reflex-dom @@ -356,6 +357,7 @@ unsupported-platforms: gi-ibus: [ x86_64-darwin ] gi-ostree: [ x86_64-darwin ] gi-vte: [ x86_64-darwin ] + gi-wnck: [ x86_64-darwin ] gnome-keyring: [ x86_64-darwin ] gtk-mac-integration: [ i686-linux, x86_64-linux, aarch64-linux, armv7l-linux ] gtk-sni-tray: [ x86_64-darwin ] diff --git a/nixpkgs/pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml b/nixpkgs/pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml index 5c38f0b040f8..fdad31819ac5 100644 --- a/nixpkgs/pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml +++ b/nixpkgs/pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml @@ -5,35 +5,395 @@ dont-distribute-packages: - 4Blocks - - a50 - - abcBridge + - AC-Vector-Fancy + - ADPfusionForest + - ADPfusionSet + - AERN-Net + - AERN-Real + - AERN-Real-Double + - AERN-Real-Interval + - AERN-RnToRm + - AERN-RnToRm-Plot + - ASN1 - AbortT-monadstf - AbortT-mtl + - Advgame + - Advise-me + - AlgoRhythm + - AlignmentAlgorithms + - AndroidViewHierarchyImporter + - Annotations + - ApplePush + - AttoJson + - AutoForms + - AvlTree + - BASIC + - Barracuda + - BerlekampAlgorithm + - BioHMM + - Biobase + - BiobaseBlast + - BiobaseDotP + - BiobaseENA + - BiobaseEnsembl + - BiobaseFR3D + - BiobaseFasta + - BiobaseHTTP + - BiobaseHTTPTools + - BiobaseInfernal + - BiobaseMAF + - BiobaseTrainingData + - BiobaseTurner + - BiobaseTypes + - BiobaseVienna + - BiobaseXNA + - BirdPP + - Bitly + - BlastHTTP + - Blobs + - BlogLiterately + - BlogLiterately-diagrams + - Bookshelf + - CBOR + - CC-delcont-alt + - CMCompare + - CPBrainfuck + - CPL + - CSPM-Interpreter + - CSPM-ToProlog + - CSPM-cspm + - CarneadesIntoDung + - Chart-fltkhs + - ClustalParser + - Coadjute + - Combinatorrent + - ComonadSheet + - Condor + - Configger + - Control-Monad-MultiPass + - CoreFoundation + - DMuCheck + - DOM + - DP + - DSH + - DSTM + - Dangerous + - DarcsHelpers + - DefendTheKing + - DifferenceLogic + - DisTract + - DnaProteinAlignment + - DocTest + - DrHylo + - Dust + - Dust-tools + - Dust-tools-pcap + - DysFRP-Cairo + - DysFRP-Craftwerk + - EditTimeReport + - EntrezHTTP + - EsounD + - EtaMOO + - Etage-Graph + - Eternal10Seconds + - Etherbunny + - EventSocket + - FComp + - FM-SBLEX + - FTPLine + - Facts + - FailureT + - FermatsLastMargin + - FieldTrip + - FilePather + - Finance-Treasury + - FiniteMap + - FirstOrderTheory + - Flippi + - Forestry + - FormalGrammars + - Foster + - Frames-beam + - Frames-dsv + - Frank + - GLFW-OGL + - GLFW-task + - GPX + - GPipe-Collada + - GPipe-Examples + - GPipe-GLFW + - GPipe-GLFW4 + - GPipe-TextureLoad + - Gamgine + - GeBoP + - GenI + - GenSmsPdu + - Genbank + - Gene-CluEDO + - GenussFold + - GlomeView + - GoogleDirections + - GoogleSB + - GoogleTranslate + - GrammarProducts + - GraphHammer + - GraphHammer-examples + - GrowlNotify + - Gtk2hsGenerics + - GtkGLTV + - GuiHaskell + - GuiTV + - H + - HAppS-Data + - HAppS-IxSet + - HAppS-Server + - HAppS-State + - HGamer3D-API + - HGamer3D-CAudio-Binding + - HGamer3D-OIS-Binding + - HJScript + - HLearn-algebra + - HLearn-approximation + - HLearn-classification + - HLearn-datastructures + - HLearn-distributions + - HNM + - HPlot + - HPong + - HROOT + - HROOT-core + - HROOT-graf + - HROOT-hist + - HROOT-io + - HROOT-math + - HROOT-tree + - HRay + - HSGEP + - HSHHelpers + - HSoundFile + - HStringTemplateHelpers + - HTab + - HXMPP + - HaMinitel + - HaRe + - HaTeX-meta + - HaTeX-qq + - HaVSA + - Hach + - HarmTrace + - HasGP + - Hashell + - HaskRel + - Hate + - Hawk + - Hayoo + - Hedi + - Hieroglyph + - HiggsSet + - Hipmunk-Utils + - HipmunkPlayground + - Hoed + - Holumbus-Distribution + - Holumbus-MapReduce + - Holumbus-Searchengine + - Holumbus-Storage + - HongoDB + - Hs2lib + - HsParrot + - HsWebots + - Hsed + - Hydrogen + - INblobs + - IORefCAS + - IndexedList + - InfixApplicative + - JSON-Combinator + - JSON-Combinator-Examples + - JSONb + - Javasf + - JsContracts + - JsonGrammar + - JuPyTer-notebook + - JunkDB-driver-gdbm + - JunkDB-driver-hashtables + - KiCS + - KiCS-debugger + - KiCS-prophecy + - LDAPv3 + - LambdaDesigner + - LambdaINet + - LambdaPrettyQuote + - LambdaShell + - LinearSplit + - LinkChecker + - LogicGrowsOnTrees + - LogicGrowsOnTrees-MPI + - LogicGrowsOnTrees-network + - LogicGrowsOnTrees-processes + - LslPlus + - Lucu + - Lykah + - MC-Fold-DP + - MFlow + - MIP-glpk + - MSQueue + - MaybeT-transformers + - MetaObject + - Metrics + - Mhailist + - Michelangelo + - MicrosoftTranslator + - MissingPy + - MonadCatchIO-mtl + - MonadCatchIO-mtl-foreign + - MonadCatchIO-transformers-foreign + - MonadLab + - Monaris + - Monatron-IO + - Monocle + - MuCheck-HUnit + - MuCheck-Hspec + - MuCheck-QuickCheck + - MuCheck-SmallCheck + - MutationOrder + - NXT + - NaperianNetCDF + - NearContextAlgebra + - Ninjas + - NoSlow + - Nomyx + - Nomyx-Core + - Nomyx-Language + - Nomyx-Rules + - Nomyx-Web + - NonEmptyList + - Nussinov78 + - OSM + - OnRmt + - OpenAFP-Utils + - OpenGLCheck + - OpenSCAD + - OpenVG + - PCLT-DB + - PageIO + - Paraiso + - Parallel-Arrows-Eden + - PermuteEffects + - Plot-ho-matic + - PlslTools + - Printf-TH + - ProbabilityMonads + - Pugs + - Pup-Events + - Pup-Events-Demo + - Quelea + - RESTng + - RMP + - RNAFold + - RNAFoldProgs + - RNAdesign + - RNAdraw + - RNAlien + - RNAwolf + - Ranka + - Rlang-QQ + - RollingDirectory + - S3 + - SBench + - SCRIPTWriter + - SCalendar + - SFML-control + - SFont + - SGdemo + - STLinkUSB + - STM32-Zombie + - SVG2Q + - SciFlow + - SciFlow-drmaa + - Scurry + - SelectSequencesFromMSA + - Shellac-compatline + - Shellac-editline + - Shellac-haskeline + - Shellac-readline + - ShortestPathProblems + - Shpadoinkle-backend-pardiff + - Shpadoinkle-backend-static + - Shpadoinkle-developer-tools + - Shpadoinkle-disembodied + - Shpadoinkle-examples + - Shpadoinkle-html + - Shpadoinkle-router + - Shpadoinkle-template + - Shpadoinkle-widgets + - SimpleGL + - SimpleLog + - SimpleServer + - Smooth + - Snusmumrik + - SoccerFun + - SoccerFunGL + - SourceGraph + - SpinCounter + - Spock-auth + - Spock-lucid + - Spock-worker + - StockholmAlignment + - Strafunski-Sdf2Haskell + - SyntaxMacros + - Taxonomy + - TaxonomyTools + - TeX-my-math + - TeaHS + - TreeCounter + - Treiber + - TrieMap + - TypeClass + - TypeIlluminator + - UMM + - URLT + - UrlDisp + - ViennaRNA-extras + - WAVE + - WEditorBrick + - WEditorHyphen + - WL500gPControl + - WURFL + - WXDiffCtrl + - WashNGo + - WaveFront + - WebBits-Html + - WebBits-multiplate + - WebCont + - WordAlignment + - WxGeneric + - XML + - XMPP + - XSaiga + - YACPong + - Yablog + - Yogurt + - Yogurt-Standalone + - Z-Botan + - Z-IO + - Z-MessagePack + - Z-YAML + - a50 + - abcBridge + - ac-machine-conduit - accelerate-arithmetic - accelerate-fourier - accelerate-typelits - access-token-provider - - ac-machine-conduit - acme-php - acme-safe - acousticbrainz-client - activehs - actor - - AC-Vector-Fancy - adhoc-network - adict - - ADPfusionForest - - ADPfusionSet - adp-multi-monadiccp - - Advgame - - Advise-me - aern2-real - - AERN-Net - - AERN-Real - - AERN-Real-Double - - AERN-Real-Interval - - AERN-RnToRm - - AERN-RnToRm-Plot - aeson-native - afv - agda-server @@ -46,8 +406,6 @@ dont-distribute-packages: - algebra-driven-design - algebra-sql - algolia - - AlgoRhythm - - AlignmentAlgorithms - alms - alpha - alsa-gui @@ -58,18 +416,18 @@ dont-distribute-packages: - amqp-streamly - analyze-client - anatomy - - AndroidViewHierarchyImporter - animate-example - animate-frames - animate-preview - animate-sdl2 - annah - - Annotations - anonymous-sums-tests - antagonist - anticiv - antlrc - apelsin + - api-rpc-pegnet + - api-yoti - apiary - apiary-authenticate - apiary-clientsession @@ -85,11 +443,8 @@ dont-distribute-packages: - apiary-redis - apiary-session - apiary-websockets - - api-rpc-pegnet - apis - - api-yoti - apotiki - - ApplePush - approx-rand-test - arbor-monad-metric-datadog - arch-hs @@ -104,7 +459,6 @@ dont-distribute-packages: - arraylist - ascii-table - asic - - ASN1 - assert4hs-hspec - assert4hs-tasty - assimp @@ -114,7 +468,6 @@ dont-distribute-packages: - atmos-dimensional-tf - atomic-primops-foreign - atp - - AttoJson - attoparsec-enumerator - attoparsec-iteratee - attoparsec-text-enumerator @@ -122,13 +475,11 @@ dont-distribute-packages: - audiovisual - aura - authoring - - AutoForms - autonix-deps-kf5 - avers - avers-api - avers-api-docs - avers-server - - AvlTree - avro-piper - awesomium - awesomium-glut @@ -150,6 +501,7 @@ dont-distribute-packages: - azure-functions-worker - azure-service-api - azure-servicebus + - b-tree - babylon - backblaze-b2-hs - backdropper @@ -162,12 +514,10 @@ dont-distribute-packages: - bamboo-theme-mini-html5 - bamse - bamstats - - Barracuda - base16-lens - base32-bytestring - base64-bytes - baserock-schema - - BASIC - batchd - battlenet-yesod - battleships @@ -184,9 +534,9 @@ dont-distribute-packages: - beam-th - beautifHOL - bech32-th + - bech32-th_1_1_1 - bein - belka - - BerlekampAlgorithm - berp - bff - bglib @@ -197,32 +547,15 @@ dont-distribute-packages: - binary-file - binary-protocol-zmq - binary-streams + - binding-wx - bindings-apr-util - bindings-linux-videodev2 - bindings-ppdev - - binding-wx - binembed-example - bioace - bioalign - - Biobase - - BiobaseBlast - - BiobaseDotP - - BiobaseENA - - BiobaseEnsembl - - BiobaseFasta - - BiobaseFR3D - - BiobaseHTTP - - BiobaseHTTPTools - - BiobaseInfernal - - BiobaseMAF - - BiobaseTrainingData - - BiobaseTurner - - BiobaseTypes - - BiobaseVienna - - BiobaseXNA - biofasta - biofastq - - BioHMM - bioinformatics-toolkit - biophd - biopsl @@ -231,27 +564,24 @@ dont-distribute-packages: - bip32 - birch-beer - bird - - BirdPP - bit-array - bitcoin-address - bitcoin-api - bitcoin-api-extra - bitcoin-block - bitcoin-compact-filters - - bitcoind-regtest - - bitcoind-rpc - bitcoin-keys - bitcoin-rpc - bitcoin-scripting - bitcoin-tx - bitcoin-types - - Bitly + - bitcoind-regtest + - bitcoind-rpc - bitly-cli - bitmaps - bittorrent - bla - blakesum-demo - - BlastHTTP - blastxml - blatex - blaze-builder-enumerator @@ -259,10 +589,7 @@ dont-distribute-packages: - ble - blink1 - blip - - Blobs - blogination - - BlogLiterately - - BlogLiterately-diagrams - bloodhound-amazonka-auth - bloxorz - blubber @@ -273,7 +600,6 @@ dont-distribute-packages: - bond-haskell - bond-haskell-compiler - bookkeeper-permissions - - Bookshelf - boomslang - boopadoop - boots-cloud @@ -292,7 +618,6 @@ dont-distribute-packages: - bronyradiogermany-streaming - brotli-conduit - brotli-streams - - b-tree - btree - buchhaltung - buildbox-tools @@ -309,14 +634,14 @@ dont-distribute-packages: - bytelog - bytestring-read - c0check - - cabal2arch - cabal-bounds - cabal-cache - cabal-cargs - - cabalmdvrpm - cabal-query - - cabalrpmdeps - cabal-test + - cabal2arch + - cabalmdvrpm + - cabalrpmdeps - cake - cakyrespa - cal3d-examples @@ -332,9 +657,8 @@ dont-distribute-packages: - canteven-http - cao - cap - - carboncopy - - CarneadesIntoDung - car-pool + - carboncopy - cartel - casadi-bindings - casadi-bindings-control @@ -348,8 +672,6 @@ dont-distribute-packages: - casui - categorical-algebra - category-extras - - CBOR - - CC-delcont-alt - cctools-workqueue - cef3-simple - ceilometer-common @@ -363,11 +685,9 @@ dont-distribute-packages: - cfopu - cgrep - chainweb-mining-client - - chakra - chalkboard-viewer - charade - chart-cli - - Chart-fltkhs - chart-svg - chart-svg-various - chart-unit @@ -423,38 +743,33 @@ dont-distribute-packages: - cloud-seeder - cloudyfs - clua - - ClustalParser - clustertools - clutterhs - cmathml3 - - CMCompare - cmptype - cmv - cnc-spec-compiler - - Coadjute - - codec + - co-feldspar + - co-log-polysemy-formatting - code-conjure + - codec - codec-rpm - codemonitor - - co-feldspar - cognimeta-utils - coinbase-exchange - colada - collapse-duplication - collection-json - collections-base-instances - - co-log-polysemy-formatting - color-counter - colorless-http-client - colorless-scotty - colour-space - columbia - comark - - Combinatorrent - comic - commsec-keyexchange - comonad-random - - ComonadSheet - compact-mutable - complexity - computational-algebra @@ -464,7 +779,6 @@ dont-distribute-packages: - concrete-haskell - concrete-haskell-autogen - condor - - Condor - conductive-hsc3 - conductive-song - conduit-vfs-zip @@ -474,9 +788,8 @@ dont-distribute-packages: - conferer-source-dhall - conferer-source-yaml - conffmt - - Configger - - configifier - config-select + - configifier - configurator-ng - constraint-manip - constructible @@ -488,7 +801,6 @@ dont-distribute-packages: - control - control-monad-attempt - control-monad-exception-monadsfd - - Control-Monad-MultiPass - conversions - convert - convertible-ascii @@ -500,13 +812,10 @@ dont-distribute-packages: - copilot-language - copilot-libraries - copilot-theorem - - CoreFoundation - coroutine-enumerator - coroutine-iteratee - - couchdb-enumerator - couch-simple - - CPBrainfuck - - CPL + - couchdb-enumerator - cprng-aes-effect - cql-io-tinylog - cqrs-example @@ -526,17 +835,14 @@ dont-distribute-packages: - criu-rpc - crockford - cron-compat - - cryptocipher - crypto-conduit + - cryptocipher - cryptoids - cryptoids-class - cryptol - crystalfontz - csg - cspmchecker - - CSPM-cspm - - CSPM-Interpreter - - CSPM-ToProlog - csv-enumerator - ctpl - cube @@ -544,13 +850,11 @@ dont-distribute-packages: - cursor-fuzzy-time-gen - cv-combinators - cypher - - Dangerous - dapi - darcs-benchmark - darcs-beta - - darcsden - darcs-fastconvert - - DarcsHelpers + - darcsden - darcswatch - darkplaces-demo - darkplaces-rcon-util @@ -558,9 +862,7 @@ dont-distribute-packages: - data-accessor-monads-fd - data-basic - data-cycle - - datadog-tracing - data-elf - - dataflow - data-layer - data-lens-fd - data-lens-ixset @@ -570,6 +872,8 @@ dont-distribute-packages: - data-result - data-rtuple - data-structure-inferrer + - datadog-tracing + - dataflow - date-conversions - dbjava - dbus-client @@ -584,11 +888,11 @@ dont-distribute-packages: - ddc-core-simpl - ddc-core-tetra - ddc-driver - - ddci-core - ddc-interface - ddc-source-tetra - ddc-tools - ddc-war + - ddci-core - debug - debug-trace-var - decidable @@ -597,7 +901,6 @@ dont-distribute-packages: - deeplearning-hs - deepzoom - defargs - - DefendTheKing - definitive-graphics - deka-tests - delaunay @@ -606,9 +909,9 @@ dont-distribute-packages: - delimiter-separated - delta - delta-h + - dep-t-advice - dependent-state - dephd - - dep-t-advice - deptrack-devops - deptrack-dot - dequeue @@ -618,6 +921,7 @@ dont-distribute-packages: - dewdrop - dfinity-radix-tree - dhall-docs + - di-polysemy - dia-functions - diagrams-haddock - diagrams-html5 @@ -625,7 +929,6 @@ dont-distribute-packages: - diagrams-pgf - diagrams-reflex - diagrams-wx - - DifferenceLogic - difference-monoid - digestive-functors-hsp - dingo-core @@ -633,14 +936,12 @@ dont-distribute-packages: - dingo-widgets - diplomacy - diplomacy-server - - di-polysemy - dirfiles - discogs-haskell - discord-gateway - discord-hs - discord-register - discord-rest - - DisTract - distributed-process-async - distributed-process-azure - distributed-process-client-server @@ -665,18 +966,13 @@ dont-distribute-packages: - dmenu-pkill - dmenu-pmount - dmenu-search - - DMuCheck - - DnaProteinAlignment - doc-review - - DocTest - doi - - DOM - domain - domain-core - domain-optics - dow - download-media-content - - DP - dph-examples - dph-lifted-base - dph-lifted-copy @@ -684,25 +980,17 @@ dont-distribute-packages: - dph-prim-interface - dph-prim-par - dph-prim-seq - - DrHylo - dropbox-sdk - dropsolve - - DSH - dsh-sql - dsmc-tools - - DSTM - dtd - dumb-cas - - Dust - - Dust-tools - - Dust-tools-pcap - dvda - dynamic-cabal - dynamic-pipeline - dynamic-plot - dynobud - - DysFRP-Cairo - - DysFRP-Craftwerk - eccrypto-ed25519-bindings - ecdsa - edenskel @@ -710,7 +998,6 @@ dont-distribute-packages: - edge - edges - editable - - EditTimeReport - effective-aspects-mzv - egison - egison-pattern-src-haskell-mode @@ -729,7 +1016,6 @@ dont-distribute-packages: - embroidery - engine-io-growler - entangle - - EntrezHTTP - enumerate - enumerate-function - enumerator-fd @@ -742,25 +1028,19 @@ dont-distribute-packages: - errors-ext - ersatz-toysat - esotericbot - - EsounD - estreps - - Etage-Graph - - EtaMOO - - Eternal10Seconds - eternity - eternity-timestamped - ether - - Etherbunny - ethereum-analyzer - ethereum-analyzer-cli - ethereum-analyzer-webui - ethereum-client-haskell - ethereum-merkle-patricia-db - evdev-streamly + - event-monad - eventful-postgresql - eventful-sqlite - - event-monad - - EventSocket - eventsource-geteventstore-store - every-bit-counts - exception-monads-fd @@ -777,25 +1057,22 @@ dont-distribute-packages: - extensible-data - extract-dependencies - extrapolate - - Facts - factual-api - - FailureT - fakedata-quickcheck - - fallingblocks - falling-turnip + - fallingblocks - family-tree - fast-digits - fastirc - fault-tree - fbrnch - fcd - - FComp - feature-flipper-postgres - fedora-img-dl - - feed2lj - - feed2twitter - feed-gipeda - feed-translator + - feed2lj + - feed2twitter - fei-base - fei-cocoapi - fei-dataiter @@ -805,33 +1082,26 @@ dont-distribute-packages: - fei-nn - feldspar-compiler - feldspar-language - - FermatsLastMargin - festung - ffmpeg-tutorials - ficketed - fields - - FieldTrip - filepath-crypto - - filepather - - FilePather - filepath-io-access + - filepather - filesystem-enumerator - - Finance-Treasury - find-clumpiness - findhttp - - FiniteMap - firstify - - FirstOrderTheory + - fix-parser-simple - fixed-point-vector - fixed-point-vector-space - fixhs - - fix-parser-simple - flac-picture - flashblast - flatbuffers - flexiwrap - flexiwrap-smallcheck - - Flippi - flite - flowdock-api - flower @@ -843,13 +1113,10 @@ dont-distribute-packages: - fltkhs-themes - fluent-logger - fluent-logger-conduit - - FM-SBLEX - foldl-transduce-attoparsec - follower - foo - - Forestry - formal - - FormalGrammars - format - format-status - forml @@ -859,28 +1126,23 @@ dont-distribute-packages: - fortran-src-extras - foscam-directory - foscam-sort - - Foster - fp-ieee - fplll - fpnla-examples - frame-markdown - - Frames-beam - - Frames-dsv - - Frank - - freekick2 - - freelude - - freer-converse - free-theorems-counterexamples - free-theorems-seq - free-theorems-seq-webui - free-theorems-webui + - freekick2 + - freelude + - freer-converse - frpnow-gloss - frpnow-gtk - frpnow-gtk3 - frpnow-vty - ftdi - ftp-client-conduit - - FTPLine - ftree - ftshell - funbot @@ -888,8 +1150,8 @@ dont-distribute-packages: - funcons-lambda-cbv-mp - funcons-simple - funcons-tools - - functional-arrow - function-combine + - functional-arrow - functor-combo - funflow-nix - funion @@ -903,12 +1165,10 @@ dont-distribute-packages: - g2q - gact - galois-fft - - Gamgine - gargoyle-postgresql-connect - gbu - gdax - gdiff-ig - - GeBoP - gedcom - geek - geek-server @@ -917,18 +1177,13 @@ dont-distribute-packages: - gelatin-gl - gelatin-sdl2 - gelatin-shaders - - Genbank - - Gene-CluEDO - generics-mrsop-gdiff - genesis - genesis-test - - GenI - - geniconvert - geni-gui - - geniserver - geni-util - - GenSmsPdu - - GenussFold + - geniconvert + - geniserver - geodetic - geolite-csv - getemx @@ -938,11 +1193,11 @@ dont-distribute-packages: - ghc-debug-stub - ghc-imported-from - ghc-instances - - ghci-pretty - - ghcjs-hplay - ghc-mod - ghc-tags-plugin - ghc-vis + - ghci-pretty + - ghcjs-hplay - ght - gi-cairo-again - gi-gsk @@ -950,11 +1205,11 @@ dont-distribute-packages: - gi-gtk_4_0_4 - git-fmt - git-gpush + - git-object + - git-remote-ipfs - github-webhook-handler-snap - gitlib-cross - gitlib-s3 - - git-object - - git-remote-ipfs - givegif - gladexml-accessor - glazier @@ -962,12 +1217,9 @@ dont-distribute-packages: - glazier-react - glazier-react-examples - glazier-react-widget - - GLFW-OGL - - GLFW-task - global - global-config - glome-hs - - GlomeView - gloss-accelerate - gloss-devil - gloss-examples @@ -983,14 +1235,11 @@ dont-distribute-packages: - goal-probability - goal-simulation - goat - - GoogleDirections - google-drive - google-mail-filters - google-maps-geocoding - - googleplus - - GoogleSB - google-static-maps - - GoogleTranslate + - googleplus - gore-and-ash-actor - gore-and-ash-async - gore-and-ash-demo @@ -1000,27 +1249,15 @@ dont-distribute-packages: - gore-and-ash-network - gore-and-ash-sdl - gore-and-ash-sync - - GPipe-Collada - - GPipe-Examples - - GPipe-GLFW - - GPipe-GLFW4 - - GPipe-TextureLoad - gps - gps2htmlReport - - GPX - grab-form - graflog - grammar-combinators - - GrammarProducts - grapefruit-examples - grapefruit-records - grapefruit-ui - grapefruit-ui-gtk - - GraphHammer - - GraphHammer-examples - - graphicsFormats - - graphicstools - - graphql-client - graph-rewriting-cl - graph-rewriting-gl - graph-rewriting-lambdascope @@ -1029,13 +1266,15 @@ dont-distribute-packages: - graph-rewriting-strategies - graph-rewriting-trs - graph-rewriting-ww - - graphtype - graph-visit + - graphicsFormats + - graphicstools + - graphql-client + - graphtype - greencard-lib + - grid-proto - gridbounds - gridland - - grid-proto - - GrowlNotify - grpc-etcd-client - grpc-haskell - grpc-haskell-core @@ -1046,28 +1285,22 @@ dont-distribute-packages: - gsmenu - gstorable - gtfs + - gtk-serialized-event - gtk2hs-cast-glade - gtk2hs-cast-gnomevfs - gtk2hs-cast-gtkglext - gtk2hs-cast-gtksourceview2 - - Gtk2hsGenerics - - GtkGLTV - gtkimageview - gtkrsync - - gtk-serialized-event - guarded-rewriting - guess-combinator - - GuiHaskell - - GuiTV + - hArduino + - hOff-display + - hPDB + - hPDB-examples - habit - hablo - hablog - - Hach - - hack2-handler-happstack-server - - hack2-handler-mongrel2-http - - hack2-handler-snap-server - - hackage2twitter - - hackage-server - hack-contrib - hack-contrib-press - hack-handler-epoll @@ -1075,10 +1308,15 @@ dont-distribute-packages: - hack-handler-fastcgi - hack-handler-hyena - hack-handler-simpleserver - - hackmanager - hack-middleware-cleanpath - hack-middleware-clientsession - hack-middleware-jsonp + - hack2-handler-happstack-server + - hack2-handler-mongrel2-http + - hack2-handler-snap-server + - hackage-server + - hackage2twitter + - hackmanager - haddock - haddock_2_23_1 - haddocset @@ -1093,16 +1331,12 @@ dont-distribute-packages: - halma-gui - halma-telegram-bot - ham - - HaMinitel - hamusic - hans-pcap - happlets-lib-gtk - - HAppS-Data - happs-hsp - happs-hsp-template - - HAppS-IxSet - - HAppS-Server - - HAppS-State + - happs-tutorial - happstack-auth - happstack-authenticate - happstack-contrib @@ -1117,48 +1351,26 @@ dont-distribute-packages: - happstack-state - happstack-static-routing - happstack-yui - - happs-tutorial - happybara-webkit - haquil - - hArduino - hardware-edsl - - HaRe - harg - hark - harmony - - HarmTrace - haroonga-httpd + - has-th - hascat - hascat-lib - hascat-setup - hascat-system - - HasGP - - Hashell - hashflare + - hask-home - haskarrow - haskdeep - haskeem - haskell-abci - haskell-aliyun - haskell-bitmex-client - - haskelldb-connect-hdbc - - haskelldb-connect-hdbc-catchio-mtl - - haskelldb-connect-hdbc-catchio-tf - - haskelldb-connect-hdbc-catchio-transformers - - haskelldb-connect-hdbc-lifted - - haskelldb-dynamic - - haskelldb-flat - - haskelldb-hdbc - - haskelldb-hdbc-mysql - - haskelldb-hdbc-odbc - - haskelldb-hdbc-postgresql - - haskelldb-hdbc-sqlite3 - - haskelldb-hsql - - haskelldb-hsql-mysql - - haskelldb-hsql-odbc - - haskelldb-hsql-postgresql - - haskelldb-hsql-sqlite3 - - haskelldb-th - haskell-docs - haskell-eigen-util - haskell-ftp @@ -1182,10 +1394,27 @@ dont-distribute-packages: - haskell-tools-refactor - haskell-tools-rewrite - haskell-tor + - haskelldb-connect-hdbc + - haskelldb-connect-hdbc-catchio-mtl + - haskelldb-connect-hdbc-catchio-tf + - haskelldb-connect-hdbc-catchio-transformers + - haskelldb-connect-hdbc-lifted + - haskelldb-dynamic + - haskelldb-flat + - haskelldb-hdbc + - haskelldb-hdbc-mysql + - haskelldb-hdbc-odbc + - haskelldb-hdbc-postgresql + - haskelldb-hdbc-sqlite3 + - haskelldb-hsql + - haskelldb-hsql-mysql + - haskelldb-hsql-odbc + - haskelldb-hsql-postgresql + - haskelldb-hsql-sqlite3 + - haskelldb-th - haskelm - haskey-mtl - haskgame - - hask-home - haskoin-bitcoind - haskoin-core - haskoin-crypto @@ -1201,7 +1430,6 @@ dont-distribute-packages: - haskore-realtime - haskore-supercollider - haskore-synthesizer - - HaskRel - hasktorch - hasktorch-ffi-thc - hasktorch-indef @@ -1222,16 +1450,9 @@ dont-distribute-packages: - haste-lib - haste-markup - haste-perch - - has-th - - Hate - - HaTeX-meta - hatexmpp3 - - HaTeX-qq - - HaVSA - hawitter - - Hawk - haxy - - Hayoo - hback - hbayes - hbb @@ -1252,15 +1473,14 @@ dont-distribute-packages: - hdph - heart-app - heatitup + - heavy-log-shortcuts - heavy-logger - heavy-logger-amazon - heavy-logger-instances - - heavy-log-shortcuts - hecc - hedgehog-checkers-lens - hedgehog-fakedata - hedgehog-gen-json - - Hedi - hedis-pile - heist-aeson - helics @@ -1287,16 +1507,11 @@ dont-distribute-packages: - hfd - hfiar - hgalib - - HGamer3D-API - - HGamer3D-CAudio-Binding - - HGamer3D-OIS-Binding - hgen - hgeometry-svg - hgithub - hiccup - hierarchical-spectral-clustering - - Hieroglyph - - HiggsSet - highjson-swagger - highjson-th - himpy @@ -1307,8 +1522,6 @@ dont-distribute-packages: - hinvaders - hinze-streams - hipbot - - HipmunkPlayground - - Hipmunk-Utils - hipsql-client - hipsql-server - hirt @@ -1319,15 +1532,9 @@ dont-distribute-packages: - hist-pl-lmf - hit - hit-graph - - HJScript - hjsonschema - hjugement-cli - hlcm - - HLearn-algebra - - HLearn-approximation - - HLearn-classification - - HLearn-datastructures - - HLearn-distributions - hledger-api - hlrdb - hls @@ -1339,20 +1546,12 @@ dont-distribute-packages: - hmm-lapack - hmt - hmt-diagrams - - HNM - hnormalise - hob - - Hoed - - hOff-display - hogre - hogre-examples - - Holumbus-Distribution - - Holumbus-MapReduce - - Holumbus-Searchengine - - Holumbus-Storage - holy-project - hommage - - HongoDB - hood - hoodie - hoodle @@ -1371,11 +1570,7 @@ dont-distribute-packages: - hpage - hpaste - hpc-tracer - - hPDB - - hPDB-examples - hplayground - - HPlot - - HPong - hpqtypes-extras - hprotoc-fork - hps @@ -1383,26 +1578,21 @@ dont-distribute-packages: - hpython - hquantlib - hranker - - HRay - hreader - hreader-lens - hreq-client - hreq-conduit - - HROOT - - HROOT-core - - HROOT-graf - - HROOT-hist - - HROOT-io - - HROOT-math - - HROOT-tree + - hs-blake2 + - hs-brotli + - hs-ffmpeg + - hs-gen-iface + - hs-pkpass + - hs-swisstable-hashtables-class - hs2dot - - Hs2lib - hsautogui - hsbackup - hsbencher-codespeed - hsbencher-fusion - - hs-blake2 - - hs-brotli - hsc3-auditor - hsc3-cairo - hsc3-data @@ -1422,24 +1612,16 @@ dont-distribute-packages: - hscassandra - hscope - hsdev - - Hsed - hset - hsfacter - - hs-ffmpeg - - hs-gen-iface - - HSGEP - - HSHHelpers - hslogstash - hsnock - - HSoundFile - - HsParrot - hspec-expectations-pretty - hspec-pg-transact - hspec-setup - hspec-shouldbe - hspec-test-sandbox - hspecVariant - - hs-pkpass - hsprocess - hsql-mysql - hsql-odbc @@ -1450,24 +1632,20 @@ dont-distribute-packages: - hsqml-morris - hsreadability - hssqlppp-th - - hs-swisstable-hashtables-class - hstar - hstox - hstradeking - - HStringTemplateHelpers - hstzaar - hsubconvert - - HsWebots - hswip - hsx-jmacro - hsx-xhtml - - HTab - hts - - http2-client-exe - - http2-client-grpc - http-client-auth - http-enumerator - http-io-streams + - http2-client-exe + - http2-client-grpc - https-everywhere-rules - https-everywhere-rules-raw - httpspec @@ -1488,14 +1666,13 @@ dont-distribute-packages: - hw-json-simple-cursor - hw-json-standard-cursor - hw-kafka-avro + - hw-simd-cli + - hw-uri - hworker-ses - hwormhole - hws - - hw-simd-cli - hwsl2-bytevector - hwsl2-reducers - - hw-uri - - HXMPP - hxmppc - hxournal - hxt-binary @@ -1503,7 +1680,6 @@ dont-distribute-packages: - hxthelper - hxweb - hybrid - - Hydrogen - hydrogen-cli - hydrogen-cli-args - hydrogen-data @@ -1517,13 +1693,14 @@ dont-distribute-packages: - hyloutils - hyperpublic - ice40-prim - - ideas-math - - ideas-math-types - - ideas-statistics - ide-backend - ide-backend-common - ide-backend-server + - ideas-math + - ideas-math-types + - ideas-statistics - ige-mac-integration + - ihaskell-inline-r - ihaskell-rlangqq - ihttp - imap @@ -1539,7 +1716,6 @@ dont-distribute-packages: - importify - imprevu-happstack - improve - - INblobs - inch - incremental-computing - incremental-maps @@ -1548,10 +1724,8 @@ dont-distribute-packages: - indentation-parsec - indentation-trifecta - indexation - - IndexedList - indieweb-algorithms - infernu - - InfixApplicative - inline-java - inspector-wrecker - instant-aeson @@ -1566,7 +1740,6 @@ dont-distribute-packages: - intset - invertible-hlist - ion - - IORefCAS - ipatch - ipc - ipld-cid @@ -1581,12 +1754,12 @@ dont-distribute-packages: - ismtp - isobmff-builder - isohunt + - iter-stats - iteratee-compress - iteratee-mtl - iteratee-parsec - iteratee-stm - iterio-server - - iter-stats - ivor - ivory-avr-atmega328p-registers - ivory-backend-c @@ -1604,10 +1777,9 @@ dont-distribute-packages: - jail - java-bridge-extras - java-character - - javaclass - java-reflect + - javaclass - javasf - - Javasf - jmacro - jmacro-rpc - jmacro-rpc-happstack @@ -1616,26 +1788,18 @@ dont-distribute-packages: - jobs-ui - join - jot - - JsContracts - jsmw - - json2-hdbc - json-ast-json-encoder - json-autotype - json-b - - JSONb - - JSON-Combinator - - JSON-Combinator-Examples - json-enumerator - - JsonGrammar - json-incremental-decoder - json-query - - jsons-to-schema - json-togo - json-tokens + - json2-hdbc + - jsons-to-schema - jspath - - JunkDB-driver-gdbm - - JunkDB-driver-hashtables - - JuPyTer-notebook - jvm - jvm-batching - jvm-streaming @@ -1662,20 +1826,17 @@ dont-distribute-packages: - keera-hails-reactive-fs - keera-hails-reactive-gtk - keera-hails-reactive-htmldom - - keera-hails-reactivelenses - keera-hails-reactive-network - keera-hails-reactive-polling - keera-hails-reactive-wx - keera-hails-reactive-yampa + - keera-hails-reactivelenses - keera-posture - kevin - keysafe - keyvaluehash - keyword-args - kicad-data - - KiCS - - KiCS-debugger - - KiCS-prophecy - kif-parser - kit - kleene @@ -1694,8 +1855,12 @@ dont-distribute-packages: - labyrinth - labyrinth-server - laika - - lambdabot-zulip - lambda-calculator + - lambda-devs + - lambda-options + - lambdaFeed + - lambdaLit + - lambdabot-zulip - lambdacms-media - lambdacube - lambdacube-bullet @@ -1706,21 +1871,13 @@ dont-distribute-packages: - lambdacube-examples - lambdacube-gl - lambdacube-samples - - LambdaDesigner - - lambda-devs - - lambdaFeed - - LambdaINet - - lambdaLit - - lambda-options - - LambdaPrettyQuote - - LambdaShell - lambdaya-bus - lambdiff - lang + - language-Modula2 - language-boogie - language-eiffel - language-kort - - language-Modula2 - language-ninja - language-oberon - language-python-colour @@ -1740,7 +1897,6 @@ dont-distribute-packages: - lazy-hash - lazy-hash-cache - ldapply - - LDAPv3 - leaky - lean - legion @@ -1776,8 +1932,6 @@ dont-distribute-packages: - linear-circuit - linearmap-category - linearscan-hoopl - - LinearSplit - - LinkChecker - linkchk - linkcore - linux-ptrace @@ -1787,15 +1941,15 @@ dont-distribute-packages: - liquid-bytestring - liquid-containers - liquid-ghc-prim - - liquidhaskell-cabal-demo - liquid-parallel - liquid-platform - liquid-prelude - liquid-vector - - listenbrainz-client + - liquidhaskell-cabal-demo - list-t-attoparsec - list-t-html-parser - list-witnesses + - listenbrainz-client - live-sequencer - llvm - llvm-analysis @@ -1811,57 +1965,51 @@ dont-distribute-packages: - llvm-tf - llvm-tools - lmonad-yesod - - localize - local-search + - localize - locked-poll - log - - logging-effect-extra - - logic-classes - - LogicGrowsOnTrees - - LogicGrowsOnTrees-MPI - - LogicGrowsOnTrees-network - - LogicGrowsOnTrees-processes - log-postgres - log-utils + - logging-effect-extra + - logic-classes - lojban - lojysamban - lol-apps - lol-benches - lol-cpp - - loli - lol-repa - lol-tests - lol-typing + - loli - longshot - loop-effin - lorentz - lostcities - loup - - LslPlus - ls-usb - lsystem - lti13 - luachunk - lucid-colonnade - lucienne - - Lucu - luhn - lui - luminance-samples - lvish - - Lykah - lz4-conduit - lzma-enumerator + - mDNSResponder-client - macbeth-lib - machines-amazonka - macosx-make-standalone + - magic-wormhole - magicbane - magico - - magic-wormhole - mahoro - maid - - mailgun - mail-pool + - mailgun - majordomo - majority - manatee @@ -1881,27 +2029,24 @@ dont-distribute-packages: - manifold-random - manifolds - marionetta - - markdown2svg - markdown-pap + - markdown2svg - markov-processes - marmalade-upload - marquise - marvin - masakazu-bot - matchers - - mathblog - - mathlink - math-programming-glpk - math-programming-tests + - mathblog + - mathlink - matsuri - maxent - maxent-learner-hw-gui - maxsharing - - MaybeT-transformers - - MC-Fold-DP - mcmc - mcmc-samplers - - mDNSResponder-client - mealy - mediabus-fdk-aac - mediabus-rtp @@ -1911,20 +2056,13 @@ dont-distribute-packages: - mergeful-persistent - mergeless-persistent - merkle-patricia-db - - MetaObject - meta-par-accelerate - metaplug - metar - metar-http - - Metrics - metronome - - MFlow - - Mhailist - - Michelangelo - - microformats2-parser - - microformats2-types - micro-gateway - - MicrosoftTranslator + - microformats2-types - midimory - mighttpd - minecraft-data @@ -1934,11 +2072,9 @@ dont-distribute-packages: - minilight-lua - minimung - minioperational - - MIP-glpk - miss - - MissingPy - - missing-py2 - miss-porcelain + - missing-py2 - mixed-strategies - mkbndl - mkcabal @@ -1949,25 +2085,18 @@ dont-distribute-packages: - moan - modify-fasta - modsplit - - modularity - modular-prelude-classy + - modularity - modulo - mole - - MonadCatchIO-mtl - - MonadCatchIO-mtl-foreign - - MonadCatchIO-transformers-foreign - monad-exception - - monadiccp-gecode - - MonadLab - monad-state - monad-stlike-stm + - monadiccp-gecode - monarch - - Monaris - - Monatron-IO - monetdb-mapi - mongrel2-handler - monky - - Monocle - monte-carlo - moo - moo-nad @@ -1987,16 +2116,12 @@ dont-distribute-packages: - msgpack-idl - msgpack-rpc - msgpack-rpc-conduit - - MSQueue - mtgoxapi - - MuCheck-Hspec - - MuCheck-HUnit - - MuCheck-QuickCheck - - MuCheck-SmallCheck - mu-grpc-client - mu-grpc-server - - multibase + - mu-tracing - multi-cabal + - multibase - multifocal - multihash-serialise - multilinear-io @@ -2006,7 +2131,6 @@ dont-distribute-packages: - multisetrewrite - murder - murmurhash3 - - musicbrainz-email - music-graphics - music-parts - music-pitch @@ -2014,39 +2138,36 @@ dont-distribute-packages: - music-score - music-sibelius - music-suite + - musicbrainz-email - musicxml2 - mutable-iter - - MutationOrder - mute-unmute - - mu-tracing - - mvclient - mvc-updates + - mvclient - mxnet-dataiter - mxnet-examples - mxnet-nn + - myTestlll - mysnapsession-example - mysql-haskell-openssl - mysql-simple-typed - - myTestlll - mywatch - n2o-web - nakadi-client - nanovg-simple - - NaperianNetCDF - nats-queue - natural-number - - NearContextAlgebra - nemesis-titan - nerf - nero-wai - nero-warp - nested-routes - - netcore - - netlines - net-spider-cli - net-spider-pangraph - net-spider-rpl - net-spider-rpl-cli + - netcore + - netlines - netstring-enumerator - nettle-frp - nettle-netkit @@ -2071,31 +2192,21 @@ dont-distribute-packages: - ngrams-loader - ngx-export-tools-extra - nikepub - - Ninjas - nirum - nlp-scores-scripts - - Nomyx - nomyx-api - nomyx-core - - Nomyx-Core - nomyx-language - - Nomyx-Language - nomyx-library - - Nomyx-Rules - nomyx-server - - Nomyx-Web - - NonEmptyList - - NoSlow - notmuch-haskell - notmuch-web - - numerical - numeric-ode + - numerical - numhask-hedgehog - numhask-histogram - numhask-range - numhask-test - - Nussinov78 - - NXT - nymphaea - obd - obdd @@ -2115,17 +2226,12 @@ dont-distribute-packages: - one-liner_2_0 - online - online-csv - - OnRmt - open-adt-tutorial - - OpenAFP-Utils - - OpenGLCheck + - open-union - openpgp-crypto-api - - OpenSCAD - openssh-github-keys - opentracing-jaeger - opentracing-zipkin-v1 - - open-union - - OpenVG - optima-for-hasql - optimal-blocks - optimusprime @@ -2133,11 +2239,9 @@ dont-distribute-packages: - orchid-demo - order-maintenance - org-mode-lucid - - OSM - osm-download - otp-authenticator - padKONTROL - - PageIO - pairing - panda - pandoc-japanese-filters @@ -2148,11 +2252,9 @@ dont-distribute-packages: - papa-implement - papa-semigroupoids - paprika - - Paraiso - - Parallel-Arrows-Eden - parco-attoparsec - - parconc-examples - parco-parsec + - parconc-examples - parquet-hs - parse-help - parsestar @@ -2165,7 +2267,6 @@ dont-distribute-packages: - pcapng - pcf - pcf-font-embed - - PCLT-DB - pdf-slave - peakachu - pec @@ -2182,7 +2283,6 @@ dont-distribute-packages: - periodic-client-exe - periodic-server - perm - - PermuteEffects - persistent-audit - persistent-hssqlppp - persistent-map @@ -2217,17 +2317,16 @@ dont-distribute-packages: - planet-mitchell - plocketed - ploterific - - Plot-ho-matic - - PlslTools - png-file - pngload - pocket-dns + - point-octree - pointless-lenses - pointless-rewrite - - point-octree - poke - polh-lexicon - polydata + - polysemy-RandomFu - polysemy-chronos - polysemy-conc - polysemy-extra @@ -2244,7 +2343,7 @@ dont-distribute-packages: - polysemy-optics - polysemy-path - polysemy-plugin - - polysemy-RandomFu + - polysemy-readline - polysemy-resume - polysemy-test - polysemy-time @@ -2277,15 +2376,13 @@ dont-distribute-packages: - powerqueue-sqs - pqueue-mtl - practice-room - - prednote-test - pred-set - pred-trie + - prednote-test - presto-hdbc - preview - primula-board - primula-bot - - Printf-TH - - ProbabilityMonads - proc - process-iterio - process-progress @@ -2303,19 +2400,16 @@ dont-distribute-packages: - proplang - prosidyc - proteome + - proto-lens-descriptors - proto3-suite - protobuf-native - protocol-buffers-descriptor-fork - - proto-lens-descriptors - proton - psc-ide - puffytools - - Pugs - pugs-compat - pugs-hsregex - punkt - - Pup-Events - - Pup-Events-Demo - puppetresources - pure-cdb - pure-priority-queue-tests @@ -2332,7 +2426,6 @@ dont-distribute-packages: - qhs - qr-repa - quantum-random - - Quelea - queryparser - queryparser-demo - queryparser-hive @@ -2376,7 +2469,6 @@ dont-distribute-packages: - random-effin - random-hypergeometric - range-space - - Ranka - rasa - rasa-example-config - rasa-ext-bufs @@ -2409,10 +2501,10 @@ dont-distribute-packages: - record-aeson - record-gl - record-preprocessor - - records-th - record-syntax - - reddit + - records-th - redHandlers + - reddit - reduce-equations - refh - reflex-animation @@ -2428,8 +2520,8 @@ dont-distribute-packages: - regex-genex - regex-pcre-text - regex-pderiv - - regexp-tries - regex-xmlschema + - regexp-tries - regional-pointers - regions-monadsfd - regions-monadstf @@ -2462,20 +2554,18 @@ dont-distribute-packages: - rest-client - rest-core - rest-example - - restful-snap - rest-gen - rest-happstack - - RESTng - - restricted-workers - rest-snap - rest-stringmap - rest-types - rest-wai + - restful-snap + - restricted-workers - rethinkdb-model - rewrite - rewriting - rezoom - - rfc - rfc-env - rfc-http-client - rfc-psql @@ -2491,16 +2581,8 @@ dont-distribute-packages: - ripple - risc-v - rivet - - Rlang-QQ - rlwe-challenges - rmonad - - RMP - - RNAdesign - - RNAdraw - - RNAFold - - RNAFoldProgs - - RNAlien - - RNAwolf - rncryptor - rob - robot @@ -2512,7 +2594,6 @@ dont-distribute-packages: - rollbar-cli - rollbar-wai - rollbar-yesod - - RollingDirectory - ron-schema - ron-storage - rose-trie @@ -2531,7 +2612,7 @@ dont-distribute-packages: - ruler - ruler-core - runtime-arbitrary - - S3 + - s-expression - safer-file-handles - safer-file-handles-bytestring - safer-file-handles-text @@ -2549,29 +2630,25 @@ dont-distribute-packages: - samtools-iteratee - sarsi - sasl + - sat-micro-hs - satchmo-backends - satchmo-examples - satchmo-funsat - satchmo-minisat - satchmo-toysat - - sat-micro-hs - - SBench - - sc2hs - sc2-lowlevel - sc2-support + - sc2hs - sc3-rdu - scalable-server - - SCalendar - - scalpel-search - scalp-webhooks + - scalpel-search - scan-vector-machine - schema - schematic - scholdoc - scholdoc-citeproc - scholdoc-texmath - - SciFlow - - SciFlow-drmaa - scion - scion-browser - scope @@ -2580,15 +2657,12 @@ dont-distribute-packages: - scp-streams - scrabble-bot - scrapbook - - SCRIPTWriter - - Scurry - sde-solver - seakale-postgresql - seakale-tests - secrm - sednaDBXML - seitz-symbol - - SelectSequencesFromMSA - selenium-server - self-extract - semi-iso @@ -2603,6 +2677,7 @@ dont-distribute-packages: - sequor - serpentine - serv + - serv-wai - servant-auth-token - servant-auth-token-acid - servant-auth-token-leveldb @@ -2631,12 +2706,7 @@ dont-distribute-packages: - servant-zeppelin-client - servant-zeppelin-server - servant-zeppelin-swagger - - serv-wai - sessiontypes-distributed - - s-expression - - SFML-control - - SFont - - SGdemo - sgf - sgrep - sha1 @@ -2645,27 +2715,13 @@ dont-distribute-packages: - shapefile - shapely-data - shelduck - - Shellac-compatline - - Shellac-editline - - Shellac-haskeline - - Shellac-readline - shellmate-extras - shine-varying - - ShortestPathProblems - showdown - - Shpadoinkle-backend-pardiff - - Shpadoinkle-backend-static - - Shpadoinkle-developer-tools - - Shpadoinkle-disembodied - - Shpadoinkle-examples - - Shpadoinkle-html - - Shpadoinkle-router - - Shpadoinkle-template - - Shpadoinkle-widgets - shpider - shuffle - - sibe - si-clock + - sibe - sigma-ij - signable - signals @@ -2675,12 +2731,9 @@ dont-distribute-packages: - simgi - simple-c-value - simple-firewire - - SimpleGL - - simpleirc-lens - - SimpleLog - simple-nix - simple-pascal - - SimpleServer + - simpleirc-lens - simseq - singleton-nats_0_4_6 - singletons-base @@ -2697,7 +2750,6 @@ dont-distribute-packages: - smcdel - smith-cli - smith-client - - Smooth - smtlib2-debug - smtlib2-pipe - smtlib2-quickcheck @@ -2706,6 +2758,7 @@ dont-distribute-packages: - snap-auth-cli - snap-elm - snap-extras + - snap-utils - snaplet-actionlog - snaplet-auth-acid - snaplet-coffee @@ -2728,17 +2781,13 @@ dont-distribute-packages: - snaplet-tasks - snaplet-wordpress - snappy-iteratee - - snap-utils - sndfile-enumerators - sneathlane-haste - snm - snmp + - snow-white - snowflake-core - snowflake-server - - snow-white - - Snusmumrik - - SoccerFun - - SoccerFunGL - sock2stream - sockets - solga-swagger @@ -2747,7 +2796,6 @@ dont-distribute-packages: - sounddelay - soundgen - source-code-server - - SourceGraph - sparkle - sparrow - sparsebit @@ -2762,49 +2810,41 @@ dont-distribute-packages: - sphero - sphinx-cli - spice - - SpinCounter - spline3 - splines - - Spock-auth - - Spock-lucid - - Spock-worker - sprinkles - sproxy - - sproxy2 - sproxy-web - - sqlite-simple-typed + - sproxy2 - sql-simple-mysql - sql-simple-pool - sql-simple-postgresql - sql-simple-sqlite + - sqlite-simple-typed - sr-extra - sscgi - sshd-lint - sssp - sstable - stable-tree + - stack-hpc-coveralls + - stack-network + - stack-run-auto - stackage - - stackage2nix - stackage-build-plan - stackage-cabal - stackage-query - stackage-sandbox - stackage-setup - stackage-upload - - stack-hpc-coveralls - - stack-network - - stack-run-auto + - stackage2nix - starrover2 - stateful-mtl - static-closure - statsd-client - statsdi - - STLinkUSB - - STM32-Zombie - stmcontrol - - StockholmAlignment - storablevector-streamfusion - - Strafunski-Sdf2Haskell - stratux - stratux-demo - stratux-http @@ -2837,38 +2877,36 @@ dont-distribute-packages: - superconstraints - sv - sv-cassava + - sv-svfactor - svg2q - - SVG2Q - svgone - - sv-svfactor - swapper - swearjure - sweet-egison - switch - sylvia + - sym-plot - symantic-atom - symantic-lib - symbiote - symmetry-operations-symbols - - sym-plot - syncthing-hs - syntax - syntax-attoparsec - syntax-example - syntax-example-json - - SyntaxMacros - - syntaxnet-haskell - syntax-pretty - syntax-printer + - syntaxnet-haskell - synthesizer-llvm - systemstats - t3-client - ta + - tag-stream - tagged-list - tagged-th - tagsoup-navigate - tagstew - - tag-stream - tal - tamarin-prover - tamarin-prover-term @@ -2883,15 +2921,12 @@ dont-distribute-packages: - tasty-laws - tasty-lens - tateti-tateti - - Taxonomy - - TaxonomyTools - tbox - tccli - tdd-util - tdlib - tdlib-gen - tdlib-types - - TeaHS - techlab - telegram-bot - telegram-raw-api @@ -2901,35 +2936,34 @@ dont-distribute-packages: - tensorflow-ops - terminal-text - terrahs - - testbench - test-framework-sandbox - test-sandbox-compose - test-sandbox-hunit - test-sandbox-quickcheck - test-simple - - TeX-my-math - - textmatetags + - testbench - text-plus - text-trie - text-xml-generic + - textmatetags - th-alpha - th-context + - th-instances + - th-typegraph - theatre - theoremquest-client - thimk - - th-instances - - th-typegraph - thumbnail-polish - - tickle - tic-tac-toe + - tickle - tidal-serial - tighttp - timberc - time-exts - time-http - time-io-access - - timeprint - time-warp + - timeprint - timezone-unix - tinyMesh - tip-haskell-frontend @@ -2937,13 +2971,13 @@ dont-distribute-packages: - titan - tls-extra - tn + - to-string-instances - toboggan - todos - toktok - too-many-cells - top - topkata - - to-string-instances - total-map - toxcore - toxcore-c @@ -2963,14 +2997,11 @@ dont-distribute-packages: - trasa-reflex - trasa-server - trasa-th - - TreeCounter - treemap-html-tools - treersec - - Treiber - trek-app - trek-db - triangulation - - TrieMap - tries - trimpolya - truelevel @@ -2997,22 +3028,20 @@ dont-distribute-packages: - type-assertions - type-cache - type-cereal - - TypeClass - type-combinators-quote - type-combinators-singletons - - typed-encoding-encoding - type-digits - - typed-spreadsheet - - typed-streams - - TypeIlluminator - - typelevel - - typelevel-rewrite-rules - type-ord - type-ord-spine-cereal - - typescript-docs - type-sets - type-structure - type-sub-th + - typed-encoding-encoding + - typed-spreadsheet + - typed-streams + - typelevel + - typelevel-rewrite-rules + - typescript-docs - typson-beam - typson-esqueleto - typson-selda @@ -3021,20 +3050,19 @@ dont-distribute-packages: - ucam-webauth - uhc-light - uhc-util - - UMM - unagi-bloomfilter - unbound - unfoldable-restricted - - unicode-normalization - uni-events - - uniformBase - - uniform-io - uni-graphs - uni-htk - uni-posixutil - - uniqueness-periods-vector-examples - uni-reactor - uni-uDrawGraph + - unicode-normalization + - uniform-io + - uniformBase + - uniqueness-periods-vector-examples - universe-th - unix-fcntl - unix-simple @@ -3050,8 +3078,6 @@ dont-distribute-packages: - urembed - uri-enumerator - uri-enumerator-file - - UrlDisp - - URLT - usb - usb-enumerator - usb-hid @@ -3087,7 +3113,6 @@ dont-distribute-packages: - vformat-aeson - vformat-time - vfr-waypoints - - ViennaRNA-extras - vigilance - vimeta - vinyl-operational @@ -3101,7 +3126,6 @@ dont-distribute-packages: - vty-ui-extras - waargonaut - wahsp - - wai-cli - wai-devel - wai-dispatch - wai-handler-snap @@ -3116,26 +3140,18 @@ dont-distribute-packages: - wai-thrift - waldo - warped - - WashNGo - - WAVE - - WaveFront - wavesurfer - wavy - - web3 - - webapi - - WebBits-Html - - WebBits-multiplate - - WebCont - - webcrank-wai - - webdriver-w3c - web-mongrel2 - web-page - web-rep - web-routes-regular - web-routing + - web3 + - webapi + - webcrank-wai + - webdriver-w3c - webserver - - WEditorBrick - - WEditorHyphen - weighted - werewolf-slack - what4 @@ -3146,13 +3162,11 @@ dont-distribute-packages: - wikipedia4epub - windowslive - winio - - WL500gPControl - - wlc-hs - wl-pprint-ansiterm - wl-pprint-terminfo + - wlc-hs - wobsurv - wolf - - WordAlignment - workflow-extra - workflow-pure - workflow-types @@ -3163,28 +3177,23 @@ dont-distribute-packages: - writer-cps-full - wss-client - wtk-gtk + - wu-wei - wumpus-basic - wumpus-drawing - wumpus-microprint - wumpus-tree - - WURFL - - wu-wei - wx - wxAsteroids + - wxFruit + - wxSimpleCanvas - wxc - wxcore - - WXDiffCtrl - - wxFruit - - WxGeneric - wxhnotepad - - wxSimpleCanvas - wxturtle - wyvern - xdcc - xhb-atom-cache - xhb-ewmh - - XML - - xml2x - xml-catalog - xml-enumerator - xml-enumerator-combinators @@ -3193,34 +3202,31 @@ dont-distribute-packages: - xml-push - xml-query-xml-conduit - xml-query-xml-types - - xmltv - xml-tydom-conduit + - xml2x + - xmltv - xmms2-client - xmms2-client-glib - xmonad-contrib-bluetilebranch - xmpipe - - XMPP - xournal-builder - xournal-convert - xournal-parser - xournal-render - - XSaiga - xtc - - Yablog - - YACPong - yajl-enumerator - yam - yam-datasource - yam-job - yam-logger - - yaml-rpc-scotty - - yaml-rpc-snap - - yaml-unscrambler - yam-redis - yam-transaction - yam-transaction-odbc - yam-transaction-postgresql - yam-web + - yaml-rpc-scotty + - yaml-rpc-snap + - yaml-unscrambler - yarr-image-io - yavie - ycextra @@ -3243,15 +3249,12 @@ dont-distribute-packages: - yesod-session-redis - yjftp - yjftp-libs - - Yogurt - - Yogurt-Standalone - yoko - york-lava - yql - yu-launch - yuuko - zasni-gerna - - Z-Botan - zephyr - zerobin - zeromq3-conduit @@ -3263,16 +3266,13 @@ dont-distribute-packages: - zifter-hindent - zifter-hlint - zifter-stack - - Z-IO - zipper - zippo - ziptastic-client - zlib-enum - zmcat - - Z-MessagePack - zoom-cache - zoom-cache-pcm - zoom-cache-sndfile - zoovisitor - zuramaru - - Z-YAML diff --git a/nixpkgs/pkgs/development/haskell-modules/generic-builder.nix b/nixpkgs/pkgs/development/haskell-modules/generic-builder.nix index 2b2f23e20eaf..e76f5012f957 100644 --- a/nixpkgs/pkgs/development/haskell-modules/generic-builder.nix +++ b/nixpkgs/pkgs/development/haskell-modules/generic-builder.nix @@ -44,6 +44,7 @@ in , libraryFrameworkDepends ? [], executableFrameworkDepends ? [] , homepage ? "https://hackage.haskell.org/package/${pname}" , platforms ? with lib.platforms; all # GHC can cross-compile +, badPlatforms ? lib.platforms.none , hydraPlatforms ? null , hyperlinkSource ? true , isExecutable ? false, isLibrary ? !isExecutable @@ -52,6 +53,7 @@ in , enableParallelBuilding ? true , maintainers ? null , changelog ? null +, mainProgram ? null , doCoverage ? false , doHaddock ? !(ghc.isHaLVM or false) , passthru ? {} @@ -289,7 +291,7 @@ in lib.fix (drv: assert allPkgconfigDepends != [] -> pkg-config != null; stdenv.mkDerivation ({ - name = "${pname}-${version}"; + inherit pname version; outputs = [ "out" ] ++ (optional enableSeparateDataOutput "data") @@ -663,7 +665,9 @@ stdenv.mkDerivation ({ // optionalAttrs (args ? description) { inherit description; } // optionalAttrs (args ? maintainers) { inherit maintainers; } // optionalAttrs (args ? hydraPlatforms) { inherit hydraPlatforms; } + // optionalAttrs (args ? badPlatforms) { inherit badPlatforms; } // optionalAttrs (args ? changelog) { inherit changelog; } + // optionalAttrs (args ? mainProgram) { inherit mainProgram; } ; } diff --git a/nixpkgs/pkgs/development/haskell-modules/hackage-packages.nix b/nixpkgs/pkgs/development/haskell-modules/hackage-packages.nix index 87864a11e56a..4e8e61c05b08 100644 --- a/nixpkgs/pkgs/development/haskell-modules/hackage-packages.nix +++ b/nixpkgs/pkgs/development/haskell-modules/hackage-packages.nix @@ -7753,6 +7753,7 @@ self: { ]; description = "The Haskell/R mixed programming environment"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; }) {}; "HABQT" = callPackage @@ -8818,17 +8819,17 @@ self: { ({ mkDerivation, base, constraints, containers, data-default , deepseq, directory, doctest-exitcode-stdio, doctest-lib , exceptions, extra, hspec, monad-control, mono-traversable, mtl - , QuickCheck, regex-tdfa, syb, template-haskell, transformers-base - , unliftio + , QuickCheck, regex-tdfa, stm, syb, template-haskell + , transformers-base, unliftio }: mkDerivation { pname = "HMock"; - version = "0.1.0.1"; - sha256 = "1viv8aggapxvk1akm1z3976h4b12wa8zwkr5qinfpvmsgvlkhhlz"; + version = "0.2.0.0"; + sha256 = "1i5b9fxb5fii3ib97dncr5pfsylj5bsppi45qx7wq1idmz0fq3rj"; libraryHaskellDepends = [ base constraints containers data-default exceptions extra - monad-control mono-traversable mtl regex-tdfa syb template-haskell - transformers-base unliftio + monad-control mono-traversable mtl regex-tdfa stm syb + template-haskell transformers-base unliftio ]; testHaskellDepends = [ base containers data-default deepseq directory @@ -35089,8 +35090,8 @@ self: { }: mkDerivation { pname = "attoparsec-data"; - version = "1.0.5.1"; - sha256 = "1fn28rg79w5kkv3lrmqjcff8fhn1kc2b84vnblr0xqbfdjdbzgp6"; + version = "1.0.5.2"; + sha256 = "05x7xij5jyfzcl0hyjjw4lxlzgkmi55q48s5vbgvba48a2crv0qj"; libraryHaskellDepends = [ attoparsec attoparsec-time base bytestring scientific text time uuid @@ -35234,16 +35235,12 @@ self: { }) {}; "attoparsec-time" = callPackage - ({ mkDerivation, attoparsec, base, bytestring, scientific, text - , time - }: + ({ mkDerivation, attoparsec, base, bytestring, text, time }: mkDerivation { pname = "attoparsec-time"; - version = "1.0.1.1"; - sha256 = "1g3wfc499zdz79i06hgg4286ky9yv4mi3jgq1zf92ik1wcw23q6l"; - libraryHaskellDepends = [ - attoparsec base bytestring scientific text time - ]; + version = "1.0.1.2"; + sha256 = "1pc4dy4d6q11cfmgrg41h2nm34vgnnarah85gnwbd6x48cissrpp"; + libraryHaskellDepends = [ attoparsec base bytestring text time ]; description = "Attoparsec parsers of time"; license = lib.licenses.mit; }) {}; @@ -38232,6 +38229,8 @@ self: { pname = "base32"; version = "0.2.1.0"; sha256 = "1c1qzbri6m8b2m1cr68vrjbny6wlvfyrbfyzd61s83a3y3w39plp"; + revision = "1"; + editedCabalFile = "0apyphnlsnr16s5xb9b9g7d5aw3ny4qx8nz8y71zpglk63sy0cq0"; libraryHaskellDepends = [ base bytestring deepseq ghc-byteorder text text-short ]; @@ -39495,6 +39494,35 @@ self: { broken = true; }) {}; + "bech32_1_1_1" = callPackage + ({ mkDerivation, array, base, base58-bytestring, bytestring + , containers, deepseq, extra, hspec, hspec-discover, memory + , optparse-applicative, process, QuickCheck, text, vector + }: + mkDerivation { + pname = "bech32"; + version = "1.1.1"; + sha256 = "0ibdibki3f51wpxby3cl6p0xzd32ddczlg2dcqxy7lgx7j3h9xgn"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + array base bytestring containers extra text + ]; + executableHaskellDepends = [ + base base58-bytestring bytestring extra memory optparse-applicative + text + ]; + testHaskellDepends = [ + base base58-bytestring bytestring containers deepseq extra hspec + memory process QuickCheck text vector + ]; + testToolDepends = [ hspec-discover ]; + description = "Implementation of the Bech32 cryptocurrency address format (BIP 0173)"; + license = lib.licenses.asl20; + hydraPlatforms = lib.platforms.none; + broken = true; + }) {}; + "bech32-th" = callPackage ({ mkDerivation, base, bech32, hspec, hspec-discover , template-haskell, text @@ -39513,6 +39541,22 @@ self: { hydraPlatforms = lib.platforms.none; }) {}; + "bech32-th_1_1_1" = callPackage + ({ mkDerivation, base, bech32, hspec, hspec-discover + , template-haskell, text + }: + mkDerivation { + pname = "bech32-th"; + version = "1.1.1"; + sha256 = "0548an9v6y14qalb1agl5bskcmpb9865lxyap162xzgskd9s4iik"; + libraryHaskellDepends = [ base bech32 template-haskell text ]; + testHaskellDepends = [ base bech32 hspec template-haskell ]; + testToolDepends = [ hspec-discover ]; + description = "Template Haskell extensions to the Bech32 library"; + license = lib.licenses.asl20; + hydraPlatforms = lib.platforms.none; + }) {}; + "bed-and-breakfast" = callPackage ({ mkDerivation, array, base, binary, cpphs, deepseq, QuickCheck , template-haskell @@ -44256,8 +44300,8 @@ self: { }: mkDerivation { pname = "blucontrol"; - version = "0.5.1.1"; - sha256 = "0v3ifwxjbxm86ybn5daqqfdm4nmbfzlbkyc19d4nawnzjyf8v2p9"; + version = "0.6.0.0"; + sha256 = "1rywy6r5wachz3y9vw1iy5b46fvlxcv5s33lrriffimqprkglbcj"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -47353,8 +47397,8 @@ self: { }: mkDerivation { pname = "bytebuild"; - version = "0.3.7.0"; - sha256 = "1vckm98sarxzqh6ib89y5kzhbf1yxc9wgrbpwbsrh0dv5gi3pclj"; + version = "0.3.8.0"; + sha256 = "19gg4qjlj595j8zd0n6cz2kgz70g8z6w666c6wlf5lj32j8p6yh5"; libraryHaskellDepends = [ base byteslice bytestring integer-logarithms natural-arithmetic primitive primitive-offset primitive-unlifted run-st text-short @@ -50184,8 +50228,8 @@ self: { }: mkDerivation { pname = "calamity"; - version = "0.1.30.2"; - sha256 = "0i0v8cb0a3mbkrb3liw60gb7zflnps5w04a6nx5aynini7mpwanj"; + version = "0.1.30.3"; + sha256 = "0r6vrcdqqf6a8rihjgppmp625ws5vmsmq98i177xfg14hsal49pp"; libraryHaskellDepends = [ aeson async base bytestring calamity-commands colour concurrent-extra connection containers data-default-class @@ -53125,7 +53169,6 @@ self: { ]; description = "A REST Web Api server template for building (micro)services"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; }) {}; "chalk" = callPackage @@ -54638,6 +54681,8 @@ self: { ]; description = "Channel/Arrow based streaming computation library"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "cielo" = callPackage @@ -58667,6 +58712,24 @@ self: { license = lib.licenses.mit; }) {}; + "colour_2_3_6" = callPackage + ({ mkDerivation, base, QuickCheck, random, test-framework + , test-framework-quickcheck2 + }: + mkDerivation { + pname = "colour"; + version = "2.3.6"; + sha256 = "0wgqj64mh2y2zk77kv59k3xb3dk4wmgfp988y74sp9a4d76mvlrc"; + enableSeparateDataOutput = true; + libraryHaskellDepends = [ base ]; + testHaskellDepends = [ + base QuickCheck random test-framework test-framework-quickcheck2 + ]; + description = "A model for human colour/color perception"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + }) {}; + "colour-accelerate" = callPackage ({ mkDerivation, accelerate, base }: mkDerivation { @@ -67215,8 +67278,8 @@ self: { }: mkDerivation { pname = "cuckoo"; - version = "0.2.1"; - sha256 = "1bv39vfg0yzancyya1cdbrcdc0gasp0djcc9ryiwrc3kf9y0nbzn"; + version = "0.2.2"; + sha256 = "1wm81a5fsq0wdvx3ayxfrljya7rm9c0vfmy5dhxa6h9zxnqrkvav"; libraryHaskellDepends = [ base memory primitive random vector ]; testHaskellDepends = [ base bytestring cryptonite doctest hashable memory primitive @@ -69699,6 +69762,18 @@ self: { license = lib.licenses.mit; }) {}; + "data-lens-light_0_1_2_3" = callPackage + ({ mkDerivation, base, mtl, template-haskell }: + mkDerivation { + pname = "data-lens-light"; + version = "0.1.2.3"; + sha256 = "1xczbmgin315qh9wpl6v2vvnp6hv1irfbfqs7pk034qcpx61fwdl"; + libraryHaskellDepends = [ base mtl template-haskell ]; + description = "Simple lenses, minimum dependencies"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + }) {}; + "data-lens-template" = callPackage ({ mkDerivation, base, data-lens, template-haskell }: mkDerivation { @@ -73854,6 +73929,8 @@ self: { pname = "dhall-docs"; version = "1.0.6"; sha256 = "004n8kh8riw67aqwp6z9199jwv2c9r1dbkg92s71vd9zc04wxljv"; + revision = "1"; + editedCabalFile = "1m8ms4y4pxiays620k4zjf7hnfk103y990pnhnb6hr0h70n7i157"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -74537,6 +74614,8 @@ self: { pname = "diagrams-graphviz"; version = "1.4.1.1"; sha256 = "0lscrxd682jvyrl5bj4dxp7593qwyis01sl0p4jm2jfn335wdq40"; + revision = "1"; + editedCabalFile = "1qx69541pxf71whfz2a913yzbhfcks2pyzfprkgrcmiiyv0a3i7b"; libraryHaskellDepends = [ base containers diagrams-lib fgl graphviz split ]; @@ -75620,8 +75699,8 @@ self: { }: mkDerivation { pname = "digraph"; - version = "0.2"; - sha256 = "0k6kr1vr25i2jvv2q1xby06b7xkpg2dr4sq2ffnv0lmznshjy8y5"; + version = "0.2.1"; + sha256 = "04x8y6snlfm8w22l0mn58sqbgdsc3av9l6qz2wqfdjmcp7h7s79r"; libraryHaskellDepends = [ base containers deepseq hashable massiv mwc-random streaming transformers unordered-containers @@ -78678,8 +78757,8 @@ self: { }: mkDerivation { pname = "domain"; - version = "0.1.1.1"; - sha256 = "1vy789dv1lpha2bxvr0x1vk2vvgb9z43abkqi1rbj2vvirqsbr1n"; + version = "0.1.1.2"; + sha256 = "0s4x7jhhcx94fzi8cg5bqfqn2vajdlv1yjrakfnfdqk187zbdc6r"; libraryHaskellDepends = [ attoparsec base bytestring domain-core foldl hashable parser-combinators template-haskell template-haskell-compat-v0208 @@ -78687,7 +78766,8 @@ self: { ]; testHaskellDepends = [ base domain-core QuickCheck quickcheck-instances rerebase tasty - tasty-hunit tasty-quickcheck template-haskell text th-orphans + tasty-hunit tasty-quickcheck template-haskell + template-haskell-compat-v0208 text th-orphans ]; description = "Codegen helping you define domain models"; license = lib.licenses.mit; @@ -85429,7 +85509,7 @@ self: { license = lib.licenses.bsd3; }) {}; - "esqueleto_3_5_1_0" = callPackage + "esqueleto_3_5_2_0" = callPackage ({ mkDerivation, aeson, attoparsec, base, blaze-html, bytestring , conduit, containers, exceptions, hspec, hspec-core, monad-logger , mtl, mysql, mysql-simple, persistent, persistent-mysql @@ -85439,8 +85519,8 @@ self: { }: mkDerivation { pname = "esqueleto"; - version = "3.5.1.0"; - sha256 = "1r77lym11gh53059b3hg5wyzb4ymaynk5awrmzgnwfkmx041sqp8"; + version = "3.5.2.0"; + sha256 = "06z5n0nbyrdvzlfqmx3jvh76kkss3bis19k5ppqkifsfgwi07rzw"; libraryHaskellDepends = [ aeson attoparsec base blaze-html bytestring conduit containers monad-logger persistent resourcet tagged text time transformers @@ -88678,8 +88758,8 @@ self: { }: mkDerivation { pname = "fakedata-quickcheck"; - version = "0.1.0"; - sha256 = "0al5brin9bs0553rrw073za4jzw2whrf05yj6h34lmx4kxzciv6s"; + version = "0.2.0"; + sha256 = "0m70r66vbkgi1d016cpgahaas17hysabp44nigz4cda9l3x6qmh6"; libraryHaskellDepends = [ base fakedata QuickCheck random ]; testHaskellDepends = [ base fakedata hspec hspec-core QuickCheck random regex-tdfa text @@ -96670,8 +96750,8 @@ self: { }: mkDerivation { pname = "funcons-tools"; - version = "0.2.0.11"; - sha256 = "1gi7db5mjq25xwl27ihsrg0ya1jgw5zhki5c1431rizj72yx5ji9"; + version = "0.2.0.13"; + sha256 = "0favv5lfhhhsjasn0gfx2m9q18j8qjk3w92ih78nqaam8gfg59vm"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -96693,10 +96773,10 @@ self: { ({ mkDerivation, base, bv, containers, multiset, text, vector }: mkDerivation { pname = "funcons-values"; - version = "0.1.0.7"; - sha256 = "0jdgwv44gs4zr8z5pg6lzikrgn3dzna8z0vriq71anlifjyci8yq"; + version = "0.1.0.9"; + sha256 = "1817jhp9vpipkvxdqvn4yj88z7z3pyrxs22h4d51c3056ighq6wn"; revision = "1"; - editedCabalFile = "1aam84wminmcy530vkv8g2qkag6gz45yyx5xks7gq1y7jifm1kkb"; + editedCabalFile = "1g807b4lpz0whz0v4xl7y0qj0682y9lvmng06rxxyabn2lcvx5sc"; libraryHaskellDepends = [ base bv containers multiset text vector ]; @@ -97353,6 +97433,8 @@ self: { pname = "futhark-data"; version = "1.0.0.1"; sha256 = "126b7igrk0aldj4kjwkyvvsy3v64g9iv6w9ladbbfnd4qw7svswm"; + revision = "1"; + editedCabalFile = "08p820dmdlg5x6ikgi69sddkywj71cnnjwz2fppnv901bbn55fav"; libraryHaskellDepends = [ base binary bytestring bytestring-to-vector containers megaparsec mtl text vector vector-binary-instances @@ -104049,8 +104131,9 @@ self: { libraryPkgconfigDepends = [ libwnck ]; description = "Wnck bindings"; license = lib.licenses.lgpl21Only; - hydraPlatforms = lib.platforms.none; - broken = true; + platforms = [ + "aarch64-linux" "armv7l-linux" "i686-linux" "x86_64-linux" + ]; }) {inherit (pkgs) libwnck;}; "gi-xlib" = callPackage @@ -104890,6 +104973,27 @@ self: { license = lib.licenses.bsd3; }) {}; + "githash_0_1_6_1" = callPackage + ({ mkDerivation, base, bytestring, directory, filepath, hspec + , process, template-haskell, temporary, th-compat, unliftio + }: + mkDerivation { + pname = "githash"; + version = "0.1.6.1"; + sha256 = "0g922g2l3xv795gvhri5ccrh751dnyckjs7mzv1d8pg2lffpj0bi"; + libraryHaskellDepends = [ + base bytestring directory filepath process template-haskell + th-compat + ]; + testHaskellDepends = [ + base bytestring directory filepath hspec process template-haskell + temporary th-compat unliftio + ]; + description = "Compile git revision info into Haskell projects"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "github" = callPackage ({ mkDerivation, aeson, base, base-compat, base16-bytestring , binary, binary-instances, bytestring, containers, cryptohash-sha1 @@ -105266,6 +105370,26 @@ self: { license = lib.licenses.bsd3; }) {}; + "gitlab-haskell_0_3_0" = callPackage + ({ mkDerivation, aeson, base, bytestring, connection, http-conduit + , http-types, tasty, tasty-hunit, temporary, text, time + , transformers, unix, unliftio, unliftio-core + }: + mkDerivation { + pname = "gitlab-haskell"; + version = "0.3.0"; + sha256 = "0krcan8i9lkickl77r9dyf93k96yxj5zp0asmzq86ds13m8f3s9i"; + enableSeparateDataOutput = true; + libraryHaskellDepends = [ + aeson base bytestring connection http-conduit http-types temporary + text time transformers unix unliftio unliftio-core + ]; + testHaskellDepends = [ aeson base bytestring tasty tasty-hunit ]; + description = "A Haskell library for the GitLab web API"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "gitlib" = callPackage ({ mkDerivation, base, base16-bytestring, bytestring, conduit , conduit-combinators, containers, directory, exceptions, filepath @@ -129646,8 +129770,8 @@ self: { }: mkDerivation { pname = "hledger-flow"; - version = "0.14.3.0"; - sha256 = "113lr6b47fs3900wrn8fg1kxcbvfh91gla7585h13miz3wyjbdyf"; + version = "0.14.4"; + sha256 = "1qvh5vgnk6vrhhr1kjqsycz13acxa7ynpqnd1bmchfl4q3aga9gw"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -138853,6 +138977,8 @@ self: { ]; description = "SSH protocol implementation"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "hsshellscript" = callPackage @@ -139686,8 +139812,8 @@ self: { pname = "html-parse"; version = "0.2.0.2"; sha256 = "0dm771lrrqc87ygbr3dzyl1vsyi30jgr7l0isvsbqyah7s4zyg38"; - revision = "1"; - editedCabalFile = "1hr9bskwwx3svxqaxcyaz8v0brli1bb03xcvg7zpgbisf8x6r316"; + revision = "2"; + editedCabalFile = "1arck1sfcnqfczpi6zq4rja3svd3vcxxdi69dv9983v3sl01hk2g"; libraryHaskellDepends = [ attoparsec base containers deepseq text ]; @@ -144402,8 +144528,8 @@ self: { }: mkDerivation { pname = "hypertypes"; - version = "0.1.0.1"; - sha256 = "0b3cnjw07pryqslnx0k6lxdpwnihnk6pnhp6l9d09mqyxymd9nyx"; + version = "0.1.0.2"; + sha256 = "1zh10884a2fvj06ndh4hz2vk97x4nibr57b30kgq731x4q50zgfs"; libraryHaskellDepends = [ array base base-compat binary constraints containers deepseq generic-constraints generic-data lattices lens monad-st mtl pretty @@ -145703,6 +145829,7 @@ self: { ]; description = "Embed R quasiquotes and plots in IHaskell notebooks"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; }) {}; "ihaskell-juicypixels" = callPackage @@ -147694,6 +147821,8 @@ self: { ]; description = "Seamlessly call R from Haskell and vice versa. No FFI required."; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; }) {inherit (pkgs) R;}; "inliterate" = callPackage @@ -149399,8 +149528,8 @@ self: { ({ mkDerivation, base, binary, bytestring, iproute }: mkDerivation { pname = "ip2location"; - version = "8.2.1"; - sha256 = "1ccr15yn2ska5wgwlcnfpi9w1xxkly0pwqibmdl9a1ggmwfsskv0"; + version = "8.3.1"; + sha256 = "01sdx0j0rm7rgylac51mk4ph5krdnzdd8532di5g5ik3p112dzg8"; libraryHaskellDepends = [ base binary bytestring iproute ]; description = "IP2Location Haskell package for IP geolocation"; license = lib.licenses.mit; @@ -153778,8 +153907,8 @@ self: { }: mkDerivation { pname = "jukebox"; - version = "0.5.3"; - sha256 = "00774gby970jxa69zw8baki40r6nw7vrprc670n8skmlp03p38j2"; + version = "0.5.4"; + sha256 = "10lmx9xwikk4sbc3ffpzqff9qxpphgp2q8w2rdm2iskaa7qi3skn"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -156121,8 +156250,8 @@ self: { }: mkDerivation { pname = "knit"; - version = "0.2.0.0"; - sha256 = "0a1swv5w9fxissxqr2x61qijqyhdxs71fv21fjz4r0kcqywnvy6x"; + version = "0.3.0.0"; + sha256 = "0wp16yrlibfl32b4akcwali074wxar96mvaykgh0xsf4pq1czx3q"; libraryHaskellDepends = [ base bytestring containers deepseq hashtables vector ]; @@ -164941,6 +165070,31 @@ self: { license = lib.licenses.mit; }) {}; + "literatex_0_2_0_0" = callPackage + ({ mkDerivation, ansi-wl-pprint, base, bytestring, conduit + , filepath, optparse-applicative, tasty, tasty-hunit, text, ttc + , unliftio + }: + mkDerivation { + pname = "literatex"; + version = "0.2.0.0"; + sha256 = "1j5x1hfh71jpywgwpbyir74h58b6lzaj7gpk2f07xlcwqmm68syz"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base bytestring conduit text ttc unliftio + ]; + executableHaskellDepends = [ + ansi-wl-pprint base optparse-applicative ttc + ]; + testHaskellDepends = [ + base bytestring filepath tasty tasty-hunit text ttc unliftio + ]; + description = "transform literate source code to Markdown"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + }) {}; + "little-earley" = callPackage ({ mkDerivation, base, containers, mtl, tasty, tasty-hunit }: mkDerivation { @@ -166064,8 +166218,8 @@ self: { }: mkDerivation { pname = "log-elasticsearch"; - version = "0.12.0.0"; - sha256 = "05cvk93s61k42bmsmj4997hdij4xk74a6jrd1qvdbkq13w20260m"; + version = "0.12.1.0"; + sha256 = "07z0p5jcd5gjhk4dyf9ny74l68ja58ffa80mbfsyaz66ff6k4y6s"; libraryHaskellDepends = [ aeson aeson-pretty base base64-bytestring bytestring deepseq http-client http-client-tls http-types log-base network-uri @@ -171134,6 +171288,29 @@ self: { broken = true; }) {}; + "matrix-client" = callPackage + ({ mkDerivation, aeson, base, base64, bytestring, doctest + , exceptions, hashable, hspec, http-client, http-client-tls, retry + , SHA, text, time, unordered-containers + }: + mkDerivation { + pname = "matrix-client"; + version = "0.1.0.0"; + sha256 = "10w1q846b4jnyg9yb87d69ixfyhl205ryrib6a53pbk0bx6zn59w"; + libraryHaskellDepends = [ + aeson base base64 bytestring exceptions hashable http-client + http-client-tls retry SHA text time unordered-containers + ]; + testHaskellDepends = [ + aeson base base64 bytestring doctest exceptions hashable hspec + http-client http-client-tls retry SHA text time + unordered-containers + ]; + description = "A matrix client library"; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ maralorn ]; + }) {}; + "matrix-lens" = callPackage ({ mkDerivation, base, hedgehog, lens, matrix, tasty , tasty-discover, tasty-hedgehog, tasty-hspec, vector @@ -172903,16 +173080,14 @@ self: { }) {}; "merkle-log" = callPackage - ({ mkDerivation, base, bytestring, cereal, criterion, cryptonite - , deepseq, exceptions, hash-tree, memory, merkle-tree, mwc-random - , QuickCheck, random, random-bytestring, text + ({ mkDerivation, base, bytestring, criterion, cryptonite, deepseq + , exceptions, hash-tree, memory, mwc-random, QuickCheck, random + , random-bytestring, text }: mkDerivation { pname = "merkle-log"; - version = "0.1.0.0"; - sha256 = "07q0ifgwq8agwm62k1k83sdrln4zbj6ln90nw9p9g3pgxnp3inia"; - revision = "1"; - editedCabalFile = "1vrzsflvmx0mrsdb7i7pbz4d74k6yjccrb7979yw0r91qhmzlcir"; + version = "0.1.1"; + sha256 = "17a6s9xbv460289avbwdnf8c4vhw9qzj5xddxvfmnjjwp58qxvj1"; libraryHaskellDepends = [ base bytestring cryptonite deepseq exceptions memory text ]; @@ -172920,8 +173095,8 @@ self: { base bytestring cryptonite deepseq exceptions memory QuickCheck ]; benchmarkHaskellDepends = [ - base bytestring cereal criterion cryptonite deepseq hash-tree - memory merkle-tree mwc-random QuickCheck random random-bytestring + base bytestring criterion cryptonite deepseq hash-tree memory + mwc-random QuickCheck random random-bytestring ]; description = "Merkle Tree Logs"; license = lib.licenses.bsd3; @@ -173594,31 +173769,33 @@ self: { }) {}; "microformats2-parser" = callPackage - ({ mkDerivation, aeson, aeson-pretty, aeson-qq, attoparsec, base - , base-compat, blaze-html, blaze-markup, bytestring, containers - , data-default, either, errors, hspec - , hspec-expectations-pretty-diff, html-conduit, lens-aeson, mtl - , network, network-uri, options, pcre-heavy, raw-strings-qq, safe - , scotty, tagsoup, template-haskell, text, time, transformers - , unordered-containers, vector, wai-cli, wai-extra, xml-lens - , xss-sanitize + ({ mkDerivation, aeson, aeson-pretty, aeson-qq, attoparsec + , aws-lambda-haskell-runtime, aws-lambda-haskell-runtime-wai, base + , base-compat, blaze-html, blaze-markup, bytestring + , case-insensitive, containers, data-default, either, errors + , githash, hspec, hspec-expectations-pretty-diff, html-conduit + , lens, lens-aeson, mtl, network, network-uri, options, pcre-heavy + , raw-strings-qq, safe, scotty, tagsoup, template-haskell, text + , time, transformers, unordered-containers, vector, wai, wai-cli + , wai-extra, xml-lens, xss-sanitize }: mkDerivation { pname = "microformats2-parser"; - version = "1.0.1.9"; - sha256 = "1lxbw825yg16nmflf93l1sy6mxa3dnd7a5mdalc034brsnf1vish"; + version = "1.0.2.0"; + sha256 = "1vrw60az8jb3m9kk2vsn1v5l68jmwxsfw3p7lfwl9a8d4gk5m1gp"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ aeson aeson-qq attoparsec base base-compat blaze-markup bytestring - containers data-default either errors html-conduit lens-aeson - network-uri pcre-heavy safe tagsoup text time transformers - unordered-containers vector xml-lens xss-sanitize + case-insensitive containers data-default either errors html-conduit + lens lens-aeson network-uri pcre-heavy safe tagsoup text time + transformers unordered-containers vector xml-lens xss-sanitize ]; executableHaskellDepends = [ - aeson aeson-pretty base base-compat blaze-html blaze-markup - data-default network network-uri options scotty text wai-cli - wai-extra + aeson aeson-pretty aws-lambda-haskell-runtime + aws-lambda-haskell-runtime-wai base base-compat blaze-html + blaze-markup data-default githash network network-uri options + scotty text wai wai-cli wai-extra ]; testHaskellDepends = [ aeson-qq base base-compat bytestring data-default hspec @@ -173628,6 +173805,7 @@ self: { description = "A Microformats 2 parser"; license = lib.licenses.publicDomain; hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "microformats2-types" = callPackage @@ -189008,8 +189186,8 @@ self: { pname = "nvim-hs"; version = "2.1.0.4"; sha256 = "0bg94adja6xvzlv1x849nrfpb0i5mjbp19f9cwhaa4iw1qs532rf"; - revision = "1"; - editedCabalFile = "0yzdq8nxf2n7n4ns6frgl5nhgb3vj3nkh7336mz994iydam17wcl"; + revision = "2"; + editedCabalFile = "0bd90ndkk4lll4rvr87b9vil2h8jlchkh1fag1nrhj90lnczgpnl"; libraryHaskellDepends = [ base bytestring cereal cereal-conduit conduit containers data-default deepseq foreign-store hslogger megaparsec messagepack @@ -189033,6 +189211,44 @@ self: { license = lib.licenses.asl20; }) {}; + "nvim-hs_2_1_0_5" = callPackage + ({ mkDerivation, base, bytestring, cereal, cereal-conduit, conduit + , containers, data-default, deepseq, foreign-store, hslogger, hspec + , hspec-discover, HUnit, megaparsec, messagepack, mtl, network + , optparse-applicative, path, path-io, prettyprinter + , prettyprinter-ansi-terminal, QuickCheck, resourcet, stm + , streaming-commons, template-haskell, text, time + , time-locale-compat, transformers, transformers-base + , typed-process, unliftio, unliftio-core, utf8-string, vector, void + }: + mkDerivation { + pname = "nvim-hs"; + version = "2.1.0.5"; + sha256 = "11ld5bgrica3ma54f7x37hcbcl0ms3x6gi0326by3jsnskxplz0z"; + libraryHaskellDepends = [ + base bytestring cereal cereal-conduit conduit containers + data-default deepseq foreign-store hslogger megaparsec messagepack + mtl network optparse-applicative path path-io prettyprinter + prettyprinter-ansi-terminal resourcet stm streaming-commons + template-haskell text time time-locale-compat transformers + transformers-base typed-process unliftio unliftio-core utf8-string + vector void + ]; + testHaskellDepends = [ + base bytestring cereal cereal-conduit conduit containers + data-default foreign-store hslogger hspec hspec-discover HUnit + megaparsec messagepack mtl network optparse-applicative path + path-io prettyprinter prettyprinter-ansi-terminal QuickCheck + resourcet stm streaming-commons template-haskell text time + time-locale-compat transformers transformers-base typed-process + unliftio unliftio-core utf8-string vector + ]; + testToolDepends = [ hspec-discover ]; + description = "Haskell plugin backend for neovim"; + license = lib.licenses.asl20; + hydraPlatforms = lib.platforms.none; + }) {}; + "nvim-hs-contrib" = callPackage ({ mkDerivation, base, bytestring, data-default, directory , filepath, hspec, hspec-discover, messagepack, mtl, nvim-hs @@ -192465,12 +192681,12 @@ self: { }) {}; "optparse-declarative" = callPackage - ({ mkDerivation, base, mtl }: + ({ mkDerivation, base, exceptions, mtl }: mkDerivation { pname = "optparse-declarative"; - version = "0.4.1"; - sha256 = "0paa7r64y0nb9yv3x387pdid68lnc1gn2m28kcli55dvh1x4wwxr"; - libraryHaskellDepends = [ base mtl ]; + version = "0.4.2"; + sha256 = "0a8b4aa5zvj36nj81kfylxcqfp9ahi5lnak61wvwv9bw68r2a2jn"; + libraryHaskellDepends = [ base exceptions mtl ]; description = "Declarative command line option parser"; license = lib.licenses.mit; }) {}; @@ -192541,6 +192757,26 @@ self: { license = lib.licenses.bsd3; }) {}; + "optparse-simple_0_1_1_4" = callPackage + ({ mkDerivation, base, bytestring, directory, githash + , optparse-applicative, template-haskell, th-compat, transformers + }: + mkDerivation { + pname = "optparse-simple"; + version = "0.1.1.4"; + sha256 = "0y3qgab8csiwyv60cnpzpv65n3c0ikvdx5b5mfkfahkv8xfdh08x"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base githash optparse-applicative template-haskell th-compat + transformers + ]; + testHaskellDepends = [ base bytestring directory ]; + description = "Simple interface to optparse-applicative"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "optparse-text" = callPackage ({ mkDerivation, base, hspec, optparse-applicative, text }: mkDerivation { @@ -194186,6 +194422,65 @@ self: { maintainers = with lib.maintainers; [ peti ]; }) {}; + "pandoc_2_14_0_3" = callPackage + ({ mkDerivation, aeson, aeson-pretty, array, attoparsec, base + , base64-bytestring, binary, blaze-html, blaze-markup, bytestring + , case-insensitive, citeproc, commonmark, commonmark-extensions + , commonmark-pandoc, connection, containers, data-default, deepseq + , Diff, directory, doclayout, doctemplates, emojis, exceptions + , file-embed, filepath, Glob, haddock-library, hslua + , hslua-module-path, hslua-module-system, hslua-module-text, HsYAML + , HTTP, http-client, http-client-tls, http-types, ipynb + , jira-wiki-markup, JuicyPixels, mtl, network, network-uri + , pandoc-types, parsec, process, QuickCheck, random, safe + , scientific, SHA, skylighting, skylighting-core, split, syb + , tagsoup, tasty, tasty-bench, tasty-golden, tasty-hunit, tasty-lua + , tasty-quickcheck, temporary, texmath, text, text-conversions + , time, unicode-collation, unicode-transforms, unix + , unordered-containers, xml, xml-conduit, zip-archive, zlib + }: + mkDerivation { + pname = "pandoc"; + version = "2.14.0.3"; + sha256 = "1pgd6125mrvzj2faxbsfmackb7kchzcr6bjkrwqbyn9hzxdzbqw2"; + configureFlags = [ "-fhttps" "-f-trypandoc" ]; + isLibrary = true; + isExecutable = true; + enableSeparateDataOutput = true; + libraryHaskellDepends = [ + aeson aeson-pretty array attoparsec base base64-bytestring binary + blaze-html blaze-markup bytestring case-insensitive citeproc + commonmark commonmark-extensions commonmark-pandoc connection + containers data-default deepseq directory doclayout doctemplates + emojis exceptions file-embed filepath Glob haddock-library hslua + hslua-module-path hslua-module-system hslua-module-text HsYAML HTTP + http-client http-client-tls http-types ipynb jira-wiki-markup + JuicyPixels mtl network network-uri pandoc-types parsec process + random safe scientific SHA skylighting skylighting-core split syb + tagsoup temporary texmath text text-conversions time + unicode-collation unicode-transforms unix unordered-containers xml + xml-conduit zip-archive zlib + ]; + executableHaskellDepends = [ base ]; + testHaskellDepends = [ + base bytestring containers Diff directory doctemplates exceptions + filepath Glob hslua mtl pandoc-types process QuickCheck tasty + tasty-golden tasty-hunit tasty-lua tasty-quickcheck text time xml + zip-archive + ]; + benchmarkHaskellDepends = [ + base bytestring containers deepseq mtl tasty-bench text time + ]; + postInstall = '' + mkdir -p $out/share/man/man1 + mv "man/"*.1 $out/share/man/man1/ + ''; + description = "Conversion between markup formats"; + license = lib.licenses.gpl2Plus; + hydraPlatforms = lib.platforms.none; + maintainers = with lib.maintainers; [ peti ]; + }) {}; + "pandoc-citeproc" = callPackage ({ mkDerivation, aeson, aeson-pretty, attoparsec, base, bytestring , Cabal, containers, data-default, directory, filepath, hs-bibutils @@ -196066,8 +196361,8 @@ self: { ({ mkDerivation, base }: mkDerivation { pname = "parsec1"; - version = "1.0.0.7"; - sha256 = "1v9kq4g378v8pkj8ldpqwh9dwlng5idbxqqb8ywmzdjnglih34rf"; + version = "1.0.0.8"; + sha256 = "02zagbrn4w6gjl9awh4si5b6ia14p4rx22cssd03zx4ddb8kcwf7"; libraryHaskellDepends = [ base ]; description = "Portable monadic parser combinators"; license = lib.licenses.bsd3; @@ -199002,7 +199297,7 @@ self: { maintainers = with lib.maintainers; [ psibi ]; }) {}; - "persistent_2_13_0_3" = callPackage + "persistent_2_13_0_4" = callPackage ({ mkDerivation, aeson, attoparsec, base, base64-bytestring , blaze-html, bytestring, conduit, containers, criterion, deepseq , fast-logger, file-embed, hspec, http-api-data, lift-type @@ -199013,8 +199308,8 @@ self: { }: mkDerivation { pname = "persistent"; - version = "2.13.0.3"; - sha256 = "0jlrkyy10cz6rq47r75q9l5ycyrdjwxs810x7v5ijrimdd9cv24d"; + version = "2.13.0.4"; + sha256 = "04q4x50p2jpsp7fzrb61rs225hnrl8n1khmdvf0z6inkwq462w6a"; libraryHaskellDepends = [ aeson attoparsec base base64-bytestring blaze-html bytestring conduit containers fast-logger http-api-data lift-type monad-logger @@ -203390,6 +203685,8 @@ self: { ]; description = "run a subprocess, combining stdout and stderr"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "plist" = callPackage @@ -203588,8 +203885,8 @@ self: { }: mkDerivation { pname = "ploterific"; - version = "0.2.1.2"; - sha256 = "1ywg09amxngan23c5724c5s2s79yhynqha6c5xivg1ls58nc7yk5"; + version = "0.2.1.3"; + sha256 = "0ggi653hjg9s3v9zqsapm3ryb37hfdbw21pznhsvzhyy3n0fv7jv"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -204883,6 +205180,25 @@ self: { hydraPlatforms = lib.platforms.none; }) {}; + "polysemy-readline" = callPackage + ({ mkDerivation, base, exceptions, haskeline, polysemy + , polysemy-plugin + }: + mkDerivation { + pname = "polysemy-readline"; + version = "0.1.0.0"; + sha256 = "19nic0n5k3r5qbmhnrzwrkncj61ba43qmg86mx0y190mvx540yz1"; + libraryHaskellDepends = [ + base exceptions haskeline polysemy polysemy-plugin + ]; + testHaskellDepends = [ + base exceptions haskeline polysemy polysemy-plugin + ]; + description = "Readline effect for polysemy"; + license = lib.licenses.bsd2; + hydraPlatforms = lib.platforms.none; + }) {}; + "polysemy-resume" = callPackage ({ mkDerivation, base, hedgehog, polysemy, polysemy-plugin , polysemy-test, relude, tasty, tasty-hedgehog, text, transformers @@ -216627,24 +216943,24 @@ self: { , filepath, hashable, html-entities, http-conduit, HUnit , lifted-base, mmorph, mtl, network-uri, parsec, parsers , QuickCheck, safe, selective, tasty, tasty-hunit, tasty-quickcheck - , text, unordered-containers, xeno + , template-haskell, temporary, text, unordered-containers, xeno }: mkDerivation { pname = "rdf4h"; - version = "4.0.2"; - sha256 = "1gkz1i1v2509aa5c9jp2lgmsnnsr7d1314gq3xmcs21dfgf7xibw"; + version = "5.0.1"; + sha256 = "0i6sza600fzrk92pp9qc4ji361js5adg7ijf30hb9fdl854hjgk9"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ algebraic-graphs attoparsec base binary bytestring containers deepseq exceptions filepath hashable html-entities http-conduit - lifted-base mmorph mtl network-uri parsec parsers selective text - unordered-containers xeno + lifted-base mmorph mtl network-uri parsec parsers selective + template-haskell text unordered-containers xeno ]; executableHaskellDepends = [ base containers text ]; testHaskellDepends = [ - base containers directory filepath HUnit QuickCheck safe tasty - tasty-hunit tasty-quickcheck text + base bytestring containers directory filepath HUnit QuickCheck safe + tasty tasty-hunit tasty-quickcheck temporary text ]; benchmarkHaskellDepends = [ base criterion deepseq text ]; description = "A library for RDF processing in Haskell"; @@ -222901,6 +223217,7 @@ self: { description = "Robert Fischer's Common library"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "rfc-env" = callPackage @@ -223672,8 +223989,8 @@ self: { }: mkDerivation { pname = "rio-process-pool"; - version = "1.0.0"; - sha256 = "09v95wyrsa6yg5q5zaf9gqmn2xhh1i1q2mmxq52xhpc8pqwj93b9"; + version = "1.0.1"; + sha256 = "1r3w7p9yf2k2czdwm739y191x25ravbsn948wwgqxsqamsqs7l18"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -231554,14 +231871,41 @@ self: { license = lib.licenses.bsd3; }) {}; + "servant_0_18_3" = callPackage + ({ mkDerivation, aeson, attoparsec, base, base-compat, bifunctors + , bytestring, case-insensitive, deepseq, hspec, hspec-discover + , http-api-data, http-media, http-types, mmorph, mtl, network-uri + , QuickCheck, quickcheck-instances, singleton-bool, sop-core + , string-conversions, tagged, text, transformers, vault + }: + mkDerivation { + pname = "servant"; + version = "0.18.3"; + sha256 = "033ykm8l7a9bjcwb3v9d0ljglq1sxpjm1iss7nqakpyxljcg2sxp"; + libraryHaskellDepends = [ + aeson attoparsec base base-compat bifunctors bytestring + case-insensitive deepseq http-api-data http-media http-types mmorph + mtl network-uri QuickCheck singleton-bool sop-core + string-conversions tagged text transformers vault + ]; + testHaskellDepends = [ + aeson base base-compat bytestring hspec http-media mtl QuickCheck + quickcheck-instances string-conversions text transformers + ]; + testToolDepends = [ hspec-discover ]; + description = "A family of combinators for defining webservices APIs"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "servant-JuicyPixels" = callPackage ({ mkDerivation, base, bytestring, http-media, JuicyPixels, servant , servant-server, wai, warp }: mkDerivation { pname = "servant-JuicyPixels"; - version = "0.3.0.6"; - sha256 = "16bdlgrz71h03lr2xcd2isclfzgr9h2xdl5lbnbs0v1czaxx7m6h"; + version = "0.3.1.0"; + sha256 = "1mi9b84myy3sg35xxrna5pwjwkn51v0xsd300ssvy8xaj4k96wjk"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -231611,8 +231955,8 @@ self: { pname = "servant-auth"; version = "0.4.0.0"; sha256 = "0v2g80kakjwpws92bk3anzy4k8vgxq99y7g3ib4amc5x6kxcmjh1"; - revision = "2"; - editedCabalFile = "0mbx44l1jnvfvppv6diiixqx5rdkb68djxl36m5sd12qz6rqmcx0"; + revision = "3"; + editedCabalFile = "1hq0mz4fm2f6v57jzyahk5wfip285v3yh20dawvmwdh7wq6104zr"; libraryHaskellDepends = [ aeson base jose lens servant text unordered-containers ]; @@ -231631,8 +231975,8 @@ self: { pname = "servant-auth-client"; version = "0.4.1.0"; sha256 = "16rmwdrx0qyqa821ipayczzl3gv8gvqgx8k9q8qaw19w87hwkh83"; - revision = "1"; - editedCabalFile = "0q7bazq4ilijclpz23fshpjcspnrfalh7jhqi5gg03m00wwibn4n"; + revision = "2"; + editedCabalFile = "0mq9nhrlh44jxkngj06pasrrjzv5193lj6d2szprnncgrk36zi31"; libraryHaskellDepends = [ base bytestring containers servant servant-auth servant-client-core ]; @@ -231687,8 +232031,8 @@ self: { pname = "servant-auth-docs"; version = "0.2.10.0"; sha256 = "0j1ynnrb6plrhpb2vzs2p7a9jb41llp0j1jwgap7hjhkwhyc7wxd"; - revision = "7"; - editedCabalFile = "10178ahxq36l9mik7dcn1c1f97fpp8b4r7xiqwiv21llp95s7cqp"; + revision = "8"; + editedCabalFile = "01mb003lajxs1x82k20dbnxzdvxdla51vi4dh4f0a1xycvyhfpyi"; setupHaskellDepends = [ base Cabal cabal-doctest ]; libraryHaskellDepends = [ base lens servant servant-auth servant-docs text @@ -231753,8 +232097,8 @@ self: { pname = "servant-auth-server"; version = "0.4.6.0"; sha256 = "0isl9pzzhfbs8pgh3qr2vbgfp0bh741dfa59sq7n3cmbkc6ndpkk"; - revision = "2"; - editedCabalFile = "1vf0mnbq0wmwha3aa2fn593dwibaw00l4agspgvchx7574jyr5wp"; + revision = "3"; + editedCabalFile = "0iasfns12wab45hf4qkwm5bx1z63ass9n5sh926wnn82g1v6qdyw"; libraryHaskellDepends = [ aeson base base64-bytestring blaze-builder bytestring case-insensitive cookie data-default-class entropy http-types jose @@ -231779,8 +232123,8 @@ self: { pname = "servant-auth-swagger"; version = "0.2.10.1"; sha256 = "029nvb4wxwl98ah26bgcq1b7izrnvssxwn1682liimvsh4a8bady"; - revision = "2"; - editedCabalFile = "0b8fawx2wv9zshn9i4abnwy4lgf3fkhbhm8bhfpgm9d867dx21y4"; + revision = "3"; + editedCabalFile = "1hkszdp7c7c34b2yp2gb7khzlzq8iw5ma066r30kq2nw5jj895k0"; libraryHaskellDepends = [ base lens servant servant-auth servant-swagger swagger2 text ]; @@ -232112,6 +232456,37 @@ self: { license = lib.licenses.bsd3; }) {}; + "servant-client_0_18_3" = callPackage + ({ mkDerivation, aeson, base, base-compat, bytestring, containers + , deepseq, entropy, exceptions, hspec, hspec-discover + , http-api-data, http-client, http-media, http-types, HUnit + , kan-extensions, markdown-unlit, monad-control, mtl, network + , QuickCheck, semigroupoids, servant, servant-client-core + , servant-server, sop-core, stm, tdigest, text, time, transformers + , transformers-base, transformers-compat, wai, warp + }: + mkDerivation { + pname = "servant-client"; + version = "0.18.3"; + sha256 = "0ddn7x9z2znkkyn6l2x6a85vq673q4vppr0q9n56ibvl3k3saxj0"; + libraryHaskellDepends = [ + base base-compat bytestring containers deepseq exceptions + http-client http-media http-types kan-extensions monad-control mtl + semigroupoids servant servant-client-core stm text time + transformers transformers-base transformers-compat + ]; + testHaskellDepends = [ + aeson base base-compat bytestring entropy hspec http-api-data + http-client http-types HUnit kan-extensions markdown-unlit mtl + network QuickCheck servant servant-client-core servant-server + sop-core stm tdigest text transformers transformers-compat wai warp + ]; + testToolDepends = [ hspec-discover markdown-unlit ]; + description = "Automatic derivation of querying functions for servant"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "servant-client-core" = callPackage ({ mkDerivation, aeson, base, base-compat, base64-bytestring , bytestring, containers, deepseq, exceptions, free, hspec @@ -232135,6 +232510,28 @@ self: { license = lib.licenses.bsd3; }) {}; + "servant-client-core_0_18_3" = callPackage + ({ mkDerivation, aeson, base, base-compat, base64-bytestring + , bytestring, containers, deepseq, exceptions, free, hspec + , hspec-discover, http-media, http-types, network-uri, QuickCheck + , safe, servant, sop-core, template-haskell, text, transformers + }: + mkDerivation { + pname = "servant-client-core"; + version = "0.18.3"; + sha256 = "1iln4axymmmk3ib0wxmpzjgq16lip8nz7xich3ysgzx6g2n15xsd"; + libraryHaskellDepends = [ + aeson base base-compat base64-bytestring bytestring containers + deepseq exceptions free http-media http-types network-uri safe + servant sop-core template-haskell text transformers + ]; + testHaskellDepends = [ base base-compat deepseq hspec QuickCheck ]; + testToolDepends = [ hspec-discover ]; + description = "Core functionality and class for client function generation for servant APIs"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "servant-client-js" = callPackage ({ mkDerivation, base, binary, bytestring, case-insensitive , containers, exceptions, http-media, http-types, jsaddle @@ -232187,6 +232584,8 @@ self: { pname = "servant-conduit"; version = "0.15.1"; sha256 = "1vy3ihypb0zm2yd16rq120qw3898i3c0mahh2jysssv65g0avdwp"; + revision = "1"; + editedCabalFile = "0j7jrwyj6vnfr8wyyzjjm6gakx401aylrq8shc2y9ciy0mhf8lrv"; libraryHaskellDepends = [ base bytestring conduit mtl resourcet servant unliftio-core ]; @@ -232310,6 +232709,35 @@ self: { license = lib.licenses.bsd3; }) {}; + "servant-docs_0_11_9" = callPackage + ({ mkDerivation, aeson, aeson-pretty, base, base-compat, bytestring + , case-insensitive, hashable, http-media, http-types, lens, servant + , string-conversions, tasty, tasty-golden, tasty-hunit, text + , transformers, universe-base, unordered-containers + }: + mkDerivation { + pname = "servant-docs"; + version = "0.11.9"; + sha256 = "0ynjyyxlzb2j5d92rryqqa97rp16582mbmvnv7syczha5ziq24nk"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson aeson-pretty base base-compat bytestring case-insensitive + hashable http-media http-types lens servant string-conversions text + universe-base unordered-containers + ]; + executableHaskellDepends = [ + aeson base lens servant string-conversions text + ]; + testHaskellDepends = [ + aeson base base-compat lens servant string-conversions tasty + tasty-golden tasty-hunit transformers + ]; + description = "generate API docs for your servant webservice"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "servant-docs-simple" = callPackage ({ mkDerivation, aeson, aeson-pretty, base, bytestring, hspec , hspec-core, ordered-containers, prettyprinter, raw-strings-qq @@ -232552,6 +232980,24 @@ self: { license = lib.licenses.bsd3; }) {}; + "servant-foreign_0_15_4" = callPackage + ({ mkDerivation, base, base-compat, hspec, hspec-discover + , http-types, lens, servant, text + }: + mkDerivation { + pname = "servant-foreign"; + version = "0.15.4"; + sha256 = "0bznb73rbgfgkg7n4pxghkqsfca0yw9vak73c6w8sqvc2mjnc7mz"; + libraryHaskellDepends = [ + base base-compat http-types lens servant text + ]; + testHaskellDepends = [ base hspec servant ]; + testToolDepends = [ hspec-discover ]; + description = "Helpers for generating clients for servant APIs in any programming language"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "servant-gdp" = callPackage ({ mkDerivation, aeson, base, gdp, servant-server, text }: mkDerivation { @@ -232737,6 +233183,41 @@ self: { broken = true; }) {}; + "servant-http-streams_0_18_3" = callPackage + ({ mkDerivation, aeson, base, base-compat, bytestring + , case-insensitive, containers, deepseq, entropy, exceptions, hspec + , hspec-discover, http-api-data, http-common, http-media + , http-streams, http-types, HUnit, io-streams, kan-extensions + , markdown-unlit, monad-control, mtl, network, QuickCheck + , semigroupoids, servant, servant-client-core, servant-server, stm + , tdigest, text, time, transformers, transformers-base + , transformers-compat, wai, warp + }: + mkDerivation { + pname = "servant-http-streams"; + version = "0.18.3"; + sha256 = "0cc4qmbzq4n1yp5yfg76w1skkksh13qlbza9i2pgsxa9sc39s5fa"; + libraryHaskellDepends = [ + base base-compat bytestring case-insensitive containers deepseq + exceptions http-common http-media http-streams http-types + io-streams kan-extensions monad-control mtl semigroupoids servant + servant-client-core text time transformers transformers-base + transformers-compat + ]; + testHaskellDepends = [ + aeson base base-compat bytestring deepseq entropy hspec + http-api-data http-streams http-types HUnit kan-extensions + markdown-unlit mtl network QuickCheck servant servant-client-core + servant-server stm tdigest text transformers transformers-compat + wai warp + ]; + testToolDepends = [ hspec-discover markdown-unlit ]; + description = "Automatic derivation of querying functions for servant"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; + }) {}; + "servant-http2-client" = callPackage ({ mkDerivation, aeson, async, base, binary, bytestring , case-insensitive, containers, data-default-class, exceptions @@ -232916,6 +233397,8 @@ self: { pname = "servant-machines"; version = "0.15.1"; sha256 = "0k8abcc72s5bzcf2vmjkxxjnhk45rww6hr3l93msm2510hi6gda4"; + revision = "1"; + editedCabalFile = "0zplgs1kqfmnnx8yv8ay594misiamgmvy41b8w1h3mr7n4vrgk8j"; libraryHaskellDepends = [ base bytestring machines mtl servant ]; testHaskellDepends = [ base base-compat bytestring http-client http-media machines servant @@ -233213,6 +233696,28 @@ self: { license = lib.licenses.bsd3; }) {}; + "servant-pipes_0_15_3" = callPackage + ({ mkDerivation, base, base-compat, bytestring, http-client + , http-media, monad-control, mtl, pipes, pipes-bytestring + , pipes-safe, servant, servant-client, servant-server, wai, warp + }: + mkDerivation { + pname = "servant-pipes"; + version = "0.15.3"; + sha256 = "1sd01f95rkraa0zdqqg2vwx91zsih0i0hqqkz55nnw9bsbsqhq1n"; + libraryHaskellDepends = [ + base bytestring monad-control mtl pipes pipes-safe servant + ]; + testHaskellDepends = [ + base base-compat bytestring http-client http-media pipes + pipes-bytestring pipes-safe servant servant-client servant-server + wai warp + ]; + description = "Servant Stream support for pipes"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "servant-polysemy" = callPackage ({ mkDerivation, base, deepseq, http-client, http-client-tls, lens , mtl, polysemy, polysemy-plugin, polysemy-zoo, servant @@ -233641,6 +234146,42 @@ self: { license = lib.licenses.bsd3; }) {}; + "servant-server_0_18_3" = callPackage + ({ mkDerivation, aeson, base, base-compat, base64-bytestring + , bytestring, containers, directory, exceptions, filepath, hspec + , hspec-discover, hspec-wai, http-api-data, http-media, http-types + , monad-control, mtl, network, network-uri, QuickCheck, resourcet + , safe, servant, should-not-typecheck, sop-core, string-conversions + , tagged, temporary, text, transformers, transformers-base + , transformers-compat, wai, wai-app-static, wai-extra, warp, word8 + }: + mkDerivation { + pname = "servant-server"; + version = "0.18.3"; + sha256 = "1gng0in85as45aprwy19xaqlgmwfx0pkly150d2v96knhbcwsshk"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base base-compat base64-bytestring bytestring containers exceptions + filepath http-api-data http-media http-types monad-control mtl + network network-uri resourcet servant sop-core string-conversions + tagged text transformers transformers-base wai wai-app-static word8 + ]; + executableHaskellDepends = [ + aeson base base-compat servant text wai warp + ]; + testHaskellDepends = [ + aeson base base-compat base64-bytestring bytestring directory hspec + hspec-wai http-types mtl QuickCheck resourcet safe servant + should-not-typecheck sop-core string-conversions temporary text + transformers transformers-compat wai wai-extra + ]; + testToolDepends = [ hspec-discover ]; + description = "A family of combinators for defining webservices APIs and serving them"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "servant-server-namedargs" = callPackage ({ mkDerivation, base, bytestring, http-api-data, http-types, named , servant, servant-namedargs, servant-server, string-conversions @@ -248528,6 +249069,28 @@ self: { license = lib.licenses.bsd3; }) {}; + "streaming-bytestring_0_2_1" = callPackage + ({ mkDerivation, base, bytestring, deepseq, exceptions, ghc-prim + , mmorph, mtl, resourcet, smallcheck, streaming, tasty, tasty-hunit + , tasty-smallcheck, transformers, transformers-base + }: + mkDerivation { + pname = "streaming-bytestring"; + version = "0.2.1"; + sha256 = "1yri2g0wx2fila25ang04nsv4i12b4yhwqwcfkkpx1sz8fhzibxy"; + libraryHaskellDepends = [ + base bytestring deepseq exceptions ghc-prim mmorph mtl resourcet + streaming transformers transformers-base + ]; + testHaskellDepends = [ + base bytestring resourcet smallcheck streaming tasty tasty-hunit + tasty-smallcheck transformers + ]; + description = "Fast, effectful byte streams"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "streaming-cassava" = callPackage ({ mkDerivation, base, bytestring, cassava, hspec, mtl, QuickCheck , quickcheck-instances, streaming, streaming-bytestring, text @@ -250074,8 +250637,8 @@ self: { }: mkDerivation { pname = "stripeapi"; - version = "0.1.0.2"; - sha256 = "1zls2k2bzrkwcqav8s416gjsc4rp6glb4rv0ljkjab55ym3fkbqq"; + version = "1.0.0.0"; + sha256 = "0wg3b08gvkcqinc5r9jcrcfrgw0c3mh57ca5hzcrknddwd23flbj"; libraryHaskellDepends = [ aeson base bytestring ghc-prim http-client http-conduit http-types mtl scientific text time transformers unordered-containers vector @@ -251957,13 +252520,13 @@ self: { }: mkDerivation { pname = "swiss-ephemeris"; - version = "1.2.1.1"; - sha256 = "1k584gv36xgj87qbrvcl5w9v8z2k7y4csmz737d5r2a8mvf8sf33"; + version = "1.3.0.1"; + sha256 = "1y30qx18ps412r28grlxpfxw3ikirbf3kkxmqwd75ydxp9apn52k"; libraryHaskellDepends = [ base ]; testHaskellDepends = [ base directory hspec QuickCheck ]; testToolDepends = [ hspec-discover ]; description = "Haskell bindings for the Swiss Ephemeris C library"; - license = lib.licenses.gpl2Only; + license = lib.licenses.agpl3Only; hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -255452,6 +256015,18 @@ self: { license = lib.licenses.mit; }) {}; + "tasty-bench_0_3" = callPackage + ({ mkDerivation, base, containers, deepseq, tasty }: + mkDerivation { + pname = "tasty-bench"; + version = "0.3"; + sha256 = "06c7n1dslxr1m15m8kf35zfn544jm36vk8s3yfrf6h047gd1bs2k"; + libraryHaskellDepends = [ base containers deepseq tasty ]; + description = "Featherlight benchmark framework"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + }) {}; + "tasty-checklist" = callPackage ({ mkDerivation, base, exceptions, parameterized-utils, tasty , tasty-expected-failure, tasty-hunit, text @@ -255821,6 +256396,8 @@ self: { pname = "tasty-json"; version = "0.1.0.0"; sha256 = "0k6zzi2w675pghxfv5y6m67n2cv8bb22dq9zgb5yfwycfj3va4bp"; + revision = "1"; + editedCabalFile = "0jk27ld4l435nnzc80wg6b46ibmc0cmbb0k3hpp58yxbyldr6xdr"; libraryHaskellDepends = [ base bytestring containers stm tagged tasty text ]; @@ -256206,8 +256783,8 @@ self: { pname = "tasty-wai"; version = "0.1.1.1"; sha256 = "1bnq2mbgv1ksn9sq33dq1q91pzndy7gn61mlnkybk89k0bsw5i7y"; - revision = "1"; - editedCabalFile = "033s0aap50r7y3sbxc1jf60lpv66nljwyypc8smyccgiv5l8khzr"; + revision = "2"; + editedCabalFile = "13f0rmdyfd8wx9w9d6vj40akskq763gjj89p7dzy6zyaiyllgk64"; libraryHaskellDepends = [ base bytestring http-types HUnit tasty wai wai-extra ]; @@ -257031,6 +257608,18 @@ self: { license = lib.licenses.mit; }) {}; + "template-haskell-compat-v0208_0_1_6" = callPackage + ({ mkDerivation, base, template-haskell }: + mkDerivation { + pname = "template-haskell-compat-v0208"; + version = "0.1.6"; + sha256 = "1s2ba86y2r9n4r1dwfg734y3nfqxak560s8srd04kbn623hnrkw8"; + libraryHaskellDepends = [ base template-haskell ]; + description = "A backwards compatibility layer for Template Haskell newer than 2.8"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + }) {}; + "template-haskell-optics" = callPackage ({ mkDerivation, base, containers, optics-core, template-haskell }: mkDerivation { @@ -258769,8 +259358,8 @@ self: { pname = "texrunner"; version = "0.0.1.2"; sha256 = "1fxyxwgvn0rxhkl1fs2msr88jqwx5wwfnjsjlcankrwcn7gyk7jy"; - revision = "2"; - editedCabalFile = "0zv8xp8z2gx9zjqn1f81hri4hn0bws7cq39g5i2g2axrkm9nwj5q"; + revision = "3"; + editedCabalFile = "1l3cpi7yx8jm3653rf3v7midf19i7khc6in75m7zz66124c6i350"; libraryHaskellDepends = [ attoparsec base bytestring directory filepath io-streams mtl process semigroups temporary @@ -266567,6 +267156,23 @@ self: { license = lib.licenses.mit; }) {}; + "ttc_1_1_0_1" = callPackage + ({ mkDerivation, base, bytestring, tasty, tasty-hunit + , template-haskell, text + }: + mkDerivation { + pname = "ttc"; + version = "1.1.0.1"; + sha256 = "0vngp6md5viz4r57q0qn3pf09ph6kpkzvdigsxmgqcic2ha1a4n1"; + libraryHaskellDepends = [ base bytestring template-haskell text ]; + testHaskellDepends = [ + base bytestring tasty tasty-hunit template-haskell text + ]; + description = "Textual Type Classes"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + }) {}; + "ttl-hashtables" = callPackage ({ mkDerivation, base, clock, containers, data-default, failable , hashable, hashtables, hspec, mtl, transformers @@ -267088,6 +267694,8 @@ self: { ]; description = "An equational theorem prover"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "twee-lib" = callPackage @@ -276926,23 +277534,19 @@ self: { "wai-cli" = callPackage ({ mkDerivation, ansi-terminal, base, http-types, iproute - , monads-tf, network, options, socket-activation, stm - , streaming-commons, unix, wai, wai-extra, warp, warp-tls + , monads-tf, network, options, stm, streaming-commons, transformers + , unix, wai, wai-extra, warp, warp-tls }: mkDerivation { pname = "wai-cli"; - version = "0.2.1"; - sha256 = "1r4lxbjzb5qzn7y0kanlgm8s9a3j1j93cvs74s2bmcc82ysc3x9f"; - revision = "1"; - editedCabalFile = "1h0ip8r0zdm0xzaprfiyfdm40286apyvn6psqnx7pif8acfhpq8m"; + version = "0.2.3"; + sha256 = "0fflvxfc9ibkrrgqdsr89gl77b0b706a8g7ylydaqqz6z089qbi3"; libraryHaskellDepends = [ - ansi-terminal base http-types iproute monads-tf network options - socket-activation stm streaming-commons unix wai wai-extra warp - warp-tls + ansi-terminal base http-types iproute monads-tf network options stm + streaming-commons transformers unix wai wai-extra warp warp-tls ]; description = "Command line runner for Wai apps (using Warp) with TLS, CGI, socket activation & graceful shutdown"; license = lib.licenses.publicDomain; - hydraPlatforms = lib.platforms.none; }) {}; "wai-conduit" = callPackage @@ -286307,8 +286911,8 @@ self: { }: mkDerivation { pname = "yaml-unscrambler"; - version = "0.1.0.2"; - sha256 = "03wvb5skx41kdmdc6zhydr7zddzyshy2cgk8zmwy26q70z3g01zf"; + version = "0.1.0.3"; + sha256 = "1n8q5dsvs6sh2gzs24m49cz5pg1pavn9sma4fk5jizrjrabik4sj"; libraryHaskellDepends = [ acc attoparsec attoparsec-data attoparsec-time base base64 bytestring conduit containers foldl hashable libyaml mtl scientific @@ -291303,8 +291907,8 @@ self: { ({ mkDerivation, base, hspec, Z-Data, Z-IO, zookeeper_mt }: mkDerivation { pname = "zoovisitor"; - version = "0.1.1.1"; - sha256 = "1mg3wz3drddxdrbr1b0yw5wayzqi99zfdlgiwvgcc5pxb98i6wk3"; + version = "0.1.2.0"; + sha256 = "0s0svxa7y7a35jg4f0qq6zdg187c2g1s0f3payd26vpwa6rp8f8k"; libraryHaskellDepends = [ base Z-Data Z-IO ]; librarySystemDepends = [ zookeeper_mt ]; testHaskellDepends = [ base hspec ]; diff --git a/nixpkgs/pkgs/development/interpreters/alda/default.nix b/nixpkgs/pkgs/development/interpreters/alda/default.nix index 85c48ee2014d..96d4207dbe8f 100644 --- a/nixpkgs/pkgs/development/interpreters/alda/default.nix +++ b/nixpkgs/pkgs/development/interpreters/alda/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "alda"; - version = "1.4.4"; + version = "1.5.0"; src = fetchurl { url = "https://github.com/alda-lang/alda/releases/download/${version}/alda"; - sha256 = "sha256-zIq8coSh4B9VGrixkQfhySK7qhlFG2p7O0suvbiScKY="; + sha256 = "sha256-OHbOsgYN87ThU7EgjCgxADnOv32qIi+7XwDwcW0dmV0="; }; dontUnpack = true; diff --git a/nixpkgs/pkgs/development/interpreters/dhall/build-dhall-github-package.nix b/nixpkgs/pkgs/development/interpreters/dhall/build-dhall-github-package.nix index 53adc5a9b125..8f9e4d835511 100644 --- a/nixpkgs/pkgs/development/interpreters/dhall/build-dhall-github-package.nix +++ b/nixpkgs/pkgs/development/interpreters/dhall/build-dhall-github-package.nix @@ -43,7 +43,7 @@ lib.makePackageOverridable "rev" ]); - prefix = lib.optionalString (directory != "") "${directory}/"; + prefix = lib.optionalString (directory != "") "/${directory}"; in buildDhallPackage @@ -51,9 +51,12 @@ lib.makePackageOverridable name = versionedName; - code = "${src}/${prefix}${file}"; + code = "${src}${prefix}/${file}"; } // lib.optionalAttrs document - { documentationRoot = "${src}/${prefix}"; } + { documentationRoot = "${src}/${prefix}"; + + baseImportUrl = "https://raw.githubusercontent.com/${owner}/${repo}/${rev}${prefix}"; + } ) ) diff --git a/nixpkgs/pkgs/development/interpreters/dhall/build-dhall-package.nix b/nixpkgs/pkgs/development/interpreters/dhall/build-dhall-package.nix index 9fc9a4412156..86797e9f136f 100644 --- a/nixpkgs/pkgs/development/interpreters/dhall/build-dhall-package.nix +++ b/nixpkgs/pkgs/development/interpreters/dhall/build-dhall-package.nix @@ -37,6 +37,12 @@ # # If `null`, then no documentation is generated. , documentationRoot ? null + + # Base URL prepended to paths copied to the clipboard + # + # This is used in conjunction with `documentationRoot`, and is unused if + # `documentationRoot` is `null`. +, baseImportUrl ? null }: let @@ -85,6 +91,12 @@ in ${lib.optionalString (documentationRoot != null) '' mkdir -p $out/${dataDhall} - XDG_DATA_HOME=$out/${data} ${dhall-docs}/bin/dhall-docs --input '${documentationRoot}' --package-name '${name}' --output-link $out/docs + XDG_DATA_HOME=$out/${data} ${dhall-docs}/bin/dhall-docs --output-link $out/docs ${lib.cli.toGNUCommandLineShell { } { + base-import-url = baseImportUrl; + + input = documentationRoot; + + package-name = name; + }} ''} '' diff --git a/nixpkgs/pkgs/development/interpreters/erlang/R24.nix b/nixpkgs/pkgs/development/interpreters/erlang/R24.nix index a4fe839bff4c..7f4b49c5c322 100644 --- a/nixpkgs/pkgs/development/interpreters/erlang/R24.nix +++ b/nixpkgs/pkgs/development/interpreters/erlang/R24.nix @@ -3,6 +3,6 @@ # How to obtain `sha256`: # nix-prefetch-url --unpack https://github.com/erlang/otp/archive/OTP-${version}.tar.gz mkDerivation { - version = "24.0.2"; - sha256 = "gAiQc+AVj5xjwAnn9mF4xprjZOft1JvfEFVJMG5isxg="; + version = "24.0.3"; + sha256 = "KVMISrWNBkk+w37gB4M5TQkgm4odZ+GqLvKN4stzOUI="; } diff --git a/nixpkgs/pkgs/development/interpreters/hy/builder.nix b/nixpkgs/pkgs/development/interpreters/hy/builder.nix new file mode 100644 index 000000000000..6757f859ac14 --- /dev/null +++ b/nixpkgs/pkgs/development/interpreters/hy/builder.nix @@ -0,0 +1,40 @@ +{ lib +, python3Packages +, hyDefinedPythonPackages /* Packages like with python.withPackages */ +, ... +}: +python3Packages.buildPythonApplication rec { + pname = "hy"; + version = "1.0a1"; + + src = python3Packages.fetchPypi { + inherit pname version; + sha256 = "sha256-lCrbvbkeutSNmvvn/eHpTnJwPb5aEH7hWTXYSE+AJmU="; + }; + + checkInputs = with python3Packages; [ flake8 pytest ]; + + propagatedBuildInputs = with python3Packages; [ + appdirs + astor + clint + colorama + fastentrypoints + funcparserlib + rply + pygments + ] ++ (hyDefinedPythonPackages python3Packages); + + # Hy does not include tests in the source distribution from PyPI, so only test executable. + checkPhase = '' + $out/bin/hy --help > /dev/null + ''; + + meta = with lib; { + description = "A LISP dialect embedded in Python"; + homepage = "https://hylang.org/"; + license = licenses.mit; + maintainers = with maintainers; [ nixy mazurel ]; + platforms = platforms.all; + }; +} diff --git a/nixpkgs/pkgs/development/interpreters/hy/default.nix b/nixpkgs/pkgs/development/interpreters/hy/default.nix index e39bf915cfcf..f5d80c11d711 100644 --- a/nixpkgs/pkgs/development/interpreters/hy/default.nix +++ b/nixpkgs/pkgs/development/interpreters/hy/default.nix @@ -1,37 +1,15 @@ -{ lib, python3Packages }: - -python3Packages.buildPythonApplication rec { - pname = "hy"; - version = "0.19.0"; - - src = python3Packages.fetchPypi { - inherit pname version; - sha256 = "05k05qmiiysiwdc05sxmanwhv1crfwbb3l8swxfisbzbvmv1snis"; - }; - - checkInputs = with python3Packages; [ flake8 pytest ]; - - propagatedBuildInputs = with python3Packages; [ - appdirs - astor - clint - colorama - fastentrypoints - funcparserlib - rply - pygments - ]; - - # Hy does not include tests in the source distribution from PyPI, so only test executable. - checkPhase = '' - $out/bin/hy --help > /dev/null - ''; - - meta = with lib; { - description = "A LISP dialect embedded in Python"; - homepage = "http://hylang.org/"; - license = licenses.mit; - maintainers = with maintainers; [ nixy ]; - platforms = platforms.all; - }; +{ lib +, callPackage +, hyDefinedPythonPackages ? python-packages: [] /* Packages like with python.withPackages */ +}: +let + withPackages = ( + python-packages: callPackage ./builder.nix { + hyDefinedPythonPackages = python-packages; + } + ); +in +(withPackages hyDefinedPythonPackages) // { + # Export withPackages function for hy customization + inherit withPackages; } diff --git a/nixpkgs/pkgs/development/interpreters/janet/default.nix b/nixpkgs/pkgs/development/interpreters/janet/default.nix index c0438d1e0076..35631174e260 100644 --- a/nixpkgs/pkgs/development/interpreters/janet/default.nix +++ b/nixpkgs/pkgs/development/interpreters/janet/default.nix @@ -11,7 +11,20 @@ stdenv.mkDerivation rec { sha256 = "sha256-TzJbHmHIySlf3asQ02HOdehMR+s0KkPifBiaQ4FvFCg="; }; + # we don't have /usr/bin/env in the sandbox, so substitute for a proper, + # absolute path to janet + postPatch = '' + substituteInPlace jpm \ + --replace '/usr/bin/env janet' $out/bin/janet \ + --replace /usr/local/lib/janet $out/lib \ + --replace /usr/local $out + + substituteInPlace janet.1 \ + --replace /usr/local/lib/janet $out/lib + ''; + nativeBuildInputs = [ meson ninja ]; + mesonFlags = [ "-Dgit_hash=release" ]; doCheck = true; @@ -20,7 +33,7 @@ stdenv.mkDerivation rec { description = "Janet programming language"; homepage = "https://janet-lang.org/"; license = licenses.mit; + maintainers = with maintainers; [ andrewchambers peterhoeg ]; platforms = platforms.all; - maintainers = with maintainers; [ andrewchambers ]; }; } diff --git a/nixpkgs/pkgs/development/interpreters/lua-5/default.nix b/nixpkgs/pkgs/development/interpreters/lua-5/default.nix index d2ba451b9e60..3e36f77dab43 100644 --- a/nixpkgs/pkgs/development/interpreters/lua-5/default.nix +++ b/nixpkgs/pkgs/development/interpreters/lua-5/default.nix @@ -19,10 +19,6 @@ rec { patches = lib.optionals stdenv.isDarwin [ ./5.2.darwin.patch ]; - - postBuild = lib.optionalString (!stdenv.isDarwin) '' - ( cd src; make $makeFlags "''${makeFlagsArray[@]}" liblua.so ) - ''; }; lua5_3_compat = lua5_3.override({ diff --git a/nixpkgs/pkgs/development/interpreters/lua-5/interpreter.nix b/nixpkgs/pkgs/development/interpreters/lua-5/interpreter.nix index fd8c47d751b3..3476b2b648b6 100644 --- a/nixpkgs/pkgs/development/interpreters/lua-5/interpreter.nix +++ b/nixpkgs/pkgs/development/interpreters/lua-5/interpreter.nix @@ -7,6 +7,7 @@ , patches ? [] , postConfigure ? null , postBuild ? null +, staticOnly ? stdenv.hostPlatform.isStatic }: let luaPackages = callPackage ../../lua-modules {lua=self; overrides=packageOverrides;}; @@ -38,7 +39,7 @@ self = stdenv.mkDerivation rec { inherit patches; - postPatch = lib.optionalString (!stdenv.isDarwin) '' + postPatch = lib.optionalString (!stdenv.isDarwin && !staticOnly) '' # Add a target for a shared library to the Makefile. sed -e '1s/^/LUA_SO = liblua.so/' \ -e 's/ALL_T *= */&$(LUA_SO) /' \ @@ -56,6 +57,10 @@ self = stdenv.mkDerivation rec { "PLAT=${plat}" "CC=${stdenv.cc.targetPrefix}cc" "RANLIB=${stdenv.cc.targetPrefix}ranlib" + # Lua links with readline wich depends on ncurses. For some reason when + # building pkgsStatic.lua it fails because symbols from ncurses are not + # found. Adding ncurses here fixes the problem. + "MYLIBS=-lncurses" ]; configurePhase = '' @@ -66,7 +71,8 @@ self = stdenv.mkDerivation rec { makeFlagsArray+=(${lib.optionalString stdenv.isDarwin "CC=\"$CC\""}${lib.optionalString (stdenv.buildPlatform != stdenv.hostPlatform) " 'AR=${stdenv.cc.targetPrefix}ar rcu'"}) installFlagsArray=( TO_BIN="lua luac" INSTALL_DATA='cp -d' \ - TO_LIB="${if stdenv.isDarwin then "liblua.${version}.dylib" else "liblua.a liblua.so liblua.so.${luaversion} liblua.so.${version}"}" ) + TO_LIB="${if stdenv.isDarwin then "liblua.${version}.dylib" + else ("liblua.a" + lib.optionalString (!staticOnly) " liblua.so liblua.so.${luaversion} liblua.so.${version}" )}" ) runHook postConfigure ''; diff --git a/nixpkgs/pkgs/development/interpreters/nix-exec/default.nix b/nixpkgs/pkgs/development/interpreters/nix-exec/default.nix deleted file mode 100644 index c2a3fa2c7749..000000000000 --- a/nixpkgs/pkgs/development/interpreters/nix-exec/default.nix +++ /dev/null @@ -1,24 +0,0 @@ -{ lib, stdenv, fetchurl, pkg-config, nix, git }: let - version = "4.1.6"; -in stdenv.mkDerivation { - pname = "nix-exec"; - inherit version; - - src = fetchurl { - url = "https://github.com/shlevy/nix-exec/releases/download/v${version}/nix-exec-${version}.tar.xz"; - sha256 = "0slpsnzzzdkf5d9za7j4kr15jr4mn1k9klfsxibzy47b2bx1vkar"; - }; - - nativeBuildInputs = [ pkg-config ]; - buildInputs = [ nix git ]; - - NIX_CFLAGS_COMPILE = "-std=c++1y"; - - meta = { - description = "Run programs defined in nix expressions"; - homepage = "https://github.com/shlevy/nix-exec"; - license = lib.licenses.mit; - platforms = nix.meta.platforms; - broken = true; - }; -} diff --git a/nixpkgs/pkgs/development/interpreters/php/7.4.nix b/nixpkgs/pkgs/development/interpreters/php/7.4.nix index 7640e6bc6463..1e72f7b48b4a 100644 --- a/nixpkgs/pkgs/development/interpreters/php/7.4.nix +++ b/nixpkgs/pkgs/development/interpreters/php/7.4.nix @@ -2,8 +2,8 @@ let base = callPackage ./generic.nix (_args // { - version = "7.4.20"; - sha256 = "0d5ncz97y0271dsmz269wl4721vhq2fn6pmm9rxglc756p36pnha"; + version = "7.4.21"; + sha256 = "0al2697d5hwq0f39rgncl1pwfxzzpc0afmr0fjvw5qjpww163v1n"; }); in diff --git a/nixpkgs/pkgs/development/interpreters/php/8.0.nix b/nixpkgs/pkgs/development/interpreters/php/8.0.nix index 294f100dedd3..82d78d95314e 100644 --- a/nixpkgs/pkgs/development/interpreters/php/8.0.nix +++ b/nixpkgs/pkgs/development/interpreters/php/8.0.nix @@ -2,8 +2,8 @@ let base = callPackage ./generic.nix (_args // { - version = "8.0.7"; - sha256 = "0yazcc9x66xg1gmi3rpgk891g6s3mm7aywcadqfqnx1mdz4z5ckj"; + version = "8.0.8"; + sha256 = "0vyi9hhy7yl4l589dniwb3gq29sp3giq7ni4nca3x54q3bbpgg8l"; }); in diff --git a/nixpkgs/pkgs/development/interpreters/php/generic.nix b/nixpkgs/pkgs/development/interpreters/php/generic.nix index 5344be9c5c7e..dbe01acb6dfd 100644 --- a/nixpkgs/pkgs/development/interpreters/php/generic.nix +++ b/nixpkgs/pkgs/development/interpreters/php/generic.nix @@ -133,7 +133,7 @@ let unwrapped = php; # Select the right php tests for the php version tests = nixosTests."php${lib.strings.replaceStrings [ "." ] [ "" ] (lib.versions.majorMinor php.version)}"; - inherit (php-packages) extensions buildPecl; + inherit (php-packages) extensions buildPecl mkExtension; packages = php-packages.tools; meta = php.meta // { outputsToInstall = [ "out" ]; @@ -195,8 +195,6 @@ let # PCRE ++ lib.optionals (lib.versionAtLeast version "7.4") [ "--with-external-pcre=${pcre2.dev}" ] - ++ lib.optionals (lib.versions.majorMinor version == "7.3") [ "--with-pcre-regex=${pcre2.dev}" ] - ++ lib.optionals (lib.versionOlder version "7.3") [ "--with-pcre-regex=${pcre2.dev}" ] ++ [ "PCRE_LIBDIR=${pcre2}" ] diff --git a/nixpkgs/pkgs/development/interpreters/tcl/tcl-package-hook.sh b/nixpkgs/pkgs/development/interpreters/tcl/tcl-package-hook.sh index 747783cb1c27..41603037931f 100644 --- a/nixpkgs/pkgs/development/interpreters/tcl/tcl-package-hook.sh +++ b/nixpkgs/pkgs/development/interpreters/tcl/tcl-package-hook.sh @@ -2,6 +2,8 @@ # * wrap any installed executables with a wrapper that configures TCLLIBPATH # * write a setup hook that extends the TCLLIBPATH of any anti-dependencies +tclWrapperArgs=( ${tclWrapperArgs-} ) + # Add a directory to TCLLIBPATH, provided that it exists _addToTclLibPath() { local tclPkg="$1" @@ -50,10 +52,12 @@ wrapTclBins() { return fi + tclWrapperArgs+=(--prefix TCLLIBPATH ' ' "$TCLLIBPATH") + find "$tclBinsDir" -type f -executable -print | while read -r someBin; do echo "Adding TCLLIBPATH wrapper for $someBin" - wrapProgram "$someBin" --prefix TCLLIBPATH ' ' "$TCLLIBPATH" + wrapProgram "$someBin" "${tclWrapperArgs[@]}" done } diff --git a/nixpkgs/pkgs/development/libraries/SDL/default.nix b/nixpkgs/pkgs/development/libraries/SDL/default.nix index bf76bc1e8570..225cadac8c60 100644 --- a/nixpkgs/pkgs/development/libraries/SDL/default.nix +++ b/nixpkgs/pkgs/development/libraries/SDL/default.nix @@ -5,7 +5,7 @@ , x11Support ? !stdenv.isCygwin && !stdenv.hostPlatform.isAndroid , libXext, libICE, libXrandr , pulseaudioSupport ? config.pulseaudio or stdenv.isLinux && !stdenv.hostPlatform.isAndroid, libpulseaudio -, OpenGL, CoreAudio, CoreServices, AudioUnit, Kernel, Cocoa +, OpenGL, GLUT, CoreAudio, CoreServices, AudioUnit, Kernel, Cocoa }: # NOTE: When editing this expression see if the same change applies to @@ -16,7 +16,8 @@ with lib; let extraPropagatedBuildInputs = [ ] ++ optionals x11Support [ libXext libICE libXrandr ] - ++ optionals openglSupport [ libGL libGLU ] + ++ optionals (openglSupport && stdenv.isLinux) [ libGL libGLU ] + ++ optionals (openglSupport && stdenv.isDarwin) [ OpenGL GLUT ] ++ optional alsaSupport alsa-lib ++ optional pulseaudioSupport libpulseaudio ++ optional stdenv.isDarwin Cocoa; diff --git a/nixpkgs/pkgs/development/libraries/amdvlk/default.nix b/nixpkgs/pkgs/development/libraries/amdvlk/default.nix index 5d5277afcd3e..2ef3f3d3920b 100644 --- a/nixpkgs/pkgs/development/libraries/amdvlk/default.nix +++ b/nixpkgs/pkgs/development/libraries/amdvlk/default.nix @@ -85,6 +85,6 @@ in stdenv.mkDerivation rec { changelog = "https://github.com/GPUOpen-Drivers/AMDVLK/releases/tag/v-${version}"; license = licenses.mit; platforms = [ "x86_64-linux" "i686-linux" ]; - maintainers = with maintainers; [ danieldk Flakebi ]; + maintainers = with maintainers; [ Flakebi ]; }; } diff --git a/nixpkgs/pkgs/development/libraries/armadillo/default.nix b/nixpkgs/pkgs/development/libraries/armadillo/default.nix index 9fdccfb3faa0..fcc64989606e 100644 --- a/nixpkgs/pkgs/development/libraries/armadillo/default.nix +++ b/nixpkgs/pkgs/development/libraries/armadillo/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "armadillo"; - version = "10.5.2"; + version = "10.5.3"; src = fetchurl { url = "mirror://sourceforge/arma/armadillo-${version}.tar.xz"; - sha256 = "sha256-Y/I87cVIpelASBblDPj4/MSSqxqtxsDO8wv8Kvzq2V8="; + sha256 = "sha256-5sUdjVKm94ucZFn2mGE1CT4O5wWmdDBxEPYXXyzV7jc="; }; nativeBuildInputs = [ cmake ]; diff --git a/nixpkgs/pkgs/development/libraries/aws-c-cal/default.nix b/nixpkgs/pkgs/development/libraries/aws-c-cal/default.nix index 3246c572962f..6f3df977efa8 100644 --- a/nixpkgs/pkgs/development/libraries/aws-c-cal/default.nix +++ b/nixpkgs/pkgs/development/libraries/aws-c-cal/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "aws-c-cal"; - version = "0.4.5"; + version = "0.5.11"; src = fetchFromGitHub { owner = "awslabs"; repo = pname; rev = "v${version}"; - sha256 = "04acra1mnzw9q7jycs5966akfbgnx96hkrq90nq0dhw8pvarlyv6"; + sha256 = "sha256-rmEsDsY50IKpCpQTvAFEkgCtuHwwgwMwcRpBUyyZGGc="; }; nativeBuildInputs = [ cmake ]; diff --git a/nixpkgs/pkgs/development/libraries/babl/default.nix b/nixpkgs/pkgs/development/libraries/babl/default.nix index d6e1d75437ef..c0765922de5f 100644 --- a/nixpkgs/pkgs/development/libraries/babl/default.nix +++ b/nixpkgs/pkgs/development/libraries/babl/default.nix @@ -10,13 +10,13 @@ stdenv.mkDerivation rec { pname = "babl"; - version = "0.1.86"; + version = "0.1.88"; outputs = [ "out" "dev" ]; src = fetchurl { url = "https://download.gimp.org/pub/babl/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "sha256-Cz9ZUVmtGyFs1ynAUEw6X2z3gMZB9Nxj/BZPPAOCyPA="; + sha256 = "sha256-Tw1/SqoLsucl80mt97NRqVfZ+ybVVdmJWnr4FrQWcDk="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/development/libraries/boca/default.nix b/nixpkgs/pkgs/development/libraries/boca/default.nix index 0f848e302408..ffbc99f79f7d 100644 --- a/nixpkgs/pkgs/development/libraries/boca/default.nix +++ b/nixpkgs/pkgs/development/libraries/boca/default.nix @@ -14,13 +14,13 @@ stdenv.mkDerivation rec { pname = "BoCA"; - version = "1.0.4"; + version = "1.0.5"; src = fetchFromGitHub { owner = "enzo1982"; repo = "boca"; rev = "v${version}"; - sha256 = "sha256-SP/rVt/8VoeUprwJIIMSIBvoC1Zein3F7MR2tqc2vd0="; + sha256 = "sha256-ooLPpwTxG7QBAGhEGhta4T06ZDWlPysocHbb/Sq7Wyo="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/development/libraries/cairo/default.nix b/nixpkgs/pkgs/development/libraries/cairo/default.nix index 799024f19acf..137da005062e 100644 --- a/nixpkgs/pkgs/development/libraries/cairo/default.nix +++ b/nixpkgs/pkgs/development/libraries/cairo/default.nix @@ -42,6 +42,13 @@ in stdenv.mkDerivation rec { sha256 = "112hgrrsmcwxh1r52brhi5lksq4pvrz4xhkzcf2iqp55jl2pb7n1"; }) + # Fix PDF output. + # https://gitlab.freedesktop.org/cairo/cairo/issues/342 + (fetchpatch { + url = "https://gitlab.freedesktop.org/cairo/cairo/commit/5e34c5a9640e49dcc29e6b954c4187cfc838dbd1.patch"; + sha256 = "yCwsDUY7efVvOZkA6a0bPS+RrVc8Yk9bfPwWHeOjq5o="; + }) + ./0001-test-don-t-always-build-FreeType-dependent-test.patch ./0002-gl-don-t-implicitly-include-X11-headers.patch ./0003-test-only-build-GL-tests-when-Xlib-is-enabled.patch @@ -80,7 +87,9 @@ in stdenv.mkDerivation rec { ++ optional glSupport libGL ; # TODO: maybe liblzo but what would it be for here? - configureFlags = (if stdenv.isDarwin then [ + configureFlags = [ + "--enable-tee" + ] ++ (if stdenv.isDarwin then [ "--disable-dependency-tracking" "--enable-quartz" "--enable-quartz-font" @@ -93,7 +102,6 @@ in stdenv.mkDerivation rec { (enableFeature zlibSupport "interpreter") (enableFeature pngSupport "png") (enableFeature pngSupport "svg") - "--enable-tee" (enableFeature glSupport "gl") (enableFeature x11Support "xlib") ]); diff --git a/nixpkgs/pkgs/development/libraries/duckdb/default.nix b/nixpkgs/pkgs/development/libraries/duckdb/default.nix index 60ccf5aeeb23..e63f2c3cfd68 100644 --- a/nixpkgs/pkgs/development/libraries/duckdb/default.nix +++ b/nixpkgs/pkgs/development/libraries/duckdb/default.nix @@ -5,13 +5,13 @@ stdenv.mkDerivation rec { pname = "duckdb"; - version = "0.2.2"; + version = "0.2.7"; src = fetchFromGitHub { owner = "cwida"; repo = "duckdb"; rev = "v${version}"; - sha256 = "1pzz2zjzpvji5am21vd9kjxj0pnxsjmrsfqrym9h2rk2mi7p2cx8"; + sha256 = "0cnqq2n1424fqg7gfyvrwkk6nvjal2fm5n08xc8q28ynyhq4sfmj"; }; nativeBuildInputs = [ cmake ]; diff --git a/nixpkgs/pkgs/development/libraries/eclib/default.nix b/nixpkgs/pkgs/development/libraries/eclib/default.nix index 4709441a1011..740b0d81ca92 100644 --- a/nixpkgs/pkgs/development/libraries/eclib/default.nix +++ b/nixpkgs/pkgs/development/libraries/eclib/default.nix @@ -1,5 +1,5 @@ { lib, stdenv -, fetchFromGitHub +, fetchurl , autoreconfHook , pari , ntl @@ -14,16 +14,22 @@ assert withFlint -> flint != null; stdenv.mkDerivation rec { pname = "eclib"; - version = "20190909"; # upgrade might break the sage interface + version = "20210625"; # upgrade might break the sage interface # sage tests to run: # src/sage/interfaces/mwrank.py # src/sage/libs/eclib # ping @timokau for more info - src = fetchFromGitHub { - owner = "JohnCremona"; - repo = pname; - rev = "v${version}"; - sha256 = "0y1vdi4120gdw56gg2dn3wh625yr9wpyk3wpbsd25w4lv83qq5da"; + src = fetchurl { + # all releases for this project appear on its GitHub releases page + # by definition! other distros sometimes update whenever they see + # a version bump in configure.ac or a new tag (and this might show + # up on repology). however, a version bump or a new tag may not + # represent a new release, and a new release might not be tagged. + # + # see https://github.com/JohnCremona/eclib/issues/64#issuecomment-789788561 + # for upstream's explanation of the above + url = "https://github.com/JohnCremona/eclib/releases/download/${version}/eclib-${version}.tar.bz2"; + sha256 = "sha256-fA3MPz/L+Q39sA8wxAYOUowlHRcgOd8VF4tpsBGI6BA="; }; buildInputs = [ pari diff --git a/nixpkgs/pkgs/development/libraries/egl-wayland/default.nix b/nixpkgs/pkgs/development/libraries/egl-wayland/default.nix index b3654087ffd0..9e7beb0a4f86 100644 --- a/nixpkgs/pkgs/development/libraries/egl-wayland/default.nix +++ b/nixpkgs/pkgs/development/libraries/egl-wayland/default.nix @@ -4,6 +4,7 @@ , pkg-config , meson , ninja +, wayland-scanner , libX11 , mesa , libGL @@ -51,10 +52,15 @@ in stdenv.mkDerivation rec { sha256 = "1n9lg8hpjgxlf7dpddkjhbslsfd0symla2wk6jjmnl9n9jv2gmzk"; }; + depsBuildBuild = [ + pkg-config + ]; + nativeBuildInputs = [ meson ninja pkg-config + wayland-scanner ]; buildInputs = [ diff --git a/nixpkgs/pkgs/development/libraries/enchant/2.x.nix b/nixpkgs/pkgs/development/libraries/enchant/2.x.nix index 93815308f9c0..f2a4ae31346e 100644 --- a/nixpkgs/pkgs/development/libraries/enchant/2.x.nix +++ b/nixpkgs/pkgs/development/libraries/enchant/2.x.nix @@ -10,13 +10,13 @@ stdenv.mkDerivation rec { pname = "enchant"; - version = "2.2.15"; + version = "2.3.0"; outputs = [ "out" "dev" ]; src = fetchurl { url = "https://github.com/AbiWord/${pname}/releases/download/v${version}/${pname}-${version}.tar.gz"; - sha256 = "sha256-Ow8iFVeBFfKOKmqlSbNRKGADlDBL151vKLDTs9b0bAM="; + sha256 = "sha256-32gGO2wTskX6ckaw4JigPnT3qRxtiUe8XE9CzlXi5B0="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/development/libraries/fcft/default.nix b/nixpkgs/pkgs/development/libraries/fcft/default.nix index 9018a1bfa218..c413cf277c8b 100644 --- a/nixpkgs/pkgs/development/libraries/fcft/default.nix +++ b/nixpkgs/pkgs/development/libraries/fcft/default.nix @@ -6,13 +6,14 @@ stdenv.mkDerivation rec { pname = "fcft"; - version = "2.4.1"; + version = "2.4.2"; src = fetchzip { url = "https://codeberg.org/dnkl/fcft/archive/${version}.tar.gz"; - sha256 = "sha256-QxAp6pnZPLPwarurbKovz0BVOO4XdckBzjB65XCBPAM="; + sha256 = "01zvc8519fcg14nmcx3iqap9jnspcnr6pvlr59ipqxs0jprnrxl2"; }; + depsBuildBuild = [ pkg-config ]; nativeBuildInputs = [ pkg-config meson ninja scdoc ]; buildInputs = [ freetype fontconfig pixman tllist ] ++ lib.optional withHarfBuzz harfbuzz; diff --git a/nixpkgs/pkgs/development/libraries/fmt/default.nix b/nixpkgs/pkgs/development/libraries/fmt/default.nix index 474c990d5177..3fee016175bc 100644 --- a/nixpkgs/pkgs/development/libraries/fmt/default.nix +++ b/nixpkgs/pkgs/development/libraries/fmt/default.nix @@ -47,4 +47,9 @@ in version = "7.1.3"; sha256 = "08hyv73qp2ndbs0isk8pspsphdzz5qh8czl3wgyxy3mmif9xdg29"; }; + + fmt_8 = generic { + version = "8.0.1"; + sha256 = "1mnvxqsan034d2jiqnw2yvkljl7lwvhakmj5bscwp1fpkn655bbw"; + }; } diff --git a/nixpkgs/pkgs/development/libraries/fontconfig/default.nix b/nixpkgs/pkgs/development/libraries/fontconfig/default.nix index c0846edbbfe4..075c810131c7 100644 --- a/nixpkgs/pkgs/development/libraries/fontconfig/default.nix +++ b/nixpkgs/pkgs/development/libraries/fontconfig/default.nix @@ -3,6 +3,7 @@ , substituteAll , fetchurl , pkg-config +, python3 , freetype , expat , libxslt @@ -14,67 +15,29 @@ stdenv.mkDerivation rec { pname = "fontconfig"; - version = "2.13.92"; + version = "2.13.93"; src = fetchurl { url = "http://fontconfig.org/release/${pname}-${version}.tar.xz"; - sha256 = "0kkfsvxcvcphm9zcgsh646gix3qn4spz555wa1jp5hbq70l62vjh"; + sha256 = "1850q4k80yxma5g3yxkvyv8i5a3xqzswwml8gjy3jmywx8qqd5pa"; }; patches = [ - # Fix fonts not being loaded when missing included configs that have ignore_missing="yes". - # https://bugzilla.redhat.com/show_bug.cgi?id=1744377 + # Fix build with no docbook2html. (fetchpatch { - url = "https://gitlab.freedesktop.org/fontconfig/fontconfig/commit/fcada522913e5e07efa6367eff87ace9f06d24c8.patch"; - sha256 = "1jbm3vw45b3qjnqrh2545v1k8vmb29c09v2wj07jnrq3lnchbvmn"; + url = "https://gitlab.freedesktop.org/fontconfig/fontconfig/-/commit/60ce9b695ee9d1ac514a61f562e210d3278ba605.patch"; + sha256 = "0hfd2jdvsgackdp29dyzf5b1277pnbacihxqh9vdn63rr932ipra"; }) - - # Register JoyPixels as an emoji font. - # https://gitlab.freedesktop.org/fontconfig/fontconfig/merge_requests/67 - (fetchpatch { - url = "https://gitlab.freedesktop.org/fontconfig/fontconfig/commit/65087ac7ce4cc5f2109967c1380b474955dcb590.patch"; - sha256 = "1dkrbqx1c1d8yfnx0igvv516wanw2ksrpm3fbpm2h9nw0hccwqvm"; - }) - - # Fix invalid DTD in reset-dirs. - # https://gitlab.freedesktop.org/fontconfig/fontconfig/merge_requests/78 - (fetchpatch { - url = "https://gitlab.freedesktop.org/fontconfig/fontconfig/commit/a4aa66a858f1ecd375c5efe5916398281f73f794.patch"; - sha256 = "1j4ky8jhpllfm1lh2if34xglh2hl79nsa0xxgzxpj9sx6h4v99j5"; - }) - - # Do not include its tags, they are external now and only cause warnings with old fontconfig clients. - # https://gitlab.freedesktop.org/fontconfig/fontconfig/merge_requests/97 - (fetchpatch { - url = "https://gitlab.freedesktop.org/fontconfig/fontconfig/commit/528b17b2837c3b102acd90cc7548d07bacaccb1f.patch"; - sha256 = "1zf4wcd2xlprh805jalfy8ja5c2qzgkh4fwd1m9d638nl9gx932m"; - }) - # https://gitlab.freedesktop.org/fontconfig/fontconfig/merge_requests/100 - (fetchpatch { - url = "https://gitlab.freedesktop.org/fontconfig/fontconfig/commit/37c7c748740bf6f2468d59e67951902710240b34.patch"; - sha256 = "1rz5zrfwhpn9g49wrzzrmdglj78pbvpnw8ksgsw6bxq8l5d84jfr"; - }) - - # Show warning instead of error when encountering unknown attribute in config. - # https://gitlab.freedesktop.org/fontconfig/fontconfig/merge_requests/111 - (fetchpatch { - url = "https://gitlab.freedesktop.org/fontconfig/fontconfig/commit/409b37c62780728755c908991c912a6b16f2389c.patch"; - sha256 = "zJFh37QErSAINPGFkFVJyhYRP27BuIN7PIgoDl/PIwI="; - }) - - # Combination of - # https://gitlab.freedesktop.org/fontconfig/fontconfig/-/merge_requests/88 - # https://gitlab.freedesktop.org/fontconfig/fontconfig/-/merge_requests/131 - ./macos-atomics.h ]; outputs = [ "bin" "dev" "lib" "out" ]; # $out contains all the config nativeBuildInputs = [ + autoreconfHook gperf libxslt pkg-config - autoreconfHook + python3 ]; buildInputs = [ @@ -85,6 +48,11 @@ stdenv.mkDerivation rec { freetype ]; + postPatch = '' + # Requires networking. + sed -i '/check_PROGRAMS += test-crbug1004254/d' test/Makefile.am + ''; + configureFlags = [ "--sysconfdir=/etc" "--with-arch=${stdenv.hostPlatform.parsed.cpu.name}" diff --git a/nixpkgs/pkgs/development/libraries/fontconfig/macos-atomics.h b/nixpkgs/pkgs/development/libraries/fontconfig/macos-atomics.h deleted file mode 100644 index 07b0cf1d52dc..000000000000 --- a/nixpkgs/pkgs/development/libraries/fontconfig/macos-atomics.h +++ /dev/null @@ -1,39 +0,0 @@ ---- a/src/fcatomic.h 2020-11-27 13:23:44.000000000 +0900 -+++ b/src/fcatomic.h 2020-11-27 13:24:43.000000000 +0900 -@@ -70,24 +70,25 @@ - #elif !defined(FC_NO_MT) && defined(__APPLE__) - - #include <libkern/OSAtomic.h> --#ifdef __MAC_OS_X_MIN_REQUIRED - #include <AvailabilityMacros.h> --#elif defined(__IPHONE_OS_MIN_REQUIRED) --#include <Availability.h> --#endif - - typedef int fc_atomic_int_t; - #define fc_atomic_int_add(AI, V) (OSAtomicAdd32Barrier ((V), &(AI)) - (V)) - --#define fc_atomic_ptr_get(P) (OSMemoryBarrier (), (void *) *(P)) --#if (MAC_OS_X_VERSION_MIN_REQUIRED > MAC_OS_X_VERSION_10_4 || __IPHONE_VERSION_MIN_REQUIRED >= 20100) --#define fc_atomic_ptr_cmpexch(P,O,N) OSAtomicCompareAndSwapPtrBarrier ((void *) (O), (void *) (N), (void **) (P)) --#else --#if __ppc64__ || __x86_64__ --#define fc_atomic_ptr_cmpexch(P,O,N) OSAtomicCompareAndSwap64Barrier ((int64_t) (O), (int64_t) (N), (int64_t*) (P)) -+#if (MAC_OS_X_VERSION_MIN_REQUIRED > MAC_OS_X_VERSION_10_4 || __IPHONE_OS_VERSION_MIN_REQUIRED >= 20100) -+ -+#if SIZEOF_VOID_P == 8 -+#define fc_atomic_ptr_get(P) OSAtomicAdd64Barrier (0, (int64_t*)(P)) -+#elif SIZEOF_VOID_P == 4 -+#define fc_atomic_ptr_get(P) OSAtomicAdd32Barrier (0, (int32_t*)(P)) - #else --#define fc_atomic_ptr_cmpexch(P,O,N) OSAtomicCompareAndSwap32Barrier ((int32_t) (O), (int32_t) (N), (int32_t*) (P)) -+#error "SIZEOF_VOID_P not 4 or 8 (assumes CHAR_BIT is 8)" - #endif -+ -+#define fc_atomic_ptr_cmpexch(P,O,N) OSAtomicCompareAndSwapPtrBarrier ((void *) (O), (void *) (N), (void **) (P)) -+ -+#else -+#error "Your macOS / iOS targets are too old" - #endif - - #elif !defined(FC_NO_MT) && defined(HAVE_INTEL_ATOMIC_PRIMITIVES) diff --git a/nixpkgs/pkgs/development/libraries/freenect/default.nix b/nixpkgs/pkgs/development/libraries/freenect/default.nix index 2cf026514731..e13302319a11 100644 --- a/nixpkgs/pkgs/development/libraries/freenect/default.nix +++ b/nixpkgs/pkgs/development/libraries/freenect/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { pname = "freenect"; - version = "0.6.1"; + version = "0.6.2"; src = fetchFromGitHub { owner = "OpenKinect"; repo = "libfreenect"; rev = "v${version}"; - sha256 = "0was1va167rqshmpn382h36yyprpfi9cwillb6ylppmnfdrfrhrr"; + sha256 = "sha256-/CR+r9/zMj+8gxhHeRGPCDhALeF5bLsea38KQ1lF6wo="; }; buildInputs = [ libusb1 freeglut libGLU libGL libXi libXmu ] diff --git a/nixpkgs/pkgs/development/libraries/gdbm/default.nix b/nixpkgs/pkgs/development/libraries/gdbm/default.nix index 16c045cd68ef..83df37f236be 100644 --- a/nixpkgs/pkgs/development/libraries/gdbm/default.nix +++ b/nixpkgs/pkgs/development/libraries/gdbm/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "gdbm"; - version = "1.19"; + version = "1.20"; src = fetchurl { url = "mirror://gnu/gdbm/${pname}-${version}.tar.gz"; - sha256 = "sha256-N+0SIUEiuXLhig2UmVA55XdIGRk573QRWx1B2IETZLw="; + sha256 = "sha256-OurAVkizSCoQotqYa586OAoprWUL6AuYF6Q1+4EUopI="; }; doCheck = true; # not cross; diff --git a/nixpkgs/pkgs/development/libraries/gegl/4.0.nix b/nixpkgs/pkgs/development/libraries/gegl/4.0.nix deleted file mode 100644 index 11f4f070c08f..000000000000 --- a/nixpkgs/pkgs/development/libraries/gegl/4.0.nix +++ /dev/null @@ -1,121 +0,0 @@ -{ lib -, stdenv -, fetchurl -, pkg-config -, vala -, gobject-introspection -, gtk-doc -, docbook-xsl-nons -, docbook_xml_dtd_43 -, glib -, babl -, libpng -, cairo -, libjpeg -, librsvg -, lensfun -, libspiro -, maxflow -, netsurf -, pango -, poly2tri-c -, poppler -, bzip2 -, json-glib -, gettext -, meson -, ninja -, libraw -, gexiv2 -, libwebp -, luajit -, openexr -, OpenCL -, suitesparse -}: - -stdenv.mkDerivation rec { - pname = "gegl"; - version = "0.4.30"; - - outputs = [ "out" "dev" "devdoc" ]; - outputBin = "dev"; - - src = fetchurl { - url = "https://download.gimp.org/pub/gegl/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "sha256-wRJ4LPQJaWniMhfM36vkIoTjXVQ1/wxD1A5McPrsqN0="; - }; - - nativeBuildInputs = [ - pkg-config - gettext - meson - ninja - vala - gobject-introspection - gtk-doc - docbook-xsl-nons - docbook_xml_dtd_43 - ]; - - buildInputs = [ - libpng - cairo - libjpeg - librsvg - lensfun - libspiro - maxflow - netsurf.libnsgif - pango - poly2tri-c - poppler - bzip2 - libraw - libwebp - gexiv2 - luajit - openexr - suitesparse - ] ++ lib.optional stdenv.isDarwin OpenCL; - - # for gegl-4.0.pc - propagatedBuildInputs = [ - glib - json-glib - babl - ]; - - mesonFlags = [ - "-Ddocs=true" - "-Dmrg=disabled" # not sure what that is - "-Dsdl2=disabled" - "-Dpygobject=disabled" - "-Dlibav=disabled" - "-Dlibv4l=disabled" - "-Dlibv4l2=disabled" - # Disabled due to multiple vulnerabilities, see - # https://github.com/NixOS/nixpkgs/pull/73586 - "-Djasper=disabled" - ]; - - # TODO: Fix missing math symbols in gegl seamless clone. - # It only appears when we use packaged poly2tri-c instead of vendored one. - NIX_CFLAGS_COMPILE = "-lm"; - - postPatch = '' - chmod +x tests/opencl/opencl_test.sh - patchShebangs tests/ff-load-save/tests_ff_load_save.sh tests/opencl/opencl_test.sh tools/xml_insert.sh - ''; - - # tests fail to connect to the com.apple.fonts daemon in sandboxed mode - doCheck = !stdenv.isDarwin; - - meta = with lib; { - description = "Graph-based image processing framework"; - homepage = "https://www.gegl.org"; - license = licenses.lgpl3Plus; - maintainers = with maintainers; [ jtojnar ]; - platforms = platforms.unix; - }; -} diff --git a/nixpkgs/pkgs/development/libraries/gegl/default.nix b/nixpkgs/pkgs/development/libraries/gegl/default.nix index bd67f3e6b7ca..11f4f070c08f 100644 --- a/nixpkgs/pkgs/development/libraries/gegl/default.nix +++ b/nixpkgs/pkgs/development/libraries/gegl/default.nix @@ -1,43 +1,115 @@ -{ lib, stdenv +{ lib +, stdenv , fetchurl , pkg-config +, vala +, gobject-introspection +, gtk-doc +, docbook-xsl-nons +, docbook_xml_dtd_43 +, glib , babl , libpng , cairo , libjpeg , librsvg +, lensfun +, libspiro +, maxflow +, netsurf , pango -, gtk2 +, poly2tri-c +, poppler , bzip2 -, intltool -, libintl -, OpenGL ? null }: +, json-glib +, gettext +, meson +, ninja +, libraw +, gexiv2 +, libwebp +, luajit +, openexr +, OpenCL +, suitesparse +}: stdenv.mkDerivation rec { pname = "gegl"; - version = "0.2.0"; + version = "0.4.30"; + + outputs = [ "out" "dev" "devdoc" ]; + outputBin = "dev"; src = fetchurl { - url = "ftp://ftp.gtk.org/pub/gegl/0.2/${pname}-${version}.tar.bz2"; - sha256 = "df2e6a0d9499afcbc4f9029c18d9d1e0dd5e8710a75e17c9b1d9a6480dd8d426"; + url = "https://download.gimp.org/pub/gegl/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + sha256 = "sha256-wRJ4LPQJaWniMhfM36vkIoTjXVQ1/wxD1A5McPrsqN0="; }; - patches = [( fetchurl { - url = "https://projects.archlinux.org/svntogit/packages.git/plain/trunk/" - + "gegl-0.2.0-CVE-2012-4433.patch?h=packages/gegl&id=57a60fbda5d7bbbd1cc4767cb0724baa80c5e3e9"; - sha256 = "0p8mxj3w09nn1cc6cbxrd9hx742c5y27903i608wx6ja3kdjis59"; - name = "CVE-2012-4433.patch"; - })]; + nativeBuildInputs = [ + pkg-config + gettext + meson + ninja + vala + gobject-introspection + gtk-doc + docbook-xsl-nons + docbook_xml_dtd_43 + ]; + + buildInputs = [ + libpng + cairo + libjpeg + librsvg + lensfun + libspiro + maxflow + netsurf.libnsgif + pango + poly2tri-c + poppler + bzip2 + libraw + libwebp + gexiv2 + luajit + openexr + suitesparse + ] ++ lib.optional stdenv.isDarwin OpenCL; + + # for gegl-4.0.pc + propagatedBuildInputs = [ + glib + json-glib + babl + ]; - # needs fonts otherwise don't know how to pass them - configureFlags = [ "--disable-docs" ]; + mesonFlags = [ + "-Ddocs=true" + "-Dmrg=disabled" # not sure what that is + "-Dsdl2=disabled" + "-Dpygobject=disabled" + "-Dlibav=disabled" + "-Dlibv4l=disabled" + "-Dlibv4l2=disabled" + # Disabled due to multiple vulnerabilities, see + # https://github.com/NixOS/nixpkgs/pull/73586 + "-Djasper=disabled" + ]; - buildInputs = [ babl libpng cairo libjpeg librsvg pango gtk2 bzip2 intltool libintl ] - ++ lib.optional stdenv.isDarwin OpenGL; + # TODO: Fix missing math symbols in gegl seamless clone. + # It only appears when we use packaged poly2tri-c instead of vendored one. + NIX_CFLAGS_COMPILE = "-lm"; - nativeBuildInputs = [ pkg-config ]; + postPatch = '' + chmod +x tests/opencl/opencl_test.sh + patchShebangs tests/ff-load-save/tests_ff_load_save.sh tests/opencl/opencl_test.sh tools/xml_insert.sh + ''; - doCheck = false; # fails 3 out of 19 tests + # tests fail to connect to the com.apple.fonts daemon in sandboxed mode + doCheck = !stdenv.isDarwin; meta = with lib; { description = "Graph-based image processing framework"; diff --git a/nixpkgs/pkgs/development/libraries/glib/default.nix b/nixpkgs/pkgs/development/libraries/glib/default.nix index e15f59757862..3c8fe4d569fa 100644 --- a/nixpkgs/pkgs/development/libraries/glib/default.nix +++ b/nixpkgs/pkgs/development/libraries/glib/default.nix @@ -45,11 +45,11 @@ in stdenv.mkDerivation rec { pname = "glib"; - version = "2.68.2"; + version = "2.68.3"; src = fetchurl { url = "mirror://gnome/sources/glib/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "sha256-7Md5ipzANOq9/X8kbm3UYc2/EXX8wumGfMfae3MJ4Ps="; + sha256 = "0f1iprj7v0b5wn9njj39dkl25g6filfs7i4ybk20jq821k1a7qg7"; }; patches = optionals stdenv.isDarwin [ diff --git a/nixpkgs/pkgs/development/libraries/gtkmm/3.x.nix b/nixpkgs/pkgs/development/libraries/gtkmm/3.x.nix index 0f6811815f60..2e43e58db42d 100644 --- a/nixpkgs/pkgs/development/libraries/gtkmm/3.x.nix +++ b/nixpkgs/pkgs/development/libraries/gtkmm/3.x.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "gtkmm"; - version = "3.24.4"; + version = "3.24.5"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "sha256-m+txw+kM/Pt5A5a1Hj9ecWmWZ1Hv1PPvlpcRS+O+Z0M="; + sha256 = "1ri2msp3cmzi6r65ghwb8gfavfaxv0axpwi3q60nm7v8hvg36qw5"; }; outputs = [ "out" "dev" ]; diff --git a/nixpkgs/pkgs/development/libraries/gtkmm/4.x.nix b/nixpkgs/pkgs/development/libraries/gtkmm/4.x.nix index 50839568462f..0a654d9518dc 100644 --- a/nixpkgs/pkgs/development/libraries/gtkmm/4.x.nix +++ b/nixpkgs/pkgs/development/libraries/gtkmm/4.x.nix @@ -17,13 +17,13 @@ stdenv.mkDerivation rec { pname = "gtkmm"; - version = "4.0.1"; + version = "4.2.0"; outputs = [ "out" "dev" ]; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "sha256-iXPZvHhI4CyyBR4F8+46S6/+L+tK9KVIfw4xMu7AOIQ="; + sha256 = "12x9j82y37r4v0ngs22rzp4wmw7k2bbb9d3bymcczzz7y8w4q328"; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/development/libraries/intel-gmmlib/default.nix b/nixpkgs/pkgs/development/libraries/intel-gmmlib/default.nix index a56422c87e13..c0bb8ec9ab41 100644 --- a/nixpkgs/pkgs/development/libraries/intel-gmmlib/default.nix +++ b/nixpkgs/pkgs/development/libraries/intel-gmmlib/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { pname = "intel-gmmlib"; - version = "21.1.3"; + version = "21.2.1"; src = fetchFromGitHub { owner = "intel"; repo = "gmmlib"; rev = "${pname}-${version}"; - sha256 = "05vcr2rv6l38j7rv34mvcvzpgc2gjmvsb73wyprgdj71mcwrksyq"; + sha256 = "1icnxq4sqhi11c82kg0hnavk3gvbwgw2fshc7a7nb6w1wdiibj5n"; }; nativeBuildInputs = [ cmake ]; diff --git a/nixpkgs/pkgs/development/libraries/intel-media-driver/default.nix b/nixpkgs/pkgs/development/libraries/intel-media-driver/default.nix index 37375f52c32e..7aefaa9d4936 100644 --- a/nixpkgs/pkgs/development/libraries/intel-media-driver/default.nix +++ b/nixpkgs/pkgs/development/libraries/intel-media-driver/default.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { pname = "intel-media-driver"; - version = "21.2.2"; + version = "21.2.3"; src = fetchFromGitHub { owner = "intel"; repo = "media-driver"; rev = "intel-media-${version}"; - sha256 = "0cz2zr5qmhlsb1ydffakpkw9adyvn5n2y269fp0k2sskqwlykn48"; + sha256 = "0nldd1yfyvwnpkh0v3ni09z2zwmj84px0pcd1w50brvny36r814c"; }; cmakeFlags = [ diff --git a/nixpkgs/pkgs/development/libraries/intel-media-sdk/default.nix b/nixpkgs/pkgs/development/libraries/intel-media-sdk/default.nix index 47a3ca4f9f99..00c80277ea2b 100644 --- a/nixpkgs/pkgs/development/libraries/intel-media-sdk/default.nix +++ b/nixpkgs/pkgs/development/libraries/intel-media-sdk/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { pname = "intel-media-sdk"; - version = "21.2.2"; + version = "21.2.3"; src = fetchFromGitHub { owner = "Intel-Media-SDK"; repo = "MediaSDK"; rev = "intel-mediasdk-${version}"; - sha256 = "sha256-iSrr9g6C8YRcmu92sTyDCh76Cdu8wbDL3COwiVxox4Q="; + sha256 = "sha256-Id2/d6rRKiei6UQ0pywdcbNLfIQR8gEseiDgqeaT3p8="; }; nativeBuildInputs = [ cmake pkg-config ]; diff --git a/nixpkgs/pkgs/development/libraries/libaec/default.nix b/nixpkgs/pkgs/development/libraries/libaec/default.nix index 4c539860be72..aa146ca24133 100644 --- a/nixpkgs/pkgs/development/libraries/libaec/default.nix +++ b/nixpkgs/pkgs/development/libraries/libaec/default.nix @@ -4,14 +4,14 @@ stdenv.mkDerivation rec { pname = "libaec"; - version = "1.0.4"; + version = "1.0.5"; src = fetchFromGitLab { domain = "gitlab.dkrz.de"; owner = "k202009"; repo = "libaec"; rev = "v${version}"; - sha256 = "1rpma89i35ahbalaqz82y201syxni7jkf9892jlyyrhhrvlnm4l2"; + sha256 = "sha256-Vi0fCd9V/EH+PcD+e6RZK2/isR1xGX25POhm1Xen5ak="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/development/libraries/libbaseencode/default.nix b/nixpkgs/pkgs/development/libraries/libbaseencode/default.nix new file mode 100644 index 000000000000..c40f9bafb476 --- /dev/null +++ b/nixpkgs/pkgs/development/libraries/libbaseencode/default.nix @@ -0,0 +1,22 @@ +{ stdenv, lib, fetchFromGitHub, cmake }: + +stdenv.mkDerivation rec { + pname = "libbaseencode"; + version = "1.0.11"; + + src = fetchFromGitHub { + owner = "paolostivanin"; + repo = pname; + rev = "v${version}"; + sha256 = "1f52yh052z8k90d1ag6nk01p1gf4i1zxp1daw8mashs8avqr2m7g"; + }; + + nativeBuildInputs = [ cmake ]; + + meta = with lib; { + description = "Library written in C for encoding and decoding data using base32 or base64 (RFC-4648)"; + homepage = "https://github.com/paolostivanin/libbaseencode"; + license = licenses.asl20; + maintainers = with maintainers; [ alexbakker ]; + }; +} diff --git a/nixpkgs/pkgs/development/libraries/libconfig/default.nix b/nixpkgs/pkgs/development/libraries/libconfig/default.nix index 7387e9edc5b5..10d688d89b6c 100644 --- a/nixpkgs/pkgs/development/libraries/libconfig/default.nix +++ b/nixpkgs/pkgs/development/libraries/libconfig/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "libconfig"; - version = "1.7.2"; + version = "1.7.3"; src = fetchurl { url = "https://hyperrealm.github.io/${pname}/dist/${pname}-${version}.tar.gz"; - sha256 = "1ngs2qx3cx5cbwinc5mvadly0b5n7s86zsc68c404czzfff7lg3w"; + sha256 = "sha256-VFFm1srAN3RDgdHpzFpUBQlOe/rRakEWmbz/QLuzHuc="; }; doCheck = true; diff --git a/nixpkgs/pkgs/development/libraries/libcotp/default.nix b/nixpkgs/pkgs/development/libraries/libcotp/default.nix new file mode 100644 index 000000000000..986890102dc6 --- /dev/null +++ b/nixpkgs/pkgs/development/libraries/libcotp/default.nix @@ -0,0 +1,23 @@ +{ stdenv, lib, fetchFromGitHub, cmake, pkg-config, libgcrypt, libbaseencode }: + +stdenv.mkDerivation rec { + pname = "libcotp"; + version = "1.2.3"; + + src = fetchFromGitHub { + owner = "paolostivanin"; + repo = pname; + rev = "v${version}"; + sha256 = "1qq4shwiz1if9vys052dnsbm4dfw1ynlj6nsb0v4zjly3ndspfsk"; + }; + + buildInputs = [ libbaseencode libgcrypt ]; + nativeBuildInputs = [ cmake pkg-config ]; + + meta = with lib; { + description = "C library that generates TOTP and HOTP"; + homepage = "https://github.com/paolostivanin/libcotp"; + license = licenses.asl20; + maintainers = with maintainers; [ alexbakker ]; + }; +} diff --git a/nixpkgs/pkgs/development/libraries/libcyaml/default.nix b/nixpkgs/pkgs/development/libraries/libcyaml/default.nix index b316b6b63956..0fabdb49ca11 100644 --- a/nixpkgs/pkgs/development/libraries/libcyaml/default.nix +++ b/nixpkgs/pkgs/development/libraries/libcyaml/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { pname = "libcyaml"; - version = "1.1.0"; + version = "1.2.0"; src = fetchFromGitHub { owner = "tlsa"; repo = "libcyaml"; rev = "v${version}"; - sha256 = "0428p0rwq71nhh5nzcbapsbrjxa0x5l6h6ns32nxv7j624f0zd93"; + sha256 = "sha256-LtU1r95YoLuQ2JCphxbMojxKyXnt50XEARGUPftLgsU="; }; buildInputs = [ libyaml ]; diff --git a/nixpkgs/pkgs/development/libraries/libdvdnav/default.nix b/nixpkgs/pkgs/development/libraries/libdvdnav/default.nix index 3eb1032b2a79..8414605593de 100644 --- a/nixpkgs/pkgs/development/libraries/libdvdnav/default.nix +++ b/nixpkgs/pkgs/development/libraries/libdvdnav/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "libdvdnav"; - version = "6.1.0"; + version = "6.1.1"; src = fetchurl { url = "http://get.videolan.org/libdvdnav/${version}/${pname}-${version}.tar.bz2"; - sha256 = "0nzf1ir27s5vs1jrisdiw9ag2sc160k3gv7nplv9ypppm5gb35zn"; + sha256 = "sha256-wZGnR1lH0yP/doDPksD7G+gjdwGIXzdlbGTQTpjRjUg="; }; nativeBuildInputs = [ pkg-config ]; diff --git a/nixpkgs/pkgs/development/libraries/libint/default.nix b/nixpkgs/pkgs/development/libraries/libint/default.nix index 6df3d5a7eb3e..330fe8eac26b 100644 --- a/nixpkgs/pkgs/development/libraries/libint/default.nix +++ b/nixpkgs/pkgs/development/libraries/libint/default.nix @@ -71,6 +71,6 @@ stdenv.mkDerivation rec { homepage = "https://github.com/evaleev/libint"; license = with licenses; [ lgpl3Only gpl3Only ]; maintainers = [ maintainers.markuskowa ]; - platforms = platforms.linux; + platforms = [ "x86_64-linux" ]; }; } diff --git a/nixpkgs/pkgs/development/libraries/libliftoff/default.nix b/nixpkgs/pkgs/development/libraries/libliftoff/default.nix new file mode 100644 index 000000000000..759549dbb289 --- /dev/null +++ b/nixpkgs/pkgs/development/libraries/libliftoff/default.nix @@ -0,0 +1,34 @@ +{ lib, stdenv, fetchFromGitHub +, meson, pkg-config, ninja +, libdrm +}: + +stdenv.mkDerivation rec { + pname = "libliftoff"; + version = "0.1.0"; + + src = fetchFromGitHub { + owner = "emersion"; + repo = pname; + rev = "v${version}"; + sha256 = "1s53jsll3c7272bhmh4jr6k5m1nvn8i1ld704qmzsm852ilmgrla"; + }; + + nativeBuildInputs = [ meson pkg-config ninja ]; + + buildInputs = [ libdrm ]; + + meta = with lib; { + description = "A lightweight KMS plane library"; + longDescription = '' + libliftoff eases the use of KMS planes from userspace without standing in + your way. Users create "virtual planes" called layers, set KMS properties + on them, and libliftoff will pick planes for these layers if possible. + ''; + inherit (src.meta) homepage; + changelog = "https://github.com/emersion/libliftoff/releases/tag/v${version}"; + license = licenses.mit; + platforms = platforms.linux; + maintainers = with maintainers; [ primeos ]; + }; +} diff --git a/nixpkgs/pkgs/development/libraries/libmbim/default.nix b/nixpkgs/pkgs/development/libraries/libmbim/default.nix index ef13fdc9de12..43a88f9dd5fb 100644 --- a/nixpkgs/pkgs/development/libraries/libmbim/default.nix +++ b/nixpkgs/pkgs/development/libraries/libmbim/default.nix @@ -11,11 +11,11 @@ stdenv.mkDerivation rec { pname = "libmbim"; - version = "1.24.6"; + version = "1.24.8"; src = fetchurl { url = "https://www.freedesktop.org/software/libmbim/${pname}-${version}.tar.xz"; - sha256 = "sha256-dgRlyqoczWmcFCkOl5HaRW1TAN0R6/TBSGFRAz6HXf0="; + sha256 = "sha256-AlkHNhY//xDlcyGR/MwbmSCWlhbdxZYToAMFKhFqPCU="; }; outputs = [ "out" "dev" "man" ]; diff --git a/nixpkgs/pkgs/development/libraries/libnbd/default.nix b/nixpkgs/pkgs/development/libraries/libnbd/default.nix index 2254c8241545..635f8b8a6159 100644 --- a/nixpkgs/pkgs/development/libraries/libnbd/default.nix +++ b/nixpkgs/pkgs/development/libraries/libnbd/default.nix @@ -11,11 +11,11 @@ stdenv.mkDerivation rec { pname = "libnbd"; - version = "1.7.7"; + version = "1.9.2"; src = fetchurl { url = "https://download.libguestfs.org/libnbd/${lib.versions.majorMinor version}-development/${pname}-${version}.tar.gz"; - hash = "sha256-fNeu1qx+EbKitv2I8nJAmGMF5jxN2RZGPR/LJYnOjG8="; + hash = "sha256-UDLH5IMuKI6mAO/9VNmI8pCbxv94tCCQYRKZn2DBclg="; }; nativeBuildInputs = [ @@ -23,6 +23,7 @@ stdenv.mkDerivation rec { pkg-config perl ]; + buildInputs = [ fuse gnutls diff --git a/nixpkgs/pkgs/development/libraries/libqalculate/default.nix b/nixpkgs/pkgs/development/libraries/libqalculate/default.nix index 45b79571b43a..9368469f26dd 100644 --- a/nixpkgs/pkgs/development/libraries/libqalculate/default.nix +++ b/nixpkgs/pkgs/development/libraries/libqalculate/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { pname = "libqalculate"; - version = "3.18.0"; + version = "3.19.0"; src = fetchFromGitHub { owner = "qalculate"; repo = "libqalculate"; rev = "v${version}"; - sha256 = "sha256-cQNcKa/mEdeH1MaLhj203MOphfYDTQ5pn/GzUmSZGcE="; + sha256 = "1w44407wb552q21dz4m2nwwdi8b9hzjb2w1l3ffsikzqckc7wbyj"; }; outputs = [ "out" "dev" "doc" ]; diff --git a/nixpkgs/pkgs/development/libraries/libqmi/default.nix b/nixpkgs/pkgs/development/libraries/libqmi/default.nix index a812a2d78489..157445cfee82 100644 --- a/nixpkgs/pkgs/development/libraries/libqmi/default.nix +++ b/nixpkgs/pkgs/development/libraries/libqmi/default.nix @@ -15,13 +15,13 @@ stdenv.mkDerivation rec { pname = "libqmi"; - version = "1.28.4"; + version = "1.28.6"; outputs = [ "out" "dev" "devdoc" ]; src = fetchurl { url = "https://www.freedesktop.org/software/libqmi/${pname}-${version}.tar.xz"; - sha256 = "sha256-OxTNKrUiGnrbs5/tFu9pdTjqHHkwiCGtLRm1BeHarqA="; + sha256 = "1zg5k8f6l87iy9hmzwckdx532s845z9c5npblmpf1pp17n4r1f6b"; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/development/libraries/libsoup/default.nix b/nixpkgs/pkgs/development/libraries/libsoup/default.nix index 960591d1a22d..0cc4c8b3453a 100644 --- a/nixpkgs/pkgs/development/libraries/libsoup/default.nix +++ b/nixpkgs/pkgs/development/libraries/libsoup/default.nix @@ -1,6 +1,24 @@ -{ stdenv, lib, fetchurl, fetchpatch, glib, libxml2, meson, ninja, pkg-config, gnome, libsysprof-capture -, gnomeSupport ? true, sqlite, glib-networking, gobject-introspection, vala -, libpsl, python3, brotli +{ stdenv +, lib +, fetchurl +, glib +, libxml2 +, meson +, ninja +, pkg-config +, gnome +, libsysprof-capture +, gnomeSupport ? true +, sqlite +, glib-networking +, gobject-introspection +, withIntrospection ? stdenv.buildPlatform == stdenv.hostPlatform +, vala +, withVala ? stdenv.buildPlatform == stdenv.hostPlatform +, libpsl +, python3 +, brotli +, fetchpatch }: stdenv.mkDerivation rec { @@ -35,7 +53,9 @@ stdenv.mkDerivation rec { ] ++ lib.optionals stdenv.isLinux [ libsysprof-capture ]; - nativeBuildInputs = [ meson ninja pkg-config gobject-introspection vala glib ]; + nativeBuildInputs = [ meson ninja pkg-config glib ] + ++ lib.optional withIntrospection gobject-introspection + ++ lib.optional withVala vala; propagatedBuildInputs = [ glib libxml2 ]; NIX_CFLAGS_COMPILE = [ "-lpthread" ]; @@ -43,7 +63,8 @@ stdenv.mkDerivation rec { mesonFlags = [ "-Dtls_check=false" # glib-networking is a runtime dependency, not a compile-time dependency "-Dgssapi=disabled" - "-Dvapi=enabled" + "-Dvapi=${if withVala then "enabled" else "disabled"}" + "-Dintrospection=${if withIntrospection then "enabled" else "disabled"}" "-Dgnome=${lib.boolToString gnomeSupport}" "-Dntlm=disabled" ] ++ lib.optionals (!stdenv.isLinux) [ diff --git a/nixpkgs/pkgs/development/libraries/libstatgrab/default.nix b/nixpkgs/pkgs/development/libraries/libstatgrab/default.nix index 6d874fe23678..fe2717cfeb36 100644 --- a/nixpkgs/pkgs/development/libraries/libstatgrab/default.nix +++ b/nixpkgs/pkgs/development/libraries/libstatgrab/default.nix @@ -1,5 +1,8 @@ -{ lib, stdenv, fetchurl -, IOKit ? null }: +{ lib +, stdenv +, fetchurl +, IOKit +}: stdenv.mkDerivation rec { name = "libstatgrab-0.92"; @@ -9,11 +12,12 @@ stdenv.mkDerivation rec { sha256 = "15m1sl990l85ijf8pnc6hdfha6fqyiq74mijrzm3xz4zzxm91wav"; }; - buildInputs = [] ++ lib.optional stdenv.isDarwin IOKit; + buildInputs = lib.optional stdenv.isDarwin IOKit; meta = with lib; { homepage = "https://www.i-scream.org/libstatgrab/"; description = "A library that provides cross platforms access to statistics about the running system"; + maintainers = with maintainers; [ ]; license = licenses.gpl2; platforms = platforms.unix; }; diff --git a/nixpkgs/pkgs/development/libraries/libvmaf/default.nix b/nixpkgs/pkgs/development/libraries/libvmaf/default.nix index c4b945bed446..1410822a1ca4 100644 --- a/nixpkgs/pkgs/development/libraries/libvmaf/default.nix +++ b/nixpkgs/pkgs/development/libraries/libvmaf/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "libvmaf"; - version = "2.1.1"; + version = "2.2.0"; src = fetchFromGitHub { owner = "netflix"; repo = "vmaf"; rev = "v${version}"; - sha256 = "0dynk1pmsyf23vfxljaazqkr27vfrvhj3dyjzm06zxpzsn59aif3"; + sha256 = "1jlmivmdzlhizljbmsvqqxnhjfyjh8zxyf5xv6j040vbfj4mf14f"; }; sourceRoot = "source/libvmaf"; diff --git a/nixpkgs/pkgs/development/libraries/libvpx/1_8.nix b/nixpkgs/pkgs/development/libraries/libvpx/1_8.nix index f1a2bf377cc0..befbafd5a4ec 100644 --- a/nixpkgs/pkgs/development/libraries/libvpx/1_8.nix +++ b/nixpkgs/pkgs/development/libraries/libvpx/1_8.nix @@ -69,7 +69,14 @@ stdenv.mkDerivation rec { # ./CVE-2019-9232.CVE-2019-9325.CVE-2019-9371.CVE-2019-9433.patch ]; - postPatch = "patchShebangs ."; + postPatch = '' + patchShebangs --build \ + build/make/*.sh \ + build/make/*.pl \ + build/make/*.pm \ + test/*.sh \ + configure + ''; outputs = [ "bin" "dev" "out" ]; setOutputFlags = false; @@ -135,11 +142,6 @@ stdenv.mkDerivation rec { experimentalFpMbStatsSupport || experimentalEmulateHardwareSupport) "experimental") ] ++ optionals (stdenv.hostPlatform != stdenv.buildPlatform) [ - #"--extra-cflags=" - #"--extra-cxxflags=" - #"--prefix=" - #"--libc=" - #"--libdir=" "--enable-external-build" # libvpx darwin targets include darwin version (ie. ARCH-darwinXX-gcc, XX being the darwin version) # See all_platforms: https://github.com/webmproject/libvpx/blob/master/configure diff --git a/nixpkgs/pkgs/development/libraries/libvpx/default.nix b/nixpkgs/pkgs/development/libraries/libvpx/default.nix index f19183966163..d538aa41bff3 100644 --- a/nixpkgs/pkgs/development/libraries/libvpx/default.nix +++ b/nixpkgs/pkgs/development/libraries/libvpx/default.nix @@ -65,7 +65,21 @@ stdenv.mkDerivation rec { sha256 = "sha256-EZP33U10fchyqy7Jr26vHgUUfWR6xtG3fcMWUII0m9w="; }; - postPatch = "patchShebangs ."; + postPatch = '' + patchShebangs --build \ + build/make/*.sh \ + build/make/*.pl \ + build/make/*.pm \ + test/*.sh \ + configure + + # When cross-compiling (for aarch64-multiplatform), the compiler errors out on these flags. + # Since they're 'just' warnings, it's fine to just remove them. + substituteInPlace configure \ + --replace "check_add_cflags -Wparentheses-equality" "" \ + --replace "check_add_cflags -Wunreachable-code-loop-increment" "" \ + --replace "check_cflags -Wshorten-64-to-32 && add_cflags_only -Wshorten-64-to-32" "" + ''; outputs = [ "bin" "dev" "out" ]; setOutputFlags = false; @@ -131,12 +145,6 @@ stdenv.mkDerivation rec { experimentalFpMbStatsSupport || experimentalEmulateHardwareSupport) "experimental") ] ++ optionals (stdenv.hostPlatform != stdenv.buildPlatform) [ - #"--extra-cflags=" - #"--extra-cxxflags=" - #"--prefix=" - #"--libc=" - #"--libdir=" - "--enable-external-build" # libvpx darwin targets include darwin version (ie. ARCH-darwinXX-gcc, XX being the darwin version) # See all_platforms: https://github.com/webmproject/libvpx/blob/master/configure # Darwin versions: 10.4=8, 10.5=9, 10.6=10, 10.7=11, 10.8=12, 10.9=13, 10.10=14 diff --git a/nixpkgs/pkgs/development/libraries/libxlsxwriter/default.nix b/nixpkgs/pkgs/development/libraries/libxlsxwriter/default.nix index 4bb80cb04a45..ce9a72f00c1c 100644 --- a/nixpkgs/pkgs/development/libraries/libxlsxwriter/default.nix +++ b/nixpkgs/pkgs/development/libraries/libxlsxwriter/default.nix @@ -8,13 +8,13 @@ stdenv.mkDerivation rec { pname = "libxlsxwriter"; - version = "1.0.6"; + version = "1.0.8"; src = fetchFromGitHub { owner = "jmcnamara"; repo = "libxlsxwriter"; rev = "RELEASE_${version}"; - sha256 = "03fdcbm0xnkxwv6fir4yy4x9q2p5h08j099w9xh5gc2ni7ygjlyx"; + sha256 = "1z9bkg0pfkzxbpj2rys4mx9wmcxyjjqsg0nbiaabsg455q00plki"; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/development/libraries/mesa/default.nix b/nixpkgs/pkgs/development/libraries/mesa/default.nix index bdecfe0d57ad..aaa78de47f75 100644 --- a/nixpkgs/pkgs/development/libraries/mesa/default.nix +++ b/nixpkgs/pkgs/development/libraries/mesa/default.nix @@ -31,7 +31,7 @@ with lib; let # Release calendar: https://www.mesa3d.org/release-calendar.html # Release frequency: https://www.mesa3d.org/releasing.html#schedule - version = "21.1.3"; + version = "21.1.4"; branch = versions.major version; self = stdenv.mkDerivation { @@ -45,7 +45,7 @@ self = stdenv.mkDerivation { "ftp://ftp.freedesktop.org/pub/mesa/${version}/mesa-${version}.tar.xz" "ftp://ftp.freedesktop.org/pub/mesa/older-versions/${branch}.x/${version}/mesa-${version}.tar.xz" ]; - sha256 = "0s8yi7y63xsyqw19ihil18fykkjxr6ibcir2fvymz1vh4ql23qnb"; + sha256 = "02z9g6zpkg1p1sm8f84xdi7v2n7x534x9pn565bvcr411527y5qz"; }; prePatch = "patchShebangs ."; diff --git a/nixpkgs/pkgs/development/libraries/mimalloc/default.nix b/nixpkgs/pkgs/development/libraries/mimalloc/default.nix index 36abc9f3276e..1e9e44e09973 100644 --- a/nixpkgs/pkgs/development/libraries/mimalloc/default.nix +++ b/nixpkgs/pkgs/development/libraries/mimalloc/default.nix @@ -7,42 +7,35 @@ let in stdenv.mkDerivation rec { pname = "mimalloc"; - version = "2.0.0"; + version = "2.0.2"; src = fetchFromGitHub { owner = "microsoft"; repo = pname; rev = "v${version}"; - sha256 = "sha256-BMDCreY41CxJaPo9BdSRZlqh/YjtPC9aI/Zxt501e+0="; + sha256 = "sha256-n4FGld3bq6ZOSLTzXcVlucCGbQ5/eSFbijU0dfBD/T0="; }; nativeBuildInputs = [ cmake ninja ]; - cmakeFlags = lib.optional secureBuild [ "-DMI_SECURE=ON" ]; + cmakeFlags = [ "-DMI_INSTALL_TOPLEVEL=ON" ] ++ lib.optional secureBuild [ "-DMI_SECURE=ON" ]; postInstall = let rel = lib.versions.majorMinor version; + suffix = if stdenv.isLinux then "${soext}.${rel}" else ".${rel}${soext}"; in '' - # first, install headers, that's easy - mkdir -p $dev - mv $out/lib/*/include $dev/include + # first, move headers and cmake files, that's easy + mkdir -p $dev/lib + mv $out/include $dev/include + mv $out/cmake $dev/lib/ - # move .a and .o files into place find $out/lib - mv $out/lib/mimalloc-${rel}/libmimalloc*.a $out/lib/libmimalloc.a - mv $out/lib/mimalloc-${rel}/mimalloc*.o $out/lib/mimalloc.o - - '' + (if secureBuild then '' - mv $out/lib/mimalloc-${rel}/libmimalloc-secure${soext}.${rel} $out/lib/libmimalloc-secure${soext}.${rel} - ln -sfv $out/lib/libmimalloc-secure${soext}.${rel} $out/lib/libmimalloc-secure${soext} - ln -sfv $out/lib/libmimalloc-secure${soext}.${rel} $out/lib/libmimalloc${soext} - '' else '' - mv $out/lib/mimalloc-${rel}/libmimalloc${soext}.${rel} $out/lib/libmimalloc${soext}.${rel} - ln -sfv $out/lib/libmimalloc${soext}.${rel} $out/lib/libmimalloc${soext} - '') + '' - # remote duplicate dir. FIXME: try to fix the .cmake file distribution - # so we can re-use it for dependencies... - rm -rf $out/lib/mimalloc-${rel} - ''; + '' + (lib.optionalString secureBuild '' + # pretend we're normal mimalloc + ln -sfv $out/lib/libmimalloc-secure${suffix} $out/lib/libmimalloc${suffix} + ln -sfv $out/lib/libmimalloc-secure${suffix} $out/lib/libmimalloc${soext} + ln -sfv $out/lib/libmimalloc-secure.a $out/lib/libmimalloc.a + ln -sfv $out/lib/mimalloc-secure.o $out/lib/mimalloc.o + ''); outputs = [ "out" "dev" ]; @@ -52,6 +45,5 @@ stdenv.mkDerivation rec { license = licenses.bsd2; platforms = platforms.unix; maintainers = with maintainers; [ thoughtpolice ]; - badPlatforms = platforms.darwin; }; } diff --git a/nixpkgs/pkgs/development/libraries/opencolorio/default.nix b/nixpkgs/pkgs/development/libraries/opencolorio/default.nix index 522c8cfa4a13..b93e517def66 100644 --- a/nixpkgs/pkgs/development/libraries/opencolorio/default.nix +++ b/nixpkgs/pkgs/development/libraries/opencolorio/default.nix @@ -1,5 +1,5 @@ { - stdenv, lib, fetchFromGitHub, + stdenv, lib, fetchFromGitHub, symlinkJoin, cmake, expat, libyamlcpp, ilmbase, pystring, # Base dependencies glew, freeglut, # Only required on Linux @@ -25,8 +25,8 @@ stdenv.mkDerivation rec { sha256 = "194j9jp5c8ws0fryiz936wyinphnpzwpqnzvw9ryx6rbiwrba487"; }; - nativeBuildInputs = [ cmake ]; - buildInputs = [ expat libyamlcpp ilmbase pystring ] + nativeBuildInputs = [ cmake (symlinkJoin { name = "expat"; paths = [ expat.out expat.dev ]; }) ]; + buildInputs = [ expat.out libyamlcpp ilmbase pystring ] ++ lib.optionals stdenv.hostPlatform.isLinux [ glew freeglut ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ Carbon GLUT Cocoa ] ++ lib.optionals pythonBindings [ python3Packages.python python3Packages.pybind11 ] diff --git a/nixpkgs/pkgs/development/libraries/openmpi/default.nix b/nixpkgs/pkgs/development/libraries/openmpi/default.nix index 2df08426368d..35708c0ac016 100644 --- a/nixpkgs/pkgs/development/libraries/openmpi/default.nix +++ b/nixpkgs/pkgs/development/libraries/openmpi/default.nix @@ -13,20 +13,21 @@ # Enable libfabric support (necessary for Omnipath networks) on x86_64 linux , fabricSupport ? stdenv.isLinux && stdenv.isx86_64 + +# Enable Fortran support +, fortranSupport ? true }: assert !cudaSupport || cudatoolkit != null; let - version = "4.1.1"; - cudatoolkit_joined = symlinkJoin { name = "${cudatoolkit.name}-unsplit"; paths = [ cudatoolkit.out cudatoolkit.lib ]; }; in stdenv.mkDerivation rec { pname = "openmpi"; - inherit version; + version = "4.1.1"; src = with lib.versions; fetchurl { url = "https://www.open-mpi.org/software/ompi/v${major version}.${minor version}/downloads/${pname}-${version}.tar.bz2"; @@ -44,17 +45,19 @@ in stdenv.mkDerivation rec { find -name "Makefile.in" -exec sed -i "s/\`date\`/$ts/" \{} \; ''; - buildInputs = with stdenv; [ gfortran zlib ] - ++ lib.optionals isLinux [ libnl numactl pmix ucx ] + buildInputs = [ zlib ] + ++ lib.optionals fortranSupport [ gfortran ] + ++ lib.optionals stdenv.isLinux [ libnl numactl pmix ucx ] ++ lib.optionals cudaSupport [ cudatoolkit ] ++ [ libevent hwloc ] - ++ lib.optional (isLinux || isFreeBSD) rdma-core + ++ lib.optional (stdenv.isLinux || stdenv.isFreeBSD) rdma-core ++ lib.optional fabricSupport [ libpsm2 libfabric ]; nativeBuildInputs = [ perl ]; - configureFlags = with stdenv; lib.optional (!cudaSupport) "--disable-mca-dso" - ++ lib.optionals isLinux [ + configureFlags = lib.optional (!cudaSupport) "--disable-mca-dso" + ++ lib.optional (!fortranSupport) "--disable-mpi-fortran" + ++ lib.optionals stdenv.isLinux [ "--with-libnl=${libnl.dev}" "--with-pmix=${pmix}" "--with-pmix-libdir=${pmix}/lib" @@ -70,6 +73,16 @@ in stdenv.mkDerivation rec { enableParallelBuilding = true; + # disable stackprotector on aarch64-darwin for now + # https://github.com/NixOS/nixpkgs/issues/127608 + # + # build error: + # + # /private/tmp/nix-build-openmpi-4.1.1.drv-0/ccg7QqR8.s:13:15: error: index must be an integer in range [-256, 255]. + # ldr x2, [x2, ___stack_chk_guard];momd + # + hardeningDisable = lib.optionals (stdenv.isAarch64 && stdenv.isDarwin) [ "stackprotector" ]; + postInstall = '' rm -f $out/lib/*.la ''; @@ -86,6 +99,7 @@ in stdenv.mkDerivation rec { sed -i 's:compiler=.*:compiler=${targetPackages.stdenv.cc}/bin/${targetPackages.stdenv.cc.targetPrefix}c++:' \ $out/share/openmpi/mpic++-wrapper-data.txt + '' + lib.optionalString fortranSupport '' sed -i 's:compiler=.*:compiler=${gfortran}/bin/${gfortran.targetPrefix}gfortran:' \ $out/share/openmpi/mpifort-wrapper-data.txt diff --git a/nixpkgs/pkgs/development/libraries/pango/default.nix b/nixpkgs/pkgs/development/libraries/pango/default.nix index f4dba00d3518..c75e33a0686e 100644 --- a/nixpkgs/pkgs/development/libraries/pango/default.nix +++ b/nixpkgs/pkgs/development/libraries/pango/default.nix @@ -19,15 +19,19 @@ , x11Support? !stdenv.isDarwin, libXft }: +let + withDocs = stdenv.buildPlatform == stdenv.hostPlatform; +in stdenv.mkDerivation rec { pname = "pango"; - version = "1.48.4"; + version = "1.48.5"; - outputs = [ "bin" "out" "dev" "devdoc" ]; + outputs = [ "bin" "out" "dev" ] + ++ lib.optionals withDocs [ "devdoc" ]; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "0ym3cvajy2asapj8xbhfpy05rak79afrhi32hiss0w900vxi72a1"; + sha256 = "0aivpd6l5687lj5293j859zd7vq97yxpzvad0b6jvh3kc54p87jh"; }; nativeBuildInputs = [ @@ -58,9 +62,11 @@ stdenv.mkDerivation rec { ]; mesonFlags = [ - "-Dgtk_doc=true" + "-Dgtk_doc=${lib.boolToString withDocs}" ] ++ lib.optionals (!x11Support) [ "-Dxft=disabled" # only works with x11 + ] ++ lib.optionals (stdenv.buildPlatform != stdenv.hostPlatform) [ + "-Dintrospection=disabled" ]; # Fontconfig error: Cannot load default config file @@ -70,7 +76,7 @@ stdenv.mkDerivation rec { doCheck = false; # test-font: FAIL - postInstall = '' + postInstall = lib.optionalString withDocs '' # So that devhelp can find this. # https://gitlab.gnome.org/GNOME/pango/merge_requests/293/diffs#note_1058448 mkdir -p "$devdoc/share/devhelp" diff --git a/nixpkgs/pkgs/development/libraries/pipewire/0055-pipewire-media-session-path.patch b/nixpkgs/pkgs/development/libraries/pipewire/0055-pipewire-media-session-path.patch index be6683c3e7b7..8290aec5dfc4 100644 --- a/nixpkgs/pkgs/development/libraries/pipewire/0055-pipewire-media-session-path.patch +++ b/nixpkgs/pkgs/development/libraries/pipewire/0055-pipewire-media-session-path.patch @@ -2,16 +2,13 @@ diff --git a/meson_options.txt b/meson_options.txt index 93b5e2a9..1b915ac3 100644 --- a/meson_options.txt +++ b/meson_options.txt -@@ -13,6 +13,9 @@ option('media-session', - description: 'Build and install pipewire-media-session', +@@ -200,3 +200,6 @@ option('media-session', type: 'feature', value: 'auto') +option('media-session-prefix', + description: 'Install directory for pipewire-media-session and its support files', + type: 'string') - option('man', - description: 'Build manpages', - type: 'feature', + option('session-managers', diff --git a/src/daemon/systemd/user/meson.build b/src/daemon/systemd/user/meson.build index 1edebb2d..251270eb 100644 --- a/src/daemon/systemd/user/meson.build diff --git a/nixpkgs/pkgs/development/libraries/pipewire/0090-pipewire-config-template-paths.patch b/nixpkgs/pkgs/development/libraries/pipewire/0090-pipewire-config-template-paths.patch index 966cb9579777..1f1a98780e9c 100644 --- a/nixpkgs/pkgs/development/libraries/pipewire/0090-pipewire-config-template-paths.patch +++ b/nixpkgs/pkgs/development/libraries/pipewire/0090-pipewire-config-template-paths.patch @@ -6,8 +6,8 @@ index bbafa134..227d3e06 100644 # access.allowed to list an array of paths of allowed # apps. #access.allowed = [ -- # @media_session_path@ -+ # <media_session_path> +- # @session_manager_path@ ++ # <session_manager_path> #] # An array of rejected paths. @@ -15,8 +15,8 @@ index bbafa134..227d3e06 100644 # but it is better to start it as a systemd service. # Run the session manager with -h for options. # -- @comment@{ path = "@media_session_path@" args = "" } -+ @comment@{ path = "<media_session_path>" args = "" } +- @comment@{ path = "@session_manager_path@" args = "@session_manager_args@" } ++ @comment@{ path = "<session_manager_path>" args = "@session_manager_args@" } # # You can optionally start the pulseaudio-server here as well # but it is better to start it as a systemd service. diff --git a/nixpkgs/pkgs/development/libraries/pipewire/default.nix b/nixpkgs/pkgs/development/libraries/pipewire/default.nix index 8504d2669849..5f32216737ef 100644 --- a/nixpkgs/pkgs/development/libraries/pipewire/default.nix +++ b/nixpkgs/pkgs/development/libraries/pipewire/default.nix @@ -14,6 +14,7 @@ , dbus , alsa-lib , libjack2 +, libusb1 , udev , libva , libsndfile @@ -43,10 +44,11 @@ let }; mesonEnable = b: if b then "enabled" else "disabled"; + mesonList = l: "[" + lib.concatStringsSep "," l + "]"; self = stdenv.mkDerivation rec { pname = "pipewire"; - version = "0.3.30"; + version = "0.3.31"; outputs = [ "out" @@ -64,7 +66,7 @@ let owner = "pipewire"; repo = "pipewire"; rev = version; - sha256 = "sha256-DnaPvZoDaegjtJNKBmCJEAZe5FQBnSER79FPnxiWQUE="; + sha256 = "1dirz69ami7bcgy6hhh0ffi9gzwcy9idg94nvknwvwkjw4zm8m79"; }; patches = [ @@ -96,6 +98,7 @@ let dbus glib libjack2 + libusb1 libsndfile ncurses udev @@ -122,6 +125,7 @@ let "-Dmedia-session-prefix=${placeholder "mediaSession"}" "-Dlibjack-path=${placeholder "jack"}/lib" "-Dlibcamera=disabled" + "-Droc=disabled" "-Dlibpulse=${mesonEnable pulseTunnelSupport}" "-Davahi=${mesonEnable zeroconfSupport}" "-Dgstreamer=${mesonEnable gstreamerSupport}" @@ -133,6 +137,7 @@ let "-Dbluez5-backend-hsphfpd=${mesonEnable hsphfpdSupport}" "-Dsysconfdir=/etc" "-Dpipewire_confdata_dir=${placeholder "lib"}/share/pipewire" + "-Dsession-managers=${mesonList (lib.optional withMediaSession "media-session")}" ]; FONTCONFIG_FILE = fontsConf; # Fontconfig error: Cannot load default config file @@ -187,6 +192,7 @@ let paths-out-media-session = [ "nix-support/etc/pipewire/media-session.d/alsa-monitor.conf.json" "nix-support/etc/pipewire/media-session.d/bluez-monitor.conf.json" + "nix-support/etc/pipewire/media-session.d/bluez-hardware.conf.json" "nix-support/etc/pipewire/media-session.d/media-session.conf.json" "nix-support/etc/pipewire/media-session.d/v4l2-monitor.conf.json" ]; diff --git a/nixpkgs/pkgs/development/libraries/protobuf/3.17.nix b/nixpkgs/pkgs/development/libraries/protobuf/3.17.nix new file mode 100644 index 000000000000..d869b9ce76ef --- /dev/null +++ b/nixpkgs/pkgs/development/libraries/protobuf/3.17.nix @@ -0,0 +1,6 @@ +{ callPackage, ... }: + +callPackage ./generic-v3.nix { + version = "3.17.3"; + sha256 = "08644kaxhpjs38q5q4fp01yr0wakg1ijha4g3lzp2ifg7y3c465d"; +} diff --git a/nixpkgs/pkgs/development/libraries/rocclr/default.nix b/nixpkgs/pkgs/development/libraries/rocclr/default.nix index c93ea5ba78ba..cf085d50edb0 100644 --- a/nixpkgs/pkgs/development/libraries/rocclr/default.nix +++ b/nixpkgs/pkgs/development/libraries/rocclr/default.nix @@ -55,7 +55,7 @@ stdenv.mkDerivation rec { description = "Radeon Open Compute common language runtime"; homepage = "https://github.com/ROCm-Developer-Tools/ROCclr"; license = licenses.mit; - maintainers = with maintainers; [ danieldk ]; + maintainers = with maintainers; [ ]; # rocclr seems to have some AArch64 ifdefs, but does not seem # to be supported yet by the build infrastructure. Recheck in # the future. diff --git a/nixpkgs/pkgs/development/libraries/rocm-comgr/default.nix b/nixpkgs/pkgs/development/libraries/rocm-comgr/default.nix index b9a34b113ebd..95fe28ce9fd3 100644 --- a/nixpkgs/pkgs/development/libraries/rocm-comgr/default.nix +++ b/nixpkgs/pkgs/development/libraries/rocm-comgr/default.nix @@ -40,7 +40,7 @@ stdenv.mkDerivation rec { description = "APIs for compiling and inspecting AMDGPU code objects"; homepage = "https://github.com/RadeonOpenCompute/ROCm-CompilerSupport/tree/amd-stg-open/lib/comgr"; license = licenses.ncsa; - maintainers = with maintainers; [ danieldk ]; + maintainers = with maintainers; [ ]; platforms = platforms.linux; }; } diff --git a/nixpkgs/pkgs/development/libraries/rocm-device-libs/default.nix b/nixpkgs/pkgs/development/libraries/rocm-device-libs/default.nix index e62d6f0076fc..383d91bd08c1 100644 --- a/nixpkgs/pkgs/development/libraries/rocm-device-libs/default.nix +++ b/nixpkgs/pkgs/development/libraries/rocm-device-libs/default.nix @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { description = "Set of AMD-specific device-side language runtime libraries"; homepage = "https://github.com/RadeonOpenCompute/ROCm-Device-Libs"; license = licenses.ncsa; - maintainers = with maintainers; [ danieldk ]; + maintainers = with maintainers; [ ]; platforms = platforms.linux; }; } diff --git a/nixpkgs/pkgs/development/libraries/rocm-opencl-icd/default.nix b/nixpkgs/pkgs/development/libraries/rocm-opencl-icd/default.nix index 903c238f4553..0a9d124561e2 100644 --- a/nixpkgs/pkgs/development/libraries/rocm-opencl-icd/default.nix +++ b/nixpkgs/pkgs/development/libraries/rocm-opencl-icd/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "OpenCL ICD definition for AMD GPUs using the ROCm stack"; license = licenses.mit; - maintainers = with maintainers; [ danieldk ]; + maintainers = with maintainers; [ ]; platforms = platforms.linux; }; } diff --git a/nixpkgs/pkgs/development/libraries/rocm-opencl-runtime/default.nix b/nixpkgs/pkgs/development/libraries/rocm-opencl-runtime/default.nix index d721cfece96a..40ffcae79246 100644 --- a/nixpkgs/pkgs/development/libraries/rocm-opencl-runtime/default.nix +++ b/nixpkgs/pkgs/development/libraries/rocm-opencl-runtime/default.nix @@ -77,7 +77,7 @@ stdenv.mkDerivation rec { description = "OpenCL runtime for AMD GPUs, part of the ROCm stack"; homepage = "https://github.com/RadeonOpenCompute/ROCm-OpenCL-Runtime"; license = with licenses; [ asl20 mit ]; - maintainers = with maintainers; [ danieldk ]; + maintainers = with maintainers; [ ]; platforms = platforms.linux; }; } diff --git a/nixpkgs/pkgs/development/libraries/rocm-runtime/default.nix b/nixpkgs/pkgs/development/libraries/rocm-runtime/default.nix index c63e8249cfc0..eb4ce3c19fb6 100644 --- a/nixpkgs/pkgs/development/libraries/rocm-runtime/default.nix +++ b/nixpkgs/pkgs/development/libraries/rocm-runtime/default.nix @@ -43,6 +43,6 @@ stdenv.mkDerivation rec { description = "Platform runtime for ROCm"; homepage = "https://github.com/RadeonOpenCompute/ROCR-Runtime"; license = with licenses; [ ncsa ]; - maintainers = with maintainers; [ danieldk ]; + maintainers = with maintainers; [ ]; }; } diff --git a/nixpkgs/pkgs/development/libraries/rocm-thunk/default.nix b/nixpkgs/pkgs/development/libraries/rocm-thunk/default.nix index 1339e035ebfd..770dd16740ca 100644 --- a/nixpkgs/pkgs/development/libraries/rocm-thunk/default.nix +++ b/nixpkgs/pkgs/development/libraries/rocm-thunk/default.nix @@ -32,6 +32,6 @@ stdenv.mkDerivation rec { description = "Radeon open compute thunk interface"; homepage = "https://github.com/RadeonOpenCompute/ROCT-Thunk-Interface"; license = with licenses; [ bsd2 mit ]; - maintainers = with maintainers; [ danieldk ]; + maintainers = with maintainers; [ ]; }; } diff --git a/nixpkgs/pkgs/development/libraries/science/math/blas/default.nix b/nixpkgs/pkgs/development/libraries/science/math/blas/default.nix index 332806c495c9..85a73ccd5697 100644 --- a/nixpkgs/pkgs/development/libraries/science/math/blas/default.nix +++ b/nixpkgs/pkgs/development/libraries/science/math/blas/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "blas"; - version = "3.8.0"; + version = "3.10.0"; src = fetchurl { url = "http://www.netlib.org/blas/${pname}-${version}.tgz"; - sha256 = "1s24iry5197pskml4iygasw196bdhplj0jmbsb9jhabcjqj2mpsm"; + sha256 = "sha256-LjYNmcm9yEB6YYiMQKqFP7QhlCDruCZNtIbLiGBGirM="; }; buildInputs = [ gfortran ]; @@ -20,17 +20,17 @@ stdenv.mkDerivation rec { echo >>make.inc "NOOPT = -O0 -fPIC" echo >>make.inc "LOADER = gfortran" echo >>make.inc "LOADOPTS =" - echo >>make.inc "ARCH = gfortran" - echo >>make.inc "ARCHFLAGS = -shared -o" + echo >>make.inc "AR = gfortran" + echo >>make.inc "ARFLAGS = -shared -o" echo >>make.inc "RANLIB = echo" echo >>make.inc "BLASLIB = libblas.so.${version}" ''; buildPhase = '' make - echo >>make.inc "ARCHFLAGS = " + echo >>make.inc "ARFLAGS = " echo >>make.inc "BLASLIB = libblas.a" - echo >>make.inc "ARCH = ar rcs" + echo >>make.inc "AR = ar rcs" echo >>make.inc "RANLIB = ranlib" make ''; diff --git a/nixpkgs/pkgs/development/libraries/science/math/liblapack/default.nix b/nixpkgs/pkgs/development/libraries/science/math/liblapack/default.nix index 50563f2745ab..66f343d4912d 100644 --- a/nixpkgs/pkgs/development/libraries/science/math/liblapack/default.nix +++ b/nixpkgs/pkgs/development/libraries/science/math/liblapack/default.nix @@ -7,7 +7,7 @@ }: let inherit (lib) optional; - version = "3.9.0"; + version = "3.9.1"; in stdenv.mkDerivation rec { @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { owner = "Reference-LAPACK"; repo = "lapack"; rev = "v${version}"; - sha256 = "0sxnc97z67i7phdmcnq8f8lmxgw10wdwvr8ami0w3pb179cgrbpb"; + sha256 = "sha256-B7eRaEY9vaLvuKkJ7d2KWanGE7OXh43O0UbXFheUWK8="; }; nativeBuildInputs = [ gfortran cmake ]; diff --git a/nixpkgs/pkgs/development/libraries/science/math/p4est-sc/default.nix b/nixpkgs/pkgs/development/libraries/science/math/p4est-sc/default.nix new file mode 100644 index 000000000000..338101b80b56 --- /dev/null +++ b/nixpkgs/pkgs/development/libraries/science/math/p4est-sc/default.nix @@ -0,0 +1,71 @@ +{ lib, stdenv, fetchFromGitHub +, autoreconfHook, pkg-config +, p4est-sc-debugEnable ? true, p4est-sc-mpiSupport ? true +, mpi, openssh, zlib +}: + +let + dbg = if debugEnable then "-dbg" else ""; + debugEnable = p4est-sc-debugEnable; + mpiSupport = p4est-sc-mpiSupport; + isOpenmpi = mpiSupport && mpi.pname == "openmpi"; +in +stdenv.mkDerivation { + pname = "p4est-sc${dbg}"; + version = "unstable-2021-06-14"; + + # fetch an untagged snapshot of the prev3-develop branch + src = fetchFromGitHub { + owner = "cburstedde"; + repo = "libsc"; + rev = "1ae814e3fb1cc5456652e0d77550386842cb9bfb"; + sha256 = "14vm0b162jh8399pgpsikbwq4z5lkrw9vfzy3drqykw09n6nc53z"; + }; + + nativeBuildInputs = [ autoreconfHook pkg-config ]; + propagatedBuildInputs = [ zlib ] + ++ lib.optional mpiSupport mpi + ++ lib.optional isOpenmpi openssh + ; + inherit debugEnable mpiSupport; + + postPatch = '' + echo "dist_scaclocal_DATA += config/sc_v4l2.m4" >> Makefile.am + ''; + preConfigure = '' + echo "2.8.0" > .tarball-version + ${if mpiSupport then "unset CC" else ""} + ''; + + configureFlags = [ "--enable-pthread=-pthread" ] + ++ lib.optional debugEnable "--enable-debug" + ++ lib.optional mpiSupport "--enable-mpi" + ; + + dontDisableStatic = true; + enableParallelBuilding = true; + makeFlags = [ "V=0" ]; + + preCheck = '' + export OMPI_MCA_rmaps_base_oversubscribe=1 + export HYDRA_IFACE=lo + ''; + + # disallow Darwin checks due to prototype incompatibility of qsort_r + # to be fixed in a future version of the source code + doCheck = !stdenv.isDarwin && stdenv.hostPlatform == stdenv.buildPlatform; + + meta = { + branch = "prev3-develop"; + description = "Support for parallel scientific applications"; + longDescription = '' + The SC library provides support for parallel scientific applications. + Its main purpose is to support the p4est software library, hence + this package is called p4est-sc, but it works standalone, too. + ''; + homepage = "https://www.p4est.org/"; + downloadPage = "https://github.com/cburstedde/libsc.git"; + license = lib.licenses.lgpl21Plus; + maintainers = [ lib.maintainers.cburstedde ]; + }; +} diff --git a/nixpkgs/pkgs/development/libraries/science/math/p4est/default.nix b/nixpkgs/pkgs/development/libraries/science/math/p4est/default.nix new file mode 100644 index 000000000000..68c71ab59be1 --- /dev/null +++ b/nixpkgs/pkgs/development/libraries/science/math/p4est/default.nix @@ -0,0 +1,58 @@ +{ lib, stdenv, fetchFromGitHub +, autoreconfHook, pkg-config +, p4est-withMetis ? true, metis +, p4est-sc +}: + +let + inherit (p4est-sc) debugEnable mpiSupport; + dbg = if debugEnable then "-dbg" else ""; + withMetis = p4est-withMetis; +in +stdenv.mkDerivation { + pname = "p4est${dbg}"; + version = "unstable-2021-06-22"; + + # fetch an untagged snapshot of the prev3-develop branch + src = fetchFromGitHub { + owner = "cburstedde"; + repo = "p4est"; + rev = "7423ac5f2b2b64490a7a92e5ddcbd251053c4dee"; + sha256 = "0vffnf48rzw6d0as4c3x1f31b4kapmdzr1hfj5rz5ngah72gqrph"; + }; + + nativeBuildInputs = [ autoreconfHook pkg-config ]; + propagatedBuildInputs = [ p4est-sc ]; + buildInputs = lib.optional withMetis metis; + inherit debugEnable mpiSupport withMetis; + + patches = [ ./p4est-metis.patch ]; + postPatch = '' + sed -i -e "s:\(^\s*ACLOCAL_AMFLAGS.*\)\s@P4EST_SC_AMFLAGS@\s*$:\1 -I ${p4est-sc}/share/aclocal:" Makefile.am + ''; + preConfigure = '' + echo "2.8.0" > .tarball-version + ${if mpiSupport then "unset CC" else ""} + ''; + + configureFlags = p4est-sc.configureFlags + ++ [ "--with-sc=${p4est-sc}" ] + ++ lib.optional withMetis "--with-metis" + ; + + inherit (p4est-sc) makeFlags dontDisableStatic enableParallelBuilding preCheck doCheck; + + meta = { + branch = "prev3-develop"; + description = "Parallel AMR on Forests of Octrees"; + longDescription = '' + The p4est software library provides algorithms for parallel AMR. + AMR refers to Adaptive Mesh Refinement, a technique in scientific + computing to cover the domain of a simulation with an adaptive mesh. + ''; + homepage = "https://www.p4est.org/"; + downloadPage = "https://github.com/cburstedde/p4est.git"; + license = lib.licenses.gpl2Plus; + maintainers = [ lib.maintainers.cburstedde ]; + }; +} diff --git a/nixpkgs/pkgs/development/libraries/science/math/p4est/p4est-metis.patch b/nixpkgs/pkgs/development/libraries/science/math/p4est/p4est-metis.patch new file mode 100644 index 000000000000..46b8dc8af08c --- /dev/null +++ b/nixpkgs/pkgs/development/libraries/science/math/p4est/p4est-metis.patch @@ -0,0 +1,26 @@ +diff --git a/src/p4est_connectivity.c b/src/p4est_connectivity.c +index 95339136..c93528f2 100644 +--- a/src/p4est_connectivity.c ++++ b/src/p4est_connectivity.c +@@ -3715,6 +3715,7 @@ p4est_connectivity_reorder_newid (sc_MPI_Comm comm, int k, + sc_array_t * newid) + { + const int n = (int) conn->num_trees; ++ int metis_n; + int *xadj; + int *adjncy; + int *part; +@@ -3862,10 +3863,12 @@ p4est_connectivity_reorder_newid (sc_MPI_Comm comm, int k, + + P4EST_GLOBAL_INFO ("Entering metis\n"); + /* now call metis */ ++ metis_n = n; + P4EST_EXECUTE_ASSERT_INT +- (METIS_PartGraphRecursive (&n, &ncon, xadj, adjncy, NULL, NULL, ++ (METIS_PartGraphRecursive (&metis_n, &ncon, xadj, adjncy, NULL, NULL, + NULL, &k, NULL, NULL, NULL, &volume, part), + METIS_OK); ++ P4EST_ASSERT (metis_n == n); + P4EST_GLOBAL_INFO ("Done metis\n"); + + P4EST_GLOBAL_STATISTICSF ("metis volume %d\n", volume); diff --git a/nixpkgs/pkgs/development/libraries/silgraphite/graphite2.nix b/nixpkgs/pkgs/development/libraries/silgraphite/graphite2.nix index cd737a82a293..25f4b5e13177 100644 --- a/nixpkgs/pkgs/development/libraries/silgraphite/graphite2.nix +++ b/nixpkgs/pkgs/development/libraries/silgraphite/graphite2.nix @@ -1,4 +1,11 @@ -{ lib, stdenv, fetchurl, pkg-config, freetype, cmake }: +{ lib +, stdenv +, fetchurl +, pkg-config +, freetype +, cmake +, static ? stdenv.hostPlatform.isStatic +}: stdenv.mkDerivation rec { version = "1.3.14"; @@ -15,7 +22,22 @@ stdenv.mkDerivation rec { patches = lib.optionals stdenv.isDarwin [ ./macosx.patch ]; - doCheck = false; # fails, probably missing something + cmakeFlags = lib.optionals static [ + "-DBUILD_SHARED_LIBS=OFF" + ]; + + # Remove a test that fails to statically link (undefined reference to png and + # freetype symbols) + postConfigure = lib.optionals static '' + sed -e '/freetype freetype.c/d' -i ../tests/examples/CMakeLists.txt + ''; + + preCheck = '' + export LD_LIBRARY_PATH=$LD_LIBRARY_PATH''${LD_LIBRARY_PATH:+:}$PWD/src/ + export DYLD_LIBRARY_PATH=$DYLD_LIBRARY_PATH''${DYLD_LIBRARY_PATH:+:}$PWD/src/ + ''; + + doCheck = true; meta = with lib; { description = "An advanced font engine"; diff --git a/nixpkgs/pkgs/development/libraries/smooth/default.nix b/nixpkgs/pkgs/development/libraries/smooth/default.nix index f86862382112..8e55c8f4128a 100644 --- a/nixpkgs/pkgs/development/libraries/smooth/default.nix +++ b/nixpkgs/pkgs/development/libraries/smooth/default.nix @@ -10,13 +10,13 @@ stdenv.mkDerivation rec { pname = "smooth"; - version = "0.9.6"; + version = "0.9.8"; src = fetchFromGitHub { owner = "enzo1982"; repo = "smooth"; rev = "v${version}"; - sha256 = "05j5gk6kz2089x8bcq2l0kjspfiiymxn69jcxl4dh9lw96blbadr"; + sha256 = "sha256-4092Od/wCWe4br80Ry6mr8GpUIUeeF6sk3unELdfQJU="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/development/libraries/virglrenderer/default.nix b/nixpkgs/pkgs/development/libraries/virglrenderer/default.nix index 38688d90246e..4c4af6b2c1f8 100644 --- a/nixpkgs/pkgs/development/libraries/virglrenderer/default.nix +++ b/nixpkgs/pkgs/development/libraries/virglrenderer/default.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { pname = "virglrenderer"; - version = "0.8.2"; + version = "0.9.1"; src = fetchurl { url = "https://gitlab.freedesktop.org/virgl/virglrenderer/-/archive/virglrenderer-${version}/virglrenderer-virglrenderer-${version}.tar.bz2"; - sha256 = "07vfzg99wq92yg2phza9jc0zvps34yy9gc8v4hibqchdl77fmspx"; + sha256 = "1h76a1ylhh4niq33sa5knx033sr4k2816vibh4m58j54y7qc6346"; }; buildInputs = [ libGLU epoxy libX11 libdrm mesa ]; diff --git a/nixpkgs/pkgs/development/libraries/volk/default.nix b/nixpkgs/pkgs/development/libraries/volk/default.nix index 574a90d22724..40ae88bf71bb 100644 --- a/nixpkgs/pkgs/development/libraries/volk/default.nix +++ b/nixpkgs/pkgs/development/libraries/volk/default.nix @@ -1,9 +1,7 @@ { stdenv , lib , fetchFromGitHub -, fetchpatch , cmake -, cppunit , python3 , enableModTool ? true , removeReferencesTo @@ -11,25 +9,18 @@ stdenv.mkDerivation rec { pname = "volk"; - version = "2.4.1"; + version = "2.5.0"; src = fetchFromGitHub { owner = "gnuradio"; repo = pname; rev = "v${version}"; - sha256 = "fuHJ+p5VN4ThdbQFbzB08VCuy/Zo7m/I1Gs5EQGPeNY="; + sha256 = "XvX6emv30bSB29EFm6aC+j8NGOxWqHCNv0Hxtdrq/jc="; fetchSubmodules = true; }; - patches = [ - # Fixes a failing test: https://github.com/gnuradio/volk/pull/434 - (fetchpatch { - url = "https://github.com/gnuradio/volk/pull/434/commits/bce8531b6f1a3c5abe946ed6674b283d54258281.patch"; - sha256 = "OLW9uF6iL47z63kjvYqwsWtkINav8Xhs+Htqg6Kr4uI="; - }) - ]; cmakeFlags = lib.optionals (!enableModTool) [ "-DENABLE_MODTOOL=OFF" ]; - postInstall = '' + postInstall = lib.optionalString (!stdenv.isDarwin) '' ${removeReferencesTo}/bin/remove-references-to -t ${stdenv.cc} $(readlink -f $out/lib/libvolk.so) ''; diff --git a/nixpkgs/pkgs/development/libraries/wlroots/default.nix b/nixpkgs/pkgs/development/libraries/wlroots/default.nix index 45c2fd228f2d..9dc717c34790 100644 --- a/nixpkgs/pkgs/development/libraries/wlroots/default.nix +++ b/nixpkgs/pkgs/development/libraries/wlroots/default.nix @@ -18,6 +18,8 @@ stdenv.mkDerivation rec { # $out for the library and $examples for the example programs (in examples): outputs = [ "out" "examples" ]; + depsBuildBuild = [ pkg-config ]; + nativeBuildInputs = [ meson ninja pkg-config wayland-scanner ]; buildInputs = [ diff --git a/nixpkgs/pkgs/development/mobile/checkra1n/default.nix b/nixpkgs/pkgs/development/mobile/checkra1n/default.nix new file mode 100644 index 000000000000..110bb187f61c --- /dev/null +++ b/nixpkgs/pkgs/development/mobile/checkra1n/default.nix @@ -0,0 +1,26 @@ +{ lib, stdenv, fetchurl }: + +stdenv.mkDerivation rec { + pname = "checkra1n"; + version = "0.12.4"; + + src = fetchurl { + url = "https://assets.checkra.in/downloads/linux/cli/x86_64/dac9968939ea6e6bfbdedeb41d7e2579c4711dc2c5083f91dced66ca397dc51d/checkra1n"; + sha256 = "07f5glwwlrpdvj8ky265q8fp3i3r4mz1vd6yvvxnnvpa764rdjfs"; + }; + + dontUnpack = true; + + installPhase = '' + install -dm755 "$out/bin" + install -m755 $src $out/bin/${pname} + ''; + + meta = with lib; { + description = "Jailbreak for iPhone 5s though iPhone X, iOS 12.0 and up"; + homepage = "https://checkra.in/"; + license = licenses.unfreeRedistributable; + maintainers = with maintainers; [ onny ]; + platforms = platforms.linux; + }; +} diff --git a/nixpkgs/pkgs/development/node-packages/node-packages.json b/nixpkgs/pkgs/development/node-packages/node-packages.json index ea8f2ef7a181..6b322a903f97 100644 --- a/nixpkgs/pkgs/development/node-packages/node-packages.json +++ b/nixpkgs/pkgs/development/node-packages/node-packages.json @@ -126,7 +126,7 @@ , "indium" , "insect" , "ionic" -, {"iosevka": "https://github.com/be5invis/Iosevka/archive/v7.0.4.tar.gz"} +, {"iosevka": "https://github.com/be5invis/Iosevka/archive/v7.2.4.tar.gz"} , "jake" , "javascript-typescript-langserver" , "joplin" @@ -182,6 +182,7 @@ , "patch-package" , "peerflix" , "peerflix-server" +, "pkg" , "pm2" , "pnpm" , "poor-mans-t-sql-formatter-cli" diff --git a/nixpkgs/pkgs/development/node-packages/node-packages.nix b/nixpkgs/pkgs/development/node-packages/node-packages.nix index 92a931bd4bba..ace401855650 100644 --- a/nixpkgs/pkgs/development/node-packages/node-packages.nix +++ b/nixpkgs/pkgs/development/node-packages/node-packages.nix @@ -49,13 +49,13 @@ let sha512 = "o/xdK8b4P0t/xpCARgWXAeaiWeh9jeua6bP1jrcbfN39+Z4zC4x2jg4NysHNhz6spRG8dJFH3kJIUoIbs0Ckww=="; }; }; - "@angular-devkit/architect-0.1200.5" = { + "@angular-devkit/architect-0.1201.1" = { name = "_at_angular-devkit_slash_architect"; packageName = "@angular-devkit/architect"; - version = "0.1200.5"; + version = "0.1201.1"; src = fetchurl { - url = "https://registry.npmjs.org/@angular-devkit/architect/-/architect-0.1200.5.tgz"; - sha512 = "222VZ4OeaDK3vON8V5m+w15SRWfUs5uOb4H9ij/H9/6tyHD83uWfCDoOGg+ax4wJVdWEFJIS+Vn4ijGcZCq9WQ=="; + url = "https://registry.npmjs.org/@angular-devkit/architect/-/architect-0.1201.1.tgz"; + sha512 = "n7ycxrIPbtnV7q8PH5Uvs8Jd++u6hWUiB+8EUxznSfdHGA+fE7TTnJTkc27LoMlYZAImc/Axp/uyYZ6Awt72ZQ=="; }; }; "@angular-devkit/core-11.2.4" = { @@ -76,13 +76,13 @@ let sha512 = "3dA0Z6sIIxCDjZS/DucgmIKti7EZ/LgHoHgCO72Q50H5ZXbUSNBz5wGl5hVq2+gzrnFgU/0u40MIs6eptk30ZA=="; }; }; - "@angular-devkit/core-12.0.5" = { + "@angular-devkit/core-12.1.1" = { name = "_at_angular-devkit_slash_core"; packageName = "@angular-devkit/core"; - version = "12.0.5"; + version = "12.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/@angular-devkit/core/-/core-12.0.5.tgz"; - sha512 = "zVSQV+8/vjUjsUKGlj8Kf5LioA6AXJTGI0yhHW9q1dFX4dPpbW63k0R1UoIB2wJ0F/AbYVgpnPGPe9BBm2fvZA=="; + url = "https://registry.npmjs.org/@angular-devkit/core/-/core-12.1.1.tgz"; + sha512 = "z5+O3ugXbo8djKPjUtf/UfnYCmco2K1LVhQ6cWLhKi3NKRBiHeNmZh5nAycqFD8/Q+oI/+Ao40MkmkK1Tq0jsw=="; }; }; "@angular-devkit/schematics-11.2.4" = { @@ -103,13 +103,13 @@ let sha512 = "bhi2+5xtVAjtr3bsXKT8pnoBamQrArd/Y20ueA4Od7cd38YT97nzTA1wyHBFG0vWd0HMyg42ZS0aycNBuOebaA=="; }; }; - "@angular-devkit/schematics-12.0.5" = { + "@angular-devkit/schematics-12.1.1" = { name = "_at_angular-devkit_slash_schematics"; packageName = "@angular-devkit/schematics"; - version = "12.0.5"; + version = "12.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/@angular-devkit/schematics/-/schematics-12.0.5.tgz"; - sha512 = "iW3XuDHScr3TXuunlEjF5O01zBpwpLgfr1oEny8PvseFGDlHK4Nj8zNIoIn3Yg936aiFO4GJAC/UXsT8g5vKxQ=="; + url = "https://registry.npmjs.org/@angular-devkit/schematics/-/schematics-12.1.1.tgz"; + sha512 = "oRsvlhJQLXkGWdJvArOby+G4j8UX2uCHwrN4EC1hXUKs84UsD+UATYOAh4h2auy+I+sdrmELUaHwdI4wdKpqnw=="; }; }; "@angular-devkit/schematics-cli-0.1102.6" = { @@ -625,6 +625,15 @@ let sha512 = "qf9u2WFWVV0MppaL877j2dBtQIDgmidgjGk5VIMw3OadXvYaXn66U1BFlH2t4+t3i+8PhedppRv+i40ABzd+gg=="; }; }; + "@babel/parser-7.13.13" = { + name = "_at_babel_slash_parser"; + packageName = "@babel/parser"; + version = "7.13.13"; + src = fetchurl { + url = "https://registry.npmjs.org/@babel/parser/-/parser-7.13.13.tgz"; + sha512 = "OhsyMrqygfk5v8HmWwOzlYjJrtLaFhF34MrfG/Z73DgYCI6ojNUTUp2TYbtnjo8PegeJp12eamsNettCQjKjVw=="; + }; + }; "@babel/parser-7.14.7" = { name = "_at_babel_slash_parser"; packageName = "@babel/parser"; @@ -1534,6 +1543,15 @@ let sha512 = "9vDr5NzHu27wgwejuKL7kIOm4bwEtaPQ4Z6cpCmjSuaRqpH/7xc4qcGEscwMqlkwgcXl6MvqoAjZkQ24uSdIZQ=="; }; }; + "@babel/types-7.13.12" = { + name = "_at_babel_slash_types"; + packageName = "@babel/types"; + version = "7.13.12"; + src = fetchurl { + url = "https://registry.npmjs.org/@babel/types/-/types-7.13.12.tgz"; + sha512 = "K4nY2xFN4QMvQwkQ+zmBDp6ANMbVNw6BbxWmYA4qNjhR9W+Lj/8ky5MEY2Me5r+B2c6/v6F53oMndG+f9s3IiA=="; + }; + }; "@babel/types-7.14.5" = { name = "_at_babel_slash_types"; packageName = "@babel/types"; @@ -1552,13 +1570,13 @@ let sha512 = "GcIY79elgB+azP74j8vqkiXz8xLFfIzbQJdlwOPisgbKT00tviJQuEghOXSMVxJ00HoYJbGswr4kcllUc4xCcg=="; }; }; - "@bugsnag/browser-7.10.1" = { + "@bugsnag/browser-7.10.4" = { name = "_at_bugsnag_slash_browser"; packageName = "@bugsnag/browser"; - version = "7.10.1"; + version = "7.10.4"; src = fetchurl { - url = "https://registry.npmjs.org/@bugsnag/browser/-/browser-7.10.1.tgz"; - sha512 = "Yxm/DheT/NHX2PhadBDuafuHBhP547Iav6Y9jf+skBBSi1n0ZYkGhtVxh8ZWLgqz5W8MsJ0HFiLBqcg/mulSvQ=="; + url = "https://registry.npmjs.org/@bugsnag/browser/-/browser-7.10.4.tgz"; + sha512 = "1lPhUBIHUCxCyOfMHCfM+rt2cpV49LEeodFBPx8D8+7LJNmxX0JwfQ0OB+7Lv8JNRcnAI3j6Uq6OOTVakhaxBw=="; }; }; "@bugsnag/core-7.10.0" = { @@ -1579,13 +1597,13 @@ let sha512 = "LOt8aaBI+KvOQGneBtpuCz3YqzyEAehd1f3nC5yr9TIYW1+IzYKa2xWS4EiMz5pPOnRPHkyyS5t/wmSmN51Gjg=="; }; }; - "@bugsnag/js-7.10.1" = { + "@bugsnag/js-7.10.4" = { name = "_at_bugsnag_slash_js"; packageName = "@bugsnag/js"; - version = "7.10.1"; + version = "7.10.4"; src = fetchurl { - url = "https://registry.npmjs.org/@bugsnag/js/-/js-7.10.1.tgz"; - sha512 = "1/MK/Bw2ViFx1hMG2TOX8MOq/LzT2VRd0VswknF4LYsZSgzohkRzz/hi6P2TSlLeapRs+bkDC6u2RCq4zYvyiA=="; + url = "https://registry.npmjs.org/@bugsnag/js/-/js-7.10.4.tgz"; + sha512 = "XnH3JlG9w1elhmMsByIsQ6JODYdoDlJ75QwvkPjkdybikEm8Zw+OK16JKyxY2scD4RSNbzYMWnbNZvCiFgcDPA=="; }; }; "@bugsnag/node-7.10.1" = { @@ -2047,22 +2065,22 @@ let sha512 = "Ydf4LidRB/EBI+YrB+cVLqIseiRfjUI/AeHBgjGMtq3GroraDu81OV7zqophRgupngoL3iS3JUMDMnxO7g39qA=="; }; }; - "@expo/config-4.0.4" = { + "@expo/config-5.0.2" = { name = "_at_expo_slash_config"; packageName = "@expo/config"; - version = "4.0.4"; + version = "5.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/@expo/config/-/config-4.0.4.tgz"; - sha512 = "O3xRlwMCidOgk1WHIy6eOjh2yp0h/kgBDRNKqPe21+YDiOufyTGGNvbWgHwoax8goa1iMg443WQO7GhvaH286g=="; + url = "https://registry.npmjs.org/@expo/config/-/config-5.0.2.tgz"; + sha512 = "NJd2iQDIWNn6vVv4NEeUMrRPFtV27loaR9w1I0d+lhbfrfIqY7JxI7OgDS8udwjBi0iWnO+BUb0l4C5SmfHuhA=="; }; }; - "@expo/config-plugins-2.0.4" = { + "@expo/config-plugins-3.0.2" = { name = "_at_expo_slash_config-plugins"; packageName = "@expo/config-plugins"; - version = "2.0.4"; + version = "3.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/@expo/config-plugins/-/config-plugins-2.0.4.tgz"; - sha512 = "JGt/X2tFr7H8KBQrKfbGo9hmCubQraMxq5sj3bqDdKmDOLcE1a/EDCP9g0U4GHsa425J8VDIkQUHYz3h3ndEXQ=="; + url = "https://registry.npmjs.org/@expo/config-plugins/-/config-plugins-3.0.2.tgz"; + sha512 = "bS7t9JbPBK1lCcMo2mp7QSDq2a4xsc8E6sEYVwD+YS5RKx7nxEtSYohnFWlKthm624dHCaVzqEbKxhIGO3M3Uw=="; }; }; "@expo/config-types-41.0.0" = { @@ -2074,31 +2092,22 @@ let sha512 = "Ax0pHuY5OQaSrzplOkT9DdpdmNzaVDnq9VySb4Ujq7UJ4U4jriLy8u93W98zunOXpcu0iiKubPsqD6lCiq0pig=="; }; }; - "@expo/configure-splash-screen-0.4.0" = { - name = "_at_expo_slash_configure-splash-screen"; - packageName = "@expo/configure-splash-screen"; - version = "0.4.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@expo/configure-splash-screen/-/configure-splash-screen-0.4.0.tgz"; - sha512 = "IDPnr2/DW1tYpDHqedFYNCDzRTf9HYinWFQ7fOelNZLuOCMoErLbSStA5zfkv46o69AgcCpteqgKHSoxsIBz5g=="; - }; - }; - "@expo/dev-server-0.1.74" = { + "@expo/dev-server-0.1.77" = { name = "_at_expo_slash_dev-server"; packageName = "@expo/dev-server"; - version = "0.1.74"; + version = "0.1.77"; src = fetchurl { - url = "https://registry.npmjs.org/@expo/dev-server/-/dev-server-0.1.74.tgz"; - sha512 = "b0yHZH0HB28plFf2/d53ZP91QNANy5Sz9fDYfWfMznHTg1tx6xkjBNu6WiVtlDqBq4UBdbXqSu5AIZWAziss2Q=="; + url = "https://registry.npmjs.org/@expo/dev-server/-/dev-server-0.1.77.tgz"; + sha512 = "gOnJ3YAVVMsi+lZY39O9KRCVRCPs61dhONJ0OLuOdtt8N5/VG+CTKNiyls1k5jAxsAzeOPzZsPqRNMTKvnxsOg=="; }; }; - "@expo/dev-tools-0.13.104" = { + "@expo/dev-tools-0.13.107" = { name = "_at_expo_slash_dev-tools"; packageName = "@expo/dev-tools"; - version = "0.13.104"; + version = "0.13.107"; src = fetchurl { - url = "https://registry.npmjs.org/@expo/dev-tools/-/dev-tools-0.13.104.tgz"; - sha512 = "q0ozFDgMzfjJIpVyp3awA3L2jQ+t+suhfrJvKk58uYiCiVAicQYaqoxMj7jVgRdd45WJwPcUSA6lAbFx1PMkmQ=="; + url = "https://registry.npmjs.org/@expo/dev-tools/-/dev-tools-0.13.107.tgz"; + sha512 = "F60wit5+MiXzFPZ1R2rQuM0wC4vdesKtUrV8ipQyGdEkjogZ2mdq7OJbxofnzslkyAGImWfyKRJhqMflRBD/9w=="; }; }; "@expo/devcert-1.0.0" = { @@ -2128,13 +2137,13 @@ let sha512 = "vrgGyPEXBoFI5NY70IegusCSoSVIFV3T3ry4tjJg1MFQKTUlR7E0r+8g8XR6qC705rc2PawaZQjqXMAVtV6s2A=="; }; }; - "@expo/metro-config-0.1.74" = { + "@expo/metro-config-0.1.77" = { name = "_at_expo_slash_metro-config"; packageName = "@expo/metro-config"; - version = "0.1.74"; + version = "0.1.77"; src = fetchurl { - url = "https://registry.npmjs.org/@expo/metro-config/-/metro-config-0.1.74.tgz"; - sha512 = "1FzFJCXhdEMzDivZ+AKxrNBsgSRNPwQqz++KwN1ooeL9oPgxXWOQtStMB0Y2N2FSaHtLe/94D4EmzNWFGyz15A=="; + url = "https://registry.npmjs.org/@expo/metro-config/-/metro-config-0.1.77.tgz"; + sha512 = "PGxcxkN1AJjzn82Fb3zBxbG0kI6V6BrYVhICPL3jenreKQYaHN0+/owkAwX+8MxKqaJqJR6outw8I+Gypp4ZcQ=="; }; }; "@expo/osascript-2.0.28" = { @@ -2164,13 +2173,13 @@ let sha512 = "zGPSq9OrCn7lWvwLLHLpHUUq2E40KptUFXn53xyZXPViI0k9lbApcR9KlonQZ95C+ELsf0BQ3gRficwK92Ivcw=="; }; }; - "@expo/prebuild-config-1.0.5" = { + "@expo/prebuild-config-2.0.2" = { name = "_at_expo_slash_prebuild-config"; packageName = "@expo/prebuild-config"; - version = "1.0.5"; + version = "2.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/@expo/prebuild-config/-/prebuild-config-1.0.5.tgz"; - sha512 = "tBVB3n70t/jWqOZOxo85WsIp9gJ/hZT8aii72S7BLarXa0oPmAy+TmPD19IR4U6+TcrR0B2Qwr/6mVNnZhuBtg=="; + url = "https://registry.npmjs.org/@expo/prebuild-config/-/prebuild-config-2.0.2.tgz"; + sha512 = "wyAPiu1tnUghDoE5cUbjD92rF/rtyNqrfdwmcn56q8EG7MKuO47CxFrkhAL0EBVplPhSdzZ3zPFOtWzYK7E+6Q=="; }; }; "@expo/results-1.0.0" = { @@ -2209,22 +2218,22 @@ let sha512 = "LB7jWkqrHo+5fJHNrLAFdimuSXQ2MQ4lA7SQW5bf/HbsXuV2VrT/jN/M8f/KoWt0uJMGN4k/j7Opx4AvOOxSew=="; }; }; - "@expo/webpack-config-0.12.78" = { + "@expo/webpack-config-0.12.81" = { name = "_at_expo_slash_webpack-config"; packageName = "@expo/webpack-config"; - version = "0.12.78"; + version = "0.12.81"; src = fetchurl { - url = "https://registry.npmjs.org/@expo/webpack-config/-/webpack-config-0.12.78.tgz"; - sha512 = "oYR9fTuO2qWkZOHhA20NPpG0P+C4EBSsWT3RavHSREFPWSNqQB6BYnTIAFmK29QaVcY370qvqfBo+p7vCaRQ4w=="; + url = "https://registry.npmjs.org/@expo/webpack-config/-/webpack-config-0.12.81.tgz"; + sha512 = "hsWI3EwYcwsG2E1VKlkaQwiLofgH6g7qNRpnoncnvbVEsfHhvA5+aI8/CMiUO+sHh6RPJWgux12O89TXS/DeBg=="; }; }; - "@expo/xcpretty-3.1.3" = { + "@expo/xcpretty-3.1.4" = { name = "_at_expo_slash_xcpretty"; packageName = "@expo/xcpretty"; - version = "3.1.3"; + version = "3.1.4"; src = fetchurl { - url = "https://registry.npmjs.org/@expo/xcpretty/-/xcpretty-3.1.3.tgz"; - sha512 = "Kgp2eXR8LB/m7UxOwL1fi6JzRv6DGT+rXfrtyUR3J9L0O66KDKem3A9NWACnihn/1RiL8Xb5ryb0vBUFYYeieg=="; + url = "https://registry.npmjs.org/@expo/xcpretty/-/xcpretty-3.1.4.tgz"; + sha512 = "zjZo89YkDW/C2wh10wAkAHYrdXwLdiMbKrGmADLJvz25yp7QpXgDR8KOaa1FUU/vYqmHZ6lshjrMMJpJWEqTRw=="; }; }; "@fast-csv/format-4.3.5" = { @@ -2254,6 +2263,15 @@ let sha512 = "o8iU1VIY+QsqVRWARKiky29fh4KR1xaKSgMClXIi65qkt8EDDhjmlzL0KVDEoDA2GWukwb/1PpaVCWDg4v3cUQ=="; }; }; + "@fluentui/date-time-utilities-8.2.0" = { + name = "_at_fluentui_slash_date-time-utilities"; + packageName = "@fluentui/date-time-utilities"; + version = "8.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@fluentui/date-time-utilities/-/date-time-utilities-8.2.0.tgz"; + sha512 = "OunpRZ8hyDPLNWwrx8w17eUwGdNYjG4kGR9+jzvQQJjswk94KMxc6SY33mlTLVEbagjdHMHw9jR7STS+JCQNcA=="; + }; + }; "@fluentui/dom-utilities-1.1.2" = { name = "_at_fluentui_slash_dom-utilities"; packageName = "@fluentui/dom-utilities"; @@ -2263,6 +2281,33 @@ let sha512 = "XqPS7l3YoMwxdNlaYF6S2Mp0K3FmVIOIy2K3YkMc+eRxu9wFK6emr2Q/3rBhtG5u/On37NExRT7/5CTLnoi9gw=="; }; }; + "@fluentui/dom-utilities-2.1.2" = { + name = "_at_fluentui_slash_dom-utilities"; + packageName = "@fluentui/dom-utilities"; + version = "2.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/@fluentui/dom-utilities/-/dom-utilities-2.1.2.tgz"; + sha512 = "9LxI3iLbBkyoudRyk0nPTjMdMB2+ClDfM8V3A0SM82e5cDss5qlo0fog/2T2aoaon+hwfeinpiY4e3znx+Nn0w=="; + }; + }; + "@fluentui/font-icons-mdl2-8.1.4" = { + name = "_at_fluentui_slash_font-icons-mdl2"; + packageName = "@fluentui/font-icons-mdl2"; + version = "8.1.4"; + src = fetchurl { + url = "https://registry.npmjs.org/@fluentui/font-icons-mdl2/-/font-icons-mdl2-8.1.4.tgz"; + sha512 = "v0NRk+W2qJQtBsH9hqYNG5Xnic8C1kfB0I+OTGasFYPvxdd0APcWw2vajrlE49ijgVjXS0AByCgF6mu8LiYlHg=="; + }; + }; + "@fluentui/foundation-legacy-8.1.4" = { + name = "_at_fluentui_slash_foundation-legacy"; + packageName = "@fluentui/foundation-legacy"; + version = "8.1.4"; + src = fetchurl { + url = "https://registry.npmjs.org/@fluentui/foundation-legacy/-/foundation-legacy-8.1.4.tgz"; + sha512 = "Kd+XpHsv3UEnDTwEnUm93Au+QGpYZ5x/VuQsv8K1sDM+gjb3BDohuwR6MWgzgCMJiVW0NMlbS4I2OpUZa6k5eg=="; + }; + }; "@fluentui/keyboard-key-0.2.17" = { name = "_at_fluentui_slash_keyboard-key"; packageName = "@fluentui/keyboard-key"; @@ -2272,6 +2317,24 @@ let sha512 = "iT1bU56rKrKEOfODoW6fScY11qj3iaYrZ+z11T6fo5+TDm84UGkkXjLXJTE57ZJzg0/gbccHQWYv+chY7bJN8Q=="; }; }; + "@fluentui/keyboard-key-0.3.2" = { + name = "_at_fluentui_slash_keyboard-key"; + packageName = "@fluentui/keyboard-key"; + version = "0.3.2"; + src = fetchurl { + url = "https://registry.npmjs.org/@fluentui/keyboard-key/-/keyboard-key-0.3.2.tgz"; + sha512 = "Hjes+WUgVRqikyvmBEuyovw89inYZ1qVmdp4kKi/6BGvQlAcHgGIVfmdnlFumP4lmFpBW8uUh2K1ZmfY0xwQ6Q=="; + }; + }; + "@fluentui/merge-styles-8.1.2" = { + name = "_at_fluentui_slash_merge-styles"; + packageName = "@fluentui/merge-styles"; + version = "8.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/@fluentui/merge-styles/-/merge-styles-8.1.2.tgz"; + sha512 = "r0EGKfJUjZw9yJ21VMXjaqLoujvBkRIWRQVMM6CUxbY+02dhKUt6Sa9QA/8m8klsEWBENOaKZ4uX5U2vWWBlyw=="; + }; + }; "@fluentui/react-7.172.1" = { name = "_at_fluentui_slash_react"; packageName = "@fluentui/react"; @@ -2281,6 +2344,15 @@ let sha512 = "XJhYEo0fn/30i4m+qJkT1y5kNTZ8DAwzWhdGSyTiOrxiJ7pKWOoXAdWnvhtk3iY0SPVWSD9jTn5lMT/2WkZbJw=="; }; }; + "@fluentui/react-8.22.0" = { + name = "_at_fluentui_slash_react"; + packageName = "@fluentui/react"; + version = "8.22.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@fluentui/react/-/react-8.22.0.tgz"; + sha512 = "mn/zUd7vJNFLqpXZhc3ePNpDcNx4mhYdQ5vCC6kqcFIYjMg2ve5WqBP9tpFlbD3LEBa8NyOvIWfdG0NZdKejLg=="; + }; + }; "@fluentui/react-focus-7.17.6" = { name = "_at_fluentui_slash_react-focus"; packageName = "@fluentui/react-focus"; @@ -2290,6 +2362,24 @@ let sha512 = "JkLWNDe567lhvbnIhbYv9nUWYDIVN06utc3krs0UZBI+A0YZtQmftBtY0ghXo4PSjgozZocdu9sYkkgZOgyRLg=="; }; }; + "@fluentui/react-focus-8.1.5" = { + name = "_at_fluentui_slash_react-focus"; + packageName = "@fluentui/react-focus"; + version = "8.1.5"; + src = fetchurl { + url = "https://registry.npmjs.org/@fluentui/react-focus/-/react-focus-8.1.5.tgz"; + sha512 = "zvHwta+lRmw2kYRif0Zz6+skmfxUzagd15iMlUPRIVAcsj+rxOkoE7g8NlhXym7HsgMiKRAYJM0CdfMauCnkvQ=="; + }; + }; + "@fluentui/react-hooks-8.2.3" = { + name = "_at_fluentui_slash_react-hooks"; + packageName = "@fluentui/react-hooks"; + version = "8.2.3"; + src = fetchurl { + url = "https://registry.npmjs.org/@fluentui/react-hooks/-/react-hooks-8.2.3.tgz"; + sha512 = "JqQNLIc0WOwwMZ3rAnBkcy0oHZD83Bi1hs7qpvwGUW1OrL3QoJqEnmiKPowxWb8NUeKEP51cBfGi+/7aqbDZAg=="; + }; + }; "@fluentui/react-window-provider-1.0.2" = { name = "_at_fluentui_slash_react-window-provider"; packageName = "@fluentui/react-window-provider"; @@ -2299,6 +2389,33 @@ let sha512 = "fGSgL3Vp/+6t1Ysfz21FWZmqsU+iFVxOigvHnm5uKVyyRPwtaabv/F6kQ2y5isLMI2YmJaUd2i0cDJKu8ggrvw=="; }; }; + "@fluentui/react-window-provider-2.1.2" = { + name = "_at_fluentui_slash_react-window-provider"; + packageName = "@fluentui/react-window-provider"; + version = "2.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/@fluentui/react-window-provider/-/react-window-provider-2.1.2.tgz"; + sha512 = "VWtesIAZR5fdlZMwYco/M5EBb3jawUkslQYOKsneNq+mq8ThkUs1Bol5bpK6jwmouROscu76HD1QfjdACAfkLQ=="; + }; + }; + "@fluentui/set-version-8.1.2" = { + name = "_at_fluentui_slash_set-version"; + packageName = "@fluentui/set-version"; + version = "8.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/@fluentui/set-version/-/set-version-8.1.2.tgz"; + sha512 = "uCPwdBsahBbLuN8UkbmXtp+u8Gxqtm5+fZ1UuOUBhEL7MKl86LrWmxoy4IW3JD2rcbaYpCb7KFpnMB5s0Nx0ZA=="; + }; + }; + "@fluentui/style-utilities-8.1.4" = { + name = "_at_fluentui_slash_style-utilities"; + packageName = "@fluentui/style-utilities"; + version = "8.1.4"; + src = fetchurl { + url = "https://registry.npmjs.org/@fluentui/style-utilities/-/style-utilities-8.1.4.tgz"; + sha512 = "tR/ntfobJvuCtLyi7jpEbsq67iTaBNq/lpq+tYuvIqI8Gl90L9a8g8344ADP4+9/i3TKsrAZgnV9vze66ybHOw=="; + }; + }; "@fluentui/theme-1.7.4" = { name = "_at_fluentui_slash_theme"; packageName = "@fluentui/theme"; @@ -2308,6 +2425,24 @@ let sha512 = "o4eo7lstLxxXl1g2RR9yz18Yt8yjQO/LbQuZjsiAfv/4Bf0CRnb+3j1F7gxIdBWAchKj9gzaMpIFijfI98pvYQ=="; }; }; + "@fluentui/theme-2.1.3" = { + name = "_at_fluentui_slash_theme"; + packageName = "@fluentui/theme"; + version = "2.1.3"; + src = fetchurl { + url = "https://registry.npmjs.org/@fluentui/theme/-/theme-2.1.3.tgz"; + sha512 = "o/So4091GtwtEkxujd6QT9M8kuLOde0Z7by/zLNQBU00wX3PeBxM4mpSLmnz2vt5CN5IT7OWhRRsiyve/7hLAg=="; + }; + }; + "@fluentui/utilities-8.2.0" = { + name = "_at_fluentui_slash_utilities"; + packageName = "@fluentui/utilities"; + version = "8.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@fluentui/utilities/-/utilities-8.2.0.tgz"; + sha512 = "kq8xyFHkWUbzzbkGLuDACEhH+K5oqM/wEU9+zRuM/qI2bIS1B6Cr0ruq7FHxVrtAnMhvXKzM8DPn0W8uf775qQ=="; + }; + }; "@google-cloud/paginator-3.0.5" = { name = "_at_google-cloud_slash_paginator"; packageName = "@google-cloud/paginator"; @@ -2344,13 +2479,13 @@ let sha512 = "d4VSA86eL/AFTe5xtyZX+ePUjE8dIFu2T8zmdeNBSa5/kNgXPCx/o/wbFNHAGLJdGnk1vddRuMESD9HbOC8irw=="; }; }; - "@google-cloud/pubsub-2.14.0" = { + "@google-cloud/pubsub-2.15.1" = { name = "_at_google-cloud_slash_pubsub"; packageName = "@google-cloud/pubsub"; - version = "2.14.0"; + version = "2.15.1"; src = fetchurl { - url = "https://registry.npmjs.org/@google-cloud/pubsub/-/pubsub-2.14.0.tgz"; - sha512 = "pP8pwQ9d+p5KNmccEuwM4W9MM8Z9NP+Zzu3P9ewo/z+obK8mEvh5suC2at60MUWaDQOneTcUICpL6DXLRx957A=="; + url = "https://registry.npmjs.org/@google-cloud/pubsub/-/pubsub-2.15.1.tgz"; + sha512 = "avBYmN1n9BsY8RzntkEP3SG1gSfEm0iOoUwoWjtrmWAk+6QZw0C093HJCGClteo+EwIQDhgyn2cXc5QInegSeg=="; }; }; "@graphql-cli/common-4.1.0" = { @@ -2497,13 +2632,13 @@ let sha512 = "UXepkOKCATJrhHGsxt+CGfpZy9zUn1q9mop5kfcXq1fBkTePxVNPOdnISlCbJFlCtld+pSLGyZCzr9/zVprFKA=="; }; }; - "@grpc/grpc-js-1.3.3" = { + "@grpc/grpc-js-1.3.4" = { name = "_at_grpc_slash_grpc-js"; packageName = "@grpc/grpc-js"; - version = "1.3.3"; + version = "1.3.4"; src = fetchurl { - url = "https://registry.npmjs.org/@grpc/grpc-js/-/grpc-js-1.3.3.tgz"; - sha512 = "KkKZrX3fVTBYCtUk8I+Y4xWaauEEOIR1mIGoPFUK8C+a9TTub5dmjowJpFGz0dqYj//wJcgVR9fqpoNhSYFfHQ=="; + url = "https://registry.npmjs.org/@grpc/grpc-js/-/grpc-js-1.3.4.tgz"; + sha512 = "AxtZcm0mArQhY9z8T3TynCYVEaSKxNCa9mVhVwBCUnsuUEe8Zn94bPYYKVQSLt+hJJ1y0ukr3mUvtWfcATL/IQ=="; }; }; "@grpc/proto-loader-0.5.6" = { @@ -2524,6 +2659,24 @@ let sha512 = "q2Qle60Ht2OQBCp9S5hv1JbI4uBBq6/mqSevFNK3ZEgRDBCAkWqZPUhD/K9gXOHrHKluliHiVq2L9sw1mVyAIg=="; }; }; + "@grpc/proto-loader-0.6.3" = { + name = "_at_grpc_slash_proto-loader"; + packageName = "@grpc/proto-loader"; + version = "0.6.3"; + src = fetchurl { + url = "https://registry.npmjs.org/@grpc/proto-loader/-/proto-loader-0.6.3.tgz"; + sha512 = "AtMWwb7kY8DdtwIQh2hC4YFM1MzZ22lMA+gjbnCYDgICt14vX2tCa59bDrEjFyOI4LvORjpvT/UhHUdKvsX8og=="; + }; + }; + "@grpc/proto-loader-0.6.4" = { + name = "_at_grpc_slash_proto-loader"; + packageName = "@grpc/proto-loader"; + version = "0.6.4"; + src = fetchurl { + url = "https://registry.npmjs.org/@grpc/proto-loader/-/proto-loader-0.6.4.tgz"; + sha512 = "7xvDvW/vJEcmLUltCUGOgWRPM8Oofv0eCFSVMuKqaqWJaXSzmB+m9hiyqe34QofAl4WAzIKUZZlinIF9FOHyTQ=="; + }; + }; "@gulp-sourcemaps/identity-map-1.0.2" = { name = "_at_gulp-sourcemaps_slash_identity-map"; packageName = "@gulp-sourcemaps/identity-map"; @@ -2641,13 +2794,13 @@ let sha512 = "tAag0jEcjwH+P2quUfipd7liWCNX2F8NvYjQp2wtInsZxnMlypdw0FtAOLxtvvkO+GSRRbmNi8m/5y42PQJYCQ=="; }; }; - "@hapi/topo-5.0.0" = { + "@hapi/topo-5.1.0" = { name = "_at_hapi_slash_topo"; packageName = "@hapi/topo"; - version = "5.0.0"; + version = "5.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/@hapi/topo/-/topo-5.0.0.tgz"; - sha512 = "tFJlT47db0kMqVm3H4nQYgn6Pwg10GTZHb1pwmSiv1K4ks6drQOtfEF5ZnPjkvC+y4/bUPHK+bc87QvLcL+WMw=="; + url = "https://registry.npmjs.org/@hapi/topo/-/topo-5.1.0.tgz"; + sha512 = "foQZKJig7Ob0BMAYBfcJk8d77QtOe7Wo4ox7ff1lQYoNNAb6jwcY1ncdoy2e9wQZzvNy7ODZCYJkK8kzmcAnAg=="; }; }; "@heroku-cli/color-1.1.14" = { @@ -3091,31 +3244,31 @@ let sha512 = "EjPkDQOzV/oZfbolEUgFT6SE++PtCccVBvjuACkttyCfl0P2jnpR49SwstyVLc2u8AwBAZEHHAw9lPYaMjtbXQ=="; }; }; - "@joplin/fork-htmlparser2-4.1.27" = { + "@joplin/fork-htmlparser2-4.1.28" = { name = "_at_joplin_slash_fork-htmlparser2"; packageName = "@joplin/fork-htmlparser2"; - version = "4.1.27"; + version = "4.1.28"; src = fetchurl { - url = "https://registry.npmjs.org/@joplin/fork-htmlparser2/-/fork-htmlparser2-4.1.27.tgz"; - sha512 = "4rR2spWO9eLWGoGXS0ulxzarl/tNq3bIcqTKLu3Qh6C5putae7A01gJssg1BtO+0hLADuzfQK7FWb4W6Z6fymA=="; + url = "https://registry.npmjs.org/@joplin/fork-htmlparser2/-/fork-htmlparser2-4.1.28.tgz"; + sha512 = "aY8o+hi42Rn0BCcjI33nXC/tHwm1mYoAMrqnEfNVQ1ZDGJbbKVnYWADf6o5tGMR+Klkn9lbbR9tn+U8hKHbFhA=="; }; }; - "@joplin/fork-sax-1.2.31" = { + "@joplin/fork-sax-1.2.32" = { name = "_at_joplin_slash_fork-sax"; packageName = "@joplin/fork-sax"; - version = "1.2.31"; + version = "1.2.32"; src = fetchurl { - url = "https://registry.npmjs.org/@joplin/fork-sax/-/fork-sax-1.2.31.tgz"; - sha512 = "EIRijEi10yuCSoSkGjvOes0yljEGBWjLf38NnIbadfByWUNPkdlSL+yEq9b8bc2WupAxmJiNA4tfi1i8Th2xDQ=="; + url = "https://registry.npmjs.org/@joplin/fork-sax/-/fork-sax-1.2.32.tgz"; + sha512 = "N6Nk2qdsmCM31zIYjyIEH2hTSFd9rZv6tcvN9bjsuxTQ97WW74d6fI8+ReBWz2cFs7joXxaPay0iNwwDDXV0Kg=="; }; }; - "@joplin/lib-2.0.3" = { + "@joplin/lib-2.1.1" = { name = "_at_joplin_slash_lib"; packageName = "@joplin/lib"; - version = "2.0.3"; + version = "2.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/@joplin/lib/-/lib-2.0.3.tgz"; - sha512 = "0LYqc8JY75TMFwapYcj0aJrCSVjBsXH15520fZehy1iheh5yQO6YV3MMqLHwpa4/CofCT4SlOs3pd6LIbSyh1w=="; + url = "https://registry.npmjs.org/@joplin/lib/-/lib-2.1.1.tgz"; + sha512 = "mePMxOEC7+T7gTRuIO3ZWxkyDhAhuoNNGi3wsf4g633TcYD0SEX9peokCdjAnQC5l4BjrqxmgY1qTmk2sx+9TA=="; }; }; "@joplin/renderer-1.8.2" = { @@ -3127,31 +3280,31 @@ let sha512 = "Khl2DoM1aFEy15RX9JaMaYinjoNEYQHOgQqzMHq4wuWr+QuAQaX8/SofTe1FU2rS4SJrkObPA+XPavhVSAxpOQ=="; }; }; - "@joplin/renderer-2.0.3" = { + "@joplin/renderer-2.1.1" = { name = "_at_joplin_slash_renderer"; packageName = "@joplin/renderer"; - version = "2.0.3"; + version = "2.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/@joplin/renderer/-/renderer-2.0.3.tgz"; - sha512 = "FKXFR212wjStu2wRJ7pe5KyCm4uwiXrrSd9g8Vp38FuQu8Db6J5MNiqno/EcwvibshCxn0cE/odEM7ld/Aukng=="; + url = "https://registry.npmjs.org/@joplin/renderer/-/renderer-2.1.1.tgz"; + sha512 = "XxmquKGZxlrjUorx924ogAACc39p22pzWp06DJX/eElU2kLZ/s+RC0EXAFj503EuDj/dd2voV+Tciz0wfCPc0Q=="; }; }; - "@joplin/turndown-4.0.49" = { + "@joplin/turndown-4.0.50" = { name = "_at_joplin_slash_turndown"; packageName = "@joplin/turndown"; - version = "4.0.49"; + version = "4.0.50"; src = fetchurl { - url = "https://registry.npmjs.org/@joplin/turndown/-/turndown-4.0.49.tgz"; - sha512 = "TIGJLjSDwy2j00+XGxTi7GaoqPOmDqmfhVsTCZK7C7JDfYzFQWzMixmEKSJkw3rWnFHA5q4omGeIWZP6DAkoGA=="; + url = "https://registry.npmjs.org/@joplin/turndown/-/turndown-4.0.50.tgz"; + sha512 = "oqMCmkudn3OUxkI68mbBy5AWqnmgWBlIL9lz3XSoq3iYJZdXYCDyYUA0Wb64eRHf6muUN8V23WdeVjc02dsbEQ=="; }; }; - "@joplin/turndown-plugin-gfm-1.0.31" = { + "@joplin/turndown-plugin-gfm-1.0.32" = { name = "_at_joplin_slash_turndown-plugin-gfm"; packageName = "@joplin/turndown-plugin-gfm"; - version = "1.0.31"; + version = "1.0.32"; src = fetchurl { - url = "https://registry.npmjs.org/@joplin/turndown-plugin-gfm/-/turndown-plugin-gfm-1.0.31.tgz"; - sha512 = "6PqxgmOIJ8CUR/aFno88JM2a0QTlFtz50ofTz8/hhD4jDD8qQ8DROy6yexCeZle4Gj45yLt8/WhmOlu32FkO/w=="; + url = "https://registry.npmjs.org/@joplin/turndown-plugin-gfm/-/turndown-plugin-gfm-1.0.32.tgz"; + sha512 = "5jodAeZz90xt4p5FSvnRi4V1NyiPS0L9O7WufG8lN55sacZ9pkXUvELex4PQ7kiHvmOv67x4XcvTjfqX/mnKnA=="; }; }; "@josephg/resolvable-1.0.1" = { @@ -3802,13 +3955,13 @@ let sha512 = "W6CLUJ2eBMw3Rec70qrsEW0jOm/3twwJv21mrmj2yORiaVmVYGS4sSS5yUwvQc1ZlDLYGPnClVWmUUMagKNsfA=="; }; }; - "@microsoft/load-themed-styles-1.10.185" = { + "@microsoft/load-themed-styles-1.10.190" = { name = "_at_microsoft_slash_load-themed-styles"; packageName = "@microsoft/load-themed-styles"; - version = "1.10.185"; + version = "1.10.190"; src = fetchurl { - url = "https://registry.npmjs.org/@microsoft/load-themed-styles/-/load-themed-styles-1.10.185.tgz"; - sha512 = "IyjxBy64JnmlOPjI0F/J+JoeQu/gDCoqLQ4zEmWgd2EDCg2Sd03CrkwqR40q1B5QzC2bUbP3KwnFhoaTS4pBsA=="; + url = "https://registry.npmjs.org/@microsoft/load-themed-styles/-/load-themed-styles-1.10.190.tgz"; + sha512 = "4Lhme3yHQgcIt05+BwgeJ0ClnY5wkmMXAFw4mGL8tO5jSkscd6lRKEtmQoGSTAy5S21FJzEUhnDJUqaK9M8P9Q=="; }; }; "@mitmaro/errors-1.0.0" = { @@ -3883,13 +4036,13 @@ let sha512 = "b+MGNyP9/LXkapreJzNUzcvuzZslj/RGgdVVJ16P2wSlYatfLycPObImqVJSmNAdyeShvNeM/pl3sVZsObFueg=="; }; }; - "@netlify/build-12.7.2" = { + "@netlify/build-12.26.0" = { name = "_at_netlify_slash_build"; packageName = "@netlify/build"; - version = "12.7.2"; + version = "12.26.0"; src = fetchurl { - url = "https://registry.npmjs.org/@netlify/build/-/build-12.7.2.tgz"; - sha512 = "AQCtlVBQFEpcQzglzAiXqfaXAss/+ufBhfuc6BuWM24ze+dD+ywyUb9IHfe6ceHdHZIKhfST6AYWT7my39NGmg=="; + url = "https://registry.npmjs.org/@netlify/build/-/build-12.26.0.tgz"; + sha512 = "wRBOxaZXJ0OCzg2YVp+SsKIE6fmLzwk68X7I8X6/jEL7np4Rq1H0BornxSGu9ewbCJseCl3zGKgd6aiBR4E8Pg=="; }; }; "@netlify/cache-utils-1.0.7" = { @@ -3901,22 +4054,13 @@ let sha512 = "yrdrnQkzg/qMovoFYwQ24UVt/OyHtP+t0KpQFd7eBl6gnuuGGgxFocaFFv6eKpMVwzHTsOwx/y9B/FcC3/6cfA=="; }; }; - "@netlify/config-7.7.1" = { + "@netlify/config-9.5.0" = { name = "_at_netlify_slash_config"; packageName = "@netlify/config"; - version = "7.7.1"; - src = fetchurl { - url = "https://registry.npmjs.org/@netlify/config/-/config-7.7.1.tgz"; - sha512 = "ReVy0Dqcvubldo9ZzmI6jCwUqFwDdq9v4enQu/uM6B2UVueKSgombKO8r0BlyNtLlKbbCOlaG7Gpbu0KsBvsPw=="; - }; - }; - "@netlify/config-8.0.0" = { - name = "_at_netlify_slash_config"; - packageName = "@netlify/config"; - version = "8.0.0"; + version = "9.5.0"; src = fetchurl { - url = "https://registry.npmjs.org/@netlify/config/-/config-8.0.0.tgz"; - sha512 = "zEgClyq8RZ79FPJHEK3xIPnXOPbji0N5ucPpk17lFyccPeKTsEG2cfEJ94vP2T809AUHa90cRvZVg8j7UtpR4A=="; + url = "https://registry.npmjs.org/@netlify/config/-/config-9.5.0.tgz"; + sha512 = "Kt5xukNclUtraXVX1xnrseMwvIA1WnFjR6i4GuwgvM2MreS6zb5LIV5XGJ/vDCEpH9uxI609gj2iu9FNy543rA=="; }; }; "@netlify/esbuild-0.13.6" = { @@ -3928,22 +4072,22 @@ let sha512 = "tiKmDcHM2riSVN79c0mJY/67EBDafXQAMitHuLiCDAMdtz3kfv+NqdVG5krgf5lWR8Uf8AeZrUW5Q9RP25REvw=="; }; }; - "@netlify/framework-info-5.3.0" = { + "@netlify/framework-info-5.5.0" = { name = "_at_netlify_slash_framework-info"; packageName = "@netlify/framework-info"; - version = "5.3.0"; + version = "5.5.0"; src = fetchurl { - url = "https://registry.npmjs.org/@netlify/framework-info/-/framework-info-5.3.0.tgz"; - sha512 = "9pgfafCGv2pt2l82JfPxst3QasuA40DFF0QdLm/3NNdSje8Ro3/i4rUATMCisaGJcScrAYljRlMFOhT4vFVlDg=="; + url = "https://registry.npmjs.org/@netlify/framework-info/-/framework-info-5.5.0.tgz"; + sha512 = "kAGcUnFlJgP2lQXez1c0RKJNF1reoefLVXMzTTTCoKqt1OcfzQnWzgCT6rJbsS7wia02JoLAb7TrdMdpWDAGTg=="; }; }; - "@netlify/functions-utils-1.3.46" = { + "@netlify/functions-utils-1.4.1" = { name = "_at_netlify_slash_functions-utils"; packageName = "@netlify/functions-utils"; - version = "1.3.46"; + version = "1.4.1"; src = fetchurl { - url = "https://registry.npmjs.org/@netlify/functions-utils/-/functions-utils-1.3.46.tgz"; - sha512 = "BXJxaj4fQ//zYUdRO9Mib35hOinRVBIjAWgD2YiW4fJv98Adcr33LMbPxxTnc/zP3Oh6c56YAUIBh5FA3VIe5g=="; + url = "https://registry.npmjs.org/@netlify/functions-utils/-/functions-utils-1.4.1.tgz"; + sha512 = "11WhjgX74b+AgROL/w0iDrZg1cjhX7+hyCUrzOagJbkC2v83qZaVff+4RFTA7damuO9zc9BHw2+LHe0wLVvEbg=="; }; }; "@netlify/git-utils-1.0.11" = { @@ -3973,22 +4117,22 @@ let sha512 = "SAsVNIxF0asduPXbsr3wbyAB7lPZQxhG90EeOu0/Fo+BLhpO4g+6eH13I60qJpWCI/ucXXqSrUw8y6Oy5wpY0g=="; }; }; - "@netlify/plugins-list-2.18.0" = { + "@netlify/plugins-list-2.18.1" = { name = "_at_netlify_slash_plugins-list"; packageName = "@netlify/plugins-list"; - version = "2.18.0"; + version = "2.18.1"; src = fetchurl { - url = "https://registry.npmjs.org/@netlify/plugins-list/-/plugins-list-2.18.0.tgz"; - sha512 = "lbI7P0CaSH23r2sF4z3DX02PqQ8ENUtRullQXEQXUareZfrXlOV6F8sl/LAWcgjE/kuh51eIAu/hWstsZFEQIQ=="; + url = "https://registry.npmjs.org/@netlify/plugins-list/-/plugins-list-2.18.1.tgz"; + sha512 = "UFXVAlmuwmA0s7xDpL1pF3ksyB+5UDNVQDqkwobb+HlxjKNU0hy0c+aL8G8EoBjtX9iGP7Xr+QawtytAWlIyXw=="; }; }; - "@netlify/routing-local-proxy-0.30.1" = { + "@netlify/routing-local-proxy-0.30.2" = { name = "_at_netlify_slash_routing-local-proxy"; packageName = "@netlify/routing-local-proxy"; - version = "0.30.1"; + version = "0.30.2"; src = fetchurl { - url = "https://registry.npmjs.org/@netlify/routing-local-proxy/-/routing-local-proxy-0.30.1.tgz"; - sha512 = "9IfNBXDJA2JLvHA5GRDTpOgPpU3dovL8ezB1+igxvtinnl4Nnl9G4D9N6leqf1ecC6aZrx9St4OATqVwY2LryQ=="; + url = "https://registry.npmjs.org/@netlify/routing-local-proxy/-/routing-local-proxy-0.30.2.tgz"; + sha512 = "rQnv383/vFF1x3iKnY/2Q2i7Z7RhugfoVfAIbEJ2bIaWFMQ2YcGMVpwj1w8rK+4MGH5uwvlNNlfE0gGYQOq+4Q=="; }; }; "@netlify/run-utils-1.0.7" = { @@ -4000,22 +4144,13 @@ let sha512 = "YFi1Sf+ktQICS3tAKu7/uiGzLXgi8RNVwH9naUkziXwXQNH2oxDhKgy0/Zv5Nw0zMDJyKWrJ3xObWEC57mJ/KA=="; }; }; - "@netlify/zip-it-and-ship-it-4.4.2" = { + "@netlify/zip-it-and-ship-it-4.8.0" = { name = "_at_netlify_slash_zip-it-and-ship-it"; packageName = "@netlify/zip-it-and-ship-it"; - version = "4.4.2"; - src = fetchurl { - url = "https://registry.npmjs.org/@netlify/zip-it-and-ship-it/-/zip-it-and-ship-it-4.4.2.tgz"; - sha512 = "627ZNqfc4mdhU5mYDpcKUbmx8RoAUu8ZQiW/RIt5s7uDhruba3bK776Ygzog5b14hYWthT41/bf+9wQ+O9NFWw=="; - }; - }; - "@netlify/zip-it-and-ship-it-4.5.1" = { - name = "_at_netlify_slash_zip-it-and-ship-it"; - packageName = "@netlify/zip-it-and-ship-it"; - version = "4.5.1"; + version = "4.8.0"; src = fetchurl { - url = "https://registry.npmjs.org/@netlify/zip-it-and-ship-it/-/zip-it-and-ship-it-4.5.1.tgz"; - sha512 = "zU2ztAEwLxIL7oy1nl0NXZC9Mbzb2QVkdjztZcpY76Ne5q0hBYpBv85SJFgrz75QMSC5C/eeQxs8iUYpmdZH4Q=="; + url = "https://registry.npmjs.org/@netlify/zip-it-and-ship-it/-/zip-it-and-ship-it-4.8.0.tgz"; + sha512 = "Dq0hBeX2LW62eny22d+isU4SvEilT/4eusjP1EFA0XYaDCgQ9rFJ50+NySXfxxu20qbfZmt34XKiby+tO7EcRA=="; }; }; "@node-red/editor-api-1.3.5" = { @@ -4108,13 +4243,13 @@ let sha512 = "BTIhocbPBSrRmHxOAJFtR18oLhxTtAFDAvL8hY1S3iU8k+E60W/YFs4jrixGzQjMpF4qPXxIQHcjVD9dz1C2QA=="; }; }; - "@npmcli/arborist-2.6.3" = { + "@npmcli/arborist-2.6.4" = { name = "_at_npmcli_slash_arborist"; packageName = "@npmcli/arborist"; - version = "2.6.3"; + version = "2.6.4"; src = fetchurl { - url = "https://registry.npmjs.org/@npmcli/arborist/-/arborist-2.6.3.tgz"; - sha512 = "R8U2dZ8+jeE7go+qNU4Mt6aiXyBu3mM75iRIugNCA4P0OWlsLOpuDPPhsaRcOVbtXheOGZXrqe36qP1g+M68KQ=="; + url = "https://registry.npmjs.org/@npmcli/arborist/-/arborist-2.6.4.tgz"; + sha512 = "A/pDQ/VZpdxaqsQS5XOWrhrPuC+ER7HLq+4ZkEmnO2yo/USFCWEsiUPYKhfY+sWXK3pgKjN7B7CEFmAnSoAt3g=="; }; }; "@npmcli/ci-detect-1.3.0" = { @@ -4189,6 +4324,15 @@ let sha512 = "yrJUe6reVMpktcvagumoqD9r08fH1iRo01gn1u0zoCApa9lnZGEigVKUd2hzsCId4gdtkZZIVscLhNxMECKgRg=="; }; }; + "@npmcli/package-json-1.0.1" = { + name = "_at_npmcli_slash_package-json"; + packageName = "@npmcli/package-json"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/@npmcli/package-json/-/package-json-1.0.1.tgz"; + sha512 = "y6jnu76E9C23osz8gEMBayZmaZ69vFOIk8vR1FJL/wbEJ54+9aVG9rLTjQKSXfgYZEr50nw1txBBFfBZZe+bYg=="; + }; + }; "@npmcli/promise-spawn-1.3.2" = { name = "_at_npmcli_slash_promise-spawn"; packageName = "@npmcli/promise-spawn"; @@ -4297,13 +4441,13 @@ let sha512 = "G440PCuMi/OT8b71aWkR+kCWikngGtyRjOR24sPMDbpUFV4+B3r51fz1fcqeUiiEOYqUpr0Uy/sneUe1O/NfBg=="; }; }; - "@oclif/plugin-plugins-1.10.0" = { + "@oclif/plugin-plugins-1.10.1" = { name = "_at_oclif_slash_plugin-plugins"; packageName = "@oclif/plugin-plugins"; - version = "1.10.0"; + version = "1.10.1"; src = fetchurl { - url = "https://registry.npmjs.org/@oclif/plugin-plugins/-/plugin-plugins-1.10.0.tgz"; - sha512 = "lfHNiuuCrCUtH9A912T/ztxRA9lS1lCZm+gcmVWksIJG/gwKH/fMn+GdLTbRzU2k6ojtMhBblYk1RWKxUEJuzA=="; + url = "https://registry.npmjs.org/@oclif/plugin-plugins/-/plugin-plugins-1.10.1.tgz"; + sha512 = "JDUA3NtOa4OlH8ofUBXQMTFlpEkSmeE9BxoQTD6+BeUvMgqFuZThENucRvCD00sywhCmDngmIYN59gKcXpGJeQ=="; }; }; "@oclif/screen-1.0.4" = { @@ -4360,13 +4504,13 @@ let sha512 = "SWTdXsVheRmlotWNjKzPOb6Js6tjSqA2a8z9+glDJng0Aqjzti8MEWOtuT8ZSu6wHnci7LZNuarE87+WJBG4vg=="; }; }; - "@octokit/openapi-types-7.3.2" = { + "@octokit/openapi-types-8.1.4" = { name = "_at_octokit_slash_openapi-types"; packageName = "@octokit/openapi-types"; - version = "7.3.2"; + version = "8.1.4"; src = fetchurl { - url = "https://registry.npmjs.org/@octokit/openapi-types/-/openapi-types-7.3.2.tgz"; - sha512 = "oJhK/yhl9Gt430OrZOzAl2wJqR0No9445vmZ9Ey8GjUZUpwuu/vmEFP0TDhDXdpGDoxD6/EIFHJEcY8nHXpDTA=="; + url = "https://registry.npmjs.org/@octokit/openapi-types/-/openapi-types-8.1.4.tgz"; + sha512 = "NnGr4NNDqO5wjSDJo5nxrGtzZUwoT23YasqK2H4Pav/6vSgeVTxuqCL9Aeh+cWfTxDomj1M4Os5BrXFsvl7qiQ=="; }; }; "@octokit/plugin-enterprise-rest-6.0.1" = { @@ -4378,13 +4522,13 @@ let sha512 = "93uGjlhUD+iNg1iWhUENAtJata6w5nE+V4urXOAlIXdco6xNZtUSfYY8dzp3Udy74aqO/B5UZL80x/YMa5PKRw=="; }; }; - "@octokit/plugin-paginate-rest-2.13.5" = { + "@octokit/plugin-paginate-rest-2.13.6" = { name = "_at_octokit_slash_plugin-paginate-rest"; packageName = "@octokit/plugin-paginate-rest"; - version = "2.13.5"; + version = "2.13.6"; src = fetchurl { - url = "https://registry.npmjs.org/@octokit/plugin-paginate-rest/-/plugin-paginate-rest-2.13.5.tgz"; - sha512 = "3WSAKBLa1RaR/7GG+LQR/tAZ9fp9H9waE9aPXallidyci9oZsfgsLn5M836d3LuDC6Fcym+2idRTBpssHZePVg=="; + url = "https://registry.npmjs.org/@octokit/plugin-paginate-rest/-/plugin-paginate-rest-2.13.6.tgz"; + sha512 = "ai7TNKLi8tGkDvLM7fm0X1fbIP9u1nfXnN49ZAw2PgSoQou9yixKn5c3m0awuLacbuX2aXEvJpv1gKm3jboabg=="; }; }; "@octokit/plugin-request-log-1.0.4" = { @@ -4396,13 +4540,13 @@ let sha512 = "mLUsMkgP7K/cnFEw07kWqXGF5LKrOkD+lhCrKvPHXWDywAwuDUeDwWBpc69XK3pNX0uKiVt8g5z96PJ6z9xCFA=="; }; }; - "@octokit/plugin-rest-endpoint-methods-5.3.1" = { + "@octokit/plugin-rest-endpoint-methods-5.3.7" = { name = "_at_octokit_slash_plugin-rest-endpoint-methods"; packageName = "@octokit/plugin-rest-endpoint-methods"; - version = "5.3.1"; + version = "5.3.7"; src = fetchurl { - url = "https://registry.npmjs.org/@octokit/plugin-rest-endpoint-methods/-/plugin-rest-endpoint-methods-5.3.1.tgz"; - sha512 = "3B2iguGmkh6bQQaVOtCsS0gixrz8Lg0v4JuXPqBcFqLKuJtxAUf3K88RxMEf/naDOI73spD+goJ/o7Ie7Cvdjg=="; + url = "https://registry.npmjs.org/@octokit/plugin-rest-endpoint-methods/-/plugin-rest-endpoint-methods-5.3.7.tgz"; + sha512 = "LAgTLOsJ86ig2wYSpcSx+UWt7aQYYsEZ/Tf/pksAVQWKNcGuTVCDl9OUiPhQ7DZelNozYVWTO9Iyjd/soe4tug=="; }; }; "@octokit/request-5.6.0" = { @@ -4423,22 +4567,22 @@ let sha512 = "1VIvgXxs9WHSjicsRwq8PlR2LR2x6DwsJAaFgzdi0JfJoGSO8mYI/cHJQ+9FbN21aa+DrgNLnwObmyeSC8Rmpg=="; }; }; - "@octokit/rest-18.6.0" = { + "@octokit/rest-18.6.6" = { name = "_at_octokit_slash_rest"; packageName = "@octokit/rest"; - version = "18.6.0"; + version = "18.6.6"; src = fetchurl { - url = "https://registry.npmjs.org/@octokit/rest/-/rest-18.6.0.tgz"; - sha512 = "MdHuXHDJM7e5sUBe3K9tt7th0cs4csKU5Bb52LRi2oHAeIMrMZ4XqaTrEv660HoUPoM1iDlnj27Ab/Nh3MtwlA=="; + url = "https://registry.npmjs.org/@octokit/rest/-/rest-18.6.6.tgz"; + sha512 = "kCLvz8MSh+KToXySdqUp80caBom1ZQmsX3gbT3osfbJy6fD86QObUjzAOD3D3Awz3X7ng24+lB+imvSr5EnM7g=="; }; }; - "@octokit/types-6.16.4" = { + "@octokit/types-6.17.4" = { name = "_at_octokit_slash_types"; packageName = "@octokit/types"; - version = "6.16.4"; + version = "6.17.4"; src = fetchurl { - url = "https://registry.npmjs.org/@octokit/types/-/types-6.16.4.tgz"; - sha512 = "UxhWCdSzloULfUyamfOg4dJxV9B+XjgrIZscI0VCbp4eNrjmorGEw+4qdwcpTsu6DIrm9tQsFQS2pK5QkqQ04A=="; + url = "https://registry.npmjs.org/@octokit/types/-/types-6.17.4.tgz"; + sha512 = "Ghk/JC4zC/1al1GwH6p8jVX6pLdypSWmbnx6h79C/yo3DeaDd6MsNsBFlHu22KbkFh+CdcAzFqdP7UdPaPPmmA=="; }; }; "@open-policy-agent/opa-wasm-1.2.0" = { @@ -4477,22 +4621,22 @@ let sha512 = "PffXX2AL8Sh0VHQ52jJC4u3T0H6wDK6N/4bg7xh4ngMYOIi13aR1kzVvX1sVDBgfGwDOkMbl4c54Xm3tlPx/+A=="; }; }; - "@opentelemetry/api-0.20.0" = { + "@opentelemetry/api-1.0.1" = { name = "_at_opentelemetry_slash_api"; packageName = "@opentelemetry/api"; - version = "0.20.0"; + version = "1.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/@opentelemetry/api/-/api-0.20.0.tgz"; - sha512 = "n06MtDYEc2H07S/NTvGMlxF2Ijp0YbNrI/rBgLcxpEh3hxOkPZA12gxlUoZkBHWCZYau2j3b/uL+QFpiQKOjSw=="; + url = "https://registry.npmjs.org/@opentelemetry/api/-/api-1.0.1.tgz"; + sha512 = "H5Djcc2txGAINgf3TNaq4yFofYSIK3722PM89S/3R8FuI/eqi1UscajlXk7EBkG9s2pxss/q6SHlpturaavXaw=="; }; }; - "@opentelemetry/semantic-conventions-0.20.0" = { + "@opentelemetry/semantic-conventions-0.22.0" = { name = "_at_opentelemetry_slash_semantic-conventions"; packageName = "@opentelemetry/semantic-conventions"; - version = "0.20.0"; + version = "0.22.0"; src = fetchurl { - url = "https://registry.npmjs.org/@opentelemetry/semantic-conventions/-/semantic-conventions-0.20.0.tgz"; - sha512 = "x40C3vQMttFlnNEfhFwO49jHrY6AoWnntL35TCem3LINr/aw1W0hGhdKY/zweC64CBJEyiHumaae480rqF8eOA=="; + url = "https://registry.npmjs.org/@opentelemetry/semantic-conventions/-/semantic-conventions-0.22.0.tgz"; + sha512 = "t4fKikazahwNKmwD+CE/icHyuZldWvNMupJhjxdk9T/KxHFx3zCGjHT3MKavwYP6abzgAAm5WwzD1oHlmj7dyg=="; }; }; "@ot-builder/bin-composite-types-1.0.9" = { @@ -5035,22 +5179,22 @@ let sha512 = "s4f489h5+EJksn4CfheLgv5PGOM0CDmK1UEBLw2t/ncWs3cW2VI7vXzndcd/WJHTv3GntJhXDcJMuL+Z2IAOgg=="; }; }; - "@redocly/ajv-6.12.4" = { + "@redocly/ajv-8.6.2" = { name = "_at_redocly_slash_ajv"; packageName = "@redocly/ajv"; - version = "6.12.4"; + version = "8.6.2"; src = fetchurl { - url = "https://registry.npmjs.org/@redocly/ajv/-/ajv-6.12.4.tgz"; - sha512 = "RB6vWO78v6c+SW/3bZh+XZMr4nGdJKAiPGsBALuUZnLuCiQ7aXCT1AuFHqnfS2gyXbEUEj+kw8p4ux8KdAfs3A=="; + url = "https://registry.npmjs.org/@redocly/ajv/-/ajv-8.6.2.tgz"; + sha512 = "tU8fQs0D76ZKhJ2cWtnfQthWqiZgGBx0gH0+5D8JvaBEBaqA8foPPBt3Nonwr3ygyv5xrw2IzKWgIY86BlGs+w=="; }; }; - "@redocly/openapi-core-1.0.0-beta.50" = { + "@redocly/openapi-core-1.0.0-beta.53" = { name = "_at_redocly_slash_openapi-core"; packageName = "@redocly/openapi-core"; - version = "1.0.0-beta.50"; + version = "1.0.0-beta.53"; src = fetchurl { - url = "https://registry.npmjs.org/@redocly/openapi-core/-/openapi-core-1.0.0-beta.50.tgz"; - sha512 = "GuXn4IETxpbRd8dlAQDQPtvqOpbMvPMeC/e5mv5MOXkLIznNk4vjiQVe6QSCbZbCHzzpb2+89B6S7asebPm4Rg=="; + url = "https://registry.npmjs.org/@redocly/openapi-core/-/openapi-core-1.0.0-beta.53.tgz"; + sha512 = "n5WixBRb7oWS31v3/cdOW/eNXbr2M4N8+HjHfCA/oQX6Z4ZYqPOJCekw64sQ/fnUQMIQyT6fKqyaf+iO4tG7YA=="; }; }; "@redocly/react-dropdown-aria-2.0.12" = { @@ -5152,13 +5296,13 @@ let sha512 = "c/qwwcHyafOQuVQJj0IlBjf5yYgBI7YPJ77k4fOJYesb41jio65eaJODRUmfYKhTOFBrIZ66kgvGPlNbjuoRdQ=="; }; }; - "@schematics/angular-12.0.5" = { + "@schematics/angular-12.1.1" = { name = "_at_schematics_slash_angular"; packageName = "@schematics/angular"; - version = "12.0.5"; + version = "12.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/@schematics/angular/-/angular-12.0.5.tgz"; - sha512 = "gMT66T33az+uGLDSc7UkJVg+vloPeTpQNgWddBVGnW/Lkl1tGaWUxyqUJAp8AvusPNU+NCP+ZFB3qUm+pc7tCg=="; + url = "https://registry.npmjs.org/@schematics/angular/-/angular-12.1.1.tgz"; + sha512 = "ukSKoAWfXt28TiHlRrEzKFW63V3jroRF3xnBKtsaL3AZ4MVJiHzOWXkzDAZBaEOLUH/l6Xhm64NMgOqMEAg1rQ=="; }; }; "@schematics/schematics-0.1102.6" = { @@ -5197,13 +5341,13 @@ let sha512 = "lOUyRopNTKJYVEU9T6stp2irwlTDsYMmUKBOUjnMcwGveuUfIJqrCOtFLtIPPj3XJlbZy5F68l4KP9rZ8Ipang=="; }; }; - "@serverless/components-3.12.0" = { + "@serverless/components-3.13.2" = { name = "_at_serverless_slash_components"; packageName = "@serverless/components"; - version = "3.12.0"; + version = "3.13.2"; src = fetchurl { - url = "https://registry.npmjs.org/@serverless/components/-/components-3.12.0.tgz"; - sha512 = "USK6QCREd/SjsDDhumrsORkyQYew9WvXGjSbh5GvoGNKbqZlMiNWnua/DXmpz1uf2qaXzJO0LZEtpsiDBPX59w=="; + url = "https://registry.npmjs.org/@serverless/components/-/components-3.13.2.tgz"; + sha512 = "fIYqo9cONxQeNpyWFTTLi6+r2S1KivOU5sys6nVQSR24jRVqxSpPN2eMz6BCUB8rw7N4kf+wbQDLwlyFbIroyQ=="; }; }; "@serverless/core-1.1.2" = { @@ -5215,13 +5359,13 @@ let sha512 = "PY7gH+7aQ+MltcUD7SRDuQODJ9Sav9HhFJsgOiyf8IVo7XVD6FxZIsSnpMI6paSkptOB7n+0Jz03gNlEkKetQQ=="; }; }; - "@serverless/dashboard-plugin-5.4.2" = { + "@serverless/dashboard-plugin-5.4.3" = { name = "_at_serverless_slash_dashboard-plugin"; packageName = "@serverless/dashboard-plugin"; - version = "5.4.2"; + version = "5.4.3"; src = fetchurl { - url = "https://registry.npmjs.org/@serverless/dashboard-plugin/-/dashboard-plugin-5.4.2.tgz"; - sha512 = "yFugs3TBPjZh6Gt/8lPca8H7n2/ICin17r/zmhiOhIscYMgIJT1EOY9EyCFWIQi9AMAmZD0a3ZR8U8gSYYTT9A=="; + url = "https://registry.npmjs.org/@serverless/dashboard-plugin/-/dashboard-plugin-5.4.3.tgz"; + sha512 = "lgQh7NG5B0T+jr5/CWLZUvW2EqQ5Phzf+XTybM/I+Obwc5jxtpOmPgItDs52kBgyNLDJAqzUN+YRpfE/HBGsoQ=="; }; }; "@serverless/event-mocks-1.1.1" = { @@ -5242,13 +5386,13 @@ let sha512 = "dyELLbrf/9+O+sjuIL7ymlH8zwCOsG+tf2TjeEjXooVSvNqUoZ4ZadENjxInUV841l0ddwkihwzH/54Yw+/qkg=="; }; }; - "@serverless/platform-client-china-2.1.14" = { + "@serverless/platform-client-china-2.1.17" = { name = "_at_serverless_slash_platform-client-china"; packageName = "@serverless/platform-client-china"; - version = "2.1.14"; + version = "2.1.17"; src = fetchurl { - url = "https://registry.npmjs.org/@serverless/platform-client-china/-/platform-client-china-2.1.14.tgz"; - sha512 = "ciXVcYcdLlSB9ph94sX/8jmDuY85Yq0fJvwKGzndKPngjVkXs6Gw2tqj91act9nqW541Ycqb/HFh1BhgcDWP7Q=="; + url = "https://registry.npmjs.org/@serverless/platform-client-china/-/platform-client-china-2.1.17.tgz"; + sha512 = "knJeb559PBJ72f/+RMH1iMavSiCJiXnTIWH88vdhlON+Tx7RPOTT5p48Modgbs8xONugmqbHjw9Z+fcyXZ2ajg=="; }; }; "@serverless/template-1.1.4" = { @@ -5287,13 +5431,13 @@ let sha512 = "cUt1ZYXZ/6Khe/foCucqraRpaTtejc4mICWVjQynwaPaK86/3g4Afu4pV1kEumnbet7N0PLbi+SKr8SHTf6tNQ=="; }; }; - "@serverless/utils-china-1.1.2" = { + "@serverless/utils-china-1.1.4" = { name = "_at_serverless_slash_utils-china"; packageName = "@serverless/utils-china"; - version = "1.1.2"; + version = "1.1.4"; src = fetchurl { - url = "https://registry.npmjs.org/@serverless/utils-china/-/utils-china-1.1.2.tgz"; - sha512 = "svZV9zZx2vSqR6EPstgaaLu1YHFfQ5PB2rvZAb66XuXwcPGMwAQN1c836H9L35Y/cUXLhFxv0UCpRHShJLYQSw=="; + url = "https://registry.npmjs.org/@serverless/utils-china/-/utils-china-1.1.4.tgz"; + sha512 = "8s73M1k+mST7Z/Rp8wgmZh50tjpwX+fqsbYYRuFGgyuWTvgqAlUflDOWAeQuDx4pEndWEqjbG09ZrZNqlHuZqQ=="; }; }; "@sideway/address-4.1.2" = { @@ -5449,13 +5593,13 @@ let sha512 = "T3xfDqrEFKclHGdJx4/5+D5F7e76/99f33guE4RTlVITBhy7VVnjz4t/NDr3UYqcC0MgAmiC4bSVYHnlshuwJw=="; }; }; - "@snyk/cloud-config-parser-1.9.2" = { + "@snyk/cloud-config-parser-1.9.3" = { name = "_at_snyk_slash_cloud-config-parser"; packageName = "@snyk/cloud-config-parser"; - version = "1.9.2"; + version = "1.9.3"; src = fetchurl { - url = "https://registry.npmjs.org/@snyk/cloud-config-parser/-/cloud-config-parser-1.9.2.tgz"; - sha512 = "m8Y2+3l4fxj96QMrTfiCEaXgCpDkCkJIX/5wv0V0RHuxpUiyh+KxC2yJ8Su4wybBj6v6hB9hB7h5/L+Gy4V4PA=="; + url = "https://registry.npmjs.org/@snyk/cloud-config-parser/-/cloud-config-parser-1.9.3.tgz"; + sha512 = "qv9NsIESPtyC2vKkqA7wEFePNuklksnQWJTWX8Cy3CQoCpZk80XwH50OVpDIU2szgnkWUm1XNSahG/IwVMSbOw=="; }; }; "@snyk/cocoapods-lockfile-parser-3.6.2" = { @@ -5485,13 +5629,13 @@ let sha512 = "wNANv235j95NFsQuODIXCiQZ9kcyg9fz92Kg1zoGvaP3kN/ma7fgCnvQL/dyml6iouQJR5aZovjhrrfEFoKtiQ=="; }; }; - "@snyk/dep-graph-1.28.0" = { + "@snyk/dep-graph-1.28.1" = { name = "_at_snyk_slash_dep-graph"; packageName = "@snyk/dep-graph"; - version = "1.28.0"; + version = "1.28.1"; src = fetchurl { - url = "https://registry.npmjs.org/@snyk/dep-graph/-/dep-graph-1.28.0.tgz"; - sha512 = "Oup9nAvb558jdNvbZah/vaBtOtCcizkdeS+OBQeBIqIffyer4mc4juSn4b1SFjCpu7AG7piio8Lj8k1B9ps6Tg=="; + url = "https://registry.npmjs.org/@snyk/dep-graph/-/dep-graph-1.28.1.tgz"; + sha512 = "ti5fPYivhBGCJ7rZGznMX2UJE1M5lR811WvVyBWTRJwLYVFYkhxRXKfgZUXEB0tq8vpo3V7tm3syrBd5TLPIMA=="; }; }; "@snyk/docker-registry-v2-client-2.2.2" = { @@ -5512,13 +5656,13 @@ let sha512 = "E/Pfdze/WFfxwyuTFcfhQN1SwyUsc43yuCoW63RVBCaxTD6OzhVD2Pvc/Sy7BjiWUfmelzyKkIBpoow8zZX7Zg=="; }; }; - "@snyk/fix-1.642.0" = { + "@snyk/fix-1.650.0" = { name = "_at_snyk_slash_fix"; packageName = "@snyk/fix"; - version = "1.642.0"; + version = "1.650.0"; src = fetchurl { - url = "https://registry.npmjs.org/@snyk/fix/-/fix-1.642.0.tgz"; - sha512 = "wA1hjH/eH0y/4/psauKFkK8pO29NSv1uEfheckvkoBB8BVrj3zDDBJhrxx2RRH2395XZxk977GLU9oTgUwSzlw=="; + url = "https://registry.npmjs.org/@snyk/fix/-/fix-1.650.0.tgz"; + sha512 = "qzwb0+DMrjxTsBXAcC74gb2X17925SapCBNo6DybLbOZXNJ6IFvtdN5ucd2FguEojfVyB4HVqkpbawc0bbfGtA=="; }; }; "@snyk/fix-pipenv-pipfile-0.5.4" = { @@ -6070,13 +6214,13 @@ let sha512 = "NTPErx4/FiPCGScH7foPyr+/1Dkzkni+rHiYHHoTjvwou7AQzJkNeD60A9CXRy+ZEN2B1bggmkTMCDb+Mv5k+A=="; }; }; - "@types/babel__traverse-7.11.1" = { + "@types/babel__traverse-7.14.0" = { name = "_at_types_slash_babel__traverse"; packageName = "@types/babel__traverse"; - version = "7.11.1"; + version = "7.14.0"; src = fetchurl { - url = "https://registry.npmjs.org/@types/babel__traverse/-/babel__traverse-7.11.1.tgz"; - sha512 = "Vs0hm0vPahPMYi9tDjtP66llufgO3ST16WXaSTtDGEl9cewAl3AibmxWw6TINOqHPT9z0uABKAYjT9jNSg4npw=="; + url = "https://registry.npmjs.org/@types/babel__traverse/-/babel__traverse-7.14.0.tgz"; + sha512 = "IilJZ1hJBUZwMOVDNTdflOOLzJB/ZtljYVa7k3gEZN/jqIJIPkWHC6dvbX+DD2CwZDHB9wAKzZPzzqMIkW37/w=="; }; }; "@types/babylon-6.16.5" = { @@ -6214,13 +6358,13 @@ let sha512 = "C7srjHiVG3Ey1nR6d511dtDkCEjxuN9W1HWAEjGq8kpcwmNM6JJkpC0xvabM7BXTG2wDq8Eu33iH9aQKa7IvLQ=="; }; }; - "@types/debug-4.1.5" = { + "@types/debug-4.1.6" = { name = "_at_types_slash_debug"; packageName = "@types/debug"; - version = "4.1.5"; + version = "4.1.6"; src = fetchurl { - url = "https://registry.npmjs.org/@types/debug/-/debug-4.1.5.tgz"; - sha512 = "Q1y515GcOdTHgagaVFhHnIFQ38ygs/kmxdNpvpou+raI9UO3YZcHDngBSYKQklcKlvA7iuQlmIKbzvmxcOE9CQ=="; + url = "https://registry.npmjs.org/@types/debug/-/debug-4.1.6.tgz"; + sha512 = "7fDOJFA/x8B+sO1901BmHlf5dE1cxBU8mRXj8QOEDnn16hhGJv/IHxJtZhvsabZsIMn0eLIyeOKAeqSNJJYTpA=="; }; }; "@types/decompress-4.2.3" = { @@ -6322,22 +6466,22 @@ let sha512 = "laIjwTQaD+5DukBZaygQ79K1Z0jb1bPEMRrkXSLjtCcZm+abyp5YbrqpSLzD42FwWW6gK/aS4NYpJ804nG2brg=="; }; }; - "@types/estree-0.0.47" = { + "@types/estree-0.0.48" = { name = "_at_types_slash_estree"; packageName = "@types/estree"; - version = "0.0.47"; + version = "0.0.48"; src = fetchurl { - url = "https://registry.npmjs.org/@types/estree/-/estree-0.0.47.tgz"; - sha512 = "c5ciR06jK8u9BstrmJyO97m+klJrrhCf9u3rLu3DEAJBirxRqSCvDQoYKmxuYwQI5SZChAWu+tq9oVlGRuzPAg=="; + url = "https://registry.npmjs.org/@types/estree/-/estree-0.0.48.tgz"; + sha512 = "LfZwXoGUDo0C3me81HXgkBg5CTQYb6xzEl+fNmbO4JdRiSKQ8A0GD1OBBvKAIsbCUgoyAty7m99GqqMQe784ew=="; }; }; - "@types/estree-0.0.48" = { + "@types/estree-0.0.49" = { name = "_at_types_slash_estree"; packageName = "@types/estree"; - version = "0.0.48"; + version = "0.0.49"; src = fetchurl { - url = "https://registry.npmjs.org/@types/estree/-/estree-0.0.48.tgz"; - sha512 = "LfZwXoGUDo0C3me81HXgkBg5CTQYb6xzEl+fNmbO4JdRiSKQ8A0GD1OBBvKAIsbCUgoyAty7m99GqqMQe784ew=="; + url = "https://registry.npmjs.org/@types/estree/-/estree-0.0.49.tgz"; + sha512 = "K1AFuMe8a+pXmfHTtnwBvqoEylNKVeaiKYkjmcEAdytMQVJ/i9Fu7sc13GxgXdO49gkE7Hy8SyJonUZUn+eVaw=="; }; }; "@types/expect-1.20.4" = { @@ -6376,13 +6520,13 @@ let sha512 = "wLhcKh3PMlyA2cNAB9sjM1BntnhPMiM0JOBwPBqttjHev2428MLEB4AYVN+d8s2iyCVZac+o41Pflm/ZH5vLXQ=="; }; }; - "@types/express-serve-static-core-4.17.21" = { + "@types/express-serve-static-core-4.17.22" = { name = "_at_types_slash_express-serve-static-core"; packageName = "@types/express-serve-static-core"; - version = "4.17.21"; + version = "4.17.22"; src = fetchurl { - url = "https://registry.npmjs.org/@types/express-serve-static-core/-/express-serve-static-core-4.17.21.tgz"; - sha512 = "gwCiEZqW6f7EoR8TTEfalyEhb1zA5jQJnRngr97+3pzMaO1RKoI1w2bw07TK72renMUVWcWS5mLI6rk1NqN0nA=="; + url = "https://registry.npmjs.org/@types/express-serve-static-core/-/express-serve-static-core-4.17.22.tgz"; + sha512 = "WdqmrUsRS4ootGha6tVwk/IVHM1iorU8tGehftQD2NWiPniw/sm7xdJOIlXLwqdInL9wBw/p7oO8vaYEF3NDmA=="; }; }; "@types/fancy-log-1.3.0" = { @@ -6889,6 +7033,24 @@ let sha512 = "zrNj1+yqYF4WskCMOHwN+w9iuD12+dGm0rQ35HLl9/Ouuq52cEtd0CH9qMgrdNmi5ejC1/V7vKEXYubB+65DkA=="; }; }; + "@types/node-15.12.5" = { + name = "_at_types_slash_node"; + packageName = "@types/node"; + version = "15.12.5"; + src = fetchurl { + url = "https://registry.npmjs.org/@types/node/-/node-15.12.5.tgz"; + sha512 = "se3yX7UHv5Bscf8f1ERKvQOD6sTyycH3hdaoozvaLxgUiY5lIGEeH37AD0G0Qi9kPqihPn0HOfd2yaIEN9VwEg=="; + }; + }; + "@types/node-15.14.0" = { + name = "_at_types_slash_node"; + packageName = "@types/node"; + version = "15.14.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@types/node/-/node-15.14.0.tgz"; + sha512 = "um/+/ip3QZmwLfIkWZSNtQIJNVAqrJ92OkLMeuZrjZMTAJniI7fh8N8OICyDhAJ2mzgk/fmYFo72jRr5HyZ1EQ=="; + }; + }; "@types/node-15.6.1" = { name = "_at_types_slash_node"; packageName = "@types/node"; @@ -7393,13 +7555,13 @@ let sha512 = "S9q47ByT2pPvD65IvrWp7qppVMpk9WGMbVq9wbWZOHg6tnXSD4vyhao6nOSBwwfDdV2p3Kx9evA9vI+XWTfDvw=="; }; }; - "@typescript-eslint/eslint-plugin-4.28.0" = { + "@typescript-eslint/eslint-plugin-4.28.1" = { name = "_at_typescript-eslint_slash_eslint-plugin"; packageName = "@typescript-eslint/eslint-plugin"; - version = "4.28.0"; + version = "4.28.1"; src = fetchurl { - url = "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-4.28.0.tgz"; - sha512 = "KcF6p3zWhf1f8xO84tuBailV5cN92vhS+VT7UJsPzGBm9VnQqfI9AsiMUFUCYHTYPg1uCCo+HyiDnpDuvkAMfQ=="; + url = "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-4.28.1.tgz"; + sha512 = "9yfcNpDaNGQ6/LQOX/KhUFTR1sCKH+PBr234k6hI9XJ0VP5UqGxap0AnNwBnWFk1MNyWBylJH9ZkzBXC+5akZQ=="; }; }; "@typescript-eslint/experimental-utils-3.10.1" = { @@ -7411,13 +7573,13 @@ let sha512 = "DewqIgscDzmAfd5nOGe4zm6Bl7PKtMG2Ad0KG8CUZAHlXfAKTF9Ol5PXhiMh39yRL2ChRH1cuuUGOcVyyrhQIw=="; }; }; - "@typescript-eslint/experimental-utils-4.28.0" = { + "@typescript-eslint/experimental-utils-4.28.1" = { name = "_at_typescript-eslint_slash_experimental-utils"; packageName = "@typescript-eslint/experimental-utils"; - version = "4.28.0"; + version = "4.28.1"; src = fetchurl { - url = "https://registry.npmjs.org/@typescript-eslint/experimental-utils/-/experimental-utils-4.28.0.tgz"; - sha512 = "9XD9s7mt3QWMk82GoyUpc/Ji03vz4T5AYlHF9DcoFNfJ/y3UAclRsfGiE2gLfXtyC+JRA3trR7cR296TEb1oiQ=="; + url = "https://registry.npmjs.org/@typescript-eslint/experimental-utils/-/experimental-utils-4.28.1.tgz"; + sha512 = "n8/ggadrZ+uyrfrSEchx3jgODdmcx7MzVM2sI3cTpI/YlfSm0+9HEUaWw3aQn2urL2KYlWYMDgn45iLfjDYB+Q=="; }; }; "@typescript-eslint/parser-3.10.1" = { @@ -7429,22 +7591,22 @@ let sha512 = "Ug1RcWcrJP02hmtaXVS3axPPTTPnZjupqhgj+NnZ6BCkwSImWk/283347+x9wN+lqOdK9Eo3vsyiyDHgsmiEJw=="; }; }; - "@typescript-eslint/parser-4.28.0" = { + "@typescript-eslint/parser-4.28.1" = { name = "_at_typescript-eslint_slash_parser"; packageName = "@typescript-eslint/parser"; - version = "4.28.0"; + version = "4.28.1"; src = fetchurl { - url = "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-4.28.0.tgz"; - sha512 = "7x4D22oPY8fDaOCvkuXtYYTQ6mTMmkivwEzS+7iml9F9VkHGbbZ3x4fHRwxAb5KeuSkLqfnYjs46tGx2Nour4A=="; + url = "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-4.28.1.tgz"; + sha512 = "UjrMsgnhQIIK82hXGaD+MCN8IfORS1CbMdu7VlZbYa8LCZtbZjJA26De4IPQB7XYZbL8gJ99KWNj0l6WD0guJg=="; }; }; - "@typescript-eslint/scope-manager-4.28.0" = { + "@typescript-eslint/scope-manager-4.28.1" = { name = "_at_typescript-eslint_slash_scope-manager"; packageName = "@typescript-eslint/scope-manager"; - version = "4.28.0"; + version = "4.28.1"; src = fetchurl { - url = "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-4.28.0.tgz"; - sha512 = "eCALCeScs5P/EYjwo6se9bdjtrh8ByWjtHzOkC4Tia6QQWtQr3PHovxh3TdYTuFcurkYI4rmFsRFpucADIkseg=="; + url = "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-4.28.1.tgz"; + sha512 = "o95bvGKfss6705x7jFGDyS7trAORTy57lwJ+VsYwil/lOUxKQ9tA7Suuq+ciMhJc/1qPwB3XE2DKh9wubW8YYA=="; }; }; "@typescript-eslint/types-3.10.1" = { @@ -7456,13 +7618,13 @@ let sha512 = "+3+FCUJIahE9q0lDi1WleYzjCwJs5hIsbugIgnbB+dSCYUxl8L6PwmsyOPFZde2hc1DlTo/xnkOgiTLSyAbHiQ=="; }; }; - "@typescript-eslint/types-4.28.0" = { + "@typescript-eslint/types-4.28.1" = { name = "_at_typescript-eslint_slash_types"; packageName = "@typescript-eslint/types"; - version = "4.28.0"; + version = "4.28.1"; src = fetchurl { - url = "https://registry.npmjs.org/@typescript-eslint/types/-/types-4.28.0.tgz"; - sha512 = "p16xMNKKoiJCVZY5PW/AfILw2xe1LfruTcfAKBj3a+wgNYP5I9ZEKNDOItoRt53p4EiPV6iRSICy8EPanG9ZVA=="; + url = "https://registry.npmjs.org/@typescript-eslint/types/-/types-4.28.1.tgz"; + sha512 = "4z+knEihcyX7blAGi7O3Fm3O6YRCP+r56NJFMNGsmtdw+NCdpG5SgNz427LS9nQkRVTswZLhz484hakQwB8RRg=="; }; }; "@typescript-eslint/typescript-estree-3.10.1" = { @@ -7474,13 +7636,13 @@ let sha512 = "QbcXOuq6WYvnB3XPsZpIwztBoquEYLXh2MtwVU+kO8jgYCiv4G5xrSP/1wg4tkvrEE+esZVquIPX/dxPlePk1w=="; }; }; - "@typescript-eslint/typescript-estree-4.28.0" = { + "@typescript-eslint/typescript-estree-4.28.1" = { name = "_at_typescript-eslint_slash_typescript-estree"; packageName = "@typescript-eslint/typescript-estree"; - version = "4.28.0"; + version = "4.28.1"; src = fetchurl { - url = "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-4.28.0.tgz"; - sha512 = "m19UQTRtxMzKAm8QxfKpvh6OwQSXaW1CdZPoCaQuLwAq7VZMNuhJmZR4g5281s2ECt658sldnJfdpSZZaxUGMQ=="; + url = "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-4.28.1.tgz"; + sha512 = "GhKxmC4sHXxHGJv8e8egAZeTZ6HI4mLU6S7FUzvFOtsk7ZIDN1ksA9r9DyOgNqowA9yAtZXV0Uiap61bIO81FQ=="; }; }; "@typescript-eslint/visitor-keys-3.10.1" = { @@ -7492,13 +7654,13 @@ let sha512 = "9JgC82AaQeglebjZMgYR5wgmfUdUc+EitGUUMW8u2nDckaeimzW+VsoLV6FoimPv2id3VQzfjwBxEMVz08ameQ=="; }; }; - "@typescript-eslint/visitor-keys-4.28.0" = { + "@typescript-eslint/visitor-keys-4.28.1" = { name = "_at_typescript-eslint_slash_visitor-keys"; packageName = "@typescript-eslint/visitor-keys"; - version = "4.28.0"; + version = "4.28.1"; src = fetchurl { - url = "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-4.28.0.tgz"; - sha512 = "PjJyTWwrlrvM5jazxYF5ZPs/nl0kHDZMVbuIcbpawVXaDPelp3+S9zpOz5RmVUfS/fD5l5+ZXNKnWhNYjPzCvw=="; + url = "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-4.28.1.tgz"; + sha512 = "K4HMrdFqr9PFquPu178SaSb92CaWe2yErXyPumc8cYWxFmhgJsNY9eSePmO05j0JhBvf2Cdhptd6E6Yv9HVHcg=="; }; }; "@uifabric/foundation-7.9.26" = { @@ -7582,13 +7744,13 @@ let sha512 = "sL/cEvJWAnClXw0wHk85/2L0G6Sj8UB0Ctc1TEMbKSsmpRosqhwj9gWgFRZSrBr2f9tiXISwNhCPmlfqUqyb9Q=="; }; }; - "@unicode/unicode-13.0.0-1.0.6" = { + "@unicode/unicode-13.0.0-1.1.0" = { name = "_at_unicode_slash_unicode-13.0.0"; packageName = "@unicode/unicode-13.0.0"; - version = "1.0.6"; + version = "1.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/@unicode/unicode-13.0.0/-/unicode-13.0.0-1.0.6.tgz"; - sha512 = "ywSlML1wdeBSGH12b6PkblGtjzsQNMZ7+JlJj+eoPj0VuCeg52hcUTeVWfd4GmISU+zOQHWjNC6c0xmsIuVy8Q=="; + url = "https://registry.npmjs.org/@unicode/unicode-13.0.0/-/unicode-13.0.0-1.1.0.tgz"; + sha512 = "iOVqHDBzYSb4EOLBirZM9qNur+J7hAb6YyzGlUoAFx2ubb3Qidc+VhAuRQAxnOOWEqMcIZpnVnJ/OkTxbNmgEA=="; }; }; "@uphold/request-logger-2.0.0" = { @@ -7636,31 +7798,31 @@ let sha512 = "B6PedV/H2kcGEAgnqncwjHe3E8fqUNXCLv1BsrNwkHHWQJXkDN7dFeuEB4oaucBOVbjhH7KGLJ6JAiXPE3S7xA=="; }; }; - "@vue/compiler-core-3.1.2" = { + "@vue/compiler-core-3.1.3" = { name = "_at_vue_slash_compiler-core"; packageName = "@vue/compiler-core"; - version = "3.1.2"; + version = "3.1.3"; src = fetchurl { - url = "https://registry.npmjs.org/@vue/compiler-core/-/compiler-core-3.1.2.tgz"; - sha512 = "nHmq7vLjq/XM2IMbZUcKWoH5sPXa2uR/nIKZtjbK5F3TcbnYE/zKsrSUR9WZJ03unlwotNBX1OyxVt9HbWD7/Q=="; + url = "https://registry.npmjs.org/@vue/compiler-core/-/compiler-core-3.1.3.tgz"; + sha512 = "I58MDtVa8AYEIa3waLO6/89JdmgpkDAEcL3Vrmlsbnt07KZ5sIGLqaXjzGrOT57j9s8ty0WTYlLQq2rWUVYGCg=="; }; }; - "@vue/compiler-dom-3.1.2" = { + "@vue/compiler-dom-3.1.3" = { name = "_at_vue_slash_compiler-dom"; packageName = "@vue/compiler-dom"; - version = "3.1.2"; + version = "3.1.3"; src = fetchurl { - url = "https://registry.npmjs.org/@vue/compiler-dom/-/compiler-dom-3.1.2.tgz"; - sha512 = "k2+SWcWH0jL6WQAX7Or2ONqu5MbtTgTO0dJrvebQYzgqaKMXNI90RNeWeCxS4BnNFMDONpHBeFgbwbnDWIkmRg=="; + url = "https://registry.npmjs.org/@vue/compiler-dom/-/compiler-dom-3.1.3.tgz"; + sha512 = "BunLXKP+UvY1XJ0L6M7KD/De0XP+kOlIxFg3OfXtVQZcLLgnLcTgSK3t/ylvIpYJOadGaHhb+BfCK/hdqOVAyw=="; }; }; - "@vue/shared-3.1.2" = { + "@vue/shared-3.1.3" = { name = "_at_vue_slash_shared"; packageName = "@vue/shared"; - version = "3.1.2"; + version = "3.1.3"; src = fetchurl { - url = "https://registry.npmjs.org/@vue/shared/-/shared-3.1.2.tgz"; - sha512 = "EmH/poaDWBPJaPILXNI/1fvUbArJQmmTyVCwvvyDYDFnkPoTclAbHRAtyIvqfez7jybTDn077HTNILpxlsoWhg=="; + url = "https://registry.npmjs.org/@vue/shared/-/shared-3.1.3.tgz"; + sha512 = "uGBX4bZVFvgranxzpH3q1gGmICUjEUnNrMIBFeZRw8hBfCPhT+VnuY8+mG2l/yEyY73J9e6d36CtbFUqDXa12w=="; }; }; "@webassemblyjs/ast-1.11.0" = { @@ -8518,13 +8680,13 @@ let sha512 = "nQyp0o1/mNdbTO1PO6kHkwSrmgZ0MT/jCCpNiwbUjGoRN4dlBhqJtoQuCnEOKzgTVwg0ZWiCoQy6SxMebQVh8A=="; }; }; - "acorn-8.4.0" = { + "acorn-8.4.1" = { name = "acorn"; packageName = "acorn"; - version = "8.4.0"; + version = "8.4.1"; src = fetchurl { - url = "https://registry.npmjs.org/acorn/-/acorn-8.4.0.tgz"; - sha512 = "ULr0LDaEqQrMFGyQ3bhJkLsbtrQ8QibAseGZeaSUiT/6zb9IvIkomWHJIvgvwad+hinRAgsI51JcWk2yvwyL+w=="; + url = "https://registry.npmjs.org/acorn/-/acorn-8.4.1.tgz"; + sha512 = "asabaBSkEKosYKMITunzX177CXxQ4Q8BSSzMTKD+FefUhipQC70gfW5SiUDhYQ3vk8G+81HqQk7Fv9OXwwn9KA=="; }; }; "acorn-globals-1.0.9" = { @@ -8869,15 +9031,6 @@ let sha512 = "LqZ9wY+fx3UMiiPd741yB2pj3hhil+hQc8taf4o2QGRFpWgZ2V5C8HA165DY9sS3fJwsk7uT7ZlFEyC3Ig3lLg=="; }; }; - "ajv-8.2.0" = { - name = "ajv"; - packageName = "ajv"; - version = "8.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/ajv/-/ajv-8.2.0.tgz"; - sha512 = "WSNGFuyWd//XO8n/m/EaOlNLtO0yL8EXT/74LqT4khdhpZjP7lkj/kT5uwRmGitKEVp/Oj7ZUHeGfPtgHhQ5CA=="; - }; - }; "ajv-8.6.0" = { name = "ajv"; packageName = "ajv"; @@ -8896,15 +9049,6 @@ let sha512 = "DCRfO/4nQ+89p/RK43i8Ezd41EqdGIU4ld7nGF8OQ14oc/we5rEntLCUa7+jrn3nn83BosfwZA0wb4pon2o8iQ=="; }; }; - "ajv-formats-2.0.2" = { - name = "ajv-formats"; - packageName = "ajv-formats"; - version = "2.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/ajv-formats/-/ajv-formats-2.0.2.tgz"; - sha512 = "Brah4Uo5/U8v76c6euTwtjVFFaVishwnJrQBYpev1JRh4vjA1F4HY3UzQez41YUCszUCXKagG8v6eVRBHV1gkw=="; - }; - }; "ajv-formats-2.1.0" = { name = "ajv-formats"; packageName = "ajv-formats"; @@ -9400,22 +9544,22 @@ let sha1 = "d8a3f26615379398a1b53ca6cc1a666a0fbfe150"; }; }; - "apache-crypt-1.2.4" = { + "apache-crypt-1.2.5" = { name = "apache-crypt"; packageName = "apache-crypt"; - version = "1.2.4"; + version = "1.2.5"; src = fetchurl { - url = "https://registry.npmjs.org/apache-crypt/-/apache-crypt-1.2.4.tgz"; - sha512 = "Icze5ny5W5uv3xgMgl8U+iGmRCC0iIDrb2PVPuRBtL3Zy1Y5TMewXP1Vtc4r5X9eNNBEk7KYPu0Qby9m/PmcHg=="; + url = "https://registry.npmjs.org/apache-crypt/-/apache-crypt-1.2.5.tgz"; + sha512 = "ICnYQH+DFVmw+S4Q0QY2XRXD8Ne8ewh8HgbuFH4K7022zCxgHM0Hz1xkRnUlEfAXNbwp1Cnhbedu60USIfDxvg=="; }; }; - "apache-md5-1.1.5" = { + "apache-md5-1.1.7" = { name = "apache-md5"; packageName = "apache-md5"; - version = "1.1.5"; + version = "1.1.7"; src = fetchurl { - url = "https://registry.npmjs.org/apache-md5/-/apache-md5-1.1.5.tgz"; - sha512 = "sbLEIMQrkV7RkIruqTPXxeCMkAAycv4yzTkBzRgOR1BrR5UB7qZtupqxkersTJSf0HZ3sbaNRrNV80TnnM7cUw=="; + url = "https://registry.npmjs.org/apache-md5/-/apache-md5-1.1.7.tgz"; + sha512 = "JtHjzZmJxtzfTSjsCyHgPR155HBe5WGyUyHTaEkfy46qhwCFKx1Epm6nAxgUG3WfUZP1dWhGqj9Z2NOBeZ+uBw=="; }; }; "apollo-cache-control-0.14.0" = { @@ -10858,13 +11002,13 @@ let sha512 = "tbMZ/Y2rRo6R6TTBODJXTiil+MXaoT6Qzotws3yvI1IWGpYxKo7N/3L06XB8ul8tCG0TigxIOY70SMICM70Ppg=="; }; }; - "aws-sdk-2.932.0" = { + "aws-sdk-2.938.0" = { name = "aws-sdk"; packageName = "aws-sdk"; - version = "2.932.0"; + version = "2.938.0"; src = fetchurl { - url = "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.932.0.tgz"; - sha512 = "U6MWUtFD0npWa+ReVEgm0fCIM0fMOYahFp14GLv8fC+BWOTvh5Iwt/gF8NrLomx42bBjA1Abaw6yhmiaSJDQHQ=="; + url = "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.938.0.tgz"; + sha512 = "e+KWYRyJ4Tvlg+6kQTze9Hxmkn+4/H8m+D8AXlfgUbtzyc1OBDf7cMCcl8IvCD3xoqELsgEunPC014v2JTTfZg=="; }; }; "aws-sign2-0.6.0" = { @@ -11245,13 +11389,13 @@ let sha512 = "Goy5ghsc21HgPDFtzRkSirpZVW35meGoTmTOb2bxqdl60ghub4xOidgNTHaZfQ2FaxQsKmwvXtOAkcIS4SMBWg=="; }; }; - "babel-plugin-styled-components-1.12.0" = { + "babel-plugin-styled-components-1.13.1" = { name = "babel-plugin-styled-components"; packageName = "babel-plugin-styled-components"; - version = "1.12.0"; + version = "1.13.1"; src = fetchurl { - url = "https://registry.npmjs.org/babel-plugin-styled-components/-/babel-plugin-styled-components-1.12.0.tgz"; - sha512 = "FEiD7l5ZABdJPpLssKXjBUJMYqzbcNzBowfXDCdJhOpbhWiewapUaY+LZGT8R4Jg2TwOjGjG4RKeyrO5p9sBkA=="; + url = "https://registry.npmjs.org/babel-plugin-styled-components/-/babel-plugin-styled-components-1.13.1.tgz"; + sha512 = "iY11g5orsdBnvWtXKCFBzDyTxZ9jvmkcYCCs5ONlvASYltDRhieCVzeDC7Do0fSW7psAL0zfVoXB3FHz2CkUSg=="; }; }; "babel-plugin-syntax-flow-6.18.0" = { @@ -12532,13 +12676,13 @@ let sha1 = "f962d687ec2c369570ae71af843256e6d0ca1129"; }; }; - "blessed-contrib-4.9.0" = { + "blessed-contrib-4.10.0" = { name = "blessed-contrib"; packageName = "blessed-contrib"; - version = "4.9.0"; + version = "4.10.0"; src = fetchurl { - url = "https://registry.npmjs.org/blessed-contrib/-/blessed-contrib-4.9.0.tgz"; - sha512 = "lqvb+6WeqMh7AO8zudSDnvKPGqzkmxqMAwpv83qzeL35MfmROkmjwnY3pi5dvgxfwg5i1UJnDMpj8OroCqpAPw=="; + url = "https://registry.npmjs.org/blessed-contrib/-/blessed-contrib-4.10.0.tgz"; + sha512 = "NbMkaBNPNZikQo5XBKsXTGIu/gxAywRANHPt2Zc4oFmtiXGHgAGgl6Q6mg6sr9SvG08zidPxokRDcgso+HGmzw=="; }; }; "blgr-0.1.8" = { @@ -13999,6 +14143,15 @@ let sha512 = "AKcdTnFSWATd5/GCPRxr2ChwIJ85CeyrEyjRHlKxQ56d4XJMGym0uAiKn0xbLOGOl3+yRpOTi484dVCEc5AUzQ=="; }; }; + "cache-chunk-store-3.2.2" = { + name = "cache-chunk-store"; + packageName = "cache-chunk-store"; + version = "3.2.2"; + src = fetchurl { + url = "https://registry.npmjs.org/cache-chunk-store/-/cache-chunk-store-3.2.2.tgz"; + sha512 = "2lJdWbgHFFxcSth9s2wpId3CR3v1YC63KjP4T9WhpW7LWlY7Hiiei3QwwqzkWqlJTfR8lSy9F5kRQECeyj+yQA=="; + }; + }; "cache-directory-2.0.0" = { name = "cache-directory"; packageName = "cache-directory"; @@ -14296,13 +14449,13 @@ let sha512 = "bsTwuIg/BZZK/vreVTYYbSWoe2F+71P7K5QGEX+pT250DZbfU1MQ5prOKpPR+LL6uWKK3KMwMCAS74QB3Um1uw=="; }; }; - "caniuse-lite-1.0.30001239" = { + "caniuse-lite-1.0.30001241" = { name = "caniuse-lite"; packageName = "caniuse-lite"; - version = "1.0.30001239"; + version = "1.0.30001241"; src = fetchurl { - url = "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001239.tgz"; - sha512 = "cyBkXJDMeI4wthy8xJ2FvDU6+0dtcZSJW3voUF8+e9f1bBeuvyZfc3PNbkOETyhbR+dGCPzn9E7MA3iwzusOhQ=="; + url = "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001241.tgz"; + sha512 = "1uoSZ1Pq1VpH0WerIMqwptXHNNGfdl7d1cJUFs80CwQ/lVzdhTvsFZCeNFslze7AjsQnb4C85tzclPa1VShbeQ=="; }; }; "canvas-2.8.0" = { @@ -14836,15 +14989,6 @@ let sha512 = "0td5ijfUPuubwLUu0OBoe98gZj8C/AA+RW3v67GPlGOrvxWjZmBXiBCRU+I8VEiNyJzjth40POfHiz2RB3gImA=="; }; }; - "cheerio-1.0.0-rc.5" = { - name = "cheerio"; - packageName = "cheerio"; - version = "1.0.0-rc.5"; - src = fetchurl { - url = "https://registry.npmjs.org/cheerio/-/cheerio-1.0.0-rc.5.tgz"; - sha512 = "yoqps/VCaZgN4pfXtenwHROTp8NG6/Hlt4Jpz2FEP0ZJQ+ZUkVDd0hAPDNKhj3nakpfPt/CNs57yEtxD1bXQiw=="; - }; - }; "cheerio-select-1.5.0" = { name = "cheerio-select"; packageName = "cheerio-select"; @@ -14854,15 +14998,6 @@ let sha512 = "qocaHPv5ypefh6YNxvnbABM07KMxExbtbfuJoIie3iZXX1ERwYmJcIiRrr9H05ucQP1k28dav8rpdDgjQd8drg=="; }; }; - "cheerio-select-tmp-0.1.1" = { - name = "cheerio-select-tmp"; - packageName = "cheerio-select-tmp"; - version = "0.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/cheerio-select-tmp/-/cheerio-select-tmp-0.1.1.tgz"; - sha512 = "YYs5JvbpU19VYJyj+F7oYrIE2BOll1/hRU7rEy/5+v9BzkSo3bK81iAeeQEMI92vRIxz677m72UmJUiVwwgjfQ=="; - }; - }; "child-process-1.0.2" = { name = "child-process"; packageName = "child-process"; @@ -15223,13 +15358,13 @@ let sha512 = "VcMWDN54ZN/DS+g58HYL5/n4Zrqe8vHJpGA8KdgUXFU4fuP/aHNw8eld9SyEIyabIMJX/0RaY/fplOo5hYLSFA=="; }; }; - "clean-css-5.1.2" = { + "clean-css-5.1.3" = { name = "clean-css"; packageName = "clean-css"; - version = "5.1.2"; + version = "5.1.3"; src = fetchurl { - url = "https://registry.npmjs.org/clean-css/-/clean-css-5.1.2.tgz"; - sha512 = "QcaGg9OuMo+0Ds933yLOY+gHPWbxhxqF0HDexmToPf8pczvmvZGYzd+QqWp9/mkucAOKViI+dSFOqoZIvXbeBw=="; + url = "https://registry.npmjs.org/clean-css/-/clean-css-5.1.3.tgz"; + sha512 = "qGXzUCDpLwAlPx0kYeU4QXjzQIcIYZbJjD4FNm7NnSjoP0hYMVZhHOpUYJ6AwfkMX2cceLRq54MeCgHy/va1cA=="; }; }; "clean-deep-3.4.0" = { @@ -15376,6 +15511,15 @@ let sha512 = "g7rLWfhAo/7pF+a/STFH/xPyosaL1zgADhI0OM83hl3c7S43iGvJWEAV2QuDOnQ8i6EMBj/u4+NTd0d5L+4JfA=="; }; }; + "cli-progress-footer-1.1.1" = { + name = "cli-progress-footer"; + packageName = "cli-progress-footer"; + version = "1.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/cli-progress-footer/-/cli-progress-footer-1.1.1.tgz"; + sha512 = "J0uW2u06pWI0tMKCbcCiMOZd8TbWj4EpuYgPo4Jiwih/FfGbd4dbLcJieO0Ior1pY1HBrnmCuHFk6GB9azE4pg=="; + }; + }; "cli-spinner-0.2.10" = { name = "cli-spinner"; packageName = "cli-spinner"; @@ -15547,15 +15691,6 @@ let sha512 = "0tOHJNMF9+4R3qcbBL+4IxLErpaYSYvzs10aXuECDbZdJOuJHdagJMAqvLdeaUQTI/o2uSCDRpet6ywDiKOAYw=="; }; }; - "clipboard-2.0.8" = { - name = "clipboard"; - packageName = "clipboard"; - version = "2.0.8"; - src = fetchurl { - url = "https://registry.npmjs.org/clipboard/-/clipboard-2.0.8.tgz"; - sha512 = "Y6WO0unAIQp5bLmk1zdThRhgJt/x3ks6f30s3oE3H1mgIEU33XyQjEf8gsf6DxC7NPX8Y1SsNWjUjL/ywLnnbQ=="; - }; - }; "clipboardy-1.2.3" = { name = "clipboardy"; packageName = "clipboardy"; @@ -16240,15 +16375,6 @@ let sha512 = "GHuDRO12Sypu2cV70d1dkA2EUmXHgntrzbpvOB+Qy+49ypNfGgFQIC2fhhXbnyrJRynDCAARsT7Ou0M6hirpfw=="; }; }; - "command-exists-1.2.6" = { - name = "command-exists"; - packageName = "command-exists"; - version = "1.2.6"; - src = fetchurl { - url = "https://registry.npmjs.org/command-exists/-/command-exists-1.2.6.tgz"; - sha512 = "Qst/zUUNmS/z3WziPxyqjrcz09pm+2Knbs5mAZL4VAE0sSrNY1/w8+/YxeHcoBTsO6iojA6BW7eFf27Eg2MRuw=="; - }; - }; "command-exists-1.2.9" = { name = "command-exists"; packageName = "command-exists"; @@ -16483,6 +16609,15 @@ let sha512 = "QrWXB+ZQSVPmIWIhtEO9H+gwHaMGYiF5ChvoJ+K9ZGHG/sVsa6yiesAD1GC/x46sET00Xlwo1u49RVVVzvcSkw=="; }; }; + "commander-8.0.0" = { + name = "commander"; + packageName = "commander"; + version = "8.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/commander/-/commander-8.0.0.tgz"; + sha512 = "Xvf85aAtu6v22+E5hfVoLHqyul/jyxh91zvqk/ioJTQuJR7Z78n7H558vMPKanPSRgIEeZemT92I2g9Y8LPbSQ=="; + }; + }; "commandpost-1.4.0" = { name = "commandpost"; packageName = "commandpost"; @@ -16996,13 +17131,13 @@ let sha1 = "c20b96d8c617748aaf1c16021760cd27fcb8cb75"; }; }; - "constructs-3.3.87" = { + "constructs-3.3.94" = { name = "constructs"; packageName = "constructs"; - version = "3.3.87"; + version = "3.3.94"; src = fetchurl { - url = "https://registry.npmjs.org/constructs/-/constructs-3.3.87.tgz"; - sha512 = "/SQrY1RP9KQsSyyVeyBTSMIiC5yOJO635YVqPH6XBsS5MMkBHd4gsPOX4FkpkDLMC1shAoK0FSTLatgxFiS4+A=="; + url = "https://registry.npmjs.org/constructs/-/constructs-3.3.94.tgz"; + sha512 = "P2Sfaa+CHt6lVlIdSry4hj1cQsg71J7eXJm9zyPpZNi/FDeHu/vcOmon84v8effvBoF5e7ef2tfVCwwMXcu9Jw=="; }; }; "consume-http-header-1.0.0" = { @@ -17078,13 +17213,13 @@ let sha1 = "0e790b3abfef90f6ecb77ae8585db9099caf7578"; }; }; - "contentful-management-7.25.1" = { + "contentful-management-7.27.0" = { name = "contentful-management"; packageName = "contentful-management"; - version = "7.25.1"; + version = "7.27.0"; src = fetchurl { - url = "https://registry.npmjs.org/contentful-management/-/contentful-management-7.25.1.tgz"; - sha512 = "V8tcSHw3MwWKWHWMW+AZB6lP31hreos+v2gtayZczWXYRcfd+owt+qVjbkLZk1pL80ewSmc8Pl1A7rM/oB2ldw=="; + url = "https://registry.npmjs.org/contentful-management/-/contentful-management-7.27.0.tgz"; + sha512 = "HGwUmR0160TI9RNiqLWjlFpPmjiXGC2VAgtzqM0mXMCJKJTzLBmsETVycQ7Nwip+2+CHdDRta5a9vQEN89UNTw=="; }; }; "contentful-sdk-core-6.8.0" = { @@ -17510,31 +17645,31 @@ let sha512 = "SaMnchL//WwU2Ot1hhkPflE8gzo7uq1FGvUJ8GKmi3TOU7rGTHIU+eir1WGf6qOtTyxdfdcp10yPdGZ59sQ3hw=="; }; }; - "core-js-3.15.1" = { + "core-js-3.15.2" = { name = "core-js"; packageName = "core-js"; - version = "3.15.1"; + version = "3.15.2"; src = fetchurl { - url = "https://registry.npmjs.org/core-js/-/core-js-3.15.1.tgz"; - sha512 = "h8VbZYnc9pDzueiS2610IULDkpFFPunHwIpl8yRwFahAEEdSpHlTy3h3z3rKq5h11CaUdBEeRViu9AYvbxiMeg=="; + url = "https://registry.npmjs.org/core-js/-/core-js-3.15.2.tgz"; + sha512 = "tKs41J7NJVuaya8DxIOCnl8QuPHx5/ZVbFo1oKgVl1qHFBBrDctzQGtuLjPpRdNTWmKPH6oEvgN/MUID+l485Q=="; }; }; - "core-js-compat-3.15.1" = { + "core-js-compat-3.15.2" = { name = "core-js-compat"; packageName = "core-js-compat"; - version = "3.15.1"; + version = "3.15.2"; src = fetchurl { - url = "https://registry.npmjs.org/core-js-compat/-/core-js-compat-3.15.1.tgz"; - sha512 = "xGhzYMX6y7oEGQGAJmP2TmtBLvR4nZmRGEcFa3ubHOq5YEp51gGN9AovVa0AoujGZIq+Wm6dISiYyGNfdflYww=="; + url = "https://registry.npmjs.org/core-js-compat/-/core-js-compat-3.15.2.tgz"; + sha512 = "Wp+BJVvwopjI+A1EFqm2dwUmWYXrvucmtIB2LgXn/Rb+gWPKYxtmb4GKHGKG/KGF1eK9jfjzT38DITbTOCX/SQ=="; }; }; - "core-js-pure-3.15.1" = { + "core-js-pure-3.15.2" = { name = "core-js-pure"; packageName = "core-js-pure"; - version = "3.15.1"; + version = "3.15.2"; src = fetchurl { - url = "https://registry.npmjs.org/core-js-pure/-/core-js-pure-3.15.1.tgz"; - sha512 = "OZuWHDlYcIda8sJLY4Ec6nWq2hRjlyCqCZ+jCflyleMkVt3tPedDVErvHslyS2nbO+SlBFMSBJYvtLMwxnrzjA=="; + url = "https://registry.npmjs.org/core-js-pure/-/core-js-pure-3.15.2.tgz"; + sha512 = "D42L7RYh1J2grW8ttxoY1+17Y4wXZeKe7uyplAI3FkNQyI5OgBIAjUfFiTPfL1rs0qLpxaabITNbjKl1Sp82tA=="; }; }; "core-util-is-1.0.2" = { @@ -18023,15 +18158,6 @@ let sha512 = "DG9pFfwOrzc+hawpmqX/dHYHJG+Bsdb0klhyi1sDneOgGOXy9wQIC8hzyVp1e4NRYDBdxcylvywPkkXCHAzTyQ=="; }; }; - "css-b64-images-0.2.5" = { - name = "css-b64-images"; - packageName = "css-b64-images"; - version = "0.2.5"; - src = fetchurl { - url = "https://registry.npmjs.org/css-b64-images/-/css-b64-images-0.2.5.tgz"; - sha1 = "42005d83204b2b4a5d93b6b1a5644133b5927a02"; - }; - }; "css-color-keywords-1.0.0" = { name = "css-color-keywords"; packageName = "css-color-keywords"; @@ -18140,15 +18266,6 @@ let sha512 = "Dqk7LQKpwLoH3VovzZnkzegqNSuAziQyNZUcrdDM401iY+R5NkGBXGmtO05/yaXQziALuPogeG0b7UAgjnTJTQ=="; }; }; - "css-select-3.1.2" = { - name = "css-select"; - packageName = "css-select"; - version = "3.1.2"; - src = fetchurl { - url = "https://registry.npmjs.org/css-select/-/css-select-3.1.2.tgz"; - sha512 = "qmss1EihSuBNWNNhHjxzxSfJoFBM/lERB/Q4EnsJQQC62R2evJDW481091oAdOr9uh46/0n4nrg0It5cAnj1RA=="; - }; - }; "css-select-4.1.3" = { name = "css-select"; packageName = "css-select"; @@ -18230,15 +18347,6 @@ let sha512 = "ACUm3L0/jiZTqfzRM3Hi9Q8eZqd6IK37mMWPLz9PJxkLWllYeRf+EHUSHYEtFop2Eqytaq1FizFVh7XfBnXCDQ=="; }; }; - "css-what-4.0.0" = { - name = "css-what"; - packageName = "css-what"; - version = "4.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/css-what/-/css-what-4.0.0.tgz"; - sha512 = "teijzG7kwYfNVsUh2H/YN62xW3KK9YhXEgSlbxMlcyjPNvdKJqFx5lrwlJgoFP1ZHlB89iGDlo/JyshKeRhv5A=="; - }; - }; "css-what-5.0.1" = { name = "css-what"; packageName = "css-what"; @@ -19580,13 +19688,13 @@ let sha1 = "d171a87933252807eb3cb61dc1c1445d078df2d9"; }; }; - "decimal.js-10.3.0" = { + "decimal.js-10.3.1" = { name = "decimal.js"; packageName = "decimal.js"; - version = "10.3.0"; + version = "10.3.1"; src = fetchurl { - url = "https://registry.npmjs.org/decimal.js/-/decimal.js-10.3.0.tgz"; - sha512 = "MrQRs2gyD//7NeHi9TtsfClkf+cFAewDz+PZHR8ILKglLmBMyVX3ymQ+oeznE3tjrS7beTN+6JXb2C3JDHm7ug=="; + url = "https://registry.npmjs.org/decimal.js/-/decimal.js-10.3.1.tgz"; + sha512 = "V0pfhfr8suzyPGOx3nmq4aHqabehUZn6Ch9kyFpV79TGDTWFmHqUqXdabR7QHqxzrYolF4+tVmJhUG4OURg5dQ=="; }; }; "decimal.js-7.5.1" = { @@ -20102,15 +20210,6 @@ let sha1 = "df3ae199acadfb7d440aaae0b29e2272b24ec619"; }; }; - "delegate-3.2.0" = { - name = "delegate"; - packageName = "delegate"; - version = "3.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/delegate/-/delegate-3.2.0.tgz"; - sha512 = "IofjkYBZaZivn0V8nnsMJGBr4jVLxHDheKSW88PyxS5QC4Vo9ZbZVvhzlSxY87fVq3STR6r+4cGepyHkcWOQSw=="; - }; - }; "delegates-1.0.0" = { name = "delegates"; packageName = "delegates"; @@ -20435,15 +20534,6 @@ let sha512 = "y/Ev98AleGvl43YKTNcA2Q+lyFmsmCfTTNWy4cjEJxoLkbobcXtRS0Kvx06daCgr2GdtlwLfNzL553BkktfJoA=="; }; }; - "devtools-protocol-0.0.854822" = { - name = "devtools-protocol"; - packageName = "devtools-protocol"; - version = "0.0.854822"; - src = fetchurl { - url = "https://registry.npmjs.org/devtools-protocol/-/devtools-protocol-0.0.854822.tgz"; - sha512 = "xd4D8kHQtB0KtWW0c9xBZD5LVtm9chkMOfs/3Yn01RhT/sFIsVtzTtypfKoFfWBaL+7xCYLxjOLkhwPXaX/Kcg=="; - }; - }; "devtools-protocol-0.0.883894" = { name = "devtools-protocol"; packageName = "devtools-protocol"; @@ -20984,15 +21074,6 @@ let sha512 = "2/xPb3ORsQ42nHYiSunXkDjPLBaEj/xTwUO4B7XCZQTRk7EBtTOPaygh10YAAh2OI1Qrp6NWfpAhzswj0ydt9g=="; }; }; - "dom-serializer-1.2.0" = { - name = "dom-serializer"; - packageName = "dom-serializer"; - version = "1.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/dom-serializer/-/dom-serializer-1.2.0.tgz"; - sha512 = "n6kZFH/KlCrqs/1GHMOd5i2fd/beQHuehKdWvNNffbGHTr/almdhuVvTVFb3V7fglz+nC50fFusu3lY33h12pA=="; - }; - }; "dom-serializer-1.3.2" = { name = "dom-serializer"; packageName = "dom-serializer"; @@ -21650,13 +21731,13 @@ let sha512 = "1sQ1DRtQGpglFhc3urD4olMJzt/wxlbnAAsf+WY2xHf5c50ZovivZvCXSpVgTOP9f4TzOMvelWyspyfhxQKHzQ=="; }; }; - "electron-to-chromium-1.3.755" = { + "electron-to-chromium-1.3.765" = { name = "electron-to-chromium"; packageName = "electron-to-chromium"; - version = "1.3.755"; + version = "1.3.765"; src = fetchurl { - url = "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.755.tgz"; - sha512 = "BJ1s/kuUuOeo1bF/EM2E4yqW9te0Hpof3wgwBx40AWJE18zsD1Tqo0kr7ijnOc+lRsrlrqKPauJAHqaxOItoUA=="; + url = "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.765.tgz"; + sha512 = "4NhcsfZYlr1x4FehYkK+R9CNNTOZ8vLcIu8Y1uWehxYp5r/jlCGAfBqChIubEfdtX+rBQpXx4yJuX/dzILH/nw=="; }; }; "electrum-client-git://github.com/janoside/electrum-client" = { @@ -22741,13 +22822,13 @@ let sha512 = "Nhc+oVAHm0uz/PkJAWscwIT4ijTrK5fqNqz9QB1D35SbbuMG1uB6Yr5AJpvPSWg+WOw7nYNswerYh0kOk64gqQ=="; }; }; - "eslint-plugin-vue-7.11.1" = { + "eslint-plugin-vue-7.12.1" = { name = "eslint-plugin-vue"; packageName = "eslint-plugin-vue"; - version = "7.11.1"; + version = "7.12.1"; src = fetchurl { - url = "https://registry.npmjs.org/eslint-plugin-vue/-/eslint-plugin-vue-7.11.1.tgz"; - sha512 = "lbw3vkEAGqYjqd1HpPFWHXtYaS8mILTJ5KOpJfRxO3Fo7o0wCf1zD7vSOasbm6nTA9xIgvZQ4VcyGIzQXxznHw=="; + url = "https://registry.npmjs.org/eslint-plugin-vue/-/eslint-plugin-vue-7.12.1.tgz"; + sha512 = "xHf/wCt88qmzqQerjaSteUFGASj7fPreglKD4ijnvoKRkoSJ3/H3kuJE8QFFtc+2wjw6hRDs834HH7vpuTJQzg=="; }; }; "eslint-scope-3.7.3" = { @@ -22822,6 +22903,15 @@ let sha512 = "0rSmRBzXgDzIsD6mGdJgevzgezI534Cer5L/vyMX0kHzT/jiB43jRhd9YUlMGYLQy2zprNmoT8qasCGtY+QaKw=="; }; }; + "eslint-visitor-keys-3.0.0" = { + name = "eslint-visitor-keys"; + packageName = "eslint-visitor-keys"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-3.0.0.tgz"; + sha512 = "mJOZa35trBTb3IyRmo8xmKBZlxf+N7OnUl4+ZhJHs/r+0770Wh/LEACE2pqMGMe27G/4y8P2bYGk4J70IC5k1Q=="; + }; + }; "esmangle-1.0.1" = { name = "esmangle"; packageName = "esmangle"; @@ -22876,6 +22966,15 @@ let sha512 = "v3JCNCE64umkFpmkFGqzVKsOT0tN1Zr+ueqLZfpV1Ob8e+CEgPWa+OxCoGH3tnhimMKIaBm4m/vaRpJ/krRz2g=="; }; }; + "espree-8.0.0" = { + name = "espree"; + packageName = "espree"; + version = "8.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/espree/-/espree-8.0.0.tgz"; + sha512 = "y/+i23dwTjIDJrYCcjcAMr3c3UGbPIjC6THMQKjWmhP97fW0FPiI89kmpKfmgV/5jrkIi6toQP+CMm3qBE1Hig=="; + }; + }; "esprima-1.1.1" = { name = "esprima"; packageName = "esprima"; @@ -23614,13 +23713,13 @@ let sha1 = "a793d3ac0cad4c6ab571e9968fbbab6cb2532929"; }; }; - "expo-pwa-0.0.84" = { + "expo-pwa-0.0.87" = { name = "expo-pwa"; packageName = "expo-pwa"; - version = "0.0.84"; + version = "0.0.87"; src = fetchurl { - url = "https://registry.npmjs.org/expo-pwa/-/expo-pwa-0.0.84.tgz"; - sha512 = "esZ6a5ObdnWn8h9METs3WuUbGEq16vh4wq1jwSK81oBJKIxijd5M0JbqDqhOsT4rIjuH8ZfQKsl0C1AtLIAfgQ=="; + url = "https://registry.npmjs.org/expo-pwa/-/expo-pwa-0.0.87.tgz"; + sha512 = "ijNE0hKcOcCTU4Ve0AC69VLCe2d3xLcyU38oCXm2s/r/kuzMvs6bb1ecIrwWUt6Y7JpAPFYGemzxInDW5zcXQg=="; }; }; "express-2.5.11" = { @@ -24154,13 +24253,13 @@ let sha512 = "g1KuQwHOZAmOZMuBtHdxDtju+T2RT8jgCC9aANsbpdiDDTSnjgfuVsIBNKbUeJI3oKMRExcfNDtJl4OhbffMsw=="; }; }; - "fast-glob-3.2.5" = { + "fast-glob-3.2.6" = { name = "fast-glob"; packageName = "fast-glob"; - version = "3.2.5"; + version = "3.2.6"; src = fetchurl { - url = "https://registry.npmjs.org/fast-glob/-/fast-glob-3.2.5.tgz"; - sha512 = "2DtFcgT68wiTTiwZ2hNdJfcHNke9XOfnwmBRWXhmeKM8rF0TGwmC/Qto3S7RoZKp5cilZbxzO5iTNTQsJ+EeDg=="; + url = "https://registry.npmjs.org/fast-glob/-/fast-glob-3.2.6.tgz"; + sha512 = "GnLuqj/pvQ7pX8/L4J84nijv6sAnlwvSDpMkJi9i7nPmPxGtRPkBSStfvDW5l6nMdX9VWe+pkKWFTgD+vF2QSQ=="; }; }; "fast-json-parse-1.0.3" = { @@ -24766,13 +24865,13 @@ let sha512 = "LpCHtPQ3sFx67z+uh2HnSyWSLLu5Jxo21795uRDuar/EOuYWXib5EmPaGIBuSnRqH2IODiKA2k5re/K9OnN/Yg=="; }; }; - "filesize-6.3.0" = { + "filesize-6.4.0" = { name = "filesize"; packageName = "filesize"; - version = "6.3.0"; + version = "6.4.0"; src = fetchurl { - url = "https://registry.npmjs.org/filesize/-/filesize-6.3.0.tgz"; - sha512 = "ytx0ruGpDHKWVoiui6+BY/QMNngtDQ/pJaFwfBpQif0J63+E8DLdFyqS3NkKQn7vIruUEpoGD9JUJSg7Kp+I0g=="; + url = "https://registry.npmjs.org/filesize/-/filesize-6.4.0.tgz"; + sha512 = "mjFIpOHC4jbfcTfoh4rkWpI31mF7viw9ikj/JyLoKzqlwG/YsefKfvYlYhdYdg/9mtK2z1AzgN/0LvVQ3zdlSQ=="; }; }; "filestream-5.0.0" = { @@ -25144,13 +25243,13 @@ let sha512 = "r5wGx7YeOwNWNlCA0wQ86zKyDLMQr+/RB8xy74M4hTphfmjlijTSSXGuH8rnvKZnfT9i+75zmd8jcKdMR4O6jA=="; }; }; - "flatted-3.1.1" = { + "flatted-3.2.0" = { name = "flatted"; packageName = "flatted"; - version = "3.1.1"; + version = "3.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/flatted/-/flatted-3.1.1.tgz"; - sha512 = "zAoAQiudy+r5SvnSw3KJy5os/oRJYHzrzja/tBDqrZtNhUw8bt6y8OBzMWcjWr+8liV8Eb6yOhw8WZ7VFZ5ZzA=="; + url = "https://registry.npmjs.org/flatted/-/flatted-3.2.0.tgz"; + sha512 = "XprP7lDrVT+kE2c2YlfiV+IfS9zxukiIOvNamPNsImNhXadSsQEbosItdL9bUQlCZXR13SvPk20BjWSWLA7m4A=="; }; }; "flatten-0.0.1" = { @@ -25189,13 +25288,13 @@ let sha512 = "jlbUu0XkbpXeXhan5xyTqVK1jmEKNxE8hpzznI3TThHTr76GiFwK0iRzhDo4KNy+S9h/KxHaqVhTP86vA6wHCg=="; }; }; - "flow-parser-0.153.0" = { + "flow-parser-0.154.0" = { name = "flow-parser"; packageName = "flow-parser"; - version = "0.153.0"; + version = "0.154.0"; src = fetchurl { - url = "https://registry.npmjs.org/flow-parser/-/flow-parser-0.153.0.tgz"; - sha512 = "qa7UODgbofQyruRWqNQ+KM5hO37CenByxhNfAztiwjBsPhWZ5AFh5g+gtLpTWPlzG7X66QdjBB9DuHNUBcaF+Q=="; + url = "https://registry.npmjs.org/flow-parser/-/flow-parser-0.154.0.tgz"; + sha512 = "cH9xY/ljOgmqG1n7PU1jffiHhRggoloauwOrOlCWBEX4Y+ml6GA8g//tCVKU+6PO4BXoPF22TFHkS5E1bN3JOQ=="; }; }; "fluent-ffmpeg-2.1.2" = { @@ -26719,13 +26818,13 @@ let sha512 = "kbuvus1dWQB2sSW4cbfTeGpCMd8ge9jx9RKnhXhuJ7tnvT+NIrTVfYZxjtflZddQYcmdOTlkAcjmx7bor+15AQ=="; }; }; - "git-url-parse-11.4.4" = { + "git-url-parse-11.5.0" = { name = "git-url-parse"; packageName = "git-url-parse"; - version = "11.4.4"; + version = "11.5.0"; src = fetchurl { - url = "https://registry.npmjs.org/git-url-parse/-/git-url-parse-11.4.4.tgz"; - sha512 = "Y4o9o7vQngQDIU9IjyCmRJBin5iYjI5u9ZITnddRZpD7dcCFQj2sL2XuMNbLRE4b4B/4ENPsp2Q8P44fjAZ0Pw=="; + url = "https://registry.npmjs.org/git-url-parse/-/git-url-parse-11.5.0.tgz"; + sha512 = "TZYSMDeM37r71Lqg1mbnMlOqlHd7BSij9qN7XwTkRqSAYFMihGLGhfHwgqQob3GUhEneKnV4nskN9rbQw2KGxA=="; }; }; "gitconfiglocal-1.0.0" = { @@ -27251,15 +27350,6 @@ let sha1 = "2edeeb958084d0f8ea7988e5d995b1c7dfc14777"; }; }; - "goldengate-10.0.6" = { - name = "goldengate"; - packageName = "goldengate"; - version = "10.0.6"; - src = fetchurl { - url = "https://registry.npmjs.org/goldengate/-/goldengate-10.0.6.tgz"; - sha512 = "6nwFndjr71Od5XL53oVtlwf3gk8EI/zkKrcjeRAS/G6XLFzPsrOe4npeuom+mgkfgE0rRJFtoOY0wrYgDGuYSg=="; - }; - }; "goldengate-10.1.0" = { name = "goldengate"; packageName = "goldengate"; @@ -27278,15 +27368,6 @@ let sha512 = "otgSPpUmdWJ43VXyiNgEYE4luzHCL2pz4wQ0OnDluC6Eg4Ko3Vexy/SrSynglw/eR+OhkzmqFCZa/OFa/RgAOQ=="; }; }; - "good-listener-1.2.2" = { - name = "good-listener"; - packageName = "good-listener"; - version = "1.2.2"; - src = fetchurl { - url = "https://registry.npmjs.org/good-listener/-/good-listener-1.2.2.tgz"; - sha1 = "d53b30cdf9313dffb7dc9a0d477096aa6d145c50"; - }; - }; "google-auth-library-6.1.6" = { name = "google-auth-library"; packageName = "google-auth-library"; @@ -27296,13 +27377,13 @@ let sha512 = "Q+ZjUEvLQj/lrVHF/IQwRo6p3s8Nc44Zk/DALsN+ac3T4HY/g/3rrufkgtl+nZ1TW7DNAw5cTChdVp4apUXVgQ=="; }; }; - "google-auth-library-7.1.2" = { + "google-auth-library-7.2.0" = { name = "google-auth-library"; packageName = "google-auth-library"; - version = "7.1.2"; + version = "7.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/google-auth-library/-/google-auth-library-7.1.2.tgz"; - sha512 = "FMipHgfe2u1LzWsf2n9zEB9KsJ8M3n8OYTHbHtlkzPCyo7IknXQR5X99nfvwUHGuX+iEpihUZxDuPm7+qBYeXg=="; + url = "https://registry.npmjs.org/google-auth-library/-/google-auth-library-7.2.0.tgz"; + sha512 = "F5mnidUaIXfZZl2FzhZOhboLNR6pIgIPrmP4QAbDKMy+kkb3GOc4r7KndAV9+Kx3VijrQTi4FI/AMLg8VWG6nw=="; }; }; "google-closure-compiler-js-20170910.0.1" = { @@ -27314,13 +27395,13 @@ let sha512 = "Vric7QFWxzHFxITZ10bmlG1H/5rhODb7hJuWyKWMD8GflpQzRmbMVqkFp3fKvN+U9tPwZItGVhkiOR+84PX3ew=="; }; }; - "google-gax-2.16.0" = { + "google-gax-2.17.0" = { name = "google-gax"; packageName = "google-gax"; - version = "2.16.0"; + version = "2.17.0"; src = fetchurl { - url = "https://registry.npmjs.org/google-gax/-/google-gax-2.16.0.tgz"; - sha512 = "IwHxHs9gEbvQ0Ne12taqDjJT9cpoLqM7tJamvctIGmkyqnQrdnbDJTGK2Rf85piMYGzmOuPKas9TkhCaoTVIJA=="; + url = "https://registry.npmjs.org/google-gax/-/google-gax-2.17.0.tgz"; + sha512 = "Ze/Oq0atVNKyKvDzQFU8B82V9w36GELQruXGsiY1jnySbieZ9vS75v98V/Z10PktmSVqis4sQ+FwK2gkgwIiiw=="; }; }; "google-p12-pem-3.1.0" = { @@ -27584,13 +27665,13 @@ let sha512 = "95yD/tKi24q8xYa7Q9rhQN16AYj5wPbrb8tmHGM3WRc9EBmWrG/0kkMl+tQG8wcEuE9ibR4zyOM31p5Sdr2v4g=="; }; }; - "graphql-tag-2.12.4" = { + "graphql-tag-2.12.5" = { name = "graphql-tag"; packageName = "graphql-tag"; - version = "2.12.4"; + version = "2.12.5"; src = fetchurl { - url = "https://registry.npmjs.org/graphql-tag/-/graphql-tag-2.12.4.tgz"; - sha512 = "VV1U4O+9x99EkNpNmCUV5RZwq6MnK4+pGbRYWG+lA/m3uo7TSqJF81OkcOP148gFP6fzdl7JWYBrwWVTS9jXww=="; + url = "https://registry.npmjs.org/graphql-tag/-/graphql-tag-2.12.5.tgz"; + sha512 = "5xNhP4063d16Pz3HBtKprutsPrmHZi5IdUGOWRxA2B6VF7BIRGOHZ5WQvDmJXZuPcBg7rYwaFxvQYjqkSdR3TQ=="; }; }; "graphql-tools-3.0.0" = { @@ -28781,15 +28862,6 @@ let sha512 = "LKUKwuJDhxNa3uf/LPR/KVjm/l3rBqtYeCOAekvG8F1vItxMUpueGd94i/asDDr8/1u7InxzFA5EeGjhhG5mMA=="; }; }; - "html-minifier-4.0.0" = { - name = "html-minifier"; - packageName = "html-minifier"; - version = "4.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/html-minifier/-/html-minifier-4.0.0.tgz"; - sha512 = "aoGxanpFPLg7MkIl/DDFYtb0iWz7jMFGqFhvEDZga6/4QTjneiD8I/NXL1x5aaoCp7FSIT6h/OhykDdPsbtMig=="; - }; - }; "html-minifier-terser-5.1.1" = { name = "html-minifier-terser"; packageName = "html-minifier-terser"; @@ -30087,15 +30159,6 @@ let sha512 = "JG3eIAj5V9CwcGvuOmoo6LB9kbAYT8HXffUl6memuszlwDC/qvFAJw49XJ5NROSFNPxp3iQg1GqkFhaY/CR0IA=="; }; }; - "inquirer-8.0.0" = { - name = "inquirer"; - packageName = "inquirer"; - version = "8.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/inquirer/-/inquirer-8.0.0.tgz"; - sha512 = "ON8pEJPPCdyjxj+cxsYRe6XfCJepTxANdNnTebsTuQgXpRyZRRT9t4dJwjRubgmvn20CLSEnozRUayXyM9VTXA=="; - }; - }; "inquirer-8.1.1" = { name = "inquirer"; packageName = "inquirer"; @@ -30330,6 +30393,15 @@ let sha1 = "96fb0a936c12babd6ff1752a17d05616abd094c6"; }; }; + "into-stream-6.0.0" = { + name = "into-stream"; + packageName = "into-stream"; + version = "6.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/into-stream/-/into-stream-6.0.0.tgz"; + sha512 = "XHbaOAvP+uFKUFsOgoNPRjLkwB+I22JFPFe5OjTkQ0nwgj6+pSjb4NmB6VMxaPshLiOf+zcpOCBQuLwC1KHhZA=="; + }; + }; "invariant-2.2.4" = { name = "invariant"; packageName = "invariant"; @@ -30393,6 +30465,15 @@ let sha512 = "b1yeWevW04/jMmkzJ3Fk91d8cAd+pYYg/w0S7XCGAI4yo8jSnAD+S4oAWjfFkwNa+GV8WwCOTDuotWcI5md87A=="; }; }; + "invoices-2.0.0" = { + name = "invoices"; + packageName = "invoices"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/invoices/-/invoices-2.0.0.tgz"; + sha512 = "UnU0bS3+cMA2UvYrF5RXp/Hm7v/nYiA3F0GVCOeRmDiZmXAt/eO7KdqyRzewopvhBlev7F7t7GZzRRYY1XE3xg=="; + }; + }; "iota-array-1.0.0" = { name = "iota-array"; packageName = "iota-array"; @@ -32337,13 +32418,13 @@ let sha512 = "KWYVV1c4i+jbMpaBC+U++4Va0cp8OisU185o73T1vo99hqi7w8tSJfUXYswwqqrjzwxa6KpRK54WhPvwf5w6PQ=="; }; }; - "jest-worker-27.0.2" = { + "jest-worker-27.0.6" = { name = "jest-worker"; packageName = "jest-worker"; - version = "27.0.2"; + version = "27.0.6"; src = fetchurl { - url = "https://registry.npmjs.org/jest-worker/-/jest-worker-27.0.2.tgz"; - sha512 = "EoBdilOTTyOgmHXtw/cPc+ZrCA0KJMrkXzkrPGNwLmnvvlN1nj7MPrxpT7m+otSv2e1TLaVffzDnE/LB14zJMg=="; + url = "https://registry.npmjs.org/jest-worker/-/jest-worker-27.0.6.tgz"; + sha512 = "qupxcj/dRuA3xHPMUd40gr2EaAurFbkwzOh7wfPaeE9id7hyjURRQoqNfHifHK3XjJU6YJJUQKILGUnwGPEOCA=="; }; }; "jimp-0.12.1" = { @@ -32355,13 +32436,13 @@ let sha512 = "0soPJif+yjmzmOF+4cF2hyhxUWWpXpQntsm2joJXFFoRcQiPzsG4dbLKYqYPT3Fc6PjZ8MaLtCkDqqckVSfmRw=="; }; }; - "jitdb-3.1.4" = { + "jitdb-3.1.5" = { name = "jitdb"; packageName = "jitdb"; - version = "3.1.4"; + version = "3.1.5"; src = fetchurl { - url = "https://registry.npmjs.org/jitdb/-/jitdb-3.1.4.tgz"; - sha512 = "UEzC68eqFIQJPQnmPm2/KGirX2pE+GebhA2EZss3b0UZZca7eGgxpvQ7+sIPcwLKAcZr5rmkFhQHGIQJyf20bg=="; + url = "https://registry.npmjs.org/jitdb/-/jitdb-3.1.5.tgz"; + sha512 = "O3z6dmk4FY+Il3zt4CEnDwgbCWP89dsGvCK1Gx7pVOSsKML31WupDJMTICZ3PUagYi52NNUhvCZHUeJVJFdgTA=="; }; }; "jju-1.4.0" = { @@ -32805,13 +32886,13 @@ let sha512 = "ChFg5qhvxCaM2bspCqizs48yMtsm5YLHjBoNZLCkbXyc3yMM5l8pnn787B5ww5TI3+tKxKYWkbiKf356kQ1OgQ=="; }; }; - "jsii-srcmak-0.1.290" = { + "jsii-srcmak-0.1.297" = { name = "jsii-srcmak"; packageName = "jsii-srcmak"; - version = "0.1.290"; + version = "0.1.297"; src = fetchurl { - url = "https://registry.npmjs.org/jsii-srcmak/-/jsii-srcmak-0.1.290.tgz"; - sha512 = "kKyb2kUBCbecbQRx467QGHUCcuCvD2gXzMNYACMgxbKLakRq3qZ3CMb8Pc8/7mnlbgU9e3suh49t8E3D6Q0yhw=="; + url = "https://registry.npmjs.org/jsii-srcmak/-/jsii-srcmak-0.1.297.tgz"; + sha512 = "CeBsxrdz22C7j7CyO0hqlz/T6MjpeR1jKy1wY5BHyKXc8mSCoTQDuCMHnmTGg9ifiuRUbOsNSbPMiHYEq2sanQ=="; }; }; "json-bigint-0.2.3" = { @@ -33111,13 +33192,13 @@ let sha512 = "0/4Lv6IenJV0qj2oBdgPIAmFiKKnh8qh7bmLFJ+/ZZHLjSeiL3fKKGX3UryvKPbxFbhV+JcYo9KUC19GJ/Z/4A=="; }; }; - "json2jsii-0.1.257" = { + "json2jsii-0.1.264" = { name = "json2jsii"; packageName = "json2jsii"; - version = "0.1.257"; + version = "0.1.264"; src = fetchurl { - url = "https://registry.npmjs.org/json2jsii/-/json2jsii-0.1.257.tgz"; - sha512 = "MMMMK6Oa9U3FtISKuOow6iwd/nJqk9i9C1HkkOO7AyBaD0IDhvgss3cRj37a390AVMnJKeQGWPm8whRsno/N+Q=="; + url = "https://registry.npmjs.org/json2jsii/-/json2jsii-0.1.264.tgz"; + sha512 = "IOe1PBV1h7feIUXO3HMRwK56TntzfEeRTMYMWwZYjRwZD6cbBS9yLsteW2fSlnhBVWkJsgZWQPP931aCulPBxw=="; }; }; "json3-3.2.6" = { @@ -33949,13 +34030,13 @@ let sha512 = "Ca4LSXFFZUjPScRaqOcFxneA0VpKZr4MMYCljyQr4LIewTLb3Y0IUTIsnBBsVubIeEfxeSZpSjSsRM8APEQaAw=="; }; }; - "lambda-local-1.7.4" = { + "lambda-local-2.0.0" = { name = "lambda-local"; packageName = "lambda-local"; - version = "1.7.4"; + version = "2.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/lambda-local/-/lambda-local-1.7.4.tgz"; - sha512 = "uLrFPGj2//glOgJGLZn8hNTNlhU+eGx0WFRLZxIoC39nfjLRZ1fncHcPK2t5gA2GcvgtGUT2dnw60M8vJAOIkQ=="; + url = "https://registry.npmjs.org/lambda-local/-/lambda-local-2.0.0.tgz"; + sha512 = "5Z7ZEhqVYJSm3djoq7QLDkEk7Ao+jNYbARo3nk3wtjKpgCnEbzOuraxDPDWg7OlZ4JKcsRDP+wNLeORMdbF2ow=="; }; }; "last-call-webpack-plugin-3.0.0" = { @@ -34471,6 +34552,15 @@ let sha512 = "bD57EjMVMBplyEMjXDMo8MvBfPymufU81kYbixqrvaLHoqsmyTMwLzqpa4CurJ5YKAXLJw68ZReDzDb6rj90Sg=="; }; }; + "lightning-3.3.12" = { + name = "lightning"; + packageName = "lightning"; + version = "3.3.12"; + src = fetchurl { + url = "https://registry.npmjs.org/lightning/-/lightning-3.3.12.tgz"; + sha512 = "tq7AAMpjQ9sl58pW/qis/vOBzN7MCQ4F4n+ox4VQhyv1qVA+P2LgJq36I1Y6b4RX68+hK48u1eHDzSt527fEXA=="; + }; + }; "lightning-3.3.9" = { name = "lightning"; packageName = "lightning"; @@ -34615,13 +34705,13 @@ let sha512 = "04PDPqSlsqIOaaaGZ+41vq5FejI9auqTInicFRndCBgE3bXG8D6W1I+mWhk+1nqbHmyhla/6BUrd5OSiHwKRXw=="; }; }; - "ln-accounting-4.3.0" = { + "ln-accounting-4.3.1" = { name = "ln-accounting"; packageName = "ln-accounting"; - version = "4.3.0"; + version = "4.3.1"; src = fetchurl { - url = "https://registry.npmjs.org/ln-accounting/-/ln-accounting-4.3.0.tgz"; - sha512 = "JfnHWP6hNmA5DCx0OHq7WKwiwPKyD1lb7GPmRqg0NFr8jj9p/PNnxayfjRD2PsmA5C3OxXO53wCy1XymG4I8+Q=="; + url = "https://registry.npmjs.org/ln-accounting/-/ln-accounting-4.3.1.tgz"; + sha512 = "EBEeBymqktoaViGAG5aVmgIOZpWc6IwDqxq93ZYYIw+Uc9Vy/86nUDPx8A/jJC0f8lwEGcqT+hnSIiBF4SyqeA=="; }; }; "ln-service-51.8.2" = { @@ -34642,6 +34732,15 @@ let sha512 = "8jTfQWtdAJJ2pipprNnUrUUpMxq6wQpT1bhN+ZwyMCdHVo72r58TrFoy0UQsutbgN9OjHMHSsBoyTd5cPmUfWA=="; }; }; + "ln-service-51.8.5" = { + name = "ln-service"; + packageName = "ln-service"; + version = "51.8.5"; + src = fetchurl { + url = "https://registry.npmjs.org/ln-service/-/ln-service-51.8.5.tgz"; + sha512 = "1SU0eG9/LDy6k3UGXaahmoe1wOahAJkaidWpLX5Nmlfq72I0arad420smma5ZGXAW4wNlGR/gx68KZzzYI5D4A=="; + }; + }; "ln-sync-0.4.5" = { name = "ln-sync"; packageName = "ln-sync"; @@ -34651,13 +34750,13 @@ let sha512 = "ETaASkbv5v2gcrob/xonsjy0deKSxIHfKOTfOXQicxhZed02plQ2oAUx/K3yxIhRnm7YS45Z/gYQLxUqHkI4ow=="; }; }; - "ln-telegram-3.2.5" = { + "ln-telegram-3.2.6" = { name = "ln-telegram"; packageName = "ln-telegram"; - version = "3.2.5"; + version = "3.2.6"; src = fetchurl { - url = "https://registry.npmjs.org/ln-telegram/-/ln-telegram-3.2.5.tgz"; - sha512 = "odHaSJDF1asxW74D4JaoLIGkVqX5KMBDk310sPoM0LJ5Fqljjc2K/Mo+zW+NQtIyaEcFrQTH207jZy2sb4niUQ=="; + url = "https://registry.npmjs.org/ln-telegram/-/ln-telegram-3.2.6.tgz"; + sha512 = "8Cd/f5v8tz6v7Tu9AMss3Gn71njnfMK9FC8+wBz+LoYLwI1VRj5yS4koWf7dVXD8qsA4DU4TnqZRrGbdSODWyQ=="; }; }; "load-bmfont-1.4.1" = { @@ -36694,6 +36793,15 @@ let sha512 = "zTU3DaZaF3Rt9rhN3uBMGQD3dD2/vFQqnvZCDv4dl5iOzq2IZQqTxu90r4E5J+nP70J3ilqVCrbho2eWaeW8Ow=="; }; }; + "luxon-1.27.0" = { + name = "luxon"; + packageName = "luxon"; + version = "1.27.0"; + src = fetchurl { + url = "https://registry.npmjs.org/luxon/-/luxon-1.27.0.tgz"; + sha512 = "VKsFsPggTA0DvnxtJdiExAucKdAnwbCCNlMM5ENvHlxubqWd0xhZcdb4XgZ7QFNhaRhilXCFxHuoObP5BNA4PA=="; + }; + }; "lzma-native-6.0.1" = { name = "lzma-native"; packageName = "lzma-native"; @@ -37054,13 +37162,13 @@ let sha512 = "34RwOXZT8kyuOJy25oJNJoulO8L0bTHYWXcdZBYZqFnjIy3NgjeoM3FmPXIOFQ26/lSHYMr8oc62B6adxXcb3Q=="; }; }; - "markdown-it-12.0.6" = { + "markdown-it-12.1.0" = { name = "markdown-it"; packageName = "markdown-it"; - version = "12.0.6"; + version = "12.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/markdown-it/-/markdown-it-12.0.6.tgz"; - sha512 = "qv3sVLl4lMT96LLtR7xeRJX11OUFjsaD5oVat2/SNBIb21bJXwal2+SklcRbTwGwqWpWH/HRtYavOoJE+seL8w=="; + url = "https://registry.npmjs.org/markdown-it/-/markdown-it-12.1.0.tgz"; + sha512 = "7temG6IFOOxfU0SgzhqR+vr2diuMhyO5uUIEZ3C5NbXhqC9uFUHoU41USYuDFoZRsaY7BEIEei874Z20VMLF6A=="; }; }; "markdown-it-8.4.2" = { @@ -37279,13 +37387,13 @@ let sha512 = "c+yYdCZJQrsRjTPhUx7VKkApw9bwDkNbHUKo1ovgcfDjb2kc8rLuRbIFyXL5WOEUwzSSKo3IXpph2K6DqB/KZg=="; }; }; - "marked-2.1.2" = { + "marked-2.1.3" = { name = "marked"; packageName = "marked"; - version = "2.1.2"; + version = "2.1.3"; src = fetchurl { - url = "https://registry.npmjs.org/marked/-/marked-2.1.2.tgz"; - sha512 = "ueJhIvklJJw04qxQbGIAu63EXwwOCYc7yKMBjgagTM4rjC5QtWyqSNgW7jCosV1/Km/1TUfs5qEpAqcGG0Mo5g=="; + url = "https://registry.npmjs.org/marked/-/marked-2.1.3.tgz"; + sha512 = "/Q+7MGzaETqifOMWYEA7HVMaZb4XbcRfaOzcSsHZEith83KGlvaSG33u0SKu89Mj5h+T8V2hM+8O45Qc5XTgwA=="; }; }; "marked-terminal-3.3.0" = { @@ -38098,13 +38206,13 @@ let sha1 = "f8a064760d37e7978ad5f9f6d3c119a494f57081"; }; }; - "mermaid-8.10.2" = { + "mermaid-8.11.0" = { name = "mermaid"; packageName = "mermaid"; - version = "8.10.2"; + version = "8.11.0"; src = fetchurl { - url = "https://registry.npmjs.org/mermaid/-/mermaid-8.10.2.tgz"; - sha512 = "Za5MrbAOMbEsyY4ONgGjfYz06sbwF1iNGRzp1sQqpOtvXxjxGu/J1jRJ8QyE9kD/D9zj1/KlRrYegWEvA7eZ5Q=="; + url = "https://registry.npmjs.org/mermaid/-/mermaid-8.11.0.tgz"; + sha512 = "c/SprR4mJ2Pj7A+3mEvva7XrhEkXQJUal7fIyOkMhOhsPX2u5gQjjm5CEhHQ6WdGsqP+yiR+Fcgnd1i8mpFK8w=="; }; }; "meros-1.1.4" = { @@ -38701,15 +38809,6 @@ let sha512 = "LfHUYIA047rrqIZEn0gwbqbzarU5bmZ8yZ9SizeoiPwVq5cemE3foJTJZ3pCktUq/IPkKNGghFHJk1O8149mOA=="; }; }; - "minify-4.1.3" = { - name = "minify"; - packageName = "minify"; - version = "4.1.3"; - src = fetchurl { - url = "https://registry.npmjs.org/minify/-/minify-4.1.3.tgz"; - sha512 = "ykuscavxivSmVpcCzsXmsVTukWYLUUtPhHj0w2ILvHDGqC+hsuTCihBn9+PJBd58JNvWTNg9132J9nrrI2anzA=="; - }; - }; "minilog-3.1.0" = { name = "minilog"; packageName = "minilog"; @@ -40349,15 +40448,6 @@ let sha512 = "Gd1aexpJ3RrOzkssdE8ipS67PuppOAkJNhRqQPp2in2XnJKPm5kvYonYMNVadasSFlNdmVCk9nELV3TnbAfklw=="; }; }; - "netlify-redirect-parser-7.0.0" = { - name = "netlify-redirect-parser"; - packageName = "netlify-redirect-parser"; - version = "7.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/netlify-redirect-parser/-/netlify-redirect-parser-7.0.0.tgz"; - sha512 = "O+4b18XZG1Y8Jaki02T58xRFoEAXIH4qxMSlhQXd8qP5WPIicwcQKylC4fdoA2+puQzGkXvEY9Yc5jn8Zpb2pQ=="; - }; - }; "netlify-redirect-parser-8.0.0" = { name = "netlify-redirect-parser"; packageName = "netlify-redirect-parser"; @@ -40854,13 +40944,13 @@ let sha1 = "87a9065cdb355d3182d8f94ce11188b825c68a3b"; }; }; - "node-ipc-9.1.4" = { + "node-ipc-9.2.0" = { name = "node-ipc"; packageName = "node-ipc"; - version = "9.1.4"; + version = "9.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/node-ipc/-/node-ipc-9.1.4.tgz"; - sha512 = "A+f0mn2KxUt1uRTSd5ktxQUsn2OEhj5evo7NUi/powBzMSZ0vocdzDjlq9QN2v3LH6CJi3e5xAenpZ1QwU5A8g=="; + url = "https://registry.npmjs.org/node-ipc/-/node-ipc-9.2.0.tgz"; + sha512 = "m4A/wueUS2PqrhM6Z8rzD1J2qvG4QG8NkKY0v3lgdntQI2NTDDL3YbfU6qkDc0RgUiA9UqZTO9CtIiDAIjrVwA=="; }; }; "node-libs-browser-2.2.1" = { @@ -41475,15 +41565,6 @@ let sha512 = "xXxr8y5U0kl8dVkz2oK7yZjPBvqM2fwaO5l3Yg13p03v8+E3qQcD0JNhHzjL1vyGgxcKkD0cco+NLR72iuPk3g=="; }; }; - "npm-package-arg-8.1.2" = { - name = "npm-package-arg"; - packageName = "npm-package-arg"; - version = "8.1.2"; - src = fetchurl { - url = "https://registry.npmjs.org/npm-package-arg/-/npm-package-arg-8.1.2.tgz"; - sha512 = "6Eem455JsSMJY6Kpd3EyWE+n5hC+g9bSyHr9K9U2zqZb7+02+hObQ2c0+8iDk/mNF+8r1MhY44WypKJAkySIYA=="; - }; - }; "npm-package-arg-8.1.5" = { name = "npm-package-arg"; packageName = "npm-package-arg"; @@ -41547,15 +41628,6 @@ let sha512 = "Qs6P6nnopig+Y8gbzpeN/dkt+n7IyVd8f45NTMotGk6Qo7GfBmzwYx6jRLoOOgKiMnaQfYxsuyQlD8Mc3guBhg=="; }; }; - "npm-registry-fetch-10.1.2" = { - name = "npm-registry-fetch"; - packageName = "npm-registry-fetch"; - version = "10.1.2"; - src = fetchurl { - url = "https://registry.npmjs.org/npm-registry-fetch/-/npm-registry-fetch-10.1.2.tgz"; - sha512 = "KsM/TdPmntqgBFlfsbkOLkkE9ovZo7VpVcd+/eTdYszCrgy5zFl5JzWm+OxavFaEWlbkirpkou+ZYI00RmOBFA=="; - }; - }; "npm-registry-fetch-11.0.0" = { name = "npm-registry-fetch"; packageName = "npm-registry-fetch"; @@ -42430,15 +42502,6 @@ let sha512 = "MVHddDVweXZF3awtlAS+6pgKLlm/JgxZ90+/NBurBoQctVOOB/zDdVjcyPzQ+0laDGbsWgrRkflI65sQeOgT9Q=="; }; }; - "open-8.0.2" = { - name = "open"; - packageName = "open"; - version = "8.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/open/-/open-8.0.2.tgz"; - sha512 = "NV5QmWJrTaNBLHABJyrb+nd5dXI5zfea/suWawBhkHzAbVhLLiJdrqMgxMypGK9Eznp2Ltoh7SAVkQ3XAucX7Q=="; - }; - }; "open-8.1.0" = { name = "open"; packageName = "open"; @@ -42565,13 +42628,13 @@ let sha512 = "Su8jA45PhegUgJnEAT15DYt2spPJgvjyTtXqg+Lw5AtGePfcQskV6ACEzsL0XPoAXIFf09Vx6sBor9pek+tl+Q=="; }; }; - "openapi-sampler-1.0.1" = { + "openapi-sampler-1.1.0" = { name = "openapi-sampler"; packageName = "openapi-sampler"; - version = "1.0.1"; + version = "1.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/openapi-sampler/-/openapi-sampler-1.0.1.tgz"; - sha512 = "qBjxkSLJV183zTTs4fgxtU/iWSLUUu2aH2+5ddWkNhV7p8CSe/mnAgoLkEbMfHtel6yr9NF+vjUWqfM+iiwORQ=="; + url = "https://registry.npmjs.org/openapi-sampler/-/openapi-sampler-1.1.0.tgz"; + sha512 = "/LhZYKNBWphLEpbAG5BdpBZbIbmLgC4vTiTj8N/MV0LF9ptmKOiJ2nETVlacNjXHt7iqDgZDELJCIoZ3q5ZG6A=="; }; }; "openapi-schema-validator-3.0.3" = { @@ -42691,13 +42754,13 @@ let sha512 = "ur5UIdyw5Y7yEj9wLzhqXiy6GZ3Mwx0yGI+5sMn2r0N0v3cKJvUmFH5yPP+WXh9e0xfyzyJX95D8l088DNFj7A=="; }; }; - "openid-2.0.8" = { + "openid-2.0.9" = { name = "openid"; packageName = "openid"; - version = "2.0.8"; + version = "2.0.9"; src = fetchurl { - url = "https://registry.npmjs.org/openid/-/openid-2.0.8.tgz"; - sha512 = "ljI4GE6p4RYn9dLftlXw6TvlA+untAkoWBRpj4qIB4AJQWcDZ2lOVOJQ2tq346ok38mtGDBYRBvp3Q+AsuCBnQ=="; + url = "https://registry.npmjs.org/openid/-/openid-2.0.9.tgz"; + sha512 = "LzsGBHUDU2FjW/aHjB99GXxuyEPVkFyU4Ub/df3K0hYGxD1qvYu7atPORLXddCufVkcZBpgbYxdLVG8uiY0fCA=="; }; }; "openpgp-4.10.10" = { @@ -43141,13 +43204,13 @@ let sha512 = "BZOr3nRQHOntUjTrH8+Lh54smKHoHyur8We1V8DSMVrl5A2malOOwuJRnKRDjSnkoeBh4at6BwEnb5I7Jl31wg=="; }; }; - "p-debounce-1.0.0" = { + "p-debounce-2.1.0" = { name = "p-debounce"; packageName = "p-debounce"; - version = "1.0.0"; + version = "2.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/p-debounce/-/p-debounce-1.0.0.tgz"; - sha1 = "cb7f2cbeefd87a09eba861e112b67527e621e2fd"; + url = "https://registry.npmjs.org/p-debounce/-/p-debounce-2.1.0.tgz"; + sha512 = "M9bMt62TTnozdZhqFgs+V7XD2MnuKCaz+7fZdlu2/T7xruI3uIE5CicQ0vx1hV7HIUYF0jF+4/R1AgfOkl74Qw=="; }; }; "p-defer-1.0.0" = { @@ -43240,6 +43303,15 @@ let sha512 = "Y3W0wlRPK8ZMRbNq97l4M5otioeA5lm1z7bkNkxCka8HSPjR0xRWmpCmc9utiaLP9Jb1eD8BgeIxTW4AIF45Pg=="; }; }; + "p-is-promise-3.0.0" = { + name = "p-is-promise"; + packageName = "p-is-promise"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/p-is-promise/-/p-is-promise-3.0.0.tgz"; + sha512 = "Wo8VsW4IRQSKVXsJCn7TomUaVtyfjVDn3nUP7kE967BQk0CwFpdbZs0X0uk5sW9mkBa9eNM7hCMaG93WUAwxYQ=="; + }; + }; "p-limit-1.3.0" = { name = "p-limit"; packageName = "p-limit"; @@ -43591,15 +43663,6 @@ let sha512 = "LUL4NK7sz01jdSUdCu3z1LyphCiFdQaFouaEDsAWmJpzS0lbeNfvZoX4bi1Tm1ilzheK5VAoD96QskDCZQr+jA=="; }; }; - "pacote-11.3.2" = { - name = "pacote"; - packageName = "pacote"; - version = "11.3.2"; - src = fetchurl { - url = "https://registry.npmjs.org/pacote/-/pacote-11.3.2.tgz"; - sha512 = "lMO7V9aMhyE5gfaSFxKfW3OTdXuFBNQJfuNuet3NPzWWhOYIW90t85vHcHLDjdhgmfAdAHyh9q1HAap96ea0XA=="; - }; - }; "pacote-11.3.4" = { name = "pacote"; packageName = "pacote"; @@ -44023,13 +44086,13 @@ let sha1 = "32d4b6afde631420e5f415919a222b774b575707"; }; }; - "parse-url-5.0.3" = { + "parse-url-5.0.7" = { name = "parse-url"; packageName = "parse-url"; - version = "5.0.3"; + version = "5.0.7"; src = fetchurl { - url = "https://registry.npmjs.org/parse-url/-/parse-url-5.0.3.tgz"; - sha512 = "nrLCVMJpqo12X8uUJT4GJPd5AFaTOrGx/QpJy3HNcVtq0AZSstVIsnxS5fqNPuoqMUs3MyfBoOP6Zvu2Arok5A=="; + url = "https://registry.npmjs.org/parse-url/-/parse-url-5.0.7.tgz"; + sha512 = "CgbjyWT6aOh2oNSUS0cioYQsGysj9hQ2IdbOfeNwq5KOaKM7dOw/yTupiI0cnJhaDHJEIGybPkQz7LF9WNIhyw=="; }; }; "parse5-1.5.1" = { @@ -44248,13 +44311,13 @@ let sha1 = "1fe63268c92e75606626437e3b906662c15ba6ee"; }; }; - "passport-oauth2-1.5.0" = { + "passport-oauth2-1.6.0" = { name = "passport-oauth2"; packageName = "passport-oauth2"; - version = "1.5.0"; + version = "1.6.0"; src = fetchurl { - url = "https://registry.npmjs.org/passport-oauth2/-/passport-oauth2-1.5.0.tgz"; - sha512 = "kqBt6vR/5VlCK8iCx1/KpY42kQ+NEHZwsSyt4Y6STiNjU+wWICG1i8ucc1FapXDGO15C5O5VZz7+7vRzrDPXXQ=="; + url = "https://registry.npmjs.org/passport-oauth2/-/passport-oauth2-1.6.0.tgz"; + sha512 = "emXPLqLcVEcLFR/QvQXZcwLmfK8e9CqvMgmOFJxcNT3okSFMtUbRRKpY20x5euD+01uHsjjCa07DYboEeLXYiw=="; }; }; "passport-oauth2-client-password-0.1.2" = { @@ -45004,6 +45067,15 @@ let sha512 = "NPE8TDbzl/3YQYY7CSS228s3g2ollTFnc+Qi3tqmqJp9Vg2ovUpixcJEo2HJScN2Ez+kEaal6y70c0ehqJBJeA=="; }; }; + "pkg-fetch-3.1.1" = { + name = "pkg-fetch"; + packageName = "pkg-fetch"; + version = "3.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/pkg-fetch/-/pkg-fetch-3.1.1.tgz"; + sha512 = "3GfpNwbwoTxge2TrVp6Oyz/FZJOoxF1r0+1YikOhnBXa2Di/VOJKtUObFHap76BFnyFo1fwh5vARWFR9TzLKUg=="; + }; + }; "pkg-up-2.0.0" = { name = "pkg-up"; packageName = "pkg-up"; @@ -46040,6 +46112,15 @@ let sha512 = "s8Aai8++QQGi4sSbs/M1Qku62PFK49Jm1CbgXklGz4nmHveDq0wzJkg7Na5QbnO1uNH8K7iqx2EQ/mV0MZEmOg=="; }; }; + "prebuild-install-6.0.1" = { + name = "prebuild-install"; + packageName = "prebuild-install"; + version = "6.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/prebuild-install/-/prebuild-install-6.0.1.tgz"; + sha512 = "7GOJrLuow8yeiyv75rmvZyeMGzl8mdEX5gY69d6a6bHWmiPevwqFw+tQavhK0EYMaSg3/KD24cWqeQv1EWsqDQ=="; + }; + }; "prebuild-install-6.1.3" = { name = "prebuild-install"; packageName = "prebuild-install"; @@ -46157,13 +46238,13 @@ let sha512 = "kXtO4s0Lz/DW/IJ9QdWhAf7/NmPWQXkFr/r/WkR3vyI+0v8amTDxiaQSLzs8NBlytfLWX/7uQUMIW677yLKl4w=="; }; }; - "prettier-2.3.1" = { + "prettier-2.3.2" = { name = "prettier"; packageName = "prettier"; - version = "2.3.1"; + version = "2.3.2"; src = fetchurl { - url = "https://registry.npmjs.org/prettier/-/prettier-2.3.1.tgz"; - sha512 = "p+vNbgpLjif/+D+DwAZAbndtRrR0md0MwfmOVN9N+2RgyACMT+7tfaRnT+WDPkqnuVwleyuBIG2XBxKDme3hPA=="; + url = "https://registry.npmjs.org/prettier/-/prettier-2.3.2.tgz"; + sha512 = "lnJzDfJ66zkMy58OL5/NY5zp70S7Nz6KqcKkXYzn2tMVrNxvbqaBpg7H3qHaLxCJ5lNMsGuM8+ohS7cZrthdLQ=="; }; }; "prettier-bytes-1.0.4" = { @@ -46400,13 +46481,13 @@ let sha512 = "dG2w7WtovUa4SiYTdWn9H8Bd4JNdei2djtkP/Bk9fXq81j5Q15ZPHYSwhUVvBRbp5zMkGtu0Yk62HuMcly0pRw=="; }; }; - "prismjs-1.23.0" = { + "prismjs-1.24.0" = { name = "prismjs"; packageName = "prismjs"; - version = "1.23.0"; + version = "1.24.0"; src = fetchurl { - url = "https://registry.npmjs.org/prismjs/-/prismjs-1.23.0.tgz"; - sha512 = "c29LVsqOaLbBHuIbsTxaKENh1N2EQBOHaWv7gkHN4dgRbxSREqDnDbtFJYdpPauS4YCplMSNCABQ6Eeor69bAA=="; + url = "https://registry.npmjs.org/prismjs/-/prismjs-1.24.0.tgz"; + sha512 = "SqV5GRsNqnzCL8k5dfAjCNhUrF3pR0A9lTDSCUZeh/LIshheXJEaP0hwLz2t4XHivd2J/v2HR+gRnigzeKe3cQ=="; }; }; "private-0.1.8" = { @@ -46517,6 +46598,24 @@ let sha512 = "3ouUOpQhtgrbOa17J7+uxOTpITYWaGP7/AhoR3+A+/1e9skrzelGi/dXzEYyvbxubEF6Wn2ypscTKiKJFFn1ag=="; }; }; + "process-utils-2.6.0" = { + name = "process-utils"; + packageName = "process-utils"; + version = "2.6.0"; + src = fetchurl { + url = "https://registry.npmjs.org/process-utils/-/process-utils-2.6.0.tgz"; + sha512 = "2zKFADQDvHiUDyJQTsBTdu1+Q2D/WtReBotZwXmD9oUueb0kNv4rXulK/78hMM+nclBNFZ/ZlHOJtobt8oHpqQ=="; + }; + }; + "process-utils-4.0.0" = { + name = "process-utils"; + packageName = "process-utils"; + version = "4.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/process-utils/-/process-utils-4.0.0.tgz"; + sha512 = "fMyMQbKCxX51YxR7YGCzPjLsU3yDzXFkP4oi1/Mt5Ixnk7GO/7uUTj8mrCHUwuvozWzI+V7QSJR9cZYnwNOZPg=="; + }; + }; "progress-1.1.8" = { name = "progress"; packageName = "progress"; @@ -47885,22 +47984,13 @@ let sha512 = "l1jNAspIBSFqbT+y+5FosojNpVpF94nlI+wDUpqP9enwOTfHx9f0gh5nB96vl+6yTpsJsypeNrwfzPrKuHB41A=="; }; }; - "puppeteer-10.0.0" = { + "puppeteer-10.1.0" = { name = "puppeteer"; packageName = "puppeteer"; - version = "10.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/puppeteer/-/puppeteer-10.0.0.tgz"; - sha512 = "AxHvCb9IWmmP3gMW+epxdj92Gglii+6Z4sb+W+zc2hTTu10HF0yg6hGXot5O74uYkVqG3lfDRLfnRpi6WOwi5A=="; - }; - }; - "puppeteer-8.0.0" = { - name = "puppeteer"; - packageName = "puppeteer"; - version = "8.0.0"; + version = "10.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/puppeteer/-/puppeteer-8.0.0.tgz"; - sha512 = "D0RzSWlepeWkxPPdK3xhTcefj8rjah1791GE82Pdjsri49sy11ci/JQsAO8K2NRukqvwEtcI+ImP5F4ZiMvtIQ=="; + url = "https://registry.npmjs.org/puppeteer/-/puppeteer-10.1.0.tgz"; + sha512 = "bsyDHbFBvbofZ63xqF7hMhuKBX1h4WsqFIAoh1GuHr/Y9cewh+EFNAOdqWSkQRHLiBU/MY6M+8PUnXXjAPtuSg=="; }; }; "purgecss-2.3.0" = { @@ -47948,13 +48038,13 @@ let sha1 = "15931d3cd967ade52206f523aa7331aef7d43af7"; }; }; - "pyright-1.1.151" = { + "pyright-1.1.154" = { name = "pyright"; packageName = "pyright"; - version = "1.1.151"; + version = "1.1.154"; src = fetchurl { - url = "https://registry.npmjs.org/pyright/-/pyright-1.1.151.tgz"; - sha512 = "R/Zr6VqXghuFLm7y3a8HoCrA+mfy+Zp+mp6P8gFZeJO9Rl1kQLJhfc/y4QKSQHZWxXOBGo+AFDi/rWLZfNBEgQ=="; + url = "https://registry.npmjs.org/pyright/-/pyright-1.1.154.tgz"; + sha512 = "J2P5Iurkl7smCyB8CH5fsm8GOGeKRk7d1HWcFiro94E0vJW/5sSKXrkfjPxo7XZ+e96UiW1qyiVTCC++db3Tfg=="; }; }; "q-0.9.7" = { @@ -50594,13 +50684,13 @@ let sha1 = "6f697e50a0e4ddc8c8f7fb547a9b60dead43678d"; }; }; - "retry-request-4.1.3" = { + "retry-request-4.2.1" = { name = "retry-request"; packageName = "retry-request"; - version = "4.1.3"; + version = "4.2.1"; src = fetchurl { - url = "https://registry.npmjs.org/retry-request/-/retry-request-4.1.3.tgz"; - sha512 = "QnRZUpuPNgX0+D1xVxul6DbJ9slvo4Rm6iV/dn63e048MvGbUZiKySVt6Tenp04JqmchxjiLltGerOJys7kJYQ=="; + url = "https://registry.npmjs.org/retry-request/-/retry-request-4.2.1.tgz"; + sha512 = "afiCoZZ7D/AR2mf+9ajr75dwGFgWmPEshv3h+oKtf9P1AsHfHvcVXumdbAEq2qNy4UXFEXsEX5HpyGj4axvoaA=="; }; }; "reusify-1.0.4" = { @@ -50801,13 +50891,13 @@ let sha512 = "/2HA0Ec70TvQnXdzynFffkjA6XN+1e2pEv/uKS5Ulca40g2L7KuOE3riasHoNVHOsFD5KKZgDsMk1CP3Tw9s+A=="; }; }; - "rollup-2.52.2" = { + "rollup-2.52.7" = { name = "rollup"; packageName = "rollup"; - version = "2.52.2"; + version = "2.52.7"; src = fetchurl { - url = "https://registry.npmjs.org/rollup/-/rollup-2.52.2.tgz"; - sha512 = "4RlFC3k2BIHlUsJ9mGd8OO+9Lm2eDF5P7+6DNQOp5sx+7N/1tFM01kELfbxlMX3MxT6owvLB1ln4S3QvvQlbUA=="; + url = "https://registry.npmjs.org/rollup/-/rollup-2.52.7.tgz"; + sha512 = "55cSH4CCU6MaPr9TAOyrIC+7qFCHscL7tkNsm1MBfIJRRqRbCEY0mmeFn4Wg8FKsHtEH8r389Fz38r/o+kgXLg=="; }; }; "rollup-plugin-babel-4.4.0" = { @@ -51503,15 +51593,6 @@ let sha512 = "e1QtP3YL5tWww8uKaOCQ18UxIT2laNBXHjV/S2WYCiK4udiv8lkG89KRIoCjUagnAmCBurjF4zEVX2ByBbnCjQ=="; }; }; - "select-1.1.2" = { - name = "select"; - packageName = "select"; - version = "1.1.2"; - src = fetchurl { - url = "https://registry.npmjs.org/select/-/select-1.1.2.tgz"; - sha1 = "0e7350acdec80b1108528786ec1d4418d11b396d"; - }; - }; "select-hose-2.0.0" = { name = "select-hose"; packageName = "select-hose"; @@ -51863,6 +51944,15 @@ let sha512 = "SaaNal9imEO737H2c05Og0/8LUXG7EnsZyMa8MzkmuHoELfT6txuj0cMqRj6zfPKnmQ1yasR4PCJc8x+M4JSPA=="; }; }; + "serialize-javascript-6.0.0" = { + name = "serialize-javascript"; + packageName = "serialize-javascript"; + version = "6.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-6.0.0.tgz"; + sha512 = "Qr3TosvguFt8ePWqsvRfrKyQXIiW+nGbYpy8XK24NQHE83caxWt+mIymTT19DGFbNWNLfEwsrkSmN64lVWB9ag=="; + }; + }; "serialize-to-js-3.1.1" = { name = "serialize-to-js"; packageName = "serialize-to-js"; @@ -52970,13 +53060,13 @@ let sha512 = "XYjhOTRPFA7NfDUsH6uH1fbML2OgSFsqdUPbud7x01urNP9CHXgUgAD4NhKMi3dVQK+7IdYadWt0wrFWw4y+qg=="; }; }; - "snyk-python-plugin-1.19.9" = { + "snyk-python-plugin-1.19.11" = { name = "snyk-python-plugin"; packageName = "snyk-python-plugin"; - version = "1.19.9"; + version = "1.19.11"; src = fetchurl { - url = "https://registry.npmjs.org/snyk-python-plugin/-/snyk-python-plugin-1.19.9.tgz"; - sha512 = "vkqBJP+wOtrBKpqrFRP5EfAs5wZ/fGNI14Mb+EMnmu+ebP1ze9AnHxfiqMl/+ITzeYElZ2H5DX9sXXiqpJRhRg=="; + url = "https://registry.npmjs.org/snyk-python-plugin/-/snyk-python-plugin-1.19.11.tgz"; + sha512 = "zUKbSbw+wU1FCUDYt+IDjaES0pc1UKBECOqjHSJMxWm9VhstvPtI4KccetwOfne2oUcmaEJJvcEp4s9VTK04XQ=="; }; }; "snyk-resolve-1.1.0" = { @@ -52997,13 +53087,13 @@ let sha512 = "Bmtr7QdRL2b3Js+mPDmvXbkprOpzO8aUFXqR0nJKAOlUVQqZ84yiuT0n/mssEiJJ0vP+k0kZvTeiTwgio4KZRg=="; }; }; - "snyk-sbt-plugin-2.11.0" = { + "snyk-sbt-plugin-2.11.1" = { name = "snyk-sbt-plugin"; packageName = "snyk-sbt-plugin"; - version = "2.11.0"; + version = "2.11.1"; src = fetchurl { - url = "https://registry.npmjs.org/snyk-sbt-plugin/-/snyk-sbt-plugin-2.11.0.tgz"; - sha512 = "wUqHLAa3MzV6sVO+05MnV+lwc+T6o87FZZaY+43tQPytBI2Wq23O3j4POREM4fa2iFfiQJoEYD6c7xmhiEUsSA=="; + url = "https://registry.npmjs.org/snyk-sbt-plugin/-/snyk-sbt-plugin-2.11.1.tgz"; + sha512 = "WKSV4MivovUHqdD2EYrkCuESjVLSbtsKpNnHeDCRIvv/GZ7YkvDsDqRLBUzDl6SvhGzaCv9rwEVUl+ZwJITL1w=="; }; }; "snyk-tree-1.0.0" = { @@ -53924,13 +54014,13 @@ let sha512 = "VE0SOVEHCk7Qc8ulkWw3ntAzXuqf7S2lvwQaDLRnUeIEaKNQJzV6BwmLKhOqT61aGhfUMrXeaBk+oDGCzvhcug=="; }; }; - "sprintf-kit-2.0.0" = { + "sprintf-kit-2.0.1" = { name = "sprintf-kit"; packageName = "sprintf-kit"; - version = "2.0.0"; + version = "2.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/sprintf-kit/-/sprintf-kit-2.0.0.tgz"; - sha512 = "/0d2YTn8ZFVpIPAU230S9ZLF8WDkSSRWvh/UOLM7zzvkCchum1TtouRgyV8OfgOaYilSGU4lSSqzwBXJVlAwUw=="; + url = "https://registry.npmjs.org/sprintf-kit/-/sprintf-kit-2.0.1.tgz"; + sha512 = "2PNlcs3j5JflQKcg4wpdqpZ+AjhQJ2OZEo34NXDtlB0tIPG84xaaXhpA8XFacFiwjKA4m49UOYG83y3hbMn/gQ=="; }; }; "sqlite3-5.0.0" = { @@ -54041,13 +54131,13 @@ let sha512 = "pJAFizB6OcuJLX4RJJuU9HWyPwM2CqLi/vs08lhVIR3TGxacxpavvK5LzbxT+Y3iWkBchOTKS5hHCigA5aaung=="; }; }; - "ssb-db2-2.1.3" = { + "ssb-db2-2.1.4" = { name = "ssb-db2"; packageName = "ssb-db2"; - version = "2.1.3"; + version = "2.1.4"; src = fetchurl { - url = "https://registry.npmjs.org/ssb-db2/-/ssb-db2-2.1.3.tgz"; - sha512 = "neA96dzAzxuH5/btqtbZ3h3RoWVdAT4b8rJrK/oZPfaOHMkQHL75IBuviTqkgfXoMqx1exegt4AI4bVroCJPmg=="; + url = "https://registry.npmjs.org/ssb-db2/-/ssb-db2-2.1.4.tgz"; + sha512 = "r70wOz0taaIgpFX/I1DbzT1mucfLSHMmXfNMaenmLcrV6vDZFyFvZVyQTn26xgv7JwDkrdD9B/1Y85AH0qjYow=="; }; }; "ssb-ebt-5.6.7" = { @@ -54320,13 +54410,13 @@ let sha512 = "zZ/Q1M+9ZWlrchgh4QauD/MEUFa6eC6H6FYq6T8Of/y82JqsQBLwN6YlzbO09evE7Rx6x0oliXDCnQSjwGwQRA=="; }; }; - "sscaff-1.2.10" = { + "sscaff-1.2.17" = { name = "sscaff"; packageName = "sscaff"; - version = "1.2.10"; + version = "1.2.17"; src = fetchurl { - url = "https://registry.npmjs.org/sscaff/-/sscaff-1.2.10.tgz"; - sha512 = "okh9hLxPkZl22XpK+4rLOnR3SHG2hEI92KKevDI8e6wZPIP5Dgsxx8RQUogdm3/a87kgyoWaCoOABekYIeXx9g=="; + url = "https://registry.npmjs.org/sscaff/-/sscaff-1.2.17.tgz"; + sha512 = "0QF6J4B6lJKXKuUdiRDm576Ix1nVO3hdiHZYwEQJujcshJriHnny8kpOch1L6VykLPifg2g3hkHKas6WuNkqsg=="; }; }; "ssh-config-1.1.6" = { @@ -54824,6 +54914,15 @@ let sha512 = "y+ChhCov2A5nDqC2aZ6HKXs3OvDlvAp0Ps3BF1P/Iv8tUZJQQsMVaSzk0WryVTVoGITKv01UYahCXMpAs7I0lQ=="; }; }; + "stream-meter-1.0.4" = { + name = "stream-meter"; + packageName = "stream-meter"; + version = "1.0.4"; + src = fetchurl { + url = "https://registry.npmjs.org/stream-meter/-/stream-meter-1.0.4.tgz"; + sha1 = "52af95aa5ea760a2491716704dbff90f73afdd1d"; + }; + }; "stream-parser-0.3.1" = { name = "stream-parser"; packageName = "stream-parser"; @@ -56111,13 +56210,13 @@ let sha512 = "xk5CMbwoQVI53rTq9o/iMojAqXP5NT4/+TMeTP4uXWDIH18pB9AXgO5Olqt0RXuf3jH032DA4DS4qzem6XdXAw=="; }; }; - "swagger-ui-dist-3.50.0" = { + "swagger-ui-dist-3.51.1" = { name = "swagger-ui-dist"; packageName = "swagger-ui-dist"; - version = "3.50.0"; + version = "3.51.1"; src = fetchurl { - url = "https://registry.npmjs.org/swagger-ui-dist/-/swagger-ui-dist-3.50.0.tgz"; - sha512 = "BklniOBPlvZ6M9oGkhUwOf5HvxhkHBIycXN3ndju8WlLmi1xfMSdOA2AR6pNswlwURzsZUe1rh80aUyjnpD+Zw=="; + url = "https://registry.npmjs.org/swagger-ui-dist/-/swagger-ui-dist-3.51.1.tgz"; + sha512 = "df2mEeVgnJp/FcXY3DRh3CsTfvHVTaO6g3FJP/kfwhxfOD1+YTXqBZrOIIsYTPtcRIFBkCAto0NFCxAV4XFRbw=="; }; }; "swagger2openapi-7.0.7" = { @@ -56796,13 +56895,13 @@ let sha512 = "EAPipTNeWsb/3wLPeup1tVPaXfIaU68xMnVdPafIL1TV05OhASArYyIfFvnvJCNrR2NIOvDVNNTFRa+Re2MWyw=="; }; }; - "terser-5.7.0" = { + "terser-5.7.1" = { name = "terser"; packageName = "terser"; - version = "5.7.0"; + version = "5.7.1"; src = fetchurl { - url = "https://registry.npmjs.org/terser/-/terser-5.7.0.tgz"; - sha512 = "HP5/9hp2UaZt5fYkuhNBR8YyRcT8juw8+uFbAme53iN9hblvKnLUTKkmwJG6ocWpIKf8UK4DoeWG4ty0J6S6/g=="; + url = "https://registry.npmjs.org/terser/-/terser-5.7.1.tgz"; + sha512 = "b3e+d5JbHAe/JSjwsC3Zn55wsBIM7AsHLjKxT31kGCldgbpFePaFo+PiddtO6uwRZWRw7sPXmAN8dTW61xmnSg=="; }; }; "terser-webpack-plugin-1.4.5" = { @@ -56832,13 +56931,13 @@ let sha512 = "3qAQpykRTD5DReLu5/cwpsg7EZFzP3Q0Hp2XUWJUw2mpq2jfgOKTZr8IZKKnNieRVVo1UauROTdhbQJZveGKtQ=="; }; }; - "terser-webpack-plugin-5.1.3" = { + "terser-webpack-plugin-5.1.4" = { name = "terser-webpack-plugin"; packageName = "terser-webpack-plugin"; - version = "5.1.3"; + version = "5.1.4"; src = fetchurl { - url = "https://registry.npmjs.org/terser-webpack-plugin/-/terser-webpack-plugin-5.1.3.tgz"; - sha512 = "cxGbMqr6+A2hrIB5ehFIF+F/iST5ZOxvOmy9zih9ySbP1C2oEWQSOUS+2SNBTjzx5xLKO4xnod9eywdfq1Nb9A=="; + url = "https://registry.npmjs.org/terser-webpack-plugin/-/terser-webpack-plugin-5.1.4.tgz"; + sha512 = "C2WkFwstHDhVEmsmlCxrXUtVklS+Ir1A7twrYzrDrQQOIMOaVAYykaoo/Aq1K0QRkMoY2hhvDQY1cm4jnIMFwA=="; }; }; "test-exclude-6.0.0" = { @@ -58083,15 +58182,6 @@ let sha1 = "405923909592d56f78a5818434b0b78489ca5f2b"; }; }; - "try-catch-2.0.1" = { - name = "try-catch"; - packageName = "try-catch"; - version = "2.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/try-catch/-/try-catch-2.0.1.tgz"; - sha512 = "LsOrmObN/2WdM+y2xG+t16vhYrQsnV8wftXIcIOWZhQcBJvKGYuamJGwnU98A7Jxs2oZNkJztXlphEOoA0DWqg=="; - }; - }; "try-resolve-1.0.1" = { name = "try-resolve"; packageName = "try-resolve"; @@ -58101,15 +58191,6 @@ let sha1 = "cfde6fabd72d63e5797cfaab873abbe8e700e912"; }; }; - "try-to-catch-1.1.1" = { - name = "try-to-catch"; - packageName = "try-to-catch"; - version = "1.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/try-to-catch/-/try-to-catch-1.1.1.tgz"; - sha512 = "ikUlS+/BcImLhNYyIgZcEmq4byc31QpC+46/6Jm5ECWkVFhf8SM2Fp/0pMVXPX6vk45SMCwrP4Taxucne8I0VA=="; - }; - }; "tryer-1.0.1" = { name = "tryer"; packageName = "tryer"; @@ -58713,13 +58794,13 @@ let sha512 = "7uc1O8h1M1g0rArakJdf0uLRSSgFcYexrVoKo+bzJd32gd4gDy2L/Z+8/FjPnU9ydY3pEnVPtr9FyscYY60K1g=="; }; }; - "typegram-3.3.1" = { + "typegram-3.4.0" = { name = "typegram"; packageName = "typegram"; - version = "3.3.1"; + version = "3.4.0"; src = fetchurl { - url = "https://registry.npmjs.org/typegram/-/typegram-3.3.1.tgz"; - sha512 = "Y1bR17IZ9Shj1Ih8wTLtrmOOMHJ20ve0Bd5SPymmw53uO4WLp/JjNM55s2b6PEziBvMISRdCQSZ+m6JiUKEobA=="; + url = "https://registry.npmjs.org/typegram/-/typegram-3.4.0.tgz"; + sha512 = "GUE1LV3LJruTThJaUBUvTnaEpTswFhuxhEx9LaVLIA6WRw9CdPQmb87OIA0rCvoMSPBC8gZiHrrPqX9VJGDXwQ=="; }; }; "typescript-2.9.2" = { @@ -58785,13 +58866,13 @@ let sha512 = "qOcYwxaByStAWrBf4x0fibwZvMRG+r4cQoTjbPtUlrWjBHbmCAww1i448U0GJ+3cNNEtebDteo/cHOR3xJ4wEw=="; }; }; - "typescript-4.3.4" = { + "typescript-4.3.5" = { name = "typescript"; packageName = "typescript"; - version = "4.3.4"; + version = "4.3.5"; src = fetchurl { - url = "https://registry.npmjs.org/typescript/-/typescript-4.3.4.tgz"; - sha512 = "uauPG7XZn9F/mo+7MrsRjyvbxFpzemRjKEZXS4AK83oP2KKOJPvb+9cO/gmnv8arWZvhnjVOXz7B49m1l0e9Ew=="; + url = "https://registry.npmjs.org/typescript/-/typescript-4.3.5.tgz"; + sha512 = "DqQgihaQ9cUrskJo9kIyW/+g0Vxsk8cDtZ52a3NGh0YNTfpUSArXSohyUGnvbPazEPLu398C0UxmKSOrPumUzA=="; }; }; "typescript-eslint-parser-16.0.1" = { @@ -58884,22 +58965,22 @@ let sha1 = "29c5733148057bb4e1f75df35b7a9cb72e6a59dd"; }; }; - "uglify-js-3.13.3" = { + "uglify-js-3.13.10" = { name = "uglify-js"; packageName = "uglify-js"; - version = "3.13.3"; + version = "3.13.10"; src = fetchurl { - url = "https://registry.npmjs.org/uglify-js/-/uglify-js-3.13.3.tgz"; - sha512 = "otIc7O9LyxpUcQoXzj2hL4LPWKklO6LJWoJUzNa8A17Xgi4fOeDC8FBDOLHnC/Slo1CQgsZMcM6as0M76BZaig=="; + url = "https://registry.npmjs.org/uglify-js/-/uglify-js-3.13.10.tgz"; + sha512 = "57H3ACYFXeo1IaZ1w02sfA71wI60MGco/IQFjOqK+WtKoprh7Go2/yvd2HPtoJILO2Or84ncLccI4xoHMTSbGg=="; }; }; - "uglify-js-3.13.9" = { + "uglify-js-3.13.3" = { name = "uglify-js"; packageName = "uglify-js"; - version = "3.13.9"; + version = "3.13.3"; src = fetchurl { - url = "https://registry.npmjs.org/uglify-js/-/uglify-js-3.13.9.tgz"; - sha512 = "wZbyTQ1w6Y7fHdt8sJnHfSIuWeDgk6B5rCb4E/AM6QNNPbOMIZph21PW5dRB3h7Df0GszN+t7RuUH6sWK5bF0g=="; + url = "https://registry.npmjs.org/uglify-js/-/uglify-js-3.13.3.tgz"; + sha512 = "otIc7O9LyxpUcQoXzj2hL4LPWKklO6LJWoJUzNa8A17Xgi4fOeDC8FBDOLHnC/Slo1CQgsZMcM6as0M76BZaig=="; }; }; "uglify-js-3.4.10" = { @@ -59289,13 +59370,13 @@ let sha512 = "JCrmN13jI4+h9UAyKEoGcDZV+i1E7BLFuG7OsaDvTXI5P0qhHX+vZO/kOhz9jn8HGENDKbwSeB0nVOg4gVStGA=="; }; }; - "unified-9.2.1" = { + "unified-9.2.2" = { name = "unified"; packageName = "unified"; - version = "9.2.1"; + version = "9.2.2"; src = fetchurl { - url = "https://registry.npmjs.org/unified/-/unified-9.2.1.tgz"; - sha512 = "juWjuI8Z4xFg8pJbnEZ41b5xjGUWGHqXALmBZ3FC3WX0PIx1CZBIIJ6mXbYMcf6Yw4Fi0rFUTA1cdz/BglbOhA=="; + url = "https://registry.npmjs.org/unified/-/unified-9.2.2.tgz"; + sha512 = "Sg7j110mtefBD+qunSLO1lqOEKdrwBFBrR6Qd8f4uwkhWNlbkaqwHse6e7QvD3AP/MNoJdEDLaf8OxYyoWgorQ=="; }; }; "unified-diff-3.1.0" = { @@ -59316,13 +59397,13 @@ let sha512 = "iDJYH82TgcezQA4IZzhCNJQx7vBsGk4h9s4Q7Fscrb3qcPsxBqVrVNYez2W3sBVTxuU1bFAhyRpA6ba/R4j93A=="; }; }; - "unified-engine-8.1.0" = { + "unified-engine-8.2.0" = { name = "unified-engine"; packageName = "unified-engine"; - version = "8.1.0"; + version = "8.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/unified-engine/-/unified-engine-8.1.0.tgz"; - sha512 = "ptXTWUf9HZ2L9xto7tre+hSdSN7M9S0rypUpMAcFhiDYjrXLrND4If+8AZOtPFySKI/Zhfxf7GVAR34BqixDUA=="; + url = "https://registry.npmjs.org/unified-engine/-/unified-engine-8.2.0.tgz"; + sha512 = "ZlMm62ejrf+tJHdyOjQfljszngQjRor95q2XZMGk6rpJUYi7ZIHY/EXEhOcj9PZkMKKdLIM+dqL4s0ceyk9wbA=="; }; }; "unified-message-control-3.0.3" = { @@ -60451,13 +60532,13 @@ let sha512 = "vRAKaS8WcYNgzbxyH2LdheqgL4sQLis8LXl7r/mN+O4mpWlUpoCsTtietxepLrft2q0TFA2gaIvSWN1iRkzW/w=="; }; }; - "utp-native-2.5.1" = { + "utp-native-2.5.3" = { name = "utp-native"; packageName = "utp-native"; - version = "2.5.1"; + version = "2.5.3"; src = fetchurl { - url = "https://registry.npmjs.org/utp-native/-/utp-native-2.5.1.tgz"; - sha512 = "wbrJwR8DZx8N9s1ffTcMuBK7tMBQ9tvKpIL+mWHrDvGUYfV7ivroEGFTXUr4meqy/PVbUdMfURSoBbwuGtt/YQ=="; + url = "https://registry.npmjs.org/utp-native/-/utp-native-2.5.3.tgz"; + sha512 = "sWTrWYXPhhWJh+cS2baPzhaZc89zwlWCfwSthUjGhLkZztyPhcQllo+XVVCbNGi7dhyRlxkWxN4NKU6FbA9Y8w=="; }; }; "uuid-2.0.3" = { @@ -61504,13 +61585,13 @@ let sha512 = "QxI+qV97uD7HHOCjh3MrM1TfbdwmTXrMckri5Tus1/FQiG3baDZb2C9Y0y8QThs7PwHYBIQXcAc59ZveCRZKPA=="; }; }; - "vscode-json-languageservice-4.1.4" = { + "vscode-json-languageservice-4.1.5" = { name = "vscode-json-languageservice"; packageName = "vscode-json-languageservice"; - version = "4.1.4"; + version = "4.1.5"; src = fetchurl { - url = "https://registry.npmjs.org/vscode-json-languageservice/-/vscode-json-languageservice-4.1.4.tgz"; - sha512 = "/UqaE58BVFdePM9l971L6xPRLlCLNk01aovf1Pp9hB/8pytmd2s9ZNEnS1JqYyQEJ1k5/fEBsWOdhQlNo4H7VA=="; + url = "https://registry.npmjs.org/vscode-json-languageservice/-/vscode-json-languageservice-4.1.5.tgz"; + sha512 = "oRVPj2UY6BQ8PQ1LIz/FigUEZQVqsB9msNCFlxRBHE9sSEIJkCbYG6aCB2n7WR17VIisYQdO3MDheuoyI48G2w=="; }; }; "vscode-jsonrpc-3.5.0" = { @@ -61990,13 +62071,13 @@ let sha512 = "8FdXi0gieEwh1IprIBafpiJWcApwrU+l2FEj8c1HtHFdNXMd0+2jUSjBVmcQYohf/E72irwAXEXLga6TQcB3FA=="; }; }; - "vue-eslint-parser-7.6.0" = { + "vue-eslint-parser-7.7.1" = { name = "vue-eslint-parser"; packageName = "vue-eslint-parser"; - version = "7.6.0"; + version = "7.7.1"; src = fetchurl { - url = "https://registry.npmjs.org/vue-eslint-parser/-/vue-eslint-parser-7.6.0.tgz"; - sha512 = "QXxqH8ZevBrtiZMZK0LpwaMfevQi9UL7lY6Kcp+ogWHC88AuwUPwwCIzkOUc1LR4XsYAt/F9yHXAB/QoD17QXA=="; + url = "https://registry.npmjs.org/vue-eslint-parser/-/vue-eslint-parser-7.7.1.tgz"; + sha512 = "rUGUCKH5rSGTvF9QlxYXi6MyoSATcrTbLwiCqFuFRhaSJLlDYBmsXJ08xIZoLdsUl/OfCC1ibnkj7SWHRTrStQ=="; }; }; "vue-onsenui-helper-json-1.0.2" = { @@ -62224,13 +62305,13 @@ let sha512 = "n1CfuJcJ+dynIx/fmavB6haPx37N3GZvY5HIGIselymDiSwNRC+8pAxOzoB4eVwUBJnbP3+aA8vWttrAZbgs7A=="; }; }; - "web3-utils-1.3.6" = { + "web3-utils-1.4.0" = { name = "web3-utils"; packageName = "web3-utils"; - version = "1.3.6"; + version = "1.4.0"; src = fetchurl { - url = "https://registry.npmjs.org/web3-utils/-/web3-utils-1.3.6.tgz"; - sha512 = "hHatFaQpkQgjGVER17gNx8u1qMyaXFZtM0y0XLGH1bzsjMPlkMPLRcYOrZ00rOPfTEuYFOdrpGOqZXVmGrMZRg=="; + url = "https://registry.npmjs.org/web3-utils/-/web3-utils-1.4.0.tgz"; + sha512 = "b8mEhwh/J928Xk+SQFjtqrR2EGPhpknWLcIt9aCpVPVRXiqjUGo/kpOHKz0azu9c6/onEJ9tWXZt0cVjmH0N5Q=="; }; }; "webassemblyjs-1.11.0" = { @@ -62314,13 +62395,13 @@ let sha512 = "1xllYVmA4dIvRjHzwELgW4KjIU1fW4PEuEnjsylz7k7H5HgPOctIq7W1jrt3sKH9yG5d72//XWzsHhfoWvsQVg=="; }; }; - "webpack-5.40.0" = { + "webpack-5.42.0" = { name = "webpack"; packageName = "webpack"; - version = "5.40.0"; + version = "5.42.0"; src = fetchurl { - url = "https://registry.npmjs.org/webpack/-/webpack-5.40.0.tgz"; - sha512 = "c7f5e/WWrxXWUzQqTBg54vBs5RgcAgpvKE4F4VegVgfo4x660ZxYUF2/hpMkZUnLjgytVTitjeXaN4IPlXCGIw=="; + url = "https://registry.npmjs.org/webpack/-/webpack-5.42.0.tgz"; + sha512 = "Ln8HL0F831t1x/yPB/qZEUVmZM4w9BnHZ1EQD/sAUHv8m22hthoPniWTXEzFMh/Sf84mhrahut22TX5KxWGuyQ=="; }; }; "webpack-bundle-analyzer-3.9.0" = { @@ -62512,13 +62593,13 @@ let sha512 = "OqedPIGOfsDlo31UNwYbCFMSaO9m9G/0faIHj5/dZFDMFqPTcx6UwqyOy3COEaEOg/9VsGIpdqn62W5KhoKSpg=="; }; }; - "webtorrent-1.0.1" = { + "webtorrent-1.1.0" = { name = "webtorrent"; packageName = "webtorrent"; - version = "1.0.1"; + version = "1.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/webtorrent/-/webtorrent-1.0.1.tgz"; - sha512 = "A0l8T7iRJ+Cc/TUQqPAX/7hemrEEfIimaRiEYMTPAs1TM99Yd5tfKe00jTkjmI6a0nqx7d7+r5GgXSO/uFs7GA=="; + url = "https://registry.npmjs.org/webtorrent/-/webtorrent-1.1.0.tgz"; + sha512 = "v5TS7MXmNRJqTWv7+a2wE4KGGZI/RyG4XpxWb1oJ4/CwpQaO5mJ5UA6Aj9unVbgEMLpyIy4xcHgOjE82wpyeUQ=="; }; }; "well-known-symbols-2.0.0" = { @@ -62575,13 +62656,13 @@ let sha512 = "WUu7Rg1DroM7oQvGWfOiAK21n74Gg+T4elXEQYkOhtyLeWiJFoOGLXPKI/9gzIie9CtwVLm8wtw6YJdKyxSjeg=="; }; }; - "whatwg-url-8.6.0" = { + "whatwg-url-8.7.0" = { name = "whatwg-url"; packageName = "whatwg-url"; - version = "8.6.0"; + version = "8.7.0"; src = fetchurl { - url = "https://registry.npmjs.org/whatwg-url/-/whatwg-url-8.6.0.tgz"; - sha512 = "os0KkeeqUOl7ccdDT1qqUcS4KH4tcBTSKK5Nl5WKb2lyxInIZ/CpjkqKa1Ss12mjfdcRX9mHmPPs7/SxG1Hbdw=="; + url = "https://registry.npmjs.org/whatwg-url/-/whatwg-url-8.7.0.tgz"; + sha512 = "gAojqb/m9Q8a5IV96E3fHJM70AzCkgt4uXYX2O7EmuyOnLrViCQlsEBmF9UQIu3/aeAIp2U17rtbpZWNntQqdg=="; }; }; "whatwg-url-compat-0.6.5" = { @@ -63466,6 +63547,15 @@ let sha512 = "6ezXvzOZupqKj4jUqbQ9tXuJNo+BR2gU8fFRk3XCP3e0G6WT414u5ELe6Y0vtp7kmSJ3F7YWObSNr1ESsgi4vw=="; }; }; + "ws-7.5.1" = { + name = "ws"; + packageName = "ws"; + version = "7.5.1"; + src = fetchurl { + url = "https://registry.npmjs.org/ws/-/ws-7.5.1.tgz"; + sha512 = "2c6faOUH/nhoQN6abwMloF7Iyl0ZS2E9HGtsiLrWn0zOOMWlhtDmdf/uihDt6jnuCxgtwGBNy6Onsoy2s2O2Ow=="; + }; + }; "x-default-browser-0.3.1" = { name = "x-default-browser"; packageName = "x-default-browser"; @@ -63547,13 +63637,13 @@ let sha512 = "N1XQngeqMBoj9wM4ZFadVV2MymImeiFfYD+fJrNlcVcOHsJFFQe7n3b+aBoTPwARuq2HQxukfzVpQmAk1gN4sQ=="; }; }; - "xdl-59.0.44" = { + "xdl-59.0.47" = { name = "xdl"; packageName = "xdl"; - version = "59.0.44"; + version = "59.0.47"; src = fetchurl { - url = "https://registry.npmjs.org/xdl/-/xdl-59.0.44.tgz"; - sha512 = "p9zwI5w0juiKdq5v0tIYojyqpomhMWg7C3W1tILSE48aPdkNgOlatSgAPJ9qbjBha6berKYtdOnpnfyEYOAtWQ=="; + url = "https://registry.npmjs.org/xdl/-/xdl-59.0.47.tgz"; + sha512 = "y6oA1/0RAOQ0pVl2nxRE40r/YUCPGcg+JS9mEiKDYZo6U8bIYhWx/X1gdBwvzzDOjfDZV34ls0fyTgLjeq0Xvg=="; }; }; "xenvar-0.5.1" = { @@ -63953,13 +64043,13 @@ let sha512 = "2t7FahYnGJys6DpHLhajusId7R0Pm2yTmuL0GV9+mV0ZlaLSnb2toBmppATfg5sWIhZQGlsTLoecSzya+l4EAQ=="; }; }; - "xstate-4.20.0" = { + "xstate-4.20.2" = { name = "xstate"; packageName = "xstate"; - version = "4.20.0"; + version = "4.20.2"; src = fetchurl { - url = "https://registry.npmjs.org/xstate/-/xstate-4.20.0.tgz"; - sha512 = "u5Ou1CMo/oWApasmv1TYTHgj38k69DJdTqQdBBwt+/ooNhPJQiSIKTB3Y3HvX0h5tulwfSo6xAwZgBgjRsK3LA=="; + url = "https://registry.npmjs.org/xstate/-/xstate-4.20.2.tgz"; + sha512 = "HvU+NCYffTOC1oiopNKve3IdLNRpuvNa3tv+fhM8mo9+TGCF35wIMQJON7bWG/2041ySBKw78PW2goV+Ug073w=="; }; }; "xstream-11.14.0" = { @@ -64616,30 +64706,30 @@ in "@angular/cli" = nodeEnv.buildNodePackage { name = "_at_angular_slash_cli"; packageName = "@angular/cli"; - version = "12.0.5"; + version = "12.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/@angular/cli/-/cli-12.0.5.tgz"; - sha512 = "MdgJ9DY3bWYsMFr9Xa+60gtVaYErhAE8ULGnUyI8zLMhWqrV1ZpJJ1WfP8pMQYx4HaKJIgx7wd8az7ZXAcF8hg=="; + url = "https://registry.npmjs.org/@angular/cli/-/cli-12.1.1.tgz"; + sha512 = "rQZItn3kpYEX6tH7wquAEhJuxVpW6sYKO2tSi8Suxrm+iz1RPRnfhSwS1WIEumnwpFRtH/8P+lOrScax1ldYkg=="; }; dependencies = [ - sources."@angular-devkit/architect-0.1200.5" - sources."@angular-devkit/core-12.0.5" - sources."@angular-devkit/schematics-12.0.5" + sources."@angular-devkit/architect-0.1201.1" + sources."@angular-devkit/core-12.1.1" + sources."@angular-devkit/schematics-12.1.1" sources."@npmcli/git-2.1.0" sources."@npmcli/installed-package-contents-1.0.7" sources."@npmcli/move-file-1.1.2" sources."@npmcli/node-gyp-1.0.2" sources."@npmcli/promise-spawn-1.3.2" sources."@npmcli/run-script-1.8.5" - sources."@schematics/angular-12.0.5" + sources."@schematics/angular-12.1.1" sources."@tootallnate/once-1.1.2" sources."@yarnpkg/lockfile-1.1.0" sources."abbrev-1.1.1" sources."agent-base-6.0.2" sources."agentkeepalive-4.1.4" sources."aggregate-error-3.1.0" - sources."ajv-8.2.0" - sources."ajv-formats-2.0.2" + sources."ajv-8.6.0" + sources."ajv-formats-2.1.0" sources."ansi-colors-4.1.1" sources."ansi-escapes-4.3.2" sources."ansi-regex-5.0.0" @@ -64745,7 +64835,7 @@ in sources."inflight-1.0.6" sources."inherits-2.0.4" sources."ini-2.0.0" - sources."inquirer-8.0.0" + sources."inquirer-8.1.1" sources."ip-1.1.5" sources."is-core-module-2.4.0" sources."is-docker-2.2.1" @@ -64770,7 +64860,7 @@ in sources."log-symbols-4.1.0" sources."lru-cache-6.0.0" sources."magic-string-0.25.7" - sources."make-fetch-happen-8.0.14" + sources."make-fetch-happen-9.0.3" sources."mime-db-1.48.0" sources."mime-types-2.1.31" sources."mimic-fn-2.1.0" @@ -64786,26 +64876,27 @@ in sources."mkdirp-1.0.4" sources."ms-2.1.2" sources."mute-stream-0.0.8" + sources."negotiator-0.6.2" sources."node-gyp-7.1.2" sources."nopt-5.0.0" sources."npm-bundled-1.1.2" sources."npm-install-checks-4.0.0" sources."npm-normalize-package-bin-1.0.1" - sources."npm-package-arg-8.1.2" + sources."npm-package-arg-8.1.5" sources."npm-packlist-2.2.2" sources."npm-pick-manifest-6.1.1" - sources."npm-registry-fetch-10.1.2" + sources."npm-registry-fetch-11.0.0" sources."npmlog-4.1.2" sources."number-is-nan-1.0.1" sources."oauth-sign-0.9.0" sources."object-assign-4.1.1" sources."once-1.4.0" sources."onetime-5.1.2" - sources."open-8.0.2" - sources."ora-5.4.0" + sources."open-8.2.1" + sources."ora-5.4.1" sources."os-tmpdir-1.0.2" sources."p-map-4.0.0" - sources."pacote-11.3.2" + sources."pacote-11.3.4" sources."path-is-absolute-1.0.1" sources."path-parse-1.0.7" sources."performance-now-2.1.0" @@ -65200,7 +65291,7 @@ in ]; }) sources."to-utf8-0.0.1" - sources."uglify-js-3.13.9" + sources."uglify-js-3.13.10" sources."unc-path-regex-0.1.2" sources."unique-stream-2.3.1" sources."universalify-0.1.2" @@ -65447,7 +65538,7 @@ in sources."@types/estree-0.0.46" sources."@types/json-schema-7.0.7" sources."@types/json5-0.0.29" - sources."@types/node-15.12.4" + sources."@types/node-15.14.0" sources."@types/parse-json-4.0.0" sources."@webassemblyjs/ast-1.11.0" sources."@webassemblyjs/floating-point-hex-parser-1.11.0" @@ -65466,7 +65557,7 @@ in sources."@webassemblyjs/wast-printer-1.11.0" sources."@xtuc/ieee754-1.2.0" sources."@xtuc/long-4.2.2" - sources."acorn-8.4.0" + sources."acorn-8.4.1" sources."ajv-6.12.6" sources."ajv-keywords-3.5.2" sources."ansi-colors-4.1.1" @@ -65485,7 +65576,7 @@ in sources."buffer-5.7.1" sources."buffer-from-1.1.1" sources."callsites-3.1.0" - sources."caniuse-lite-1.0.30001239" + sources."caniuse-lite-1.0.30001241" sources."chalk-3.0.0" sources."chardet-0.7.0" sources."chokidar-3.5.1" @@ -65505,7 +65596,7 @@ in sources."cross-spawn-7.0.3" sources."deepmerge-4.2.2" sources."defaults-1.0.3" - sources."electron-to-chromium-1.3.755" + sources."electron-to-chromium-1.3.765" sources."emoji-regex-8.0.0" sources."end-of-stream-1.4.4" (sources."enhanced-resolve-5.8.2" // { @@ -65573,7 +65664,7 @@ in sources."is-stream-2.0.0" sources."is-unicode-supported-0.1.0" sources."isexe-2.0.0" - (sources."jest-worker-27.0.2" // { + (sources."jest-worker-27.0.6" // { dependencies = [ sources."supports-color-8.1.1" ]; @@ -65645,7 +65736,7 @@ in sources."safer-buffer-2.1.2" sources."schema-utils-2.7.0" sources."semver-7.3.5" - sources."serialize-javascript-5.0.1" + sources."serialize-javascript-6.0.0" sources."shebang-command-2.0.0" sources."shebang-regex-3.0.0" sources."shelljs-0.8.4" @@ -65671,12 +65762,12 @@ in sources."supports-color-7.2.0" sources."symbol-observable-3.0.0" sources."tapable-1.1.3" - (sources."terser-5.7.0" // { + (sources."terser-5.7.1" // { dependencies = [ sources."commander-2.20.3" ]; }) - (sources."terser-webpack-plugin-5.1.3" // { + (sources."terser-webpack-plugin-5.1.4" // { dependencies = [ sources."schema-utils-3.0.0" sources."source-map-0.6.1" @@ -65891,7 +65982,7 @@ in sources."@types/cors-2.8.10" sources."@types/ejs-2.7.0" sources."@types/express-4.17.12" - sources."@types/express-serve-static-core-4.17.21" + sources."@types/express-serve-static-core-4.17.22" sources."@types/fs-capacitor-2.0.0" sources."@types/glob-7.1.3" sources."@types/http-assert-1.5.1" @@ -65910,7 +66001,7 @@ in sources."@types/long-4.0.1" sources."@types/mime-1.3.2" sources."@types/minimatch-3.0.4" - sources."@types/node-15.12.4" + sources."@types/node-15.14.0" sources."@types/normalize-package-data-2.4.0" sources."@types/qs-6.9.6" sources."@types/range-parser-1.2.3" @@ -65925,13 +66016,13 @@ in }) sources."@vue/cli-ui-addon-webpack-4.5.13" sources."@vue/cli-ui-addon-widgets-4.5.13" - (sources."@vue/compiler-core-3.1.2" // { + (sources."@vue/compiler-core-3.1.3" // { dependencies = [ sources."source-map-0.6.1" ]; }) - sources."@vue/compiler-dom-3.1.2" - sources."@vue/shared-3.1.2" + sources."@vue/compiler-dom-3.1.3" + sources."@vue/shared-3.1.3" sources."@wry/equality-0.1.11" sources."accepts-1.3.7" sources."aggregate-error-3.1.0" @@ -66053,7 +66144,7 @@ in sources."call-bind-1.0.2" sources."call-me-maybe-1.0.1" sources."camelcase-5.3.1" - sources."caniuse-lite-1.0.30001239" + sources."caniuse-lite-1.0.30001241" sources."caseless-0.12.0" sources."caw-2.0.1" sources."chalk-2.4.2" @@ -66080,7 +66171,6 @@ in sources."cli-cursor-2.1.0" sources."cli-spinners-2.6.0" sources."cli-width-3.0.0" - sources."clipboard-2.0.8" sources."cliui-7.0.4" sources."clone-1.0.4" sources."clone-deep-4.0.1" @@ -66111,12 +66201,12 @@ in sources."cookie-0.4.0" sources."cookie-signature-1.0.6" sources."copy-descriptor-0.1.1" - (sources."core-js-compat-3.15.1" // { + (sources."core-js-compat-3.15.2" // { dependencies = [ sources."semver-7.0.0" ]; }) - sources."core-js-pure-3.15.1" + sources."core-js-pure-3.15.2" sources."core-util-is-1.0.2" sources."cors-2.8.5" (sources."cross-spawn-6.0.5" // { @@ -66166,7 +66256,6 @@ in sources."define-properties-1.1.3" sources."define-property-2.0.2" sources."delayed-stream-1.0.0" - sources."delegate-3.2.0" sources."depd-1.1.2" sources."deprecated-decorator-0.1.6" sources."destroy-1.0.4" @@ -66183,7 +66272,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.755" + sources."electron-to-chromium-1.3.765" sources."emoji-regex-7.0.3" sources."encodeurl-1.0.2" sources."end-of-stream-1.4.4" @@ -66266,7 +66355,7 @@ in }) sources."find-up-3.0.0" sources."fkill-6.2.0" - sources."flow-parser-0.153.0" + sources."flow-parser-0.154.0" sources."for-each-0.3.3" sources."for-in-1.0.2" sources."forever-agent-0.6.1" @@ -66308,7 +66397,6 @@ in sources."slash-2.0.0" ]; }) - sources."good-listener-1.2.2" (sources."got-8.3.2" // { dependencies = [ sources."get-stream-3.0.0" @@ -66319,7 +66407,7 @@ in sources."graphql-14.7.0" sources."graphql-extensions-0.15.0" sources."graphql-subscriptions-1.2.1" - (sources."graphql-tag-2.12.4" // { + (sources."graphql-tag-2.12.5" // { dependencies = [ sources."tslib-2.3.0" ]; @@ -66507,7 +66595,7 @@ in sources."nice-try-1.0.5" sources."node-dir-0.1.17" sources."node-fetch-2.6.1" - sources."node-ipc-9.1.4" + sources."node-ipc-9.2.0" sources."node-modules-regexp-1.0.0" (sources."node-notifier-9.0.1" // { dependencies = [ @@ -66608,7 +66696,7 @@ in }) sources."posix-character-classes-0.1.1" sources."prepend-http-2.0.0" - sources."prismjs-1.23.0" + sources."prismjs-1.24.0" sources."private-0.1.8" sources."process-exists-3.1.0" sources."process-nextick-args-2.0.1" @@ -66680,7 +66768,6 @@ in sources."sax-1.2.4" sources."sec-1.0.0" sources."seek-bzip-1.0.6" - sources."select-1.1.2" sources."semver-6.3.0" (sources."send-0.17.1" // { dependencies = [ @@ -66834,7 +66921,6 @@ in sources."through-2.3.8" sources."through2-2.0.5" sources."timed-out-4.0.1" - sources."tiny-emitter-2.1.0" sources."tmp-0.0.33" sources."to-buffer-1.1.1" sources."to-fast-properties-2.0.0" @@ -66899,7 +66985,7 @@ in sources."array-union-2.1.0" sources."braces-3.0.2" sources."dir-glob-3.0.1" - sources."fast-glob-3.2.5" + sources."fast-glob-3.2.6" sources."fill-range-7.0.1" sources."glob-parent-5.1.2" sources."globby-11.0.4" @@ -66926,7 +67012,7 @@ in }) sources."wrappy-1.0.2" sources."write-file-atomic-2.4.3" - sources."ws-7.5.0" + sources."ws-7.5.1" sources."xml2js-0.4.23" sources."xmlbuilder-11.0.1" sources."xss-1.0.9" @@ -67152,10 +67238,10 @@ in alloy = nodeEnv.buildNodePackage { name = "alloy"; packageName = "alloy"; - version = "1.16.2"; + version = "1.16.3"; src = fetchurl { - url = "https://registry.npmjs.org/alloy/-/alloy-1.16.2.tgz"; - sha512 = "9/MIehoAx0KtmGIlH408LVU99ms+JycCCLY+DI1CvI8HwwRxS1d5clbKj/7JmCPm5cRYnD7798x4JDNMVNaSIA=="; + url = "https://registry.npmjs.org/alloy/-/alloy-1.16.3.tgz"; + sha512 = "Y4pSzPpJHovMA6uqpRTztraKFtchQm9rPbYd9s6UkEuqpYs45hFSY4j+ezkvGxU6Hvn2L6OLc+5dlaOr+P+QKQ=="; }; dependencies = [ sources."@babel/code-frame-7.14.5" @@ -67196,18 +67282,18 @@ in sources."balanced-match-1.0.2" sources."brace-expansion-1.1.11" sources."browserslist-4.16.6" - sources."caniuse-lite-1.0.30001239" + sources."caniuse-lite-1.0.30001241" sources."chalk-2.4.2" sources."color-convert-1.9.3" sources."color-name-1.1.3" sources."colorette-1.2.2" sources."colors-1.4.0" - sources."commander-7.2.0" + sources."commander-8.0.0" sources."concat-map-0.0.1" sources."convert-source-map-1.8.0" sources."debug-4.3.2" sources."ejs-3.1.6" - sources."electron-to-chromium-1.3.755" + sources."electron-to-chromium-1.3.765" sources."ensure-posix-path-1.1.1" sources."escalade-3.1.1" sources."escape-string-regexp-1.0.5" @@ -67301,7 +67387,7 @@ in dependencies = [ sources."@types/glob-7.1.3" sources."@types/minimatch-3.0.4" - sources."@types/node-15.12.4" + sources."@types/node-15.14.0" sources."balanced-match-1.0.2" sources."brace-expansion-1.1.11" sources."chromium-pickle-js-0.2.0" @@ -67329,25 +67415,21 @@ in aws-azure-login = nodeEnv.buildNodePackage { name = "aws-azure-login"; packageName = "aws-azure-login"; - version = "3.3.0"; + version = "3.4.0"; src = fetchurl { - url = "https://registry.npmjs.org/aws-azure-login/-/aws-azure-login-3.3.0.tgz"; - sha512 = "gwcHKwovQOpVY4F87M46ppqop2/KXgvJGFqZDZvtGALvFihP1olhna5lnJk/Gbl5topHZj8oXefNoWhj/L19aA=="; + url = "https://registry.npmjs.org/aws-azure-login/-/aws-azure-login-3.4.0.tgz"; + sha512 = "7PXkWdq+3NL7hUmLOV1yoO6OnVNcT54UVtC6WT1gE9C9dYGG0bEL9nsZz8qiV75hvX1E6fABjw1/Q7KaXgvHfg=="; }; dependencies = [ sources."@tootallnate/once-1.1.2" - sources."@types/node-15.12.4" + sources."@types/node-15.14.0" sources."@types/yauzl-2.9.1" sources."agent-base-6.0.2" sources."ansi-escapes-4.3.2" sources."ansi-regex-5.0.0" sources."ansi-styles-4.3.0" - (sources."ast-types-0.13.4" // { - dependencies = [ - sources."tslib-2.3.0" - ]; - }) - (sources."aws-sdk-2.932.0" // { + sources."ast-types-0.13.4" + (sources."aws-sdk-2.938.0" // { dependencies = [ sources."uuid-3.3.2" ]; @@ -67357,8 +67439,6 @@ in (sources."bl-4.1.0" // { dependencies = [ sources."buffer-5.7.1" - sources."readable-stream-3.6.0" - sources."string_decoder-1.3.0" ]; }) sources."bluebird-3.7.2" @@ -67369,31 +67449,34 @@ in sources."bytes-3.1.0" sources."chalk-4.1.1" sources."chardet-0.7.0" - sources."cheerio-1.0.0-rc.5" - sources."cheerio-select-tmp-0.1.1" + sources."cheerio-1.0.0-rc.10" + sources."cheerio-select-1.5.0" sources."chownr-1.1.4" sources."cli-cursor-3.1.0" + sources."cli-spinners-2.6.0" sources."cli-width-3.0.0" + sources."clone-1.0.4" sources."color-convert-2.0.1" sources."color-name-1.1.4" - sources."commander-6.2.1" + sources."commander-8.0.0" sources."concat-map-0.0.1" sources."core-util-is-1.0.2" - sources."css-select-3.1.2" - sources."css-what-4.0.0" + sources."css-select-4.1.3" + sources."css-what-5.0.1" sources."data-uri-to-buffer-3.0.1" sources."debug-4.3.2" sources."deep-is-0.1.3" + sources."defaults-1.0.3" sources."degenerator-2.2.0" sources."depd-1.1.2" - sources."devtools-protocol-0.0.854822" - sources."dom-serializer-1.2.0" + sources."devtools-protocol-0.0.883894" + sources."dom-serializer-1.3.2" sources."domelementtype-2.2.0" sources."domhandler-4.2.0" sources."domutils-2.7.0" sources."emoji-regex-8.0.0" sources."end-of-stream-1.4.4" - sources."entities-2.1.0" + sources."entities-2.2.0" sources."escape-string-regexp-1.0.5" sources."escodegen-1.14.3" sources."esprima-4.0.1" @@ -67410,7 +67493,13 @@ in sources."fs-constants-1.0.0" sources."fs-extra-8.1.0" sources."fs.realpath-1.0.0" - sources."ftp-0.3.10" + (sources."ftp-0.3.10" // { + dependencies = [ + sources."isarray-0.0.1" + sources."readable-stream-1.1.14" + sources."string_decoder-0.10.31" + ]; + }) sources."get-stream-5.2.0" sources."get-uri-3.0.2" sources."glob-7.1.7" @@ -67425,20 +67514,23 @@ in sources."inflight-1.0.6" sources."inherits-2.0.4" sources."ini-2.0.0" - sources."inquirer-7.3.3" + sources."inquirer-8.1.1" sources."ip-1.1.5" sources."is-fullwidth-code-point-3.0.0" + sources."is-interactive-1.0.0" + sources."is-unicode-supported-0.1.0" sources."isarray-1.0.0" sources."jmespath-0.15.0" sources."jsonfile-4.0.0" sources."levn-0.3.0" sources."locate-path-5.0.0" sources."lodash-4.17.21" + sources."log-symbols-4.1.0" sources."lru-cache-5.1.1" sources."mimic-fn-2.1.0" sources."minimatch-3.0.4" + sources."minimist-1.2.5" sources."mkdirp-1.0.4" - sources."mkdirp-classic-0.5.3" sources."ms-2.1.2" sources."mute-stream-0.0.8" sources."netmask-2.0.2" @@ -67447,6 +67539,7 @@ in sources."once-1.4.0" sources."onetime-5.1.2" sources."optionator-0.8.3" + sources."ora-5.4.1" sources."os-tmpdir-1.0.2" sources."p-limit-2.3.0" sources."p-locate-4.1.0" @@ -67460,23 +67553,27 @@ in sources."pend-1.2.0" sources."pkg-dir-4.2.0" sources."prelude-ls-1.1.2" - sources."progress-2.0.3" + sources."progress-2.0.1" sources."proxy-agent-4.0.1" sources."proxy-from-env-1.1.0" sources."pump-3.0.0" sources."punycode-1.3.2" - sources."puppeteer-8.0.0" - sources."querystring-0.2.0" - sources."raw-body-2.4.1" - (sources."readable-stream-1.1.14" // { + (sources."puppeteer-10.1.0" // { dependencies = [ - sources."isarray-0.0.1" + sources."debug-4.3.1" ]; }) + sources."querystring-0.2.0" + sources."raw-body-2.4.1" + sources."readable-stream-3.6.0" sources."restore-cursor-3.1.0" sources."rimraf-3.0.2" sources."run-async-2.4.1" - sources."rxjs-6.6.7" + (sources."rxjs-6.6.7" // { + dependencies = [ + sources."tslib-1.14.1" + ]; + }) sources."safe-buffer-5.2.1" sources."safer-buffer-2.1.2" sources."sax-1.2.1" @@ -67488,23 +67585,22 @@ in sources."source-map-0.6.1" sources."statuses-1.5.0" sources."string-width-4.2.2" - sources."string_decoder-0.10.31" + sources."string_decoder-1.3.0" sources."strip-ansi-6.0.0" sources."supports-color-7.2.0" - sources."tar-fs-2.1.1" - (sources."tar-stream-2.2.0" // { + (sources."tar-fs-2.0.0" // { dependencies = [ - sources."readable-stream-3.6.0" - sources."string_decoder-1.3.0" + sources."mkdirp-0.5.5" ]; }) + sources."tar-stream-2.2.0" sources."through-2.3.8" sources."tmp-0.0.33" sources."toidentifier-1.0.0" - sources."tslib-1.14.1" + sources."tslib-2.3.0" sources."type-check-0.3.2" sources."type-fest-0.21.3" - (sources."unbzip2-stream-1.4.3" // { + (sources."unbzip2-stream-1.3.3" // { dependencies = [ sources."buffer-5.7.1" ]; @@ -67514,9 +67610,10 @@ in sources."url-0.10.3" sources."util-deprecate-1.0.2" sources."uuid-8.3.2" + sources."wcwidth-1.0.1" sources."word-wrap-1.2.3" sources."wrappy-1.0.2" - sources."ws-7.5.0" + sources."ws-7.4.6" sources."xml2js-0.4.19" sources."xmlbuilder-9.0.7" sources."xregexp-2.0.0" @@ -67536,10 +67633,10 @@ in balanceofsatoshis = nodeEnv.buildNodePackage { name = "balanceofsatoshis"; packageName = "balanceofsatoshis"; - version = "10.1.0"; + version = "10.4.3"; src = fetchurl { - url = "https://registry.npmjs.org/balanceofsatoshis/-/balanceofsatoshis-10.1.0.tgz"; - sha512 = "ZKHOfZkyXhevLUbQMijz6PEGBZuBdeUS6oqdqrmeYlOB2xZPC/KxCPmKTD7igbq7eD2E/XixtzpHub8bQnxRIg=="; + url = "https://registry.npmjs.org/balanceofsatoshis/-/balanceofsatoshis-10.4.3.tgz"; + sha512 = "mphALvASQBcm5CEaLP4BSo+/JFQ9L8i0Hmr7az49RnTFFqeZLuLPx+eac9cTA24sbSK3I9sRtbLYQv59dW/1VQ=="; }; dependencies = [ sources."@alexbosworth/html2unicode-1.1.5" @@ -67552,7 +67649,7 @@ in sources."@cto.af/textdecoder-0.0.0" (sources."@grpc/grpc-js-1.3.2" // { dependencies = [ - sources."@types/node-15.12.4" + sources."@types/node-15.14.0" ]; }) sources."@grpc/proto-loader-0.6.2" @@ -67575,7 +67672,7 @@ in sources."@types/caseless-0.12.2" sources."@types/connect-3.4.34" sources."@types/express-4.17.12" - sources."@types/express-serve-static-core-4.17.21" + sources."@types/express-serve-static-core-4.17.22" sources."@types/long-4.0.1" sources."@types/mime-1.3.2" sources."@types/node-10.12.18" @@ -67812,7 +67909,9 @@ in sources."global-dirs-3.0.0" (sources."goldengate-10.1.0" // { dependencies = [ + sources."bech32-2.0.0" sources."bn.js-5.2.0" + sources."invoices-1.2.1" sources."ln-service-51.8.2" ]; }) @@ -67874,7 +67973,7 @@ in sources."tmp-0.0.33" ]; }) - (sources."invoices-1.2.1" // { + (sources."invoices-2.0.0" // { dependencies = [ sources."bech32-2.0.0" sources."bn.js-5.2.0" @@ -67923,22 +68022,20 @@ in (sources."lightning-3.3.9" // { dependencies = [ sources."@types/node-15.6.1" + sources."bech32-2.0.0" sources."bn.js-5.2.0" + sources."invoices-1.2.1" ]; }) - (sources."ln-accounting-4.3.0" // { - dependencies = [ - sources."bn.js-5.2.0" - sources."goldengate-10.0.6" - sources."ln-service-51.8.2" - ]; - }) - (sources."ln-service-51.8.4" // { + sources."ln-accounting-4.3.1" + (sources."ln-service-51.8.5" // { dependencies = [ - sources."@types/node-15.12.4" + sources."@grpc/grpc-js-1.3.4" + sources."@grpc/proto-loader-0.6.3" + sources."@types/node-15.12.5" sources."@types/ws-7.4.5" sources."bn.js-5.2.0" - sources."lightning-3.3.11" + sources."lightning-3.3.12" sources."ws-7.5.0" ]; }) @@ -67964,11 +68061,16 @@ in sources."psbt-1.1.8" ]; }) - (sources."ln-telegram-3.2.5" // { + (sources."ln-telegram-3.2.6" // { dependencies = [ + sources."@types/node-15.12.4" + sources."@types/ws-7.4.5" + sources."bech32-2.0.0" sources."bn.js-5.2.0" - sources."goldengate-10.0.6" - sources."ln-service-51.8.2" + sources."invoices-1.2.1" + sources."lightning-3.3.11" + sources."ln-service-51.8.4" + sources."ws-7.5.0" ]; }) sources."lodash-4.17.21" @@ -67991,6 +68093,7 @@ in sources."long-4.0.0" sources."lowercase-keys-1.0.1" sources."lru-cache-6.0.0" + sources."luxon-1.27.0" (sources."macaroon-3.0.4" // { dependencies = [ sources."tweetnacl-1.0.3" @@ -68054,7 +68157,18 @@ in sources."p-cancelable-1.1.0" sources."p-timeout-4.1.0" sources."package-json-6.5.0" - sources."paid-services-2.0.0" + (sources."paid-services-2.0.0" // { + dependencies = [ + sources."@types/node-15.12.4" + sources."@types/ws-7.4.5" + sources."bech32-2.0.0" + sources."bn.js-5.2.0" + sources."invoices-1.2.1" + sources."lightning-3.3.11" + sources."ln-service-51.8.4" + sources."ws-7.5.0" + ]; + }) sources."parseurl-1.3.3" sources."path-to-regexp-0.1.7" sources."performance-now-2.1.0" @@ -68064,13 +68178,16 @@ in sources."prettyjson-1.2.1" (sources."probing-1.3.6" // { dependencies = [ + sources."bech32-2.0.0" + sources."bn.js-5.2.0" + sources."invoices-1.2.1" sources."ln-service-51.8.2" ]; }) sources."process-nextick-args-2.0.1" (sources."protobufjs-6.11.2" // { dependencies = [ - sources."@types/node-15.12.4" + sources."@types/node-15.14.0" ]; }) sources."proxy-addr-2.0.7" @@ -68181,7 +68298,7 @@ in sources."typedarray-0.0.6" sources."typedarray-to-buffer-3.1.5" sources."typeforce-1.18.0" - sources."typegram-3.3.1" + sources."typegram-3.4.0" sources."unique-string-2.0.0" sources."unpipe-1.0.0" (sources."update-notifier-5.1.0" // { @@ -68904,7 +69021,7 @@ in sources."map-obj-1.0.1" ]; }) - sources."decimal.js-10.3.0" + sources."decimal.js-10.3.1" sources."delayed-stream-1.0.0" sources."denque-1.5.0" sources."depd-1.1.2" @@ -69019,7 +69136,7 @@ in sources."lodash-4.17.21" sources."lru-cache-6.0.0" sources."map-obj-4.2.1" - (sources."markdown-it-12.0.6" // { + (sources."markdown-it-12.1.0" // { dependencies = [ sources."argparse-2.0.1" sources."entities-2.1.0" @@ -69247,7 +69364,7 @@ in sources."@protobufjs/pool-1.1.0" sources."@protobufjs/utf8-1.1.0" sources."@types/long-4.0.1" - sources."@types/node-15.12.4" + sources."@types/node-15.14.0" sources."addr-to-ip-port-1.5.1" sources."airplay-js-0.2.16" sources."ajv-6.12.6" @@ -69309,7 +69426,7 @@ in sources."co-3.1.0" sources."codepage-1.4.0" sources."combined-stream-1.0.8" - sources."commander-7.2.0" + sources."commander-8.0.0" sources."compact2string-1.4.1" sources."concat-map-0.0.1" (sources."concat-stream-2.0.0" // { @@ -69681,7 +69798,7 @@ in sources."color-name-1.1.4" sources."colors-1.4.0" sources."commonmark-0.29.3" - sources."constructs-3.3.87" + sources."constructs-3.3.94" sources."date-format-3.0.0" sources."debug-4.3.2" sources."decamelize-5.0.0" @@ -69754,13 +69871,13 @@ in sources."yargs-16.2.0" ]; }) - (sources."jsii-srcmak-0.1.290" // { + (sources."jsii-srcmak-0.1.297" // { dependencies = [ sources."fs-extra-9.1.0" ]; }) sources."json-schema-0.3.0" - sources."json2jsii-0.1.257" + sources."json2jsii-0.1.264" sources."jsonfile-6.1.0" sources."jsonschema-1.4.0" sources."locate-path-5.0.0" @@ -69796,7 +69913,7 @@ in sources."snake-case-3.0.4" sources."sort-json-2.0.0" sources."spdx-license-list-6.4.0" - sources."sscaff-1.2.10" + sources."sscaff-1.2.17" (sources."streamroller-2.2.4" // { dependencies = [ sources."date-format-2.1.0" @@ -69911,7 +70028,7 @@ in sources."commonmark-0.29.3" sources."compress-commons-4.1.1" sources."concat-map-0.0.1" - sources."constructs-3.3.87" + sources."constructs-3.3.94" sources."convert-to-spaces-1.0.2" sources."core-util-is-1.0.2" sources."crc-32-1.2.0" @@ -70030,7 +70147,7 @@ in sources."yargs-16.2.0" ]; }) - (sources."jsii-srcmak-0.1.290" // { + (sources."jsii-srcmak-0.1.297" // { dependencies = [ sources."fs-extra-9.1.0" sources."jsonfile-6.1.0" @@ -70113,7 +70230,7 @@ in sources."slice-ansi-3.0.0" sources."sort-json-2.0.0" sources."spdx-license-list-6.4.0" - sources."sscaff-1.2.10" + sources."sscaff-1.2.17" sources."stack-utils-2.0.3" sources."stream-buffers-3.0.2" (sources."streamroller-2.2.4" // { @@ -70152,7 +70269,7 @@ in sources."widest-line-3.1.0" sources."wrap-ansi-6.2.0" sources."wrappy-1.0.2" - sources."ws-7.5.0" + sources."ws-7.5.1" sources."xmlbuilder-15.1.1" sources."xmldom-0.6.0" sources."y18n-5.0.8" @@ -70191,7 +70308,7 @@ in dependencies = [ sources."balanced-match-1.0.2" sources."brace-expansion-1.1.11" - sources."clean-css-5.1.2" + sources."clean-css-5.1.3" sources."commander-7.2.0" sources."concat-map-0.0.1" sources."fs.realpath-1.0.0" @@ -70571,7 +70688,7 @@ in sha512 = "7SHQYzpRKPrpaLcTm1UUk1zu9VvFEJKFqxwDIuqv/CL0cBTtEvlsfpVh9DOaMHlZPu8U8Lgyf04bHV/sFS1zJw=="; }; dependencies = [ - sources."typescript-4.3.4" + sources."typescript-4.3.5" ]; buildInputs = globalBuildInputs; meta = { @@ -70659,7 +70776,7 @@ in sources."ms-2.0.0" sources."request-light-0.4.0" sources."vscode-json-languageserver-1.3.4" - (sources."vscode-json-languageservice-4.1.4" // { + (sources."vscode-json-languageservice-4.1.5" // { dependencies = [ sources."vscode-nls-5.0.0" ]; @@ -70926,10 +71043,10 @@ in coc-prettier = nodeEnv.buildNodePackage { name = "coc-prettier"; packageName = "coc-prettier"; - version = "1.1.23"; + version = "1.1.24"; src = fetchurl { - url = "https://registry.npmjs.org/coc-prettier/-/coc-prettier-1.1.23.tgz"; - sha512 = "9tjbN4O13DXlrNaZWtXozthLSW0LE+YjmBZf4LDdrpbfmzqLDvncDtOtqcRCd9LStoLPY7pv2o4Tucb2IrHjMw=="; + url = "https://registry.npmjs.org/coc-prettier/-/coc-prettier-1.1.24.tgz"; + sha512 = "nVsvnTFI02RBEs+O7geMsVdhoDQDW/b7GQN9GJRiLbyPS7LTArKf1G6dkX6gQgLBR5lOYQWiuw54iIyMgqc29Q=="; }; dependencies = [ sources."@babel/code-frame-7.12.11" @@ -71010,7 +71127,7 @@ in sources."callsites-3.1.0" sources."camelcase-2.1.1" sources."camelcase-keys-2.1.0" - sources."caniuse-lite-1.0.30001239" + sources."caniuse-lite-1.0.30001241" sources."capture-stack-trace-1.0.1" sources."ccount-1.1.0" (sources."chalk-4.1.1" // { @@ -71072,7 +71189,7 @@ in ]; }) sources."copy-descriptor-0.1.1" - sources."core-js-3.15.1" + sources."core-js-3.15.2" sources."cosmiconfig-3.1.0" sources."create-error-class-3.0.2" sources."cross-spawn-7.0.3" @@ -71108,7 +71225,7 @@ in sources."domutils-1.7.0" sources."dot-prop-5.3.0" sources."duplexer3-0.1.4" - sources."electron-to-chromium-1.3.755" + sources."electron-to-chromium-1.3.765" sources."emoji-regex-8.0.0" sources."end-of-stream-1.4.4" sources."enquirer-2.3.6" @@ -71227,7 +71344,7 @@ in sources."fill-range-2.2.4" sources."find-up-2.1.0" sources."flat-cache-3.0.4" - sources."flatted-3.1.1" + sources."flatted-3.2.0" sources."for-in-1.0.2" sources."for-own-0.1.5" sources."fragment-cache-0.2.1" @@ -71564,7 +71681,7 @@ in sources."prelude-ls-1.2.1" sources."prepend-http-1.0.4" sources."preserve-0.2.0" - sources."prettier-2.3.1" + sources."prettier-2.3.2" sources."prettier-eslint-12.0.0" (sources."prettier-stylelint-0.4.2" // { dependencies = [ @@ -71907,13 +72024,13 @@ in coc-pyright = nodeEnv.buildNodePackage { name = "coc-pyright"; packageName = "coc-pyright"; - version = "1.1.150"; + version = "1.1.154"; src = fetchurl { - url = "https://registry.npmjs.org/coc-pyright/-/coc-pyright-1.1.150.tgz"; - sha512 = "+dWSYM9AfBsYeOclQNmuHcw9aKWwL6XICmPm64N9peWE+oXqMOAShaH5xO+JV+r88R0wTN/LJaEwGHlkxJD2XA=="; + url = "https://registry.npmjs.org/coc-pyright/-/coc-pyright-1.1.154.tgz"; + sha512 = "SUaGghNwGq4dD6DFWbmsMF0eqwydbO/OKknCmjx0kvLXniIkEkQUnfS3wc3dm3MIWBNYsZ2x3fM0J7a83WhHgA=="; }; dependencies = [ - sources."pyright-1.1.151" + sources."pyright-1.1.154" ]; buildInputs = globalBuildInputs; meta = { @@ -71987,10 +72104,10 @@ in coc-rust-analyzer = nodeEnv.buildNodePackage { name = "coc-rust-analyzer"; packageName = "coc-rust-analyzer"; - version = "0.46.2"; + version = "0.46.3"; src = fetchurl { - url = "https://registry.npmjs.org/coc-rust-analyzer/-/coc-rust-analyzer-0.46.2.tgz"; - sha512 = "uEFyQAaWQ60qY2q74jXn8Wk73QMekHVSRKuBP178uVV/xAhyd24psr+pNrdZxXVZGBRwuRLgHFd+N5YhikOBMw=="; + url = "https://registry.npmjs.org/coc-rust-analyzer/-/coc-rust-analyzer-0.46.3.tgz"; + sha512 = "eaHTqrFLwtTgjOMSiVIc3Z4I575LZ0xzY6rvrMEKmxWiRHB8c26LzrhKN8dbK+An6XxryUceijBMrfz4dsiOVw=="; }; buildInputs = globalBuildInputs; meta = { @@ -72023,10 +72140,10 @@ in coc-snippets = nodeEnv.buildNodePackage { name = "coc-snippets"; packageName = "coc-snippets"; - version = "2.4.2"; + version = "2.4.3"; src = fetchurl { - url = "https://registry.npmjs.org/coc-snippets/-/coc-snippets-2.4.2.tgz"; - sha512 = "e+gsnzl//ilZNhfdVNkzI3lvJoMdB/aLVrMbaecimJG+gabVI/MvjmpsvrOLu9KFkBmECFjpM3T2Hxd6DuvY2Q=="; + url = "https://registry.npmjs.org/coc-snippets/-/coc-snippets-2.4.3.tgz"; + sha512 = "1vIMSDI8zKbr7J/jD4Ey9EFfYnipRaYzbaY9WZHnStEb0H2M/obIjwl5k9gRFGfJV00vB7zDpHp19FXLXVqzhQ=="; }; buildInputs = globalBuildInputs; meta = { @@ -72119,7 +72236,7 @@ in sources."callsites-3.1.0" sources."camelcase-5.3.1" sources."camelcase-keys-6.2.2" - sources."caniuse-lite-1.0.30001239" + sources."caniuse-lite-1.0.30001241" (sources."chalk-4.1.1" // { dependencies = [ sources."ansi-styles-4.3.0" @@ -72157,7 +72274,7 @@ in sources."domelementtype-1.3.1" sources."domhandler-2.4.2" sources."domutils-1.7.0" - sources."electron-to-chromium-1.3.755" + sources."electron-to-chromium-1.3.765" sources."emoji-regex-8.0.0" sources."entities-1.1.2" sources."error-ex-1.3.2" @@ -72167,14 +72284,14 @@ in sources."extend-3.0.2" sources."fast-deep-equal-3.1.3" sources."fast-diff-1.2.0" - sources."fast-glob-3.2.5" + sources."fast-glob-3.2.6" sources."fastest-levenshtein-1.0.12" sources."fastq-1.11.0" sources."file-entry-cache-6.0.1" sources."fill-range-7.0.1" sources."find-up-4.1.0" sources."flat-cache-3.0.4" - sources."flatted-3.1.1" + sources."flatted-3.2.0" sources."fs.realpath-1.0.0" sources."function-bind-1.1.1" sources."gensync-1.0.0-beta.2" @@ -72362,7 +72479,7 @@ in sources."trough-1.0.5" sources."type-fest-0.18.1" sources."typedarray-to-buffer-3.1.5" - sources."unified-9.2.1" + sources."unified-9.2.2" sources."unist-util-find-all-after-3.0.2" sources."unist-util-is-4.1.0" sources."unist-util-stringify-position-2.0.3" @@ -72537,7 +72654,7 @@ in sha512 = "qkVsa46XLmOCmohpQhhz1SG9vUQN/54b/zZsDI5fnuBM49GX9f+Aya8m9ZidAzuwFKV+ostgvdWaB+GeQPPNPQ=="; }; dependencies = [ - sources."typescript-4.3.4" + sources."typescript-4.3.5" ]; buildInputs = globalBuildInputs; meta = { @@ -72601,7 +72718,7 @@ in sources."enquirer-2.3.6" sources."escape-string-regexp-4.0.0" sources."eslint-7.29.0" - sources."eslint-plugin-vue-7.11.1" + sources."eslint-plugin-vue-7.12.1" sources."eslint-scope-5.1.1" (sources."eslint-utils-2.1.0" // { dependencies = [ @@ -72632,7 +72749,7 @@ in sources."fast-levenshtein-2.0.6" sources."file-entry-cache-6.0.1" sources."flat-cache-3.0.4" - sources."flatted-3.1.1" + sources."flatted-3.2.0" sources."fs.realpath-1.0.0" sources."function-bind-1.1.1" sources."functional-red-black-tree-1.0.1" @@ -72673,7 +72790,7 @@ in sources."path-key-3.1.1" sources."path-parse-1.0.7" sources."prelude-ls-1.2.1" - sources."prettier-2.3.1" + sources."prettier-2.3.2" sources."progress-2.0.3" sources."punycode-2.1.1" sources."regexpp-3.2.0" @@ -72714,14 +72831,19 @@ in sources."tsutils-2.29.0" sources."type-check-0.4.0" sources."type-fest-0.20.2" - sources."typescript-4.3.4" + sources."typescript-4.3.5" sources."uri-js-4.4.1" sources."v8-compile-cache-2.3.0" sources."vls-0.7.4" - (sources."vue-eslint-parser-7.6.0" // { + (sources."vue-eslint-parser-7.7.1" // { dependencies = [ + sources."acorn-8.4.1" sources."eslint-visitor-keys-1.3.0" - sources."espree-6.2.1" + (sources."espree-8.0.0" // { + dependencies = [ + sources."eslint-visitor-keys-3.0.0" + ]; + }) ]; }) sources."which-2.0.2" @@ -73191,7 +73313,7 @@ in }) sources."extsprintf-1.4.0" sources."fast-deep-equal-3.1.3" - sources."fast-glob-3.2.5" + sources."fast-glob-3.2.6" sources."fast-json-parse-1.0.3" sources."fast-json-stable-stringify-2.1.0" sources."fastq-1.11.0" @@ -73619,7 +73741,7 @@ in sources."@types/glob-7.1.3" sources."@types/minimatch-3.0.4" sources."@types/minimist-1.2.1" - sources."@types/node-15.12.4" + sources."@types/node-15.14.0" sources."@types/normalize-package-data-2.4.0" sources."aggregate-error-3.1.0" sources."ansi-styles-3.2.1" @@ -73990,7 +74112,7 @@ in sources."@cycle/run-3.4.0" sources."@cycle/time-0.10.1" sources."@types/cookiejar-2.1.2" - sources."@types/node-15.12.4" + sources."@types/node-15.14.0" sources."@types/superagent-3.8.2" sources."ansi-escapes-3.2.0" sources."ansi-regex-2.1.1" @@ -74905,7 +75027,7 @@ in sources."use-3.1.1" sources."util-deprecate-1.0.2" sources."utile-0.3.0" - (sources."utp-native-2.5.1" // { + (sources."utp-native-2.5.3" // { dependencies = [ sources."node-gyp-build-4.2.3" sources."readable-stream-3.6.0" @@ -74985,7 +75107,7 @@ in sources."crypto-random-string-2.0.0" sources."del-6.0.0" sources."dir-glob-3.0.1" - sources."fast-glob-3.2.5" + sources."fast-glob-3.2.6" sources."fastq-1.11.0" sources."fill-range-7.0.1" sources."find-up-4.1.0" @@ -75304,7 +75426,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-15.12.4" + sources."@types/node-15.14.0" sources."@types/responselike-1.0.0" sources."@types/yauzl-2.9.1" sources."abbrev-1.1.1" @@ -75380,7 +75502,7 @@ in sources."concat-map-0.0.1" sources."config-chain-1.1.13" sources."console-control-strings-1.1.0" - sources."core-js-3.15.1" + sources."core-js-3.15.2" sources."core-util-is-1.0.2" sources."cross-spawn-7.0.3" sources."currently-unhandled-0.4.1" @@ -75936,7 +76058,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-15.12.4" + sources."@types/node-15.14.0" sources."@types/normalize-package-data-2.4.0" sources."@types/responselike-1.0.0" sources."@types/yoga-layout-1.9.2" @@ -75971,7 +76093,7 @@ in sources."quick-lru-4.0.1" ]; }) - sources."caniuse-lite-1.0.30001239" + sources."caniuse-lite-1.0.30001241" sources."chalk-2.4.2" sources."ci-info-2.0.0" sources."cli-boxes-2.2.1" @@ -76008,7 +76130,7 @@ in }) sources."defer-to-connect-2.0.1" sources."dot-prop-5.3.0" - sources."electron-to-chromium-1.3.755" + sources."electron-to-chromium-1.3.765" sources."emoji-regex-8.0.0" sources."emojilib-2.4.0" sources."end-of-stream-1.4.4" @@ -76219,7 +76341,7 @@ in ]; }) sources."wrappy-1.0.2" - sources."ws-7.5.0" + sources."ws-7.5.1" sources."yallist-4.0.0" sources."yargs-parser-18.1.3" sources."yoga-layout-prebuilt-1.10.0" @@ -76283,7 +76405,7 @@ in sources."normalize-path-2.1.1" ]; }) - sources."@microsoft/load-themed-styles-1.10.185" + sources."@microsoft/load-themed-styles-1.10.190" sources."@nodelib/fs.scandir-2.1.5" sources."@nodelib/fs.stat-2.0.5" sources."@nodelib/fs.walk-1.2.7" @@ -76301,7 +76423,7 @@ in sources."@types/connect-3.4.34" sources."@types/engine.io-3.1.5" sources."@types/express-4.17.8" - sources."@types/express-serve-static-core-4.17.21" + sources."@types/express-serve-static-core-4.17.22" sources."@types/fancy-log-1.3.0" sources."@types/glob-7.1.3" sources."@types/hls.js-0.13.1" @@ -76816,7 +76938,7 @@ in sources."extsprintf-1.3.0" sources."fancy-log-1.3.3" sources."fast-deep-equal-3.1.3" - sources."fast-glob-3.2.5" + sources."fast-glob-3.2.6" sources."fast-json-stable-stringify-2.1.0" sources."fast-levenshtein-1.1.4" sources."fastq-1.11.0" @@ -77722,7 +77844,7 @@ in sources."yallist-3.1.1" ]; }) - (sources."terser-5.7.0" // { + (sources."terser-5.7.1" // { dependencies = [ sources."source-map-0.7.3" ]; @@ -77907,7 +78029,7 @@ in ]; }) sources."wrappy-1.0.2" - sources."ws-7.5.0" + sources."ws-7.5.1" sources."xmlhttprequest-ssl-1.5.5" sources."xtend-4.0.2" sources."y18n-3.2.2" @@ -78028,7 +78150,7 @@ in sources."fast-levenshtein-2.0.6" sources."file-entry-cache-6.0.1" sources."flat-cache-3.0.4" - sources."flatted-3.1.1" + sources."flatted-3.2.0" sources."fs.realpath-1.0.0" sources."functional-red-black-tree-1.0.1" sources."glob-7.1.7" @@ -78190,7 +78312,7 @@ in sources."fast-levenshtein-2.0.6" sources."file-entry-cache-6.0.1" sources."flat-cache-3.0.4" - sources."flatted-3.1.1" + sources."flatted-3.2.0" sources."fs.realpath-1.0.0" sources."functional-red-black-tree-1.0.1" sources."glob-7.1.7" @@ -78292,10 +78414,10 @@ in expo-cli = nodeEnv.buildNodePackage { name = "expo-cli"; packageName = "expo-cli"; - version = "4.6.0"; + version = "4.7.2"; src = fetchurl { - url = "https://registry.npmjs.org/expo-cli/-/expo-cli-4.6.0.tgz"; - sha512 = "hvsfWKLsPG8oUMTEAVcGxp3JR/28H2KkZP2TW6iXqCv4EXwOYydnr1WjnYLZgN+wDRtoyGhYn7GFra5tXZJhrA=="; + url = "https://registry.npmjs.org/expo-cli/-/expo-cli-4.7.2.tgz"; + sha512 = "svwjCPWCk7KMwGBxYIwSm65ypkTIBvjdfR/v7El3365krTPY6sf5to6hY3+NKWUA9m5IZoUn3LUfpTIOyZIuUQ=="; }; dependencies = [ sources."@babel/code-frame-7.14.5" @@ -78431,16 +78553,10 @@ in sources."@babel/types-7.14.5" sources."@expo/apple-utils-0.0.0-alpha.20" sources."@expo/bunyan-4.0.0" - sources."@expo/config-4.0.4" - sources."@expo/config-plugins-2.0.4" + sources."@expo/config-5.0.2" + sources."@expo/config-plugins-3.0.2" sources."@expo/config-types-41.0.0" - (sources."@expo/configure-splash-screen-0.4.0" // { - dependencies = [ - sources."commander-5.1.0" - sources."pngjs-5.0.0" - ]; - }) - (sources."@expo/dev-server-0.1.74" // { + (sources."@expo/dev-server-0.1.77" // { dependencies = [ sources."body-parser-1.19.0" sources."bytes-3.1.0" @@ -78457,7 +78573,7 @@ in sources."temp-dir-2.0.0" ]; }) - sources."@expo/dev-tools-0.13.104" + sources."@expo/dev-tools-0.13.107" (sources."@expo/devcert-1.0.0" // { dependencies = [ sources."debug-3.2.7" @@ -78477,7 +78593,7 @@ in sources."json5-1.0.1" ]; }) - sources."@expo/metro-config-0.1.74" + sources."@expo/metro-config-0.1.77" sources."@expo/osascript-2.0.28" (sources."@expo/package-manager-0.0.43" // { dependencies = [ @@ -78491,7 +78607,7 @@ in sources."xmlbuilder-14.0.0" ]; }) - sources."@expo/prebuild-config-1.0.5" + sources."@expo/prebuild-config-2.0.2" sources."@expo/results-1.0.0" (sources."@expo/schemer-1.3.29" // { dependencies = [ @@ -78502,13 +78618,13 @@ in }) sources."@expo/simple-spinner-1.0.2" sources."@expo/spawn-async-1.5.0" - (sources."@expo/webpack-config-0.12.78" // { + (sources."@expo/webpack-config-0.12.81" // { dependencies = [ sources."@babel/runtime-7.9.0" sources."react-refresh-0.8.3" ]; }) - (sources."@expo/xcpretty-3.1.3" // { + (sources."@expo/xcpretty-3.1.4" // { dependencies = [ sources."@babel/code-frame-7.10.4" sources."js-yaml-4.1.0" @@ -78519,7 +78635,7 @@ in sources."@hapi/hoek-9.2.0" sources."@hapi/joi-17.1.1" sources."@hapi/pinpoint-2.0.0" - sources."@hapi/topo-5.0.0" + sources."@hapi/topo-5.1.0" (sources."@jest/types-25.5.0" // { dependencies = [ sources."ansi-styles-4.3.0" @@ -78846,7 +78962,7 @@ in }) sources."camelcase-5.3.1" sources."caniuse-api-3.0.0" - sources."caniuse-lite-1.0.30001239" + sources."caniuse-lite-1.0.30001241" sources."caseless-0.12.0" (sources."chalk-4.1.1" // { dependencies = [ @@ -78980,7 +79096,7 @@ in ]; }) sources."core-js-2.6.12" - (sources."core-js-compat-3.15.1" // { + (sources."core-js-compat-3.15.2" // { dependencies = [ sources."semver-7.0.0" ]; @@ -79114,7 +79230,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.755" + sources."electron-to-chromium-1.3.765" (sources."elliptic-6.5.4" // { dependencies = [ sources."bn.js-4.12.0" @@ -79141,11 +79257,7 @@ in sources."eol-0.9.1" sources."err-code-2.0.3" sources."errno-0.1.8" - (sources."error-ex-1.3.2" // { - dependencies = [ - sources."is-arrayish-0.2.1" - ]; - }) + sources."error-ex-1.3.2" sources."error-stack-parser-2.0.6" sources."errorhandler-1.5.1" sources."es-abstract-1.18.3" @@ -79195,7 +79307,7 @@ in sources."ms-2.0.0" ]; }) - (sources."expo-pwa-0.0.84" // { + (sources."expo-pwa-0.0.87" // { dependencies = [ sources."commander-2.20.0" ]; @@ -79220,7 +79332,7 @@ in }) sources."extsprintf-1.3.0" sources."fast-deep-equal-3.1.3" - sources."fast-glob-3.2.5" + sources."fast-glob-3.2.6" sources."fast-json-stable-stringify-2.1.0" sources."fastq-1.11.0" sources."faye-websocket-0.10.0" @@ -79423,7 +79535,7 @@ in sources."is-absolute-url-2.1.0" sources."is-accessor-descriptor-1.0.0" sources."is-arguments-1.1.0" - sources."is-arrayish-0.3.2" + sources."is-arrayish-0.2.1" sources."is-bigint-1.0.2" sources."is-binary-path-2.1.0" sources."is-boolean-object-1.1.1" @@ -80237,7 +80349,11 @@ in sources."shell-quote-1.7.2" sources."signal-exit-3.0.3" sources."simple-plist-1.1.1" - sources."simple-swizzle-0.2.2" + (sources."simple-swizzle-0.2.2" // { + dependencies = [ + sources."is-arrayish-0.3.2" + ]; + }) sources."sisteransi-1.0.5" sources."slash-3.0.0" (sources."slugid-1.1.0" // { @@ -80747,7 +80863,7 @@ in sources."uuid-7.0.3" ]; }) - (sources."xdl-59.0.44" // { + (sources."xdl-59.0.47" // { dependencies = [ sources."chownr-1.1.4" sources."fs-minipass-1.2.7" @@ -80760,7 +80876,6 @@ in ]; }) sources."xhr-2.6.0" - sources."xml-js-1.6.11" sources."xml-parse-from-string-1.0.1" (sources."xml2js-0.4.23" // { dependencies = [ @@ -81242,7 +81357,7 @@ in sources."extsprintf-1.3.0" sources."fast-deep-equal-3.1.3" sources."fast-diff-1.2.0" - sources."fast-glob-3.2.5" + sources."fast-glob-3.2.6" sources."fast-json-stable-stringify-2.1.0" sources."fast-levenshtein-2.0.6" sources."fastq-1.11.0" @@ -81442,7 +81557,7 @@ in sources."posix-character-classes-0.1.1" sources."prelude-ls-1.1.2" sources."prepend-http-2.0.0" - sources."prettier-2.3.1" + sources."prettier-2.3.2" sources."prettier-linter-helpers-1.0.0" sources."process-nextick-args-2.0.1" sources."psl-1.8.0" @@ -81622,21 +81737,21 @@ in sources."@google-cloud/precise-date-2.0.3" sources."@google-cloud/projectify-2.1.0" sources."@google-cloud/promisify-2.0.3" - (sources."@google-cloud/pubsub-2.14.0" // { + (sources."@google-cloud/pubsub-2.15.1" // { dependencies = [ - sources."google-auth-library-7.1.2" + sources."google-auth-library-7.2.0" ]; }) - sources."@grpc/grpc-js-1.3.3" - sources."@grpc/proto-loader-0.6.2" + sources."@grpc/grpc-js-1.3.4" + sources."@grpc/proto-loader-0.6.4" sources."@jsdevtools/ono-7.1.3" (sources."@npmcli/move-file-1.1.2" // { dependencies = [ sources."mkdirp-1.0.4" ]; }) - sources."@opentelemetry/api-0.20.0" - sources."@opentelemetry/semantic-conventions-0.20.0" + sources."@opentelemetry/api-1.0.1" + sources."@opentelemetry/semantic-conventions-0.22.0" sources."@protobufjs/aspromise-1.1.2" sources."@protobufjs/base64-1.1.2" sources."@protobufjs/codegen-2.0.4" @@ -81656,7 +81771,7 @@ in sources."@types/json-schema-7.0.7" sources."@types/long-4.0.1" sources."@types/minimatch-3.0.4" - sources."@types/node-15.12.4" + sources."@types/node-15.14.0" sources."JSONStream-1.3.5" sources."abbrev-1.1.1" sources."abort-controller-3.0.0" @@ -81943,7 +82058,7 @@ in sources."fecha-4.2.1" sources."figures-2.0.0" sources."file-uri-to-path-2.0.0" - sources."filesize-6.3.0" + sources."filesize-6.4.0" sources."fill-range-7.0.1" (sources."finalhandler-1.1.2" // { dependencies = [ @@ -82008,9 +82123,9 @@ in sources."glob-slasher-1.0.1" sources."global-dirs-2.1.0" sources."google-auth-library-6.1.6" - (sources."google-gax-2.16.0" // { + (sources."google-gax-2.17.0" // { dependencies = [ - sources."google-auth-library-7.1.2" + sources."google-auth-library-7.2.0" ]; }) sources."google-p12-pem-3.1.0" @@ -82308,7 +82423,7 @@ in sources."responselike-1.0.2" sources."restore-cursor-2.0.0" sources."retry-0.12.0" - sources."retry-request-4.1.3" + sources."retry-request-4.2.1" sources."rimraf-3.0.2" (sources."router-1.3.5" // { dependencies = [ @@ -82505,7 +82620,7 @@ in sources."wrap-ansi-7.0.0" sources."wrappy-1.0.2" sources."write-file-atomic-3.0.3" - sources."ws-7.5.0" + sources."ws-7.5.1" sources."xdg-basedir-4.0.0" sources."xregexp-2.0.0" sources."xtend-4.0.2" @@ -82765,7 +82880,7 @@ in dependencies = [ sources."@types/atob-2.1.2" sources."@types/inquirer-6.5.0" - sources."@types/node-15.12.4" + sources."@types/node-15.14.0" sources."@types/through-0.0.30" sources."ajv-6.12.6" sources."ansi-escapes-4.3.2" @@ -82938,7 +83053,7 @@ in sources."utf8-3.0.0" sources."uuid-3.4.0" sources."verror-1.10.0" - (sources."web3-utils-1.3.6" // { + (sources."web3-utils-1.4.0" // { dependencies = [ sources."underscore-1.12.1" ]; @@ -83546,12 +83661,12 @@ in sources."@turist/fetch-7.1.7" sources."@turist/time-0.0.1" sources."@types/common-tags-1.8.0" - sources."@types/debug-4.1.5" + sources."@types/debug-4.1.6" 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/json-patch-0.0.30" - sources."@types/node-15.12.4" + sources."@types/node-15.14.0" sources."@types/node-fetch-2.5.10" sources."@types/readable-stream-2.3.10" sources."@types/unist-2.0.3" @@ -83559,7 +83674,7 @@ in sources."@types/yargs-parser-20.2.0" sources."@types/yoga-layout-1.9.2" sources."accepts-1.3.7" - sources."acorn-8.4.0" + sources."acorn-8.4.1" sources."acorn-jsx-5.3.1" sources."address-1.1.2" (sources."ansi-align-3.0.0" // { @@ -83613,13 +83728,12 @@ in dependencies = [ sources."get-stream-5.2.0" sources."lowercase-keys-2.0.0" - sources."normalize-url-4.5.1" ]; }) sources."call-bind-1.0.2" sources."camel-case-4.1.2" sources."camelcase-5.3.1" - sources."caniuse-lite-1.0.30001239" + sources."caniuse-lite-1.0.30001241" sources."ccount-1.1.0" (sources."chalk-4.1.1" // { dependencies = [ @@ -83669,7 +83783,7 @@ in ]; }) sources."content-type-1.0.4" - sources."contentful-management-7.25.1" + sources."contentful-management-7.27.0" sources."contentful-sdk-core-6.8.0" sources."convert-hrtime-3.0.0" (sources."convert-source-map-1.8.0" // { @@ -83715,7 +83829,7 @@ in sources."dotenv-8.6.0" sources."duplexer3-0.1.4" sources."ee-first-1.1.1" - sources."electron-to-chromium-1.3.755" + sources."electron-to-chromium-1.3.765" sources."emoji-regex-7.0.3" sources."encodeurl-1.0.2" sources."end-of-stream-1.4.4" @@ -83898,7 +84012,7 @@ in (sources."joi-17.4.0" // { dependencies = [ sources."@hapi/hoek-9.2.0" - sources."@hapi/topo-5.0.0" + sources."@hapi/topo-5.1.0" ]; }) sources."js-tokens-4.0.0" @@ -83964,7 +84078,7 @@ in sources."node-object-hash-2.3.7" sources."node-releases-1.1.73" sources."normalize-path-3.0.0" - sources."normalize-url-6.1.0" + sources."normalize-url-4.5.1" sources."npm-run-path-2.0.2" sources."nth-check-2.0.0" sources."object-assign-4.1.1" @@ -83988,7 +84102,7 @@ in }) sources."parse-entities-2.0.0" sources."parse-path-4.0.3" - sources."parse-url-5.0.3" + sources."parse-url-5.0.7" sources."parseurl-1.3.3" sources."pascal-case-3.1.2" sources."path-exists-4.0.0" @@ -84000,7 +84114,7 @@ in sources."picomatch-2.3.0" sources."pkg-dir-4.2.0" sources."prepend-http-2.0.0" - sources."prettier-2.3.1" + sources."prettier-2.3.2" sources."pretty-error-2.1.2" (sources."pretty-format-25.5.0" // { dependencies = [ @@ -84193,9 +84307,9 @@ in }) sources."wrappy-1.0.2" sources."write-file-atomic-3.0.3" - sources."ws-7.5.0" + sources."ws-7.5.1" sources."xdg-basedir-4.0.0" - sources."xstate-4.20.0" + sources."xstate-4.20.2" sources."xtend-4.0.2" sources."y18n-4.0.3" sources."yallist-4.0.0" @@ -84450,7 +84564,7 @@ in sources."tweetnacl-0.14.5" sources."tweetnacl-auth-0.3.1" sources."typedarray-to-buffer-4.0.0" - sources."ws-7.5.0" + sources."ws-7.5.1" sources."xtend-4.0.2" ]; buildInputs = globalBuildInputs; @@ -84942,7 +85056,7 @@ in sources."@nodelib/fs.walk-1.2.7" sources."@sindresorhus/is-0.14.0" sources."@szmarczak/http-timer-1.1.2" - sources."@types/node-15.12.4" + sources."@types/node-15.14.0" sources."@types/parse-json-4.0.0" sources."@types/websocket-1.0.2" sources."abort-controller-3.0.0" @@ -85055,7 +85169,7 @@ in sources."extract-files-9.0.0" sources."extsprintf-1.3.0" sources."fast-deep-equal-3.1.3" - sources."fast-glob-3.2.5" + sources."fast-glob-3.2.6" sources."fast-json-stable-stringify-2.1.0" sources."fast-safe-stringify-2.0.7" sources."fastq-1.11.0" @@ -85631,7 +85745,7 @@ in sources."ansi-term-0.0.2" sources."ansicolors-0.3.2" sources."blessed-0.1.81" - sources."blessed-contrib-4.9.0" + sources."blessed-contrib-4.10.0" sources."bresenham-0.0.3" sources."buffers-0.1.1" sources."cardinal-2.1.1" @@ -85660,7 +85774,7 @@ in sources."lodash-4.17.21" sources."lodash.toarray-4.4.0" sources."map-canvas-0.1.5" - sources."marked-2.1.2" + sources."marked-2.1.3" (sources."marked-terminal-4.1.1" // { dependencies = [ sources."ansi-styles-4.3.0" @@ -86583,7 +86697,7 @@ in sources."param-case-2.1.1" sources."relateurl-0.2.7" sources."source-map-0.6.1" - sources."uglify-js-3.13.9" + sources."uglify-js-3.13.10" sources."upper-case-1.1.3" ]; buildInputs = globalBuildInputs; @@ -87248,21 +87362,18 @@ in sources."arch-2.2.0" sources."balanced-match-1.0.2" sources."brace-expansion-1.1.11" - sources."clipboard-2.0.8" sources."clipboardy-2.3.0" sources."clone-1.0.4" sources."concat-map-0.0.1" sources."cross-spawn-6.0.5" sources."decimal.js-7.5.1" sources."defaults-1.0.3" - sources."delegate-3.2.0" sources."end-of-stream-1.4.4" sources."execa-1.0.0" sources."fs-extra-0.24.0" sources."fs.realpath-1.0.0" sources."get-stream-4.1.0" sources."glob-7.1.7" - sources."good-listener-1.2.2" sources."graceful-fs-4.2.6" sources."historic-readline-1.0.8" sources."inflight-1.0.6" @@ -87284,16 +87395,14 @@ in sources."p-finally-1.0.0" sources."path-is-absolute-1.0.1" sources."path-key-2.0.1" - sources."prismjs-1.23.0" + sources."prismjs-1.24.0" sources."pump-3.0.0" sources."rimraf-2.7.1" - sources."select-1.1.2" sources."semver-5.7.1" sources."shebang-command-1.2.0" sources."shebang-regex-1.0.0" sources."signal-exit-3.0.3" sources."strip-eof-1.0.0" - sources."tiny-emitter-2.1.0" sources."wcwidth-1.0.1" sources."which-1.3.1" sources."wrappy-1.0.2" @@ -87604,7 +87713,7 @@ in }) sources."wrappy-1.0.2" sources."write-file-atomic-3.0.3" - sources."ws-7.5.0" + sources."ws-7.5.1" sources."xregexp-2.0.0" sources."yallist-3.1.1" ]; @@ -87691,7 +87800,7 @@ in sources."@ot-builder/trace-1.0.9" sources."@ot-builder/var-store-1.0.9" sources."@ot-builder/variance-1.0.9" - sources."@unicode/unicode-13.0.0-1.0.6" + sources."@unicode/unicode-13.0.0-1.1.0" sources."aglfn-1.0.2" sources."amdefine-1.0.1" sources."ansi-regex-5.0.0" @@ -88002,17 +88111,17 @@ in joplin = nodeEnv.buildNodePackage { name = "joplin"; packageName = "joplin"; - version = "2.0.1"; + version = "2.1.2"; src = fetchurl { - url = "https://registry.npmjs.org/joplin/-/joplin-2.0.1.tgz"; - sha512 = "NFjW9O1SZp6zN8RUjQA8DGTuoAljN1zKNUpDcEX7uY3hG/V4nqZtZVF0wzZ3EN/UWkx/lIP2FohRv4cUtdrO+A=="; + url = "https://registry.npmjs.org/joplin/-/joplin-2.1.2.tgz"; + sha512 = "8xDS/I9zMH0wHuZGZ0xENBn/Ml4gHk2WLMDfShN7L2VNRK/9xowunf2c/fAwI0eNXn/aw2QcMrcgqj37uZ0gbw=="; }; dependencies = [ sources."@braintree/sanitize-url-3.1.0" sources."@cronvel/get-pixels-3.4.0" - sources."@joplin/fork-htmlparser2-4.1.27" - sources."@joplin/fork-sax-1.2.31" - (sources."@joplin/lib-2.0.3" // { + sources."@joplin/fork-htmlparser2-4.1.28" + sources."@joplin/fork-sax-1.2.32" + (sources."@joplin/lib-2.1.1" // { dependencies = [ (sources."@joplin/renderer-1.8.2" // { dependencies = [ @@ -88022,18 +88131,18 @@ in }) ]; }) - (sources."@joplin/renderer-2.0.3" // { + (sources."@joplin/renderer-2.1.1" // { dependencies = [ sources."fs-extra-8.1.0" sources."uslug-git+https://github.com/laurent22/uslug.git#emoji-support" ]; }) - (sources."@joplin/turndown-4.0.49" // { + (sources."@joplin/turndown-4.0.50" // { dependencies = [ sources."css-2.2.4" ]; }) - sources."@joplin/turndown-plugin-gfm-1.0.31" + sources."@joplin/turndown-plugin-gfm-1.0.32" sources."abab-2.0.5" sources."abbrev-1.1.1" sources."acorn-7.4.1" @@ -88073,7 +88182,7 @@ in sources."async-mutex-0.1.4" sources."asynckit-0.4.0" sources."atob-2.1.2" - (sources."aws-sdk-2.932.0" // { + (sources."aws-sdk-2.938.0" // { dependencies = [ sources."sax-1.2.1" sources."uuid-3.3.2" @@ -88100,7 +88209,6 @@ in sources."braces-3.0.2" sources."browser-process-hrtime-1.0.0" sources."buffer-4.9.2" - sources."buffer-from-1.1.1" sources."builtin-modules-3.2.0" sources."camel-case-3.0.0" sources."camelcase-4.1.0" @@ -88133,7 +88241,6 @@ in sources."source-map-resolve-0.6.0" ]; }) - sources."css-b64-images-0.2.5" sources."cssom-0.4.4" (sources."cssstyle-2.3.0" // { dependencies = [ @@ -88181,7 +88288,7 @@ in sources."dagre-d3-0.6.4" sources."dashdash-1.14.1" sources."data-urls-1.1.0" - sources."debug-4.3.2" + sources."debug-3.2.7" sources."decode-uri-component-0.2.0" sources."decompress-response-4.2.1" sources."deep-extend-0.6.0" @@ -88280,11 +88387,6 @@ in (sources."html-minifier-3.5.21" // { dependencies = [ sources."commander-2.17.1" - (sources."uglify-js-3.4.10" // { - dependencies = [ - sources."commander-2.19.0" - ]; - }) ]; }) sources."http-errors-1.8.0" @@ -88417,16 +88519,10 @@ in sources."md5-2.3.0" sources."md5-file-4.0.0" sources."mdurl-1.0.1" - sources."mermaid-8.10.2" + sources."mermaid-8.11.0" sources."mime-db-1.48.0" sources."mime-types-2.1.31" sources."mimic-response-2.1.0" - (sources."minify-4.1.3" // { - dependencies = [ - sources."commander-2.20.3" - sources."html-minifier-4.0.0" - ]; - }) sources."minimatch-3.0.4" sources."minimist-1.2.5" (sources."minipass-2.9.0" // { @@ -88439,18 +88535,14 @@ in sources."mkdirp-classic-0.5.3" sources."moment-2.29.1" sources."moment-mini-2.24.0" - sources."ms-2.1.2" + sources."ms-2.1.3" sources."multiparty-4.2.2" sources."mustache-4.2.0" sources."nanoid-3.1.23" sources."napi-build-utils-1.0.2" sources."ndarray-1.0.19" sources."ndarray-pack-1.2.1" - (sources."needle-2.6.0" // { - dependencies = [ - sources."debug-3.2.7" - ]; - }) + sources."needle-2.6.0" sources."nextgen-events-1.5.2" sources."no-case-2.3.2" (sources."node-abi-2.30.0" // { @@ -88596,7 +88688,6 @@ in }) sources."source-map-0.6.1" sources."source-map-resolve-0.5.3" - sources."source-map-support-0.5.19" sources."source-map-url-0.4.1" sources."split-skip-0.0.2" sources."sprintf-js-1.1.2" @@ -88653,11 +88744,6 @@ in ]; }) sources."terminal-kit-1.49.3" - (sources."terser-4.8.0" // { - dependencies = [ - sources."commander-2.20.3" - ]; - }) (sources."tkwidgets-0.5.26" // { dependencies = [ sources."ansi-styles-3.2.1" @@ -88674,14 +88760,16 @@ in sources."tough-cookie-3.0.1" sources."tr46-1.0.1" sources."tree-kit-0.6.2" - sources."try-catch-2.0.1" - sources."try-to-catch-1.1.1" sources."tunnel-agent-0.6.0" sources."tweetnacl-0.14.5" sources."type-check-0.3.2" sources."typical-2.6.1" sources."uc.micro-1.0.6" - sources."uglify-js-3.13.9" + (sources."uglify-js-3.4.10" // { + dependencies = [ + sources."commander-2.19.0" + ]; + }) sources."uglifycss-0.0.29" sources."uid-safe-2.1.5" sources."unc-path-regex-0.1.2" @@ -88720,7 +88808,7 @@ in ]; }) sources."wrappy-1.0.2" - sources."ws-7.5.0" + sources."ws-7.5.1" sources."xml-name-validator-3.0.0" sources."xml2js-0.4.23" sources."xmlbuilder-11.0.1" @@ -88824,7 +88912,7 @@ in sources."lodash-4.17.21" sources."markdown-it-10.0.0" sources."markdown-it-anchor-5.3.0" - sources."marked-2.1.2" + sources."marked-2.1.3" sources."mdurl-1.0.1" sources."mkdirp-1.0.4" sources."requizzle-0.2.3" @@ -89385,7 +89473,7 @@ in sources."external-editor-3.1.0" sources."extract-stack-2.0.0" sources."fast-deep-equal-3.1.3" - sources."fast-glob-3.2.5" + sources."fast-glob-3.2.6" sources."fast-json-stable-stringify-2.1.0" sources."fastq-1.11.0" (sources."figures-3.2.0" // { @@ -89556,7 +89644,7 @@ in sources."@types/component-emitter-1.2.10" sources."@types/cookie-0.4.0" sources."@types/cors-2.8.10" - sources."@types/node-15.12.4" + sources."@types/node-15.14.0" sources."accepts-1.3.7" sources."ansi-regex-5.0.0" sources."ansi-styles-4.3.0" @@ -89887,7 +89975,7 @@ in sources."path-parse-1.0.7" sources."path-platform-0.11.15" sources."pbkdf2-3.1.2" - sources."prettier-2.3.1" + sources."prettier-2.3.2" sources."process-0.11.10" sources."process-nextick-args-2.0.1" (sources."public-encrypt-4.0.3" // { @@ -90699,19 +90787,19 @@ in ]; }) sources."@octokit/graphql-4.6.4" - sources."@octokit/openapi-types-7.3.2" + sources."@octokit/openapi-types-8.1.4" sources."@octokit/plugin-enterprise-rest-6.0.1" - sources."@octokit/plugin-paginate-rest-2.13.5" + sources."@octokit/plugin-paginate-rest-2.13.6" sources."@octokit/plugin-request-log-1.0.4" - sources."@octokit/plugin-rest-endpoint-methods-5.3.1" + sources."@octokit/plugin-rest-endpoint-methods-5.3.7" (sources."@octokit/request-5.6.0" // { dependencies = [ sources."is-plain-object-5.0.0" ]; }) sources."@octokit/request-error-2.1.0" - sources."@octokit/rest-18.6.0" - sources."@octokit/types-6.16.4" + sources."@octokit/rest-18.6.6" + sources."@octokit/types-6.17.4" sources."@tootallnate/once-1.1.2" sources."@types/minimatch-3.0.4" sources."@types/minimist-1.2.1" @@ -90860,7 +90948,7 @@ in }) sources."extsprintf-1.3.0" sources."fast-deep-equal-3.1.3" - sources."fast-glob-3.2.5" + sources."fast-glob-3.2.6" sources."fast-json-stable-stringify-2.1.0" sources."fastq-1.11.0" sources."figures-3.2.0" @@ -90924,7 +91012,7 @@ in ]; }) sources."git-up-4.0.2" - sources."git-url-parse-11.4.4" + sources."git-url-parse-11.5.0" sources."gitconfiglocal-1.0.0" sources."glob-7.1.7" sources."glob-parent-5.1.2" @@ -91101,7 +91189,7 @@ in sources."semver-5.7.1" ]; }) - sources."normalize-url-6.1.0" + sources."normalize-url-4.5.1" sources."npm-bundled-1.1.2" sources."npm-install-checks-4.0.0" (sources."npm-lifecycle-3.1.5" // { @@ -91160,7 +91248,7 @@ in sources."qs-6.10.1" ]; }) - sources."parse-url-5.0.3" + sources."parse-url-5.0.7" sources."path-exists-4.0.0" sources."path-is-absolute-1.0.1" sources."path-key-3.1.1" @@ -91291,7 +91379,7 @@ in sources."type-fest-0.4.1" sources."typedarray-0.0.6" sources."typedarray-to-buffer-3.1.5" - sources."uglify-js-3.13.9" + sources."uglify-js-3.13.10" sources."uid-number-0.0.6" sources."umask-1.1.0" sources."unbox-primitive-1.0.1" @@ -91309,7 +91397,7 @@ in sources."verror-1.10.0" sources."wcwidth-1.0.1" sources."webidl-conversions-6.1.0" - sources."whatwg-url-8.6.0" + sources."whatwg-url-8.7.0" sources."which-2.0.2" sources."which-boxed-primitive-1.0.2" (sources."wide-align-1.1.3" // { @@ -91439,8 +91527,8 @@ in sources."normalize-path-2.1.1" ]; }) - sources."apache-crypt-1.2.4" - sources."apache-md5-1.1.5" + sources."apache-crypt-1.2.5" + sources."apache-md5-1.1.7" sources."arr-diff-4.0.0" sources."arr-flatten-1.1.0" sources."arr-union-3.1.0" @@ -92378,14 +92466,14 @@ in sources."@types/babel__core-7.1.14" sources."@types/babel__generator-7.6.2" sources."@types/babel__template-7.4.0" - sources."@types/babel__traverse-7.11.1" - sources."@types/estree-0.0.48" + sources."@types/babel__traverse-7.14.0" + sources."@types/estree-0.0.49" sources."@types/graceful-fs-4.1.5" 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/json-schema-7.0.7" - sources."@types/node-15.12.4" + sources."@types/node-15.14.0" sources."@types/normalize-package-data-2.4.0" sources."@types/resolve-0.0.8" sources."@types/yargs-15.0.13" @@ -92558,7 +92646,7 @@ in sources."cached-path-relative-1.0.2" sources."call-bind-1.0.2" sources."camelcase-5.3.1" - sources."caniuse-lite-1.0.30001239" + sources."caniuse-lite-1.0.30001241" sources."capture-exit-2.0.0" sources."caseless-0.12.0" (sources."chalk-3.0.0" // { @@ -92630,7 +92718,7 @@ in }) sources."copy-descriptor-0.1.1" sources."core-js-2.6.12" - (sources."core-js-compat-3.15.1" // { + (sources."core-js-compat-3.15.2" // { dependencies = [ sources."semver-7.0.0" ]; @@ -92682,7 +92770,7 @@ in sources."duplexer2-0.1.4" sources."duplexify-3.7.1" sources."ecc-jsbn-0.1.2" - sources."electron-to-chromium-1.3.755" + sources."electron-to-chromium-1.3.765" (sources."elliptic-6.5.4" // { dependencies = [ sources."bn.js-4.12.0" @@ -93537,7 +93625,7 @@ in sources."link-check-4.5.4" sources."lodash-4.17.21" sources."markdown-link-extractor-1.3.0" - sources."marked-2.1.2" + sources."marked-2.1.3" sources."mime-db-1.48.0" sources."mime-types-2.1.31" sources."ms-2.1.3" @@ -93572,10 +93660,10 @@ in mastodon-bot = nodeEnv.buildNodePackage { name = "mastodon-bot"; packageName = "mastodon-bot"; - version = "1.12.1-20210623060235"; + version = "1.13.5-20210701203013"; src = fetchurl { - url = "https://registry.npmjs.org/mastodon-bot/-/mastodon-bot-1.12.1-20210623060235.tgz"; - sha512 = "eXao5YnfoIQ4hqVmzCN2HT6GXfgYuReCPNlDz54Yn8YtUxwdhQZ9KnQo9t0ex4Bl6rrAZ0Po8GuVIzTVn22o4Q=="; + url = "https://registry.npmjs.org/mastodon-bot/-/mastodon-bot-1.13.5-20210701203013.tgz"; + sha512 = "d5HCg9yu6xhFWnUPKBFSzPoXsxXRCYrmy4AGMvjlifWqQnCf9EklbocqVZSO1j50JRymlfDELq1QO/WYKZ5TYQ=="; }; dependencies = [ sources."acorn-5.7.4" @@ -93923,14 +94011,14 @@ in "@mermaid-js/mermaid-cli" = nodeEnv.buildNodePackage { name = "_at_mermaid-js_slash_mermaid-cli"; packageName = "@mermaid-js/mermaid-cli"; - version = "8.10.2"; + version = "8.11.0"; src = fetchurl { - url = "https://registry.npmjs.org/@mermaid-js/mermaid-cli/-/mermaid-cli-8.10.2.tgz"; - sha512 = "aoGVAZC/goUc6iWYef5aRjCwITojjWvlEj+qPHCEbAGisR4md3fi3+3iDD3ra+zhagfXJZ1Qyo5+3lVkJPaC6Q=="; + url = "https://registry.npmjs.org/@mermaid-js/mermaid-cli/-/mermaid-cli-8.11.0.tgz"; + sha512 = "UyYOnVhvKcfh9e2S4QnK53uRa2hvdgQVo3ZT+FcaP56ZeBDNWKB3IZI/sNzAbxqJBEuRpW6HxoEzHCleis1dFw=="; }; dependencies = [ sources."@braintree/sanitize-url-3.1.0" - sources."@types/node-15.12.4" + sources."@types/node-15.14.0" sources."@types/yauzl-2.9.1" sources."agent-base-6.0.2" sources."ansi-styles-4.3.0" @@ -93940,16 +94028,12 @@ in sources."brace-expansion-1.1.11" sources."buffer-5.7.1" sources."buffer-crc32-0.2.13" - sources."buffer-from-1.1.1" - sources."camel-case-3.0.0" sources."chalk-4.1.1" sources."chownr-1.1.4" - sources."clean-css-4.2.3" sources."color-convert-2.0.1" sources."color-name-1.1.4" - sources."commander-7.2.0" + sources."commander-8.0.0" sources."concat-map-0.0.1" - sources."css-b64-images-0.2.5" sources."d3-5.16.0" sources."d3-array-1.2.4" sources."d3-axis-1.0.12" @@ -94002,11 +94086,6 @@ in sources."graphlib-2.1.8" sources."has-flag-4.0.0" sources."he-1.2.0" - (sources."html-minifier-4.0.0" // { - dependencies = [ - sources."commander-2.20.3" - ]; - }) sources."https-proxy-agent-5.0.0" sources."iconv-lite-0.4.24" sources."ieee754-1.2.1" @@ -94015,21 +94094,17 @@ in sources."khroma-1.4.1" sources."locate-path-5.0.0" sources."lodash-4.17.21" - sources."lower-case-1.1.4" - sources."mermaid-8.10.2" - sources."minify-4.1.3" + sources."mermaid-8.11.0" sources."minimatch-3.0.4" sources."minimist-1.2.5" sources."mkdirp-0.5.5" sources."moment-mini-2.24.0" sources."ms-2.1.2" - sources."no-case-2.3.2" sources."node-fetch-2.6.1" sources."once-1.4.0" sources."p-limit-2.3.0" sources."p-locate-4.1.0" sources."p-try-2.2.0" - sources."param-case-2.1.1" sources."path-exists-4.0.0" sources."path-is-absolute-1.0.1" sources."pend-1.2.0" @@ -94037,31 +94112,19 @@ in sources."progress-2.0.1" sources."proxy-from-env-1.1.0" sources."pump-3.0.0" - sources."puppeteer-10.0.0" + sources."puppeteer-10.1.0" sources."readable-stream-3.6.0" - sources."relateurl-0.2.7" sources."rimraf-3.0.2" sources."rw-1.3.3" sources."safe-buffer-5.2.1" sources."safer-buffer-2.1.2" - sources."source-map-0.6.1" - sources."source-map-support-0.5.19" sources."string_decoder-1.3.0" sources."stylis-3.5.4" sources."supports-color-7.2.0" sources."tar-fs-2.0.0" sources."tar-stream-2.2.0" - (sources."terser-4.8.0" // { - dependencies = [ - sources."commander-2.20.3" - ]; - }) sources."through-2.3.8" - sources."try-catch-2.0.1" - sources."try-to-catch-1.1.1" - sources."uglify-js-3.13.9" sources."unbzip2-stream-1.3.3" - sources."upper-case-1.1.3" sources."util-deprecate-1.0.2" sources."wrappy-1.0.2" sources."ws-7.4.6" @@ -94080,29 +94143,30 @@ in mirakurun = nodeEnv.buildNodePackage { name = "mirakurun"; packageName = "mirakurun"; - version = "3.5.0"; + version = "3.6.0"; src = fetchurl { - url = "https://registry.npmjs.org/mirakurun/-/mirakurun-3.5.0.tgz"; - sha512 = "j2ukrvANZQUreLl2grOQxPl0pbRSoJthYLqujdphZdwJyDwYjPqGOs+KrWwY26QbfqG2Toy06qFnYTaGx9txIg=="; + url = "https://registry.npmjs.org/mirakurun/-/mirakurun-3.6.0.tgz"; + sha512 = "LrJqn/26CxH9aQ9j7iPqnk9fS6ywI3gpCt7HS26UXeycC3VBfhkoONLZQW/JXW3aJGoUHUlxunsQBI0h89EJIw=="; }; dependencies = [ - sources."@fluentui/date-time-utilities-7.9.1" - sources."@fluentui/dom-utilities-1.1.2" - sources."@fluentui/keyboard-key-0.2.17" - sources."@fluentui/react-7.172.1" - 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.185" + sources."@fluentui/date-time-utilities-8.2.0" + sources."@fluentui/dom-utilities-2.1.2" + sources."@fluentui/font-icons-mdl2-8.1.4" + sources."@fluentui/foundation-legacy-8.1.4" + sources."@fluentui/keyboard-key-0.3.2" + sources."@fluentui/merge-styles-8.1.2" + sources."@fluentui/react-8.22.0" + sources."@fluentui/react-focus-8.1.5" + sources."@fluentui/react-hooks-8.2.3" + sources."@fluentui/react-window-provider-2.1.2" + sources."@fluentui/set-version-8.1.2" + sources."@fluentui/style-utilities-8.1.4" + sources."@fluentui/theme-2.1.3" + sources."@fluentui/utilities-8.2.0" + sources."@microsoft/load-themed-styles-1.10.190" sources."@sindresorhus/is-0.14.0" sources."@szmarczak/http-timer-1.1.2" - sources."@uifabric/foundation-7.9.26" - sources."@uifabric/icons-7.5.23" - sources."@uifabric/merge-styles-7.19.2" - sources."@uifabric/react-hooks-7.14.0" - sources."@uifabric/set-version-7.0.24" - sources."@uifabric/styling-7.19.0" - sources."@uifabric/utilities-7.33.5" + sources."@types/cors-2.8.10" sources."accepts-1.3.7" sources."ajv-6.12.6" sources."ansi-escapes-1.4.0" @@ -94144,6 +94208,7 @@ in sources."cookie-0.4.0" sources."cookie-signature-1.0.6" sources."core-js-2.6.12" + sources."cors-2.8.5" sources."crc-3.8.0" sources."debug-2.6.9" sources."decompress-response-3.3.0" @@ -94197,7 +94262,11 @@ in sources."is-fullwidth-code-point-2.0.0" sources."is-stream-1.1.0" sources."js-tokens-4.0.0" - sources."js-yaml-3.14.1" + (sources."js-yaml-4.1.0" // { + dependencies = [ + sources."argparse-2.0.1" + ]; + }) sources."json-buffer-3.0.0" sources."json-schema-traverse-0.4.1" sources."keyv-3.1.0" @@ -94229,13 +94298,16 @@ in sources."node-fetch-1.6.3" sources."normalize-url-4.5.1" sources."object-assign-4.1.1" - sources."office-ui-fabric-react-7.172.1" sources."on-finished-2.3.0" sources."on-headers-1.0.2" sources."once-1.4.0" sources."onetime-2.0.1" sources."openapi-default-setter-7.2.3" - sources."openapi-framework-7.5.0" + (sources."openapi-framework-7.5.0" // { + dependencies = [ + sources."js-yaml-3.14.1" + ]; + }) sources."openapi-jsonschema-parameters-7.2.3" sources."openapi-request-coercer-7.5.0" sources."openapi-request-validator-7.4.0" @@ -94264,7 +94336,6 @@ in sources."pinkie-promise-2.0.1" sources."prepend-http-2.0.0" sources."promise-queue-2.2.5" - sources."prop-types-15.7.2" sources."proxy-addr-2.0.7" sources."pump-3.0.0" sources."punycode-2.1.1" @@ -94272,9 +94343,8 @@ in sources."range-parser-1.2.1" sources."raw-body-2.4.0" sources."rc-1.2.8" - sources."react-16.14.0" - sources."react-dom-16.14.0" - sources."react-is-16.13.1" + sources."react-17.0.2" + sources."react-dom-17.0.2" sources."readable-stream-3.6.0" sources."regenerator-runtime-0.10.5" sources."registry-auth-token-4.2.1" @@ -94285,7 +94355,7 @@ in sources."rx-4.1.0" sources."safe-buffer-5.1.2" sources."safer-buffer-2.1.2" - sources."scheduler-0.19.1" + sources."scheduler-0.20.2" sources."semver-7.3.5" (sources."send-0.17.1" // { dependencies = [ @@ -94320,14 +94390,14 @@ 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.50.0" + sources."swagger-ui-dist-3.51.1" sources."tail-2.2.3" sources."through-2.3.8" sources."tmp-0.0.33" sources."to-readable-stream-1.0.0" sources."toidentifier-1.0.0" sources."ts-log-2.2.3" - sources."tslib-1.14.1" + sources."tslib-2.3.0" sources."type-is-1.6.18" sources."unpipe-1.0.0" sources."uri-js-4.4.1" @@ -94606,10 +94676,10 @@ in netlify-cli = nodeEnv.buildNodePackage { name = "netlify-cli"; packageName = "netlify-cli"; - version = "3.38.7"; + version = "4.0.5"; src = fetchurl { - url = "https://registry.npmjs.org/netlify-cli/-/netlify-cli-3.38.7.tgz"; - sha512 = "q95l1GhUbv1VgePfCHuNREvmGO7dN9H+kSw5esaxNITa/+67xXP4PA2dzJaylTXciEF3NdIhTdXCC9j/CUs4EQ=="; + url = "https://registry.npmjs.org/netlify-cli/-/netlify-cli-4.0.5.tgz"; + sha512 = "p1wJwMMWHM/Av5/Bsabtr0UTX4lTJVZg7Hz+G9kbA/n2wdKoWAj5P5B+shDRGRBhaFDbCiHf36baKtLJWP4SiQ=="; }; dependencies = [ sources."@babel/code-frame-7.14.5" @@ -94734,37 +94804,22 @@ in sources."@babel/template-7.14.5" sources."@babel/traverse-7.14.7" sources."@babel/types-7.14.5" - sources."@bugsnag/browser-7.10.1" + sources."@bugsnag/browser-7.10.4" sources."@bugsnag/core-7.10.0" sources."@bugsnag/cuid-3.0.0" - sources."@bugsnag/js-7.10.1" + sources."@bugsnag/js-7.10.4" sources."@bugsnag/node-7.10.1" sources."@bugsnag/safe-json-stringify-6.0.0" sources."@dabh/diagnostics-2.0.2" sources."@jest/types-24.9.0" sources."@mrmlnc/readdir-enhanced-2.2.1" - (sources."@netlify/build-12.7.2" // { + (sources."@netlify/build-12.26.0" // { dependencies = [ - sources."@netlify/config-7.7.1" - (sources."@netlify/zip-it-and-ship-it-4.4.2" // { - dependencies = [ - sources."find-up-5.0.0" - sources."locate-path-6.0.0" - sources."p-locate-5.0.0" - sources."pkg-dir-5.0.0" - sources."semver-7.3.5" - sources."yargs-16.2.0" - ]; - }) sources."ansi-styles-4.3.0" sources."chalk-3.0.0" - sources."cp-file-9.1.0" - sources."dot-prop-5.3.0" sources."execa-3.4.0" - sources."find-up-4.1.0" sources."is-plain-obj-2.1.0" sources."locate-path-5.0.0" - sources."netlify-redirect-parser-7.0.0" sources."resolve-2.0.0-next.3" sources."semver-6.3.0" sources."update-notifier-4.1.3" @@ -94778,7 +94833,7 @@ in sources."slash-3.0.0" ]; }) - (sources."@netlify/config-8.0.0" // { + (sources."@netlify/config-9.5.0" // { dependencies = [ sources."ansi-styles-4.3.0" sources."chalk-3.0.0" @@ -94790,20 +94845,13 @@ in ]; }) sources."@netlify/esbuild-0.13.6" - (sources."@netlify/framework-info-5.3.0" // { + (sources."@netlify/framework-info-5.5.0" // { dependencies = [ + sources."p-limit-3.1.0" sources."p-locate-5.0.0" ]; }) - (sources."@netlify/functions-utils-1.3.46" // { - dependencies = [ - sources."@netlify/zip-it-and-ship-it-4.4.2" - sources."cp-file-9.1.0" - sources."pkg-dir-5.0.0" - sources."resolve-2.0.0-next.3" - sources."yargs-16.2.0" - ]; - }) + sources."@netlify/functions-utils-1.4.1" (sources."@netlify/git-utils-1.0.11" // { dependencies = [ sources."braces-3.0.2" @@ -94818,22 +94866,24 @@ in (sources."@netlify/plugin-edge-handlers-1.11.19" // { dependencies = [ sources."@types/node-14.17.4" - sources."typescript-4.3.4" ]; }) - sources."@netlify/plugins-list-2.18.0" - sources."@netlify/routing-local-proxy-0.30.1" + sources."@netlify/plugins-list-2.18.1" + sources."@netlify/routing-local-proxy-0.30.2" (sources."@netlify/run-utils-1.0.7" // { dependencies = [ sources."execa-3.4.0" ]; }) - (sources."@netlify/zip-it-and-ship-it-4.5.1" // { + (sources."@netlify/zip-it-and-ship-it-4.8.0" // { dependencies = [ + sources."cliui-7.0.4" sources."cp-file-9.1.0" sources."pkg-dir-5.0.0" sources."resolve-2.0.0-next.3" + sources."y18n-5.0.8" sources."yargs-16.2.0" + sources."yargs-parser-20.2.9" ]; }) (sources."@nodelib/fs.scandir-2.1.5" // { @@ -94872,7 +94922,7 @@ in sources."array-union-2.1.0" sources."braces-3.0.2" sources."dir-glob-3.0.1" - sources."fast-glob-3.2.5" + sources."fast-glob-3.2.6" sources."fill-range-7.0.1" sources."glob-parent-5.1.2" sources."globby-11.0.4" @@ -94931,7 +94981,7 @@ in sources."supports-color-5.5.0" ]; }) - (sources."@oclif/plugin-plugins-1.10.0" // { + (sources."@oclif/plugin-plugins-1.10.1" // { dependencies = [ sources."fs-extra-9.1.0" sources."jsonfile-6.1.0" @@ -94948,18 +94998,18 @@ in ]; }) sources."@octokit/graphql-4.6.4" - sources."@octokit/openapi-types-7.3.2" - sources."@octokit/plugin-paginate-rest-2.13.5" + sources."@octokit/openapi-types-8.1.4" + sources."@octokit/plugin-paginate-rest-2.13.6" sources."@octokit/plugin-request-log-1.0.4" - sources."@octokit/plugin-rest-endpoint-methods-5.3.1" + sources."@octokit/plugin-rest-endpoint-methods-5.3.7" (sources."@octokit/request-5.6.0" // { dependencies = [ sources."is-plain-object-5.0.0" ]; }) sources."@octokit/request-error-2.1.0" - sources."@octokit/rest-18.6.0" - sources."@octokit/types-6.16.4" + sources."@octokit/rest-18.6.6" + sources."@octokit/types-6.17.4" sources."@rollup/plugin-babel-5.3.0" (sources."@rollup/plugin-commonjs-18.1.0" // { dependencies = [ @@ -94996,7 +95046,7 @@ in sources."@types/istanbul-reports-1.1.2" sources."@types/keyv-3.1.1" sources."@types/minimatch-3.0.4" - sources."@types/node-15.12.4" + sources."@types/node-15.14.0" sources."@types/node-fetch-2.5.10" sources."@types/normalize-package-data-2.4.0" sources."@types/resolve-1.17.1" @@ -95004,14 +95054,14 @@ in sources."@types/semver-7.3.6" sources."@types/yargs-13.0.11" sources."@types/yargs-parser-20.2.0" - sources."@typescript-eslint/types-4.28.0" - (sources."@typescript-eslint/typescript-estree-4.28.0" // { + sources."@typescript-eslint/types-4.28.1" + (sources."@typescript-eslint/typescript-estree-4.28.1" // { dependencies = [ sources."@nodelib/fs.stat-2.0.5" sources."array-union-2.1.0" sources."braces-3.0.2" sources."dir-glob-3.0.1" - sources."fast-glob-3.2.5" + sources."fast-glob-3.2.6" sources."fill-range-7.0.1" sources."glob-parent-5.1.2" sources."globby-11.0.4" @@ -95022,10 +95072,10 @@ in sources."to-regex-range-5.0.1" ]; }) - sources."@typescript-eslint/visitor-keys-4.28.0" + sources."@typescript-eslint/visitor-keys-4.28.1" sources."@ungap/from-entries-0.2.1" sources."accepts-1.3.7" - sources."acorn-8.4.0" + sources."acorn-8.4.1" sources."agent-base-6.0.2" sources."aggregate-error-3.1.0" sources."ajv-8.6.0" @@ -95085,13 +95135,6 @@ in sources."asynckit-0.4.0" sources."at-least-node-1.0.0" sources."atob-2.1.2" - (sources."aws-sdk-2.932.0" // { - dependencies = [ - sources."buffer-4.9.2" - sources."ieee754-1.1.13" - sources."uuid-3.3.2" - ]; - }) sources."babel-plugin-dynamic-import-node-2.3.3" (sources."babel-plugin-polyfill-corejs2-0.2.2" // { dependencies = [ @@ -95161,7 +95204,7 @@ in sources."call-me-maybe-1.0.1" sources."callsite-1.0.0" sources."camelcase-5.3.1" - sources."caniuse-lite-1.0.30001239" + sources."caniuse-lite-1.0.30001241" sources."cardinal-2.1.1" (sources."chalk-4.1.1" // { dependencies = [ @@ -95229,7 +95272,12 @@ in ]; }) sources."cli-width-2.2.1" - sources."cliui-7.0.4" + (sources."cliui-6.0.0" // { + dependencies = [ + sources."ansi-styles-4.3.0" + sources."wrap-ansi-6.2.0" + ]; + }) sources."clone-1.0.4" sources."clone-response-1.0.2" sources."code-point-at-1.1.0" @@ -95281,7 +95329,7 @@ in sources."safe-buffer-5.1.2" ]; }) - (sources."core-js-compat-3.15.1" // { + (sources."core-js-compat-3.15.2" // { dependencies = [ sources."semver-7.0.0" ]; @@ -95362,7 +95410,7 @@ in sources."array-union-2.1.0" sources."braces-3.0.2" sources."dir-glob-3.0.1" - sources."fast-glob-3.2.5" + sources."fast-glob-3.2.6" sources."fill-range-7.0.1" sources."glob-parent-5.1.2" sources."globby-11.0.4" @@ -95385,7 +95433,11 @@ in sources."detective-sass-3.0.1" sources."detective-scss-2.0.1" sources."detective-stylus-1.0.0" - sources."detective-typescript-7.0.0" + (sources."detective-typescript-7.0.0" // { + dependencies = [ + sources."typescript-3.9.10" + ]; + }) (sources."dir-glob-2.2.2" // { dependencies = [ sources."path-type-3.0.0" @@ -95423,7 +95475,7 @@ in }) sources."duplexer3-0.1.4" sources."ee-first-1.1.1" - sources."electron-to-chromium-1.3.755" + sources."electron-to-chromium-1.3.765" sources."elegant-spinner-1.0.1" sources."elf-cam-0.1.1" sources."emoji-regex-8.0.0" @@ -95450,7 +95502,6 @@ in sources."esutils-2.0.3" sources."etag-1.8.1" sources."eventemitter3-4.0.7" - sources."events-1.1.1" (sources."execa-5.1.1" // { dependencies = [ sources."get-stream-6.0.1" @@ -95613,7 +95664,7 @@ in sources."array-union-2.1.0" sources."braces-3.0.2" sources."dir-glob-3.0.1" - sources."fast-glob-3.2.5" + sources."fast-glob-3.2.6" sources."fill-range-7.0.1" sources."glob-parent-5.1.2" sources."ignore-5.1.8" @@ -95784,7 +95835,6 @@ in ]; }) sources."jest-worker-26.6.2" - sources."jmespath-0.15.0" sources."js-string-escape-1.0.1" sources."js-tokens-4.0.0" sources."js-yaml-4.1.0" @@ -95805,10 +95855,9 @@ in sources."keyv-3.1.0" sources."kind-of-6.0.3" sources."kuler-2.0.0" - (sources."lambda-local-1.7.4" // { + (sources."lambda-local-2.0.0" // { dependencies = [ - sources."commander-6.2.1" - sources."dotenv-8.6.0" + sources."commander-7.2.0" ]; }) sources."latest-version-5.1.0" @@ -95858,6 +95907,7 @@ in }) (sources."locate-path-6.0.0" // { dependencies = [ + sources."p-limit-3.1.0" sources."p-locate-5.0.0" ]; }) @@ -96092,12 +96142,8 @@ in }) sources."p-finally-2.0.1" sources."p-is-promise-1.1.0" - sources."p-limit-3.1.0" - (sources."p-locate-4.1.0" // { - dependencies = [ - sources."p-limit-2.3.0" - ]; - }) + sources."p-limit-2.3.0" + sources."p-locate-4.1.0" sources."p-map-4.0.0" sources."p-reduce-2.1.0" (sources."p-timeout-2.0.1" // { @@ -96184,7 +96230,6 @@ in sources."pupa-2.1.1" sources."qs-6.7.0" sources."query-string-5.1.1" - sources."querystring-0.2.0" sources."queue-microtask-1.2.3" sources."random-bytes-1.0.0" sources."randombytes-2.1.0" @@ -96247,7 +96292,7 @@ in sources."ret-0.1.15" sources."reusify-1.0.4" sources."rimraf-3.0.2" - sources."rollup-2.52.2" + sources."rollup-2.52.7" (sources."rollup-plugin-inject-3.0.2" // { dependencies = [ sources."estree-walker-0.6.1" @@ -96268,7 +96313,6 @@ in sources."safe-json-stringify-1.2.0" sources."safe-regex-1.1.0" sources."safer-buffer-2.1.2" - sources."sax-1.2.1" sources."seek-bzip-1.0.6" sources."semver-7.3.5" (sources."semver-diff-3.1.1" // { @@ -96433,7 +96477,7 @@ in ]; }) sources."term-size-2.2.1" - (sources."terser-5.7.0" // { + (sources."terser-5.7.1" // { dependencies = [ sources."source-map-0.7.3" ]; @@ -96475,7 +96519,7 @@ in sources."type-fest-0.21.3" sources."type-is-1.6.18" sources."typedarray-to-buffer-3.1.5" - sources."typescript-3.9.10" + sources."typescript-4.3.5" sources."uid-safe-2.1.5" sources."unbzip2-stream-1.4.3" sources."unicode-canonical-property-names-ecmascript-1.0.4" @@ -96516,11 +96560,6 @@ in }) sources."uri-js-4.4.1" sources."urix-0.1.0" - (sources."url-0.10.3" // { - dependencies = [ - sources."punycode-1.3.2" - ]; - }) sources."url-parse-lax-3.0.0" sources."url-to-options-1.0.1" sources."use-3.1.1" @@ -96576,23 +96615,16 @@ in sources."wrappy-1.0.2" sources."write-file-atomic-3.0.3" sources."xdg-basedir-4.0.0" - sources."xml2js-0.4.19" - sources."xmlbuilder-9.0.7" sources."xtend-4.0.2" - sources."y18n-5.0.8" + sources."y18n-4.0.3" sources."yallist-4.0.0" (sources."yargs-15.4.1" // { dependencies = [ - sources."ansi-styles-4.3.0" - sources."cliui-6.0.0" sources."find-up-4.1.0" sources."locate-path-5.0.0" - sources."wrap-ansi-6.2.0" - sources."y18n-4.0.3" - sources."yargs-parser-18.1.3" ]; }) - sources."yargs-parser-20.2.9" + sources."yargs-parser-18.1.3" sources."yarn-1.22.10" sources."yauzl-2.10.0" sources."yocto-queue-0.1.0" @@ -97436,7 +97468,7 @@ in sources."ms-2.1.2" sources."readable-stream-3.6.0" sources."string_decoder-1.3.0" - sources."ws-7.5.0" + sources."ws-7.5.1" ]; }) (sources."mqtt-packet-6.10.0" // { @@ -97823,10 +97855,10 @@ in nodemon = nodeEnv.buildNodePackage { name = "nodemon"; packageName = "nodemon"; - version = "2.0.7"; + version = "2.0.9"; src = fetchurl { - url = "https://registry.npmjs.org/nodemon/-/nodemon-2.0.7.tgz"; - sha512 = "XHzK69Awgnec9UzHr1kc8EomQh4sjTQ8oRf8TsGrSmHDx9/UmiGG9E/mM3BuTfNeFwdNBvrqQq/RHL0xIeyFOA=="; + url = "https://registry.npmjs.org/nodemon/-/nodemon-2.0.9.tgz"; + sha512 = "6O4k7C8f2HQArGpaPBOqGGddjzDLQAqCYmq3tKMeNIbz7Is/hOphMHy2dcY10sSq5wl3cqyn9Iz+Ep2j51JOLg=="; }; dependencies = [ sources."@sindresorhus/is-0.14.0" @@ -98019,7 +98051,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-15.12.4" + sources."@types/node-15.14.0" sources."@types/normalize-package-data-2.4.0" sources."@types/parse-json-4.0.0" sources."@types/responselike-1.0.0" @@ -98114,7 +98146,7 @@ in sources."escape-string-regexp-4.0.0" sources."execa-5.1.1" sources."external-editor-3.1.0" - sources."fast-glob-3.2.5" + sources."fast-glob-3.2.6" sources."fastq-1.11.0" (sources."figures-3.2.0" // { dependencies = [ @@ -98523,10 +98555,10 @@ in npm = nodeEnv.buildNodePackage { name = "npm"; packageName = "npm"; - version = "7.18.1"; + version = "7.19.1"; src = fetchurl { - url = "https://registry.npmjs.org/npm/-/npm-7.18.1.tgz"; - sha512 = "fu7rMtc4ZaDnFlZsiLhqwWWs6KixOcBGiBLoJH+AbuaznwtT8mYQnq5nGNN14Jib+E9OjkjNRgg+X45Ia9xtKQ=="; + url = "https://registry.npmjs.org/npm/-/npm-7.19.1.tgz"; + sha512 = "aN3hZzGkPzKOyhjXtOhnQTGumorFhgpOU6xfuQsF1nJKh4DhsgfOMG4s/SNx56r4xHPvM5m/sk914wzDgKba3A=="; }; buildInputs = globalBuildInputs; meta = { @@ -98646,7 +98678,7 @@ in sources."extend-3.0.2" sources."extsprintf-1.3.0" sources."fast-deep-equal-3.1.3" - sources."fast-glob-3.2.5" + sources."fast-glob-3.2.6" sources."fast-json-stable-stringify-2.1.0" sources."fastq-1.11.0" sources."figgy-pudding-3.5.2" @@ -99370,7 +99402,7 @@ in sources."caller-path-2.0.0" sources."callsites-2.0.0" sources."caniuse-api-3.0.0" - sources."caniuse-lite-1.0.30001239" + sources."caniuse-lite-1.0.30001241" sources."caseless-0.12.0" sources."chalk-2.4.2" sources."chokidar-2.1.8" @@ -99397,7 +99429,7 @@ in sources."convert-source-map-1.8.0" sources."copy-descriptor-0.1.1" sources."core-js-2.6.12" - (sources."core-js-compat-3.15.1" // { + (sources."core-js-compat-3.15.2" // { dependencies = [ sources."semver-7.0.0" ]; @@ -99508,7 +99540,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.755" + sources."electron-to-chromium-1.3.765" (sources."elliptic-6.5.4" // { dependencies = [ sources."bn.js-4.12.0" @@ -99616,7 +99648,7 @@ in sources."posthtml-0.15.2" sources."posthtml-parser-0.7.2" sources."source-map-0.7.3" - sources."terser-5.7.0" + sources."terser-5.7.1" ]; }) (sources."htmlparser2-6.1.0" // { @@ -100379,7 +100411,7 @@ in sources."tunnel-agent-0.6.0" sources."tweetnacl-0.14.5" sources."type-is-1.6.18" - sources."uglify-js-3.13.9" + sources."uglify-js-3.13.10" sources."unix-dgram-2.0.4" sources."unpipe-1.0.0" sources."uri-js-4.4.1" @@ -101164,6 +101196,194 @@ in bypassCache = true; reconstructLock = true; }; + pkg = nodeEnv.buildNodePackage { + name = "pkg"; + packageName = "pkg"; + version = "5.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/pkg/-/pkg-5.3.0.tgz"; + sha512 = "/DGG+QcSPraMAIxaoGCNqb2A6Xkm2jBQMsj2mjb4ag236ByTY9Xhpikvj5ixwlSQV0euuJw4fphKCd5YHRPS8w=="; + }; + dependencies = [ + sources."@babel/helper-validator-identifier-7.14.5" + sources."@babel/parser-7.13.13" + sources."@babel/types-7.13.12" + sources."@nodelib/fs.scandir-2.1.5" + sources."@nodelib/fs.stat-2.0.5" + sources."@nodelib/fs.walk-1.2.7" + sources."agent-base-6.0.2" + sources."ansi-regex-5.0.0" + sources."ansi-styles-4.3.0" + sources."aproba-1.2.0" + sources."are-we-there-yet-1.1.5" + sources."array-union-2.1.0" + sources."at-least-node-1.0.0" + sources."base64-js-1.5.1" + (sources."bl-4.1.0" // { + dependencies = [ + sources."readable-stream-3.6.0" + ]; + }) + sources."braces-3.0.2" + sources."buffer-5.7.1" + sources."chalk-4.1.1" + sources."chownr-1.1.4" + sources."cliui-7.0.4" + sources."code-point-at-1.1.0" + sources."color-convert-2.0.1" + sources."color-name-1.1.4" + sources."console-control-strings-1.1.0" + sources."core-util-is-1.0.2" + sources."debug-4.3.2" + sources."decompress-response-4.2.1" + sources."deep-extend-0.6.0" + sources."deep-is-0.1.3" + sources."delegates-1.0.0" + sources."detect-libc-1.0.3" + sources."dir-glob-3.0.1" + sources."emoji-regex-8.0.0" + sources."end-of-stream-1.4.4" + sources."escalade-3.1.1" + sources."escodegen-2.0.0" + sources."esprima-4.0.1" + sources."estraverse-5.2.0" + sources."esutils-2.0.3" + sources."expand-template-2.0.3" + sources."fast-glob-3.2.6" + sources."fast-levenshtein-2.0.6" + sources."fastq-1.11.0" + sources."fill-range-7.0.1" + sources."from2-2.3.0" + sources."fs-constants-1.0.0" + sources."fs-extra-9.1.0" + sources."function-bind-1.1.1" + (sources."gauge-2.7.4" // { + dependencies = [ + sources."ansi-regex-2.1.1" + sources."is-fullwidth-code-point-1.0.0" + sources."string-width-1.0.2" + sources."strip-ansi-3.0.1" + ]; + }) + sources."get-caller-file-2.0.5" + sources."github-from-package-0.0.0" + sources."glob-parent-5.1.2" + sources."globby-11.0.4" + sources."graceful-fs-4.2.6" + sources."has-1.0.3" + sources."has-flag-4.0.0" + sources."has-unicode-2.0.1" + sources."https-proxy-agent-5.0.0" + sources."ieee754-1.2.1" + sources."ignore-5.1.8" + sources."inherits-2.0.4" + sources."ini-1.3.8" + sources."into-stream-6.0.0" + sources."is-core-module-2.4.0" + sources."is-extglob-2.1.1" + sources."is-fullwidth-code-point-3.0.0" + sources."is-glob-4.0.1" + sources."is-number-7.0.0" + sources."isarray-1.0.0" + sources."jsonfile-6.1.0" + sources."levn-0.3.0" + sources."lodash-4.17.21" + sources."lru-cache-6.0.0" + sources."merge2-1.4.1" + sources."micromatch-4.0.4" + sources."mimic-response-2.1.0" + sources."minimist-1.2.5" + sources."mkdirp-classic-0.5.3" + sources."ms-2.1.2" + (sources."multistream-4.1.0" // { + dependencies = [ + sources."readable-stream-3.6.0" + ]; + }) + sources."napi-build-utils-1.0.2" + (sources."node-abi-2.30.0" // { + dependencies = [ + sources."semver-5.7.1" + ]; + }) + sources."node-fetch-2.6.1" + sources."noop-logger-0.1.1" + sources."npmlog-4.1.2" + sources."number-is-nan-1.0.1" + sources."object-assign-4.1.1" + sources."once-1.4.0" + sources."optionator-0.8.3" + sources."p-is-promise-3.0.0" + sources."path-parse-1.0.7" + sources."path-type-4.0.0" + sources."picomatch-2.3.0" + sources."pkg-fetch-3.1.1" + sources."prebuild-install-6.0.1" + sources."prelude-ls-1.1.2" + sources."process-nextick-args-2.0.1" + sources."progress-2.0.3" + sources."pump-3.0.0" + sources."queue-microtask-1.2.3" + sources."rc-1.2.8" + sources."readable-stream-2.3.7" + sources."require-directory-2.1.1" + sources."resolve-1.20.0" + sources."reusify-1.0.4" + sources."run-parallel-1.2.0" + sources."safe-buffer-5.1.2" + sources."semver-7.3.5" + sources."set-blocking-2.0.0" + sources."signal-exit-3.0.3" + sources."simple-concat-1.0.1" + sources."simple-get-3.1.0" + sources."slash-3.0.0" + sources."source-map-0.6.1" + sources."stream-meter-1.0.4" + sources."string-width-4.2.2" + sources."string_decoder-1.1.1" + sources."strip-ansi-6.0.0" + sources."strip-json-comments-2.0.1" + sources."supports-color-7.2.0" + sources."tar-fs-2.1.1" + (sources."tar-stream-2.2.0" // { + dependencies = [ + sources."readable-stream-3.6.0" + ]; + }) + sources."to-fast-properties-2.0.0" + sources."to-regex-range-5.0.1" + sources."tslib-2.1.0" + sources."tunnel-agent-0.6.0" + sources."type-check-0.3.2" + sources."universalify-2.0.0" + sources."util-deprecate-1.0.2" + sources."which-pm-runs-1.0.0" + (sources."wide-align-1.1.3" // { + dependencies = [ + sources."ansi-regex-3.0.0" + sources."is-fullwidth-code-point-2.0.0" + sources."string-width-2.1.1" + sources."strip-ansi-4.0.0" + ]; + }) + sources."word-wrap-1.2.3" + sources."wrap-ansi-7.0.0" + sources."wrappy-1.0.2" + sources."y18n-5.0.8" + sources."yallist-4.0.0" + sources."yargs-16.2.0" + sources."yargs-parser-20.2.9" + ]; + buildInputs = globalBuildInputs; + meta = { + description = "Package your Node.js project into an executable"; + homepage = "https://github.com/vercel/pkg#readme"; + license = "MIT"; + }; + production = true; + bypassCache = true; + reconstructLock = true; + }; pm2 = nodeEnv.buildNodePackage { name = "pm2"; packageName = "pm2"; @@ -101397,10 +101617,10 @@ in pnpm = nodeEnv.buildNodePackage { name = "pnpm"; packageName = "pnpm"; - version = "6.9.0"; + version = "6.9.1"; src = fetchurl { - url = "https://registry.npmjs.org/pnpm/-/pnpm-6.9.0.tgz"; - sha512 = "PYB3AujuDut50PAe7m8jAggruh0D8/Zm+nO2QprVfG1Xug1zAOsMMJEc+wjvEC9irFwT20Qu4qvr+lEiXyK1HA=="; + url = "https://registry.npmjs.org/pnpm/-/pnpm-6.9.1.tgz"; + sha512 = "2qlbvmHB+ULAoTCMpJ75oADYoVQnsxD1ipCemdDJA2KW4auGwoTUzyowVYEiAe4DIDOqw3axhHVkNAo7P6goZA=="; }; buildInputs = globalBuildInputs; meta = { @@ -101469,7 +101689,7 @@ in sources."dir-glob-3.0.1" sources."emoji-regex-8.0.0" sources."escalade-3.1.1" - sources."fast-glob-3.2.5" + sources."fast-glob-3.2.6" sources."fastq-1.11.0" sources."fill-range-7.0.1" sources."fs-extra-9.1.0" @@ -101536,10 +101756,10 @@ in prettier = nodeEnv.buildNodePackage { name = "prettier"; packageName = "prettier"; - version = "2.3.1"; + version = "2.3.2"; src = fetchurl { - url = "https://registry.npmjs.org/prettier/-/prettier-2.3.1.tgz"; - sha512 = "p+vNbgpLjif/+D+DwAZAbndtRrR0md0MwfmOVN9N+2RgyACMT+7tfaRnT+WDPkqnuVwleyuBIG2XBxKDme3hPA=="; + url = "https://registry.npmjs.org/prettier/-/prettier-2.3.2.tgz"; + sha512 = "lnJzDfJ66zkMy58OL5/NY5zp70S7Nz6KqcKkXYzn2tMVrNxvbqaBpg7H3qHaLxCJ5lNMsGuM8+ohS7cZrthdLQ=="; }; buildInputs = globalBuildInputs; meta = { @@ -101922,10 +102142,10 @@ in pyright = nodeEnv.buildNodePackage { name = "pyright"; packageName = "pyright"; - version = "1.1.151"; + version = "1.1.154"; src = fetchurl { - url = "https://registry.npmjs.org/pyright/-/pyright-1.1.151.tgz"; - sha512 = "R/Zr6VqXghuFLm7y3a8HoCrA+mfy+Zp+mp6P8gFZeJO9Rl1kQLJhfc/y4QKSQHZWxXOBGo+AFDi/rWLZfNBEgQ=="; + url = "https://registry.npmjs.org/pyright/-/pyright-1.1.154.tgz"; + sha512 = "J2P5Iurkl7smCyB8CH5fsm8GOGeKRk7d1HWcFiro94E0vJW/5sSKXrkfjPxo7XZ+e96UiW1qyiVTCC++db3Tfg=="; }; buildInputs = globalBuildInputs; meta = { @@ -102408,7 +102628,7 @@ in sources."@types/glob-7.1.3" sources."@types/json-schema-7.0.7" sources."@types/minimatch-3.0.4" - sources."@types/node-15.12.4" + sources."@types/node-15.14.0" sources."@types/parse-json-4.0.0" sources."@types/q-1.5.4" sources."@webassemblyjs/ast-1.9.0" @@ -102596,7 +102816,7 @@ in sources."camel-case-3.0.0" sources."camelcase-5.3.1" sources."caniuse-api-3.0.0" - sources."caniuse-lite-1.0.30001239" + sources."caniuse-lite-1.0.30001241" sources."case-sensitive-paths-webpack-plugin-2.4.0" sources."caw-2.0.1" (sources."chalk-2.4.2" // { @@ -102681,7 +102901,7 @@ in sources."copy-concurrently-1.0.5" sources."copy-descriptor-0.1.1" sources."core-js-2.6.12" - (sources."core-js-compat-3.15.1" // { + (sources."core-js-compat-3.15.2" // { dependencies = [ sources."semver-7.0.0" ]; @@ -102825,7 +103045,7 @@ in sources."duplexify-3.7.1" sources."ee-first-1.1.1" sources."ejs-2.7.4" - sources."electron-to-chromium-1.3.755" + sources."electron-to-chromium-1.3.765" (sources."elliptic-6.5.4" // { dependencies = [ sources."bn.js-4.12.0" @@ -104082,7 +104302,7 @@ in sources."@mozilla/readability-0.4.1" sources."@tootallnate/once-1.1.2" sources."abab-2.0.5" - sources."acorn-8.4.0" + sources."acorn-8.4.1" (sources."acorn-globals-6.0.0" // { dependencies = [ sources."acorn-7.4.1" @@ -104106,7 +104326,7 @@ in }) sources."data-urls-2.0.0" sources."debug-4.3.2" - sources."decimal.js-10.3.0" + sources."decimal.js-10.3.1" sources."deep-is-0.1.3" sources."delayed-stream-1.0.0" (sources."domexception-2.0.1" // { @@ -104158,10 +104378,10 @@ in sources."webidl-conversions-6.1.0" sources."whatwg-encoding-1.0.5" sources."whatwg-mimetype-2.3.0" - sources."whatwg-url-8.6.0" + sources."whatwg-url-8.7.0" sources."word-wrap-1.2.3" sources."wrap-ansi-7.0.0" - sources."ws-7.5.0" + sources."ws-7.5.1" sources."xml-name-validator-3.0.0" sources."xmlchars-2.2.0" sources."y18n-5.0.8" @@ -104211,15 +104431,15 @@ in sources."@emotion/stylis-0.8.5" sources."@emotion/unitless-0.7.5" sources."@exodus/schemasafe-1.0.0-rc.3" - sources."@redocly/ajv-6.12.4" - (sources."@redocly/openapi-core-1.0.0-beta.50" // { + sources."@redocly/ajv-8.6.2" + (sources."@redocly/openapi-core-1.0.0-beta.53" // { dependencies = [ sources."@types/node-14.17.4" ]; }) sources."@redocly/react-dropdown-aria-2.0.12" sources."@types/json-schema-7.0.7" - sources."@types/node-15.12.4" + sources."@types/node-15.14.0" sources."ansi-regex-5.0.0" sources."ansi-styles-3.2.1" sources."anymatch-3.1.2" @@ -104234,7 +104454,7 @@ in sources."util-0.10.3" ]; }) - sources."babel-plugin-styled-components-1.12.0" + sources."babel-plugin-styled-components-1.13.1" sources."babel-plugin-syntax-jsx-6.18.0" sources."balanced-match-1.0.2" sources."base64-js-1.5.1" @@ -104267,7 +104487,6 @@ in sources."chokidar-3.5.2" sources."cipher-base-1.0.4" sources."classnames-2.3.1" - sources."clipboard-2.0.8" sources."cliui-7.0.4" sources."clsx-1.1.1" sources."color-convert-1.9.3" @@ -104289,7 +104508,6 @@ in sources."css-to-react-native-3.0.0" sources."debug-4.3.2" sources."decko-1.2.0" - sources."delegate-3.2.0" sources."des.js-1.0.1" (sources."diffie-hellman-5.0.3" // { dependencies = [ @@ -104313,7 +104531,6 @@ in sources."events-3.3.0" sources."evp_bytestokey-1.0.3" sources."fast-deep-equal-3.1.3" - sources."fast-json-stable-stringify-2.1.0" sources."fast-safe-stringify-2.0.7" sources."fill-range-7.0.1" sources."foreach-2.0.5" @@ -104321,7 +104538,6 @@ in sources."get-caller-file-2.0.5" sources."glob-parent-5.1.2" sources."globals-11.12.0" - sources."good-listener-1.2.2" sources."handlebars-4.7.7" sources."has-flag-3.0.0" (sources."hash-base-3.1.0" // { @@ -104352,7 +104568,7 @@ in sources."js-yaml-3.14.1" sources."jsesc-2.5.2" sources."json-pointer-0.6.1" - sources."json-schema-traverse-0.4.1" + sources."json-schema-traverse-1.0.0" sources."lodash-4.17.21" sources."lodash.isequal-4.5.0" sources."loose-envify-1.4.0" @@ -104387,7 +104603,7 @@ in sources."oas-schema-walker-1.1.5" sources."oas-validator-5.0.7" sources."object-assign-4.1.1" - sources."openapi-sampler-1.0.1" + sources."openapi-sampler-1.1.0" sources."os-browserify-0.3.0" sources."pako-1.0.11" sources."parse-asn1-5.1.6" @@ -104397,7 +104613,7 @@ in sources."picomatch-2.3.0" sources."polished-4.1.3" sources."postcss-value-parser-4.1.0" - sources."prismjs-1.23.0" + sources."prismjs-1.24.0" sources."process-0.11.10" sources."process-nextick-args-2.0.1" sources."prop-types-15.7.2" @@ -104432,11 +104648,11 @@ in sources."reftools-1.1.8" sources."regenerator-runtime-0.13.8" sources."require-directory-2.1.1" + sources."require-from-string-2.0.2" sources."ripemd160-2.0.2" sources."safe-buffer-5.2.1" sources."safer-buffer-2.1.2" sources."scheduler-0.20.2" - sources."select-1.1.2" sources."setimmediate-1.0.5" sources."sha.js-2.4.11" sources."shallowequal-1.1.0" @@ -104459,12 +104675,11 @@ in sources."supports-color-5.5.0" sources."swagger2openapi-7.0.7" sources."timers-browserify-2.0.12" - sources."tiny-emitter-2.1.0" sources."to-arraybuffer-1.0.1" sources."to-fast-properties-2.0.0" sources."to-regex-range-5.0.1" sources."tty-browserify-0.0.0" - sources."uglify-js-3.13.9" + sources."uglify-js-3.13.10" (sources."uri-js-4.4.1" // { dependencies = [ sources."punycode-2.1.1" @@ -104700,10 +104915,10 @@ in rollup = nodeEnv.buildNodePackage { name = "rollup"; packageName = "rollup"; - version = "2.52.2"; + version = "2.52.7"; src = fetchurl { - url = "https://registry.npmjs.org/rollup/-/rollup-2.52.2.tgz"; - sha512 = "4RlFC3k2BIHlUsJ9mGd8OO+9Lm2eDF5P7+6DNQOp5sx+7N/1tFM01kELfbxlMX3MxT6owvLB1ln4S3QvvQlbUA=="; + url = "https://registry.npmjs.org/rollup/-/rollup-2.52.7.tgz"; + sha512 = "55cSH4CCU6MaPr9TAOyrIC+7qFCHscL7tkNsm1MBfIJRRqRbCEY0mmeFn4Wg8FKsHtEH8r389Fz38r/o+kgXLg=="; }; dependencies = [ sources."fsevents-2.3.2" @@ -104757,13 +104972,13 @@ in sources."@types/node-fetch-2.5.10" sources."@types/resolve-1.17.1" sources."@types/vscode-1.57.0" - sources."@typescript-eslint/eslint-plugin-4.28.0" - sources."@typescript-eslint/experimental-utils-4.28.0" - sources."@typescript-eslint/parser-4.28.0" - sources."@typescript-eslint/scope-manager-4.28.0" - sources."@typescript-eslint/types-4.28.0" - sources."@typescript-eslint/typescript-estree-4.28.0" - sources."@typescript-eslint/visitor-keys-4.28.0" + sources."@typescript-eslint/eslint-plugin-4.28.1" + sources."@typescript-eslint/experimental-utils-4.28.1" + sources."@typescript-eslint/parser-4.28.1" + sources."@typescript-eslint/scope-manager-4.28.1" + sources."@typescript-eslint/types-4.28.1" + sources."@typescript-eslint/typescript-estree-4.28.1" + sources."@typescript-eslint/visitor-keys-4.28.1" sources."@ungap/promise-all-settled-1.1.2" sources."acorn-7.4.1" sources."acorn-jsx-5.3.1" @@ -104878,7 +105093,7 @@ in sources."estree-walker-2.0.2" sources."esutils-2.0.3" sources."fast-deep-equal-3.1.3" - sources."fast-glob-3.2.5" + sources."fast-glob-3.2.6" sources."fast-json-stable-stringify-2.1.0" sources."fast-levenshtein-2.0.6" sources."fastq-1.11.0" @@ -104888,7 +105103,7 @@ in sources."find-up-5.0.0" sources."flat-5.0.2" sources."flat-cache-3.0.4" - sources."flatted-3.1.1" + sources."flatted-3.2.0" sources."form-data-3.0.1" sources."fs.realpath-1.0.0" sources."fsevents-2.3.2" @@ -105027,7 +105242,7 @@ in sources."resolve-from-4.0.0" sources."reusify-1.0.4" sources."rimraf-3.0.2" - sources."rollup-2.52.2" + sources."rollup-2.52.7" sources."run-parallel-1.2.0" sources."safe-buffer-5.2.1" sources."semver-7.3.5" @@ -105076,7 +105291,7 @@ in sources."type-check-0.4.0" sources."type-fest-0.20.2" sources."typed-rest-client-1.8.4" - sources."typescript-4.3.4" + sources."typescript-4.3.5" sources."typescript-formatter-7.2.2" sources."uc.micro-1.0.6" sources."underscore-1.13.1" @@ -105142,19 +105357,12 @@ in sha1 = "c8fa1fffb8258ce68adf75df73f90fbb6f23d198"; }; dependencies = [ - sources."ajv-6.12.6" - sources."asn1-0.2.4" - sources."assert-plus-1.0.0" - sources."asynckit-0.4.0" sources."aws-sdk-1.18.0" - sources."aws-sign2-0.7.0" - sources."aws4-1.11.0" - sources."bcrypt-pbkdf-1.0.2" + sources."axios-0.21.1" sources."buffer-crc32-0.2.1" sources."bytes-0.2.1" - sources."caseless-0.12.0" + sources."call-bind-1.0.2" sources."coffee-script-1.6.3" - sources."combined-stream-1.0.8" sources."commander-2.0.0" (sources."connect-2.11.0" // { dependencies = [ @@ -105166,10 +105374,7 @@ in sources."core-util-is-1.0.2" sources."crc-0.2.0" sources."crypto-0.0.3" - sources."dashdash-1.14.1" sources."debug-4.3.2" - sources."delayed-stream-1.0.0" - sources."ecc-jsbn-0.1.2" sources."events.node-0.4.9" (sources."everyauth-0.4.5" // { dependencies = [ @@ -105188,33 +105393,19 @@ in sources."commander-1.3.2" ]; }) - sources."extend-3.0.2" - sources."extsprintf-1.3.0" - sources."fast-deep-equal-3.1.3" - sources."fast-json-stable-stringify-2.1.0" - sources."forever-agent-0.6.1" - sources."form-data-2.3.3" + sources."follow-redirects-1.14.1" sources."formidable-1.0.11" sources."fresh-0.2.0" - sources."getpass-0.1.7" - sources."har-schema-2.0.0" - sources."har-validator-5.1.5" + sources."function-bind-1.1.1" + sources."get-intrinsic-1.1.1" + sources."has-1.0.3" + sources."has-symbols-1.0.2" sources."http-auth-2.0.7" - sources."http-signature-1.2.0" sources."inherits-2.0.4" - sources."is-typedarray-1.0.0" sources."isarray-0.0.1" - sources."isstream-0.1.2" - sources."jsbn-0.1.1" - sources."json-schema-0.2.3" - sources."json-schema-traverse-0.4.1" - sources."json-stringify-safe-5.0.1" - sources."jsprim-1.4.1" sources."keypress-0.1.0" sources."methods-0.1.0" sources."mime-1.2.11" - sources."mime-db-1.48.0" - sources."mime-types-2.1.31" sources."mkdirp-0.3.5" sources."ms-2.1.2" sources."multiparty-2.2.0" @@ -105223,38 +105414,26 @@ in sources."node-uuid-1.4.1" sources."node-wsfederation-0.1.1" sources."oauth-https://github.com/ciaranj/node-oauth/tarball/master" - sources."oauth-sign-0.9.0" - (sources."openid-2.0.8" // { + sources."object-inspect-1.10.3" + (sources."openid-2.0.9" // { dependencies = [ - sources."qs-6.5.2" - sources."request-2.88.2" + sources."qs-6.10.1" ]; }) sources."pause-0.0.1" - sources."performance-now-2.1.0" - sources."psl-1.8.0" - sources."punycode-2.1.1" sources."qs-0.6.5" sources."range-parser-0.0.4" sources."raw-body-0.0.3" sources."readable-stream-1.1.14" sources."request-2.9.203" - sources."safe-buffer-5.2.1" - sources."safer-buffer-2.1.2" sources."sax-1.2.4" sources."send-0.1.4" - sources."sshpk-1.16.1" + sources."side-channel-1.0.4" sources."stream-counter-0.2.0" sources."string-1.6.1" sources."string_decoder-0.10.31" - sources."tough-cookie-2.5.0" - sources."tunnel-agent-0.6.0" - sources."tweetnacl-0.14.5" sources."uid2-0.0.3" - sources."uri-js-4.4.1" sources."util-0.4.9" - sources."uuid-3.4.0" - sources."verror-1.10.0" sources."xml2js-0.2.4" sources."xmlbuilder-0.4.2" ]; @@ -105441,10 +105620,10 @@ in serverless = nodeEnv.buildNodePackage { name = "serverless"; packageName = "serverless"; - version = "2.48.0"; + version = "2.50.0"; src = fetchurl { - url = "https://registry.npmjs.org/serverless/-/serverless-2.48.0.tgz"; - sha512 = "1CGCKr+7226psdyuGYFC54khCMUUBlLt2QPEAZtY00ZHMy8yOxvjMXAdfHAVnCdo+YH419MW3jFJhGuwVUsDyw=="; + url = "https://registry.npmjs.org/serverless/-/serverless-2.50.0.tgz"; + sha512 = "9n2Afh0vEI6guDAue3Fm1Xu1B7i7zVR+LC37AHUhhmAxYRu0hH6ao1ERdrgUhHbzmV2P42yLRD0osB4alrp8gw=="; }; dependencies = [ sources."2-thenable-1.0.0" @@ -105477,7 +105656,7 @@ in ]; }) sources."@serverless/component-metrics-1.0.8" - (sources."@serverless/components-3.12.0" // { + (sources."@serverless/components-3.13.2" // { dependencies = [ (sources."@serverless/utils-4.1.0" // { dependencies = [ @@ -105505,7 +105684,7 @@ in sources."semver-6.3.0" ]; }) - sources."@serverless/dashboard-plugin-5.4.2" + sources."@serverless/dashboard-plugin-5.4.3" sources."@serverless/event-mocks-1.1.1" (sources."@serverless/platform-client-4.2.3" // { dependencies = [ @@ -105513,7 +105692,7 @@ in sources."js-yaml-3.14.1" ]; }) - (sources."@serverless/platform-client-china-2.1.14" // { + (sources."@serverless/platform-client-china-2.1.17" // { dependencies = [ sources."dotenv-8.6.0" sources."js-yaml-3.14.1" @@ -105527,7 +105706,7 @@ in sources."write-file-atomic-3.0.3" ]; }) - sources."@serverless/utils-china-1.1.2" + sources."@serverless/utils-china-1.1.4" sources."@sindresorhus/is-0.14.0" sources."@szmarczak/http-timer-1.1.2" sources."@tencent-sdk/capi-1.1.8" @@ -105541,12 +105720,12 @@ in sources."@tokenizer/token-0.1.1" sources."@types/cacheable-request-6.0.1" sources."@types/caseless-0.12.2" - sources."@types/debug-4.1.5" + sources."@types/debug-4.1.6" sources."@types/http-cache-semantics-4.0.0" sources."@types/keyv-3.1.1" sources."@types/lodash-4.14.170" sources."@types/long-4.0.1" - sources."@types/node-15.12.4" + sources."@types/node-15.14.0" sources."@types/readable-stream-2.3.10" sources."@types/request-2.48.5" sources."@types/request-promise-native-1.0.17" @@ -105608,7 +105787,7 @@ in sources."async-2.6.3" sources."asynckit-0.4.0" sources."at-least-node-1.0.0" - (sources."aws-sdk-2.932.0" // { + (sources."aws-sdk-2.938.0" // { dependencies = [ sources."buffer-4.9.2" sources."ieee754-1.1.13" @@ -105698,6 +105877,13 @@ in ]; }) sources."cli-cursor-3.1.0" + (sources."cli-progress-footer-1.1.1" // { + dependencies = [ + sources."ansi-regex-2.1.1" + sources."cli-color-1.4.0" + sources."process-utils-2.6.0" + ]; + }) sources."cli-width-3.0.0" sources."clone-response-1.0.2" sources."code-point-at-1.1.0" @@ -105821,7 +106007,7 @@ in sources."external-editor-3.1.0" sources."extsprintf-1.3.0" sources."fast-deep-equal-3.1.3" - sources."fast-glob-3.2.5" + sources."fast-glob-3.2.6" sources."fast-json-stable-stringify-2.1.0" sources."fast-safe-stringify-2.0.7" sources."fastest-levenshtein-1.0.12" @@ -105833,7 +106019,7 @@ in sources."file-uri-to-path-1.0.0" sources."filename-reserved-regex-2.0.0" sources."filenamify-4.3.0" - sources."filesize-6.3.0" + sources."filesize-6.4.0" sources."fill-range-7.0.1" sources."find-requires-1.0.0" sources."flat-5.0.2" @@ -106091,6 +106277,7 @@ in sources."prettyoutput-1.2.0" sources."printj-1.1.2" sources."process-nextick-args-2.0.1" + sources."process-utils-4.0.0" sources."promise-queue-2.2.5" (sources."protobufjs-6.11.2" // { dependencies = [ @@ -106168,7 +106355,7 @@ in sources."sort-keys-length-1.0.1" sources."split2-3.2.2" sources."sprintf-js-1.0.3" - sources."sprintf-kit-2.0.0" + sources."sprintf-kit-2.0.1" sources."sshpk-1.16.1" sources."stack-trace-0.0.10" sources."stealthy-require-1.1.1" @@ -106305,7 +106492,7 @@ in }) sources."wrappy-1.0.2" sources."write-file-atomic-2.4.3" - sources."ws-7.5.0" + sources."ws-7.5.1" sources."xml2js-0.4.19" sources."xmlbuilder-9.0.7" sources."xmlhttprequest-ssl-1.6.3" @@ -106954,10 +107141,10 @@ in snyk = nodeEnv.buildNodePackage { name = "snyk"; packageName = "snyk"; - version = "1.642.0"; + version = "1.653.0"; src = fetchurl { - url = "https://registry.npmjs.org/snyk/-/snyk-1.642.0.tgz"; - sha512 = "rrEZuPD1olFg8+MoNAHXeS+HuPQE/RpL4R2Yhizg/NIzYd/PC2peNx0jOOywqqqRseQY8Vhyr19KIrriFEIFJg=="; + url = "https://registry.npmjs.org/snyk/-/snyk-1.653.0.tgz"; + sha512 = "AFIsk1kgE9eQ+s31X9+b967us36UyHNes3VnHhgiVPX8YCq+uAPGNDV2rIaWDY/7c0yCtfOmFLD3mI5WxpJmdA=="; }; dependencies = [ sources."@arcanis/slice-ansi-1.0.2" @@ -106970,18 +107157,18 @@ in sources."@sindresorhus/is-4.0.1" sources."@snyk/child-process-0.3.1" sources."@snyk/cli-interface-2.11.0" - sources."@snyk/cloud-config-parser-1.9.2" + sources."@snyk/cloud-config-parser-1.9.3" sources."@snyk/cocoapods-lockfile-parser-3.6.2" sources."@snyk/code-client-3.9.0" sources."@snyk/composer-lockfile-parser-1.4.1" - (sources."@snyk/dep-graph-1.28.0" // { + (sources."@snyk/dep-graph-1.28.1" // { dependencies = [ sources."semver-7.3.5" ]; }) sources."@snyk/docker-registry-v2-client-2.2.2" sources."@snyk/fast-glob-3.2.6-patch" - (sources."@snyk/fix-1.642.0" // { + (sources."@snyk/fix-1.650.0" // { dependencies = [ sources."chalk-4.1.1" sources."strip-ansi-6.0.0" @@ -107036,7 +107223,7 @@ in }) sources."@szmarczak/http-timer-4.0.5" sources."@types/cacheable-request-6.0.1" - sources."@types/debug-4.1.5" + sources."@types/debug-4.1.6" sources."@types/emscripten-1.39.4" sources."@types/flat-cache-2.0.0" sources."@types/graphlib-2.1.7" @@ -107163,7 +107350,7 @@ in sources."color-name-1.1.4" sources."concat-map-0.0.1" sources."configstore-5.0.1" - sources."core-js-3.15.1" + sources."core-js-3.15.2" sources."core-util-is-1.0.2" (sources."cross-spawn-6.0.5" // { dependencies = [ @@ -107217,7 +107404,11 @@ in }) sources."execa-1.0.0" sources."external-editor-3.1.0" - sources."fast-glob-3.2.5" + (sources."fast-glob-3.2.6" // { + dependencies = [ + sources."micromatch-4.0.4" + ]; + }) sources."fastq-1.11.0" sources."figures-3.2.0" sources."fill-range-7.0.1" @@ -107563,7 +107754,12 @@ in sources."yallist-3.1.1" ]; }) - sources."snyk-python-plugin-1.19.9" + (sources."snyk-python-plugin-1.19.11" // { + dependencies = [ + sources."rimraf-3.0.2" + sources."tmp-0.2.1" + ]; + }) sources."snyk-resolve-1.1.0" (sources."snyk-resolve-deps-4.7.2" // { dependencies = [ @@ -107572,7 +107768,7 @@ in sources."yallist-2.1.2" ]; }) - (sources."snyk-sbt-plugin-2.11.0" // { + (sources."snyk-sbt-plugin-2.11.1" // { dependencies = [ sources."tmp-0.1.0" ]; @@ -107704,7 +107900,7 @@ in sources."@types/component-emitter-1.2.10" sources."@types/cookie-0.4.0" sources."@types/cors-2.8.10" - sources."@types/node-15.12.4" + sources."@types/node-15.14.0" sources."accepts-1.3.7" sources."base64-arraybuffer-0.1.4" sources."base64id-2.0.0" @@ -108266,7 +108462,7 @@ in sources."isarray-1.0.0" sources."isexe-2.0.0" sources."isobject-2.1.0" - (sources."jitdb-3.1.4" // { + (sources."jitdb-3.1.5" // { dependencies = [ sources."mkdirp-1.0.4" sources."push-stream-11.0.1" @@ -108441,7 +108637,7 @@ in sources."polyraf-1.1.0" sources."posix-character-classes-0.1.1" sources."preserve-0.2.0" - sources."prettier-2.3.1" + sources."prettier-2.3.2" (sources."pretty-quick-3.1.1" // { dependencies = [ sources."ansi-styles-4.3.0" @@ -108704,7 +108900,7 @@ in sources."ssb-client-4.9.0" sources."ssb-config-3.4.5" sources."ssb-db-19.2.0" - (sources."ssb-db2-2.1.3" // { + (sources."ssb-db2-2.1.4" // { dependencies = [ sources."abstract-leveldown-6.2.3" (sources."flumecodec-0.0.1" // { @@ -108870,7 +109066,7 @@ in sources."word-wrap-1.2.3" sources."wrap-fn-0.1.5" sources."wrappy-1.0.2" - sources."ws-7.5.0" + sources."ws-7.5.1" sources."xtend-4.0.2" sources."zerr-1.0.4" ]; @@ -108970,13 +109166,14 @@ in sources."async-1.5.2" sources."async-limiter-1.0.1" sources."asynckit-0.4.0" - (sources."aws-sdk-2.932.0" // { + (sources."aws-sdk-2.938.0" // { dependencies = [ sources."uuid-3.3.2" ]; }) sources."aws-sign2-0.6.0" sources."aws4-1.11.0" + sources."axios-0.21.1" sources."babel-runtime-6.26.0" sources."babel-types-6.26.0" sources."babylon-6.18.0" @@ -109359,7 +109556,11 @@ in sources."on-finished-2.3.0" sources."on-headers-1.0.2" sources."once-1.4.0" - sources."openid-2.0.8" + (sources."openid-2.0.9" // { + dependencies = [ + sources."qs-6.10.1" + ]; + }) sources."options-0.0.6" sources."optjs-3.2.2" sources."os-locale-3.1.0" @@ -109374,7 +109575,7 @@ in sources."parseuri-0.0.6" sources."parseurl-1.3.3" sources."passport-0.3.2" - sources."passport-oauth2-1.5.0" + sources."passport-oauth2-1.6.0" (sources."passport-saml-0.15.0" // { dependencies = [ sources."lodash-3.2.0" @@ -109803,7 +110004,7 @@ in sources."callsites-3.1.0" sources."camelcase-5.3.1" sources."camelcase-keys-6.2.2" - sources."caniuse-lite-1.0.30001239" + sources."caniuse-lite-1.0.30001241" (sources."chalk-4.1.1" // { dependencies = [ sources."ansi-styles-4.3.0" @@ -109841,7 +110042,7 @@ in sources."domelementtype-1.3.1" sources."domhandler-2.4.2" sources."domutils-1.7.0" - sources."electron-to-chromium-1.3.755" + sources."electron-to-chromium-1.3.765" sources."emoji-regex-8.0.0" sources."entities-1.1.2" sources."error-ex-1.3.2" @@ -109850,14 +110051,14 @@ in sources."execall-2.0.0" sources."extend-3.0.2" sources."fast-deep-equal-3.1.3" - sources."fast-glob-3.2.5" + sources."fast-glob-3.2.6" sources."fastest-levenshtein-1.0.12" sources."fastq-1.11.0" sources."file-entry-cache-6.0.1" sources."fill-range-7.0.1" sources."find-up-4.1.0" sources."flat-cache-3.0.4" - sources."flatted-3.1.1" + sources."flatted-3.2.0" sources."fs.realpath-1.0.0" sources."function-bind-1.1.1" sources."gensync-1.0.0-beta.2" @@ -110043,7 +110244,7 @@ in sources."trough-1.0.5" sources."type-fest-0.18.1" sources."typedarray-to-buffer-3.1.5" - sources."unified-9.2.1" + sources."unified-9.2.2" sources."unist-util-find-all-after-3.0.2" sources."unist-util-is-4.1.0" sources."unist-util-stringify-position-2.0.3" @@ -110083,7 +110284,7 @@ in sources."@emmetio/abbreviation-2.2.2" sources."@emmetio/css-abbreviation-2.1.4" sources."@emmetio/scanner-1.0.0" - sources."@types/node-15.12.4" + sources."@types/node-15.14.0" sources."@types/pug-2.0.4" sources."@types/sass-1.16.0" sources."anymatch-3.1.2" @@ -110129,7 +110330,7 @@ in sources."svelte2tsx-0.3.0" sources."to-regex-range-5.0.1" sources."tslib-2.3.0" - sources."typescript-4.3.4" + sources."typescript-4.3.5" sources."vscode-css-languageservice-5.0.0" sources."vscode-emmet-helper-2.1.2" sources."vscode-html-languageservice-4.0.0" @@ -110159,10 +110360,10 @@ in svgo = nodeEnv.buildNodePackage { name = "svgo"; packageName = "svgo"; - version = "2.3.0"; + version = "2.3.1"; src = fetchurl { - url = "https://registry.npmjs.org/svgo/-/svgo-2.3.0.tgz"; - sha512 = "fz4IKjNO6HDPgIQxu4IxwtubtbSfGEAJUq/IXyTPIkGhWck/faiiwfkvsB8LnBkKLvSoyNNIY6d13lZprJMc9Q=="; + url = "https://registry.npmjs.org/svgo/-/svgo-2.3.1.tgz"; + sha512 = "riDDIQgXpEnn0BEl9Gvhh1LNLIyiusSpt64IR8upJu7MwxnzetmF/Y57pXQD2NMX2lVyMRzXt5f2M5rO4wG7Dw=="; }; dependencies = [ sources."@trysound/sax-0.1.1" @@ -110172,9 +110373,9 @@ in sources."color-convert-2.0.1" sources."color-name-1.1.4" sources."commander-7.2.0" - sources."css-select-3.1.2" + sources."css-select-4.1.3" sources."css-tree-1.1.3" - sources."css-what-4.0.0" + sources."css-what-5.0.1" sources."csso-4.2.0" sources."dom-serializer-1.3.2" sources."domelementtype-2.2.0" @@ -110777,7 +110978,7 @@ in sources."truncate-utf8-bytes-1.0.2" sources."type-is-1.6.18" sources."typedarray-0.0.6" - sources."uglify-js-3.13.9" + sources."uglify-js-3.13.10" sources."undefsafe-2.0.3" (sources."union-value-1.0.1" // { dependencies = [ @@ -111311,7 +111512,7 @@ in sources."trough-1.0.5" sources."try-resolve-1.0.1" sources."type-check-0.4.0" - sources."unified-9.2.1" + sources."unified-9.2.2" sources."unique-concat-0.2.2" sources."unist-util-is-4.1.0" sources."unist-util-stringify-position-2.0.3" @@ -111407,7 +111608,7 @@ in sources."@types/normalize-package-data-2.4.0" sources."@types/parse5-5.0.3" sources."@types/unist-2.0.3" - sources."acorn-8.4.0" + sources."acorn-8.4.1" sources."acorn-jsx-5.3.1" sources."alex-9.1.0" (sources."ansi-align-3.0.0" // { @@ -111753,13 +111954,13 @@ in sources."typedarray-0.0.6" sources."typedarray-to-buffer-3.1.5" sources."unherit-1.1.3" - (sources."unified-9.2.1" // { + (sources."unified-9.2.2" // { dependencies = [ sources."is-plain-obj-2.1.0" ]; }) sources."unified-diff-3.1.0" - (sources."unified-engine-8.1.0" // { + (sources."unified-engine-8.2.0" // { dependencies = [ sources."is-plain-obj-2.1.0" ]; @@ -112204,10 +112405,10 @@ in sources."@szmarczak/http-timer-4.0.5" sources."@tokenizer/token-0.1.1" sources."@types/cacheable-request-6.0.1" - sources."@types/debug-4.1.5" + sources."@types/debug-4.1.6" sources."@types/http-cache-semantics-4.0.0" sources."@types/keyv-3.1.1" - sources."@types/node-15.12.4" + sources."@types/node-15.14.0" sources."@types/responselike-1.0.0" sources."abbrev-1.1.1" sources."abstract-logging-2.0.1" @@ -112283,7 +112484,7 @@ in sources."content-type-1.0.4" sources."cookie-0.4.0" sources."cookie-signature-1.0.6" - sources."core-js-3.15.1" + sources."core-js-3.15.2" sources."core-util-is-1.0.2" sources."css-select-1.2.0" sources."css-what-2.1.3" @@ -112623,7 +112824,7 @@ in sources."wide-align-1.1.3" sources."with-open-file-0.1.7" sources."wrappy-1.0.2" - sources."ws-7.5.0" + sources."ws-7.5.1" sources."xmlhttprequest-ssl-1.5.5" sources."yallist-3.1.1" sources."yarn-1.22.4" @@ -112642,10 +112843,10 @@ in three = nodeEnv.buildNodePackage { name = "three"; packageName = "three"; - version = "0.129.0"; + version = "0.130.0"; src = fetchurl { - url = "https://registry.npmjs.org/three/-/three-0.129.0.tgz"; - sha512 = "wiWio1yVRg2Oj6WEWsTHQo5eSzYpEwSBtPSi3OofNpvFbf26HFfb9kw4FZJNjII4qxzp0b1xLB11+tKkBGB1ZA=="; + url = "https://registry.npmjs.org/three/-/three-0.130.0.tgz"; + sha512 = "4jqvbJyvgrjTsBgqE7TrdkZral78l8CXpFCdGzqQoiJHsRhGHxe5tvwqZQVaS6eodPav7jdYO5sp1c5RmMB3ng=="; }; buildInputs = globalBuildInputs; meta = { @@ -113071,10 +113272,10 @@ in typescript = nodeEnv.buildNodePackage { name = "typescript"; packageName = "typescript"; - version = "4.3.4"; + version = "4.3.5"; src = fetchurl { - url = "https://registry.npmjs.org/typescript/-/typescript-4.3.4.tgz"; - sha512 = "uauPG7XZn9F/mo+7MrsRjyvbxFpzemRjKEZXS4AK83oP2KKOJPvb+9cO/gmnv8arWZvhnjVOXz7B49m1l0e9Ew=="; + url = "https://registry.npmjs.org/typescript/-/typescript-4.3.5.tgz"; + sha512 = "DqQgihaQ9cUrskJo9kIyW/+g0Vxsk8cDtZ52a3NGh0YNTfpUSArXSohyUGnvbPazEPLu398C0UxmKSOrPumUzA=="; }; buildInputs = globalBuildInputs; meta = { @@ -113089,29 +113290,74 @@ in typescript-language-server = nodeEnv.buildNodePackage { name = "typescript-language-server"; packageName = "typescript-language-server"; - version = "0.5.1"; + version = "0.5.4"; src = fetchurl { - url = "https://registry.npmjs.org/typescript-language-server/-/typescript-language-server-0.5.1.tgz"; - sha512 = "60Kguhwk/R1BB4pEIb6B9C7Ix7JzLzYnsODlmorYMPjMeEV0rCBqTR6FGAj4wVw/eHrHcpwLENmmURKUd8aybA=="; + url = "https://registry.npmjs.org/typescript-language-server/-/typescript-language-server-0.5.4.tgz"; + sha512 = "MQbCaq+ZUGfibp91reQJGYPXWbEdsY8G+iAkOaKRLOs3MDIssacEYF3v1nFne8iWWYPSsYs4HvuiIzbuUAO8GA=="; }; dependencies = [ - sources."command-exists-1.2.6" - sources."commander-2.20.3" - sources."crypto-random-string-1.0.0" - sources."fs-extra-7.0.1" + sources."@nodelib/fs.scandir-2.1.5" + sources."@nodelib/fs.stat-2.0.5" + sources."@nodelib/fs.walk-1.2.7" + sources."aggregate-error-3.1.0" + sources."array-union-2.1.0" + sources."balanced-match-1.0.2" + sources."brace-expansion-1.1.11" + sources."braces-3.0.2" + sources."clean-stack-2.2.0" + sources."command-exists-1.2.9" + sources."commander-7.2.0" + sources."concat-map-0.0.1" + sources."crypto-random-string-2.0.0" + sources."del-6.0.0" + sources."dir-glob-3.0.1" + sources."fast-glob-3.2.6" + sources."fastq-1.11.0" + sources."fill-range-7.0.1" + sources."fs-extra-10.0.0" + sources."fs.realpath-1.0.0" + sources."glob-7.1.7" + sources."glob-parent-5.1.2" + sources."globby-11.0.4" sources."graceful-fs-4.2.6" - sources."jsonfile-4.0.0" - sources."p-debounce-1.0.0" - sources."temp-dir-1.0.0" - sources."tempy-0.2.1" - sources."unique-string-1.0.0" - sources."universalify-0.1.2" + sources."ignore-5.1.8" + sources."indent-string-4.0.0" + sources."inflight-1.0.6" + sources."inherits-2.0.4" + sources."is-extglob-2.1.1" + sources."is-glob-4.0.1" + sources."is-number-7.0.0" + sources."is-path-cwd-2.2.0" + sources."is-path-inside-3.0.3" + sources."is-stream-2.0.0" + sources."jsonfile-6.1.0" + sources."merge2-1.4.1" + sources."micromatch-4.0.4" + sources."minimatch-3.0.4" + sources."once-1.4.0" + sources."p-debounce-2.1.0" + sources."p-map-4.0.0" + sources."path-is-absolute-1.0.1" + sources."path-type-4.0.0" + sources."picomatch-2.3.0" + sources."queue-microtask-1.2.3" + sources."reusify-1.0.4" + sources."rimraf-3.0.2" + sources."run-parallel-1.2.0" + sources."slash-3.0.0" + sources."temp-dir-2.0.0" + sources."tempy-1.0.1" + sources."to-regex-range-5.0.1" + sources."type-fest-0.16.0" + sources."unique-string-2.0.0" + sources."universalify-2.0.0" sources."vscode-jsonrpc-6.0.0" sources."vscode-languageserver-5.3.0-next.10" sources."vscode-languageserver-protocol-3.16.0" sources."vscode-languageserver-types-3.16.0" sources."vscode-textbuffer-1.0.0" sources."vscode-uri-1.0.8" + sources."wrappy-1.0.2" ]; buildInputs = globalBuildInputs; meta = { @@ -113126,10 +113372,10 @@ in uglify-js = nodeEnv.buildNodePackage { name = "uglify-js"; packageName = "uglify-js"; - version = "3.13.9"; + version = "3.13.10"; src = fetchurl { - url = "https://registry.npmjs.org/uglify-js/-/uglify-js-3.13.9.tgz"; - sha512 = "wZbyTQ1w6Y7fHdt8sJnHfSIuWeDgk6B5rCb4E/AM6QNNPbOMIZph21PW5dRB3h7Df0GszN+t7RuUH6sWK5bF0g=="; + url = "https://registry.npmjs.org/uglify-js/-/uglify-js-3.13.10.tgz"; + sha512 = "57H3ACYFXeo1IaZ1w02sfA71wI60MGco/IQFjOqK+WtKoprh7Go2/yvd2HPtoJILO2Or84ncLccI4xoHMTSbGg=="; }; buildInputs = globalBuildInputs; meta = { @@ -113742,7 +113988,7 @@ in sources."enquirer-2.3.6" sources."escape-string-regexp-4.0.0" sources."eslint-7.29.0" - sources."eslint-plugin-vue-7.11.1" + sources."eslint-plugin-vue-7.12.1" sources."eslint-scope-5.1.1" (sources."eslint-utils-2.1.0" // { dependencies = [ @@ -113773,7 +114019,7 @@ in sources."fast-levenshtein-2.0.6" sources."file-entry-cache-6.0.1" sources."flat-cache-3.0.4" - sources."flatted-3.1.1" + sources."flatted-3.2.0" sources."fs.realpath-1.0.0" sources."function-bind-1.1.1" sources."functional-red-black-tree-1.0.1" @@ -113814,7 +114060,7 @@ in sources."path-key-3.1.1" sources."path-parse-1.0.7" sources."prelude-ls-1.2.1" - sources."prettier-2.3.1" + sources."prettier-2.3.2" sources."progress-2.0.3" sources."punycode-2.1.1" sources."regexpp-3.2.0" @@ -113855,13 +114101,18 @@ in sources."tsutils-2.29.0" sources."type-check-0.4.0" sources."type-fest-0.20.2" - sources."typescript-4.3.4" + sources."typescript-4.3.5" sources."uri-js-4.4.1" sources."v8-compile-cache-2.3.0" - (sources."vue-eslint-parser-7.6.0" // { + (sources."vue-eslint-parser-7.7.1" // { dependencies = [ + sources."acorn-8.4.1" sources."eslint-visitor-keys-1.3.0" - sources."espree-6.2.1" + (sources."espree-8.0.0" // { + dependencies = [ + sources."eslint-visitor-keys-3.0.0" + ]; + }) ]; }) sources."which-2.0.2" @@ -113967,7 +114218,7 @@ in sources."minimatch-3.0.4" sources."ms-2.0.0" sources."request-light-0.4.0" - (sources."vscode-json-languageservice-4.1.4" // { + (sources."vscode-json-languageservice-4.1.5" // { dependencies = [ sources."vscode-nls-5.0.0" ]; @@ -114049,7 +114300,7 @@ in sources."@discoveryjs/json-ext-0.5.3" sources."@types/eslint-7.2.13" sources."@types/eslint-scope-3.7.0" - sources."@types/estree-0.0.47" + sources."@types/estree-0.0.48" sources."@types/json-schema-7.0.7" sources."@types/mocha-7.0.2" sources."@types/node-8.10.66" @@ -114076,7 +114327,7 @@ in sources."@webpack-cli/serve-1.5.1" sources."@xtuc/ieee754-1.2.0" sources."@xtuc/long-4.2.2" - sources."acorn-8.4.0" + sources."acorn-8.4.1" sources."ajv-6.12.6" sources."ajv-keywords-3.5.2" sources."ansi-colors-4.1.1" @@ -114097,7 +114348,7 @@ in sources."buffer-from-1.1.1" sources."call-bind-1.0.2" sources."camelcase-6.2.0" - sources."caniuse-lite-1.0.30001239" + sources."caniuse-lite-1.0.30001241" (sources."chalk-4.1.1" // { dependencies = [ sources."supports-color-7.2.0" @@ -114137,7 +114388,7 @@ in sources."domelementtype-2.2.0" sources."domhandler-4.2.0" sources."domutils-2.7.0" - sources."electron-to-chromium-1.3.755" + sources."electron-to-chromium-1.3.765" sources."emoji-regex-8.0.0" sources."emojis-list-3.0.0" sources."enhanced-resolve-5.8.2" @@ -114196,7 +114447,7 @@ in sources."isarray-0.0.1" sources."isexe-2.0.0" sources."isobject-3.0.1" - sources."jest-worker-27.0.2" + sources."jest-worker-27.0.6" sources."js-yaml-4.0.0" sources."json-parse-better-errors-1.0.2" sources."json-schema-traverse-0.4.1" @@ -114303,13 +114554,17 @@ in sources."strip-json-comments-3.1.1" sources."supports-color-8.1.1" sources."tapable-2.2.0" - (sources."terser-5.7.0" // { + (sources."terser-5.7.1" // { dependencies = [ sources."commander-2.20.3" sources."source-map-0.7.3" ]; }) - sources."terser-webpack-plugin-5.1.3" + (sources."terser-webpack-plugin-5.1.4" // { + dependencies = [ + sources."serialize-javascript-6.0.0" + ]; + }) sources."tmp-0.0.29" sources."to-regex-range-5.0.1" (sources."ts-loader-8.3.0" // { @@ -114322,7 +114577,7 @@ in sources."tslib-2.3.0" sources."tunnel-0.0.6" sources."typed-rest-client-1.8.4" - sources."typescript-4.3.4" + sources."typescript-4.3.5" sources."uc.micro-1.0.6" sources."underscore-1.13.1" sources."uri-js-4.4.1" @@ -114343,7 +114598,7 @@ in sources."vscode-debugadapter-testsupport-1.47.0" sources."vscode-debugprotocol-1.47.0" sources."watchpack-2.2.0" - sources."webpack-5.40.0" + sources."webpack-5.42.0" (sources."webpack-cli-4.7.2" // { dependencies = [ sources."commander-7.2.0" @@ -114641,7 +114896,7 @@ in sources."tslib-1.14.1" sources."tunnel-agent-0.6.0" sources."tweetnacl-0.14.5" - sources."uglify-js-3.13.9" + sources."uglify-js-3.13.10" sources."uid-0.0.2" sources."unbzip2-stream-1.4.3" sources."unyield-0.0.1" @@ -114700,7 +114955,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-15.12.4" + sources."@types/node-15.14.0" sources."@types/unist-2.0.3" sources."@types/vfile-3.0.2" sources."@types/vfile-message-2.0.0" @@ -114895,12 +115150,19 @@ in }) (sources."eslint-plugin-vue-6.2.2" // { dependencies = [ - sources."acorn-7.4.1" + sources."acorn-8.4.1" sources."debug-4.3.2" sources."eslint-scope-5.1.1" - sources."espree-6.2.1" + sources."eslint-visitor-keys-3.0.0" + sources."espree-8.0.0" + sources."lru-cache-6.0.0" sources."ms-2.1.2" - sources."vue-eslint-parser-7.6.0" + (sources."vue-eslint-parser-7.7.1" // { + dependencies = [ + sources."semver-7.3.5" + ]; + }) + sources."yallist-4.0.0" ]; }) sources."eslint-scope-4.0.3" @@ -115625,7 +115887,7 @@ in sources."@types/raf-3.4.0" sources."abab-2.0.5" sources."abbrev-1.1.1" - sources."acorn-8.4.0" + sources."acorn-8.4.1" (sources."acorn-globals-6.0.0" // { dependencies = [ sources."acorn-7.4.1" @@ -115671,7 +115933,7 @@ in sources."combined-stream-1.0.8" sources."concat-map-0.0.1" sources."console-control-strings-1.1.0" - sources."core-js-pure-3.15.1" + sources."core-js-pure-3.15.2" sources."core-util-is-1.0.2" sources."cssom-0.4.4" (sources."cssstyle-2.3.0" // { @@ -115681,7 +115943,7 @@ in }) sources."data-urls-2.0.0" sources."debug-4.3.2" - sources."decimal.js-10.3.0" + sources."decimal.js-10.3.1" sources."decompress-response-4.2.1" sources."deep-is-0.1.3" sources."delayed-stream-1.0.0" @@ -115795,7 +116057,7 @@ in sources."webidl-conversions-6.1.0" sources."whatwg-encoding-1.0.5" sources."whatwg-mimetype-2.3.0" - sources."whatwg-url-8.6.0" + sources."whatwg-url-8.7.0" sources."wide-align-1.1.3" sources."word-wrap-1.2.3" (sources."wrap-ansi-7.0.0" // { @@ -115807,7 +116069,7 @@ in ]; }) sources."wrappy-1.0.2" - sources."ws-7.5.0" + sources."ws-7.5.1" sources."xml-name-validator-3.0.0" sources."xmlchars-2.2.0" sources."y18n-5.0.8" @@ -115868,7 +116130,7 @@ in sources."@sindresorhus/is-0.14.0" sources."@szmarczak/http-timer-1.1.2" sources."@types/minimatch-3.0.4" - sources."@types/node-15.12.4" + sources."@types/node-15.14.0" sources."@types/yauzl-2.9.1" sources."acorn-7.4.1" sources."acorn-jsx-5.3.1" @@ -116056,7 +116318,7 @@ in sources."first-chunk-stream-3.0.0" sources."flat-cache-3.0.4" sources."flatstr-1.0.12" - sources."flatted-3.1.1" + sources."flatted-3.2.0" sources."fluent-syntax-0.13.0" sources."forever-agent-0.6.1" sources."form-data-2.3.3" @@ -116421,17 +116683,17 @@ in webpack = nodeEnv.buildNodePackage { name = "webpack"; packageName = "webpack"; - version = "5.40.0"; + version = "5.42.0"; src = fetchurl { - url = "https://registry.npmjs.org/webpack/-/webpack-5.40.0.tgz"; - sha512 = "c7f5e/WWrxXWUzQqTBg54vBs5RgcAgpvKE4F4VegVgfo4x660ZxYUF2/hpMkZUnLjgytVTitjeXaN4IPlXCGIw=="; + url = "https://registry.npmjs.org/webpack/-/webpack-5.42.0.tgz"; + sha512 = "Ln8HL0F831t1x/yPB/qZEUVmZM4w9BnHZ1EQD/sAUHv8m22hthoPniWTXEzFMh/Sf84mhrahut22TX5KxWGuyQ=="; }; dependencies = [ sources."@types/eslint-7.2.13" sources."@types/eslint-scope-3.7.0" - sources."@types/estree-0.0.47" + sources."@types/estree-0.0.48" sources."@types/json-schema-7.0.7" - sources."@types/node-15.12.4" + sources."@types/node-15.14.0" sources."@webassemblyjs/ast-1.11.0" sources."@webassemblyjs/floating-point-hex-parser-1.11.0" sources."@webassemblyjs/helper-api-error-1.11.0" @@ -116449,16 +116711,16 @@ in sources."@webassemblyjs/wast-printer-1.11.0" sources."@xtuc/ieee754-1.2.0" sources."@xtuc/long-4.2.2" - sources."acorn-8.4.0" + sources."acorn-8.4.1" sources."ajv-6.12.6" sources."ajv-keywords-3.5.2" sources."browserslist-4.16.6" sources."buffer-from-1.1.1" - sources."caniuse-lite-1.0.30001239" + sources."caniuse-lite-1.0.30001241" sources."chrome-trace-event-1.0.3" sources."colorette-1.2.2" sources."commander-2.20.3" - sources."electron-to-chromium-1.3.755" + sources."electron-to-chromium-1.3.765" sources."enhanced-resolve-5.8.2" sources."es-module-lexer-0.6.0" sources."escalade-3.1.1" @@ -116475,7 +116737,7 @@ in sources."glob-to-regexp-0.4.1" sources."graceful-fs-4.2.6" sources."has-flag-4.0.0" - sources."jest-worker-27.0.2" + sources."jest-worker-27.0.6" sources."json-parse-better-errors-1.0.2" sources."json-schema-traverse-0.4.1" sources."loader-runner-4.2.0" @@ -116489,18 +116751,18 @@ in sources."randombytes-2.1.0" sources."safe-buffer-5.2.1" sources."schema-utils-3.0.0" - sources."serialize-javascript-5.0.1" + sources."serialize-javascript-6.0.0" sources."source-list-map-2.0.1" sources."source-map-0.6.1" sources."source-map-support-0.5.19" sources."supports-color-8.1.1" sources."tapable-2.2.0" - (sources."terser-5.7.0" // { + (sources."terser-5.7.1" // { dependencies = [ sources."source-map-0.7.3" ]; }) - sources."terser-webpack-plugin-5.1.3" + sources."terser-webpack-plugin-5.1.4" sources."uri-js-4.4.1" sources."watchpack-2.2.0" sources."webpack-sources-2.3.0" @@ -116596,7 +116858,7 @@ in dependencies = [ sources."@types/glob-7.1.3" sources."@types/minimatch-3.0.4" - sources."@types/node-15.12.4" + sources."@types/node-15.14.0" sources."accepts-1.3.7" sources."ajv-6.12.6" sources."ajv-errors-1.0.1" @@ -117169,10 +117431,10 @@ in copy-webpack-plugin = nodeEnv.buildNodePackage { name = "copy-webpack-plugin"; packageName = "copy-webpack-plugin"; - version = "9.0.0"; + version = "9.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/copy-webpack-plugin/-/copy-webpack-plugin-9.0.0.tgz"; - sha512 = "k8UB2jLIb1Jip2nZbCz83T/XfhfjX6mB1yLJNYKrpYi7FQimfOoFv/0//iT6HV1K8FwUB5yUbCcnpLebJXJTug=="; + url = "https://registry.npmjs.org/copy-webpack-plugin/-/copy-webpack-plugin-9.0.1.tgz"; + sha512 = "14gHKKdYIxF84jCEgPgYXCPpldbwpxxLbCmA7LReY7gvbaT555DgeBWBgBZM116tv/fO6RRJrsivBqRyRlukhw=="; }; dependencies = [ sources."@nodelib/fs.scandir-2.1.5" @@ -117185,7 +117447,7 @@ in sources."braces-3.0.2" sources."dir-glob-3.0.1" sources."fast-deep-equal-3.1.3" - (sources."fast-glob-3.2.5" // { + (sources."fast-glob-3.2.6" // { dependencies = [ sources."glob-parent-5.1.2" ]; @@ -117213,7 +117475,7 @@ in sources."run-parallel-1.2.0" sources."safe-buffer-5.2.1" sources."schema-utils-3.0.0" - sources."serialize-javascript-5.0.1" + sources."serialize-javascript-6.0.0" sources."slash-3.0.0" sources."to-regex-range-5.0.1" sources."uri-js-4.4.1" @@ -117249,7 +117511,7 @@ in sources."@protobufjs/pool-1.1.0" sources."@protobufjs/utf8-1.1.0" sources."@types/long-4.0.1" - sources."@types/node-15.12.4" + sources."@types/node-15.14.0" sources."addr-to-ip-port-1.5.1" sources."airplay-js-0.3.0" sources."balanced-match-1.0.2" @@ -117299,6 +117561,7 @@ in sources."buffer-indexof-1.1.1" sources."buffer-xor-2.0.2" sources."bufferutil-4.0.3" + sources."cache-chunk-store-3.2.2" (sources."castv2-0.1.10" // { dependencies = [ sources."debug-4.3.2" @@ -117524,10 +117787,10 @@ in sources."ut_pex-3.0.1" sources."utf-8-validate-5.0.5" sources."util-deprecate-1.0.2" - sources."utp-native-2.5.1" + sources."utp-native-2.5.3" sources."videostream-3.2.2" sources."vlc-command-1.2.0" - (sources."webtorrent-1.0.1" // { + (sources."webtorrent-1.1.0" // { dependencies = [ sources."debug-4.3.2" sources."decompress-response-6.0.0" @@ -117538,7 +117801,7 @@ in }) sources."winreg-1.2.4" sources."wrappy-1.0.2" - sources."ws-7.5.0" + sources."ws-7.5.1" sources."xml2js-0.4.23" sources."xmlbuilder-11.0.1" sources."xmldom-0.1.31" @@ -117622,7 +117885,7 @@ in sources."minimatch-3.0.4" sources."ms-2.0.0" sources."request-light-0.2.5" - (sources."vscode-json-languageservice-4.1.4" // { + (sources."vscode-json-languageservice-4.1.5" // { dependencies = [ sources."jsonc-parser-3.0.0" sources."vscode-nls-5.0.0" @@ -117678,7 +117941,7 @@ in sources."@nodelib/fs.scandir-2.1.5" sources."@nodelib/fs.stat-2.0.5" sources."@nodelib/fs.walk-1.2.7" - (sources."@npmcli/arborist-2.6.3" // { + (sources."@npmcli/arborist-2.6.4" // { dependencies = [ sources."semver-7.3.5" ]; @@ -117704,13 +117967,14 @@ in }) sources."@npmcli/name-from-folder-1.0.1" sources."@npmcli/node-gyp-1.0.2" + sources."@npmcli/package-json-1.0.1" sources."@npmcli/promise-spawn-1.3.2" sources."@npmcli/run-script-1.8.5" sources."@sindresorhus/is-0.7.0" sources."@tootallnate/once-1.1.2" sources."@types/expect-1.20.4" sources."@types/minimatch-3.0.4" - sources."@types/node-15.12.4" + sources."@types/node-15.14.0" sources."@types/vinyl-2.0.4" sources."abbrev-1.1.1" (sources."agent-base-6.0.2" // { @@ -117831,7 +118095,7 @@ in sources."config-chain-1.1.13" sources."configstore-3.1.5" sources."console-control-strings-1.1.0" - sources."core-js-3.15.1" + sources."core-js-3.15.2" sources."core-util-is-1.0.2" sources."create-error-class-3.0.2" sources."cross-spawn-6.0.5" @@ -117889,7 +118153,7 @@ in sources."external-editor-3.1.0" sources."extsprintf-1.3.0" sources."fast-deep-equal-3.1.3" - sources."fast-glob-3.2.5" + sources."fast-glob-3.2.6" sources."fast-json-stable-stringify-2.1.0" sources."fastq-1.11.0" sources."figures-2.0.0" @@ -118606,7 +118870,7 @@ in sha512 = "omgqRVve+5dqbFrogFSjJXLUCUr4xHF2Gan+Njn/z4fumhIj3tMTFEA9iV+HgiobZ5Mgl5N96z4S4fwhaas4Pw=="; }; dependencies = [ - sources."@types/node-15.12.4" + sources."@types/node-15.14.0" sources."@types/node-fetch-2.5.10" sources."ansi-styles-4.3.0" sources."asynckit-0.4.0" diff --git a/nixpkgs/pkgs/development/ocaml-modules/alcotest/default.nix b/nixpkgs/pkgs/development/ocaml-modules/alcotest/default.nix index 94626f3c1798..abef3ef7ef46 100644 --- a/nixpkgs/pkgs/development/ocaml-modules/alcotest/default.nix +++ b/nixpkgs/pkgs/development/ocaml-modules/alcotest/default.nix @@ -4,13 +4,13 @@ buildDunePackage rec { pname = "alcotest"; - version = "1.2.3"; + version = "1.3.0"; useDune2 = true; src = fetchurl { url = "https://github.com/mirage/alcotest/releases/download/${version}/alcotest-mirage-${version}.tbz"; - sha256 = "1bmjcivbmd4vib15v4chycgd1gl8js9dk94vzxkdg06zxqd4hp08"; + sha256 = "sha256-efnevbyolTdNb91zr4pHDcvgaLQQSD01wEu2zMM+iaw="; }; propagatedBuildInputs = [ astring cmdliner fmt uuidm re stdlib-shims uutf ]; diff --git a/nixpkgs/pkgs/development/ocaml-modules/alcotest/lwt.nix b/nixpkgs/pkgs/development/ocaml-modules/alcotest/lwt.nix index 82efbe91a069..5a57dc0fcc2e 100644 --- a/nixpkgs/pkgs/development/ocaml-modules/alcotest/lwt.nix +++ b/nixpkgs/pkgs/development/ocaml-modules/alcotest/lwt.nix @@ -1,13 +1,16 @@ -{ lib, buildDunePackage, alcotest, logs, ocaml_lwt }: +{ lib, buildDunePackage, alcotest, logs, ocaml_lwt, fmt +, re, cmdliner +}: buildDunePackage { pname = "alcotest-lwt"; inherit (alcotest) version src useDune2; - propagatedBuildInputs = [ alcotest logs ocaml_lwt ]; + propagatedBuildInputs = [ alcotest logs ocaml_lwt fmt ]; doCheck = true; + checkInputs = [ re cmdliner ]; meta = alcotest.meta // { description = "Lwt-based helpers for Alcotest"; diff --git a/nixpkgs/pkgs/development/ocaml-modules/alcotest/mirage.nix b/nixpkgs/pkgs/development/ocaml-modules/alcotest/mirage.nix new file mode 100644 index 000000000000..b4ba4246b2cd --- /dev/null +++ b/nixpkgs/pkgs/development/ocaml-modules/alcotest/mirage.nix @@ -0,0 +1,16 @@ +{ lib, buildDunePackage, alcotest, lwt, logs, mirage-clock, duration }: + +buildDunePackage { + pname = "alcotest-mirage"; + + inherit (alcotest) version src useDune2; + + propagatedBuildInputs = [ alcotest lwt logs mirage-clock duration ]; + + doCheck = true; + + meta = alcotest.meta // { + description = "Mirage implementation for Alcotest"; + maintainers = with lib.maintainers; [ ulrikstrid anmonteiro ]; + }; +} diff --git a/nixpkgs/pkgs/development/ocaml-modules/camlimages/4.1.2.nix b/nixpkgs/pkgs/development/ocaml-modules/camlimages/4.1.2.nix deleted file mode 100644 index dba303afdf24..000000000000 --- a/nixpkgs/pkgs/development/ocaml-modules/camlimages/4.1.2.nix +++ /dev/null @@ -1,37 +0,0 @@ -{ lib, stdenv, fetchFromGitLab, fetchpatch, omake, ocaml, findlib -, graphicsmagick, ghostscript -, freetype, giflib, libjpeg, libpng, libtiff, libXpm -}: - -stdenv.mkDerivation rec { - pname = "camlimages"; - version = "4.1.2"; - - src = fetchFromGitLab { - owner = "camlspotter"; - repo = "camlimages"; - rev = "98661d507e12ce91a51295a50f244cb8265b4439"; # no tag - sha256 = "0kpxj8wm2m17wjq217jzjpfgv1d7sp4w1yd1gi8ipn5rj4sid2j8"; - }; - - buildInputs = [ ocaml omake findlib graphicsmagick ghostscript ]; - propagatedBuildInputs = [ libtiff libjpeg libpng giflib freetype libXpm ]; - - createFindlibDestdir = true; - - buildPhase = '' - omake - ''; - - installPhase = '' - omake install - ''; - - meta = with lib; { - branch = "4.1"; - homepage = "https://gitlab.com/camlspotter/camlimages"; - description = "OCaml image processing library"; - license = licenses.lgpl2; - maintainers = [ maintainers.vbgl ]; - }; -} diff --git a/nixpkgs/pkgs/development/ocaml-modules/camlimages/4.2.4.nix b/nixpkgs/pkgs/development/ocaml-modules/camlimages/4.2.4.nix new file mode 100644 index 000000000000..8ed562a27e69 --- /dev/null +++ b/nixpkgs/pkgs/development/ocaml-modules/camlimages/4.2.4.nix @@ -0,0 +1,75 @@ +{ stdenv +, lib +, fetchFromGitLab +, ocaml +, findlib +, omake +, graphicsmagick +, libpng +, libjpeg +, libexif +, libtiff +, libXpm +, freetype +, giflib +, ghostscript +}: + +assert lib.versionOlder ocaml.version "4.06"; + +stdenv.mkDerivation rec { + name = "ocaml${ocaml.version}-${pname}-${version}"; + pname = "camlimages"; + version = "4.2.4"; + + src = fetchFromGitLab { + owner = "camlspotter"; + repo = pname; + rev = "c4f0ec4178fd18cb85872181965c5f020c349160"; + sha256 = "17hvsql5dml7ialjcags8wphs7w6z88b2rgjir1382bg8vn62bkr"; + }; + + nativeBuildInputs = [ + omake + ocaml + findlib + graphicsmagick + ]; + + propagatedBuildInputs = [ + libpng + libjpeg + libexif + libtiff + libXpm + freetype + giflib + ghostscript + ]; + + buildPhase = '' + runHook preBuild + omake + runHook postBuild + ''; + + installPhase = '' + runHook preBuild + omake install + runHook postBuild + ''; + + createFindlibDestdir = true; + + meta = with lib; { + # 4.2.5 requires OCaml >= 4.06 + branch = "4.2.4"; + homepage = "https://gitlab.com/camlspotter/camlimages"; + description = "OCaml image processing library"; + license = licenses.lgpl2Only; + maintainers = [ + maintainers.vbgl + maintainers.sternenseemann + ]; + }; +} diff --git a/nixpkgs/pkgs/development/ocaml-modules/camlpdf/default.nix b/nixpkgs/pkgs/development/ocaml-modules/camlpdf/default.nix index 18683d5f1709..f496ce91c826 100644 --- a/nixpkgs/pkgs/development/ocaml-modules/camlpdf/default.nix +++ b/nixpkgs/pkgs/development/ocaml-modules/camlpdf/default.nix @@ -5,27 +5,17 @@ then throw "camlpdf is not available for OCaml ${ocaml.version}" else stdenv.mkDerivation rec { - version = "2.3.1"; + version = "2.4"; name = "ocaml${ocaml.version}-camlpdf-${version}"; src = fetchFromGitHub { owner = "johnwhitington"; repo = "camlpdf"; rev = "v${version}"; - sha256 = "1q69hhk63z836jbkv4wsng27w35w0qpz01c7ax0mqm8d8kmnr0v4"; + sha256 = "09kzrgmlxb567315p3fy59ba0kv7xhp548n9i3l4wf9n06p0ww9m"; }; buildInputs = [ which ocaml findlib ]; - # Version number in META file is wrong - patchPhase = '' - patch -p 0 META <<EOF - 3c3 - < version="1.7.1" - --- - > version="${version}" - EOF - ''; - preInstall = '' mkdir -p $out/lib/ocaml/${ocaml.version}/site-lib/stublibs ''; diff --git a/nixpkgs/pkgs/development/ocaml-modules/cpdf/default.nix b/nixpkgs/pkgs/development/ocaml-modules/cpdf/default.nix index cc2aad52d3d6..2a0fae4a1dbb 100644 --- a/nixpkgs/pkgs/development/ocaml-modules/cpdf/default.nix +++ b/nixpkgs/pkgs/development/ocaml-modules/cpdf/default.nix @@ -1,6 +1,10 @@ { lib, stdenv, fetchFromGitHub, ocaml, findlib, camlpdf, ncurses }: -let version = "2.3.1"; in +if !lib.versionAtLeast ocaml.version "4.10" +then throw "cpdf is not available for OCaml ${ocaml.version}" +else + +let version = "2.4"; in stdenv.mkDerivation { name = "ocaml${ocaml.version}-cpdf-${version}"; @@ -9,19 +13,14 @@ stdenv.mkDerivation { owner = "johnwhitington"; repo = "cpdf-source"; rev = "v${version}"; - sha256 = "1gwz0iy28f67kbqap2q10nf98dalwbi03vv5j893z2an7pb4w68z"; + sha256 = "1a8lmfc76dr8x6pxgm4aypbys02pfma9yh4z3l1qxp2q1909na5l"; }; - prePatch = '' - substituteInPlace META --replace 'version="1.7"' 'version="${version}"' - ''; - buildInputs = [ ocaml findlib ncurses ]; propagatedBuildInputs = [ camlpdf ]; - createFindlibDestdir = true; - - postInstall = '' + preInstall = '' + mkdir -p $OCAMLFIND_DESTDIR mkdir -p $out/bin cp cpdf $out/bin mkdir -p $out/share/ diff --git a/nixpkgs/pkgs/development/ocaml-modules/lwt-canceler/default.nix b/nixpkgs/pkgs/development/ocaml-modules/lwt-canceler/default.nix new file mode 100644 index 000000000000..2e4d12082b75 --- /dev/null +++ b/nixpkgs/pkgs/development/ocaml-modules/lwt-canceler/default.nix @@ -0,0 +1,27 @@ +{ lib, fetchFromGitLab, buildDunePackage, lwt }: + +buildDunePackage rec { + pname = "lwt-canceler"; + version = "0.2"; + + src = fetchFromGitLab { + owner = "nomadic-labs"; + repo = "lwt-canceler"; + rev = "v${version}"; + sha256 = "07931486vg83sl1c268i0vyw61l8n8xs2krjsj43070zljqi8rf1"; + }; + useDune2 = true; + + propagatedBuildInputs = [ + lwt + ]; + + doCheck = true; + + meta = { + homepage = "https://gitlab.com/nomadic-labs/lwt-canceler"; + description = "Cancellation synchronization object"; + license = lib.licenses.mit; + maintainers = [ lib.maintainers.ulrikstrid ]; + }; +} diff --git a/nixpkgs/pkgs/development/ocaml-modules/ppxlib/default.nix b/nixpkgs/pkgs/development/ocaml-modules/ppxlib/default.nix index a19d8cce52fb..c4591927e075 100644 --- a/nixpkgs/pkgs/development/ocaml-modules/ppxlib/default.nix +++ b/nixpkgs/pkgs/development/ocaml-modules/ppxlib/default.nix @@ -2,7 +2,7 @@ , version ? if lib.versionAtLeast ocaml.version "4.07" then if lib.versionAtLeast ocaml.version "4.08" - then "0.22.0" else "0.15.0" else "0.13.0" + then "0.22.2" else "0.15.0" else "0.13.0" , ocaml-compiler-libs, ocaml-migrate-parsetree, ppx_derivers, stdio , stdlib-shims, ocaml-migrate-parsetree-2 }: @@ -34,6 +34,10 @@ let param = { sha256 = "0kf7lgcwygf6zlx7rwddqpqvasa6v7xiq0bqal8vxlib6lpg074q"; min_version = "4.07"; }; + "0.22.2" = { + sha256 = "0fysjqcpv281n52wl3h0dy2lzf9d61wdzk90ldv3p63a4i3mr1j2"; + min_version = "4.07"; + }; }."${version}"; in if param ? max_version && lib.versionAtLeast ocaml.version param.max_version diff --git a/nixpkgs/pkgs/development/ocaml-modules/routes/default.nix b/nixpkgs/pkgs/development/ocaml-modules/routes/default.nix new file mode 100644 index 000000000000..a83d0db5d84d --- /dev/null +++ b/nixpkgs/pkgs/development/ocaml-modules/routes/default.nix @@ -0,0 +1,21 @@ +{ lib, fetchurl, buildDunePackage }: + +buildDunePackage rec { + pname = "routes"; + version = "0.9.1"; + + useDune2 = true; + minimalOCamlVersion = "4.05"; + + src = fetchurl { + url = "https://github.com/anuragsoni/routes/releases/download/${version}/routes-${version}.tbz"; + sha256 = "0h2c1p5w6237c1lmsl5c8q2dj5dq20gf2cmb12nbmlfn12sfmcrl"; + }; + + meta = with lib; { + description = "Typed routing for OCaml applications"; + license = licenses.bsd3; + homepage = "https://anuragsoni.github.io/routes"; + maintainers = with maintainers; [ ulrikstrid anmonteiro ]; + }; +} diff --git a/nixpkgs/pkgs/development/ocaml-modules/stringext/default.nix b/nixpkgs/pkgs/development/ocaml-modules/stringext/default.nix index ae797815aed5..8aaf36baa8b5 100644 --- a/nixpkgs/pkgs/development/ocaml-modules/stringext/default.nix +++ b/nixpkgs/pkgs/development/ocaml-modules/stringext/default.nix @@ -1,32 +1,24 @@ -{ stdenv, lib, fetchzip, ocaml, findlib, ocamlbuild, ounit, qcheck +{ lib, fetchurl, ocaml, buildDunePackage, ounit, qtest # Optionally enable tests; test script use OCaml-4.01+ features -, doCheck ? lib.versionAtLeast (lib.getVersion ocaml) "4.01" +, doCheck ? lib.versionAtLeast ocaml.version "4.04" }: -let version = "1.4.3"; in +let version = "1.6.0"; in -stdenv.mkDerivation { - name = "ocaml${ocaml.version}-stringext-${version}"; - - src = fetchzip { - url = "https://github.com/rgrinberg/stringext/archive/v${version}.tar.gz"; - sha256 = "121k79vjazvsd254yg391fp4spsd1p32amccrahd0g6hjhf5w6sl"; +buildDunePackage { + pname = "stringext"; + version = version; + useDune2 = true; + src = fetchurl { + url = "https://github.com/rgrinberg/stringext/releases/download/${version}/stringext-${version}.tbz"; + sha256 = "1sh6nafi3i9773j5mlwwz3kxfzdjzsfqj2qibxhigawy5vazahfv"; }; - buildInputs = [ ocaml findlib ocamlbuild ounit qcheck ]; - - configurePhase = "ocaml setup.ml -configure --prefix $out" - + lib.optionalString doCheck " --enable-tests"; - buildPhase = "ocaml setup.ml -build"; + checkInputs = [ ounit qtest ]; inherit doCheck; - checkPhase = "ocaml setup.ml -test"; - installPhase = "ocaml setup.ml -install"; - - createFindlibDestdir = true; meta = { homepage = "https://github.com/rgrinberg/stringext"; - platforms = ocaml.meta.platforms or []; description = "Extra string functions for OCaml"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ vbgl ]; diff --git a/nixpkgs/pkgs/development/perl-modules/strip-nondeterminism/default.nix b/nixpkgs/pkgs/development/perl-modules/strip-nondeterminism/default.nix index 20463ed24250..bdbd1a816434 100644 --- a/nixpkgs/pkgs/development/perl-modules/strip-nondeterminism/default.nix +++ b/nixpkgs/pkgs/development/perl-modules/strip-nondeterminism/default.nix @@ -18,7 +18,8 @@ buildPerlPackage rec { doCheck = false; nativeBuildInputs = lib.optionals stdenv.isDarwin [ shortenPerlShebang ]; - buildInputs = [ ArchiveZip ArchiveCpio file ]; + buildInputs = [ ArchiveZip ArchiveCpio ]; + propagatedNativeBuildInputs = [ file ]; perlPostHook = '' # we don’t need the debhelper script diff --git a/nixpkgs/pkgs/development/python-modules/Nikola/default.nix b/nixpkgs/pkgs/development/python-modules/Nikola/default.nix index 17a6e4d6a899..ae18ce5dc319 100644 --- a/nixpkgs/pkgs/development/python-modules/Nikola/default.nix +++ b/nixpkgs/pkgs/development/python-modules/Nikola/default.nix @@ -3,7 +3,7 @@ , Babel , blinker , buildPythonPackage -, dateutil +, python-dateutil , docutils , doit , fetchPypi @@ -53,7 +53,7 @@ buildPythonPackage rec { aiohttp Babel blinker - dateutil + python-dateutil docutils doit ghp-import diff --git a/nixpkgs/pkgs/development/python-modules/adafruit-platformdetect/default.nix b/nixpkgs/pkgs/development/python-modules/adafruit-platformdetect/default.nix index adb72d0cd03b..114130595339 100644 --- a/nixpkgs/pkgs/development/python-modules/adafruit-platformdetect/default.nix +++ b/nixpkgs/pkgs/development/python-modules/adafruit-platformdetect/default.nix @@ -6,12 +6,12 @@ buildPythonPackage rec { pname = "adafruit-platformdetect"; - version = "3.14.0"; + version = "3.14.2"; src = fetchPypi { pname = "Adafruit-PlatformDetect"; inherit version; - sha256 = "1v33546cflsbm6k8mhmi1r5c8fqjlirvzmf62a604xns8wrxb88h"; + sha256 = "sha256-SFqSTNKZMETRf9RxSD6skzAVpxepmW+JG/gqZgFX06A="; }; nativeBuildInputs = [ setuptools-scm ]; diff --git a/nixpkgs/pkgs/development/python-modules/adafruit-pureio/default.nix b/nixpkgs/pkgs/development/python-modules/adafruit-pureio/default.nix index 36bafb0f7a07..d3712ba46c24 100644 --- a/nixpkgs/pkgs/development/python-modules/adafruit-pureio/default.nix +++ b/nixpkgs/pkgs/development/python-modules/adafruit-pureio/default.nix @@ -6,12 +6,12 @@ buildPythonPackage rec { pname = "Adafruit-PureIO"; - version = "1.1.8"; + version = "1.1.9"; src = fetchPypi { pname = "Adafruit_PureIO"; inherit version; - sha256 = "1mfa6sfz7qwgajz3lqw0s69ivvwbwvblwkjzbrwdrxjbma4jaw66"; + sha256 = "0yd8hw676s7plq75gac4z0ilfcfydjkk3wv76bc73xy70zxj5brc"; }; nativeBuildInputs = [ setuptools-scm ]; diff --git a/nixpkgs/pkgs/development/python-modules/adal/default.nix b/nixpkgs/pkgs/development/python-modules/adal/default.nix index 31e0e73016cd..b555188b4b5c 100644 --- a/nixpkgs/pkgs/development/python-modules/adal/default.nix +++ b/nixpkgs/pkgs/development/python-modules/adal/default.nix @@ -1,5 +1,5 @@ { lib, buildPythonPackage, fetchPypi -, requests, pyjwt, dateutil }: +, requests, pyjwt, python-dateutil }: buildPythonPackage rec { pname = "adal"; @@ -10,7 +10,7 @@ buildPythonPackage rec { sha256 = "d74f45b81317454d96e982fd1c50e6fb5c99ac2223728aea8764433a39f566f1"; }; - propagatedBuildInputs = [ requests pyjwt dateutil ]; + propagatedBuildInputs = [ requests pyjwt python-dateutil ]; meta = with lib; { description = "Library to make it easy for python application to authenticate to Azure Active Directory (AAD) in order to access AAD protected web resources"; diff --git a/nixpkgs/pkgs/development/python-modules/ailment/default.nix b/nixpkgs/pkgs/development/python-modules/ailment/default.nix index 388880cda0b3..961a6cff1960 100644 --- a/nixpkgs/pkgs/development/python-modules/ailment/default.nix +++ b/nixpkgs/pkgs/development/python-modules/ailment/default.nix @@ -7,14 +7,14 @@ buildPythonPackage rec { pname = "ailment"; - version = "9.0.8021"; + version = "9.0.8761"; disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "angr"; repo = pname; rev = "v${version}"; - sha256 = "sha256-DeQvYuVRYOxyVPqHzTSNtEUUN4tHhSVMZoex6SUWik8="; + sha256 = "sha256-UAtVWh3BBZZmU5+BR0+2B+rivzR4E7bZK1ro1uKngtE="; }; propagatedBuildInputs = [ pyvex ]; diff --git a/nixpkgs/pkgs/development/python-modules/aiocoap/default.nix b/nixpkgs/pkgs/development/python-modules/aiocoap/default.nix index dd74a21bf9b8..e169b886f88e 100644 --- a/nixpkgs/pkgs/development/python-modules/aiocoap/default.nix +++ b/nixpkgs/pkgs/development/python-modules/aiocoap/default.nix @@ -1,24 +1,42 @@ { lib , buildPythonPackage , fetchFromGitHub -, python +, pytestCheckHook +, pygments +, pythonOlder }: buildPythonPackage rec { pname = "aiocoap"; - version = "0.4b3"; + version = "0.4.1"; + disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "chrysn"; repo = pname; rev = version; - sha256 = "1zjg475xgvi19rqg7jmfgy5nfabq50aph0231p9jba211ps7cmxw"; + sha256 = "0k7ii2l3n139f8712ja6w3z73xiwlfsjgdc4k5c514ni2w6w2yjc"; }; - checkPhase = '' - ${python.interpreter} -m aiocoap.cli.defaults - ${python.interpreter} -m unittest discover -v - ''; + propagatedBuildInputs = [ + pygments + ]; + + checkInputs = [ + pytestCheckHook + ]; + + disabledTestPaths = [ + # Don't test the plugins + "tests/test_tls.py" + "tests/test_reverseproxy.py" + "tests/test_oscore_plugtest.py" + ]; + + disabledTests = [ + # Communication is not properly mocked + "test_uri_parser" + ]; pythonImportsCheck = [ "aiocoap" ]; diff --git a/nixpkgs/pkgs/development/python-modules/aiolifx-effects/default.nix b/nixpkgs/pkgs/development/python-modules/aiolifx-effects/default.nix index 0a06144c65c3..201fdb32a0be 100644 --- a/nixpkgs/pkgs/development/python-modules/aiolifx-effects/default.nix +++ b/nixpkgs/pkgs/development/python-modules/aiolifx-effects/default.nix @@ -7,20 +7,21 @@ buildPythonPackage rec { pname = "aiolifx-effects"; - version = "0.2.1"; + version = "0.2.2"; + disabled = !isPy3k; src = fetchPypi { inherit version; pname = "aiolifx_effects"; - sha256 = "cb4ac52deeb220783fc6449251cf40833fcffa28648270be64b1b3e83e06b503"; + sha256 = "sha256-qkXJDYdJ+QyQWn/u7g6t4QJG1uSqle+a5RhTkPPsHKo="; }; + propagatedBuildInputs = [ aiolifx ]; + # tests are not implemented doCheck = false; - disabled = !isPy3k; - - propagatedBuildInputs = [ aiolifx ]; + pythonImportsCheck = [ "aiolifx_effects" ]; meta = with lib; { homepage = "https://github.com/amelchio/aiolifx_effects"; diff --git a/nixpkgs/pkgs/development/python-modules/aiomusiccast/default.nix b/nixpkgs/pkgs/development/python-modules/aiomusiccast/default.nix new file mode 100644 index 000000000000..267ca5b4a5a6 --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/aiomusiccast/default.nix @@ -0,0 +1,43 @@ +{ lib +, buildPythonPackage +, pythonOlder +, fetchFromGitHub +, poetry-core +, aiohttp +}: + +buildPythonPackage rec { + pname = "aiomusiccast"; + version = "0.8.2"; + + format = "pyproject"; + + disabled = pythonOlder "3.8"; + + src = fetchFromGitHub { + owner = "vigonotion"; + repo = "aiomusiccast"; + rev = version; + sha256 = "sha256-XmDE704c9KJst8hrvdyQdS52Sd6RnprQZjBCIWAaiho="; + }; + + nativeBuildInputs = [ + poetry-core + ]; + + propagatedBuildInputs = [ + aiohttp + ]; + + # upstream has no tests + doCheck = false; + + pythonImportsCheck = [ "aiomusiccast" ]; + + meta = with lib; { + description = "Companion library for musiccast devices intended for the Home Assistant integration"; + homepage = "https://github.com/vigonotion/aiomusiccast"; + license = licenses.mit; + maintainers = with maintainers; [ dotlambda ]; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/aiopg/default.nix b/nixpkgs/pkgs/development/python-modules/aiopg/default.nix index cb9cd327e8ce..36ea00234830 100644 --- a/nixpkgs/pkgs/development/python-modules/aiopg/default.nix +++ b/nixpkgs/pkgs/development/python-modules/aiopg/default.nix @@ -8,14 +8,14 @@ buildPythonPackage rec { pname = "aiopg"; - version = "1.2.1"; + version = "1.3.0"; disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "aio-libs"; repo = pname; rev = "v${version}"; - sha256 = "0c6s2p1fjbdk1ygpl6a1s1rbnsk8gw9kj99pf98nxhb9j3iahas4"; + sha256 = "sha256-/J53WqBag4ArSF7wETvmoBUtgNqp4eYGH0ytipiSKBI="; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/aiopylgtv/default.nix b/nixpkgs/pkgs/development/python-modules/aiopylgtv/default.nix index 200bc41b7a5d..ad089ef708e7 100644 --- a/nixpkgs/pkgs/development/python-modules/aiopylgtv/default.nix +++ b/nixpkgs/pkgs/development/python-modules/aiopylgtv/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "aiopylgtv"; - version = "0.4.0"; + version = "0.4.1"; disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "bendavid"; repo = pname; rev = version; - sha256 = "0x0xcnlz42arsp53zlq5wyv9pwif1in8j2pv48gh0pkdnz9s86b6"; + sha256 = "sha256-NkWJGy5QUrhpbARoscrXy/ilCjAz01YxeVTH0I+IjNM="; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/aiosignal/default.nix b/nixpkgs/pkgs/development/python-modules/aiosignal/default.nix index 9b9ef3b12ae1..9d919becd439 100644 --- a/nixpkgs/pkgs/development/python-modules/aiosignal/default.nix +++ b/nixpkgs/pkgs/development/python-modules/aiosignal/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "aiosignal"; - version = "1.1.1"; + version = "1.1.2"; disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "aio-libs"; repo = pname; rev = "v${version}"; - sha256 = "0a9md2dy83qwg2an57nqrzp9nb7krq27y9zz0f7qxcrv0xd42djy"; + sha256 = "1gyvisccx25py85wwwlljai5qa20jvwyvacgrgkk1h18dkc262fw"; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/aiounittest/default.nix b/nixpkgs/pkgs/development/python-modules/aiounittest/default.nix index eeb0ea0af577..088131824ad7 100644 --- a/nixpkgs/pkgs/development/python-modules/aiounittest/default.nix +++ b/nixpkgs/pkgs/development/python-modules/aiounittest/default.nix @@ -4,20 +4,25 @@ , nose , coverage , isPy27 +, wrapt }: buildPythonPackage rec { pname = "aiounittest"; - version = "1.3.1"; + version = "1.4.0"; disabled = isPy27; src = fetchFromGitHub { owner = "kwarunek"; repo = pname; rev = version; - sha256 = "0mlic2q49cb0vv62mixy4i4x8c91qb6jlji7khiamcxcg676nasl"; + sha256 = "sha256-GbGApY4pQoFpP3RTCLdjjTnJbdz9wEXXzZRRYXgtFEM="; }; + propagatedBuildInputs = [ + wrapt + ]; + checkInputs = [ nose coverage @@ -27,6 +32,8 @@ buildPythonPackage rec { nosetests ''; + pythonImportsCheck = [ "aiounittest" ]; + meta = with lib; { description = "Test asyncio code more easily"; homepage = "https://github.com/kwarunek/aiounittest"; diff --git a/nixpkgs/pkgs/development/python-modules/alembic/default.nix b/nixpkgs/pkgs/development/python-modules/alembic/default.nix index c820ee81ee2a..81502a470a68 100644 --- a/nixpkgs/pkgs/development/python-modules/alembic/default.nix +++ b/nixpkgs/pkgs/development/python-modules/alembic/default.nix @@ -1,6 +1,6 @@ { lib, buildPythonPackage, fetchPypi , pytest, pytestcov, mock, coverage, setuptools -, Mako, sqlalchemy, python-editor, dateutil +, Mako, sqlalchemy, python-editor, python-dateutil }: buildPythonPackage rec { @@ -13,7 +13,7 @@ buildPythonPackage rec { }; buildInputs = [ pytest pytestcov mock coverage ]; - propagatedBuildInputs = [ Mako sqlalchemy python-editor dateutil setuptools ]; + propagatedBuildInputs = [ Mako sqlalchemy python-editor python-dateutil setuptools ]; # no traditional test suite doCheck = false; diff --git a/nixpkgs/pkgs/development/python-modules/angr/default.nix b/nixpkgs/pkgs/development/python-modules/angr/default.nix index 89cdc5c55f0b..092d3a53e941 100644 --- a/nixpkgs/pkgs/development/python-modules/angr/default.nix +++ b/nixpkgs/pkgs/development/python-modules/angr/default.nix @@ -42,14 +42,14 @@ in buildPythonPackage rec { pname = "angr"; - version = "9.0.8021"; + version = "9.0.8761"; disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "v${version}"; - sha256 = "sha256-brX/HdeZSPOnZKuD1v086GwyWSV8yA/FaMC3CbeI4Xk="; + sha256 = "sha256-vPqCezHYJP3ue3/J/Pni9jPvSJ+om7nAVgPTU6z5xBE="; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/angrop/default.nix b/nixpkgs/pkgs/development/python-modules/angrop/default.nix index 09d1388c25ec..aa6f72eae54f 100644 --- a/nixpkgs/pkgs/development/python-modules/angrop/default.nix +++ b/nixpkgs/pkgs/development/python-modules/angrop/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "angrop"; - version = "9.0.8021"; + version = "9.0.8761"; disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "angr"; repo = pname; rev = "v${version}"; - sha256 = "sha256-wkCgVVHulu1hGdbUSEi38aMWy2UfR3g/7jj+o+NLI44="; + sha256 = "sha256-M/4kEESL9OH4KyPgsrlVzm54OtU28pDox5qtV7Up2ew="; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/aniso8601/default.nix b/nixpkgs/pkgs/development/python-modules/aniso8601/default.nix index 9cc3fb827755..62db58d611e4 100644 --- a/nixpkgs/pkgs/development/python-modules/aniso8601/default.nix +++ b/nixpkgs/pkgs/development/python-modules/aniso8601/default.nix @@ -1,6 +1,6 @@ { lib , buildPythonPackage -, dateutil +, python-dateutil , fetchPypi , isPy3k , mock @@ -17,7 +17,7 @@ buildPythonPackage rec { }; propagatedBuildInputs = [ - dateutil + python-dateutil ]; checkInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/anyio/default.nix b/nixpkgs/pkgs/development/python-modules/anyio/default.nix index 9ac37cdc5994..4c6a5e190788 100644 --- a/nixpkgs/pkgs/development/python-modules/anyio/default.nix +++ b/nixpkgs/pkgs/development/python-modules/anyio/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { pname = "anyio"; - version = "3.2.0"; + version = "3.2.1"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -27,7 +27,7 @@ buildPythonPackage rec { owner = "agronholm"; repo = pname; rev = version; - sha256 = "sha256-zQiSAQN7cp1s+8hDTvYaMkHUXV1ccNwIsl2IOztH7J8="; + sha256 = "0fiqzsgr9c0yicsh1pwhyc6z4qyr2ng42dakyy4a81w9cff38had"; }; preBuild = '' diff --git a/nixpkgs/pkgs/development/python-modules/apispec/default.nix b/nixpkgs/pkgs/development/python-modules/apispec/default.nix index 2db76ab24839..3bc1e6d4a5cf 100644 --- a/nixpkgs/pkgs/development/python-modules/apispec/default.nix +++ b/nixpkgs/pkgs/development/python-modules/apispec/default.nix @@ -12,12 +12,12 @@ buildPythonPackage rec { pname = "apispec"; - version = "4.6.0"; + version = "4.7.0"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "a896f97394b7d046d46c65262e51e45241dd8d9d71eedebcdb2d7024b775eec4"; + sha256 = "sha256-v6G+yLWyzqZyfgIMOm/hHZYwiN0u1hbhFHXOry1naTc="; }; propagatedBuildInputs = [ @@ -32,8 +32,10 @@ buildPythonPackage rec { pytestCheckHook ]; + pythonImportsCheck = [ "apispec" ]; + meta = with lib; { - description = "A pluggable API specification generator. Currently supports the OpenAPI Specification (f.k.a. the Swagger specification"; + description = "A pluggable API specification generator with support for the OpenAPI Specification"; homepage = "https://github.com/marshmallow-code/apispec"; license = licenses.mit; maintainers = [ maintainers.costrouc ]; diff --git a/nixpkgs/pkgs/development/python-modules/aqualogic/default.nix b/nixpkgs/pkgs/development/python-modules/aqualogic/default.nix index 9a23ebd82a9f..255248e8d924 100644 --- a/nixpkgs/pkgs/development/python-modules/aqualogic/default.nix +++ b/nixpkgs/pkgs/development/python-modules/aqualogic/default.nix @@ -1,33 +1,36 @@ { lib +, aiohttp , buildPythonPackage , fetchFromGitHub -, fetchpatch , pyserial , pytestCheckHook +, websockets }: buildPythonPackage rec { pname = "aqualogic"; - version = "2.6"; + version = "3.3"; src = fetchFromGitHub { owner = "swilson"; repo = pname; rev = version; - sha256 = "sha256-dAC/0OjvrC8J/5pu5vcOKV/WqgkAlz0LuFl0up6FQRM="; + sha256 = "sha256-6YvkSUtBc3Nl/Ap3LjU0IKY2bE4k86XdSoLo+/c8dDs="; }; - patches = [ - (fetchpatch { - name = "allow-iobase-objects.patch"; - url = "https://github.com/swilson/aqualogic/commit/185fe25a86c82c497a55c78914b55ed39f5ca339.patch"; - sha256 = "072jrrsqv86bn3skibjc57111jlpm8pq2503997fl3h4v6ziwdxg"; - }) + propagatedBuildInputs = [ + pyserial + websockets ]; - propagatedBuildInputs = [ pyserial ]; + checkInputs = [ + aiohttp + pytestCheckHook + ]; - checkInputs = [ pytestCheckHook ]; + # With 3.3 the event loop is not terminated after the first test + # https://github.com/swilson/aqualogic/issues/9 + doCheck = false; pythonImportsCheck = [ "aqualogic" ]; diff --git a/nixpkgs/pkgs/development/python-modules/archinfo/default.nix b/nixpkgs/pkgs/development/python-modules/archinfo/default.nix index 96cbf539fd18..580b05b82ade 100644 --- a/nixpkgs/pkgs/development/python-modules/archinfo/default.nix +++ b/nixpkgs/pkgs/development/python-modules/archinfo/default.nix @@ -7,13 +7,13 @@ buildPythonPackage rec { pname = "archinfo"; - version = "9.0.8021"; + version = "9.0.8761"; src = fetchFromGitHub { owner = "angr"; repo = pname; rev = "v${version}"; - sha256 = "sha256-j8sPrSaKam5gv1ZlTA3fF1u3UMei9jy843O0n8Hsibc="; + sha256 = "sha256-mdry5JQIW1b2p9a+c6RfHE6HYs54WKFofPkzFCgpUXg="; }; checkInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/asdf/default.nix b/nixpkgs/pkgs/development/python-modules/asdf/default.nix index 33513b2289c5..363d8900163a 100644 --- a/nixpkgs/pkgs/development/python-modules/asdf/default.nix +++ b/nixpkgs/pkgs/development/python-modules/asdf/default.nix @@ -2,6 +2,8 @@ , astropy , buildPythonPackage , fetchPypi +, importlib-resources +, jmespath , jsonschema , numpy , packaging @@ -15,23 +17,26 @@ buildPythonPackage rec { pname = "asdf"; - version = "2.7.3"; + version = "2.8.1"; disabled = pythonOlder "3.6"; format = "pyproject"; src = fetchPypi { inherit pname version; - sha256 = "11dyr295wn5m2pcynlwj7kgw9xr66msfvwn1m6a5vv13vzj19spp"; + sha256 = "sha256-bp3fME3FTa5vcj7qUoUEGqvuI2uwSpI13zDcFgWvbJw="; }; nativeBuildInputs = [ setuptools-scm ]; propagatedBuildInputs = [ + jmespath jsonschema numpy packaging pyyaml semantic-version + ] ++ lib.optionals (pythonOlder "3.9") [ + importlib-resources ]; checkInputs = [ @@ -50,6 +55,6 @@ buildPythonPackage rec { description = "Python tools to handle ASDF files"; homepage = "https://github.com/spacetelescope/asdf"; license = licenses.bsd3; - maintainers = [ maintainers.costrouc ]; + maintainers = with maintainers; [ costrouc ]; }; } diff --git a/nixpkgs/pkgs/development/python-modules/ase/default.nix b/nixpkgs/pkgs/development/python-modules/ase/default.nix index 868402577256..25210e4740bd 100644 --- a/nixpkgs/pkgs/development/python-modules/ase/default.nix +++ b/nixpkgs/pkgs/development/python-modules/ase/default.nix @@ -12,12 +12,12 @@ buildPythonPackage rec { pname = "ase"; - version = "3.21.1"; + version = "3.22.0"; disabled = isPy27; src = fetchPypi { inherit pname version; - sha256 = "78b01d88529d5f604e76bc64be102d48f058ca50faad72ac740d717545711c7b"; + sha256 = "sha256-5gJZx7UIZ7HLgXyvk4/MHtODcCQT320uGv5+oH9lrO4="; }; propagatedBuildInputs = [ numpy scipy matplotlib flask pillow psycopg2 ]; @@ -29,6 +29,8 @@ buildPythonPackage rec { # tests just hang most likely due to something with subprocesses and cli doCheck = false; + pythonImportsCheck = [ "ase" ]; + meta = with lib; { description = "Atomic Simulation Environment"; homepage = "https://wiki.fysik.dtu.dk/ase/"; diff --git a/nixpkgs/pkgs/development/python-modules/asteval/default.nix b/nixpkgs/pkgs/development/python-modules/asteval/default.nix index a55aef99ecbb..dd772e007cc1 100644 --- a/nixpkgs/pkgs/development/python-modules/asteval/default.nix +++ b/nixpkgs/pkgs/development/python-modules/asteval/default.nix @@ -3,21 +3,30 @@ , fetchFromGitHub , pytestCheckHook , pythonOlder +, setuptools-scm }: buildPythonPackage rec { pname = "asteval"; - version = "0.9.23"; + version = "0.9.25"; disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "newville"; repo = pname; rev = version; - sha256 = "sha256-9Zxb2EzB6nxDQHdlryFiwyNW+76VvysLUB78bXKzfv0="; + sha256 = "sha256-Jy+4NifItCGI1Jj25VakwoJcrpZw0Ng4cArf2M31WGs="; }; - checkInputs = [ pytestCheckHook ]; + SETUPTOOLS_SCM_PRETEND_VERSION = version; + + nativeBuildInputs = [ + setuptools-scm + ]; + + checkInputs = [ + pytestCheckHook + ]; pythonImportsCheck = [ "asteval" ]; diff --git a/nixpkgs/pkgs/development/python-modules/async-dns/default.nix b/nixpkgs/pkgs/development/python-modules/async-dns/default.nix index fdf240f5ba96..3067269aac9f 100644 --- a/nixpkgs/pkgs/development/python-modules/async-dns/default.nix +++ b/nixpkgs/pkgs/development/python-modules/async-dns/default.nix @@ -1,7 +1,6 @@ { lib , buildPythonPackage , fetchFromGitHub -, fetchpatch , poetry-core , python , pythonOlder @@ -9,7 +8,7 @@ buildPythonPackage rec { pname = "async-dns"; - version = "1.1.9"; + version = "1.1.10"; disabled = pythonOlder "3.6"; format = "pyproject"; @@ -17,23 +16,13 @@ buildPythonPackage rec { owner = "gera2ld"; repo = "async_dns"; rev = "v${version}"; - sha256 = "1z8j0s3dwcyavarhx41q75k1cmfzmwiqdh4svv3v15np26cywyag"; + sha256 = "1yxmdlf2n66kp2mprsd4bvfsf63l4c4cfkjm2rm063pmlifz2fvj"; }; nativeBuildInputs = [ poetry-core ]; - patches = [ - # Switch to poetry-core, https://github.com/gera2ld/async_dns/pull/22 - # Can be remove for async-dns>1.1.9 - (fetchpatch { - name = "switch-to-poetry-core.patch"; - url = "https://github.com/gera2ld/async_dns/commit/25fee497aae3bde0ddf9f8804d249a27edbe607e.patch"; - sha256 = "0w4zlppnp1a2q1wasc95ymqx3djswl32y5nw6fvz3nn8jg4gc743"; - }) - ]; - checkPhase = '' export HOME=$TMPDIR # Test needs network access diff --git a/nixpkgs/pkgs/development/python-modules/asyncssh/default.nix b/nixpkgs/pkgs/development/python-modules/asyncssh/default.nix index f02f5291bf15..160a90a0e6d0 100644 --- a/nixpkgs/pkgs/development/python-modules/asyncssh/default.nix +++ b/nixpkgs/pkgs/development/python-modules/asyncssh/default.nix @@ -1,40 +1,40 @@ -{ lib, buildPythonPackage, fetchPypi, pythonOlder +{ lib +, buildPythonPackage +, fetchPypi +, pythonOlder , cryptography -, bcrypt, gssapi, libnacl, libsodium, nettle, pyopenssl -, openssl, openssh, pytestCheckHook }: +, bcrypt +, gssapi +, fido2 +, libnacl +, libsodium +, nettle +, python-pkcs11 +, pyopenssl +, openssl +, openssh +, pytestCheckHook +}: buildPythonPackage rec { pname = "asyncssh"; - version = "2.6.0"; - disabled = pythonOlder "3.4"; + version = "2.7.0"; + disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "20f0ef553a1e64a7d38db86ba3a2f3907e72f1e81f3dfec5edb191383783c7d1"; + sha256 = "sha256-GFAT2OZ3R8PA8BtyQWuL14QX2h30jHH3baU8YH71QbY="; }; - patches = [ - # Reverts https://github.com/ronf/asyncssh/commit/4b3dec994b3aa821dba4db507030b569c3a32730 - # - # This changed the test to avoid setting the sticky bit - # because that's not allowed for plain files in FreeBSD. - # However that broke the test on NixOS, failing with - # "Operation not permitted" - ./fix-sftp-chmod-test-nixos.patch - ]; - - # Disables windows specific test (specifically the GSSAPI wrapper for Windows) - postPatch = '' - rm tests/sspi_stub.py - ''; - propagatedBuildInputs = [ bcrypt cryptography + fido2 gssapi libnacl libsodium nettle + python-pkcs11 pyopenssl ]; @@ -44,11 +44,26 @@ buildPythonPackage rec { pytestCheckHook ]; - disabledTests = [ "test_expired_root" "test_confirm" ]; + patches = [ + # Reverts https://github.com/ronf/asyncssh/commit/4b3dec994b3aa821dba4db507030b569c3a32730 + # + # This changed the test to avoid setting the sticky bit + # because that's not allowed for plain files in FreeBSD. + # However that broke the test on NixOS, failing with + # "Operation not permitted" + ./fix-sftp-chmod-test-nixos.patch + ]; + + disabledTestPaths = [ + # Disables windows specific test (specifically the GSSAPI wrapper for Windows) + "tests/sspi_stub.py" + ]; + + pythonImportsCheck = [ "asyncssh" ]; meta = with lib; { - description = "Provides an asynchronous client and server implementation of the SSHv2 protocol on top of the Python asyncio framework"; - homepage = "https://asyncssh.readthedocs.io/en/latest"; + description = "Asynchronous SSHv2 Python client and server library"; + homepage = "https://asyncssh.readthedocs.io/"; license = licenses.epl20; maintainers = with maintainers; [ ]; }; diff --git a/nixpkgs/pkgs/development/python-modules/asyncstdlib/default.nix b/nixpkgs/pkgs/development/python-modules/asyncstdlib/default.nix index 63e096bdc0f2..dc68584d668f 100644 --- a/nixpkgs/pkgs/development/python-modules/asyncstdlib/default.nix +++ b/nixpkgs/pkgs/development/python-modules/asyncstdlib/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "asyncstdlib"; - version = "3.9.1"; + version = "3.9.2"; disabled = pythonOlder "3.7"; format = "flit"; @@ -16,7 +16,7 @@ buildPythonPackage rec { owner = "maxfischer2781"; repo = pname; rev = "v${version}"; - sha256 = "13ranr7zi61w52vfrxwkf32bbhk88j0r5c5z2x2h5vw268001lk2"; + sha256 = "04z0x2n4a7503h6xf853p7if218magi98x397648wb21l4gh3zwv"; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/azure-core/default.nix b/nixpkgs/pkgs/development/python-modules/azure-core/default.nix index 6718ca1d5042..8dce5b8feb75 100644 --- a/nixpkgs/pkgs/development/python-modules/azure-core/default.nix +++ b/nixpkgs/pkgs/development/python-modules/azure-core/default.nix @@ -1,6 +1,7 @@ { lib, buildPythonPackage, fetchPypi, isPy27 , aiodns , aiohttp +, flask , mock , msrest , pytest @@ -14,14 +15,14 @@ }: buildPythonPackage rec { - version = "1.15.0"; + version = "1.16.0"; pname = "azure-core"; disabled = isPy27; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "197917b98fec661c35392e32abec4f690ac2117371a814e25e57c224ce23cf1f"; + sha256 = "b1c7d2e01846074f258c8b2e592239aef836a2b1c27d8d0e8491a2c7e2906ef4"; }; propagatedBuildInputs = [ @@ -32,6 +33,7 @@ buildPythonPackage rec { checkInputs = [ aiodns aiohttp + flask mock msrest pytest @@ -51,6 +53,8 @@ buildPythonPackage rec { # wants network "tests/async_tests/test_streaming_async.py" "tests/test_streaming.py" + # testserver tests require being in a very specific working directory to make it work + "tests/testserver_tests/" ]; meta = with lib; { diff --git a/nixpkgs/pkgs/development/python-modules/azure-keyvault-administration/default.nix b/nixpkgs/pkgs/development/python-modules/azure-keyvault-administration/default.nix index e72dc036989b..788eaf70457d 100644 --- a/nixpkgs/pkgs/development/python-modules/azure-keyvault-administration/default.nix +++ b/nixpkgs/pkgs/development/python-modules/azure-keyvault-administration/default.nix @@ -6,13 +6,13 @@ buildPythonPackage rec { pname = "azure-keyvault-administration"; - version = "4.0.0b1"; + version = "4.0.0"; disabled = isPy27; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "1kmf2x3jdmfm9c7ldvajzckkm79gxxvl1l2968lizjwiyjbbsih5"; + sha256 = "b05a0372f35921cedb7a231426077745eee9a65881088de6d4d8b73d9709a6cb"; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/azure-keyvault-certificates/default.nix b/nixpkgs/pkgs/development/python-modules/azure-keyvault-certificates/default.nix index 56ccb8b5fb0d..52b1305998ec 100644 --- a/nixpkgs/pkgs/development/python-modules/azure-keyvault-certificates/default.nix +++ b/nixpkgs/pkgs/development/python-modules/azure-keyvault-certificates/default.nix @@ -11,12 +11,12 @@ buildPythonPackage rec { pname = "azure-keyvault-certificates"; - version = "4.2.1"; + version = "4.3.0"; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "ea651883ad00d0a9a25b38e51feff7111f6c7099c6fb2597598da5bb21d3451c"; + sha256 = "4e0a9bae9fd4c222617fbce6b31f97e2e0622774479de3c387239cbfbb828d87"; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/azure-keyvault-keys/default.nix b/nixpkgs/pkgs/development/python-modules/azure-keyvault-keys/default.nix index bbdc06d52d4d..27f97854dd37 100644 --- a/nixpkgs/pkgs/development/python-modules/azure-keyvault-keys/default.nix +++ b/nixpkgs/pkgs/development/python-modules/azure-keyvault-keys/default.nix @@ -10,13 +10,13 @@ buildPythonPackage rec { pname = "azure-keyvault-keys"; - version = "4.3.1"; + version = "4.4.0"; disabled = isPy27; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "fbf67bca913ebf68b9075ee9d2e2b899dc3c7892cc40abfe1b08220a382f6ed9"; + sha256 = "7792ad0d5e63ad9eafa68bdce5de91b3ffcc7ca7a6afdc576785e6a2793caed0"; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/azure-keyvault-secrets/default.nix b/nixpkgs/pkgs/development/python-modules/azure-keyvault-secrets/default.nix index 704d2951cc97..78f7f20e469e 100644 --- a/nixpkgs/pkgs/development/python-modules/azure-keyvault-secrets/default.nix +++ b/nixpkgs/pkgs/development/python-modules/azure-keyvault-secrets/default.nix @@ -6,13 +6,13 @@ buildPythonPackage rec { pname = "azure-keyvault-secrets"; - version = "4.2.0"; + version = "4.3.0"; disabled = isPy27; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "1083ab900da5ec63c518ffef49d9fdca02c81ddffdf80c52c03cd9da479e021f"; + sha256 = "26279ba3a6c727deba1fb61f549496867baddffbf062bd579d6fd2bc04e95276"; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/azure-mgmt-appconfiguration/default.nix b/nixpkgs/pkgs/development/python-modules/azure-mgmt-appconfiguration/default.nix index 9fea2cf87d06..45147a94b2ab 100644 --- a/nixpkgs/pkgs/development/python-modules/azure-mgmt-appconfiguration/default.nix +++ b/nixpkgs/pkgs/development/python-modules/azure-mgmt-appconfiguration/default.nix @@ -6,13 +6,13 @@ }: buildPythonPackage rec { - version = "1.0.1"; + version = "2.0.0"; pname = "azure-mgmt-appconfiguration"; disabled = isPy27; src = fetchPypi { inherit pname version; - sha256 = "b58bbe82a7429ba589292024896b58d96fe9fa732c578569cac349928dc2ca5f"; + sha256 = "97e990ec6a5a3acafc7fc1add8ff1a160ebb2052792931352fd7cf1d90f1f956"; extension = "zip"; }; diff --git a/nixpkgs/pkgs/development/python-modules/azure-mgmt-containerservice/default.nix b/nixpkgs/pkgs/development/python-modules/azure-mgmt-containerservice/default.nix index 76d5c11cb6fd..e903e553b44a 100644 --- a/nixpkgs/pkgs/development/python-modules/azure-mgmt-containerservice/default.nix +++ b/nixpkgs/pkgs/development/python-modules/azure-mgmt-containerservice/default.nix @@ -11,12 +11,12 @@ buildPythonPackage rec { pname = "azure-mgmt-containerservice"; - version = "15.1.0"; + version = "16.0.0"; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "51c64e01e614c9b88723b86b36b48f8417171610a098bf4690e39e71cefc32d9"; + sha256 = "d6aa95951d32fe2cb390b3d8ae4f6459746de51bbaad94b5d1842dd35c4d0c11"; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/azure-mgmt-core/default.nix b/nixpkgs/pkgs/development/python-modules/azure-mgmt-core/default.nix index c824f3725a7e..fe64cabb2567 100644 --- a/nixpkgs/pkgs/development/python-modules/azure-mgmt-core/default.nix +++ b/nixpkgs/pkgs/development/python-modules/azure-mgmt-core/default.nix @@ -7,13 +7,13 @@ }: buildPythonPackage rec { - version = "1.2.2"; + version = "1.3.0"; pname = "azure-mgmt-core"; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "4246810996107f72482a9351cf918d380c257e90942144ec9c0c2abda1d0a312"; + sha256 = "3ffb7352b39e5495dccc2d2b47254f4d82747aff4735e8bf3267c335b0c9bb40"; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/azure-mgmt-cosmosdb/default.nix b/nixpkgs/pkgs/development/python-modules/azure-mgmt-cosmosdb/default.nix index 1531a4e0758f..f546f2e23e0d 100644 --- a/nixpkgs/pkgs/development/python-modules/azure-mgmt-cosmosdb/default.nix +++ b/nixpkgs/pkgs/development/python-modules/azure-mgmt-cosmosdb/default.nix @@ -11,12 +11,12 @@ buildPythonPackage rec { pname = "azure-mgmt-cosmosdb"; - version = "6.3.0"; + version = "6.4.0"; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "4135104da5b0f3f0a7249abcd8da55936603e50aaaf2868e5f739a717cf20b3d"; + sha256 = "fb6b8ab80ab97214b94ae9e462ba1c459b68a3af296ffc26317ebd3ff500e00b"; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/azure-mgmt-netapp/default.nix b/nixpkgs/pkgs/development/python-modules/azure-mgmt-netapp/default.nix index ccb7c5592478..06f0ae30aff6 100644 --- a/nixpkgs/pkgs/development/python-modules/azure-mgmt-netapp/default.nix +++ b/nixpkgs/pkgs/development/python-modules/azure-mgmt-netapp/default.nix @@ -6,13 +6,13 @@ }: buildPythonPackage rec { - version = "3.0.0"; + version = "4.0.0"; pname = "azure-mgmt-netapp"; disabled = isPy27; src = fetchPypi { inherit pname version; - sha256 = "5a293118c5089c4ec81f676b76aa95c60408a3443a46131d22978ffb81fe4605"; + sha256 = "7195e413a0764684cd42bec9e429c13c290db9ab5c465dbed586a6f6d0ec8a42"; extension = "zip"; }; diff --git a/nixpkgs/pkgs/development/python-modules/azure-mgmt-rdbms/default.nix b/nixpkgs/pkgs/development/python-modules/azure-mgmt-rdbms/default.nix index 56e531421634..75e77c594008 100644 --- a/nixpkgs/pkgs/development/python-modules/azure-mgmt-rdbms/default.nix +++ b/nixpkgs/pkgs/development/python-modules/azure-mgmt-rdbms/default.nix @@ -11,12 +11,12 @@ buildPythonPackage rec { pname = "azure-mgmt-rdbms"; - version = "8.1.0"; + version = "9.0.0"; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "b30003a94c306533ebfb741b824dd1cc6c0a1810200926675e6b808bd0459d19"; + sha256 = "36a508fe40f904723485586e9088092e6f65cdb82bc86efc42d615499c256829"; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/azure-mgmt-sql/default.nix b/nixpkgs/pkgs/development/python-modules/azure-mgmt-sql/default.nix index 83cffa0a295c..a9e41e32799e 100644 --- a/nixpkgs/pkgs/development/python-modules/azure-mgmt-sql/default.nix +++ b/nixpkgs/pkgs/development/python-modules/azure-mgmt-sql/default.nix @@ -11,12 +11,12 @@ buildPythonPackage rec { pname = "azure-mgmt-sql"; - version = "2.1.0"; + version = "3.0.0"; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "5474387ec3417b0a277de2b42c6d1992256a6a9717ca1ada0e8dad01238b9919"; + sha256 = "e2fe427ed8f6e368de7176696b38910a16b307dd9c2e1d2144d643a1c0f38e21"; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/azure-storage/default.nix b/nixpkgs/pkgs/development/python-modules/azure-storage/default.nix index 8afb9b751ee9..3bc6a7318665 100644 --- a/nixpkgs/pkgs/development/python-modules/azure-storage/default.nix +++ b/nixpkgs/pkgs/development/python-modules/azure-storage/default.nix @@ -5,7 +5,7 @@ , azure-common , cryptography , futures ? null -, dateutil +, python-dateutil , requests , isPy3k }: @@ -19,7 +19,7 @@ buildPythonPackage rec { sha256 = "0pyasfxkin6j8j00qmky7d9cvpxgis4fi9bscgclj6yrpvf14qpv"; }; - propagatedBuildInputs = [ azure-common cryptography dateutil requests ] + propagatedBuildInputs = [ azure-common cryptography python-dateutil requests ] ++ pkgs.lib.optionals (!isPy3k) [ futures ]; postPatch = '' diff --git a/nixpkgs/pkgs/development/python-modules/bashlex/default.nix b/nixpkgs/pkgs/development/python-modules/bashlex/default.nix index 8e29eed2acfd..0ee12c414804 100644 --- a/nixpkgs/pkgs/development/python-modules/bashlex/default.nix +++ b/nixpkgs/pkgs/development/python-modules/bashlex/default.nix @@ -8,13 +8,13 @@ buildPythonPackage rec { pname = "bashlex"; - version = "0.14"; + version = "0.15"; src = fetchFromGitHub { owner = "idank"; repo = pname; rev = version; - sha256 = "070spmbf53y18miky5chgky4x5h8kp9czkp7dm173klv9pi2cn0k"; + sha256 = "sha256-kKVorAIKlyC9vUzLOlaZ/JrG1kBBRIvLwBmHNj9nx84="; }; checkInputs = [ nose ]; @@ -29,9 +29,11 @@ buildPythonPackage rec { ${python.interpreter} -m nose --with-doctest ''; + pythonImportsCheck = [ "bashlex" ]; + meta = with lib; { description = "Python parser for bash"; - license = licenses.gpl3; + license = licenses.gpl3Plus; homepage = "https://github.com/idank/bashlex"; maintainers = with maintainers; [ multun ]; }; diff --git a/nixpkgs/pkgs/development/python-modules/beancount/default.nix b/nixpkgs/pkgs/development/python-modules/beancount/default.nix index ec864e71498f..31f8a24d8b76 100644 --- a/nixpkgs/pkgs/development/python-modules/beancount/default.nix +++ b/nixpkgs/pkgs/development/python-modules/beancount/default.nix @@ -5,7 +5,7 @@ , beautifulsoup4 , bottle , chardet -, dateutil +, python-dateutil , google-api-python-client , google-auth-oauthlib , lxml @@ -34,7 +34,7 @@ buildPythonPackage rec { beautifulsoup4 bottle chardet - dateutil + python-dateutil google-api-python-client google-auth-oauthlib lxml diff --git a/nixpkgs/pkgs/development/python-modules/bitarray/default.nix b/nixpkgs/pkgs/development/python-modules/bitarray/default.nix index 985c5429f7e8..28ae80020986 100644 --- a/nixpkgs/pkgs/development/python-modules/bitarray/default.nix +++ b/nixpkgs/pkgs/development/python-modules/bitarray/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "bitarray"; - version = "2.1.3"; + version = "2.2.1"; src = fetchPypi { inherit pname version; - sha256 = "a24aff72a7f1b09571b5daf9dbfcffd98481be1fe085ae5ef662cf11452a97e0"; + sha256 = "sha256-MbQNcWofBkLqnidBwpt1YpkHXbLh0evnUOPiwUafWJ0="; }; checkPhase = '' diff --git a/nixpkgs/pkgs/development/python-modules/bitcoin-price-api/default.nix b/nixpkgs/pkgs/development/python-modules/bitcoin-price-api/default.nix index 3e74c17f3be8..c9d317a81c3c 100644 --- a/nixpkgs/pkgs/development/python-modules/bitcoin-price-api/default.nix +++ b/nixpkgs/pkgs/development/python-modules/bitcoin-price-api/default.nix @@ -1,5 +1,5 @@ { lib, buildPythonPackage, fetchPypi -, dateutil, requests }: +, python-dateutil, requests }: buildPythonPackage rec { pname = "bitcoin-price-api"; @@ -10,7 +10,7 @@ buildPythonPackage rec { sha256 = "bc68076f9632aaa9a8009d916d67a709c1e045dd904cfc7a3e8be33960d32029"; }; - propagatedBuildInputs = [ dateutil requests ]; + propagatedBuildInputs = [ python-dateutil requests ]; # No tests in archive doCheck = false; diff --git a/nixpkgs/pkgs/development/python-modules/bleak/default.nix b/nixpkgs/pkgs/development/python-modules/bleak/default.nix index f229beb2b049..aecc904af503 100644 --- a/nixpkgs/pkgs/development/python-modules/bleak/default.nix +++ b/nixpkgs/pkgs/development/python-modules/bleak/default.nix @@ -4,13 +4,13 @@ buildPythonPackage rec { pname = "bleak"; - version = "0.11.0"; + version = "0.12.0"; disabled = !isPy3k; src = fetchPypi { inherit pname version; - sha256 = "1zs5lz3r17a2xn19i4na132iccyjsl9navj0d3v7gks7hlcad5kp"; + sha256 = "sha256-pNHz24YjB6FB9ZLC3LoXS+2qzhforflNXzG6OWFqCvk="; }; postPatch = '' diff --git a/nixpkgs/pkgs/development/python-modules/botocore/default.nix b/nixpkgs/pkgs/development/python-modules/botocore/default.nix index 8a21eb455e0d..d05c2decf497 100644 --- a/nixpkgs/pkgs/development/python-modules/botocore/default.nix +++ b/nixpkgs/pkgs/development/python-modules/botocore/default.nix @@ -1,7 +1,7 @@ { lib , buildPythonPackage , fetchPypi -, dateutil +, python-dateutil , jmespath , docutils , ordereddict @@ -21,7 +21,7 @@ buildPythonPackage rec { }; propagatedBuildInputs = [ - dateutil + python-dateutil jmespath docutils ordereddict diff --git a/nixpkgs/pkgs/development/python-modules/bravado-core/default.nix b/nixpkgs/pkgs/development/python-modules/bravado-core/default.nix index 8c65cca07b2e..24db42b7a74f 100644 --- a/nixpkgs/pkgs/development/python-modules/bravado-core/default.nix +++ b/nixpkgs/pkgs/development/python-modules/bravado-core/default.nix @@ -5,13 +5,13 @@ buildPythonPackage rec { pname = "bravado-core"; - version = "5.16.1"; + version = "5.17.0"; src = fetchFromGitHub { owner = "Yelp"; repo = pname; rev = "v${version}"; - sha256 = "0r9gk5vkjbc407fjydms3ik3hnzajq54znyz58d8rm6pvqcvjjpl"; + sha256 = "sha256-okQA4YJq0lyVJuDzD8mMRlOS/K3gf1qRUpw/5M0LlZE="; }; checkInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/bson/default.nix b/nixpkgs/pkgs/development/python-modules/bson/default.nix new file mode 100644 index 000000000000..ca78b0806f0d --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/bson/default.nix @@ -0,0 +1,33 @@ +{ lib +, buildPythonPackage +, fetchPypi +, python-dateutil +, six +}: + +buildPythonPackage rec { + pname = "bson"; + version = "0.5.10"; + + src = fetchPypi { + inherit pname version; + sha256 = "14355m3dchz446fl54ym78bn4wi20hddx1614f8rl4sin0m1nlfn"; + }; + + propagatedBuildInputs = [ + python-dateutil + six + ]; + + # 0.5.10 was not tagged, https://github.com/py-bson/bson/issues/108 + doCheck = false; + + pythonImportsCheck = [ "bson" ]; + + meta = with lib; { + description = "BSON codec for Python"; + homepage = "https://github.com/py-bson/bson"; + license = licenses.asl20; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/bt-proximity/default.nix b/nixpkgs/pkgs/development/python-modules/bt-proximity/default.nix index 584b7b126055..9de6dfbdefff 100644 --- a/nixpkgs/pkgs/development/python-modules/bt-proximity/default.nix +++ b/nixpkgs/pkgs/development/python-modules/bt-proximity/default.nix @@ -1,19 +1,22 @@ -{ lib, buildPythonPackage, fetchFromGitHub -, pybluez }: +{ lib +, buildPythonPackage +, fetchPypi +, pybluez +}: -buildPythonPackage { +buildPythonPackage rec { pname = "bt-proximity"; - version = "0.2"; + version = "0.2.1"; - # pypi only has a pre-compiled wheel and no sources - src = fetchFromGitHub { - owner = "FrederikBolding"; - repo = "bluetooth-proximity"; - rev = "463bade8a9080b47f09bf4a47830b31c69c5dffd"; - sha256 = "0anfh90cj3c2g7zqrjvq0d6dzpb4hjl6gk8zw0r349j2zw9i4h7y"; + src = fetchPypi { + pname = "bt_proximity"; + inherit version; + sha256 = "0xlif91vblbz065531yjf8nmlcahrl4q5pz52bc1jmzz7iv9hpgq"; }; - propagatedBuildInputs = [ pybluez ]; + propagatedBuildInputs = [ + pybluez + ]; # there are no tests doCheck = false; diff --git a/nixpkgs/pkgs/development/python-modules/bugsnag/default.nix b/nixpkgs/pkgs/development/python-modules/bugsnag/default.nix index 65cfa74777a4..f23bc566bac5 100644 --- a/nixpkgs/pkgs/development/python-modules/bugsnag/default.nix +++ b/nixpkgs/pkgs/development/python-modules/bugsnag/default.nix @@ -8,12 +8,12 @@ buildPythonPackage rec { pname = "bugsnag"; - version = "4.0.3"; + version = "4.1.0"; disabled = pythonOlder "3.5"; src = fetchPypi { inherit pname version; - sha256 = "0b70bc95e4e4f98b2eef7a3dadfdc50c1a40da7f50446adf43be05574a4b9f7c"; + sha256 = "sha256-3L1ZzZ7eomzJLvtlGK7YOi81b4G/1azHML/iAvsnwcE="; }; propagatedBuildInputs = [ six webob ]; diff --git a/nixpkgs/pkgs/development/python-modules/bugwarrior/default.nix b/nixpkgs/pkgs/development/python-modules/bugwarrior/default.nix index c59d2196d207..a29e7458d4b5 100644 --- a/nixpkgs/pkgs/development/python-modules/bugwarrior/default.nix +++ b/nixpkgs/pkgs/development/python-modules/bugwarrior/default.nix @@ -1,5 +1,5 @@ { lib, buildPythonPackage, fetchPypi, pythonOlder, setuptools -, twiggy, requests, offtrac, bugzilla, taskw, dateutil, pytz, keyring, six +, twiggy, requests, offtrac, bugzilla, taskw, python-dateutil, pytz, keyring, six , jinja2, pycurl, dogpile_cache, lockfile, click, pyxdg, future, jira }: buildPythonPackage rec { @@ -14,7 +14,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ setuptools - twiggy requests offtrac bugzilla taskw dateutil pytz keyring six + twiggy requests offtrac bugzilla taskw python-dateutil pytz keyring six jinja2 pycurl dogpile_cache lockfile click pyxdg future jira ]; diff --git a/nixpkgs/pkgs/development/python-modules/buildbot/default.nix b/nixpkgs/pkgs/development/python-modules/buildbot/default.nix index 043a1cd3e136..65919542057b 100644 --- a/nixpkgs/pkgs/development/python-modules/buildbot/default.nix +++ b/nixpkgs/pkgs/development/python-modules/buildbot/default.nix @@ -1,6 +1,6 @@ { stdenv, lib, buildPythonPackage, fetchPypi, makeWrapper, isPy3k, python, twisted, jinja2, zope_interface, sqlalchemy, - sqlalchemy_migrate, dateutil, txaio, autobahn, pyjwt, pyyaml, unidiff, treq, + sqlalchemy_migrate, python-dateutil, txaio, autobahn, pyjwt, pyyaml, unidiff, treq, txrequests, pypugjs, boto3, moto, mock, python-lz4, setuptoolsTrial, isort, pylint, flake8, buildbot-worker, buildbot-pkg, buildbot-plugins, parameterized, git, openssh, glibcLocales, ldap3, nixosTests }: @@ -39,7 +39,7 @@ let zope_interface sqlalchemy sqlalchemy_migrate - dateutil + python-dateutil txaio autobahn pyjwt diff --git a/nixpkgs/pkgs/development/python-modules/bytecode/default.nix b/nixpkgs/pkgs/development/python-modules/bytecode/default.nix index 24ff14f62552..75d4f38b2c3d 100644 --- a/nixpkgs/pkgs/development/python-modules/bytecode/default.nix +++ b/nixpkgs/pkgs/development/python-modules/bytecode/default.nix @@ -2,23 +2,26 @@ , buildPythonPackage , fetchFromGitHub , pythonOlder -, aenum +, pytestCheckHook }: buildPythonPackage rec { pname = "bytecode"; - version = "0.11.0"; + version = "0.12.0"; + disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "vstinner"; repo = pname; rev = version; - sha256 = "097k83zr0z71pha7bafzhs4ink174wk9ls2883bic274rihsnc5r"; + sha256 = "sha256-CEfDoJ+JlnxLLVnSxv7bEN891tmwG9zAvtT8GNvp8JU="; }; - disabled = pythonOlder "3.5"; + checkInputs = [ + pytestCheckHook + ]; - propagatedBuildInputs = lib.optionals (pythonOlder "3.6") [ aenum ]; + pythonImportsCheck = [ "bytecode" ]; meta = with lib; { homepage = "https://github.com/vstinner/bytecode"; diff --git a/nixpkgs/pkgs/development/python-modules/cattrs/default.nix b/nixpkgs/pkgs/development/python-modules/cattrs/default.nix index a48e29b827b7..7f51c89e3e4e 100644 --- a/nixpkgs/pkgs/development/python-modules/cattrs/default.nix +++ b/nixpkgs/pkgs/development/python-modules/cattrs/default.nix @@ -1,27 +1,70 @@ { lib , attrs +, bson , buildPythonPackage , fetchFromGitHub , hypothesis +, immutables +, msgpack +, poetry-core , pytestCheckHook +, pyyaml +, tomlkit +, ujson }: buildPythonPackage rec { pname = "cattrs"; - version = "1.1.2"; + version = "1.7.0"; + format = "pyproject"; src = fetchFromGitHub { owner = "Tinche"; repo = pname; rev = "v${version}"; - sha256 = "083d5mi6x7qcl26wlvwwn7gsp5chxlxkh4rp3a41w8cfwwr3h6l8"; + sha256 = "sha256-7F4S4IeApbULXhkEZ0oab3Y7sk20Ag2fCYxsyi4WbWw="; }; - propagatedBuildInputs = [ attrs ]; + nativeBuildInputs = [ + poetry-core + ]; + + propagatedBuildInputs = [ + attrs + ]; checkInputs = [ + bson hypothesis + immutables + msgpack pytestCheckHook + pyyaml + tomlkit + ujson + ]; + + postPatch = '' + substituteInPlace setup.cfg \ + --replace "-l --benchmark-sort=fullname --benchmark-warmup=true --benchmark-warmup-iterations=5 --benchmark-group-by=fullname" "" + substituteInPlace pyproject.toml \ + --replace 'orjson = "^3.5.2"' "" + substituteInPlace tests/test_preconf.py \ + --replace "from orjson import dumps as orjson_dumps" "" \ + --replace "from orjson import loads as orjson_loads" "" + ''; + + disabledTestPaths = [ + # Don't run benchmarking tests + "bench/test_attrs_collections.py" + "bench/test_attrs_nested.py" + "bench/test_attrs_primitives.py" + "bench/test_primitives.py" + ]; + + disabledTests = [ + # orjson is not available as it requires Rust nightly features to compile its requirements + "test_orjson" ]; pythonImportsCheck = [ "cattr" ]; diff --git a/nixpkgs/pkgs/development/python-modules/celery/default.nix b/nixpkgs/pkgs/development/python-modules/celery/default.nix index 480f7acb3d1b..a48f8651298a 100644 --- a/nixpkgs/pkgs/development/python-modules/celery/default.nix +++ b/nixpkgs/pkgs/development/python-modules/celery/default.nix @@ -12,9 +12,13 @@ buildPythonPackage rec { sha256 = "54436cd97b031bf2e08064223240e2a83d601d9414bcb1b702f94c6c33c29485"; }; + # click is only used for the repl, in most cases this shouldn't impact + # downstream packages postPatch = '' substituteInPlace requirements/test.txt \ --replace "moto==1.3.7" moto + substituteInPlace requirements/default.txt \ + --replace "click>=7.0,<8.0" click ''; propagatedBuildInputs = [ billiard click click-didyoumean click-plugins click-repl kombu pytz vine ]; diff --git a/nixpkgs/pkgs/development/python-modules/censys/default.nix b/nixpkgs/pkgs/development/python-modules/censys/default.nix index 23c883a48a4c..b3d152efab16 100644 --- a/nixpkgs/pkgs/development/python-modules/censys/default.nix +++ b/nixpkgs/pkgs/development/python-modules/censys/default.nix @@ -2,49 +2,62 @@ , backoff , buildPythonPackage , fetchFromGitHub +, parameterized , pytestCheckHook +, pythonOlder , requests -, pytestcov , requests-mock -, parameterized +, responses +, rich +, types-requests }: buildPythonPackage rec { pname = "censys"; - version = "1.1.1"; + version = "2.0.3"; + disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "censys"; repo = "censys-python"; - rev = version; - sha256 = "06jwk0ps80fjzbsy24qn5bsggfpgn4ccjzjz65cdh0ap1mfvh5jf"; + rev = "v${version}"; + sha256 = "0ga5f6xv6rylfvalnl3cflr0w30r771gb05n5cjhxisb8an0qcb6"; }; propagatedBuildInputs = [ backoff requests + rich + types-requests ]; checkInputs = [ - pytestcov + parameterized pytestCheckHook requests-mock - parameterized + responses ]; + postPatch = '' + substituteInPlace setup.py \ + --replace "rich==10.3.0" "rich" \ + --replace "types-requests==0.1.11" "types-requests" + substituteInPlace pytest.ini --replace \ + " --cov -rs -p no:warnings" "" + ''; + # The tests want to write a configuration file preCheck = '' export HOME=$(mktemp -d) mkdir -p $HOME - ''; - # All other tests require an API key - pytestFlagsArray = [ "tests/test_config.py" ]; + ''; + pythonImportsCheck = [ "censys" ]; meta = with lib; { description = "Python API wrapper for the Censys Search Engine (censys.io)"; homepage = "https://github.com/censys/censys-python"; license = with licenses; [ asl20 ]; - maintainers = [ maintainers.fab ]; + maintainers = with maintainers; [ fab ]; }; } diff --git a/nixpkgs/pkgs/development/python-modules/certbot/default.nix b/nixpkgs/pkgs/development/python-modules/certbot/default.nix index 0f6b5fa28594..7c324e646a4d 100644 --- a/nixpkgs/pkgs/development/python-modules/certbot/default.nix +++ b/nixpkgs/pkgs/development/python-modules/certbot/default.nix @@ -4,7 +4,7 @@ , fetchFromGitHub , ConfigArgParse, acme, configobj, cryptography, distro, josepy, parsedatetime, pyRFC3339, pyopenssl, pytz, requests, six, zope_component, zope_interface , dialog, gnureadline -, pytest_xdist, pytestCheckHook, dateutil +, pytest_xdist, pytestCheckHook, python-dateutil }: buildPythonPackage rec { @@ -40,7 +40,7 @@ buildPythonPackage rec { buildInputs = [ dialog gnureadline ]; checkInputs = [ - dateutil + python-dateutil pytestCheckHook pytest_xdist ]; diff --git a/nixpkgs/pkgs/development/python-modules/certifi/python2.nix b/nixpkgs/pkgs/development/python-modules/certifi/python2.nix new file mode 100644 index 000000000000..adc9594d69d0 --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/certifi/python2.nix @@ -0,0 +1,34 @@ +{ lib +, fetchPypi +, buildPythonPackage +, python3 +}: + +let + inherit (python3.pkgs) certifi; + +in buildPythonPackage rec { + pname = "certifi"; + version = "2019.11.28"; + + src = fetchPypi { + inherit pname version; + sha256 = "25b64c7da4cd7479594d035c08c2d809eb4aab3a26e5a990ea98cc450c320f1f"; + }; + + postPatch = '' + cp ${certifi.src}/certifi/cacert.pem certifi/cacert.pem + ''; + + pythonImportsCheck = [ "certifi" ]; + + # no tests implemented + doCheck = false; + + meta = with lib; { + homepage = "https://certifi.io/"; + description = "Python package for providing Mozilla's CA Bundle"; + license = licenses.isc; + maintainers = with maintainers; [ ]; # NixOps team + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/claripy/default.nix b/nixpkgs/pkgs/development/python-modules/claripy/default.nix index 03be293a5674..d8257f446d15 100644 --- a/nixpkgs/pkgs/development/python-modules/claripy/default.nix +++ b/nixpkgs/pkgs/development/python-modules/claripy/default.nix @@ -13,14 +13,14 @@ buildPythonPackage rec { pname = "claripy"; - version = "9.0.8021"; + version = "9.0.8761"; disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "angr"; repo = pname; rev = "v${version}"; - sha256 = "sha256-btV6J5r4ogb4yC0G3lyXXkCTnx55nfBkWFH1wgiWtjs="; + sha256 = "sha256-MEG6J7FBjufFqvmfV+LTtgDJb8eZuUrDq4am/mnYCZI="; }; # Use upstream z3 implementation diff --git a/nixpkgs/pkgs/development/python-modules/cle/default.nix b/nixpkgs/pkgs/development/python-modules/cle/default.nix index bb99365e33fa..87091509fb0d 100644 --- a/nixpkgs/pkgs/development/python-modules/cle/default.nix +++ b/nixpkgs/pkgs/development/python-modules/cle/default.nix @@ -15,7 +15,7 @@ let # The binaries are following the argr projects release cycle - version = "9.0.8021"; + version = "9.0.8761"; # Binary files from https://github.com/angr/binaries (only used for testing and only here) binaries = fetchFromGitHub { @@ -35,7 +35,7 @@ buildPythonPackage rec { owner = "angr"; repo = pname; rev = "v${version}"; - sha256 = "sha256-pgOeNAzAq2x7MEnheV6txmXISFY/0sWw4cVzs51k4eM="; + sha256 = "sha256-cJpwtAX2cck/SoTfm8G93Imyyqn1B2Izkxk9O7WtRrk="; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/clize/default.nix b/nixpkgs/pkgs/development/python-modules/clize/default.nix index 1418db69a393..0088acdb832c 100644 --- a/nixpkgs/pkgs/development/python-modules/clize/default.nix +++ b/nixpkgs/pkgs/development/python-modules/clize/default.nix @@ -1,7 +1,7 @@ { lib , buildPythonPackage , fetchPypi -, dateutil +, python-dateutil , sigtools , six , attrs @@ -29,7 +29,7 @@ buildPythonPackage rec { checkInputs = [ pytestCheckHook - dateutil + python-dateutil pygments repeated_test unittest2 diff --git a/nixpkgs/pkgs/development/python-modules/clldutils/default.nix b/nixpkgs/pkgs/development/python-modules/clldutils/default.nix index 318354786b56..563ad08381c4 100644 --- a/nixpkgs/pkgs/development/python-modules/clldutils/default.nix +++ b/nixpkgs/pkgs/development/python-modules/clldutils/default.nix @@ -5,7 +5,7 @@ , attrs , colorlog , csvw -, dateutil +, python-dateutil , tabulate , mock , postgresql @@ -30,7 +30,7 @@ buildPythonPackage rec { ''; propagatedBuildInputs = [ - dateutil + python-dateutil tabulate colorlog attrs diff --git a/nixpkgs/pkgs/development/python-modules/cloudsmith-api/default.nix b/nixpkgs/pkgs/development/python-modules/cloudsmith-api/default.nix index 57316ae9d6ce..5c3b5f114f53 100644 --- a/nixpkgs/pkgs/development/python-modules/cloudsmith-api/default.nix +++ b/nixpkgs/pkgs/development/python-modules/cloudsmith-api/default.nix @@ -3,7 +3,7 @@ , fetchPypi , certifi , six -, dateutil +, python-dateutil , urllib3 }: @@ -22,7 +22,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ certifi six - dateutil + python-dateutil urllib3 ]; diff --git a/nixpkgs/pkgs/development/python-modules/clvm-rs/default.nix b/nixpkgs/pkgs/development/python-modules/clvm-rs/default.nix index 4e5f69f8cd50..c18aab859fff 100644 --- a/nixpkgs/pkgs/development/python-modules/clvm-rs/default.nix +++ b/nixpkgs/pkgs/development/python-modules/clvm-rs/default.nix @@ -9,20 +9,20 @@ buildPythonPackage rec { pname = "clvm_rs"; - version = "0.1.7"; + version = "0.1.8"; disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "Chia-Network"; repo = "clvm_rs"; rev = version; - sha256 = "sha256-ves23q1uQ3lexwK9l1xGRss05jYObJDi/aY9Yvp4aPU="; + sha256 = "sha256-YQfcVF+/eEgSLhq0EIFjMlVUT/4w2S5C1/rbkNpKszo="; }; cargoDeps = rustPlatform.fetchCargoTarball { inherit src; name = "${pname}-${version}"; - hash = "sha256-3kPzM2EX61ZvU6VKXY1OG/ic+9FU3Et4RuKp+3QYzSo="; + sha256 = "000vkyqlbq35fg6k4c05qh52iw8m4xbzyh94y038zr9p0yjlr019"; }; format = "pyproject"; diff --git a/nixpkgs/pkgs/development/python-modules/clvm/default.nix b/nixpkgs/pkgs/development/python-modules/clvm/default.nix index 00bc14e280f4..2853bfe53182 100644 --- a/nixpkgs/pkgs/development/python-modules/clvm/default.nix +++ b/nixpkgs/pkgs/development/python-modules/clvm/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "clvm"; - version = "0.9.6"; + version = "0.9.7"; disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "Chia-Network"; repo = "clvm"; rev = version; - sha256 = "sha256-XBQEilDFhx0kT9bEMD4jX+SDk3cAC1BUCWhbtpgrLcA="; + sha256 = "sha256-kTmuiy0IbTGjDokZjxp3p8lr/0uVxG/0pRN2hETLBtA="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/coloredlogs/default.nix b/nixpkgs/pkgs/development/python-modules/coloredlogs/default.nix index 8cdd714bf105..0c14ee7b4476 100644 --- a/nixpkgs/pkgs/development/python-modules/coloredlogs/default.nix +++ b/nixpkgs/pkgs/development/python-modules/coloredlogs/default.nix @@ -5,14 +5,14 @@ , humanfriendly , verboselogs , capturer -, pytest +, pytestCheckHook , mock , util-linux }: buildPythonPackage rec { pname = "coloredlogs"; - version = "15.0"; + version = "15.0.1"; src = fetchFromGitHub { owner = "xolox"; @@ -21,18 +21,33 @@ buildPythonPackage rec { sha256 = "sha256-C1Eo+XrrL3bwhT49KyOE6xjbAHJxn9Qy4s1RR5ERVtA="; }; + propagatedBuildInputs = [ + humanfriendly + ]; + + checkInputs = [ + pytestCheckHook + mock + util-linux + verboselogs + capturer + ]; + # capturer is broken on darwin / py38, so we skip the test until a fix for # https://github.com/xolox/python-capturer/issues/10 is released. doCheck = !stdenv.isDarwin; - checkPhase = '' - PATH=$PATH:$out/bin pytest . -k "not test_plain_text_output_format \ - and not test_auto_install" + + preCheck = '' + # Required for the CLI test + PATH=$PATH:$out/bin ''; - checkInputs = [ pytest mock util-linux verboselogs capturer ]; - pythonImportsCheck = [ "coloredlogs" ]; + disabledTests = [ + "test_plain_text_output_format" + "test_auto_install" + ]; - propagatedBuildInputs = [ humanfriendly ]; + pythonImportsCheck = [ "coloredlogs" ]; meta = with lib; { description = "Colored stream handler for Python's logging module"; diff --git a/nixpkgs/pkgs/development/python-modules/confuse/default.nix b/nixpkgs/pkgs/development/python-modules/confuse/default.nix index 8f1c1754056a..2b350be00460 100644 --- a/nixpkgs/pkgs/development/python-modules/confuse/default.nix +++ b/nixpkgs/pkgs/development/python-modules/confuse/default.nix @@ -1,25 +1,45 @@ { buildPythonPackage , enum34 -, fetchPypi +, fetchFromGitHub +, flit-core , isPy27 , lib , pathlib , pyyaml +, pytestCheckHook }: buildPythonPackage rec { pname = "confuse"; - version = "1.4.0"; + version = "1.5.0"; + format = "flit"; - src = fetchPypi { - inherit pname version; - sha256 = "sha256-kvwEUcbiwnMqw2PQ9Z1+pgir3b7QYt2o6Y6ajJhs5GQ="; + src = fetchFromGitHub { + owner = "beetbox"; + repo = pname; + rev = "v${version}"; + sha256 = "1kvilxhjifvz6ra64jadf9jiwphrah5rcb9ryq0v7w1dywgn4qp7"; }; - propagatedBuildInputs = [ pyyaml ] ++ lib.optionals isPy27 [ enum34 pathlib ] ; + nativeBuildInputs = [ + flit-core + ]; + + propagatedBuildInputs = [ + pyyaml + ] ++ lib.optionals isPy27 [ + enum34 + pathlib + ] ; + + checkInputs = [ + pytestCheckHook + ]; + + pythonImportsCheck = [ "confuse" ]; meta = with lib; { - description = "Confuse is a configuration library for Python that uses YAML."; + description = "Python configuration library for Python that uses YAML"; homepage = "https://github.com/beetbox/confuse"; license = licenses.mit; maintainers = with maintainers; [ lovesegfault ]; diff --git a/nixpkgs/pkgs/development/python-modules/crc32c/default.nix b/nixpkgs/pkgs/development/python-modules/crc32c/default.nix index dd2c9059ed5f..f4a85fba599f 100644 --- a/nixpkgs/pkgs/development/python-modules/crc32c/default.nix +++ b/nixpkgs/pkgs/development/python-modules/crc32c/default.nix @@ -1,14 +1,14 @@ { lib, buildPythonPackage, fetchFromGitHub }: buildPythonPackage rec { - version = "2.0.1"; + version = "2.2.post0"; pname = "crc32c"; src = fetchFromGitHub { owner = "ICRAR"; repo = pname; rev = "v${version}"; - sha256 = "0vyac7pchh083h5qdjwhhacfq77frkrq1bjzsn51qv1vwcdrpnrf"; + sha256 = "sha256-0FgNOVpgJTxRALuufZ7Dt1TwuX+zqw35yCq8kmq4RTc="; }; meta = { diff --git a/nixpkgs/pkgs/development/python-modules/croniter/default.nix b/nixpkgs/pkgs/development/python-modules/croniter/default.nix index a93f8e78ce6b..3628609259c1 100644 --- a/nixpkgs/pkgs/development/python-modules/croniter/default.nix +++ b/nixpkgs/pkgs/development/python-modules/croniter/default.nix @@ -10,11 +10,11 @@ buildPythonPackage rec { pname = "croniter"; - version = "1.0.13"; + version = "1.0.15"; src = fetchPypi { inherit pname version; - sha256 = "sha256-V/Nt9PWhwxu/ULv/o1UWEsGfYVarHoji5CNCzLufm5o="; + sha256 = "06c2smrjskd9di8lcpymcxmygncxr14932qjhslc37yyaafzq3d7"; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/csvw/default.nix b/nixpkgs/pkgs/development/python-modules/csvw/default.nix index 27f3f291113c..67342d9eccc8 100644 --- a/nixpkgs/pkgs/development/python-modules/csvw/default.nix +++ b/nixpkgs/pkgs/development/python-modules/csvw/default.nix @@ -4,7 +4,7 @@ , pythonOlder , attrs , isodate -, dateutil +, python-dateutil , rfc3986 , uritemplate , mock @@ -31,7 +31,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ attrs isodate - dateutil + python-dateutil rfc3986 uritemplate ]; diff --git a/nixpkgs/pkgs/development/python-modules/curio/default.nix b/nixpkgs/pkgs/development/python-modules/curio/default.nix index fb1eceda7f2b..1a0f4e2d9fe7 100644 --- a/nixpkgs/pkgs/development/python-modules/curio/default.nix +++ b/nixpkgs/pkgs/development/python-modules/curio/default.nix @@ -1,7 +1,6 @@ { lib , buildPythonPackage , fetchPypi -, fetchpatch , isPy3k , pytestCheckHook , sphinx @@ -10,31 +9,19 @@ buildPythonPackage rec { pname = "curio"; - version = "1.4"; + version = "1.5"; + disabled = !isPy3k; src = fetchPypi { inherit pname version; - sha256 = "57edce81c837f3c2cf42fbb346dee26e537d1659e6605269fb13bd179e068744"; + sha256 = "sha256-rwghLlkLt9qOTMOcQgEnEUlNwg1iLxYhVbopbMLjvBA="; }; - patches = [ - # Fix the flaky test due to slow moving time on Apple Silicon chips. - # Remove when https://github.com/dabeaz/curio/pull/339 is in the next release. - (fetchpatch { - url = "https://github.com/dabeaz/curio/commit/132376724bbfaa0a52d3d63d0791aa4ac1eb6f5f.patch"; - sha256 = "sha256-AxO0xRcR9l9/NKEJFwyZIoYcyZxpqOhpdNaeaYokVb4="; - }) - # Same as above - (fetchpatch { - url = "https://github.com/dabeaz/curio/commit/8ac2f12a2cdacbc750b01fc7459cee8879bc1ee3.patch"; - sha256 = "sha256-2Si3fuDLrI09QuzJd1TrE0QY02G9e9m+1eHFTB/MrWU="; - }) + checkInputs = [ + pytestCheckHook + sphinx ]; - disabled = !isPy3k; - - checkInputs = [ pytestCheckHook sphinx ]; - __darwinAllowLocalNetworking = true; disabledTests = [ @@ -46,9 +33,11 @@ buildPythonPackage rec { "test_unix_ssl_server" # socket bind error on hydra when built with other packages ]; + pythonImportsCheck = [ "curio" ]; + meta = with lib; { homepage = "https://github.com/dabeaz/curio"; - description = "Library for performing concurrent I/O with coroutines in Python 3"; + description = "Library for performing concurrent I/O with coroutines in Python"; license = licenses.bsd3; maintainers = [ maintainers.marsam ]; }; diff --git a/nixpkgs/pkgs/development/python-modules/cvxpy/default.nix b/nixpkgs/pkgs/development/python-modules/cvxpy/default.nix index 359ee96f60a9..9068814ffd79 100644 --- a/nixpkgs/pkgs/development/python-modules/cvxpy/default.nix +++ b/nixpkgs/pkgs/development/python-modules/cvxpy/default.nix @@ -16,14 +16,14 @@ buildPythonPackage rec { pname = "cvxpy"; - version = "1.1.12"; + version = "1.1.13"; format = "pyproject"; disabled = pythonOlder "3.5"; src = fetchPypi { inherit pname version; - hash = "sha256-tJnr+uT8ZF6VI2IVc//LHFtoVKG1wM4dZqippFhgWAc="; + sha256 = "012avhf0a8n9xyy4g3xcr5z8z2a3m6rnqic6gfs9fq6p9bkq3ix9"; }; propagatedBuildInputs = [ @@ -42,8 +42,10 @@ buildPythonPackage rec { ''; checkInputs = [ pytestCheckHook ]; + pytestFlagsArray = [ "./cvxpy" ]; - # Disable the slowest benchmarking tests, cuts test time in half + + # Disable the slowest benchmarking tests, cuts test time in half disabledTests = [ "test_tv_inpainting" "test_diffcp_sdp_example" @@ -51,6 +53,8 @@ buildPythonPackage rec { "test_ecos_bb_mi_lp_2" # https://github.com/cvxgrp/cvxpy/issues/1241#issuecomment-780912155 ]; + pythonImportsCheck = [ "cvxpy" ]; + meta = with lib; { description = "A domain-specific language for modeling convex optimization problems in Python"; homepage = "https://www.cvxpy.org/"; diff --git a/nixpkgs/pkgs/development/python-modules/daphne/default.nix b/nixpkgs/pkgs/development/python-modules/daphne/default.nix index fc48f9150124..f6d7fcac62a5 100644 --- a/nixpkgs/pkgs/development/python-modules/daphne/default.nix +++ b/nixpkgs/pkgs/development/python-modules/daphne/default.nix @@ -4,7 +4,7 @@ }: buildPythonPackage rec { pname = "daphne"; - version = "3.0.1"; + version = "3.0.2"; disabled = !isPy3k; @@ -12,7 +12,7 @@ buildPythonPackage rec { owner = "django"; repo = pname; rev = version; - sha256 = "1bkxhzvaqwz760c11nhaiwvsq1d1csmk5dz2a1j1ynypjprhvhsk"; + sha256 = "sha256-KWkMV4L7bA2Eo/u4GGif6lmDNrZAzvYyDiyzyWt9LeI="; }; nativeBuildInputs = [ pytestrunner ]; diff --git a/nixpkgs/pkgs/development/python-modules/dask/default.nix b/nixpkgs/pkgs/development/python-modules/dask/default.nix index b51ac1701a2e..208856490b86 100644 --- a/nixpkgs/pkgs/development/python-modules/dask/default.nix +++ b/nixpkgs/pkgs/development/python-modules/dask/default.nix @@ -20,14 +20,14 @@ buildPythonPackage rec { pname = "dask"; - version = "2021.06.1"; + version = "2021.06.2"; disabled = pythonOlder "3.5"; src = fetchFromGitHub { owner = "dask"; repo = pname; rev = version; - sha256 = "sha256-wrUqLSmlKhd0NSjWBwbow8aX53ZBTgl2n4lEmvxC3bs="; + sha256 = "sha256-qvfjdijzlqaJQrDztRAVr5PudTaVd3WOTBid2ElZQgg="; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/datadog/default.nix b/nixpkgs/pkgs/development/python-modules/datadog/default.nix index fbe3316e0100..a24f726e346d 100644 --- a/nixpkgs/pkgs/development/python-modules/datadog/default.nix +++ b/nixpkgs/pkgs/development/python-modules/datadog/default.nix @@ -17,11 +17,11 @@ buildPythonPackage rec { pname = "datadog"; - version = "0.41.0"; + version = "0.42.0"; src = fetchPypi { inherit pname version; - sha256 = "sha256-PeGkO4qNX2sZ0WLsG0gtxasmNsWc9l5gWJcCMEUQpok="; + sha256 = "sha256-em+sF6fQnxiDq5pFzk/3oWqhpes8xMbN2sf4xT59Hps="; }; postPatch = '' diff --git a/nixpkgs/pkgs/development/python-modules/datasets/default.nix b/nixpkgs/pkgs/development/python-modules/datasets/default.nix index cc06297c4ea0..0141b79f5d64 100644 --- a/nixpkgs/pkgs/development/python-modules/datasets/default.nix +++ b/nixpkgs/pkgs/development/python-modules/datasets/default.nix @@ -16,13 +16,13 @@ buildPythonPackage rec { pname = "datasets"; - version = "1.4.1"; + version = "1.8.0"; src = fetchFromGitHub { owner = "huggingface"; repo = pname; rev = version; - hash = "sha256-is8TS84varARWyfeDTbQH0pcYFTk0PcEyK183emB4GE="; + sha256 = "sha256-is8TS84varARWyfeDTbQH0pcYFTk0PcEyK183emB4GE="; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/datashape/default.nix b/nixpkgs/pkgs/development/python-modules/datashape/default.nix index 6f11ae62c3e9..50bde25cf444 100644 --- a/nixpkgs/pkgs/development/python-modules/datashape/default.nix +++ b/nixpkgs/pkgs/development/python-modules/datashape/default.nix @@ -5,7 +5,7 @@ , mock , numpy , multipledispatch -, dateutil +, python-dateutil }: let @@ -29,7 +29,7 @@ in buildPythonPackage rec { }; checkInputs = [ pytest mock ]; - propagatedBuildInputs = [ numpy multipledispatch dateutil ]; + propagatedBuildInputs = [ numpy multipledispatch python-dateutil ]; # Disable several tests # https://github.com/blaze/datashape/issues/232 diff --git a/nixpkgs/pkgs/development/python-modules/dateparser/0.x.nix b/nixpkgs/pkgs/development/python-modules/dateparser/0.x.nix index 49e2d1f2796e..2aab262e64d2 100644 --- a/nixpkgs/pkgs/development/python-modules/dateparser/0.x.nix +++ b/nixpkgs/pkgs/development/python-modules/dateparser/0.x.nix @@ -4,7 +4,7 @@ , mock , parameterized , pytestCheckHook -, dateutil +, python-dateutil , pytz , regex , tzlocal @@ -39,7 +39,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ # install_requires - dateutil pytz regex tzlocal + python-dateutil pytz regex tzlocal # extra_requires convertdate umalqurra jdatetime ruamel_yaml ]; diff --git a/nixpkgs/pkgs/development/python-modules/dateparser/default.nix b/nixpkgs/pkgs/development/python-modules/dateparser/default.nix index 21dcffc4a841..6cbd1df32a57 100644 --- a/nixpkgs/pkgs/development/python-modules/dateparser/default.nix +++ b/nixpkgs/pkgs/development/python-modules/dateparser/default.nix @@ -2,7 +2,7 @@ , buildPythonPackage , isPy3k , fetchFromGitHub -, dateutil +, python-dateutil , pytz , regex , tzlocal @@ -29,7 +29,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ # install_requires - dateutil pytz regex tzlocal + python-dateutil pytz regex tzlocal # extra_requires hijri-converter convertdate ]; diff --git a/nixpkgs/pkgs/development/python-modules/datrie/default.nix b/nixpkgs/pkgs/development/python-modules/datrie/default.nix index d8bbc96fcc48..a74e53a939e1 100644 --- a/nixpkgs/pkgs/development/python-modules/datrie/default.nix +++ b/nixpkgs/pkgs/development/python-modules/datrie/default.nix @@ -1,36 +1,39 @@ -{ lib, buildPythonPackage, fetchPypi, fetchpatch -, cython, pytest, pytestrunner, hypothesis }: +{ lib +, buildPythonPackage +, fetchPypi +, cython +, pytestCheckHook +, hypothesis +}: buildPythonPackage rec { pname = "datrie"; - version = "0.7.1"; + version = "0.8.2"; src = fetchPypi { inherit pname version; - sha256 = "08r0if7dry2q7p34gf7ffyrlnf4bdvnprxgydlfxgfnvq8f3f4bs"; + sha256 = "sha256-UlsI9jjVz2EV32zNgY5aASmM0jCy2skcj/LmSZ0Ydl0="; }; - patches = [ - # fix tests against recent hypothesis - (fetchpatch { - url = "https://github.com/pytries/datrie/commit/9b24b4c02783cdb703ac3f6c6d7d881db93166e0.diff"; - sha256 = "1ql7jcf57q3x3fcbddl26y9kmnbnj2dv6ga8mwq94l4a3213j2iy"; - }) + nativeBuildInputs = [ + cython ]; - nativeBuildInputs = [ cython ]; - buildInputs = [ pytest pytestrunner hypothesis ]; + buildInputs = [ + hypothesis + pytestCheckHook + ]; - # recompile pxd and pyx for python37 - # https://github.com/pytries/datrie/issues/52 - preBuild = '' - ./update_c.sh + postPatch = '' + substituteInPlace setup.py --replace '"pytest-runner", ' "" ''; + pythonImportsCheck = [ "datrie" ]; + meta = with lib; { description = "Super-fast, efficiently stored Trie for Python"; homepage = "https://github.com/kmike/datrie"; - license = licenses.lgpl2; + license = licenses.lgpl21Plus; maintainers = with maintainers; [ lewo ]; }; } diff --git a/nixpkgs/pkgs/development/python-modules/dbutils/default.nix b/nixpkgs/pkgs/development/python-modules/dbutils/default.nix index 848e5038af8d..294456cc85bd 100644 --- a/nixpkgs/pkgs/development/python-modules/dbutils/default.nix +++ b/nixpkgs/pkgs/development/python-modules/dbutils/default.nix @@ -1,13 +1,13 @@ { lib, buildPythonPackage, fetchPypi, pytestCheckHook }: buildPythonPackage rec { - version = "2.0"; + version = "2.0.1"; pname = "dbutils"; src = fetchPypi { inherit version; pname = "DBUtils"; - sha256 = "131ifm2c2a7bipij597i8fvjka0dk2qv1xr2ghcvbc30jlkvag2g"; + sha256 = "sha256-Vw590TbBMRb+74vKGGCeP2a4ZoqcPV8hCdh0TERE2GE="; }; checkInputs = [ pytestCheckHook ]; diff --git a/nixpkgs/pkgs/development/python-modules/debian-inspector/default.nix b/nixpkgs/pkgs/development/python-modules/debian-inspector/default.nix index 8064a35ffee0..e19694bcf9c8 100644 --- a/nixpkgs/pkgs/development/python-modules/debian-inspector/default.nix +++ b/nixpkgs/pkgs/development/python-modules/debian-inspector/default.nix @@ -2,30 +2,25 @@ , buildPythonPackage , fetchPypi , pythonAtLeast -, fetchpatch , chardet , attrs , commoncode , pytestCheckHook +, setuptools-scm }: + buildPythonPackage rec { pname = "debian-inspector"; - version = "0.9.10"; + version = "21.5.25"; src = fetchPypi { pname = "debian_inspector"; inherit version; - sha256 = "fd29a02b925a4de0d7bb00c29bb05f19715a304bc10ef7b9ad06a93893dc3a8c"; + sha256 = "1d3xaqw00kav85nk29qm2yqb73bkyqf185fs1q0vgd7bnap9wqaw"; }; - patches = lib.optionals (pythonAtLeast "3.9") [ - # https://github.com/nexB/debian-inspector/pull/15 - # fixes tests on Python 3.9 - (fetchpatch { - name = "drop-encoding-argument.patch"; - url = "https://github.com/nexB/debian-inspector/commit/ff991cdb788671ca9b81f1602b70a439248fd1aa.patch"; - sha256 = "bm3k7vb9+Rm6+YicQEeDOOUVut8xpDaNavG+t2oLZkI="; - }) + nativeBuildInputs = [ + setuptools-scm ]; dontConfigure = true; diff --git a/nixpkgs/pkgs/development/python-modules/deezer-python/default.nix b/nixpkgs/pkgs/development/python-modules/deezer-python/default.nix index cd24ae0fd3e9..926dadd031cf 100644 --- a/nixpkgs/pkgs/development/python-modules/deezer-python/default.nix +++ b/nixpkgs/pkgs/development/python-modules/deezer-python/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "deezer-python"; - version = "2.2.4"; + version = "2.3.0"; disabled = pythonOlder "3.6"; format = "pyproject"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "browniebroke"; repo = pname; rev = "v${version}"; - sha256 = "11gqmyf350256gbppak2qv20lg2bmszand4kmks93wphq5yp2iiy"; + sha256 = "sha256-pRYC0kJHJ5SKgDdGS1KkQEbv+DkF9oPw/A1GnB0AwfQ="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/dependency-injector/default.nix b/nixpkgs/pkgs/development/python-modules/dependency-injector/default.nix index 8958566070ed..d220bd51ac1c 100644 --- a/nixpkgs/pkgs/development/python-modules/dependency-injector/default.nix +++ b/nixpkgs/pkgs/development/python-modules/dependency-injector/default.nix @@ -16,13 +16,13 @@ buildPythonPackage rec { pname = "dependency-injector"; - version = "4.32.2"; + version = "4.34.0"; src = fetchFromGitHub { owner = "ets-labs"; repo = "python-dependency-injector"; rev = version; - sha256 = "1gkkka0hl2hl4axf3gfm58mzv92bg0frr5jikw8g32hd4q4aagcg"; + sha256 = "sha256-MI0+saRe4Zi77otVPGYxrX9z8Jc5K1A1sCxHBS0uta0="; }; propagatedBuildInputs = [ @@ -42,6 +42,11 @@ buildPythonPackage rec { pyyaml ]; + postPatch = '' + substituteInPlace requirements.txt \ + --replace "six>=1.7.0,<=1.15.0" "six" + ''; + disabledTestPaths = [ # There is no unique identifier to disable the one failing test "tests/unit/ext/test_aiohttp_py35.py" diff --git a/nixpkgs/pkgs/development/python-modules/devolo-home-control-api/default.nix b/nixpkgs/pkgs/development/python-modules/devolo-home-control-api/default.nix index 44a0165d6fd8..751ebaae292c 100644 --- a/nixpkgs/pkgs/development/python-modules/devolo-home-control-api/default.nix +++ b/nixpkgs/pkgs/development/python-modules/devolo-home-control-api/default.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "devolo-home-control-api"; - version = "0.17.3"; + version = "0.17.4"; disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "2Fake"; repo = "devolo_home_control_api"; rev = "v${version}"; - sha256 = "1h7admqb1l28sxwhhkkhw0sfzgpn8zpczvmi3h28f68csflkv379"; + sha256 = "sha256-N/48Q2IEL194vCzrPPuy+mRNejXfkoXy2t2oe0Y6ug4="; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/dftfit/default.nix b/nixpkgs/pkgs/development/python-modules/dftfit/default.nix deleted file mode 100644 index 778b8c3d9843..000000000000 --- a/nixpkgs/pkgs/development/python-modules/dftfit/default.nix +++ /dev/null @@ -1,52 +0,0 @@ -{ lib -, fetchPypi -, buildPythonPackage -, pymatgen -, marshmallow -, pyyaml -, pygmo -, pandas -, scipy -, numpy -, scikit-learn -, lammps-cython -, pymatgen-lammps -, pytestrunner -, isPy3k -}: - -buildPythonPackage rec { - pname = "dftfit"; - version = "0.5.1"; - disabled = (!isPy3k); - - src = fetchPypi { - inherit pname version; - sha256 = "4dcbde48948835dcf2d49d6628c9df5747a8ec505d517e374b8d6c7fe95892df"; - }; - - buildInputs = [ pytestrunner ]; - propagatedBuildInputs = [ - pymatgen - marshmallow - pyyaml - pygmo - pandas - scipy - numpy - scikit-learn - lammps-cython - pymatgen-lammps - ]; - - # tests require git lfs download. and is quite large so skip tests - doCheck = false; - pythonImportsCheck = [ "dftfit" ]; - - meta = { - description = "Ab-Initio Molecular Dynamics Potential Development"; - homepage = "https://gitlab.com/costrouc/dftfit"; - license = lib.licenses.mit; - maintainers = with lib.maintainers; [ costrouc ]; - }; -} diff --git a/nixpkgs/pkgs/development/python-modules/dicom2nifti/default.nix b/nixpkgs/pkgs/development/python-modules/dicom2nifti/default.nix index a9c2e4e82373..dd43902949ab 100644 --- a/nixpkgs/pkgs/development/python-modules/dicom2nifti/default.nix +++ b/nixpkgs/pkgs/development/python-modules/dicom2nifti/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "dicom2nifti"; - version = "2.2.12"; + version = "2.3.0"; disabled = isPy27; # no tests in PyPI dist @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "icometrix"; repo = pname; rev = version; - sha256 = "0ddzaw0yasyi2wsh7a6r73cdcmdfbb0nh0k0n4yxp9vnkw1ag5z4"; + sha256 = "sha256-QSu9CGXFjDpI25Cy6QSbrwiQ2bwsVezCUxSovRLs6AI="; }; propagatedBuildInputs = [ nibabel numpy pydicom scipy setuptools ]; diff --git a/nixpkgs/pkgs/development/python-modules/diff-cover/default.nix b/nixpkgs/pkgs/development/python-modules/diff-cover/default.nix new file mode 100644 index 000000000000..7a9e1205979a --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/diff-cover/default.nix @@ -0,0 +1,57 @@ +{ lib +, buildPythonPackage +, chardet +, fetchPypi +, inflect +, jinja2 +, jinja2_pluralize +, pycodestyle +, pyflakes +, pygments +, pylint +, pytest-mock +, pytestCheckHook +, pythonOlder +}: + +buildPythonPackage rec { + pname = "diff-cover"; + version = "5.4.0"; + disabled = pythonOlder "3.6"; + + src = fetchPypi { + pname = "diff_cover"; + inherit version; + sha256 = "sha256-4iQ9/QcXh/lW8HE6wFZWc6Y57xhAEWu2TQnIUZJNAMs="; + }; + + propagatedBuildInputs = [ + chardet + inflect + jinja2 + jinja2_pluralize + pygments + ]; + + checkInputs = [ + pycodestyle + pyflakes + pylint + pytest-mock + pytestCheckHook + ]; + + disabledTests = [ + "added_file_pylint_console" + "file_does_not_exist" + ]; + + pythonImportsCheck = [ "diff_cover" ]; + + meta = with lib; { + description = "Automatically find diff lines that need test coverage"; + homepage = "https://github.com/Bachmann1234/diff-cover"; + license = licenses.asl20; + maintainers = with maintainers; [ dzabraev ]; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/diff_cover/default.nix b/nixpkgs/pkgs/development/python-modules/diff_cover/default.nix deleted file mode 100644 index 7eeb378ff417..000000000000 --- a/nixpkgs/pkgs/development/python-modules/diff_cover/default.nix +++ /dev/null @@ -1,46 +0,0 @@ -{ lib, buildPythonPackage, fetchPypi -, chardet -, inflect -, jinja2 -, jinja2_pluralize -, pygments -, six -# test dependencies -, coverage -, mock -, nose -, pycodestyle -, pyflakes -, pylint -, pytest -}: - -buildPythonPackage rec { - pname = "diff_cover"; - version = "5.2.0"; - - preCheck = '' - export LC_ALL=en_US.UTF-8; - ''; - - src = fetchPypi { - inherit pname version; - sha256 = "a1cd54232d2e48bd4c1eabc96cfe4a8727a9a92fd2556b52ff8f65bb8adf8768"; - }; - - propagatedBuildInputs = [ chardet jinja2 jinja2_pluralize pygments six inflect ]; - - checkInputs = [ mock coverage pytest nose pylint pyflakes pycodestyle ]; - - # ignore tests which try to write files - checkPhase = '' - pytest -k 'not added_file_pylint_console and not file_does_not_exist' - ''; - - meta = with lib; { - description = "Automatically find diff lines that need test coverage"; - homepage = "https://github.com/Bachmann1234/diff-cover"; - license = licenses.asl20; - maintainers = with maintainers; [ dzabraev ]; - }; -} diff --git a/nixpkgs/pkgs/development/python-modules/diofant/default.nix b/nixpkgs/pkgs/development/python-modules/diofant/default.nix index f99e17137de9..5a2e6e60b830 100644 --- a/nixpkgs/pkgs/development/python-modules/diofant/default.nix +++ b/nixpkgs/pkgs/development/python-modules/diofant/default.nix @@ -1,39 +1,42 @@ { lib -, isPy3k , buildPythonPackage , fetchPypi -, pytestrunner -, setuptools-scm +, gmpy2 , isort , mpmath -, strategies +, numpy +, pythonOlder +, scipy +, setuptools-scm }: buildPythonPackage rec { pname = "diofant"; - version = "0.10.0"; + version = "0.12.0"; + disabled = pythonOlder "3.9"; src = fetchPypi { inherit version; pname = "Diofant"; - sha256 = "0qjg0mmz2cqxryr610mppx3virf1gslzrsk24304502588z53v8w"; + sha256 = "sha256-G0CTSoDSduiWxlrk5XjnX5ldNZ9f7yxaJeUPO3ezJgo="; }; nativeBuildInputs = [ isort - pytestrunner setuptools-scm ]; propagatedBuildInputs = [ + gmpy2 mpmath - strategies + numpy + scipy ]; # tests take ~1h doCheck = false; - disabled = !isPy3k; + pythonImportsCheck = [ "diofant" ]; meta = with lib; { description = "A Python CAS library"; diff --git a/nixpkgs/pkgs/development/python-modules/discogs-client/default.nix b/nixpkgs/pkgs/development/python-modules/discogs-client/default.nix new file mode 100644 index 000000000000..e47922f9577a --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/discogs-client/default.nix @@ -0,0 +1,40 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, requests +, oauthlib +, python-dateutil +, pytestCheckHook +}: + +buildPythonPackage rec { + pname = "discogs-client"; + version = "2.3.12"; + + + src = fetchFromGitHub { + owner = "joalla"; + repo = "discogs_client"; + rev = "v${version}"; + sha256 = "0y553x8rkgmqqg980n62pwdxbp75xalkhlb6k5g0cms42ggy5fsc"; + }; + + propagatedBuildInputs = [ + requests + oauthlib + python-dateutil + ]; + + checkInputs = [ + pytestCheckHook + ]; + + pythonImportsCheck = [ "discogs_client" ]; + + meta = with lib; { + description = "Unofficial Python API client for Discogs"; + homepage = "https://github.com/joalla/discogs_client"; + license = licenses.bsd2; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/discogs_client/default.nix b/nixpkgs/pkgs/development/python-modules/discogs_client/default.nix deleted file mode 100644 index e522ac4b6c9d..000000000000 --- a/nixpkgs/pkgs/development/python-modules/discogs_client/default.nix +++ /dev/null @@ -1,19 +0,0 @@ -{ lib, buildPythonPackage, fetchPypi, requests, oauthlib }: - -buildPythonPackage rec { - pname = "discogs-client"; - version = "2.3.0"; - - src = fetchPypi { - inherit pname version; - sha256 = "cc979fcbb5283f74d388c7111c8ed6bef920b01614a014d6b1c5d6fbb554bfc3"; - }; - - propagatedBuildInputs = [ requests oauthlib ]; - - meta = with lib; { - description = "Official Python API client for Discogs"; - license = licenses.bsd2; - homepage = "https://github.com/discogs/discogs_client"; - }; -} diff --git a/nixpkgs/pkgs/development/python-modules/distributed/default.nix b/nixpkgs/pkgs/development/python-modules/distributed/default.nix index 605e905d4ab4..ce0cf13e9a92 100644 --- a/nixpkgs/pkgs/development/python-modules/distributed/default.nix +++ b/nixpkgs/pkgs/development/python-modules/distributed/default.nix @@ -6,7 +6,6 @@ , dask , msgpack , psutil -, six , sortedcontainers , tblib , toolz @@ -20,27 +19,39 @@ buildPythonPackage rec { pname = "distributed"; - version = "2021.6.1"; + version = "2021.6.2"; disabled = pythonOlder "3.6"; # get full repository need conftest.py to run tests src = fetchPypi { inherit pname version; - sha256 = "sha256-Z79h/WAio5diX2myChx8HPAWe2RB4Ajw7Ybch4XUYFc="; + sha256 = "sha256-19ESqGqwSdzvo7If0brqQhKiwD0iwkvVWtONIaf10Ug="; }; propagatedBuildInputs = [ - click cloudpickle dask msgpack psutil six - sortedcontainers tblib toolz tornado zict pyyaml mpi4py bokeh + bokeh + click + cloudpickle + dask + mpi4py + msgpack + psutil + pyyaml + sortedcontainers + tblib + toolz + tornado + zict ]; # when tested random tests would fail and not repeatably doCheck = false; + pythonImportsCheck = [ "distributed" ]; meta = with lib; { - description = "Distributed computation in Python."; - homepage = "https://distributed.readthedocs.io/en/latest/"; + description = "Distributed computation in Python"; + homepage = "https://distributed.readthedocs.io/"; license = licenses.bsd3; platforms = platforms.x86; # fails on aarch64 maintainers = with maintainers; [ teh costrouc ]; diff --git a/nixpkgs/pkgs/development/python-modules/django-haystack/default.nix b/nixpkgs/pkgs/development/python-modules/django-haystack/default.nix index 2c678e672a3e..14e66a159c18 100644 --- a/nixpkgs/pkgs/development/python-modules/django-haystack/default.nix +++ b/nixpkgs/pkgs/development/python-modules/django-haystack/default.nix @@ -1,5 +1,5 @@ { lib, buildPythonPackage, fetchPypi -, setuptools, setuptools-scm, django, dateutil, whoosh, pysolr +, setuptools, setuptools-scm, django, python-dateutil, whoosh, pysolr , coverage, mock, nose, geopy, requests }: buildPythonPackage rec { @@ -11,7 +11,7 @@ buildPythonPackage rec { sha256 = "d490f920afa85471dd1fa5000bc8eff4b704daacbe09aee1a64e75cbc426f3be"; }; - checkInputs = [ pysolr whoosh dateutil geopy coverage nose mock coverage requests ]; + checkInputs = [ pysolr whoosh python-dateutil geopy coverage nose mock coverage requests ]; propagatedBuildInputs = [ django setuptools ]; nativeBuildInputs = [ setuptools-scm ]; diff --git a/nixpkgs/pkgs/development/python-modules/django/3.nix b/nixpkgs/pkgs/development/python-modules/django/3.nix index ae6187e207e9..7ee41a962c73 100644 --- a/nixpkgs/pkgs/development/python-modules/django/3.nix +++ b/nixpkgs/pkgs/development/python-modules/django/3.nix @@ -13,13 +13,13 @@ buildPythonPackage rec { pname = "Django"; - version = "3.2.4"; + version = "3.2.5"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "15pjwyvrx4n8gi8n51b14wp54bg4jqapr25p52597zn6ikdxijb6"; + sha256 = "1kam3301jl53vm0mhflwwsqy5d7kb5dksmjanlaj7v7xakm5z81x"; }; patches = lib.optional withGdal diff --git a/nixpkgs/pkgs/development/python-modules/django_silk/default.nix b/nixpkgs/pkgs/development/python-modules/django_silk/default.nix index b1d4eaec5c9a..3af74be85b27 100644 --- a/nixpkgs/pkgs/development/python-modules/django_silk/default.nix +++ b/nixpkgs/pkgs/development/python-modules/django_silk/default.nix @@ -7,7 +7,7 @@ , django , pygments , simplejson -, dateutil +, python-dateutil , requests , setuptools-scm , sqlparse @@ -56,7 +56,7 @@ buildPythonPackage rec { nativeBuildInputs = [ setuptools-scm ]; buildInputs = [ mock ]; propagatedBuildInputs = [ - django pygments simplejson dateutil requests + django pygments simplejson python-dateutil requests sqlparse jinja2 autopep8 pytz pillow gprof2dot ]; diff --git a/nixpkgs/pkgs/development/python-modules/drms/default.nix b/nixpkgs/pkgs/development/python-modules/drms/default.nix index 613d2444d73c..1bc5d380b08e 100644 --- a/nixpkgs/pkgs/development/python-modules/drms/default.nix +++ b/nixpkgs/pkgs/development/python-modules/drms/default.nix @@ -7,16 +7,18 @@ , astropy , pytestCheckHook , pytest-doctestplus +, pythonOlder }: buildPythonPackage rec { pname = "drms"; - version = "0.6.0"; + version = "0.6.2"; format = "pyproject"; + disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "74efb903f42647ea536de0c5aea4f9a81efe027c95055ec4e72ef62479a04c89"; + sha256 = "sha256-Id8rPK8qq71gHn5DKnEi7Lp081GFbcFtGU+v89Vlt9o="; }; propagatedBuildInputs = [ @@ -31,10 +33,12 @@ buildPythonPackage rec { pytest-doctestplus ]; + pythonImportsCheck = [ "drms" ]; + meta = with lib; { description = "Access HMI, AIA and MDI data with Python"; homepage = "https://github.com/sunpy/drms"; - license = licenses.mit; - maintainers = [ maintainers.costrouc ]; + license = licenses.bsd2; + maintainers = with maintainers; [ costrouc ]; }; } diff --git a/nixpkgs/pkgs/development/python-modules/duckdb/default.nix b/nixpkgs/pkgs/development/python-modules/duckdb/default.nix index 4a4dd279a52e..fd360bfbd120 100644 --- a/nixpkgs/pkgs/development/python-modules/duckdb/default.nix +++ b/nixpkgs/pkgs/development/python-modules/duckdb/default.nix @@ -5,7 +5,7 @@ , pandas , pybind11 , setuptools-scm -, pytestrunner +, pytest-runner , pytestCheckHook }: @@ -28,18 +28,24 @@ buildPythonPackage rec { nativeBuildInputs = [ pybind11 setuptools-scm - pytestrunner + pytest-runner ]; - propagatedBuildInputs = [ numpy pandas ]; + propagatedBuildInputs = [ + numpy + pandas + ]; + + checkInputs = [ + pytestCheckHook + ]; - checkInputs = [ pytestCheckHook ]; pythonImportsCheck = [ "duckdb" ]; meta = with lib; { - description = "DuckDB is an embeddable SQL OLAP Database Management System"; - homepage = "https://pypi.python.org/pypi/duckdb"; + description = "Python binding for DuckDB"; + homepage = "https://duckdb.org/"; license = licenses.mit; - maintainers = [ maintainers.costrouc ]; + maintainers = with maintainers; [ costrouc ]; }; } diff --git a/nixpkgs/pkgs/development/python-modules/dugong/default.nix b/nixpkgs/pkgs/development/python-modules/dugong/default.nix index 09a0f25e18fd..5130ea3b0043 100644 --- a/nixpkgs/pkgs/development/python-modules/dugong/default.nix +++ b/nixpkgs/pkgs/development/python-modules/dugong/default.nix @@ -1,14 +1,32 @@ -{ buildPythonPackage, fetchPypi, pythonOlder }: +{ lib +, buildPythonPackage +, fetchFromGitHub +, pythonOlder +, pytestCheckHook +}: buildPythonPackage rec { pname = "dugong"; - version = "3.7.5"; + version = "3.8.1"; + disabled = pythonOlder "3.3"; - disabled = pythonOlder "3.3"; # Library does not support versions older than 3.3 + src = fetchFromGitHub { + owner = "python-dugong"; + repo = "python-dugong"; + rev = "release-${version}"; + sha256 = "1063c1779idc5nrjzfv5w1xqvyy3crapb2a2xll9y6xphxclnkjc"; + }; + + checkInputs = [ + pytestCheckHook + ]; + + pythonImportsCheck = [ "dugong" ]; - src = fetchPypi { - inherit pname version; - extension = "tar.bz2"; - sha256 = "10vjdp21m0gzm096lgl84z184s5l9iz69ppj6acgsc125037dl6h"; + meta = with lib; { + description = "HTTP 1.1 client designed for REST-ful APIs"; + homepage = "https://github.com/python-dugong/python-dugong/"; + license = with licenses; [ psfl asl20 ]; + maintainers = with maintainers; [ ]; }; } diff --git a/nixpkgs/pkgs/development/python-modules/ecos/default.nix b/nixpkgs/pkgs/development/python-modules/ecos/default.nix index 6c07a5d485a6..35470cb8b60b 100644 --- a/nixpkgs/pkgs/development/python-modules/ecos/default.nix +++ b/nixpkgs/pkgs/development/python-modules/ecos/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "ecos"; - version = "2.0.7.post1"; + version = "2.0.8"; disabled = pythonOlder "3.6"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "embotech"; repo = "ecos-python"; rev = version; - sha256 = "1wzmamz2r4xr2zxgfwnm5q283185d1q6a7zn30vip18lxpys70z0"; + sha256 = "sha256-2OJqbcOZceeD2fO5cu9fohuUVaA2LwQOQSWR4jRv3mk="; fetchSubmodules = true; }; diff --git a/nixpkgs/pkgs/development/python-modules/editdistance-s/default.nix b/nixpkgs/pkgs/development/python-modules/editdistance-s/default.nix new file mode 100644 index 000000000000..8d9be707f9b4 --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/editdistance-s/default.nix @@ -0,0 +1,31 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, pytestCheckHook +, cffi +}: + +buildPythonPackage rec { + pname = "editdistance-s"; + version = "1.0.0"; + + src = fetchFromGitHub { + owner = "asottile"; + repo = pname; + rev = "v${version}"; + sha256 = "0w2qd5b6a3c3ahd0xy9ykq4wzqk0byqwdqrr26dyn8j2425j46lg"; + }; + + propagatedBuildInputs = [ cffi ]; + + checkInputs = [ pytestCheckHook ]; + + pythonImportsCheck = [ "editdistance_s" ]; + + meta = with lib; { + description = "Fast implementation of the edit distance (Levenshtein distance)"; + homepage = "https://github.com/asottile/editdistance-s"; + license = with licenses; [ mit ]; + maintainers = with maintainers; [ austinbutler ]; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/editorconfig/default.nix b/nixpkgs/pkgs/development/python-modules/editorconfig/default.nix index 4329db98c2bd..6449a3da767c 100644 --- a/nixpkgs/pkgs/development/python-modules/editorconfig/default.nix +++ b/nixpkgs/pkgs/development/python-modules/editorconfig/default.nix @@ -6,29 +6,33 @@ buildPythonPackage rec { pname = "editorconfig"; - version = "0.12.2"; + version = "0.12.3"; # fetchgit used to ensure test submodule is available src = fetchgit { url = "https://github.com/editorconfig/editorconfig-core-py"; - rev = "596da5e06ebee05bdbdc6224203c79c4d3c6486a"; # Not tagged - sha256 = "05cbp971b0zix7kfxkk7ndxb4ax1l21frwc00d4g78mk4sdz6dig"; + rev = "1a8fb62b9941fded9e4fb83a3d0599427f5484cb"; # Not tagged + sha256 = "0vx8rl7kii72965jsi01mdsz9rfi1q9bwy13x47iaqm6rmcwc1rb"; }; - nativeBuildInputs = [ cmake ]; + nativeBuildInputs = [ + cmake + ]; dontUseCmakeConfigure = true; checkPhase = '' cmake . - # utf_8_char fails with python3 + # utf_8_char fails with Python 3 ctest -E "utf_8_char" . ''; + pythonImportsCheck = [ "editorconfig" ]; + meta = with lib; { - homepage = "https://editorconfig.org"; description = "EditorConfig File Locator and Interpreter for Python"; + homepage = "https://editorconfig.org"; license = licenses.psfl; + maintainers = with maintainers; [ ]; }; - } diff --git a/nixpkgs/pkgs/development/python-modules/emailthreads/default.nix b/nixpkgs/pkgs/development/python-modules/emailthreads/default.nix index 36553daff55f..c57e58368ff8 100644 --- a/nixpkgs/pkgs/development/python-modules/emailthreads/default.nix +++ b/nixpkgs/pkgs/development/python-modules/emailthreads/default.nix @@ -3,7 +3,7 @@ buildPythonPackage rec { pname = "emailthreads"; - version = "0.1.0"; + version = "0.1.3"; disabled = !isPy3k; # pypi is missing files for tests @@ -11,7 +11,7 @@ buildPythonPackage rec { owner = "emersion"; repo = "python-emailthreads"; rev = "v${version}"; - sha256 = "17pfal8kbxhs025apkijqbkppw2lljca8x1cwcx49jv60h05c3cn"; + sha256 = "sha256-7BhYS1DQCW9QpG31asPCq5qPyJy+WW2onZpvEHhwQCs="; }; PKGVER = version; diff --git a/nixpkgs/pkgs/development/python-modules/emcee/default.nix b/nixpkgs/pkgs/development/python-modules/emcee/default.nix index a4f2bece3497..72cb9a64db0a 100644 --- a/nixpkgs/pkgs/development/python-modules/emcee/default.nix +++ b/nixpkgs/pkgs/development/python-modules/emcee/default.nix @@ -1,20 +1,42 @@ -{ lib, buildPythonPackage, fetchPypi -, numpy }: +{ lib +, buildPythonPackage +, fetchFromGitHub +, numpy +, pytestCheckHook +, setuptools-scm +}: buildPythonPackage rec { pname = "emcee"; - version = "3.0.2"; + version = "3.1.0"; - src = fetchPypi { - inherit pname version; - sha256 = "035a44d7594fdd03efd10a522558cdfaa080e046ad75594d0bf2aec80ec35388"; + src = fetchFromGitHub { + owner = "dfm"; + repo = pname; + rev = "v${version}"; + sha256 = "1x9y4zwlv6hl7jms2knpa2qrh89ywsl847yb7d93n94gyx2s16p0"; }; - propagatedBuildInputs = [ numpy ]; + SETUPTOOLS_SCM_PRETEND_VERSION = version; + + nativeBuildInputs = [ + setuptools-scm + ]; + + propagatedBuildInputs = [ + numpy + ]; + + checkInputs = [ + pytestCheckHook + ]; + + pythonImportsCheck = [ "emcee" ]; meta = with lib; { description = "Kick ass affine-invariant ensemble MCMC sampling"; homepage = "https://emcee.readthedocs.io/"; license = licenses.mit; + maintainers = with maintainers; [ ]; }; } diff --git a/nixpkgs/pkgs/development/python-modules/emoji/default.nix b/nixpkgs/pkgs/development/python-modules/emoji/default.nix index ce2beb235116..67c9c7a1abd0 100644 --- a/nixpkgs/pkgs/development/python-modules/emoji/default.nix +++ b/nixpkgs/pkgs/development/python-modules/emoji/default.nix @@ -1,21 +1,33 @@ -{ lib, buildPythonPackage, fetchPypi, nose }: +{ lib +, buildPythonPackage +, fetchFromGitHub +, pytestCheckHook +}: buildPythonPackage rec { pname = "emoji"; - version = "1.2.0"; + version = "1.4.0"; - src = fetchPypi { - inherit pname version; - sha256 = "18siknldyqvxvjf0nv18m0a1c26ahkg7vmhkij1qayanb0h46vs9"; + src = fetchFromGitHub { + owner = "carpedm20"; + repo = pname; + rev = "v.${version}"; + sha256 = "0xksxdld20sh3c2s6pry1fm2br9xq8ypdq5pf971fpg5pk2f4iy9"; }; - checkInputs = [ nose ]; + checkInputs = [ + pytestCheckHook + ]; - checkPhase = "nosetests"; + disabledTests = [ + "test_emojize_name_only" + ]; + + pythonImportsCheck = [ "emoji" ]; meta = with lib; { description = "Emoji for Python"; - homepage = "https://pypi.python.org/pypi/emoji/"; + homepage = "https://github.com/carpedm20/emoji/"; license = licenses.bsd3; maintainers = with maintainers; [ joachifm ]; }; diff --git a/nixpkgs/pkgs/development/python-modules/enaml/default.nix b/nixpkgs/pkgs/development/python-modules/enaml/default.nix index 8896c5c706a6..8257af2e45fe 100644 --- a/nixpkgs/pkgs/development/python-modules/enaml/default.nix +++ b/nixpkgs/pkgs/development/python-modules/enaml/default.nix @@ -12,13 +12,13 @@ buildPythonPackage rec { pname = "enaml"; - version = "0.11.2"; + version = "0.13.0"; src = fetchFromGitHub { owner = "nucleic"; repo = pname; rev = version; - sha256 = "1in5qa5j96qs3gsv8yaxs1l6dbm69xhzvc0pbzg0dd9kpqxfdy1j"; + sha256 = "sha256-8ZahvFDYW7xUTSTZP1UXnQBCg9RVUywoO7EbqtTQPJI="; }; # qt bindings cannot be found during tests diff --git a/nixpkgs/pkgs/development/python-modules/enturclient/default.nix b/nixpkgs/pkgs/development/python-modules/enturclient/default.nix index 8ac474b6e5f8..f98b38396efc 100644 --- a/nixpkgs/pkgs/development/python-modules/enturclient/default.nix +++ b/nixpkgs/pkgs/development/python-modules/enturclient/default.nix @@ -3,21 +3,27 @@ , async-timeout , buildPythonPackage , fetchFromGitHub +, poetry-core , pythonOlder }: buildPythonPackage rec { pname = "enturclient"; - version = "0.2.1"; - disabled = pythonOlder "3.7"; + version = "0.2.2"; + disabled = pythonOlder "3.8"; + format = "pyproject"; src = fetchFromGitHub { owner = "hfurubotten"; repo = pname; rev = "v${version}"; - sha256 = "158xzv9c2drjgrdhfqm0xzx2d34v45gr5rnjfsi94scffvprgwrg"; + sha256 = "1kl44ch8p31pr70yv6na2m0w40frackdwzph9rpb05sc83va701i"; }; + nativeBuildInputs = [ + poetry-core + ]; + propagatedBuildInputs = [ aiohttp async-timeout diff --git a/nixpkgs/pkgs/development/python-modules/env-canada/default.nix b/nixpkgs/pkgs/development/python-modules/env-canada/default.nix new file mode 100644 index 000000000000..3beb01e3b13e --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/env-canada/default.nix @@ -0,0 +1,55 @@ +{ lib +, aiohttp +, buildPythonPackage +, fetchFromGitHub +, geopy +, imageio +, pillow +, pytestCheckHook +, python-dateutil +}: + +buildPythonPackage rec { + pname = "env-canada"; + version = "0.4.0"; + + src = fetchFromGitHub { + owner = "michaeldavie"; + repo = "env_canada"; + rev = "v${version}"; + sha256 = "0y4yjzmg6ns7a13j1cxqvrff4fd6k97cpc1xjwqrwp7gq49rzhy7"; + }; + + propagatedBuildInputs = [ + aiohttp + geopy + imageio + pillow + python-dateutil + ]; + + checkInputs = [ + pytestCheckHook + ]; + + disabledTests = [ + # Tests require network access + "test_get_aqhi_regions" + "test_update" + "test_get_hydro_sites" + "test_echydro" + "test_get_dimensions" + "test_get_latest_frame" + "test_get_loop" + "test_get_ec_sites" + ]; + + pythonImportsCheck = [ "env_canada" ]; + + meta = with lib; { + description = "Python library to get Environment Canada weather data"; + homepage = "https://github.com/michaeldavie/env_canada"; + license = with licenses; [ mit ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/ephem/default.nix b/nixpkgs/pkgs/development/python-modules/ephem/default.nix index c0d77c297481..a859f509f347 100644 --- a/nixpkgs/pkgs/development/python-modules/ephem/default.nix +++ b/nixpkgs/pkgs/development/python-modules/ephem/default.nix @@ -1,26 +1,36 @@ -{ lib, buildPythonPackage, fetchPypi, isPy3k -, glibcLocales, pytest }: +{ lib +, buildPythonPackage +, fetchPypi +, isPy3k +, glibcLocales +, pytest +}: buildPythonPackage rec { pname = "ephem"; - version = "3.7.7.1"; + version = "4.0.0.2"; src = fetchPypi { inherit pname version; - sha256 = "36b51a8dc7cfdeb456dd6b8ab811accab8341b2d562ee3c6f4c86f6d3dbb984e"; + sha256 = "sha256-0D3nPr9qkWgdWX61tdQ7z28MZ+KSu6L5qXRzS08VdX4="; }; - patchFlags = [ "-p0" ]; - checkInputs = [ pytest glibcLocales ]; + checkInputs = [ + glibcLocales + pytest + ]; + # JPLTest uses assets not distributed in package checkPhase = '' - LC_ALL="en_US.UTF-8" py.test --pyargs ephem.tests -k "not JPLTest" + LC_ALL="en_US.UTF-8" pytest --pyargs ephem.tests -k "not JPLTest" ''; + pythonImportsCheck = [ "ephem" ]; + meta = with lib; { description = "Compute positions of the planets and stars"; - homepage = "https://pypi.python.org/pypi/ephem/"; - license = licenses.lgpl3; + homepage = "https://github.com/brandon-rhodes/pyephem"; + license = licenses.mit; maintainers = with maintainers; [ chrisrosset ]; }; } diff --git a/nixpkgs/pkgs/development/python-modules/extractcode/7z.nix b/nixpkgs/pkgs/development/python-modules/extractcode/7z.nix index e3318b426ecc..be6fcde55c29 100644 --- a/nixpkgs/pkgs/development/python-modules/extractcode/7z.nix +++ b/nixpkgs/pkgs/development/python-modules/extractcode/7z.nix @@ -4,15 +4,16 @@ , plugincode , p7zip }: + buildPythonPackage rec { pname = "extractcode-7z"; - version = "21.4.4"; + version = "21.5.31"; src = fetchFromGitHub { owner = "nexB"; repo = "scancode-plugins"; rev = "v${version}"; - sha256 = "xnUGDMS34iMVMGo/nZwRarGzzbj3X4Rt+YHvvKpmy6A="; + sha256 = "02qinla281fc6pmg5xzsrmqnf9js76f2qcbf98zq7m2dkn70as4w"; }; sourceRoot = "source/builtins/extractcode_7z-linux"; diff --git a/nixpkgs/pkgs/development/python-modules/extractcode/libarchive.nix b/nixpkgs/pkgs/development/python-modules/extractcode/libarchive.nix index 8e89c3d6a8e3..2cff60f3d811 100644 --- a/nixpkgs/pkgs/development/python-modules/extractcode/libarchive.nix +++ b/nixpkgs/pkgs/development/python-modules/extractcode/libarchive.nix @@ -15,13 +15,13 @@ buildPythonPackage rec { pname = "extractcode-libarchive"; - version = "21.4.4"; + version = "21.5.31"; src = fetchFromGitHub { owner = "nexB"; repo = "scancode-plugins"; rev = "v${version}"; - sha256 = "xnUGDMS34iMVMGo/nZwRarGzzbj3X4Rt+YHvvKpmy6A="; + sha256 = "02qinla281fc6pmg5xzsrmqnf9js76f2qcbf98zq7m2dkn70as4w"; }; sourceRoot = "source/builtins/extractcode_libarchive-linux"; diff --git a/nixpkgs/pkgs/development/python-modules/fabulous/default.nix b/nixpkgs/pkgs/development/python-modules/fabulous/default.nix index 6079f22020a2..b357eb0c01b4 100644 --- a/nixpkgs/pkgs/development/python-modules/fabulous/default.nix +++ b/nixpkgs/pkgs/development/python-modules/fabulous/default.nix @@ -7,13 +7,13 @@ buildPythonPackage rec { pname = "fabulous"; - version = "0.3.0"; + version = "0.4.0"; src = fetchFromGitHub { owner = "jart"; repo = pname; rev = version; - sha256 = "0yxdaz6yayp1a57kdb2i8q7kwwdlwy4a3d0lr012h2ji9m89c8q7"; + sha256 = "sha256-hchlxuB5QP+VxCx+QZ2739/mR5SQmYyE+9kXLKJ2ij4="; }; patches = [ diff --git a/nixpkgs/pkgs/development/python-modules/fake_factory/default.nix b/nixpkgs/pkgs/development/python-modules/fake_factory/default.nix index 2e561a163ab5..002df15177bd 100644 --- a/nixpkgs/pkgs/development/python-modules/fake_factory/default.nix +++ b/nixpkgs/pkgs/development/python-modules/fake_factory/default.nix @@ -3,7 +3,7 @@ , fetchPypi , python , six -, dateutil +, python-dateutil , ipaddress , mock }: @@ -17,7 +17,7 @@ buildPythonPackage rec { sha256 = "f5bd18deb22ad8cb4402513c025877bc6b50de58902d686b6b21ba8981dce260"; }; - propagatedBuildInputs = [ six dateutil ipaddress mock ]; + propagatedBuildInputs = [ six python-dateutil ipaddress mock ]; # fake-factory is depreciated and single test will always fail doCheck = false; diff --git a/nixpkgs/pkgs/development/python-modules/faker/default.nix b/nixpkgs/pkgs/development/python-modules/faker/default.nix index 12f30b20a42b..196c7e47b399 100644 --- a/nixpkgs/pkgs/development/python-modules/faker/default.nix +++ b/nixpkgs/pkgs/development/python-modules/faker/default.nix @@ -1,7 +1,7 @@ { lib , buildPythonPackage , fetchPypi -, dateutil +, python-dateutil , text-unidecode , freezegun , pytestCheckHook @@ -19,7 +19,7 @@ buildPythonPackage rec { }; propagatedBuildInputs = [ - dateutil + python-dateutil text-unidecode ]; diff --git a/nixpkgs/pkgs/development/python-modules/fastimport/default.nix b/nixpkgs/pkgs/development/python-modules/fastimport/default.nix index c036f5cacb70..fe46405eb3f1 100644 --- a/nixpkgs/pkgs/development/python-modules/fastimport/default.nix +++ b/nixpkgs/pkgs/development/python-modules/fastimport/default.nix @@ -1,9 +1,16 @@ -{ lib, buildPythonPackage, python, fetchPypi}: +{ lib +, pythonOlder +, buildPythonPackage +, fetchPypi +, python +}: buildPythonPackage rec { pname = "fastimport"; version = "0.9.13"; + disabled = pythonOlder "3.5"; + src = fetchPypi { inherit pname version; sha256 = "486135a39edb85808fdbbe2c8009197978800a4544fca56cc2074df32e1304f3"; @@ -13,8 +20,10 @@ buildPythonPackage rec { ${python.interpreter} -m unittest discover ''; + pythonImportsCheck = [ "fastimport" ]; + meta = with lib; { - homepage = "https://launchpad.net/python-fastimport"; + homepage = "https://github.com/jelmer/python-fastimport"; description = "VCS fastimport/fastexport parser"; maintainers = with maintainers; [ koral ]; license = licenses.gpl2Plus; diff --git a/nixpkgs/pkgs/development/python-modules/feedgen/default.nix b/nixpkgs/pkgs/development/python-modules/feedgen/default.nix index 59ca95a0338a..9ca3627e74ca 100644 --- a/nixpkgs/pkgs/development/python-modules/feedgen/default.nix +++ b/nixpkgs/pkgs/development/python-modules/feedgen/default.nix @@ -1,4 +1,4 @@ -{ lib, buildPythonPackage, fetchPypi, dateutil, lxml }: +{ lib, buildPythonPackage, fetchPypi, python-dateutil, lxml }: buildPythonPackage rec { pname = "feedgen"; @@ -9,7 +9,7 @@ buildPythonPackage rec { sha256 = "0jl0b87l7v6c0f1nx6k81skjhdj5i11kmchdjls00mynpvdip0cf"; }; - propagatedBuildInputs = [ dateutil lxml ]; + propagatedBuildInputs = [ python-dateutil lxml ]; # No tests in archive doCheck = false; diff --git a/nixpkgs/pkgs/development/python-modules/fitbit/default.nix b/nixpkgs/pkgs/development/python-modules/fitbit/default.nix index 46c6ac78a6c4..b41ac0a4983a 100644 --- a/nixpkgs/pkgs/development/python-modules/fitbit/default.nix +++ b/nixpkgs/pkgs/development/python-modules/fitbit/default.nix @@ -2,7 +2,7 @@ , buildPythonPackage , fetchFromGitHub , coverage -, dateutil +, python-dateutil , freezegun , mock , requests-mock @@ -15,7 +15,7 @@ buildPythonPackage rec { version = "0.3.1"; checkInputs = [ coverage freezegun mock requests-mock sphinx ]; - propagatedBuildInputs = [ dateutil requests_oauthlib ]; + propagatedBuildInputs = [ python-dateutil requests_oauthlib ]; # The source package on PyPi is missing files required for unit testing. # https://github.com/orcasgit/python-fitbit/issues/148 diff --git a/nixpkgs/pkgs/development/python-modules/flask-compress/default.nix b/nixpkgs/pkgs/development/python-modules/flask-compress/default.nix index 5d8359885bd1..fff330946d16 100644 --- a/nixpkgs/pkgs/development/python-modules/flask-compress/default.nix +++ b/nixpkgs/pkgs/development/python-modules/flask-compress/default.nix @@ -11,6 +11,10 @@ buildPythonPackage rec { sha256 = "28352387efbbe772cfb307570019f81957a13ff718d994a9125fa705efb73680"; }; + postPatch = '' + sed -i -e 's/use_scm_version=.*/version="${version}",/' setup.py + ''; + propagatedBuildInputs = [ flask brotli ]; meta = with lib; { diff --git a/nixpkgs/pkgs/development/python-modules/flask-jwt-extended/default.nix b/nixpkgs/pkgs/development/python-modules/flask-jwt-extended/default.nix index d58ae4310398..7057bb587503 100644 --- a/nixpkgs/pkgs/development/python-modules/flask-jwt-extended/default.nix +++ b/nixpkgs/pkgs/development/python-modules/flask-jwt-extended/default.nix @@ -1,4 +1,4 @@ -{ lib, buildPythonPackage, fetchPypi, dateutil, flask, pyjwt, werkzeug, pytest }: +{ lib, buildPythonPackage, fetchPypi, python-dateutil, flask, pyjwt, werkzeug, pytest }: buildPythonPackage rec { pname = "Flask-JWT-Extended"; @@ -9,7 +9,7 @@ buildPythonPackage rec { sha256 = "76461f2dbdf502261c69ddecd858eaf4164fbcfbf05aa456f3927fc2ab0315de"; }; - propagatedBuildInputs = [ dateutil flask pyjwt werkzeug ]; + propagatedBuildInputs = [ python-dateutil flask pyjwt werkzeug ]; checkInputs = [ pytest ]; checkPhase = '' diff --git a/nixpkgs/pkgs/development/python-modules/flask-restx/default.nix b/nixpkgs/pkgs/development/python-modules/flask-restx/default.nix index e1de7bf0d3b3..4d0d89d0f146 100644 --- a/nixpkgs/pkgs/development/python-modules/flask-restx/default.nix +++ b/nixpkgs/pkgs/development/python-modules/flask-restx/default.nix @@ -20,16 +20,23 @@ buildPythonPackage rec { pname = "flask-restx"; - version = "0.3.0"; + version = "0.4.0"; # Tests not included in PyPI tarball src = fetchFromGitHub { owner = "python-restx"; repo = pname; rev = version; - sha256 = "0aj13nd3z71gb8c2kqiaz3f9k7jr0srlvrsx8hpz4nkpki8jiz2s"; + sha256 = "sha256-jM0QJ/klbWh3qho6ZQOH2n1qaguK9C98QIuSfqpI8xA="; }; + postPatch = '' + # https://github.com/python-restx/flask-restx/pull/341 + substituteInPlace requirements/install.pip \ + --replace "Flask>=0.8, <2.0.0" "Flask>=0.8, !=2.0.0" \ + --replace "werkzeug <2.0.0" "werkzeug !=2.0.0" + ''; + propagatedBuildInputs = [ aniso8601 jsonschema flask werkzeug pytz six ] ++ lib.optionals isPy27 [ enum34 ]; @@ -42,6 +49,8 @@ buildPythonPackage rec { "--deselect=tests/test_logging.py::LoggingTest::test_override_app_level" ]; + pythonImportCheck = [ "flask_restx" ]; + meta = with lib; { homepage = "https://flask-restx.readthedocs.io/en/${version}/"; description = "Fully featured framework for fast, easy and documented API development with Flask"; diff --git a/nixpkgs/pkgs/development/python-modules/foolscap/default.nix b/nixpkgs/pkgs/development/python-modules/foolscap/default.nix index e0d38a5a1313..ea0c17d5524a 100644 --- a/nixpkgs/pkgs/development/python-modules/foolscap/default.nix +++ b/nixpkgs/pkgs/development/python-modules/foolscap/default.nix @@ -2,39 +2,48 @@ , buildPythonPackage , fetchPypi , mock -, twisted , pyopenssl +, pytestCheckHook , service-identity +, twisted }: buildPythonPackage rec { pname = "foolscap"; - version = "20.4.0"; + version = "21.7.0"; src = fetchPypi { inherit pname version; - sha256 = "0rbw9makjmawkcxnkkngybj3n14s0dnzn9gkqqq2krcm514kmlb9"; + sha256 = "sha256-6dGFU4YNk1joXXZi2c2L84JtUbTs1ICgXfv0/EU2P4Q="; }; - propagatedBuildInputs = [ mock twisted pyopenssl service-identity ]; + propagatedBuildInputs = [ + mock + twisted + pyopenssl + service-identity + ]; + + checkInputs = [ + pytestCheckHook + ]; - checkPhase = '' - # Either uncomment this, or remove this custom check phase entirely, if - # you wish to do battle with the foolscap tests. ~ C. - # trial foolscap - ''; + disabledTestPaths = [ + # Not all dependencies are present + "src/foolscap/test/test_connection.py" + ]; + + pythonImportsCheck = [ "foolscap" ]; meta = with lib; { - homepage = "http://foolscap.lothar.com/"; - description = "Foolscap, an RPC protocol for Python that follows the distributed object-capability model"; + description = "RPC protocol for Python that follows the distributed object-capability model"; longDescription = '' - "Foolscap" is the name for the next-generation RPC protocol, - intended to replace Perspective Broker (part of Twisted). - Foolscap is a protocol to implement a distributed - object-capabilities model in Python. + "Foolscap" is the name for the next-generation RPC protocol, intended to + replace Perspective Broker (part of Twisted). Foolscap is a protocol to + implement a distributed object-capabilities model in Python. ''; - # See http://foolscap.lothar.com/trac/browser/LICENSE. + homepage = "https://github.com/warner/foolscap"; license = licenses.mit; + maintainers = with maintainers; [ ]; }; - } diff --git a/nixpkgs/pkgs/development/python-modules/freezegun/0.3.nix b/nixpkgs/pkgs/development/python-modules/freezegun/0.3.nix index a83a432d89dc..c4444805009d 100644 --- a/nixpkgs/pkgs/development/python-modules/freezegun/0.3.nix +++ b/nixpkgs/pkgs/development/python-modules/freezegun/0.3.nix @@ -2,7 +2,7 @@ , buildPythonPackage , fetchPypi , isPy27 -, dateutil +, python-dateutil , six , mock , nose @@ -18,7 +18,7 @@ buildPythonPackage rec { sha256 = "e2062f2c7f95cc276a834c22f1a17179467176b624cc6f936e8bc3be5535ad1b"; }; - propagatedBuildInputs = [ dateutil six ]; + propagatedBuildInputs = [ python-dateutil six ]; checkInputs = [ mock nose pytest ]; meta = with lib; { diff --git a/nixpkgs/pkgs/development/python-modules/freezegun/default.nix b/nixpkgs/pkgs/development/python-modules/freezegun/default.nix index 00d03435de9d..742506b6089d 100644 --- a/nixpkgs/pkgs/development/python-modules/freezegun/default.nix +++ b/nixpkgs/pkgs/development/python-modules/freezegun/default.nix @@ -2,7 +2,7 @@ , buildPythonPackage , pythonOlder , fetchPypi -, dateutil +, python-dateutil , pytestCheckHook }: @@ -16,7 +16,7 @@ buildPythonPackage rec { sha256 = "177f9dd59861d871e27a484c3332f35a6e3f5d14626f2bf91be37891f18927f3"; }; - propagatedBuildInputs = [ dateutil ]; + propagatedBuildInputs = [ python-dateutil ]; checkInputs = [ pytestCheckHook ]; meta = with lib; { diff --git a/nixpkgs/pkgs/development/python-modules/gdrivefs/default.nix b/nixpkgs/pkgs/development/python-modules/gdrivefs/default.nix index 836fdee4bebd..41b6a6a87f19 100644 --- a/nixpkgs/pkgs/development/python-modules/gdrivefs/default.nix +++ b/nixpkgs/pkgs/development/python-modules/gdrivefs/default.nix @@ -6,7 +6,7 @@ , greenlet , httplib2 , six -, dateutil +, python-dateutil , fusepy , google-api-python-client }: @@ -22,7 +22,7 @@ buildPythonPackage rec { }; buildInputs = [ gipc greenlet httplib2 six ]; - propagatedBuildInputs = [ dateutil fusepy google-api-python-client ]; + propagatedBuildInputs = [ python-dateutil fusepy google-api-python-client ]; patchPhase = '' substituteInPlace gdrivefs/resources/requirements.txt \ diff --git a/nixpkgs/pkgs/development/python-modules/georss-ign-sismologia-client/default.nix b/nixpkgs/pkgs/development/python-modules/georss-ign-sismologia-client/default.nix index 3fada45d0c8c..e87c766c0caf 100644 --- a/nixpkgs/pkgs/development/python-modules/georss-ign-sismologia-client/default.nix +++ b/nixpkgs/pkgs/development/python-modules/georss-ign-sismologia-client/default.nix @@ -8,14 +8,14 @@ buildPythonPackage rec { pname = "georss-ign-sismologia-client"; - version = "0.3"; + version = "0.4"; disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "exxamalte"; repo = "python-georss-ign-sismologia-client"; rev = "v${version}"; - sha256 = "sha256-7Jj6uWb4HyPAh3/XtVTy0N23bk33mlIiqlt9z/PW+4Y="; + sha256 = "sha256-g7lZC5ZiJV8dNZJceLROqyBRZSuqaivGFhaQrKe4B7g="; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/ghp-import/default.nix b/nixpkgs/pkgs/development/python-modules/ghp-import/default.nix index 37a35febdf03..0d5506009a75 100644 --- a/nixpkgs/pkgs/development/python-modules/ghp-import/default.nix +++ b/nixpkgs/pkgs/development/python-modules/ghp-import/default.nix @@ -1,7 +1,7 @@ { lib , buildPythonPackage , fetchPypi -, dateutil +, python-dateutil }: buildPythonPackage rec { @@ -13,7 +13,7 @@ buildPythonPackage rec { hash = "sha256-wiqc4Qw3dT4miNFk12WnANrkuNefptsKLDEyuniBiU8="; }; - propagatedBuildInputs = [ dateutil ]; + propagatedBuildInputs = [ python-dateutil ]; # Does not include any unit tests doCheck = false; diff --git a/nixpkgs/pkgs/development/python-modules/gibberish-detector/default.nix b/nixpkgs/pkgs/development/python-modules/gibberish-detector/default.nix new file mode 100644 index 000000000000..df3b70c000d7 --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/gibberish-detector/default.nix @@ -0,0 +1,32 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, isPy27 +, pytestCheckHook +}: + +buildPythonPackage rec { + pname = "gibberish-detector"; + version = "0.1.1"; + disabled = isPy27; + + src = fetchFromGitHub { + owner = "domanchi"; + repo = pname; + rev = "v${version}"; + sha256 = "1si0fkpnk9vjkwl31sq5jkyv3rz8a5f2nh3xq7591j9wv2b6dn0b"; + }; + + checkInputs = [ + pytestCheckHook + ]; + + pythonImportsCheck = [ "gibberish_detector" ]; + + meta = with lib; { + description = "Python module to detect gibberish strings"; + homepage = "https://github.com/domanchi/gibberish-detector"; + license = licenses.mit; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/github3_py/default.nix b/nixpkgs/pkgs/development/python-modules/github3_py/default.nix index 8a1eea40c682..68e277d0b1a5 100644 --- a/nixpkgs/pkgs/development/python-modules/github3_py/default.nix +++ b/nixpkgs/pkgs/development/python-modules/github3_py/default.nix @@ -9,7 +9,7 @@ , mock , requests , uritemplate -, dateutil +, python-dateutil , jwcrypto , pyopenssl , ndg-httpsclient @@ -28,7 +28,7 @@ buildPythonPackage rec { checkInputs = [ betamax pytest betamax-matchers ] ++ lib.optional (pythonOlder "3") unittest2 ++ lib.optional (pythonOlder "3.3") mock; - propagatedBuildInputs = [ requests uritemplate dateutil jwcrypto pyopenssl ndg-httpsclient pyasn1 ]; + propagatedBuildInputs = [ requests uritemplate python-dateutil jwcrypto pyopenssl ndg-httpsclient pyasn1 ]; postPatch = '' sed -i -e 's/unittest2 ==0.5.1/unittest2>=0.5.1/' setup.py diff --git a/nixpkgs/pkgs/development/python-modules/google-apputils/default.nix b/nixpkgs/pkgs/development/python-modules/google-apputils/default.nix index 321837f56aec..225adf348d1a 100644 --- a/nixpkgs/pkgs/development/python-modules/google-apputils/default.nix +++ b/nixpkgs/pkgs/development/python-modules/google-apputils/default.nix @@ -4,7 +4,7 @@ , isPy3k , pytz , gflags -, dateutil +, python-dateutil , mox , python }: @@ -23,7 +23,7 @@ buildPythonPackage rec { sed -i '/ez_setup/d' setup.py ''; - propagatedBuildInputs = [ pytz gflags dateutil mox ]; + propagatedBuildInputs = [ pytz gflags python-dateutil mox ]; checkPhase = '' ${python.executable} setup.py google_test diff --git a/nixpkgs/pkgs/development/python-modules/graphene/default.nix b/nixpkgs/pkgs/development/python-modules/graphene/default.nix index be2cc808eb0d..c2776e20e2bb 100644 --- a/nixpkgs/pkgs/development/python-modules/graphene/default.nix +++ b/nixpkgs/pkgs/development/python-modules/graphene/default.nix @@ -25,9 +25,8 @@ buildPythonPackage rec { sha256 = "sha256-bVCCLPnV5F8PqLMg3GwcpwpGldrxsU+WryL6gj6y338="; }; - # Allow later aniso8601 releases - # https://github.com/graphql-python/graphene/pull/1331 patches = [ (fetchpatch { + # Allow later aniso8601 releases, https://github.com/graphql-python/graphene/pull/1331 url = "https://github.com/graphql-python/graphene/commit/26b16f75b125e35eeb2274b7be503ec29f2e8a45.patch"; sha256 = "qm96pNOoxPieEy1CFZpa2Mx010pY3QU/vRyuL0qO3Tk="; }) ]; @@ -50,6 +49,11 @@ buildPythonPackage rec { pytestFlagsArray = [ "--benchmark-disable" ]; + disabledTests = [ + # TypeError: Failed: DID NOT RAISE <class... + "test_unexpected_error" + ]; + pythonImportsCheck = [ "graphene" ]; meta = with lib; { diff --git a/nixpkgs/pkgs/development/python-modules/graphviz/default.nix b/nixpkgs/pkgs/development/python-modules/graphviz/default.nix index 1a0e6d903a47..0a2413e9d761 100644 --- a/nixpkgs/pkgs/development/python-modules/graphviz/default.nix +++ b/nixpkgs/pkgs/development/python-modules/graphviz/default.nix @@ -8,7 +8,6 @@ , mock , pytestCheckHook , pytest-mock -, pytestcov }: buildPythonPackage rec { @@ -30,12 +29,20 @@ buildPythonPackage rec { }) ]; + postPatch = '' + sed -i "/--cov/d" setup.cfg + ''; + # Fontconfig error: Cannot load default config file FONTCONFIG_FILE = makeFontsConf { fontDirectories = [ freefont_ttf ]; }; - checkInputs = [ mock pytestCheckHook pytest-mock pytestcov ]; + checkInputs = [ mock pytestCheckHook pytest-mock ]; + + preCheck = '' + export HOME=$TMPDIR + ''; meta = with lib; { description = "Simple Python interface for Graphviz"; diff --git a/nixpkgs/pkgs/development/python-modules/gssapi/default.nix b/nixpkgs/pkgs/development/python-modules/gssapi/default.nix index 4a98008f7905..cbb81d3c7f61 100644 --- a/nixpkgs/pkgs/development/python-modules/gssapi/default.nix +++ b/nixpkgs/pkgs/development/python-modules/gssapi/default.nix @@ -17,14 +17,14 @@ buildPythonPackage rec { pname = "gssapi"; - version = "1.6.12"; + version = "1.6.14"; disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "pythongssapi"; repo = "python-${pname}"; rev = "v${version}"; - sha256 = "0r6w52vji1095n3wgzjz9ddaqsvsf3f4gal0rv5i62hpqwlbzkn7"; + sha256 = "sha256-pL8uvHUdev+nDG0nGh7j7VIJCIQv0egPoTa9hUMuEZc="; }; # It's used to locate headers diff --git a/nixpkgs/pkgs/development/python-modules/guessit/default.nix b/nixpkgs/pkgs/development/python-modules/guessit/default.nix index 0450dfd07e58..adb131868c7c 100644 --- a/nixpkgs/pkgs/development/python-modules/guessit/default.nix +++ b/nixpkgs/pkgs/development/python-modules/guessit/default.nix @@ -2,7 +2,7 @@ , buildPythonPackage , fetchPypi , pytestrunner -, dateutil +, python-dateutil , babelfish , rebulk }: @@ -20,7 +20,7 @@ buildPythonPackage rec { doCheck = false; buildInputs = [ pytestrunner ]; propagatedBuildInputs = [ - dateutil babelfish rebulk + python-dateutil babelfish rebulk ]; meta = { diff --git a/nixpkgs/pkgs/development/python-modules/guppy3/default.nix b/nixpkgs/pkgs/development/python-modules/guppy3/default.nix index 578f979914cb..b9db312d8716 100644 --- a/nixpkgs/pkgs/development/python-modules/guppy3/default.nix +++ b/nixpkgs/pkgs/development/python-modules/guppy3/default.nix @@ -7,14 +7,14 @@ buildPythonPackage rec { pname = "guppy3"; - version = "3.1.0"; + version = "3.1.1"; disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "zhuyifei1999"; repo = pname; rev = "v${version}"; - sha256 = "0yjsn8najbic4f50nj6jzhzrhj1bw6918w0gihdkzhqynwgqi64m"; + sha256 = "14iwah1i4dcn74zjj9sq3av1yh9q5nvgqwccnn71blp7gxcnxnvh"; }; propagatedBuildInputs = [ tkinter ]; diff --git a/nixpkgs/pkgs/development/python-modules/hass-nabucasa/default.nix b/nixpkgs/pkgs/development/python-modules/hass-nabucasa/default.nix index f69f140017e0..201337ef7717 100644 --- a/nixpkgs/pkgs/development/python-modules/hass-nabucasa/default.nix +++ b/nixpkgs/pkgs/development/python-modules/hass-nabucasa/default.nix @@ -15,13 +15,13 @@ buildPythonPackage rec { pname = "hass-nabucasa"; - version = "0.43.1"; + version = "0.44.0"; src = fetchFromGitHub { owner = "nabucasa"; repo = pname; rev = version; - sha256 = "sha256-eQdbAQRKqnJGxnSTkk3gld9TX9MpP3J8LFNYH6peVIY="; + sha256 = "sha256-cfKuqkIgmbo7/kUIpJFbckyQ0uDrxXmdsI7qORX0PWc="; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/hijri-converter/default.nix b/nixpkgs/pkgs/development/python-modules/hijri-converter/default.nix index d7ae17ed61a8..e9ce708b2cba 100644 --- a/nixpkgs/pkgs/development/python-modules/hijri-converter/default.nix +++ b/nixpkgs/pkgs/development/python-modules/hijri-converter/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "hijri-converter"; - version = "2.1.2"; + version = "2.1.3"; src = fetchPypi { inherit pname version; - sha256 = "43b5ac566e7a7deeab364a2397e94405a65fd24ea786073eb3d4c740ebda7b9b"; + sha256 = "1cq67v0fjk7cd8kbppg2kl31a5i6jm8qrkcdqxx6vxwmx65l68ks"; }; checkInputs = [ pytestCheckHook ]; diff --git a/nixpkgs/pkgs/development/python-modules/hikvision/default.nix b/nixpkgs/pkgs/development/python-modules/hikvision/default.nix new file mode 100644 index 000000000000..274157c9616d --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/hikvision/default.nix @@ -0,0 +1,35 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, requests +, pytestCheckHook +}: + +buildPythonPackage rec { + pname = "hikvision"; + version = "2.0.4"; + + src = fetchFromGitHub { + owner = "fbradyirl"; + repo = pname; + rev = "v${version}"; + sha256 = "1l0zvir4hf1pcwwcmrhkspbdljzmi4lknxar5bkipdanpsm588mn"; + }; + + propagatedBuildInputs = [ + requests + ]; + + checkInputs = [ + pytestCheckHook + ]; + + pythonImportsCheck = [ "hikvision.api" ]; + + meta = with lib; { + description = "Python module for interacting with Hikvision IP Cameras"; + homepage = "https://github.com/fbradyirl/hikvision"; + license = with licenses; [ mit ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/holidays/default.nix b/nixpkgs/pkgs/development/python-modules/holidays/default.nix index fe362fa86da8..e09b957425a8 100644 --- a/nixpkgs/pkgs/development/python-modules/holidays/default.nix +++ b/nixpkgs/pkgs/development/python-modules/holidays/default.nix @@ -1,7 +1,7 @@ { lib , buildPythonPackage , convertdate -, dateutil +, python-dateutil , fetchPypi , hijri-converter , korean-lunar-calendar @@ -22,7 +22,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ convertdate - dateutil + python-dateutil hijri-converter korean-lunar-calendar six diff --git a/nixpkgs/pkgs/development/python-modules/hstspreload/default.nix b/nixpkgs/pkgs/development/python-modules/hstspreload/default.nix index e6a3837522e6..6833837b6968 100644 --- a/nixpkgs/pkgs/development/python-modules/hstspreload/default.nix +++ b/nixpkgs/pkgs/development/python-modules/hstspreload/default.nix @@ -6,14 +6,14 @@ buildPythonPackage rec { pname = "hstspreload"; - version = "2021.6.28"; + version = "2021.7.5"; disabled = isPy27; src = fetchFromGitHub { owner = "sethmlarson"; repo = pname; rev = version; - sha256 = "sha256-SZGyn79R3+IwtoZ+khgFnl0WosRoCcKNk8efGxbOugc="; + sha256 = "sha256-/89K41MrTdF68+BVkfnv+0d+6rBHdRGKpN2Psfr2Wog="; }; # tests require network connection diff --git a/nixpkgs/pkgs/development/python-modules/httmock/default.nix b/nixpkgs/pkgs/development/python-modules/httmock/default.nix index cbf6b95ccd36..7928189c7cd1 100644 --- a/nixpkgs/pkgs/development/python-modules/httmock/default.nix +++ b/nixpkgs/pkgs/development/python-modules/httmock/default.nix @@ -1,22 +1,34 @@ -{ lib, buildPythonPackage, fetchFromGitHub, requests }: +{ lib +, buildPythonPackage +, fetchFromGitHub +, requests +, pytestCheckHook +}: buildPythonPackage rec { - pname = "httmock"; - version = "1.3.0"; + pname = "httmock"; + version = "1.4.0"; src = fetchFromGitHub { owner = "patrys"; repo = "httmock"; rev = version; - sha256 = "1dy7pjq4gz476jcnbbpzk8w8qxr9l8wwgw9x2c7lf6fzsgnf404q"; + sha256 = "sha256-yid4vh1do0zqVzd1VV7gc+Du4VPrkeGFsDHqNbHL28I="; }; - checkInputs = [ requests ]; + checkInputs = [ + requests + pytestCheckHook + ]; + + pytestFlagsArray = [ "tests.py" ]; + + pythonImportsCheck = [ "httmock" ]; meta = with lib; { description = "A mocking library for requests"; - homepage = "https://github.com/patrys/httmock"; - license = licenses.asl20; + homepage = "https://github.com/patrys/httmock"; + license = licenses.asl20; maintainers = with maintainers; [ nyanloutre ]; }; } diff --git a/nixpkgs/pkgs/development/python-modules/hypchat/default.nix b/nixpkgs/pkgs/development/python-modules/hypchat/default.nix index 8337fd2230ba..1f69dfe21062 100644 --- a/nixpkgs/pkgs/development/python-modules/hypchat/default.nix +++ b/nixpkgs/pkgs/development/python-modules/hypchat/default.nix @@ -1,5 +1,5 @@ { buildPythonPackage, fetchPypi -, requests, six, dateutil }: +, requests, six, python-dateutil }: buildPythonPackage rec { pname = "hypchat"; @@ -10,5 +10,5 @@ buildPythonPackage rec { sha256 = "1sd8f3gihagaqd848dqy6xw457fa4f9bla1bfyni7fq3h76sjdzg"; }; - propagatedBuildInputs = [ requests six dateutil ]; + propagatedBuildInputs = [ requests six python-dateutil ]; } diff --git a/nixpkgs/pkgs/development/python-modules/ibm-cloud-sdk-core/default.nix b/nixpkgs/pkgs/development/python-modules/ibm-cloud-sdk-core/default.nix index 973b792f5bc8..a63617ba2a2a 100644 --- a/nixpkgs/pkgs/development/python-modules/ibm-cloud-sdk-core/default.nix +++ b/nixpkgs/pkgs/development/python-modules/ibm-cloud-sdk-core/default.nix @@ -38,9 +38,17 @@ buildPythonPackage rec { # Various tests try to access credential files which are not included with the source distribution disabledTests = [ - "test_iam" "test_cwd" "test_configure_service" "test_get_authenticator" - "test_read_external_sources_2" "test_files_duplicate_parts" "test_files_list" - "test_files_dict" "test_retry_config_external" "test_gzip_compression_external" + "test_configure_service" + "test_cp4d_authenticator" + "test_cwd" + "test_files_dict" + "test_files_duplicate_parts" + "test_files_list" + "test_get_authenticator" + "test_gzip_compression_external" + "test_iam" + "test_read_external_sources_2" + "test_retry_config_external" ]; meta = with lib; { diff --git a/nixpkgs/pkgs/development/python-modules/ibm-watson/default.nix b/nixpkgs/pkgs/development/python-modules/ibm-watson/default.nix index 7684f1a689cb..3698d8b2e368 100644 --- a/nixpkgs/pkgs/development/python-modules/ibm-watson/default.nix +++ b/nixpkgs/pkgs/development/python-modules/ibm-watson/default.nix @@ -14,13 +14,13 @@ buildPythonPackage rec { pname = "ibm-watson"; - version = "5.2.0"; + version = "5.2.1"; src = fetchFromGitHub { owner = "watson-developer-cloud"; repo = "python-sdk"; rev = "v${version}"; - sha256 = "1abink5mv9nw506nwm9hlvnr1lq6dkxxj2j12iwphcyd7xs63n2s"; + sha256 = "sha256-0F4BZf0D0dqGm0OkJaSgmH5RxEA8KCzOlbnhIQVsgzQ="; }; checkInputs = [ @@ -40,8 +40,7 @@ buildPythonPackage rec { postPatch = '' substituteInPlace setup.py \ - --replace websocket-client==0.48.0 websocket-client>=0.48.0 \ - --replace ibm_cloud_sdk_core==3.3.6 ibm_cloud_sdk_core>=3.3.6 + --replace websocket-client==1.1.0 websocket-client>=1.1.0 ''; meta = with lib; { diff --git a/nixpkgs/pkgs/development/python-modules/icalendar/default.nix b/nixpkgs/pkgs/development/python-modules/icalendar/default.nix index 8e75a945d10c..fdf490e7cb2d 100644 --- a/nixpkgs/pkgs/development/python-modules/icalendar/default.nix +++ b/nixpkgs/pkgs/development/python-modules/icalendar/default.nix @@ -2,7 +2,7 @@ , buildPythonPackage , fetchPypi , setuptools -, dateutil +, python-dateutil , pytz }: @@ -16,7 +16,7 @@ buildPythonPackage rec { }; buildInputs = [ setuptools ]; - propagatedBuildInputs = [ dateutil pytz ]; + propagatedBuildInputs = [ python-dateutil pytz ]; meta = with lib; { description = "A parser/generator of iCalendar files"; diff --git a/nixpkgs/pkgs/development/python-modules/identify/default.nix b/nixpkgs/pkgs/development/python-modules/identify/default.nix index cb4d538da3dd..15850707b187 100644 --- a/nixpkgs/pkgs/development/python-modules/identify/default.nix +++ b/nixpkgs/pkgs/development/python-modules/identify/default.nix @@ -2,23 +2,23 @@ , buildPythonPackage , fetchFromGitHub , pytestCheckHook -, editdistance +, editdistance-s }: buildPythonPackage rec { pname = "identify"; - version = "1.6.1"; + version = "2.2.10"; src = fetchFromGitHub { owner = "pre-commit"; repo = pname; rev = "v${version}"; - sha256 = "1sqhqqjp53dwm8yq4nrgggxbvzs3szbg49z5sj2ss9xzlgmimclm"; + sha256 = "017xcwm8m42a1v3v0fs8v3m2sga97rx9a7vk0cb2g14777f4w4si"; }; checkInputs = [ - editdistance + editdistance-s pytestCheckHook ]; diff --git a/nixpkgs/pkgs/development/python-modules/influxdb/default.nix b/nixpkgs/pkgs/development/python-modules/influxdb/default.nix index 6b3a46ea3915..3b9672701833 100644 --- a/nixpkgs/pkgs/development/python-modules/influxdb/default.nix +++ b/nixpkgs/pkgs/development/python-modules/influxdb/default.nix @@ -1,6 +1,6 @@ { lib , buildPythonPackage -, dateutil +, python-dateutil , fetchFromGitHub , fetchpatch , mock @@ -27,7 +27,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ requests - dateutil + python-dateutil pytz six msgpack diff --git a/nixpkgs/pkgs/development/python-modules/ipfshttpclient/default.nix b/nixpkgs/pkgs/development/python-modules/ipfshttpclient/default.nix index aec8f1ec1176..62fa6d936149 100644 --- a/nixpkgs/pkgs/development/python-modules/ipfshttpclient/default.nix +++ b/nixpkgs/pkgs/development/python-modules/ipfshttpclient/default.nix @@ -20,15 +20,15 @@ buildPythonPackage rec { pname = "ipfshttpclient"; - version = "0.7.0"; + version = "0.8.0a2"; format = "flit"; - disabled = pythonOlder "3.5"; + disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "ipfs-shipyard"; repo = "py-ipfs-http-client"; rev = version; - sha256 = "sha256-0lMoZo/9kZUXkaKvD9ZAZDQdGX7eNLzJVszZdlM/3Qs="; + sha256 = "sha256-OmC67pN2BbuGwM43xNDKlsLhwVeUbpvfOazyIDvoMEA="; }; propagatedBuildInputs = [ @@ -51,11 +51,7 @@ buildPythonPackage rec { ]; postPatch = '' - # Remove when the package supports the latest IPFS version by default - substituteInPlace ipfshttpclient/client/__init__.py \ - --replace 'VERSION_MAXIMUM = "0.8.0"' \ - 'VERSION_MAXIMUM = "0.9.0"' - + # This can be removed for the 0.8.0 release # Use pytest-order instead of pytest-ordering since the latter is unmaintained and broken substituteInPlace test/run-tests.py \ --replace 'pytest_ordering' 'pytest_order' diff --git a/nixpkgs/pkgs/development/python-modules/ipyparallel/default.nix b/nixpkgs/pkgs/development/python-modules/ipyparallel/default.nix index 2c5692bf26a9..cc5957d29733 100644 --- a/nixpkgs/pkgs/development/python-modules/ipyparallel/default.nix +++ b/nixpkgs/pkgs/development/python-modules/ipyparallel/default.nix @@ -2,7 +2,7 @@ , buildPythonPackage , fetchPypi , nose -, dateutil +, python-dateutil , ipython_genutils , decorator , pyzmq @@ -25,7 +25,7 @@ buildPythonPackage rec { buildInputs = [ nose ]; - propagatedBuildInputs = [ dateutil ipython_genutils decorator pyzmq ipython jupyter_client ipykernel tornado + propagatedBuildInputs = [ python-dateutil ipython_genutils decorator pyzmq ipython jupyter_client ipykernel tornado ] ++ lib.optionals (!isPy3k) [ futures ]; # Requires access to cluster diff --git a/nixpkgs/pkgs/development/python-modules/itunespy/default.nix b/nixpkgs/pkgs/development/python-modules/itunespy/default.nix index 4720101d8177..3bb0bb677bad 100644 --- a/nixpkgs/pkgs/development/python-modules/itunespy/default.nix +++ b/nixpkgs/pkgs/development/python-modules/itunespy/default.nix @@ -1,4 +1,4 @@ -{ lib, buildPythonPackage, fetchFromGitHub, requests, pycountry, mypy }: +{ lib, buildPythonPackage, fetchFromGitHub, requests, pycountry }: buildPythonPackage rec { pname = "itunespy"; @@ -11,7 +11,7 @@ buildPythonPackage rec { sha256 = "0yc3az5531qs8nbcw4rhgrszwczgy4bikfwfar7xb2044360sslw"; }; - propagatedBuildInputs = [ requests pycountry mypy ]; + propagatedBuildInputs = [ requests pycountry ]; # This module has no tests doCheck = false; diff --git a/nixpkgs/pkgs/development/python-modules/javaproperties/default.nix b/nixpkgs/pkgs/development/python-modules/javaproperties/default.nix index dd3c027bca20..348d83e11059 100644 --- a/nixpkgs/pkgs/development/python-modules/javaproperties/default.nix +++ b/nixpkgs/pkgs/development/python-modules/javaproperties/default.nix @@ -1,7 +1,7 @@ { lib, buildPythonPackage, fetchFromGitHub , six , pytest -, dateutil +, python-dateutil }: buildPythonPackage rec { @@ -18,7 +18,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ six ]; - checkInputs = [ dateutil pytest ]; + checkInputs = [ python-dateutil pytest ]; checkPhase = '' rm tox.ini pytest -k 'not dumps and not time' --ignore=test/test_propclass.py diff --git a/nixpkgs/pkgs/development/python-modules/jupyter_client/5.nix b/nixpkgs/pkgs/development/python-modules/jupyter_client/5.nix index 201fbec02ca5..e4e77cf47510 100644 --- a/nixpkgs/pkgs/development/python-modules/jupyter_client/5.nix +++ b/nixpkgs/pkgs/development/python-modules/jupyter_client/5.nix @@ -4,7 +4,7 @@ , traitlets , jupyter_core , pyzmq -, dateutil +, python-dateutil , isPyPy , py , tornado @@ -23,7 +23,7 @@ buildPythonPackage rec { traitlets jupyter_core pyzmq - dateutil + python-dateutil tornado ] ++ lib.optional isPyPy py; diff --git a/nixpkgs/pkgs/development/python-modules/jupyter_client/default.nix b/nixpkgs/pkgs/development/python-modules/jupyter_client/default.nix index 5f534557a9ad..fbc37c3f581b 100644 --- a/nixpkgs/pkgs/development/python-modules/jupyter_client/default.nix +++ b/nixpkgs/pkgs/development/python-modules/jupyter_client/default.nix @@ -4,7 +4,7 @@ , traitlets , jupyter_core , pyzmq -, dateutil +, python-dateutil , isPyPy , py , tornado @@ -23,7 +23,7 @@ buildPythonPackage rec { traitlets jupyter_core pyzmq - dateutil + python-dateutil tornado ] ++ lib.optional isPyPy py; diff --git a/nixpkgs/pkgs/development/python-modules/jupyterhub/default.nix b/nixpkgs/pkgs/development/python-modules/jupyterhub/default.nix index 108d11853f05..904cd7df0c2a 100644 --- a/nixpkgs/pkgs/development/python-modules/jupyterhub/default.nix +++ b/nixpkgs/pkgs/development/python-modules/jupyterhub/default.nix @@ -7,7 +7,7 @@ , alembic , async_generator , certipy -, dateutil +, python-dateutil , entrypoints , jinja2 , jupyter-telemetry @@ -115,7 +115,7 @@ buildPythonPackage rec { alembic async_generator certipy - dateutil + python-dateutil entrypoints jinja2 jupyter-telemetry diff --git a/nixpkgs/pkgs/development/python-modules/koji/default.nix b/nixpkgs/pkgs/development/python-modules/koji/default.nix index 5f560be4e887..cd3b5ff62c26 100644 --- a/nixpkgs/pkgs/development/python-modules/koji/default.nix +++ b/nixpkgs/pkgs/development/python-modules/koji/default.nix @@ -1,4 +1,4 @@ -{ lib, fetchurl, buildPythonPackage, isPy3k, pycurl, six, rpm, dateutil }: +{ lib, fetchurl, buildPythonPackage, isPy3k, pycurl, six, rpm, python-dateutil }: buildPythonPackage rec { pname = "koji"; @@ -10,7 +10,7 @@ buildPythonPackage rec { sha256 = "0a3kn3qvspvx15imgzzzjsbvw6bqmbk29apbliqwifa9cj7pvb40"; }; - propagatedBuildInputs = [ pycurl six rpm dateutil ]; + propagatedBuildInputs = [ pycurl six rpm python-dateutil ]; # Judging from SyntaxError disabled = isPy3k; diff --git a/nixpkgs/pkgs/development/python-modules/lammps-cython/default.nix b/nixpkgs/pkgs/development/python-modules/lammps-cython/default.nix deleted file mode 100644 index cf6bdc38ffaa..000000000000 --- a/nixpkgs/pkgs/development/python-modules/lammps-cython/default.nix +++ /dev/null @@ -1,53 +0,0 @@ -{ lib -, fetchurl -, buildPythonPackage -, lammps-mpi -, mpi -, mpi4py -, numpy -, cython -, pymatgen -, ase -, pytestrunner -, isPy3k -}: - -buildPythonPackage rec { - pname = "lammps-cython"; - version = "0.5.7"; - disabled = (!isPy3k); - - src = fetchurl { - url = "https://gitlab.com/costrouc/${pname}/-/archive/v${version}/${pname}-v${version}.tar.gz"; - sha256 = "1wj9scmjdl00af13b5ihfccrjpikrdgkzd88ialam1nkxvxi42bl"; - }; - - buildInputs = [ cython pytestrunner ]; - propagatedBuildInputs = [ mpi4py pymatgen ase numpy ]; - - preBuild = '' - echo "Creating lammps.cfg file..." - cat << EOF > lammps.cfg - [lammps] - lammps_include_dir = ${lammps-mpi}/include - lammps_library_dir = ${lammps-mpi}/lib - lammps_library = lammps_mpi - - [mpi] - mpi_include_dir = ${mpi}/include - mpi_library_dir = ${mpi}/lib - mpi_library = mpi - EOF - ''; - - pythonImportsCheck = [ "lammps" ]; - - meta = { - description = "Pythonic Wrapper to LAMMPS using cython"; - homepage = "https://gitlab.com/costrouc/lammps-cython"; - license = lib.licenses.mit; - maintainers = with lib.maintainers; [ costrouc ]; - # fails import check - broken = true; - }; -} diff --git a/nixpkgs/pkgs/development/python-modules/libarcus/default.nix b/nixpkgs/pkgs/development/python-modules/libarcus/default.nix index a48d70c544c3..7b0b09dcb14c 100644 --- a/nixpkgs/pkgs/development/python-modules/libarcus/default.nix +++ b/nixpkgs/pkgs/development/python-modules/libarcus/default.nix @@ -3,14 +3,14 @@ buildPythonPackage rec { pname = "libarcus"; - version = "4.9.0"; + version = "4.10.0"; format = "other"; src = fetchFromGitHub { owner = "Ultimaker"; repo = "libArcus"; rev = version; - sha256 = "0wq72nf680bwxijjajb4piw563rnvflshmw96kqln4lsny7ydjj2"; + sha256 = "1ahka8s8fjwymyr7pca7i7h51ikfr35zy4nkzfcjn946x7p0dprf"; }; disabled = pythonOlder "3.4.0"; diff --git a/nixpkgs/pkgs/development/python-modules/libsavitar/default.nix b/nixpkgs/pkgs/development/python-modules/libsavitar/default.nix index 7ecd09160fff..e82400b565fd 100644 --- a/nixpkgs/pkgs/development/python-modules/libsavitar/default.nix +++ b/nixpkgs/pkgs/development/python-modules/libsavitar/default.nix @@ -2,14 +2,14 @@ buildPythonPackage rec { pname = "libsavitar"; - version = "4.9.0"; + version = "4.10.0"; format = "other"; src = fetchFromGitHub { owner = "Ultimaker"; repo = "libSavitar"; rev = version; - sha256 = "0434cb19v9phc9xicbmgpbig18ivplcpqhnsjgca4p8n8c715k9h"; + sha256 = "1zyzsrdm5aazv12h7ga35amfryrbxdsmx3abvh27hixyh9f92fdp"; }; postPatch = '' diff --git a/nixpkgs/pkgs/development/python-modules/libusb1/default.nix b/nixpkgs/pkgs/development/python-modules/libusb1/default.nix index cc0ba39e64ef..0d8142645e1b 100644 --- a/nixpkgs/pkgs/development/python-modules/libusb1/default.nix +++ b/nixpkgs/pkgs/development/python-modules/libusb1/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "libusb1"; - version = "1.9.2"; + version = "1.9.3"; src = fetchPypi { inherit pname version; - sha256 = "17hqck808m59jv6m2g4hasnay44pycy3y0im01fq9jpr3ymcdbi7"; + sha256 = "60e6ce37be064f6e51d02b25da44230ecc9c0b1fdb6f14568c71457d963c1749"; }; postPatch = '' @@ -20,9 +20,7 @@ buildPythonPackage rec { checkInputs = [ pytest ]; checkPhase = '' - # USBPollerThread is unreliable. Let's not test it. - # See: https://github.com/vpelletier/python-libusb1/issues/16 - py.test -k 'not testUSBPollerThreadExit' usb1/testUSB1.py + py.test usb1/testUSB1.py ''; meta = with lib; { diff --git a/nixpkgs/pkgs/development/python-modules/liquidctl/default.nix b/nixpkgs/pkgs/development/python-modules/liquidctl/default.nix index 4b2decb9550c..b543002bc07b 100644 --- a/nixpkgs/pkgs/development/python-modules/liquidctl/default.nix +++ b/nixpkgs/pkgs/development/python-modules/liquidctl/default.nix @@ -9,18 +9,19 @@ , smbus-cffi , i2c-tools , pytestCheckHook +, colorlog }: buildPythonPackage rec { pname = "liquidctl"; - version = "1.6.1"; + version = "1.7.0"; disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "v${version}"; - sha256 = "sha256-FYpr1mYzPc0rOE75fUNjxe/57EWl+zcbIbkqFseDhzI="; + sha256 = "sha256-tpk8wCKyrj3dOkBxj9UWcyrAb31uKtl2fRwwh7dAQGE="; }; nativeBuildInputs = [ installShellFiles ]; @@ -31,6 +32,7 @@ buildPythonPackage rec { pyusb smbus-cffi i2c-tools + colorlog ]; outputs = [ "out" "man" ]; diff --git a/nixpkgs/pkgs/development/python-modules/lmnotify/default.nix b/nixpkgs/pkgs/development/python-modules/lmnotify/default.nix index 340e8386a0ea..4e5526a424da 100644 --- a/nixpkgs/pkgs/development/python-modules/lmnotify/default.nix +++ b/nixpkgs/pkgs/development/python-modules/lmnotify/default.nix @@ -8,11 +8,11 @@ buildPythonPackage rec { pname = "lmnotify"; - version = "0.0.4"; + version = "0.0.6"; src = fetchPypi { inherit pname version; - sha256 = "1l0h4yab7ix8psf65iygc1wy5xwq3v2rwwjixvd8rwk46d2477dx"; + sha256 = "sha256-cCP7BU2f7QJe9gAI298cvkp3OGijvBv8G1RN7qfZ5PE="; }; propagatedBuildInputs = [ oauthlib requests requests_oauthlib ]; diff --git a/nixpkgs/pkgs/development/python-modules/maestral/default.nix b/nixpkgs/pkgs/development/python-modules/maestral/default.nix index 86794cba4d14..50180f43b8ed 100644 --- a/nixpkgs/pkgs/development/python-modules/maestral/default.nix +++ b/nixpkgs/pkgs/development/python-modules/maestral/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "maestral"; - version = "1.4.4"; + version = "1.4.6"; disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "SamSchott"; repo = "maestral"; rev = "v${version}"; - sha256 = "03scg4y13jbi8n454hc4vq8p02isbhppqx0zhbady639p7l3ggfg"; + sha256 = "sha256-kaRcM8Z0xeDp3JYputKZmzTfYYq2oKpF7AM6ciFF7I4="; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/mailman-rss/default.nix b/nixpkgs/pkgs/development/python-modules/mailman-rss/default.nix index e2043b0d6d4d..f71b62c67fc4 100644 --- a/nixpkgs/pkgs/development/python-modules/mailman-rss/default.nix +++ b/nixpkgs/pkgs/development/python-modules/mailman-rss/default.nix @@ -9,7 +9,7 @@ python3Packages.buildPythonApplication rec { sha256 = "1brrik70jyagxa9l0cfmlxvqpilwj1q655bphxnvjxyganxf4c00"; }; - propagatedBuildInputs = with python3Packages; [ dateutil future requests beautifulsoup4 ] + propagatedBuildInputs = with python3Packages; [ python-dateutil future requests beautifulsoup4 ] ++ lib.optional withTwitter python3Packages.twitter ; diff --git a/nixpkgs/pkgs/development/python-modules/malduck/default.nix b/nixpkgs/pkgs/development/python-modules/malduck/default.nix index a9a8419a04dc..1b757a144ccf 100644 --- a/nixpkgs/pkgs/development/python-modules/malduck/default.nix +++ b/nixpkgs/pkgs/development/python-modules/malduck/default.nix @@ -35,8 +35,14 @@ buildPythonPackage rec { yara-python ]; + postPatch = '' + substituteInPlace requirements.txt \ + --replace "pefile==2019.4.18" "pefile" + ''; + # Project has no tests. They will come with the next release doCheck = false; + pythonImportsCheck = [ "malduck" ]; meta = with lib; { diff --git a/nixpkgs/pkgs/development/python-modules/matplotlib/2.nix b/nixpkgs/pkgs/development/python-modules/matplotlib/2.nix index a6ee1a3bade7..96d33b681ebc 100644 --- a/nixpkgs/pkgs/development/python-modules/matplotlib/2.nix +++ b/nixpkgs/pkgs/development/python-modules/matplotlib/2.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchPypi, writeText, python, buildPythonPackage, pycairo, backports_functools_lru_cache -, which, cycler, dateutil, nose, numpy, pyparsing, sphinx, tornado, kiwisolver +, which, cycler, python-dateutil, nose, numpy, pyparsing, sphinx, tornado, kiwisolver , freetype, libpng, pkg-config, mock, pytz, pygobject3, gobject-introspection, functools32, subprocess32 , fetchpatch , enableGhostscript ? false, ghostscript, gtk3 @@ -38,7 +38,7 @@ buildPythonPackage rec { ++ lib.optional stdenv.isDarwin [ Cocoa ]; propagatedBuildInputs = - [ cycler dateutil nose numpy pyparsing tornado freetype kiwisolver + [ cycler python-dateutil nose numpy pyparsing tornado freetype kiwisolver libpng mock pytz ] ++ lib.optional (pythonOlder "3.3") backports_functools_lru_cache ++ lib.optionals enableGtk3 [ cairo pycairo gtk3 gobject-introspection pygobject3 ] diff --git a/nixpkgs/pkgs/development/python-modules/matplotlib/default.nix b/nixpkgs/pkgs/development/python-modules/matplotlib/default.nix index 75f75e981ce0..beddaf6810dd 100644 --- a/nixpkgs/pkgs/development/python-modules/matplotlib/default.nix +++ b/nixpkgs/pkgs/development/python-modules/matplotlib/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchPypi, writeText, buildPythonPackage, isPy3k, pycairo -, which, cycler, dateutil, numpy, pyparsing, sphinx, tornado, kiwisolver +, which, cycler, python-dateutil, numpy, pyparsing, sphinx, tornado, kiwisolver , freetype, qhull, libpng, pkg-config, mock, pytz, pygobject3, gobject-introspection , certifi, pillow , enableGhostscript ? true, ghostscript, gtk3 @@ -36,7 +36,7 @@ buildPythonPackage rec { ++ lib.optional stdenv.isDarwin [ Cocoa ]; propagatedBuildInputs = - [ cycler dateutil numpy pyparsing tornado freetype qhull + [ cycler python-dateutil numpy pyparsing tornado freetype qhull kiwisolver certifi libpng mock pytz pillow ] ++ lib.optionals enableGtk3 [ cairo pycairo gtk3 gobject-introspection pygobject3 ] ++ lib.optionals enableTk [ tcl tk tkinter libX11 ] diff --git a/nixpkgs/pkgs/development/python-modules/matrix-nio/default.nix b/nixpkgs/pkgs/development/python-modules/matrix-nio/default.nix index 4fad524bfa73..d16260dd57eb 100644 --- a/nixpkgs/pkgs/development/python-modules/matrix-nio/default.nix +++ b/nixpkgs/pkgs/development/python-modules/matrix-nio/default.nix @@ -28,14 +28,14 @@ buildPythonPackage rec { pname = "matrix-nio"; - version = "0.18.1"; + version = "0.18.3"; format = "pyproject"; src = fetchFromGitHub { owner = "poljar"; repo = "matrix-nio"; rev = version; - sha256 = "QHNirglqSxGMmbST96LUp9MHoGj0yAwLoTRlsbMqwaM="; + sha256 = "1sjdqzlk8vgv0748ayhnadw1bip3i4bfga4knb94cfkd3s4rgb39"; }; postPatch = '' diff --git a/nixpkgs/pkgs/development/python-modules/mcstatus/default.nix b/nixpkgs/pkgs/development/python-modules/mcstatus/default.nix index 43906cd95aae..165885c02252 100644 --- a/nixpkgs/pkgs/development/python-modules/mcstatus/default.nix +++ b/nixpkgs/pkgs/development/python-modules/mcstatus/default.nix @@ -13,14 +13,14 @@ buildPythonPackage rec { pname = "mcstatus"; - version = "6.1.0"; + version = "6.2.0"; disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "Dinnerbone"; repo = pname; rev = "v${version}"; - sha256 = "068dc2ilw1kkvw394vqhqgkia5smnvzaca5zbdd2xyl3nch3rk4x"; + sha256 = "sha256-o5JVj4Tt5+VOjDC0TDlVuVbDUQPvZGX5Zeoz0vVxPJ8="; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/md-toc/default.nix b/nixpkgs/pkgs/development/python-modules/md-toc/default.nix index aaec77a9ace8..e5321430dc52 100644 --- a/nixpkgs/pkgs/development/python-modules/md-toc/default.nix +++ b/nixpkgs/pkgs/development/python-modules/md-toc/default.nix @@ -8,14 +8,14 @@ buildPythonPackage rec { pname = "md-toc"; - version = "7.2.0"; + version = "8.0.0"; disabled = pythonOlder "3.5"; src = fetchFromGitHub { owner = "frnmst"; repo = pname; rev = version; - sha256 = "1v74iddfk5d6170frg89vzrkz9xrycl1f50g59imc7x7g50i6c2x"; + sha256 = "sha256-w5/oIeA9POth8bMszPH53RK1FM9PhmPdn4w9wxlqQ+g="; }; propagatedBuildInputs = [ @@ -26,10 +26,6 @@ buildPythonPackage rec { pytestCheckHook ]; - postPatch = '' - substituteInPlace setup.py --replace "fpyutils>=1.2,<1.3" "fpyutils>=1.2" - ''; - pytestFlagsArray = [ "md_toc/tests/*.py" ]; pythonImportsCheck = [ "md_toc" ]; diff --git a/nixpkgs/pkgs/development/python-modules/mdformat/default.nix b/nixpkgs/pkgs/development/python-modules/mdformat/default.nix index 159310035b8f..780cafa599db 100644 --- a/nixpkgs/pkgs/development/python-modules/mdformat/default.nix +++ b/nixpkgs/pkgs/development/python-modules/mdformat/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "mdformat"; - version = "0.7.6"; + version = "0.7.7"; format = "pyproject"; disabled = pythonOlder "3.6"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "executablebooks"; repo = pname; rev = version; - sha256 = "0mnbi3vp7zgllpcpf6vrjw9y6jas95shphn99ayr8b8wgxsaqkif"; + sha256 = "sha256-1qwluHxZnSuyNJENzeJzkuhIQN5njTOch2Wz45J0qRI="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/micloud/default.nix b/nixpkgs/pkgs/development/python-modules/micloud/default.nix new file mode 100644 index 000000000000..3b3bf4484497 --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/micloud/default.nix @@ -0,0 +1,37 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, click +, requests +, tzlocal +}: + +buildPythonPackage rec { + pname = "micloud"; + version = "0.3"; + + src = fetchFromGitHub { + owner = "Squachen"; + repo = "micloud"; + rev = "v_${version}"; + sha256 = "0267zyr79nfb5f9rwdwq3ym258yrpxx1b71xiqmszyz5s83mcixm"; + }; + + propagatedBuildInputs = [ + click + requests + tzlocal + ]; + + # tests require credentials + doCheck = false; + + pythonImportsCheck = [ "micloud" ]; + + meta = with lib; { + description = "Xiaomi cloud connect library"; + homepage = "https://github.com/Squachen/micloud"; + license = licenses.mit; + maintainers = with maintainers; [ dotlambda ]; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/millheater/default.nix b/nixpkgs/pkgs/development/python-modules/millheater/default.nix index d6815f53d779..9a329ef26515 100644 --- a/nixpkgs/pkgs/development/python-modules/millheater/default.nix +++ b/nixpkgs/pkgs/development/python-modules/millheater/default.nix @@ -2,25 +2,27 @@ , aiohttp , async-timeout , buildPythonPackage +, cryptography , fetchFromGitHub , pythonOlder }: buildPythonPackage rec { pname = "millheater"; - version = "0.4.2"; + version = "0.5.0"; disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "Danielhiversen"; repo = "pymill"; rev = version; - sha256 = "sha256-B9/nxlPHAPZzbOMQj81CxTEjI03JQxfH8F8vy1E4HIQ="; + sha256 = "sha256-uMvCpXz+amb5mR9ebkAit21UFYpsTkjkZRXtmcvWt8k="; }; propagatedBuildInputs = [ aiohttp async-timeout + cryptography ]; # Project has no tests diff --git a/nixpkgs/pkgs/development/python-modules/msal-extensions/default.nix b/nixpkgs/pkgs/development/python-modules/msal-extensions/default.nix index 82ef6fc77f03..a673d96893fa 100644 --- a/nixpkgs/pkgs/development/python-modules/msal-extensions/default.nix +++ b/nixpkgs/pkgs/development/python-modules/msal-extensions/default.nix @@ -25,12 +25,18 @@ buildPythonPackage rec { pathlib2 ]; + # upstream doesn't update this requirement probably because they use pip + postPatch = '' + substituteInPlace setup.py \ + --replace "portalocker~=1.0" "portalocker" + ''; + # No tests found doCheck = false; meta = with lib; { description = "The Microsoft Authentication Library Extensions (MSAL-Extensions) for Python"; - homepage = "https://github.com/AzureAD/microsoft-authentication-library-for-python"; + homepage = "https://github.com/AzureAD/microsoft-authentication-extensions-for-python"; license = licenses.mit; maintainers = with maintainers; [ kamadorueda diff --git a/nixpkgs/pkgs/development/python-modules/netmap/default.nix b/nixpkgs/pkgs/development/python-modules/netmap/default.nix new file mode 100644 index 000000000000..012599216074 --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/netmap/default.nix @@ -0,0 +1,43 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, substituteAll +, nmap +, python +}: + +buildPythonPackage rec { + pname = "netmap"; + version = "0.7.0.2"; + + src = fetchFromGitHub { + owner = "home-assistant-libs"; + repo = "python-nmap"; + rev = version; + sha256 = "1a44zz9zsxy48ahlpjjrddpyfi7cnfknicfcp35hi588qm430mag"; + }; + + patches = [ + (substituteAll { + src = ./nmap-path.patch; + nmap = "${lib.getBin nmap}/bin/nmap"; + }) + ]; + + # upstream tests require sudo + # make sure nmap is found instead + checkPhase = '' + runHook preCheck + ${python.interpreter} -c 'import nmap; nmap.PortScanner()' + runHook postCheck + ''; + + pythonImportsCheck = [ "nmap" ]; + + meta = with lib; { + description = "Python class to use nmap and access scan results from python3"; + homepage = "https://github.com/home-assistant-libs/python-nmap"; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ dotlambda ]; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/netmap/nmap-path.patch b/nixpkgs/pkgs/development/python-modules/netmap/nmap-path.patch new file mode 100644 index 000000000000..99f9cb43a940 --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/netmap/nmap-path.patch @@ -0,0 +1,17 @@ +diff --git a/nmap/nmap.py b/nmap/nmap.py +index 91c460d..8c5ff0a 100755 +--- a/nmap/nmap.py ++++ b/nmap/nmap.py +@@ -77,11 +77,7 @@ class PortScanner(object): + def __init__( + self, + nmap_search_path=( +- "nmap", +- "/usr/bin/nmap", +- "/usr/local/bin/nmap", +- "/sw/bin/nmap", +- "/opt/local/bin/nmap", ++ "@nmap@", + ), + ): + """ diff --git a/nixpkgs/pkgs/development/python-modules/nipype/default.nix b/nixpkgs/pkgs/development/python-modules/nipype/default.nix index 3d72748a1e74..078c455a6373 100644 --- a/nixpkgs/pkgs/development/python-modules/nipype/default.nix +++ b/nixpkgs/pkgs/development/python-modules/nipype/default.nix @@ -4,7 +4,7 @@ , isPy27 # python dependencies , click -, dateutil +, python-dateutil , etelemetry , filelock , funcsigs @@ -68,7 +68,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ click - dateutil + python-dateutil etelemetry filelock funcsigs diff --git a/nixpkgs/pkgs/development/python-modules/nmigen/default.nix b/nixpkgs/pkgs/development/python-modules/nmigen/default.nix index d42e27a29329..8bd198713a3f 100644 --- a/nixpkgs/pkgs/development/python-modules/nmigen/default.nix +++ b/nixpkgs/pkgs/development/python-modules/nmigen/default.nix @@ -12,9 +12,9 @@ # for tests , pytestCheckHook -, yosys , symbiyosys , yices +, yosys }: buildPythonPackage rec { @@ -31,22 +31,35 @@ buildPythonPackage rec { sha256 = "0cjs9wgmxa76xqmjhsw4fsb2mhgvd85jgs2mrjxqp6fwp8rlgnl1"; }; - nativeBuildInputs = [ setuptools-scm git ]; + SETUPTOOLS_SCM_PRETEND_VERSION="${realVersion}"; + + nativeBuildInputs = [ + git + setuptools-scm + ]; propagatedBuildInputs = [ - setuptools - pyvcd jinja2 + pyvcd + setuptools ] ++ lib.optional (pythonOlder "3.9") importlib-resources ++ lib.optional (pythonOlder "3.8") importlib-metadata; - checkInputs = [ pytestCheckHook yosys symbiyosys yices ]; + checkInputs = [ + pytestCheckHook + symbiyosys + yices + yosys + ]; - preBuild = '' - export SETUPTOOLS_SCM_PRETEND_VERSION="${realVersion}" + postPatch = '' + substituteInPlace setup.py \ + --replace "Jinja2~=2.11" "Jinja2>=2.11" ''; + pythonImportsCheck = [ "nmigen" ]; + meta = with lib; { description = "A refreshed Python toolbox for building complex digital hardware"; homepage = "https://nmigen.info/nmigen"; diff --git a/nixpkgs/pkgs/development/python-modules/oci/default.nix b/nixpkgs/pkgs/development/python-modules/oci/default.nix index 41c6ffb72284..793e23d71135 100644 --- a/nixpkgs/pkgs/development/python-modules/oci/default.nix +++ b/nixpkgs/pkgs/development/python-modules/oci/default.nix @@ -5,7 +5,7 @@ , configparser , cryptography , pyopenssl -, dateutil +, python-dateutil , pytz }: @@ -28,7 +28,7 @@ buildPythonPackage rec { ''; propagatedBuildInputs = [ - certifi configparser cryptography pyopenssl dateutil pytz + certifi configparser cryptography pyopenssl python-dateutil pytz ]; # Tests fail: https://github.com/oracle/oci-python-sdk/issues/164 diff --git a/nixpkgs/pkgs/development/python-modules/osmnx/default.nix b/nixpkgs/pkgs/development/python-modules/osmnx/default.nix index a55d26d83c28..4cc0ce80d4d1 100755 --- a/nixpkgs/pkgs/development/python-modules/osmnx/default.nix +++ b/nixpkgs/pkgs/development/python-modules/osmnx/default.nix @@ -1,18 +1,19 @@ -{ lib, buildPythonPackage, fetchFromGitHub, geopandas, descartes, matplotlib, networkx, numpy -, pandas, requests, Rtree, shapely, folium, scikit-learn, scipy}: +{ lib, buildPythonPackage, fetchFromGitHub, pythonOlder, geopandas, matplotlib, networkx, numpy +, pandas, requests, Rtree, shapely, folium, scikit-learn, scipy, gdal, rasterio}: buildPythonPackage rec { pname = "osmnx"; - version = "0.9"; + version = "1.1.1"; + disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "gboeing"; repo = pname; rev = "v${version}"; - sha256 = "1k3y5kl4k93vxaxyanc040x44s2fyyc3m1ndy2j3kg0037z8ad4z"; + sha256 = "0dkv3fnlq23d7d30lhdf4a313lxy3a5qfldidvszs1z9n16ycnwb"; }; - propagatedBuildInputs = [ geopandas descartes matplotlib networkx numpy pandas requests Rtree shapely folium scikit-learn scipy ]; + propagatedBuildInputs = [ geopandas matplotlib networkx numpy pandas requests Rtree shapely folium scikit-learn scipy gdal rasterio ]; # requires network doCheck = false; diff --git a/nixpkgs/pkgs/development/python-modules/owslib/default.nix b/nixpkgs/pkgs/development/python-modules/owslib/default.nix index 3ccd3d916b65..ea80fade1411 100644 --- a/nixpkgs/pkgs/development/python-modules/owslib/default.nix +++ b/nixpkgs/pkgs/development/python-modules/owslib/default.nix @@ -1,4 +1,4 @@ -{ lib, buildPythonPackage, fetchPypi, dateutil, requests, pytz, pyproj , pytest, pyyaml } : +{ lib, buildPythonPackage, fetchPypi, python-dateutil, requests, pytz, pyproj , pytest, pyyaml } : buildPythonPackage rec { pname = "OWSLib"; version = "0.24.1"; @@ -9,7 +9,7 @@ buildPythonPackage rec { }; buildInputs = [ pytest ]; - propagatedBuildInputs = [ dateutil pyproj pytz requests pyyaml ]; + propagatedBuildInputs = [ python-dateutil pyproj pytz requests pyyaml ]; # 'tests' dir not included in pypy distribution archive. doCheck = false; diff --git a/nixpkgs/pkgs/development/python-modules/pandas/2.nix b/nixpkgs/pkgs/development/python-modules/pandas/2.nix index 8af4094b0cfb..9b29a8442696 100644 --- a/nixpkgs/pkgs/development/python-modules/pandas/2.nix +++ b/nixpkgs/pkgs/development/python-modules/pandas/2.nix @@ -8,7 +8,7 @@ , pytest , glibcLocales , cython -, dateutil +, python-dateutil , scipy , moto , numexpr @@ -41,7 +41,7 @@ buildPythonPackage rec { nativeBuildInputs = [ cython ]; buildInputs = lib.optional stdenv.isDarwin libcxx; propagatedBuildInputs = [ - dateutil + python-dateutil scipy numexpr pytz @@ -68,7 +68,7 @@ buildPythonPackage rec { disabledTests = lib.concatMapStringsSep " and " (s: "not " + s) ([ - # since dateutil 0.6.0 the following fails: test_fallback_plural, test_ambiguous_flags, test_ambiguous_compat + # since python-dateutil 0.6.0 the following fails: test_fallback_plural, test_ambiguous_flags, test_ambiguous_compat # was supposed to be solved by https://github.com/dateutil/dateutil/issues/321, but is not the case "test_fallback_plural" "test_ambiguous_flags" diff --git a/nixpkgs/pkgs/development/python-modules/pandas/default.nix b/nixpkgs/pkgs/development/python-modules/pandas/default.nix index 2d5020168215..b7e237a3e3ba 100644 --- a/nixpkgs/pkgs/development/python-modules/pandas/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pandas/default.nix @@ -7,7 +7,7 @@ , beautifulsoup4 , bottleneck , cython -, dateutil +, python-dateutil , html5lib , jinja2 , lxml @@ -47,7 +47,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ beautifulsoup4 bottleneck - dateutil + python-dateutil html5lib numexpr lxml diff --git a/nixpkgs/pkgs/development/python-modules/pefile/default.nix b/nixpkgs/pkgs/development/python-modules/pefile/default.nix index 92a0d064f49c..5cd514c871fc 100644 --- a/nixpkgs/pkgs/development/python-modules/pefile/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pefile/default.nix @@ -1,24 +1,34 @@ -{ buildPythonPackage +{ lib +, buildPythonPackage , future -, fetchPypi -, lib +, fetchFromGitHub +, setuptools-scm +, pythonOlder }: buildPythonPackage rec { pname = "pefile"; - version = "2019.4.18"; + version = "2021.5.24"; + disabled = pythonOlder "3.6"; - propagatedBuildInputs = [ future ]; - - src = fetchPypi { - inherit pname version; - sha256 = "a5d6e8305c6b210849b47a6174ddf9c452b2888340b8177874b862ba6c207645"; + src = fetchFromGitHub { + owner = "erocarrera"; + repo = pname; + rev = "v${version}"; + sha256 = "0qdy88dvy29ixsyfqdcvf3w6rz09vpimk0568i09v1ayhs52p62k"; }; - # Test data encrypted. + nativeBuildInputs = [ + setuptools-scm + ]; + + propagatedBuildInputs = [ + future + ]; + + # Test data encrypted doCheck = false; - # Verify import still works. pythonImportsCheck = [ "pefile" ]; meta = with lib; { diff --git a/nixpkgs/pkgs/development/python-modules/pelican/default.nix b/nixpkgs/pkgs/development/python-modules/pelican/default.nix index 1ae27b5ecf87..5419407d610e 100644 --- a/nixpkgs/pkgs/development/python-modules/pelican/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pelican/default.nix @@ -1,7 +1,7 @@ { lib, buildPythonPackage, fetchFromGitHub, isPy27 , glibcLocales, git , mock, nose, markdown, lxml, typogrify -, jinja2, pygments, docutils, pytz, unidecode, six, dateutil, feedgenerator +, jinja2, pygments, docutils, pytz, unidecode, six, python-dateutil, feedgenerator , blinker, pillow, beautifulsoup4, markupsafe, pandoc }: buildPythonPackage rec { @@ -44,7 +44,7 @@ buildPythonPackage rec { ]; propagatedBuildInputs = [ - jinja2 pygments docutils pytz unidecode six dateutil feedgenerator + jinja2 pygments docutils pytz unidecode six python-dateutil feedgenerator blinker pillow beautifulsoup4 markupsafe lxml ]; diff --git a/nixpkgs/pkgs/development/python-modules/pendulum/default.nix b/nixpkgs/pkgs/development/python-modules/pendulum/default.nix index 5688090b0958..d432ca271dd7 100644 --- a/nixpkgs/pkgs/development/python-modules/pendulum/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pendulum/default.nix @@ -1,5 +1,5 @@ { lib, fetchPypi, buildPythonPackage, pythonOlder -, dateutil +, python-dateutil , importlib-metadata , poetry , poetry-core @@ -22,7 +22,7 @@ buildPythonPackage rec { ''; nativeBuildInputs = [ poetry-core ]; - propagatedBuildInputs = [ dateutil pytzdata ] + propagatedBuildInputs = [ python-dateutil pytzdata ] ++ lib.optional (pythonOlder "3.5") typing ++ lib.optionals (pythonOlder "3.8") [ importlib-metadata ]; diff --git a/nixpkgs/pkgs/development/python-modules/pep8-naming/default.nix b/nixpkgs/pkgs/development/python-modules/pep8-naming/default.nix index 5f6ef894d8ff..a23cce431a09 100644 --- a/nixpkgs/pkgs/development/python-modules/pep8-naming/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pep8-naming/default.nix @@ -1,6 +1,10 @@ -{ lib, fetchPypi, buildPythonPackage, pythonOlder +{ lib +, fetchPypi +, fetchpatch +, buildPythonPackage +, flake8 , flake8-polyfill -, importlib-metadata +, python }: buildPythonPackage rec { @@ -12,10 +16,27 @@ buildPythonPackage rec { sha256 = "0937rnk3c2z1jkdmbw9hfm80p5k467q7rqhn6slfiprs4kflgpd1"; }; + patches = [ + (fetchpatch { + # Fix tests by setting extended-default-ignore to an empty list + url = "https://github.com/PyCQA/pep8-naming/commit/6d62db81d7967e123e29673a4796fefec6f06d26.patch"; + sha256 = "1jpr2dga8sphksik3izyzq9hiszyki691mwnh2rjzd2vpgnv8cxf"; + }) + ]; + propagatedBuildInputs = [ + flake8 flake8-polyfill - ] ++ lib.optionals (pythonOlder "3.8") [ - importlib-metadata + ]; + + checkPhase = '' + runHook preCheck + ${python.interpreter} run_tests.py + runHook postCheck + ''; + + pythonImportsCheck = [ + "pep8ext_naming" ]; meta = with lib; { diff --git a/nixpkgs/pkgs/development/python-modules/pg8000/default.nix b/nixpkgs/pkgs/development/python-modules/pg8000/default.nix index 5560e918ac4a..db18611f20aa 100644 --- a/nixpkgs/pkgs/development/python-modules/pg8000/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pg8000/default.nix @@ -8,12 +8,12 @@ buildPythonPackage rec { pname = "pg8000"; - version = "1.19.5"; + version = "1.20.0"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "sha256-3LmvucuHrMeTiK5jPEXPf4Bqq+O7XYzxVFcraZOT+Tc="; + sha256 = "sha256-SQ7CKpJgHwRUs+1MjU7N3DD2bA4/eD8OzFgQN3SajFU="; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/pillow-simd/default.nix b/nixpkgs/pkgs/development/python-modules/pillow-simd/default.nix index d7b2ff8d6b36..e2ea4c713888 100644 --- a/nixpkgs/pkgs/development/python-modules/pillow-simd/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pillow-simd/default.nix @@ -6,15 +6,16 @@ import ../pillow/generic.nix (rec { pname = "Pillow-SIMD"; - version = "8.1.2"; - + # check for release version on https://pypi.org/project/Pillow-SIMD/#history + # does not match the latest pillow release version! + version = "7.0.0.post3"; disabled = !isPy3k; src = fetchFromGitHub { owner = "uploadcare"; repo = "pillow-simd"; - rev = version; - sha256 = "1z0c1qpx7l1bhj71ww7za7kl29j5wdraqr2pdhv4dp1q74kgrr0m"; + rev = "v${version}"; + sha256 = "1h832xp1bzf951hr4dmjmxqfsv28sx9lr2cq96qdz1c72k40zj1h"; }; meta = with lib; { diff --git a/nixpkgs/pkgs/development/python-modules/portalocker/default.nix b/nixpkgs/pkgs/development/python-modules/portalocker/default.nix index d79f6201b6fd..7b4fc177bc11 100644 --- a/nixpkgs/pkgs/development/python-modules/portalocker/default.nix +++ b/nixpkgs/pkgs/development/python-modules/portalocker/default.nix @@ -1,34 +1,27 @@ -{ lib, buildPythonPackage, fetchPypi, fetchpatch -, sphinx -, pytest +{ lib, buildPythonPackage, fetchPypi +, pytestCheckHook , pytestcov , pytest-flake8 +, pytest-mypy +, redis }: buildPythonPackage rec { - version = "1.7.0"; + version = "2.3.0"; pname = "portalocker"; src = fetchPypi { inherit pname version; - sha256 = "1p32v16va780mjjdbyp3v702aqg5s618khlila7bdyynis1n84q9"; + sha256 = "0k08c0qg21mwz3iqbd20ab22nq705q7cal4a1qr8qnd6ga03v4af"; }; - patches = [ - # remove pytest-flakes from test dependencies - # merged into master, remove > 1.7.0 release - (fetchpatch { - url = "https://github.com/WoLpH/portalocker/commit/42e4c0a16bbc987c7e33b5cbc7676a63a164ceb5.patch"; - sha256 = "01mlr41nhh7mh3qhqy5fhp3br4nps745iy4ns9fjcnm5xhabg5rr"; - excludes = [ "pytest.ini" ]; - }) + propagatedBuildInputs = [ + redis ]; checkInputs = [ - sphinx - pytest - pytestcov - pytest-flake8 + pytestCheckHook + pytest-mypy ]; meta = with lib; { diff --git a/nixpkgs/pkgs/development/python-modules/prov/default.nix b/nixpkgs/pkgs/development/python-modules/prov/default.nix index acee0f09b848..9844b018518b 100644 --- a/nixpkgs/pkgs/development/python-modules/prov/default.nix +++ b/nixpkgs/pkgs/development/python-modules/prov/default.nix @@ -3,7 +3,7 @@ , fetchPypi , lxml , networkx -, dateutil +, python-dateutil , rdflib , pydot }: @@ -20,7 +20,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ lxml networkx - dateutil + python-dateutil rdflib ]; diff --git a/nixpkgs/pkgs/development/python-modules/pubnub/default.nix b/nixpkgs/pkgs/development/python-modules/pubnub/default.nix index 89dd4d1cbf0e..478782b488c8 100644 --- a/nixpkgs/pkgs/development/python-modules/pubnub/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pubnub/default.nix @@ -13,13 +13,13 @@ buildPythonPackage rec { pname = "pubnub"; - version = "5.1.3"; + version = "5.1.4"; src = fetchFromGitHub { owner = pname; repo = "python"; rev = "v${version}"; - sha256 = "0mpw2wzbpb60lnrsnw8mc88mxxhslpnc5nvkjyc3v2dbqs5cnmy5"; + sha256 = "sha256-aDmmF3T5v6NX3kut7cydEJNRw4mkrGt4X0+WOm/ZCVo="; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/pwntools/default.nix b/nixpkgs/pkgs/development/python-modules/pwntools/default.nix index e6ee7d4f9832..e3422aff024e 100644 --- a/nixpkgs/pkgs/development/python-modules/pwntools/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pwntools/default.nix @@ -14,7 +14,7 @@ , psutil , pyelftools , pyserial -, dateutil +, python-dateutil , requests , rpyc , tox @@ -63,7 +63,7 @@ buildPythonPackage rec { psutil pyelftools pyserial - dateutil + python-dateutil requests rpyc tox diff --git a/nixpkgs/pkgs/development/python-modules/pyahocorasick/default.nix b/nixpkgs/pkgs/development/python-modules/pyahocorasick/default.nix index 9ef89c6e920d..87d1d0c9fc01 100644 --- a/nixpkgs/pkgs/development/python-modules/pyahocorasick/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pyahocorasick/default.nix @@ -6,13 +6,13 @@ buildPythonPackage rec { pname = "pyahocorasick"; - version = "1.4.0"; + version = "1.4.1"; src = fetchFromGitHub { owner = "WojciechMula"; repo = pname; rev = version; - sha256 = "0plm9x2gziayjsl7flsgn1z8qx88c9vqm4fs1wq7dv7fr188liik"; + sha256 = "13x3718if28l50474xrz1b9709kvnvdg3nzm6y8bh7mc9a4zyss5"; }; checkInputs = [ pytestCheckHook ]; diff --git a/nixpkgs/pkgs/development/python-modules/pyatmo/default.nix b/nixpkgs/pkgs/development/python-modules/pyatmo/default.nix index 8df35cb39bb9..e313d2b8b054 100644 --- a/nixpkgs/pkgs/development/python-modules/pyatmo/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pyatmo/default.nix @@ -15,14 +15,14 @@ buildPythonPackage rec { pname = "pyatmo"; - version = "5.1.0"; + version = "5.2.0"; disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "jabesq"; repo = "pyatmo"; rev = "v${version}"; - sha256 = "0szk3wjcrllzvpix66iq3li54pw0c1knlx8wn1z9kqhkrb8r200x"; + sha256 = "sha256-P9c9tm2RcF/4r0OYBoAQxQbMBaFAsaHg/stg9rrYHNM="; }; postPatch = '' diff --git a/nixpkgs/pkgs/development/python-modules/pyatv/default.nix b/nixpkgs/pkgs/development/python-modules/pyatv/default.nix index cf7fd53d1657..cef64c084f2f 100644 --- a/nixpkgs/pkgs/development/python-modules/pyatv/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pyatv/default.nix @@ -19,13 +19,13 @@ buildPythonPackage rec { pname = "pyatv"; - version = "0.8.0"; + version = "0.8.1"; src = fetchFromGitHub { owner = "postlund"; repo = pname; rev = "v${version}"; - sha256 = "1slr6l0gw0mf1zhp40bjf5bib45arw1cy4fqkg0gvdk1hx79828m"; + sha256 = "sha256-/ccmYNOYE+RkJiJbGkQgdYE8/X4xzyRT4dkMa/qSZEc="; }; postPatch = '' diff --git a/nixpkgs/pkgs/development/python-modules/pycollada/default.nix b/nixpkgs/pkgs/development/python-modules/pycollada/default.nix index e8e0809c0222..49dfbf030966 100644 --- a/nixpkgs/pkgs/development/python-modules/pycollada/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pycollada/default.nix @@ -1,4 +1,4 @@ -{ lib, fetchPypi, buildPythonPackage, numpy, dateutil }: +{ lib, fetchPypi, buildPythonPackage, numpy, python-dateutil }: buildPythonPackage rec { pname = "pycollada"; @@ -9,7 +9,7 @@ buildPythonPackage rec { sha256 = "1rp4wlvfywgk3v6l3hnhjx61x9yqawvvivpq4dig2jj71k3mpsyj"; }; - propagatedBuildInputs = [ numpy dateutil ]; + propagatedBuildInputs = [ numpy python-dateutil ]; # Some tests fail because they refer to test data files that don't exist # (upstream packaging issue) diff --git a/nixpkgs/pkgs/development/python-modules/pydaikin/default.nix b/nixpkgs/pkgs/development/python-modules/pydaikin/default.nix index 9b2eda85abe5..5eefe5ade5ec 100644 --- a/nixpkgs/pkgs/development/python-modules/pydaikin/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pydaikin/default.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "pydaikin"; - version = "2.4.3"; + version = "2.4.4"; disabled = pythonOlder "3.6"; src = fetchFromBitbucket { owner = "mustang51"; repo = pname; rev = "v${version}"; - sha256 = "0i013ma2fs6an3izak6zbs9lbr4l7b5x54d0xagw6gqf5n8dsclq"; + sha256 = "sha256-G7SShq2zjd9KGM7t1KsAMehqm2onB5cYdcOO3k8Sb30="; }; propagatedBuildInputs = [ @@ -28,7 +28,7 @@ buildPythonPackage rec { urllib3 ]; - # while they have tests, they do not run them in their CI and they fail as of 2.4.3 + # while they have tests, they do not run them in their CI and they fail as of 2.4.4 # AttributeError: 'DaikinBRP069' object has no attribute 'last_hour_cool_energy_consumption' doCheck = false; diff --git a/nixpkgs/pkgs/development/python-modules/pydes/default.nix b/nixpkgs/pkgs/development/python-modules/pydes/default.nix index 78f131d42437..0bceaeceaa37 100644 --- a/nixpkgs/pkgs/development/python-modules/pydes/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pydes/default.nix @@ -1,4 +1,4 @@ -{ lib, buildPythonPackage, fetchFromGitHub }: +{ lib, buildPythonPackage, fetchFromGitHub, python }: buildPythonPackage rec { pname = "pydes"; @@ -11,7 +11,9 @@ buildPythonPackage rec { sha256 = "0sic8wbyk5azb4d4m6zbc96lfqcw8s2pzcv9nric5yqc751613ww"; }; - checkPhase = "python test_pydes.py"; + checkPhase = '' + ${python.interpreter} test_pydes.py + ''; pythonImportsCheck = [ "pyDes" ]; diff --git a/nixpkgs/pkgs/development/python-modules/pyeight/default.nix b/nixpkgs/pkgs/development/python-modules/pyeight/default.nix index b3a2de5ed404..a714bbfaba95 100644 --- a/nixpkgs/pkgs/development/python-modules/pyeight/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pyeight/default.nix @@ -8,14 +8,14 @@ buildPythonPackage rec { pname = "pyeight"; - version = "0.1.5"; + version = "0.1.7"; disabled = !isPy3k; src = fetchFromGitHub { owner = "mezz64"; repo = "pyEight"; rev = version; - sha256 = "1wzmjqs8zx611b71ip7a0phyas96vxpq8xpnhrirfi9l09kdjgsw"; + sha256 = "sha256-kTxd6nRsPvCjrXApjKcoghOISIMho5x9/kK7OvHjKQM="; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/pyflick/default.nix b/nixpkgs/pkgs/development/python-modules/pyflick/default.nix index b1f39353c142..b6a9c2cf96d4 100644 --- a/nixpkgs/pkgs/development/python-modules/pyflick/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pyflick/default.nix @@ -3,7 +3,7 @@ , pythonOlder , fetchPypi , aiohttp -, dateutil +, python-dateutil }: buildPythonPackage rec { @@ -20,7 +20,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ aiohttp - dateutil + python-dateutil ]; # no tests implemented diff --git a/nixpkgs/pkgs/development/python-modules/pyfreedompro/default.nix b/nixpkgs/pkgs/development/python-modules/pyfreedompro/default.nix new file mode 100644 index 000000000000..f5fd102ed7fc --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/pyfreedompro/default.nix @@ -0,0 +1,34 @@ +{ lib +, buildPythonPackage +, pythonOlder +, fetchPypi +, aiohttp +}: + +buildPythonPackage rec { + pname = "pyfreedompro"; + version = "1.1.0"; + + disabled = pythonOlder "3.6"; + + src = fetchPypi { + inherit pname version; + sha256 = "92812070a0c74761fa0c8cac98ddbe0bca781c8de80e2b08dbd04492e831c172"; + }; + + propagatedBuildInputs = [ + aiohttp + ]; + + # upstream has no tests + doCheck = false; + + pythonImportsCheck = [ "aiohttp" ]; + + meta = with lib; { + description = "Python library for Freedompro API"; + homepage = "https://github.com/stefano055415/pyfreedompro"; + license = licenses.mit; + maintainers = with maintainers; [ dotlambda ]; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/pyfritzhome/default.nix b/nixpkgs/pkgs/development/python-modules/pyfritzhome/default.nix index 7c0982d490ba..0bfda48269e1 100644 --- a/nixpkgs/pkgs/development/python-modules/pyfritzhome/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pyfritzhome/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "pyfritzhome"; - version = "0.6.1"; + version = "0.6.2"; disabled = pythonOlder "3.5"; src = fetchFromGitHub { owner = "hthiery"; repo = "python-fritzhome"; rev = version; - sha256 = "sha256-CEoXb7D/8Iksw4aJYNqANkmfhd0yxIIuabaTdWI3RNc="; + sha256 = "1hwxq9w5qmiky8gpp623nabmydr3yv6hvgzk24fdbmkglfp6ja1v"; }; propagatedBuildInputs = [ requests ]; @@ -27,7 +27,7 @@ buildPythonPackage rec { ]; checkPhase = '' - nosetests --with-coverage + nosetests ''; pythonImportsCheck = [ "pyfritzhome" ]; diff --git a/nixpkgs/pkgs/development/python-modules/pykeepass/default.nix b/nixpkgs/pkgs/development/python-modules/pykeepass/default.nix index e54a9c6fa20f..5d23949eba62 100644 --- a/nixpkgs/pkgs/development/python-modules/pykeepass/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pykeepass/default.nix @@ -1,6 +1,6 @@ { lib, fetchFromGitHub, buildPythonPackage , lxml, pycryptodomex, construct -, argon2_cffi, dateutil, future +, argon2_cffi, python-dateutil, future , python }: @@ -21,7 +21,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ lxml pycryptodomex construct - argon2_cffi dateutil future + argon2_cffi python-dateutil future ]; checkPhase = '' diff --git a/nixpkgs/pkgs/development/python-modules/pykwalify/default.nix b/nixpkgs/pkgs/development/python-modules/pykwalify/default.nix index b65c0fd46709..cf42c98457cb 100644 --- a/nixpkgs/pkgs/development/python-modules/pykwalify/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pykwalify/default.nix @@ -1,6 +1,6 @@ { lib , buildPythonPackage -, dateutil +, python-dateutil , docopt , fetchPypi , pytestCheckHook @@ -19,7 +19,7 @@ buildPythonPackage rec { }; propagatedBuildInputs = [ - dateutil + python-dateutil docopt pyyaml ruamel-yaml diff --git a/nixpkgs/pkgs/development/python-modules/pyls-black/default.nix b/nixpkgs/pkgs/development/python-modules/pyls-black/default.nix index d10e4930ac0c..128c8cbd0de2 100644 --- a/nixpkgs/pkgs/development/python-modules/pyls-black/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pyls-black/default.nix @@ -29,6 +29,6 @@ buildPythonPackage rec { homepage = "https://github.com/rupert/pyls-black"; description = "Black plugin for the Python Language Server"; license = licenses.mit; - maintainers = [ maintainers.mic92 ]; + maintainers = [ ]; }; } diff --git a/nixpkgs/pkgs/development/python-modules/pyls-isort/default.nix b/nixpkgs/pkgs/development/python-modules/pyls-isort/default.nix index 9dc614035e0e..35b43969e529 100644 --- a/nixpkgs/pkgs/development/python-modules/pyls-isort/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pyls-isort/default.nix @@ -24,6 +24,6 @@ buildPythonPackage rec { homepage = "https://github.com/paradoxxxzero/pyls-isort"; description = "Isort plugin for python-language-server"; license = licenses.mit; - maintainers = [ maintainers.mic92 ]; + maintainers = [ ]; }; } diff --git a/nixpkgs/pkgs/development/python-modules/pyls-mypy/default.nix b/nixpkgs/pkgs/development/python-modules/pyls-mypy/default.nix index eaf069c8ccb4..f919ac21cb7b 100644 --- a/nixpkgs/pkgs/development/python-modules/pyls-mypy/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pyls-mypy/default.nix @@ -46,6 +46,6 @@ buildPythonPackage rec { homepage = "https://github.com/tomv564/pyls-mypy"; description = "Mypy plugin for the Python Language Server"; license = licenses.mit; - maintainers = [ maintainers.mic92 ]; + maintainers = [ ]; }; } diff --git a/nixpkgs/pkgs/development/python-modules/pyls-spyder/default.nix b/nixpkgs/pkgs/development/python-modules/pyls-spyder/default.nix index 4e0029783eb6..61b0fa7449bc 100644 --- a/nixpkgs/pkgs/development/python-modules/pyls-spyder/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pyls-spyder/default.nix @@ -1,18 +1,29 @@ -{ lib, buildPythonPackage, fetchPypi, python-language-server }: +{ lib +, buildPythonPackage +, fetchFromGitHub +, python-lsp-server +, pytestCheckHook +}: buildPythonPackage rec { pname = "pyls-spyder"; version = "0.4.0"; - src = fetchPypi { - inherit pname version; - sha256 = "45a321c83f64267d82907492c55199fccabda45bc872dd23bf1efd08edac1b0b"; + src = fetchFromGitHub { + owner = "spyder-ide"; + repo = pname; + rev = "v${version}"; + sha256 = "11ajbsia60d4c9s6m6rbvaqp1d69fcdbq6a98lkzkkzv2b9pdhkk"; }; - propagatedBuildInputs = [ python-language-server ]; + propagatedBuildInputs = [ + python-lsp-server + ]; + + checkInputs = [ + pytestCheckHook + ]; - # no tests - doCheck = false; pythonImportsCheck = [ "pyls_spyder" ]; meta = with lib; { diff --git a/nixpkgs/pkgs/development/python-modules/pymetar/default.nix b/nixpkgs/pkgs/development/python-modules/pymetar/default.nix index ef5273936cf4..b4ff976c8eac 100644 --- a/nixpkgs/pkgs/development/python-modules/pymetar/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pymetar/default.nix @@ -2,13 +2,13 @@ buildPythonPackage rec { pname = "pymetar"; - version = "1.2"; + version = "1.3"; disabled = !isPy3k; src = fetchPypi { inherit pname version; - sha256 = "f9a8caa21eff5367427da55a469ef396293ae4cc93797ab2f1a66a2924fbdc68"; + sha256 = "sha256-zhuXOZIIzh5p0CDOsiUNTqeXDoHFcf1BPg868fc7CIg="; }; checkPhase = '' @@ -23,7 +23,7 @@ buildPythonPackage rec { meta = with lib; { description = "A command-line tool to show the weather report by a given station ID"; - homepage = "http://www.schwarzvogel.de/software/pymetar.html"; + homepage = "https://github.com/klausman/pymetar"; license = licenses.gpl2Plus; maintainers = with maintainers; [ erosennin ]; }; diff --git a/nixpkgs/pkgs/development/python-modules/pync/default.nix b/nixpkgs/pkgs/development/python-modules/pync/default.nix index 9506b8bae953..0eb13c732d7e 100644 --- a/nixpkgs/pkgs/development/python-modules/pync/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pync/default.nix @@ -2,7 +2,7 @@ , buildPythonPackage , fetchPypi , isPy27 -, dateutil +, python-dateutil , pkgs }: @@ -17,7 +17,7 @@ buildPythonPackage rec { }; buildInputs = [ pkgs.coreutils ]; - propagatedBuildInputs = [ dateutil ]; + propagatedBuildInputs = [ python-dateutil ]; preInstall = lib.optionalString stdenv.isDarwin '' sed -i 's|^\([ ]*\)self.bin_path.*$|\1self.bin_path = "${pkgs.terminal-notifier}/bin/terminal-notifier"|' build/lib/pync/TerminalNotifier.py diff --git a/nixpkgs/pkgs/development/python-modules/pynest2d/default.nix b/nixpkgs/pkgs/development/python-modules/pynest2d/default.nix index f3b5b9ba6854..5d6a006634e2 100644 --- a/nixpkgs/pkgs/development/python-modules/pynest2d/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pynest2d/default.nix @@ -2,7 +2,7 @@ , pythonOlder, libnest2d, sip_4, clipper }: buildPythonPackage rec { - version = "4.8.0"; + version = "4.10.0"; pname = "pynest2d"; format = "other"; @@ -10,7 +10,7 @@ buildPythonPackage rec { owner = "Ultimaker"; repo = "pynest2d"; rev = version; - sha256 = "18dn92vgr4gvf9scfh93yg9bwrhdjvq62di08rpi7pqjrrvq2nvp"; + sha256 = "03aj0whxj9rs9nz3idld7w4vpmnr6vr40vpwmzcf5w2pi2n4z4lk"; }; propagatedBuildInputs = [ libnest2d sip_4 clipper ]; diff --git a/nixpkgs/pkgs/development/python-modules/pypoint/default.nix b/nixpkgs/pkgs/development/python-modules/pypoint/default.nix new file mode 100644 index 000000000000..be487199b38b --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/pypoint/default.nix @@ -0,0 +1,35 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, authlib +, httpx +}: + +buildPythonPackage rec { + pname = "pypoint"; + version = "2.1.0"; + + src = fetchFromGitHub { + owner = "fredrike"; + repo = "pypoint"; + rev = "v${version}"; + sha256 = "13p68d2qxfj31lfjv94wzpigjfgjw03yjpl2h16zgxbka2k8zf3x"; + }; + + propagatedBuildInputs = [ + authlib + httpx + ]; + + # upstream has no tests + doCheck = false; + + pythonImportsCheck = [ "pypoint" ]; + + meta = with lib; { + description = "API for Minut Point"; + homepage = "https://github.com/fredrike/pypoint"; + license = licenses.mit; + maintainers = with maintainers; [ dotlambda ]; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/pyrfxtrx/default.nix b/nixpkgs/pkgs/development/python-modules/pyrfxtrx/default.nix new file mode 100644 index 000000000000..6b63ac8f9fe2 --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/pyrfxtrx/default.nix @@ -0,0 +1,33 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, pyserial +, pytestCheckHook +}: + +buildPythonPackage rec { + pname = "pyrfxtrx"; + version = "0.27.0"; + + src = fetchFromGitHub { + owner = "Danielhiversen"; + repo = "pyRFXtrx"; + rev = version; + sha256 = "0nzgy56b2v3bnn9idlb67qkzj4cj5j9v1436ri1y305fqwjy48nm"; + }; + + propagatedBuildInputs = [ + pyserial + ]; + + checkInputs = [ + pytestCheckHook + ]; + + meta = with lib; { + description = "Library to communicate with the RFXtrx family of devices"; + homepage = "https://github.com/Danielhiversen/pyRFXtrx"; + license = licenses.lgpl3Plus; + maintainers = with maintainers; [ dotlambda ]; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/pyrituals/default.nix b/nixpkgs/pkgs/development/python-modules/pyrituals/default.nix index d9c8759798d7..6b3b9f91c1e5 100644 --- a/nixpkgs/pkgs/development/python-modules/pyrituals/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pyrituals/default.nix @@ -7,7 +7,7 @@ buildPythonPackage rec { pname = "pyrituals"; - version = "0.0.4"; + version = "0.0.5"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -15,7 +15,7 @@ buildPythonPackage rec { owner = "milanmeu"; repo = pname; rev = version; - sha256 = "sha256-XJoSKGGwLoHMWxPGfXHeLg8VlIH1/j0ktzWe/pjd//0="; + sha256 = "sha256-iWJhjAUXkoH3MMJ5PFj2rjIy2e0nn57cRoEF6KMfrQg="; }; propagatedBuildInputs = [ aiohttp ]; diff --git a/nixpkgs/pkgs/development/python-modules/pysaml2/default.nix b/nixpkgs/pkgs/development/python-modules/pysaml2/default.nix index 30fcfc52cba8..5de5ad3a0dbe 100644 --- a/nixpkgs/pkgs/development/python-modules/pysaml2/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pysaml2/default.nix @@ -4,7 +4,7 @@ , fetchFromGitHub , substituteAll , xmlsec -, cryptography, defusedxml, pyopenssl, dateutil, pytz, requests, six +, cryptography, defusedxml, pyopenssl, python-dateutil, pytz, requests, six , mock, pyasn1, pymongo, pytest, responses, xmlschema, importlib-resources }: @@ -36,7 +36,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ cryptography - dateutil + python-dateutil defusedxml importlib-resources pyopenssl diff --git a/nixpkgs/pkgs/development/python-modules/pysyncobj/default.nix b/nixpkgs/pkgs/development/python-modules/pysyncobj/default.nix index bca2d47320eb..3afdacd18034 100644 --- a/nixpkgs/pkgs/development/python-modules/pysyncobj/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pysyncobj/default.nix @@ -5,13 +5,13 @@ buildPythonPackage rec { pname = "pysyncobj"; - version = "0.3.7"; + version = "0.3.8"; src = fetchFromGitHub { owner = "bakwc"; repo = "PySyncObj"; rev = version; - sha256 = "0i7gjapaggkfvys4rgd4krpmh6mxwpzv30ngiwb6ddgp8jx0nzxk"; + sha256 = "sha256-T7ecy5/1eF0pYaOv74SBEp6V6Z23E2b9lo5Q/gig3Cw="; }; # Tests require network features diff --git a/nixpkgs/pkgs/development/python-modules/pytenable/default.nix b/nixpkgs/pkgs/development/python-modules/pytenable/default.nix index 2482e4230961..5b0dfb29be2b 100644 --- a/nixpkgs/pkgs/development/python-modules/pytenable/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pytenable/default.nix @@ -17,13 +17,13 @@ buildPythonPackage rec { pname = "pytenable"; - version = "1.3.0"; + version = "1.3.1"; src = fetchFromGitHub { owner = "tenable"; repo = "pyTenable"; rev = version; - sha256 = "sha256-APwBC1fL5JtYL5E/pabQpwGD1OtFMNPeWi/b9+hbhBE="; + sha256 = "sha256-9qkNQ3+yDplPHIXDwlghpJP1f+UoDYObWpPhl6UVtHU="; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/pytest-cases/default.nix b/nixpkgs/pkgs/development/python-modules/pytest-cases/default.nix index 018ca0c46de9..9bee3808c5a7 100644 --- a/nixpkgs/pkgs/development/python-modules/pytest-cases/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pytest-cases/default.nix @@ -10,12 +10,12 @@ buildPythonPackage rec { pname = "pytest-cases"; - version = "3.6.1"; + version = "3.6.2"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "2009845554d3169dca99a7397d9904e5dbb58726c7417e8c308dda86f8966311"; + sha256 = "1hipm73s97dx37la57aif1x7myidirfslr1k6apvwyc2929y2lsk"; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/pytest-rerunfailures/default.nix b/nixpkgs/pkgs/development/python-modules/pytest-rerunfailures/default.nix index b0b0e2372f41..a643e7dc5a54 100644 --- a/nixpkgs/pkgs/development/python-modules/pytest-rerunfailures/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pytest-rerunfailures/default.nix @@ -2,13 +2,13 @@ buildPythonPackage rec { pname = "pytest-rerunfailures"; - version = "9.1.1"; + version = "10.1"; disabled = pythonOlder "3.5"; src = fetchPypi { inherit pname version; - sha256 = "1cb11a17fc121b3918414eb5eaf314ee325f2e693ac7cb3f6abf7560790827f2"; + sha256 = "7617c06de13ee6dd2df9add7e275bfb2bcebbaaf3e450f5937cd0200df824273"; }; buildInputs = [ pytest ]; diff --git a/nixpkgs/pkgs/development/python-modules/python-gitlab/default.nix b/nixpkgs/pkgs/development/python-modules/python-gitlab/default.nix index 34fbcff42f13..9d06569dfdc3 100644 --- a/nixpkgs/pkgs/development/python-modules/python-gitlab/default.nix +++ b/nixpkgs/pkgs/development/python-modules/python-gitlab/default.nix @@ -10,12 +10,12 @@ buildPythonPackage rec { pname = "python-gitlab"; - version = "2.8.0"; + version = "2.9.0"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "f3364a8d1e813a0b3e68485db1e1881d8653b0e03b9a41f2c59544fce4930101"; + sha256 = "sha256-LFGxTN2aaAKDFaKw6IUl03YJZziPmfqlfeiQK0VGW+Y="; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/python-http-client/default.nix b/nixpkgs/pkgs/development/python-modules/python-http-client/default.nix index f4b19ba379e4..8eece2ed4fee 100644 --- a/nixpkgs/pkgs/development/python-modules/python-http-client/default.nix +++ b/nixpkgs/pkgs/development/python-modules/python-http-client/default.nix @@ -7,13 +7,13 @@ buildPythonPackage rec { pname = "python_http_client"; - version = "3.3.1"; + version = "3.3.2"; src = fetchFromGitHub { owner = "sendgrid"; repo = "python-http-client"; rev = version; - sha256 = "0mbcg0vb9v41v7hbvycrxx5wyrf3ysvfgxkix8hn8c4x5l2lmidc"; + sha256 = "0z7nvfq9wdcprwh88xn9p3vm15gb3ijdc8pxn0a133ini9hxxlpx"; }; checkInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/python-ipmi/default.nix b/nixpkgs/pkgs/development/python-modules/python-ipmi/default.nix new file mode 100644 index 000000000000..7f8b8fe58a77 --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/python-ipmi/default.nix @@ -0,0 +1,41 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, future +, mock +, nose +, pytestCheckHook +, pythonOlder +}: + +buildPythonPackage rec { + pname = "python-ipmi"; + version = "0.5.1"; + disabled = pythonOlder "3.6"; + + src = fetchFromGitHub { + owner = "kontron"; + repo = pname; + rev = version; + sha256 = "0rcix3q845zsmfj5857kq1r5b8m7m3sad34i23k65m0p58clwdqm"; + }; + + propagatedBuildInputs = [ + future + ]; + + checkInputs = [ + mock + nose + pytestCheckHook + ]; + + pythonImportsCheck = [ "pyipmi" ]; + + meta = with lib; { + description = "Python IPMI Library"; + homepage = "https://github.com/kontron/python-ipmi"; + license = with licenses; [ lgpl2Plus ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/python-jose/default.nix b/nixpkgs/pkgs/development/python-modules/python-jose/default.nix index 15c6474cc388..5ba5d9c8ddc0 100644 --- a/nixpkgs/pkgs/development/python-modules/python-jose/default.nix +++ b/nixpkgs/pkgs/development/python-modules/python-jose/default.nix @@ -1,46 +1,50 @@ -{ lib, buildPythonPackage, fetchFromGitHub -, future, six, ecdsa, rsa -, pycrypto, pytestcov, pytestrunner, cryptography +{ lib +, buildPythonPackage +, fetchFromGitHub +, ecdsa +, rsa +, pycrypto +, pyasn1 +, pycryptodome +, cryptography , pytestCheckHook }: buildPythonPackage rec { pname = "python-jose"; - version = "3.2.0"; + version = "3.3.0"; src = fetchFromGitHub { owner = "mpdavis"; - repo = "python-jose"; + repo = pname; rev = version; - sha256 = "cSPIZrps0xFd4pPcQ4w/jFWOk2XYgd3mtE/sDzlytvY="; + sha256 = "sha256-6VGC6M5oyGCOiXcYp6mpyhL+JlcYZKIqOQU9Sm/TkKM="; }; - checkInputs = [ + propagatedBuildInputs = [ + cryptography + ecdsa + pyasn1 pycrypto + pycryptodome + rsa + ]; + + checkInputs = [ pytestCheckHook - pytestcov - pytestrunner - cryptography # optional dependency, but needed in tests ]; - # relax ecdsa deps - patchPhase = '' + postPatch = '' substituteInPlace setup.py \ - --replace 'ecdsa<0.15' 'ecdsa' \ - --replace 'ecdsa <0.15' 'ecdsa' + --replace '"pytest-runner",' "" ''; - disabledTests = [ - # https://github.com/mpdavis/python-jose/issues/176 - "test_key_too_short" - ]; - - propagatedBuildInputs = [ future six ecdsa rsa ]; + pythonImportsCheck = [ "jose" ]; meta = with lib; { homepage = "https://github.com/mpdavis/python-jose"; description = "A JOSE implementation in Python"; license = licenses.mit; - maintainers = [ maintainers.jhhuh ]; + maintainers = with maintainers; [ jhhuh ]; }; } diff --git a/nixpkgs/pkgs/development/python-modules/python-language-server/default.nix b/nixpkgs/pkgs/development/python-modules/python-language-server/default.nix index daab437c9797..3ed9b75ef91f 100644 --- a/nixpkgs/pkgs/development/python-modules/python-language-server/default.nix +++ b/nixpkgs/pkgs/development/python-modules/python-language-server/default.nix @@ -84,6 +84,6 @@ buildPythonPackage rec { homepage = "https://github.com/palantir/python-language-server"; description = "An implementation of the Language Server Protocol for Python"; license = licenses.mit; - maintainers = [ maintainers.mic92 ]; + maintainers = [ ]; }; } diff --git a/nixpkgs/pkgs/development/python-modules/python-lsp-jsonrpc/default.nix b/nixpkgs/pkgs/development/python-modules/python-lsp-jsonrpc/default.nix new file mode 100644 index 000000000000..6938bc282f88 --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/python-lsp-jsonrpc/default.nix @@ -0,0 +1,41 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, pytestCheckHook +, ujson +}: + +buildPythonPackage rec { + pname = "python-lsp-jsonrpc"; + version = "1.0.0"; + + src = fetchFromGitHub { + owner = "python-lsp"; + repo = pname; + rev = "v${version}"; + sha256 = "0h4bs8s4axcm0p02v59amz9sq3nr4zhzdgwq7iaw6awl27v1hd0i"; + }; + + propagatedBuildInputs = [ + ujson + ]; + + checkInputs = [ + pytestCheckHook + ]; + + postPatch = '' + substituteInPlace setup.cfg \ + --replace "--cov-report html --cov-report term --junitxml=pytest.xml" "" \ + --replace "--cov pylsp_jsonrpc --cov test" "" + ''; + + pythonImportsCheck = [ "pylsp_jsonrpc" ]; + + meta = with lib; { + description = "Python server implementation of the JSON RPC 2.0 protocol."; + homepage = "https://github.com/python-lsp/python-lsp-jsonrpc"; + license = licenses.mit; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/python-lsp-server/default.nix b/nixpkgs/pkgs/development/python-modules/python-lsp-server/default.nix new file mode 100644 index 000000000000..6a2c396ecf89 --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/python-lsp-server/default.nix @@ -0,0 +1,81 @@ +{ lib +, autopep8 +, buildPythonPackage +, fetchFromGitHub +, flake8 +, flaky +, jedi +, matplotlib +, mccabe +, numpy +, pandas +, pluggy +, pycodestyle +, pydocstyle +, pyflakes +, pylint +, pyqt5 +, pytestCheckHook +, python-lsp-jsonrpc +, pythonOlder +, rope +, ujson +, yapf +}: + +buildPythonPackage rec { + pname = "python-lsp-server"; + version = "1.1.0"; + disabled = pythonOlder "3.6"; + + src = fetchFromGitHub { + owner = "python-lsp"; + repo = pname; + rev = "v${version}"; + sha256 = "1akdpfnylqg2mcwpkqmdwcg6j6hab23slp5rfjfidhphig2f2yjv"; + }; + + propagatedBuildInputs = [ + autopep8 + flake8 + jedi + mccabe + pluggy + pycodestyle + pydocstyle + pyflakes + pylint + python-lsp-jsonrpc + rope + ujson + yapf + ]; + + checkInputs = [ + flaky + matplotlib + numpy + pandas + pyqt5 + pytestCheckHook + ]; + + postPatch = '' + substituteInPlace setup.cfg \ + --replace "--cov-report html --cov-report term --junitxml=pytest.xml" "" \ + --replace "--cov pylsp --cov test" "" + ''; + + preCheck = '' + export HOME=$(mktemp -d); + ''; + + pythonImportsCheck = [ "pylsp" ]; + + meta = with lib; { + description = "Python implementation of the Language Server Protocol"; + homepage = "https://github.com/python-lsp/python-lsp-server"; + license = licenses.mit; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/python-pidfile/default.nix b/nixpkgs/pkgs/development/python-modules/python-pidfile/default.nix new file mode 100644 index 000000000000..7ba39341516e --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/python-pidfile/default.nix @@ -0,0 +1,32 @@ +{ lib +, buildPythonPackage +, fetchPypi +, psutil +}: + +buildPythonPackage rec { + pname = "python-pidfile"; + version = "3.0.0"; + + src = fetchPypi { + inherit pname version; + sha256 = "sha256-HhCX30G8dfV0WZ/++J6LIO/xvfyRkdPtJkzC2ulUKdA="; + }; + + propagatedBuildInputs = [ + psutil + ]; + + pythonImportsCheck = [ "pidfile" ]; + + # no tests on the github mirror of the source code + # see this: https://github.com/mosquito/python-pidfile/issues/7 + doCheck = false; + + meta = with lib; { + description = "Python context manager for managing pid files"; + homepage = "https://github.com/mosquito/python-pidfile"; + license = with licenses; [ mit ]; + maintainers = with maintainers; [ legendofmiracles ]; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/python-pkcs11/default.nix b/nixpkgs/pkgs/development/python-modules/python-pkcs11/default.nix new file mode 100644 index 000000000000..d0d4b4e98d39 --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/python-pkcs11/default.nix @@ -0,0 +1,44 @@ +{ lib +, asn1crypto +, buildPythonPackage +, cached-property +, cython +, fetchFromGitHub +, setuptools-scm +}: + +buildPythonPackage rec { + pname = "python-pkcs11"; + version = "0.7.0"; + + src = fetchFromGitHub { + owner = "danni"; + repo = pname; + rev = "v${version}"; + sha256 = "0kncbipfpsb7m7mhv5s5b9wk604h1j08i2j26fn90pklgqll0xhv"; + }; + + SETUPTOOLS_SCM_PRETEND_VERSION = version; + + nativeBuildInputs = [ + cython + setuptools-scm + ]; + + propagatedBuildInputs = [ + cached-property + asn1crypto + ]; + + # Test require additional setup + doCheck = false; + + pythonImportsCheck = [ "pkcs11" ]; + + meta = with lib; { + description = "PKCS#11/Cryptoki support for Python"; + homepage = "https://github.com/danni/python-pkcs11"; + license = with licenses; [ mit ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/python-songpal/default.nix b/nixpkgs/pkgs/development/python-modules/python-songpal/default.nix new file mode 100644 index 000000000000..180e5b3d833e --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/python-songpal/default.nix @@ -0,0 +1,68 @@ +{ lib +, buildPythonPackage +, pythonOlder +, fetchFromGitHub +, fetchpatch +, poetry-core +, aiohttp +, async-upnp-client +, attrs +, click +, importlib-metadata +, pytestCheckHook +}: + +buildPythonPackage rec { + pname = "python-songpal"; + version = "0.13"; + + format = "pyproject"; + + disabled = pythonOlder "3.6"; + + src = fetchFromGitHub { + owner = "rytilahti"; + repo = "python-songpal"; + rev = version; + sha256 = "124w6vfn992845k09bjv352havk8pg590b135m37h1x1m7fmbpwa"; + }; + + patches = [ + # https://github.com/rytilahti/python-songpal/pull/90 + (fetchpatch { + name = "switch-to-poetry-core.patch"; + url = "https://github.com/rytilahti/python-songpal/commit/56b634790d94b2f9788d5af3d5cedff47f1e42c2.patch"; + sha256 = "0yc0mrb91ywk77nd4mxvyc0p2kjz2w1p395755a32ls30zw2bs27"; + }) + ]; + + postPatch = '' + # https://github.com/rytilahti/python-songpal/issues/91 + substituteInPlace pyproject.toml \ + --replace 'click = "^7"' 'click = "*"' + ''; + + nativeBuildInputs = [ + poetry-core + ]; + + propagatedBuildInputs = [ + aiohttp + async-upnp-client + attrs + click + importlib-metadata + ]; + + # no tests implemented + doCheck = false; + + pythonImportsCheck = [ "songpal" ]; + + meta = with lib; { + description = "Python library for interfacing with Sony's Songpal devices"; + homepage = "https://github.com/rytilahti/python-songpal"; + license = licenses.gpl3Only; + maintainers = with maintainers; [ dotlambda ]; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/python-telegram-bot/default.nix b/nixpkgs/pkgs/development/python-modules/python-telegram-bot/default.nix index 4d223c548388..6ddc4543d3d0 100644 --- a/nixpkgs/pkgs/development/python-modules/python-telegram-bot/default.nix +++ b/nixpkgs/pkgs/development/python-modules/python-telegram-bot/default.nix @@ -13,12 +13,12 @@ buildPythonPackage rec { pname = "python-telegram-bot"; - version = "13.6"; + version = "13.7"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "37cfe8faba16fb68a8b5ab41a10e787c385f6296200c84256cc54d7c16334643"; + sha256 = "sha256-JN91RZ4zW5a6/6aZFnn4RL1CaXivWmnKQZoKxDpAYCw="; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/python3-saml/default.nix b/nixpkgs/pkgs/development/python-modules/python3-saml/default.nix index 00774cc40f88..af57357d11c9 100644 --- a/nixpkgs/pkgs/development/python-modules/python3-saml/default.nix +++ b/nixpkgs/pkgs/development/python-modules/python3-saml/default.nix @@ -1,4 +1,4 @@ -{ lib, fetchurl, fetchFromGitHub, buildPythonPackage, isPy3k, +{ lib, fetchpatch, fetchFromGitHub, buildPythonPackage, isPy3k, isodate, lxml, xmlsec, freezegun }: buildPythonPackage rec { @@ -13,14 +13,21 @@ buildPythonPackage rec { sha256 = "1yk02xq90bm7p6k091av6gapb5h2ccxzgrbm03sj2x8h0wff9s8k"; }; + # Remove both patches on update patches = [ # Remove the dependency on defusedxml # # This patch is already merged upstream and does not introduce any # functionality changes. - (fetchurl { + (fetchpatch { url = "https://github.com/onelogin/python3-saml/commit/4b6c4b1f2ed3f6eab70ff4391e595b808ace168c.patch"; - sha256 = "11gqn7ib2hmlx5wp4xhi375v5ajapwmj4lpw0y44bh5ww8cypvqy"; + sha256 = "sha256-KHyAoX3our3Rz2z4xo0lTBB1XOGuC3Pe+lUDCzK5WQI="; + }) + + # Update expiry dates for test response XMLs + (fetchpatch { + url = "https://github.com/onelogin/python3-saml/commit/05611bbf6d7d8313adb9c77ff88a9210333ccc38.patch"; + sha256 = "sha256-62TwgCXDFYsZIAeqAysJRziMvhUVhGzta/C2wS3v4HY="; }) ]; diff --git a/nixpkgs/pkgs/development/python-modules/pytibber/default.nix b/nixpkgs/pkgs/development/python-modules/pytibber/default.nix index c6bf0e4aef6a..e036197a1eca 100644 --- a/nixpkgs/pkgs/development/python-modules/pytibber/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pytibber/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "pytibber"; - version = "0.18.0"; + version = "0.19.0"; disabled = pythonOlder "3.7"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "Danielhiversen"; repo = "pyTibber"; rev = version; - sha256 = "sha256-612BBDgVcdpOsEl2Hc+oCDFmSPGjHvfmVr7i7zdfB/o="; + sha256 = "sha256-9xKt6OspdM7zWbVzjtvDPYuGyIW3K6ioASt53LOgdvk="; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/pytile/default.nix b/nixpkgs/pkgs/development/python-modules/pytile/default.nix index 0d269522e1a0..cf445fd96815 100644 --- a/nixpkgs/pkgs/development/python-modules/pytile/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pytile/default.nix @@ -8,23 +8,25 @@ , pytest-aiohttp , pytest-asyncio , pytestCheckHook -, pythonAtLeast +, pythonOlder }: buildPythonPackage rec { pname = "pytile"; - version = "5.2.1"; + version = "5.2.2"; + format = "pyproject"; + disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "bachya"; repo = pname; rev = version; - sha256 = "0d63xga4gjlfl9fzv3i4j605rrx2qgbzam6cl609ny96s8q8h1px"; + sha256 = "sha256-oVtTR5zucYvnaPO0i4sEBBU4nafq7GUfx3kPdSvptDo="; }; - format = "pyproject"; - - nativeBuildInputs = [ poetry-core ]; + nativeBuildInputs = [ + poetry-core + ]; propagatedBuildInputs = [ aiohttp @@ -38,8 +40,11 @@ buildPythonPackage rec { pytestCheckHook ]; - # Ignore the examples as they are prefixed with test_ - pytestFlagsArray = [ "--ignore examples/" ]; + disabledTestPaths = [ + # Ignore the examples as they are prefixed with test_ + "examples/" + ]; + pythonImportsCheck = [ "pytile" ]; __darwinAllowLocalNetworking = true; diff --git a/nixpkgs/pkgs/development/python-modules/pytomlpp/default.nix b/nixpkgs/pkgs/development/python-modules/pytomlpp/default.nix index 19edd7057eb4..d2fc8470d487 100644 --- a/nixpkgs/pkgs/development/python-modules/pytomlpp/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pytomlpp/default.nix @@ -4,7 +4,7 @@ , pythonOlder , pybind11 , pytestCheckHook -, dateutil +, python-dateutil , doxygen , python , pelican @@ -28,7 +28,7 @@ buildPythonPackage rec { checkInputs = [ pytestCheckHook - dateutil + python-dateutil doxygen python pelican diff --git a/nixpkgs/pkgs/development/python-modules/pytube/default.nix b/nixpkgs/pkgs/development/python-modules/pytube/default.nix index 9cedb1ac944c..62824354c670 100644 --- a/nixpkgs/pkgs/development/python-modules/pytube/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pytube/default.nix @@ -7,7 +7,7 @@ buildPythonPackage rec { pname = "pytube"; - version = "10.8.5"; + version = "10.9.0"; disabled = pythonOlder "3.6"; @@ -15,7 +15,7 @@ buildPythonPackage rec { owner = "pytube"; repo = "pytube"; rev = "v${version}"; - sha256 = "05w2jlrm1kqki3yq4ssf3ydmy0sf4zcychz94wxsppgr2xrghnhn"; + sha256 = "sha256-9kKazy0Fg3YcNIkzgVFQ46Ipn3Dngfnh5DjwRP/fZGg="; }; checkInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/pyvex/default.nix b/nixpkgs/pkgs/development/python-modules/pyvex/default.nix index b2696b101b42..b2f43db50cf9 100644 --- a/nixpkgs/pkgs/development/python-modules/pyvex/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pyvex/default.nix @@ -11,11 +11,11 @@ buildPythonPackage rec { pname = "pyvex"; - version = "9.0.8021"; + version = "9.0.8761"; src = fetchPypi { inherit pname version; - sha256 = "sha256-Bx6A258LgmmRBbrwY2pgf0DXdMwh9QjaA4sVbxj+kBo="; + sha256 = "sha256-3aLpMiOJfgELfnpqTyXAL6Uofbm4UW4VRRsYzTTAofg="; }; postPatch = lib.optionalString stdenv.isDarwin '' diff --git a/nixpkgs/pkgs/development/python-modules/qcelemental/default.nix b/nixpkgs/pkgs/development/python-modules/qcelemental/default.nix index 7d1dcdeb1c7b..3a3e9bced050 100644 --- a/nixpkgs/pkgs/development/python-modules/qcelemental/default.nix +++ b/nixpkgs/pkgs/development/python-modules/qcelemental/default.nix @@ -1,34 +1,19 @@ -{ buildPythonPackage, lib, fetchPypi, fetchpatch, numpy +{ buildPythonPackage, lib, fetchPypi, numpy , pydantic, pint, networkx, pytestrunner, pytestcov, pytest } : buildPythonPackage rec { pname = "qcelemental"; - version = "0.20.0"; + version = "0.21.0"; checkInputs = [ pytestrunner pytestcov pytest ]; propagatedBuildInputs = [ numpy pydantic pint networkx ]; src = fetchPypi { inherit pname version; - sha256 = "141vw36fmacj897q26kq2bl9l0d23lyqjfry6q46aa9087dcs7ni"; + sha256 = "1b3c78fxbpnddrm1fnbvv4x2840jcfjg2l5cb5w4p38vzksiv238"; }; - # FIXME: Fixed upstream but not released yet. Nevertheless critical for correct behaviour. - # See https://github.com/MolSSI/QCElemental/pull/265 - patches = [ - (fetchpatch { - name = "SearchPath1.patch"; - url = "https://github.com/MolSSI/QCElemental/commit/2211a4e59690bcb14265a60f199a5efe74fe44db.diff"; - sha256 = "1ibjvmdrc103jdj79xrr11y5yji5hc966rm4ihfhfzgbvfkbjg2l"; - }) - (fetchpatch { - name = "SearchPath2.patch"; - url = "https://github.com/MolSSI/QCElemental/commit/5a32ce33e8142047b0a00d0036621fe2750e872a.diff"; - sha256 = "0gmg70vdps7k6alqclwdlxkli9d8s1fphbdvyl8wy8xrh46jw6rk"; - }) - ]; - doCheck = true; meta = with lib; { diff --git a/nixpkgs/pkgs/development/python-modules/rainbowstream/default.nix b/nixpkgs/pkgs/development/python-modules/rainbowstream/default.nix index e484c07f31ca..02c948fd405a 100644 --- a/nixpkgs/pkgs/development/python-modules/rainbowstream/default.nix +++ b/nixpkgs/pkgs/development/python-modules/rainbowstream/default.nix @@ -8,7 +8,7 @@ , pyfiglet , requests , arrow -, dateutil +, python-dateutil , pysocks , pocket }: @@ -42,7 +42,7 @@ buildPythonPackage rec { done ''; - buildInputs = [ pkgs.libjpeg pkgs.freetype pkgs.zlib pkgs.glibcLocales pillow twitter pyfiglet requests arrow dateutil pysocks pocket ]; + buildInputs = [ pkgs.libjpeg pkgs.freetype pkgs.zlib pkgs.glibcLocales pillow twitter pyfiglet requests arrow python-dateutil pysocks pocket ]; meta = with lib; { description = "Streaming command-line twitter client"; diff --git a/nixpkgs/pkgs/development/python-modules/rasterio/default.nix b/nixpkgs/pkgs/development/python-modules/rasterio/default.nix index 236970a5d343..85d5d5d0b7d8 100644 --- a/nixpkgs/pkgs/development/python-modules/rasterio/default.nix +++ b/nixpkgs/pkgs/development/python-modules/rasterio/default.nix @@ -2,23 +2,24 @@ , cython, setuptools , numpy, affine, attrs, cligj, click-plugins, snuggs, gdal , pytest, pytestcov, packaging, hypothesis, boto3, mock +, certifi, shapely }: buildPythonPackage rec { pname = "rasterio"; - version = "1.1.5"; + version = "1.2.6"; # Pypi doesn't ship the tests, so we fetch directly from GitHub src = fetchFromGitHub { owner = "mapbox"; repo = "rasterio"; rev = version; - sha256 = "168b6hmx026jsvhnq6s5k0qfhzda02mmx1alax6wqk16mk63mqcz"; + sha256 = "sha256-rf2qdUhbS4Z2+mvlN1RzZvlgTgjqiBoQzry4z5QLSUc="; }; - checkInputs = [ boto3 pytest pytestcov packaging hypothesis ] ++ lib.optional (!isPy3k) mock; + checkInputs = [ boto3 pytest pytestcov packaging hypothesis shapely ] ++ lib.optional (!isPy3k) mock; nativeBuildInputs = [ cython gdal ]; - propagatedBuildInputs = [ gdal numpy attrs affine cligj click-plugins snuggs setuptools ]; + propagatedBuildInputs = [ certifi gdal numpy attrs affine cligj click-plugins snuggs setuptools ]; meta = with lib; { description = "Python package to read and write geospatial raster data"; diff --git a/nixpkgs/pkgs/development/python-modules/regenmaschine/default.nix b/nixpkgs/pkgs/development/python-modules/regenmaschine/default.nix index 02ac2da96726..e19c744ba655 100644 --- a/nixpkgs/pkgs/development/python-modules/regenmaschine/default.nix +++ b/nixpkgs/pkgs/development/python-modules/regenmaschine/default.nix @@ -7,33 +7,37 @@ , poetry-core , pytest-aiohttp , pytest-asyncio -, pytest-cov , pytest-mock , pytestCheckHook +, pythonOlder }: buildPythonPackage rec { pname = "regenmaschine"; - version = "3.1.2"; + version = "3.1.3"; format = "pyproject"; + disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "bachya"; repo = pname; rev = version; - sha256 = "sha256-lARti3Sb/jh7h8x+lFLqkM/BlL6XmELm46owsL041Cw="; + sha256 = "sha256-3Q0JQQVspzuQQAn3S46uFbOYW2zQ7c1UL4zjEOnifDY="; }; - nativeBuildInputs = [ poetry-core ]; + nativeBuildInputs = [ + poetry-core + ]; - propagatedBuildInputs = [ aiohttp ]; + propagatedBuildInputs = [ + aiohttp + ]; checkInputs = [ aresponses asynctest pytest-aiohttp pytest-asyncio - pytest-cov pytest-mock pytestCheckHook ]; diff --git a/nixpkgs/pkgs/development/python-modules/requests-pkcs12/default.nix b/nixpkgs/pkgs/development/python-modules/requests-pkcs12/default.nix index c58e8a926c82..29d7b85f9e6e 100644 --- a/nixpkgs/pkgs/development/python-modules/requests-pkcs12/default.nix +++ b/nixpkgs/pkgs/development/python-modules/requests-pkcs12/default.nix @@ -7,13 +7,13 @@ buildPythonPackage rec { pname = "requests-pkcs12"; - version = "1.9"; + version = "1.10"; src = fetchFromGitHub { owner = "m-click"; repo = "requests_pkcs12"; rev = version; - sha256 = "09nm3c6v911d1vwwi0f7mzapbkq7rnsl7026pb13j6ma8pkxznms"; + sha256 = "sha256-HIUCzHxOsbk1OmcxkRK9GQ+SZ6Uf1xDylOe2pUYz3Hk="; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/sacn/default.nix b/nixpkgs/pkgs/development/python-modules/sacn/default.nix index 46678504cab6..e4e14bc93e5b 100644 --- a/nixpkgs/pkgs/development/python-modules/sacn/default.nix +++ b/nixpkgs/pkgs/development/python-modules/sacn/default.nix @@ -6,12 +6,12 @@ buildPythonPackage rec { pname = "sacn"; - version = "1.6.4"; + version = "1.7.0"; disabled = isPy27; src = fetchPypi { inherit pname version; - sha256 = "1abkalzpy8bj2hpx563bxii5h0gv9v89f0yp9clc1l76amyf6dj2"; + sha256 = "136gw09av7r2y02q7aam4chhivpbwkdskwwavrl5v0zn34y0axwp"; }; # no tests diff --git a/nixpkgs/pkgs/development/python-modules/scp/default.nix b/nixpkgs/pkgs/development/python-modules/scp/default.nix index e0c6769b07d7..7bd426706886 100644 --- a/nixpkgs/pkgs/development/python-modules/scp/default.nix +++ b/nixpkgs/pkgs/development/python-modules/scp/default.nix @@ -7,11 +7,11 @@ buildPythonPackage rec { pname = "scp"; - version = "0.13.4"; + version = "0.13.5"; src = fetchPypi { inherit pname version; - sha256 = "e60948dd3e1aa13da21aa1bf8a025fabbbc2816ed04f1a1272410247d1a86f15"; + sha256 = "sha256-CrLukXi4vlPcXJ/i8zdh4BokNQh/XJ+1tUUZhzxlDWA="; }; propagatedBuildInputs = [ @@ -25,10 +25,12 @@ buildPythonPackage rec { #The Pypi package doesn't include the test doCheck = false; + pythonImportsCheck = [ "scp" ]; + meta = with lib; { homepage = "https://github.com/jbardin/scp.py"; description = "SCP module for paramiko"; - license = licenses.lgpl3; + license = licenses.lgpl21Only; maintainers = with maintainers; [ xnaveira ]; }; } diff --git a/nixpkgs/pkgs/development/python-modules/selenium/default.nix b/nixpkgs/pkgs/development/python-modules/selenium/default.nix index 370d25489809..7a1d1439c1f7 100644 --- a/nixpkgs/pkgs/development/python-modules/selenium/default.nix +++ b/nixpkgs/pkgs/development/python-modules/selenium/default.nix @@ -49,7 +49,7 @@ buildPythonPackage rec { ''; passthru.tests = { - testing-bitwarden = nixosTests.bitwarden; + testing-vaultwarden = nixosTests.vaultwarden; }; meta = with lib; { diff --git a/nixpkgs/pkgs/development/python-modules/simber/default.nix b/nixpkgs/pkgs/development/python-modules/simber/default.nix index d1471286bb84..331f84252cee 100644 --- a/nixpkgs/pkgs/development/python-modules/simber/default.nix +++ b/nixpkgs/pkgs/development/python-modules/simber/default.nix @@ -2,13 +2,13 @@ buildPythonPackage rec { pname = "simber"; - version = "0.2.2"; + version = "0.2.3"; src = fetchFromGitHub { owner = "deepjyoti30"; repo = pname; rev = version; - sha256 = "0ksc2m61j5ijj0sq6kkc0hhkmfy9f51h9z3cl2sf8g6wbr9vc47h"; + sha256 = "04dp9b4s7zb166vlacsaypc6iw1p75azqas1wf0flp570qqf3rkx"; }; propagatedBuildInputs = [ colorama ]; diff --git a/nixpkgs/pkgs/development/python-modules/sipsimple/default.nix b/nixpkgs/pkgs/development/python-modules/sipsimple/default.nix index 838ffd471840..34b95fe781d9 100644 --- a/nixpkgs/pkgs/development/python-modules/sipsimple/default.nix +++ b/nixpkgs/pkgs/development/python-modules/sipsimple/default.nix @@ -5,7 +5,7 @@ , pkgs , cython , dnspython -, dateutil +, python-dateutil , xcaplib , msrplib , lxml @@ -34,7 +34,7 @@ buildPythonPackage rec { nativeBuildInputs = [ pkgs.pkg-config ]; buildInputs = with pkgs; [ alsa-lib ffmpeg_3 libv4l sqlite libvpx ]; - propagatedBuildInputs = [ cython pkgs.openssl dnspython dateutil xcaplib msrplib lxml python-otr ]; + propagatedBuildInputs = [ cython pkgs.openssl dnspython python-dateutil xcaplib msrplib lxml python-otr ]; meta = with lib; { description = "SIP SIMPLE implementation for Python"; diff --git a/nixpkgs/pkgs/development/python-modules/skidl/default.nix b/nixpkgs/pkgs/development/python-modules/skidl/default.nix index 3d2007732e8c..3b4f42c1feee 100644 --- a/nixpkgs/pkgs/development/python-modules/skidl/default.nix +++ b/nixpkgs/pkgs/development/python-modules/skidl/default.nix @@ -1,36 +1,28 @@ { lib , buildPythonPackage , fetchFromGitHub -, requests , future , kinparse -, enum34 , pyspice , graphviz -, pillow -, cffi }: buildPythonPackage rec { pname = "skidl"; - version = "unstable-2020-09-15"; + version = "1.0.0"; src = fetchFromGitHub { owner = "xesscorp"; repo = "skidl"; - rev = "551bdb92a50c0894b0802c0a89b4cb62a5b4038f"; - sha256 = "1g65cyxpkqshgsggav2q3f76rbj5pzh7sacyhmhzvfz4zfarkcxk"; + rev = version; + sha256 = "1m0hllvmr5nkl4zy8yyzfgw9zmbrrzd5pw87ahd2mq68fjpcaqq5"; }; propagatedBuildInputs = [ - requests future kinparse - enum34 pyspice graphviz - pillow - cffi ]; # Checks require availability of the kicad symbol libraries. @@ -38,8 +30,8 @@ buildPythonPackage rec { pythonImportsCheck = [ "skidl" ]; meta = with lib; { - description = "SKiDL is a module that extends Python with the ability to design electronic circuits"; - homepage = "https://xesscorp.github.io/skidl/docs/_site/"; + description = "Module that extends Python with the ability to design electronic circuits"; + homepage = "https://xess.com/skidl/docs/_site/"; license = licenses.mit; maintainers = with maintainers; [ matthuszagh ]; }; diff --git a/nixpkgs/pkgs/development/python-modules/smart-meter-texas/default.nix b/nixpkgs/pkgs/development/python-modules/smart-meter-texas/default.nix new file mode 100644 index 000000000000..abdcd7317bc5 --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/smart-meter-texas/default.nix @@ -0,0 +1,43 @@ +{ lib +, buildPythonPackage +, pythonOlder +, fetchFromGitHub +, aiohttp +, python-dateutil +, tenacity +}: + +buildPythonPackage rec { + pname = "smart-meter-texas"; + version = "0.4.3"; + + disabled = pythonOlder "3.6"; + + src = fetchFromGitHub { + owner = "grahamwetzler"; + repo = "smart-meter-texas"; + rev = "v${version}"; + sha256 = "09n03wbyjh1b1gsiibf17fg86x7k1i1r1kpp94p7w1lcdbmn8v5c"; + }; + + postPatch = '' + substituteInPlace setup.py \ + --replace "pytest-runner" "" + ''; + + propagatedBuildInputs = [ + aiohttp + python-dateutil + tenacity + ]; + + # no tests implemented + doCheck = false; + + meta = with lib; { + description = "Connect to and retrieve data from the unofficial Smart Meter Texas API"; + homepage = "https://github.com/grahamwetzler/smart-meter-texas"; + license = licenses.mit; + maintainers = with maintainers; [ dotlambda ]; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/smarthab/default.nix b/nixpkgs/pkgs/development/python-modules/smarthab/default.nix new file mode 100644 index 000000000000..f26e294b938f --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/smarthab/default.nix @@ -0,0 +1,32 @@ +{ lib +, buildPythonPackage +, fetchPypi +, aiohttp +}: + +buildPythonPackage rec { + pname = "smarthab"; + version = "0.21"; + + src = fetchPypi { + pname = "SmartHab"; + inherit version; + sha256 = "bf929455a2f7cc1e275b331de73d983587138a8d9179574988ba05fa152d3ccf"; + }; + + propagatedBuildInputs = [ + aiohttp + ]; + + # no tests on PyPI, no tags on GitLab + doCheck = false; + + pythonImportsCheck = [ "pysmarthab" ]; + + meta = with lib; { + description = "Control devices in a SmartHab-powered home"; + homepage = "https://gitlab.com/outadoc/python-smarthab"; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ dotlambda ]; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/somfy-mylink-synergy/default.nix b/nixpkgs/pkgs/development/python-modules/somfy-mylink-synergy/default.nix new file mode 100644 index 000000000000..b0fa5948c0da --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/somfy-mylink-synergy/default.nix @@ -0,0 +1,31 @@ +{ lib +, buildPythonPackage +, pythonOlder +, fetchFromGitHub +}: + +buildPythonPackage rec { + pname = "somfy-mylink-synergy"; + version = "1.0.6"; + + disabled = pythonOlder "3.5"; + + src = fetchFromGitHub { + owner = "bendews"; + repo = "somfy-mylink-synergy"; + rev = "v${version}"; + sha256 = "1aa178b5lxdzfa4z7sjw6ky39dkfazp7dqs9dq78z2zay2sqgmgr"; + }; + + # no tests implemented + doCheck = false; + + pythonImportsCheck = [ "somfy_mylink_synergy" ]; + + meta = with lib; { + description = "Python API to utilise the Somfy Synergy JsonRPC API"; + homepage = "https://github.com/bendews/somfy-mylink-synergy"; + license = licenses.mit; + maintainers = with maintainers; [ dotlambda ]; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/sonarr/default.nix b/nixpkgs/pkgs/development/python-modules/sonarr/default.nix new file mode 100644 index 000000000000..9f73522def4d --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/sonarr/default.nix @@ -0,0 +1,41 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, aiohttp +, yarl +, aresponses +, pytest-asyncio +, pytestCheckHook +}: + +buildPythonPackage rec { + pname = "sonarr"; + version = "0.3.0"; + + src = fetchFromGitHub { + owner = "ctalkington"; + repo = "python-sonarr"; + rev = version; + sha256 = "0gi34951qhzzrq59hj93mnkid8cvvknlamkhir6ya9mb23fr7bya"; + }; + + propagatedBuildInputs = [ + aiohttp + yarl + ]; + + checkInputs = [ + aresponses + pytest-asyncio + pytestCheckHook + ]; + + pythonImportsCheck = [ "sonarr" ]; + + meta = with lib; { + description = "Asynchronous Python client for the Sonarr API"; + homepage = "https://github.com/ctalkington/python-sonarr"; + license = licenses.mit; + maintainers = with maintainers; [ dotlambda ]; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/splinter/default.nix b/nixpkgs/pkgs/development/python-modules/splinter/default.nix index 1ae05cab9738..cb63f8d11ba4 100644 --- a/nixpkgs/pkgs/development/python-modules/splinter/default.nix +++ b/nixpkgs/pkgs/development/python-modules/splinter/default.nix @@ -9,13 +9,13 @@ buildPythonPackage rec { pname = "splinter"; - version = "0.14.0"; + version = "0.15.0"; src = fetchFromGitHub { owner = "cobrateam"; repo = "splinter"; rev = version; - sha256 = "0480bqprv8581cvnc80ls91rz9780wvdnfw99zsw44hvy2yg15a6"; + sha256 = "sha256-y87Cnci4gJHrttThGPeOS/h6VK8x95cQA9nZs1fBfAw="; }; propagatedBuildInputs = [ @@ -32,6 +32,7 @@ buildPythonPackage rec { "samples" "tests/test_djangoclient.py" "tests/test_flaskclient.py" + "tests/test_popups.py" "tests/test_webdriver.py" "tests/test_webdriver_chrome.py" "tests/test_webdriver_firefox.py" diff --git a/nixpkgs/pkgs/development/python-modules/sqlalchemy-utils/default.nix b/nixpkgs/pkgs/development/python-modules/sqlalchemy-utils/default.nix index b59209f42956..dc983e20ce23 100644 --- a/nixpkgs/pkgs/development/python-modules/sqlalchemy-utils/default.nix +++ b/nixpkgs/pkgs/development/python-modules/sqlalchemy-utils/default.nix @@ -1,6 +1,6 @@ { lib, fetchPypi, buildPythonPackage , six, sqlalchemy -, mock, pytz, isort, flake8, jinja2, pg8000, pyodbc, pytest, pymysql, dateutil +, mock, pytz, isort, flake8, jinja2, pg8000, pyodbc, pytest, pymysql, python-dateutil , docutils, flexmock, psycopg2, pygments }: buildPythonPackage rec { @@ -30,7 +30,7 @@ buildPythonPackage rec { pyodbc pytest pymysql - dateutil + python-dateutil docutils flexmock psycopg2 diff --git a/nixpkgs/pkgs/development/python-modules/sqlmap/default.nix b/nixpkgs/pkgs/development/python-modules/sqlmap/default.nix index 5b32cb8b64a6..762df0ab7e3a 100644 --- a/nixpkgs/pkgs/development/python-modules/sqlmap/default.nix +++ b/nixpkgs/pkgs/development/python-modules/sqlmap/default.nix @@ -7,11 +7,11 @@ buildPythonPackage rec { pname = "sqlmap"; - version = "1.5.6"; + version = "1.5.7"; src = fetchPypi { inherit pname version; - sha256 = "fc4be53bb7f64b1cc2e8058e7660059d8f5afb9857cc033084953ea615a10305"; + sha256 = "sha256-HTayAlXehm3Azmbi+ar/Vav5bPYmGu9gflzZCwWZihw="; }; postPatch = '' diff --git a/nixpkgs/pkgs/development/python-modules/starlette/default.nix b/nixpkgs/pkgs/development/python-modules/starlette/default.nix index 694b678930b2..3079b60564f1 100644 --- a/nixpkgs/pkgs/development/python-modules/starlette/default.nix +++ b/nixpkgs/pkgs/development/python-modules/starlette/default.nix @@ -53,9 +53,13 @@ buildPythonPackage rec { typing-extensions ]; - # fails to import graphql, but integrated graphql support is about to - # be removed in 0.15, see https://github.com/encode/starlette/pull/1135. - disabledTestPaths = [ "tests/test_graphql.py" ]; + disabledTestPaths = [ + # fails to import graphql, but integrated graphql support is about to + # be removed in 0.15, see https://github.com/encode/starlette/pull/1135. + "tests/test_graphql.py" + # contextfunction was removed in Jinja 3.1 + "tests/test_templates.py" + ]; pythonImportsCheck = [ "starlette" ]; diff --git a/nixpkgs/pkgs/development/python-modules/staticjinja/default.nix b/nixpkgs/pkgs/development/python-modules/staticjinja/default.nix index 0681218cd0a5..dc36066ec304 100644 --- a/nixpkgs/pkgs/development/python-modules/staticjinja/default.nix +++ b/nixpkgs/pkgs/development/python-modules/staticjinja/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "staticjinja"; - version = "2.1.0"; + version = "3.0.1"; format = "pyproject"; # No tests in pypi @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "staticjinja"; repo = pname; rev = version; - sha256 = "sha256-VKsDvWEurBdckWbPG5hQLK3dzdM7XVbrp23fR5wp1xk="; + sha256 = "sha256-W4q0vG8Kl2gCmA8UnUbdiGRtghhdnWxIJXFIIa6BogA="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/sunpy/default.nix b/nixpkgs/pkgs/development/python-modules/sunpy/default.nix index 987523ed42b9..c8fd82043a81 100644 --- a/nixpkgs/pkgs/development/python-modules/sunpy/default.nix +++ b/nixpkgs/pkgs/development/python-modules/sunpy/default.nix @@ -31,12 +31,12 @@ buildPythonPackage rec { pname = "sunpy"; - version = "3.0.0"; + version = "3.0.1"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "sha256-N/DAvnO+S9E4tndEWpiG84P3FCFwxYNdGFxbxUVsTx8="; + sha256 = "sha256-WpqkCAwDYb6L+W4VTC/1auGVbblnNYwBxbk+tZbAiBw="; }; nativeBuildInputs = [ @@ -75,11 +75,13 @@ buildPythonPackage rec { # darwin has write permission issues doCheck = stdenv.isLinux; - # ignore documentation tests + # ignore documentation tests and ignore tests with schema issues checkPhase = '' PY_IGNORE_IMPORTMISMATCH=1 HOME=$(mktemp -d) pytest sunpy -k 'not rst' \ --deselect=sunpy/tests/tests/test_self_test.py::test_main_nonexisting_module \ - --deselect=sunpy/tests/tests/test_self_test.py::test_main_stdlib_module + --deselect=sunpy/tests/tests/test_self_test.py::test_main_stdlib_module \ + --ignore=sunpy/io/special/asdf/schemas/sunpy.org/sunpy/coordinates/frames/heliocentric-1.0.0.yaml \ + --ignore=sunpy/io/special/asdf/schemas/sunpy.org/sunpy/coordinates/frames/helioprojective-1.0.0.yaml ''; meta = with lib; { diff --git a/nixpkgs/pkgs/development/python-modules/suseapi/default.nix b/nixpkgs/pkgs/development/python-modules/suseapi/default.nix index 1c36f45090b8..bcf35d1f5f70 100644 --- a/nixpkgs/pkgs/development/python-modules/suseapi/default.nix +++ b/nixpkgs/pkgs/development/python-modules/suseapi/default.nix @@ -7,7 +7,7 @@ , mechanize , beautifulsoup4 , pyxdg -, dateutil +, python-dateutil , requests , httpretty }: @@ -24,7 +24,7 @@ buildPythonPackage rec { }; propagatedBuildInputs = [ - django suds-jurko ldap mechanize beautifulsoup4 pyxdg dateutil requests + django suds-jurko ldap mechanize beautifulsoup4 pyxdg python-dateutil requests ]; buildInputs = [ httpretty ]; diff --git a/nixpkgs/pkgs/development/python-modules/taskw/default.nix b/nixpkgs/pkgs/development/python-modules/taskw/default.nix index 523d3e303b32..80d86c3edb01 100644 --- a/nixpkgs/pkgs/development/python-modules/taskw/default.nix +++ b/nixpkgs/pkgs/development/python-modules/taskw/default.nix @@ -4,7 +4,7 @@ , nose , tox , six -, dateutil +, python-dateutil , kitchen , pytz , pkgs @@ -29,7 +29,7 @@ buildPythonPackage rec { doCheck = false; buildInputs = [ nose pkgs.taskwarrior tox ]; - propagatedBuildInputs = [ six dateutil kitchen pytz ]; + propagatedBuildInputs = [ six python-dateutil kitchen pytz ]; meta = with lib; { homepage = "https://github.com/ralphbean/taskw"; diff --git a/nixpkgs/pkgs/development/python-modules/tern/0001-Replace-debut-with-debian-inspector.patch b/nixpkgs/pkgs/development/python-modules/tern/0001-Replace-debut-with-debian-inspector.patch deleted file mode 100644 index c9cb8b4a5281..000000000000 --- a/nixpkgs/pkgs/development/python-modules/tern/0001-Replace-debut-with-debian-inspector.patch +++ /dev/null @@ -1,40 +0,0 @@ -From d944d8fa6cb6d1667f3e4c4e0cff4c4b2a7c0a30 Mon Sep 17 00:00:00 2001 -From: Cole Helbling <cole.e.helbling@outlook.com> -Date: Fri, 7 May 2021 11:00:46 -0700 -Subject: [PATCH] Replace `debut` with `debian-inspector` - ---- - requirements.in | 2 +- - tern/analyze/common.py | 4 ++-- - 2 files changed, 3 insertions(+), 3 deletions(-) - -diff --git a/requirements.in b/requirements.in -index edd90ab..5135841 100644 ---- a/requirements.in -+++ b/requirements.in -@@ -12,6 +12,6 @@ requests - stevedore - pbr - dockerfile-parse --debut -+debian-inspector - regex - GitPython -diff --git a/tern/analyze/common.py b/tern/analyze/common.py -index 6962404..0f5e77d 100644 ---- a/tern/analyze/common.py -+++ b/tern/analyze/common.py -@@ -19,8 +19,8 @@ from tern.utils import cache - from tern.utils import constants - from tern.utils import general - from tern.utils import rootfs --from debut import debcon --from debut import copyright as debut_copyright -+from debian_inspector import debcon -+from debian_inspector import copyright as debut_copyright - - # global logger - logger = logging.getLogger(constants.logger_name) --- -2.31.1 - diff --git a/nixpkgs/pkgs/development/python-modules/tern/default.nix b/nixpkgs/pkgs/development/python-modules/tern/default.nix index e00e06561f02..0468ee6f84b1 100644 --- a/nixpkgs/pkgs/development/python-modules/tern/default.nix +++ b/nixpkgs/pkgs/development/python-modules/tern/default.nix @@ -13,6 +13,7 @@ , prettytable , idna }: + buildPythonPackage rec { pname = "tern"; version = "2.6.1"; @@ -22,14 +23,6 @@ buildPythonPackage rec { sha256 = "749c18ef493ebe3ac28624b2b26c6e38f77de2afd6a6579d2c92393d8fbdbd46"; }; - patches = [ - # debut was renamed to debian-inspector - # https://github.com/tern-tools/tern/pull/962 - # NOTE: Has to be in-tree because the upstream patch doesn't apply cleanly - # to the PyPi source. - ./0001-Replace-debut-with-debian-inspector.patch - ]; - preBuild = '' cp requirements.{in,txt} ''; diff --git a/nixpkgs/pkgs/development/python-modules/textfsm/default.nix b/nixpkgs/pkgs/development/python-modules/textfsm/default.nix index 04bc47913d8f..fed2f7c3e3fe 100644 --- a/nixpkgs/pkgs/development/python-modules/textfsm/default.nix +++ b/nixpkgs/pkgs/development/python-modules/textfsm/default.nix @@ -9,26 +9,25 @@ buildPythonPackage rec { pname = "textfsm"; - version = "1.1.1"; + version = "1.1.2"; + format = "setuptools"; + src = fetchFromGitHub { owner = "google"; repo = pname; rev = "v${version}"; - sha256 = "0fq2hphd89hns11nh0yifcp6brg6yy4n4hbvfk6avbjd7s40789a"; + sha256 = "1cbczg3h2841v1xk2s2xg540c69vsrkwxljm758fyr65kshrzlhm"; }; - patches = [ - (fetchpatch { - # remove pytest-runner dependency - url = "https://github.com/google/textfsm/commit/212db75fea4a79aca0f8f85a78954ffbc5667096.patch"; - sha256 = "0n6qh3sz9wy5gdpq9jjxx8firis48ypr20yacs5bqri59sziwjp0"; - }) + propagatedBuildInputs = [ + six + future ]; - propagatedBuildInputs = [ six future ]; - - checkInputs = [ pytestCheckHook ]; + checkInputs = [ + pytestCheckHook + ]; meta = with lib; { description = "Python module for parsing semi-structured text into python tables"; diff --git a/nixpkgs/pkgs/development/python-modules/token-bucket/default.nix b/nixpkgs/pkgs/development/python-modules/token-bucket/default.nix index ac614d53fd5a..f1e90114ac6d 100644 --- a/nixpkgs/pkgs/development/python-modules/token-bucket/default.nix +++ b/nixpkgs/pkgs/development/python-modules/token-bucket/default.nix @@ -7,14 +7,14 @@ buildPythonPackage rec { pname = "token-bucket"; - version = "0.2.0"; + version = "0.3.0"; format = "setuptools"; src = fetchFromGitHub { owner = "falconry"; repo = pname; rev = version; - sha256 = "0kv8j2ab4knvzik2di66bgjwjxdslm2i0hjy35kn9z0dazni585s"; + sha256 = "0a703y2d09kvv2l9vq7vc97l4pi2wwq1f2hq783mbw2238jymb3m"; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/transitions/default.nix b/nixpkgs/pkgs/development/python-modules/transitions/default.nix index c469875728cd..752cd8fb4d55 100644 --- a/nixpkgs/pkgs/development/python-modules/transitions/default.nix +++ b/nixpkgs/pkgs/development/python-modules/transitions/default.nix @@ -33,6 +33,7 @@ buildPythonPackage rec { preCheck = '' export FONTCONFIG_FILE=${fontconfig.out}/etc/fonts/fonts.conf + export HOME=$TMPDIR ''; meta = with lib; { diff --git a/nixpkgs/pkgs/development/python-modules/trytond/default.nix b/nixpkgs/pkgs/development/python-modules/trytond/default.nix index f0cb79b0a8bb..d5ddf8f58802 100644 --- a/nixpkgs/pkgs/development/python-modules/trytond/default.nix +++ b/nixpkgs/pkgs/development/python-modules/trytond/default.nix @@ -6,7 +6,7 @@ , lxml , relatorio , genshi -, dateutil +, python-dateutil , polib , python-sql , werkzeug @@ -41,7 +41,7 @@ buildPythonApplication rec { lxml relatorio genshi - dateutil + python-dateutil polib python-sql werkzeug diff --git a/nixpkgs/pkgs/development/python-modules/tvnamer/default.nix b/nixpkgs/pkgs/development/python-modules/tvnamer/default.nix deleted file mode 100644 index a9439d3e8878..000000000000 --- a/nixpkgs/pkgs/development/python-modules/tvnamer/default.nix +++ /dev/null @@ -1,30 +0,0 @@ -{ lib -, buildPythonPackage -, fetchPypi -, pytest -, tvdb_api -}: - -buildPythonPackage rec { - pname = "tvnamer"; - version = "3.0.4"; - - src = fetchPypi { - inherit pname version; - sha256 = "dc2ea8188df6ac56439343630466b874c57756dd0b2538dd8e7905048f425f04"; - }; - - checkInputs = [ pytest ]; - propagatedBuildInputs = [ tvdb_api ]; - - # a ton of tests fail with: IOError: tvnamer/main.py could not be found in . or .. - doCheck = false; - - meta = with lib; { - description = "Automatic TV episode file renamer, uses data from thetvdb.com via tvdb_api."; - homepage = "https://github.com/dbr/tvnamer"; - license = licenses.unlicense; - maintainers = with maintainers; [ peterhoeg ]; - }; - -} diff --git a/nixpkgs/pkgs/development/python-modules/twitterapi/default.nix b/nixpkgs/pkgs/development/python-modules/twitterapi/default.nix index b45218219c53..166e42ced821 100644 --- a/nixpkgs/pkgs/development/python-modules/twitterapi/default.nix +++ b/nixpkgs/pkgs/development/python-modules/twitterapi/default.nix @@ -7,13 +7,13 @@ buildPythonPackage rec { pname = "twitterapi"; - version = "2.7.3"; + version = "2.7.4"; src = fetchFromGitHub { owner = "geduldig"; repo = "TwitterAPI"; rev = "v${version}"; - sha256 = "sha256-82TOVrC7wX7E9lKsx3iGxaEEjHSzf5uZwePBvAw3hDk="; + sha256 = "sha256-HDPRpM1LDTtUbldzfCrsdh/GpbzNCVVUVGwohyMe/YE="; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/types-decorator/default.nix b/nixpkgs/pkgs/development/python-modules/types-decorator/default.nix new file mode 100644 index 000000000000..54f531e0f52f --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/types-decorator/default.nix @@ -0,0 +1,26 @@ +{ lib +, buildPythonPackage +, fetchPypi +}: + +buildPythonPackage rec { + pname = "types-decorator"; + version = "0.1.5"; + + src = fetchPypi { + inherit pname version; + sha256 = "0rfg2s4y23w1xk0502sg2jqbzswalkg6infblyzgf94i4bsg1j48"; + }; + + # Modules doesn't have tests + doCheck = false; + + pythonImportsCheck = [ "decorator-stubs" ]; + + meta = with lib; { + description = "Typing stubs for decorator"; + homepage = "https://github.com/python/typeshed"; + license = licenses.asl20; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/types-requests/default.nix b/nixpkgs/pkgs/development/python-modules/types-requests/default.nix new file mode 100644 index 000000000000..0450da3f1a71 --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/types-requests/default.nix @@ -0,0 +1,26 @@ +{ lib +, buildPythonPackage +, fetchPypi +}: + +buildPythonPackage rec { + pname = "types-requests"; + version = "2.25.0"; + + src = fetchPypi { + inherit pname version; + sha256 = "022q31fgiyq6zfjv4pbpg10hh9m7x91wqfc6bdyin50hf980q3gf"; + }; + + # Modules doesn't have tests + doCheck = false; + + pythonImportsCheck = [ "requests-stubs" ]; + + meta = with lib; { + description = "Typing stubs for requests"; + homepage = "https://github.com/python/typeshed"; + license = licenses.asl20; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/uranium/default.nix b/nixpkgs/pkgs/development/python-modules/uranium/default.nix index db8c8c8bd23b..a8ce6713f2c0 100644 --- a/nixpkgs/pkgs/development/python-modules/uranium/default.nix +++ b/nixpkgs/pkgs/development/python-modules/uranium/default.nix @@ -2,7 +2,7 @@ , pyqt5, numpy, scipy, shapely, libarcus, cryptography, doxygen, gettext, pythonOlder }: buildPythonPackage rec { - version = "4.9.0"; + version = "4.10.0"; pname = "uranium"; format = "other"; @@ -10,7 +10,7 @@ buildPythonPackage rec { owner = "Ultimaker"; repo = "Uranium"; rev = version; - sha256 = "0bqrc4g4pd7b209swlv06bm5sx7df96h9kjpqpra4mfz469km4nn"; + sha256 = "0bxbkqc4ajs52vmalmhvvqvl1aw2ss6yf7nclwx8nc2g5vchd4ng"; }; disabled = pythonOlder "3.5.0"; diff --git a/nixpkgs/pkgs/development/python-modules/urllib3/2.nix b/nixpkgs/pkgs/development/python-modules/urllib3/2.nix index 3fc90fe5d821..f1eea4c31d8d 100644 --- a/nixpkgs/pkgs/development/python-modules/urllib3/2.nix +++ b/nixpkgs/pkgs/development/python-modules/urllib3/2.nix @@ -3,7 +3,7 @@ , buildPythonPackage , certifi , cryptography -, dateutil +, python-dateutil , fetchpatch , fetchPypi , idna @@ -45,7 +45,7 @@ buildPythonPackage rec { ]; checkInputs = [ - dateutil + python-dateutil mock pytest-freezegun pytest-timeout diff --git a/nixpkgs/pkgs/development/python-modules/urllib3/default.nix b/nixpkgs/pkgs/development/python-modules/urllib3/default.nix index eec8e284c0eb..6d73357e3bc2 100644 --- a/nixpkgs/pkgs/development/python-modules/urllib3/default.nix +++ b/nixpkgs/pkgs/development/python-modules/urllib3/default.nix @@ -2,7 +2,7 @@ , brotli , buildPythonPackage , cryptography -, dateutil +, python-dateutil , fetchPypi , idna , isPy27 @@ -36,7 +36,7 @@ buildPythonPackage rec { ]; checkInputs = [ - dateutil + python-dateutil mock pytest-freezegun pytest-timeout diff --git a/nixpkgs/pkgs/development/python-modules/vertica-python/default.nix b/nixpkgs/pkgs/development/python-modules/vertica-python/default.nix index 823d2820e1bd..dc1223419249 100644 --- a/nixpkgs/pkgs/development/python-modules/vertica-python/default.nix +++ b/nixpkgs/pkgs/development/python-modules/vertica-python/default.nix @@ -1,4 +1,4 @@ -{ lib, buildPythonPackage, fetchPypi, future, dateutil, six, pytest, mock, parameterized }: +{ lib, buildPythonPackage, fetchPypi, future, python-dateutil, six, pytest, mock, parameterized }: buildPythonPackage rec { pname = "vertica-python"; @@ -9,7 +9,7 @@ buildPythonPackage rec { sha256 = "94cff37e03f89fc4c5e4b2d4c913c7d5d7450f5a205d14f709b39e0a4202be95"; }; - propagatedBuildInputs = [ future dateutil six ]; + propagatedBuildInputs = [ future python-dateutil six ]; checkInputs = [ pytest mock parameterized ]; diff --git a/nixpkgs/pkgs/development/python-modules/vobject/default.nix b/nixpkgs/pkgs/development/python-modules/vobject/default.nix index 1bb87d9d1222..30f84150283c 100644 --- a/nixpkgs/pkgs/development/python-modules/vobject/default.nix +++ b/nixpkgs/pkgs/development/python-modules/vobject/default.nix @@ -1,4 +1,4 @@ -{ lib, buildPythonPackage, fetchPypi, isPyPy, python, dateutil }: +{ lib, buildPythonPackage, fetchPypi, isPyPy, python, python-dateutil }: buildPythonPackage rec { version = "0.9.6.1"; @@ -11,7 +11,7 @@ buildPythonPackage rec { disabled = isPyPy; - propagatedBuildInputs = [ dateutil ]; + propagatedBuildInputs = [ python-dateutil ]; checkPhase = "${python.interpreter} tests.py"; diff --git a/nixpkgs/pkgs/development/python-modules/webdavclient3/default.nix b/nixpkgs/pkgs/development/python-modules/webdavclient3/default.nix index eb13cd6b9bbf..fc63c1913d00 100644 --- a/nixpkgs/pkgs/development/python-modules/webdavclient3/default.nix +++ b/nixpkgs/pkgs/development/python-modules/webdavclient3/default.nix @@ -1,4 +1,4 @@ -{ buildPythonPackage, fetchPypi, isPy27, lib, dateutil, lxml, requests +{ buildPythonPackage, fetchPypi, isPy27, lib, python-dateutil, lxml, requests , pytestCheckHook }: buildPythonPackage rec { @@ -12,7 +12,7 @@ buildPythonPackage rec { sha256 = "0yw3n5m70ysjn1ch48znpn4zr4a1bd0lsm7q2grqz7q5hfjzjwk0"; }; - propagatedBuildInputs = [ dateutil lxml requests ]; + propagatedBuildInputs = [ python-dateutil lxml requests ]; checkInputs = [ pytestCheckHook ]; diff --git a/nixpkgs/pkgs/development/python-modules/weboob/default.nix b/nixpkgs/pkgs/development/python-modules/weboob/default.nix index 3ce15a3fdcea..b1afa242107e 100644 --- a/nixpkgs/pkgs/development/python-modules/weboob/default.nix +++ b/nixpkgs/pkgs/development/python-modules/weboob/default.nix @@ -1,7 +1,7 @@ { lib, buildPythonPackage, fetchPypi, isPy27 , Babel , cssselect -, dateutil +, python-dateutil , feedparser , futures ? null , gdata @@ -52,7 +52,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ Babel cssselect - dateutil + python-dateutil feedparser gdata gnupg diff --git a/nixpkgs/pkgs/development/python-modules/woob/default.nix b/nixpkgs/pkgs/development/python-modules/woob/default.nix index 4794843a66d8..fc5e6e9dc65b 100644 --- a/nixpkgs/pkgs/development/python-modules/woob/default.nix +++ b/nixpkgs/pkgs/development/python-modules/woob/default.nix @@ -5,7 +5,7 @@ , Babel , colorama , cssselect -, dateutil +, python-dateutil , feedparser , gdata , gnupg @@ -49,7 +49,7 @@ buildPythonPackage rec { Babel colorama cssselect - dateutil + python-dateutil feedparser gdata gnupg diff --git a/nixpkgs/pkgs/development/python-modules/xknx/default.nix b/nixpkgs/pkgs/development/python-modules/xknx/default.nix index 0a8da94e52eb..6dd624d597fa 100644 --- a/nixpkgs/pkgs/development/python-modules/xknx/default.nix +++ b/nixpkgs/pkgs/development/python-modules/xknx/default.nix @@ -11,14 +11,14 @@ buildPythonPackage rec { pname = "xknx"; - version = "0.18.7"; + version = "0.18.8"; disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "XKNX"; repo = pname; rev = version; - sha256 = "17w6a4ci4w6ggxpa99197f84awd116ygzd3fa5cvn1a7221dvdj4"; + sha256 = "sha256-Y+SHZd/E72eR7gANqHHutZt1a4G4R1oHC8uV0hpJ/J0="; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/youtube-search/default.nix b/nixpkgs/pkgs/development/python-modules/youtube-search/default.nix index 41424aa56d2e..439cc31c8c99 100644 --- a/nixpkgs/pkgs/development/python-modules/youtube-search/default.nix +++ b/nixpkgs/pkgs/development/python-modules/youtube-search/default.nix @@ -1,20 +1,19 @@ -{ lib, buildPythonPackage, fetchFromGitHub, requests }: +{ lib, buildPythonPackage, fetchPypi, requests }: buildPythonPackage rec { pname = "youtube-search"; - version = "unstable-2021-02-27"; + version = "2.1.0"; - src = fetchFromGitHub { - owner = "joetats"; - repo = "youtube_search"; - rev = "886fe1b16c829215ee0984b6859f874b4a30d875"; - sha256 = "sha256-3ECJ6iHNzx5PLgpTFraFzAYbKnyMYRf/iJ0zajU+hlo="; + src = fetchPypi { + inherit pname version; + sha256 = "1541120273996fa433698b2e57b73296dfb8e90536211f29ea997dcf161b66fe"; }; propagatedBuildInputs = [ requests ]; - # Check disabled due to relative import with no known parent package + # tests require network connection doCheck = false; + pythonImportsCheck = [ "youtube_search" ]; meta = with lib; { diff --git a/nixpkgs/pkgs/development/python-modules/ytmusicapi/default.nix b/nixpkgs/pkgs/development/python-modules/ytmusicapi/default.nix index daba39eb224d..6ec5fda2ca58 100644 --- a/nixpkgs/pkgs/development/python-modules/ytmusicapi/default.nix +++ b/nixpkgs/pkgs/development/python-modules/ytmusicapi/default.nix @@ -7,13 +7,13 @@ buildPythonPackage rec { pname = "ytmusicapi"; - version = "0.17.3"; + version = "0.18.0"; disabled = isPy27; src = fetchPypi { inherit pname version; - sha256 = "sha256-miScxT79ZAgDT0AamkN1JyqbM56Otk86LnE6HM0G1Vs="; + sha256 = "sha256-RH0ballPSZQvesdUEsulnBkbbzVA2YrGWhMzRFvuwW0="; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/zha-quirks/default.nix b/nixpkgs/pkgs/development/python-modules/zha-quirks/default.nix index 34335c65e1a1..37fbc87f3f79 100644 --- a/nixpkgs/pkgs/development/python-modules/zha-quirks/default.nix +++ b/nixpkgs/pkgs/development/python-modules/zha-quirks/default.nix @@ -9,13 +9,13 @@ buildPythonPackage rec { pname = "zha-quirks"; - version = "0.0.57"; + version = "0.0.58"; src = fetchFromGitHub { owner = "zigpy"; repo = "zha-device-handlers"; rev = version; - sha256 = "sha256-ajdluj6UIzjJUK30GtoM+e5lsMQRKnn3FPNEg+RS/DM="; + sha256 = "sha256-QU5ssbnT3/gioQ3vM9zvlbwxqSWyKIylsV9NuFkNe+Q="; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/zwave-js-server-python/default.nix b/nixpkgs/pkgs/development/python-modules/zwave-js-server-python/default.nix index 2976c5e24bad..778f9c448ed5 100644 --- a/nixpkgs/pkgs/development/python-modules/zwave-js-server-python/default.nix +++ b/nixpkgs/pkgs/development/python-modules/zwave-js-server-python/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "zwave-js-server-python"; - version = "0.26.1"; + version = "0.27.0"; disabled = pythonOlder "3.8"; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "home-assistant-libs"; repo = pname; rev = version; - sha256 = "1rh6wim5hr9lygvgria7lr6x61sdyrv3drrrirgv9p9gl3rxcj6m"; + sha256 = "sha256-ClZ9B20NphN5XewqEtHpUMNHuuVxs1RJBcxWi6TzT1Y="; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/r-modules/default.nix b/nixpkgs/pkgs/development/r-modules/default.nix index c4fb1f25304d..6e04e60bfb5c 100644 --- a/nixpkgs/pkgs/development/r-modules/default.nix +++ b/nixpkgs/pkgs/development/r-modules/default.nix @@ -345,6 +345,7 @@ let stsm = [ pkgs.gsl_1 ]; stringi = [ pkgs.icu.dev ]; survSNP = [ pkgs.gsl_1 ]; + svglite = [ pkgs.libpng.dev ]; sysfonts = [ pkgs.zlib pkgs.libpng pkgs.freetype.dev ]; systemfonts = [ pkgs.fontconfig.dev pkgs.freetype.dev ]; TAQMNGR = [ pkgs.zlib.dev ]; diff --git a/nixpkgs/pkgs/development/ruby-modules/bundler/default.nix b/nixpkgs/pkgs/development/ruby-modules/bundler/default.nix index fc2733de3f00..912bace20201 100644 --- a/nixpkgs/pkgs/development/ruby-modules/bundler/default.nix +++ b/nixpkgs/pkgs/development/ruby-modules/bundler/default.nix @@ -4,8 +4,8 @@ buildRubyGem rec { inherit ruby; name = "${gemName}-${version}"; gemName = "bundler"; - version = "2.1.4"; - source.sha256 = "12glbb1357x91fvd004jgkw7ihlkpc9dwr349pd7j83isqhls0ah"; + version = "2.2.20"; + source.sha256 = "259ba486173d72a71df43fee8e3bc8dcb868c8a65e0c4020af3a6f13c3a57ff8"; dontPatchShebangs = true; postFixup = '' diff --git a/nixpkgs/pkgs/development/scheme-modules/scheme-bytestructures/default.nix b/nixpkgs/pkgs/development/scheme-modules/scheme-bytestructures/default.nix index 67d9e39af62c..5be2fca96fbe 100644 --- a/nixpkgs/pkgs/development/scheme-modules/scheme-bytestructures/default.nix +++ b/nixpkgs/pkgs/development/scheme-modules/scheme-bytestructures/default.nix @@ -34,6 +34,6 @@ stdenv.mkDerivation rec { homepage = "https://github.com/TaylanUB/scheme-bytestructures"; license = licenses.gpl3Plus; maintainers = with maintainers; [ ethancedwards8 ]; - platforms = platforms.linux; + platforms = platforms.unix; }; } diff --git a/nixpkgs/pkgs/development/tools/analysis/cargo-tarpaulin/default.nix b/nixpkgs/pkgs/development/tools/analysis/cargo-tarpaulin/default.nix index 66f2db280685..ebbfa619fed3 100644 --- a/nixpkgs/pkgs/development/tools/analysis/cargo-tarpaulin/default.nix +++ b/nixpkgs/pkgs/development/tools/analysis/cargo-tarpaulin/default.nix @@ -2,13 +2,13 @@ rustPlatform.buildRustPackage rec { pname = "cargo-tarpaulin"; - version = "0.17.0"; + version = "0.18.0"; src = fetchFromGitHub { owner = "xd009642"; repo = "tarpaulin"; rev = version; - sha256 = "1z104cd3wg718x1d89znppx4h6f0c6icgmpcllyrd0d19lb71a2b"; + sha256 = "sha256-j5VLxtu8Xg1fwDYWYJXGFUkfpgauG/5NauSniSZ7G2w="; }; nativeBuildInputs = [ @@ -16,7 +16,7 @@ rustPlatform.buildRustPackage rec { ]; buildInputs = [ openssl ]; - cargoSha256 = "1hpi9aifn3g19yqkb58lphyw8cbsqllhg5dzbqx15hcfvrb7ip4k"; + cargoSha256 = "sha256-1lFGczzcN4QPsIpEVQiSmNS7L+9rlSfxi+gopt2E7Ec="; #checkFlags = [ "--test-threads" "1" ]; doCheck = false; diff --git a/nixpkgs/pkgs/development/tools/analysis/codeql/default.nix b/nixpkgs/pkgs/development/tools/analysis/codeql/default.nix index 25d61d2393e5..df3c42b4718f 100644 --- a/nixpkgs/pkgs/development/tools/analysis/codeql/default.nix +++ b/nixpkgs/pkgs/development/tools/analysis/codeql/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { pname = "codeql"; - version = "2.5.5"; + version = "2.5.7"; dontConfigure = true; dontBuild = true; @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { src = fetchzip { url = "https://github.com/github/codeql-cli-binaries/releases/download/v${version}/codeql.zip"; - sha256 = "sha256-M5O2NEGIVPWYKl11yxMMVreEtDO1VqcMkiGGrjNmk3A="; + sha256 = "sha256-dKJQv/omXT/L5dWYkveXodNNt5Q3i1WDIA9nwmo0Sfc="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/development/tools/analysis/cppcheck/default.nix b/nixpkgs/pkgs/development/tools/analysis/cppcheck/default.nix index 600d0efc92ee..5e7f6a3f2d56 100644 --- a/nixpkgs/pkgs/development/tools/analysis/cppcheck/default.nix +++ b/nixpkgs/pkgs/development/tools/analysis/cppcheck/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "cppcheck"; - version = "2.4"; + version = "2.5"; src = fetchurl { url = "mirror://sourceforge/${pname}/${pname}-${version}.tar.bz2"; - sha256 = "sha256-mGJPqOmz1/siAVkwDP5WXFvx3TtD5KT/klciqnaEoCo="; + sha256 = "sha256-s+KJpA11A4bFOXgy2eVkRMYBFwwBjU7QZgSPZ0oVKxo="; }; buildInputs = [ pcre ] ++ lib.optionals withZ3 [ z3 ]; diff --git a/nixpkgs/pkgs/development/tools/analysis/rr/unstable.nix b/nixpkgs/pkgs/development/tools/analysis/rr/unstable.nix index 82b644f76ae6..35098c1bcfc8 100644 --- a/nixpkgs/pkgs/development/tools/analysis/rr/unstable.nix +++ b/nixpkgs/pkgs/development/tools/analysis/rr/unstable.nix @@ -1,9 +1,8 @@ -# This is a temporary copy of the default.nix in this folder, with the version updated to the current tip of rr's master branch. -# This exists because rr has not had a release in a long time, but there have been a lot of improvements including UX. -# Some of the UX improvements help prevent foot shooting. -# Upstream has stated that it should be fine to use master. -# This file, and its attribute in all-packages, can be removed once rr makes a release. -# For further information, please see https://github.com/NixOS/nixpkgs/issues/99535 "Improve support for the rr debugger in nixos containers" +# This is a temporary copy of the default.nix in this folder, with the version +# updated to the current tip of rr's master branch. This exists because rr has +# not had a release in a long time. Upstream has stated that it should be fine +# to use master. This file, and its attribute in all-packages, can be removed +# once rr makes a release. { callPackage, fetchFromGitHub }: @@ -12,12 +11,12 @@ let in rr.overrideAttrs (old: { - version = "unstable-2020-10-04"; + version = "unstable-2021-07-06"; src = fetchFromGitHub { owner = "mozilla"; repo = "rr"; - rev = "9ff375813a740a0a6ebcdfcebc58bd61ab68c667"; - sha256 = "0raifs6cg5ckpi2445inhy3hfhp4p89s1lkx9z17mcc2g1c1phf5"; + rev = "0fc21a8d654dabc7fb1991d76343824cb7951ea0"; + sha256 = "0s851rflxmvxcfw97zmplcwzhv86xmd3my78pi4c7gkj18d621i5"; }; }) diff --git a/nixpkgs/pkgs/development/tools/analysis/smatch/default.nix b/nixpkgs/pkgs/development/tools/analysis/smatch/default.nix index 4330ec3d7426..2780c8552fc0 100644 --- a/nixpkgs/pkgs/development/tools/analysis/smatch/default.nix +++ b/nixpkgs/pkgs/development/tools/analysis/smatch/default.nix @@ -1,14 +1,12 @@ { lib, stdenv, fetchgit, sqlite, pkg-config, perl , buildllvmsparse ? true , buildc2xml ? true -, llvm ? null, libxml2 ? null +, llvm, libxml2 }: -assert buildllvmsparse -> llvm != null; -assert buildc2xml -> libxml2 != null; - stdenv.mkDerivation { - name = "smatch-20120924"; + pname = "smatch"; + version = "20120924"; src = fetchgit { url = "git://repo.or.cz/smatch.git"; @@ -17,19 +15,20 @@ stdenv.mkDerivation { }; nativeBuildInputs = [ pkg-config ]; - buildInputs = [sqlite perl] + buildInputs = [ sqlite perl ] ++ lib.optional buildllvmsparse llvm ++ lib.optional buildc2xml libxml2; - preBuild = - '' sed -i Makefile \ - -e "s|^PREFIX=.*|PREFIX = $out|g" - ''; + preBuild = '' + sed -i Makefile \ + -e "s|^PREFIX=.*|PREFIX = $out|g" + ''; - meta = { + meta = with lib; { description = "A semantic analysis tool for C"; homepage = "http://smatch.sourceforge.net/"; - license = lib.licenses.free; /* OSL, see http://www.opensource.org */ - platforms = lib.platforms.linux; + maintainers = with maintainers; []; + license = licenses.free; /* OSL, see http://www.opensource.org */ + platforms = platforms.linux; }; } diff --git a/nixpkgs/pkgs/development/tools/analysis/tflint/default.nix b/nixpkgs/pkgs/development/tools/analysis/tflint/default.nix index 9666bf006d72..a5798c6ad560 100644 --- a/nixpkgs/pkgs/development/tools/analysis/tflint/default.nix +++ b/nixpkgs/pkgs/development/tools/analysis/tflint/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "tflint"; - version = "0.29.1"; + version = "0.30.0"; src = fetchFromGitHub { owner = "terraform-linters"; repo = pname; rev = "v${version}"; - sha256 = "1pkz8y3da7i4a3nm79a0640xjj4wfkx3dz6614c4hynqn5svji82"; + sha256 = "0xdn8xakywms8gcacmjvx0ivv37i3vj1d41c8sjlnf1s13q3zv7k"; }; - vendorSha256 = "0k8v49sr0jmljfl4fa5pnvzd5k3pg865h201114l6cs257sdkczk"; + vendorSha256 = "18w0wz3raysba99cxcc8pk4md9j438g4y2d2v2pk2l6qri9apscw"; doCheck = false; diff --git a/nixpkgs/pkgs/development/tools/analysis/tfsec/default.nix b/nixpkgs/pkgs/development/tools/analysis/tfsec/default.nix index 246f42b63999..da0e0554bf70 100644 --- a/nixpkgs/pkgs/development/tools/analysis/tfsec/default.nix +++ b/nixpkgs/pkgs/development/tools/analysis/tfsec/default.nix @@ -2,23 +2,27 @@ buildGoPackage rec { pname = "tfsec"; - version = "0.39.16"; + version = "0.41.0"; src = fetchFromGitHub { owner = "tfsec"; repo = pname; rev = "v${version}"; - sha256 = "sha256-5We3Nk/AU5dj37vG4pvqzvNztK01PAPadQV/CgHZe8w="; + sha256 = "sha256-MK5cWRPGty7S4pkRZJRZF5qitoPM3im8JJW2J3yQqFo="; }; goPackagePath = "github.com/tfsec/tfsec"; - buildFlagsArray = [ "-ldflags=-s -w -X ${goPackagePath}/version.Version=${version}" ]; + ldflags = [ + "-w" + "-s" + "-X ${goPackagePath}/version.Version=${version}" + ]; meta = with lib; { homepage = "https://github.com/tfsec/tfsec"; description = "Static analysis powered security scanner for your terraform code"; license = licenses.mit; - maintainers = [ maintainers.marsam ]; + maintainers = with maintainers; [ marsam ]; }; } diff --git a/nixpkgs/pkgs/development/tools/apksigcopier/default.nix b/nixpkgs/pkgs/development/tools/apksigcopier/default.nix new file mode 100644 index 000000000000..972de479ee78 --- /dev/null +++ b/nixpkgs/pkgs/development/tools/apksigcopier/default.nix @@ -0,0 +1,61 @@ +{ lib +, fetchFromGitHub +, python3 +, installShellFiles +, bash +, pandoc +}: + +# FIXME: how to "recommend" apksigner like the Debian package? + +python3.pkgs.buildPythonApplication rec { + pname = "apksigcopier"; + version = "1.0.0"; + + src = fetchFromGitHub { + owner = "obfusk"; + repo = "apksigcopier"; + rev = "v${version}"; + sha256 = "1la1ml91jvqc1zakbqfpayjbs67pi3i18bsgz3mf11rxgphd3fpk"; + }; + + nativeBuildInputs = [ installShellFiles pandoc ]; + propagatedBuildInputs = with python3.pkgs; [ click ]; + checkInputs = with python3.pkgs; [ flake8 mypy pylint ]; + + postPatch = '' + substituteInPlace Makefile \ + --replace /bin/bash ${bash}/bin/bash \ + --replace 'apksigcopier --version' '${python3.interpreter} apksigcopier --version' + ''; + + postBuild = '' + make ${pname}.1 + ''; + + checkPhase = '' + make test + ''; + + postInstall = '' + installManPage ${pname}.1 + ''; + + meta = with lib; { + description = "Copy/extract/patch apk signatures & compare apks"; + longDescription = '' + apksigcopier is a tool for copying APK signatures from a signed APK + to an unsigned one (in order to verify reproducible builds). It can + also be used to compare two APKs with different signatures. Its + command-line tool offers four operations: + + * copy signatures directly from a signed to an unsigned APK + * extract signatures from a signed APK to a directory + * patch previously extracted signatures onto an unsigned APK + * compare two APKs with different signatures (requires apksigner) + ''; + homepage = "https://github.com/obfusk/apksigcopier"; + license = with licenses; [ gpl3Plus ]; + maintainers = [ maintainers.obfusk ]; + }; +} diff --git a/nixpkgs/pkgs/development/tools/build-managers/bmake/default.nix b/nixpkgs/pkgs/development/tools/build-managers/bmake/default.nix index a93de053c446..0d8ca351096c 100644 --- a/nixpkgs/pkgs/development/tools/build-managers/bmake/default.nix +++ b/nixpkgs/pkgs/development/tools/build-managers/bmake/default.nix @@ -1,21 +1,25 @@ { lib, stdenv, fetchurl, fetchpatch -, getopt, tzdata +, getopt, tzdata, ksh +, pkgsMusl # for passthru.tests }: stdenv.mkDerivation rec { pname = "bmake"; - version = "20210420"; + version = "20210621"; src = fetchurl { url = "http://www.crufty.net/ftp/pub/sjg/${pname}-${version}.tar.gz"; - sha256 = "1ajq8v5rq3pl5y9h1hlscs83007fsyk3lhcp87z09ma370lm3ra7"; + sha256 = "0gpzv75ibzqz1j1h0hdjgx1v7hkl3i5cb5yf6q9sfcgx0bvb55xa"; }; # Make tests work with musl # * Disable deptgt-delete_on_error test (alpine does this too) + # * Disable shell-ksh test (ksh doesn't compile with musl) # * Fix test failing due to different strerror(3) output for musl and glibc postPatch = lib.optionalString (stdenv.hostPlatform.libc == "musl") '' - sed -i unit-tests/Makefile -e '/deptgt-delete_on_error/d' + sed -i unit-tests/Makefile \ + -e '/deptgt-delete_on_error/d' \ + -e '/shell-ksh/d' substituteInPlace unit-tests/opt-chdir.exp --replace "File name" "Filename" ''; @@ -28,6 +32,8 @@ stdenv.mkDerivation rec { ./fix-unexport-env-test.patch # Fix localtime tests without global /etc/zoneinfo directory ./fix-localtime-test.patch + # Always enable ksh test since it checks in a impure location /bin/ksh + ./unconditional-ksh-test.patch # decouple tests from build phase (fetchpatch { name = "separate-tests.patch"; @@ -68,7 +74,11 @@ stdenv.mkDerivation rec { ''; doCheck = true; - checkInputs = [ tzdata ]; + checkInputs = [ + tzdata + ] ++ lib.optionals (stdenv.hostPlatform.libc != "musl") [ + ksh + ]; checkPhase = '' runHook preCheck @@ -79,6 +89,10 @@ stdenv.mkDerivation rec { setupHook = ./setup-hook.sh; + passthru.tests = { + bmakeMusl = pkgsMusl.bmake; + }; + meta = with lib; { description = "Portable version of NetBSD 'make'"; homepage = "http://www.crufty.net/help/sjg/bmake.html"; diff --git a/nixpkgs/pkgs/development/tools/build-managers/bmake/unconditional-ksh-test.patch b/nixpkgs/pkgs/development/tools/build-managers/bmake/unconditional-ksh-test.patch new file mode 100644 index 000000000000..117b85da16d1 --- /dev/null +++ b/nixpkgs/pkgs/development/tools/build-managers/bmake/unconditional-ksh-test.patch @@ -0,0 +1,12 @@ +--- bmake/unit-tests/Makefile.orig 2021-07-04 19:13:09.068094922 +0200 ++++ bmake/unit-tests/Makefile 2021-07-04 19:13:14.630080696 +0200 +@@ -295,9 +295,7 @@ + TESTS+= sh-single-line + TESTS+= shell-csh + TESTS+= shell-custom +-.if exists(/bin/ksh) + TESTS+= shell-ksh +-.endif + TESTS+= shell-sh + TESTS+= suff-add-later + TESTS+= suff-clear-regular diff --git a/nixpkgs/pkgs/development/tools/build-managers/boot/default.nix b/nixpkgs/pkgs/development/tools/build-managers/boot/default.nix index 68a4d5f44eaa..1590906206c1 100644 --- a/nixpkgs/pkgs/development/tools/build-managers/boot/default.nix +++ b/nixpkgs/pkgs/development/tools/build-managers/boot/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Build tooling for Clojure"; - homepage = "https://boot-clj.com/"; + homepage = "https://boot-clj.github.io/"; license = licenses.epl10; platforms = platforms.linux ++ platforms.darwin; maintainers = with maintainers; [ ragge ]; diff --git a/nixpkgs/pkgs/development/tools/build-managers/conan/default.nix b/nixpkgs/pkgs/development/tools/build-managers/conan/default.nix index 9c3e99e23ad6..f59e74b02f4e 100644 --- a/nixpkgs/pkgs/development/tools/build-managers/conan/default.nix +++ b/nixpkgs/pkgs/development/tools/build-managers/conan/default.nix @@ -39,6 +39,22 @@ let newPython = python3.override { "test_ec_verify_should_return_false_if_signature_invalid" ]; }); + # conan needs jinja2<3 + jinja2 = super.jinja2.overridePythonAttrs (oldAttrs: rec { + version = "2.11.3"; + src = oldAttrs.src.override { + inherit version; + sha256 = "a6d58433de0ae800347cab1fa3043cebbabe8baa9d29e668f1c768cb87a333c6"; + }; + }); + # old jinja2 needs old markupsafe + markupsafe = super.markupsafe.overridePythonAttrs (oldAttrs: rec { + version = "1.1.1"; + src = oldAttrs.src.override { + inherit version; + sha256 = "29872e92839765e546828bb7754a68c418d927cd064fd4708fab9fe9c8bb116b"; + }; + }); }; }; @@ -56,7 +72,7 @@ in newPython.pkgs.buildPythonApplication rec { propagatedBuildInputs = with newPython.pkgs; [ bottle colorama - dateutil + python-dateutil deprecation distro fasteners @@ -92,7 +108,8 @@ in newPython.pkgs.buildPythonApplication rec { postPatch = '' substituteInPlace conans/requirements.txt \ - --replace "deprecation>=2.0, <2.1" "deprecation" + --replace "deprecation>=2.0, <2.1" "deprecation" \ + --replace "six>=1.10.0,<=1.15.0" "six>=1.10.0,<=1.16.0" ''; meta = with lib; { diff --git a/nixpkgs/pkgs/development/tools/build-managers/gradle/default.nix b/nixpkgs/pkgs/development/tools/build-managers/gradle/default.nix index 0013eb4e2e04..3afe88043dee 100644 --- a/nixpkgs/pkgs/development/tools/build-managers/gradle/default.nix +++ b/nixpkgs/pkgs/development/tools/build-managers/gradle/default.nix @@ -64,9 +64,9 @@ in rec { gradle_latest = gradle_7; gradle_7 = gradleGen (gradleSpec { - version = "7.0"; - nativeVersion = "0.22-milestone-11"; - sha256 = "01f3bjn8pbpni8kmxvx1dpwpf4zz04vj7cpm6025n0k188c8k2zb"; + version = "7.1"; + nativeVersion = "0.22-milestone-16"; + sha256 = "0yyqksq3zza7r9ls389ha81l3s768j7dfdqiwk3846qy4wcyxsrd"; }); gradle_6_8 = gradleGen (gradleSpec { diff --git a/nixpkgs/pkgs/development/tools/build-managers/mill/default.nix b/nixpkgs/pkgs/development/tools/build-managers/mill/default.nix index 4fbd0365af95..4682fab41db1 100644 --- a/nixpkgs/pkgs/development/tools/build-managers/mill/default.nix +++ b/nixpkgs/pkgs/development/tools/build-managers/mill/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "mill"; - version = "0.9.6"; + version = "0.9.8"; src = fetchurl { url = "https://github.com/com-lihaoyi/mill/releases/download/${version}/${version}"; - sha256 = "sha256-cAhcTmSPkV5z5ryuCNrpxy9/1iWvvminiVYul9c/DwM="; + sha256 = "sha256-vWCzjit7MPrKqEYgJfQHAkam9J9NgMObOQ/A+OQr24o="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/nixpkgs/pkgs/development/tools/build-managers/redo-c/Makefile b/nixpkgs/pkgs/development/tools/build-managers/redo-c/Makefile index f2c43cc5003c..5a1dd74c5b84 100644 --- a/nixpkgs/pkgs/development/tools/build-managers/redo-c/Makefile +++ b/nixpkgs/pkgs/development/tools/build-managers/redo-c/Makefile @@ -1,4 +1,4 @@ -CFLAGS=-Os +CFLAGS ?= -Os all: redo links diff --git a/nixpkgs/pkgs/development/tools/build-managers/redo-c/default.nix b/nixpkgs/pkgs/development/tools/build-managers/redo-c/default.nix index 40708b7877a9..14d33cba0395 100644 --- a/nixpkgs/pkgs/development/tools/build-managers/redo-c/default.nix +++ b/nixpkgs/pkgs/development/tools/build-managers/redo-c/default.nix @@ -1,13 +1,13 @@ { lib, stdenv, fetchFromGitHub }: stdenv.mkDerivation rec { pname = "redo-c"; - version = "0.2"; + version = "0.3"; src = fetchFromGitHub { owner = "leahneukirchen"; repo = pname; rev = "v${version}"; - sha256 = "11wc2sgw1ssdm83cjdc6ndnp1bv5mzhbw7njw47mk7ri1ic1x51b"; + sha256 = "sha256-oZcaBgESIaD7/SUBE7luh7axucKTEzXPVkQAQs2NCXE="; }; postPatch = '' diff --git a/nixpkgs/pkgs/development/tools/build-managers/rocm-cmake/default.nix b/nixpkgs/pkgs/development/tools/build-managers/rocm-cmake/default.nix index 16ea0dc28318..68cd3d449cad 100644 --- a/nixpkgs/pkgs/development/tools/build-managers/rocm-cmake/default.nix +++ b/nixpkgs/pkgs/development/tools/build-managers/rocm-cmake/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { description = "CMake modules for common build tasks for the ROCm stack"; homepage = "https://github.com/RadeonOpenCompute/rocm-cmake"; license = licenses.mit; - maintainers = with maintainers; [ danieldk ]; + maintainers = with maintainers; [ ]; platforms = platforms.unix; }; } diff --git a/nixpkgs/pkgs/development/tools/buildah/default.nix b/nixpkgs/pkgs/development/tools/buildah/default.nix index e3828eb7f14c..ba6f0bf652e3 100644 --- a/nixpkgs/pkgs/development/tools/buildah/default.nix +++ b/nixpkgs/pkgs/development/tools/buildah/default.nix @@ -14,13 +14,13 @@ buildGoModule rec { pname = "buildah"; - version = "1.21.1"; + version = "1.21.2"; src = fetchFromGitHub { owner = "containers"; repo = "buildah"; rev = "v${version}"; - sha256 = "sha256-Wes52lTcv3Jb6gJeUS6fmf4Nee3qEcc3SibaTFvQ8sQ="; + sha256 = "sha256-9AYFC10AYbt/qHj5hfuLRxUwibizKk4n9rgtd5RBEQg="; }; outputs = [ "out" "man" ]; diff --git a/nixpkgs/pkgs/development/tools/cloud-nuke/default.nix b/nixpkgs/pkgs/development/tools/cloud-nuke/default.nix index b947fc1ebfe2..75fb29db8827 100644 --- a/nixpkgs/pkgs/development/tools/cloud-nuke/default.nix +++ b/nixpkgs/pkgs/development/tools/cloud-nuke/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "cloud-nuke"; - version = "0.1.30"; + version = "0.3.0"; src = fetchFromGitHub { owner = "gruntwork-io"; repo = pname; rev = "v${version}"; - sha256 = "sha256-uQj14arxDPc8/k1Cvp3T6hqjln30NFk9MzvYy8tAiJ8="; + sha256 = "sha256-rxWTh+iltD1kcntlu9sovwG/mQPmukYbw8V2FAFi1KE="; }; - vendorSha256 = "sha256-pl3dLisu4Oc77kgfuteKbsZaDzrHo1wUigZEkM4081Q="; + vendorSha256 = "sha256-mfNbcnJ62v6tdEhOtA0P9lDoD5HmLBAtNcrv1H3/mSE="; buildFlagsArray = [ "-ldflags=-s -w -X main.VERSION=${version}" ]; diff --git a/nixpkgs/pkgs/development/tools/continuous-integration/drone-cli/default.nix b/nixpkgs/pkgs/development/tools/continuous-integration/drone-cli/default.nix index 6c9cffe41b20..245aeeb4351b 100644 --- a/nixpkgs/pkgs/development/tools/continuous-integration/drone-cli/default.nix +++ b/nixpkgs/pkgs/development/tools/continuous-integration/drone-cli/default.nix @@ -1,12 +1,12 @@ { lib, fetchFromGitHub, buildGoModule }: -let version = "1.2.4"; +let version = "1.3.0"; in buildGoModule rec { inherit version; pname = "drone-cli"; revision = "v${version}"; - vendorSha256 = "0v94rwxkbj85l3brbm792xf1rfs3vgnwpgjczwqip1gm159dpnd7"; + vendorSha256 = "sha256-I+UBa6gqkPRXNV72iyJcCBLYShZxMtHFHSK77mhDv+U="; doCheck = false; @@ -18,7 +18,7 @@ in buildGoModule rec { owner = "drone"; repo = "drone-cli"; rev = revision; - sha256 = "14sm5k2ifvr4g9369zqgb92vrr4rc0bxf5m52l3g8bd2s8fq8nx8"; + sha256 = "sha256-j6drDMxvAVfQ1aCFooc9g9HhMRMlFZXGZPiuJZKBbY4="; }; meta = with lib; { diff --git a/nixpkgs/pkgs/development/tools/continuous-integration/jenkins/default.nix b/nixpkgs/pkgs/development/tools/continuous-integration/jenkins/default.nix index 415b22894cbe..88156f815ab8 100644 --- a/nixpkgs/pkgs/development/tools/continuous-integration/jenkins/default.nix +++ b/nixpkgs/pkgs/development/tools/continuous-integration/jenkins/default.nix @@ -1,18 +1,28 @@ -{ lib, stdenv, fetchurl, common-updater-scripts, coreutils, git, gnused, nix -, nixfmt, writeScript, nixosTests, jq, cacert, curl }: +{ lib, stdenv, fetchurl, common-updater-scripts, coreutils, git, gnused, makeWrapper, nix +, nixfmt, openjdk, writeScript, nixosTests, jq, cacert, curl }: stdenv.mkDerivation rec { pname = "jenkins"; - version = "2.289.1"; + version = "2.289.2"; src = fetchurl { url = "http://mirrors.jenkins.io/war-stable/${version}/jenkins.war"; - sha256 = "1wkm1y2bj245b9i51vhns9qfxc6xm44hg60vhgmswndcy5pwrybh"; + sha256 = "0413ymfrb00ifxl8ww8nn8y4k07jhgsaxaw2h0qnfh9s6yxifpbf"; }; + nativeBuildInputs = [ makeWrapper ]; + buildCommand = '' - mkdir -p "$out/webapps" + mkdir -p "$out/bin" "$out/share" "$out/webapps" + cp "$src" "$out/webapps/jenkins.war" + + # Create the `jenkins-cli` command. + ${openjdk}/bin/jar -xf "$src" WEB-INF/lib/cli-${version}.jar \ + && mv WEB-INF/lib/cli-${version}.jar "$out/share/jenkins-cli.jar" + + makeWrapper "${openjdk}/bin/java" "$out/bin/jenkins-cli" \ + --add-flags "-jar $out/share/jenkins-cli.jar" ''; passthru = { diff --git a/nixpkgs/pkgs/development/tools/database/sqlfluff/default.nix b/nixpkgs/pkgs/development/tools/database/sqlfluff/default.nix index 01f4941c8e4f..12e5c8c14abd 100644 --- a/nixpkgs/pkgs/development/tools/database/sqlfluff/default.nix +++ b/nixpkgs/pkgs/development/tools/database/sqlfluff/default.nix @@ -5,14 +5,14 @@ python3.pkgs.buildPythonApplication rec { pname = "sqlfluff"; - version = "0.6.0a2"; + version = "0.6.0"; disabled = python3.pythonOlder "3.6"; src = fetchFromGitHub { owner = pname; repo = pname; rev = version; - sha256 = "13hzr0jialzi2nlvqwvff3w0h6jikqvcg0p2p4irwlisg4db8w7w"; + sha256 = "sha256-RW3+NpKZns3Jo1b3GfTymUE74pVoJi9f0zi4j4mUGiY="; }; propagatedBuildInputs = with python3.pkgs; [ diff --git a/nixpkgs/pkgs/development/tools/database/sqlitebrowser/default.nix b/nixpkgs/pkgs/development/tools/database/sqlitebrowser/default.nix index 45b5f185880d..9ff5c1b01b87 100644 --- a/nixpkgs/pkgs/development/tools/database/sqlitebrowser/default.nix +++ b/nixpkgs/pkgs/development/tools/database/sqlitebrowser/default.nix @@ -1,5 +1,5 @@ { mkDerivation, lib, fetchFromGitHub, cmake -, qtbase, qttools, sqlite }: +, qtbase, qttools, sqlite, wrapGAppsHook }: mkDerivation rec { pname = "sqlitebrowser"; @@ -18,7 +18,7 @@ mkDerivation rec { # We *really* should get that cleaned up. buildInputs = [ qtbase sqlite ]; - nativeBuildInputs = [ cmake qttools ]; + nativeBuildInputs = [ cmake qttools wrapGAppsHook ]; meta = with lib; { description = "DB Browser for SQLite"; diff --git a/nixpkgs/pkgs/development/tools/detect-secrets/default.nix b/nixpkgs/pkgs/development/tools/detect-secrets/default.nix index f0dddf66ff40..5dc765ffe6f3 100644 --- a/nixpkgs/pkgs/development/tools/detect-secrets/default.nix +++ b/nixpkgs/pkgs/development/tools/detect-secrets/default.nix @@ -1,10 +1,7 @@ { lib , buildPythonApplication -, configparser -, enum34 , fetchFromGitHub -, functools32 -, future +, gibberish-detector , isPy27 , mock , pyahocorasick @@ -17,34 +14,54 @@ buildPythonApplication rec { pname = "detect-secrets"; - version = "0.14.3"; + version = "1.1.0"; disabled = isPy27; - # PyPI tarball doesn't ship tests src = fetchFromGitHub { owner = "Yelp"; repo = pname; rev = "v${version}"; - sha256 = "0c4hxih9ljmv0d3izq5idyspk5zci26gdb6lv9klwcshwrfkvxj0"; + sha256 = "sha256-dj0lqm9s8OKhM4OmNrmGVRc32/ZV0I9+5WcW2hvLwu0="; }; propagatedBuildInputs = [ + gibberish-detector pyyaml + pyahocorasick requests ]; checkInputs = [ mock - pyahocorasick pytestCheckHook responses unidiff ]; + preCheck = '' + export HOME=$(mktemp -d); + ''; + disabledTests = [ - "TestMain" - "TestPreCommitHook" - "TestInitializeBaseline" + # Tests are failing for various reasons. Needs to be adjusted with the next update + "test_baseline_filters_out_known_secrets" + "test_basic" + "test_does_not_modify_slim_baseline" + "test_handles_each_path_separately" + "test_handles_multiple_directories" + "test_load_and_output" + "test_make_decisions" + "test_modifies_baseline" + "test_no_files_in_git_repo" + "test_outputs_baseline_if_none_supplied" + "test_saves_to_baseline" + "test_scan_all_files" + "test_should_scan_all_files_in_directory_if_flag_is_provided" + "test_should_scan_specific_non_tracked_file" + "test_should_scan_tracked_files_in_directory" + "test_start_halfway" + "test_works_from_different_directory" + "TestModifiesBaselineFromVersionChange" ]; pythonImportsCheck = [ "detect_secrets" ]; diff --git a/nixpkgs/pkgs/development/tools/dprint/default.nix b/nixpkgs/pkgs/development/tools/dprint/default.nix new file mode 100644 index 000000000000..7ac81b236dbe --- /dev/null +++ b/nixpkgs/pkgs/development/tools/dprint/default.nix @@ -0,0 +1,30 @@ +{ lib, fetchCrate, rustPlatform }: + +rustPlatform.buildRustPackage rec { + pname = "dprint"; + version = "0.15.0"; + + src = fetchCrate { + inherit pname version; + sha256 = "sha256-1DUGp+HiiY03fyZ+b8hNUBIfuQV5Z/gEcOxc/vG3YiA="; + }; + + cargoSha256 = "sha256-twFXA8A+vP1n6IFJO78fKNs+FC2ui46rj1JmJ/eq3wc="; + + # Tests fail because they expect a test WASM plugin. Tests already run for + # every commit upstream on GitHub Actions + doCheck = false; + + meta = with lib; { + description = "Code formatting platform written in Rust"; + longDescription = '' + dprint is a pluggable and configurable code formatting platform written in Rust. + It offers multiple WASM plugins to support various languages. It's written in + Rust, so it’s small, fast, and portable. + ''; + changelog = "https://github.com/dprint/dprint/releases/tag/${version}"; + homepage = "https://dprint.dev"; + license = licenses.mit; + maintainers = with maintainers; [ khushraj ]; + }; +} diff --git a/nixpkgs/pkgs/development/tools/eclipse-mat/default.nix b/nixpkgs/pkgs/development/tools/eclipse-mat/default.nix index 608c721caf00..01146542d0cc 100644 --- a/nixpkgs/pkgs/development/tools/eclipse-mat/default.nix +++ b/nixpkgs/pkgs/development/tools/eclipse-mat/default.nix @@ -20,7 +20,7 @@ with lib; let - pVersion = "1.11.0.20201202"; + pVersion = "1.12.0.20210602"; pVersionTriple = splitVersion pVersion; majorVersion = elemAt pVersionTriple 0; minorVersion = elemAt pVersionTriple 1; @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "http://ftp.halifax.rwth-aachen.de/eclipse//mat/${baseVersion}/rcp/MemoryAnalyzer-${version}-linux.gtk.x86_64.zip"; - sha256 = "sha256-HtIKcGfdjb2wovGGSxv16ud7y1cPQFBn77pkhiekAkI="; + sha256 = "sha256-qX4RPuZdeiEduJAEpzOi/QnbJ+kaD0PZ3WHrmGsvqHc="; }; desktopItem = makeDesktopItem { diff --git a/nixpkgs/pkgs/development/tools/ecpdap/default.nix b/nixpkgs/pkgs/development/tools/ecpdap/default.nix index 3bb12c40e355..38ba9d78712e 100644 --- a/nixpkgs/pkgs/development/tools/ecpdap/default.nix +++ b/nixpkgs/pkgs/development/tools/ecpdap/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "ecpdap"; - version = "0.1.6"; + version = "0.1.7"; src = fetchFromGitHub { owner = "adamgreig"; repo = pname; rev = "v${version}"; - sha256 = "1va96hxm22a2lfy141x1sv5f5g8f6mp965an4jsff9qzi55kfv2g"; + sha256 = "sha256-fdvpGmEy54i48H6YJ4E1LIuogimNEL8PJS5ScoW/6DM="; }; - cargoSha256 = "1dk6x2f36c546qr415kzmqr2r4550iwdmj4chrb46p3hr64jddhd"; + cargoSha256 = "sha256-2YARNoHVDBwGr8FE/oRlNZMX/vCPIre7OnZbr04eF/M="; nativeBuildInputs = [ pkg-config ]; diff --git a/nixpkgs/pkgs/development/tools/elkhound/default.nix b/nixpkgs/pkgs/development/tools/elkhound/default.nix new file mode 100644 index 000000000000..5c29b10a6139 --- /dev/null +++ b/nixpkgs/pkgs/development/tools/elkhound/default.nix @@ -0,0 +1,50 @@ +{ stdenv +, lib +, fetchFromGitHub +, bison +, cmake +, flex +, perl +}: + +stdenv.mkDerivation rec { + pname = "elkhound"; + version = "unstable-2020-04-13"; + + src = fetchFromGitHub { + owner = "WeiDUorg"; + repo = pname; + rev = "a7eb4bb2151c00cc080613a770d37560f62a285c"; + sha256 = "sha256-Y96OFpBNrD3vrKoEZ4KdJuI1Q4RmYANsu7H3ZzfaA6g="; + }; + + postPatch = '' + patchShebangs scripts + ''; + + sourceRoot = "source/src"; + + nativeBuildInputs = [ bison cmake flex perl ]; + + installPhase = '' + runHook preInstall + + install -Dm555 -t $out/bin ast/astgen elkhound/elkhound + for d in ast elkhound smbase; do + install -Dm444 -t $out/lib $d/*.a + install -Dm444 -t $out/include/$d $src/src/$d/*.h + done + install -Dm444 -t $out/share/doc/${pname} $src/src/elkhound/*.txt + + runHook postInstall + ''; + + meta = with lib; { + description = "A parser generator which emits GLR parsers, either in OCaml or C++"; + homepage = "https://scottmcpeak.com/elkhound/"; + license = licenses.bsd3; + maintainers = with maintainers; [ peterhoeg ]; + # possibly works on Darwin + platforms = platforms.linux; + }; +} diff --git a/nixpkgs/pkgs/development/tools/esbuild/default.nix b/nixpkgs/pkgs/development/tools/esbuild/default.nix index 22a6a59cc1bc..8b37899ef675 100644 --- a/nixpkgs/pkgs/development/tools/esbuild/default.nix +++ b/nixpkgs/pkgs/development/tools/esbuild/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "esbuild"; - version = "0.12.9"; + version = "0.12.14"; src = fetchFromGitHub { owner = "evanw"; repo = "esbuild"; rev = "v${version}"; - sha256 = "sha256-MqwgdhgWIfYE0wO7fWQuC72tEwCVgL7qUbJlJ3APf4E="; + sha256 = "sha256-+qFR5XGV1LSCY8AR7gd269UcOwlL5hkvKiQEhdsqIJc="; }; vendorSha256 = "sha256-2ABWPqhK2Cf4ipQH7XvRrd+ZscJhYPc3SV2cGT0apdg="; diff --git a/nixpkgs/pkgs/development/tools/fission/default.nix b/nixpkgs/pkgs/development/tools/fission/default.nix index 3045842d91f0..56d5161b49e9 100644 --- a/nixpkgs/pkgs/development/tools/fission/default.nix +++ b/nixpkgs/pkgs/development/tools/fission/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "fission"; - version = "1.13.0"; + version = "1.13.1"; src = fetchFromGitHub { owner = "fission"; repo = "fission"; rev = version; - sha256 = "sha256-WCynU5+d789d584JH99jmTZSEbyco2ysuBXIC2pW1r4="; + sha256 = "sha256-ayVEU2Dlqun8KLP+KeI0uU4p9N4aaYLZ/IHqfA2PGrI="; }; vendorSha256 = "sha256-V3/IFCbW3wXfNiFzucLeyFDc6SA2nE+NwO0sNEBmIYg="; diff --git a/nixpkgs/pkgs/development/tools/flawfinder/default.nix b/nixpkgs/pkgs/development/tools/flawfinder/default.nix index 554ca92b8c0e..36209c5d5aa4 100644 --- a/nixpkgs/pkgs/development/tools/flawfinder/default.nix +++ b/nixpkgs/pkgs/development/tools/flawfinder/default.nix @@ -1,30 +1,22 @@ { lib -, stdenv , fetchurl , installShellFiles , python3 }: -stdenv.mkDerivation rec { +python3.pkgs.buildPythonApplication rec { pname = "flawfinder"; - version = "2.0.15"; + version = "2.0.18"; src = fetchurl { url = "https://dwheeler.com/flawfinder/flawfinder-${version}.tar.gz"; - sha256 = "01j4szy8gwvikrfzfayfayjnc1za0jxsnxp5fsa6d06kn69wyr8a"; + sha256 = "1hk2y13fd2a5gf42a1hk45hw6pbls715wi9k1yh3c3wyhvbyylba"; }; - nativeBuildInputs = [ installShellFiles ]; + # Project is using a combination of bash/Python for the tests + doCheck = false; - buildInputs = [ python3 ]; - - installPhase = '' - runHook preInstall - mkdir -p $out/bin - cp ${pname} $out/bin - installManPage flawfinder.1 - runHook postInstall - ''; + pythonImportsCheck = [ "flawfinder" ]; meta = with lib; { description = "Tool to examines C/C++ source code for security flaws"; diff --git a/nixpkgs/pkgs/development/tools/go-task/default.nix b/nixpkgs/pkgs/development/tools/go-task/default.nix index 58a986e813e1..280e0c1e986b 100644 --- a/nixpkgs/pkgs/development/tools/go-task/default.nix +++ b/nixpkgs/pkgs/development/tools/go-task/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "go-task"; - version = "3.4.3"; + version = "3.5.0"; src = fetchFromGitHub { owner = pname; repo = "task"; rev = "v${version}"; - sha256 = "sha256-hI6x3DOB7pP+umnEFqL0sIx+6qN74sooLdkR2pC74D8="; + sha256 = "sha256-oXr98guqEvE/rpRJF5NMjQYZtzbrh1F/neXYbLaCGUg="; }; vendorSha256 = "sha256-bsVzV2M31BA7X6aq8na7v56uGYgne4OwR5kz/utmQHI="; diff --git a/nixpkgs/pkgs/development/tools/gops/default.nix b/nixpkgs/pkgs/development/tools/gops/default.nix index d23aa71a8abe..bc9cba9df5f7 100644 --- a/nixpkgs/pkgs/development/tools/gops/default.nix +++ b/nixpkgs/pkgs/development/tools/gops/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "gops"; - version = "0.3.18"; + version = "0.3.19"; src = fetchFromGitHub { owner = "google"; repo = "gops"; rev = "v${version}"; - sha256 = "0534jyravpsj73lgdmw6fns1qaqiw401jlfk04wa0as5sv09rfhy"; + sha256 = "sha256-9QEhc0OVCrIdIY220PDn2+CjUsCF84l6QRQS0HjDEZY="; }; vendorSha256 = null; diff --git a/nixpkgs/pkgs/development/tools/jbang/default.nix b/nixpkgs/pkgs/development/tools/jbang/default.nix index 1220ec90d90f..b0d2cb719533 100644 --- a/nixpkgs/pkgs/development/tools/jbang/default.nix +++ b/nixpkgs/pkgs/development/tools/jbang/default.nix @@ -1,12 +1,12 @@ { stdenv, lib, fetchzip, jdk, makeWrapper, coreutils, curl }: stdenv.mkDerivation rec { - version = "0.71.1"; + version = "0.72.0"; pname = "jbang"; src = fetchzip { url = "https://github.com/jbangdev/jbang/releases/download/v${version}/${pname}-${version}.tar"; - sha256 = "sha256-+s2Wa+5Qznqpv84VEZCMmzy0bI1mN/BknPObYqJlaYs="; + sha256 = "sha256-QMbkxfGJOMNTILmGYhbUdtq4zfe0Cc/IBftFdM+rT9c="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/nixpkgs/pkgs/development/tools/just/default.nix b/nixpkgs/pkgs/development/tools/just/default.nix index 8a8d4201451f..d7a2e7338592 100644 --- a/nixpkgs/pkgs/development/tools/just/default.nix +++ b/nixpkgs/pkgs/development/tools/just/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "just"; - version = "0.9.6"; + version = "0.9.8"; src = fetchFromGitHub { owner = "casey"; repo = pname; rev = version; - sha256 = "sha256-FWJ7fSJysT5LVFio49nbN0T0b+zWwiV7NvEJlojbNKs="; + sha256 = "sha256-WT3r6qw/lCZy6hdfAJmoAgUqjSLPVT8fKX4DnqDnhOs="; }; - cargoSha256 = "sha256-/VmCuHPURQTyeIumMaWVrFu18ZgVR0klpc/bO1f1w4o="; + cargoSha256 = "sha256-0R/9VndP/Oh5/yP7NsBC25jiCSRVNEXhbVksElLXeEc="; nativeBuildInputs = [ installShellFiles ]; buildInputs = lib.optionals stdenv.isDarwin [ libiconv ]; diff --git a/nixpkgs/pkgs/development/tools/kustomize/3.nix b/nixpkgs/pkgs/development/tools/kustomize/3.nix new file mode 100644 index 000000000000..aa99256faa84 --- /dev/null +++ b/nixpkgs/pkgs/development/tools/kustomize/3.nix @@ -0,0 +1,40 @@ +{ lib, buildGoModule, fetchFromGitHub }: + +buildGoModule rec { + pname = "kustomize_3"; + version = "3.10.0"; + # rev is the commit of the tag, mainly for kustomize version command output + rev = "602ad8aa98e2e17f6c9119e027a09757e63c8bec"; + + ldflags = let t = "sigs.k8s.io/kustomize/api/provenance"; in [ + "-s -w" + "-X ${t}.version=${version}" + "-X ${t}.gitCommit=${rev}" + ]; + + src = fetchFromGitHub { + owner = "kubernetes-sigs"; + repo = "kustomize"; + rev = "kustomize/v${version}"; + sha256 = "sha256-ESIykbAKXdv8zM9be0zEJ71rBAzZby0aTg25NlCsIOM="; + }; + + doCheck = true; + + # avoid finding test and development commands + sourceRoot = "source/kustomize"; + + vendorSha256 = "sha256-xLeetcmzvpILLLMhMx7oahWLxguFjG3qbYpeeWpFUlw="; + + meta = with lib; { + description = "Customization of kubernetes YAML configurations"; + longDescription = '' + kustomize lets you customize raw, template-free YAML files for + multiple purposes, leaving the original YAML untouched and usable + as is. + ''; + homepage = "https://github.com/kubernetes-sigs/kustomize"; + license = licenses.asl20; + maintainers = with maintainers; [ carlosdagos vdemeester zaninime Chili-Man saschagrunert ]; + }; +} diff --git a/nixpkgs/pkgs/development/tools/kustomize/default.nix b/nixpkgs/pkgs/development/tools/kustomize/default.nix index 489b62891b65..c2453c8ff163 100644 --- a/nixpkgs/pkgs/development/tools/kustomize/default.nix +++ b/nixpkgs/pkgs/development/tools/kustomize/default.nix @@ -2,7 +2,7 @@ buildGoModule rec { pname = "kustomize"; - version = "4.1.3"; + version = "4.2.0"; # rev is the commit of the tag, mainly for kustomize version command output rev = "9e8e7a7fe99ec9fbf801463e8607928322fc5245"; @@ -17,7 +17,7 @@ buildGoModule rec { owner = "kubernetes-sigs"; repo = pname; rev = "kustomize/v${version}"; - sha256 = "sha256-NPWKInDHOoelWqDrUn/AlRItI4e8J6dbBxgLW078ecs="; + sha256 = "sha256-mFF0Yc+j292oajY1i9SApnWaQnVoHxvkGCIurKC0t4o="; }; # TODO: Remove once https://github.com/kubernetes-sigs/kustomize/pull/3708 got merged. @@ -26,7 +26,7 @@ buildGoModule rec { # avoid finding test and development commands sourceRoot = "source/kustomize"; - vendorSha256 = "sha256-6maEpEPEV436NrVnVlvWV1q6YywGVILXbxn8Z8Ku/hs="; + vendorSha256 = "sha256-VMvXDIrg/BkuxZVDHvpfHY/hgwQGz2kw1/hu5lhcYEE="; meta = with lib; { description = "Customization of kubernetes YAML configurations"; diff --git a/nixpkgs/pkgs/development/tools/kustomize/kustomize-sops.nix b/nixpkgs/pkgs/development/tools/kustomize/kustomize-sops.nix index 9c71af562137..bea8a33a43d8 100644 --- a/nixpkgs/pkgs/development/tools/kustomize/kustomize-sops.nix +++ b/nixpkgs/pkgs/development/tools/kustomize/kustomize-sops.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "kustomize-sops"; - version = "2.5.6"; + version = "2.5.7"; src = fetchFromGitHub { owner = "viaduct-ai"; repo = pname; rev = "v${version}"; - sha256 = "sha256-UEtWEOuekFbMUJFWYdXfzbCWCz4I7vVdb9UBQbMXF/A="; + sha256 = "sha256-CtVFCpj6YZUAjeyRAPOkbd30Js1PSmzapB12SwKZisc="; }; vendorSha256 = "sha256-kNJkSivSj8LMeXobKazLy9MCTtWzrBn99GmvaH+qIUU="; diff --git a/nixpkgs/pkgs/development/tools/literate-programming/funnelweb/default.nix b/nixpkgs/pkgs/development/tools/literate-programming/funnelweb/default.nix index 53b7f208e812..56d53104a206 100644 --- a/nixpkgs/pkgs/development/tools/literate-programming/funnelweb/default.nix +++ b/nixpkgs/pkgs/development/tools/literate-programming/funnelweb/default.nix @@ -1,8 +1,9 @@ -{lib, stdenv, fetchurl}: +{ lib, stdenv, fetchurl }: stdenv.mkDerivation rec { + pname = "funnelweb"; + version = "3.20"; - name = "funnelweb-${meta.version}"; src = fetchurl { url = "http://www.ross.net/funnelweb/download/funnelweb_v320/funnelweb_v320_source.tar.gz"; sha256 = "0zqhys0j9gabrd12mnk8ibblpc8dal4kbl8vnhxmdlplsdpwn4wg"; diff --git a/nixpkgs/pkgs/development/tools/literate-programming/noweb/default.nix b/nixpkgs/pkgs/development/tools/literate-programming/noweb/default.nix index c02764035161..6847aff097c8 100644 --- a/nixpkgs/pkgs/development/tools/literate-programming/noweb/default.nix +++ b/nixpkgs/pkgs/development/tools/literate-programming/noweb/default.nix @@ -57,7 +57,7 @@ lib.fix (noweb: stdenv.mkDerivation rec { # NOTE: substituteInPlace breaks Icon binaries, so make sure the script # uses (n)awk before calling. if grep -q nawk "$f"; then - substituteInPlace "$f" --replace "nawk" "${nawk}/bin/awk" + substituteInPlace "$f" --replace "nawk" "${nawk}/bin/nawk" fi done diff --git a/nixpkgs/pkgs/development/tools/mbed-cli/default.nix b/nixpkgs/pkgs/development/tools/mbed-cli/default.nix index 127fa1bef863..12e7d1915477 100644 --- a/nixpkgs/pkgs/development/tools/mbed-cli/default.nix +++ b/nixpkgs/pkgs/development/tools/mbed-cli/default.nix @@ -28,7 +28,7 @@ buildPythonApplication rec { homepage = "https://github.com/ARMmbed/mbed-cli"; description = "Arm Mbed Command Line Interface"; license = licenses.asl20; - maintainers = with maintainers; [ rvolosatovs ]; + maintainers = with maintainers; [ ]; }; } diff --git a/nixpkgs/pkgs/development/tools/misc/binutils/default.nix b/nixpkgs/pkgs/development/tools/misc/binutils/default.nix index 8042655a859d..a4233886a854 100644 --- a/nixpkgs/pkgs/development/tools/misc/binutils/default.nix +++ b/nixpkgs/pkgs/development/tools/misc/binutils/default.nix @@ -70,7 +70,7 @@ stdenv.mkDerivation { # indeed GHC will refuse to compile with a binutils suffering from it. See # this comment for more information: # https://gitlab.haskell.org/ghc/ghc/issues/4210#note_78333 - lib.optional stdenv.targetPlatform.isAarch32 ./R_ARM_COPY.patch; + lib.optional (stdenv.targetPlatform.isAarch32 && stdenv.hostPlatform.system != stdenv.targetPlatform.system) ./R_ARM_COPY.patch; outputs = [ "out" "info" "man" ]; diff --git a/nixpkgs/pkgs/development/tools/misc/ccls/wrapper b/nixpkgs/pkgs/development/tools/misc/ccls/wrapper index c92bc6b40d1a..294b60893a3f 100644 --- a/nixpkgs/pkgs/development/tools/misc/ccls/wrapper +++ b/nixpkgs/pkgs/development/tools/misc/ccls/wrapper @@ -4,6 +4,6 @@ printf -v extraArgs ',\"%s\"' \ $(cat @clang@/nix-support/libc-cflags \ @clang@/nix-support/libcxx-cxxflags) \ ${NIX_CFLAGS_COMPILE} -initString="--init={\"clang\":{\"extraArgs\":[${extraArgs:1}]}}" +initString="--init={\"clang\":{\"extraArgs\":[${extraArgs:1}],\"resourceDir\":\"@clang@/resource-root\"}}" exec -a "$0" "@out@/bin/@wrapped@" "${initString}" "$@" diff --git a/nixpkgs/pkgs/development/tools/misc/editorconfig-core-c/default.nix b/nixpkgs/pkgs/development/tools/misc/editorconfig-core-c/default.nix index de5c1e070fdb..f48ba999d868 100644 --- a/nixpkgs/pkgs/development/tools/misc/editorconfig-core-c/default.nix +++ b/nixpkgs/pkgs/development/tools/misc/editorconfig-core-c/default.nix @@ -1,14 +1,14 @@ { lib, stdenv, fetchgit, cmake, pcre, doxygen }: stdenv.mkDerivation rec { - name = "editorconfig-core-c-${meta.version}"; + pname = "editorconfig-core-c"; + version = "0.12.1"; src = fetchgit { url = "https://github.com/editorconfig/editorconfig-core-c.git"; - rev = "v${meta.version}"; + rev = "v${version}"; sha256 = "0awpb63ci85kal3pnlj2b54bay8igj1rbc13d8gqkvidlb51nnx4"; fetchSubmodules = true; - inherit name; }; buildInputs = [ pcre ]; @@ -31,7 +31,6 @@ stdenv.mkDerivation rec { ''; downloadPage = "https://github.com/editorconfig/editorconfig-core-c"; license = with licenses; [ bsd2 bsd3 ]; - version = "0.12.1"; maintainers = with maintainers; [ dochang ]; platforms = platforms.unix; }; diff --git a/nixpkgs/pkgs/development/tools/misc/global/default.nix b/nixpkgs/pkgs/development/tools/misc/global/default.nix index 739615a841c7..70ec9278ae13 100644 --- a/nixpkgs/pkgs/development/tools/misc/global/default.nix +++ b/nixpkgs/pkgs/development/tools/misc/global/default.nix @@ -6,11 +6,11 @@ let pygments = python3Packages.pygments; in stdenv.mkDerivation rec { pname = "global"; - version = "6.6.6"; + version = "6.6.7"; src = fetchurl { url = "mirror://gnu/global/${pname}-${version}.tar.gz"; - sha256 = "sha256-dYB4r/+Y1MBRxYeFx62j7Rl3+rt3+Il/9le3HMYtTV0="; + sha256 = "sha256-aaD3f1OCfFVoF2wdOCFm3zYedCY6BH8LMFiqLyrVijw="; }; nativeBuildInputs = [ libtool makeWrapper ]; diff --git a/nixpkgs/pkgs/development/tools/misc/rolespec/default.nix b/nixpkgs/pkgs/development/tools/misc/rolespec/default.nix index b26fbf75031d..7b084fae891e 100644 --- a/nixpkgs/pkgs/development/tools/misc/rolespec/default.nix +++ b/nixpkgs/pkgs/development/tools/misc/rolespec/default.nix @@ -1,15 +1,14 @@ { lib, stdenv, fetchFromGitHub, makeWrapper }: stdenv.mkDerivation rec { - - name = "rolespec-${meta.version}"; + pname = "rolespec"; + version = "20161104"; src = fetchFromGitHub { owner = "nickjj"; repo = "rolespec"; rev = "d9ee530cd709168882059776c482fc37f46cb743"; sha256 = "1jkidw6aqr0zfqwmcvlpi9qa140z2pxcfsd43xm5ikx6jcwjdrzl"; - inherit name; }; nativeBuildInputs = [ makeWrapper ]; @@ -41,9 +40,7 @@ stdenv.mkDerivation rec { ''; downloadPage = "https://github.com/nickjj/rolespec"; license = licenses.gpl3; - version = "20161104"; maintainers = [ maintainers.dochang ]; platforms = platforms.unix; }; - } diff --git a/nixpkgs/pkgs/development/tools/misc/terraform-ls/default.nix b/nixpkgs/pkgs/development/tools/misc/terraform-ls/default.nix index e189c563e86e..030200e47a8c 100644 --- a/nixpkgs/pkgs/development/tools/misc/terraform-ls/default.nix +++ b/nixpkgs/pkgs/development/tools/misc/terraform-ls/default.nix @@ -2,19 +2,17 @@ buildGoModule rec { pname = "terraform-ls"; - version = "0.18.1"; + version = "0.18.2"; src = fetchFromGitHub { owner = "hashicorp"; repo = pname; rev = "v${version}"; - sha256 = "sha256-68Hs9kwv7GTGnYtoJh61ubaggPKbxFwz7qDwYaJ74c8="; + sha256 = "sha256-d/dn77pV9qxzAm6NVOM5KhFxYi2/xEK02zMl2TTB5rA="; }; - vendorSha256 = "sha256-NgOpnCe0uGQVDVKYUIULqPTfvfkDtxIUQiCVwiE7nuc="; + vendorSha256 = "sha256-0PcMxotUEys+jGDFEEz6owbtTGAac+RwoBWEHP5ifKQ="; - preBuild = '' - buildFlagsArray+=("-ldflags" "-s -w -X main.version=v${version} -X main.prerelease=") - ''; + ldflags = [ "-s" "-w" "-X main.version=v${version}" "-X main.prerelease=" ]; preCheck = '' # Remove tests that requires networking diff --git a/nixpkgs/pkgs/development/tools/ocaml/dune/2.nix b/nixpkgs/pkgs/development/tools/ocaml/dune/2.nix index 2acc7e5bdf32..3945389e8cd1 100644 --- a/nixpkgs/pkgs/development/tools/ocaml/dune/2.nix +++ b/nixpkgs/pkgs/development/tools/ocaml/dune/2.nix @@ -6,11 +6,11 @@ else stdenv.mkDerivation rec { pname = "dune"; - version = "2.8.5"; + version = "2.9.0"; src = fetchurl { url = "https://github.com/ocaml/dune/releases/download/${version}/dune-${version}.tbz"; - sha256 = "0a9n8ilsi3kyx5xqvk5s7iikk6y3pkpm5mvsn5za5ivlzf1i40br"; + sha256 = "07m476kgagpd6kzm3jq30yfxqspr2hychah0xfqs14z82zxpq8dv"; }; buildInputs = [ ocaml findlib ]; diff --git a/nixpkgs/pkgs/development/tools/open-policy-agent/default.nix b/nixpkgs/pkgs/development/tools/open-policy-agent/default.nix index 739a562227a8..6737f161754c 100644 --- a/nixpkgs/pkgs/development/tools/open-policy-agent/default.nix +++ b/nixpkgs/pkgs/development/tools/open-policy-agent/default.nix @@ -2,7 +2,7 @@ buildGoModule rec { pname = "open-policy-agent"; - version = "0.29.4"; + version = "0.30.0"; src = fetchFromGitHub { owner = "open-policy-agent"; @@ -10,14 +10,11 @@ buildGoModule rec { rev = "v${version}"; sha256 = "sha256-AjNr+t30ftF92+cEfvt8iHBDVD/SO52ojJRLAkYF9l4="; }; - vendorSha256 = null; subPackages = [ "." ]; - preBuild = '' - buildFlagsArray+=("-ldflags" "-s -w -X github.com/open-policy-agent/opa/version.Version=${version}") - ''; + ldflags = [ "-s" "-w" "-X github.com/open-policy-agent/opa/version.Version=${version}" ]; doInstallCheck = true; installCheckPhase = '' diff --git a/nixpkgs/pkgs/development/tools/parsing/tree-sitter/default.nix b/nixpkgs/pkgs/development/tools/parsing/tree-sitter/default.nix index 6ab1463917c8..60704fdd780b 100644 --- a/nixpkgs/pkgs/development/tools/parsing/tree-sitter/default.nix +++ b/nixpkgs/pkgs/development/tools/parsing/tree-sitter/default.nix @@ -28,9 +28,9 @@ let # 1) change all these hashes # 2) nix-build -A tree-sitter.updater.update-all-grammars # 3) run the ./result script that is output by that (it updates ./grammars) - version = "0.19.5"; - sha256 = "1qmb0sva28zv6r3c3j7xs9pc8bpwwhkb9vxxndw2zbdn9wkvmbmn"; - cargoSha256 = "0hnjik3pymb1s7frhfpfzvd6w2k3lgpsmh6milpriwxmqsmkwdzz"; + version = "0.20.0"; + sha256 = "0hrcisvw44fjxix09lfbrz7majaj6njbnr6c92a6a5748p2jvyng"; + cargoSha256 = "029db3yy6nj18vxfvj0ra568a9k4x7znfj08spvzl5sxfbx6442r"; src = fetchFromGitHub { owner = "tree-sitter"; diff --git a/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-c-sharp.json b/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-c-sharp.json index 5ebc9c9a0f3c..8b8315e4abdc 100644 --- a/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-c-sharp.json +++ b/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-c-sharp.json @@ -1,9 +1,9 @@ { "url": "https://github.com/tree-sitter/tree-sitter-c-sharp", - "rev": "aa429589525bb849189a0c5ddb52267ce578f988", - "date": "2021-06-07T18:47:38+02:00", - "path": "/nix/store/mclvpa5kfbl9g5ij3xjdhnqc6bqzqcj6-tree-sitter-c-sharp", - "sha256": "07alycp4bclr0ycn44dj2481xag0s10nwgyrdxar3j91hphd966s", + "rev": "3953034ee61e8639100b063092d4280e047ca9e9", + "date": "2021-06-21T12:18:46+02:00", + "path": "/nix/store/8f2bnr790zwibhyd3jqjm38zfc1md5is-tree-sitter-c-sharp", + "sha256": "0k6pb27f463y88bf6ym0zl4d36182y5cr3013j71h3vlg264z96c", "fetchSubmodules": false, "deepClone": false, "leaveDotGit": false diff --git a/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-haskell.json b/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-haskell.json index b8ca41abcf29..1e00f279d68f 100644 --- a/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-haskell.json +++ b/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-haskell.json @@ -1,9 +1,9 @@ { "url": "https://github.com/tree-sitter/tree-sitter-haskell", - "rev": "237f4eb4417c28f643a29d795ed227246afb66f9", - "date": "2021-06-05T13:41:42+02:00", - "path": "/nix/store/wwi86c3ix0zq8czwljxxypw5w2mxnz5h-tree-sitter-haskell", - "sha256": "0gx6mr6yg053i5mif8i8qwkk9h57laf9riw5r24av1y7cal7sszd", + "rev": "a0c1adb59e390f7d839a146c57fdb33d36ed97e6", + "date": "2021-06-18T23:36:08+02:00", + "path": "/nix/store/7rl3najf8rn8ndh31vcxjz5px3r1scky-tree-sitter-haskell", + "sha256": "0a97w0qnj0fwy0yyg7hb9i1fyiwbyiz5mwx77aaw6md4jcsf4di8", "fetchSubmodules": false, "deepClone": false, "leaveDotGit": false diff --git a/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-javascript.json b/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-javascript.json index 65066c66d539..24fd79d5116c 100644 --- a/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-javascript.json +++ b/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-javascript.json @@ -1,9 +1,9 @@ { "url": "https://github.com/tree-sitter/tree-sitter-javascript", - "rev": "45b9ce2a2588c0e6d616b0ee2a710b1fcb99c5b5", - "date": "2021-06-09T14:12:41-07:00", - "path": "/nix/store/j6r7z3m4wk6baz70qg2xn2mq3jlnyq6f-tree-sitter-javascript", - "sha256": "0rzpyxbh1j9l12jxyryc06f8jhbd5ci18lfb7bw2msc685b2ckcx", + "rev": "6de6d604c243b68f90dce14130d536c694d90dcc", + "date": "2021-06-29T15:54:12-07:00", + "path": "/nix/store/mmz8s440zplg88c0mb0w3dlg94dzgxmf-tree-sitter-javascript", + "sha256": "1bz8xhs7q4lp49q1id6dvz93l7vf0gxgngsbjk3x1nvw8rg171j6", "fetchSubmodules": false, "deepClone": false, "leaveDotGit": false diff --git a/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-php.json b/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-php.json index 49b57f4d8a39..6b64a962a523 100644 --- a/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-php.json +++ b/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-php.json @@ -1,9 +1,9 @@ { "url": "https://github.com/tree-sitter/tree-sitter-php", - "rev": "b065fc4ded84c30aff14c07ec6e7cf449e222b04", - "date": "2021-06-01T20:33:20+02:00", - "path": "/nix/store/czdqn2nz8pgrd64w74yskx6vl233phxn-tree-sitter-php", - "sha256": "1qr2byy344haqybd0zz2hazncay7zndkp4p3317ck50xrs05z086", + "rev": "5e89808d490d893799ebcf229130afe4cf2b0324", + "date": "2021-06-22T09:23:44+02:00", + "path": "/nix/store/5c1pn1p183czqb43a0va7whd4sz81jf1-tree-sitter-php", + "sha256": "1mp5kv305a4rrgh7kklifqfg3680krfsd0h76sxn4i0wxyqfgczi", "fetchSubmodules": false, "deepClone": false, "leaveDotGit": false diff --git a/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-ruby.json b/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-ruby.json index a96363af7139..c8142974fd43 100644 --- a/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-ruby.json +++ b/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-ruby.json @@ -1,9 +1,9 @@ { "url": "https://github.com/tree-sitter/tree-sitter-ruby", - "rev": "391269d74d20154bbd0ac9be20b35eced6920290", - "date": "2021-05-04T14:02:32-07:00", - "path": "/nix/store/hamsaml0yzi13qd61abypjwbv33rd824-tree-sitter-ruby", - "sha256": "0biyhydfzybz3g6hhdd0rk6yav7xsk61j8lnmpsi60vaxabdsaiv", + "rev": "fe6a2d634da0e16b11b5aa255cc3df568a4572fd", + "date": "2021-03-03T16:54:30-08:00", + "path": "/nix/store/ragrvqj7hm98r74v5b3fljvc47gd3nhj-tree-sitter-ruby", + "sha256": "0m3h4928rbs300wcb6776h9r88hi32rybbhcaf6rdympl5nzi83v", "fetchSubmodules": false, "deepClone": false, "leaveDotGit": false diff --git a/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-scala.json b/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-scala.json index b7c214cc720a..75329fc63a00 100644 --- a/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-scala.json +++ b/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-scala.json @@ -1,9 +1,9 @@ { "url": "https://github.com/tree-sitter/tree-sitter-scala", - "rev": "fb23ed9a99da012d86b7a5059b9d8928607cce29", - "date": "2021-04-01T10:11:15-07:00", - "path": "/nix/store/n1wvxkz4h38770lxvwakway34ac2a8h7-tree-sitter-scala", - "sha256": "05g95340g4labkdvfka5cbg7pr6vzigc40y54js1b5wml0w3d8f7", + "rev": "bfa2a81388019d47f6a0a6a6e9c96910dec830b4", + "date": "2021-06-23T15:37:27-07:00", + "path": "/nix/store/nc5cndwzc5pzq3x64wa51bff0rl36hc8-tree-sitter-scala", + "sha256": "0x0lq78gjfsqi225mfvrpkl2jc6fbb378jgj04syxkm941lxc4bk", "fetchSubmodules": false, "deepClone": false, "leaveDotGit": false diff --git a/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-svelte.json b/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-svelte.json index b224fa54dafe..41c4fcfe734d 100644 --- a/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-svelte.json +++ b/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-svelte.json @@ -1,9 +1,9 @@ { "url": "https://github.com/Himujjal/tree-sitter-svelte", - "rev": "10c113001acf9852817150acb3031a5e68d2b4cf", - "date": "2021-05-02T10:05:14+05:30", - "path": "/nix/store/mpfr56mfiizhwr4hq7h422glmdc4hg48-tree-sitter-svelte", - "sha256": "1n7addsnin6czm5hrbhaaqqgf0c3nz3mpcdysm2z4icgn7fjq281", + "rev": "c696a13a587b0595baf7998f1fb9e95c42750263", + "date": "2021-03-20T16:45:11+05:30", + "path": "/nix/store/8krdxqwpi95ljrb5jgalwgygz3aljqr8-tree-sitter-svelte", + "sha256": "0ckmss5gmvffm6danlsvgh6gwvrlznxsqf6i6ipkn7k5lxg1awg3", "fetchSubmodules": false, "deepClone": false, "leaveDotGit": false diff --git a/nixpkgs/pkgs/development/tools/pgtop/default.nix b/nixpkgs/pkgs/development/tools/pgtop/default.nix new file mode 100644 index 000000000000..03b3ef89265b --- /dev/null +++ b/nixpkgs/pkgs/development/tools/pgtop/default.nix @@ -0,0 +1,30 @@ +{ lib, stdenv, perlPackages, fetchFromGitHub, shortenPerlShebang }: + +perlPackages.buildPerlPackage rec { + pname = "pgtop"; + version = "0.11"; + + src = fetchFromGitHub { + owner = "cosimo"; + repo = "pgtop"; + rev = "v${version}"; + sha256 = "1awyl6ddfihm7dfr5y2z15r1si5cyipnlyyj3m1l19pk98s4x66l"; + }; + + outputs = [ "out" ]; + + buildInputs = with perlPackages; [ DBI DBDPg TermReadKey JSON LWPUserAgent ]; + + nativeBuildInputs = lib.optional stdenv.isDarwin shortenPerlShebang; + postInstall = lib.optionalString stdenv.isDarwin '' + shortenPerlShebang $out/bin/pgtop + ''; + + meta = with lib; { + description = "a PostgreSQL clone of `mytop', which in turn is a `top' clone for MySQL"; + homepage = "https://github.com/cosimo/pgtop"; + changelog = "https://github.com/cosimo/pgtop/releases/tag/v${version}"; + maintainers = [ maintainers.hagl ]; + license = [ licenses.gpl2Only ]; + }; +} diff --git a/nixpkgs/pkgs/development/tools/protoc-gen-go/default.nix b/nixpkgs/pkgs/development/tools/protoc-gen-go/default.nix index 063da92a6ad3..79f97ddd745c 100644 --- a/nixpkgs/pkgs/development/tools/protoc-gen-go/default.nix +++ b/nixpkgs/pkgs/development/tools/protoc-gen-go/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "protoc-gen-go"; - version = "1.27.0"; + version = "1.27.1"; src = fetchFromGitHub { owner = "protocolbuffers"; repo = "protobuf-go"; rev = "v${version}"; - sha256 = "sha256-1L0GYXrtTYkk5eLXkfVxzbZMZKgyzSpkDaI8itb6NnA="; + sha256 = "sha256-wkUvMsoJP38KMD5b3Fz65R1cnpeTtDcVqgE7tNlZXys="; }; vendorSha256 = "sha256-yb8l4ooZwqfvenlxDRg95rqiL+hmsn0weS/dPv/oD2Y="; diff --git a/nixpkgs/pkgs/development/tools/pscale/default.nix b/nixpkgs/pkgs/development/tools/pscale/default.nix new file mode 100644 index 000000000000..701c22471ee4 --- /dev/null +++ b/nixpkgs/pkgs/development/tools/pscale/default.nix @@ -0,0 +1,23 @@ +{ lib, buildGoModule, fetchFromGitHub }: + +buildGoModule rec { + pname = "pscale"; + version = "0.51.0"; + + src = fetchFromGitHub { + owner = "planetscale"; + repo = "cli"; + rev = "v${version}"; + sha256 = "sha256-ykHwDVwL30uXeCEP4EcM8TPYqZmCDDAUUpfinpYipHE="; + }; + + vendorSha256 = "sha256-3VP2fluQLZs4nWT3O6NmCFxrqKw0/j3ASNxtbXHlZEA="; + + meta = with lib; { + homepage = "https://www.planetscale.com/"; + changelog = "https://github.com/planetscale/cli/releases/tag/v${version}"; + description = "The CLI for PlanetScale Database"; + license = licenses.asl20; + maintainers = with maintainers; [ pimeys ]; + }; +} diff --git a/nixpkgs/pkgs/development/tools/remarshal/default.nix b/nixpkgs/pkgs/development/tools/remarshal/default.nix index 385db11d7ff4..67137fb1ed93 100644 --- a/nixpkgs/pkgs/development/tools/remarshal/default.nix +++ b/nixpkgs/pkgs/development/tools/remarshal/default.nix @@ -10,7 +10,7 @@ python3Packages.buildPythonApplication rec { }; propagatedBuildInputs = with python3Packages; [ - pyyaml cbor2 dateutil tomlkit u-msgpack-python + pyyaml cbor2 python-dateutil tomlkit u-msgpack-python ]; meta = with lib; { diff --git a/nixpkgs/pkgs/development/tools/rust/cargo-bloat/default.nix b/nixpkgs/pkgs/development/tools/rust/cargo-bloat/default.nix index c0baf9f39645..549c3d11e3ac 100644 --- a/nixpkgs/pkgs/development/tools/rust/cargo-bloat/default.nix +++ b/nixpkgs/pkgs/development/tools/rust/cargo-bloat/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "cargo-bloat"; - version = "0.10.0"; + version = "0.10.1"; src = fetchFromGitHub { owner = "RazrFalcon"; repo = pname; rev = "v${version}"; - sha256 = "0bqzzh8vfqm7dpnb0fv4calnhsg9p3c5j06ycvg621p4zp4fydh2"; + sha256 = "sha256-VcdZ/dKqFFQs8ItNEj407z1pWJqpHwwIsuNnsQ8KU/8="; }; - cargoSha256 = "0f7hmwrs99qdvhn4lvs8cqva68w2y04fy3ca1xlhk7ncdmclcc4g"; + cargoSha256 = "sha256-1TIGv0yVhkhThqZiQW9JrvFd0eouTlr8kgN/g7b4vDM="; meta = with lib; { description = "A tool and Cargo subcommand that helps you find out what takes most of the space in your executable"; diff --git a/nixpkgs/pkgs/development/tools/rust/crate2nix/default.nix b/nixpkgs/pkgs/development/tools/rust/crate2nix/default.nix index e68eea50ff3d..a86e531e7f67 100644 --- a/nixpkgs/pkgs/development/tools/rust/crate2nix/default.nix +++ b/nixpkgs/pkgs/development/tools/rust/crate2nix/default.nix @@ -10,18 +10,18 @@ rustPlatform.buildRustPackage rec { pname = "crate2nix"; - version = "0.9.0"; + version = "0.10.0"; src = fetchFromGitHub { owner = "kolloch"; repo = pname; rev = version; - sha256 = "sha256-dB8wa3CQFw8ckD420zpBGw4TnsLrHqXf+ff/WuhPsVM="; + sha256 = "sha256-JaF9/H3m4Wrc5MtXcONkOAgKVkswLVw0yZe0dBr2e4Y="; }; sourceRoot = "source/crate2nix"; - cargoSha256 = "sha256-shWhzCaH8ZttUcq82tA7T1hwNl6F1XJy7ansA5lt+Mw="; + cargoSha256 = "sha256-PD7R1vcb3FKd4hfpViKyvfCExJ5H1Xo2HPYden5zpxQ="; nativeBuildInputs = [ makeWrapper ]; diff --git a/nixpkgs/pkgs/development/tools/rust/rust-analyzer/default.nix b/nixpkgs/pkgs/development/tools/rust/rust-analyzer/default.nix index 07b00deb9c36..a6381576ead0 100644 --- a/nixpkgs/pkgs/development/tools/rust/rust-analyzer/default.nix +++ b/nixpkgs/pkgs/development/tools/rust/rust-analyzer/default.nix @@ -7,21 +7,16 @@ rustPlatform.buildRustPackage rec { pname = "rust-analyzer-unwrapped"; - version = "2021-06-21"; - cargoSha256 = "sha256-OpfcxBeNwXSD830Sz3o07kgIdXTbZNNVGpaPeCIGGV8="; + version = "2021-07-05"; + cargoSha256 = "sha256-HmvvDHi33JAYXON98mbb+MfmJizOL4cdTbc3QDtPkZo="; src = fetchFromGitHub { owner = "rust-analyzer"; repo = "rust-analyzer"; rev = version; - sha256 = "sha256-nL5lSvxpOS+fw4iH/Gnl/DI86T9tUtguOy+wLGRkoeY="; + sha256 = "sha256-7pH38U+HMNPuO1BFP5kPTJoxGWTewRUoLrc9NXDdK2M="; }; - patches = [ - # We have rustc 1.52.1 in nixpkgs. - ./no-rust-1-53-features.patch - ]; - buildAndTestSubdir = "crates/rust-analyzer"; cargoBuildFlags = lib.optional useMimalloc "--features=mimalloc"; diff --git a/nixpkgs/pkgs/development/tools/rust/rust-analyzer/no-rust-1-53-features.patch b/nixpkgs/pkgs/development/tools/rust/rust-analyzer/no-rust-1-53-features.patch deleted file mode 100644 index 9fa54e8a9039..000000000000 --- a/nixpkgs/pkgs/development/tools/rust/rust-analyzer/no-rust-1-53-features.patch +++ /dev/null @@ -1,673 +0,0 @@ -diff --git a/crates/hir/src/semantics.rs b/crates/hir/src/semantics.rs -index 43162797e..613266e07 100644 ---- a/crates/hir/src/semantics.rs -+++ b/crates/hir/src/semantics.rs -@@ -51,14 +51,12 @@ impl PathResolution { - PathResolution::Def(ModuleDef::BuiltinType(builtin)) => { - Some(TypeNs::BuiltinType((*builtin).into())) - } -- PathResolution::Def( -- ModuleDef::Const(_) -- | ModuleDef::Variant(_) -- | ModuleDef::Function(_) -- | ModuleDef::Module(_) -- | ModuleDef::Static(_) -- | ModuleDef::Trait(_), -- ) => None, -+ PathResolution::Def(ModuleDef::Const(_)) -+ | PathResolution::Def(ModuleDef::Variant(_)) -+ | PathResolution::Def(ModuleDef::Function(_)) -+ | PathResolution::Def(ModuleDef::Module(_)) -+ | PathResolution::Def(ModuleDef::Static(_)) -+ | PathResolution::Def(ModuleDef::Trait(_)) => None, - PathResolution::Def(ModuleDef::TypeAlias(alias)) => { - Some(TypeNs::TypeAliasId((*alias).into())) - } -@@ -67,7 +65,8 @@ impl PathResolution { - } - PathResolution::TypeParam(param) => Some(TypeNs::GenericParam((*param).into())), - PathResolution::SelfType(impl_def) => Some(TypeNs::SelfType((*impl_def).into())), -- PathResolution::AssocItem(AssocItem::Const(_) | AssocItem::Function(_)) => None, -+ PathResolution::AssocItem(AssocItem::Const(_)) -+ | PathResolution::AssocItem(AssocItem::Function(_)) => None, - PathResolution::AssocItem(AssocItem::TypeAlias(alias)) => { - Some(TypeNs::TypeAliasId((*alias).into())) - } -diff --git a/crates/hir_def/src/item_tree/pretty.rs b/crates/hir_def/src/item_tree/pretty.rs -index e63bc8232..b1e1b70d0 100644 ---- a/crates/hir_def/src/item_tree/pretty.rs -+++ b/crates/hir_def/src/item_tree/pretty.rs -@@ -63,7 +63,7 @@ impl<'a> Printer<'a> { - fn blank(&mut self) { - let mut iter = self.buf.chars().rev().fuse(); - match (iter.next(), iter.next()) { -- (Some('\n'), Some('\n') | None) | (None, None) => {} -+ (Some('\n'), Some('\n')) | (Some('\n'), None) | (None, None) => {} - (Some('\n'), Some(_)) => { - self.buf.push('\n'); - } -@@ -77,7 +77,7 @@ impl<'a> Printer<'a> { - - fn whitespace(&mut self) { - match self.buf.chars().next_back() { -- None | Some('\n' | ' ') => {} -+ None | Some('\n') | Some(' ') => {} - _ => self.buf.push(' '), - } - } -diff --git a/crates/hir_def/src/nameres/collector.rs b/crates/hir_def/src/nameres/collector.rs -index 927a7b6e8..fc2c50fb8 100644 ---- a/crates/hir_def/src/nameres/collector.rs -+++ b/crates/hir_def/src/nameres/collector.rs -@@ -1260,7 +1260,7 @@ impl DefCollector<'_> { - for directive in &self.unresolved_imports { - if let ImportSource::Import { id: import, use_tree } = &directive.import.source { - match (directive.import.path.segments().first(), &directive.import.path.kind) { -- (Some(krate), PathKind::Plain | PathKind::Abs) => { -+ (Some(krate), PathKind::Plain) | (Some(krate), PathKind::Abs) => { - if diagnosed_extern_crates.contains(krate) { - continue; - } -diff --git a/crates/hir_def/src/resolver.rs b/crates/hir_def/src/resolver.rs -index 49c573087..5edd93a2a 100644 ---- a/crates/hir_def/src/resolver.rs -+++ b/crates/hir_def/src/resolver.rs -@@ -605,7 +605,8 @@ fn to_value_ns(per_ns: PerNs) -> Option<ValueNs> { - ModuleDefId::ConstId(it) => ValueNs::ConstId(it), - ModuleDefId::StaticId(it) => ValueNs::StaticId(it), - -- ModuleDefId::AdtId(AdtId::EnumId(_) | AdtId::UnionId(_)) -+ ModuleDefId::AdtId(AdtId::EnumId(_)) -+ | ModuleDefId::AdtId(AdtId::UnionId(_)) - | ModuleDefId::TraitId(_) - | ModuleDefId::TypeAliasId(_) - | ModuleDefId::BuiltinType(_) -diff --git a/crates/hir_def/src/visibility.rs b/crates/hir_def/src/visibility.rs -index aeb1e7726..83500f54e 100644 ---- a/crates/hir_def/src/visibility.rs -+++ b/crates/hir_def/src/visibility.rs -@@ -172,8 +172,9 @@ impl Visibility { - /// visible in unrelated modules). - pub(crate) fn max(self, other: Visibility, def_map: &DefMap) -> Option<Visibility> { - match (self, other) { -- (Visibility::Module(_) | Visibility::Public, Visibility::Public) -- | (Visibility::Public, Visibility::Module(_)) => Some(Visibility::Public), -+ (Visibility::Module(_), Visibility::Public) -+ | (Visibility::Public, Visibility::Module(_)) -+ | (Visibility::Public, Visibility::Public) => Some(Visibility::Public), - (Visibility::Module(mod_a), Visibility::Module(mod_b)) => { - if mod_a.krate != mod_b.krate { - return None; -diff --git a/crates/hir_expand/src/hygiene.rs b/crates/hir_expand/src/hygiene.rs -index 848522411..05c6c3fb1 100644 ---- a/crates/hir_expand/src/hygiene.rs -+++ b/crates/hir_expand/src/hygiene.rs -@@ -146,11 +146,10 @@ impl HygieneInfo { - (&self.macro_arg.1, InFile::new(loc.kind.file_id(), arg_start)) - } - mbe::Origin::Def => match (&*self.macro_def, self.def_start) { -- ( -- TokenExpander::MacroDef { def_site_token_map, .. } -- | TokenExpander::MacroRules { def_site_token_map, .. }, -- Some(tt), -- ) => (def_site_token_map, tt), -+ (TokenExpander::MacroDef { def_site_token_map, .. }, Some(tt)) -+ | (TokenExpander::MacroRules { def_site_token_map, .. }, Some(tt)) => { -+ (def_site_token_map, tt) -+ } - _ => panic!("`Origin::Def` used with non-`macro_rules!` macro"), - }, - }; -diff --git a/crates/hir_expand/src/lib.rs b/crates/hir_expand/src/lib.rs -index c31426d7c..33107aa24 100644 ---- a/crates/hir_expand/src/lib.rs -+++ b/crates/hir_expand/src/lib.rs -@@ -368,11 +368,10 @@ impl ExpansionInfo { - let (token_map, tt) = match origin { - mbe::Origin::Call => (&self.macro_arg.1, self.arg.clone()), - mbe::Origin::Def => match (&*self.macro_def, self.def.as_ref()) { -- ( -- db::TokenExpander::MacroRules { def_site_token_map, .. } -- | db::TokenExpander::MacroDef { def_site_token_map, .. }, -- Some(tt), -- ) => (def_site_token_map, tt.as_ref().map(|tt| tt.syntax().clone())), -+ (db::TokenExpander::MacroRules { def_site_token_map, .. }, Some(tt)) -+ | (db::TokenExpander::MacroDef { def_site_token_map, .. }, Some(tt)) => { -+ (def_site_token_map, tt.as_ref().map(|tt| tt.syntax().clone())) -+ } - _ => panic!("`Origin::Def` used with non-`macro_rules!` macro"), - }, - }; -diff --git a/crates/hir_ty/src/consteval.rs b/crates/hir_ty/src/consteval.rs -index ab1afce08..6f0bf8f8c 100644 ---- a/crates/hir_ty/src/consteval.rs -+++ b/crates/hir_ty/src/consteval.rs -@@ -38,7 +38,8 @@ impl ConstExt for Const { - // FIXME: support more than just evaluating literals - pub fn eval_usize(expr: &Expr) -> Option<u64> { - match expr { -- Expr::Literal(Literal::Uint(v, None | Some(BuiltinUint::Usize))) => (*v).try_into().ok(), -+ Expr::Literal(Literal::Uint(v, None)) -+ | Expr::Literal(Literal::Uint(v, Some(BuiltinUint::Usize))) => (*v).try_into().ok(), - _ => None, - } - } -diff --git a/crates/hir_ty/src/diagnostics/match_check/deconstruct_pat.rs b/crates/hir_ty/src/diagnostics/match_check/deconstruct_pat.rs -index e3d640a79..471cd4921 100644 ---- a/crates/hir_ty/src/diagnostics/match_check/deconstruct_pat.rs -+++ b/crates/hir_ty/src/diagnostics/match_check/deconstruct_pat.rs -@@ -84,7 +84,10 @@ impl IntRange { - #[inline] - fn is_integral(ty: &Ty) -> bool { - match ty.kind(&Interner) { -- TyKind::Scalar(Scalar::Char | Scalar::Int(_) | Scalar::Uint(_) | Scalar::Bool) => true, -+ TyKind::Scalar(Scalar::Char) -+ | TyKind::Scalar(Scalar::Int(_)) -+ | TyKind::Scalar(Scalar::Uint(_)) -+ | TyKind::Scalar(Scalar::Bool) => true, - _ => false, - } - } -@@ -378,7 +381,7 @@ impl Constructor { - // Wildcards cover anything - (_, Wildcard) => true, - // The missing ctors are not covered by anything in the matrix except wildcards. -- (Missing | Wildcard, _) => false, -+ (Missing, _) | (Wildcard, _) => false, - - (Single, Single) => true, - (Variant(self_id), Variant(other_id)) => self_id == other_id, -@@ -520,7 +523,7 @@ impl SplitWildcard { - } - } - TyKind::Scalar(Scalar::Char) => unhandled(), -- TyKind::Scalar(Scalar::Int(..) | Scalar::Uint(..)) => unhandled(), -+ TyKind::Scalar(Scalar::Int(..)) | TyKind::Scalar(Scalar::Uint(..)) => unhandled(), - TyKind::Never if !cx.feature_exhaustive_patterns() && !pcx.is_top_level => { - smallvec![NonExhaustive] - } -diff --git a/crates/hir_ty/src/infer/coerce.rs b/crates/hir_ty/src/infer/coerce.rs -index 7be914451..4b7f31521 100644 ---- a/crates/hir_ty/src/infer/coerce.rs -+++ b/crates/hir_ty/src/infer/coerce.rs -@@ -47,7 +47,10 @@ impl<'a> InferenceContext<'a> { - // pointers to have a chance at getting a match. See - // https://github.com/rust-lang/rust/blob/7b805396bf46dce972692a6846ce2ad8481c5f85/src/librustc_typeck/check/coercion.rs#L877-L916 - let sig = match (ty1.kind(&Interner), ty2.kind(&Interner)) { -- (TyKind::FnDef(..) | TyKind::Closure(..), TyKind::FnDef(..) | TyKind::Closure(..)) => { -+ (TyKind::FnDef(..), TyKind::FnDef(..)) -+ | (TyKind::Closure(..), TyKind::FnDef(..)) -+ | (TyKind::FnDef(..), TyKind::Closure(..)) -+ | (TyKind::Closure(..), TyKind::Closure(..)) => { - // FIXME: we're ignoring safety here. To be more correct, if we have one FnDef and one Closure, - // we should be coercing the closure to a fn pointer of the safety of the FnDef - cov_mark::hit!(coerce_fn_reification); -@@ -445,7 +448,8 @@ fn safe_to_unsafe_fn_ty(fn_ty: FnPointer) -> FnPointer { - - fn coerce_mutabilities(from: Mutability, to: Mutability) -> Result<(), TypeError> { - match (from, to) { -- (Mutability::Mut, Mutability::Mut | Mutability::Not) -+ (Mutability::Mut, Mutability::Mut) -+ | (Mutability::Mut, Mutability::Not) - | (Mutability::Not, Mutability::Not) => Ok(()), - (Mutability::Not, Mutability::Mut) => Err(TypeError), - } -diff --git a/crates/hir_ty/src/infer/expr.rs b/crates/hir_ty/src/infer/expr.rs -index c3a5b979f..346e94128 100644 ---- a/crates/hir_ty/src/infer/expr.rs -+++ b/crates/hir_ty/src/infer/expr.rs -@@ -593,11 +593,11 @@ impl<'a> InferenceContext<'a> { - UnaryOp::Neg => { - match inner_ty.kind(&Interner) { - // Fast path for builtins -- TyKind::Scalar(Scalar::Int(_) | Scalar::Uint(_) | Scalar::Float(_)) -- | TyKind::InferenceVar( -- _, -- TyVariableKind::Integer | TyVariableKind::Float, -- ) => inner_ty, -+ TyKind::Scalar(Scalar::Int(_)) -+ | TyKind::Scalar(Scalar::Uint(_)) -+ | TyKind::Scalar(Scalar::Float(_)) -+ | TyKind::InferenceVar(_, TyVariableKind::Integer) -+ | TyKind::InferenceVar(_, TyVariableKind::Float) => inner_ty, - // Otherwise we resolve via the std::ops::Neg trait - _ => self - .resolve_associated_type(inner_ty, self.resolve_ops_neg_output()), -@@ -606,7 +606,9 @@ impl<'a> InferenceContext<'a> { - UnaryOp::Not => { - match inner_ty.kind(&Interner) { - // Fast path for builtins -- TyKind::Scalar(Scalar::Bool | Scalar::Int(_) | Scalar::Uint(_)) -+ TyKind::Scalar(Scalar::Bool) -+ | TyKind::Scalar(Scalar::Int(_)) -+ | TyKind::Scalar(Scalar::Uint(_)) - | TyKind::InferenceVar(_, TyVariableKind::Integer) => inner_ty, - // Otherwise we resolve via the std::ops::Not trait - _ => self -@@ -733,7 +735,7 @@ impl<'a> InferenceContext<'a> { - Expr::Array(array) => { - let elem_ty = - match expected.to_option(&mut self.table).as_ref().map(|t| t.kind(&Interner)) { -- Some(TyKind::Array(st, _) | TyKind::Slice(st)) => st.clone(), -+ Some(TyKind::Array(st, _)) | Some(TyKind::Slice(st)) => st.clone(), - _ => self.table.new_type_var(), - }; - -diff --git a/crates/hir_ty/src/infer/pat.rs b/crates/hir_ty/src/infer/pat.rs -index c79ed91ea..80ecd4ea9 100644 ---- a/crates/hir_ty/src/infer/pat.rs -+++ b/crates/hir_ty/src/infer/pat.rs -@@ -297,11 +297,10 @@ fn is_non_ref_pat(body: &hir_def::body::Body, pat: PatId) -> bool { - Expr::Literal(Literal::String(..)) => false, - _ => true, - }, -- Pat::Bind { -- mode: BindingAnnotation::Mutable | BindingAnnotation::Unannotated, -- subpat: Some(subpat), -- .. -- } => is_non_ref_pat(body, *subpat), -+ Pat::Bind { mode: BindingAnnotation::Mutable, subpat: Some(subpat), .. } -+ | Pat::Bind { mode: BindingAnnotation::Unannotated, subpat: Some(subpat), .. } => { -+ is_non_ref_pat(body, *subpat) -+ } - Pat::Wild | Pat::Bind { .. } | Pat::Ref { .. } | Pat::Box { .. } | Pat::Missing => false, - } - } -diff --git a/crates/hir_ty/src/op.rs b/crates/hir_ty/src/op.rs -index 5ef6342d5..0222de2bc 100644 ---- a/crates/hir_ty/src/op.rs -+++ b/crates/hir_ty/src/op.rs -@@ -8,15 +8,17 @@ pub(super) fn binary_op_return_ty(op: BinaryOp, lhs_ty: Ty, rhs_ty: Ty) -> Ty { - match op { - BinaryOp::LogicOp(_) | BinaryOp::CmpOp(_) => TyKind::Scalar(Scalar::Bool).intern(&Interner), - BinaryOp::Assignment { .. } => TyBuilder::unit(), -- BinaryOp::ArithOp(ArithOp::Shl | ArithOp::Shr) => { -+ BinaryOp::ArithOp(ArithOp::Shl) | BinaryOp::ArithOp(ArithOp::Shr) => { - // all integer combinations are valid here - if matches!( - lhs_ty.kind(&Interner), -- TyKind::Scalar(Scalar::Int(_) | Scalar::Uint(_)) -+ TyKind::Scalar(Scalar::Int(_)) -+ | TyKind::Scalar(Scalar::Uint(_)) - | TyKind::InferenceVar(_, TyVariableKind::Integer) - ) && matches!( - rhs_ty.kind(&Interner), -- TyKind::Scalar(Scalar::Int(_) | Scalar::Uint(_)) -+ TyKind::Scalar(Scalar::Int(_)) -+ | TyKind::Scalar(Scalar::Uint(_)) - | TyKind::InferenceVar(_, TyVariableKind::Integer) - ) { - lhs_ty -@@ -30,15 +32,15 @@ pub(super) fn binary_op_return_ty(op: BinaryOp, lhs_ty: Ty, rhs_ty: Ty) -> Ty { - | (TyKind::Scalar(Scalar::Uint(_)), TyKind::Scalar(Scalar::Uint(_))) - | (TyKind::Scalar(Scalar::Float(_)), TyKind::Scalar(Scalar::Float(_))) => rhs_ty, - // ({int}, int) | ({int}, uint) -- ( -- TyKind::InferenceVar(_, TyVariableKind::Integer), -- TyKind::Scalar(Scalar::Int(_) | Scalar::Uint(_)), -- ) => rhs_ty, -+ (TyKind::InferenceVar(_, TyVariableKind::Integer), TyKind::Scalar(Scalar::Int(_))) -+ | (TyKind::InferenceVar(_, TyVariableKind::Integer), TyKind::Scalar(Scalar::Uint(_))) => { -+ rhs_ty -+ } - // (int, {int}) | (uint, {int}) -- ( -- TyKind::Scalar(Scalar::Int(_) | Scalar::Uint(_)), -- TyKind::InferenceVar(_, TyVariableKind::Integer), -- ) => lhs_ty, -+ (TyKind::Scalar(Scalar::Int(_)), TyKind::InferenceVar(_, TyVariableKind::Integer)) -+ | (TyKind::Scalar(Scalar::Uint(_)), TyKind::InferenceVar(_, TyVariableKind::Integer)) => { -+ lhs_ty -+ } - // ({float} | float) - (TyKind::InferenceVar(_, TyVariableKind::Float), TyKind::Scalar(Scalar::Float(_))) => { - rhs_ty -@@ -67,15 +69,21 @@ pub(super) fn binary_op_rhs_expectation(op: BinaryOp, lhs_ty: Ty) -> Ty { - BinaryOp::Assignment { op: None } => lhs_ty, - BinaryOp::CmpOp(CmpOp::Eq { .. }) => match lhs_ty.kind(&Interner) { - TyKind::Scalar(_) | TyKind::Str => lhs_ty, -- TyKind::InferenceVar(_, TyVariableKind::Integer | TyVariableKind::Float) => lhs_ty, -+ TyKind::InferenceVar(_, TyVariableKind::Integer) -+ | TyKind::InferenceVar(_, TyVariableKind::Float) => lhs_ty, - _ => TyKind::Error.intern(&Interner), - }, -- BinaryOp::ArithOp(ArithOp::Shl | ArithOp::Shr) => TyKind::Error.intern(&Interner), -+ BinaryOp::ArithOp(ArithOp::Shl) | BinaryOp::ArithOp(ArithOp::Shr) => { -+ TyKind::Error.intern(&Interner) -+ } - BinaryOp::CmpOp(CmpOp::Ord { .. }) - | BinaryOp::Assignment { op: Some(_) } - | BinaryOp::ArithOp(_) => match lhs_ty.kind(&Interner) { -- TyKind::Scalar(Scalar::Int(_) | Scalar::Uint(_) | Scalar::Float(_)) => lhs_ty, -- TyKind::InferenceVar(_, TyVariableKind::Integer | TyVariableKind::Float) => lhs_ty, -+ TyKind::Scalar(Scalar::Int(_)) -+ | TyKind::Scalar(Scalar::Uint(_)) -+ | TyKind::Scalar(Scalar::Float(_)) => lhs_ty, -+ TyKind::InferenceVar(_, TyVariableKind::Integer) -+ | TyKind::InferenceVar(_, TyVariableKind::Float) => lhs_ty, - _ => TyKind::Error.intern(&Interner), - }, - } -diff --git a/crates/ide/src/join_lines.rs b/crates/ide/src/join_lines.rs -index ffa8bd182..93d3760bf 100644 ---- a/crates/ide/src/join_lines.rs -+++ b/crates/ide/src/join_lines.rs -@@ -197,7 +197,7 @@ fn join_single_use_tree(edit: &mut TextEditBuilder, token: &SyntaxToken) -> Opti - } - - fn is_trailing_comma(left: SyntaxKind, right: SyntaxKind) -> bool { -- matches!((left, right), (T![,], T![')'] | T![']'])) -+ matches!((left, right), (T![,], T![')']) | (T![,], T![']'])) - } - - fn compute_ws(left: SyntaxKind, right: SyntaxKind) -> &'static str { -diff --git a/crates/ide/src/references.rs b/crates/ide/src/references.rs -index 5808562a7..945c9b9e1 100644 ---- a/crates/ide/src/references.rs -+++ b/crates/ide/src/references.rs -@@ -79,7 +79,8 @@ pub(crate) fn find_all_refs( - }); - usages.references.retain(|_, it| !it.is_empty()); - } -- Definition::ModuleDef(hir::ModuleDef::Adt(_) | hir::ModuleDef::Variant(_)) => { -+ Definition::ModuleDef(hir::ModuleDef::Adt(_)) -+ | Definition::ModuleDef(hir::ModuleDef::Variant(_)) => { - refs.for_each(|it| { - it.retain(|reference| { - reference.name.as_name_ref().map_or(false, is_lit_name_ref) -diff --git a/crates/ide/src/syntax_highlighting.rs b/crates/ide/src/syntax_highlighting.rs -index d44a1b45f..e186b82b7 100644 ---- a/crates/ide/src/syntax_highlighting.rs -+++ b/crates/ide/src/syntax_highlighting.rs -@@ -294,7 +294,7 @@ fn traverse( - Some(parent) => { - // We only care Name and Name_ref - match (token.kind(), parent.kind()) { -- (IDENT, NAME | NAME_REF) => parent.into(), -+ (IDENT, NAME) | (IDENT, NAME_REF) => parent.into(), - _ => token.into(), - } - } -@@ -310,7 +310,7 @@ fn traverse( - Some(parent) => { - // We only care Name and Name_ref - match (token.kind(), parent.kind()) { -- (IDENT, NAME | NAME_REF) => parent.into(), -+ (IDENT, NAME) | (IDENT, NAME_REF) => parent.into(), - _ => token.into(), - } - } -diff --git a/crates/ide_assists/src/handlers/extract_function.rs b/crates/ide_assists/src/handlers/extract_function.rs -index ac7f0959b..9b78cf4b1 100644 ---- a/crates/ide_assists/src/handlers/extract_function.rs -+++ b/crates/ide_assists/src/handlers/extract_function.rs -@@ -1384,7 +1384,7 @@ fn fix_param_usages(ctx: &AssistContext, params: &[Param], syntax: &SyntaxNode) - for (param, usages) in usages_for_param { - for usage in usages { - match usage.syntax().ancestors().skip(1).find_map(ast::Expr::cast) { -- Some(ast::Expr::MethodCallExpr(_) | ast::Expr::FieldExpr(_)) => { -+ Some(ast::Expr::MethodCallExpr(_)) | Some(ast::Expr::FieldExpr(_)) => { - // do nothing - } - Some(ast::Expr::RefExpr(node)) -diff --git a/crates/ide_assists/src/tests.rs b/crates/ide_assists/src/tests.rs -index 841537c77..d9d9124b6 100644 ---- a/crates/ide_assists/src/tests.rs -+++ b/crates/ide_assists/src/tests.rs -@@ -181,10 +181,9 @@ fn check(handler: Handler, before: &str, expected: ExpectedResult, assist_label: - "unresolved assist should not contain source changes" - ), - (Some(_), ExpectedResult::NotApplicable) => panic!("assist should not be applicable!"), -- ( -- None, -- ExpectedResult::After(_) | ExpectedResult::Target(_) | ExpectedResult::Unresolved, -- ) => { -+ (None, ExpectedResult::After(_)) -+ | (None, ExpectedResult::Target(_)) -+ | (None, ExpectedResult::Unresolved) => { - panic!("code action is not applicable") - } - (None, ExpectedResult::NotApplicable) => (), -diff --git a/crates/ide_completion/src/completions/qualified_path.rs b/crates/ide_completion/src/completions/qualified_path.rs -index f5dbd203b..88f4d940d 100644 ---- a/crates/ide_completion/src/completions/qualified_path.rs -+++ b/crates/ide_completion/src/completions/qualified_path.rs -@@ -65,11 +65,9 @@ pub(crate) fn complete_qualified_path(acc: &mut Completions, ctx: &CompletionCon - // Don't suggest attribute macros and derives. - hir::ScopeDef::MacroDef(mac) => mac.is_fn_like(), - // no values in type places -- hir::ScopeDef::ModuleDef( -- hir::ModuleDef::Function(_) -- | hir::ModuleDef::Variant(_) -- | hir::ModuleDef::Static(_), -- ) -+ hir::ScopeDef::ModuleDef(hir::ModuleDef::Function(_)) -+ | hir::ScopeDef::ModuleDef(hir::ModuleDef::Variant(_)) -+ | hir::ScopeDef::ModuleDef(hir::ModuleDef::Static(_)) - | hir::ScopeDef::Local(_) => !ctx.expects_type(), - // unless its a constant in a generic arg list position - hir::ScopeDef::ModuleDef(hir::ModuleDef::Const(_)) => { -@@ -83,13 +81,9 @@ pub(crate) fn complete_qualified_path(acc: &mut Completions, ctx: &CompletionCon - } - } - } -- hir::PathResolution::Def( -- def -- @ -- (hir::ModuleDef::Adt(_) -- | hir::ModuleDef::TypeAlias(_) -- | hir::ModuleDef::BuiltinType(_)), -- ) => { -+ hir::PathResolution::Def(def @ hir::ModuleDef::Adt(_)) -+ | hir::PathResolution::Def(def @ hir::ModuleDef::TypeAlias(_)) -+ | hir::PathResolution::Def(def @ hir::ModuleDef::BuiltinType(_)) => { - if let hir::ModuleDef::Adt(hir::Adt::Enum(e)) = def { - add_enum_variants(acc, ctx, e); - } -diff --git a/crates/ide_completion/src/completions/unqualified_path.rs b/crates/ide_completion/src/completions/unqualified_path.rs -index 81c4fb305..8ea5a2d5b 100644 ---- a/crates/ide_completion/src/completions/unqualified_path.rs -+++ b/crates/ide_completion/src/completions/unqualified_path.rs -@@ -74,11 +74,9 @@ pub(crate) fn complete_unqualified_path(acc: &mut Completions, ctx: &CompletionC - // Don't suggest attribute macros and derives. - ScopeDef::MacroDef(mac) => mac.is_fn_like(), - // no values in type places -- ScopeDef::ModuleDef( -- hir::ModuleDef::Function(_) -- | hir::ModuleDef::Variant(_) -- | hir::ModuleDef::Static(_), -- ) -+ ScopeDef::ModuleDef(hir::ModuleDef::Function(_)) -+ | ScopeDef::ModuleDef(hir::ModuleDef::Variant(_)) -+ | ScopeDef::ModuleDef(hir::ModuleDef::Static(_)) - | ScopeDef::Local(_) => !ctx.expects_type(), - // unless its a constant in a generic arg list position - ScopeDef::ModuleDef(hir::ModuleDef::Const(_)) -diff --git a/crates/ide_completion/src/context.rs b/crates/ide_completion/src/context.rs -index 7b76600df..09eb953fd 100644 ---- a/crates/ide_completion/src/context.rs -+++ b/crates/ide_completion/src/context.rs -@@ -242,23 +242,24 @@ impl<'a> CompletionContext<'a> { - } - - pub(crate) fn expects_assoc_item(&self) -> bool { -- matches!(self.completion_location, Some(ImmediateLocation::Trait | ImmediateLocation::Impl)) -+ matches!( -+ self.completion_location, -+ Some(ImmediateLocation::Trait) | Some(ImmediateLocation::Impl) -+ ) - } - - pub(crate) fn has_dot_receiver(&self) -> bool { - matches!( - &self.completion_location, -- Some(ImmediateLocation::FieldAccess { receiver, .. } | ImmediateLocation::MethodCall { receiver,.. }) -+ Some(ImmediateLocation::FieldAccess { receiver, .. }) | Some(ImmediateLocation::MethodCall { receiver,.. }) - if receiver.is_some() - ) - } - - pub(crate) fn dot_receiver(&self) -> Option<&ast::Expr> { - match &self.completion_location { -- Some( -- ImmediateLocation::MethodCall { receiver, .. } -- | ImmediateLocation::FieldAccess { receiver, .. }, -- ) => receiver.as_ref(), -+ Some(ImmediateLocation::MethodCall { receiver, .. }) -+ | Some(ImmediateLocation::FieldAccess { receiver, .. }) => receiver.as_ref(), - _ => None, - } - } -@@ -282,7 +283,7 @@ impl<'a> CompletionContext<'a> { - pub(crate) fn expects_ident_pat_or_ref_expr(&self) -> bool { - matches!( - self.completion_location, -- Some(ImmediateLocation::IdentPat | ImmediateLocation::RefExpr) -+ Some(ImmediateLocation::IdentPat) | Some(ImmediateLocation::RefExpr) - ) - } - -@@ -293,14 +294,14 @@ impl<'a> CompletionContext<'a> { - pub(crate) fn in_use_tree(&self) -> bool { - matches!( - self.completion_location, -- Some(ImmediateLocation::Use | ImmediateLocation::UseTree) -+ Some(ImmediateLocation::Use) | Some(ImmediateLocation::UseTree) - ) - } - - pub(crate) fn has_impl_or_trait_prev_sibling(&self) -> bool { - matches!( - self.prev_sibling, -- Some(ImmediatePrevSibling::ImplDefType | ImmediatePrevSibling::TraitDefName) -+ Some(ImmediatePrevSibling::ImplDefType) | Some(ImmediatePrevSibling::TraitDefName) - ) - } - -@@ -321,16 +322,14 @@ impl<'a> CompletionContext<'a> { - || self.previous_token_is(T![unsafe]) - || matches!( - self.prev_sibling, -- Some(ImmediatePrevSibling::Attribute | ImmediatePrevSibling::Visibility) -+ Some(ImmediatePrevSibling::Attribute) | Some(ImmediatePrevSibling::Visibility) - ) - || matches!( - self.completion_location, -- Some( -- ImmediateLocation::Attribute(_) -- | ImmediateLocation::ModDeclaration(_) -- | ImmediateLocation::RecordPat(_) -- | ImmediateLocation::RecordExpr(_) -- ) -+ Some(ImmediateLocation::Attribute(_)) -+ | Some(ImmediateLocation::ModDeclaration(_)) -+ | Some(ImmediateLocation::RecordPat(_)) -+ | Some(ImmediateLocation::RecordExpr(_)) - ) - } - -@@ -704,8 +703,8 @@ fn path_or_use_tree_qualifier(path: &ast::Path) -> Option<(ast::Path, bool)> { - - fn has_ref(token: &SyntaxToken) -> bool { - let mut token = token.clone(); -- for skip in [WHITESPACE, IDENT, T![mut]] { -- if token.kind() == skip { -+ for skip in &[WHITESPACE, IDENT, T![mut]] { -+ if token.kind() == *skip { - token = match token.prev_token() { - Some(it) => it, - None => return false, -diff --git a/crates/ide_completion/src/render/builder_ext.rs b/crates/ide_completion/src/render/builder_ext.rs -index 33d3a5ee1..749dfc665 100644 ---- a/crates/ide_completion/src/render/builder_ext.rs -+++ b/crates/ide_completion/src/render/builder_ext.rs -@@ -32,7 +32,7 @@ impl Builder { - cov_mark::hit!(no_parens_in_use_item); - return false; - } -- if matches!(ctx.path_call_kind(), Some(CallKind::Expr | CallKind::Pat)) -+ if matches!(ctx.path_call_kind(), Some(CallKind::Expr) | Some(CallKind::Pat)) - | matches!( - ctx.completion_location, - Some(ImmediateLocation::MethodCall { has_parens: true, .. }) -diff --git a/crates/mbe/src/expander/matcher.rs b/crates/mbe/src/expander/matcher.rs -index b4f2fe9a4..c2a9a38c9 100644 ---- a/crates/mbe/src/expander/matcher.rs -+++ b/crates/mbe/src/expander/matcher.rs -@@ -804,17 +804,33 @@ impl<'a> TtIter<'a> { - }; - - match (punct.char, second, third) { -- ('.', '.', Some('.' | '=')) | ('<', '<', Some('=')) | ('>', '>', Some('=')) => { -+ ('.', '.', Some('.')) -+ | ('.', '.', Some('=')) -+ | ('<', '<', Some('=')) -+ | ('>', '>', Some('=')) => { - let tt2 = self.next().unwrap().clone(); - let tt3 = self.next().unwrap().clone(); - Ok(tt::Subtree { delimiter: None, token_trees: vec![tt, tt2, tt3] }.into()) - } -- ('-' | '!' | '*' | '/' | '&' | '%' | '^' | '+' | '<' | '=' | '>' | '|', '=', _) -- | ('-' | '=' | '>', '>', _) -+ ('-', '=', _) -+ | ('-', '>', _) - | (':', ':', _) -+ | ('!', '=', _) - | ('.', '.', _) -+ | ('*', '=', _) -+ | ('/', '=', _) - | ('&', '&', _) -+ | ('&', '=', _) -+ | ('%', '=', _) -+ | ('^', '=', _) -+ | ('+', '=', _) - | ('<', '<', _) -+ | ('<', '=', _) -+ | ('=', '=', _) -+ | ('=', '>', _) -+ | ('>', '=', _) -+ | ('>', '>', _) -+ | ('|', '=', _) - | ('|', '|', _) => { - let tt2 = self.next().unwrap().clone(); - Ok(tt::Subtree { delimiter: None, token_trees: vec![tt, tt2] }.into()) -diff --git a/crates/parser/src/grammar/params.rs b/crates/parser/src/grammar/params.rs -index 5a78675fb..e0c1d3b3a 100644 ---- a/crates/parser/src/grammar/params.rs -+++ b/crates/parser/src/grammar/params.rs -@@ -184,7 +184,8 @@ fn opt_self_param(p: &mut Parser, m: Marker) -> Result<(), Marker> { - if !matches!( - (p.current(), la1, la2, la3), - (T![&], T![self], _, _) -- | (T![&], T![mut] | LIFETIME_IDENT, T![self], _) -+ | (T![&], LIFETIME_IDENT, T![self], _) -+ | (T![&], T![mut], T![self], _) - | (T![&], LIFETIME_IDENT, T![mut], T![self]) - ) { - return Err(m); -diff --git a/crates/vfs/src/vfs_path.rs b/crates/vfs/src/vfs_path.rs -index ef2d7657a..2b3d7fd84 100644 ---- a/crates/vfs/src/vfs_path.rs -+++ b/crates/vfs/src/vfs_path.rs -@@ -389,7 +389,7 @@ impl VirtualPath { - - match (file_stem, extension) { - (None, None) => None, -- (None | Some(""), Some(_)) => Some((file_name, None)), -+ (None, Some(_)) | (Some(""), Some(_)) => Some((file_name, None)), - (Some(file_stem), extension) => Some((file_stem, extension)), - } - } -diff --git a/xtask/src/install.rs b/xtask/src/install.rs -index 64ab12b42..7e2dccdfe 100644 ---- a/xtask/src/install.rs -+++ b/xtask/src/install.rs -@@ -8,7 +8,7 @@ use xshell::{cmd, pushd}; - use crate::flags; - - // Latest stable, feel free to send a PR if this lags behind. --const REQUIRED_RUST_VERSION: u32 = 53; -+const REQUIRED_RUST_VERSION: u32 = 52; - - impl flags::Install { - pub(crate) fn run(self) -> Result<()> { diff --git a/nixpkgs/pkgs/development/tools/skopeo/default.nix b/nixpkgs/pkgs/development/tools/skopeo/default.nix index 2af1d5e2a074..ed704b0639a0 100644 --- a/nixpkgs/pkgs/development/tools/skopeo/default.nix +++ b/nixpkgs/pkgs/development/tools/skopeo/default.nix @@ -14,13 +14,13 @@ buildGoModule rec { pname = "skopeo"; - version = "1.3.0"; + version = "1.3.1"; src = fetchFromGitHub { rev = "v${version}"; owner = "containers"; repo = "skopeo"; - sha256 = "sha256-ZHEujkl+GUk5WjgDWdbJwOIKuOqJnIpGnvD1SsrHuhI="; + sha256 = "sha256-ARNsNt5xpXn4ifnnRdmkhJAJq98ri3+oAF+Uov+byI0="; }; outputs = [ "out" "man" ]; diff --git a/nixpkgs/pkgs/development/tools/tapview/default.nix b/nixpkgs/pkgs/development/tools/tapview/default.nix new file mode 100644 index 000000000000..966df4bed65e --- /dev/null +++ b/nixpkgs/pkgs/development/tools/tapview/default.nix @@ -0,0 +1,32 @@ +{ asciidoctor +, fetchFromGitLab +, lib +, stdenv +}: + +stdenv.mkDerivation rec { + pname = "tapview"; + version = "1.1"; + + nativeBuildInputs = [ asciidoctor ]; + + src = fetchFromGitLab { + owner = "esr"; + repo = pname; + rev = version; + sha256 = "sha256-inrxICNglZU/tup+YnHaDiVss32K2OXht/7f8lOZI4g="; + }; + + # Remove unecessary `echo` checks: `/bin/echo` fails, and `echo -n` works as expected. + patches = [ ./dont_check_echo.patch ]; + + makeFlags = [ "prefix=$(out)" ]; + + meta = with lib; { + description = "A minimalist pure consumer for TAP (Test Anything Protocol)"; + homepage = "https://gitlab.com/esr/tapview"; + license = licenses.bsd2; + platforms = platforms.all; + maintainers = with maintainers; [ pamplemousse ]; + }; +} diff --git a/nixpkgs/pkgs/development/tools/tapview/dont_check_echo.patch b/nixpkgs/pkgs/development/tools/tapview/dont_check_echo.patch new file mode 100644 index 000000000000..3b12adb84c57 --- /dev/null +++ b/nixpkgs/pkgs/development/tools/tapview/dont_check_echo.patch @@ -0,0 +1,44 @@ +diff --git a/tapview b/tapview +index ad6a33a66d1..4cf9545d42f 100644 +--- a/tapview ++++ b/tapview +@@ -13,21 +13,6 @@ + # + # This is version 1.1 + # A newer version may be available at https://gitlab.com/esr/tapview +-# +-# POSIX allows but does not mandate that -n suppresses emission of a +-# trailing newline in echo. Thus, some shell builtin echos don't do +-# that. Cope gracefully. +-# shellcheck disable=SC2039 +-if [ "$(echo -n "a"; echo "b")" != "ab" ] +-then +- ECHO="echo" +-elif [ "$(/bin/echo -n "a"; /bin/echo "b")" = "ab" ] +-then +- ECHO="/bin/echo" +-else +- echo "tapview: bailing out, your echo lacks -n support." +- exit 3 +-fi + + OK="." + FAIL="F" +@@ -37,7 +22,7 @@ TODO_OK="u" + + ship_char() { + # shellcheck disable=SC2039 +- "${ECHO}" -n "$1" ++ echo -n "$1" + } + + ship_line() { +@@ -155,7 +140,7 @@ do + fi + done + +-/bin/echo "" ++echo "" + + if [ -z "$expect" ] + then diff --git a/nixpkgs/pkgs/development/tools/unity3d/default.nix b/nixpkgs/pkgs/development/tools/unity3d/default.nix index 9333864c69b9..5470c45b138a 100644 --- a/nixpkgs/pkgs/development/tools/unity3d/default.nix +++ b/nixpkgs/pkgs/development/tools/unity3d/default.nix @@ -30,7 +30,7 @@ in stdenv.mkDerivation { src = fetchurl { url = "https://beta.unity3d.com/download/6e9a27477296/LinuxEditorInstaller/Unity.tar.xz"; - sha1 = "083imikkrgha5w9sihjvv1m74naxm5yv"; + sha256 = "10gppnqacs1qzahj077nkcgbfz2lryd0dxnfcmvyc64xpxnj9nlk"; }; nosuidLib = ./unity-nosuid.c; diff --git a/nixpkgs/pkgs/development/tools/vala-language-server/default.nix b/nixpkgs/pkgs/development/tools/vala-language-server/default.nix index 7a5ab2ae4190..1d211e55ad87 100644 --- a/nixpkgs/pkgs/development/tools/vala-language-server/default.nix +++ b/nixpkgs/pkgs/development/tools/vala-language-server/default.nix @@ -16,13 +16,13 @@ stdenv.mkDerivation rec { pname = "vala-language-server"; - version = "0.48.2"; + version = "0.48.3"; src = fetchFromGitHub { - owner = "benwaffle"; + owner = "Prince781"; repo = pname; rev = version; - sha256 = "sha256-vtb2l4su+zuwGbS9F+Sv0tDInQMH4Uw6GjT+s7fHIio="; + sha256 = "sha256-MhVwK4RtEAJcwcJe71ganCaXQHa9jzxyknzc9kJi274="; }; passthru = { @@ -51,7 +51,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Code Intelligence for Vala & Genie"; - homepage = "https://github.com/benwaffle/vala-language-server"; + homepage = "https://github.com/Prince781/vala-language-server"; license = licenses.lgpl21Plus; maintainers = with maintainers; [ andreasfelix ]; platforms = platforms.linux; diff --git a/nixpkgs/pkgs/development/tools/wp-cli/default.nix b/nixpkgs/pkgs/development/tools/wp-cli/default.nix index 901435bb631f..8d8b1a004d5e 100644 --- a/nixpkgs/pkgs/development/tools/wp-cli/default.nix +++ b/nixpkgs/pkgs/development/tools/wp-cli/default.nix @@ -1,10 +1,10 @@ { stdenv, lib, fetchurl, writeText, php, makeWrapper }: let - version = "2.4.0"; + version = "2.5.0"; completion = fetchurl { url = "https://raw.githubusercontent.com/wp-cli/wp-cli/v${version}/utils/wp-completion.bash"; - sha256 = "15d330x6d3fizrm6ckzmdknqg6wjlx5fr87bmkbd5s6a1ihs0g24"; + sha256 = "sha256-RDygYQzK6NLWrOug7EqnkpuH7Wz1T2Zq/tGNZjoYo5U="; }; ini = writeText "php.ini" '' @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "https://github.com/wp-cli/wp-cli/releases/download/v${version}/${pname}-${version}.phar"; - sha256 = "0h5mjxrw4z3648v4wb4pvapz2a1mlmbszgggg4b7bvrrxn3cr78k"; + sha256 = "sha256-vghT6fRD84SFZgcIcdNE6K2B6x4V0V3PkyS0p14nJ4k="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/nixpkgs/pkgs/development/web/cypress/default.nix b/nixpkgs/pkgs/development/web/cypress/default.nix index 9563563bc427..0b61aa23086f 100644 --- a/nixpkgs/pkgs/development/web/cypress/default.nix +++ b/nixpkgs/pkgs/development/web/cypress/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "cypress"; - version = "7.5.0"; + version = "7.7.0"; src = fetchzip { url = "https://cdn.cypress.io/desktop/${version}/linux-x64/cypress.zip"; - sha256 = "07i475b17v8qazdq6qzjqsdfpvhg1b8x1p5a51hwhcxaym3p5njj"; + sha256 = "1mr46raha5aqi8ba0cqvyil5z4vcr46hnxqqmpk3fkrr8awd2897"; }; passthru.updateScript = ./update.sh; diff --git a/nixpkgs/pkgs/development/web/deno/default.nix b/nixpkgs/pkgs/development/web/deno/default.nix index 85f7c294e9d6..b469a49eb722 100644 --- a/nixpkgs/pkgs/development/web/deno/default.nix +++ b/nixpkgs/pkgs/development/web/deno/default.nix @@ -17,15 +17,15 @@ rustPlatform.buildRustPackage rec { pname = "deno"; - version = "1.11.2"; + version = "1.11.3"; src = fetchFromGitHub { owner = "denoland"; repo = pname; rev = "v${version}"; - sha256 = "sha256-/dy+jAm9TioDF8rZtLNFlKcu7ASzvvoVq4dun4gkiCA="; + sha256 = "sha256-Ru75eyyyaaFDD71AzDE5kgLsiB7thjqrJvvnA/PdvrA="; }; - cargoSha256 = "sha256-AUNDwbiGHiA+GADnLo/CmKAMhv68BPnvXsZaWacDJ2Y="; + cargoSha256 = "sha256-8UnsmIDdFEKp4diJ6Cr/fsbPKlw7wGHmGjXu5oqh2HI="; # Install completions post-install nativeBuildInputs = [ installShellFiles ]; diff --git a/nixpkgs/pkgs/development/web/flyctl/default.nix b/nixpkgs/pkgs/development/web/flyctl/default.nix index 130ff9c9bcbf..3c61121b0357 100644 --- a/nixpkgs/pkgs/development/web/flyctl/default.nix +++ b/nixpkgs/pkgs/development/web/flyctl/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "flyctl"; - version = "0.0.227"; + version = "0.0.228"; src = fetchFromGitHub { owner = "superfly"; repo = "flyctl"; rev = "v${version}"; - sha256 = "sha256-nql0zK2H0FDQMsnSJSNzC7YmvUZfITHH5p1efFHsj58="; + sha256 = "sha256-h8ZiAabB0IIJoeQMMvOO1lQNMdFYAoTXKcTAPmLP5Sw="; }; preBuild = '' diff --git a/nixpkgs/pkgs/development/web/insomnia/default.nix b/nixpkgs/pkgs/development/web/insomnia/default.nix index 3ba900f3f691..8fcf4696d0e1 100644 --- a/nixpkgs/pkgs/development/web/insomnia/default.nix +++ b/nixpkgs/pkgs/development/web/insomnia/default.nix @@ -16,12 +16,12 @@ let ]; in stdenv.mkDerivation rec { pname = "insomnia"; - version = "2021.3.0"; + version = "2021.4.0"; src = fetchurl { url = "https://github.com/Kong/insomnia/releases/download/core%40${version}/Insomnia.Core-${version}.deb"; - sha256 = "sha256-RtEkWi0J3nYzT+IhdyBlGeUE2SCmhlnfw0L6sOvE4WI="; + sha256 = "sha256-lMQWoShlEACTrcGgQtfPGVQ4X8pCG/6SkXtz+rWAOyg="; }; nativeBuildInputs = diff --git a/nixpkgs/pkgs/development/web/nodejs/v12.nix b/nixpkgs/pkgs/development/web/nodejs/v12.nix index 7fad6a020a88..cfd6c211ab53 100644 --- a/nixpkgs/pkgs/development/web/nodejs/v12.nix +++ b/nixpkgs/pkgs/development/web/nodejs/v12.nix @@ -8,7 +8,7 @@ let in buildNodejs { inherit enableNpm; - version = "12.22.1"; - sha256 = "12drpkffn79xx84pffg9y2cn9fiwycgaa2rjj3ix6visfzvhsrfx"; + version = "12.22.3"; + sha256 = "143ihn30jd08nk19saxn6qp3ldc9yvy8w338i4cg9256wgx120im"; patches = lib.optional stdenv.isDarwin ./bypass-xcodebuild.diff; } diff --git a/nixpkgs/pkgs/development/web/nodejs/v14.nix b/nixpkgs/pkgs/development/web/nodejs/v14.nix index 27b2a4f33191..ad6c8aacddc3 100644 --- a/nixpkgs/pkgs/development/web/nodejs/v14.nix +++ b/nixpkgs/pkgs/development/web/nodejs/v14.nix @@ -7,7 +7,7 @@ let in buildNodejs { inherit enableNpm; - version = "14.17.1"; - sha256 = "0zr4b9gja8f9611rnmc9yacmh90bd76xv9ayikcyqdfzdpax5wfx"; + version = "14.17.3"; + sha256 = "0j3zd5vavsapqs9h682mr8r5i7xp47n0w4vjvm8rw3rn3dg4p2sb"; patches = lib.optional stdenv.isDarwin ./bypass-xcodebuild.diff; } diff --git a/nixpkgs/pkgs/development/web/nodejs/v15.nix b/nixpkgs/pkgs/development/web/nodejs/v15.nix deleted file mode 100644 index e6903098b302..000000000000 --- a/nixpkgs/pkgs/development/web/nodejs/v15.nix +++ /dev/null @@ -1,13 +0,0 @@ -{ callPackage, icu68, python3, enableNpm ? true }: - -let - buildNodejs = callPackage ./nodejs.nix { - icu = icu68; - python = python3; - }; -in - buildNodejs { - inherit enableNpm; - version = "15.14.0"; - sha256 = "0vm6jdazqjd1plqsgngzvjrafv2d3mdahk6il4ray02gx97dq8l1"; - } diff --git a/nixpkgs/pkgs/development/web/nodejs/v16.nix b/nixpkgs/pkgs/development/web/nodejs/v16.nix index 8514baec8b16..350abed7ec7a 100644 --- a/nixpkgs/pkgs/development/web/nodejs/v16.nix +++ b/nixpkgs/pkgs/development/web/nodejs/v16.nix @@ -8,6 +8,6 @@ let in buildNodejs { inherit enableNpm; - version = "16.4.0"; - sha256 = "07f8g3hs0v7nsdvzlsr1p4pzgb04qn54pnhmbdsgmmb41cp227pr"; + version = "16.4.2"; + sha256 = "048x4vznpi6dai6fripg0yk21kfxm9s2mw7jb0rzisyv5aw8v2dj"; } |