diff options
Diffstat (limited to 'infra/libkookie/nixpkgs/pkgs/development/compilers')
171 files changed, 4612 insertions, 2342 deletions
diff --git a/infra/libkookie/nixpkgs/pkgs/development/compilers/4th/default.nix b/infra/libkookie/nixpkgs/pkgs/development/compilers/4th/default.nix new file mode 100644 index 000000000000..ee3050b8ba69 --- /dev/null +++ b/infra/libkookie/nixpkgs/pkgs/development/compilers/4th/default.nix @@ -0,0 +1,39 @@ +{ stdenv, fetchurl }: + +stdenv.mkDerivation rec { + pname = "4th"; + version = "3.62.5"; + + src = fetchurl { + url = "https://sourceforge.net/projects/forth-4th/files/${pname}-${version}/${pname}-${version}-unix.tar.gz"; + sha256 = "sha256-+CL33Yz7CxdEpi1lPG7+kzV4rheJ7GCgiFCaOLyktPw="; + }; + + dontConfigure = true; + + makeFlags = [ + "-C sources" + "CC=${stdenv.cc}/bin/cc" + ]; + + preInstall = '' + install -d ${placeholder "out"}/bin \ + ${placeholder "out"}/lib \ + ${placeholder "out"}/share/doc/${pname} \ + ${placeholder "out"}/share/man + ''; + + installFlags = [ + "BINARIES=${placeholder "out"}/bin" + "LIBRARIES=${placeholder "out"}/lib" + "DOCDIR=${placeholder "out"}/share/doc" + "MANDIR=${placeholder "out"}/share/man" + ]; + + meta = with stdenv.lib; { + description = "A portable Forth compiler"; + homepage = "https://thebeez.home.xs4all.nl/4tH/index.html"; + license = licenses.lgpl3; + platforms = platforms.linux; + }; +} diff --git a/infra/libkookie/nixpkgs/pkgs/development/compilers/abcl/default.nix b/infra/libkookie/nixpkgs/pkgs/development/compilers/abcl/default.nix index edcf722f2553..22f6ca7a0dd2 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/compilers/abcl/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/compilers/abcl/default.nix @@ -1,11 +1,11 @@ {stdenv, fetchurl, ant, jre, jdk}: stdenv.mkDerivation rec { pname = "abcl"; - version = "1.7.1"; + version = "1.8.0"; # or fetchFromGitHub(owner,repo,rev) or fetchgit(rev) src = fetchurl { url = "https://common-lisp.net/project/armedbear/releases/${version}/${pname}-src-${version}.tar.gz"; - sha256 = "09wjcjvriagml740krg9nva5v6bsc3sav86dmb55pjvfpsr1846m"; + sha256 = "0zr5mmqyj484vza089l8vc88d07g0m8ymxzglvar3ydwyvi1x1qx"; }; configurePhase = '' mkdir nix-tools diff --git a/infra/libkookie/nixpkgs/pkgs/development/compilers/adoptopenjdk-bin/generate-sources.py b/infra/libkookie/nixpkgs/pkgs/development/compilers/adoptopenjdk-bin/generate-sources.py index a7782610afb3..63b807bd8005 100755 --- a/infra/libkookie/nixpkgs/pkgs/development/compilers/adoptopenjdk-bin/generate-sources.py +++ b/infra/libkookie/nixpkgs/pkgs/development/compilers/adoptopenjdk-bin/generate-sources.py @@ -6,7 +6,7 @@ import re import requests import sys -releases = ("openjdk8", "openjdk11", "openjdk13") +releases = ("openjdk8", "openjdk11", "openjdk13", "openjdk14", "openjdk15") oses = ("mac", "linux") types = ("jre", "jdk") impls = ("hotspot", "openj9") diff --git a/infra/libkookie/nixpkgs/pkgs/development/compilers/adoptopenjdk-bin/jdk-linux-base.nix b/infra/libkookie/nixpkgs/pkgs/development/compilers/adoptopenjdk-bin/jdk-linux-base.nix index d62224d518de..00945e325351 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/compilers/adoptopenjdk-bin/jdk-linux-base.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/compilers/adoptopenjdk-bin/jdk-linux-base.nix @@ -29,7 +29,7 @@ let result = stdenv.mkDerivation rec { buildInputs = [ alsaLib freetype fontconfig zlib xorg.libX11 xorg.libXext xorg.libXtst - xorg.libXi xorg.libXrender + xorg.libXi xorg.libXrender stdenv.cc.cc.lib ] ++ lib.optional stdenv.isAarch32 libffi; nativeBuildInputs = [ autoPatchelfHook ]; diff --git a/infra/libkookie/nixpkgs/pkgs/development/compilers/adoptopenjdk-bin/jdk14-darwin.nix b/infra/libkookie/nixpkgs/pkgs/development/compilers/adoptopenjdk-bin/jdk14-darwin.nix new file mode 100644 index 000000000000..e440903ad526 --- /dev/null +++ b/infra/libkookie/nixpkgs/pkgs/development/compilers/adoptopenjdk-bin/jdk14-darwin.nix @@ -0,0 +1,9 @@ +let + sources = builtins.fromJSON (builtins.readFile ./sources.json); +in +{ + jdk-hotspot = import ./jdk-darwin-base.nix sources.openjdk14.mac.jdk.hotspot; + jre-hotspot = import ./jdk-darwin-base.nix sources.openjdk14.mac.jre.hotspot; + jdk-openj9 = import ./jdk-darwin-base.nix sources.openjdk14.mac.jdk.openj9; + jre-openj9 = import ./jdk-darwin-base.nix sources.openjdk14.mac.jre.openj9; +} diff --git a/infra/libkookie/nixpkgs/pkgs/development/compilers/adoptopenjdk-bin/jdk14-linux.nix b/infra/libkookie/nixpkgs/pkgs/development/compilers/adoptopenjdk-bin/jdk14-linux.nix new file mode 100644 index 000000000000..90ae65ba970c --- /dev/null +++ b/infra/libkookie/nixpkgs/pkgs/development/compilers/adoptopenjdk-bin/jdk14-linux.nix @@ -0,0 +1,9 @@ +let + sources = builtins.fromJSON (builtins.readFile ./sources.json); +in +{ + jdk-hotspot = import ./jdk-linux-base.nix sources.openjdk14.linux.jdk.hotspot; + jre-hotspot = import ./jdk-linux-base.nix sources.openjdk14.linux.jre.hotspot; + jdk-openj9 = import ./jdk-linux-base.nix sources.openjdk14.linux.jdk.openj9; + jre-openj9 = import ./jdk-linux-base.nix sources.openjdk14.linux.jre.openj9; +} diff --git a/infra/libkookie/nixpkgs/pkgs/development/compilers/adoptopenjdk-bin/jdk15-darwin.nix b/infra/libkookie/nixpkgs/pkgs/development/compilers/adoptopenjdk-bin/jdk15-darwin.nix new file mode 100644 index 000000000000..b9b67f271ac5 --- /dev/null +++ b/infra/libkookie/nixpkgs/pkgs/development/compilers/adoptopenjdk-bin/jdk15-darwin.nix @@ -0,0 +1,9 @@ +let + sources = builtins.fromJSON (builtins.readFile ./sources.json); +in +{ + jdk-hotspot = import ./jdk-darwin-base.nix sources.openjdk15.mac.jdk.hotspot; + jre-hotspot = import ./jdk-darwin-base.nix sources.openjdk15.mac.jre.hotspot; + jdk-openj9 = import ./jdk-darwin-base.nix sources.openjdk15.mac.jdk.openj9; + jre-openj9 = import ./jdk-darwin-base.nix sources.openjdk15.mac.jre.openj9; +} diff --git a/infra/libkookie/nixpkgs/pkgs/development/compilers/adoptopenjdk-bin/jdk15-linux.nix b/infra/libkookie/nixpkgs/pkgs/development/compilers/adoptopenjdk-bin/jdk15-linux.nix new file mode 100644 index 000000000000..d48f9312dd6e --- /dev/null +++ b/infra/libkookie/nixpkgs/pkgs/development/compilers/adoptopenjdk-bin/jdk15-linux.nix @@ -0,0 +1,9 @@ +let + sources = builtins.fromJSON (builtins.readFile ./sources.json); +in +{ + jdk-hotspot = import ./jdk-linux-base.nix sources.openjdk15.linux.jdk.hotspot; + jre-hotspot = import ./jdk-linux-base.nix sources.openjdk15.linux.jre.hotspot; + jdk-openj9 = import ./jdk-linux-base.nix sources.openjdk15.linux.jdk.openj9; + jre-openj9 = import ./jdk-linux-base.nix sources.openjdk15.linux.jre.openj9; +} diff --git a/infra/libkookie/nixpkgs/pkgs/development/compilers/adoptopenjdk-bin/sources.json b/infra/libkookie/nixpkgs/pkgs/development/compilers/adoptopenjdk-bin/sources.json index 41e7a8eac7df..14c887554f89 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/compilers/adoptopenjdk-bin/sources.json +++ b/infra/libkookie/nixpkgs/pkgs/development/compilers/adoptopenjdk-bin/sources.json @@ -4,92 +4,92 @@ "jdk": { "hotspot": { "aarch64": { - "build": "10", - "sha256": "3b8b8bba6a0472ec7de5271cbf67f11e6ab525de6dd5d4729300375f1d56b7a1", - "url": "https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.7%2B10/OpenJDK11U-jdk_aarch64_linux_hotspot_11.0.7_10.tar.gz", - "version": "11.0.7" + "build": "11", + "sha256": "f90c6f941a95e20e305870700328804e5b48acb69d4928dc9c4627b3c755ae8a", + "url": "https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.9%2B11.1/OpenJDK11U-jdk_aarch64_linux_hotspot_11.0.9_11.tar.gz", + "version": "11.0.9" }, "armv6l": { - "build": "10", - "sha256": "45c235af67498f87e3dc99642771e57547cf226335eaee8a55d195173e66a2e9", - "url": "https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.7%2B10/OpenJDK11U-jdk_arm_linux_hotspot_11.0.7_10.tar.gz", - "version": "11.0.7" + "build": "11", + "sha256": "082a13a9a5fbcf7ca45e67ab39e9682a9ef9e3779395e37aa0bf235e42a8eaf5", + "url": "https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.9%2B11/OpenJDK11U-jdk_arm_linux_hotspot_11.0.9_11.tar.gz", + "version": "11.0.9" }, "armv7l": { - "build": "10", - "sha256": "45c235af67498f87e3dc99642771e57547cf226335eaee8a55d195173e66a2e9", - "url": "https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.7%2B10/OpenJDK11U-jdk_arm_linux_hotspot_11.0.7_10.tar.gz", - "version": "11.0.7" + "build": "11", + "sha256": "082a13a9a5fbcf7ca45e67ab39e9682a9ef9e3779395e37aa0bf235e42a8eaf5", + "url": "https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.9%2B11/OpenJDK11U-jdk_arm_linux_hotspot_11.0.9_11.tar.gz", + "version": "11.0.9" }, "packageType": "jdk", "vmType": "hotspot", "x86_64": { - "build": "10", - "sha256": "ee60304d782c9d5654bf1a6b3f38c683921c1711045e1db94525a51b7024a2ca", - "url": "https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.7%2B10/OpenJDK11U-jdk_x64_linux_hotspot_11.0.7_10.tar.gz", - "version": "11.0.7" + "build": "11", + "sha256": "a3c52b73a76bed0f113604165eb4f2020b767e188704d8cc0bfc8bc4eb596712", + "url": "https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.9%2B11.1/OpenJDK11U-jdk_x64_linux_hotspot_11.0.9_11.tar.gz", + "version": "11.0.9" } }, "openj9": { "aarch64": { - "build": "10", - "sha256": "0be01fdcae330e26c489d8d0d0c98c535a2af8cbd0cdcda211776ab9fcd05086", - "url": "https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.7%2B10_openj9-0.20.0/OpenJDK11U-jdk_aarch64_linux_openj9_11.0.7_10_openj9-0.20.0.tar.gz", - "version": "11.0.7" + "build": "11", + "sha256": "f0426b6d37085d471a7f577ce6f28af7cc8fe35b9b0b09a5111eccaed80a0447", + "url": "https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.9%2B11_openj9-0.23.0/OpenJDK11U-jdk_aarch64_linux_openj9_11.0.9_11_openj9-0.23.0.tar.gz", + "version": "11.0.9" }, "packageType": "jdk", "vmType": "openj9", "x86_64": { - "build": "10", - "sha256": "526e89f3014fec473b24c10c2464c1343e23703114983fd171b68b1599bba561", - "url": "https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.7%2B10_openj9-0.20.0/OpenJDK11U-jdk_x64_linux_openj9_11.0.7_10_openj9-0.20.0.tar.gz", - "version": "11.0.7" + "build": "11", + "sha256": "812d58fac39465802039291a1bc530b4feaaa61b58664d9c458a075921ae8091", + "url": "https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.9%2B11_openj9-0.23.0/OpenJDK11U-jdk_x64_linux_openj9_11.0.9_11_openj9-0.23.0.tar.gz", + "version": "11.0.9" } } }, "jre": { "hotspot": { "aarch64": { - "build": "10", - "sha256": "cfe504e9e9621b831a5cfd800a2005dafe90a1d11aa14ee35d7b674d68685698", - "url": "https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.7%2B10/OpenJDK11U-jre_aarch64_linux_hotspot_11.0.7_10.tar.gz", - "version": "11.0.7" + "build": "11", + "sha256": "89b9b3108afda968a97961c5602a896bae31fea7c95195b54be5ad68b3af9e45", + "url": "https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.9%2B11.1/OpenJDK11U-jre_aarch64_linux_hotspot_11.0.9_11.tar.gz", + "version": "11.0.9" }, "armv6l": { - "build": "10", - "sha256": "581bae8efcaa40e209a780baa6f96b7c8c9397965bc6d54533f4fd8599d5c742", - "url": "https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.7%2B10/OpenJDK11U-jre_arm_linux_hotspot_11.0.7_10.tar.gz", - "version": "11.0.7" + "build": "11", + "sha256": "8e52de3c7a24edb74e423631fa90a09f7af3193aa9e6e4837b337192669530b0", + "url": "https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.9%2B11/OpenJDK11U-jre_arm_linux_hotspot_11.0.9_11.tar.gz", + "version": "11.0.9" }, "armv7l": { - "build": "10", - "sha256": "581bae8efcaa40e209a780baa6f96b7c8c9397965bc6d54533f4fd8599d5c742", - "url": "https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.7%2B10/OpenJDK11U-jre_arm_linux_hotspot_11.0.7_10.tar.gz", - "version": "11.0.7" + "build": "11", + "sha256": "8e52de3c7a24edb74e423631fa90a09f7af3193aa9e6e4837b337192669530b0", + "url": "https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.9%2B11/OpenJDK11U-jre_arm_linux_hotspot_11.0.9_11.tar.gz", + "version": "11.0.9" }, "packageType": "jre", "vmType": "hotspot", "x86_64": { - "build": "10", - "sha256": "74b493dd8a884dcbee29682ead51b182d9d3e52b40c3d4cbb3167c2fd0063503", - "url": "https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.7%2B10/OpenJDK11U-jre_x64_linux_hotspot_11.0.7_10.tar.gz", - "version": "11.0.7" + "build": "11", + "sha256": "2ed263b662afb8b5d2964d1c9941d20031d07e5af68679ebefdca35d40bb91b1", + "url": "https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.9%2B11.1/OpenJDK11U-jre_x64_linux_hotspot_11.0.9_11.tar.gz", + "version": "11.0.9" } }, "openj9": { "aarch64": { - "build": "10", - "sha256": "37ae26443abb02d2ab041eced9be948f0d20db03183aaf3c159ef682eeeabf9b", - "url": "https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.7%2B10_openj9-0.20.0/OpenJDK11U-jre_aarch64_linux_openj9_11.0.7_10_openj9-0.20.0.tar.gz", - "version": "11.0.7" + "build": "11", + "sha256": "b73f406dba1560dc194ac891452a1aacc2ba3b3e5e7b55e91a64559f8c2d9539", + "url": "https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.9%2B11_openj9-0.23.0/OpenJDK11U-jre_aarch64_linux_openj9_11.0.9_11_openj9-0.23.0.tar.gz", + "version": "11.0.9" }, "packageType": "jre", "vmType": "openj9", "x86_64": { - "build": "10", - "sha256": "08258a767a6953bde21d15ef3c08e776d83257afa4acc52b55c70e1ac02f0489", - "url": "https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.7%2B10_openj9-0.20.0/OpenJDK11U-jre_x64_linux_openj9_11.0.7_10_openj9-0.20.0.tar.gz", - "version": "11.0.7" + "build": "11", + "sha256": "54c845c167c197ba789eb6c3508faa5b1c95c9abe2ac26878123b6eecc87a111", + "url": "https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.9%2B11_openj9-0.23.0/OpenJDK11U-jre_x64_linux_openj9_11.0.9_11_openj9-0.23.0.tar.gz", + "version": "11.0.9" } } } @@ -100,20 +100,20 @@ "packageType": "jdk", "vmType": "hotspot", "x86_64": { - "build": "10", - "sha256": "0ab1e15e8bd1916423960e91b932d2b17f4c15b02dbdf9fa30e9423280d9e5cc", - "url": "https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.7%2B10/OpenJDK11U-jdk_x64_mac_hotspot_11.0.7_10.tar.gz", - "version": "11.0.7" + "build": "11", + "sha256": "7b21961ffb2649e572721a0dfad64169b490e987937b661cb4e13a594c21e764", + "url": "https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.9%2B11.1/OpenJDK11U-jdk_x64_mac_hotspot_11.0.9_11.tar.gz", + "version": "11.0.9" } }, "openj9": { "packageType": "jdk", "vmType": "openj9", "x86_64": { - "build": "10", - "sha256": "a0de749c37802cc233ac58ffde68191a4dc985c71b626e7c0ff53944f743427f", - "url": "https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.7%2B10.2_openj9-0.20.0/OpenJDK11U-jdk_x64_mac_openj9_11.0.7_10_openj9-0.20.0.tar.gz", - "version": "11.0.7" + "build": "11", + "sha256": "382238443d4495d976f9e1a66b0f6e3bc250d3d009b64d2c29d44022afd7e418", + "url": "https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.9%2B11.1_openj9-0.23.0/OpenJDK11U-jdk_x64_mac_openj9_11.0.9_11_openj9-0.23.0.tar.gz", + "version": "11.0.9" } } }, @@ -122,20 +122,20 @@ "packageType": "jre", "vmType": "hotspot", "x86_64": { - "build": "10", - "sha256": "931a81f4bed38c48b364db57d4ebdd6e4b4ea1466e9bd0eaf8e0f1e47c4569e9", - "url": "https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.7%2B10/OpenJDK11U-jre_x64_mac_hotspot_11.0.7_10.tar.gz", - "version": "11.0.7" + "build": "11", + "sha256": "cd8965dc8dbd0b5b3b25b6a336857d9bb622965e039b77e3048bc825e5512e95", + "url": "https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.9%2B11.1/OpenJDK11U-jre_x64_mac_hotspot_11.0.9_11.tar.gz", + "version": "11.0.9" } }, "openj9": { "packageType": "jre", "vmType": "openj9", "x86_64": { - "build": "10", - "sha256": "0941d739e3230d1d83dc1ee54cff6d17d90331e4f275d00739cb78fba41c5b96", - "url": "https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.7%2B10.2_openj9-0.20.0/OpenJDK11U-jre_x64_mac_openj9_11.0.7_10_openj9-0.20.0.tar.gz", - "version": "11.0.7" + "build": "11", + "sha256": "33a868f12bbe9326f658e60abe48dac658df33578b3719f551355855a87d1911", + "url": "https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.9%2B11.1_openj9-0.23.0/OpenJDK11U-jre_x64_mac_openj9_11.0.9_11_openj9-0.23.0.tar.gz", + "version": "11.0.9" } } } @@ -259,45 +259,181 @@ } } }, - "openjdk8": { + "openjdk14": { + "linux": { + "jdk": { + "hotspot": { + "aarch64": { + "build": "12", + "sha256": "ee87e9f03b1fbe6f328429b78fe1a9f44900026d220c90dfd747fe0bcd62d904", + "url": "https://github.com/AdoptOpenJDK/openjdk14-binaries/releases/download/jdk-14.0.2%2B12/OpenJDK14U-jdk_aarch64_linux_hotspot_14.0.2_12.tar.gz", + "version": "14.0.2" + }, + "armv6l": { + "build": "12", + "sha256": "65f193496c6977ba7aed1563edc4b5be091b5ff03e3d790074bb4e389a034b36", + "url": "https://github.com/AdoptOpenJDK/openjdk14-binaries/releases/download/jdk-14.0.2%2B12/OpenJDK14U-jdk_arm_linux_hotspot_14.0.2_12.tar.gz", + "version": "14.0.2" + }, + "armv7l": { + "build": "12", + "sha256": "65f193496c6977ba7aed1563edc4b5be091b5ff03e3d790074bb4e389a034b36", + "url": "https://github.com/AdoptOpenJDK/openjdk14-binaries/releases/download/jdk-14.0.2%2B12/OpenJDK14U-jdk_arm_linux_hotspot_14.0.2_12.tar.gz", + "version": "14.0.2" + }, + "packageType": "jdk", + "vmType": "hotspot", + "x86_64": { + "build": "12", + "sha256": "7d5ee7e06909b8a99c0d029f512f67b092597aa5b0e78c109bd59405bbfa74fe", + "url": "https://github.com/AdoptOpenJDK/openjdk14-binaries/releases/download/jdk-14.0.2%2B12/OpenJDK14U-jdk_x64_linux_hotspot_14.0.2_12.tar.gz", + "version": "14.0.2" + } + }, + "openj9": { + "packageType": "jdk", + "vmType": "openj9", + "x86_64": { + "build": "12", + "sha256": "306f7138cdb65daaf2596ec36cafbde72088144c83b2e964f0193662e6caf3be", + "url": "https://github.com/AdoptOpenJDK/openjdk14-binaries/releases/download/jdk-14.0.2%2B12_openj9-0.21.0/OpenJDK14U-jdk_x64_linux_openj9_14.0.2_12_openj9-0.21.0.tar.gz", + "version": "14.0.2" + } + } + }, + "jre": { + "hotspot": { + "aarch64": { + "build": "12", + "sha256": "2b749ceead19d68dd7e3c28b143dc4f94bb0916378a98b7346e851318ea4da84", + "url": "https://github.com/AdoptOpenJDK/openjdk14-binaries/releases/download/jdk-14.0.2%2B12/OpenJDK14U-jre_aarch64_linux_hotspot_14.0.2_12.tar.gz", + "version": "14.0.2" + }, + "armv6l": { + "build": "12", + "sha256": "4468ecf74956783ae41a46e8ba023c003c69e4d111622944aad1af764a1bc4af", + "url": "https://github.com/AdoptOpenJDK/openjdk14-binaries/releases/download/jdk-14.0.2%2B12/OpenJDK14U-jre_arm_linux_hotspot_14.0.2_12.tar.gz", + "version": "14.0.2" + }, + "armv7l": { + "build": "12", + "sha256": "4468ecf74956783ae41a46e8ba023c003c69e4d111622944aad1af764a1bc4af", + "url": "https://github.com/AdoptOpenJDK/openjdk14-binaries/releases/download/jdk-14.0.2%2B12/OpenJDK14U-jre_arm_linux_hotspot_14.0.2_12.tar.gz", + "version": "14.0.2" + }, + "packageType": "jre", + "vmType": "hotspot", + "x86_64": { + "build": "12", + "sha256": "1107845947da56e6bdad0da0b79210a079a74ec5c806f815ec5db9d09e1a9236", + "url": "https://github.com/AdoptOpenJDK/openjdk14-binaries/releases/download/jdk-14.0.2%2B12/OpenJDK14U-jre_x64_linux_hotspot_14.0.2_12.tar.gz", + "version": "14.0.2" + } + }, + "openj9": { + "packageType": "jre", + "vmType": "openj9", + "x86_64": { + "build": "12", + "sha256": "3a137146a7b0bd8b029e72beb37c5fbb09dcfb9e33a10125076fff1555227cfd", + "url": "https://github.com/AdoptOpenJDK/openjdk14-binaries/releases/download/jdk-14.0.2%2B12_openj9-0.21.0/OpenJDK14U-jre_x64_linux_openj9_14.0.2_12_openj9-0.21.0.tar.gz", + "version": "14.0.2" + } + } + } + }, + "mac": { + "jdk": { + "hotspot": { + "packageType": "jdk", + "vmType": "hotspot", + "x86_64": { + "build": "12", + "sha256": "09b7e6ab5d5eb4b73813f4caa793a0b616d33794a17988fa6a6b7c972e8f3dd3", + "url": "https://github.com/AdoptOpenJDK/openjdk14-binaries/releases/download/jdk-14.0.2%2B12/OpenJDK14U-jdk_x64_mac_hotspot_14.0.2_12.tar.gz", + "version": "14.0.2" + } + }, + "openj9": { + "packageType": "jdk", + "vmType": "openj9", + "x86_64": { + "build": "12", + "sha256": "95e6abcc12dde676ccd5ba65ab86f06ddaa22749dde00e31f4c6d3ea95277359", + "url": "https://github.com/AdoptOpenJDK/openjdk14-binaries/releases/download/jdk-14.0.2%2B12_openj9-0.21.0/OpenJDK14U-jdk_x64_mac_openj9_14.0.2_12_openj9-0.21.0.tar.gz", + "version": "14.0.2" + } + } + }, + "jre": { + "hotspot": { + "packageType": "jre", + "vmType": "hotspot", + "x86_64": { + "build": "12", + "sha256": "e8b5196de8ecb2b136a28494c2888784b9d9e22e29d2c38528892fb7d0c95260", + "url": "https://github.com/AdoptOpenJDK/openjdk14-binaries/releases/download/jdk-14.0.2%2B12/OpenJDK14U-jre_x64_mac_hotspot_14.0.2_12.tar.gz", + "version": "14.0.2" + } + }, + "openj9": { + "packageType": "jre", + "vmType": "openj9", + "x86_64": { + "build": "12", + "sha256": "2562a442d7278409358f474071db34df4ba9c555925f28d0270139f97133c8d5", + "url": "https://github.com/AdoptOpenJDK/openjdk14-binaries/releases/download/jdk-14.0.2%2B12_openj9-0.21.0/OpenJDK14U-jre_x64_mac_openj9_14.0.2_12_openj9-0.21.0.tar.gz", + "version": "14.0.2" + } + } + } + } + }, + "openjdk15": { "linux": { "jdk": { "hotspot": { "aarch64": { "build": "9", - "sha256": "536bf397d98174b376da9ed49d2f659d65c7310318d8211444f4b7ba7c15e453", - "url": "https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u252-b09/OpenJDK8U-jdk_aarch64_linux_hotspot_8u252b09.tar.gz", - "version": "8.0.252" + "sha256": "84398a1566d66ee5a88f3326fb7f0b70504eb510190f8f798bdb386481a3900e", + "url": "https://github.com/AdoptOpenJDK/openjdk15-binaries/releases/download/jdk-15.0.1%2B9/OpenJDK15U-jdk_aarch64_linux_hotspot_15.0.1_9.tar.gz", + "version": "15.0.1" }, "armv6l": { "build": "9", - "sha256": "5b401ad3c9b246281bd6df34b1abaf75e10e5cad9c6b26b55232b016e90e411a", - "url": "https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u252-b09/OpenJDK8U-jdk_arm_linux_hotspot_8u252b09.tar.gz", - "version": "8.0.252" + "sha256": "bef5e9f4ab8a87645fa2b3d0ffb9f2b97374caa03cd1296597e8c86e8360d5a2", + "url": "https://github.com/AdoptOpenJDK/openjdk15-binaries/releases/download/jdk-15.0.1%2B9/OpenJDK15U-jdk_arm_linux_hotspot_15.0.1_9.tar.gz", + "version": "15.0.1" }, "armv7l": { "build": "9", - "sha256": "5b401ad3c9b246281bd6df34b1abaf75e10e5cad9c6b26b55232b016e90e411a", - "url": "https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u252-b09/OpenJDK8U-jdk_arm_linux_hotspot_8u252b09.tar.gz", - "version": "8.0.252" + "sha256": "bef5e9f4ab8a87645fa2b3d0ffb9f2b97374caa03cd1296597e8c86e8360d5a2", + "url": "https://github.com/AdoptOpenJDK/openjdk15-binaries/releases/download/jdk-15.0.1%2B9/OpenJDK15U-jdk_arm_linux_hotspot_15.0.1_9.tar.gz", + "version": "15.0.1" }, "packageType": "jdk", "vmType": "hotspot", "x86_64": { "build": "9", - "sha256": "2b59b5282ff32bce7abba8ad6b9fde34c15a98f949ad8ae43e789bbd78fc8862", - "url": "https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u252-b09/OpenJDK8U-jdk_x64_linux_hotspot_8u252b09.tar.gz", - "version": "8.0.252" + "sha256": "61045ecb9434e3320dbc2c597715f9884586b7a18a56d29851b4d4a4d48a2a5e", + "url": "https://github.com/AdoptOpenJDK/openjdk15-binaries/releases/download/jdk-15.0.1%2B9/OpenJDK15U-jdk_x64_linux_hotspot_15.0.1_9.tar.gz", + "version": "15.0.1" } }, "openj9": { + "aarch64": { + "build": "9", + "sha256": "6206643ec4a57597f73880423b72fc06c1018d92cc6b02972ec3ea3fe4d853a2", + "url": "https://github.com/AdoptOpenJDK/openjdk15-binaries/releases/download/jdk-15.0.1%2B9_openj9-0.23.0/OpenJDK15U-jdk_aarch64_linux_openj9_15.0.1_9_openj9-0.23.0.tar.gz", + "version": "15.0.1" + }, "packageType": "jdk", "vmType": "openj9", "x86_64": { "build": "9", - "sha256": "910ae847109a6dd1b6cf69baa7615ea2cce8cff787e5a9349a5331ce7604f3a5", - "url": "https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u252-b09_openj9-0.20.0/OpenJDK8U-jdk_x64_linux_openj9_8u252b09_openj9-0.20.0.tar.gz", - "version": "8.0.252" + "sha256": "b1561f7a69c977bfc9991e61e96dcb200c39300dd9ad423254af117c189e4a8d", + "url": "https://github.com/AdoptOpenJDK/openjdk15-binaries/releases/download/jdk-15.0.1%2B9_openj9-0.23.0/OpenJDK15U-jdk_x64_linux_openj9_15.0.1_9_openj9-0.23.0.tar.gz", + "version": "15.0.1" } } }, @@ -305,39 +441,45 @@ "hotspot": { "aarch64": { "build": "9", - "sha256": "30bba4425497f5b4aabcba7b45db69d582d278fb17357d64c22c9dc6b2d29ca1", - "url": "https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u252-b09/OpenJDK8U-jre_aarch64_linux_hotspot_8u252b09.tar.gz", - "version": "8.0.252" + "sha256": "9eecdd39239545b922878abf51015030ba9aed4dda5c4574ddbc669a71ddab31", + "url": "https://github.com/AdoptOpenJDK/openjdk15-binaries/releases/download/jdk-15.0.1%2B9/OpenJDK15U-jre_aarch64_linux_hotspot_15.0.1_9.tar.gz", + "version": "15.0.1" }, "armv6l": { "build": "9", - "sha256": "107699a88f611e0c2d57816be25821ef9b17db860b14402c4e9e5bf0b9cf16fd", - "url": "https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u252-b09/OpenJDK8U-jre_arm_linux_hotspot_8u252b09.tar.gz", - "version": "8.0.252" + "sha256": "f289d1b9fc05099889eaa9a52d352275d44698f3448153cc2ef05f2fa1c04cca", + "url": "https://github.com/AdoptOpenJDK/openjdk15-binaries/releases/download/jdk-15.0.1%2B9/OpenJDK15U-jre_arm_linux_hotspot_15.0.1_9.tar.gz", + "version": "15.0.1" }, "armv7l": { "build": "9", - "sha256": "107699a88f611e0c2d57816be25821ef9b17db860b14402c4e9e5bf0b9cf16fd", - "url": "https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u252-b09/OpenJDK8U-jre_arm_linux_hotspot_8u252b09.tar.gz", - "version": "8.0.252" + "sha256": "f289d1b9fc05099889eaa9a52d352275d44698f3448153cc2ef05f2fa1c04cca", + "url": "https://github.com/AdoptOpenJDK/openjdk15-binaries/releases/download/jdk-15.0.1%2B9/OpenJDK15U-jre_arm_linux_hotspot_15.0.1_9.tar.gz", + "version": "15.0.1" }, "packageType": "jre", "vmType": "hotspot", "x86_64": { "build": "9", - "sha256": "a93be303ed62398dba9acb0376fb3caf8f488fcde80dc62d0a8e46256b3adfb1", - "url": "https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u252-b09/OpenJDK8U-jre_x64_linux_hotspot_8u252b09.tar.gz", - "version": "8.0.252" + "sha256": "e619197c7a5757631f6ea9c912ab47528ebf64c27cf788cdad22bc9245779411", + "url": "https://github.com/AdoptOpenJDK/openjdk15-binaries/releases/download/jdk-15.0.1%2B9/OpenJDK15U-jre_x64_linux_hotspot_15.0.1_9.tar.gz", + "version": "15.0.1" } }, "openj9": { + "aarch64": { + "build": "9", + "sha256": "1db3c28e8c423d005fcf3b0c8a081061e56c51966273e32e3930d4c57c21bf49", + "url": "https://github.com/AdoptOpenJDK/openjdk15-binaries/releases/download/jdk-15.0.1%2B9_openj9-0.23.0/OpenJDK15U-jre_aarch64_linux_openj9_15.0.1_9_openj9-0.23.0.tar.gz", + "version": "15.0.1" + }, "packageType": "jre", "vmType": "openj9", "x86_64": { "build": "9", - "sha256": "5c0ab4691ff5f8e69bb14462f2afb8d73d751b01048eacf4b426ed6d6646dc63", - "url": "https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u252-b09_openj9-0.20.0/OpenJDK8U-jre_x64_linux_openj9_8u252b09_openj9-0.20.0.tar.gz", - "version": "8.0.252" + "sha256": "e47fdadfe91f554f3e343b24e678b6862673f9b1dce3703efd1447950188357b", + "url": "https://github.com/AdoptOpenJDK/openjdk15-binaries/releases/download/jdk-15.0.1%2B9_openj9-0.23.0/OpenJDK15U-jre_x64_linux_openj9_15.0.1_9_openj9-0.23.0.tar.gz", + "version": "15.0.1" } } } @@ -349,9 +491,9 @@ "vmType": "hotspot", "x86_64": { "build": "9", - "sha256": "2caed3ec07d108bda613f9b4614b22a8bdd196ccf2a432a126161cd4077f07a5", - "url": "https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u252-b09.1/OpenJDK8U-jdk_x64_mac_hotspot_8u252b09.tar.gz", - "version": "8.0.252" + "sha256": "d32f9429c4992cef7be559a15c542011503d6bc38c89379800cd209a9d7ec539", + "url": "https://github.com/AdoptOpenJDK/openjdk15-binaries/releases/download/jdk-15.0.1%2B9/OpenJDK15U-jdk_x64_mac_hotspot_15.0.1_9.tar.gz", + "version": "15.0.1" } }, "openj9": { @@ -359,9 +501,9 @@ "vmType": "openj9", "x86_64": { "build": "9", - "sha256": "f522061a23290bce3423e49025a95b6e78d6f30e2741817e83c8fdba4c0c4ae7", - "url": "https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u252-b09.2_openj9-0.20.0/OpenJDK8U-jdk_x64_mac_openj9_8u252b09_openj9-0.20.0.tar.gz", - "version": "8.0.252" + "sha256": "c9b19fd1fda9c581aa0bcddbf5f821204c351a1de29da1c5aa51cb680ee99517", + "url": "https://github.com/AdoptOpenJDK/openjdk15-binaries/releases/download/jdk-15.0.1%2B9.1_openj9-0.23.0/OpenJDK15U-jdk_x64_mac_openj9_15.0.1_9_openj9-0.23.0.tar.gz", + "version": "15.0.1" } } }, @@ -371,9 +513,9 @@ "vmType": "hotspot", "x86_64": { "build": "9", - "sha256": "f8206f0fef194c598de6b206a4773b2e517154913ea0e26c5726091562a034c8", - "url": "https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u252-b09.1/OpenJDK8U-jre_x64_mac_hotspot_8u252b09.tar.gz", - "version": "8.0.252" + "sha256": "fde1713fc51e824a08f8eeb5e2b8a2acf21424d5f9a0e70cfd2e85a77c827bc4", + "url": "https://github.com/AdoptOpenJDK/openjdk15-binaries/releases/download/jdk-15.0.1%2B9/OpenJDK15U-jre_x64_mac_hotspot_15.0.1_9.tar.gz", + "version": "15.0.1" } }, "openj9": { @@ -381,12 +523,154 @@ "vmType": "openj9", "x86_64": { "build": "9", - "sha256": "55cce54a39c5748360e2e3fe8edf04469b75a0783514853a5745463979b43c80", - "url": "https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u252-b09.2_openj9-0.20.0/OpenJDK8U-jre_x64_mac_openj9_8u252b09_openj9-0.20.0.tar.gz", - "version": "8.0.252" + "sha256": "e7c3710d6cc23480ac66eba79b48d9e2bebec34ba688f3053bb5eba406a2c315", + "url": "https://github.com/AdoptOpenJDK/openjdk15-binaries/releases/download/jdk-15.0.1%2B9.1_openj9-0.23.0/OpenJDK15U-jre_x64_mac_openj9_15.0.1_9_openj9-0.23.0.tar.gz", + "version": "15.0.1" + } + } + } + } + }, + "openjdk8": { + "linux": { + "jdk": { + "hotspot": { + "aarch64": { + "build": "10", + "sha256": "cfbde5191027c6d25af44af8a3d64625c6e22422dea8c4af6fe9240e7e249baa", + "url": "https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u272-b10/OpenJDK8U-jdk_aarch64_linux_hotspot_8u272b10.tar.gz", + "version": "8.0.272" + }, + "armv6l": { + "build": "10", + "sha256": "b005e9e8a912aa6605debdea3685a223c077d5a4ba7c90bca02d804c5f39d0b9", + "url": "https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u272-b10/OpenJDK8U-jdk_arm_linux_hotspot_8u272b10.tar.gz", + "version": "8.0.272" + }, + "armv7l": { + "build": "10", + "sha256": "b005e9e8a912aa6605debdea3685a223c077d5a4ba7c90bca02d804c5f39d0b9", + "url": "https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u272-b10/OpenJDK8U-jdk_arm_linux_hotspot_8u272b10.tar.gz", + "version": "8.0.272" + }, + "packageType": "jdk", + "vmType": "hotspot", + "x86_64": { + "build": "10", + "sha256": "6f124b69d07d8d3edf39b9aa5c58473f63a380b686ddb73a5495e01d25c2939a", + "url": "https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u272-b10/OpenJDK8U-jdk_x64_linux_hotspot_8u272b10.tar.gz", + "version": "8.0.272" + } + }, + "openj9": { + "aarch64": { + "build": "10", + "sha256": "bbc78dc8caf25372578a95287bcf672c4bf62af23939d4a988634b2a1356cd89", + "url": "https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u272-b10_openj9-0.23.0/OpenJDK8U-jdk_aarch64_linux_openj9_8u272b10_openj9-0.23.0.tar.gz", + "version": "8.0.272" + }, + "packageType": "jdk", + "vmType": "openj9", + "x86_64": { + "build": "10", + "sha256": "ca852f976e5b27ccd9b73a527a517496bda865b2ae2a85517ca74486fb8de7da", + "url": "https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u272-b10_openj9-0.23.0/OpenJDK8U-jdk_x64_linux_openj9_8u272b10_openj9-0.23.0.tar.gz", + "version": "8.0.272" + } + } + }, + "jre": { + "hotspot": { + "aarch64": { + "build": "10", + "sha256": "ed3a862d83dd1f19037fc6ccf73500f2ecf453eb245af8b70bec3fb80d084289", + "url": "https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u272-b10/OpenJDK8U-jre_aarch64_linux_hotspot_8u272b10.tar.gz", + "version": "8.0.272" + }, + "armv6l": { + "build": "10", + "sha256": "906113d909d81b930c4eb519512d1cc9f9be9789dfd349128d6e7efaeeb36e1c", + "url": "https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u272-b10/OpenJDK8U-jre_arm_linux_hotspot_8u272b10.tar.gz", + "version": "8.0.272" + }, + "armv7l": { + "build": "10", + "sha256": "906113d909d81b930c4eb519512d1cc9f9be9789dfd349128d6e7efaeeb36e1c", + "url": "https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u272-b10/OpenJDK8U-jre_arm_linux_hotspot_8u272b10.tar.gz", + "version": "8.0.272" + }, + "packageType": "jre", + "vmType": "hotspot", + "x86_64": { + "build": "10", + "sha256": "e6894601a559c5226c6dc337308df263444d356a6430f4aabb66e02607c82956", + "url": "https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u272-b10/OpenJDK8U-jre_x64_linux_hotspot_8u272b10.tar.gz", + "version": "8.0.272" + } + }, + "openj9": { + "aarch64": { + "build": "10", + "sha256": "b0891c3493a9fc6135700d065a826fc67223d54e9d0da3c41b57e6cb6897b726", + "url": "https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u272-b10_openj9-0.23.0/OpenJDK8U-jre_aarch64_linux_openj9_8u272b10_openj9-0.23.0.tar.gz", + "version": "8.0.272" + }, + "packageType": "jre", + "vmType": "openj9", + "x86_64": { + "build": "10", + "sha256": "a4e58f3c15ca3bc15cb3aaa9f116de972809ca52ae81e0726f84c059442174d5", + "url": "https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u272-b10_openj9-0.23.0/OpenJDK8U-jre_x64_linux_openj9_8u272b10_openj9-0.23.0.tar.gz", + "version": "8.0.272" + } + } + } + }, + "mac": { + "jdk": { + "hotspot": { + "packageType": "jdk", + "vmType": "hotspot", + "x86_64": { + "build": "10", + "sha256": "091f9ee39b0bdbc8af8ec19f51aaa0f73e416c2e93a8fb2c79b82f4caac83ab6", + "url": "https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u272-b10/OpenJDK8U-jdk_x64_mac_hotspot_8u272b10.tar.gz", + "version": "8.0.272" + } + }, + "openj9": { + "packageType": "jdk", + "vmType": "openj9", + "x86_64": { + "build": "10", + "sha256": "bbd66ec27a4ea9b0b0952f501e1837e69c24262f64b316dab0408d1a8633a527", + "url": "https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u272-b10.1_openj9-0.23.0/OpenJDK8U-jdk_x64_mac_openj9_8u272b10_openj9-0.23.0.tar.gz", + "version": "8.0.272" + } + } + }, + "jre": { + "hotspot": { + "packageType": "jre", + "vmType": "hotspot", + "x86_64": { + "build": "10", + "sha256": "afb9c08cb8b93d8e7d4f1e48ced3d43cfb3082491595a2eaf1f00c48abd25428", + "url": "https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u272-b10/OpenJDK8U-jre_x64_mac_hotspot_8u272b10.tar.gz", + "version": "8.0.272" + } + }, + "openj9": { + "packageType": "jre", + "vmType": "openj9", + "x86_64": { + "build": "10", + "sha256": "4d90e85240113189d897a86731e672b37a6e345c056f35c7719cb27f3d08385b", + "url": "https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u272-b10.1_openj9-0.23.0/OpenJDK8U-jre_x64_mac_openj9_8u272b10_openj9-0.23.0.tar.gz", + "version": "8.0.272" } } } } } -}
\ No newline at end of file +} diff --git a/infra/libkookie/nixpkgs/pkgs/development/compilers/bluespec/default.nix b/infra/libkookie/nixpkgs/pkgs/development/compilers/bluespec/default.nix index 09e76d63235c..df7b6585205a 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/compilers/bluespec/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/compilers/bluespec/default.nix @@ -4,40 +4,45 @@ , autoconf , automake , fontconfig -, gmp +, gmp-static , gperf , libX11 , libpoly , perl +, flex +, bison , pkgconfig +, itktcl +, incrtcl +, tcl +, tk , verilog , xorg +, yices , zlib , ghc }: let - # yices wants a libgmp.a and fails otherwise - gmpStatic = gmp.override { withStatic = true; }; - - ghcWithPackages = ghc.withPackages (g: (with g; [old-time regex-compat syb])); + ghcWithPackages = ghc.withPackages (g: (with g; [old-time regex-compat syb split ])); in stdenv.mkDerivation rec { pname = "bluespec"; - version = "unstable-2020.02.09"; + version = "unstable-2020.11.04"; src = fetchFromGitHub { - owner = "B-Lang-org"; - repo = "bsc"; - rev = "05c8afb08078e437c635b9c708124b428ac51b3d"; - sha256 = "06yhpkz7wga1a0p9031cfjqbzw7205bj2jxgdghhfzmllaiphniy"; - fetchSubmodules = true; - }; + owner = "B-Lang-org"; + repo = "bsc"; + rev = "103357f32cf63f2ca2b16ebc8e2c675ec5562464"; + sha256 = "0iikzx0fxky0fmc31lyxfldy1wixr2mayzcn24b8d76wd4ix1vk3"; + }; enableParallelBuilding = true; - buildInputs = [ + patches = [ ./libstp_stub_makefile.patch ]; + + buildInputs = yices.buildInputs ++ [ zlib - gmpStatic gperf libpoly # yices + tcl tk libX11 # tcltk xorg.libXft fontconfig @@ -46,6 +51,8 @@ in stdenv.mkDerivation rec { nativeBuildInputs = [ automake autoconf perl + flex + bison pkgconfig ghcWithPackages ]; @@ -54,13 +61,13 @@ in stdenv.mkDerivation rec { verilog ]; - patches = [ - # drop stp support https://github.com/B-Lang-org/bsc/pull/31 - (fetchpatch { - url = "https://github.com/flokli/bsc/commit/0bd48ecc2561541dc1368918863c0b2f4915006f.patch"; - sha256 = "0bam9anld33zfi9d4gs502g94w49zhl5iqmbs2d1p5i19aqpy38l"; - }) - ]; + + postUnpack = '' + mkdir -p $sourceRoot/src/vendor/yices/v2.6/yices2 + # XXX: only works because yices.src isn't a tarball. + cp -av ${yices.src}/* $sourceRoot/src/vendor/yices/v2.6/yices2 + chmod -R +rwX $sourceRoot/src/vendor/yices/v2.6/yices2 + ''; preBuild = '' patchShebangs \ @@ -72,11 +79,15 @@ in stdenv.mkDerivation rec { substituteInPlace src/comp/Makefile \ --replace 'BINDDIR' 'BINDIR' \ --replace 'install-bsc install-bluetcl' 'install-bsc install-bluetcl $(UTILEXES) install-utils' + # allow running bsc to bootstrap + export LD_LIBRARY_PATH=/build/source/inst/lib/SAT ''; makeFlags = [ + "NO_DEPS_CHECKS=1" # skip the subrepo check (this deriviation uses yices.src instead of the subrepo) "NOGIT=1" # https://github.com/B-Lang-org/bsc/issues/12 "LDCONFIG=ldconfig" # https://github.com/B-Lang-org/bsc/pull/43 + "STP_STUB=1" ]; installPhase = "mv inst $out"; @@ -90,6 +101,6 @@ in stdenv.mkDerivation rec { platforms = [ "x86_64-linux" ]; # darwin fails at https://github.com/B-Lang-org/bsc/pull/35#issuecomment-583731562 # aarch64 fails, as GHC fails with "ghc: could not execute: opt" - maintainers = with stdenv.lib.maintainers; [ flokli thoughtpolice ]; + maintainers = with stdenv.lib.maintainers; [ jcumming thoughtpolice ]; }; } diff --git a/infra/libkookie/nixpkgs/pkgs/development/compilers/bluespec/libstp_stub_makefile.patch b/infra/libkookie/nixpkgs/pkgs/development/compilers/bluespec/libstp_stub_makefile.patch new file mode 100644 index 000000000000..c714afc670c5 --- /dev/null +++ b/infra/libkookie/nixpkgs/pkgs/development/compilers/bluespec/libstp_stub_makefile.patch @@ -0,0 +1,28 @@ +diff -ru bsc-orig/src/vendor/stp/Makefile bsc-new/src/vendor/stp/Makefile +--- bsc-orig/src/vendor/stp/Makefile 1969-12-31 16:00:01.000000000 -0800 ++++ bsc-new/src/vendor/stp/Makefile 2020-11-12 17:42:40.115143035 -0800 +@@ -9,12 +9,13 @@ + SRC = src + else + SRC = src_stub ++SNAME += lib/libstp_stub.so + endif + + ifeq ($(OSTYPE), Darwin) +-SNAME=libstp.dylib ++SNAME = lib/libstp.dylib + else +-SNAME=libstp.so.1 ++SNAME += lib/libstp.so.1 + endif + + all: install +@@ -23,7 +24,7 @@ + $(MAKE) -C $(SRC) install + ln -fsn HaskellIfc include_hs + install -m 755 -d $(PREFIX)/lib/SAT +- install -m 644 lib/$(SNAME) $(PREFIX)/lib/SAT ++ install -m 644 $(SNAME) $(PREFIX)/lib/SAT + + clean: + $(MAKE) -C $(SRC) clean diff --git a/infra/libkookie/nixpkgs/pkgs/development/compilers/cc65/default.nix b/infra/libkookie/nixpkgs/pkgs/development/compilers/cc65/default.nix new file mode 100644 index 000000000000..1b5011365cf2 --- /dev/null +++ b/infra/libkookie/nixpkgs/pkgs/development/compilers/cc65/default.nix @@ -0,0 +1,57 @@ +{ stdenv +, fetchFromGitHub +}: + +stdenv.mkDerivation rec { + pname = "cc65"; + version = "2.19"; + + src = fetchFromGitHub { + owner = "cc65"; + repo = pname; + rev = "V${version}"; + sha256 = "01a15yvs455qp20hri2pbg2wqvcip0d50kb7dibi9427hqk9cnj4"; + }; + + makeFlags = [ "PREFIX=${placeholder "out"}"]; + + meta = with stdenv.lib; { + homepage = "https://cc65.github.io/"; + description = "C compiler for processors of 6502 family"; + longDescription = '' + cc65 is a complete cross development package for 65(C)02 systems, + including a powerful macro assembler, a C compiler, linker, librarian and + several other tools. + + cc65 has C and runtime library support for many of the old 6502 machines, + including the following Commodore machines: + + - VIC20 + - C16/C116 and Plus/4 + - C64 + - C128 + - CBM 510 (aka P500) + - the 600/700 family + - newer PET machines (not 2001). + - the Apple ][+ and successors. + - the Atari 8-bit machines. + - the Atari 2600 console. + - the Atari 5200 console. + - GEOS for the C64, C128 and Apple //e. + - the Bit Corporation Gamate console. + - the NEC PC-Engine (aka TurboGrafx-16) console. + - the Nintendo Entertainment System (NES) console. + - the Watara Supervision console. + - the VTech Creativision console. + - the Oric Atmos. + - the Oric Telestrat. + - the Lynx console. + - the Ohio Scientific Challenger 1P. + + The libraries are fairly portable, so creating a version for other 6502s + shouldn't be too much work. + ''; + license = licenses.zlib; + maintainers = with maintainers; [ AndersonTorres ]; + }; +} diff --git a/infra/libkookie/nixpkgs/pkgs/development/compilers/chez/default.nix b/infra/libkookie/nixpkgs/pkgs/development/compilers/chez/default.nix index 864ccc5a7439..550f754639e6 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/compilers/chez/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/compilers/chez/default.nix @@ -5,13 +5,13 @@ stdenv.mkDerivation rec { pname = "chez-scheme"; - version = "9.5.2"; + version = "9.5.4"; src = fetchFromGitHub { owner = "cisco"; repo = "ChezScheme"; rev = "refs/tags/v${version}"; - sha256 = "1gsjmsvsj31q5l9bjvm869y7bakrvl41yq94vyqdx8zwcr1bmpjf"; + sha256 = "065dir19cqpn0d1bk9w49wnwzn6qfrgvcqw8da2fdhkafhfcb1bj"; fetchSubmodules = true; }; diff --git a/infra/libkookie/nixpkgs/pkgs/development/compilers/chicken/4/chicken.nix b/infra/libkookie/nixpkgs/pkgs/development/compilers/chicken/4/chicken.nix index 11f4eaada604..50126fdac92c 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/compilers/chicken/4/chicken.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/compilers/chicken/4/chicken.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, makeWrapper, bootstrap-chicken ? null }: +{ stdenv, fetchurl, makeWrapper, darwin, bootstrap-chicken ? null }: let version = "4.13.0"; @@ -21,31 +21,39 @@ stdenv.mkDerivation { sha256 = "0hvckhi5gfny3mlva6d7y9pmx7cbwvq0r7mk11k3sdiik9hlkmdd"; }; - setupHook = lib.ifEnable (bootstrap-chicken != null) ./setup-hook.sh; + setupHook = lib.optional (bootstrap-chicken != null) ./setup-hook.sh; - buildFlags = [ "PLATFORM=${platform}" "PREFIX=$(out)" "VARDIR=$(out)/var/lib" ]; - installFlags = [ "PLATFORM=${platform}" "PREFIX=$(out)" "VARDIR=$(out)/var/lib" ]; + # -fno-strict-overflow is not a supported argument in clang on darwin + hardeningDisable = lib.optionals stdenv.isDarwin ["strictoverflow"]; + + makeFlags = [ + "PLATFORM=${platform}" "PREFIX=$(out)" + "VARDIR=$(out)/var/lib" + ] ++ (lib.optionals stdenv.isDarwin [ + "XCODE_TOOL_PATH=${darwin.binutils.bintools}/bin" + "C_COMPILER=$(CC)" + ]); # We need a bootstrap-chicken to regenerate the c-files after # applying a patch to add support for CHICKEN_REPOSITORY_EXTRA - patches = lib.ifEnable (bootstrap-chicken != null) [ + patches = lib.optionals (bootstrap-chicken != null) [ ./0001-Introduce-CHICKEN_REPOSITORY_EXTRA.patch ]; buildInputs = [ makeWrapper - ] ++ (lib.ifEnable (bootstrap-chicken != null) [ + ] ++ (lib.optionals (bootstrap-chicken != null) [ bootstrap-chicken ]); - preBuild = lib.ifEnable (bootstrap-chicken != null) '' + preBuild = lib.optionalString (bootstrap-chicken != null) '' # Backup the build* files - those are generated from hostname, # git-tag, etc. and we don't need/want that mkdir -p build-backup mv buildid buildbranch buildtag.h build-backup # Regenerate eval.c after the patch - make spotless $buildFlags + make spotless $makeFlags mv build-backup/* . ''; @@ -64,7 +72,7 @@ stdenv.mkDerivation { homepage = "http://www.call-cc.org/"; license = stdenv.lib.licenses.bsd3; maintainers = with stdenv.lib.maintainers; [ corngood ]; - platforms = stdenv.lib.platforms.linux; # Maybe other non-darwin Unix + platforms = stdenv.lib.platforms.linux ++ stdenv.lib.platforms.darwin; # Maybe other Unix description = "A portable compiler for the Scheme programming language"; longDescription = '' CHICKEN is a compiler for the Scheme programming language. diff --git a/infra/libkookie/nixpkgs/pkgs/development/compilers/chicken/5/chicken.nix b/infra/libkookie/nixpkgs/pkgs/development/compilers/chicken/5/chicken.nix index f07b63ea26f4..712012643f33 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/compilers/chicken/5/chicken.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/compilers/chicken/5/chicken.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, makeWrapper, bootstrap-chicken ? null }: +{ stdenv, fetchurl, makeWrapper, darwin, bootstrap-chicken ? null }: let version = "5.2.0"; @@ -21,14 +21,21 @@ stdenv.mkDerivation { sha256 = "1yl0hxm9cirgcp8jgxp6vv29lpswfvaw3zfkh6rsj0vkrv44k4c1"; }; - setupHook = lib.ifEnable (bootstrap-chicken != null) ./setup-hook.sh; + setupHook = lib.optional (bootstrap-chicken != null) ./setup-hook.sh; - buildFlags = [ "PLATFORM=${platform}" "PREFIX=$(out)" ]; - installFlags = [ "PLATFORM=${platform}" "PREFIX=$(out)" ]; + # -fno-strict-overflow is not a supported argument in clang on darwin + hardeningDisable = lib.optionals stdenv.isDarwin ["strictoverflow"]; + + makeFlags = [ + "PLATFORM=${platform}" "PREFIX=$(out)" + ] ++ (lib.optionals stdenv.isDarwin [ + "XCODE_TOOL_PATH=${darwin.binutils.bintools}/bin" + "C_COMPILER=$(CC)" + ]); buildInputs = [ makeWrapper - ] ++ (lib.ifEnable (bootstrap-chicken != null) [ + ] ++ (lib.optionals (bootstrap-chicken != null) [ bootstrap-chicken ]); @@ -46,7 +53,7 @@ stdenv.mkDerivation { homepage = "http://www.call-cc.org/"; license = stdenv.lib.licenses.bsd3; maintainers = with stdenv.lib.maintainers; [ corngood ]; - platforms = stdenv.lib.platforms.linux; # Maybe other non-darwin Unix + platforms = stdenv.lib.platforms.linux ++ stdenv.lib.platforms.darwin; # Maybe other Unix description = "A portable compiler for the Scheme programming language"; longDescription = '' CHICKEN is a compiler for the Scheme programming language. diff --git a/infra/libkookie/nixpkgs/pkgs/development/compilers/compcert/default.nix b/infra/libkookie/nixpkgs/pkgs/development/compilers/compcert/default.nix index 8c8a56d8e28f..3dea91970e24 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/compilers/compcert/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/compilers/compcert/default.nix @@ -3,9 +3,6 @@ , tools ? stdenv.cc }: -assert lib.versionAtLeast ocamlPackages.ocaml.version "4.02"; -assert lib.versionAtLeast coq.coq-version "8.8.0"; - let ocaml-pkgs = with ocamlPackages; [ ocaml findlib menhir ]; ccomp-platform = if stdenv.isDarwin then "x86_64-macosx" else "x86_64-linux"; diff --git a/infra/libkookie/nixpkgs/pkgs/development/compilers/computecpp/default.nix b/infra/libkookie/nixpkgs/pkgs/development/compilers/computecpp/default.nix index 31a0b054ee72..7cfc60f050e4 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/compilers/computecpp/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/compilers/computecpp/default.nix @@ -3,24 +3,23 @@ , pkg-config , autoPatchelfHook , installShellFiles -, ncurses5 , ocl-icd , zlib }: stdenv.mkDerivation rec { pname = "computecpp"; - version = "1.3.0"; + version = "2.2.1"; src = fetchzip { - url = "https://computecpp.codeplay.com/downloads/computecpp-ce/${version}/ubuntu-16.04-64bit.tar.gz"; - sha256 = "1q6gqjpzz4a260gsd6mm1iv4z8ar3vxaypmgdwl8pb4i7kg6ykaz"; + url = "https://computecpp.codeplay.com/downloads/computecpp-ce/${version}/x86_64-linux-gnu.tar.gz"; + hash = "sha256-niXNWbkXjd35col6dS66HdxFurXfJw/Xb2c5njukxcg="; stripRoot = true; }; dontStrip = true; - buildInputs = [ stdenv.cc.cc.lib ncurses5 ocl-icd zlib ]; + buildInputs = [ stdenv.cc.cc.lib ocl-icd zlib ]; nativeBuildInputs = [ autoPatchelfHook pkg-config installShellFiles ]; installPhase = '' diff --git a/infra/libkookie/nixpkgs/pkgs/development/compilers/crystal/default.nix b/infra/libkookie/nixpkgs/pkgs/development/compilers/crystal/default.nix index a04d48dd0e5a..fa8198fabad9 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/compilers/crystal/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/compilers/crystal/default.nix @@ -1,7 +1,29 @@ -{ stdenv, lib, fetchFromGitHub, fetchurl, makeWrapper -, coreutils, git, gmp, hostname, openssl, readline, tzdata, libxml2, libyaml -, boehmgc, libatomic_ops, pcre, libevent, libiconv, llvm, clang, which, zlib, pkgconfig -, callPackage }: +{ stdenv +, callPackage +, fetchFromGitHub +, fetchurl +, lib +# Dependencies +, boehmgc +, coreutils +, git +, gmp +, hostname +, libatomic_ops +, libevent +, libiconv +, libxml2 +, libyaml +, llvmPackages +, makeWrapper +, openssl +, pcre +, pkgconfig +, readline +, tzdata +, which +, zlib +}: # We need multiple binaries as a given binary isn't always able to build # (even slightly) older or newer versions. @@ -43,144 +65,152 @@ let ] ++ extraBuildInputs ++ stdenv.lib.optionals stdenv.isDarwin [ libiconv ]; + generic = ( + { version + , sha256 + , binary + , doCheck ? true + , extraBuildInputs ? [] + , buildFlags ? ["all" "docs"] + }: + lib.fix (compiler: stdenv.mkDerivation { + pname = "crystal"; + inherit buildFlags doCheck version; + + src = fetchFromGitHub { + owner = "crystal-lang"; + repo = "crystal"; + rev = version; + inherit sha256; + }; + + outputs = [ "out" "lib" "bin" ]; - generic = ({ version, sha256, binary, doCheck ? true, extraBuildInputs ? [] }: - lib.fix (compiler: stdenv.mkDerivation { - pname = "crystal"; - inherit doCheck version; + postPatch = '' + # Add dependency of crystal to docs to avoid issue on flag changes between releases + # https://github.com/crystal-lang/crystal/pull/8792#issuecomment-614004782 + substituteInPlace Makefile \ + --replace 'docs: ## Generate standard library documentation' 'docs: crystal ## Generate standard library documentation' - src = fetchFromGitHub { - owner = "crystal-lang"; - repo = "crystal"; - rev = version; - inherit sha256; - }; - - outputs = [ "out" "lib" "bin" ]; - - postPatch = '' - substituteInPlace src/crystal/system/unix/time.cr \ - --replace /usr/share/zoneinfo ${tzdata}/share/zoneinfo - - ln -sf spec/compiler spec/std - - # Dirty fix for when no sandboxing is enabled - rm -rf /tmp/crystal - mkdir -p /tmp/crystal - - substituteInPlace spec/std/file_spec.cr \ - --replace '/bin/ls' '${coreutils}/bin/ls' \ - --replace '/usr/share' '/tmp/crystal' \ - --replace '/usr' '/tmp' - - substituteInPlace spec/std/process_spec.cr \ - --replace '/bin/cat' '${coreutils}/bin/cat' \ - --replace '/bin/ls' '${coreutils}/bin/ls' \ - --replace '/usr/bin/env' '${coreutils}/bin/env' \ - --replace '"env"' '"${coreutils}/bin/env"' \ - --replace '"/usr"' '"/tmp"' - - substituteInPlace spec/std/socket/tcp_server_spec.cr \ - --replace '{% if flag?(:gnu) %}"listen: "{% else %}"bind: "{% end %}' '"bind: "' - - substituteInPlace spec/std/system_spec.cr \ - --replace '`hostname`' '`${hostname}/bin/hostname`' - - # See https://github.com/crystal-lang/crystal/pull/8640 - substituteInPlace spec/std/http/cookie_spec.cr \ - --replace '01 Jan 2020' '01 Jan #{Time.utc.year + 2}' - - # See https://github.com/crystal-lang/crystal/issues/8629 - substituteInPlace spec/std/socket/udp_socket_spec.cr \ - --replace 'it "joins and transmits to multicast groups"' 'pending "joins and transmits to multicast groups"' - - # See https://github.com/crystal-lang/crystal/pull/8699 - substituteInPlace spec/std/xml/xml_spec.cr \ - --replace 'it "handles errors"' 'pending "handles errors"' - ''; - - buildInputs = commonBuildInputs extraBuildInputs; + substituteInPlace src/crystal/system/unix/time.cr \ + --replace /usr/share/zoneinfo ${tzdata}/share/zoneinfo - nativeBuildInputs = [ binary makeWrapper which pkgconfig llvm ]; + ln -sf spec/compiler spec/std - makeFlags = [ - "CRYSTAL_CONFIG_VERSION=${version}" - ]; + # Dirty fix for when no sandboxing is enabled + rm -rf /tmp/crystal + mkdir -p /tmp/crystal - buildFlags = [ - "all" "docs" - ]; + substituteInPlace spec/std/file_spec.cr \ + --replace '/bin/ls' '${coreutils}/bin/ls' \ + --replace '/usr/share' '/tmp/crystal' \ + --replace '/usr' '/tmp' - LLVM_CONFIG = "${llvm}/bin/llvm-config"; + substituteInPlace spec/std/process_spec.cr \ + --replace '/bin/cat' '${coreutils}/bin/cat' \ + --replace '/bin/ls' '${coreutils}/bin/ls' \ + --replace '/usr/bin/env' '${coreutils}/bin/env' \ + --replace '"env"' '"${coreutils}/bin/env"' \ + --replace '"/usr"' '"/tmp"' + + substituteInPlace spec/std/socket/tcp_server_spec.cr \ + --replace '{% if flag?(:gnu) %}"listen: "{% else %}"bind: "{% end %}' '"bind: "' + + substituteInPlace spec/std/system_spec.cr \ + --replace '`hostname`' '`${hostname}/bin/hostname`' + + # See https://github.com/crystal-lang/crystal/pull/8640 + substituteInPlace spec/std/http/cookie_spec.cr \ + --replace '01 Jan 2020' '01 Jan #{Time.utc.year + 2}' + + # See https://github.com/crystal-lang/crystal/issues/8629 + substituteInPlace spec/std/socket/udp_socket_spec.cr \ + --replace 'it "joins and transmits to multicast groups"' 'pending "joins and transmits to multicast groups"' + + # See https://github.com/crystal-lang/crystal/pull/8699 + substituteInPlace spec/std/xml/xml_spec.cr \ + --replace 'it "handles errors"' 'pending "handles errors"' + ''; + + buildInputs = commonBuildInputs extraBuildInputs; + + nativeBuildInputs = [ binary makeWrapper which pkgconfig llvmPackages.llvm ]; + + makeFlags = [ + "CRYSTAL_CONFIG_VERSION=${version}" + ]; + + LLVM_CONFIG = "${llvmPackages.llvm}/bin/llvm-config"; + + FLAGS = [ + "--release" + "--single-module" # needed for deterministic builds + ]; + + # This makes sure we don't keep depending on the previous version of + # crystal used to build this one. + CRYSTAL_LIBRARY_PATH = "${placeholder "lib"}/crystal"; + + # We *have* to add `which` to the PATH or crystal is unable to build + # stuff later if which is not available. + installPhase = '' + runHook preInstall + + install -Dm755 .build/crystal $bin/bin/crystal + wrapProgram $bin/bin/crystal \ + --suffix PATH : ${lib.makeBinPath [ pkgconfig llvmPackages.clang which ]} \ + --suffix CRYSTAL_PATH : lib:$lib/crystal \ + --suffix CRYSTAL_LIBRARY_PATH : ${ + lib.makeLibraryPath (commonBuildInputs extraBuildInputs) + } + install -dm755 $lib/crystal + cp -r src/* $lib/crystal/ + + install -dm755 $out/share/doc/crystal/api + cp -r docs/* $out/share/doc/crystal/api/ + cp -r samples $out/share/doc/crystal/ - FLAGS = [ - "--release" - "--single-module" # needed for deterministic builds - ]; + install -Dm644 etc/completion.bash $out/share/bash-completion/completions/crystal + install -Dm644 etc/completion.zsh $out/share/zsh/site-functions/_crystal - # This makes sure we don't keep depending on the previous version of - # crystal used to build this one. - CRYSTAL_LIBRARY_PATH = "${placeholder "lib"}/crystal"; + install -Dm644 man/crystal.1 $out/share/man/man1/crystal.1 - # We *have* to add `which` to the PATH or crystal is unable to build stuff - # later if which is not available. - installPhase = '' - runHook preInstall + install -Dm644 -t $out/share/licenses/crystal LICENSE README.md - install -Dm755 .build/crystal $bin/bin/crystal - wrapProgram $bin/bin/crystal \ - --suffix PATH : ${lib.makeBinPath [ pkgconfig clang which ]} \ - --suffix CRYSTAL_PATH : lib:$lib/crystal \ - --suffix CRYSTAL_LIBRARY_PATH : ${ - lib.makeLibraryPath (commonBuildInputs extraBuildInputs) - } - install -dm755 $lib/crystal - cp -r src/* $lib/crystal/ + mkdir -p $out + ln -s $bin/bin $out/bin + ln -s $lib $out/lib - install -dm755 $out/share/doc/crystal/api - cp -r docs/* $out/share/doc/crystal/api/ - cp -r samples $out/share/doc/crystal/ + runHook postInstall + ''; - install -Dm644 etc/completion.bash $out/share/bash-completion/completions/crystal - install -Dm644 etc/completion.zsh $out/share/zsh/site-functions/_crystal + enableParallelBuilding = true; - install -Dm644 man/crystal.1 $out/share/man/man1/crystal.1 + dontStrip = true; - install -Dm644 -t $out/share/licenses/crystal LICENSE README.md + checkTarget = "compiler_spec"; - mkdir -p $out - ln -s $bin/bin $out/bin - ln -s $lib $out/lib - - runHook postInstall - ''; - - enableParallelBuilding = true; - - dontStrip = true; - - checkTarget = "spec"; - - preCheck = '' - export HOME=/tmp - mkdir -p $HOME/test + preCheck = '' + export HOME=/tmp + mkdir -p $HOME/test - export LIBRARY_PATH=${lib.makeLibraryPath checkInputs}:$LIBRARY_PATH - export PATH=${lib.makeBinPath checkInputs}:$PATH - ''; + export LIBRARY_PATH=${lib.makeLibraryPath checkInputs}:$LIBRARY_PATH + export PATH=${lib.makeBinPath checkInputs}:$PATH + ''; - passthru.buildCrystalPackage = callPackage ./build-package.nix { - crystal = compiler; - }; + passthru.buildCrystalPackage = callPackage ./build-package.nix { + crystal = compiler; + }; - meta = with lib; { - description = "A compiled language with Ruby like syntax and type inference"; - homepage = "https://crystal-lang.org/"; - license = licenses.asl20; - maintainers = with maintainers; [ manveru david50407 peterhoeg ]; - platforms = builtins.attrNames archs; - }; - })); + meta = with lib; { + description = "A compiled language with Ruby like syntax and type inference"; + homepage = "https://crystal-lang.org/"; + license = licenses.asl20; + maintainers = with maintainers; [ david50407 fabianhjr manveru peterhoeg ]; + platforms = builtins.attrNames archs; + }; + }) + ); in rec { binaryCrystal_0_31 = genericBinary { @@ -202,24 +232,30 @@ in rec { crystal_0_32 = generic { version = "0.32.1"; sha256 = "120ndi3nhh2r52hjvhwfb49cdggr1bzdq6b8xg7irzavhjinfza6"; - binary = binaryCrystal_0_31; + binary = crystal_0_31; }; crystal_0_33 = generic { version = "0.33.0"; sha256 = "1zg0qixcws81s083wrh54hp83ng2pa8iyyafaha55mzrh8293jbi"; - binary = binaryCrystal_0_31; - doCheck = false; # 4 checks are failing now + binary = crystal_0_32; }; crystal_0_34 = generic { version = "0.34.0"; sha256 = "110lfpxk9jnqyznbfnilys65ixj5sdmy8pvvnlhqhc3ccvrlnmq4"; binary = crystal_0_33; - doCheck = false; # 4 checks are failing now }; - crystal = crystal_0_34; + crystal_0_35 = generic { + version = "0.35.1"; + sha256 = "0p51bjl1nsvwsm64lqq421dcsxa201w7wwq8plw4r8wqarpq0g69"; + binary = crystal_0_34; + # Needs git to build as per https://github.com/crystal-lang/crystal/issues/9789 + extraBuildInputs = [ git ]; + }; + + crystal = crystal_0_35; crystal2nix = callPackage ./crystal2nix.nix {}; } diff --git a/infra/libkookie/nixpkgs/pkgs/development/compilers/dasm/default.nix b/infra/libkookie/nixpkgs/pkgs/development/compilers/dasm/default.nix index 6ab729cd3139..627ac36329a0 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/compilers/dasm/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/compilers/dasm/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "dasm"; - version = "2.20.14"; + version = "2.20.14.1"; src = fetchFromGitHub { owner = "dasm-assembler"; repo = "dasm"; rev = version; - sha256 = "09hzw228j43a78624bmq9cam7y1fjs48d3hpjqh2gn8iwnyk0pnp"; + sha256 = "1bna0bj503xyn5inwzzsrsgi9qg8p20by4dfk7azj91ynw56pl41"; }; configurePhase = false; diff --git a/infra/libkookie/nixpkgs/pkgs/development/compilers/dmd/binary.nix b/infra/libkookie/nixpkgs/pkgs/development/compilers/dmd/binary.nix index cd3a15889b21..2ff2b35060b8 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/compilers/dmd/binary.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/compilers/dmd/binary.nix @@ -17,7 +17,8 @@ in mkDerivation { dontConfigure = true; dontBuild = true; - nativeBuildInputs = [ fixDarwinDylibNames autoPatchelfHook ]; + nativeBuildInputs = [ autoPatchelfHook ] + ++ lib.optional hostPlatform.isDarwin fixDarwinDylibNames; propagatedBuildInputs = [ curl tzdata ] ++ lib.optional hostPlatform.isLinux glibc; installPhase = '' diff --git a/infra/libkookie/nixpkgs/pkgs/development/compilers/dotnet/default.nix b/infra/libkookie/nixpkgs/pkgs/development/compilers/dotnet/default.nix index b4d6a0933e9a..54784ea63cc8 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/compilers/dotnet/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/compilers/dotnet/default.nix @@ -105,12 +105,30 @@ rec { # v5.0.0 + aspnetcore_5_0 = buildAspNetCore { + version = "5.0.0"; + sha512 = { + x86_64-linux = "402046ee144915ef7d75a788cf19552eea56cf897681721b74bfc403fd366f71eb7e56f6b83ea299b6b812c6b87378c15e7bfe249415427dcd147dfeacd084d0"; + aarch64-linux = "13e174de1cf10135531468c2a76852de2c37253f4d8b487ff25d249c2d7a1c590475545ca246515338baff2950422ec6c5ffe2180e8327f25cb5f9fede696ccc"; + x86_64-darwin = "b47a9958f5412b22edb2cb47702ad442c389901ede3ca2a7f75d901f8ed608494431849f498c2191327065ff1db52a1658b1a8c0feb53aaec4c814fb0baf6818"; + }; + }; + + net_5_0 = buildNetCore { + version = "5.0.0"; + sha512 = { + x86_64-linux = "d4d67df5ff5f6dde0d865a6e87559955bd57429df396cf7d05fe77f09e6220c67dc5e66439b1801ca4d301a62f81f666122bf4b623b31a46b861677dcafc62a4"; + aarch64-linux = "c7a5ae2bd4e0edbd3b681c2997ebf1633bfa1cd30a4333cb63fc9945b4e7c9278282516fb5bc22c710ce6fb59dc2e28230c07b0e99826165fa148406ab8afb0f"; + x86_64-darwin = "eba97211e158a0c1c15b03a79b42027319d83456dc377a2513c32defb560cd43fcfa1e84154a43243b77ca6b454c4dbc32be4153f0ba9c954c7b1e69ab5d7c53"; + }; + }; + sdk_5_0 = buildNetCoreSdk { - version = "5.0.100-rc.1.20452.10"; + version = "5.0.100"; sha512 = { - x86_64-linux = "d7e709dacc4bb188c2380060d24bfb5b791240dc33af8499fb4a31e1885a9377dad1d1ebc76847432ea67d5e4ac832a31679dc293e09fa6dade28f5fbbe4db9b"; - aarch64-linux = "2d04890c71e845d1eb08f5dfbbb9c93024d7a52fb1cc3fd50bd51bc6bd44e455c5c82abc8f04eef23bd012984ae5f86143c600ceb49c4c733935d95d5b68785f"; - x86_64-darwin = "06bb40273071f3dd1e84ebf58abc7798795d5f1ac298f24bf7109d1597fd52ff31bcbf2b81f86d91d37ae293678d07f8da0469d7cbd318d19a8d718b6629dcac"; + x86_64-linux = "bec37bfb327c45cc01fd843ef93b22b556f753b04724bba501622df124e7e144c303a4d7e931b5dbadbd4f7b39e5adb8f601cb6293e317ad46d8fe7d52aa9a09"; + aarch64-linux = "5fceac0a9468097d66af25516da597eb4836b294ed1647ba272ade5c8faea2ed977a95d9ce720c44d71607fa3a0cf9de55afe0e66c0c89ab1cc6736945978204"; + x86_64-darwin = "69ccc7c686ac06f6c658d118f59cf1a0e7284b4570375dd88d3e3043098e311745922301f2650d159624d09c4d39a1f3cbdd5daee0e408eef915de839e3bce8f"; }; }; } diff --git a/infra/libkookie/nixpkgs/pkgs/development/compilers/dtc/default.nix b/infra/libkookie/nixpkgs/pkgs/development/compilers/dtc/default.nix index b7fcbe1c611d..0a694e29ee83 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/compilers/dtc/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/compilers/dtc/default.nix @@ -13,7 +13,6 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ flex bison pkgconfig which ] ++ lib.optionals pythonSupport [ python swig ]; - buildInputs = lib.optionals pythonSupport [ python ]; postPatch = '' patchShebangs pylibfdt/ diff --git a/infra/libkookie/nixpkgs/pkgs/development/compilers/ecl/default.nix b/infra/libkookie/nixpkgs/pkgs/development/compilers/ecl/default.nix index 65f6884cd558..0b37dcf64fcb 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/compilers/ecl/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/compilers/ecl/default.nix @@ -1,5 +1,6 @@ {stdenv, fetchurl , libtool, autoconf, automake +, texinfo , gmp, mpfr, libffi, makeWrapper , noUnicode ? false , gcc @@ -10,14 +11,13 @@ let s = # Generated upstream information rec { baseName="ecl"; - version="16.1.3"; + version="20.4.24"; name="${baseName}-${version}"; - hash="0m0j24w5d5a9dwwqyrg0d35c0nys16ijb4r0nyk87yp82v38b9bn"; - url="https://common-lisp.net/project/ecl/static/files/release/ecl-16.1.3.tgz"; - sha256="0m0j24w5d5a9dwwqyrg0d35c0nys16ijb4r0nyk87yp82v38b9bn"; + url="https://common-lisp.net/project/ecl/static/files/release/${name}.tgz"; + sha256="01qgdmr54wkj854f69qdm9sybrvd6gd21dpx4askdaaqybnkh237"; }; buildInputs = [ - libtool autoconf automake makeWrapper + libtool autoconf automake texinfo makeWrapper ]; propagatedBuildInputs = [ libffi gmp mpfr gcc @@ -36,7 +36,6 @@ stdenv.mkDerivation { }; patches = [ - ./libffi-3.3-abi.patch ]; configureFlags = [ diff --git a/infra/libkookie/nixpkgs/pkgs/development/compilers/ecl/libffi-3.3-abi.patch b/infra/libkookie/nixpkgs/pkgs/development/compilers/ecl/libffi-3.3-abi.patch deleted file mode 100644 index 0a2b5f4dd568..000000000000 --- a/infra/libkookie/nixpkgs/pkgs/development/compilers/ecl/libffi-3.3-abi.patch +++ /dev/null @@ -1,15 +0,0 @@ -diff --git a/src/c/ffi.d b/src/c/ffi.d -index 8174977a..caa69f39 100644 ---- a/src/c/ffi.d -+++ b/src/c/ffi.d -@@ -133,8 +133,8 @@ static struct { - #elif defined(X86_WIN64) - {@':win64', FFI_WIN64}, - #elif defined(X86_ANY) || defined(X86) || defined(X86_64) -- {@':cdecl', FFI_SYSV}, -- {@':sysv', FFI_SYSV}, -+ {@':cdecl', FFI_UNIX64}, -+ {@':sysv', FFI_UNIX64}, - {@':unix64', FFI_UNIX64}, - #endif - }; diff --git a/infra/libkookie/nixpkgs/pkgs/development/compilers/edk2/default.nix b/infra/libkookie/nixpkgs/pkgs/development/compilers/edk2/default.nix index 8a18b6306c27..51e0842d4beb 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/compilers/edk2/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/compilers/edk2/default.nix @@ -37,13 +37,13 @@ buildType = if stdenv.isDarwin then edk2 = buildStdenv.mkDerivation { pname = "edk2"; - version = "201911"; + version = "202011"; # submodules src = fetchgit { url = "https://github.com/tianocore/edk2"; rev = "edk2-stable${edk2.version}"; - sha256 = "1rmvb4w043v25cppsqxqrpzqqcay3yrzsrhhzm2q9bncrj56vm8q"; + sha256 = "1fvlz1z075jr6smq9qa0asy6fxga1gljcfd0764ypzy1mw963c9s"; }; buildInputs = [ libuuid pythonEnv ]; diff --git a/infra/libkookie/nixpkgs/pkgs/development/compilers/elm/default.nix b/infra/libkookie/nixpkgs/pkgs/development/compilers/elm/default.nix index 369ea8626204..0dbf1a3306f3 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/compilers/elm/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/compilers/elm/default.nix @@ -74,6 +74,12 @@ let inherit (hsPkgs.elmPkgs) elm; }; + elmRustPackages = { + elm-json = import ./packages/elm-json.nix { + inherit rustPlatform fetchurl openssl stdenv pkg-config; + }; + }; + elmNodePackages = with elmLib; let nodePkgs = import ./packages/node-composition.nix { @@ -110,6 +116,9 @@ let create-elm-app = patchNpmElm (patchBinwrap [elmi-to-json] nodePkgs.create-elm-app); + elm-review = patchBinwrap [elmRustPackages.elm-json] + nodePkgs.elm-review; + elm-language-server = nodePkgs."@elm-tooling/elm-language-server"; elm-optimize-level-2 = nodePkgs."elm-optimize-level-2"; @@ -117,9 +126,6 @@ let inherit (nodePkgs) elm-doc-preview elm-live elm-upgrade elm-xref elm-analyse; }; -in hsPkgs.elmPkgs // elmNodePackages // { - elm-json = import ./packages/elm-json.nix { - inherit rustPlatform fetchurl openssl stdenv pkg-config; - }; +in hsPkgs.elmPkgs // elmNodePackages // elmRustPackages // { lib = elmLib; } diff --git a/infra/libkookie/nixpkgs/pkgs/development/compilers/elm/packages/generate-node-packages.sh b/infra/libkookie/nixpkgs/pkgs/development/compilers/elm/packages/generate-node-packages.sh index 0ffa56eae90a..d805fe3827dd 100755 --- a/infra/libkookie/nixpkgs/pkgs/development/compilers/elm/packages/generate-node-packages.sh +++ b/infra/libkookie/nixpkgs/pkgs/development/compilers/elm/packages/generate-node-packages.sh @@ -10,4 +10,6 @@ $(nix-build $ROOT -A nodePackages.node2nix --no-out-link)/bin/node2nix \ -i node-packages.json \ -o node-packages.nix \ -c node-composition.nix \ - --no-copy-node-env -e ../../../node-packages/node-env.nix + # TODO: Switch to the commented out version once nodejs package set gets updated to new node2nix + -e node-env.nix + # --no-copy-node-env -e ../../../node-packages/node-env.nix diff --git a/infra/libkookie/nixpkgs/pkgs/development/compilers/elm/packages/node-composition.nix b/infra/libkookie/nixpkgs/pkgs/development/compilers/elm/packages/node-composition.nix index 9c6bdb2006a1..c970861a86f0 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/compilers/elm/packages/node-composition.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/compilers/elm/packages/node-composition.nix @@ -5,7 +5,7 @@ }, system ? builtins.currentSystem, nodejs ? pkgs."nodejs-12_x"}: let - nodeEnv = import ../../../node-packages/node-env.nix { + nodeEnv = import ./node-env.nix { inherit (pkgs) stdenv python2 utillinux runCommand writeTextFile; inherit nodejs; libtool = if pkgs.stdenv.isDarwin then pkgs.darwin.cctools else null; diff --git a/infra/libkookie/nixpkgs/pkgs/development/compilers/elm/packages/node-env.nix b/infra/libkookie/nixpkgs/pkgs/development/compilers/elm/packages/node-env.nix new file mode 100644 index 000000000000..e1abf5304935 --- /dev/null +++ b/infra/libkookie/nixpkgs/pkgs/development/compilers/elm/packages/node-env.nix @@ -0,0 +1,542 @@ +# This file originates from node2nix + +{stdenv, nodejs, python2, utillinux, libtool, runCommand, writeTextFile}: + +let + python = if nodejs ? python then nodejs.python else python2; + + # Create a tar wrapper that filters all the 'Ignoring unknown extended header keyword' noise + tarWrapper = runCommand "tarWrapper" {} '' + mkdir -p $out/bin + + cat > $out/bin/tar <<EOF + #! ${stdenv.shell} -e + $(type -p tar) "\$@" --warning=no-unknown-keyword --delay-directory-restore + EOF + + chmod +x $out/bin/tar + ''; + + # Function that generates a TGZ file from a NPM project + buildNodeSourceDist = + { name, version, src, ... }: + + stdenv.mkDerivation { + name = "node-tarball-${name}-${version}"; + inherit src; + buildInputs = [ nodejs ]; + buildPhase = '' + export HOME=$TMPDIR + tgzFile=$(npm pack | tail -n 1) # Hooks to the pack command will add output (https://docs.npmjs.com/misc/scripts) + ''; + installPhase = '' + mkdir -p $out/tarballs + mv $tgzFile $out/tarballs + mkdir -p $out/nix-support + echo "file source-dist $out/tarballs/$tgzFile" >> $out/nix-support/hydra-build-products + ''; + }; + + includeDependencies = {dependencies}: + stdenv.lib.optionalString (dependencies != []) + (stdenv.lib.concatMapStrings (dependency: + '' + # Bundle the dependencies of the package + mkdir -p node_modules + cd node_modules + + # Only include dependencies if they don't exist. They may also be bundled in the package. + if [ ! -e "${dependency.name}" ] + then + ${composePackage dependency} + fi + + cd .. + '' + ) dependencies); + + # Recursively composes the dependencies of a package + composePackage = { name, packageName, src, dependencies ? [], ... }@args: + builtins.addErrorContext "while evaluating node package '${packageName}'" '' + DIR=$(pwd) + cd $TMPDIR + + unpackFile ${src} + + # Make the base dir in which the target dependency resides first + mkdir -p "$(dirname "$DIR/${packageName}")" + + if [ -f "${src}" ] + then + # Figure out what directory has been unpacked + packageDir="$(find . -maxdepth 1 -type d | tail -1)" + + # Restore write permissions to make building work + find "$packageDir" -type d -exec chmod u+x {} \; + chmod -R u+w "$packageDir" + + # Move the extracted tarball into the output folder + mv "$packageDir" "$DIR/${packageName}" + elif [ -d "${src}" ] + then + # Get a stripped name (without hash) of the source directory. + # On old nixpkgs it's already set internally. + if [ -z "$strippedName" ] + then + strippedName="$(stripHash ${src})" + fi + + # Restore write permissions to make building work + chmod -R u+w "$strippedName" + + # Move the extracted directory into the output folder + mv "$strippedName" "$DIR/${packageName}" + fi + + # Unset the stripped name to not confuse the next unpack step + unset strippedName + + # Include the dependencies of the package + cd "$DIR/${packageName}" + ${includeDependencies { inherit dependencies; }} + cd .. + ${stdenv.lib.optionalString (builtins.substring 0 1 packageName == "@") "cd .."} + ''; + + pinpointDependencies = {dependencies, production}: + let + pinpointDependenciesFromPackageJSON = writeTextFile { + name = "pinpointDependencies.js"; + text = '' + var fs = require('fs'); + var path = require('path'); + + function resolveDependencyVersion(location, name) { + if(location == process.env['NIX_STORE']) { + return null; + } else { + var dependencyPackageJSON = path.join(location, "node_modules", name, "package.json"); + + if(fs.existsSync(dependencyPackageJSON)) { + var dependencyPackageObj = JSON.parse(fs.readFileSync(dependencyPackageJSON)); + + if(dependencyPackageObj.name == name) { + return dependencyPackageObj.version; + } + } else { + return resolveDependencyVersion(path.resolve(location, ".."), name); + } + } + } + + function replaceDependencies(dependencies) { + if(typeof dependencies == "object" && dependencies !== null) { + for(var dependency in dependencies) { + var resolvedVersion = resolveDependencyVersion(process.cwd(), dependency); + + if(resolvedVersion === null) { + process.stderr.write("WARNING: cannot pinpoint dependency: "+dependency+", context: "+process.cwd()+"\n"); + } else { + dependencies[dependency] = resolvedVersion; + } + } + } + } + + /* Read the package.json configuration */ + var packageObj = JSON.parse(fs.readFileSync('./package.json')); + + /* Pinpoint all dependencies */ + replaceDependencies(packageObj.dependencies); + if(process.argv[2] == "development") { + replaceDependencies(packageObj.devDependencies); + } + replaceDependencies(packageObj.optionalDependencies); + + /* Write the fixed package.json file */ + fs.writeFileSync("package.json", JSON.stringify(packageObj, null, 2)); + ''; + }; + in + '' + node ${pinpointDependenciesFromPackageJSON} ${if production then "production" else "development"} + + ${stdenv.lib.optionalString (dependencies != []) + '' + if [ -d node_modules ] + then + cd node_modules + ${stdenv.lib.concatMapStrings (dependency: pinpointDependenciesOfPackage dependency) dependencies} + cd .. + fi + ''} + ''; + + # Recursively traverses all dependencies of a package and pinpoints all + # dependencies in the package.json file to the versions that are actually + # being used. + + pinpointDependenciesOfPackage = { packageName, dependencies ? [], production ? true, ... }@args: + '' + if [ -d "${packageName}" ] + then + cd "${packageName}" + ${pinpointDependencies { inherit dependencies production; }} + cd .. + ${stdenv.lib.optionalString (builtins.substring 0 1 packageName == "@") "cd .."} + fi + ''; + + # Extract the Node.js source code which is used to compile packages with + # native bindings + nodeSources = runCommand "node-sources" {} '' + tar --no-same-owner --no-same-permissions -xf ${nodejs.src} + mv node-* $out + ''; + + # Script that adds _integrity fields to all package.json files to prevent NPM from consulting the cache (that is empty) + addIntegrityFieldsScript = writeTextFile { + name = "addintegrityfields.js"; + text = '' + var fs = require('fs'); + var path = require('path'); + + function augmentDependencies(baseDir, dependencies) { + for(var dependencyName in dependencies) { + var dependency = dependencies[dependencyName]; + + // Open package.json and augment metadata fields + var packageJSONDir = path.join(baseDir, "node_modules", dependencyName); + var packageJSONPath = path.join(packageJSONDir, "package.json"); + + if(fs.existsSync(packageJSONPath)) { // Only augment packages that exist. Sometimes we may have production installs in which development dependencies can be ignored + console.log("Adding metadata fields to: "+packageJSONPath); + var packageObj = JSON.parse(fs.readFileSync(packageJSONPath)); + + if(dependency.integrity) { + packageObj["_integrity"] = dependency.integrity; + } else { + packageObj["_integrity"] = "sha1-000000000000000000000000000="; // When no _integrity string has been provided (e.g. by Git dependencies), add a dummy one. It does not seem to harm and it bypasses downloads. + } + + if(dependency.resolved) { + packageObj["_resolved"] = dependency.resolved; // Adopt the resolved property if one has been provided + } else { + packageObj["_resolved"] = dependency.version; // Set the resolved version to the version identifier. This prevents NPM from cloning Git repositories. + } + + if(dependency.from !== undefined) { // Adopt from property if one has been provided + packageObj["_from"] = dependency.from; + } + + fs.writeFileSync(packageJSONPath, JSON.stringify(packageObj, null, 2)); + } + + // Augment transitive dependencies + if(dependency.dependencies !== undefined) { + augmentDependencies(packageJSONDir, dependency.dependencies); + } + } + } + + if(fs.existsSync("./package-lock.json")) { + var packageLock = JSON.parse(fs.readFileSync("./package-lock.json")); + + if(packageLock.lockfileVersion !== 1) { + process.stderr.write("Sorry, I only understand lock file version 1!\n"); + process.exit(1); + } + + if(packageLock.dependencies !== undefined) { + augmentDependencies(".", packageLock.dependencies); + } + } + ''; + }; + + # Reconstructs a package-lock file from the node_modules/ folder structure and package.json files with dummy sha1 hashes + reconstructPackageLock = writeTextFile { + name = "addintegrityfields.js"; + text = '' + var fs = require('fs'); + var path = require('path'); + + var packageObj = JSON.parse(fs.readFileSync("package.json")); + + var lockObj = { + name: packageObj.name, + version: packageObj.version, + lockfileVersion: 1, + requires: true, + dependencies: {} + }; + + function augmentPackageJSON(filePath, dependencies) { + var packageJSON = path.join(filePath, "package.json"); + if(fs.existsSync(packageJSON)) { + var packageObj = JSON.parse(fs.readFileSync(packageJSON)); + dependencies[packageObj.name] = { + version: packageObj.version, + integrity: "sha1-000000000000000000000000000=", + dependencies: {} + }; + processDependencies(path.join(filePath, "node_modules"), dependencies[packageObj.name].dependencies); + } + } + + function processDependencies(dir, dependencies) { + if(fs.existsSync(dir)) { + var files = fs.readdirSync(dir); + + files.forEach(function(entry) { + var filePath = path.join(dir, entry); + var stats = fs.statSync(filePath); + + if(stats.isDirectory()) { + if(entry.substr(0, 1) == "@") { + // When we encounter a namespace folder, augment all packages belonging to the scope + var pkgFiles = fs.readdirSync(filePath); + + pkgFiles.forEach(function(entry) { + if(stats.isDirectory()) { + var pkgFilePath = path.join(filePath, entry); + augmentPackageJSON(pkgFilePath, dependencies); + } + }); + } else { + augmentPackageJSON(filePath, dependencies); + } + } + }); + } + } + + processDependencies("node_modules", lockObj.dependencies); + + fs.writeFileSync("package-lock.json", JSON.stringify(lockObj, null, 2)); + ''; + }; + + prepareAndInvokeNPM = {packageName, bypassCache, reconstructLock, npmFlags, production}: + let + forceOfflineFlag = if bypassCache then "--offline" else "--registry http://www.example.com"; + in + '' + # Pinpoint the versions of all dependencies to the ones that are actually being used + echo "pinpointing versions of dependencies..." + source $pinpointDependenciesScriptPath + + # Patch the shebangs of the bundled modules to prevent them from + # calling executables outside the Nix store as much as possible + patchShebangs . + + # Deploy the Node.js package by running npm install. Since the + # dependencies have been provided already by ourselves, it should not + # attempt to install them again, which is good, because we want to make + # it Nix's responsibility. If it needs to install any dependencies + # anyway (e.g. because the dependency parameters are + # incomplete/incorrect), it fails. + # + # The other responsibilities of NPM are kept -- version checks, build + # steps, postprocessing etc. + + export HOME=$TMPDIR + cd "${packageName}" + runHook preRebuild + + ${stdenv.lib.optionalString bypassCache '' + ${stdenv.lib.optionalString reconstructLock '' + if [ -f package-lock.json ] + then + echo "WARNING: Reconstruct lock option enabled, but a lock file already exists!" + echo "This will most likely result in version mismatches! We will remove the lock file and regenerate it!" + rm package-lock.json + else + echo "No package-lock.json file found, reconstructing..." + fi + + node ${reconstructPackageLock} + ''} + + node ${addIntegrityFieldsScript} + ''} + + npm ${forceOfflineFlag} --nodedir=${nodeSources} ${npmFlags} ${stdenv.lib.optionalString production "--production"} rebuild + + if [ "''${dontNpmInstall-}" != "1" ] + then + # NPM tries to download packages even when they already exist if npm-shrinkwrap is used. + rm -f npm-shrinkwrap.json + + npm ${forceOfflineFlag} --nodedir=${nodeSources} ${npmFlags} ${stdenv.lib.optionalString production "--production"} install + fi + ''; + + # Builds and composes an NPM package including all its dependencies + buildNodePackage = + { name + , packageName + , version + , dependencies ? [] + , buildInputs ? [] + , production ? true + , npmFlags ? "" + , dontNpmInstall ? false + , bypassCache ? false + , reconstructLock ? false + , preRebuild ? "" + , dontStrip ? true + , unpackPhase ? "true" + , buildPhase ? "true" + , ... }@args: + + let + extraArgs = removeAttrs args [ "name" "dependencies" "buildInputs" "dontStrip" "dontNpmInstall" "preRebuild" "unpackPhase" "buildPhase" ]; + in + stdenv.mkDerivation ({ + name = "node_${name}-${version}"; + buildInputs = [ tarWrapper python nodejs ] + ++ stdenv.lib.optional (stdenv.isLinux) utillinux + ++ stdenv.lib.optional (stdenv.isDarwin) libtool + ++ buildInputs; + + inherit nodejs; + + inherit dontStrip; # Stripping may fail a build for some package deployments + inherit dontNpmInstall preRebuild unpackPhase buildPhase; + + compositionScript = composePackage args; + pinpointDependenciesScript = pinpointDependenciesOfPackage args; + + passAsFile = [ "compositionScript" "pinpointDependenciesScript" ]; + + installPhase = '' + # Create and enter a root node_modules/ folder + mkdir -p $out/lib/node_modules + cd $out/lib/node_modules + + # Compose the package and all its dependencies + source $compositionScriptPath + + ${prepareAndInvokeNPM { inherit packageName bypassCache reconstructLock npmFlags production; }} + + # Create symlink to the deployed executable folder, if applicable + if [ -d "$out/lib/node_modules/.bin" ] + then + ln -s $out/lib/node_modules/.bin $out/bin + fi + + # Create symlinks to the deployed manual page folders, if applicable + if [ -d "$out/lib/node_modules/${packageName}/man" ] + then + mkdir -p $out/share + for dir in "$out/lib/node_modules/${packageName}/man/"* + do + mkdir -p $out/share/man/$(basename "$dir") + for page in "$dir"/* + do + ln -s $page $out/share/man/$(basename "$dir") + done + done + fi + + # Run post install hook, if provided + runHook postInstall + ''; + } // extraArgs); + + # Builds a development shell + buildNodeShell = + { name + , packageName + , version + , src + , dependencies ? [] + , buildInputs ? [] + , production ? true + , npmFlags ? "" + , dontNpmInstall ? false + , bypassCache ? false + , reconstructLock ? false + , dontStrip ? true + , unpackPhase ? "true" + , buildPhase ? "true" + , ... }@args: + + let + extraArgs = removeAttrs args [ "name" "dependencies" "buildInputs" ]; + + nodeDependencies = stdenv.mkDerivation ({ + name = "node-dependencies-${name}-${version}"; + + buildInputs = [ tarWrapper python nodejs ] + ++ stdenv.lib.optional (stdenv.isLinux) utillinux + ++ stdenv.lib.optional (stdenv.isDarwin) libtool + ++ buildInputs; + + inherit dontStrip; # Stripping may fail a build for some package deployments + inherit dontNpmInstall unpackPhase buildPhase; + + includeScript = includeDependencies { inherit dependencies; }; + pinpointDependenciesScript = pinpointDependenciesOfPackage args; + + passAsFile = [ "includeScript" "pinpointDependenciesScript" ]; + + installPhase = '' + mkdir -p $out/${packageName} + cd $out/${packageName} + + source $includeScriptPath + + # Create fake package.json to make the npm commands work properly + cp ${src}/package.json . + chmod 644 package.json + ${stdenv.lib.optionalString bypassCache '' + if [ -f ${src}/package-lock.json ] + then + cp ${src}/package-lock.json . + fi + ''} + + # Go to the parent folder to make sure that all packages are pinpointed + cd .. + ${stdenv.lib.optionalString (builtins.substring 0 1 packageName == "@") "cd .."} + + ${prepareAndInvokeNPM { inherit packageName bypassCache reconstructLock npmFlags production; }} + + # Expose the executables that were installed + cd .. + ${stdenv.lib.optionalString (builtins.substring 0 1 packageName == "@") "cd .."} + + mv ${packageName} lib + ln -s $out/lib/node_modules/.bin $out/bin + ''; + } // extraArgs); + in + stdenv.mkDerivation { + name = "node-shell-${name}-${version}"; + + buildInputs = [ python nodejs ] ++ stdenv.lib.optional (stdenv.isLinux) utillinux ++ buildInputs; + buildCommand = '' + mkdir -p $out/bin + cat > $out/bin/shell <<EOF + #! ${stdenv.shell} -e + $shellHook + exec ${stdenv.shell} + EOF + chmod +x $out/bin/shell + ''; + + # Provide the dependencies in a development shell through the NODE_PATH environment variable + inherit nodeDependencies; + shellHook = stdenv.lib.optionalString (dependencies != []) '' + export NODE_PATH=${nodeDependencies}/lib/node_modules + export PATH="${nodeDependencies}/bin:$PATH" + ''; + }; +in +{ + buildNodeSourceDist = stdenv.lib.makeOverridable buildNodeSourceDist; + buildNodePackage = stdenv.lib.makeOverridable buildNodePackage; + buildNodeShell = stdenv.lib.makeOverridable buildNodeShell; +} diff --git a/infra/libkookie/nixpkgs/pkgs/development/compilers/elm/packages/node-packages.json b/infra/libkookie/nixpkgs/pkgs/development/compilers/elm/packages/node-packages.json index a440533b2414..b5c7216645b5 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/compilers/elm/packages/node-packages.json +++ b/infra/libkookie/nixpkgs/pkgs/development/compilers/elm/packages/node-packages.json @@ -1,13 +1,14 @@ [ - "elm-analyse", - "elm-coverage", - "elm-doc-preview", - "@elm-tooling/elm-language-server", - "elm-live", - "elm-test", - "elm-upgrade", - "elm-verify-examples", - "elm-xref", - "create-elm-app", - "elm-optimize-level-2" + "elm-analyse", + "elm-coverage", + "elm-doc-preview", + "@elm-tooling/elm-language-server", + "elm-live", + "elm-test", + "elm-upgrade", + "elm-verify-examples", + "elm-xref", + "create-elm-app", + "elm-optimize-level-2", + "elm-review" ] diff --git a/infra/libkookie/nixpkgs/pkgs/development/compilers/elm/packages/node-packages.nix b/infra/libkookie/nixpkgs/pkgs/development/compilers/elm/packages/node-packages.nix index a284ef470bbd..c81d2acdf7f1 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/compilers/elm/packages/node-packages.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/compilers/elm/packages/node-packages.nix @@ -4,13 +4,13 @@ let sources = { - "@babel/cli-7.11.6" = { + "@babel/cli-7.12.8" = { name = "_at_babel_slash_cli"; packageName = "@babel/cli"; - version = "7.11.6"; + version = "7.12.8"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/cli/-/cli-7.11.6.tgz"; - sha512 = "+w7BZCvkewSmaRM6H4L2QM3RL90teqEIHDIFXAmrW33+0jhlymnDAEdqVeCZATvxhQuio1ifoGVlJJbIiH9Ffg=="; + url = "https://registry.npmjs.org/@babel/cli/-/cli-7.12.8.tgz"; + sha512 = "/6nQj11oaGhLmZiuRUfxsujiPDc9BBReemiXgIbxc+M5W+MIiFKYwvNDJvBfnGKNsJTKbUfEheKc9cwoPHAVQA=="; }; }; "@babel/code-frame-7.0.0" = { @@ -31,31 +31,31 @@ let sha512 = "vG6SvB6oYEhvgisZNFRmRCUkLz11c7rp+tbNTynGqc6mS1d5ATd/sGyV6W0KZZnXRKMTzZDRgQT3Ou9jhpAfUg=="; }; }; - "@babel/compat-data-7.11.0" = { + "@babel/compat-data-7.12.7" = { name = "_at_babel_slash_compat-data"; packageName = "@babel/compat-data"; - version = "7.11.0"; + version = "7.12.7"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.11.0.tgz"; - sha512 = "TPSvJfv73ng0pfnEOh17bYMPQbI95+nGWc71Ss4vZdRBHTDqmM9Z8ZV4rYz8Ks7sfzc95n30k6ODIq5UGnXcYQ=="; + url = "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.12.7.tgz"; + sha512 = "YaxPMGs/XIWtYqrdEOZOCPsVWfEoriXopnsz3/i7apYPXQ3698UFhS6dVT1KN5qOsWmVgw/FOrmQgpRaZayGsw=="; }; }; - "@babel/core-7.11.6" = { + "@babel/core-7.12.9" = { name = "_at_babel_slash_core"; packageName = "@babel/core"; - version = "7.11.6"; + version = "7.12.9"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/core/-/core-7.11.6.tgz"; - sha512 = "Wpcv03AGnmkgm6uS6k8iwhIwTrcP0m17TL1n1sy7qD0qelDu4XNeW0dN0mHfa+Gei211yDaLoEe/VlbXQzM4Bg=="; + url = "https://registry.npmjs.org/@babel/core/-/core-7.12.9.tgz"; + sha512 = "gTXYh3M5wb7FRXQy+FErKFAv90BnlOuNn1QkCK2lREoPAjrQCO49+HVSrFoe5uakFAF5eenS75KbO2vQiLrTMQ=="; }; }; - "@babel/generator-7.11.6" = { + "@babel/generator-7.12.5" = { name = "_at_babel_slash_generator"; packageName = "@babel/generator"; - version = "7.11.6"; + version = "7.12.5"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/generator/-/generator-7.11.6.tgz"; - sha512 = "DWtQ1PV3r+cLbySoHrwn9RWEgKMBLLma4OBQloPRyDYvc5msJM9kvTLo1YnlJd1P/ZuKbdli3ijr5q3FvAF3uA=="; + url = "https://registry.npmjs.org/@babel/generator/-/generator-7.12.5.tgz"; + sha512 = "m16TQQJ8hPt7E+OS/XVQg/7U184MLXtvuGbCdA7na61vha+ImkyyNM/9DDA0unYCVZn3ZOhng+qz48/KBOT96A=="; }; }; "@babel/helper-annotate-as-pure-7.10.4" = { @@ -76,31 +76,31 @@ let sha512 = "L0zGlFrGWZK4PbT8AszSfLTM5sDU1+Az/En9VrdT8/LmEiJt4zXt+Jve9DCAnQcbqDhCI+29y/L93mrDzddCcg=="; }; }; - "@babel/helper-compilation-targets-7.10.4" = { + "@babel/helper-compilation-targets-7.12.5" = { name = "_at_babel_slash_helper-compilation-targets"; packageName = "@babel/helper-compilation-targets"; - version = "7.10.4"; + version = "7.12.5"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.10.4.tgz"; - sha512 = "a3rYhlsGV0UHNDvrtOXBg8/OpfV0OKTkxKPzIplS1zpx7CygDcWWxckxZeDd3gzPzC4kUT0A4nVFDK0wGMh4MQ=="; + url = "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.12.5.tgz"; + sha512 = "+qH6NrscMolUlzOYngSBMIOQpKUGPPsc61Bu5W10mg84LxZ7cmvnBHzARKbDoFxVvqqAbj6Tg6N7bSrWSPXMyw=="; }; }; - "@babel/helper-create-class-features-plugin-7.10.5" = { + "@babel/helper-create-class-features-plugin-7.12.1" = { name = "_at_babel_slash_helper-create-class-features-plugin"; packageName = "@babel/helper-create-class-features-plugin"; - version = "7.10.5"; + version = "7.12.1"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.10.5.tgz"; - sha512 = "0nkdeijB7VlZoLT3r/mY3bUkw3T8WG/hNw+FATs/6+pG2039IJWjTYL0VTISqsNHMUTEnwbVnc89WIJX9Qed0A=="; + url = "https://registry.npmjs.org/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.12.1.tgz"; + sha512 = "hkL++rWeta/OVOBTRJc9a5Azh5mt5WgZUGAKMD8JM141YsE08K//bp1unBBieO6rUKkIPyUE0USQ30jAy3Sk1w=="; }; }; - "@babel/helper-create-regexp-features-plugin-7.10.4" = { + "@babel/helper-create-regexp-features-plugin-7.12.7" = { name = "_at_babel_slash_helper-create-regexp-features-plugin"; packageName = "@babel/helper-create-regexp-features-plugin"; - version = "7.10.4"; + version = "7.12.7"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-create-regexp-features-plugin/-/helper-create-regexp-features-plugin-7.10.4.tgz"; - sha512 = "2/hu58IEPKeoLF45DBwx3XFqsbCXmkdAay4spVr2x0jYgRxrSNp+ePwvSsy9g6YSaNDcKIQVPXk1Ov8S2edk2g=="; + url = "https://registry.npmjs.org/@babel/helper-create-regexp-features-plugin/-/helper-create-regexp-features-plugin-7.12.7.tgz"; + sha512 = "idnutvQPdpbduutvi3JVfEgcVIHooQnhvhx0Nk9isOINOIGYkZea1Pk2JlJRiUnMefrlvr0vkByATBY/mB4vjQ=="; }; }; "@babel/helper-define-map-7.10.5" = { @@ -112,13 +112,13 @@ let sha512 = "fMw4kgFB720aQFXSVaXr79pjjcW5puTCM16+rECJ/plGS+zByelE8l9nCpV1GibxTnFVmUuYG9U8wYfQHdzOEQ=="; }; }; - "@babel/helper-explode-assignable-expression-7.11.4" = { + "@babel/helper-explode-assignable-expression-7.12.1" = { name = "_at_babel_slash_helper-explode-assignable-expression"; packageName = "@babel/helper-explode-assignable-expression"; - version = "7.11.4"; + version = "7.12.1"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-explode-assignable-expression/-/helper-explode-assignable-expression-7.11.4.tgz"; - sha512 = "ux9hm3zR4WV1Y3xXxXkdG/0gxF9nvI0YVmKVhvK9AfMoaQkemL3sJpXw+Xbz65azo8qJiEz2XVDUpK3KYhH3ZQ=="; + url = "https://registry.npmjs.org/@babel/helper-explode-assignable-expression/-/helper-explode-assignable-expression-7.12.1.tgz"; + sha512 = "dmUwH8XmlrUpVqgtZ737tK88v07l840z9j3OEhCLwKTkjlvKpfqXVIZ0wpK3aeOxspwGrf/5AP5qLx4rO3w5rA=="; }; }; "@babel/helper-function-name-7.10.4" = { @@ -148,40 +148,40 @@ let sha512 = "wljroF5PgCk2juF69kanHVs6vrLwIPNp6DLD+Lrl3hoQ3PpPPikaDRNFA+0t81NOoMt2DL6WW/mdU8k4k6ZzuA=="; }; }; - "@babel/helper-member-expression-to-functions-7.11.0" = { + "@babel/helper-member-expression-to-functions-7.12.7" = { name = "_at_babel_slash_helper-member-expression-to-functions"; packageName = "@babel/helper-member-expression-to-functions"; - version = "7.11.0"; + version = "7.12.7"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.11.0.tgz"; - sha512 = "JbFlKHFntRV5qKw3YC0CvQnDZ4XMwgzzBbld7Ly4Mj4cbFy3KywcR8NtNctRToMWJOVvLINJv525Gd6wwVEx/Q=="; + url = "https://registry.npmjs.org/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.12.7.tgz"; + sha512 = "DCsuPyeWxeHgh1Dus7APn7iza42i/qXqiFPWyBDdOFtvS581JQePsc1F/nD+fHrcswhLlRc2UpYS1NwERxZhHw=="; }; }; - "@babel/helper-module-imports-7.10.4" = { + "@babel/helper-module-imports-7.12.5" = { name = "_at_babel_slash_helper-module-imports"; packageName = "@babel/helper-module-imports"; - version = "7.10.4"; + version = "7.12.5"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.10.4.tgz"; - sha512 = "nEQJHqYavI217oD9+s5MUBzk6x1IlvoS9WTPfgG43CbMEeStE0v+r+TucWdx8KFGowPGvyOkDT9+7DHedIDnVw=="; + url = "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.12.5.tgz"; + sha512 = "SR713Ogqg6++uexFRORf/+nPXMmWIn80TALu0uaFb+iQIUoR7bOC7zBWyzBs5b3tBBJXuyD0cRu1F15GyzjOWA=="; }; }; - "@babel/helper-module-transforms-7.11.0" = { + "@babel/helper-module-transforms-7.12.1" = { name = "_at_babel_slash_helper-module-transforms"; packageName = "@babel/helper-module-transforms"; - version = "7.11.0"; + version = "7.12.1"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.11.0.tgz"; - sha512 = "02EVu8COMuTRO1TAzdMtpBPbe6aQ1w/8fePD2YgQmxZU4gpNWaL9gK3Jp7dxlkUlUCJOTaSeA+Hrm1BRQwqIhg=="; + url = "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.12.1.tgz"; + sha512 = "QQzehgFAZ2bbISiCpmVGfiGux8YVFXQ0abBic2Envhej22DVXV9nCFaS5hIQbkyo1AdGb+gNME2TSh3hYJVV/w=="; }; }; - "@babel/helper-optimise-call-expression-7.10.4" = { + "@babel/helper-optimise-call-expression-7.12.7" = { name = "_at_babel_slash_helper-optimise-call-expression"; packageName = "@babel/helper-optimise-call-expression"; - version = "7.10.4"; + version = "7.12.7"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.10.4.tgz"; - sha512 = "n3UGKY4VXwXThEiKrgRAoVPBMqeoPgHVqiHZOanAJCG9nQUL2pLRQirUzl0ioKclHGpGqRgIOkgcIJaIWLpygg=="; + url = "https://registry.npmjs.org/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.12.7.tgz"; + sha512 = "I5xc9oSJ2h59OwyUqjv95HRyzxj53DAubUERgQMrpcCEYQyToeHA+NEcUEsVWB4j53RDeskeBJ0SgRAYHDBckw=="; }; }; "@babel/helper-plugin-utils-7.10.4" = { @@ -193,49 +193,40 @@ let sha512 = "O4KCvQA6lLiMU9l2eawBPMf1xPP8xPfB3iEQw150hOVTqj/rfXz0ThTb4HEzqQfs2Bmo5Ay8BzxfzVtBrr9dVg=="; }; }; - "@babel/helper-regex-7.10.5" = { - name = "_at_babel_slash_helper-regex"; - packageName = "@babel/helper-regex"; - version = "7.10.5"; - src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-regex/-/helper-regex-7.10.5.tgz"; - sha512 = "68kdUAzDrljqBrio7DYAEgCoJHxppJOERHOgOrDN7WjOzP0ZQ1LsSDRXcemzVZaLvjaJsJEESb6qt+znNuENDg=="; - }; - }; - "@babel/helper-remap-async-to-generator-7.11.4" = { + "@babel/helper-remap-async-to-generator-7.12.1" = { name = "_at_babel_slash_helper-remap-async-to-generator"; packageName = "@babel/helper-remap-async-to-generator"; - version = "7.11.4"; + version = "7.12.1"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-remap-async-to-generator/-/helper-remap-async-to-generator-7.11.4.tgz"; - sha512 = "tR5vJ/vBa9wFy3m5LLv2faapJLnDFxNWff2SAYkSE4rLUdbp7CdObYFgI7wK4T/Mj4UzpjPwzR8Pzmr5m7MHGA=="; + url = "https://registry.npmjs.org/@babel/helper-remap-async-to-generator/-/helper-remap-async-to-generator-7.12.1.tgz"; + sha512 = "9d0KQCRM8clMPcDwo8SevNs+/9a8yWVVmaE80FGJcEP8N1qToREmWEGnBn8BUlJhYRFz6fqxeRL1sl5Ogsed7A=="; }; }; - "@babel/helper-replace-supers-7.10.4" = { + "@babel/helper-replace-supers-7.12.5" = { name = "_at_babel_slash_helper-replace-supers"; packageName = "@babel/helper-replace-supers"; - version = "7.10.4"; + version = "7.12.5"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-replace-supers/-/helper-replace-supers-7.10.4.tgz"; - sha512 = "sPxZfFXocEymYTdVK1UNmFPBN+Hv5mJkLPsYWwGBxZAxaWfFu+xqp7b6qWD0yjNuNL2VKc6L5M18tOXUP7NU0A=="; + url = "https://registry.npmjs.org/@babel/helper-replace-supers/-/helper-replace-supers-7.12.5.tgz"; + sha512 = "5YILoed0ZyIpF4gKcpZitEnXEJ9UoDRki1Ey6xz46rxOzfNMAhVIJMoune1hmPVxh40LRv1+oafz7UsWX+vyWA=="; }; }; - "@babel/helper-simple-access-7.10.4" = { + "@babel/helper-simple-access-7.12.1" = { name = "_at_babel_slash_helper-simple-access"; packageName = "@babel/helper-simple-access"; - version = "7.10.4"; + version = "7.12.1"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-simple-access/-/helper-simple-access-7.10.4.tgz"; - sha512 = "0fMy72ej/VEvF8ULmX6yb5MtHG4uH4Dbd6I/aHDb/JVg0bbivwt9Wg+h3uMvX+QSFtwr5MeItvazbrc4jtRAXw=="; + url = "https://registry.npmjs.org/@babel/helper-simple-access/-/helper-simple-access-7.12.1.tgz"; + sha512 = "OxBp7pMrjVewSSC8fXDFrHrBcJATOOFssZwv16F3/6Xtc138GHybBfPbm9kfiqQHKhYQrlamWILwlDCeyMFEaA=="; }; }; - "@babel/helper-skip-transparent-expression-wrappers-7.11.0" = { + "@babel/helper-skip-transparent-expression-wrappers-7.12.1" = { name = "_at_babel_slash_helper-skip-transparent-expression-wrappers"; packageName = "@babel/helper-skip-transparent-expression-wrappers"; - version = "7.11.0"; + version = "7.12.1"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-skip-transparent-expression-wrappers/-/helper-skip-transparent-expression-wrappers-7.11.0.tgz"; - sha512 = "0XIdiQln4Elglgjbwo9wuJpL/K7AGCY26kmEt0+pRP0TAj4jjyNq1MjoRvikrTVqKcx4Gysxt4cXvVFXP/JO2Q=="; + url = "https://registry.npmjs.org/@babel/helper-skip-transparent-expression-wrappers/-/helper-skip-transparent-expression-wrappers-7.12.1.tgz"; + sha512 = "Mf5AUuhG1/OCChOJ/HcADmvcHM42WJockombn8ATJG3OnyiSxBK/Mm5x78BQWvmtXZKHgbjdGL2kin/HOLlZGA=="; }; }; "@babel/helper-split-export-declaration-7.11.0" = { @@ -256,22 +247,31 @@ let sha512 = "3U9y+43hz7ZM+rzG24Qe2mufW5KhvFg/NhnNph+i9mgCtdTCtMJuI1TMkrIUiK7Ix4PYlRF9I5dhqaLYA/ADXw=="; }; }; - "@babel/helper-wrap-function-7.10.4" = { + "@babel/helper-validator-option-7.12.1" = { + name = "_at_babel_slash_helper-validator-option"; + packageName = "@babel/helper-validator-option"; + version = "7.12.1"; + src = fetchurl { + url = "https://registry.npmjs.org/@babel/helper-validator-option/-/helper-validator-option-7.12.1.tgz"; + sha512 = "YpJabsXlJVWP0USHjnC/AQDTLlZERbON577YUVO/wLpqyj6HAtVYnWaQaN0iUN+1/tWn3c+uKKXjRut5115Y2A=="; + }; + }; + "@babel/helper-wrap-function-7.12.3" = { name = "_at_babel_slash_helper-wrap-function"; packageName = "@babel/helper-wrap-function"; - version = "7.10.4"; + version = "7.12.3"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-wrap-function/-/helper-wrap-function-7.10.4.tgz"; - sha512 = "6py45WvEF0MhiLrdxtRjKjufwLL1/ob2qDJgg5JgNdojBAZSAKnAjkyOCNug6n+OBl4VW76XjvgSFTdaMcW0Ug=="; + url = "https://registry.npmjs.org/@babel/helper-wrap-function/-/helper-wrap-function-7.12.3.tgz"; + sha512 = "Cvb8IuJDln3rs6tzjW3Y8UeelAOdnpB8xtQ4sme2MSZ9wOxrbThporC0y/EtE16VAtoyEfLM404Xr1e0OOp+ow=="; }; }; - "@babel/helpers-7.10.4" = { + "@babel/helpers-7.12.5" = { name = "_at_babel_slash_helpers"; packageName = "@babel/helpers"; - version = "7.10.4"; + version = "7.12.5"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helpers/-/helpers-7.10.4.tgz"; - sha512 = "L2gX/XeUONeEbI78dXSrJzGdz4GQ+ZTA/aazfUsFaWjSe95kiCuOZ5HsXvkiw3iwF+mFHSRUfJU8t6YavocdXA=="; + url = "https://registry.npmjs.org/@babel/helpers/-/helpers-7.12.5.tgz"; + sha512 = "lgKGMQlKqA8meJqKsW6rUnc4MdUk35Ln0ATDqdM1a/UpARODdI4j5Y5lVfUScnSNkJcdCRAaWkspykNoFg9sJA=="; }; }; "@babel/highlight-7.10.4" = { @@ -283,130 +283,130 @@ let sha512 = "i6rgnR/YgPEQzZZnbTHHuZdlE8qyoBNalD6F+q4vAFlcMEcqmkoG+mPqJYJCo63qPf74+Y1UZsl3l6f7/RIkmA=="; }; }; - "@babel/parser-7.11.5" = { + "@babel/parser-7.12.7" = { name = "_at_babel_slash_parser"; packageName = "@babel/parser"; - version = "7.11.5"; + version = "7.12.7"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/parser/-/parser-7.11.5.tgz"; - sha512 = "X9rD8qqm695vgmeaQ4fvz/o3+Wk4ZzQvSHkDBgpYKxpD4qTAUm88ZKtHkVqIOsYFFbIQ6wQYhC6q7pjqVK0E0Q=="; + url = "https://registry.npmjs.org/@babel/parser/-/parser-7.12.7.tgz"; + sha512 = "oWR02Ubp4xTLCAqPRiNIuMVgNO5Aif/xpXtabhzW2HWUD47XJsAB4Zd/Rg30+XeQA3juXigV7hlquOTmwqLiwg=="; }; }; - "@babel/plugin-proposal-async-generator-functions-7.10.5" = { + "@babel/plugin-proposal-async-generator-functions-7.12.1" = { name = "_at_babel_slash_plugin-proposal-async-generator-functions"; packageName = "@babel/plugin-proposal-async-generator-functions"; - version = "7.10.5"; + version = "7.12.1"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-proposal-async-generator-functions/-/plugin-proposal-async-generator-functions-7.10.5.tgz"; - sha512 = "cNMCVezQbrRGvXJwm9fu/1sJj9bHdGAgKodZdLqOQIpfoH3raqmRPBM17+lh7CzhiKRRBrGtZL9WcjxSoGYUSg=="; + url = "https://registry.npmjs.org/@babel/plugin-proposal-async-generator-functions/-/plugin-proposal-async-generator-functions-7.12.1.tgz"; + sha512 = "d+/o30tJxFxrA1lhzJqiUcEJdI6jKlNregCv5bASeGf2Q4MXmnwH7viDo7nhx1/ohf09oaH8j1GVYG/e3Yqk6A=="; }; }; - "@babel/plugin-proposal-class-properties-7.10.4" = { + "@babel/plugin-proposal-class-properties-7.12.1" = { name = "_at_babel_slash_plugin-proposal-class-properties"; packageName = "@babel/plugin-proposal-class-properties"; - version = "7.10.4"; + version = "7.12.1"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-proposal-class-properties/-/plugin-proposal-class-properties-7.10.4.tgz"; - sha512 = "vhwkEROxzcHGNu2mzUC0OFFNXdZ4M23ib8aRRcJSsW8BZK9pQMD7QB7csl97NBbgGZO7ZyHUyKDnxzOaP4IrCg=="; + url = "https://registry.npmjs.org/@babel/plugin-proposal-class-properties/-/plugin-proposal-class-properties-7.12.1.tgz"; + sha512 = "cKp3dlQsFsEs5CWKnN7BnSHOd0EOW8EKpEjkoz1pO2E5KzIDNV9Ros1b0CnmbVgAGXJubOYVBOGCT1OmJwOI7w=="; }; }; - "@babel/plugin-proposal-dynamic-import-7.10.4" = { + "@babel/plugin-proposal-dynamic-import-7.12.1" = { name = "_at_babel_slash_plugin-proposal-dynamic-import"; packageName = "@babel/plugin-proposal-dynamic-import"; - version = "7.10.4"; + version = "7.12.1"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-proposal-dynamic-import/-/plugin-proposal-dynamic-import-7.10.4.tgz"; - sha512 = "up6oID1LeidOOASNXgv/CFbgBqTuKJ0cJjz6An5tWD+NVBNlp3VNSBxv2ZdU7SYl3NxJC7agAQDApZusV6uFwQ=="; + url = "https://registry.npmjs.org/@babel/plugin-proposal-dynamic-import/-/plugin-proposal-dynamic-import-7.12.1.tgz"; + sha512 = "a4rhUSZFuq5W8/OO8H7BL5zspjnc1FLd9hlOxIK/f7qG4a0qsqk8uvF/ywgBA8/OmjsapjpvaEOYItfGG1qIvQ=="; }; }; - "@babel/plugin-proposal-export-namespace-from-7.10.4" = { + "@babel/plugin-proposal-export-namespace-from-7.12.1" = { name = "_at_babel_slash_plugin-proposal-export-namespace-from"; packageName = "@babel/plugin-proposal-export-namespace-from"; - version = "7.10.4"; + version = "7.12.1"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-proposal-export-namespace-from/-/plugin-proposal-export-namespace-from-7.10.4.tgz"; - sha512 = "aNdf0LY6/3WXkhh0Fdb6Zk9j1NMD8ovj3F6r0+3j837Pn1S1PdNtcwJ5EG9WkVPNHPxyJDaxMaAOVq4eki0qbg=="; + url = "https://registry.npmjs.org/@babel/plugin-proposal-export-namespace-from/-/plugin-proposal-export-namespace-from-7.12.1.tgz"; + sha512 = "6CThGf0irEkzujYS5LQcjBx8j/4aQGiVv7J9+2f7pGfxqyKh3WnmVJYW3hdrQjyksErMGBPQrCnHfOtna+WLbw=="; }; }; - "@babel/plugin-proposal-json-strings-7.10.4" = { + "@babel/plugin-proposal-json-strings-7.12.1" = { name = "_at_babel_slash_plugin-proposal-json-strings"; packageName = "@babel/plugin-proposal-json-strings"; - version = "7.10.4"; + version = "7.12.1"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-proposal-json-strings/-/plugin-proposal-json-strings-7.10.4.tgz"; - sha512 = "fCL7QF0Jo83uy1K0P2YXrfX11tj3lkpN7l4dMv9Y9VkowkhkQDwFHFd8IiwyK5MZjE8UpbgokkgtcReH88Abaw=="; + url = "https://registry.npmjs.org/@babel/plugin-proposal-json-strings/-/plugin-proposal-json-strings-7.12.1.tgz"; + sha512 = "GoLDUi6U9ZLzlSda2Df++VSqDJg3CG+dR0+iWsv6XRw1rEq+zwt4DirM9yrxW6XWaTpmai1cWJLMfM8qQJf+yw=="; }; }; - "@babel/plugin-proposal-logical-assignment-operators-7.11.0" = { + "@babel/plugin-proposal-logical-assignment-operators-7.12.1" = { name = "_at_babel_slash_plugin-proposal-logical-assignment-operators"; packageName = "@babel/plugin-proposal-logical-assignment-operators"; - version = "7.11.0"; + version = "7.12.1"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-proposal-logical-assignment-operators/-/plugin-proposal-logical-assignment-operators-7.11.0.tgz"; - sha512 = "/f8p4z+Auz0Uaf+i8Ekf1iM7wUNLcViFUGiPxKeXvxTSl63B875YPiVdUDdem7hREcI0E0kSpEhS8tF5RphK7Q=="; + url = "https://registry.npmjs.org/@babel/plugin-proposal-logical-assignment-operators/-/plugin-proposal-logical-assignment-operators-7.12.1.tgz"; + sha512 = "k8ZmVv0JU+4gcUGeCDZOGd0lCIamU/sMtIiX3UWnUc5yzgq6YUGyEolNYD+MLYKfSzgECPcqetVcJP9Afe/aCA=="; }; }; - "@babel/plugin-proposal-nullish-coalescing-operator-7.10.4" = { + "@babel/plugin-proposal-nullish-coalescing-operator-7.12.1" = { name = "_at_babel_slash_plugin-proposal-nullish-coalescing-operator"; packageName = "@babel/plugin-proposal-nullish-coalescing-operator"; - version = "7.10.4"; + version = "7.12.1"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-proposal-nullish-coalescing-operator/-/plugin-proposal-nullish-coalescing-operator-7.10.4.tgz"; - sha512 = "wq5n1M3ZUlHl9sqT2ok1T2/MTt6AXE0e1Lz4WzWBr95LsAZ5qDXe4KnFuauYyEyLiohvXFMdbsOTMyLZs91Zlw=="; + url = "https://registry.npmjs.org/@babel/plugin-proposal-nullish-coalescing-operator/-/plugin-proposal-nullish-coalescing-operator-7.12.1.tgz"; + sha512 = "nZY0ESiaQDI1y96+jk6VxMOaL4LPo/QDHBqL+SF3/vl6dHkTwHlOI8L4ZwuRBHgakRBw5zsVylel7QPbbGuYgg=="; }; }; - "@babel/plugin-proposal-numeric-separator-7.10.4" = { + "@babel/plugin-proposal-numeric-separator-7.12.7" = { name = "_at_babel_slash_plugin-proposal-numeric-separator"; packageName = "@babel/plugin-proposal-numeric-separator"; - version = "7.10.4"; + version = "7.12.7"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-proposal-numeric-separator/-/plugin-proposal-numeric-separator-7.10.4.tgz"; - sha512 = "73/G7QoRoeNkLZFxsoCCvlg4ezE4eM+57PnOqgaPOozd5myfj7p0muD1mRVJvbUWbOzD+q3No2bWbaKy+DJ8DA=="; + url = "https://registry.npmjs.org/@babel/plugin-proposal-numeric-separator/-/plugin-proposal-numeric-separator-7.12.7.tgz"; + sha512 = "8c+uy0qmnRTeukiGsjLGy6uVs/TFjJchGXUeBqlG4VWYOdJWkhhVPdQ3uHwbmalfJwv2JsV0qffXP4asRfL2SQ=="; }; }; - "@babel/plugin-proposal-object-rest-spread-7.11.0" = { + "@babel/plugin-proposal-object-rest-spread-7.12.1" = { name = "_at_babel_slash_plugin-proposal-object-rest-spread"; packageName = "@babel/plugin-proposal-object-rest-spread"; - version = "7.11.0"; + version = "7.12.1"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.11.0.tgz"; - sha512 = "wzch41N4yztwoRw0ak+37wxwJM2oiIiy6huGCoqkvSTA9acYWcPfn9Y4aJqmFFJ70KTJUu29f3DQ43uJ9HXzEA=="; + url = "https://registry.npmjs.org/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.12.1.tgz"; + sha512 = "s6SowJIjzlhx8o7lsFx5zmY4At6CTtDvgNQDdPzkBQucle58A6b/TTeEBYtyDgmcXjUTM+vE8YOGHZzzbc/ioA=="; }; }; - "@babel/plugin-proposal-optional-catch-binding-7.10.4" = { + "@babel/plugin-proposal-optional-catch-binding-7.12.1" = { name = "_at_babel_slash_plugin-proposal-optional-catch-binding"; packageName = "@babel/plugin-proposal-optional-catch-binding"; - version = "7.10.4"; + version = "7.12.1"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-proposal-optional-catch-binding/-/plugin-proposal-optional-catch-binding-7.10.4.tgz"; - sha512 = "LflT6nPh+GK2MnFiKDyLiqSqVHkQnVf7hdoAvyTnnKj9xB3docGRsdPuxp6qqqW19ifK3xgc9U5/FwrSaCNX5g=="; + url = "https://registry.npmjs.org/@babel/plugin-proposal-optional-catch-binding/-/plugin-proposal-optional-catch-binding-7.12.1.tgz"; + sha512 = "hFvIjgprh9mMw5v42sJWLI1lzU5L2sznP805zeT6rySVRA0Y18StRhDqhSxlap0oVgItRsB6WSROp4YnJTJz0g=="; }; }; - "@babel/plugin-proposal-optional-chaining-7.11.0" = { + "@babel/plugin-proposal-optional-chaining-7.12.7" = { name = "_at_babel_slash_plugin-proposal-optional-chaining"; packageName = "@babel/plugin-proposal-optional-chaining"; - version = "7.11.0"; + version = "7.12.7"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-proposal-optional-chaining/-/plugin-proposal-optional-chaining-7.11.0.tgz"; - sha512 = "v9fZIu3Y8562RRwhm1BbMRxtqZNFmFA2EG+pT2diuU8PT3H6T/KXoZ54KgYisfOFZHV6PfvAiBIZ9Rcz+/JCxA=="; + url = "https://registry.npmjs.org/@babel/plugin-proposal-optional-chaining/-/plugin-proposal-optional-chaining-7.12.7.tgz"; + sha512 = "4ovylXZ0PWmwoOvhU2vhnzVNnm88/Sm9nx7V8BPgMvAzn5zDou3/Awy0EjglyubVHasJj+XCEkr/r1X3P5elCA=="; }; }; - "@babel/plugin-proposal-private-methods-7.10.4" = { + "@babel/plugin-proposal-private-methods-7.12.1" = { name = "_at_babel_slash_plugin-proposal-private-methods"; packageName = "@babel/plugin-proposal-private-methods"; - version = "7.10.4"; + version = "7.12.1"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-proposal-private-methods/-/plugin-proposal-private-methods-7.10.4.tgz"; - sha512 = "wh5GJleuI8k3emgTg5KkJK6kHNsGEr0uBTDBuQUBJwckk9xs1ez79ioheEVVxMLyPscB0LfkbVHslQqIzWV6Bw=="; + url = "https://registry.npmjs.org/@babel/plugin-proposal-private-methods/-/plugin-proposal-private-methods-7.12.1.tgz"; + sha512 = "mwZ1phvH7/NHK6Kf8LP7MYDogGV+DKB1mryFOEwx5EBNQrosvIczzZFTUmWaeujd5xT6G1ELYWUz3CutMhjE1w=="; }; }; - "@babel/plugin-proposal-unicode-property-regex-7.10.4" = { + "@babel/plugin-proposal-unicode-property-regex-7.12.1" = { name = "_at_babel_slash_plugin-proposal-unicode-property-regex"; packageName = "@babel/plugin-proposal-unicode-property-regex"; - version = "7.10.4"; + version = "7.12.1"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-proposal-unicode-property-regex/-/plugin-proposal-unicode-property-regex-7.10.4.tgz"; - sha512 = "H+3fOgPnEXFL9zGYtKQe4IDOPKYlZdF1kqFDQRRb8PK4B8af1vAGK04tF5iQAAsui+mHNBQSAtd2/ndEDe9wuA=="; + url = "https://registry.npmjs.org/@babel/plugin-proposal-unicode-property-regex/-/plugin-proposal-unicode-property-regex-7.12.1.tgz"; + sha512 = "MYq+l+PvHuw/rKUz1at/vb6nCnQ2gmJBNaM62z0OgH7B2W1D9pvkpYtlti9bGtizNIU1K3zm4bZF9F91efVY0w=="; }; }; "@babel/plugin-syntax-async-generators-7.8.4" = { @@ -418,13 +418,13 @@ let sha512 = "tycmZxkGfZaxhMRbXlPXuVFpdWlXpir2W4AMhSJgRKzk/eDlIXOhb2LHWoLpDF7TEHylV5zNhykX6KAgHJmTNw=="; }; }; - "@babel/plugin-syntax-class-properties-7.10.4" = { + "@babel/plugin-syntax-class-properties-7.12.1" = { name = "_at_babel_slash_plugin-syntax-class-properties"; packageName = "@babel/plugin-syntax-class-properties"; - version = "7.10.4"; + version = "7.12.1"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-syntax-class-properties/-/plugin-syntax-class-properties-7.10.4.tgz"; - sha512 = "GCSBF7iUle6rNugfURwNmCGG3Z/2+opxAMLs1nND4bhEG5PuxTIggDBoeYYSujAlLtsupzOHYJQgPS3pivwXIA=="; + url = "https://registry.npmjs.org/@babel/plugin-syntax-class-properties/-/plugin-syntax-class-properties-7.12.1.tgz"; + sha512 = "U40A76x5gTwmESz+qiqssqmeEsKvcSyvtgktrm0uzcARAmM9I1jR221f6Oq+GmHrcD+LvZDag1UTOTe2fL3TeA=="; }; }; "@babel/plugin-syntax-dynamic-import-7.8.3" = { @@ -508,319 +508,319 @@ let sha512 = "KoK9ErH1MBlCPxV0VANkXW2/dw4vlbGDrFgz8bmUsBGYkFRcbRwMh6cIJubdPrkxRwuGdtCk0v/wPTKbQgBjkg=="; }; }; - "@babel/plugin-syntax-top-level-await-7.10.4" = { + "@babel/plugin-syntax-top-level-await-7.12.1" = { name = "_at_babel_slash_plugin-syntax-top-level-await"; packageName = "@babel/plugin-syntax-top-level-await"; - version = "7.10.4"; + version = "7.12.1"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-syntax-top-level-await/-/plugin-syntax-top-level-await-7.10.4.tgz"; - sha512 = "ni1brg4lXEmWyafKr0ccFWkJG0CeMt4WV1oyeBW6EFObF4oOHclbkj5cARxAPQyAQ2UTuplJyK4nfkXIMMFvsQ=="; + url = "https://registry.npmjs.org/@babel/plugin-syntax-top-level-await/-/plugin-syntax-top-level-await-7.12.1.tgz"; + sha512 = "i7ooMZFS+a/Om0crxZodrTzNEPJHZrlMVGMTEpFAj6rYY/bKCddB0Dk/YxfPuYXOopuhKk/e1jV6h+WUU9XN3A=="; }; }; - "@babel/plugin-transform-arrow-functions-7.10.4" = { + "@babel/plugin-transform-arrow-functions-7.12.1" = { name = "_at_babel_slash_plugin-transform-arrow-functions"; packageName = "@babel/plugin-transform-arrow-functions"; - version = "7.10.4"; + version = "7.12.1"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-arrow-functions/-/plugin-transform-arrow-functions-7.10.4.tgz"; - sha512 = "9J/oD1jV0ZCBcgnoFWFq1vJd4msoKb/TCpGNFyyLt0zABdcvgK3aYikZ8HjzB14c26bc7E3Q1yugpwGy2aTPNA=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-arrow-functions/-/plugin-transform-arrow-functions-7.12.1.tgz"; + sha512 = "5QB50qyN44fzzz4/qxDPQMBCTHgxg3n0xRBLJUmBlLoU/sFvxVWGZF/ZUfMVDQuJUKXaBhbupxIzIfZ6Fwk/0A=="; }; }; - "@babel/plugin-transform-async-to-generator-7.10.4" = { + "@babel/plugin-transform-async-to-generator-7.12.1" = { name = "_at_babel_slash_plugin-transform-async-to-generator"; packageName = "@babel/plugin-transform-async-to-generator"; - version = "7.10.4"; + version = "7.12.1"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-async-to-generator/-/plugin-transform-async-to-generator-7.10.4.tgz"; - sha512 = "F6nREOan7J5UXTLsDsZG3DXmZSVofr2tGNwfdrVwkDWHfQckbQXnXSPfD7iO+c/2HGqycwyLST3DnZ16n+cBJQ=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-async-to-generator/-/plugin-transform-async-to-generator-7.12.1.tgz"; + sha512 = "SDtqoEcarK1DFlRJ1hHRY5HvJUj5kX4qmtpMAm2QnhOlyuMC4TMdCRgW6WXpv93rZeYNeLP22y8Aq2dbcDRM1A=="; }; }; - "@babel/plugin-transform-block-scoped-functions-7.10.4" = { + "@babel/plugin-transform-block-scoped-functions-7.12.1" = { name = "_at_babel_slash_plugin-transform-block-scoped-functions"; packageName = "@babel/plugin-transform-block-scoped-functions"; - version = "7.10.4"; + version = "7.12.1"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-block-scoped-functions/-/plugin-transform-block-scoped-functions-7.10.4.tgz"; - sha512 = "WzXDarQXYYfjaV1szJvN3AD7rZgZzC1JtjJZ8dMHUyiK8mxPRahynp14zzNjU3VkPqPsO38CzxiWO1c9ARZ8JA=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-block-scoped-functions/-/plugin-transform-block-scoped-functions-7.12.1.tgz"; + sha512 = "5OpxfuYnSgPalRpo8EWGPzIYf0lHBWORCkj5M0oLBwHdlux9Ri36QqGW3/LR13RSVOAoUUMzoPI/jpE4ABcHoA=="; }; }; - "@babel/plugin-transform-block-scoping-7.11.1" = { + "@babel/plugin-transform-block-scoping-7.12.1" = { name = "_at_babel_slash_plugin-transform-block-scoping"; packageName = "@babel/plugin-transform-block-scoping"; - version = "7.11.1"; + version = "7.12.1"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.11.1.tgz"; - sha512 = "00dYeDE0EVEHuuM+26+0w/SCL0BH2Qy7LwHuI4Hi4MH5gkC8/AqMN5uWFJIsoXZrAphiMm1iXzBw6L2T+eA0ew=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.12.1.tgz"; + sha512 = "zJyAC9sZdE60r1nVQHblcfCj29Dh2Y0DOvlMkcqSo0ckqjiCwNiUezUKw+RjOCwGfpLRwnAeQ2XlLpsnGkvv9w=="; }; }; - "@babel/plugin-transform-classes-7.10.4" = { + "@babel/plugin-transform-classes-7.12.1" = { name = "_at_babel_slash_plugin-transform-classes"; packageName = "@babel/plugin-transform-classes"; - version = "7.10.4"; + version = "7.12.1"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-classes/-/plugin-transform-classes-7.10.4.tgz"; - sha512 = "2oZ9qLjt161dn1ZE0Ms66xBncQH4In8Sqw1YWgBUZuGVJJS5c0OFZXL6dP2MRHrkU/eKhWg8CzFJhRQl50rQxA=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-classes/-/plugin-transform-classes-7.12.1.tgz"; + sha512 = "/74xkA7bVdzQTBeSUhLLJgYIcxw/dpEpCdRDiHgPJ3Mv6uC11UhjpOhl72CgqbBCmt1qtssCyB2xnJm1+PFjog=="; }; }; - "@babel/plugin-transform-computed-properties-7.10.4" = { + "@babel/plugin-transform-computed-properties-7.12.1" = { name = "_at_babel_slash_plugin-transform-computed-properties"; packageName = "@babel/plugin-transform-computed-properties"; - version = "7.10.4"; + version = "7.12.1"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-computed-properties/-/plugin-transform-computed-properties-7.10.4.tgz"; - sha512 = "JFwVDXcP/hM/TbyzGq3l/XWGut7p46Z3QvqFMXTfk6/09m7xZHJUN9xHfsv7vqqD4YnfI5ueYdSJtXqqBLyjBw=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-computed-properties/-/plugin-transform-computed-properties-7.12.1.tgz"; + sha512 = "vVUOYpPWB7BkgUWPo4C44mUQHpTZXakEqFjbv8rQMg7TC6S6ZhGZ3otQcRH6u7+adSlE5i0sp63eMC/XGffrzg=="; }; }; - "@babel/plugin-transform-destructuring-7.10.4" = { + "@babel/plugin-transform-destructuring-7.12.1" = { name = "_at_babel_slash_plugin-transform-destructuring"; packageName = "@babel/plugin-transform-destructuring"; - version = "7.10.4"; + version = "7.12.1"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.10.4.tgz"; - sha512 = "+WmfvyfsyF603iPa6825mq6Qrb7uLjTOsa3XOFzlYcYDHSS4QmpOWOL0NNBY5qMbvrcf3tq0Cw+v4lxswOBpgA=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.12.1.tgz"; + sha512 = "fRMYFKuzi/rSiYb2uRLiUENJOKq4Gnl+6qOv5f8z0TZXg3llUwUhsNNwrwaT/6dUhJTzNpBr+CUvEWBtfNY1cw=="; }; }; - "@babel/plugin-transform-dotall-regex-7.10.4" = { + "@babel/plugin-transform-dotall-regex-7.12.1" = { name = "_at_babel_slash_plugin-transform-dotall-regex"; packageName = "@babel/plugin-transform-dotall-regex"; - version = "7.10.4"; + version = "7.12.1"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-dotall-regex/-/plugin-transform-dotall-regex-7.10.4.tgz"; - sha512 = "ZEAVvUTCMlMFAbASYSVQoxIbHm2OkG2MseW6bV2JjIygOjdVv8tuxrCTzj1+Rynh7ODb8GivUy7dzEXzEhuPaA=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-dotall-regex/-/plugin-transform-dotall-regex-7.12.1.tgz"; + sha512 = "B2pXeRKoLszfEW7J4Hg9LoFaWEbr/kzo3teWHmtFCszjRNa/b40f9mfeqZsIDLLt/FjwQ6pz/Gdlwy85xNckBA=="; }; }; - "@babel/plugin-transform-duplicate-keys-7.10.4" = { + "@babel/plugin-transform-duplicate-keys-7.12.1" = { name = "_at_babel_slash_plugin-transform-duplicate-keys"; packageName = "@babel/plugin-transform-duplicate-keys"; - version = "7.10.4"; + version = "7.12.1"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-duplicate-keys/-/plugin-transform-duplicate-keys-7.10.4.tgz"; - sha512 = "GL0/fJnmgMclHiBTTWXNlYjYsA7rDrtsazHG6mglaGSTh0KsrW04qml+Bbz9FL0LcJIRwBWL5ZqlNHKTkU3xAA=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-duplicate-keys/-/plugin-transform-duplicate-keys-7.12.1.tgz"; + sha512 = "iRght0T0HztAb/CazveUpUQrZY+aGKKaWXMJ4uf9YJtqxSUe09j3wteztCUDRHs+SRAL7yMuFqUsLoAKKzgXjw=="; }; }; - "@babel/plugin-transform-exponentiation-operator-7.10.4" = { + "@babel/plugin-transform-exponentiation-operator-7.12.1" = { name = "_at_babel_slash_plugin-transform-exponentiation-operator"; packageName = "@babel/plugin-transform-exponentiation-operator"; - version = "7.10.4"; + version = "7.12.1"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-exponentiation-operator/-/plugin-transform-exponentiation-operator-7.10.4.tgz"; - sha512 = "S5HgLVgkBcRdyQAHbKj+7KyuWx8C6t5oETmUuwz1pt3WTWJhsUV0WIIXuVvfXMxl/QQyHKlSCNNtaIamG8fysw=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-exponentiation-operator/-/plugin-transform-exponentiation-operator-7.12.1.tgz"; + sha512 = "7tqwy2bv48q+c1EHbXK0Zx3KXd2RVQp6OC7PbwFNt/dPTAV3Lu5sWtWuAj8owr5wqtWnqHfl2/mJlUmqkChKug=="; }; }; - "@babel/plugin-transform-for-of-7.10.4" = { + "@babel/plugin-transform-for-of-7.12.1" = { name = "_at_babel_slash_plugin-transform-for-of"; packageName = "@babel/plugin-transform-for-of"; - version = "7.10.4"; + version = "7.12.1"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.10.4.tgz"; - sha512 = "ItdQfAzu9AlEqmusA/65TqJ79eRcgGmpPPFvBnGILXZH975G0LNjP1yjHvGgfuCxqrPPueXOPe+FsvxmxKiHHQ=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.12.1.tgz"; + sha512 = "Zaeq10naAsuHo7heQvyV0ptj4dlZJwZgNAtBYBnu5nNKJoW62m0zKcIEyVECrUKErkUkg6ajMy4ZfnVZciSBhg=="; }; }; - "@babel/plugin-transform-function-name-7.10.4" = { + "@babel/plugin-transform-function-name-7.12.1" = { name = "_at_babel_slash_plugin-transform-function-name"; packageName = "@babel/plugin-transform-function-name"; - version = "7.10.4"; + version = "7.12.1"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-function-name/-/plugin-transform-function-name-7.10.4.tgz"; - sha512 = "OcDCq2y5+E0dVD5MagT5X+yTRbcvFjDI2ZVAottGH6tzqjx/LKpgkUepu3hp/u4tZBzxxpNGwLsAvGBvQ2mJzg=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-function-name/-/plugin-transform-function-name-7.12.1.tgz"; + sha512 = "JF3UgJUILoFrFMEnOJLJkRHSk6LUSXLmEFsA23aR2O5CSLUxbeUX1IZ1YQ7Sn0aXb601Ncwjx73a+FVqgcljVw=="; }; }; - "@babel/plugin-transform-literals-7.10.4" = { + "@babel/plugin-transform-literals-7.12.1" = { name = "_at_babel_slash_plugin-transform-literals"; packageName = "@babel/plugin-transform-literals"; - version = "7.10.4"; + version = "7.12.1"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-literals/-/plugin-transform-literals-7.10.4.tgz"; - sha512 = "Xd/dFSTEVuUWnyZiMu76/InZxLTYilOSr1UlHV+p115Z/Le2Fi1KXkJUYz0b42DfndostYlPub3m8ZTQlMaiqQ=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-literals/-/plugin-transform-literals-7.12.1.tgz"; + sha512 = "+PxVGA+2Ag6uGgL0A5f+9rklOnnMccwEBzwYFL3EUaKuiyVnUipyXncFcfjSkbimLrODoqki1U9XxZzTvfN7IQ=="; }; }; - "@babel/plugin-transform-member-expression-literals-7.10.4" = { + "@babel/plugin-transform-member-expression-literals-7.12.1" = { name = "_at_babel_slash_plugin-transform-member-expression-literals"; packageName = "@babel/plugin-transform-member-expression-literals"; - version = "7.10.4"; + version = "7.12.1"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-member-expression-literals/-/plugin-transform-member-expression-literals-7.10.4.tgz"; - sha512 = "0bFOvPyAoTBhtcJLr9VcwZqKmSjFml1iVxvPL0ReomGU53CX53HsM4h2SzckNdkQcHox1bpAqzxBI1Y09LlBSw=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-member-expression-literals/-/plugin-transform-member-expression-literals-7.12.1.tgz"; + sha512 = "1sxePl6z9ad0gFMB9KqmYofk34flq62aqMt9NqliS/7hPEpURUCMbyHXrMPlo282iY7nAvUB1aQd5mg79UD9Jg=="; }; }; - "@babel/plugin-transform-modules-amd-7.10.5" = { + "@babel/plugin-transform-modules-amd-7.12.1" = { name = "_at_babel_slash_plugin-transform-modules-amd"; packageName = "@babel/plugin-transform-modules-amd"; - version = "7.10.5"; + version = "7.12.1"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.10.5.tgz"; - sha512 = "elm5uruNio7CTLFItVC/rIzKLfQ17+fX7EVz5W0TMgIHFo1zY0Ozzx+lgwhL4plzl8OzVn6Qasx5DeEFyoNiRw=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.12.1.tgz"; + sha512 = "tDW8hMkzad5oDtzsB70HIQQRBiTKrhfgwC/KkJeGsaNFTdWhKNt/BiE8c5yj19XiGyrxpbkOfH87qkNg1YGlOQ=="; }; }; - "@babel/plugin-transform-modules-commonjs-7.10.4" = { + "@babel/plugin-transform-modules-commonjs-7.12.1" = { name = "_at_babel_slash_plugin-transform-modules-commonjs"; packageName = "@babel/plugin-transform-modules-commonjs"; - version = "7.10.4"; + version = "7.12.1"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.10.4.tgz"; - sha512 = "Xj7Uq5o80HDLlW64rVfDBhao6OX89HKUmb+9vWYaLXBZOma4gA6tw4Ni1O5qVDoZWUV0fxMYA0aYzOawz0l+1w=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.12.1.tgz"; + sha512 = "dY789wq6l0uLY8py9c1B48V8mVL5gZh/+PQ5ZPrylPYsnAvnEMjqsUXkuoDVPeVK+0VyGar+D08107LzDQ6pag=="; }; }; - "@babel/plugin-transform-modules-systemjs-7.10.5" = { + "@babel/plugin-transform-modules-systemjs-7.12.1" = { name = "_at_babel_slash_plugin-transform-modules-systemjs"; packageName = "@babel/plugin-transform-modules-systemjs"; - version = "7.10.5"; + version = "7.12.1"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.10.5.tgz"; - sha512 = "f4RLO/OL14/FP1AEbcsWMzpbUz6tssRaeQg11RH1BP/XnPpRoVwgeYViMFacnkaw4k4wjRSjn3ip1Uw9TaXuMw=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.12.1.tgz"; + sha512 = "Hn7cVvOavVh8yvW6fLwveFqSnd7rbQN3zJvoPNyNaQSvgfKmDBO9U1YL9+PCXGRlZD9tNdWTy5ACKqMuzyn32Q=="; }; }; - "@babel/plugin-transform-modules-umd-7.10.4" = { + "@babel/plugin-transform-modules-umd-7.12.1" = { name = "_at_babel_slash_plugin-transform-modules-umd"; packageName = "@babel/plugin-transform-modules-umd"; - version = "7.10.4"; + version = "7.12.1"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-modules-umd/-/plugin-transform-modules-umd-7.10.4.tgz"; - sha512 = "mohW5q3uAEt8T45YT7Qc5ws6mWgJAaL/8BfWD9Dodo1A3RKWli8wTS+WiQ/knF+tXlPirW/1/MqzzGfCExKECA=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-modules-umd/-/plugin-transform-modules-umd-7.12.1.tgz"; + sha512 = "aEIubCS0KHKM0zUos5fIoQm+AZUMt1ZvMpqz0/H5qAQ7vWylr9+PLYurT+Ic7ID/bKLd4q8hDovaG3Zch2uz5Q=="; }; }; - "@babel/plugin-transform-named-capturing-groups-regex-7.10.4" = { + "@babel/plugin-transform-named-capturing-groups-regex-7.12.1" = { name = "_at_babel_slash_plugin-transform-named-capturing-groups-regex"; packageName = "@babel/plugin-transform-named-capturing-groups-regex"; - version = "7.10.4"; + version = "7.12.1"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-named-capturing-groups-regex/-/plugin-transform-named-capturing-groups-regex-7.10.4.tgz"; - sha512 = "V6LuOnD31kTkxQPhKiVYzYC/Jgdq53irJC/xBSmqcNcqFGV+PER4l6rU5SH2Vl7bH9mLDHcc0+l9HUOe4RNGKA=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-named-capturing-groups-regex/-/plugin-transform-named-capturing-groups-regex-7.12.1.tgz"; + sha512 = "tB43uQ62RHcoDp9v2Nsf+dSM8sbNodbEicbQNA53zHz8pWUhsgHSJCGpt7daXxRydjb0KnfmB+ChXOv3oADp1Q=="; }; }; - "@babel/plugin-transform-new-target-7.10.4" = { + "@babel/plugin-transform-new-target-7.12.1" = { name = "_at_babel_slash_plugin-transform-new-target"; packageName = "@babel/plugin-transform-new-target"; - version = "7.10.4"; + version = "7.12.1"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-new-target/-/plugin-transform-new-target-7.10.4.tgz"; - sha512 = "YXwWUDAH/J6dlfwqlWsztI2Puz1NtUAubXhOPLQ5gjR/qmQ5U96DY4FQO8At33JN4XPBhrjB8I4eMmLROjjLjw=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-new-target/-/plugin-transform-new-target-7.12.1.tgz"; + sha512 = "+eW/VLcUL5L9IvJH7rT1sT0CzkdUTvPrXC2PXTn/7z7tXLBuKvezYbGdxD5WMRoyvyaujOq2fWoKl869heKjhw=="; }; }; - "@babel/plugin-transform-object-super-7.10.4" = { + "@babel/plugin-transform-object-super-7.12.1" = { name = "_at_babel_slash_plugin-transform-object-super"; packageName = "@babel/plugin-transform-object-super"; - version = "7.10.4"; + version = "7.12.1"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-object-super/-/plugin-transform-object-super-7.10.4.tgz"; - sha512 = "5iTw0JkdRdJvr7sY0vHqTpnruUpTea32JHmq/atIWqsnNussbRzjEDyWep8UNztt1B5IusBYg8Irb0bLbiEBCQ=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-object-super/-/plugin-transform-object-super-7.12.1.tgz"; + sha512 = "AvypiGJH9hsquNUn+RXVcBdeE3KHPZexWRdimhuV59cSoOt5kFBmqlByorAeUlGG2CJWd0U+4ZtNKga/TB0cAw=="; }; }; - "@babel/plugin-transform-parameters-7.10.5" = { + "@babel/plugin-transform-parameters-7.12.1" = { name = "_at_babel_slash_plugin-transform-parameters"; packageName = "@babel/plugin-transform-parameters"; - version = "7.10.5"; + version = "7.12.1"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.10.5.tgz"; - sha512 = "xPHwUj5RdFV8l1wuYiu5S9fqWGM2DrYc24TMvUiRrPVm+SM3XeqU9BcokQX/kEUe+p2RBwy+yoiR1w/Blq6ubw=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.12.1.tgz"; + sha512 = "xq9C5EQhdPK23ZeCdMxl8bbRnAgHFrw5EOC3KJUsSylZqdkCaFEXxGSBuTSObOpiiHHNyb82es8M1QYgfQGfNg=="; }; }; - "@babel/plugin-transform-property-literals-7.10.4" = { + "@babel/plugin-transform-property-literals-7.12.1" = { name = "_at_babel_slash_plugin-transform-property-literals"; packageName = "@babel/plugin-transform-property-literals"; - version = "7.10.4"; + version = "7.12.1"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-property-literals/-/plugin-transform-property-literals-7.10.4.tgz"; - sha512 = "ofsAcKiUxQ8TY4sScgsGeR2vJIsfrzqvFb9GvJ5UdXDzl+MyYCaBj/FGzXuv7qE0aJcjWMILny1epqelnFlz8g=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-property-literals/-/plugin-transform-property-literals-7.12.1.tgz"; + sha512 = "6MTCR/mZ1MQS+AwZLplX4cEySjCpnIF26ToWo942nqn8hXSm7McaHQNeGx/pt7suI1TWOWMfa/NgBhiqSnX0cQ=="; }; }; - "@babel/plugin-transform-regenerator-7.10.4" = { + "@babel/plugin-transform-regenerator-7.12.1" = { name = "_at_babel_slash_plugin-transform-regenerator"; packageName = "@babel/plugin-transform-regenerator"; - version = "7.10.4"; + version = "7.12.1"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.10.4.tgz"; - sha512 = "3thAHwtor39A7C04XucbMg17RcZ3Qppfxr22wYzZNcVIkPHfpM9J0SO8zuCV6SZa265kxBJSrfKTvDCYqBFXGw=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.12.1.tgz"; + sha512 = "gYrHqs5itw6i4PflFX3OdBPMQdPbF4bj2REIUxlMRUFk0/ZOAIpDFuViuxPjUL7YC8UPnf+XG7/utJvqXdPKng=="; }; }; - "@babel/plugin-transform-reserved-words-7.10.4" = { + "@babel/plugin-transform-reserved-words-7.12.1" = { name = "_at_babel_slash_plugin-transform-reserved-words"; packageName = "@babel/plugin-transform-reserved-words"; - version = "7.10.4"; + version = "7.12.1"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-reserved-words/-/plugin-transform-reserved-words-7.10.4.tgz"; - sha512 = "hGsw1O6Rew1fkFbDImZIEqA8GoidwTAilwCyWqLBM9f+e/u/sQMQu7uX6dyokfOayRuuVfKOW4O7HvaBWM+JlQ=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-reserved-words/-/plugin-transform-reserved-words-7.12.1.tgz"; + sha512 = "pOnUfhyPKvZpVyBHhSBoX8vfA09b7r00Pmm1sH+29ae2hMTKVmSp4Ztsr8KBKjLjx17H0eJqaRC3bR2iThM54A=="; }; }; - "@babel/plugin-transform-runtime-7.11.5" = { + "@babel/plugin-transform-runtime-7.12.1" = { name = "_at_babel_slash_plugin-transform-runtime"; packageName = "@babel/plugin-transform-runtime"; - version = "7.11.5"; + version = "7.12.1"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-runtime/-/plugin-transform-runtime-7.11.5.tgz"; - sha512 = "9aIoee+EhjySZ6vY5hnLjigHzunBlscx9ANKutkeWTJTx6m5Rbq6Ic01tLvO54lSusR+BxV7u4UDdCmXv5aagg=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-runtime/-/plugin-transform-runtime-7.12.1.tgz"; + sha512 = "Ac/H6G9FEIkS2tXsZjL4RAdS3L3WHxci0usAnz7laPWUmFiGtj7tIASChqKZMHTSQTQY6xDbOq+V1/vIq3QrWg=="; }; }; - "@babel/plugin-transform-shorthand-properties-7.10.4" = { + "@babel/plugin-transform-shorthand-properties-7.12.1" = { name = "_at_babel_slash_plugin-transform-shorthand-properties"; packageName = "@babel/plugin-transform-shorthand-properties"; - version = "7.10.4"; + version = "7.12.1"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-shorthand-properties/-/plugin-transform-shorthand-properties-7.10.4.tgz"; - sha512 = "AC2K/t7o07KeTIxMoHneyX90v3zkm5cjHJEokrPEAGEy3UCp8sLKfnfOIGdZ194fyN4wfX/zZUWT9trJZ0qc+Q=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-shorthand-properties/-/plugin-transform-shorthand-properties-7.12.1.tgz"; + sha512 = "GFZS3c/MhX1OusqB1MZ1ct2xRzX5ppQh2JU1h2Pnfk88HtFTM+TWQqJNfwkmxtPQtb/s1tk87oENfXJlx7rSDw=="; }; }; - "@babel/plugin-transform-spread-7.11.0" = { + "@babel/plugin-transform-spread-7.12.1" = { name = "_at_babel_slash_plugin-transform-spread"; packageName = "@babel/plugin-transform-spread"; - version = "7.11.0"; + version = "7.12.1"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-spread/-/plugin-transform-spread-7.11.0.tgz"; - sha512 = "UwQYGOqIdQJe4aWNyS7noqAnN2VbaczPLiEtln+zPowRNlD+79w3oi2TWfYe0eZgd+gjZCbsydN7lzWysDt+gw=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-spread/-/plugin-transform-spread-7.12.1.tgz"; + sha512 = "vuLp8CP0BE18zVYjsEBZ5xoCecMK6LBMMxYzJnh01rxQRvhNhH1csMMmBfNo5tGpGO+NhdSNW2mzIvBu3K1fng=="; }; }; - "@babel/plugin-transform-sticky-regex-7.10.4" = { + "@babel/plugin-transform-sticky-regex-7.12.7" = { name = "_at_babel_slash_plugin-transform-sticky-regex"; packageName = "@babel/plugin-transform-sticky-regex"; - version = "7.10.4"; + version = "7.12.7"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-sticky-regex/-/plugin-transform-sticky-regex-7.10.4.tgz"; - sha512 = "Ddy3QZfIbEV0VYcVtFDCjeE4xwVTJWTmUtorAJkn6u/92Z/nWJNV+mILyqHKrUxXYKA2EoCilgoPePymKL4DvQ=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-sticky-regex/-/plugin-transform-sticky-regex-7.12.7.tgz"; + sha512 = "VEiqZL5N/QvDbdjfYQBhruN0HYjSPjC4XkeqW4ny/jNtH9gcbgaqBIXYEZCNnESMAGs0/K/R7oFGMhOyu/eIxg=="; }; }; - "@babel/plugin-transform-template-literals-7.10.5" = { + "@babel/plugin-transform-template-literals-7.12.1" = { name = "_at_babel_slash_plugin-transform-template-literals"; packageName = "@babel/plugin-transform-template-literals"; - version = "7.10.5"; + version = "7.12.1"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-template-literals/-/plugin-transform-template-literals-7.10.5.tgz"; - sha512 = "V/lnPGIb+KT12OQikDvgSuesRX14ck5FfJXt6+tXhdkJ+Vsd0lDCVtF6jcB4rNClYFzaB2jusZ+lNISDk2mMMw=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-template-literals/-/plugin-transform-template-literals-7.12.1.tgz"; + sha512 = "b4Zx3KHi+taXB1dVRBhVJtEPi9h1THCeKmae2qP0YdUHIFhVjtpqqNfxeVAa1xeHVhAy4SbHxEwx5cltAu5apw=="; }; }; - "@babel/plugin-transform-typeof-symbol-7.10.4" = { + "@babel/plugin-transform-typeof-symbol-7.12.1" = { name = "_at_babel_slash_plugin-transform-typeof-symbol"; packageName = "@babel/plugin-transform-typeof-symbol"; - version = "7.10.4"; + version = "7.12.1"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-typeof-symbol/-/plugin-transform-typeof-symbol-7.10.4.tgz"; - sha512 = "QqNgYwuuW0y0H+kUE/GWSR45t/ccRhe14Fs/4ZRouNNQsyd4o3PG4OtHiIrepbM2WKUBDAXKCAK/Lk4VhzTaGA=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-typeof-symbol/-/plugin-transform-typeof-symbol-7.12.1.tgz"; + sha512 = "EPGgpGy+O5Kg5pJFNDKuxt9RdmTgj5sgrus2XVeMp/ZIbOESadgILUbm50SNpghOh3/6yrbsH+NB5+WJTmsA7Q=="; }; }; - "@babel/plugin-transform-unicode-escapes-7.10.4" = { + "@babel/plugin-transform-unicode-escapes-7.12.1" = { name = "_at_babel_slash_plugin-transform-unicode-escapes"; packageName = "@babel/plugin-transform-unicode-escapes"; - version = "7.10.4"; + version = "7.12.1"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-unicode-escapes/-/plugin-transform-unicode-escapes-7.10.4.tgz"; - sha512 = "y5XJ9waMti2J+e7ij20e+aH+fho7Wb7W8rNuu72aKRwCHFqQdhkdU2lo3uZ9tQuboEJcUFayXdARhcxLQ3+6Fg=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-unicode-escapes/-/plugin-transform-unicode-escapes-7.12.1.tgz"; + sha512 = "I8gNHJLIc7GdApm7wkVnStWssPNbSRMPtgHdmH3sRM1zopz09UWPS4x5V4n1yz/MIWTVnJ9sp6IkuXdWM4w+2Q=="; }; }; - "@babel/plugin-transform-unicode-regex-7.10.4" = { + "@babel/plugin-transform-unicode-regex-7.12.1" = { name = "_at_babel_slash_plugin-transform-unicode-regex"; packageName = "@babel/plugin-transform-unicode-regex"; - version = "7.10.4"; + version = "7.12.1"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-unicode-regex/-/plugin-transform-unicode-regex-7.10.4.tgz"; - sha512 = "wNfsc4s8N2qnIwpO/WP2ZiSyjfpTamT2C9V9FDH/Ljub9zw6P3SjkXcFmc0RQUt96k2fmIvtla2MMjgTwIAC+A=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-unicode-regex/-/plugin-transform-unicode-regex-7.12.1.tgz"; + sha512 = "SqH4ClNngh/zGwHZOOQMTD+e8FGWexILV+ePMyiDJttAWRh5dhDL8rcl5lSgU3Huiq6Zn6pWTMvdPAb21Dwdyg=="; }; }; - "@babel/preset-env-7.11.5" = { + "@babel/preset-env-7.12.7" = { name = "_at_babel_slash_preset-env"; packageName = "@babel/preset-env"; - version = "7.11.5"; + version = "7.12.7"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/preset-env/-/preset-env-7.11.5.tgz"; - sha512 = "kXqmW1jVcnB2cdueV+fyBM8estd5mlNfaQi6lwLgRwCby4edpavgbFhiBNjmWA3JpB/yZGSISa7Srf+TwxDQoA=="; + url = "https://registry.npmjs.org/@babel/preset-env/-/preset-env-7.12.7.tgz"; + sha512 = "OnNdfAr1FUQg7ksb7bmbKoby4qFOHw6DKWWUNB9KqnnCldxhxJlP+21dpyaWFmf2h0rTbOkXJtAGevY3XW1eew=="; }; }; "@babel/preset-modules-0.1.4" = { @@ -832,40 +832,40 @@ let sha512 = "J36NhwnfdzpmH41M1DrnkkgAqhZaqr/NBdPfQ677mLzlaXo+oDiv1deyCDtgAhz8p328otdob0Du7+xgHGZbKg=="; }; }; - "@babel/runtime-7.11.2" = { + "@babel/runtime-7.12.5" = { name = "_at_babel_slash_runtime"; packageName = "@babel/runtime"; - version = "7.11.2"; + version = "7.12.5"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/runtime/-/runtime-7.11.2.tgz"; - sha512 = "TeWkU52so0mPtDcaCTxNBI/IHiz0pZgr8VEFqXFtZWpYD08ZB6FaSwVAS8MKRQAP3bYKiVjwysOJgMFY28o6Tw=="; + url = "https://registry.npmjs.org/@babel/runtime/-/runtime-7.12.5.tgz"; + sha512 = "plcc+hbExy3McchJCEQG3knOsuh3HH+Prx1P6cLIkET/0dLuQDEnrT+s27Axgc9bqfsmNUNHfscgMUdBpC9xfg=="; }; }; - "@babel/template-7.10.4" = { + "@babel/template-7.12.7" = { name = "_at_babel_slash_template"; packageName = "@babel/template"; - version = "7.10.4"; + version = "7.12.7"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/template/-/template-7.10.4.tgz"; - sha512 = "ZCjD27cGJFUB6nmCB1Enki3r+L5kJveX9pq1SvAUKoICy6CZ9yD8xO086YXdYhvNjBdnekm4ZnaP5yC8Cs/1tA=="; + url = "https://registry.npmjs.org/@babel/template/-/template-7.12.7.tgz"; + sha512 = "GkDzmHS6GV7ZeXfJZ0tLRBhZcMcY0/Lnb+eEbXDBfCAcZCjrZKe6p3J4we/D24O9Y8enxWAg1cWwof59yLh2ow=="; }; }; - "@babel/traverse-7.11.5" = { + "@babel/traverse-7.12.9" = { name = "_at_babel_slash_traverse"; packageName = "@babel/traverse"; - version = "7.11.5"; + version = "7.12.9"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/traverse/-/traverse-7.11.5.tgz"; - sha512 = "EjiPXt+r7LiCZXEfRpSJd+jUMnBd4/9OUv7Nx3+0u9+eimMwJmG0Q98lw4/289JCoxSE8OolDMNZaaF/JZ69WQ=="; + url = "https://registry.npmjs.org/@babel/traverse/-/traverse-7.12.9.tgz"; + sha512 = "iX9ajqnLdoU1s1nHt36JDI9KG4k+vmI8WgjK5d+aDTwQbL2fUnzedNedssA645Ede3PM2ma1n8Q4h2ohwXgMXw=="; }; }; - "@babel/types-7.11.5" = { + "@babel/types-7.12.7" = { name = "_at_babel_slash_types"; packageName = "@babel/types"; - version = "7.11.5"; + version = "7.12.7"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/types/-/types-7.11.5.tgz"; - sha512 = "bvM7Qz6eKnJVFIn+1LPtjlBFPVN5jNDc1XmN15vWe7Q3DPBufWWsLiIvUu7xW87uTG6QoggpIDnUgLQvPheU+Q=="; + url = "https://registry.npmjs.org/@babel/types/-/types-7.12.7.tgz"; + sha512 = "MNyI92qZq6jrQkXvtIiykvl4WtoRrVV9MPn+ZfsoEENjiWcBQ3ZSHrkxnJWgWtLX3XXqX5hrSQ+X69wkmesXuQ=="; }; }; "@hapi/address-2.1.4" = { @@ -913,24 +913,6 @@ let sha512 = "tAag0jEcjwH+P2quUfipd7liWCNX2F8NvYjQp2wtInsZxnMlypdw0FtAOLxtvvkO+GSRRbmNi8m/5y42PQJYCQ=="; }; }; - "@jest/types-25.5.0" = { - name = "_at_jest_slash_types"; - packageName = "@jest/types"; - version = "25.5.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@jest/types/-/types-25.5.0.tgz"; - sha512 = "OXD0RgQ86Tu3MazKo8bnrkDRaDXXMGUqd+kTtLtK1Zb7CRzQcaSRPPPV37SvYTdevXEBVxe0HXylEjs8ibkmCw=="; - }; - }; - "@jest/types-26.5.0" = { - name = "_at_jest_slash_types"; - packageName = "@jest/types"; - version = "26.5.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@jest/types/-/types-26.5.0.tgz"; - sha512 = "nH9DFLqaIhB+RVgjivemvMiFSWw/BKwbZGxBAMv8CCTvUyFoK8RwHhAlmlXIvMBrf5Z3YQ4p9cq3Qh9EDctGvA=="; - }; - }; "@mrmlnc/readdir-enhanced-2.2.1" = { name = "_at_mrmlnc_slash_readdir-enhanced"; packageName = "@mrmlnc/readdir-enhanced"; @@ -1066,51 +1048,6 @@ let sha512 = "IrSHl2u6AWXduUaDLqYpt45tLVCtYv7o4Z0s1KghBCDgIIS9oW5K1H8mZG/A2CfeLdEa7rTd1ACOiHBc1EMT2Q=="; }; }; - "@types/istanbul-lib-coverage-2.0.3" = { - name = "_at_types_slash_istanbul-lib-coverage"; - packageName = "@types/istanbul-lib-coverage"; - version = "2.0.3"; - src = fetchurl { - url = "https://registry.npmjs.org/@types/istanbul-lib-coverage/-/istanbul-lib-coverage-2.0.3.tgz"; - sha512 = "sz7iLqvVUg1gIedBOvlkxPlc8/uVzyS5OwGz1cKjXzkl3FpL3al0crU8YGU1WoHkxn0Wxbw5tyi6hvzJKNzFsw=="; - }; - }; - "@types/istanbul-lib-report-3.0.0" = { - name = "_at_types_slash_istanbul-lib-report"; - packageName = "@types/istanbul-lib-report"; - version = "3.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@types/istanbul-lib-report/-/istanbul-lib-report-3.0.0.tgz"; - sha512 = "plGgXAPfVKFoYfa9NpYDAkseG+g6Jr294RqeqcqDixSbU34MZVJRi/P+7Y8GDpzkEwLaGZZOpKIEmeVZNtKsrg=="; - }; - }; - "@types/istanbul-reports-1.1.2" = { - name = "_at_types_slash_istanbul-reports"; - packageName = "@types/istanbul-reports"; - version = "1.1.2"; - src = fetchurl { - url = "https://registry.npmjs.org/@types/istanbul-reports/-/istanbul-reports-1.1.2.tgz"; - sha512 = "P/W9yOX/3oPZSpaYOCQzGqgCQRXn0FFO/V8bWrCQs+wLmvVVxk6CRBXALEvNs9OHIatlnlFokfhuDo2ug01ciw=="; - }; - }; - "@types/istanbul-reports-3.0.0" = { - name = "_at_types_slash_istanbul-reports"; - packageName = "@types/istanbul-reports"; - version = "3.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@types/istanbul-reports/-/istanbul-reports-3.0.0.tgz"; - sha512 = "nwKNbvnwJ2/mndE9ItP/zc2TCzw6uuodnF4EHYWD+gCQDVBuRQL5UzbZD0/ezy1iKsFU2ZQiDqg4M9dN4+wZgA=="; - }; - }; - "@types/jest-26.0.14" = { - name = "_at_types_slash_jest"; - packageName = "@types/jest"; - version = "26.0.14"; - src = fetchurl { - url = "https://registry.npmjs.org/@types/jest/-/jest-26.0.14.tgz"; - sha512 = "Hz5q8Vu0D288x3iWXePSn53W7hAjP0H7EQ6QvDO9c7t46mR0lNOLlfuwQ+JkVxuhygHzlzPX+0jKdA3ZgSh+Vg=="; - }; - }; "@types/json-schema-7.0.6" = { name = "_at_types_slash_json-schema"; packageName = "@types/json-schema"; @@ -1138,13 +1075,13 @@ let sha512 = "tHq6qdbT9U1IRSGf14CL0pUlULksvY9OZ+5eEgl1N7t+OA3tGvNpxJCzuKQlsNgCVwbAs670L1vcVQi8j9HjnA=="; }; }; - "@types/node-14.11.3" = { + "@types/node-14.14.10" = { name = "_at_types_slash_node"; packageName = "@types/node"; - version = "14.11.3"; + version = "14.14.10"; src = fetchurl { - url = "https://registry.npmjs.org/@types/node/-/node-14.11.3.tgz"; - sha512 = "tPQAF6b1wak7rBO49tL2N5nNVknyHBAzJVylF5rIYkfXbFkrNpbBLFMFUjxHzuuBiR7Si7T/X4eh6IRhZxO1tQ=="; + url = "https://registry.npmjs.org/@types/node/-/node-14.14.10.tgz"; + sha512 = "J32dgx2hw8vXrSbu4ZlVhn1Nm3GbeCFNw2FWL8S5QKucHGY0cyNwjdQdO+KMBZ4wpmC7KhLCiNsdk1RFRIYUQQ=="; }; }; "@types/parse-json-4.0.0" = { @@ -1192,22 +1129,22 @@ let sha512 = "W+bw9ds02rAQaMvaLYxAbJ6cvguW/iJXNT6lTssS1ps6QdrMKttqEAMEG/b5CR8TZl3/L7/lH0ZV5nNR1LXikA=="; }; }; - "@types/uglify-js-3.11.0" = { + "@types/uglify-js-3.11.1" = { name = "_at_types_slash_uglify-js"; packageName = "@types/uglify-js"; - version = "3.11.0"; + version = "3.11.1"; src = fetchurl { - url = "https://registry.npmjs.org/@types/uglify-js/-/uglify-js-3.11.0.tgz"; - sha512 = "I0Yd8TUELTbgRHq2K65j8rnDPAzAP+DiaF/syLem7yXwYLsHZhPd+AM2iXsWmf9P2F2NlFCgl5erZPQx9IbM9Q=="; + url = "https://registry.npmjs.org/@types/uglify-js/-/uglify-js-3.11.1.tgz"; + sha512 = "7npvPKV+jINLu1SpSYVWG8KvyJBhBa8tmzMMdDoVc2pWUYHN8KIXlPJhjJ4LT97c4dXJA2SHL/q6ADbDriZN+Q=="; }; }; - "@types/webpack-4.41.22" = { + "@types/webpack-4.41.25" = { name = "_at_types_slash_webpack"; packageName = "@types/webpack"; - version = "4.41.22"; + version = "4.41.25"; src = fetchurl { - url = "https://registry.npmjs.org/@types/webpack/-/webpack-4.41.22.tgz"; - sha512 = "JQDJK6pj8OMV9gWOnN1dcLCyU9Hzs6lux0wBO4lr1+gyEhIBR9U3FMrz12t2GPkg110XAxEAw2WHF6g7nZIbRQ=="; + url = "https://registry.npmjs.org/@types/webpack/-/webpack-4.41.25.tgz"; + sha512 = "cr6kZ+4m9lp86ytQc1jPOJXgINQyz3kLLunZ57jznW+WIAL0JqZbGubQk4GlD42MuQL5JGOABrxdpqqWeovlVQ=="; }; }; "@types/webpack-sources-2.0.0" = { @@ -1219,24 +1156,6 @@ let sha512 = "a5kPx98CNFRKQ+wqawroFunvFqv7GHm/3KOI52NY9xWADgc8smu4R6prt4EU/M4QfVjvgBkMqU4fBhw3QfMVkg=="; }; }; - "@types/yargs-15.0.7" = { - name = "_at_types_slash_yargs"; - packageName = "@types/yargs"; - version = "15.0.7"; - src = fetchurl { - url = "https://registry.npmjs.org/@types/yargs/-/yargs-15.0.7.tgz"; - sha512 = "Gf4u3EjaPNcC9cTu4/j2oN14nSVhr8PQ+BvBcBQHAhDZfl0bVIiLgvnRXv/dn58XhTm9UXvBpvJpDlwV65QxOA=="; - }; - }; - "@types/yargs-parser-15.0.0" = { - name = "_at_types_slash_yargs-parser"; - packageName = "@types/yargs-parser"; - version = "15.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@types/yargs-parser/-/yargs-parser-15.0.0.tgz"; - sha512 = "FA/BWv8t8ZWJ+gEOnLLd8ygxH/2UFbAvgEonyfN6yWGLKc7zVjbpl2Y4CTjid9h2RfgPP6SEt6uHwEOply00yw=="; - }; - }; "@webassemblyjs/ast-1.9.0" = { name = "_at_webassemblyjs_slash_ast"; packageName = "@webassemblyjs/ast"; @@ -1453,13 +1372,13 @@ let sha512 = "z55ocwKBRLryBs394Sm3ushTtBeg6VAeuku7utSoSnsJKvKcnXFIyC6vh27n3rXyxSgkJBBCAvyOn7gSUcTYjg=="; }; }; - "ajv-6.12.5" = { + "ajv-6.12.6" = { name = "ajv"; packageName = "ajv"; - version = "6.12.5"; + version = "6.12.6"; src = fetchurl { - url = "https://registry.npmjs.org/ajv/-/ajv-6.12.5.tgz"; - sha512 = "lRF8RORchjpKG50/WFf8xmg7sgCLFiYNNnqdKflk63whMQcWR5ngGjiSXkL9bjxy6B2npOK2HSMN49jEBMSkag=="; + url = "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz"; + sha512 = "j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g=="; }; }; "ajv-errors-1.0.1" = { @@ -1507,6 +1426,15 @@ let sha512 = "cBhpre4ma+U0T1oM5fXg7Dy1Jw7zzwv7lt/GoCpr+hDQJoYnKVPLL4dCvSEFMmQurOQvSrwT7SL/DAlhBI97RQ=="; }; }; + "ansi-escapes-4.3.1" = { + name = "ansi-escapes"; + packageName = "ansi-escapes"; + version = "4.3.1"; + src = fetchurl { + url = "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-4.3.1.tgz"; + sha512 = "JWF7ocqNrp8u9oqpgV+wH5ftbt+cfvv+PTjOvKLT3AdYly/LmORARfEVT1iyjwN+4MqE5UmVKoAdIBqeoCHgLA=="; + }; + }; "ansi-html-0.0.7" = { name = "ansi-html"; packageName = "ansi-html"; @@ -1849,6 +1777,15 @@ let sha1 = "c79ed97f7f34cb8f2ba1bc9790bcc366474b4b79"; }; }; + "at-least-node-1.0.0" = { + name = "at-least-node"; + packageName = "at-least-node"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/at-least-node/-/at-least-node-1.0.0.tgz"; + sha512 = "+q/t7Ekv1EDY2l6Gda6LLiX14rU9TV20Wa3ofeQmwPFZbOMo9DXrLbOjFaaclkXKWidIaopwAObQDqwWtGUjqg=="; + }; + }; "atob-2.1.2" = { name = "atob"; packageName = "atob"; @@ -1858,13 +1795,13 @@ let sha512 = "Wm6ukoaOGJi/73p/cl2GvLjTI5JM1k/O14isD73YML8StrH/7/lRFgmg8nICZgD3bZZvjwCGxtMOD3wWNAu8cg=="; }; }; - "autoprefixer-10.0.1" = { + "autoprefixer-10.0.4" = { name = "autoprefixer"; packageName = "autoprefixer"; - version = "10.0.1"; + version = "10.0.4"; src = fetchurl { - url = "https://registry.npmjs.org/autoprefixer/-/autoprefixer-10.0.1.tgz"; - sha512 = "aQo2BDIsoOdemXUAOBpFv4ZQa2DrOtEufarYhtFsK1088Ca0TUwu/aQWf0M3mrILXZ3mTIVn1lR3hPW8acacsw=="; + url = "https://registry.npmjs.org/autoprefixer/-/autoprefixer-10.0.4.tgz"; + sha512 = "hmjYejN/WTyPP9cdNmiwtwqM8/ACVJPD5ExtwoOceQohNbgnFNiwpL2+U4bXS8aXozBL00WvH6WhqbuHf0Fgfg=="; }; }; "aws-sign2-0.7.0" = { @@ -1876,13 +1813,13 @@ let sha1 = "b46e890934a9591f2d2f6f86d7e6a9f1b3fe76a8"; }; }; - "aws4-1.10.1" = { + "aws4-1.11.0" = { name = "aws4"; packageName = "aws4"; - version = "1.10.1"; + version = "1.11.0"; src = fetchurl { - url = "https://registry.npmjs.org/aws4/-/aws4-1.10.1.tgz"; - sha512 = "zg7Hz2k5lI8kb7U32998pRRFin7zJlkfezGJjUc2heaD4Pw2wObakCDVzkKztTm/Ln7eiVvYsjqak0Ed4LkMDA=="; + url = "https://registry.npmjs.org/aws4/-/aws4-1.11.0.tgz"; + sha512 = "xh1Rl34h6Fi1DC2WWKfxUTVqRsNnr6LsKz2+hfwDxQJWmrx8+c7ylaqBMcHfl1U1r2dsifOvKX3LQuLNZ+XSvA=="; }; }; "babel-extract-comments-1.0.0" = { @@ -1894,13 +1831,13 @@ let sha512 = "qWWzi4TlddohA91bFwgt6zO/J0X+io7Qp184Fw0m2JYRSTZnJbFR8+07KmzudHCZgOiKRCrjhylwv9Xd8gfhVQ=="; }; }; - "babel-loader-8.1.0" = { + "babel-loader-8.2.2" = { name = "babel-loader"; packageName = "babel-loader"; - version = "8.1.0"; + version = "8.2.2"; src = fetchurl { - url = "https://registry.npmjs.org/babel-loader/-/babel-loader-8.1.0.tgz"; - sha512 = "7q7nC1tYOrqvUrN3LQK4GwSk/TQorZSOlO9C+RZDZpODgyN4ZlCqE5q9cDsyWOliN+aU9B4JX01xK9eJXowJLw=="; + url = "https://registry.npmjs.org/babel-loader/-/babel-loader-8.2.2.tgz"; + sha512 = "JvTd0/D889PQBtUXJ2PXaKU/pjZDMtHA9V2ecm+eNRmmBCMR09a+fmpGTNwnJtFmFl5Ei7Vy47LjBb+L0wQ99g=="; }; }; "babel-plugin-dynamic-import-node-2.3.3" = { @@ -1975,13 +1912,13 @@ let sha512 = "5T6P4xPgpp0YDFvSWwEZ4NoE3aM4QBQXDzmVbraCkFj8zHM+mba8SyqB5DbZWyR7mYHo6Y7BdQo3MoA4m0TeQg=="; }; }; - "base64-js-1.3.1" = { + "base64-js-1.5.1" = { name = "base64-js"; packageName = "base64-js"; - version = "1.3.1"; + version = "1.5.1"; src = fetchurl { - url = "https://registry.npmjs.org/base64-js/-/base64-js-1.3.1.tgz"; - sha512 = "mLQ4i2QO1ytvGWFWmcngKO//JXAQueZvwEKtjgQFM4jIK0kU+ytMfplL8j+n5mspOfjHwoAg+9yhb7BwAHm36g=="; + url = "https://registry.npmjs.org/base64-js/-/base64-js-1.5.1.tgz"; + sha512 = "AKpaYlHn8t4SVbOHCy+b5+KKgvR4vrsD8vbvrbiQJps7fKDTkjkDry6ji0rUJjC0kzbNePLwzxq8iypo41qeWA=="; }; }; "batch-0.6.1" = { @@ -2191,13 +2128,13 @@ let sha512 = "BioO1xf3hFwz4kc6iBhI3ieDFompMhrMlnDFC4/0/vd5MokpuAc3R+LYbwTA9A5Yc9pq9UYPqffKpW2ObuwX5A=="; }; }; - "browserify-rsa-4.0.1" = { + "browserify-rsa-4.1.0" = { name = "browserify-rsa"; packageName = "browserify-rsa"; - version = "4.0.1"; + version = "4.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/browserify-rsa/-/browserify-rsa-4.0.1.tgz"; - sha1 = "21e0abfaf6f2029cf2fafb133567a701d4135524"; + url = "https://registry.npmjs.org/browserify-rsa/-/browserify-rsa-4.1.0.tgz"; + sha512 = "AdEER0Hkspgno2aR97SAf6vi0y0k8NuOpGnVH3O99rcA5Q6sh8QxcngtHuJ6uXwnfAXNM4Gn1Gb7/MV1+Ymbog=="; }; }; "browserify-sign-4.2.1" = { @@ -2227,22 +2164,13 @@ let sha512 = "VBorw+tgpOtZ1BYhrVSVTzTt/3+vSE3eFUh0N2GCFK1HffceOaf32YS/bs6WiFhjDAblAFrx85jMy3BG9fBK2Q=="; }; }; - "browserslist-4.14.5" = { + "browserslist-4.14.7" = { name = "browserslist"; packageName = "browserslist"; - version = "4.14.5"; + version = "4.14.7"; src = fetchurl { - url = "https://registry.npmjs.org/browserslist/-/browserslist-4.14.5.tgz"; - sha512 = "Z+vsCZIvCBvqLoYkBFTwEYH3v5MCQbsAjp50ERycpOjnPmolg1Gjy4+KaWWpm8QOJt9GHkhdqAl14NpCX73CWA=="; - }; - }; - "bs-logger-0.2.6" = { - name = "bs-logger"; - packageName = "bs-logger"; - version = "0.2.6"; - src = fetchurl { - url = "https://registry.npmjs.org/bs-logger/-/bs-logger-0.2.6.tgz"; - sha512 = "pd8DCoxmbgc7hyPKOvxtqNcjYoOsABPQdcCUjGp3d42VR2CX1ORhk2A87oqqu5R1kk+76nsxZupkmyd+MVtCog=="; + url = "https://registry.npmjs.org/browserslist/-/browserslist-4.14.7.tgz"; + sha512 = "BSVRLCeG3Xt/j/1cCGj1019Wbty0H+Yvu2AOuZSuoaUWn3RatbL33Cxk+Q4jRMRAbOm0p7SLravLjpnT6s0vzQ=="; }; }; "buffer-4.9.2" = { @@ -2371,6 +2299,15 @@ let sha512 = "lt0mJ6YAnsrBErpTMWeu5kl/tg9xMAWjavYTN6VQXM1A/teBITuNcccXsCxF0tDQQJf9DfAaX5O4e0zp0KlfZw=="; }; }; + "call-bind-1.0.0" = { + name = "call-bind"; + packageName = "call-bind"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/call-bind/-/call-bind-1.0.0.tgz"; + sha512 = "AEXsYIyyDY3MCzbwdhzG3Jx1R0J2wetQyUynn6dYHAO+bg8l1k7jwZtRv4ryryFs7EP+NDlikJlVe59jr0cM2w=="; + }; + }; "call-me-maybe-1.0.1" = { name = "call-me-maybe"; packageName = "call-me-maybe"; @@ -2443,13 +2380,13 @@ let sha512 = "L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg=="; }; }; - "camelcase-6.0.0" = { + "camelcase-6.2.0" = { name = "camelcase"; packageName = "camelcase"; - version = "6.0.0"; + version = "6.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/camelcase/-/camelcase-6.0.0.tgz"; - sha512 = "8KMDF1Vz2gzOq54ONPJS65IvTUaB1cHJ2DMM7MbPmLZljDH1qpzzLsWdiN9pHh6qvkRVDTi/07+eNGch/oLU4w=="; + url = "https://registry.npmjs.org/camelcase/-/camelcase-6.2.0.tgz"; + sha512 = "c7wVvbw3f37nuobQNtgsgG9POC9qMbNuMQmTCqZv23b6MIz0fcYpBiOlv9gEN/hdLdnZTDQhg6e9Dq5M1vKvfg=="; }; }; "caniuse-api-3.0.0" = { @@ -2461,13 +2398,13 @@ let sha512 = "bsTwuIg/BZZK/vreVTYYbSWoe2F+71P7K5QGEX+pT250DZbfU1MQ5prOKpPR+LL6uWKK3KMwMCAS74QB3Um1uw=="; }; }; - "caniuse-lite-1.0.30001143" = { + "caniuse-lite-1.0.30001161" = { name = "caniuse-lite"; packageName = "caniuse-lite"; - version = "1.0.30001143"; + version = "1.0.30001161"; src = fetchurl { - url = "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001143.tgz"; - sha512 = "p/PO5YbwmCpBJPxjOiKBvAlUPgF8dExhfEpnsH+ys4N/791WHrYrGg0cyHiAURl5hSbx5vIcjKmQAP6sHDYH3w=="; + url = "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001161.tgz"; + sha512 = "JharrCDxOqPLBULF9/SPa6yMcBRTjZARJ6sc3cuKrPfyIk64JN6kuMINWqA99Xc8uElMFcROliwtz0n9pYej+g=="; }; }; "case-sensitive-paths-webpack-plugin-2.3.0" = { @@ -2596,13 +2533,13 @@ let sha512 = "/j5PPkb5Feyps9e+jo07jUZGvkB5Aj953NrI4s8xSVScrAo/RHeILrtdb4uzR7N6aaFFxxJ+gt8mA8HfNpw76w=="; }; }; - "chokidar-3.4.2" = { + "chokidar-3.4.3" = { name = "chokidar"; packageName = "chokidar"; - version = "3.4.2"; + version = "3.4.3"; src = fetchurl { - url = "https://registry.npmjs.org/chokidar/-/chokidar-3.4.2.tgz"; - sha512 = "IZHaDeBeI+sZJRX7lGcXsdzgvZqKv6sECqsbErJA4mHWfpRrD8B97kSFN4cQz6nGBGiuFia1MKR4d6c1o8Cv7A=="; + url = "https://registry.npmjs.org/chokidar/-/chokidar-3.4.3.tgz"; + sha512 = "DtM3g7juCXQxFVSNPNByEC2+NImtBuxQQvWlHunpJIS5Ocr0lG306cC7FCi7cEA0fzmybPUIl4txBIobk1gGOQ=="; }; }; "chownr-1.1.4" = { @@ -2623,15 +2560,6 @@ let sha512 = "9e/zx1jw7B4CO+c/RXoCsfg/x1AfUBioy4owYH0bJprEYAx5hRFLRhWBqHAG57D0ZM4H7vxbP7bPe0VwhQRYDQ=="; }; }; - "ci-info-2.0.0" = { - name = "ci-info"; - packageName = "ci-info"; - version = "2.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/ci-info/-/ci-info-2.0.0.tgz"; - sha512 = "5tK7EtrZ0N+OLFMthtqOj4fI2Jeb88C4CAZPu25LDVUgXJ0A3Js4PMGqrn0JU1W0Mh1/Z8wZzYPxqUrXeBboCQ=="; - }; - }; "cipher-base-1.0.4" = { name = "cipher-base"; packageName = "cipher-base"; @@ -2668,6 +2596,24 @@ let sha1 = "b35dac376479facc3e94747d41d0d0f5238ffcb5"; }; }; + "cli-cursor-3.1.0" = { + name = "cli-cursor"; + packageName = "cli-cursor"; + version = "3.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/cli-cursor/-/cli-cursor-3.1.0.tgz"; + sha512 = "I/zHAwsKf9FqGoXM4WWRACob9+SNukZTd94DWF57E4toouRulbCxcUh6RKUEOQlYTHJnzkPMySvPNaaSLNfLZw=="; + }; + }; + "cli-spinners-2.5.0" = { + name = "cli-spinners"; + packageName = "cli-spinners"; + version = "2.5.0"; + src = fetchurl { + url = "https://registry.npmjs.org/cli-spinners/-/cli-spinners-2.5.0.tgz"; + sha512 = "PC+AmIuK04E6aeSs/pUccSujsTzBhu4HzC2dL+CfJB/Jcc2qTRbEwZQDfIUpt2Xl8BodYBEq8w4fc0kU2I9DjQ=="; + }; + }; "cli-table-0.3.1" = { name = "cli-table"; packageName = "cli-table"; @@ -2713,6 +2659,15 @@ let sha512 = "t6wbgtoCXvAzst7QgXxJYqPt0usEfbgQdftEPbLL/cvv6HPE5VgvqCuAIDR0NgU52ds6rFwqrgakNLrHEjCbrQ=="; }; }; + "clone-1.0.4" = { + name = "clone"; + packageName = "clone"; + version = "1.0.4"; + src = fetchurl { + url = "https://registry.npmjs.org/clone/-/clone-1.0.4.tgz"; + sha1 = "da309cc263df15994c688ca902179ca3c7cd7c7e"; + }; + }; "clone-response-1.0.2" = { name = "clone-response"; packageName = "clone-response"; @@ -2749,13 +2704,13 @@ let sha1 = "4bc0373c164bc3291b4d368c829cf1a80a59dca0"; }; }; - "color-3.1.2" = { + "color-3.1.3" = { name = "color"; packageName = "color"; - version = "3.1.2"; + version = "3.1.3"; src = fetchurl { - url = "https://registry.npmjs.org/color/-/color-3.1.2.tgz"; - sha512 = "vXTJhHebByxZn3lDvDJYw4lR5+uB3vuoHsuYA5AKuxRVn5wzzIfQKGLBmgdVRHKTJYeK5rvJcHnrd0Li49CFpg=="; + url = "https://registry.npmjs.org/color/-/color-3.1.3.tgz"; + sha512 = "xgXAcTHa2HeFCGLE9Xs/R82hujGtu9Jd9x4NW3T34+OMs7VoPsjwzRczKHvTAHeJwWFwX5j15+MgAppE8ztObQ=="; }; }; "color-convert-1.9.3" = { @@ -2794,13 +2749,13 @@ let sha512 = "dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA=="; }; }; - "color-string-1.5.3" = { + "color-string-1.5.4" = { name = "color-string"; packageName = "color-string"; - version = "1.5.3"; + version = "1.5.4"; src = fetchurl { - url = "https://registry.npmjs.org/color-string/-/color-string-1.5.3.tgz"; - sha512 = "dC2C5qeWoYkxki5UAXapdjqO672AM4vZuPGRQfO8b5HKuKGBbKWpITyDYN7TOFKvRW7kOgAn3746clDBMDJyQw=="; + url = "https://registry.npmjs.org/color-string/-/color-string-1.5.4.tgz"; + sha512 = "57yF5yt8Xa3czSEW1jfQDE79Idk0+AkN/4KWad6tbdxUmAs3MvjxlWSWD4deYytcRfoZ9nhKyFl1kj5tBvidbw=="; }; }; "colorette-1.2.1" = { @@ -2884,13 +2839,13 @@ let sha512 = "P0CysNDQ7rtVw4QIQtm+MRxV66vKFSvlsQvGYXZWR3qFU0jlMKHZZZgw8e+8DSah4UDKMqnknRDQz+xuQXQ/Zg=="; }; }; - "commander-6.1.0" = { + "commander-6.2.0" = { name = "commander"; packageName = "commander"; - version = "6.1.0"; + version = "6.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/commander/-/commander-6.1.0.tgz"; - sha512 = "wl7PNrYWd2y5mp1OK/LhTlv8Ff4kQJQRXXAvF+uU/TPNiVJUxZLRYGj/B0y/lPGAVcSbJqH2Za/cvHmrPMC8mA=="; + url = "https://registry.npmjs.org/commander/-/commander-6.2.0.tgz"; + sha512 = "zP4jEKbe8SHzKJYQmq8Y9gYjtO/POJLgIdKgV7B9qNmABVFVc+ctqSX6iXh4mCpJfRBOabiZ2YKPg8ciDw6C+Q=="; }; }; "common-tags-1.8.0" = { @@ -3100,22 +3055,22 @@ let sha512 = "Uh7crJAco3AjBvgAy9Z75CjK8IG+gxaErro71THQ+vv/bl4HaQcpkexAY8KVW/T6D2W2IRr+couF/knIRkZMIQ=="; }; }; - "core-js-2.6.11" = { + "core-js-2.6.12" = { name = "core-js"; packageName = "core-js"; - version = "2.6.11"; + version = "2.6.12"; src = fetchurl { - url = "https://registry.npmjs.org/core-js/-/core-js-2.6.11.tgz"; - sha512 = "5wjnpaT/3dV+XB4borEsnAYQchn00XSgTAWKDkEqv+K8KevjbzmofK6hfJ9TZIlpj2N0xQpazy7PiRQiWHqzWg=="; + url = "https://registry.npmjs.org/core-js/-/core-js-2.6.12.tgz"; + sha512 = "Kb2wC0fvsWfQrgk8HU5lW6U/Lcs8+9aaYcy4ZFc6DDlo4nZ7n70dEgE5rtR0oG6ufKDUnrwfWL1mXR5ljDatrQ=="; }; }; - "core-js-compat-3.6.5" = { + "core-js-compat-3.8.0" = { name = "core-js-compat"; packageName = "core-js-compat"; - version = "3.6.5"; + version = "3.8.0"; src = fetchurl { - url = "https://registry.npmjs.org/core-js-compat/-/core-js-compat-3.6.5.tgz"; - sha512 = "7ItTKOhOZbznhXAQ2g/slGg1PJV5zDO/WdkTwi7UEOJmkvsE32PWvx6mKtDjiMpjnR2CNf6BAD6sSxIlv7ptng=="; + url = "https://registry.npmjs.org/core-js-compat/-/core-js-compat-3.8.0.tgz"; + sha512 = "o9QKelQSxQMYWHXc/Gc4L8bx/4F7TTraE5rhuN8I7mKBt5dBIUpXpIR3omv70ebr8ST5R3PqbDQr+ZI3+Tt1FQ=="; }; }; "core-util-is-1.0.2" = { @@ -3226,6 +3181,15 @@ let sha512 = "iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w=="; }; }; + "cross-spawn-promise-0.10.2" = { + name = "cross-spawn-promise"; + packageName = "cross-spawn-promise"; + version = "0.10.2"; + src = fetchurl { + url = "https://registry.npmjs.org/cross-spawn-promise/-/cross-spawn-promise-0.10.2.tgz"; + sha512 = "74PXJf6DYaab2klRS+D+9qxKJL1Weo3/ao9OPoH6NFzxtINSa/HE2mcyAPu1fpEmRTPD4Gdmpg3xEXQSgI8lpg=="; + }; + }; "crypt-0.0.2" = { name = "crypt"; packageName = "crypt"; @@ -3307,13 +3271,13 @@ let sha512 = "DMxWJg0rnz7UgxKT0Q1HU/L9BeJI0M6ksor0OgqOnF+aRCDWg/N2641HmVyU9KVIu0OVVWOb2IpC9A+BJRnejg=="; }; }; - "css-tree-1.0.0-alpha.39" = { + "css-tree-1.1.2" = { name = "css-tree"; packageName = "css-tree"; - version = "1.0.0-alpha.39"; + version = "1.1.2"; src = fetchurl { - url = "https://registry.npmjs.org/css-tree/-/css-tree-1.0.0-alpha.39.tgz"; - sha512 = "7UvkEYgBAHRG9Nt980lYxjsTrCyHFN53ky3wVsDkiMdVqylqRt+Zc+jm5qw7/qyOvN2dHSYtX0e4MbCCExSvnA=="; + url = "https://registry.npmjs.org/css-tree/-/css-tree-1.1.2.tgz"; + sha512 = "wCoWush5Aeo48GLhfHPbmvZs59Z+M7k5+B1xDnXbdWNcEF423DoFdqSWE0PM5aNk5nI5cp1q7ms36zGApY/sKQ=="; }; }; "css-what-2.1.3" = { @@ -3325,13 +3289,13 @@ let sha512 = "a+EPoD+uZiNfh+5fxw2nO9QwFa6nJe2Or35fGY6Ipw1R3R4AGz1d1TEZrCegvw2YTmZ0jXirGYlzxxpYSHwpEg=="; }; }; - "css-what-3.4.1" = { + "css-what-3.4.2" = { name = "css-what"; packageName = "css-what"; - version = "3.4.1"; + version = "3.4.2"; src = fetchurl { - url = "https://registry.npmjs.org/css-what/-/css-what-3.4.1.tgz"; - sha512 = "wHOppVDKl4vTAOWzJt5Ek37Sgd9qq1Bmj/T1OjvicWbU5W7ru7Pqbn0Jdqii3Drx/h+dixHKXNhZYx7blthL7g=="; + url = "https://registry.npmjs.org/css-what/-/css-what-3.4.2.tgz"; + sha512 = "ACUm3L0/jiZTqfzRM3Hi9Q8eZqd6IK37mMWPLz9PJxkLWllYeRf+EHUSHYEtFop2Eqytaq1FizFVh7XfBnXCDQ=="; }; }; "cssesc-3.0.0" = { @@ -3397,13 +3361,13 @@ let sha512 = "WcKx5OY+KoSIAxBW6UBBRay1U6vkYheCdjyVNDm85zt5K9mHoGOfsOsqIszfAqrQQFIIKgjh2+FDgIj/zsl21Q=="; }; }; - "csso-4.0.3" = { + "csso-4.2.0" = { name = "csso"; packageName = "csso"; - version = "4.0.3"; + version = "4.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/csso/-/csso-4.0.3.tgz"; - sha512 = "NL3spysxUkcrOgnpsT4Xdl2aiEiBG6bXswAABQVHcMrfjjBisFOKwLDOmf4wf32aPdcJws1zds2B0Rg+jqMyHQ=="; + url = "https://registry.npmjs.org/csso/-/csso-4.2.0.tgz"; + sha512 = "wvlcdIbf6pwKEk7vHj8/Bkc0B4ylXZruLvOgs9doS5eOsOpuodOV2zJChSpkp+pRpYQLQMeF04nr3Z68Sta9jA=="; }; }; "cycle-1.0.3" = { @@ -3442,22 +3406,22 @@ let sha512 = "bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA=="; }; }; - "debug-3.2.6" = { + "debug-3.2.7" = { name = "debug"; packageName = "debug"; - version = "3.2.6"; + version = "3.2.7"; src = fetchurl { - url = "https://registry.npmjs.org/debug/-/debug-3.2.6.tgz"; - sha512 = "mel+jf7nrtEl5Pn1Qx46zARXKDpBbvzezse7p7LqINmdoIk8PYP5SySaxEmYv6TZ0JyEKA1hsCId6DIhgITtWQ=="; + url = "https://registry.npmjs.org/debug/-/debug-3.2.7.tgz"; + sha512 = "CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ=="; }; }; - "debug-4.3.0" = { + "debug-4.3.1" = { name = "debug"; packageName = "debug"; - version = "4.3.0"; + version = "4.3.1"; src = fetchurl { - url = "https://registry.npmjs.org/debug/-/debug-4.3.0.tgz"; - sha512 = "jjO6JD2rKfiZQnBoRzhRTbXjHLGLfH+UtGkWLc/UXAh/rzZMyjbgn0NcfFpqT8nd1kTtFnDiJcrIFkq4UKeJVg=="; + url = "https://registry.npmjs.org/debug/-/debug-4.3.1.tgz"; + sha512 = "doEwdvm4PCeK4K3RQN2ZC2BYUBaxwLARCqZmMjtF8a51J2Rb0xpVloFRnCODwqjpwnAoao4pelN8l3RJdv3gRQ=="; }; }; "decamelize-1.2.0" = { @@ -3532,6 +3496,15 @@ let sha512 = "h6sMrVB1VMWVrW13mSc6ia/DwYYw5MN6+exNu1OaJeFac5aSAvwM7lZ0NVfTABuSkQelr4h5oebg3KB1XPdjgA=="; }; }; + "defaults-1.0.3" = { + name = "defaults"; + packageName = "defaults"; + version = "1.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/defaults/-/defaults-1.0.3.tgz"; + sha1 = "c656051e9817d9ff08ed881477f3fe4019f3ef7d"; + }; + }; "defer-to-connect-1.1.3" = { name = "defer-to-connect"; packageName = "defer-to-connect"; @@ -3658,15 +3631,6 @@ let sha512 = "5tQykt+LqfJFBEYaDITx7S7cR7mJ/zQmLXZ2qt5w04ainYZw6tBf9dBunMjVeVOdYVRUzUOE4HkY5J7+uttb5Q=="; }; }; - "diff-sequences-25.2.6" = { - name = "diff-sequences"; - packageName = "diff-sequences"; - version = "25.2.6"; - src = fetchurl { - url = "https://registry.npmjs.org/diff-sequences/-/diff-sequences-25.2.6.tgz"; - sha512 = "Hq8o7+6GaZeoFjtpgvRBUknSXNeJiCx7V9Fr94ZMljNiCr9n9L8H8aJqgWOQiDDGdyn29fRNcDdRVJ5fdyihfg=="; - }; - }; "diffie-hellman-5.0.3" = { name = "diffie-hellman"; packageName = "diffie-hellman"; @@ -3865,13 +3829,13 @@ let sha1 = "590c61156b0ae2f4f0255732a158b266bc56b21d"; }; }; - "electron-to-chromium-1.3.576" = { + "electron-to-chromium-1.3.610" = { name = "electron-to-chromium"; packageName = "electron-to-chromium"; - version = "1.3.576"; + version = "1.3.610"; src = fetchurl { - url = "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.576.tgz"; - sha512 = "uSEI0XZ//5ic+0NdOqlxp0liCD44ck20OAGyLMSymIWTEAtHKVJi6JM18acOnRgUgX7Q65QqnI+sNncNvIy8ew=="; + url = "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.610.tgz"; + sha512 = "eFDC+yVQpEhtlapk4CYDPfV9ajF9cEof5TBcO49L1ETO+aYogrKWDmYpZyxBScMNe8Bo/gJamH4amQ4yyvXg4g=="; }; }; "elliptic-6.5.3" = { @@ -3947,6 +3911,15 @@ let sha512 = "FcRN8UlTl52EigvGjTaG9rnfdUJYh88eWRrruUmZLNVb/71maM92l3HNDAcyztOj4pEYGhoo9DEHEquZm6B08A=="; }; }; + "elm-json-0.2.8" = { + name = "elm-json"; + packageName = "elm-json"; + version = "0.2.8"; + src = fetchurl { + url = "https://registry.npmjs.org/elm-json/-/elm-json-0.2.8.tgz"; + sha512 = "YfK39CNrHjB4LMnas6aAb2LP37YgqAnh69bWD7ojAs7lBNNkWIeBifeszAfmapylQt1MVuwj6zPPYwrqRQXEBA=="; + }; + }; "elm-test-0.19.1" = { name = "elm-test"; packageName = "elm-test"; @@ -4064,13 +4037,13 @@ let sha512 = "f2LZMYl1Fzu7YSBKg+RoROelpOaNrcGmE9AZubeDfrCEia483oW4MI4VyFd5VNHIgQ/7qm1I0wUHK1eJnn2y2w=="; }; }; - "entities-2.0.3" = { + "entities-2.1.0" = { name = "entities"; packageName = "entities"; - version = "2.0.3"; + version = "2.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/entities/-/entities-2.0.3.tgz"; - sha512 = "MyoZ0jgnLvB2X3Lg5HqpFmn1kybDiIfEQmKzTb5apr51Rb+T3KdmMiqa70T+bhGnyv7bQ6WMj2QMHpGMmlrUYQ=="; + url = "https://registry.npmjs.org/entities/-/entities-2.1.0.tgz"; + sha512 = "hCx1oky9PFrJ611mf0ifBLBRW8lUUVRlFolb5gWRfIELabBlbp9xZvrqZLZAs+NxFnbfQoeGd8wDkygjg7U85w=="; }; }; "errno-0.1.7" = { @@ -4127,13 +4100,13 @@ let sha512 = "HBL8I3mIki5C1Cc9QjKUenHtnG0A5/xA8Q/AllRcfiwl2CZFXGK7ddBiCoRwAix4i2KxcQfjtIVcrVbB3vbmwg=="; }; }; - "escalade-3.1.0" = { + "escalade-3.1.1" = { name = "escalade"; packageName = "escalade"; - version = "3.1.0"; + version = "3.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/escalade/-/escalade-3.1.0.tgz"; - sha512 = "mAk+hPSO8fLDkhV7V0dXazH5pDc6MrjBTPyD3VeKzxnVFjH1MIxbCdqGZB9O8+EwWakZs3ZCbDS4IpRt79V1ig=="; + url = "https://registry.npmjs.org/escalade/-/escalade-3.1.1.tgz"; + sha512 = "k0er2gUkLf8O0zKJiAhmkTnJlTvINGv7ygDNPbeIsX/TJjGJZHuh9B2UxbsaEkmlEo9MfhrSzmhIlhRlI2GXnw=="; }; }; "escape-html-1.0.3" = { @@ -4298,13 +4271,13 @@ let sha512 = "adbxcyWV46qiHyvSp50TKt05tB4tK3HcmF7/nxfAdhnox83seTDbwnaqKO4sXRy7roHAIFqJP/Rw/AuEbX61LA=="; }; }; - "execa-4.0.3" = { + "execa-4.1.0" = { name = "execa"; packageName = "execa"; - version = "4.0.3"; + version = "4.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/execa/-/execa-4.0.3.tgz"; - sha512 = "WFDXGHckXPWZX19t1kCsXzOpqX9LWYNqn4C+HqZlk/V0imTkzJZqf87ZBhvpHaftERYknpk0fjSylnXVlVgI0A=="; + url = "https://registry.npmjs.org/execa/-/execa-4.1.0.tgz"; + sha512 = "j5W0//W7f8UxAn8hXVnwG8tLwdiUy4FJLcSupCg6maBYZDpyBvTApK7KyuI4bKj8KOh1r2YH+6ucuYtJv1bTZA=="; }; }; "expand-brackets-2.1.4" = { @@ -4469,13 +4442,13 @@ let sha512 = "lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw=="; }; }; - "fastq-1.8.0" = { + "fastq-1.9.0" = { name = "fastq"; packageName = "fastq"; - version = "1.8.0"; + version = "1.9.0"; src = fetchurl { - url = "https://registry.npmjs.org/fastq/-/fastq-1.8.0.tgz"; - sha512 = "SMIZoZdLh/fgofivvIkmknUXyPnvxRE3DhtZ5Me3Mrsk5gyPL42F0xr51TdRXskBxHfMp+07bcYzfsYEsSQA9Q=="; + url = "https://registry.npmjs.org/fastq/-/fastq-1.9.0.tgz"; + sha512 = "i7FVWL8HhVY+CTkwFxkN2mk3h+787ixS5S63eb78diVRc1MCssarHq3W5cj0av7YDSwmaV928RNag+U1etRQ7w=="; }; }; "faye-websocket-0.10.0" = { @@ -4514,13 +4487,13 @@ let sha1 = "3ab1a2d2a62c8bfb431a0c94cb797a2fce27c962"; }; }; - "file-loader-6.1.0" = { + "file-loader-6.2.0" = { name = "file-loader"; packageName = "file-loader"; - version = "6.1.0"; + version = "6.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/file-loader/-/file-loader-6.1.0.tgz"; - sha512 = "26qPdHyTsArQ6gU4P1HJbAbnFTyT2r0pG7czh1GFAd9TZbj0n94wWbupgixZH/ET/meqi2/5+F7DhW4OAXD+Lg=="; + url = "https://registry.npmjs.org/file-loader/-/file-loader-6.2.0.tgz"; + sha512 = "qo3glqyTa61Ytg4u73GultjHGjdRyig3tG6lPtyX/jOEJvHif9uB0/OCI2Kif6ctF3caQTW2G5gym21oAsI4pw=="; }; }; "file-uri-to-path-1.0.0" = { @@ -4613,6 +4586,15 @@ let sha512 = "Tq6PixE0w/VMFfCgbONnkiQIVol/JJL7nRMi20fqzA4NRs9AfeqMGeRdPi3wIhYkxjeBaWh2rxwapn5Tu3IqOQ=="; }; }; + "find-cache-dir-3.3.1" = { + name = "find-cache-dir"; + packageName = "find-cache-dir"; + version = "3.3.1"; + src = fetchurl { + url = "https://registry.npmjs.org/find-cache-dir/-/find-cache-dir-3.3.1.tgz"; + sha512 = "t2GDMt3oGC/v+BMwzmllWDuJF/xcDtE5j/fCGbqDD7OLuJkj0cfh1YSA5VKPvwMeLFLNDBkwOKZ2X85jGLVftQ=="; + }; + }; "find-elm-dependencies-2.0.2" = { name = "find-elm-dependencies"; packageName = "find-elm-dependencies"; @@ -4712,6 +4694,15 @@ let sha512 = "3Z4XhFZ3992uIq0XOqb9AreonueSYphE6oYbpt5+3u06JWklbsPkNv3ZKkP9Bz/r+1MWCaMoSQ28P85+1Yc77w=="; }; }; + "folder-hash-3.3.3" = { + name = "folder-hash"; + packageName = "folder-hash"; + version = "3.3.3"; + src = fetchurl { + url = "https://registry.npmjs.org/folder-hash/-/folder-hash-3.3.3.tgz"; + sha512 = "SDgHBgV+RCjrYs8aUwCb9rTgbTVuSdzvFmLaChsLre1yf+D64khCW++VYciaByZ8Rm0uKF8R/XEpXuTRSGUM1A=="; + }; + }; "follow-redirects-1.13.0" = { name = "follow-redirects"; packageName = "follow-redirects"; @@ -4838,6 +4829,15 @@ let sha512 = "yhlQgA6mnOJUKOsRUFsgJdQCvkKhcz8tlZG5HBQfReYZy46OwLcY+Zia0mtdHsOo9y/hP+CxMN0TU9QxoOtG4g=="; }; }; + "fs-extra-9.0.1" = { + name = "fs-extra"; + packageName = "fs-extra"; + version = "9.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/fs-extra/-/fs-extra-9.0.1.tgz"; + sha512 = "h2iAoN838FqAFJY2/qVpzFXy+EBxfVE220PalAqQLDVsFOHLJrZvut5puAbCdNv6WJk+B8ihI+k0c7JK5erwqQ=="; + }; + }; "fs-minipass-1.2.7" = { name = "fs-minipass"; packageName = "fs-minipass"; @@ -4892,6 +4892,15 @@ let sha512 = "Auw9a4AxqWpa9GUfj370BMPzzyncfBABW8Mab7BGWBYDj4Isgq+cDKtx0i6u9jcX9pQDnswsaaOTgTmA5pEjuQ=="; }; }; + "fsevents-2.2.1" = { + name = "fsevents"; + packageName = "fsevents"; + version = "2.2.1"; + src = fetchurl { + url = "https://registry.npmjs.org/fsevents/-/fsevents-2.2.1.tgz"; + sha512 = "bTLYHSeC0UH/EFXS9KqWnXuOl/wHK5Z/d+ghd5AsFMYN7wIGkUCOJyzy88+wJKkZPGON8u4Z9f6U4FdgURE9qA=="; + }; + }; "function-bind-1.1.1" = { name = "function-bind"; packageName = "function-bind"; @@ -4901,13 +4910,13 @@ let sha512 = "yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A=="; }; }; - "gensync-1.0.0-beta.1" = { + "gensync-1.0.0-beta.2" = { name = "gensync"; packageName = "gensync"; - version = "1.0.0-beta.1"; + version = "1.0.0-beta.2"; src = fetchurl { - url = "https://registry.npmjs.org/gensync/-/gensync-1.0.0-beta.1.tgz"; - sha512 = "r8EC6NO1sngH/zdD9fiRDLdcgnbayXah+mLgManTaIZJqEC1MZstmnox8KpnI2/fxQwrp5OpCOYWLp4rBl4Jcg=="; + url = "https://registry.npmjs.org/gensync/-/gensync-1.0.0-beta.2.tgz"; + sha512 = "3hN7NaskYvMDLQY55gnW3NQ+mesEAepTqlg+VEbj7zzqEMBVNhzcGYYeqFo/TlYz6eQiFcp1HcsCZO+nGgS8zg=="; }; }; "get-caller-file-1.0.3" = { @@ -4928,6 +4937,15 @@ let sha512 = "DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg=="; }; }; + "get-intrinsic-1.0.1" = { + name = "get-intrinsic"; + packageName = "get-intrinsic"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.0.1.tgz"; + sha512 = "ZnWP+AmS1VUaLgTRy47+zKtjTxz+0xMpx3I52i+aalBK1QP19ggLF3Db89KJX7kjfOfP2eoa01qc++GwPgufPg=="; + }; + }; "get-own-enumerable-property-symbols-3.0.2" = { name = "get-own-enumerable-property-symbols"; packageName = "get-own-enumerable-property-symbols"; @@ -5549,13 +5567,13 @@ let sha512 = "4aFq7wvWyMHKgxsH8QQtGpvbASCf+eM3wPRLI6R+MgAnTCZ6STYsRvttLvRWK0Nfif5piF394St3HeJDaljGPA=="; }; }; - "ieee754-1.1.13" = { + "ieee754-1.2.1" = { name = "ieee754"; packageName = "ieee754"; - version = "1.1.13"; + version = "1.2.1"; src = fetchurl { - url = "https://registry.npmjs.org/ieee754/-/ieee754-1.1.13.tgz"; - sha512 = "4vf7I2LYV/HaWerSo3XmlMkp5eZ83i+/CDluXi/IGTs/O1sejBNhTtnxzmRZfvOUqj7lZjqHkeTvpgSFDlWZTg=="; + url = "https://registry.npmjs.org/ieee754/-/ieee754-1.2.1.tgz"; + sha512 = "dcyqhDvX1C46lXZcVqCpK+FtMRQVdIMN6/Df5js2zouUsqG7I6sFxitIC+7KYK29KdXOLHdu9zL4sFnoVQnqaA=="; }; }; "iferr-0.1.5" = { @@ -5603,13 +5621,13 @@ let sha1 = "d81355c15612d386c61f9ddd3922d4304822a546"; }; }; - "import-fresh-3.2.1" = { + "import-fresh-3.2.2" = { name = "import-fresh"; packageName = "import-fresh"; - version = "3.2.1"; + version = "3.2.2"; src = fetchurl { - url = "https://registry.npmjs.org/import-fresh/-/import-fresh-3.2.1.tgz"; - sha512 = "6e1q1cnWP2RXD9/keSkxHScg508CdXqXWgWBaETNhyuBFz+kUZlKboh+ISK+bU++DmbHimVBrOz/zzPe0sZ3sQ=="; + url = "https://registry.npmjs.org/import-fresh/-/import-fresh-3.2.2.tgz"; + sha512 = "cTPNrlvJT6twpYy+YmKUKrTSjWFs3bjYjAhCwm+z4EOCubZxAuO+hHpRN64TqjEaYSHs7tJAE0w1CKMGmsG/lw=="; }; }; "import-local-2.0.0" = { @@ -5711,15 +5729,6 @@ let sha512 = "S1zBo1D6zcsyuC6PMmY5+55YMILQ9av8lotMx447Bq6SAgo/sDK6y6uUKmuYhW7eacnIhFfsPmCNYdDzsnnDCg=="; }; }; - "invariant-2.2.4" = { - name = "invariant"; - packageName = "invariant"; - version = "2.2.4"; - src = fetchurl { - url = "https://registry.npmjs.org/invariant/-/invariant-2.2.4.tgz"; - sha512 = "phJfQVBuaJM5raOpJjSfkiD6BpbCE4Ns//LaXl6wGYtUBY83nWS6Rf9tXm2e8VaK60JEjYldbPif/A2B1C2gNA=="; - }; - }; "invert-kv-1.0.0" = { name = "invert-kv"; packageName = "invert-kv"; @@ -5855,15 +5864,6 @@ let sha512 = "dnMqspv5nU3LoewK2N/y7KLtxtakvTuaCsU9FU50/QDmdbHNy/4/JuRtMHqRU22o3q+W89YQndQEeCVwK+3qrA=="; }; }; - "is-ci-2.0.0" = { - name = "is-ci"; - packageName = "is-ci"; - version = "2.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/is-ci/-/is-ci-2.0.0.tgz"; - sha512 = "YfJT7rkpQB0updsdHLGWrvhBJfcfzNNawYDNIyQXJz0IViGf75O8EBPKSdvw2rF+LGCsX4FZ8tcr3b19LcZq4w=="; - }; - }; "is-color-stop-1.1.0" = { name = "is-color-stop"; packageName = "is-color-stop"; @@ -5873,6 +5873,15 @@ let sha1 = "cfff471aee4dd5c9e158598fbe12967b5cdad345"; }; }; + "is-core-module-2.2.0" = { + name = "is-core-module"; + packageName = "is-core-module"; + version = "2.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/is-core-module/-/is-core-module-2.2.0.tgz"; + sha512 = "XRAfAdyyY5F5cOXn7hYQDqh2Xmii+DEfIcQGxK/uNwMHhIkPWO0g8msXcbzLe+MpGoR951MlqM/2iIlU4vKDdQ=="; + }; + }; "is-data-descriptor-0.1.4" = { name = "is-data-descriptor"; packageName = "is-data-descriptor"; @@ -6008,6 +6017,15 @@ let sha512 = "5G0tKtBTFImOqDnLB2hG6Bp2qcKEFduo4tZu9MT/H6NQv/ghhy30o55ufafxJ/LdH79LLs2Kfrn85TLKyA7BUg=="; }; }; + "is-interactive-1.0.0" = { + name = "is-interactive"; + packageName = "is-interactive"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/is-interactive/-/is-interactive-1.0.0.tgz"; + sha512 = "2HvIEKRoqS62guEC+qBjpvRubdX910WCMuJTZ+I9yvqKU2/12eSL549HMwtabb4oupdj2sMP50k+XJfB/8JE6w=="; + }; + }; "is-negative-zero-2.0.0" = { name = "is-negative-zero"; packageName = "is-negative-zero"; @@ -6278,33 +6296,6 @@ let sha512 = "1P/yWsxPlDtn7QeRD+ULKQPaIaN6yF368GZ2vDfv0AL0NwpStafjWCDDdn0k8wgFMWpVAqG7oJhxHnlud42i9w=="; }; }; - "jest-diff-25.5.0" = { - name = "jest-diff"; - packageName = "jest-diff"; - version = "25.5.0"; - src = fetchurl { - url = "https://registry.npmjs.org/jest-diff/-/jest-diff-25.5.0.tgz"; - sha512 = "z1kygetuPiREYdNIumRpAHY6RXiGmp70YHptjdaxTWGmA085W3iCnXNx0DhflK3vwrKmrRWyY1wUpkPMVxMK7A=="; - }; - }; - "jest-get-type-25.2.6" = { - name = "jest-get-type"; - packageName = "jest-get-type"; - version = "25.2.6"; - src = fetchurl { - url = "https://registry.npmjs.org/jest-get-type/-/jest-get-type-25.2.6.tgz"; - sha512 = "DxjtyzOHjObRM+sM1knti6or+eOgcGU4xVSb2HNP1TqO4ahsT+rqZg+nyqHWJSvWgKC5cG3QjGFBqxLghiF/Ig=="; - }; - }; - "jest-util-26.5.0" = { - name = "jest-util"; - packageName = "jest-util"; - version = "26.5.0"; - src = fetchurl { - url = "https://registry.npmjs.org/jest-util/-/jest-util-26.5.0.tgz"; - sha512 = "CSQ0uzE7JdHDCQo3K8jlyWRIF2xNLdpu9nbjo8okGDanaNsF7WonhusFvjOg7QiWn1SThe7wFRh8Jx2ls1Gx4Q=="; - }; - }; "js-tokens-4.0.0" = { name = "js-tokens"; packageName = "js-tokens"; @@ -6476,6 +6467,15 @@ let sha1 = "8771aae0799b64076b76640fca058f9c10e33ecb"; }; }; + "jsonfile-6.1.0" = { + name = "jsonfile"; + packageName = "jsonfile"; + version = "6.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/jsonfile/-/jsonfile-6.1.0.tgz"; + sha512 = "5dgndWOriYSm5cnYaJNhalLNDKOqFwyDB/rr1E9ZsGciGvKPs8R2xYGCacuf3z6K1YKDz182fd+fY3cn3pMqXQ=="; + }; + }; "jsonify-0.0.0" = { name = "jsonify"; packageName = "jsonify"; @@ -6566,6 +6566,15 @@ let sha1 = "42b76894701169cc910fd0d19ce677b5fb378af1"; }; }; + "kleur-3.0.3" = { + name = "kleur"; + packageName = "kleur"; + version = "3.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/kleur/-/kleur-3.0.3.tgz"; + sha512 = "eTIzlVOSUR+JxdDFepEYcBMtZ9Qqdef+rnzWdRZuMbOywu5tO2w2N7rqjoANZ5k9vywhL6Br1VRjUIgTQx4E8w=="; + }; + }; "klona-2.0.4" = { name = "klona"; packageName = "klona"; @@ -6602,33 +6611,6 @@ let sha1 = "308accafa0bc483a3867b4b6f2b9506251d1b835"; }; }; - "leven-3.1.0" = { - name = "leven"; - packageName = "leven"; - version = "3.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/leven/-/leven-3.1.0.tgz"; - sha512 = "qsda+H8jTaUaN/x5vzW2rzc+8Rw4TAQ/4KjB46IwK5VH+IlVeeeje/EoZRpiXvIqjFgK84QffqPztGI3VBLG1A=="; - }; - }; - "levenary-1.1.1" = { - name = "levenary"; - packageName = "levenary"; - version = "1.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/levenary/-/levenary-1.1.1.tgz"; - sha512 = "mkAdOIt79FD6irqjYSs4rdbnlT5vRonMEvBVPVb3XmevfS8kgRXwfes0dhPdEtzTWD/1eNE/Bm/G1iRt6DcnQQ=="; - }; - }; - "line-column-1.0.2" = { - name = "line-column"; - packageName = "line-column"; - version = "1.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/line-column/-/line-column-1.0.2.tgz"; - sha1 = "d25af2936b6f4849172b312e4792d1d987bc34a2"; - }; - }; "lines-and-columns-1.1.6" = { name = "lines-and-columns"; packageName = "lines-and-columns"; @@ -6773,22 +6755,22 @@ let sha1 = "d0225373aeb652adc1bc82e4945339a842754773"; }; }; - "loglevel-1.7.0" = { - name = "loglevel"; - packageName = "loglevel"; - version = "1.7.0"; + "log-symbols-3.0.0" = { + name = "log-symbols"; + packageName = "log-symbols"; + version = "3.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/loglevel/-/loglevel-1.7.0.tgz"; - sha512 = "i2sY04nal5jDcagM3FMfG++T69GEEM8CYuOfeOIvmXzOIcwE9a/CJPR0MFM97pYMj/u10lzz7/zd7+qwhrBTqQ=="; + url = "https://registry.npmjs.org/log-symbols/-/log-symbols-3.0.0.tgz"; + sha512 = "dSkNGuI7iG3mfvDzUuYZyvk5dD9ocYCYzNU6CYDE6+Xqd+gwme6Z00NS3dUh8mq/73HaEtT7m6W+yUPtU6BZnQ=="; }; }; - "loose-envify-1.4.0" = { - name = "loose-envify"; - packageName = "loose-envify"; - version = "1.4.0"; + "loglevel-1.7.1" = { + name = "loglevel"; + packageName = "loglevel"; + version = "1.7.1"; src = fetchurl { - url = "https://registry.npmjs.org/loose-envify/-/loose-envify-1.4.0.tgz"; - sha512 = "lyuxPGr/Wfhrlem2CL/UcnUc1zcqKAImBDzukY7Y5F/yQiNdko6+fRLevlw1HgMySw7f611UIY408EtxRSoK3Q=="; + url = "https://registry.npmjs.org/loglevel/-/loglevel-1.7.1.tgz"; + sha512 = "Hesni4s5UkWkwCGJMQGAh71PaLUmKFM60dHvq0zi/vDhhrzuk+4GgNbTXJ12YYQJn6ZKBDNIjYcuQGKudvqrIw=="; }; }; "lower-case-2.0.1" = { @@ -6854,13 +6836,13 @@ let sha512 = "LS9X+dc8KLxXCb8dni79fLIIUA5VyZoyjSMCwTluaXA0o27cCK0bhXkpgw+sTXVpPy/lSO57ilRixqk0vDmtRA=="; }; }; - "make-error-1.3.6" = { - name = "make-error"; - packageName = "make-error"; - version = "1.3.6"; + "make-dir-3.1.0" = { + name = "make-dir"; + packageName = "make-dir"; + version = "3.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/make-error/-/make-error-1.3.6.tgz"; - sha512 = "s8UhlNe7vPKomQhC1qFelMokr/Sc3AgNbso3n74mVPA5LTZwkB9NlXf4XPamLxJE8h0gh73rM94xvwRT2CVInw=="; + url = "https://registry.npmjs.org/make-dir/-/make-dir-3.1.0.tgz"; + sha512 = "g3FeP20LNwhALb/6Cz6Dd4F2ngze0jz7tbzrD2wAV+o9FeNHe4rL+yK2md0J/fiSf1sa1ADhXqi5+oVwOM/eGw=="; }; }; "map-cache-0.2.2" = { @@ -6899,22 +6881,22 @@ let sha512 = "xitP+WxNPcTTOgnTJcrhM0xvdPepipPSf3I8EIpGKeFLjt3PlJLIDG3u8EX53ZIubkb+5U2+3rELYpEhHhzdkg=="; }; }; - "mdn-data-2.0.4" = { + "mdn-data-2.0.14" = { name = "mdn-data"; packageName = "mdn-data"; - version = "2.0.4"; + version = "2.0.14"; src = fetchurl { - url = "https://registry.npmjs.org/mdn-data/-/mdn-data-2.0.4.tgz"; - sha512 = "iV3XNKw06j5Q7mi6h+9vbx23Tv7JkjEVgKHW4pimwyDGWm0OIQntJJ+u1C6mg6mK1EaTv42XQ7w76yuzH7M2cA=="; + url = "https://registry.npmjs.org/mdn-data/-/mdn-data-2.0.14.tgz"; + sha512 = "dn6wd0uw5GsdswPFfsgMp5NSB0/aDe6fK94YJV/AJDYXL6HVLWBsxeq7js7Ad+mU2K9LAlwpk6kN2D5mwCPVow=="; }; }; - "mdn-data-2.0.6" = { + "mdn-data-2.0.4" = { name = "mdn-data"; packageName = "mdn-data"; - version = "2.0.6"; + version = "2.0.4"; src = fetchurl { - url = "https://registry.npmjs.org/mdn-data/-/mdn-data-2.0.6.tgz"; - sha512 = "rQvjv71olwNHgiTbfPZFkJtjNMciWgswYeciZhtvWLO8bmX3TnhyA62I6sTWOyZssWHJJjY6/KiWwqQsWWsqOA=="; + url = "https://registry.npmjs.org/mdn-data/-/mdn-data-2.0.4.tgz"; + sha512 = "iV3XNKw06j5Q7mi6h+9vbx23Tv7JkjEVgKHW4pimwyDGWm0OIQntJJ+u1C6mg6mK1EaTv42XQ7w76yuzH7M2cA=="; }; }; "media-typer-0.3.0" = { @@ -7097,13 +7079,13 @@ let sha512 = "wXqjST+SLt7R009ySCglWBCFpjUygmCIfD790/kVbiGmUgfYGuB14PiTd5DwVxSV4NcYHjzMkoj5LjQZwTQLEA=="; }; }; - "mini-css-extract-plugin-0.11.3" = { + "mini-css-extract-plugin-0.12.0" = { name = "mini-css-extract-plugin"; packageName = "mini-css-extract-plugin"; - version = "0.11.3"; + version = "0.12.0"; src = fetchurl { - url = "https://registry.npmjs.org/mini-css-extract-plugin/-/mini-css-extract-plugin-0.11.3.tgz"; - sha512 = "n9BA8LonkOkW1/zn+IbLPQmovsL0wMb9yx75fMJQZf2X1Zoec9yTZtyMePcyu19wPkmFbzZZA6fLTotpFhQsOA=="; + url = "https://registry.npmjs.org/mini-css-extract-plugin/-/mini-css-extract-plugin-0.12.0.tgz"; + sha512 = "z6PQCe9rd1XUwZ8gMaEVwwRyZlrYy8Ba1gRjFP5HcV51HkXX+XlwZ+a1iAYTjSYwgNBXoNR7mhx79mDpOn5fdw=="; }; }; "minimalistic-assert-1.0.1" = { @@ -7214,22 +7196,13 @@ let sha512 = "NKmAlESf6jMGym1++R0Ra7wvhV+wFW63FaSOFPwRahvea0gMUcGUhVeAg/0BC0wiv9ih5NYPB1Wn1UEI1/L+xQ=="; }; }; - "mkdirp-1.0.4" = { - name = "mkdirp"; - packageName = "mkdirp"; - version = "1.0.4"; - src = fetchurl { - url = "https://registry.npmjs.org/mkdirp/-/mkdirp-1.0.4.tgz"; - sha512 = "vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw=="; - }; - }; - "moment-2.29.0" = { + "moment-2.29.1" = { name = "moment"; packageName = "moment"; - version = "2.29.0"; + version = "2.29.1"; src = fetchurl { - url = "https://registry.npmjs.org/moment/-/moment-2.29.0.tgz"; - sha512 = "z6IJ5HXYiuxvFTI6eiQ9dm77uE0gyy1yXNApVHqTcnIKfY9tIwEjlzsZ6u1LQXvVgKeTnv9Xm7NDvJ7lso3MtA=="; + url = "https://registry.npmjs.org/moment/-/moment-2.29.1.tgz"; + sha512 = "kHmoybcPV8Sqy59DwNDY3Jefr64lK/by/da0ViFcuA4DH0vQg5Q6Ze5VimxkfQNSC+Mls/Kx53s7TjP1RhFEDQ=="; }; }; "move-concurrently-1.0.1" = { @@ -7322,22 +7295,22 @@ let sha512 = "nnbWWOkoWyUsTjKrhgD0dcz22mdkSnpYqbEjIm2nhwhuxlSkpywJmBo8h0ZqJdkp73mb90SssHkN4rsRaBAfAA=="; }; }; - "nan-2.14.1" = { + "nan-2.14.2" = { name = "nan"; packageName = "nan"; - version = "2.14.1"; + version = "2.14.2"; src = fetchurl { - url = "https://registry.npmjs.org/nan/-/nan-2.14.1.tgz"; - sha512 = "isWHgVjnFjh2x2yuJ/tj3JbwoHu3UC2dX5G/88Cm24yB6YopVgxvBObDY7n5xW6ExmFhJpSEQqFPvq9zaXc8Jw=="; + url = "https://registry.npmjs.org/nan/-/nan-2.14.2.tgz"; + sha512 = "M2ufzIiINKCuDfBSAUr1vWQ+vuVcA9kqx8JJUsbQi6yf1uGRyb7HfpdfUr5qLXf3B/t8dPvcjhKMmlfnP47EzQ=="; }; }; - "nanoid-3.1.12" = { + "nanoid-3.1.18" = { name = "nanoid"; packageName = "nanoid"; - version = "3.1.12"; + version = "3.1.18"; src = fetchurl { - url = "https://registry.npmjs.org/nanoid/-/nanoid-3.1.12.tgz"; - sha512 = "1qstj9z5+x491jfiC4Nelk+f8XBad7LN20PmyWINJEMRSf3wcAjAWysw1qaA8z6NSKe2sjq1hRSDpBH5paCb6A=="; + url = "https://registry.npmjs.org/nanoid/-/nanoid-3.1.18.tgz"; + sha512 = "rndlDjbbHbcV3xi+R2fpJ+PbGMdfBxz5v1fATIQFq0DP64FsicQdwnKLy47K4kZHdRpmQXtz24eGsxQqamzYTA=="; }; }; "nanomatch-1.2.13" = { @@ -7430,13 +7403,13 @@ let sha512 = "h/zcD8H9kaDZ9ALUWwlBUDo6TKF8a7qBSCSEGfjTVIYeqsioSKaAX+BN7NgiMGp6iSIXZ3PxgCu8KS3b71YK5Q=="; }; }; - "node-releases-1.1.61" = { + "node-releases-1.1.67" = { name = "node-releases"; packageName = "node-releases"; - version = "1.1.61"; + version = "1.1.67"; src = fetchurl { - url = "https://registry.npmjs.org/node-releases/-/node-releases-1.1.61.tgz"; - sha512 = "DD5vebQLg8jLCOzwupn954fbIiZht05DAZs0k2u8NStSe6h9XdsuIQL8hSRKYiU8WUQRznmSDrKGbv3ObOmC7g=="; + url = "https://registry.npmjs.org/node-releases/-/node-releases-1.1.67.tgz"; + sha512 = "V5QF9noGFl3EymEwUYzO+3NTDpGfQB4ve6Qfnzf3UNydMhjQRVPR1DZTuvWiLzaFJYw2fmDwAfnRNEVb64hSIg=="; }; }; "node-watch-0.5.5" = { @@ -7610,13 +7583,13 @@ let sha512 = "jLdtEOB112fORuypAyl/50VRVIBIdVQOSUUGQHzJ4xBSbit81zRarz7GThkEFZy1RceYrWYcPcBFPQwHyAc1gA=="; }; }; - "object-is-1.1.3" = { + "object-is-1.1.4" = { name = "object-is"; packageName = "object-is"; - version = "1.1.3"; + version = "1.1.4"; src = fetchurl { - url = "https://registry.npmjs.org/object-is/-/object-is-1.1.3.tgz"; - sha512 = "teyqLvFWzLkq5B9ki8FVWA902UER2qkxmdA4nLf+wjOLAWgxzCWZNCxpDq9MvE8MmhWNr+I8w3BN49Vx36Y6Xg=="; + url = "https://registry.npmjs.org/object-is/-/object-is-1.1.4.tgz"; + sha512 = "1ZvAZ4wlF7IyPVOcE1Omikt7UpaFlOQq0HlSti+ZvDH3UiD2brwGMwDbyV43jao2bKJ+4+WdPJHSd7kgzKYVqg=="; }; }; "object-keys-1.1.1" = { @@ -7637,31 +7610,31 @@ let sha1 = "f79c4493af0c5377b59fe39d395e41042dd045bb"; }; }; - "object.assign-4.1.1" = { + "object.assign-4.1.2" = { name = "object.assign"; packageName = "object.assign"; - version = "4.1.1"; + version = "4.1.2"; src = fetchurl { - url = "https://registry.npmjs.org/object.assign/-/object.assign-4.1.1.tgz"; - sha512 = "VT/cxmx5yaoHSOTSyrCygIDFco+RsibY2NM0a4RdEeY/4KgqezwFtK1yr3U67xYhqJSlASm2pKhLVzPj2lr4bA=="; + url = "https://registry.npmjs.org/object.assign/-/object.assign-4.1.2.tgz"; + sha512 = "ixT2L5THXsApyiUPYKmW+2EHpXXe5Ii3M+f4e+aJFAHao5amFRW6J0OO6c/LU8Be47utCx2GL89hxGB6XSmKuQ=="; }; }; - "object.entries-1.1.2" = { + "object.entries-1.1.3" = { name = "object.entries"; packageName = "object.entries"; - version = "1.1.2"; + version = "1.1.3"; src = fetchurl { - url = "https://registry.npmjs.org/object.entries/-/object.entries-1.1.2.tgz"; - sha512 = "BQdB9qKmb/HyNdMNWVr7O3+z5MUIx3aiegEIJqjMBbBf0YT9RRxTJSim4mzFqtyr7PDAHigq0N9dO0m0tRakQA=="; + url = "https://registry.npmjs.org/object.entries/-/object.entries-1.1.3.tgz"; + sha512 = "ym7h7OZebNS96hn5IJeyUmaWhaSM4SVtAPPfNLQEI2MYWCO2egsITb9nab2+i/Pwibx+R0mtn+ltKJXRSeTMGg=="; }; }; - "object.getownpropertydescriptors-2.1.0" = { + "object.getownpropertydescriptors-2.1.1" = { name = "object.getownpropertydescriptors"; packageName = "object.getownpropertydescriptors"; - version = "2.1.0"; + version = "2.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/object.getownpropertydescriptors/-/object.getownpropertydescriptors-2.1.0.tgz"; - sha512 = "Z53Oah9A3TdLoblT7VKJaTDdXdT+lQO+cNpKVnya5JDe9uLvzu1YyY1yFDFrcxrlRgWrEFH0jJtD/IbuwjcEVg=="; + url = "https://registry.npmjs.org/object.getownpropertydescriptors/-/object.getownpropertydescriptors-2.1.1.tgz"; + sha512 = "6DtXgZ/lIZ9hqx4GtZETobXLR/ZLaa0aqV0kzbn80Rf8Z2e/XFnhA0I7p07N2wH8bBBltr2xQPi6sbKWAY2Eng=="; }; }; "object.pick-1.3.0" = { @@ -7673,13 +7646,13 @@ let sha1 = "87a10ac4c1694bd2e1cbf53591a66141fb5dd747"; }; }; - "object.values-1.1.1" = { + "object.values-1.1.2" = { name = "object.values"; packageName = "object.values"; - version = "1.1.1"; + version = "1.1.2"; src = fetchurl { - url = "https://registry.npmjs.org/object.values/-/object.values-1.1.1.tgz"; - sha512 = "WTa54g2K8iu0kmS/us18jEmdv1a4Wi//BZ/DTVYEcH0XhLM5NYdpDHja3gt57VrZLcNAO2WGA+KpWsDBaHt6eA=="; + url = "https://registry.npmjs.org/object.values/-/object.values-1.1.2.tgz"; + sha512 = "MYC0jvJopr8EK6dPBiO8Nb9mvjdypOachO5REGk6MXzujbBrAisKo3HmdEI6kZDL6fC31Mwee/5YbtMebixeag=="; }; }; "obuf-1.1.2" = { @@ -7799,6 +7772,15 @@ let sha1 = "ec22d312806bb53e731773e7cdaefcf1c643128f"; }; }; + "ora-4.1.1" = { + name = "ora"; + packageName = "ora"; + version = "4.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/ora/-/ora-4.1.1.tgz"; + sha512 = "sjYP8QyVWBpBZWD6Vr1M/KwknSw6kJOz41tvGMlwWeClHBtYKTbHMki1PsLZnxKpXMPbTKv9b3pjQu3REib96A=="; + }; + }; "original-1.0.2" = { name = "original"; packageName = "original"; @@ -8321,6 +8303,15 @@ let sha512 = "/E57AYkoeQ25qkxMj5PBOVgF8Kiu/h7cYS30Z5+R7WaiCCBfLq58ZI/dSeaEKb9WVJV5n/03QwrN3IeWIFllvw=="; }; }; + "pkg-dir-4.2.0" = { + name = "pkg-dir"; + packageName = "pkg-dir"; + version = "4.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/pkg-dir/-/pkg-dir-4.2.0.tgz"; + sha512 = "HRDzbaKjC+AOWVXxAU/x54COGeIv9eb+6CkDSQoNTt4XyWoIJvuPsXizxu/Fr23EiekbtZwmh1IcIG/l/a10GQ=="; + }; + }; "pkg-up-2.0.0" = { name = "pkg-up"; packageName = "pkg-up"; @@ -8375,13 +8366,13 @@ let sha512 = "3QT8bBJeX/S5zKTTjTCIjRF3If4avAT6kqxcASlTWEtAFCb9NH0OUxNDfgZSWdP5fJnBYCMEWkIFfWeugjzYMg=="; }; }; - "postcss-8.1.1" = { + "postcss-8.1.10" = { name = "postcss"; packageName = "postcss"; - version = "8.1.1"; + version = "8.1.10"; src = fetchurl { - url = "https://registry.npmjs.org/postcss/-/postcss-8.1.1.tgz"; - sha512 = "9DGLSsjooH3kSNjTZUOt2eIj2ZTW0VI2PZ/3My+8TC7KIbH2OKwUlISfDsf63EP4aiRUt3XkEWMWvyJHvJelEg=="; + url = "https://registry.npmjs.org/postcss/-/postcss-8.1.10.tgz"; + sha512 = "iBXEV5VTTYaRRdxiFYzTtuv2lGMQBExqkZKSzkJe+Fl6rvQrA/49UVGKqB+LG54hpW/TtDBMGds8j33GFNW7pg=="; }; }; "postcss-calc-7.0.5" = { @@ -8456,13 +8447,13 @@ let sha512 = "9SiofaZ9CWpQWxOwRh1b/r85KD5y7GgvsNt1056k6OYLvWUun0czCvogfJgylC22uJTwW1KzY3Gz65NZRlvoiQ=="; }; }; - "postcss-loader-4.0.3" = { + "postcss-loader-4.1.0" = { name = "postcss-loader"; packageName = "postcss-loader"; - version = "4.0.3"; + version = "4.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/postcss-loader/-/postcss-loader-4.0.3.tgz"; - sha512 = "jHboC/AOnJLPu8/974hODCJ/rNAa2YhhJOclUeuRlAmFpKmEcBY6az8y1ejHyYc2LThzPl8qPRekh2Yz3CiRKA=="; + url = "https://registry.npmjs.org/postcss-loader/-/postcss-loader-4.1.0.tgz"; + sha512 = "vbCkP70F3Q9PIk6d47aBwjqAMI4LfkXCoyxj+7NPNuVIwfTGdzv2KVQes59/RuxMniIgsYQCFSY42P3+ykJfaw=="; }; }; "postcss-merge-longhand-4.0.11" = { @@ -8753,22 +8744,13 @@ let sha512 = "s1Iam6Gwz3JI5Hweaz4GoCD1WUNUIyzePFy5+Js2hjwGVt2Z79wNN+ZKOZ2vB6C+Xs6njyB84Z1IthQg8d9LxA=="; }; }; - "pretty-error-2.1.1" = { + "pretty-error-2.1.2" = { name = "pretty-error"; packageName = "pretty-error"; - version = "2.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/pretty-error/-/pretty-error-2.1.1.tgz"; - sha1 = "5f4f87c8f91e5ae3f3ba87ab4cf5e03b1a17f1a3"; - }; - }; - "pretty-format-25.5.0" = { - name = "pretty-format"; - packageName = "pretty-format"; - version = "25.5.0"; + version = "2.1.2"; src = fetchurl { - url = "https://registry.npmjs.org/pretty-format/-/pretty-format-25.5.0.tgz"; - sha512 = "kbo/kq2LQ/A/is0PQwsEHM7Ca6//bGPPvU6UnsdDRSKTWxT/ru/xb88v4BJf6a69H+uTytOEsTusT9ksd/1iWQ=="; + url = "https://registry.npmjs.org/pretty-error/-/pretty-error-2.1.2.tgz"; + sha512 = "EY5oDzmsX5wvuynAByrmY0P0hcp+QpnAKbJng2A2MPjVKXCxrDSUkzghVJ4ZGPIv+JC4gX8fPUWscC0RtjsWGw=="; }; }; "process-0.11.10" = { @@ -8825,6 +8807,15 @@ let sha1 = "8e57123c396ab988897fb327fd3aedc3e735e4fe"; }; }; + "prompts-2.4.0" = { + name = "prompts"; + packageName = "prompts"; + version = "2.4.0"; + src = fetchurl { + url = "https://registry.npmjs.org/prompts/-/prompts-2.4.0.tgz"; + sha512 = "awZAKrk3vN6CroQukBL+R9051a4R3zCZBlJm/HBfrSZ8iTpYix3VX1vU4mveiLpiwmOJT4wokTF9m6HUk4KqWQ=="; + }; + }; "proto-list-1.2.4" = { name = "proto-list"; packageName = "proto-list"; @@ -9086,15 +9077,6 @@ let sha512 = "X1Y+0jR47ImDVr54Ab6V9eGk0Hnu7fVWGeHQSOXHf/C2pF9c6uy3gef8QUeuUiWlNb0i08InPSE5a/KJzNzw1Q=="; }; }; - "react-is-16.13.1" = { - name = "react-is"; - packageName = "react-is"; - version = "16.13.1"; - src = fetchurl { - url = "https://registry.npmjs.org/react-is/-/react-is-16.13.1.tgz"; - sha512 = "24e6ynE2H+OKt4kqsOvNd8kBpV65zoxbA4BVsEOB3ARVWQki/DHzaUoC5KuON/BiccDaCCTZBuOcfZs70kR8bQ=="; - }; - }; "read-1.0.7" = { name = "read"; packageName = "read"; @@ -9167,13 +9149,13 @@ let sha512 = "ZOsfTGkjO2kqeR5Mzr5RYDbTGYneSkdNKX2fOX2P5jF7vMrd/GNnIAUtDldeHHumHUCQ3V05YfWUdxMPAsRu9Q=="; }; }; - "readdirp-3.4.0" = { + "readdirp-3.5.0" = { name = "readdirp"; packageName = "readdirp"; - version = "3.4.0"; + version = "3.5.0"; src = fetchurl { - url = "https://registry.npmjs.org/readdirp/-/readdirp-3.4.0.tgz"; - sha512 = "0xe001vZBnJEK+uKcj8qOhyAKPzIT+gStxWr3LCB0DwcXR5NZJ3IaC+yGnHCYzB/S7ov3m3EEbZI2zeNvX+hGQ=="; + url = "https://registry.npmjs.org/readdirp/-/readdirp-3.5.0.tgz"; + sha512 = "cMhu7c/8rdhkHXWsY+osBhfSy0JikwpHK/5+imo+LpeasTF8ouErHrlYkwT0++njiyuDvc7OFY5T3ukvZ8qmFQ=="; }; }; "recursive-readdir-2.2.2" = { @@ -9194,13 +9176,13 @@ let sha512 = "Ts1Y/anZELhSsjMcU605fU9RE4Oi3p5ORujwbIKXfWa+0Zxs510Qrmrce5/Jowq3cHSZSJqBjypxmHarc+vEWg=="; }; }; - "regenerate-1.4.1" = { + "regenerate-1.4.2" = { name = "regenerate"; packageName = "regenerate"; - version = "1.4.1"; + version = "1.4.2"; src = fetchurl { - url = "https://registry.npmjs.org/regenerate/-/regenerate-1.4.1.tgz"; - sha512 = "j2+C8+NtXQgEKWk49MMP5P/u2GhnahTtVkRIHr5R5lVRlbKvmQ+oS+A5aLKWp2ma5VkT8sh6v+v4hbH0YHR66A=="; + url = "https://registry.npmjs.org/regenerate/-/regenerate-1.4.2.tgz"; + sha512 = "zrceR/XhGYU/d/opr2EKO7aRHUeiBI8qjtfHqADTwZd6Szfy16la6kqD0MIUs5z5hx6AaKa+PixpPrR289+I0A=="; }; }; "regenerate-unicode-properties-8.2.0" = { @@ -9275,13 +9257,13 @@ let sha512 = "ywH2VUraA44DZQuRKzARmw6S66mr48pQVva4LBeRhcOltJ6hExvWly5ZjFLYo67xbIxb6W1q4bAGtgfEl20zfQ=="; }; }; - "registry-auth-token-4.2.0" = { + "registry-auth-token-4.2.1" = { name = "registry-auth-token"; packageName = "registry-auth-token"; - version = "4.2.0"; + version = "4.2.1"; src = fetchurl { - url = "https://registry.npmjs.org/registry-auth-token/-/registry-auth-token-4.2.0.tgz"; - sha512 = "P+lWzPrsgfN+UEpDS3U8AQKg/UjZX6mQSJueZj3EK+vNESoqBSpBUD3gmu4sF9lOsjXWjF11dQKUqemf3veq1w=="; + url = "https://registry.npmjs.org/registry-auth-token/-/registry-auth-token-4.2.1.tgz"; + sha512 = "6gkSb4U6aWJB4SF2ZvLb76yCBjcvufXBqvvEx1HbmKPkutswjW1xNVRY0+daljIYRbogN7O0etYSlbiaEQyMyw=="; }; }; "registry-url-5.1.0" = { @@ -9329,13 +9311,13 @@ let sha1 = "c24bce2a283adad5bc3f58e0d48249b92379d8ef"; }; }; - "renderkid-2.0.3" = { + "renderkid-2.0.4" = { name = "renderkid"; packageName = "renderkid"; - version = "2.0.3"; + version = "2.0.4"; src = fetchurl { - url = "https://registry.npmjs.org/renderkid/-/renderkid-2.0.3.tgz"; - sha512 = "z8CLQp7EZBPCwCnncgf9C4XAi3WR0dv+uWu/PjIyhhAb5d6IJ/QZqlHFprHeKT+59//V6BNUsLbvN8+2LarxGA=="; + url = "https://registry.npmjs.org/renderkid/-/renderkid-2.0.4.tgz"; + sha512 = "K2eXrSOJdq+HuKzlcjOlGoOarUu5SDguDEhE7+Ah4zuOWL40j8A/oHvLlLob9PSTNvVnBd+/q0Er1QfpEuem5g=="; }; }; "repeat-element-1.1.3" = { @@ -9428,13 +9410,13 @@ let sha1 = "925d2601d39ac485e091cf0da5c6e694dc3dcaff"; }; }; - "resolve-1.17.0" = { + "resolve-1.19.0" = { name = "resolve"; packageName = "resolve"; - version = "1.17.0"; + version = "1.19.0"; src = fetchurl { - url = "https://registry.npmjs.org/resolve/-/resolve-1.17.0.tgz"; - sha512 = "ic+7JYiV8Vi2yzQGFWOkiZD5Z9z7O2Zhm9XMaTxdJExKasieFCr+yXZ/WmXsckHiKl12ar0y6XiXDx3m4RHn1w=="; + url = "https://registry.npmjs.org/resolve/-/resolve-1.19.0.tgz"; + sha512 = "rArEXAgsBG4UgRGcynxWIWKFvh/XZCcS8UJdHhwy91zwAvCZIbcs+vAbflgBnNjYMs/i/i+/Ux6IZhML1yPvxg=="; }; }; "resolve-cwd-2.0.0" = { @@ -9509,6 +9491,15 @@ let sha1 = "9f7ee287f82fd326d4fd162923d62129eee0dfaf"; }; }; + "restore-cursor-3.1.0" = { + name = "restore-cursor"; + packageName = "restore-cursor"; + version = "3.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/restore-cursor/-/restore-cursor-3.1.0.tgz"; + sha512 = "l+sSefzHpj5qimhFSE5a8nufZYAM3sBSVMAPtYkmC+4EH2anSGaEMXSD0izRQbu9nfyQ9y5JrVmp7E8oZrUjvA=="; + }; + }; "ret-0.1.15" = { name = "ret"; packageName = "ret"; @@ -9599,13 +9590,13 @@ let sha512 = "tvVnVv01b8c1RrA6Ep7JkStj85Guv/YrMcwqYQnwjsAS2cTmmPGBBjAjpCW7RrSodNSoE2/qg9O4bceNvUuDgQ=="; }; }; - "run-parallel-1.1.9" = { + "run-parallel-1.1.10" = { name = "run-parallel"; packageName = "run-parallel"; - version = "1.1.9"; + version = "1.1.10"; src = fetchurl { - url = "https://registry.npmjs.org/run-parallel/-/run-parallel-1.1.9.tgz"; - sha512 = "DEqnSRTDw/Tc3FXf49zedI638Z9onwUotBMiUFKmrO2sdFKIbXamXGQ3Axd4qgphxKB4kw/qP1w5kTxnfU1B9Q=="; + url = "https://registry.npmjs.org/run-parallel/-/run-parallel-1.1.10.tgz"; + sha512 = "zb/1OuZ6flOlH6tQyMPUrE3x3Ulxjlo9WIVXR4yVYi4H9UXQaeIsPbLn2R3O3vQCnDKkAl2qHiuocKKX4Tz/Sw=="; }; }; "run-queue-1.0.3" = { @@ -9716,6 +9707,15 @@ let sha512 = "SHiNtMOUGWBQJwzISiVYKu82GiV4QYGePp3odlY1tuKO7gPtphAT5R/py0fA6xtbgLL/RvtJZnU9b8s0F1q0Xg=="; }; }; + "schema-utils-3.0.0" = { + name = "schema-utils"; + packageName = "schema-utils"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/schema-utils/-/schema-utils-3.0.0.tgz"; + sha512 = "6D82/xSzO094ajanoOSbe4YvXWMfn2A//8Y1+MUqFAJul5Bs+yn36xbK9OtNDcRVSBJ9jjeoXftM6CfztsjOAA=="; + }; + }; "select-hose-2.0.0" = { name = "select-hose"; packageName = "select-hose"; @@ -9977,6 +9977,15 @@ let sha1 = "a4da6b635ffcccca33f70d17cb92592de95e557a"; }; }; + "sisteransi-1.0.5" = { + name = "sisteransi"; + packageName = "sisteransi"; + version = "1.0.5"; + src = fetchurl { + url = "https://registry.npmjs.org/sisteransi/-/sisteransi-1.0.5.tgz"; + sha512 = "bLGGlR1QxBcynn2d5YmDX4MGjlZvy2MRBDRNHLJ8VI6l6+9FUiyTFNJ0IveOSP0bcXgVDPRcfGqA0pjaqUpfVg=="; + }; + }; "slash-1.0.0" = { name = "slash"; packageName = "slash"; @@ -10166,13 +10175,13 @@ let sha512 = "cbqHunsQWnJNE6KhVSMsMeH5H/L9EpymbzqTQ3uLwNCLZ1Q481oWaofqH7nO6V07xlXwY6PhQdQ2IedWx/ZK4Q=="; }; }; - "spdx-license-ids-3.0.6" = { + "spdx-license-ids-3.0.7" = { name = "spdx-license-ids"; packageName = "spdx-license-ids"; - version = "3.0.6"; + version = "3.0.7"; src = fetchurl { - url = "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-3.0.6.tgz"; - sha512 = "+orQK83kyMva3WyPf59k1+Y525csj5JejicWut55zeTWANuN17qSiSLUXWtzHeNWORSvT7GLDJ/E/XiIWoXBTw=="; + url = "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-3.0.7.tgz"; + sha512 = "U+MTEOO0AiDzxwFvoa4JVnMV6mZlJKk2sBLt90s7G0Gd0Mlknc7kxEn3nuDPNZRta7O2uy8oLcZLVT+4sqNZHQ=="; }; }; "spdy-4.0.2" = { @@ -10391,22 +10400,22 @@ let sha512 = "zUz5JD+tgqtuDjMhwIg5uFVV3dtqZ9yQJlZVfq4I01/K5Paj5UHj7VyrQOJvzawSVlKpObApbfD0Ed6yJc+1eg=="; }; }; - "string.prototype.trimend-1.0.1" = { + "string.prototype.trimend-1.0.3" = { name = "string.prototype.trimend"; packageName = "string.prototype.trimend"; - version = "1.0.1"; + version = "1.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/string.prototype.trimend/-/string.prototype.trimend-1.0.1.tgz"; - sha512 = "LRPxFUaTtpqYsTeNKaFOw3R4bxIzWOnbQ837QfBylo8jIxtcbK/A/sMV7Q+OAV/vWo+7s25pOE10KYSjaSO06g=="; + url = "https://registry.npmjs.org/string.prototype.trimend/-/string.prototype.trimend-1.0.3.tgz"; + sha512 = "ayH0pB+uf0U28CtjlLvL7NaohvR1amUvVZk+y3DYb0Ey2PUV5zPkkKy9+U1ndVEIXO8hNg18eIv9Jntbii+dKw=="; }; }; - "string.prototype.trimstart-1.0.1" = { + "string.prototype.trimstart-1.0.3" = { name = "string.prototype.trimstart"; packageName = "string.prototype.trimstart"; - version = "1.0.1"; + version = "1.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/string.prototype.trimstart/-/string.prototype.trimstart-1.0.1.tgz"; - sha512 = "XxZn+QpvrBI1FOcg6dIpxUPgWCPuNXvMD72aaRaUQv1eD4e/Qy8i/hFTe0BUmD60p/QA6bh1avmuPTfNjqVWRw=="; + url = "https://registry.npmjs.org/string.prototype.trimstart/-/string.prototype.trimstart-1.0.3.tgz"; + sha512 = "oBIBUy5lea5tt0ovtOFiEQaBkoBBkyJhZXzJYrSmDo5IUUqbOPvVezuRs/agBIdZ2p2Eo1FD6bD9USyBLfl3xg=="; }; }; "string_decoder-0.10.31" = { @@ -10589,6 +10598,15 @@ let sha512 = "qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw=="; }; }; + "supports-hyperlinks-2.1.0" = { + name = "supports-hyperlinks"; + packageName = "supports-hyperlinks"; + version = "2.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/supports-hyperlinks/-/supports-hyperlinks-2.1.0.tgz"; + sha512 = "zoE5/e+dnEijk6ASB6/qrK+oYdm2do1hjoLWrqUC/8WEIW1gbxFcKuBof7sW8ArN6e+AYvsE8HBGiVRWL/F5CA=="; + }; + }; "svgo-1.3.2" = { name = "svgo"; packageName = "svgo"; @@ -10634,13 +10652,22 @@ let sha512 = "YfUhPQCJoNQE5N+FJQcdPz63O3x3sdT4Xju69Gj4iZe0lBKOtnAMi0SLj9xKhGkcGhsxThvTJ/usxtFPo438zQ=="; }; }; - "temp-0.9.1" = { + "temp-0.9.4" = { name = "temp"; packageName = "temp"; - version = "0.9.1"; + version = "0.9.4"; src = fetchurl { - url = "https://registry.npmjs.org/temp/-/temp-0.9.1.tgz"; - sha512 = "WMuOgiua1xb5R56lE0eH6ivpVmg/lq2OHm4+LtT/xtEtPQ+sz6N3bBM6WZ5FvO1lO4IKIOb43qnhoc4qxP5OeA=="; + url = "https://registry.npmjs.org/temp/-/temp-0.9.4.tgz"; + sha512 = "yYrrsWnrXMcdsnu/7YMYAofM1ktpL5By7vZhf15CrXijWWrEYZks5AXBudalfSWJLlnen/QUJUB5aoB0kqZUGA=="; + }; + }; + "terminal-link-2.1.1" = { + name = "terminal-link"; + packageName = "terminal-link"; + version = "2.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/terminal-link/-/terminal-link-2.1.1.tgz"; + sha512 = "un0FmiRUQNr5PJqy9kP7c40F5BOfpGlYTrxonDChEZB7pzZxRNp/bt+ymiy9/npwXya9KH99nJ/GXFIiUkYGFQ=="; }; }; "terser-4.8.0" = { @@ -10706,13 +10733,13 @@ let sha512 = "eHY7nBftgThBqOyHGVN+l8gF0BucP09fMo0oO/Lb0w1OF80dJv+lDVpXG60WMQvkcxAkNybKsrEIE3ZtKGmPrA=="; }; }; - "timers-browserify-2.0.11" = { + "timers-browserify-2.0.12" = { name = "timers-browserify"; packageName = "timers-browserify"; - version = "2.0.11"; + version = "2.0.12"; src = fetchurl { - url = "https://registry.npmjs.org/timers-browserify/-/timers-browserify-2.0.11.tgz"; - sha512 = "60aV6sgJ5YEbzUdn9c8kYGIqOubPoUdqQCul3SBAsRCZ40s6Y5cMcrW4dt3/k/EsbLVJNl9n6Vz3fTc+k2GeKQ=="; + url = "https://registry.npmjs.org/timers-browserify/-/timers-browserify-2.0.12.tgz"; + sha512 = "9phl76Cqm6FhSX9Xe1ZUAMLtm1BLkKj2Qd5ApyWkXzsMRaA7dgr81kf4wJmQf/hAvg8EEyJxDo3du/0KlhPiKQ=="; }; }; "timsort-0.3.0" = { @@ -10877,40 +10904,40 @@ let sha1 = "61dbc2d53b69ff6091a12a168fd7d433107e40f1"; }; }; - "ts-jest-26.4.1" = { - name = "ts-jest"; - packageName = "ts-jest"; - version = "26.4.1"; + "ts-debounce-2.1.0" = { + name = "ts-debounce"; + packageName = "ts-debounce"; + version = "2.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/ts-jest/-/ts-jest-26.4.1.tgz"; - sha512 = "F4aFq01aS6mnAAa0DljNmKr/Kk9y4HVZ1m6/rtJ0ED56cuxINGq3Q9eVAh+z5vcYKe5qnTMvv90vE8vUMFxomg=="; + url = "https://registry.npmjs.org/ts-debounce/-/ts-debounce-2.1.0.tgz"; + sha512 = "jlrN8iK/Iif5pQd+pIsH8uEexj3vvUT+BwqNrJt5xgZB+ucwVfQVAUMC8Dnx0vlk7AktHxoD9ZDYYVYUtxd5wA=="; }; }; - "ts-union-2.2.1" = { + "ts-union-2.3.0" = { name = "ts-union"; packageName = "ts-union"; - version = "2.2.1"; + version = "2.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/ts-union/-/ts-union-2.2.1.tgz"; - sha512 = "GLHuuu+N+n3mHY8/XzHUbuXf64Xy2nzYUa1/8rNCtkP6pD3mTiSM5OIyxV81ecT33S3i7lbVWdvCtyFmS8rplw=="; + url = "https://registry.npmjs.org/ts-union/-/ts-union-2.3.0.tgz"; + sha512 = "OP+W9WoYvGlOMjc90D6nYz60jU1zQlXAg3VBtuSoMDejY94PaORkya9HtHjaaqqwA4I5/hN38fmKK0nSWj7jPg=="; }; }; - "tslib-1.13.0" = { + "tslib-1.14.1" = { name = "tslib"; packageName = "tslib"; - version = "1.13.0"; + version = "1.14.1"; src = fetchurl { - url = "https://registry.npmjs.org/tslib/-/tslib-1.13.0.tgz"; - sha512 = "i/6DQjL8Xf3be4K/E6Wgpekn5Qasl1usyw++dAA35Ue5orEn65VIxOA+YvNNl9HV3qv70T7CNwjODHZrLwvd1Q=="; + url = "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz"; + sha512 = "Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg=="; }; }; - "tsyringe-4.3.0" = { + "tsyringe-4.4.0" = { name = "tsyringe"; packageName = "tsyringe"; - version = "4.3.0"; + version = "4.4.0"; src = fetchurl { - url = "https://registry.npmjs.org/tsyringe/-/tsyringe-4.3.0.tgz"; - sha512 = "Vzty1M/EQXSsEE8aoIOLl1l793chcPyQAnFJaS1mFDtFvNPY+jknSPwMIF6yfcjua+2GTgwxWFzuA3cjIx4NZA=="; + url = "https://registry.npmjs.org/tsyringe/-/tsyringe-4.4.0.tgz"; + sha512 = "SlMApe1lhIq546CDp7bF+IdF4RB6d+9C5T7B0AS0P/Bm+Qpizj/gEmZzvw9J/KlXPEt4qHTbi1TRvX3rCPSdTg=="; }; }; "tty-browserify-0.0.0" = { @@ -10949,6 +10976,15 @@ let sha512 = "EUV9jo4sffrwlg8s0zDhP0T2WD3pru5Xi0+HTE3zTUmBaZNhfkite9PdSJwdXLwPVW0jnAHT56pZHIOYckPEiw=="; }; }; + "type-fest-0.11.0" = { + name = "type-fest"; + packageName = "type-fest"; + version = "0.11.0"; + src = fetchurl { + url = "https://registry.npmjs.org/type-fest/-/type-fest-0.11.0.tgz"; + sha512 = "OdjXJxnCN1AvyLSzeKIgXTXxV+99ZuXl3Hpo9XpJAv9MBcHrrJOQ5kV7ypXOuQie+AmWG25hLbiKdwYTifzcfQ=="; + }; + }; "type-is-1.6.18" = { name = "type-is"; packageName = "type-is"; @@ -11102,6 +11138,24 @@ let sha512 = "rBJeI5CXAlmy1pV+617WB9J63U6XcazHHF2f2dbJix4XzpUF0RS3Zbj0FGIOCAva5P/d/GBOYaACQ1w+0azUkg=="; }; }; + "universalify-1.0.0" = { + name = "universalify"; + packageName = "universalify"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/universalify/-/universalify-1.0.0.tgz"; + sha512 = "rb6X1W158d7pRQBg5gkR8uPaSfiids68LTJQYOtEUhoJUWBdaQHsuT/EUduxXYxcrt4r5PJ4fuHW1MHT6p0qug=="; + }; + }; + "universalify-2.0.0" = { + name = "universalify"; + packageName = "universalify"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/universalify/-/universalify-2.0.0.tgz"; + sha512 = "hAZsKq7Yy11Zu1DE0OzWjw7nnLZmJZYTDZZyEFHZdUhV8FkH5MCfoU1XMaxXovpyW5nq5scPqq0ZDP9Zyl04oQ=="; + }; + }; "unpipe-1.0.0" = { name = "unpipe"; packageName = "unpipe"; @@ -11183,13 +11237,13 @@ let sha1 = "3838e97cfc60521eb73c525a8e55bfdd9e2e28f1"; }; }; - "url-loader-4.1.0" = { + "url-loader-4.1.1" = { name = "url-loader"; packageName = "url-loader"; - version = "4.1.0"; + version = "4.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/url-loader/-/url-loader-4.1.0.tgz"; - sha512 = "IzgAAIC8wRrg6NYkFIJY09vtktQcsvU8V6HhtQj9PTefbYImzLB1hufqo4m+RyM5N3mLx5BqJKccgxJS+W3kqw=="; + url = "https://registry.npmjs.org/url-loader/-/url-loader-4.1.1.tgz"; + sha512 = "3BTV812+AVHHOJQO8O5MkWgZ5aosP7GnROJwvzLS9hWDj00lZ6Z0wNak423Lp9PBZN05N+Jk/N5Si8jRAlGyWA=="; }; }; "url-parse-1.4.7" = { @@ -11336,6 +11390,15 @@ let sha1 = "3a105ca17053af55d6e270c1f8288682e18da400"; }; }; + "vfile-location-3.2.0" = { + name = "vfile-location"; + packageName = "vfile-location"; + version = "3.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/vfile-location/-/vfile-location-3.2.0.tgz"; + sha512 = "aLEIZKv/oxuCDZ8lkJGhuhztf/BW4M+iHdCwglA/eWc+vtuRFJj8EtgceYFX4LRjOhCAAiNHsKGssC6onJ+jbA=="; + }; + }; "vm-browserify-1.1.2" = { name = "vm-browserify"; packageName = "vm-browserify"; @@ -11399,22 +11462,22 @@ let sha512 = "8TEXQxlldWAuIODdukIb+TR5s+9Ds40eSJrw+1iDDA9IFORPjMELarNQE3myz5XIkWWpdprmJjm1/SxMlWOC8A=="; }; }; - "watchpack-1.7.4" = { + "watchpack-1.7.5" = { name = "watchpack"; packageName = "watchpack"; - version = "1.7.4"; + version = "1.7.5"; src = fetchurl { - url = "https://registry.npmjs.org/watchpack/-/watchpack-1.7.4.tgz"; - sha512 = "aWAgTW4MoSJzZPAicljkO1hsi1oKj/RRq/OJQh2PKI2UKL04c2Bs+MBOB+BBABHTXJpf9mCwHN7ANCvYsvY2sg=="; + url = "https://registry.npmjs.org/watchpack/-/watchpack-1.7.5.tgz"; + sha512 = "9P3MWk6SrKjHsGkLT2KHXdQ/9SNkyoJbabxnKOoJepsvJjJG8uYTR3yTPxPQvNDI3w4Nz1xnE0TLHK4RIVe/MQ=="; }; }; - "watchpack-chokidar2-2.0.0" = { + "watchpack-chokidar2-2.0.1" = { name = "watchpack-chokidar2"; packageName = "watchpack-chokidar2"; - version = "2.0.0"; + version = "2.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/watchpack-chokidar2/-/watchpack-chokidar2-2.0.0.tgz"; - sha512 = "9TyfOyN/zLUbA288wZ8IsMZ+6cbzvsNyEzSBp6e/zkifi6xxbl8SmQ/CxQq32k8NNqrdVEVUVSEf56L4rQ/ZxA=="; + url = "https://registry.npmjs.org/watchpack-chokidar2/-/watchpack-chokidar2-2.0.1.tgz"; + sha512 = "nCFfBIPKr5Sh61s4LPpy1Wtfi0HE8isJ3d2Yb5/Ppw2P2B/3eVSEBjKfN0fmHJSK14+31KwMKmcrzs2GM4P0Ww=="; }; }; "wbuf-1.7.3" = { @@ -11426,6 +11489,15 @@ let sha512 = "O84QOnr0icsbFGLS0O3bI5FswxzRr8/gHwWkDlQFskhSPryQXvrTMxjxGP4+iWYoauLoBvfDpkrOauZ+0iZpDA=="; }; }; + "wcwidth-1.0.1" = { + name = "wcwidth"; + packageName = "wcwidth"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/wcwidth/-/wcwidth-1.0.1.tgz"; + sha1 = "f0b0dcf915bc5ff1528afadb2c0e17b532da2fe8"; + }; + }; "web-tree-sitter-0.17.1" = { name = "web-tree-sitter"; packageName = "web-tree-sitter"; @@ -11516,13 +11588,13 @@ let sha512 = "OqedPIGOfsDlo31UNwYbCFMSaO9m9G/0faIHj5/dZFDMFqPTcx6UwqyOy3COEaEOg/9VsGIpdqn62W5KhoKSpg=="; }; }; - "whatwg-fetch-3.4.1" = { + "whatwg-fetch-3.5.0" = { name = "whatwg-fetch"; packageName = "whatwg-fetch"; - version = "3.4.1"; + version = "3.5.0"; src = fetchurl { - url = "https://registry.npmjs.org/whatwg-fetch/-/whatwg-fetch-3.4.1.tgz"; - sha512 = "sofZVzE1wKwO+EYPbWfiwzaKovWiZXf4coEzjGP9b2GBVgQRLQUZ2QcuPpQExGDAW5GItpEm6Tl4OU5mywnAoQ=="; + url = "https://registry.npmjs.org/whatwg-fetch/-/whatwg-fetch-3.5.0.tgz"; + sha512 = "jXkLtsR42xhXg7akoDKvKWE40eJeI+2KZqcp2h3NsOrRnDvtWX36KcKl30dy+hxECivdk2BVUHVNrPtoMBUx6A=="; }; }; "which-1.3.1" = { @@ -11813,13 +11885,13 @@ let sha512 = "o41D/WmDeca0BqYhsr3nJzQyg9NF5X8l/UdnFNux9cS3lwB+swm8qGWX5rn+aD6xfBU3rGmtHij7g7x6LxFU3A=="; }; }; - "ws-7.3.1" = { + "ws-7.4.0" = { name = "ws"; packageName = "ws"; - version = "7.3.1"; + version = "7.4.0"; src = fetchurl { - url = "https://registry.npmjs.org/ws/-/ws-7.3.1.tgz"; - sha512 = "D3RuNkynyHmEJIpD2qrgVkc9DQ23OrN/moAwZX4L8DfvszsJxpjQuUq3LMx6HoYji9fbIOBY18XWBsAux1ZZUA=="; + url = "https://registry.npmjs.org/ws/-/ws-7.4.0.tgz"; + sha512 = "kyFwXuV/5ymf+IXhS6f0+eAFvydbaBW3zjpT6hUdAh/hbVjTIB5EHBGi0bPoCLSK2wcuz3BrEkB9LrYv1Nm4NQ=="; }; }; "xmlbuilder-13.0.2" = { @@ -11939,15 +12011,6 @@ let sha512 = "o50j0JeToy/4K6OZcaQmW6lyXXKhq7csREXcDwk2omFPJEwUNOVtJKvmDr9EI1fAJZUyZcRF7kxGBWmRXudrCQ=="; }; }; - "yargs-parser-20.2.1" = { - name = "yargs-parser"; - packageName = "yargs-parser"; - version = "20.2.1"; - src = fetchurl { - url = "https://registry.npmjs.org/yargs-parser/-/yargs-parser-20.2.1.tgz"; - sha512 = "yYsjuSkjbLMBp16eaOt7/siKTjNVjMm3SoJnIg3sEh/JsvqVVDyjRKmaJV4cl+lNIgq6QEco2i3gDebJl7/vLA=="; - }; - }; "yargs-parser-4.2.1" = { name = "yargs-parser"; packageName = "yargs-parser"; @@ -11979,14 +12042,14 @@ in }; dependencies = [ sources."accepts-1.3.7" - sources."ajv-6.12.5" + sources."ajv-6.12.6" sources."array-flatten-1.1.1" sources."asn1-0.2.4" sources."assert-plus-1.0.0" sources."async-limiter-1.0.1" sources."asynckit-0.4.0" sources."aws-sign2-0.7.0" - sources."aws4-1.10.1" + sources."aws4-1.11.0" sources."babel-runtime-6.18.0" sources."bcrypt-pbkdf-1.0.2" sources."body-parser-1.19.0" @@ -11998,7 +12061,7 @@ in sources."content-type-1.0.4" sources."cookie-0.3.1" sources."cookie-signature-1.0.6" - sources."core-js-2.6.11" + sources."core-js-2.6.12" sources."core-util-is-1.0.2" sources."dashdash-1.14.1" sources."debug-2.6.9" @@ -12165,7 +12228,7 @@ in }; dependencies = [ sources."abbrev-1.1.1" - sources."ajv-6.12.5" + sources."ajv-6.12.6" sources."ansi-regex-4.1.0" sources."ansi-styles-3.2.1" sources."anymatch-3.1.1" @@ -12174,7 +12237,7 @@ in sources."astral-regex-1.0.0" sources."asynckit-0.4.0" sources."aws-sign2-0.7.0" - sources."aws4-1.10.1" + sources."aws4-1.11.0" sources."balanced-match-1.0.0" sources."bcrypt-pbkdf-1.0.2" sources."binary-0.3.0" @@ -12290,7 +12353,7 @@ in sources."minipass-2.9.0" sources."minizlib-1.3.3" sources."mkdirp-0.5.5" - sources."moment-2.29.0" + sources."moment-2.29.1" sources."murmur-hash-js-1.0.0" sources."mustache-3.2.1" sources."nice-try-1.0.5" @@ -12430,7 +12493,7 @@ in ]; }) sources."chalk-3.0.0" - sources."chokidar-3.4.2" + sources."chokidar-3.4.3" sources."clone-response-1.0.2" sources."color-convert-2.0.1" sources."color-name-1.1.4" @@ -12518,8 +12581,8 @@ in sources."range-parser-1.2.1" sources."raw-body-2.4.0" sources."rc-1.2.8" - sources."readdirp-3.4.0" - sources."registry-auth-token-4.2.0" + sources."readdirp-3.5.0" + sources."registry-auth-token-4.2.1" sources."registry-url-5.1.0" sources."responselike-1.0.2" sources."rimraf-2.7.1" @@ -12555,7 +12618,7 @@ in sources."vary-1.1.2" sources."which-2.0.2" sources."wrappy-1.0.2" - sources."ws-7.3.1" + sources."ws-7.4.0" ]; buildInputs = globalBuildInputs; meta = { @@ -12570,17 +12633,17 @@ in "@elm-tooling/elm-language-server" = nodeEnv.buildNodePackage { name = "_at_elm-tooling_slash_elm-language-server"; packageName = "@elm-tooling/elm-language-server"; - version = "1.12.0"; + version = "1.13.2"; src = fetchurl { - url = "https://registry.npmjs.org/@elm-tooling/elm-language-server/-/elm-language-server-1.12.0.tgz"; - sha512 = "x2Yj/lTUyohViOpRzAh/BzWCsInNCYMDERLVGehX7c5g4DhFLwlT6CSqmQ5LU2twIZW7KEKgCvoQTQ1eZ/ZtTQ=="; + url = "https://registry.npmjs.org/@elm-tooling/elm-language-server/-/elm-language-server-1.13.2.tgz"; + sha512 = "3bRD+Hut+XPLDY4r0t25tHhfWsXH2UPeruwDfsp/b991AjGpd3HlMNKVAnyu4DD2brUqo6xoHhpp3qTdHPJ2Pw=="; }; dependencies = [ sources."@nodelib/fs.scandir-2.1.3" sources."@nodelib/fs.stat-2.0.3" sources."@nodelib/fs.walk-1.2.4" sources."accepts-1.3.7" - sources."ajv-6.12.5" + sources."ajv-6.12.6" sources."array-flatten-1.1.1" sources."array-union-2.1.0" sources."asn1-0.2.4" @@ -12588,7 +12651,7 @@ in sources."async-limiter-1.0.1" sources."asynckit-0.4.0" sources."aws-sign2-0.7.0" - sources."aws4-1.10.1" + sources."aws4-1.11.0" sources."babel-runtime-6.18.0" sources."bcrypt-pbkdf-1.0.2" sources."body-parser-1.19.0" @@ -12601,7 +12664,7 @@ in sources."content-type-1.0.4" sources."cookie-0.4.0" sources."cookie-signature-1.0.6" - sources."core-js-2.6.11" + sources."core-js-2.6.12" sources."core-util-is-1.0.2" sources."cross-spawn-7.0.3" sources."dashdash-1.14.1" @@ -12618,7 +12681,7 @@ in sources."escape-html-1.0.3" sources."escape-string-regexp-4.0.0" sources."etag-1.8.1" - (sources."execa-4.0.3" // { + (sources."execa-4.1.0" // { dependencies = [ sources."is-stream-2.0.0" ]; @@ -12635,7 +12698,7 @@ in sources."fast-diff-1.2.0" sources."fast-glob-3.2.4" sources."fast-json-stable-stringify-2.1.0" - sources."fastq-1.8.0" + sources."fastq-1.9.0" sources."fill-range-7.0.1" sources."finalhandler-1.1.2" sources."find-0.2.7" @@ -12721,7 +12784,7 @@ in ]; }) sources."reusify-1.0.4" - sources."run-parallel-1.1.9" + sources."run-parallel-1.1.10" sources."safe-buffer-5.1.2" sources."safer-buffer-2.1.2" (sources."send-0.17.1" // { @@ -12746,8 +12809,9 @@ in sources."toidentifier-1.0.0" sources."tough-cookie-2.5.0" sources."traverse-chain-0.1.0" - sources."tslib-1.13.0" - sources."tsyringe-4.3.0" + sources."ts-debounce-2.1.0" + sources."tslib-1.14.1" + sources."tsyringe-4.4.0" sources."tunnel-agent-0.6.0" sources."tweetnacl-0.14.5" sources."type-is-1.6.18" @@ -12830,7 +12894,7 @@ in sources."finalhandler-1.1.2" sources."follow-redirects-1.13.0" sources."fresh-0.5.2" - sources."fsevents-2.1.3" + sources."fsevents-2.2.1" sources."get-stream-4.1.0" sources."glob-parent-5.1.1" sources."has-ansi-2.0.0" @@ -12867,7 +12931,7 @@ in sources."pseudomap-1.0.2" sources."pump-3.0.0" sources."range-parser-1.2.1" - sources."readdirp-3.4.0" + sources."readdirp-3.5.0" sources."requires-port-1.0.0" sources."semver-5.7.1" (sources."send-0.17.1" // { @@ -12912,14 +12976,14 @@ in sha512 = "DUzKPNzJb/2ZsPbtHttT5JIKGY1KtT7d9cexSNQI7DppvoEHxZ4nCd5EObv5kjskmC0JkQ5PHmCkIruQsbOdkQ=="; }; dependencies = [ - sources."ajv-6.12.5" + sources."ajv-6.12.6" sources."ansi-styles-4.3.0" sources."anymatch-3.1.1" sources."asn1-0.2.4" sources."assert-plus-1.0.0" sources."asynckit-0.4.0" sources."aws-sign2-0.7.0" - sources."aws4-1.10.1" + sources."aws4-1.11.0" sources."balanced-match-1.0.0" sources."bcrypt-pbkdf-1.0.2" sources."binary-0.3.0" @@ -12932,7 +12996,7 @@ in sources."caseless-0.12.0" sources."chainsaw-0.1.0" sources."chalk-3.0.0" - sources."chokidar-3.4.2" + sources."chokidar-3.4.3" sources."chownr-1.1.4" sources."color-convert-2.0.1" sources."color-name-1.1.4" @@ -12998,7 +13062,7 @@ in sources."psl-1.8.0" sources."punycode-2.1.1" sources."qs-6.5.2" - sources."readdirp-3.4.0" + sources."readdirp-3.5.0" sources."request-2.88.2" sources."request-promise-4.2.6" sources."request-promise-core-1.1.4" @@ -13012,7 +13076,7 @@ in sources."stealthy-require-1.1.1" sources."supports-color-7.2.0" sources."tar-4.4.13" - sources."temp-0.9.1" + sources."temp-0.9.4" sources."through-2.3.8" sources."to-regex-range-5.0.1" sources."tough-cookie-2.5.0" @@ -13053,7 +13117,7 @@ in sources."@types/cacheable-request-6.0.1" sources."@types/http-cache-semantics-4.0.0" sources."@types/keyv-3.1.1" - sources."@types/node-14.11.3" + sources."@types/node-14.14.10" sources."@types/responselike-1.0.0" sources."cacheable-lookup-2.0.1" sources."cacheable-request-7.0.1" @@ -13127,7 +13191,7 @@ in sha512 = "dAOv+U9hXZ0IRGx19mkpCAdf5rUwoJWlzFmcR2gvOzE/QjZUSlPh3e0IIDAfGUuEF8DjfE5CTe31fNtIkkd2rQ=="; }; dependencies = [ - sources."ajv-6.12.5" + sources."ajv-6.12.6" sources."ansi-regex-4.1.0" sources."ansi-styles-3.2.1" sources."anymatch-3.1.1" @@ -13135,7 +13199,7 @@ in sources."assert-plus-1.0.0" sources."asynckit-0.4.0" sources."aws-sign2-0.7.0" - sources."aws4-1.10.1" + sources."aws4-1.11.0" sources."balanced-match-1.0.0" sources."bcrypt-pbkdf-1.0.2" sources."binary-0.3.0" @@ -13360,63 +13424,58 @@ in create-elm-app = nodeEnv.buildNodePackage { name = "create-elm-app"; packageName = "create-elm-app"; - version = "5.2.1"; + version = "5.21.0"; src = fetchurl { - url = "https://registry.npmjs.org/create-elm-app/-/create-elm-app-5.2.1.tgz"; - sha512 = "gIobIWzQtCcKQH4dcCFzOJebm00j5Yha3s3XiwH0hp5auogbjS9TTLJKFUChF8j6vMlxIHxpCpxTmtPlrcZyvQ=="; + url = "https://registry.npmjs.org/create-elm-app/-/create-elm-app-5.21.0.tgz"; + sha512 = "yW7kMk/WyIUZc+OksH+GH8lhOWl129RiJGclJtpnLlmW3IDZYh23bP/e65MxX7BB+7lwi3KSObdbPYfCJf7CuA=="; }; dependencies = [ - sources."@babel/cli-7.11.6" + sources."@babel/cli-7.12.8" sources."@babel/code-frame-7.10.4" - sources."@babel/compat-data-7.11.0" - (sources."@babel/core-7.11.6" // { - dependencies = [ - sources."debug-4.3.0" - sources."ms-2.1.2" - ]; - }) - sources."@babel/generator-7.11.6" + sources."@babel/compat-data-7.12.7" + sources."@babel/core-7.12.9" + sources."@babel/generator-7.12.5" sources."@babel/helper-annotate-as-pure-7.10.4" sources."@babel/helper-builder-binary-assignment-operator-visitor-7.10.4" - sources."@babel/helper-compilation-targets-7.10.4" - sources."@babel/helper-create-class-features-plugin-7.10.5" - sources."@babel/helper-create-regexp-features-plugin-7.10.4" + sources."@babel/helper-compilation-targets-7.12.5" + sources."@babel/helper-create-class-features-plugin-7.12.1" + sources."@babel/helper-create-regexp-features-plugin-7.12.7" sources."@babel/helper-define-map-7.10.5" - sources."@babel/helper-explode-assignable-expression-7.11.4" + sources."@babel/helper-explode-assignable-expression-7.12.1" sources."@babel/helper-function-name-7.10.4" sources."@babel/helper-get-function-arity-7.10.4" sources."@babel/helper-hoist-variables-7.10.4" - sources."@babel/helper-member-expression-to-functions-7.11.0" - sources."@babel/helper-module-imports-7.10.4" - sources."@babel/helper-module-transforms-7.11.0" - sources."@babel/helper-optimise-call-expression-7.10.4" + sources."@babel/helper-member-expression-to-functions-7.12.7" + sources."@babel/helper-module-imports-7.12.5" + sources."@babel/helper-module-transforms-7.12.1" + sources."@babel/helper-optimise-call-expression-7.12.7" sources."@babel/helper-plugin-utils-7.10.4" - sources."@babel/helper-regex-7.10.5" - sources."@babel/helper-remap-async-to-generator-7.11.4" - sources."@babel/helper-replace-supers-7.10.4" - sources."@babel/helper-simple-access-7.10.4" - sources."@babel/helper-skip-transparent-expression-wrappers-7.11.0" + sources."@babel/helper-remap-async-to-generator-7.12.1" + sources."@babel/helper-replace-supers-7.12.5" + sources."@babel/helper-simple-access-7.12.1" + sources."@babel/helper-skip-transparent-expression-wrappers-7.12.1" sources."@babel/helper-split-export-declaration-7.11.0" sources."@babel/helper-validator-identifier-7.10.4" - sources."@babel/helper-wrap-function-7.10.4" - sources."@babel/helpers-7.10.4" + sources."@babel/helper-validator-option-7.12.1" + sources."@babel/helper-wrap-function-7.12.3" + sources."@babel/helpers-7.12.5" sources."@babel/highlight-7.10.4" - sources."@babel/parser-7.11.5" - sources."@babel/plugin-proposal-async-generator-functions-7.10.5" - sources."@babel/plugin-proposal-class-properties-7.10.4" - sources."@babel/plugin-proposal-dynamic-import-7.10.4" - sources."@babel/plugin-proposal-export-namespace-from-7.10.4" - sources."@babel/plugin-proposal-json-strings-7.10.4" - sources."@babel/plugin-proposal-logical-assignment-operators-7.11.0" - sources."@babel/plugin-proposal-nullish-coalescing-operator-7.10.4" - sources."@babel/plugin-proposal-numeric-separator-7.10.4" - sources."@babel/plugin-proposal-object-rest-spread-7.11.0" - sources."@babel/plugin-proposal-optional-catch-binding-7.10.4" - sources."@babel/plugin-proposal-optional-chaining-7.11.0" - sources."@babel/plugin-proposal-private-methods-7.10.4" - sources."@babel/plugin-proposal-unicode-property-regex-7.10.4" + sources."@babel/parser-7.12.7" + sources."@babel/plugin-proposal-async-generator-functions-7.12.1" + sources."@babel/plugin-proposal-class-properties-7.12.1" + sources."@babel/plugin-proposal-dynamic-import-7.12.1" + sources."@babel/plugin-proposal-export-namespace-from-7.12.1" + sources."@babel/plugin-proposal-json-strings-7.12.1" + sources."@babel/plugin-proposal-logical-assignment-operators-7.12.1" + sources."@babel/plugin-proposal-nullish-coalescing-operator-7.12.1" + sources."@babel/plugin-proposal-numeric-separator-7.12.7" + sources."@babel/plugin-proposal-object-rest-spread-7.12.1" + sources."@babel/plugin-proposal-optional-catch-binding-7.12.1" + sources."@babel/plugin-proposal-optional-chaining-7.12.7" + sources."@babel/plugin-proposal-private-methods-7.12.1" + sources."@babel/plugin-proposal-unicode-property-regex-7.12.1" sources."@babel/plugin-syntax-async-generators-7.8.4" - sources."@babel/plugin-syntax-class-properties-7.10.4" + sources."@babel/plugin-syntax-class-properties-7.12.1" sources."@babel/plugin-syntax-dynamic-import-7.8.3" sources."@babel/plugin-syntax-export-namespace-from-7.8.3" sources."@babel/plugin-syntax-json-strings-7.8.3" @@ -13426,51 +13485,46 @@ in sources."@babel/plugin-syntax-object-rest-spread-7.8.3" sources."@babel/plugin-syntax-optional-catch-binding-7.8.3" sources."@babel/plugin-syntax-optional-chaining-7.8.3" - sources."@babel/plugin-syntax-top-level-await-7.10.4" - sources."@babel/plugin-transform-arrow-functions-7.10.4" - sources."@babel/plugin-transform-async-to-generator-7.10.4" - sources."@babel/plugin-transform-block-scoped-functions-7.10.4" - sources."@babel/plugin-transform-block-scoping-7.11.1" - sources."@babel/plugin-transform-classes-7.10.4" - sources."@babel/plugin-transform-computed-properties-7.10.4" - sources."@babel/plugin-transform-destructuring-7.10.4" - sources."@babel/plugin-transform-dotall-regex-7.10.4" - sources."@babel/plugin-transform-duplicate-keys-7.10.4" - sources."@babel/plugin-transform-exponentiation-operator-7.10.4" - sources."@babel/plugin-transform-for-of-7.10.4" - sources."@babel/plugin-transform-function-name-7.10.4" - sources."@babel/plugin-transform-literals-7.10.4" - sources."@babel/plugin-transform-member-expression-literals-7.10.4" - sources."@babel/plugin-transform-modules-amd-7.10.5" - sources."@babel/plugin-transform-modules-commonjs-7.10.4" - sources."@babel/plugin-transform-modules-systemjs-7.10.5" - sources."@babel/plugin-transform-modules-umd-7.10.4" - sources."@babel/plugin-transform-named-capturing-groups-regex-7.10.4" - sources."@babel/plugin-transform-new-target-7.10.4" - sources."@babel/plugin-transform-object-super-7.10.4" - sources."@babel/plugin-transform-parameters-7.10.5" - sources."@babel/plugin-transform-property-literals-7.10.4" - sources."@babel/plugin-transform-regenerator-7.10.4" - sources."@babel/plugin-transform-reserved-words-7.10.4" - sources."@babel/plugin-transform-runtime-7.11.5" - sources."@babel/plugin-transform-shorthand-properties-7.10.4" - sources."@babel/plugin-transform-spread-7.11.0" - sources."@babel/plugin-transform-sticky-regex-7.10.4" - sources."@babel/plugin-transform-template-literals-7.10.5" - sources."@babel/plugin-transform-typeof-symbol-7.10.4" - sources."@babel/plugin-transform-unicode-escapes-7.10.4" - sources."@babel/plugin-transform-unicode-regex-7.10.4" - sources."@babel/preset-env-7.11.5" + sources."@babel/plugin-syntax-top-level-await-7.12.1" + sources."@babel/plugin-transform-arrow-functions-7.12.1" + sources."@babel/plugin-transform-async-to-generator-7.12.1" + sources."@babel/plugin-transform-block-scoped-functions-7.12.1" + sources."@babel/plugin-transform-block-scoping-7.12.1" + sources."@babel/plugin-transform-classes-7.12.1" + sources."@babel/plugin-transform-computed-properties-7.12.1" + sources."@babel/plugin-transform-destructuring-7.12.1" + sources."@babel/plugin-transform-dotall-regex-7.12.1" + sources."@babel/plugin-transform-duplicate-keys-7.12.1" + sources."@babel/plugin-transform-exponentiation-operator-7.12.1" + sources."@babel/plugin-transform-for-of-7.12.1" + sources."@babel/plugin-transform-function-name-7.12.1" + sources."@babel/plugin-transform-literals-7.12.1" + sources."@babel/plugin-transform-member-expression-literals-7.12.1" + sources."@babel/plugin-transform-modules-amd-7.12.1" + sources."@babel/plugin-transform-modules-commonjs-7.12.1" + sources."@babel/plugin-transform-modules-systemjs-7.12.1" + sources."@babel/plugin-transform-modules-umd-7.12.1" + sources."@babel/plugin-transform-named-capturing-groups-regex-7.12.1" + sources."@babel/plugin-transform-new-target-7.12.1" + sources."@babel/plugin-transform-object-super-7.12.1" + sources."@babel/plugin-transform-parameters-7.12.1" + sources."@babel/plugin-transform-property-literals-7.12.1" + sources."@babel/plugin-transform-regenerator-7.12.1" + sources."@babel/plugin-transform-reserved-words-7.12.1" + sources."@babel/plugin-transform-runtime-7.12.1" + sources."@babel/plugin-transform-shorthand-properties-7.12.1" + sources."@babel/plugin-transform-spread-7.12.1" + sources."@babel/plugin-transform-sticky-regex-7.12.7" + sources."@babel/plugin-transform-template-literals-7.12.1" + sources."@babel/plugin-transform-typeof-symbol-7.12.1" + sources."@babel/plugin-transform-unicode-escapes-7.12.1" + sources."@babel/plugin-transform-unicode-regex-7.12.1" + sources."@babel/preset-env-7.12.7" sources."@babel/preset-modules-0.1.4" - sources."@babel/runtime-7.11.2" - sources."@babel/template-7.10.4" - (sources."@babel/traverse-7.11.5" // { - dependencies = [ - sources."debug-4.3.0" - sources."ms-2.1.2" - ]; - }) - sources."@babel/types-7.11.5" + sources."@babel/runtime-7.12.5" + sources."@babel/template-7.12.7" + sources."@babel/traverse-7.12.9" + sources."@babel/types-7.12.7" sources."@hapi/address-2.1.4" sources."@hapi/bourne-1.3.2" sources."@hapi/hoek-8.5.1" @@ -13484,17 +13538,17 @@ in sources."@types/http-proxy-1.17.4" sources."@types/json-schema-7.0.6" sources."@types/minimatch-3.0.3" - sources."@types/node-14.11.3" + sources."@types/node-14.14.10" sources."@types/parse-json-4.0.0" sources."@types/q-1.5.4" sources."@types/source-list-map-0.1.2" sources."@types/tapable-1.0.6" - (sources."@types/uglify-js-3.11.0" // { + (sources."@types/uglify-js-3.11.1" // { dependencies = [ sources."source-map-0.6.1" ]; }) - (sources."@types/webpack-4.41.22" // { + (sources."@types/webpack-4.41.25" // { dependencies = [ sources."source-map-0.6.1" ]; @@ -13527,7 +13581,7 @@ in sources."accepts-1.3.7" sources."acorn-6.4.2" sources."address-1.0.3" - sources."ajv-6.12.5" + sources."ajv-6.12.6" sources."ajv-errors-1.0.1" sources."ajv-keywords-3.5.2" sources."alphanum-sort-1.0.2" @@ -13536,11 +13590,7 @@ in sources."ansi-html-0.0.7" sources."ansi-regex-2.1.1" sources."ansi-styles-3.2.1" - (sources."anymatch-2.0.0" // { - dependencies = [ - sources."normalize-path-2.1.1" - ]; - }) + sources."anymatch-3.1.1" sources."aproba-1.2.0" sources."argparse-1.0.10" sources."arr-diff-4.0.0" @@ -13578,11 +13628,16 @@ in sources."async-limiter-1.0.1" sources."asynckit-0.4.0" sources."atob-2.1.2" - sources."autoprefixer-10.0.1" + sources."autoprefixer-10.0.4" sources."aws-sign2-0.7.0" - sources."aws4-1.10.1" + sources."aws4-1.11.0" sources."babel-extract-comments-1.0.0" - sources."babel-loader-8.1.0" + (sources."babel-loader-8.2.2" // { + dependencies = [ + sources."make-dir-3.1.0" + sources."semver-6.3.0" + ]; + }) sources."babel-plugin-dynamic-import-node-2.3.3" sources."babel-plugin-syntax-object-rest-spread-6.13.0" sources."babel-plugin-transform-object-rest-spread-6.26.0" @@ -13598,12 +13653,12 @@ in sources."define-property-1.0.0" ]; }) - sources."base64-js-1.3.1" + sources."base64-js-1.5.1" sources."batch-0.6.1" sources."bcrypt-pbkdf-1.0.2" sources."big.js-5.2.2" sources."binary-0.3.0" - sources."binary-extensions-1.13.1" + sources."binary-extensions-2.1.0" sources."bindings-1.5.0" sources."binwrap-0.2.2" sources."bluebird-3.7.2" @@ -13611,6 +13666,8 @@ in (sources."body-parser-1.19.0" // { dependencies = [ sources."bytes-3.1.0" + sources."debug-2.6.9" + sources."ms-2.0.0" sources."qs-6.7.0" ]; }) @@ -13621,21 +13678,12 @@ in }) sources."boolbase-1.0.0" sources."brace-expansion-1.1.11" - (sources."braces-2.3.2" // { - dependencies = [ - sources."extend-shallow-2.0.1" - sources."is-extendable-0.1.1" - ]; - }) + sources."braces-3.0.2" sources."brorand-1.1.0" sources."browserify-aes-1.2.0" sources."browserify-cipher-1.0.1" sources."browserify-des-1.0.2" - (sources."browserify-rsa-4.0.1" // { - dependencies = [ - sources."bn.js-4.11.9" - ]; - }) + sources."browserify-rsa-4.1.0" (sources."browserify-sign-4.2.1" // { dependencies = [ sources."readable-stream-3.6.0" @@ -13643,7 +13691,7 @@ in ]; }) sources."browserify-zlib-0.2.0" - sources."browserslist-4.14.5" + sources."browserslist-4.14.7" sources."buffer-4.9.2" sources."buffer-from-1.1.1" sources."buffer-indexof-1.1.1" @@ -13653,6 +13701,7 @@ in sources."bytes-3.0.0" sources."cacache-12.0.4" sources."cache-base-1.0.1" + sources."call-bind-1.0.0" sources."call-me-maybe-1.0.1" sources."caller-callsite-2.0.0" sources."caller-path-2.0.0" @@ -13660,7 +13709,7 @@ in sources."camel-case-4.1.1" sources."camelcase-5.3.1" sources."caniuse-api-3.0.0" - sources."caniuse-lite-1.0.30001143" + sources."caniuse-lite-1.0.30001161" sources."case-sensitive-paths-webpack-plugin-2.3.0" sources."caseless-0.12.0" sources."chainsaw-0.1.0" @@ -13670,7 +13719,11 @@ in ]; }) sources."chardet-0.7.0" - sources."chokidar-2.1.8" + (sources."chokidar-3.4.3" // { + dependencies = [ + sources."glob-parent-5.1.1" + ]; + }) sources."chownr-1.1.4" sources."chrome-trace-event-1.0.2" sources."cipher-base-1.0.4" @@ -13707,10 +13760,10 @@ in sources."coa-2.0.2" sources."code-point-at-1.1.0" sources."collection-visit-1.0.0" - sources."color-3.1.2" + sources."color-3.1.3" sources."color-convert-1.9.3" sources."color-name-1.1.3" - sources."color-string-1.5.3" + sources."color-string-1.5.4" sources."colorette-1.2.1" sources."colors-1.0.3" sources."combined-stream-1.0.8" @@ -13719,7 +13772,12 @@ in sources."commondir-1.0.1" sources."component-emitter-1.3.0" sources."compressible-2.0.18" - sources."compression-1.7.4" + (sources."compression-1.7.4" // { + dependencies = [ + sources."debug-2.6.9" + sources."ms-2.0.0" + ]; + }) sources."concat-map-0.0.1" sources."concat-stream-1.6.2" sources."connect-history-api-fallback-1.6.0" @@ -13734,11 +13792,17 @@ in sources."copy-descriptor-0.1.1" (sources."copy-webpack-plugin-5.1.2" // { dependencies = [ + sources."find-cache-dir-2.1.0" + sources."find-up-3.0.0" + sources."locate-path-3.0.0" + sources."p-locate-3.0.0" + sources."path-exists-3.0.0" + sources."pkg-dir-3.0.0" sources."schema-utils-1.0.0" ]; }) - sources."core-js-2.6.11" - (sources."core-js-compat-3.6.5" // { + sources."core-js-2.6.12" + (sources."core-js-compat-3.8.0" // { dependencies = [ sources."semver-7.0.0" ]; @@ -13758,7 +13822,7 @@ in sources."css-declaration-sorter-4.0.1" (sources."css-loader-4.3.0" // { dependencies = [ - sources."camelcase-6.0.0" + sources."camelcase-6.2.0" sources."loader-utils-2.0.0" sources."semver-7.3.2" ]; @@ -13778,17 +13842,17 @@ in sources."cssnano-util-get-match-4.0.0" sources."cssnano-util-raw-cache-4.0.1" sources."cssnano-util-same-parent-4.0.1" - (sources."csso-4.0.3" // { + (sources."csso-4.2.0" // { dependencies = [ - sources."css-tree-1.0.0-alpha.39" - sources."mdn-data-2.0.6" + sources."css-tree-1.1.2" + sources."mdn-data-2.0.14" sources."source-map-0.6.1" ]; }) sources."cycle-1.0.3" sources."cyclist-1.0.1" sources."dashdash-1.14.1" - sources."debug-2.6.9" + sources."debug-4.3.1" sources."decamelize-1.2.0" sources."decode-uri-component-0.2.0" sources."deep-equal-0.2.2" @@ -13809,7 +13873,12 @@ in sources."des.js-1.0.1" sources."destroy-1.0.4" sources."detect-node-2.0.4" - sources."detect-port-alt-1.1.6" + (sources."detect-port-alt-1.1.6" // { + dependencies = [ + sources."debug-2.6.9" + sources."ms-2.0.0" + ]; + }) (sources."diffie-hellman-5.0.3" // { dependencies = [ sources."bn.js-4.11.9" @@ -13836,7 +13905,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.576" + sources."electron-to-chromium-1.3.610" (sources."elliptic-6.5.3" // { dependencies = [ sources."bn.js-4.11.9" @@ -13849,23 +13918,12 @@ in (sources."elm-test-0.19.1-revision4" // { dependencies = [ sources."ansi-styles-4.3.0" - sources."anymatch-3.1.1" - sources."binary-extensions-2.1.0" - sources."braces-3.0.2" sources."chalk-3.0.0" - sources."chokidar-3.4.2" sources."color-convert-2.0.1" sources."color-name-1.1.4" - sources."fill-range-7.0.1" sources."fs-extra-8.1.0" - sources."fsevents-2.1.3" - sources."glob-parent-5.1.1" sources."has-flag-4.0.0" - sources."is-binary-path-2.1.0" - sources."is-number-7.0.0" - sources."readdirp-3.4.0" sources."supports-color-7.2.0" - sources."to-regex-range-5.0.1" ]; }) sources."elm-webpack-loader-6.0.1" @@ -13879,12 +13937,12 @@ in sources."memory-fs-0.5.0" ]; }) - sources."entities-2.0.3" + sources."entities-2.1.0" sources."errno-0.1.7" sources."error-ex-1.3.2" sources."es-abstract-1.18.0-next.1" sources."es-to-primitive-1.2.1" - sources."escalade-3.1.0" + sources."escalade-3.1.1" sources."escape-html-1.0.3" sources."escape-string-regexp-2.0.0" sources."eslint-scope-4.0.3" @@ -13912,6 +13970,7 @@ in }) (sources."expand-brackets-2.1.4" // { dependencies = [ + sources."debug-2.6.9" sources."define-property-0.2.5" sources."extend-shallow-2.0.1" (sources."is-accessor-descriptor-0.1.6" // { @@ -13925,31 +13984,56 @@ in ]; }) sources."is-descriptor-0.1.6" - sources."is-extendable-0.1.1" sources."kind-of-5.1.0" + sources."ms-2.0.0" ]; }) sources."expand-tilde-2.0.2" (sources."express-4.17.1" // { dependencies = [ sources."array-flatten-1.1.1" + sources."debug-2.6.9" + sources."ms-2.0.0" sources."qs-6.7.0" ]; }) sources."extend-3.0.2" - sources."extend-shallow-3.0.2" + (sources."extend-shallow-3.0.2" // { + dependencies = [ + sources."is-extendable-1.0.1" + ]; + }) sources."external-editor-3.1.0" (sources."extglob-2.0.4" // { dependencies = [ sources."define-property-1.0.0" sources."extend-shallow-2.0.1" - sources."is-extendable-0.1.1" ]; }) sources."extsprintf-1.3.0" sources."eyes-0.1.8" sources."fast-deep-equal-3.1.3" - sources."fast-glob-2.2.7" + (sources."fast-glob-2.2.7" // { + dependencies = [ + (sources."braces-2.3.2" // { + dependencies = [ + sources."extend-shallow-2.0.1" + ]; + }) + (sources."fill-range-4.0.0" // { + dependencies = [ + sources."extend-shallow-2.0.1" + ]; + }) + (sources."is-number-3.0.0" // { + dependencies = [ + sources."kind-of-3.2.2" + ]; + }) + sources."micromatch-3.1.10" + sources."to-regex-range-2.1.1" + ]; + }) sources."fast-json-stable-stringify-2.1.0" sources."faye-websocket-0.11.3" sources."figgy-pudding-3.5.2" @@ -13958,23 +14042,29 @@ in sources."escape-string-regexp-1.0.5" ]; }) - (sources."file-loader-6.1.0" // { + (sources."file-loader-6.2.0" // { dependencies = [ sources."loader-utils-2.0.0" + sources."schema-utils-3.0.0" ]; }) sources."file-uri-to-path-1.0.0" sources."filesize-3.6.1" - (sources."fill-range-4.0.0" // { + sources."fill-range-7.0.1" + (sources."finalhandler-1.1.2" // { dependencies = [ - sources."extend-shallow-2.0.1" - sources."is-extendable-0.1.1" + sources."debug-2.6.9" + sources."ms-2.0.0" + ]; + }) + (sources."find-cache-dir-3.3.1" // { + dependencies = [ + sources."make-dir-3.1.0" + sources."semver-6.3.0" ]; }) - sources."finalhandler-1.1.2" - sources."find-cache-dir-2.1.0" sources."find-elm-dependencies-2.0.4" - sources."find-up-3.0.0" + sources."find-up-4.1.0" sources."firstline-1.3.1" sources."flush-write-stream-1.1.1" sources."follow-redirects-1.13.0" @@ -13990,10 +14080,11 @@ in sources."fs-readdir-recursive-1.1.0" sources."fs-write-stream-atomic-1.0.10" sources."fs.realpath-1.0.0" - sources."fsevents-1.2.13" + sources."fsevents-2.1.3" sources."function-bind-1.1.1" - sources."gensync-1.0.0-beta.1" + sources."gensync-1.0.0-beta.2" sources."get-caller-file-1.0.3" + sources."get-intrinsic-1.0.1" sources."get-own-enumerable-property-symbols-3.0.2" sources."get-stream-4.1.0" sources."get-value-2.0.6" @@ -14033,6 +14124,11 @@ in sources."has-value-1.0.0" (sources."has-values-1.0.0" // { dependencies = [ + (sources."is-number-3.0.0" // { + dependencies = [ + sources."kind-of-3.2.2" + ]; + }) sources."kind-of-4.0.0" ]; }) @@ -14069,26 +14165,26 @@ in }) sources."http-parser-js-0.5.2" sources."http-proxy-1.18.1" - (sources."http-proxy-middleware-0.21.0" // { - dependencies = [ - sources."braces-3.0.2" - sources."fill-range-7.0.1" - sources."is-number-7.0.0" - sources."micromatch-4.0.2" - sources."to-regex-range-5.0.1" - ]; - }) + sources."http-proxy-middleware-0.21.0" sources."http-signature-1.2.0" sources."https-browserify-1.0.0" sources."i-0.3.6" sources."iconv-lite-0.4.24" sources."icss-utils-4.1.1" - sources."ieee754-1.1.13" + sources."ieee754-1.2.1" sources."iferr-0.1.5" sources."ignore-3.3.10" sources."immer-1.7.2" sources."import-fresh-2.0.0" - sources."import-local-2.0.0" + (sources."import-local-2.0.0" // { + dependencies = [ + sources."find-up-3.0.0" + sources."locate-path-3.0.0" + sources."p-locate-3.0.0" + sources."path-exists-3.0.0" + sources."pkg-dir-3.0.0" + ]; + }) sources."imurmurhash-0.1.4" sources."indexes-of-1.0.1" sources."infer-owner-1.0.4" @@ -14105,7 +14201,6 @@ in ]; }) sources."internal-ip-4.3.0" - sources."invariant-2.2.4" sources."invert-kv-1.0.0" sources."ip-1.1.5" sources."ip-regex-2.1.0" @@ -14114,24 +14209,21 @@ in sources."is-accessor-descriptor-1.0.0" sources."is-arguments-1.0.4" sources."is-arrayish-0.2.1" - sources."is-binary-path-1.0.1" + sources."is-binary-path-2.1.0" sources."is-buffer-1.1.6" sources."is-callable-1.2.2" sources."is-color-stop-1.1.0" + sources."is-core-module-2.2.0" sources."is-data-descriptor-1.0.0" sources."is-date-object-1.0.2" sources."is-descriptor-1.0.2" sources."is-directory-0.3.1" - sources."is-extendable-1.0.1" + sources."is-extendable-0.1.1" sources."is-extglob-2.1.1" sources."is-fullwidth-code-point-1.0.0" sources."is-glob-4.0.1" sources."is-negative-zero-2.0.0" - (sources."is-number-3.0.0" // { - dependencies = [ - sources."kind-of-3.2.2" - ]; - }) + sources."is-number-7.0.0" sources."is-obj-2.0.0" sources."is-path-cwd-2.2.0" sources."is-path-in-cwd-2.1.0" @@ -14173,13 +14265,6 @@ in sources."klona-2.0.4" sources."last-call-webpack-plugin-3.0.0" sources."lcid-1.0.0" - sources."leven-3.1.0" - sources."levenary-1.1.1" - (sources."line-column-1.0.2" // { - dependencies = [ - sources."isobject-2.1.0" - ]; - }) sources."lines-and-columns-1.1.6" (sources."load-json-file-1.1.0" // { dependencies = [ @@ -14193,15 +14278,14 @@ in sources."json5-1.0.1" ]; }) - sources."locate-path-3.0.0" + sources."locate-path-5.0.0" sources."lodash-4.17.20" sources."lodash._reinterpolate-3.0.0" sources."lodash.memoize-4.1.2" sources."lodash.template-4.5.0" sources."lodash.templatesettings-4.2.0" sources."lodash.uniq-4.5.0" - sources."loglevel-1.7.0" - sources."loose-envify-1.4.0" + sources."loglevel-1.7.1" sources."lower-case-2.0.1" sources."lru-cache-5.1.1" sources."make-dir-2.1.0" @@ -14214,7 +14298,7 @@ in sources."merge-descriptors-1.0.1" sources."merge2-1.4.1" sources."methods-1.1.2" - sources."micromatch-3.1.10" + sources."micromatch-4.0.2" (sources."miller-rabin-4.0.1" // { dependencies = [ sources."bn.js-4.11.9" @@ -14224,7 +14308,7 @@ in sources."mime-db-1.44.0" sources."mime-types-2.1.27" sources."mimic-fn-1.2.0" - (sources."mini-css-extract-plugin-0.11.3" // { + (sources."mini-css-extract-plugin-0.12.0" // { dependencies = [ sources."schema-utils-1.0.0" ]; @@ -14236,17 +14320,21 @@ in sources."minipass-2.9.0" sources."minizlib-1.3.3" sources."mississippi-3.0.0" - sources."mixin-deep-1.3.2" + (sources."mixin-deep-1.3.2" // { + dependencies = [ + sources."is-extendable-1.0.1" + ]; + }) sources."mkdirp-0.5.3" sources."move-concurrently-1.0.1" - sources."ms-2.0.0" + sources."ms-2.1.2" sources."multicast-dns-6.2.3" sources."multicast-dns-service-types-1.1.0" sources."murmur-hash-js-1.0.0" sources."mustache-3.2.1" sources."mute-stream-0.0.8" - sources."nan-2.14.1" - sources."nanoid-3.1.12" + sources."nan-2.14.2" + sources."nanoid-3.1.18" sources."nanomatch-1.2.13" sources."ncp-1.0.1" sources."negotiator-0.6.2" @@ -14268,7 +14356,7 @@ in sources."punycode-1.4.1" ]; }) - sources."node-releases-1.1.61" + sources."node-releases-1.1.67" sources."normalize-package-data-2.5.0" sources."normalize-path-3.0.0" sources."normalize-range-0.1.2" @@ -14297,26 +14385,14 @@ in ]; }) sources."object-inspect-1.8.0" - sources."object-is-1.1.3" + sources."object-is-1.1.4" sources."object-keys-1.1.1" sources."object-visit-1.0.1" - sources."object.assign-4.1.1" - (sources."object.entries-1.1.2" // { - dependencies = [ - sources."es-abstract-1.17.7" - ]; - }) - (sources."object.getownpropertydescriptors-2.1.0" // { - dependencies = [ - sources."es-abstract-1.17.7" - ]; - }) + sources."object.assign-4.1.2" + sources."object.entries-1.1.3" + sources."object.getownpropertydescriptors-2.1.1" sources."object.pick-1.3.0" - (sources."object.values-1.1.1" // { - dependencies = [ - sources."es-abstract-1.17.7" - ]; - }) + sources."object.values-1.1.2" sources."obuf-1.1.2" sources."on-finished-2.3.0" sources."on-headers-1.0.2" @@ -14330,7 +14406,7 @@ in sources."os-tmpdir-1.0.2" sources."p-finally-1.0.0" sources."p-limit-2.3.0" - sources."p-locate-3.0.0" + sources."p-locate-4.1.0" sources."p-map-2.1.0" sources."p-retry-3.0.1" sources."p-try-2.2.0" @@ -14350,7 +14426,7 @@ in sources."pascalcase-0.1.1" sources."path-browserify-0.0.1" sources."path-dirname-1.0.2" - sources."path-exists-3.0.0" + sources."path-exists-4.0.0" sources."path-is-absolute-1.0.1" sources."path-is-inside-1.0.2" sources."path-key-3.1.1" @@ -14367,7 +14443,7 @@ in sources."pify-4.0.1" sources."pinkie-2.0.4" sources."pinkie-promise-2.0.1" - sources."pkg-dir-3.0.0" + sources."pkg-dir-4.2.0" (sources."pkg-up-2.0.0" // { dependencies = [ sources."find-up-2.1.0" @@ -14375,15 +14451,15 @@ in sources."p-limit-1.3.0" sources."p-locate-2.0.0" sources."p-try-1.0.0" + sources."path-exists-3.0.0" ]; }) sources."pkginfo-0.4.1" (sources."portfinder-1.0.28" // { dependencies = [ sources."async-2.6.3" - sources."debug-3.2.6" + sources."debug-3.2.7" sources."mkdirp-0.5.5" - sources."ms-2.1.2" ]; }) sources."posix-character-classes-0.1.1" @@ -14409,14 +14485,15 @@ in sources."postcss-discard-empty-4.0.1" sources."postcss-discard-overridden-4.0.1" sources."postcss-flexbugs-fixes-4.2.1" - (sources."postcss-loader-4.0.3" // { + (sources."postcss-loader-4.1.0" // { dependencies = [ sources."cosmiconfig-7.0.0" - sources."import-fresh-3.2.1" + sources."import-fresh-3.2.2" sources."loader-utils-2.0.0" sources."parse-json-5.1.0" sources."path-type-4.0.0" sources."resolve-from-4.0.0" + sources."schema-utils-3.0.0" sources."semver-7.3.2" ]; }) @@ -14509,7 +14586,7 @@ in }) (sources."postcss-safe-parser-5.0.2" // { dependencies = [ - sources."postcss-8.1.1" + sources."postcss-8.1.10" sources."source-map-0.6.1" ]; }) @@ -14523,7 +14600,7 @@ in sources."postcss-value-parser-4.1.0" sources."prepend-http-1.0.4" sources."pretty-bytes-5.4.1" - sources."pretty-error-2.1.1" + sources."pretty-error-2.1.2" sources."process-0.11.10" sources."process-nextick-args-2.0.1" sources."promise-8.1.0" @@ -14571,11 +14648,17 @@ in sources."browserslist-4.1.1" sources."chalk-2.4.1" sources."cross-spawn-6.0.5" + sources."debug-2.6.9" sources."emojis-list-2.1.0" sources."escape-string-regexp-1.0.5" + sources."find-up-3.0.0" sources."globby-8.0.1" sources."json5-0.5.1" sources."loader-utils-1.1.0" + sources."locate-path-3.0.0" + sources."ms-2.0.0" + sources."p-locate-3.0.0" + sources."path-exists-3.0.0" sources."path-key-2.0.1" sources."pify-3.0.0" sources."react-error-overlay-5.1.6" @@ -14602,9 +14685,9 @@ in ]; }) sources."readable-stream-2.3.7" - sources."readdirp-2.2.1" + sources."readdirp-3.5.0" sources."recursive-readdir-2.2.2" - sources."regenerate-1.4.1" + sources."regenerate-1.4.2" sources."regenerate-unicode-properties-8.2.0" sources."regenerator-runtime-0.13.7" sources."regenerator-transform-0.14.5" @@ -14623,7 +14706,7 @@ in }) sources."relateurl-0.2.7" sources."remove-trailing-separator-1.1.0" - (sources."renderkid-2.0.3" // { + (sources."renderkid-2.0.4" // { dependencies = [ sources."strip-ansi-3.0.1" ]; @@ -14636,7 +14719,7 @@ in sources."require-directory-2.1.1" sources."require-main-filename-1.0.1" sources."requires-port-1.0.0" - sources."resolve-1.17.0" + sources."resolve-1.19.0" sources."resolve-cwd-2.0.0" sources."resolve-dir-1.0.1" sources."resolve-from-3.0.0" @@ -14662,14 +14745,21 @@ in sources."semver-5.7.1" (sources."send-0.17.1" // { dependencies = [ + (sources."debug-2.6.9" // { + dependencies = [ + sources."ms-2.0.0" + ]; + }) sources."ms-2.1.1" ]; }) sources."serialize-javascript-4.0.0" (sources."serve-index-1.9.1" // { dependencies = [ + sources."debug-2.6.9" sources."http-errors-1.6.3" sources."inherits-2.0.3" + sources."ms-2.0.0" sources."setprototypeof-1.1.0" ]; }) @@ -14678,7 +14768,6 @@ in (sources."set-value-2.0.1" // { dependencies = [ sources."extend-shallow-2.0.1" - sources."is-extendable-0.1.1" ]; }) sources."setimmediate-1.0.5" @@ -14696,6 +14785,7 @@ in sources."slash-2.0.0" (sources."snapdragon-0.8.2" // { dependencies = [ + sources."debug-2.6.9" sources."define-property-0.2.5" sources."extend-shallow-2.0.1" (sources."is-accessor-descriptor-0.1.6" // { @@ -14709,8 +14799,8 @@ in ]; }) sources."is-descriptor-0.1.6" - sources."is-extendable-0.1.1" sources."kind-of-5.1.0" + sources."ms-2.0.0" ]; }) (sources."snapdragon-node-2.1.1" // { @@ -14731,9 +14821,8 @@ in }) (sources."sockjs-client-1.4.0" // { dependencies = [ - sources."debug-3.2.6" + sources."debug-3.2.7" sources."eventsource-1.0.7" - sources."ms-2.1.2" ]; }) sources."sort-keys-1.1.2" @@ -14749,17 +14838,10 @@ in sources."spdx-correct-3.1.1" sources."spdx-exceptions-2.3.0" sources."spdx-expression-parse-3.0.1" - sources."spdx-license-ids-3.0.6" - (sources."spdy-4.0.2" // { - dependencies = [ - sources."debug-4.3.0" - sources."ms-2.1.2" - ]; - }) + sources."spdx-license-ids-3.0.7" + sources."spdy-4.0.2" (sources."spdy-transport-3.0.0" // { dependencies = [ - sources."debug-4.3.0" - sources."ms-2.1.2" sources."readable-stream-3.6.0" ]; }) @@ -14800,16 +14882,8 @@ in sources."strip-ansi-3.0.1" ]; }) - (sources."string.prototype.trimend-1.0.1" // { - dependencies = [ - sources."es-abstract-1.17.7" - ]; - }) - (sources."string.prototype.trimstart-1.0.1" // { - dependencies = [ - sources."es-abstract-1.17.7" - ]; - }) + sources."string.prototype.trimend-1.0.3" + sources."string.prototype.trimstart-1.0.3" sources."string_decoder-1.1.1" (sources."stringify-object-3.3.0" // { dependencies = [ @@ -14838,13 +14912,13 @@ in (sources."svgo-1.3.2" // { dependencies = [ sources."css-select-2.1.0" - sources."css-what-3.4.1" + sources."css-what-3.4.2" sources."domutils-1.7.0" ]; }) sources."tapable-1.1.3" sources."tar-4.4.13" - (sources."temp-0.9.1" // { + (sources."temp-0.9.4" // { dependencies = [ sources."rimraf-2.6.3" ]; @@ -14857,6 +14931,12 @@ in }) (sources."terser-webpack-plugin-1.4.5" // { dependencies = [ + sources."find-cache-dir-2.1.0" + sources."find-up-3.0.0" + sources."locate-path-3.0.0" + sources."p-locate-3.0.0" + sources."path-exists-3.0.0" + sources."pkg-dir-3.0.0" sources."schema-utils-1.0.0" sources."source-map-0.6.1" ]; @@ -14865,7 +14945,7 @@ in sources."through-2.3.8" sources."through2-2.0.5" sources."thunky-1.1.0" - sources."timers-browserify-2.0.11" + sources."timers-browserify-2.0.12" sources."timsort-0.3.0" sources."tmp-0.0.33" sources."to-arraybuffer-1.0.1" @@ -14876,11 +14956,11 @@ in ]; }) sources."to-regex-3.0.2" - sources."to-regex-range-2.1.1" + sources."to-regex-range-5.0.1" sources."toidentifier-1.0.0" sources."tough-cookie-2.5.0" sources."traverse-0.3.9" - sources."tslib-1.13.0" + sources."tslib-1.14.1" sources."tty-browserify-0.0.0" sources."tunnel-agent-0.6.0" sources."tweetnacl-0.14.5" @@ -14904,6 +14984,7 @@ in sources."p-limit-1.3.0" sources."p-locate-2.0.0" sources."p-try-1.0.0" + sources."path-exists-3.0.0" sources."pify-3.0.0" sources."pkg-dir-2.0.0" sources."pump-2.0.1" @@ -14918,11 +14999,7 @@ in sources."unicode-match-property-ecmascript-1.0.4" sources."unicode-match-property-value-ecmascript-1.2.0" sources."unicode-property-aliases-ecmascript-1.1.0" - (sources."union-value-1.0.1" // { - dependencies = [ - sources."is-extendable-0.1.1" - ]; - }) + sources."union-value-1.0.1" sources."uniq-1.0.1" sources."uniqs-2.0.0" sources."unique-filename-1.1.1" @@ -14949,9 +15026,10 @@ in sources."punycode-1.3.2" ]; }) - (sources."url-loader-4.1.0" // { + (sources."url-loader-4.1.1" // { dependencies = [ sources."loader-utils-2.0.0" + sources."schema-utils-3.0.0" ]; }) sources."url-parse-1.4.7" @@ -14971,27 +15049,38 @@ in sources."vary-1.1.2" sources."vendors-1.0.4" sources."verror-1.10.0" + sources."vfile-location-3.2.0" sources."vm-browserify-1.1.2" - (sources."watchpack-1.7.4" // { - dependencies = [ - sources."anymatch-3.1.1" - sources."binary-extensions-2.1.0" - sources."braces-3.0.2" - sources."chokidar-3.4.2" - sources."fill-range-7.0.1" - sources."fsevents-2.1.3" - sources."glob-parent-5.1.1" - sources."is-binary-path-2.1.0" - sources."is-number-7.0.0" - sources."readdirp-3.4.0" - sources."to-regex-range-5.0.1" + sources."watchpack-1.7.5" + (sources."watchpack-chokidar2-2.0.1" // { + dependencies = [ + sources."anymatch-2.0.0" + sources."binary-extensions-1.13.1" + sources."braces-2.3.2" + sources."chokidar-2.1.8" + sources."extend-shallow-2.0.1" + sources."fill-range-4.0.0" + sources."fsevents-1.2.13" + sources."is-binary-path-1.0.1" + sources."is-number-3.0.0" + sources."kind-of-3.2.2" + sources."micromatch-3.1.10" + sources."normalize-path-2.1.1" + sources."readdirp-2.2.1" + sources."to-regex-range-2.1.1" ]; }) - sources."watchpack-chokidar2-2.0.0" sources."wbuf-1.7.3" (sources."webpack-4.44.2" // { dependencies = [ + sources."braces-2.3.2" + sources."extend-shallow-2.0.1" + sources."fill-range-4.0.0" + sources."is-number-3.0.0" + sources."kind-of-3.2.2" + sources."micromatch-3.1.10" sources."schema-utils-1.0.0" + sources."to-regex-range-2.1.1" ]; }) (sources."webpack-dev-middleware-3.7.2" // { @@ -15002,18 +15091,33 @@ in (sources."webpack-dev-server-3.11.0" // { dependencies = [ sources."ansi-regex-4.1.0" + sources."anymatch-2.0.0" + sources."binary-extensions-1.13.1" + sources."braces-2.3.2" + sources."chokidar-2.1.8" (sources."cliui-5.0.0" // { dependencies = [ sources."strip-ansi-5.2.0" ]; }) - sources."debug-4.3.0" + sources."extend-shallow-2.0.1" + sources."fill-range-4.0.0" + sources."find-up-3.0.0" + sources."fsevents-1.2.13" sources."get-caller-file-2.0.5" sources."http-proxy-middleware-0.19.1" sources."is-absolute-url-3.0.3" + sources."is-binary-path-1.0.1" sources."is-fullwidth-code-point-2.0.0" - sources."ms-2.1.2" + sources."is-number-3.0.0" + sources."kind-of-3.2.2" + sources."locate-path-3.0.0" + sources."micromatch-3.1.10" + sources."normalize-path-2.1.1" sources."opn-5.5.0" + sources."p-locate-3.0.0" + sources."path-exists-3.0.0" + sources."readdirp-2.2.1" sources."require-main-filename-2.0.0" sources."schema-utils-1.0.0" sources."semver-6.3.0" @@ -15024,6 +15128,7 @@ in }) sources."strip-ansi-3.0.1" sources."supports-color-6.1.0" + sources."to-regex-range-2.1.1" sources."which-module-2.0.0" (sources."wrap-ansi-5.1.0" // { dependencies = [ @@ -15047,7 +15152,7 @@ in }) sources."websocket-driver-0.7.4" sources."websocket-extensions-0.1.4" - sources."whatwg-fetch-3.4.1" + sources."whatwg-fetch-3.5.0" sources."which-2.0.2" sources."which-module-1.0.0" (sources."winston-2.1.1" // { @@ -15114,102 +15219,294 @@ in elm-optimize-level-2 = nodeEnv.buildNodePackage { name = "elm-optimize-level-2"; packageName = "elm-optimize-level-2"; - version = "0.1.3"; + version = "0.1.5"; + src = fetchurl { + url = "https://registry.npmjs.org/elm-optimize-level-2/-/elm-optimize-level-2-0.1.5.tgz"; + sha512 = "9vaPjQEjdxzUXewbCJn1X3oIwUgdBssgy+uQvsqyDSpyEwYWxQCgX4qX3NtqKNgsHEZ+TYFzKlzdKvcRKbjOUg=="; + }; + dependencies = [ + sources."ansi-styles-4.3.0" + sources."balanced-match-1.0.0" + sources."brace-expansion-1.1.11" + sources."chalk-4.1.0" + sources."color-convert-2.0.1" + sources."color-name-1.1.4" + sources."commander-6.2.0" + sources."concat-map-0.0.1" + sources."cross-spawn-6.0.5" + sources."find-elm-dependencies-2.0.4" + sources."firstline-1.3.1" + sources."fs.realpath-1.0.0" + sources."glob-7.1.6" + sources."has-flag-4.0.0" + sources."inflight-1.0.6" + sources."inherits-2.0.4" + sources."isexe-2.0.0" + sources."lodash-4.17.20" + sources."minimatch-3.0.4" + sources."minimist-1.2.5" + sources."mkdirp-0.5.5" + sources."nice-try-1.0.5" + sources."node-elm-compiler-5.0.5" + sources."once-1.4.0" + sources."path-is-absolute-1.0.1" + sources."path-key-2.0.1" + sources."rimraf-2.6.3" + sources."semver-5.7.1" + sources."shebang-command-1.2.0" + sources."shebang-regex-1.0.0" + sources."supports-color-7.2.0" + sources."temp-0.9.4" + sources."ts-union-2.3.0" + sources."typescript-3.9.7" + sources."which-1.3.1" + sources."wrappy-1.0.2" + ]; + buildInputs = globalBuildInputs; + meta = { + description = "A second level of optimization for the Javascript that the Elm Compiler produces."; + homepage = "https://github.com/mdgriffith/elm-optimize-level-2#readme"; + license = "BSD-3-Clause"; + }; + production = true; + bypassCache = true; + reconstructLock = true; + }; + elm-review = nodeEnv.buildNodePackage { + name = "elm-review"; + packageName = "elm-review"; + version = "2.3.3"; src = fetchurl { - url = "https://registry.npmjs.org/elm-optimize-level-2/-/elm-optimize-level-2-0.1.3.tgz"; - sha512 = "RC5Pz/U6Hf244j95SIxmO33Cc7XZhj4KYKZCFJYGpeb1YGARciBv2AOikm9pBHErtiKtiJwzEWHBoruhpAZnAQ=="; + url = "https://registry.npmjs.org/elm-review/-/elm-review-2.3.3.tgz"; + sha512 = "1TiTnEXzpzACrc/JdB3tvmgNf5Qd0RyX8wbBqPPuc1aWvHHvPf6wi/ncz1gcILFAObr1zquCePkJkoW0uoZiBA=="; }; dependencies = [ - (sources."@jest/types-25.5.0" // { + sources."@sindresorhus/is-2.1.1" + sources."@szmarczak/http-timer-4.0.5" + sources."@types/cacheable-request-6.0.1" + sources."@types/http-cache-semantics-4.0.0" + sources."@types/keyv-3.1.1" + sources."@types/node-14.14.10" + sources."@types/responselike-1.0.0" + sources."ajv-6.12.6" + (sources."ansi-escapes-4.3.1" // { dependencies = [ - sources."chalk-3.0.0" + sources."type-fest-0.11.0" ]; }) - 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/jest-26.0.14" - sources."@types/node-14.11.3" - sources."@types/yargs-15.0.7" - sources."@types/yargs-parser-15.0.0" sources."ansi-regex-5.0.0" sources."ansi-styles-4.3.0" + sources."anymatch-3.1.1" + sources."asn1-0.2.4" + sources."assert-plus-1.0.0" + sources."asynckit-0.4.0" + sources."at-least-node-1.0.0" + sources."aws-sign2-0.7.0" + sources."aws4-1.11.0" sources."balanced-match-1.0.0" + sources."bcrypt-pbkdf-1.0.2" + sources."binary-0.3.0" + sources."binary-extensions-2.1.0" + sources."binwrap-0.2.2" + sources."bluebird-3.7.2" sources."brace-expansion-1.1.11" sources."braces-3.0.2" - sources."bs-logger-0.2.6" - sources."buffer-from-1.1.1" + sources."buffers-0.1.1" + sources."cacheable-lookup-2.0.1" + sources."cacheable-request-7.0.1" + sources."caseless-0.12.0" + sources."chainsaw-0.1.0" sources."chalk-4.1.0" - sources."ci-info-2.0.0" + sources."chokidar-3.4.3" + sources."chownr-1.1.4" + sources."cli-cursor-3.1.0" + sources."cli-spinners-2.5.0" + sources."clone-1.0.4" + (sources."clone-response-1.0.2" // { + dependencies = [ + sources."mimic-response-1.0.1" + ]; + }) sources."color-convert-2.0.1" sources."color-name-1.1.4" - sources."commander-6.1.0" + sources."combined-stream-1.0.8" sources."concat-map-0.0.1" - (sources."cross-spawn-6.0.5" // { + sources."core-util-is-1.0.2" + sources."cross-spawn-7.0.3" + (sources."cross-spawn-promise-0.10.2" // { dependencies = [ - sources."semver-5.7.1" + sources."cross-spawn-5.1.0" + sources."shebang-command-1.2.0" + sources."shebang-regex-1.0.0" + sources."which-1.3.1" ]; }) - sources."diff-sequences-25.2.6" + sources."dashdash-1.14.1" + sources."debug-4.3.1" + sources."decompress-response-5.0.0" + sources."defaults-1.0.3" + sources."defer-to-connect-2.0.0" + sources."delayed-stream-1.0.0" + sources."duplexer3-0.1.4" + sources."ecc-jsbn-0.1.2" + sources."elm-json-0.2.8" + sources."emoji-regex-8.0.0" + sources."end-of-stream-1.4.4" + sources."escape-string-regexp-1.0.5" + 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."fill-range-7.0.1" - sources."find-elm-dependencies-2.0.4" - sources."firstline-1.3.1" + sources."find-up-4.1.0" + sources."folder-hash-3.3.3" + sources."forever-agent-0.6.1" + sources."form-data-2.3.3" + sources."fs-extra-9.0.1" + sources."fs-minipass-1.2.7" sources."fs.realpath-1.0.0" + sources."fsevents-2.1.3" + sources."get-stream-5.2.0" + sources."getpass-0.1.7" sources."glob-7.1.6" + sources."glob-parent-5.1.1" + sources."got-10.7.0" sources."graceful-fs-4.2.4" + sources."har-schema-2.0.0" + sources."har-validator-5.1.5" sources."has-flag-4.0.0" + sources."http-cache-semantics-4.1.0" + sources."http-signature-1.2.0" sources."inflight-1.0.6" sources."inherits-2.0.4" - sources."is-ci-2.0.0" + sources."is-binary-path-2.1.0" + sources."is-extglob-2.1.1" + sources."is-fullwidth-code-point-3.0.0" + sources."is-glob-4.0.1" + sources."is-interactive-1.0.0" sources."is-number-7.0.0" + sources."is-typedarray-1.0.0" sources."isexe-2.0.0" - (sources."jest-diff-25.5.0" // { + sources."isstream-0.1.2" + sources."jsbn-0.1.1" + sources."json-buffer-3.0.1" + sources."json-schema-0.2.3" + sources."json-schema-traverse-0.4.1" + sources."json-stringify-safe-5.0.1" + (sources."jsonfile-6.1.0" // { dependencies = [ - sources."chalk-3.0.0" + sources."universalify-2.0.0" ]; }) - sources."jest-get-type-25.2.6" - (sources."jest-util-26.5.0" // { + sources."jsprim-1.4.1" + sources."keyv-4.0.3" + sources."kleur-3.0.3" + sources."locate-path-5.0.0" + sources."lodash-4.17.20" + (sources."log-symbols-3.0.0" // { dependencies = [ - sources."@jest/types-26.5.0" - sources."@types/istanbul-reports-3.0.0" + sources."ansi-styles-3.2.1" + sources."chalk-2.4.2" + sources."color-convert-1.9.3" + sources."color-name-1.1.3" + sources."has-flag-3.0.0" + sources."supports-color-5.5.0" ]; }) - sources."json5-2.1.3" - sources."lodash-4.17.20" - sources."lodash.memoize-4.1.2" - sources."make-error-1.3.6" - sources."micromatch-4.0.2" + sources."lowercase-keys-2.0.0" + sources."lru-cache-4.1.5" + sources."mime-db-1.44.0" + sources."mime-types-2.1.27" + sources."mimic-fn-2.1.0" + sources."mimic-response-2.1.0" sources."minimatch-3.0.4" sources."minimist-1.2.5" - sources."mkdirp-1.0.4" - sources."nice-try-1.0.5" - sources."node-elm-compiler-5.0.5" + (sources."minipass-2.9.0" // { + dependencies = [ + sources."yallist-3.1.1" + ]; + }) + sources."minizlib-1.3.3" + sources."mkdirp-0.5.5" + sources."ms-2.1.2" + sources."mustache-3.2.1" + sources."mute-stream-0.0.8" + sources."normalize-path-3.0.0" + sources."normalize-url-4.5.0" + sources."oauth-sign-0.9.0" sources."once-1.4.0" + sources."onetime-5.1.2" + (sources."ora-4.1.1" // { + dependencies = [ + sources."chalk-3.0.0" + ]; + }) + sources."p-cancelable-2.0.0" + sources."p-event-4.2.0" + sources."p-finally-1.0.0" + sources."p-limit-2.3.0" + sources."p-locate-4.1.0" + sources."p-timeout-3.2.0" + sources."p-try-2.2.0" + sources."path-exists-4.0.0" sources."path-is-absolute-1.0.1" - sources."path-key-2.0.1" + sources."path-key-3.1.1" + sources."performance-now-2.1.0" sources."picomatch-2.2.2" - sources."pretty-format-25.5.0" - sources."react-is-16.13.1" + sources."prompts-2.4.0" + sources."pseudomap-1.0.2" + sources."psl-1.8.0" + sources."pump-3.0.0" + sources."punycode-2.1.1" + sources."qs-6.5.2" + sources."readdirp-3.5.0" + sources."request-2.88.2" + sources."request-promise-4.2.6" + sources."request-promise-core-1.1.4" + sources."responselike-2.0.0" + sources."restore-cursor-3.1.0" sources."rimraf-2.6.3" - sources."semver-7.3.2" - sources."shebang-command-1.2.0" - sources."shebang-regex-1.0.0" + sources."safe-buffer-5.2.1" + sources."safer-buffer-2.1.2" + sources."shebang-command-2.0.0" + sources."shebang-regex-3.0.0" + sources."signal-exit-3.0.3" + sources."sisteransi-1.0.5" + sources."sshpk-1.16.1" + sources."stealthy-require-1.1.1" + sources."string-width-4.2.0" + sources."strip-ansi-6.0.0" sources."supports-color-7.2.0" - sources."temp-0.9.1" + sources."supports-hyperlinks-2.1.0" + (sources."tar-4.4.13" // { + dependencies = [ + sources."yallist-3.1.1" + ]; + }) + sources."temp-0.9.4" + sources."terminal-link-2.1.1" + sources."to-readable-stream-2.1.0" sources."to-regex-range-5.0.1" - sources."ts-jest-26.4.1" - sources."ts-union-2.2.1" - sources."typescript-3.9.7" - sources."which-1.3.1" + sources."tough-cookie-2.5.0" + sources."traverse-0.3.9" + sources."tunnel-agent-0.6.0" + sources."tweetnacl-0.14.5" + sources."type-fest-0.10.0" + sources."universalify-1.0.0" + sources."unzip-stream-0.3.1" + sources."uri-js-4.4.0" + sources."uuid-3.4.0" + sources."verror-1.10.0" + sources."wcwidth-1.0.1" + sources."which-2.0.2" + sources."wrap-ansi-6.2.0" sources."wrappy-1.0.2" - sources."yargs-parser-20.2.1" + sources."yallist-2.1.2" ]; buildInputs = globalBuildInputs; meta = { - description = "A second level of optimization for the Javascript that the Elm Compiler produces."; - homepage = "https://github.com/mdgriffith/elm-optimize-level-2#readme"; + description = "Run elm-review from Node.js"; + homepage = "https://github.com/jfmengels/node-elm-review#readme"; license = "BSD-3-Clause"; }; production = true; diff --git a/infra/libkookie/nixpkgs/pkgs/development/compilers/eql/default.nix b/infra/libkookie/nixpkgs/pkgs/development/compilers/eql/default.nix index aac619126896..ce42c1021154 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/compilers/eql/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/compilers/eql/default.nix @@ -15,6 +15,9 @@ stdenv.mkDerivation rec { postPatch = '' sed -re 's@[(]in-home "gui/.command-history"[)]@(concatenate '"'"'string (ext:getenv "HOME") "/.eql-gui-command-history")@' -i gui/gui.lisp + + # cl_def_c_function was renamed to ecl_def_c_function in ECL 20.4.24. + find . -type f -exec sed -e 's/\scl_def_c_function(/ ecl_def_c_function(/' -i {} \; ''; buildPhase = '' diff --git a/infra/libkookie/nixpkgs/pkgs/development/compilers/fasmg/default.nix b/infra/libkookie/nixpkgs/pkgs/development/compilers/fasmg/default.nix new file mode 100644 index 000000000000..5233e248c074 --- /dev/null +++ b/infra/libkookie/nixpkgs/pkgs/development/compilers/fasmg/default.nix @@ -0,0 +1,58 @@ +{ stdenv +, fetchzip +}: + +stdenv.mkDerivation rec { + pname = "fasmg"; + version = "j27m"; + + src = fetchzip { + url = "https://flatassembler.net/fasmg.${version}.zip"; + sha256 = "0qmklb24n3r0my2risid8r61pi88gqrvm1c0xvyd0bp1ans6d7zd"; + stripRoot = false; + }; + + buildPhase = let + inherit (stdenv.hostPlatform) system; + + path = { + x86_64-linux = { + bin = "fasmg.x64"; + asm = "source/linux/x64/fasmg.asm"; + }; + x86_64-darwin = { + bin = "source/macos/x64/fasmg"; + asm = "source/macos/x64/fasmg.asm"; + }; + x86-linux = { + bin = "fasmg"; + asm = "source/linux/fasmg.asm"; + }; + x86-darwin = { + bin = "source/macos/fasmg"; + asm = "source/macos/fasmg.asm"; + }; + }.${system} or (throw "Unsopported system: ${system}"); + + in '' + chmod +x ${path.bin} + ./${path.bin} ${path.asm} fasmg + ''; + + outputs = [ "out" "doc" ]; + + installPhase = '' + install -Dm755 fasmg $out/bin/fasmg + + mkdir -p $doc/share/doc/fasmg + cp docs/*.txt $doc/share/doc/fasmg + ''; + + meta = with stdenv.lib; { + description = "x86(-64) macro assembler to binary, MZ, PE, COFF, and ELF"; + homepage = "https://flatassembler.net"; + license = licenses.bsd3; + maintainers = with maintainers; [ orivej luc65r ]; + platforms = with platforms; intersectLists (linux ++ darwin) x86; + }; +} diff --git a/infra/libkookie/nixpkgs/pkgs/development/compilers/flutter/default.nix b/infra/libkookie/nixpkgs/pkgs/development/compilers/flutter/default.nix index 9b9d1f7481d1..baab0583fb0c 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/compilers/flutter/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/compilers/flutter/default.nix @@ -1,6 +1,9 @@ -{ callPackage }: +{ callPackage, dart }: let + dart_stable = dart.override { version = "2.10.0"; }; + dart_beta = dart.override { version = "2.10.0"; }; + dart_dev = dart.override { version = "2.11.0-161.0.dev"; }; mkFlutter = opts: callPackage (import ./flutter.nix opts) { }; getPatches = dir: let files = builtins.attrNames (builtins.readDir dir); @@ -10,25 +13,28 @@ in { stable = mkFlutter rec { pname = "flutter"; channel = "stable"; - version = "1.17.5"; + version = "1.22.0"; filename = "flutter_linux_${version}-${channel}.tar.xz"; - sha256Hash = "0kapja3nh7dfhjbn2np02wghijrjnpzsv4hz10fj54hs8hdx19di"; + sha256Hash = "0ryrx458ss8ryhmspcfrhjvad2pl46bxh1qk5vzwzhxiqdc79vm8"; patches = getPatches ./patches/stable; + dart = dart_stable; }; beta = mkFlutter rec { - pname = "flutter-beta"; + pname = "flutter"; channel = "beta"; - version = "1.20.0-7.2.pre"; + version = "1.22.0-12.3.pre"; filename = "flutter_linux_${version}-${channel}.tar.xz"; - sha256Hash = "0w89ig5vi4spa95mf08r4vvwni7bzzdlyhvr9sy1a35qmf7j9s6f"; - patches = getPatches ./patches/beta; + sha256Hash = "1axzz137z4lgpa09h7bjf52i6dij6a9wmjbha1182db23r09plzh"; + patches = getPatches ./patches/stable; + dart = dart_beta; }; dev = mkFlutter rec { - pname = "flutter-dev"; + pname = "flutter"; channel = "dev"; - version = "1.21.0-1.0.pre"; + version = "1.23.0-7.0.pre"; filename = "flutter_linux_${version}-${channel}.tar.xz"; - sha256Hash = "14rx89jp6ivk3ai7iwbznkr5q445ndh8fppzbxg520kq10s2208r"; - patches = getPatches ./patches/beta; + sha256Hash = "166qb4qbv051bc71yj7c0vrkamhvzz3fp3mz318qzm947mydwjj5"; + patches = getPatches ./patches/dev; + dart = dart_dev; }; } diff --git a/infra/libkookie/nixpkgs/pkgs/development/compilers/flutter/flutter.nix b/infra/libkookie/nixpkgs/pkgs/development/compilers/flutter/flutter.nix index fad2a646a165..7fda2d616f3e 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/compilers/flutter/flutter.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/compilers/flutter/flutter.nix @@ -1,5 +1,5 @@ -{ channel, pname, version, sha256Hash, patches -, filename ? "flutter_linux_v${version}-${channel}.tar.xz" }: +{ channel, pname, version, sha256Hash, patches, dart +, filename ? "flutter_linux_${version}-${channel}.tar.xz"}: { bash, buildFHSUserEnv, cacert, coreutils, git, makeWrapper, runCommand, stdenv , fetchurl, alsaLib, dbus, expat, libpulseaudio, libuuid, libX11, libxcb @@ -72,6 +72,7 @@ let with pkgs; [ bash curl + dart git unzip which @@ -110,8 +111,7 @@ in runCommand drvName { allowSubstitutes = false; passthru = { unwrapped = flutter; }; meta = with stdenv.lib; { - description = - "Flutter is Google's SDK for building mobile, web and desktop with Dart."; + description = "Flutter is Google's SDK for building mobile, web and desktop with Dart"; longDescription = '' Flutter is Google’s UI toolkit for building beautiful, natively compiled applications for mobile, web, and desktop from a single codebase. @@ -119,11 +119,15 @@ in runCommand drvName { homepage = "https://flutter.dev"; license = licenses.bsd3; platforms = [ "x86_64-linux" ]; - maintainers = with maintainers; [ babariviere ]; + maintainers = with maintainers; [ babariviere ericdallo ]; }; } '' mkdir -p $out/bin echo -n "$startScript" > $out/bin/${pname} chmod +x $out/bin/${pname} + + mkdir -p $out/bin/cache/dart-sdk/ + cp -r ${dart}/* $out/bin/cache/dart-sdk/ + ln $out/bin/cache/dart-sdk/bin/dart $out/bin/dart '' diff --git a/infra/libkookie/nixpkgs/pkgs/development/compilers/flutter/patches/beta/disable-auto-update.patch b/infra/libkookie/nixpkgs/pkgs/development/compilers/flutter/patches/dev/disable-auto-update.patch index cd01577cc10f..f9ac00d1d323 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/compilers/flutter/patches/beta/disable-auto-update.patch +++ b/infra/libkookie/nixpkgs/pkgs/development/compilers/flutter/patches/dev/disable-auto-update.patch @@ -1,8 +1,8 @@ diff --git a/bin/internal/shared.sh b/bin/internal/shared.sh -index 702bd9ed5..4d4dc94c6 100755 +index 22efe87443..c6954575c5 100644 --- a/bin/internal/shared.sh +++ b/bin/internal/shared.sh -@@ -204,8 +204,6 @@ function shared::execute() { +@@ -212,8 +212,6 @@ function shared::execute() { # FLUTTER_TOOL_ARGS="--enable-asserts $FLUTTER_TOOL_ARGS" # FLUTTER_TOOL_ARGS="$FLUTTER_TOOL_ARGS --observe=65432" @@ -12,10 +12,10 @@ index 702bd9ed5..4d4dc94c6 100755 case "$BIN_NAME" in flutter*) diff --git a/packages/flutter_tools/lib/src/runner/flutter_command_runner.dart b/packages/flutter_tools/lib/src/runner/flutter_command_runner.dart -index 21be933e1..2ea73c4c0 100644 +index fb1616ba96..b973b3fd58 100644 --- a/packages/flutter_tools/lib/src/runner/flutter_command_runner.dart +++ b/packages/flutter_tools/lib/src/runner/flutter_command_runner.dart -@@ -294,13 +294,6 @@ class FlutterCommandRunner extends CommandRunner<void> { +@@ -291,13 +291,6 @@ class FlutterCommandRunner extends CommandRunner<void> { globals.flutterUsage.suppressAnalytics = true; } diff --git a/infra/libkookie/nixpkgs/pkgs/development/compilers/flutter/patches/beta/move-cache.patch b/infra/libkookie/nixpkgs/pkgs/development/compilers/flutter/patches/dev/move-cache.patch index 64950d4476ef..eb6ff5cf582e 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/compilers/flutter/patches/beta/move-cache.patch +++ b/infra/libkookie/nixpkgs/pkgs/development/compilers/flutter/patches/dev/move-cache.patch @@ -1,21 +1,21 @@ diff --git a/dev/devicelab/lib/framework/runner.dart b/dev/devicelab/lib/framework/runner.dart -index 8e511eefd..fef3cca8b 100644 +index a059a8e992..b664a7070c 100644 --- a/dev/devicelab/lib/framework/runner.dart +++ b/dev/devicelab/lib/framework/runner.dart -@@ -126,7 +126,7 @@ Future<void> cleanupSystem() async { - print('\nTelling Gradle to shut down (JAVA_HOME=$javaHome)'); - final String gradlewBinaryName = Platform.isWindows ? 'gradlew.bat' : 'gradlew'; - final Directory tempDir = Directory.systemTemp.createTempSync('flutter_devicelab_shutdown_gradle.'); -- recursiveCopy(Directory(path.join(flutterDirectory.path, 'bin', 'cache', 'artifacts', 'gradle_wrapper')), tempDir); -+ recursiveCopy(Directory(path.join(globals.fsUtils.homeDirPath, '.cache', 'flutter', 'artifacts', 'gradle_wrapper')), tempDir); - copy(File(path.join(path.join(flutterDirectory.path, 'packages', 'flutter_tools'), 'templates', 'app', 'android.tmpl', 'gradle', 'wrapper', 'gradle-wrapper.properties')), Directory(path.join(tempDir.path, 'gradle', 'wrapper'))); - if (!Platform.isWindows) { - await exec( +@@ -137,7 +137,7 @@ Future<void> cleanupSystem() async { + print('\nTelling Gradle to shut down (JAVA_HOME=$javaHome)'); + final String gradlewBinaryName = Platform.isWindows ? 'gradlew.bat' : 'gradlew'; + final Directory tempDir = Directory.systemTemp.createTempSync('flutter_devicelab_shutdown_gradle.'); +- recursiveCopy(Directory(path.join(flutterDirectory.path, 'bin', 'cache', 'artifacts', 'gradle_wrapper')), tempDir); ++ recursiveCopy(Directory(path.join(globals.fsUtils.homeDirPath, '.cache', 'flutter', 'artifacts', 'gradle_wrapper')), tempDir); + copy(File(path.join(path.join(flutterDirectory.path, 'packages', 'flutter_tools'), 'templates', 'app', 'android.tmpl', 'gradle', 'wrapper', 'gradle-wrapper.properties')), Directory(path.join(tempDir.path, 'gradle', 'wrapper'))); + if (!Platform.isWindows) { + await exec( diff --git a/packages/flutter_tools/lib/src/asset.dart b/packages/flutter_tools/lib/src/asset.dart -index c680de599..480abfb77 100644 +index 36714c5fb4..c0cc049ee1 100644 --- a/packages/flutter_tools/lib/src/asset.dart +++ b/packages/flutter_tools/lib/src/asset.dart -@@ -8,6 +8,7 @@ import 'package:meta/meta.dart'; +@@ -6,6 +6,7 @@ import 'package:meta/meta.dart'; import 'package:package_config/package_config.dart'; import 'package:yaml/yaml.dart'; @@ -23,20 +23,20 @@ index c680de599..480abfb77 100644 import 'base/context.dart'; import 'base/file_system.dart'; import 'base/utils.dart'; -@@ -392,7 +393,7 @@ List<_Asset> _getMaterialAssets(String fontSet) { +@@ -397,7 +398,7 @@ List<_Asset> _getMaterialAssets(String fontSet) { for (final Map<dynamic, dynamic> font in (family['fonts'] as List<dynamic>).cast<Map<dynamic, dynamic>>()) { final Uri entryUri = globals.fs.path.toUri(font['asset'] as String); result.add(_Asset( - baseDir: globals.fs.path.join(Cache.flutterRoot, 'bin', 'cache', 'artifacts', 'material_fonts'), -+ baseDir: globals.fs.path.join(globals.fsUtils.homeDirPath, '.cache', 'flutter', 'artifacts', 'material_fonts'), ++ baseDir: globals.fs.path.join(globals.fsUtils.homeDirPath, '.cache', 'flutter', 'artifacts', 'material_fonts'), relativeUri: Uri(path: entryUri.pathSegments.last), entryUri: entryUri, package: null, diff --git a/packages/flutter_tools/lib/src/cache.dart b/packages/flutter_tools/lib/src/cache.dart -index c0946782c..bdbc35cb8 100644 +index aaca036d78..43ff428f8d 100644 --- a/packages/flutter_tools/lib/src/cache.dart +++ b/packages/flutter_tools/lib/src/cache.dart -@@ -202,8 +202,15 @@ class Cache { +@@ -226,8 +226,15 @@ class Cache { return; } assert(_lock == null); @@ -53,7 +53,7 @@ index c0946782c..bdbc35cb8 100644 try { _lock = lockFile.openSync(mode: FileMode.write); } on FileSystemException catch (e) { -@@ -306,7 +313,7 @@ class Cache { +@@ -330,7 +337,7 @@ class Cache { if (_rootOverride != null) { return _fileSystem.directory(_fileSystem.path.join(_rootOverride.path, 'bin', 'cache')); } else { diff --git a/infra/libkookie/nixpkgs/pkgs/development/compilers/flutter/patches/stable/disable-auto-update.patch b/infra/libkookie/nixpkgs/pkgs/development/compilers/flutter/patches/stable/disable-auto-update.patch index c77357ea13c5..35ce5b367350 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/compilers/flutter/patches/stable/disable-auto-update.patch +++ b/infra/libkookie/nixpkgs/pkgs/development/compilers/flutter/patches/stable/disable-auto-update.patch @@ -1,24 +1,24 @@ -diff --git a/bin/flutter b/bin/flutter -index cdf974233..1f7de1c1b 100755 ---- a/bin/flutter -+++ b/bin/flutter -@@ -185,8 +185,6 @@ fi - # FLUTTER_TOOL_ARGS="--enable-asserts $FLUTTER_TOOL_ARGS" - # FLUTTER_TOOL_ARGS="$FLUTTER_TOOL_ARGS --observe=65432" +diff --git a/bin/internal/shared.sh b/bin/internal/shared.sh +index 8d613de739..a673466726 100644 +--- a/bin/internal/shared.sh ++++ b/bin/internal/shared.sh +@@ -204,8 +204,6 @@ function shared::execute() { + # FLUTTER_TOOL_ARGS="--enable-asserts $FLUTTER_TOOL_ARGS" + # FLUTTER_TOOL_ARGS="$FLUTTER_TOOL_ARGS --observe=65432" --(upgrade_flutter) 3< "$PROG_NAME" +- upgrade_flutter 7< "$PROG_NAME" - - # FLUTTER_TOOL_ARGS isn't quoted below, because it is meant to be considered as - # separate space-separated args. - "$DART" --packages="$FLUTTER_TOOLS_DIR/.packages" $FLUTTER_TOOL_ARGS "$SNAPSHOT_PATH" "$@" + BIN_NAME="$(basename "$PROG_NAME")" + case "$BIN_NAME" in + flutter*) diff --git a/packages/flutter_tools/lib/src/runner/flutter_command_runner.dart b/packages/flutter_tools/lib/src/runner/flutter_command_runner.dart -index b3e69714f..a9eb76234 100644 +index 8a1a1e29da..778f253358 100644 --- a/packages/flutter_tools/lib/src/runner/flutter_command_runner.dart +++ b/packages/flutter_tools/lib/src/runner/flutter_command_runner.dart -@@ -301,13 +301,6 @@ class FlutterCommandRunner extends CommandRunner<void> { +@@ -293,13 +293,6 @@ class FlutterCommandRunner extends CommandRunner<void> { + globals.flutterUsage.suppressAnalytics = true; } - _checkFlutterCopy(); - try { - await globals.flutterVersion.ensureVersionFile(); - } on FileSystemException catch (e) { diff --git a/infra/libkookie/nixpkgs/pkgs/development/compilers/flutter/patches/stable/move-cache.patch b/infra/libkookie/nixpkgs/pkgs/development/compilers/flutter/patches/stable/move-cache.patch index 64950d4476ef..dc77496edb31 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/compilers/flutter/patches/stable/move-cache.patch +++ b/infra/libkookie/nixpkgs/pkgs/development/compilers/flutter/patches/stable/move-cache.patch @@ -1,8 +1,8 @@ diff --git a/dev/devicelab/lib/framework/runner.dart b/dev/devicelab/lib/framework/runner.dart -index 8e511eefd..fef3cca8b 100644 +index d045c83f04..d51973020b 100644 --- a/dev/devicelab/lib/framework/runner.dart +++ b/dev/devicelab/lib/framework/runner.dart -@@ -126,7 +126,7 @@ Future<void> cleanupSystem() async { +@@ -136,7 +136,7 @@ Future<void> cleanupSystem() async { print('\nTelling Gradle to shut down (JAVA_HOME=$javaHome)'); final String gradlewBinaryName = Platform.isWindows ? 'gradlew.bat' : 'gradlew'; final Directory tempDir = Directory.systemTemp.createTempSync('flutter_devicelab_shutdown_gradle.'); @@ -12,7 +12,7 @@ index 8e511eefd..fef3cca8b 100644 if (!Platform.isWindows) { await exec( diff --git a/packages/flutter_tools/lib/src/asset.dart b/packages/flutter_tools/lib/src/asset.dart -index c680de599..480abfb77 100644 +index 8da01315ae..bb8d61d7f2 100644 --- a/packages/flutter_tools/lib/src/asset.dart +++ b/packages/flutter_tools/lib/src/asset.dart @@ -8,6 +8,7 @@ import 'package:meta/meta.dart'; @@ -23,20 +23,20 @@ index c680de599..480abfb77 100644 import 'base/context.dart'; import 'base/file_system.dart'; import 'base/utils.dart'; -@@ -392,7 +393,7 @@ List<_Asset> _getMaterialAssets(String fontSet) { +@@ -399,7 +400,7 @@ List<_Asset> _getMaterialAssets(String fontSet) { for (final Map<dynamic, dynamic> font in (family['fonts'] as List<dynamic>).cast<Map<dynamic, dynamic>>()) { final Uri entryUri = globals.fs.path.toUri(font['asset'] as String); result.add(_Asset( - baseDir: globals.fs.path.join(Cache.flutterRoot, 'bin', 'cache', 'artifacts', 'material_fonts'), -+ baseDir: globals.fs.path.join(globals.fsUtils.homeDirPath, '.cache', 'flutter', 'artifacts', 'material_fonts'), ++ baseDir: globals.fs.path.join(globals.fsUtils.homeDirPath, '.cache', 'flutter', 'artifacts', 'material_fonts'), relativeUri: Uri(path: entryUri.pathSegments.last), entryUri: entryUri, package: null, diff --git a/packages/flutter_tools/lib/src/cache.dart b/packages/flutter_tools/lib/src/cache.dart -index c0946782c..bdbc35cb8 100644 +index a35d8f87d0..a40027dc74 100644 --- a/packages/flutter_tools/lib/src/cache.dart +++ b/packages/flutter_tools/lib/src/cache.dart -@@ -202,8 +202,15 @@ class Cache { +@@ -215,8 +215,15 @@ class Cache { return; } assert(_lock == null); @@ -53,7 +53,7 @@ index c0946782c..bdbc35cb8 100644 try { _lock = lockFile.openSync(mode: FileMode.write); } on FileSystemException catch (e) { -@@ -306,7 +313,7 @@ class Cache { +@@ -319,7 +326,7 @@ class Cache { if (_rootOverride != null) { return _fileSystem.directory(_fileSystem.path.join(_rootOverride.path, 'bin', 'cache')); } else { diff --git a/infra/libkookie/nixpkgs/pkgs/development/compilers/fpc/lazarus.nix b/infra/libkookie/nixpkgs/pkgs/development/compilers/fpc/lazarus.nix index 9f50ea9abba2..713033057911 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/compilers/fpc/lazarus.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/compilers/fpc/lazarus.nix @@ -98,7 +98,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - description = "Lazarus graphical IDE for the FreePascal language"; + description = "Graphical IDE for the FreePascal language"; homepage = "https://www.lazarus.freepascal.org"; license = licenses.gpl2Plus ; maintainers = with maintainers; [ raskin ]; diff --git a/infra/libkookie/nixpkgs/pkgs/development/compilers/fsharp41/default.nix b/infra/libkookie/nixpkgs/pkgs/development/compilers/fsharp41/default.nix index 8a4fa303937c..6475deb1026b 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/compilers/fsharp41/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/compilers/fsharp41/default.nix @@ -41,6 +41,7 @@ stdenv.mkDerivation rec { ./fsharp-IsPathRooted-type-inference.patch ./fsharp-string-switchName.patch ./fsharp-path-overloads.patch + ./fsharp-GetFileNameWithoutExtension-type-inference.patch ]; configurePhase = '' diff --git a/infra/libkookie/nixpkgs/pkgs/development/compilers/fsharp41/fsharp-GetFileNameWithoutExtension-type-inference.patch b/infra/libkookie/nixpkgs/pkgs/development/compilers/fsharp41/fsharp-GetFileNameWithoutExtension-type-inference.patch new file mode 100644 index 000000000000..14e9444b1de3 --- /dev/null +++ b/infra/libkookie/nixpkgs/pkgs/development/compilers/fsharp41/fsharp-GetFileNameWithoutExtension-type-inference.patch @@ -0,0 +1,13 @@ +diff --git a/src/scripts/fssrgen.fsx b/src/scripts/fssrgen.fsx +index 0bee9b79e..e6ceda11e 100644 +--- a/src/scripts/fssrgen.fsx ++++ b/src/scripts/fssrgen.fsx +@@ -329,7 +329,7 @@ let StringBoilerPlate filename = + // END BOILERPLATE + " + +-let RunMain(filename, outFilename, outXmlFilenameOpt, projectNameOpt) = ++let RunMain(filename:string, outFilename, outXmlFilenameOpt, projectNameOpt) = + try + let justfilename = System.IO.Path.GetFileNameWithoutExtension(filename) + if justfilename |> Seq.exists (fun c -> not(System.Char.IsLetterOrDigit(c))) then diff --git a/infra/libkookie/nixpkgs/pkgs/development/compilers/gambit/build.nix b/infra/libkookie/nixpkgs/pkgs/development/compilers/gambit/build.nix index c6a48bd744e7..a4b884147db1 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/compilers/gambit/build.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/compilers/gambit/build.nix @@ -35,6 +35,7 @@ gccStdenv.mkDerivation rec { #runtimeDeps = [ gnused gnugrep ]; configureFlags = [ + "--enable-targets=${gambit-params.targets}" "--enable-single-host" "--enable-c-opt=${optimizationSetting}" "--enable-gcc-opts" @@ -94,6 +95,7 @@ gccStdenv.mkDerivation rec { # Now use the bootstrap compiler to build the real thing! make -j$NIX_BUILD_CORES from-scratch + ${lib.optionalString gambit-params.modules "make -j$NIX_BUILD_CORES modules"} ''; postInstall = '' diff --git a/infra/libkookie/nixpkgs/pkgs/development/compilers/gambit/gambit-support.nix b/infra/libkookie/nixpkgs/pkgs/development/compilers/gambit/gambit-support.nix index 0e78831f2e4e..be745367ec03 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/compilers/gambit/gambit-support.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/compilers/gambit/gambit-support.nix @@ -2,12 +2,16 @@ rec { stable-params = { + stable = true; defaultRuntimeOptions = "f8,-8,t8"; buildRuntimeOptions = "f8,-8,t8"; fix-stamp = git-version : ""; + targets = "java,js,php,python,ruby"; + modules = false; }; unstable-params = { + stable = false; defaultRuntimeOptions = "iL,fL,-L,tL"; buildRuntimeOptions = "i8,f8,-8,t8"; fix-stamp = git-version : '' @@ -15,6 +19,8 @@ rec { --replace "$(grep '^PACKAGE_VERSION=.*$' configure)" 'PACKAGE_VERSION="v${git-version}"' \ --replace "$(grep '^PACKAGE_STRING=.*$' configure)" 'PACKAGE_STRING="Gambit v${git-version}"' ; ''; + targets = "arm,java,js,php,python,riscv-32,riscv-64,ruby,x86,x86-64"; # eats 100% cpu on _digest + modules = false; }; export-gambopt = params : "export GAMBOPT=${params.buildRuntimeOptions} ;"; diff --git a/infra/libkookie/nixpkgs/pkgs/development/compilers/gambit/unstable.nix b/infra/libkookie/nixpkgs/pkgs/development/compilers/gambit/unstable.nix index 7284e5b531d8..a689991a1e13 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/compilers/gambit/unstable.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/compilers/gambit/unstable.nix @@ -1,13 +1,13 @@ { callPackage, fetchFromGitHub, gambit-support }: callPackage ./build.nix { - version = "unstable-2020-07-29"; - git-version = "4.9.3-1232-gbba388b8"; + version = "unstable-2020-09-20"; + git-version = "4.9.3-1234-g6acd87df"; src = fetchFromGitHub { owner = "feeley"; repo = "gambit"; - rev = "bba388b80ca62a77883a8936d64b03316808696a"; - sha256 = "0iqlp1mvxz8g32kqrqm0phnnp1i5c4jrapqh2wqwa8fh1vgnizg1"; + rev = "6acd87dfa95bfca33082a431e72f023345dc07ee"; + sha256 = "0a3dy4ij8hzlp3sjam4b6dp6yvyz5d7g2x784qm3gp89fi2ck56r"; }; gambit-params = gambit-support.unstable-params; } diff --git a/infra/libkookie/nixpkgs/pkgs/development/compilers/gcc-arm-embedded/9/default.nix b/infra/libkookie/nixpkgs/pkgs/development/compilers/gcc-arm-embedded/9/default.nix index 8ded47d6e370..98b126e85f88 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/compilers/gcc-arm-embedded/9/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/compilers/gcc-arm-embedded/9/default.nix @@ -6,8 +6,8 @@ stdenv.mkDerivation rec { pname = "gcc-arm-embedded"; - version = "9-2019-q4-major"; - subdir = "9-2019q4/RC2.1"; + version = "9-2020-q2-update"; + subdir = "9-2020q2"; suffix = { aarch64-linux = "aarch64-linux"; @@ -18,9 +18,9 @@ stdenv.mkDerivation rec { src = fetchurl { url = "https://developer.arm.com/-/media/Files/downloads/gnu-rm/${subdir}/gcc-arm-none-eabi-${version}-${suffix}.tar.bz2"; sha256 = { - aarch64-linux = "1f5b9309006737950b2218250e6bb392e2d68d4f1a764fe66be96e2a78888d83"; - x86_64-darwin = "1249f860d4155d9c3ba8f30c19e7a88c5047923cea17e0d08e633f12408f01f0"; - x86_64-linux = "bcd840f839d5bf49279638e9f67890b2ef3a7c9c7a9b25271e83ec4ff41d177a"; + aarch64-linux = "1b5q2y710hy7lddj8vj3zl54gfl74j30kx3hk3i81zrcbv16ah8z"; + x86_64-darwin = "1ils9z16wrvglh72m428y5irmd36biq79yj86756whib8izbifdv"; + x86_64-linux = "07zi2yr5gvhpbij5pnj49zswb9g2gw7zqp4xwwniqmq477h2xp2s"; }.${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}"); }; diff --git a/infra/libkookie/nixpkgs/pkgs/development/compilers/gcc/9/avoid-cycling-subreg-reloads.patch b/infra/libkookie/nixpkgs/pkgs/development/compilers/gcc/9/avoid-cycling-subreg-reloads.patch new file mode 100644 index 000000000000..17a4e0a2447b --- /dev/null +++ b/infra/libkookie/nixpkgs/pkgs/development/compilers/gcc/9/avoid-cycling-subreg-reloads.patch @@ -0,0 +1,261 @@ +From 6001db79c477b03eacc7e7049560921fb54b7845 Mon Sep 17 00:00:00 2001 +From: Richard Sandiford <richard.sandiford@arm.com> +Date: Mon, 7 Sep 2020 20:15:36 +0100 +Subject: [PATCH] lra: Avoid cycling on certain subreg reloads [PR96796] + +This PR is about LRA cycling for a reload of the form: + +---------------------------------------------------------------------------- +Changing pseudo 196 in operand 1 of insn 103 on equiv [r105:DI*0x8+r140:DI] + Creating newreg=287, assigning class ALL_REGS to slow/invalid mem r287 + Creating newreg=288, assigning class ALL_REGS to slow/invalid mem r288 + 103: r203:SI=r288:SI<<0x1+r196:DI#0 + REG_DEAD r196:DI + Inserting slow/invalid mem reload before: + 316: r287:DI=[r105:DI*0x8+r140:DI] + 317: r288:SI=r287:DI#0 +---------------------------------------------------------------------------- + +The problem is with r287. We rightly give it a broad starting class of +POINTER_AND_FP_REGS (reduced from ALL_REGS by preferred_reload_class). +However, we never make forward progress towards narrowing it down to +a specific choice of class (POINTER_REGS or FP_REGS). + +I think in practice we rely on two things to narrow a reload pseudo's +class down to a specific choice: + +(1) a restricted class is specified when the pseudo is created + + This happens for input address reloads, where the class is taken + from the target's chosen base register class. It also happens + for simple REG reloads, where the class is taken from the chosen + alternative's constraints. + +(2) uses of the reload pseudo as a direct input operand + + In this case get_reload_reg tries to reuse the existing register + and narrow its class, instead of creating a new reload pseudo. + +However, neither occurs here. As described above, r287 rightly +starts out with a wide choice of class, ultimately derived from +ALL_REGS, so we don't get (1). And as the comments in the PR +explain, r287 is never used as an input reload, only the subreg is, +so we don't get (2): + +---------------------------------------------------------------------------- + Choosing alt 13 in insn 317: (0) r (1) w {*movsi_aarch64} + Creating newreg=291, assigning class FP_REGS to r291 + 317: r288:SI=r291:SI + Inserting insn reload before: + 320: r291:SI=r287:DI#0 +---------------------------------------------------------------------------- + +IMO, in this case we should rely on the reload of r316 to narrow +down the class of r278. Currently we do: + +---------------------------------------------------------------------------- + Choosing alt 7 in insn 316: (0) r (1) m {*movdi_aarch64} + Creating newreg=289 from oldreg=287, assigning class GENERAL_REGS to r289 + 316: r289:DI=[r105:DI*0x8+r140:DI] + Inserting insn reload after: + 318: r287:DI=r289:DI +--------------------------------------------------- + +i.e. we create a new pseudo register r289 and give *that* pseudo +GENERAL_REGS instead. This is because get_reload_reg only narrows +down the existing class for OP_IN and OP_INOUT, not OP_OUT. + +But if we have a reload pseudo in a reload instruction and have chosen +a specific class for the reload pseudo, I think we should simply install +it for OP_OUT reloads too, if the class is a subset of the existing class. +We will need to pick such a register whatever happens (for r289 in the +example above). And as explained in the PR, doing this actually avoids +an unnecessary move via the FP registers too. + +The patch is quite aggressive in that it does this for all reload +pseudos in all reload instructions. I wondered about reusing the +condition for a reload move in in_class_p: + + INSN_UID (curr_insn) >= new_insn_uid_start + && curr_insn_set != NULL + && ((OBJECT_P (SET_SRC (curr_insn_set)) + && ! CONSTANT_P (SET_SRC (curr_insn_set))) + || (GET_CODE (SET_SRC (curr_insn_set)) == SUBREG + && OBJECT_P (SUBREG_REG (SET_SRC (curr_insn_set))) + && ! CONSTANT_P (SUBREG_REG (SET_SRC (curr_insn_set))))))) + +but I can't really justify that on first principles. I think we +should apply the rule consistently until we have a specific reason +for doing otherwise. + +gcc/ + PR rtl-optimization/96796 + * lra-constraints.c (in_class_p): Add a default-false + allow_all_reload_class_changes_p parameter. Do not treat + reload moves specially when the parameter is true. + (get_reload_reg): Try to narrow the class of an existing OP_OUT + reload if we're reloading a reload pseudo in a reload instruction. + +gcc/testsuite/ + PR rtl-optimization/96796 + * gcc.c-torture/compile/pr96796.c: New test. +--- + gcc/lra-constraints.c | 54 ++++++++++++++---- + gcc/testsuite/gcc.c-torture/compile/pr96796.c | 55 +++++++++++++++++++ + 2 files changed, 99 insertions(+), 10 deletions(-) + create mode 100644 gcc/testsuite/gcc.c-torture/compile/pr96796.c + +diff --git a/gcc/lra-constraints.c b/gcc/lra-constraints.c +index 580da9c3ed6..161b721efb1 100644 +--- a/gcc/lra-constraints.c ++++ b/gcc/lra-constraints.c +@@ -236,12 +236,17 @@ get_reg_class (int regno) + CL. Use elimination first if REG is a hard register. If REG is a + reload pseudo created by this constraints pass, assume that it will + be allocated a hard register from its allocno class, but allow that +- class to be narrowed to CL if it is currently a superset of CL. ++ class to be narrowed to CL if it is currently a superset of CL and ++ if either: ++ ++ - ALLOW_ALL_RELOAD_CLASS_CHANGES_P is true or ++ - the instruction we're processing is not a reload move. + + If NEW_CLASS is nonnull, set *NEW_CLASS to the new allocno class of + REGNO (reg), or NO_REGS if no change in its class was needed. */ + static bool +-in_class_p (rtx reg, enum reg_class cl, enum reg_class *new_class) ++in_class_p (rtx reg, enum reg_class cl, enum reg_class *new_class, ++ bool allow_all_reload_class_changes_p = false) + { + enum reg_class rclass, common_class; + machine_mode reg_mode; +@@ -266,7 +271,8 @@ in_class_p (rtx reg, enum reg_class cl, enum reg_class *new_class) + typically moves that have many alternatives, and restricting + reload pseudos for one alternative may lead to situations + where other reload pseudos are no longer allocatable. */ +- || (INSN_UID (curr_insn) >= new_insn_uid_start ++ || (!allow_all_reload_class_changes_p ++ && INSN_UID (curr_insn) >= new_insn_uid_start + && curr_insn_set != NULL + && ((OBJECT_P (SET_SRC (curr_insn_set)) + && ! CONSTANT_P (SET_SRC (curr_insn_set))) +@@ -598,13 +604,12 @@ canonicalize_reload_addr (rtx addr) + return addr; + } + +-/* Create a new pseudo using MODE, RCLASS, ORIGINAL or reuse already +- created input reload pseudo (only if TYPE is not OP_OUT). Don't +- reuse pseudo if IN_SUBREG_P is true and the reused pseudo should be +- wrapped up in SUBREG. The result pseudo is returned through +- RESULT_REG. Return TRUE if we created a new pseudo, FALSE if we +- reused the already created input reload pseudo. Use TITLE to +- describe new registers for debug purposes. */ ++/* Create a new pseudo using MODE, RCLASS, ORIGINAL or reuse an existing ++ reload pseudo. Don't reuse an existing reload pseudo if IN_SUBREG_P ++ is true and the reused pseudo should be wrapped up in a SUBREG. ++ The result pseudo is returned through RESULT_REG. Return TRUE if we ++ created a new pseudo, FALSE if we reused an existing reload pseudo. ++ Use TITLE to describe new registers for debug purposes. */ + static bool + get_reload_reg (enum op_type type, machine_mode mode, rtx original, + enum reg_class rclass, bool in_subreg_p, +@@ -616,6 +621,35 @@ get_reload_reg (enum op_type type, machine_mode mode, rtx original, + + if (type == OP_OUT) + { ++ /* Output reload registers tend to start out with a conservative ++ choice of register class. Usually this is ALL_REGS, although ++ a target might narrow it (for performance reasons) through ++ targetm.preferred_reload_class. It's therefore quite common ++ for a reload instruction to require a more restrictive class ++ than the class that was originally assigned to the reload register. ++ ++ In these situations, it's more efficient to refine the choice ++ of register class rather than create a second reload register. ++ This also helps to avoid cycling for registers that are only ++ used by reload instructions. */ ++ if (REG_P (original) ++ && (int) REGNO (original) >= new_regno_start ++ && INSN_UID (curr_insn) >= new_insn_uid_start ++ && in_class_p (original, rclass, &new_class, true)) ++ { ++ unsigned int regno = REGNO (original); ++ if (lra_dump_file != NULL) ++ { ++ fprintf (lra_dump_file, " Reuse r%d for output ", regno); ++ dump_value_slim (lra_dump_file, original, 1); ++ } ++ if (new_class != lra_get_allocno_class (regno)) ++ lra_change_class (regno, new_class, ", change to", false); ++ if (lra_dump_file != NULL) ++ fprintf (lra_dump_file, "\n"); ++ *result_reg = original; ++ return false; ++ } + *result_reg + = lra_create_new_reg_with_unique_value (mode, original, rclass, title); + return true; +diff --git a/gcc/testsuite/gcc.c-torture/compile/pr96796.c b/gcc/testsuite/gcc.c-torture/compile/pr96796.c +new file mode 100644 +index 00000000000..8808e62fe77 +--- /dev/null ++++ b/gcc/testsuite/gcc.c-torture/compile/pr96796.c +@@ -0,0 +1,55 @@ ++/* { dg-additional-options "-fcommon" } */ ++ ++struct S0 { ++ signed f0 : 8; ++ unsigned f1; ++ unsigned f4; ++}; ++struct S1 { ++ long f3; ++ char f4; ++} g_3_4; ++ ++int g_5, func_1_l_32, func_50___trans_tmp_31; ++static struct S0 g_144, g_834, g_1255, g_1261; ++ ++int g_273[120] = {}; ++int *g_555; ++char **g_979; ++static int g_1092_0; ++static int g_1193; ++int safe_mul_func_int16_t_s_s(int si1, int si2) { return si1 * si2; } ++static struct S0 *func_50(); ++int func_1() { func_50(g_3_4, g_5, func_1_l_32, 8, 3); } ++void safe_div_func_int64_t_s_s(int *); ++void safe_mod_func_uint32_t_u_u(struct S0); ++struct S0 *func_50(int p_51, struct S0 p_52, struct S1 p_53, int p_54, ++ int p_55) { ++ int __trans_tmp_30; ++ char __trans_tmp_22; ++ short __trans_tmp_19; ++ long l_985_1; ++ long l_1191[8]; ++ safe_div_func_int64_t_s_s(g_273); ++ __builtin_printf((char*)g_1261.f4); ++ safe_mod_func_uint32_t_u_u(g_834); ++ g_144.f0 += 1; ++ for (;;) { ++ struct S1 l_1350 = {&l_1350}; ++ for (; p_53.f3; p_53.f3 -= 1) ++ for (; g_1193 <= 2; g_1193 += 1) { ++ __trans_tmp_19 = safe_mul_func_int16_t_s_s(l_1191[l_985_1 + p_53.f3], ++ p_55 % (**g_979 = 10)); ++ __trans_tmp_22 = g_1255.f1 * p_53.f4; ++ __trans_tmp_30 = __trans_tmp_19 + __trans_tmp_22; ++ if (__trans_tmp_30) ++ g_1261.f0 = p_51; ++ else { ++ g_1255.f0 = p_53.f3; ++ int *l_1422 = g_834.f0 = g_144.f4 != (*l_1422)++ > 0 < 0 ^ 51; ++ g_555 = ~0; ++ g_1092_0 |= func_50___trans_tmp_31; ++ } ++ } ++ } ++} +-- +2.18.4 + diff --git a/infra/libkookie/nixpkgs/pkgs/development/compilers/gcc/9/default.nix b/infra/libkookie/nixpkgs/pkgs/development/compilers/gcc/9/default.nix index 305ed56df78c..c64a9dcc3f57 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/compilers/gcc/9/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/compilers/gcc/9/default.nix @@ -58,7 +58,13 @@ let majorVersion = "9"; inherit (stdenv) buildPlatform hostPlatform targetPlatform; patches = - optional (targetPlatform != hostPlatform) ../libstdc++-target.patch + # Fix ICE: Max. number of generated reload insns per insn is achieved (90) + # + # https://gcc.gnu.org/bugzilla/show_bug.cgi?id=96796 + # + # This patch can most likely be removed by a post 9.3.0-release. + [ ./avoid-cycling-subreg-reloads.patch ] + ++ optional (targetPlatform != hostPlatform) ../libstdc++-target.patch ++ optional noSysDirs ../no-sys-dirs.patch /* ++ optional (hostPlatform != buildPlatform) (fetchpatch { # XXX: Refine when this should be applied url = "https://git.busybox.net/buildroot/plain/package/gcc/${version}/0900-remove-selftests.patch?id=11271540bfe6adafbc133caf6b5b902a816f5f02"; diff --git a/infra/libkookie/nixpkgs/pkgs/development/compilers/gcc/builder.sh b/infra/libkookie/nixpkgs/pkgs/development/compilers/gcc/builder.sh index 2204744a4b59..e1c4768413f4 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/compilers/gcc/builder.sh +++ b/infra/libkookie/nixpkgs/pkgs/development/compilers/gcc/builder.sh @@ -287,7 +287,12 @@ postInstall() { done # Two identical man pages are shipped (moving and compressing is done later) - ln -sf gcc.1 "$out"/share/man/man1/g++.1 + for i in "$out"/share/man/man1/*g++.1; do + if test -e "$i"; then + man_prefix=`echo "$i" | sed "s,.*/\(.*\)g++.1,\1,"` + ln -sf "$man_prefix"gcc.1 "$i" + fi + done } genericBuild diff --git a/infra/libkookie/nixpkgs/pkgs/development/compilers/gerbil/gerbil-ethereum.nix b/infra/libkookie/nixpkgs/pkgs/development/compilers/gerbil/gerbil-ethereum.nix index 9b90cc053e1e..e498818d2e61 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/compilers/gerbil/gerbil-ethereum.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/compilers/gerbil/gerbil-ethereum.nix @@ -2,8 +2,8 @@ gerbil-support.gerbilPackage { pname = "gerbil-ethereum"; - version = "unstable-2020-08-02"; - git-version = "0.0-15-g7cd2dd7"; + version = "unstable-2020-10-18"; + git-version = "0.0-26-gf27ada8"; gerbil-package = "mukn/ethereum"; gerbil = gerbil-unstable; gerbilInputs = with gerbil-support.gerbilPackages-unstable; @@ -15,8 +15,8 @@ gerbil-support.gerbilPackage { src = fetchFromGitHub { owner = "fare"; repo = "gerbil-ethereum"; - rev = "7cd2dd7436b11917d0729dbafe087cfa8ec38f86"; - sha256 = "0qq3ch2dg735yrj3l2c9pb9qlvz98x3vjfi2xyr4fwr78smpqgb5"; + rev = "f27ada8e7f4de4f8fbdfede9fe055914b254d8e7"; + sha256 = "1lykjqim6a44whj1r8kkpiz68wghkfqx5vjlrc2ldxlmgd4r9gvd"; }; meta = { description = "Gerbil Ethereum: a Scheme alternative to web3.js"; diff --git a/infra/libkookie/nixpkgs/pkgs/development/compilers/gerbil/gerbil-libp2p.nix b/infra/libkookie/nixpkgs/pkgs/development/compilers/gerbil/gerbil-libp2p.nix new file mode 100644 index 000000000000..336f5af89c3b --- /dev/null +++ b/infra/libkookie/nixpkgs/pkgs/development/compilers/gerbil/gerbil-libp2p.nix @@ -0,0 +1,27 @@ +{ pkgs, lib, fetchFromGitHub, gerbil-unstable, gerbil-support, gambit-support }: + +gerbil-support.gerbilPackage { + pname = "gerbil-libp2p"; + version = "unstable-2018-12-27"; + git-version = "2376b3f"; + gerbil-package = "vyzo"; + gerbil = gerbil-unstable; + gerbilInputs = []; + buildInputs = []; # Note: at *runtime*, depends on go-libp2p-daemon + gambit-params = gambit-support.unstable-params; + version-path = "version"; + softwareName = "Gerbil-libp2p"; + src = fetchFromGitHub { + owner = "vyzo"; + repo = "gerbil-libp2p"; + rev = "2376b3f39cee04dd4ec455c8ea4e5faa93c2bf88"; + sha256 = "0jcy7hfg953078msigyfwp2g4ii44pi6q7vcpmq01cbbvxpxz6zw"; + }; + meta = { + description = "Gerbil libp2p: use libp2p from Gerbil"; + homepage = "https://github.com/vyzo/gerbil-libp2p"; + license = lib.licenses.mit; + platforms = lib.platforms.unix; + maintainers = with lib.maintainers; [ fare ]; + }; +} diff --git a/infra/libkookie/nixpkgs/pkgs/development/compilers/gerbil/gerbil-persist.nix b/infra/libkookie/nixpkgs/pkgs/development/compilers/gerbil/gerbil-persist.nix index 1be6684bf440..74485c19c2d0 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/compilers/gerbil/gerbil-persist.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/compilers/gerbil/gerbil-persist.nix @@ -2,8 +2,8 @@ gerbil-support.gerbilPackage { pname = "gerbil-persist"; - version = "unstable-2020-08-02"; - git-version = "0.0-4-ga3b2bd1"; + version = "unstable-2020-08-31"; + git-version = "0.0-8-gd211390"; gerbil-package = "clan/persist"; gerbil = gerbil-unstable; gerbilInputs = with gerbil-support.gerbilPackages-unstable; [gerbil-utils gerbil-crypto gerbil-poo]; @@ -14,8 +14,8 @@ gerbil-support.gerbilPackage { src = fetchFromGitHub { owner = "fare"; repo = "gerbil-persist"; - rev = "a3b2bd104612db0e4492737f09f72adea6684483"; - sha256 = "0mc01wva26ww1i7n8naa95mfw7i6lj8qg0bwsik7gb3dsj2acjvh"; + rev = "d211390c8a199cf2b8c7400cd98977524e960015"; + sha256 = "13s6ws8ziwalfp23nalss41qnz667z2712lr3y123sypm5n5axk7"; }; meta = { description = "Gerbil Persist: Persistent data and activities"; diff --git a/infra/libkookie/nixpkgs/pkgs/development/compilers/gerbil/gerbil-poo.nix b/infra/libkookie/nixpkgs/pkgs/development/compilers/gerbil/gerbil-poo.nix index 55673368eead..c6580ea0c77a 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/compilers/gerbil/gerbil-poo.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/compilers/gerbil/gerbil-poo.nix @@ -2,8 +2,8 @@ gerbil-support.gerbilPackage { pname = "gerbil-ethereum"; - version = "unstable-2020-08-02"; - git-version = "0.0-13-g1014154"; + version = "unstable-2020-10-17"; + git-version = "0.0-35-g44d490d"; gerbil-package = "clan/poo"; gerbil = gerbil-unstable; gerbilInputs = with gerbil-support.gerbilPackages-unstable; [gerbil-utils gerbil-crypto]; @@ -14,8 +14,8 @@ gerbil-support.gerbilPackage { src = fetchFromGitHub { owner = "fare"; repo = "gerbil-poo"; - rev = "1014154fe4943dfbec7524666c831b601ba88559"; - sha256 = "0g8l5mi007n07qs79m9h3h3am1p7h0kzq7yb49h562b8frh5gp97"; + rev = "44d490d95b9d1b5d54eaedf2602419af8e086837"; + sha256 = "082ndpy281saybcnp3bdidcibkk2ih6glrkbb5fdj1524ban4d0k"; }; meta = { description = "Gerbil POO: Prototype Object Orientation for Gerbil Scheme"; diff --git a/infra/libkookie/nixpkgs/pkgs/development/compilers/gerbil/gerbil-support.nix b/infra/libkookie/nixpkgs/pkgs/development/compilers/gerbil/gerbil-support.nix index e3f4bb0e0d25..9cb9954544c7 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/compilers/gerbil/gerbil-support.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/compilers/gerbil/gerbil-support.nix @@ -1,14 +1,16 @@ -{ pkgs, gccStdenv, callPackage, fetchFromGitHub }: +{ pkgs, lib, gccStdenv, callPackage, fetchFromGitHub }: # See ../gambit/build.nix regarding gccStdenv rec { # Gerbil libraries gerbilPackages-unstable = { + gerbil-libp2p = callPackage ./gerbil-libp2p.nix { }; gerbil-utils = callPackage ./gerbil-utils.nix { }; gerbil-crypto = callPackage ./gerbil-crypto.nix { }; gerbil-poo = callPackage ./gerbil-poo.nix { }; gerbil-persist = callPackage ./gerbil-persist.nix { }; gerbil-ethereum = callPackage ./gerbil-ethereum.nix { }; + smug-gerbil = callPackage ./smug-gerbil.nix { }; }; # Use this function in any package that uses Gerbil libraries, to define the GERBIL_LOADPATH. @@ -23,6 +25,7 @@ rec { gambit-params ? pkgs.gambit-support.stable-params, gerbilInputs ? [], buildInputs ? [], + buildScript ? "./build.ss", softwareName ? ""} : let buildInputs_ = buildInputs; in gccStdenv.mkDerivation rec { @@ -33,8 +36,8 @@ rec { set -e ; if [ -n "${version-path}.ss" ] ; then echo -e '(import :clan/versioning${builtins.concatStringsSep "" - (map (x : if x.passthru.version-path != "" - then " :${x.passthru.gerbil-package}/${x.passthru.version-path}" else "") + (map (x : lib.optionalString (x.passthru.version-path != "") + " :${x.passthru.gerbil-package}/${x.passthru.version-path}") gerbilInputs) })\n(register-software "${softwareName}" "v${git-version}")\n' > "${passthru.version-path}.ss" fi @@ -50,7 +53,7 @@ rec { buildPhase = '' runHook preBuild - ./build.ss + ${buildScript} runHook postBuild ''; diff --git a/infra/libkookie/nixpkgs/pkgs/development/compilers/gerbil/gerbil-utils.nix b/infra/libkookie/nixpkgs/pkgs/development/compilers/gerbil/gerbil-utils.nix index 7e1a9bf05574..6d89e1181f2d 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/compilers/gerbil/gerbil-utils.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/compilers/gerbil/gerbil-utils.nix @@ -2,8 +2,8 @@ gerbil-support.gerbilPackage { pname = "gerbil-utils"; - version = "unstable-2020-08-02"; - git-version = "0.2-21-g7e7d053"; + version = "unstable-2020-10-18"; + git-version = "0.2-36-g8b481b7"; gerbil-package = "clan"; gerbil = gerbil-unstable; gambit-params = gambit-support.unstable-params; @@ -12,8 +12,8 @@ gerbil-support.gerbilPackage { src = fetchFromGitHub { owner = "fare"; repo = "gerbil-utils"; - rev = "7e7d053ec5e78cc58d38cb03baf554d83b31b0c6"; - sha256 = "078vqdcddfavqq0d9pw430iz1562cgx1ck3fw6dpwxjkyc6m4bms"; + rev = "8b481b787e13e07e14d0718d670aab016131a090"; + sha256 = "0br8k5b2wcv4wcp65r2bfhji3af2qgqjspf41syqslq9awx47f3m"; }; meta = { description = "Gerbil Clan: Community curated Collection of Common Utilities"; diff --git a/infra/libkookie/nixpkgs/pkgs/development/compilers/gerbil/smug-gerbil.nix b/infra/libkookie/nixpkgs/pkgs/development/compilers/gerbil/smug-gerbil.nix new file mode 100644 index 000000000000..732cdb500b9b --- /dev/null +++ b/infra/libkookie/nixpkgs/pkgs/development/compilers/gerbil/smug-gerbil.nix @@ -0,0 +1,30 @@ +{ pkgs, lib, fetchFromGitHub, gerbil-unstable, gerbil-support, gambit-support }: + +gerbil-support.gerbilPackage { + pname = "smug-gerbil"; + version = "unstable-2019-12-24"; + git-version = "95d60d4"; + gerbil-package = "drewc/smug"; + gerbil = gerbil-unstable; + gerbilInputs = []; + buildInputs = []; + gambit-params = gambit-support.unstable-params; + version-path = ""; #"version"; + softwareName = "Smug-Gerbil"; + src = fetchFromGitHub { + owner = "drewc"; + repo = "smug-gerbil"; + rev = "95d60d486c1603743c6d3c525e6d5f5761b984e5"; + sha256 = "0ys07z78gq60z833si2j7xa1scqvbljlx1zb32vdf32f1b27c04j"; + }; + meta = { + description = "Super Monadic Über Go-into : Parsers and Gerbil Scheme"; + homepage = "https://github.com/drewc/smug-gerbil"; + license = lib.licenses.mit; + platforms = lib.platforms.unix; + maintainers = with lib.maintainers; [ fare ]; + }; + buildScript = '' + for i in primitive simple tokens smug ; do gxc -O $i.ss ; done + ''; +} diff --git a/infra/libkookie/nixpkgs/pkgs/development/compilers/gerbil/unstable.nix b/infra/libkookie/nixpkgs/pkgs/development/compilers/gerbil/unstable.nix index 7b54438b5c9a..d4ff3ca7a98a 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/compilers/gerbil/unstable.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/compilers/gerbil/unstable.nix @@ -1,13 +1,13 @@ { callPackage, fetchFromGitHub, gambit-unstable, gambit-support }: callPackage ./build.nix rec { - version = "unstable-2020-08-02"; - git-version = "0.16-120-g3f248e13"; + version = "unstable-2020-11-05"; + git-version = "0.16-152-g808929ae"; src = fetchFromGitHub { owner = "vyzo"; repo = "gerbil"; - rev = "3f248e139dfa11be74284fc812253fbecafbaf31"; - sha256 = "18v192cypj0nbmfcyflm8qnwp27qwy65m0a19ggs47wwbzhgvgqh"; + rev = "808929aeb8823959191f35df53bc0c0150911b4b"; + sha256 = "0d9k2gkrs9qvlnk7xa3gjzs3gln3ydds7yd2313pvbw4q2lcz8iw"; }; inherit gambit-support; gambit = gambit-unstable; diff --git a/infra/libkookie/nixpkgs/pkgs/development/compilers/ghc/8.10.1.nix b/infra/libkookie/nixpkgs/pkgs/development/compilers/ghc/8.10.1.nix index d3835d01e5a2..42eb994b8fe2 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/compilers/ghc/8.10.1.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/compilers/ghc/8.10.1.nix @@ -246,6 +246,7 @@ stdenv.mkDerivation (rec { homepage = "http://haskell.org/ghc"; description = "The Glasgow Haskell Compiler"; maintainers = with stdenv.lib.maintainers; [ marcweber andres peti ]; + timeout = 24 * 3600; inherit (ghc.meta) license platforms; }; diff --git a/infra/libkookie/nixpkgs/pkgs/development/compilers/ghc/8.10.2-binary.nix b/infra/libkookie/nixpkgs/pkgs/development/compilers/ghc/8.10.2-binary.nix index baa1d879b53e..1a1a9ca0160e 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/compilers/ghc/8.10.2-binary.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/compilers/ghc/8.10.2-binary.nix @@ -2,6 +2,12 @@ , fetchurl, perl, gcc , ncurses6, gmp, glibc, libiconv, numactl , llvmPackages + + # minimal = true; will remove files that aren't strictly necessary for + # regular builds and GHC bootstrapping. + # This is "useful" for staying within hydra's output limits for at least the + # aarch64-linux architecture. +, minimal ? false }: # Prebuilt only does native @@ -82,7 +88,6 @@ stdenv.mkDerivation rec { patchShebangs ghc-${version}/utils/ patchShebangs ghc-${version}/configure '' + - # We have to patch the GMP paths for the integer-gmp package. '' find . -name integer-gmp.buildinfo \ @@ -91,6 +96,12 @@ stdenv.mkDerivation rec { find . -name base.buildinfo \ -exec sed -i "s@extra-lib-dirs: @extra-lib-dirs: ${libiconv}/lib@" {} \; '' + + # aarch64 does HAVE_NUMA so -lnuma requires it in library-dirs in rts/package.conf.in + # FFI_LIB_DIR is a good indication of places it must be needed. + stdenv.lib.optionalString stdenv.hostPlatform.isAarch64 '' + find . -name package.conf.in \ + -exec sed -i "s@FFI_LIB_DIR@FFI_LIB_DIR ${numactl.out}/lib@g" {} \; + '' + # Rename needed libraries and binaries, fix interpreter stdenv.lib.optionalString stdenv.isLinux '' find . -type f -perm -0100 -exec patchelf \ @@ -128,14 +139,35 @@ stdenv.mkDerivation rec { # On Linux, use patchelf to modify the executables so that they can # find editline/gmp. - postFixup = stdenv.lib.optionalString stdenv.isLinux '' - for p in $(find "$out" -type f -executable); do - if isELF "$p"; then - echo "Patchelfing $p" - patchelf --set-rpath "${libPath}:$(patchelf --print-rpath $p)" $p - fi - done - '' + stdenv.lib.optionalString stdenv.isDarwin '' + postFixup = stdenv.lib.optionalString stdenv.isLinux + (if stdenv.hostPlatform.isAarch64 then + # Keep rpath as small as possible on aarch64 for patchelf#244. All Elfs + # are 2 directories deep from $out/lib, so pooling symlinks there makes + # a short rpath. + '' + (cd $out/lib; ln -s ${ncurses6.out}/lib/libtinfo.so.6) + (cd $out/lib; ln -s ${gmp.out}/lib/libgmp.so.10) + (cd $out/lib; ln -s ${numactl.out}/lib/libnuma.so.1) + for p in $(find "$out/lib" -type f -name "*\.so*"); do + (cd $out/lib; ln -s $p) + done + + for p in $(find "$out/lib" -type f -executable); do + if isELF "$p"; then + echo "Patchelfing $p" + patchelf --set-rpath "\$ORIGIN:\$ORIGIN/../.." $p + fi + done + '' + else + '' + for p in $(find "$out" -type f -executable); do + if isELF "$p"; then + echo "Patchelfing $p" + patchelf --set-rpath "${libPath}:$(patchelf --print-rpath $p)" $p + fi + done + '') + stdenv.lib.optionalString stdenv.isDarwin '' # not enough room in the object files for the full path to libiconv :( for exe in $(find "$out" -type f -executable); do isScript $exe && continue @@ -146,6 +178,17 @@ stdenv.mkDerivation rec { for file in $(find "$out" -name setup-config); do substituteInPlace $file --replace /usr/bin/ranlib "$(type -P ranlib)" done + '' + + stdenv.lib.optionalString minimal '' + # Remove profiling files + find $out -type f -name '*.p_o' -delete + find $out -type f -name '*.p_hi' -delete + find $out -type f -name '*_p.a' -delete + rm $out/lib/ghc-*/bin/ghc-iserv-prof + # Hydra will redistribute this derivation, so we have to keep the docs for + # legal reasons (retaining the legal notices etc) + # As a last resort we could unpack the docs separately and symlink them in. + # They're in $out/share/{doc,man}. ''; doInstallCheck = true; @@ -169,6 +212,11 @@ stdenv.mkDerivation rec { enableShared = true; }; - meta.license = stdenv.lib.licenses.bsd3; - meta.platforms = ["x86_64-linux" "armv7l-linux" "aarch64-linux" "i686-linux" "x86_64-darwin"]; + meta = { + homepage = "http://haskell.org/ghc"; + description = "The Glasgow Haskell Compiler"; + license = stdenv.lib.licenses.bsd3; + platforms = ["x86_64-linux" "armv7l-linux" "aarch64-linux" "i686-linux" "x86_64-darwin"]; + maintainers = with stdenv.lib.maintainers; [ lostnet ]; + }; } diff --git a/infra/libkookie/nixpkgs/pkgs/development/compilers/ghc/8.10.2.nix b/infra/libkookie/nixpkgs/pkgs/development/compilers/ghc/8.10.2.nix index f3d64ced81ee..fac12099d5db 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/compilers/ghc/8.10.2.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/compilers/ghc/8.10.2.nix @@ -2,7 +2,7 @@ # build-tools , bootPkgs -, autoconf, automake, coreutils, fetchurl, perl, python3, m4, sphinx +, autoconf, automake, coreutils, fetchpatch, fetchurl, perl, python3, m4, sphinx , bash , libiconv ? null, ncurses @@ -107,9 +107,15 @@ stdenv.mkDerivation (rec { outputs = [ "out" "doc" ]; - # https://gitlab.haskell.org/ghc/ghc/-/issues/18549 - patches = [ - ./issue-18549.patch + # https://gitlab.haskell.org/ghc/ghc/-/issues/18549 + patches = [ + ./issue-18549.patch + ] ++ stdenv.lib.optionals stdenv.isDarwin [ + # Make Block.h compile with c++ compilers. Remove with the next release + (fetchpatch { + url = "https://gitlab.haskell.org/ghc/ghc/-/commit/97d0b0a367e4c6a52a17c3299439ac7de129da24.patch"; + sha256 = "0r4zjj0bv1x1m2dgxp3adsf2xkr94fjnyj1igsivd9ilbs5ja0b5"; + }) ]; postPatch = "patchShebangs ."; @@ -190,7 +196,7 @@ stdenv.mkDerivation (rec { strictDeps = true; # Don’t add -liconv to LDFLAGS automatically so that GHC will add it itself. - dontAddExtraLibs = true; + dontAddExtraLibs = true; nativeBuildInputs = [ perl autoconf automake m4 python3 sphinx @@ -242,6 +248,7 @@ stdenv.mkDerivation (rec { homepage = "http://haskell.org/ghc"; description = "The Glasgow Haskell Compiler"; maintainers = with stdenv.lib.maintainers; [ marcweber andres peti ]; + timeout = 24 * 3600; inherit (ghc.meta) license platforms; }; diff --git a/infra/libkookie/nixpkgs/pkgs/development/compilers/ghc/8.6.5-binary.nix b/infra/libkookie/nixpkgs/pkgs/development/compilers/ghc/8.6.5-binary.nix index 41af279e83ff..9234e3b14571 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/compilers/ghc/8.6.5-binary.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/compilers/ghc/8.6.5-binary.nix @@ -1,6 +1,6 @@ { stdenv , fetchurl, perl, gcc -, ncurses5, gmp, glibc, libiconv +, ncurses5, ncurses6, gmp, glibc, libiconv , llvmPackages }: @@ -10,8 +10,12 @@ assert stdenv.targetPlatform == stdenv.hostPlatform; let useLLVM = !stdenv.targetPlatform.isx86; + useNcurses6 = stdenv.hostPlatform.system == "x86_64-linux"; + + ourNcurses = if useNcurses6 then ncurses6 else ncurses5; + libPath = stdenv.lib.makeLibraryPath ([ - ncurses5 gmp + ourNcurses gmp ] ++ stdenv.lib.optional (stdenv.hostPlatform.isDarwin) libiconv); libEnvVar = stdenv.lib.optionalString stdenv.hostPlatform.isDarwin "DY" @@ -34,12 +38,16 @@ stdenv.mkDerivation rec { # https://downloads.haskell.org/~ghc/8.6.5/ src = fetchurl ({ i686-linux = { + # Don't use the Fedora27 build (as below) because there isn't one! url = "http://haskell.org/ghc/dist/${version}/ghc-${version}-i386-deb9-linux.tar.xz"; sha256 = "1p2h29qghql19ajk755xa0yxkn85slbds8m9n5196ris743vkp8w"; }; x86_64-linux = { - url = "http://haskell.org/ghc/dist/${version}/ghc-${version}-x86_64-deb9-linux.tar.xz"; - sha256 = "1pqlx6rdjs2110g0y1i9f8x18lmdizibjqd15f5xahcz39hgaxdw"; + # This is the Fedora build because it links against ncurses6 where the + # deb9 one links against ncurses5, see here + # https://github.com/NixOS/nixpkgs/issues/85924 for a discussion + url = "http://haskell.org/ghc/dist/${version}/ghc-${version}-x86_64-fedora27-linux.tar.xz"; + sha256 = "18dlqm5d028fqh6ghzn7pgjspr5smw030jjzl3kq6q1kmwzbay6g"; }; aarch64-linux = { url = "http://haskell.org/ghc/dist/${version}/ghc-${version}-aarch64-ubuntu18.04-linux.tar.xz"; @@ -88,9 +96,12 @@ stdenv.mkDerivation rec { '' + # Rename needed libraries and binaries, fix interpreter stdenv.lib.optionalString stdenv.isLinux '' - find . -type f -perm -0100 -exec patchelf \ + find . -type f -perm -0100 \ + -exec patchelf \ --replace-needed libncurses${stdenv.lib.optionalString stdenv.is64bit "w"}.so.5 libncurses.so \ - --replace-needed libtinfo.so libtinfo.so.5 \ + ${ # This isn't required for x86_64-linux where we use ncurses6 + stdenv.lib.optionalString (!useNcurses6) "--replace-needed libtinfo.so libtinfo.so.5" + } \ --interpreter ${glibcDynLinker} {} \; sed -i "s|/usr/bin/perl|perl\x00 |" ghc-${version}/ghc/stage2/build/tmp/ghc-stage2 diff --git a/infra/libkookie/nixpkgs/pkgs/development/compilers/ghc/8.6.5.nix b/infra/libkookie/nixpkgs/pkgs/development/compilers/ghc/8.6.5.nix index a5d2bb5c88d6..7adacff597ca 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/compilers/ghc/8.6.5.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/compilers/ghc/8.6.5.nix @@ -110,10 +110,10 @@ stdenv.mkDerivation (rec { outputs = [ "out" "doc" ]; patches = [ - (fetchpatch rec { # https://phabricator.haskell.org/D5123 - url = "http://tarballs.nixos.org/sha256/${sha256}"; + (fetchpatch { # https://phabricator.haskell.org/D5123 + url = "https://gitlab.haskell.org/ghc/ghc/-/commit/13ff0b7ced097286e0d7b054f050871effe07f86.diff"; name = "D5123.diff"; - sha256 = "0nhqwdamf2y4gbwqxcgjxs0kqx23w9gv5kj0zv6450dq19rji82n"; + sha256 = "140lmnqxra7xkwy370c5pyf8dgdwgmbpcrs1dapnwr2dh8bavn8c"; }) (fetchpatch { # https://github.com/haskell/haddock/issues/900 url = "https://patch-diff.githubusercontent.com/raw/haskell/haddock/pull/983.diff"; @@ -256,6 +256,7 @@ stdenv.mkDerivation (rec { homepage = "http://haskell.org/ghc"; description = "The Glasgow Haskell Compiler"; maintainers = with stdenv.lib.maintainers; [ marcweber andres peti ]; + timeout = 24 * 3600; inherit (ghc.meta) license platforms; }; diff --git a/infra/libkookie/nixpkgs/pkgs/development/compilers/ghc/8.8.2.nix b/infra/libkookie/nixpkgs/pkgs/development/compilers/ghc/8.8.2.nix index 371a369496ee..fbb75637df65 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/compilers/ghc/8.8.2.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/compilers/ghc/8.8.2.nix @@ -241,6 +241,7 @@ stdenv.mkDerivation (rec { homepage = "http://haskell.org/ghc"; description = "The Glasgow Haskell Compiler"; maintainers = with stdenv.lib.maintainers; [ marcweber andres peti ]; + timeout = 24 * 3600; inherit (ghc.meta) license platforms; }; diff --git a/infra/libkookie/nixpkgs/pkgs/development/compilers/ghc/8.8.3.nix b/infra/libkookie/nixpkgs/pkgs/development/compilers/ghc/8.8.3.nix index e26eacca204b..538655a0d056 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/compilers/ghc/8.8.3.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/compilers/ghc/8.8.3.nix @@ -246,6 +246,7 @@ stdenv.mkDerivation (rec { homepage = "http://haskell.org/ghc"; description = "The Glasgow Haskell Compiler"; maintainers = with stdenv.lib.maintainers; [ marcweber andres peti ]; + timeout = 24 * 3600; inherit (ghc.meta) license platforms; }; diff --git a/infra/libkookie/nixpkgs/pkgs/development/compilers/ghc/8.8.4.nix b/infra/libkookie/nixpkgs/pkgs/development/compilers/ghc/8.8.4.nix index 22a9e6e25f9f..e69766bccdaa 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/compilers/ghc/8.8.4.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/compilers/ghc/8.8.4.nix @@ -119,7 +119,11 @@ stdenv.mkDerivation (rec { postPatch = "patchShebangs ."; # GHC is a bit confused on its cross terminology. - preConfigure = '' + preConfigure = stdenv.lib.optionalString stdenv.isAarch64 '' + # Aarch64 allow backward bootstrapping since earlier versions are unstable. + find . -name \*\.cabal\* -exec sed -i -e 's/\(base.*\)4.14/\14.16/' {} \; \ + -exec sed -i -e 's/\(prim.*\)0.6/\10.8/' {} \; + '' + '' for env in $(env | grep '^TARGET_' | sed -E 's|\+?=.*||'); do export "''${env#TARGET_}=''${!env}" done @@ -246,6 +250,7 @@ stdenv.mkDerivation (rec { homepage = "http://haskell.org/ghc"; description = "The Glasgow Haskell Compiler"; maintainers = with stdenv.lib.maintainers; [ marcweber andres peti ]; + timeout = 24 * 3600; inherit (ghc.meta) license platforms; }; diff --git a/infra/libkookie/nixpkgs/pkgs/development/compilers/ghc/9.0.1.nix b/infra/libkookie/nixpkgs/pkgs/development/compilers/ghc/9.0.1.nix index 23daee56a75f..bdb1a7555c21 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/compilers/ghc/9.0.1.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/compilers/ghc/9.0.1.nix @@ -237,6 +237,7 @@ stdenv.mkDerivation (rec { homepage = "http://haskell.org/ghc"; description = "The Glasgow Haskell Compiler"; maintainers = with stdenv.lib.maintainers; [ marcweber andres peti ]; + timeout = 24 * 3600; inherit (ghc.meta) license platforms; }; diff --git a/infra/libkookie/nixpkgs/pkgs/development/compilers/ghcjs-ng/default.nix b/infra/libkookie/nixpkgs/pkgs/development/compilers/ghcjs-ng/default.nix index 7b6fbc460a95..c6c81491fe6d 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/compilers/ghcjs-ng/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/compilers/ghcjs-ng/default.nix @@ -104,4 +104,6 @@ in stdenv.mkDerivation { meta.platforms = passthru.bootPkgs.ghc.meta.platforms; meta.maintainers = [lib.maintainers.elvishjerricco]; + meta.hydraPlatforms = []; + meta.broken = true; # https://hydra.nixos.org/build/129701778 } diff --git a/infra/libkookie/nixpkgs/pkgs/development/compilers/gleam/default.nix b/infra/libkookie/nixpkgs/pkgs/development/compilers/gleam/default.nix index a40065fe579c..f96f2f724a60 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/compilers/gleam/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/compilers/gleam/default.nix @@ -2,13 +2,13 @@ rustPlatform.buildRustPackage rec { pname = "gleam"; - version = "0.11.2"; + version = "0.12.1"; src = fetchFromGitHub { owner = "gleam-lang"; repo = pname; rev = "v${version}"; - sha256 = "1g8yfp1xpkv1lqz8azam40cvrs5cggxlyrb72h8k88br75qmi6hj"; + sha256 = "0n23pn7jk4i2waczw5cczsb7v4lal4x6xqmp01y280hb2vk176fg"; }; nativeBuildInputs = [ pkg-config ]; @@ -16,12 +16,12 @@ rustPlatform.buildRustPackage rec { buildInputs = [ openssl ] ++ stdenv.lib.optionals stdenv.isDarwin [ Security ]; - cargoSha256 = "1gfr6c4i5kx8x3q23s4b4n25z2k6xkxpk12acr4ry97pyj2lr5wq"; + cargoSha256 = "0rnf9agpzlvk53x8zrg32w6r0gxcbank3fs32ydv53frvqv1spj3"; meta = with stdenv.lib; { description = "A statically typed language for the Erlang VM"; homepage = "https://gleam.run/"; license = licenses.asl20; - maintainers = with maintainers; [ filalex77 ]; + maintainers = with maintainers; [ Br1ght0ne ]; }; } diff --git a/infra/libkookie/nixpkgs/pkgs/development/compilers/go-jsonnet/default.nix b/infra/libkookie/nixpkgs/pkgs/development/compilers/go-jsonnet/default.nix index 04af8e912517..1d8b912a978b 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/compilers/go-jsonnet/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/compilers/go-jsonnet/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "go-jsonnet"; - version = "0.16.0"; + version = "0.17.0"; src = fetchFromGitHub { owner = "google"; repo = "go-jsonnet"; rev = "v${version}"; - sha256 = "17606gc75wnkm64am4hmlv7m3fy2hi8rnzadp6nrgpcd6rl26m83"; + sha256 = "1rprs8l15nbrx4dw4pdg81c5l22zhj80pl4zwqgsm4113wyyvc98"; }; vendorSha256 = "0nsm4gsbbn8myz4yfi6m7qc3iizhdambsr18iks0clkdn3mi2jn1"; diff --git a/infra/libkookie/nixpkgs/pkgs/development/compilers/go/1.14.nix b/infra/libkookie/nixpkgs/pkgs/development/compilers/go/1.14.nix index e9adb0522c8a..34b37926ea6f 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/compilers/go/1.14.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/compilers/go/1.14.nix @@ -36,11 +36,11 @@ in stdenv.mkDerivation rec { pname = "go"; - version = "1.14.10"; + version = "1.14.13"; src = fetchurl { url = "https://dl.google.com/go/go${version}.src.tar.gz"; - sha256 = "0rfnjl582cm5klv8c2qyyvn26807zn89m5mk282gkc7awfkrjxmk"; + sha256 = "0xxins5crcgghgvnzplmp0qyv2gbmh36v1fpl15d03jwdd6287ds"; }; # perl is used for testing go vet diff --git a/infra/libkookie/nixpkgs/pkgs/development/compilers/go/1.15.nix b/infra/libkookie/nixpkgs/pkgs/development/compilers/go/1.15.nix index 8e692dca1e0d..b0803b6c7a7d 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/compilers/go/1.15.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/compilers/go/1.15.nix @@ -36,11 +36,11 @@ in stdenv.mkDerivation rec { pname = "go"; - version = "1.15.3"; + version = "1.15.6"; src = fetchurl { url = "https://dl.google.com/go/go${version}.src.tar.gz"; - sha256 = "1228nv4vyzbqv768dl0bimsic47x9yyqld61qbgqqk75f0jn0sl9"; + sha256 = "05sqcx4fm1nxfm46j6xriq0fnnah4bm8bqw027xrzcg2qmrvl2w9"; }; # perl is used for testing go vet diff --git a/infra/libkookie/nixpkgs/pkgs/development/compilers/go/1.4.nix b/infra/libkookie/nixpkgs/pkgs/development/compilers/go/1.4.nix index af125d60ed0a..75667a6cb2b5 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/compilers/go/1.4.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/compilers/go/1.4.nix @@ -9,12 +9,12 @@ in stdenv.mkDerivation rec { pname = "go"; - version = "1.4-bootstrap-20161024"; - revision = "79d85a4965ea7c46db483314c3981751909d7883"; + version = "1.4-bootstrap-${builtins.substring 0 7 revision}"; + revision = "bdd4b9503e47c2c38a9d0a9bb2f5d95ec5ff8ef6"; src = fetchurl { url = "https://github.com/golang/go/archive/${revision}.tar.gz"; - sha256 = "1ljbllwjysya323xxm9s792z8y9jdw19n8sj3mlc8picjclrx5xf"; + sha256 = "1zdyf883awaqdzm4r3fs76nbpiqx3iswl2p4qxclw2sl5vvynas5"; }; nativeBuildInputs = [ pkgconfig ]; @@ -43,22 +43,6 @@ stdenv.mkDerivation rec { cd go patchShebangs ./ # replace /bin/bash - # Disabling the 'os/http/net' tests (they want files not available in - # chroot builds) - rm src/net/{multicast_test.go,parse_test.go,port_test.go} - # !!! substituteInPlace does not seems to be effective. - # The os test wants to read files in an existing path. Just don't let it be /usr/bin. - sed -i 's,/usr/bin,'"`pwd`", src/os/os_test.go - sed -i 's,/bin/pwd,'"`type -P pwd`", src/os/os_test.go - # Disable the unix socket test - sed -i '/TestShutdownUnix/areturn' src/net/net_test.go - # Disable network timeout test - sed -i '/TestDialTimeout/areturn' src/net/dial_test.go - # Disable the hostname test - sed -i '/TestHostname/areturn' src/os/os_test.go - # ParseInLocation fails the test - sed -i '/TestParseInSydney/areturn' src/time/format_test.go - sed -i 's,/etc/protocols,${iana-etc}/etc/protocols,' src/net/lookup_unix.go '' + lib.optionalString stdenv.isLinux '' # prepend the nix path to the zoneinfo files but also leave the original value for static binaries @@ -70,62 +54,10 @@ stdenv.mkDerivation rec { # Replace references to the loader find src/cmd -name asm.c -exec sed -i "s,/lib/ld-linux.*\.so\.[0-9],$LOADER," {} \; - '' + lib.optionalString stdenv.isDarwin '' - sed -i 's,"/etc","'"$TMPDIR"'",' src/os/os_test.go - sed -i 's,/_go_os_test,'"$TMPDIR"'/_go_os_test,' src/os/path_test.go - sed -i '/TestCgoLookupIP/areturn' src/net/cgo_unix_test.go - sed -i '/TestChdirAndGetwd/areturn' src/os/os_test.go - sed -i '/TestDialDualStackLocalhost/areturn' src/net/dial_test.go - sed -i '/TestRead0/areturn' src/os/os_test.go - sed -i '/TestSystemRoots/areturn' src/crypto/x509/root_darwin_test.go - - # fails when running inside tmux - sed -i '/TestNohup/areturn' src/os/signal/signal_test.go - - # unix socket tests fail on darwin - sed -i '/TestConnAndListener/areturn' src/net/conn_test.go - sed -i '/TestPacketConn/areturn' src/net/conn_test.go - sed -i '/TestPacketConn/areturn' src/net/packetconn_test.go - sed -i '/TestConnAndPacketConn/areturn' src/net/packetconn_test.go - sed -i '/TestUnixListenerSpecificMethods/areturn' src/net/packetconn_test.go - sed -i '/TestUnixConnSpecificMethods/areturn' src/net/packetconn_test.go - sed -i '/TestUnixListenerSpecificMethods/areturn' src/net/protoconn_test.go - sed -i '/TestUnixConnSpecificMethods/areturn' src/net/protoconn_test.go - sed -i '/TestStreamConnServer/areturn' src/net/server_test.go - sed -i '/TestReadUnixgramWithUnnamedSocket/areturn' src/net/unix_test.go - sed -i '/TestReadUnixgramWithZeroBytesBuffer/areturn' src/net/unix_test.go - sed -i '/TestUnixgramWrite/areturn' src/net/unix_test.go - sed -i '/TestUnixConnLocalAndRemoteNames/areturn' src/net/unix_test.go - sed -i '/TestUnixgramConnLocalAndRemoteNames/areturn' src/net/unix_test.go - sed -i '/TestWithSimulated/areturn' src/log/syslog/syslog_test.go - sed -i '/TestFlap/areturn' src/log/syslog/syslog_test.go - sed -i '/TestNew/areturn' src/log/syslog/syslog_test.go - sed -i '/TestNewLogger/areturn' src/log/syslog/syslog_test.go - sed -i '/TestDial/areturn' src/log/syslog/syslog_test.go - sed -i '/TestWrite/areturn' src/log/syslog/syslog_test.go - sed -i '/TestConcurrentWrite/areturn' src/log/syslog/syslog_test.go - sed -i '/TestConcurrentReconnect/areturn' src/log/syslog/syslog_test.go - - # remove IP resolving tests, on darwin they can find fe80::1%lo while expecting ::1 - sed -i '/TestResolveIPAddr/areturn' src/net/ipraw_test.go - sed -i '/TestResolveTCPAddr/areturn' src/net/tcp_test.go - sed -i '/TestResolveUDPAddr/areturn' src/net/udp_test.go - - sed -i '/TestCgoExternalThreadSIGPROF/areturn' src/runtime/crash_cgo_test.go - - touch $TMPDIR/group $TMPDIR/hosts $TMPDIR/passwd ''; patches = [ ./remove-tools-1.4.patch - ./creds-test-1.4.patch - - # This test checks for the wrong thing with recent tzdata. It's been fixed in master but the patch - # actually works on old versions too. - (fetchpatch { - url = "https://github.com/golang/go/commit/91563ced5897faf729a34be7081568efcfedda31.patch"; - sha256 = "1ny5l3f8a9dpjjrnjnsplb66308a0x13sa0wwr4j6yrkc8j4qxqi"; - }) ]; GOOS = if stdenv.isDarwin then "darwin" else "linux"; diff --git a/infra/libkookie/nixpkgs/pkgs/development/compilers/go/creds-test-1.4.patch b/infra/libkookie/nixpkgs/pkgs/development/compilers/go/creds-test-1.4.patch deleted file mode 100644 index 98cec532dcca..000000000000 --- a/infra/libkookie/nixpkgs/pkgs/development/compilers/go/creds-test-1.4.patch +++ /dev/null @@ -1,17 +0,0 @@ -diff --git a/go-go1.4.3/src/syscall/creds_test.go b/go-go1.4.3/src/syscall/creds_test.go -index b1894c6..b2d6b4e 100644 ---- a/src/syscall/creds_test.go -+++ b/src/syscall/creds_test.go -@@ -56,9 +56,10 @@ func TestSCMCredentials(t *testing.T) { - ucred.Gid = 0 - oob := syscall.UnixCredentials(&ucred) - _, _, err := cli.(*net.UnixConn).WriteMsgUnix(nil, oob, nil) -- if err.(*net.OpError).Err != syscall.EPERM { -- t.Fatalf("WriteMsgUnix failed with %v, want EPERM", err) -+ if err.(*net.OpError).Err != syscall.EPERM && err.(*net.OpError).Err != syscall.EINVAL { -+ t.Fatalf("WriteMsgUnix failed with %v, want EPERM or EINVAL", err) - } -+ - } - - ucred.Pid = int32(os.Getpid()) diff --git a/infra/libkookie/nixpkgs/pkgs/development/compilers/graalvm/community-edition.nix b/infra/libkookie/nixpkgs/pkgs/development/compilers/graalvm/community-edition.nix new file mode 100644 index 000000000000..71f3b1560c67 --- /dev/null +++ b/infra/libkookie/nixpkgs/pkgs/development/compilers/graalvm/community-edition.nix @@ -0,0 +1,167 @@ +{ stdenv, fetchurl, perl, unzip, glibc, zlib, setJavaClassPath }: + +let + common = javaVersion: + let + graalvmXXX-ce = stdenv.mkDerivation rec { + pname = "graalvm${javaVersion}-ce"; + version = "20.2.0"; + srcs = [ + (fetchurl { + sha256 = { "8" = "1s64zkkrns1ykh6dwpjrqy0hs9m1bb08cf7ss7msx33h9ivir5b0"; + "11" = "0aaf0sjsnlckhgsh3j4lph0shahw6slf4yndqcm2swc8i1dlpdsx"; + }.${javaVersion}; + url = "https://github.com/graalvm/graalvm-ce-builds/releases/download/vm-${version}/graalvm-ce-java${javaVersion}-linux-amd64-${version}.tar.gz"; + }) + (fetchurl { + sha256 = { "8" = "1cisyyzab4pdvzavnivhy9w6dwn36ybaxw40w767m142fbi06m3b"; + "11" = "0p4j6mxajmb0xl41c79154pk4vb8bffgg1nmwislahqjky9jkd4j"; + }.${javaVersion}; + url = "https://github.com/graalvm/graalvm-ce-builds/releases/download/vm-${version}/native-image-installable-svm-java${javaVersion}-linux-amd64-${version}.jar"; + }) + (fetchurl { + sha256 = { "8" = "0rwwvk1mkfnl0b50xg7kh6015kjmsw2ra0ckrzmabl88z4bnzh2y"; + "11" = "0lc9as2a00j74lp7jby4p10vn5bbkiydzvzk28zfcbsp28p4wvwn"; + }.${javaVersion}; + url = "https://github.com/oracle/truffleruby/releases/download/vm-${version}/ruby-installable-svm-java${javaVersion}-linux-amd64-${version}.jar"; + }) + (fetchurl { + sha256 = { "8" = "0mj8p72qgvvrwpsbk0bsqldynlz1wq07icf951wq5xdbr0whj1gz"; + "11" = "1lkszqn4islsza011iabayv6riym0dwnkv83pkmk06b230qjfhzb"; + }.${javaVersion}; + url = "https://github.com/graalvm/graalpython/releases/download/vm-${version}/python-installable-svm-java${javaVersion}-linux-amd64-${version}.jar"; + }) + (fetchurl { + sha256 = { "8" = "1br7camk7y8ych43ws57096100f9kzjvqznh2flmws78ipcrrb66"; + "11" = "10swxspjvzh0j82lbpy38dckk69lw1pawqkhnj1hxd05ls36fwq5"; + }.${javaVersion}; + url = "https://github.com/graalvm/graalvm-ce-builds/releases/download/vm-${version}/wasm-installable-svm-java${javaVersion}-linux-amd64-${version}.jar"; + }) + ]; + nativeBuildInputs = [ unzip perl ]; + unpackPhase = '' + unpack_jar() { + jar=$1 + unzip -o $jar -d $out + perl -ne 'use File::Path qw(make_path); + use File::Basename qw(dirname); + if (/^(.+) = (.+)$/) { + make_path dirname("$ENV{out}/$1"); + system "ln -s $2 $ENV{out}/$1"; + }' $out/META-INF/symlinks + perl -ne 'if (/^(.+) = ([r-])([w-])([x-])([r-])([w-])([x-])([r-])([w-])([x-])$/) { + my $mode = ($2 eq 'r' ? 0400 : 0) + ($3 eq 'w' ? 0200 : 0) + ($4 eq 'x' ? 0100 : 0) + + ($5 eq 'r' ? 0040 : 0) + ($6 eq 'w' ? 0020 : 0) + ($7 eq 'x' ? 0010 : 0) + + ($8 eq 'r' ? 0004 : 0) + ($9 eq 'w' ? 0002 : 0) + ($10 eq 'x' ? 0001 : 0); + chmod $mode, "$ENV{out}/$1"; + }' $out/META-INF/permissions + rm -rf $out/META-INF + } + + mkdir -p $out + arr=($srcs) + tar xf ''${arr[0]} -C $out --strip-components=1 + unpack_jar ''${arr[1]} + unpack_jar ''${arr[2]} + unpack_jar ''${arr[3]} + unpack_jar ''${arr[4]} + ''; + + installPhase = { + "8" = '' + # BUG workaround http://mail.openjdk.java.net/pipermail/graal-dev/2017-December/005141.html + substituteInPlace $out/jre/lib/security/java.security \ + --replace file:/dev/random file:/dev/./urandom \ + --replace NativePRNGBlocking SHA1PRNG + + # provide libraries needed for static compilation + for f in ${glibc}/lib/* ${glibc.static}/lib/* ${zlib.static}/lib/*; do + ln -s $f $out/jre/lib/svm/clibraries/linux-amd64/$(basename $f) + done + + # allow using external truffle-api.jar and languages not included in the distrubution + rm $out/jre/lib/jvmci/parentClassLoader.classpath + ''; + "11" = '' + # BUG workaround http://mail.openjdk.java.net/pipermail/graal-dev/2017-December/005141.html + substituteInPlace $out/conf/security/java.security \ + --replace file:/dev/random file:/dev/./urandom \ + --replace NativePRNGBlocking SHA1PRNG + + # provide libraries needed for static compilation + for f in ${glibc}/lib/* ${glibc.static}/lib/* ${zlib.static}/lib/*; do + ln -s $f $out/lib/svm/clibraries/linux-amd64/$(basename $f) + done + ''; + }.${javaVersion}; + + dontStrip = true; + + # copy-paste openjdk's preFixup + preFixup = '' + # Set JAVA_HOME automatically. + mkdir -p $out/nix-support + cat <<EOF > $out/nix-support/setup-hook + if [ -z "\''${JAVA_HOME-}" ]; then export JAVA_HOME=$out; fi + EOF + ''; + + postFixup = '' + rpath="${ { "8" = "$out/jre/lib/amd64/jli:$out/jre/lib/amd64/server:$out/jre/lib/amd64"; + "11" = "$out/lib/jli:$out/lib/server:$out/lib"; + }.${javaVersion} + }:${ + stdenv.lib.makeLibraryPath [ + stdenv.cc.cc.lib # libstdc++.so.6 + zlib # libz.so.1 + ]}" + + for f in $(find $out -type f -perm -0100); do + patchelf --interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" "$f" || true + patchelf --set-rpath "$rpath" "$f" || true + + if ldd "$f" | fgrep 'not found'; then echo "in file $f"; fi + done + ''; + + propagatedBuildInputs = [ setJavaClassPath zlib ]; # $out/bin/native-image needs zlib to build native executables + + doInstallCheck = true; + installCheckPhase = '' + echo ${stdenv.lib.escapeShellArg '' + public class HelloWorld { + public static void main(String[] args) { + System.out.println("Hello World"); + } + } + ''} > HelloWorld.java + $out/bin/javac HelloWorld.java + + # run on JVM with Graal Compiler + $out/bin/java -XX:+UnlockExperimentalVMOptions -XX:+EnableJVMCI -XX:+UseJVMCICompiler HelloWorld | fgrep 'Hello World' + + # Ahead-Of-Time compilation + $out/bin/native-image --no-server HelloWorld + ./helloworld | fgrep 'Hello World' + + # Ahead-Of-Time compilation with --static + $out/bin/native-image --no-server --static HelloWorld + ./helloworld | fgrep 'Hello World' + ''; + + passthru.home = graalvmXXX-ce; + + meta = with stdenv.lib; { + homepage = "https://www.graalvm.org/"; + description = "High-Performance Polyglot VM"; + license = with licenses; [ upl gpl2Classpath bsd3 ]; + maintainers = with maintainers; [ bandresen volth hlolli glittershark ]; + platforms = [ "x86_64-linux" ]; + }; + }; + in + graalvmXXX-ce; +in { + graalvm8-ce = common "8"; + graalvm11-ce = common "11"; +} diff --git a/infra/libkookie/nixpkgs/pkgs/development/compilers/graalvm/enterprise-edition.nix b/infra/libkookie/nixpkgs/pkgs/development/compilers/graalvm/enterprise-edition.nix index 89896c556efa..690bfdb425cf 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/compilers/graalvm/enterprise-edition.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/compilers/graalvm/enterprise-edition.nix @@ -1,44 +1,51 @@ -{ stdenv, requireFile, perl, unzip, glibc, zlib, bzip2, gdk-pixbuf, xorg, glib, fontconfig, freetype, cairo, pango, gtk3, gtk2, ffmpeg_3, libGL, atk, alsaLib, libav_0_8, setJavaClassPath }: +{ stdenv, requireFile, perl, unzip, glibc, zlib, bzip2, gdk-pixbuf, xorg, glib, fontconfig, freetype, cairo, pango, gtk3, gtk2, ffmpeg, libGL, atk, alsaLib, libav_0_8, setJavaClassPath }: let common = javaVersion: let graalvmXXX-ee = stdenv.mkDerivation rec { pname = "graalvm${javaVersion}-ee"; - version = "20.0.0"; + version = "20.2.1"; srcs = [ (requireFile { name = "graalvm-ee-java${javaVersion}-linux-amd64-${version}.tar.gz"; - sha256 = { "8" = "2df9b31b96f7a24b6a2fe3ecea0b5e819d5d058fde6320016dba1787ce59e99e"; - "11" = "b704fd27b5993584a1ad659b41f42ff0ae8893c066b64a6f6a1719fbee382536"; + sha256 = { "8" = "e0bb182146283a43824dd2c2ceeb89b6ff7a93f9a85da889f8663ce1c2bd3002"; + "11" = "e5d92d361e7859fe5f88c92d7bb466e285e07f1e4e2d9944948f85fa0e3aee2b"; }.${javaVersion}; url = "https://www.oracle.com/technetwork/graalvm/downloads/index.html"; }) (requireFile { name = "native-image-installable-svm-svmee-java${javaVersion}-linux-amd64-${version}.jar"; - sha256 = { "8" = "a9f3f86d880d133bd24ad3b1d95129a96e80ea1d8fbc865d09e9410b921e6897"; - "11" = "57086123a95f1e9d4e67b92f830bad9325431908c69a40ef10f28ed586d8bd35"; + sha256 = { "8" = "37ac6a62f68adad513057a60513ba75749adf98cc73999b3918afe159900428d"; + "11" = "f62df715ad529f8b84854644ac99e0a9a349232c7f03985d20a2a8be20edaa44"; + }.${javaVersion}; + url = "https://www.oracle.com/technetwork/graalvm/downloads/index.html"; + }) + (requireFile { + name = "llvm-toolchain-installable-java${javaVersion}-linux-amd64-${version}.jar"; + sha256 = { "8" = "da98a8c17b0c724b41d1596b57e282a1ecfcbf9140404dfb04b0d4d9fb159d8a"; + "11" = "fc442c396e92f59d034a69175104cb3565c3d128426bd939cc94c6ceccbb720f"; }.${javaVersion}; url = "https://www.oracle.com/technetwork/graalvm/downloads/index.html"; }) (requireFile { name = "ruby-installable-svm-svmee-java${javaVersion}-linux-amd64-${version}.jar"; - sha256 = { "8" = "28b2910736f41070c84b97f1b1a3c5fa43ebdcd926ec92c8f145550b5b975b3c"; - "11" = "27ff1befa67fe5cc9eb0216b6b1105876f44d13eff6137f36f29f13377ea687b"; + sha256 = { "8" = "44f6887249f2eb54cba98dd4d9de019da5463d92982e03bf655fffe4bb520daf"; + "11" = "941f3752ccb097958f49250586f04c305092ded3ea4c1b7d9a0f7632e47fa335"; }.${javaVersion}; url = "https://www.oracle.com/technetwork/graalvm/downloads/index.html"; }) (requireFile { name = "python-installable-svm-svmee-java${javaVersion}-linux-amd64-${version}.jar"; - sha256 = { "8" = "9c83bcd71e316805c2914c9002ce348ae44829606adc2375d9188b1eaaaf82f9"; - "11" = "5ca51478bcb5ea5bd9be35856dd7fb2ef03b888cd1b7284a8c15531979025fb4"; + sha256 = { "8" = "5c3993c701bd09c6064dcf4a6d9c7489620d0654b03c74682398c788c0211c09"; + "11" = "de3ebf35ce47dc399d7976cbd09fde0e85f2c10f85bc3fe8f32bb9e2b500ab70"; }.${javaVersion}; url = "https://www.oracle.com/technetwork/graalvm/downloads/index.html"; }) (requireFile { name = "wasm-installable-svm-svmee-java${javaVersion}-linux-amd64-${version}.jar"; - sha256 = { "8" = "e8bd14d3f9bf652104e4346e0899a0351afaecae030a9c0ce0f91b1f93d9e660"; - "11" = "d24eeb84625bb7a5e330b897fd6dde7fc579a687997b64625199c33fa83c40b4"; + sha256 = { "8" = "c0a334b271fd32c098bb3c42eada7eafb9f536becaa756097eebe4682915b067"; + "11" = "9e801071992a0ff976bc40b640a8b9368fd8ea890ba986543658fcbaa3a7fd68"; }.${javaVersion}; url = "https://www.oracle.com/technetwork/graalvm/downloads/index.html"; }) @@ -47,7 +54,7 @@ let unpackPhase = '' unpack_jar() { jar=$1 - unzip $jar -d $out + unzip -o $jar -d $out perl -ne 'use File::Path qw(make_path); use File::Basename qw(dirname); if (/^(.+) = (.+)$/) { @@ -70,6 +77,7 @@ let unpack_jar ''${arr[2]} unpack_jar ''${arr[3]} unpack_jar ''${arr[4]} + unpack_jar ''${arr[5]} ''; installPhase = { @@ -117,7 +125,7 @@ let }.${javaVersion} }:${ stdenv.lib.strings.makeLibraryPath [ glibc xorg.libXxf86vm xorg.libX11 xorg.libXext xorg.libXtst xorg.libXi xorg.libXrender - glib zlib bzip2 alsaLib fontconfig freetype pango gtk3 gtk2 cairo gdk-pixbuf atk ffmpeg_3 libGL ]}" + glib zlib bzip2 alsaLib fontconfig freetype pango gtk3 gtk2 cairo gdk-pixbuf atk ffmpeg libGL ]}" for f in $(find $out -type f -perm -0100); do patchelf --interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" "$f" || true diff --git a/infra/libkookie/nixpkgs/pkgs/development/compilers/halide/default.nix b/infra/libkookie/nixpkgs/pkgs/development/compilers/halide/default.nix index 356ebe231729..1ff821edf800 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/compilers/halide/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/compilers/halide/default.nix @@ -1,42 +1,43 @@ -{ llvmPackages, lib, fetchFromGitHub, cmake -, libpng, libjpeg, mesa, eigen -, openblas, blas, lapack +{ llvmPackages +, lib +, fetchFromGitHub +, cmake +, libpng +, libjpeg +, mesa +, eigen +, openblas +, blas +, lapack }: assert blas.implementation == "openblas" && lapack.implementation == "openblas"; -let - version = "2019_08_27"; - -in llvmPackages.stdenv.mkDerivation { - - name = "halide-${builtins.replaceStrings ["_"] ["."] version}"; +llvmPackages.stdenv.mkDerivation rec { + pname = "halide"; + version = "10.0.0"; src = fetchFromGitHub { owner = "halide"; repo = "Halide"; - rev = "release_${version}"; - sha256 = "09xf8v9zyxx2fn6s1yzjkyzcf9zyzrg3x5vivgd2ljzbfhm8wh7n"; + rev = "v${version}"; + sha256 = "0il71rppjp76m7zd420siidvhs76sqiq26h60ywk812sj9mmgxj6"; }; - patches = [ ./nix.patch ]; - # clang fails to compile intermediate code because # of unused "--gcc-toolchain" option postPatch = '' sed -i "s/-Werror//" src/CMakeLists.txt ''; - cmakeFlags = [ "-DWARNINGS_AS_ERRORS=OFF" ]; + cmakeFlags = [ "-DWARNINGS_AS_ERRORS=OFF" "-DWITH_PYTHON_BINDINGS=OFF" ]; # To handle the lack of 'local' RPATH; required, as they call one of # their built binaries requiring their libs, in the build process. preBuild = '' - export LD_LIBRARY_PATH="$(pwd)/lib''${LD_LIBRARY_PATH:+:}$LD_LIBRARY_PATH" + export LD_LIBRARY_PATH="$(pwd)/src''${LD_LIBRARY_PATH:+:}$LD_LIBRARY_PATH" ''; - enableParallelBuilding = true; - # Note: only openblas and not atlas part of this Nix expression # see pkgs/development/libraries/science/math/liblapack/3.5.0.nix # to get a hint howto setup atlas instead of openblas @@ -44,24 +45,11 @@ in llvmPackages.stdenv.mkDerivation { nativeBuildInputs = [ cmake ]; - # No install target for cmake available. - # Calling install target in Makefile causes complete rebuild - # and the library rpath is broken, because libncursesw.so.6 is missing. - # Another way is using "make halide_archive", but the tarball is not easy - # to disassemble. - installPhase = '' - find - mkdir -p "$out/lib" "$out/bin" - cp bin/HalideTrace* "$out/bin" - cp lib/libHalide.so "$out/lib" - cp -r include "$out" - ''; - meta = with lib; { description = "C++ based language for image processing and computational photography"; homepage = "https://halide-lang.org"; license = licenses.mit; - platforms = [ "i686-linux" "x86_64-linux" ]; + platforms = [ "i686-linux" "x86_64-linux" "aarch64-linux" ]; maintainers = [ maintainers.ck3d ]; }; } diff --git a/infra/libkookie/nixpkgs/pkgs/development/compilers/halide/nix.patch b/infra/libkookie/nixpkgs/pkgs/development/compilers/halide/nix.patch deleted file mode 100644 index fb9bbf1a4cf7..000000000000 --- a/infra/libkookie/nixpkgs/pkgs/development/compilers/halide/nix.patch +++ /dev/null @@ -1,56 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 4ba384324..7e23038f7 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -75,10 +75,10 @@ set(CMAKE_RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/bin") - - set(LLVM_VERSION "${LLVM_VERSION_MAJOR}${LLVM_VERSION_MINOR}") - --file(TO_NATIVE_PATH "${LLVM_TOOLS_BINARY_DIR}/llvm-as${CMAKE_EXECUTABLE_SUFFIX}" LLVM_AS) --file(TO_NATIVE_PATH "${LLVM_TOOLS_BINARY_DIR}/llvm-nm${CMAKE_EXECUTABLE_SUFFIX}" LLVM_NM) --file(TO_NATIVE_PATH "${LLVM_TOOLS_BINARY_DIR}/clang${CMAKE_EXECUTABLE_SUFFIX}" CLANG) --file(TO_NATIVE_PATH "${LLVM_TOOLS_BINARY_DIR}/llvm-config${CMAKE_EXECUTABLE_SUFFIX}" LLVM_CONFIG) -+find_program(LLVM_AS llvm-as HINTS ${LLVM_TOOLS_BINARY_DIR}) -+find_program(LLVM_NM llvm-nm HINTS ${LLVM_TOOLS_BINARY_DIR}) -+find_program(CLANG clang HINTS ${LLVM_TOOLS_BINARY_DIR}) -+find_program(LLVM_CONFIG llvm-config HINTS ${LLVM_TOOLS_BINARY_DIR}) - - # LLVM doesn't appear to expose --system-libs via its CMake interface, - # so we must shell out to llvm-config to find this info -diff --git a/apps/linear_algebra/CMakeLists.txt b/apps/linear_algebra/CMakeLists.txt -index 132c80e6a..36ce865f2 100644 ---- a/apps/linear_algebra/CMakeLists.txt -+++ b/apps/linear_algebra/CMakeLists.txt -@@ -26,7 +26,7 @@ if (CBLAS_FOUND) - # Atlas requires also linking against its provided libcblas for cblas symbols - set(ATLAS_EXTRA_LIBS cblas) # XXX fragile - set(OpenBLAS_EXTRA_LIBS) -- set(BLAS_VENDORS OpenBLAS ATLAS) -+ set(BLAS_VENDORS OpenBLAS) - - # TODO - # there are more vendors we could add here that support the cblas interface -@@ -41,6 +41,7 @@ if (CBLAS_FOUND) - message(STATUS " ${BLAS_VENDOR}: Missing") - else() - message(STATUS " ${BLAS_VENDOR}: Found") -+ set(BLAS_LIBRARIES "${BLAS_LIBRARIES}" CACHE FILEPATH "BLAS library to use") - list(APPEND BLAS_VENDORS ${NAME}) - endif() - endforeach() -diff --git a/apps/linear_algebra/tests/CMakeLists.txt b/apps/linear_algebra/tests/CMakeLists.txt -index cc02eb0a4..c20419a0d 100644 ---- a/apps/linear_algebra/tests/CMakeLists.txt -+++ b/apps/linear_algebra/tests/CMakeLists.txt -@@ -19,7 +19,7 @@ target_compile_options(test_halide_blas PRIVATE -Wno-unused-variable) - target_link_libraries(test_halide_blas - PRIVATE - halide_blas -- cblas # XXX fragile -+ ${BLAS_LIBRARIES} - ${HALIDE_COMPILER_LIB} - ) - --- -2.23.0 - diff --git a/infra/libkookie/nixpkgs/pkgs/development/compilers/jsonnet/default.nix b/infra/libkookie/nixpkgs/pkgs/development/compilers/jsonnet/default.nix index 510fca1838ec..be03f53a76ee 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/compilers/jsonnet/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/compilers/jsonnet/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "jsonnet"; - version = "0.16.0"; + version = "0.17.0"; src = fetchFromGitHub { rev = "v${version}"; owner = "google"; repo = "jsonnet"; - sha256 = "0wxhc0ghjk88zrrn9a18h979ipkia2rx12489515gzhlplfx6724"; + sha256 = "1ddz14699v5lqx3dh0mb7hfffr6fk5zhmzn3z8yxkqqvriqnciim"; }; enableParallelBuilding = true; diff --git a/infra/libkookie/nixpkgs/pkgs/development/compilers/julia/0.7.nix b/infra/libkookie/nixpkgs/pkgs/development/compilers/julia/0.7.nix deleted file mode 100644 index e0992d800033..000000000000 --- a/infra/libkookie/nixpkgs/pkgs/development/compilers/julia/0.7.nix +++ /dev/null @@ -1,9 +0,0 @@ -import ./shared.nix { - majorVersion = "0"; - minorVersion = "7"; - maintenanceVersion = "0"; - src_sha256 = "1j57569qm2ii8ddzsp08hds2navpk7acdz83kh27dvk44axhwj6f"; - - libuvVersion = "ed3700c849289ed01fe04273a7bf865340b2bd7e"; - libuvSha256 = "137w666zsjw1p0ma3lf94d75hr1q45sgkfmbizkyji2qm57cnxjs"; -} diff --git a/infra/libkookie/nixpkgs/pkgs/development/compilers/julia/1.0.nix b/infra/libkookie/nixpkgs/pkgs/development/compilers/julia/1.0.nix index 3cd9daee1416..a98b69f50e9f 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/compilers/julia/1.0.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/compilers/julia/1.0.nix @@ -1,4 +1,19 @@ -import ./shared.nix { +{ stdenv, fetchpatch, fetchurl, fetchzip +# build tools +, gfortran, m4, makeWrapper, patchelf, perl, which, python2 +, cmake +# libjulia dependencies +, libunwind, readline, utf8proc, zlib +# standard library dependencies +, curl, fftwSinglePrec, fftw, gmp, libgit2, mpfr, openlibm, openspecfun, pcre2 +# linear algebra +, blas, lapack, arpack +# Darwin frameworks +, CoreServices, ApplicationServices +}: + + +let majorVersion = "1"; minorVersion = "0"; maintenanceVersion = "4"; @@ -6,4 +21,193 @@ import ./shared.nix { libuvVersion = "ed3700c849289ed01fe04273a7bf865340b2bd7e"; libuvSha256 = "137w666zsjw1p0ma3lf94d75hr1q45sgkfmbizkyji2qm57cnxjs"; + + dsfmtVersion = "2.2.3"; + dsfmt = fetchurl { + url = "http://www.math.sci.hiroshima-u.ac.jp/~m-mat/MT/SFMT/dSFMT-src-${dsfmtVersion}.tar.gz"; + sha256 = "03kaqbjbi6viz0n33dk5jlf6ayxqlsq4804n7kwkndiga9s4hd42"; + }; + + libuv = fetchurl { + url = "https://api.github.com/repos/JuliaLang/libuv/tarball/${libuvVersion}"; + sha256 = libuvSha256; + }; + + rmathVersion = "0.1"; + rmath-julia = fetchurl { + url = "https://api.github.com/repos/JuliaLang/Rmath-julia/tarball/v${rmathVersion}"; + sha256 = "1qyps217175qhid46l8f5i1v8i82slgp23ia63x2hzxwfmx8617p"; + }; + + virtualenvVersion = "15.0.0"; + virtualenv = fetchurl { + url = "mirror://pypi/v/virtualenv/virtualenv-${virtualenvVersion}.tar.gz"; + sha256 = "06fw4liazpx5vf3am45q2pdiwrv0id7ckv7n6zmpml29x6vkzmkh"; + }; + + libwhichVersion = "81e9723c0273d78493dc8c8ed570f68d9ce7e89e"; + libwhich = fetchurl { + url = "https://api.github.com/repos/vtjnash/libwhich/tarball/${libwhichVersion}"; + sha256 = "1p7zg31kpmpbmh1znrk1xrbd074agx13b9q4dcw8n2zrwwdlbz3b"; + }; + + llvmVersion = "6.0.0"; + llvm = fetchurl { + url = "http://releases.llvm.org/6.0.0/llvm-${llvmVersion}.src.tar.xz"; + sha256 = "0224xvfg6h40y5lrbnb9qaq3grmdc5rg00xq03s1wxjfbf8krx8z"; + }; + + suitesparseVersion = "4.4.5"; + suitesparse = fetchurl { + url = "http://faculty.cse.tamu.edu/davis/SuiteSparse/SuiteSparse-${suitesparseVersion}.tar.gz"; + sha256 = "1jcbxb8jx5wlcixzf6n5dca2rcfx6mlcms1k2rl5gp67ay3bix43"; + }; + version = "${majorVersion}.${minorVersion}.${maintenanceVersion}"; +in + +stdenv.mkDerivation rec { + pname = "julia"; + inherit version; + + src = fetchzip { + url = "https://github.com/JuliaLang/${pname}/releases/download/v${version}/${pname}-${version}.tar.gz"; + sha256 = src_sha256; + }; + + nativeBuildInputs = [ cmake curl gfortran m4 makeWrapper patchelf perl python2 which ]; + # cmake is only used to build the bundled deps + dontUseCmakeConfigure = true; + + # We assert that compatible blas and lapack are used. + buildInputs = assert (blas.isILP64 == lapack.isILP64); [ + arpack fftw fftwSinglePrec gmp libgit2 libunwind mpfr + pcre2.dev blas lapack openlibm openspecfun readline utf8proc + zlib + ] + ++ stdenv.lib.optionals stdenv.isDarwin [CoreServices ApplicationServices] + ; + + patches = [ + # Julia recompiles a precompiled file if the mtime stored *in* the + # .ji file differs from the mtime of the .ji file. This + # doesn't work in Nix because Nix changes the mtime of files in + # the Nix store to 1. So patch Julia to accept mtimes of 1. + ./allow_nix_mtime.patch + ./diagonal-test.patch + ./use-system-utf8proc-julia-1.0.patch + ]; + + postPatch = '' + patchShebangs . contrib + for i in backtrace cmdlineargs; do + mv test/$i.jl{,.off} + touch test/$i.jl + done + rm stdlib/Sockets/test/runtests.jl && touch stdlib/Sockets/test/runtests.jl + rm stdlib/Distributed/test/runtests.jl && touch stdlib/Distributed/test/runtests.jl + sed -e 's/Invalid Content-Type:/invalid Content-Type:/g' -i ./stdlib/LibGit2/test/libgit2.jl + sed -e 's/Failed to resolve /failed to resolve /g' -i ./stdlib/LibGit2/test/libgit2.jl + ''; + prePatch = '' + mkdir deps/srccache + cp "${dsfmt}" "./deps/srccache/dsfmt-${dsfmtVersion}.tar.gz" + cp "${rmath-julia}" "./deps/srccache/Rmath-julia-${rmathVersion}.tar.gz" + cp "${libuv}" "./deps/srccache/libuv-${libuvVersion}.tar.gz" + cp "${virtualenv}" "./deps/srccache/virtualenv-${virtualenvVersion}.tar.gz" + cp "${libwhich}" "./deps/srccache/libwhich-${libwhichVersion}.tar.gz" + cp "${llvm}" "./deps/srccache/llvm-${llvmVersion}.src.tar.xz" + cp "${suitesparse}" "./deps/srccache/SuiteSparse-${suitesparseVersion}.tar.gz" + ''; + + makeFlags = + let + arch = stdenv.lib.head (stdenv.lib.splitString "-" stdenv.system); + march = { + x86_64 = stdenv.hostPlatform.platform.gcc.arch or "x86-64"; + i686 = "pentium4"; + aarch64 = "armv8-a"; + }.${arch} + or (throw "unsupported architecture: ${arch}"); + # Julia requires Pentium 4 (SSE2) or better + cpuTarget = { x86_64 = "x86-64"; i686 = "pentium4"; aarch64 = "generic"; }.${arch} + or (throw "unsupported architecture: ${arch}"); + in [ + "ARCH=${arch}" + "MARCH=${march}" + "JULIA_CPU_TARGET=${cpuTarget}" + "PREFIX=$(out)" + "prefix=$(out)" + "SHELL=${stdenv.shell}" + + "USE_SYSTEM_BLAS=1" + "USE_BLAS64=${if blas.isILP64 then "1" else "0"}" + + "USE_SYSTEM_LAPACK=1" + + "USE_SYSTEM_ARPACK=1" + "USE_SYSTEM_FFTW=1" + "USE_SYSTEM_GMP=1" + "USE_SYSTEM_LIBGIT2=1" + "USE_SYSTEM_LIBUNWIND=1" + + # We will probably never do that + #"USE_SYSTEM_LLVM=1" + "LLVM_VER=6.0.0" + + "USE_SYSTEM_MPFR=1" + "USE_SYSTEM_OPENLIBM=1" + "USE_SYSTEM_OPENSPECFUN=1" + "USE_SYSTEM_PATCHELF=1" + "USE_SYSTEM_PCRE=1" + "PCRE_CONFIG=${pcre2.dev}/bin/pcre2-config" + "PCRE_INCL_PATH=${pcre2.dev}/include/pcre2.h" + "USE_SYSTEM_READLINE=1" + "USE_SYSTEM_UTF8PROC=1" + "USE_SYSTEM_ZLIB=1" + ]; + + LD_LIBRARY_PATH = assert (blas.isILP64 == lapack.isILP64); (stdenv.lib.makeLibraryPath [ + arpack fftw fftwSinglePrec gmp libgit2 mpfr blas lapack openlibm + openspecfun pcre2 + ]); + + enableParallelBuilding = true; + + doCheck = !stdenv.isDarwin; + checkTarget = "testall"; + # Julia's tests require read/write access to $HOME + preCheck = '' + export HOME="$NIX_BUILD_TOP" + ''; + + preBuild = '' + sed -e '/^install:/s@[^ ]*/doc/[^ ]*@@' -i Makefile + sed -e '/[$](DESTDIR)[$](docdir)/d' -i Makefile + export LD_LIBRARY_PATH=${LD_LIBRARY_PATH} + ''; + + postInstall = '' + # Symlink shared libraries from LD_LIBRARY_PATH into lib/julia, + # as using a wrapper with LD_LIBRARY_PATH causes segmentation + # faults when program returns an error: + # $ julia -e 'throw(Error())' + find $(echo $LD_LIBRARY_PATH | sed 's|:| |g') -maxdepth 1 -name '*.${if stdenv.isDarwin then "dylib" else "so"}*' | while read lib; do + if [[ ! -e $out/lib/julia/$(basename $lib) ]]; then + ln -sv $lib $out/lib/julia/$(basename $lib) + fi + done + ''; + + passthru = { + inherit majorVersion minorVersion maintenanceVersion; + site = "share/julia/site/v${majorVersion}.${minorVersion}"; + }; + + meta = { + description = "High-level performance-oriented dynamical language for technical computing"; + homepage = "https://julialang.org/"; + license = stdenv.lib.licenses.mit; + maintainers = with stdenv.lib.maintainers; [ raskin rob garrison ]; + platforms = [ "i686-linux" "x86_64-linux" "x86_64-darwin" "aarch64-linux" ]; + }; } diff --git a/infra/libkookie/nixpkgs/pkgs/development/compilers/julia/1.1.nix b/infra/libkookie/nixpkgs/pkgs/development/compilers/julia/1.1.nix deleted file mode 100644 index 5be34b4c4b4c..000000000000 --- a/infra/libkookie/nixpkgs/pkgs/development/compilers/julia/1.1.nix +++ /dev/null @@ -1,9 +0,0 @@ -import ./shared.nix { - majorVersion = "1"; - minorVersion = "1"; - maintenanceVersion = "1"; - src_sha256 = "1yqjd0n42xf9hzxpvc9vysyjj98p42by216jkdqakdy7dkjcmnhq"; - - libuvVersion = "2348256acf5759a544e5ca7935f638d2bc091d60"; - libuvSha256 = "1363f4vqayfcv5zqg07qmzjff56yhad74k16c22ian45lram8mv8"; -} diff --git a/infra/libkookie/nixpkgs/pkgs/development/compilers/julia/1.3.nix b/infra/libkookie/nixpkgs/pkgs/development/compilers/julia/1.3.nix index 15694734d487..406ea73f2aed 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/compilers/julia/1.3.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/compilers/julia/1.3.nix @@ -72,13 +72,15 @@ stdenv.mkDerivation rec { makeFlags = let arch = head (splitString "-" stdenv.system); - march = { x86_64 = stdenv.hostPlatform.platform.gcc.arch or "x86-64"; i686 = "pentium4"; }.${arch} + march = { + x86_64 = stdenv.hostPlatform.platform.gcc.arch or "x86-64"; + i686 = "pentium4"; + aarch64 = "armv8-a"; + }.${arch} or (throw "unsupported architecture: ${arch}"); # Julia requires Pentium 4 (SSE2) or better - cpuTarget = { x86_64 = "x86-64"; i686 = "pentium4"; }.${arch} + cpuTarget = { x86_64 = "x86-64"; i686 = "pentium4"; aarch64 = "generic"; }.${arch} or (throw "unsupported architecture: ${arch}"); - # Julia applies a lot of patches to its dependencies, so for now do not use the system LLVM - # https://github.com/JuliaLang/julia/tree/master/deps/patches in [ "ARCH=${arch}" "MARCH=${march}" @@ -119,7 +121,8 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - doCheck = !stdenv.isDarwin; + # Other versions of Julia pass the tests, but we are not sure why these fail. + doCheck = false; checkTarget = "testall"; # Julia's tests require read/write access to $HOME preCheck = '' diff --git a/infra/libkookie/nixpkgs/pkgs/development/compilers/julia/shared.nix b/infra/libkookie/nixpkgs/pkgs/development/compilers/julia/1.5.nix index 29ac41150506..151cf83cecef 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/compilers/julia/shared.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/compilers/julia/1.5.nix @@ -1,70 +1,26 @@ -{ majorVersion -, minorVersion -, maintenanceVersion -, src_sha256 -# source deps -, libuvVersion -, libuvSha256 -}: -{ stdenv, fetchurl, fetchzip +{ stdenv, fetchurl, fetchzip, fetchFromGitHub # build tools , gfortran, m4, makeWrapper, patchelf, perl, which, python2 , cmake # libjulia dependencies , libunwind, readline, utf8proc, zlib # standard library dependencies -, curl, fftwSinglePrec, fftw, gmp, libgit2, mpfr, openlibm, openspecfun, pcre2 +, curl, fftwSinglePrec, fftw, libgit2, mpfr, openlibm, openspecfun, pcre2 # linear algebra , blas, lapack, arpack # Darwin frameworks , CoreServices, ApplicationServices }: -with stdenv.lib; - assert (!blas.isILP64) && (!lapack.isILP64); -let - dsfmtVersion = "2.2.3"; - dsfmt = fetchurl { - url = "http://www.math.sci.hiroshima-u.ac.jp/~m-mat/MT/SFMT/dSFMT-src-${dsfmtVersion}.tar.gz"; - sha256 = "03kaqbjbi6viz0n33dk5jlf6ayxqlsq4804n7kwkndiga9s4hd42"; - }; - - libuv = fetchurl { - url = "https://api.github.com/repos/JuliaLang/libuv/tarball/${libuvVersion}"; - sha256 = libuvSha256; - }; - - rmathVersion = "0.1"; - rmath-julia = fetchurl { - url = "https://api.github.com/repos/JuliaLang/Rmath-julia/tarball/v${rmathVersion}"; - sha256 = "1qyps217175qhid46l8f5i1v8i82slgp23ia63x2hzxwfmx8617p"; - }; - - virtualenvVersion = "15.0.0"; - virtualenv = fetchurl { - url = "mirror://pypi/v/virtualenv/virtualenv-${virtualenvVersion}.tar.gz"; - sha256 = "06fw4liazpx5vf3am45q2pdiwrv0id7ckv7n6zmpml29x6vkzmkh"; - }; - - libwhichVersion = "81e9723c0273d78493dc8c8ed570f68d9ce7e89e"; - libwhich = fetchurl { - url = "https://api.github.com/repos/vtjnash/libwhich/tarball/${libwhichVersion}"; - sha256 = "1p7zg31kpmpbmh1znrk1xrbd074agx13b9q4dcw8n2zrwwdlbz3b"; - }; - - llvmVersion = "6.0.0"; - llvm = fetchurl { - url = "http://releases.llvm.org/6.0.0/llvm-${llvmVersion}.src.tar.xz"; - sha256 = "0224xvfg6h40y5lrbnb9qaq3grmdc5rg00xq03s1wxjfbf8krx8z"; - }; +with stdenv.lib; - suitesparseVersion = "4.4.5"; - suitesparse = fetchurl { - url = "http://faculty.cse.tamu.edu/davis/SuiteSparse/SuiteSparse-${suitesparseVersion}.tar.gz"; - sha256 = "1jcbxb8jx5wlcixzf6n5dca2rcfx6mlcms1k2rl5gp67ay3bix43"; - }; +let + majorVersion = "1"; + minorVersion = "5"; + maintenanceVersion = "3"; + src_sha256 = "sha256:0jds8lrhk4hfdv7dg5p2ibzin9ivga7wrx7zwcmz6dqp3x792n1i"; version = "${majorVersion}.${minorVersion}.${maintenanceVersion}"; in @@ -72,24 +28,13 @@ stdenv.mkDerivation rec { pname = "julia"; inherit version; - src = fetchzip { - url = "https://github.com/JuliaLang/${pname}/releases/download/v${version}/${pname}-${version}.tar.gz"; - sha256 = src_sha256; - }; - prePatch = '' - export PATH=$PATH:${cmake}/bin - mkdir deps/srccache - cp "${dsfmt}" "./deps/srccache/dsfmt-${dsfmtVersion}.tar.gz" - cp "${rmath-julia}" "./deps/srccache/Rmath-julia-${rmathVersion}.tar.gz" - cp "${libuv}" "./deps/srccache/libuv-${libuvVersion}.tar.gz" - cp "${virtualenv}" "./deps/srccache/virtualenv-${virtualenvVersion}.tar.gz" - cp "${libwhich}" "./deps/srccache/libwhich-${libwhichVersion}.tar.gz" - cp "${llvm}" "./deps/srccache/llvm-${llvmVersion}.src.tar.xz" - cp "${suitesparse}" "./deps/srccache/SuiteSparse-${suitesparseVersion}.tar.gz" - ''; + src = fetchzip { + url = "https://github.com/JuliaLang/julia/releases/download/v${version}/julia-${version}-full.tar.gz"; + sha256 = src_sha256; + }; patches = [ - ./0001.1-use-system-utf8proc.patch + ./use-system-utf8proc-julia-1.3.patch # Julia recompiles a precompiled file if the mtime stored *in* the # .ji file differs from the mtime of the .ji file. This @@ -106,28 +51,36 @@ stdenv.mkDerivation rec { done rm stdlib/Sockets/test/runtests.jl && touch stdlib/Sockets/test/runtests.jl rm stdlib/Distributed/test/runtests.jl && touch stdlib/Distributed/test/runtests.jl + # LibGit2 fails with a weird error, so we skip it as well now + rm stdlib/LibGit2/test/runtests.jl && touch stdlib/LibGit2/test/runtests.jl sed -e 's/Invalid Content-Type:/invalid Content-Type:/g' -i ./stdlib/LibGit2/test/libgit2.jl sed -e 's/Failed to resolve /failed to resolve /g' -i ./stdlib/LibGit2/test/libgit2.jl ''; + dontUseCmakeConfigure = true; + buildInputs = [ - arpack fftw fftwSinglePrec gmp libgit2 libunwind mpfr + arpack fftw fftwSinglePrec libgit2 libunwind mpfr pcre2.dev blas lapack openlibm openspecfun readline utf8proc zlib - ] - ++ stdenv.lib.optionals stdenv.isDarwin [CoreServices ApplicationServices] - ; + ] ++ stdenv.lib.optionals stdenv.isDarwin [CoreServices ApplicationServices]; - nativeBuildInputs = [ curl gfortran m4 makeWrapper patchelf perl python2 which ]; + nativeBuildInputs = [ curl gfortran m4 makeWrapper patchelf perl python2 which cmake ]; makeFlags = let arch = head (splitString "-" stdenv.system); - march = { x86_64 = stdenv.hostPlatform.platform.gcc.arch or "x86-64"; i686 = "pentium4"; }.${arch} + march = { + x86_64 = stdenv.hostPlatform.platform.gcc.arch or "x86-64"; + i686 = "pentium4"; + aarch64 = "armv8-a"; + }.${arch} or (throw "unsupported architecture: ${arch}"); # Julia requires Pentium 4 (SSE2) or better - cpuTarget = { x86_64 = "x86-64"; i686 = "pentium4"; }.${arch} + cpuTarget = { x86_64 = "x86-64"; i686 = "pentium4"; aarch64 = "generic"; }.${arch} or (throw "unsupported architecture: ${arch}"); + # Julia applies a lot of patches to its dependencies, so for now do not use the system LLVM + # https://github.com/JuliaLang/julia/tree/master/deps/patches in [ "ARCH=${arch}" "MARCH=${march}" @@ -143,13 +96,10 @@ stdenv.mkDerivation rec { "USE_SYSTEM_ARPACK=1" "USE_SYSTEM_FFTW=1" - "USE_SYSTEM_GMP=1" + "USE_SYSTEM_GMP=0" "USE_SYSTEM_LIBGIT2=1" "USE_SYSTEM_LIBUNWIND=1" - #"USE_SYSTEM_LLVM=1" - "LLVM_VER=6.0.0" - "USE_SYSTEM_MPFR=1" "USE_SYSTEM_OPENLIBM=1" "USE_SYSTEM_OPENSPECFUN=1" @@ -160,17 +110,17 @@ stdenv.mkDerivation rec { "USE_SYSTEM_READLINE=1" "USE_SYSTEM_UTF8PROC=1" "USE_SYSTEM_ZLIB=1" + + "USE_BINARYBUILDER=0" ]; LD_LIBRARY_PATH = makeLibraryPath [ - arpack fftw fftwSinglePrec gmp libgit2 mpfr blas lapack openlibm - openspecfun pcre2 + arpack fftw fftwSinglePrec libgit2 mpfr blas openlibm + openspecfun pcre2 lapack ]; enableParallelBuilding = true; - doCheck = !stdenv.isDarwin; - checkTarget = "testall"; # Julia's tests require read/write access to $HOME preCheck = '' export HOME="$NIX_BUILD_TOP" @@ -204,7 +154,7 @@ stdenv.mkDerivation rec { homepage = "https://julialang.org/"; license = stdenv.lib.licenses.mit; maintainers = with stdenv.lib.maintainers; [ raskin rob garrison ]; - platforms = [ "i686-linux" "x86_64-linux" "x86_64-darwin" ]; + platforms = [ "i686-linux" "x86_64-linux" "x86_64-darwin" "aarch64-linux" ]; broken = stdenv.isi686; }; } diff --git a/infra/libkookie/nixpkgs/pkgs/development/compilers/julia/diagonal-test.patch b/infra/libkookie/nixpkgs/pkgs/development/compilers/julia/diagonal-test.patch new file mode 100644 index 000000000000..dd31e67e9d34 --- /dev/null +++ b/infra/libkookie/nixpkgs/pkgs/development/compilers/julia/diagonal-test.patch @@ -0,0 +1,27 @@ +From 9eb180c523b877a53b9e1cf53a4d5e6dad3d7bfe Mon Sep 17 00:00:00 2001 +From: Lars Jellema <lars.jellema@gmail.com> +Date: Sat, 19 Sep 2020 13:52:20 +0200 +Subject: [PATCH] Use approximate comparisons for diagonal tests + +--- + stdlib/LinearAlgebra/test/diagonal.jl | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/stdlib/LinearAlgebra/test/diagonal.jl b/stdlib/LinearAlgebra/test/diagonal.jl +index e420d5bc6d..7f1b5d0aec 100644 +--- a/stdlib/LinearAlgebra/test/diagonal.jl ++++ b/stdlib/LinearAlgebra/test/diagonal.jl +@@ -450,8 +450,8 @@ end + M = randn(T, 5, 5) + MM = [randn(T, 2, 2) for _ in 1:2, _ in 1:2] + for transform in (identity, adjoint, transpose, Adjoint, Transpose) +- @test lmul!(transform(D), copy(M)) == *(transform(Matrix(D)), M) +- @test rmul!(copy(M), transform(D)) == *(M, transform(Matrix(D))) ++ @test lmul!(transform(D), copy(M)) ≈ *(transform(Matrix(D)), M) ++ @test rmul!(copy(M), transform(D)) ≈ *(M, transform(Matrix(D))) + @test lmul!(transform(DD), copy(MM)) == *(transform(fullDD), MM) + @test rmul!(copy(MM), transform(DD)) == *(MM, transform(fullDD)) + end +-- +2.28.0 + diff --git a/infra/libkookie/nixpkgs/pkgs/development/compilers/julia/0001.1-use-system-utf8proc.patch b/infra/libkookie/nixpkgs/pkgs/development/compilers/julia/use-system-utf8proc-julia-1.0.patch index be4391399f55..be4391399f55 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/compilers/julia/0001.1-use-system-utf8proc.patch +++ b/infra/libkookie/nixpkgs/pkgs/development/compilers/julia/use-system-utf8proc-julia-1.0.patch diff --git a/infra/libkookie/nixpkgs/pkgs/development/compilers/kotlin/default.nix b/infra/libkookie/nixpkgs/pkgs/development/compilers/kotlin/default.nix index e07769967fb1..7f4c824686fe 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/compilers/kotlin/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/compilers/kotlin/default.nix @@ -1,14 +1,14 @@ { stdenv, fetchurl, makeWrapper, jre, unzip }: let - version = "1.4.0"; + version = "1.4.20"; in stdenv.mkDerivation { inherit version; pname = "kotlin"; src = fetchurl { url = "https://github.com/JetBrains/kotlin/releases/download/v${version}/kotlin-compiler-${version}.zip"; - sha256 = "0qgiabpkisqjm9iryidrynqy452vzmpgaw54rd9blr9w7g8r20sr"; + sha256 = "07q16yc7xfw5kzziwxyd7m4dc9msgqk9y2znqw3397kqssj97nqi"; }; propagatedBuildInputs = [ jre ] ; diff --git a/infra/libkookie/nixpkgs/pkgs/development/compilers/ldc/binary.nix b/infra/libkookie/nixpkgs/pkgs/development/compilers/ldc/binary.nix index 56d40be86194..cbdb56efb17f 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/compilers/ldc/binary.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/compilers/ldc/binary.nix @@ -17,7 +17,8 @@ in mkDerivation { dontConfigure = true; dontBuild = true; - nativeBuildInputs = [ fixDarwinDylibNames autoPatchelfHook ]; + nativeBuildInputs = [ autoPatchelfHook ] + ++ lib.optional hostPlatform.isDarwin fixDarwinDylibNames; buildInputs = lib.optionals stdenv.hostPlatform.isLinux [ libxml2 stdenv.cc.cc ]; diff --git a/infra/libkookie/nixpkgs/pkgs/development/compilers/ldc/default.nix b/infra/libkookie/nixpkgs/pkgs/development/compilers/ldc/default.nix index 5a4baabcf8d8..e0a689c7fa05 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/compilers/ldc/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/compilers/ldc/default.nix @@ -1,5 +1,4 @@ import ./generic.nix { - version = "1.20.1"; - ldcSha256 = "1bqsgab22v02pc3c9gcyf15y7aimadv24d68icaw5lpgnvzxy89b"; + version = "1.24.0"; + ldcSha256 = "0g5svf55i0kq55q49awmwqj9qi1n907cyrn1vjdjgs8nx6nn35gx"; } - diff --git a/infra/libkookie/nixpkgs/pkgs/development/compilers/ldc/generic.nix b/infra/libkookie/nixpkgs/pkgs/development/compilers/ldc/generic.nix index c93d423945cb..214d64cfa76b 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/compilers/ldc/generic.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/compilers/ldc/generic.nix @@ -1,5 +1,5 @@ { version, ldcSha256 }: -{ stdenv, fetchurl, cmake, ninja, llvm_5, llvm_8, curl, tzdata +{ stdenv, fetchurl, cmake, ninja, llvm_11, curl, tzdata , libconfig, lit, gdb, unzip, darwin, bash , callPackage, makeWrapper, runCommand, targetPackages , ldcBootstrap ? callPackage ./bootstrap.nix { } @@ -56,16 +56,12 @@ stdenv.mkDerivation rec { ''; nativeBuildInputs = [ - cmake ninja makeWrapper unzip ldcBootstrap lit lit.python + cmake ldcBootstrap lit lit.python llvm_11 makeWrapper ninja unzip ] ++ stdenv.lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.Foundation - # https://github.com/NixOS/nixpkgs/issues/57120 - # https://github.com/NixOS/nixpkgs/pull/59197#issuecomment-481972515 - llvm_5 ] ++ stdenv.lib.optionals (!stdenv.hostPlatform.isDarwin) [ - llvm_8 # https://github.com/NixOS/nixpkgs/pull/36378#issuecomment-385034818 gdb ]; diff --git a/infra/libkookie/nixpkgs/pkgs/development/compilers/llvm/10/clang/default.nix b/infra/libkookie/nixpkgs/pkgs/development/compilers/llvm/10/clang/default.nix index a3d6e7e402ab..fef7720d726d 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/compilers/llvm/10/clang/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/compilers/llvm/10/clang/default.nix @@ -19,10 +19,10 @@ let ''; nativeBuildInputs = [ cmake python3 lld ] - ++ stdenv.lib.optional enableManpages python3.pkgs.sphinx; + ++ stdenv.lib.optional enableManpages python3.pkgs.sphinx + ++ stdenv.lib.optional stdenv.hostPlatform.isDarwin fixDarwinDylibNames; - buildInputs = [ libxml2 llvm ] - ++ stdenv.lib.optional stdenv.isDarwin fixDarwinDylibNames; + buildInputs = [ libxml2 llvm ]; cmakeFlags = [ "-DCMAKE_CXX_FLAGS=-std=c++14" diff --git a/infra/libkookie/nixpkgs/pkgs/development/compilers/llvm/10/compiler-rt.nix b/infra/libkookie/nixpkgs/pkgs/development/compilers/llvm/10/compiler-rt.nix index 47bbe808ac20..e6882cbabb8b 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/compilers/llvm/10/compiler-rt.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/compilers/llvm/10/compiler-rt.nix @@ -41,6 +41,11 @@ stdenv.mkDerivation rec { "-DCMAKE_TRY_COMPILE_TARGET_TYPE=STATIC_LIBRARY" ] ++ stdenv.lib.optionals (bareMetal) [ "-DCOMPILER_RT_OS_DIR=baremetal" + ] ++ stdenv.lib.optionals (stdenv.hostPlatform.isDarwin) [ + # The compiler-rt build infrastructure sniffs supported platforms on Darwin + # and finds i386;x86_64;x86_64h. We only build for x86_64, so linking fails + # when it tries to use libc++ and libc++api for i386. + "-DDARWIN_osx_ARCHS=${stdenv.hostPlatform.parsed.cpu.name}" ]; outputs = [ "out" "dev" ]; diff --git a/infra/libkookie/nixpkgs/pkgs/development/compilers/llvm/10/libc++/default.nix b/infra/libkookie/nixpkgs/pkgs/development/compilers/llvm/10/libc++/default.nix index 651f1887553d..95711903932e 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/compilers/llvm/10/libc++/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/compilers/llvm/10/libc++/default.nix @@ -21,9 +21,10 @@ stdenv.mkDerivation { patchShebangs utils/cat_files.py ''; nativeBuildInputs = [ cmake ] - ++ stdenv.lib.optional (stdenv.hostPlatform.isMusl || stdenv.hostPlatform.isWasi) python3; + ++ stdenv.lib.optional (stdenv.hostPlatform.isMusl || stdenv.hostPlatform.isWasi) python3 + ++ stdenv.lib.optional stdenv.hostPlatform.isDarwin fixDarwinDylibNames; - buildInputs = [ libcxxabi ] ++ lib.optional stdenv.isDarwin fixDarwinDylibNames; + buildInputs = [ libcxxabi ]; cmakeFlags = [ "-DLIBCXX_LIBCXXABI_LIB_PATH=${libcxxabi}/lib" diff --git a/infra/libkookie/nixpkgs/pkgs/development/compilers/llvm/11/clang/default.nix b/infra/libkookie/nixpkgs/pkgs/development/compilers/llvm/11/clang/default.nix index 4f5e20cfe770..2de5f65b4a13 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/compilers/llvm/11/clang/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/compilers/llvm/11/clang/default.nix @@ -20,10 +20,10 @@ let ''; nativeBuildInputs = [ cmake python3 lld ] - ++ stdenv.lib.optional enableManpages python3.pkgs.sphinx; + ++ stdenv.lib.optional enableManpages python3.pkgs.sphinx + ++ stdenv.lib.optional stdenv.hostPlatform.isDarwin fixDarwinDylibNames; - buildInputs = [ libxml2 llvm ] - ++ stdenv.lib.optional stdenv.isDarwin fixDarwinDylibNames; + buildInputs = [ libxml2 llvm ]; cmakeFlags = [ "-DCMAKE_CXX_FLAGS=-std=c++14" diff --git a/infra/libkookie/nixpkgs/pkgs/development/compilers/llvm/11/default.nix b/infra/libkookie/nixpkgs/pkgs/development/compilers/llvm/11/default.nix index a404d1606957..e6765ec68990 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/compilers/llvm/11/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/compilers/llvm/11/default.nix @@ -7,7 +7,7 @@ let release_version = "11.0.0"; - version = "${release_version}"; # differentiating these (variables) is important for RCs + version = release_version; # differentiating these (variables) is important for RCs targetConfig = stdenv.targetPlatform.config; fetch = name: sha256: fetchurl { diff --git a/infra/libkookie/nixpkgs/pkgs/development/compilers/llvm/11/llvm.nix b/infra/libkookie/nixpkgs/pkgs/development/compilers/llvm/11/llvm.nix index 3f37cac078f9..c2b70a149bf5 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/compilers/llvm/11/llvm.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/compilers/llvm/11/llvm.nix @@ -163,7 +163,7 @@ in stdenv.mkDerivation (rec { description = "Collection of modular and reusable compiler and toolchain technologies"; homepage = "https://llvm.org/"; license = stdenv.lib.licenses.ncsa; - maintainers = with stdenv.lib.maintainers; [ lovek323 raskin dtzWill ]; + maintainers = with stdenv.lib.maintainers; [ lovek323 raskin dtzWill primeos ]; platforms = stdenv.lib.platforms.all; }; } // stdenv.lib.optionalAttrs enableManpages { diff --git a/infra/libkookie/nixpkgs/pkgs/development/compilers/llvm/5/clang/default.nix b/infra/libkookie/nixpkgs/pkgs/development/compilers/llvm/5/clang/default.nix index cd7d952243ce..b5e7b54fa5be 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/compilers/llvm/5/clang/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/compilers/llvm/5/clang/default.nix @@ -19,10 +19,10 @@ let ''; nativeBuildInputs = [ cmake python3 ] - ++ stdenv.lib.optional enableManpages python3.pkgs.sphinx; + ++ stdenv.lib.optional enableManpages python3.pkgs.sphinx + ++ stdenv.lib.optional stdenv.hostPlatform.isDarwin fixDarwinDylibNames; - buildInputs = [ libxml2 llvm ] - ++ stdenv.lib.optional stdenv.isDarwin fixDarwinDylibNames; + buildInputs = [ libxml2 llvm ]; cmakeFlags = [ "-DCMAKE_CXX_FLAGS=-std=c++11" diff --git a/infra/libkookie/nixpkgs/pkgs/development/compilers/llvm/5/compiler-rt.nix b/infra/libkookie/nixpkgs/pkgs/development/compilers/llvm/5/compiler-rt.nix index 32d6dd3d4795..41f2b24b057e 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/compilers/llvm/5/compiler-rt.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/compilers/llvm/5/compiler-rt.nix @@ -41,6 +41,11 @@ stdenv.mkDerivation { "-DCMAKE_TRY_COMPILE_TARGET_TYPE=STATIC_LIBRARY" ] ++ stdenv.lib.optionals (bareMetal) [ "-DCOMPILER_RT_OS_DIR=baremetal" + ] ++ stdenv.lib.optionals (stdenv.hostPlatform.isDarwin) [ + # The compiler-rt build infrastructure sniffs supported platforms on Darwin + # and finds i386;x86_64;x86_64h. We only build for x86_64, so linking fails + # when it tries to use libc++ and libc++api for i386. + "-DDARWIN_osx_ARCHS=${stdenv.hostPlatform.parsed.cpu.name}" ]; outputs = [ "out" "dev" ]; diff --git a/infra/libkookie/nixpkgs/pkgs/development/compilers/llvm/5/libc++/default.nix b/infra/libkookie/nixpkgs/pkgs/development/compilers/llvm/5/libc++/default.nix index f8185fc3ff4b..9bebedbc0442 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/compilers/llvm/5/libc++/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/compilers/llvm/5/libc++/default.nix @@ -25,9 +25,11 @@ stdenv.mkDerivation { '' + lib.optionalString stdenv.hostPlatform.isMusl '' patchShebangs utils/cat_files.py ''; - nativeBuildInputs = [ cmake ] ++ stdenv.lib.optional stdenv.hostPlatform.isMusl python3; + nativeBuildInputs = [ cmake ] + ++ stdenv.lib.optional stdenv.hostPlatform.isMusl python3 + ++ stdenv.lib.optional stdenv.hostPlatform.isDarwin fixDarwinDylibNames; - buildInputs = [ libcxxabi ] ++ lib.optional stdenv.isDarwin fixDarwinDylibNames; + buildInputs = [ libcxxabi ]; cmakeFlags = [ "-DLIBCXX_LIBCXXABI_LIB_PATH=${libcxxabi}/lib" diff --git a/infra/libkookie/nixpkgs/pkgs/development/compilers/llvm/6/clang/default.nix b/infra/libkookie/nixpkgs/pkgs/development/compilers/llvm/6/clang/default.nix index 8f6479fe2f4e..ec3effebfd77 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/compilers/llvm/6/clang/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/compilers/llvm/6/clang/default.nix @@ -19,10 +19,10 @@ let ''; nativeBuildInputs = [ cmake python3 ] - ++ stdenv.lib.optional enableManpages python3.pkgs.sphinx; + ++ stdenv.lib.optional enableManpages python3.pkgs.sphinx + ++ stdenv.lib.optional stdenv.hostPlatform.isDarwin fixDarwinDylibNames; - buildInputs = [ libxml2 llvm ] - ++ stdenv.lib.optional stdenv.isDarwin fixDarwinDylibNames; + buildInputs = [ libxml2 llvm ]; cmakeFlags = [ "-DCMAKE_CXX_FLAGS=-std=c++11" diff --git a/infra/libkookie/nixpkgs/pkgs/development/compilers/llvm/6/compiler-rt.nix b/infra/libkookie/nixpkgs/pkgs/development/compilers/llvm/6/compiler-rt.nix index 89f25cad2c54..8bd61f5d7f70 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/compilers/llvm/6/compiler-rt.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/compilers/llvm/6/compiler-rt.nix @@ -41,6 +41,11 @@ stdenv.mkDerivation { "-DCMAKE_TRY_COMPILE_TARGET_TYPE=STATIC_LIBRARY" ] ++ stdenv.lib.optionals (bareMetal) [ "-DCOMPILER_RT_OS_DIR=baremetal" + ] ++ stdenv.lib.optionals (stdenv.hostPlatform.isDarwin) [ + # The compiler-rt build infrastructure sniffs supported platforms on Darwin + # and finds i386;x86_64;x86_64h. We only build for x86_64, so linking fails + # when it tries to use libc++ and libc++api for i386. + "-DDARWIN_osx_ARCHS=${stdenv.hostPlatform.parsed.cpu.name}" ]; outputs = [ "out" "dev" ]; diff --git a/infra/libkookie/nixpkgs/pkgs/development/compilers/llvm/6/libc++/default.nix b/infra/libkookie/nixpkgs/pkgs/development/compilers/llvm/6/libc++/default.nix index a922bcfaf0ea..727a32260872 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/compilers/llvm/6/libc++/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/compilers/llvm/6/libc++/default.nix @@ -25,9 +25,11 @@ stdenv.mkDerivation { '' + lib.optionalString stdenv.hostPlatform.isMusl '' patchShebangs utils/cat_files.py ''; - nativeBuildInputs = [ cmake ] ++ stdenv.lib.optional stdenv.hostPlatform.isMusl python3; + nativeBuildInputs = [ cmake ] + ++ stdenv.lib.optional stdenv.hostPlatform.isMusl python3 + ++ stdenv.lib.optional stdenv.hostPlatform.isDarwin fixDarwinDylibNames; - buildInputs = [ libcxxabi ] ++ lib.optional stdenv.isDarwin fixDarwinDylibNames; + buildInputs = [ libcxxabi ]; cmakeFlags = [ "-DLIBCXX_LIBCXXABI_LIB_PATH=${libcxxabi}/lib" diff --git a/infra/libkookie/nixpkgs/pkgs/development/compilers/llvm/7/clang/default.nix b/infra/libkookie/nixpkgs/pkgs/development/compilers/llvm/7/clang/default.nix index 905ec862ad7e..969938681fe9 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/compilers/llvm/7/clang/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/compilers/llvm/7/clang/default.nix @@ -20,10 +20,10 @@ let ''; nativeBuildInputs = [ cmake python3 ] - ++ stdenv.lib.optional enableManpages python3.pkgs.sphinx; + ++ stdenv.lib.optional enableManpages python3.pkgs.sphinx + ++ stdenv.lib.optional stdenv.hostPlatform.isDarwin fixDarwinDylibNames; - buildInputs = [ libxml2 llvm lld ] - ++ stdenv.lib.optional stdenv.isDarwin fixDarwinDylibNames; + buildInputs = [ libxml2 llvm lld ]; cmakeFlags = [ "-DCMAKE_CXX_FLAGS=-std=c++11" diff --git a/infra/libkookie/nixpkgs/pkgs/development/compilers/llvm/7/compiler-rt.nix b/infra/libkookie/nixpkgs/pkgs/development/compilers/llvm/7/compiler-rt.nix index 97a5d73f3041..ec9b7e6e6ad4 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/compilers/llvm/7/compiler-rt.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/compilers/llvm/7/compiler-rt.nix @@ -41,6 +41,11 @@ stdenv.mkDerivation { "-DCMAKE_TRY_COMPILE_TARGET_TYPE=STATIC_LIBRARY" ] ++ stdenv.lib.optionals (bareMetal) [ "-DCOMPILER_RT_OS_DIR=baremetal" + ] ++ stdenv.lib.optionals (stdenv.hostPlatform.isDarwin) [ + # The compiler-rt build infrastructure sniffs supported platforms on Darwin + # and finds i386;x86_64;x86_64h. We only build for x86_64, so linking fails + # when it tries to use libc++ and libc++api for i386. + "-DDARWIN_osx_ARCHS=${stdenv.hostPlatform.parsed.cpu.name}" ]; outputs = [ "out" "dev" ]; diff --git a/infra/libkookie/nixpkgs/pkgs/development/compilers/llvm/7/libc++/default.nix b/infra/libkookie/nixpkgs/pkgs/development/compilers/llvm/7/libc++/default.nix index 83c05cf0e634..76baadf1c6e9 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/compilers/llvm/7/libc++/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/compilers/llvm/7/libc++/default.nix @@ -24,9 +24,12 @@ stdenv.mkDerivation { '' + lib.optionalString stdenv.hostPlatform.isMusl '' patchShebangs utils/cat_files.py ''; - nativeBuildInputs = [ cmake ] ++ stdenv.lib.optional stdenv.hostPlatform.isMusl python3; - buildInputs = [ libcxxabi ] ++ lib.optional stdenv.isDarwin fixDarwinDylibNames; + nativeBuildInputs = [ cmake ] + ++ stdenv.lib.optional stdenv.hostPlatform.isMusl python3 + ++ stdenv.lib.optional stdenv.hostPlatform.isDarwin fixDarwinDylibNames; + + buildInputs = [ libcxxabi ] ; cmakeFlags = [ "-DLIBCXX_LIBCXXABI_LIB_PATH=${libcxxabi}/lib" diff --git a/infra/libkookie/nixpkgs/pkgs/development/compilers/llvm/7/libc++abi.nix b/infra/libkookie/nixpkgs/pkgs/development/compilers/llvm/7/libc++abi.nix index 97141a0bd402..7f2ec528f3c1 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/compilers/llvm/7/libc++abi.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/compilers/llvm/7/libc++abi.nix @@ -1,4 +1,5 @@ { stdenv, cmake, fetch, libcxx, llvm, version +, standalone ? false # on musl the shared objects don't build , enableShared ? ! stdenv.hostPlatform.isMusl }: @@ -20,7 +21,9 @@ stdenv.mkDerivation { patch -p1 -d $(ls -d libcxx-*) -i ${../libcxx-0001-musl-hacks.patch} ''; - cmakeFlags = stdenv.lib.optional (!enableShared) "-DLIBCXXABI_ENABLE_SHARED=OFF"; + cmakeFlags = + stdenv.lib.optional standalone "-DLLVM_ENABLE_LIBCXX=ON" ++ + stdenv.lib.optional (!enableShared) "-DLIBCXXABI_ENABLE_SHARED=OFF"; installPhase = if stdenv.isDarwin then '' diff --git a/infra/libkookie/nixpkgs/pkgs/development/compilers/llvm/8/clang/default.nix b/infra/libkookie/nixpkgs/pkgs/development/compilers/llvm/8/clang/default.nix index 2d7fc8068900..5c1dca5e33b1 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/compilers/llvm/8/clang/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/compilers/llvm/8/clang/default.nix @@ -20,10 +20,10 @@ let ''; nativeBuildInputs = [ cmake python3 ] - ++ stdenv.lib.optional enableManpages python3.pkgs.sphinx; + ++ stdenv.lib.optional enableManpages python3.pkgs.sphinx + ++ stdenv.lib.optional stdenv.hostPlatform.isDarwin fixDarwinDylibNames; - buildInputs = [ libxml2 llvm lld ] - ++ stdenv.lib.optional stdenv.isDarwin fixDarwinDylibNames; + buildInputs = [ libxml2 llvm lld ]; cmakeFlags = [ "-DCMAKE_CXX_FLAGS=-std=c++11" diff --git a/infra/libkookie/nixpkgs/pkgs/development/compilers/llvm/8/compiler-rt.nix b/infra/libkookie/nixpkgs/pkgs/development/compilers/llvm/8/compiler-rt.nix index a907d4086550..3c6265c4fca0 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/compilers/llvm/8/compiler-rt.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/compilers/llvm/8/compiler-rt.nix @@ -41,6 +41,11 @@ stdenv.mkDerivation { "-DCMAKE_TRY_COMPILE_TARGET_TYPE=STATIC_LIBRARY" ] ++ stdenv.lib.optionals (bareMetal) [ "-DCOMPILER_RT_OS_DIR=baremetal" + ] ++ stdenv.lib.optionals (stdenv.hostPlatform.isDarwin) [ + # The compiler-rt build infrastructure sniffs supported platforms on Darwin + # and finds i386;x86_64;x86_64h. We only build for x86_64, so linking fails + # when it tries to use libc++ and libc++api for i386. + "-DDARWIN_osx_ARCHS=${stdenv.hostPlatform.parsed.cpu.name}" ]; outputs = [ "out" "dev" ]; diff --git a/infra/libkookie/nixpkgs/pkgs/development/compilers/llvm/8/libc++/default.nix b/infra/libkookie/nixpkgs/pkgs/development/compilers/llvm/8/libc++/default.nix index 9c0c7951c794..01e0d8e008cb 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/compilers/llvm/8/libc++/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/compilers/llvm/8/libc++/default.nix @@ -25,9 +25,10 @@ stdenv.mkDerivation { patchShebangs utils/cat_files.py ''; nativeBuildInputs = [ cmake ] - ++ stdenv.lib.optional (stdenv.hostPlatform.isMusl || stdenv.hostPlatform.isWasi) python3; + ++ stdenv.lib.optional (stdenv.hostPlatform.isMusl || stdenv.hostPlatform.isWasi) python3 + ++ stdenv.lib.optional stdenv.hostPlatform.isDarwin fixDarwinDylibNames; - buildInputs = [ libcxxabi ] ++ lib.optional stdenv.isDarwin fixDarwinDylibNames; + buildInputs = [ libcxxabi ]; cmakeFlags = [ "-DLIBCXX_LIBCXXABI_LIB_PATH=${libcxxabi}/lib" diff --git a/infra/libkookie/nixpkgs/pkgs/development/compilers/llvm/9/clang/default.nix b/infra/libkookie/nixpkgs/pkgs/development/compilers/llvm/9/clang/default.nix index 81117e904d82..cfaee05944ca 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/compilers/llvm/9/clang/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/compilers/llvm/9/clang/default.nix @@ -20,10 +20,10 @@ let ''; nativeBuildInputs = [ cmake python3 ] - ++ stdenv.lib.optional enableManpages python3.pkgs.sphinx; + ++ stdenv.lib.optional enableManpages python3.pkgs.sphinx + ++ stdenv.lib.optional stdenv.hostPlatform.isDarwin fixDarwinDylibNames; - buildInputs = [ libxml2 llvm lld ] - ++ stdenv.lib.optional stdenv.isDarwin fixDarwinDylibNames; + buildInputs = [ libxml2 llvm lld ]; cmakeFlags = [ "-DCMAKE_CXX_FLAGS=-std=c++11" diff --git a/infra/libkookie/nixpkgs/pkgs/development/compilers/llvm/9/compiler-rt.nix b/infra/libkookie/nixpkgs/pkgs/development/compilers/llvm/9/compiler-rt.nix index 394f66ff7f1a..13b0b522771f 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/compilers/llvm/9/compiler-rt.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/compilers/llvm/9/compiler-rt.nix @@ -41,6 +41,11 @@ stdenv.mkDerivation rec { "-DCMAKE_TRY_COMPILE_TARGET_TYPE=STATIC_LIBRARY" ] ++ stdenv.lib.optionals (bareMetal) [ "-DCOMPILER_RT_OS_DIR=baremetal" + ] ++ stdenv.lib.optionals (stdenv.hostPlatform.isDarwin) [ + # The compiler-rt build infrastructure sniffs supported platforms on Darwin + # and finds i386;x86_64;x86_64h. We only build for x86_64, so linking fails + # when it tries to use libc++ and libc++api for i386. + "-DDARWIN_osx_ARCHS=${stdenv.hostPlatform.parsed.cpu.name}" ]; outputs = [ "out" "dev" ]; diff --git a/infra/libkookie/nixpkgs/pkgs/development/compilers/llvm/9/libc++/default.nix b/infra/libkookie/nixpkgs/pkgs/development/compilers/llvm/9/libc++/default.nix index cec6de61ca99..c9f0e6254ab4 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/compilers/llvm/9/libc++/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/compilers/llvm/9/libc++/default.nix @@ -21,9 +21,10 @@ stdenv.mkDerivation { patchShebangs utils/cat_files.py ''; nativeBuildInputs = [ cmake ] - ++ stdenv.lib.optional (stdenv.hostPlatform.isMusl || stdenv.hostPlatform.isWasi) python3; + ++ stdenv.lib.optional (stdenv.hostPlatform.isMusl || stdenv.hostPlatform.isWasi) python3 + ++ stdenv.lib.optional stdenv.hostPlatform.isDarwin fixDarwinDylibNames; - buildInputs = [ libcxxabi ] ++ lib.optional stdenv.isDarwin fixDarwinDylibNames; + buildInputs = [ libcxxabi ]; cmakeFlags = [ "-DLIBCXX_LIBCXXABI_LIB_PATH=${libcxxabi}/lib" diff --git a/infra/libkookie/nixpkgs/pkgs/development/compilers/llvm/rocm/default.nix b/infra/libkookie/nixpkgs/pkgs/development/compilers/llvm/rocm/default.nix index 3e2c3cec0c1f..c67b011721a0 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/compilers/llvm/rocm/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/compilers/llvm/rocm/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchFromGitHub, callPackage, wrapCCWith }: let - version = "3.8.0"; + version = "3.10.0"; src = fetchFromGitHub { owner = "RadeonOpenCompute"; repo = "llvm-project"; rev = "rocm-${version}"; - sha256 = "19771lxqbm7yhsy06s4bk7amiryrfdbc0jawribw063l7n599xs6"; + hash = "sha256-Lnma831RXJMnn3N8im3QLy6dYfXAvtbeFX/0CKvpkgY="; }; in rec { clang = wrapCCWith rec { diff --git a/infra/libkookie/nixpkgs/pkgs/development/compilers/llvm/rocm/lld.nix b/infra/libkookie/nixpkgs/pkgs/development/compilers/llvm/rocm/lld.nix index 052bfd1c62d8..34a094bf379c 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/compilers/llvm/rocm/lld.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/compilers/llvm/rocm/lld.nix @@ -21,6 +21,10 @@ stdenv.mkDerivation rec { postInstall = '' moveToOutput include "$dev" moveToOutput lib "$dev" + + # Fix lld binary path for CMake. + substituteInPlace "$dev/lib/cmake/lld/LLDTargets-release.cmake" \ + --replace "\''${_IMPORT_PREFIX}/bin/lld" "$out/bin/lld" ''; meta = with stdenv.lib; { diff --git a/infra/libkookie/nixpkgs/pkgs/development/compilers/lobster/default.nix b/infra/libkookie/nixpkgs/pkgs/development/compilers/lobster/default.nix index 62867f296d72..b87bec7ea2d9 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/compilers/lobster/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/compilers/lobster/default.nix @@ -1,5 +1,6 @@ { stdenv , fetchFromGitHub +, unstableGitUpdater , cmake , callPackage @@ -46,8 +47,9 @@ stdenv.mkDerivation rec { preConfigure = "cd dev"; enableParallelBuilding = true; - passthru.tests = { - can-run-hello-world = callPackage ./test-can-run-hello-world.nix {}; + passthru = { + tests.can-run-hello-world = callPackage ./test-can-run-hello-world.nix {}; + updateScript = unstableGitUpdater { }; }; meta = with stdenv.lib; { @@ -63,4 +65,3 @@ stdenv.mkDerivation rec { platforms = platforms.all; }; } - diff --git a/infra/libkookie/nixpkgs/pkgs/development/compilers/mercury/default.nix b/infra/libkookie/nixpkgs/pkgs/development/compilers/mercury/default.nix index b9225cbd793b..d7029733381d 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/compilers/mercury/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/compilers/mercury/default.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { pname = "mercury"; - version = "20.06"; + version = "20.06.1"; src = fetchurl { url = "https://dl.mercurylang.org/release/mercury-srcdist-${version}.tar.gz"; - sha256 = "1gkr9w8lsdzqykqwd3f1a1phsqv090648i14ilhv8jdg85frdimr"; + sha256 = "ef093ae81424c4f3fe696eff9aefb5fb66899e11bb17ae0326adfb70d09c1c1f"; }; buildInputs = [ gcc flex bison texinfo jdk erlang makeWrapper diff --git a/infra/libkookie/nixpkgs/pkgs/development/compilers/miranda/default.nix b/infra/libkookie/nixpkgs/pkgs/development/compilers/miranda/default.nix index c3cb854cdf49..55d3976858b7 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/compilers/miranda/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/compilers/miranda/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchzip, fetchpatch, gcc }: +{ stdenv, lib, fetchzip, fetchpatch }: stdenv.mkDerivation rec { pname = "miranda"; diff --git a/infra/libkookie/nixpkgs/pkgs/development/compilers/mlkit/default.nix b/infra/libkookie/nixpkgs/pkgs/development/compilers/mlkit/default.nix index 6fa581452507..45cb09d5a2a1 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/compilers/mlkit/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/compilers/mlkit/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "mlkit"; - version = "4.5.0"; + version = "4.5.2"; src = fetchFromGitHub { owner = "melsman"; repo = "mlkit"; rev = "v${version}"; - sha256 = "0fc0y40qphn02857fv2dvhwzzsvgixzchx9i6i0x80xfv7z68fbh"; + sha256 = "1yk7phxnwkm94qs1gbxsr6sr11a0sgpcyjymmqwf0fsl5njgyb98"; }; nativeBuildInputs = [ autoreconfHook mlton ]; diff --git a/infra/libkookie/nixpkgs/pkgs/development/compilers/mono/6.nix b/infra/libkookie/nixpkgs/pkgs/development/compilers/mono/6.nix index 0157fa7b7f68..04028648a255 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/compilers/mono/6.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/compilers/mono/6.nix @@ -2,8 +2,8 @@ callPackage ./generic.nix ({ inherit Foundation libobjc; - version = "6.0.0.313"; + version = "6.12.0.90"; srcArchiveSuffix = "tar.xz"; - sha256 = "0l0cd6q5xh1vdm6zr78rkfqdsmrgzanjgpxvgig0pyd3glfyjim9"; + sha256 = "1b6d0926rd0nkmsppwjgmwsxx1479jjvr1gm7zwk64siml15rpji"; enableParallelBuilding = true; }) diff --git a/infra/libkookie/nixpkgs/pkgs/development/compilers/mono/generic.nix b/infra/libkookie/nixpkgs/pkgs/development/compilers/mono/generic.nix index c510f372666a..ca3b31478070 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/compilers/mono/generic.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/compilers/mono/generic.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, bison, pkgconfig, glib, gettext, perl, libgdiplus, libX11, callPackage, ncurses, zlib, withLLVM ? false, cacert, Foundation, libobjc, python, version, sha256, autoconf, libtool, automake, cmake, which +{ stdenv, fetchurl, bison, pkgconfig, glib, gettext, perl, libgdiplus, libX11, callPackage, ncurses, zlib, withLLVM ? false, cacert, Foundation, libobjc, python3, version, sha256, autoconf, libtool, automake, cmake, which , gnumake42 , enableParallelBuilding ? true , srcArchiveSuffix ? "tar.bz2" @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ gnumake42 ]; buildInputs = - [ bison pkgconfig glib gettext perl libgdiplus libX11 ncurses zlib python autoconf libtool automake cmake which + [ bison pkgconfig glib gettext perl libgdiplus libX11 ncurses zlib python3 autoconf libtool automake cmake which ] ++ (stdenv.lib.optionals stdenv.isDarwin [ Foundation libobjc ]); diff --git a/infra/libkookie/nixpkgs/pkgs/development/compilers/muon/default.nix b/infra/libkookie/nixpkgs/pkgs/development/compilers/muon/default.nix new file mode 100644 index 000000000000..2e178f775b6e --- /dev/null +++ b/infra/libkookie/nixpkgs/pkgs/development/compilers/muon/default.nix @@ -0,0 +1,34 @@ +{ stdenv, lib, fetchFromGitHub, makeWrapper }: + +stdenv.mkDerivation rec { + pname = "muon"; + version = "2019-11-27"; + + src = fetchFromGitHub { + owner = "nickmqb"; + repo = pname; + rev = "6d3a5054ae75b0e5a0ae633cf8cbc3e2a054f8b3"; + sha256 = "1sb1i08421jxlx791g8nh4l239syaj730hagkzc159g0z65614zz"; + }; + + nativeBuildInputs = [ makeWrapper ]; + + buildPhase = '' + mkdir -p $out/bin $out/share/mu + cp -r lib $out/share/mu + gcc -O3 -o $out/bin/mu-unwrapped bootstrap/mu64.c + ''; + + installPhase = '' + makeWrapper $out/bin/mu-unwrapped $out/bin/mu \ + --add-flags $out/share/mu/lib/core.mu + ''; + + meta = with lib; { + description = "Modern low-level programming language"; + homepage = "https://github.com/nickmqb/muon"; + license = licenses.mit; + maintainers = with maintainers; [ Br1ght0ne ]; + platforms = [ "x86_64-linux" ]; + }; +} diff --git a/infra/libkookie/nixpkgs/pkgs/development/compilers/nasm/default.nix b/infra/libkookie/nixpkgs/pkgs/development/compilers/nasm/default.nix index 67665c3bab18..89217db6818f 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/compilers/nasm/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/compilers/nasm/default.nix @@ -1,27 +1,25 @@ -{ stdenv, fetchFromRepoOrCz, autoreconfHook, perl, asciidoc, xmlto, docbook_xml_dtd_45, docbook_xsl }: +{ stdenv, fetchurl, perl }: stdenv.mkDerivation rec { pname = "nasm"; - version = "2.14.02"; + version = "2.15.05"; - src = fetchFromRepoOrCz { - repo = "nasm"; - rev = "${pname}-${version}"; - sha256 = "15z6ybnzlsrqs2964h6czqhpmr7vc3ln4y4h0z9vrznk4mqcwbsa"; + src = fetchurl { + url = "https://www.nasm.us/pub/nasm/releasebuilds/${version}/${pname}-${version}.tar.xz"; + sha256 = "0gqand86b0r86k3h46dh560lykxmxqqywz5m55kgjfq7q4lngbrw"; }; - nativeBuildInputs = [ autoreconfHook perl asciidoc xmlto docbook_xml_dtd_45 docbook_xsl ]; + nativeBuildInputs = [ perl ]; - postBuild = "make manpages"; + enableParallelBuilding = true; doCheck = true; checkPhase = '' - make golden && make test + make golden + make test ''; - NIX_CFLAGS_COMPILE="-Wno-error=attributes"; - meta = with stdenv.lib; { homepage = "https://www.nasm.us/"; description = "An 80x86 and x86-64 assembler designed for portability and modularity"; diff --git a/infra/libkookie/nixpkgs/pkgs/development/compilers/nextpnr/default.nix b/infra/libkookie/nixpkgs/pkgs/development/compilers/nextpnr/default.nix index 5dfefa612206..664ceb79636f 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/compilers/nextpnr/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/compilers/nextpnr/default.nix @@ -14,14 +14,14 @@ let in with stdenv; mkDerivation rec { pname = "nextpnr"; - version = "2020.08.22"; + version = "2020.12.01"; srcs = [ (fetchFromGitHub { owner = "YosysHQ"; repo = "nextpnr"; - rev = "c8ecb8341ca766e1e7565cc2b652b63eaba67508"; - sha256 = "1cf9ad7w5x452qdc6m9c3in6v9yzip3n1as978lbdh76f5mc00fv"; + rev = "868902fbdf0b476bdccf4d25cbb80ba602d2cc11"; + sha256 = "1kb5lhixb7f4q800gjyw9xm9ff1yaq3pgna17f5f0bw6b4ds56zc"; name = "nextpnr"; }) (fetchFromGitHub { diff --git a/infra/libkookie/nixpkgs/pkgs/development/compilers/nim/default.nix b/infra/libkookie/nixpkgs/pkgs/development/compilers/nim/default.nix index 0ec259b66084..59061c0a2f0c 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/compilers/nim/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/compilers/nim/default.nix @@ -1,13 +1,13 @@ # https://nim-lang.github.io/Nim/packaging.html -{ stdenv, lib, fetchgit, fetchurl, makeWrapper, gdb, openssl, pcre, readline -, boehmgc, sqlite, nim-unwrapped, nim }: +{ stdenv, lib, fetchurl, fetchgit, fetchFromGitHub, makeWrapper, gdb, openssl +, pcre, readline, boehmgc, sqlite, nim-unwrapped, nimble-unwrapped }: let - version = "1.2.6"; + version = "1.4.0"; src = fetchurl { url = "https://nim-lang.org/download/nim-${version}.tar.xz"; - sha256 = "0zk5qzxayqjw7kq6p92j4008g9bbyilyymhdc5xq9sln5rqym26z"; + sha256 = "0gf2lqkqzai6mg7mf4y04gdy1ddiavans09i8aisa88ssfza5ywx"; }; meta = with lib; { @@ -139,7 +139,7 @@ let local HOME=$TMPDIR ./bin/nim c koch ./koch boot $kochArgs --parallelBuild:$NIX_BUILD_CORES - ./koch tools $kochArgs --parallelBuild:$NIX_BUILD_CORES + ./koch toolsNoExternal $kochArgs --parallelBuild:$NIX_BUILD_CORES runHook postBuild ''; @@ -153,21 +153,52 @@ let inherit meta; }; + + nimble-unwrapped = stdenv.mkDerivation rec { + pname = "nimble-unwrapped"; + version = "0.12.0"; + + src = fetchFromGitHub { + owner = "nim-lang"; + repo = "nimble"; + rev = "v" + version; + sha256 = "0vx0mdk31n00dr2rhiip6f4x7aa3z3mnblnmwk7f65ixd5hayq6y"; + }; + + nativeBuildInputs = [ nim-unwrapped ]; + buildInputs = [ openssl ]; + + nimFlags = [ "--cpu:${nimHost.cpu}" "--os:${nimHost.os}" "-d:release" ]; + + buildPhase = '' + runHook preBuild + HOME=$NIX_BUILD_TOP nim c $nimFlags src/nimble + runHook postBuild + ''; + + installPhase = '' + runHook preBuild + install -Dt $out/bin src/nimble + runHook postBuild + ''; + }; + }; wrapped = let - nim = nim-unwrapped; + nim' = nim-unwrapped; + nimble' = nimble-unwrapped; inherit (stdenv) targetPlatform; in stdenv.mkDerivation { - name = "${targetPlatform.config}-nim-wrapper-${nim.version}"; - inherit (nim) version; + name = "${targetPlatform.config}-nim-wrapper-${nim'.version}"; + inherit (nim') version; preferLocalBuild = true; nativeBuildInputs = [ makeWrapper ]; unpackPhase = '' runHook preUnpack - tar xf ${nim.src} nim-$version/config/nim.cfg + tar xf ${nim'.src} nim-$version/config/nim.cfg cd nim-$version runHook postUnpack ''; @@ -210,7 +241,7 @@ let substituteAll config/nim.cfg $out/etc/nim/nim.cfg \ --replace "cc = gcc" "" - for binpath in ${nim}/bin/nim?*; do + for binpath in ${nim'}/bin/nim?*; do local binname=`basename $binpath` makeWrapper \ $binpath $out/bin/${targetPlatform.config}-$binname \ @@ -219,21 +250,25 @@ let done makeWrapper \ - ${nim}/nim/bin/nim $out/bin/${targetPlatform.config}-nim \ + ${nim'}/nim/bin/nim $out/bin/${targetPlatform.config}-nim \ $wrapperArgs ln -s $out/bin/${targetPlatform.config}-nim $out/bin/nim + makeWrapper \ + ${nimble'}/bin/nimble $out/bin/${targetPlatform.config}-nimble \ + --suffix PATH : $out/bin + ln -s $out/bin/${targetPlatform.config}-nimble $out/bin/nimble + runHook postBuild ''; dontInstall = true; meta = meta // { - description = nim.meta.description + description = nim'.meta.description + " (${targetPlatform.config} wrapper)"; platforms = lib.platforms.unix; }; - }; in wrapped // wrapperInputs diff --git a/infra/libkookie/nixpkgs/pkgs/development/compilers/ocaml/4.12.nix b/infra/libkookie/nixpkgs/pkgs/development/compilers/ocaml/4.12.nix new file mode 100644 index 000000000000..9fa5d62423cc --- /dev/null +++ b/infra/libkookie/nixpkgs/pkgs/development/compilers/ocaml/4.12.nix @@ -0,0 +1,9 @@ +import ./generic.nix { + major_version = "4"; + minor_version = "12"; + patch_version = "0-alpha1"; + src = fetchTarball { + url = "http://caml.inria.fr/pub/distrib/ocaml-4.12/ocaml-4.12.0~alpha1.tar.xz"; + sha256 = "1p9nnj7l43b697b6bm767znbf1h0s2lyc1qb8izr1vfpsmnm11ws"; + }; +} diff --git a/infra/libkookie/nixpkgs/pkgs/development/compilers/ocaml/generic.nix b/infra/libkookie/nixpkgs/pkgs/development/compilers/ocaml/generic.nix index 1558756e16b1..79aab1ffe831 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/compilers/ocaml/generic.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/compilers/ocaml/generic.nix @@ -1,12 +1,8 @@ { minor_version, major_version, patch_version -, url ? null -, sha256, ...}@args: +, ...}@args: let versionNoPatch = "${toString major_version}.${toString minor_version}"; version = "${versionNoPatch}.${toString patch_version}"; - real_url = if url == null then - "http://caml.inria.fr/pub/distrib/ocaml-${versionNoPatch}/ocaml-${version}.tar.xz" - else url; safeX11 = stdenv: !(stdenv.isAarch32 || stdenv.isMips); in @@ -23,6 +19,13 @@ assert flambdaSupport -> stdenv.lib.versionAtLeast version "4.03"; assert spaceTimeSupport -> stdenv.lib.versionAtLeast version "4.04"; let + src = args.src or (fetchurl { + url = args.url or "http://caml.inria.fr/pub/distrib/ocaml-${versionNoPatch}/ocaml-${version}.tar.xz"; + inherit (args) sha256; + }); +in + +let useNativeCompilers = !stdenv.isMips; inherit (stdenv.lib) optional optionals optionalString; name = "ocaml${optionalString aflSupport "+afl"}${optionalString spaceTimeSupport "+spacetime"}${optionalString flambdaSupport "+flambda"}-${version}"; @@ -39,10 +42,7 @@ stdenv.mkDerivation (args // { inherit name; inherit version; - src = fetchurl { - url = real_url; - inherit sha256; - }; + inherit src; prefixKey = "-prefix "; configureFlags = diff --git a/infra/libkookie/nixpkgs/pkgs/development/compilers/opa/default.nix b/infra/libkookie/nixpkgs/pkgs/development/compilers/opa/default.nix index c20e0d0ef991..864bb8e1b263 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/compilers/opa/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/compilers/opa/default.nix @@ -15,6 +15,8 @@ stdenv.mkDerivation rec { sha256 = "1qs91rq9xrafv2mf2v415k8lv91ab3ycz0xkpjh1mng5ca3pjlf3"; }; + patches = [ ./ocaml-4.03.patch ]; + # Paths so the opa compiler code generation will use the same programs as were # used to build opa. codeGeneratorPaths = stdenv.lib.makeBinPath [ ocamlPackages.ocaml gcc binutils gnumake nodejs ]; @@ -23,7 +25,7 @@ stdenv.mkDerivation rec { patchShebangs . ( cat ./compiler/buildinfos/buildInfos.ml.pre - ./compiler/buildinfos/generate_buildinfos.sh . --release --version ./compiler/buildinfos/version_major.txt + ./compiler/buildinfos/generate_buildinfos.sh . --release --version ./compiler/buildinfos/version_major.txt echo let opa_git_version = ${version} echo 'let opa_git_sha = "xxxx"' cat ./compiler/buildinfos/buildInfos.ml.post @@ -34,6 +36,8 @@ stdenv.mkDerivation rec { done export CAMLP4O=${ocamlPackages.camlp4}/bin/camlp4o export CAMLP4ORF=${ocamlPackages.camlp4}/bin/camlp4orf + export OCAMLBUILD=${ocamlPackages.ocamlbuild}/bin/ocamlbuild + substituteInPlace _tags --replace ', warn_error_A' "" ''; prefixKey = "-prefix "; diff --git a/infra/libkookie/nixpkgs/pkgs/development/compilers/opa/ocaml-4.03.patch b/infra/libkookie/nixpkgs/pkgs/development/compilers/opa/ocaml-4.03.patch new file mode 100644 index 000000000000..5e2a3e2522e6 --- /dev/null +++ b/infra/libkookie/nixpkgs/pkgs/development/compilers/opa/ocaml-4.03.patch @@ -0,0 +1,35 @@ +--- a/compiler/passes/surfaceAstRenaming.ml ++++ b/compiler/passes/surfaceAstRenaming.ml +@@ -1110,7 +1110,7 @@ let find_opt_local_or_global name all_env = + | None -> find_opt_global name all_env + | v -> v + +-let path_expr_to_module_aux p = function ++let path_expr_to_module_aux p : _ -> _ result = function + | Some (OpenedIdent (tree, ident, path)) -> + (match Tree.get_path_opt tree p with + (* the path is not in the tree, which means a 'dot' access +diff --git a/ocamllib/libbase/baseInt64.mli b/ocamllib/libbase/baseInt64.mli +index fb544706..734437f9 100644 +--- a/ocamllib/libbase/baseInt64.mli ++++ b/ocamllib/libbase/baseInt64.mli +@@ -40,7 +40,9 @@ external shift_right_logical : int64 -> int -> int64 = "%int64_lsr" + external of_int : int -> int64 = "%int64_of_int" + external to_int : int64 -> int = "%int64_to_int" + external of_float : float -> int64 = "caml_int64_of_float" ++ "caml_int64_of_float_unboxed" [@@unboxed] [@@noalloc] + external to_float : int64 -> float = "caml_int64_to_float" ++ "caml_int64_to_float_unboxed" [@@unboxed] [@@noalloc] + external of_int32 : int32 -> int64 = "%int64_of_int32" + external to_int32 : int64 -> int32 = "%int64_to_int32" + external of_nativeint : nativeint -> int64 = "%int64_of_nativeint" +@@ -48,7 +50,9 @@ external to_nativeint : int64 -> nativeint = "%int64_to_nativeint" + external of_string : string -> int64 = "caml_int64_of_string" + val to_string : int64 -> string + external bits_of_float : float -> int64 = "caml_int64_bits_of_float" ++ "caml_int64_bits_of_float_unboxed" [@@unboxed] [@@noalloc] + external float_of_bits : int64 -> float = "caml_int64_float_of_bits" ++ "caml_int64_float_of_bits_unboxed" [@@unboxed] [@@noalloc] + type t = int64 + val compare : t -> t -> int + external format : string -> int64 -> string = "caml_int64_format" diff --git a/infra/libkookie/nixpkgs/pkgs/development/compilers/openjdk/11.nix b/infra/libkookie/nixpkgs/pkgs/development/compilers/openjdk/11.nix index 30b56ecba11c..326aef1a562c 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/compilers/openjdk/11.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/compilers/openjdk/11.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchurl, bash, pkgconfig, autoconf, cpio, file, which, unzip +{ stdenv, lib, fetchFromGitHub, bash, pkgconfig, autoconf, cpio, file, which, unzip , zip, perl, cups, freetype, alsaLib, libjpeg, giflib, libpng, zlib, lcms2 , libX11, libICE, libXrender, libXext, libXt, libXtst, libXi, libXinerama , libXcursor, libXrandr, fontconfig, openjdk11-bootstrap @@ -11,16 +11,18 @@ let major = "11"; minor = "0"; - update = "8"; - build = "10"; + update = "9"; + build = "11"; openjdk = stdenv.mkDerivation rec { pname = "openjdk" + lib.optionalString headless "-headless"; version = "${major}.${minor}.${update}+${build}"; - src = fetchurl { - url = "http://hg.openjdk.java.net/jdk-updates/jdk${major}u/archive/jdk-${version}.tar.gz"; - sha256 = "1sdncn1bk4h8xxfnmrl1125maqy6mc0v0y1dyifwsa04wasj9hbz"; + src = fetchFromGitHub { + owner = "openjdk"; + repo = "jdk${major}u"; + rev = "jdk-${version}"; + sha256 = "11j2rqz9nag5y562g99py4p72f2kv4wwwyrnaspmrzax00wynyx7"; }; nativeBuildInputs = [ pkgconfig autoconf ]; @@ -145,6 +147,7 @@ let passthru = { architecture = ""; home = "${openjdk}/lib/openjdk"; + inherit gtk3; }; }; in openjdk diff --git a/infra/libkookie/nixpkgs/pkgs/development/compilers/openjdk/12.nix b/infra/libkookie/nixpkgs/pkgs/development/compilers/openjdk/12.nix index 3576608e13e6..1de5d84a13be 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/compilers/openjdk/12.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/compilers/openjdk/12.nix @@ -151,6 +151,7 @@ let passthru = { architecture = ""; home = "${openjdk}/lib/openjdk"; + inherit gtk3; }; }; in openjdk diff --git a/infra/libkookie/nixpkgs/pkgs/development/compilers/openjdk/13.nix b/infra/libkookie/nixpkgs/pkgs/development/compilers/openjdk/13.nix index 31ffb4baf012..3c7ddfb8dd96 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/compilers/openjdk/13.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/compilers/openjdk/13.nix @@ -151,6 +151,7 @@ let passthru = { architecture = ""; home = "${openjdk}/lib/openjdk"; + inherit gtk3; }; }; in openjdk diff --git a/infra/libkookie/nixpkgs/pkgs/development/compilers/openjdk/8.nix b/infra/libkookie/nixpkgs/pkgs/development/compilers/openjdk/8.nix index bcd3524bb862..050ca2a564a1 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/compilers/openjdk/8.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/compilers/openjdk/8.nix @@ -19,8 +19,8 @@ let aarch64-linux = "aarch64"; }.${stdenv.system} or (throw "Unsupported platform"); - update = "265"; - build = if stdenv.isAarch64 then "b01" else "ga"; + update = "272"; + build = if stdenv.isAarch64 then "b10" else "b10"; baseurl = if stdenv.isAarch64 then "https://hg.openjdk.java.net/aarch64-port/jdk8u-shenandoah" else "https://hg.openjdk.java.net/jdk8u/jdk8u"; repover = lib.optionalString stdenv.isAarch64 "aarch64-shenandoah-" @@ -29,50 +29,50 @@ let jdk8 = fetchurl { name = "jdk8-${repover}.tar.gz"; url = "${baseurl}/archive/${repover}.tar.gz"; - sha256 = if stdenv.isAarch64 then "1a2adw51af064rzlngsdlhs9gl47h3lv6dzvr8swqgl2n93nlbxa" - else "02j1nbf3rxl581fqzc6i3ri6wwxx1dhkmj5klkh5xlp8dkhclr30"; + sha256 = if stdenv.isAarch64 then "db98897d6fddce85996a9b0daf4352abce4578be0b51eada41702ee1469dd415" + else "8f0e8324d3500432e8ed642b4cc7dff90a617dbb2a18a94c07c1020d32f93b7a"; }; langtools = fetchurl { name = "langtools-${repover}.tar.gz"; url = "${baseurl}/langtools/archive/${repover}.tar.gz"; - sha256 = if stdenv.isAarch64 then "0hfrbz7421s2barfrfp0fvmh45iksw2zx1z4ykjg3giv8zbmswfm" - else "1r2adp7sn3y45rb5h059qygz18bgmkqr2g2jc9mpzskl5vwsqiw4"; + sha256 = if stdenv.isAarch64 then "6544c1cc455844bbbb3d2914ffc716b1cee7f19e6aa223764d41a7cddc41322c" + else "632417b0b067c929eda6958341352e29c5810056a5fec138641eb3503f9635b7"; }; hotspot = fetchurl { name = "hotspot-${repover}.tar.gz"; url = "${baseurl}/hotspot/archive/${repover}.tar.gz"; - sha256 = if stdenv.isAarch64 then "0g5h74snfl2dj2xwlvb5hgfbqmnbhxax68axadz11mq7r2bhd0lk" - else "10xj8qr499r6nla74bjh4dmq7pkj63iircijk1wyv9xz5v777pcc"; + sha256 = if stdenv.isAarch64 then "37abb89e66641607dc6f372946bfc6bd413f23fec0b9c3baf75f41ce517e21d8" + else "2142f3b769800a955613b51ffe192551bab1db95b0c219900cf34febc6f20245"; }; corba = fetchurl { name = "corba-${repover}.tar.gz"; url = "${baseurl}/corba/archive/${repover}.tar.gz"; - sha256 = if stdenv.isAarch64 then "0wfqrpr5m4gnavgsl6zcy2l3c7sgn3yl7yhp2crh9icp44ld2cj9" - else "0lk4jimrafgphffsj5yyyhl6pib0y5xxqcr09bgr2w8sjkp4s04s"; + sha256 = if stdenv.isAarch64 then "5da82f7b4aceff32e02d2f559033e3b62b9509d79f1a6891af871502e1d125b1" + else "320098d64c843c1ff2ae62579817f9fb4a81772bc0313a543ce68976ad7a6d98"; }; jdk = fetchurl { name = "jdk-${repover}.tar.gz"; url = "${baseurl}/jdk/archive/${repover}.tar.gz"; - sha256 = if stdenv.isAarch64 then "0ss49bv2dzb9vkabpv1ag04wli5722p0a8gqkzqmzw4nj67snfqw" - else "0anbp4vq8bzhqsqxlgjd0dx0irf57x4i5ddbpljl36vy2pi9xsm7"; + sha256 = if stdenv.isAarch64 then "ee613296d823605dcd1a0fe2f89b4c7393bdb8ae5f2659f48f5cbc0012bb1a47" + else "957c24fc58ac723c8cd808ab60c77d7853710148944c8b9a59f470c4c809e1a0"; }; jaxws = fetchurl { name = "jaxws-${repover}.tar.gz"; url = "${baseurl}/jaxws/archive/${repover}.tar.gz"; - sha256 = if stdenv.isAarch64 then "1nwn6mz38app6pk5f1x3vya1x9qfckyl7z6bi62k6mj2c72ikfh5" - else "113d5nx2mp30m6xy2m2wh0nixk45q8abimlszkiq09w1w1ckzpba"; + sha256 = if stdenv.isAarch64 then "7c426b85f0d378125fa46e6d1b25ddc27ad29d93514d38c5935c84fc540b26ce" + else "4efb0ee143dfe86c8ee06db2429fb81a0c8c65af9ea8fc18daa05148c8a1162f"; }; jaxp = fetchurl { name = "jaxp-${repover}.tar.gz"; url = "${baseurl}/jaxp/archive/${repover}.tar.gz"; - sha256 = if stdenv.isAarch64 then "1rhgbwvp7xls7r3f5jm69dw7x521vamchv917dwiz1byvm2bwn7s" - else "0nvqidjssmamcrchq15cg3lfv5v3cnrw05a4h20xmhlpgb9im0vj"; + sha256 = if stdenv.isAarch64 then "928e363877afa7e0ad0c350bb18be6ab056b23708c0624a0bd7f01c4106c2a14" + else "25a651c670d5b036042f7244617a3eb11fec80c07745c1c8181a1cdebeda3d8e"; }; nashorn = fetchurl { name = "nashorn-${repover}.tar.gz"; url = "${baseurl}/nashorn/archive/${repover}.tar.gz"; - sha256 = if stdenv.isAarch64 then "14gp8q6jw1hq2wlmcalfwn1kgmnq5w9svqnbjww20f25phxkicij" - else "0fm9ldps7ayk7r3wjqiyxp1s6hvi242kl7f92ydkmlxqyfajx60a"; + sha256 = if stdenv.isAarch64 then "f060e08c5924457d4f5047c02ad6a987bdbdcd1cea53d2208322073ba4f398c3" + else "a28b41d86f0c87ceacd2b686dd31c9bf391d851b1b5187a49ef5e565fc2cbc84"; }; openjdk8 = stdenv.mkDerivation { pname = "openjdk" + lib.optionalString headless "-headless"; @@ -267,6 +267,7 @@ let passthru = { inherit architecture; home = "${openjdk8}/lib/openjdk"; + inherit gtk2; }; }; in openjdk8 diff --git a/infra/libkookie/nixpkgs/pkgs/development/compilers/openjdk/default.nix b/infra/libkookie/nixpkgs/pkgs/development/compilers/openjdk/default.nix index 3dd74f73a7ec..1dcd3e23e6fa 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/compilers/openjdk/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/compilers/openjdk/default.nix @@ -151,6 +151,7 @@ let passthru = { architecture = ""; home = "${openjdk}/lib/openjdk"; + inherit gtk3; }; }; in openjdk diff --git a/infra/libkookie/nixpkgs/pkgs/development/compilers/openjdk/jre.nix b/infra/libkookie/nixpkgs/pkgs/development/compilers/openjdk/jre.nix new file mode 100644 index 000000000000..817cdf9c26a9 --- /dev/null +++ b/infra/libkookie/nixpkgs/pkgs/development/compilers/openjdk/jre.nix @@ -0,0 +1,19 @@ +{ jdk +, runCommand +, patchelf +, lib +, modules ? [ "java.base" ] +}: + +let + jre = runCommand "${jdk.name}-jre" { + nativeBuildInputs = [ patchelf ]; + buildInputs = [ jdk ]; + passthru = { + home = "${jre}"; + }; + } '' + jlink --module-path ${jdk}/lib/openjdk/jmods --add-modules ${lib.concatStringsSep "," modules} --output $out + patchelf --shrink-rpath $out/bin/* $out/lib/jexec $out/lib/jspawnhelper $out/lib/*.so $out/lib/*/*.so + ''; +in jre diff --git a/infra/libkookie/nixpkgs/pkgs/development/compilers/orc/default.nix b/infra/libkookie/nixpkgs/pkgs/development/compilers/orc/default.nix index 34e79945f612..210aa786cddf 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/compilers/orc/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/compilers/orc/default.nix @@ -1,23 +1,31 @@ -{ stdenv, fetchurl }: - -stdenv.mkDerivation rec { - name = "orc-0.4.29"; +{ stdenv, fetchurl, meson, ninja +, gtk-doc ? null, file, docbook_xsl +, buildDevDoc ? gtk-doc != null +}: let + inherit (stdenv.lib) optional optionals; +in stdenv.mkDerivation rec { + pname = "orc"; + version = "0.4.32"; src = fetchurl { - url = "https://gstreamer.freedesktop.org/src/orc/${name}.tar.xz"; - sha256 = "1cisbbn69p9c8vikn0nin14q0zscby5m8cyvzxyw2pjb2kwh32ag"; + url = "https://gstreamer.freedesktop.org/src/orc/${pname}-${version}.tar.xz"; + sha256 = "1w0qmyj3v9sb2g7ff39pp38b9850y9hyy0bag26ifrby5f7ksvm6"; }; - outputs = [ "out" "dev" ]; + outputs = [ "out" "dev" ] + ++ optional buildDevDoc "devdoc" + ; outputBin = "dev"; # compilation tools - postInstall = '' - sed "/^toolsdir=/ctoolsdir=$dev/bin" -i "$dev"/lib/pkgconfig/orc*.pc - ''; + mesonFlags = + optional (!buildDevDoc) [ "-Dgtk_doc=disabled" ] + ; + + nativeBuildInputs = [ meson ninja ] + ++ optionals buildDevDoc [ gtk-doc file docbook_xsl ] + ; - # i686 https://gitlab.freedesktop.org/gstreamer/orc/issues/18 - # armv7l https://gitlab.freedesktop.org/gstreamer/orc/issues/9 - doCheck = (!stdenv.hostPlatform.isi686 && !stdenv.hostPlatform.isAarch32); + doCheck = true; meta = with stdenv.lib; { description = "The Oil Runtime Compiler"; diff --git a/infra/libkookie/nixpkgs/pkgs/development/compilers/osl/default.nix b/infra/libkookie/nixpkgs/pkgs/development/compilers/osl/default.nix index e9ca1bf35b88..2c00420c3626 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/compilers/osl/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/compilers/osl/default.nix @@ -1,6 +1,6 @@ { clangStdenv, stdenv, fetchFromGitHub, cmake, zlib, openexr, openimageio, llvm, boost165, flex, bison, partio, pugixml, -utillinux, python +util-linux, python }: let boost_static = boost165.override { enableStatic = true; }; @@ -25,7 +25,7 @@ in clangStdenv.mkDerivation rec { buildInputs = [ cmake zlib openexr openimageio llvm boost_static flex bison partio pugixml - utillinux # needed just for hexdump + util-linux # needed just for hexdump python # CMake doesn't check this? ]; # TODO: How important is partio? CMake doesn't seem to find it diff --git a/infra/libkookie/nixpkgs/pkgs/development/compilers/owl-lisp/default.nix b/infra/libkookie/nixpkgs/pkgs/development/compilers/owl-lisp/default.nix index 80ea9eb4c0b8..93713af99b46 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/compilers/owl-lisp/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/compilers/owl-lisp/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "owl-lisp"; - version = "0.1.19"; + version = "0.1.23"; src = fetchFromGitLab { owner = "owl-lisp"; repo = "owl"; rev = "v${version}"; - sha256 = "1bgjd2gkr5risfcc401rlr5fc82gwm4r2gpp9gzkg9h64acivkjx"; + sha256 = "1indcbicqcdlk9sinkdyhk50fi1b4cb7yrr14vr874gjzmwr2l3i"; }; nativeBuildInputs = [ which ]; diff --git a/infra/libkookie/nixpkgs/pkgs/development/compilers/pakcs/default.nix b/infra/libkookie/nixpkgs/pkgs/development/compilers/pakcs/default.nix index 0183039b11d8..9f876ea914af 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/compilers/pakcs/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/compilers/pakcs/default.nix @@ -4,13 +4,14 @@ , curl, git, unzip, gnutar, coreutils, sqlite }: let - name = "pakcs-2.2.0"; + pname = "pakcs"; + version = "2.2.1"; - # Don't switch to development release without a reason, because its - # source updates without version bump. Prefer current release instead. + # Don't switch to "Current release" without a reason, because its + # source updates without version bump. Prefer last from "Older releases" instead. src = fetchurl { - url = "https://www.informatik.uni-kiel.de/~pakcs/download/${name}-src.tar.gz"; - sha256 = "0c0a6cp9lwha5i90kv9ya2zi1ggnvkf4gwjfzbffgwwa77s2wz2l"; + url = "https://www.informatik.uni-kiel.de/~pakcs/download/pakcs-${version}-src.tar.gz"; + sha256 = "1jyg29j8r8pgcin7ixdya6c3zzfjdi66rghpwrfnkk133fz4iz7s"; }; curry-frontend = (haskellPackages.override { @@ -26,7 +27,7 @@ let }; }).curry-frontend; in stdenv.mkDerivation { - inherit name src; + inherit pname version src; buildInputs = [ swiProlog ]; nativeBuildInputs = [ which makeWrapper ]; diff --git a/infra/libkookie/nixpkgs/pkgs/development/compilers/picat/default.nix b/infra/libkookie/nixpkgs/pkgs/development/compilers/picat/default.nix index eba45ed8bbf3..4898f991079c 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/compilers/picat/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/compilers/picat/default.nix @@ -1,42 +1,36 @@ { stdenv, fetchurl, zlib }: +let + ARCH = { + i686-linux = "linux32"; + x86_64-linux = "linux64"; + aarch64-linux = "linux64"; + }."${stdenv.hostPlatform.system}" or (throw "Unsupported system: ${stdenv.hostPlatform.system}"); +in stdenv.mkDerivation { pname = "picat"; - version = "3.0"; + version = "3.0p3"; src = fetchurl { - url = "http://picat-lang.org/download/picat30_src.tar.gz"; - sha256 = "0ivqp4ifknc019rb975vx5j3rmr69x2f3ig7ybb38wm5zx5mljgg"; + url = "http://picat-lang.org/download/picat30_3_src.tar.gz"; + sha256 = "052w0vk2xfmky5nv280ysb8in6vaph7i79yvbddqmahzszarq5hw"; }; buildInputs = [ zlib ]; - ARCH = if stdenv.hostPlatform.system == "i686-linux" then "linux32" - else if stdenv.hostPlatform.system == "x86_64-linux" then "linux64" - else throw "Unsupported system"; + inherit ARCH; hardeningDisable = [ "format" ]; enableParallelBuilding = true; - buildPhase = '' - cd emu - make -f Makefile.$ARCH - ''; + buildPhase = "cd emu && make -j $NIX_BUILD_CORES -f Makefile.$ARCH"; + installPhase = "mkdir -p $out/bin && cp picat $out/bin/picat"; - installPhase = '' - mkdir -p $out/bin - cp picat $out/bin/picat - ''; - - meta = { + meta = with stdenv.lib; { description = "Logic-based programming langage"; - longDescription = '' - Picat is a simple, and yet powerful, logic-based multi-paradigm - programming language aimed for general-purpose applications. - ''; - homepage = "http://picat-lang.org/"; - license = stdenv.lib.licenses.mpl20; - platforms = stdenv.lib.platforms.linux; - maintainers = [ stdenv.lib.maintainers.earldouglas ]; + homepage = "http://picat-lang.org/"; + license = licenses.mpl20; + platforms = platforms.linux; + maintainers = with maintainers; [ earldouglas thoughtpolice ]; }; } diff --git a/infra/libkookie/nixpkgs/pkgs/development/compilers/ponyc/default.nix b/infra/libkookie/nixpkgs/pkgs/development/compilers/ponyc/default.nix index 566fd7be311c..0bfaba914a7b 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/compilers/ponyc/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/compilers/ponyc/default.nix @@ -107,7 +107,7 @@ stdenv.mkDerivation (rec { description = "Pony is an Object-oriented, actor-model, capabilities-secure, high performance programming language"; homepage = "https://www.ponylang.org"; license = licenses.bsd2; - maintainers = with maintainers; [ doublec kamilchm patternspandemic redvers ]; + maintainers = with maintainers; [ kamilchm patternspandemic redvers ]; platforms = [ "x86_64-linux" "x86_64-darwin" ]; }; }) diff --git a/infra/libkookie/nixpkgs/pkgs/development/compilers/purescript/psc-package/default.nix b/infra/libkookie/nixpkgs/pkgs/development/compilers/purescript/psc-package/default.nix index 0bebd5d2f50d..88f7adce5a1a 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/compilers/purescript/psc-package/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/compilers/purescript/psc-package/default.nix @@ -44,12 +44,10 @@ stdenv.mkDerivation rec { '' + '' chmod u-w $PSC_PACKAGE - $PSC_PACKAGE --bash-completion-script $PSC_PACKAGE > psc-package.bash - $PSC_PACKAGE --fish-completion-script $PSC_PACKAGE > psc-package.fish - $PSC_PACKAGE --zsh-completion-script $PSC_PACKAGE > _psc-package - installShellCompletion \ - psc-package.{bash,fish} \ - --zsh _psc-package + installShellCompletion --cmd psc-package \ + --bash <($PSC_PACKAGE --bash-completion-script $PSC_PACKAGE) \ + --fish <($PSC_PACKAGE --fish-completion-script $PSC_PACKAGE) \ + --zsh <($PSC_PACKAGE --zsh-completion-script $PSC_PACKAGE) ''; meta = with lib; { diff --git a/infra/libkookie/nixpkgs/pkgs/development/compilers/purescript/purescript/default.nix b/infra/libkookie/nixpkgs/pkgs/development/compilers/purescript/purescript/default.nix index 8a7fb96723a7..8dd19ecf8586 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/compilers/purescript/purescript/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/compilers/purescript/purescript/default.nix @@ -47,8 +47,8 @@ in stdenv.mkDerivation rec { install -D -m555 -T purs $PURS ${patchelf libPath} - mkdir -p $out/etc/bash_completion.d/ - $PURS --bash-completion-script $PURS > $out/etc/bash_completion.d/purs-completion.bash + mkdir -p $out/share/bash-completion/completions + $PURS --bash-completion-script $PURS > $out/share/bash-completion/completions/purs-completion.bash ''; passthru.tests = { diff --git a/infra/libkookie/nixpkgs/pkgs/development/compilers/qbe/default.nix b/infra/libkookie/nixpkgs/pkgs/development/compilers/qbe/default.nix index 8926fced482d..436b03e499c3 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/compilers/qbe/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/compilers/qbe/default.nix @@ -1,6 +1,9 @@ -{ stdenv, fetchgit }: +{ stdenv +, fetchgit +, unstableGitUpdater +}: -stdenv.mkDerivation { +stdenv.mkDerivation rec { pname = "qbe"; version = "unstable-2019-07-11"; @@ -11,6 +14,9 @@ stdenv.mkDerivation { }; makeFlags = [ "PREFIX=$(out)" ]; + + passthru.updateScript = unstableGitUpdater { }; + meta = with stdenv.lib; { homepage = "https://c9x.me/compile/"; description = "A small compiler backend written in C"; @@ -19,4 +25,3 @@ stdenv.mkDerivation { platforms = platforms.all; }; } - diff --git a/infra/libkookie/nixpkgs/pkgs/development/compilers/rasm/default.nix b/infra/libkookie/nixpkgs/pkgs/development/compilers/rasm/default.nix index 87dae128f732..37e07a230aec 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/compilers/rasm/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/compilers/rasm/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { description = "Z80 assembler"; # use -n option to display all licenses license = licenses.mit; # expat version - maintainers = [ maintainers.genesis ]; + maintainers = [ ]; platforms = platforms.linux; }; } diff --git a/infra/libkookie/nixpkgs/pkgs/development/compilers/rgbds/default.nix b/infra/libkookie/nixpkgs/pkgs/development/compilers/rgbds/default.nix index d1a9a7742a86..499a0a5f9369 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/compilers/rgbds/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/compilers/rgbds/default.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { This is a fork of the original RGBDS which aims to make the programs more like other UNIX tools. ''; - maintainers = with maintainers; [ matthewbauer ]; + maintainers = with maintainers; [ matthewbauer NieDzejkob ]; platforms = platforms.all; }; } diff --git a/infra/libkookie/nixpkgs/pkgs/development/compilers/rust/1_45.nix b/infra/libkookie/nixpkgs/pkgs/development/compilers/rust/1_45.nix index 94c70880dbaa..2b3de4dd38c6 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/compilers/rust/1_45.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/compilers/rust/1_45.nix @@ -32,6 +32,7 @@ import ./default.nix { armv7-unknown-linux-gnueabihf = "d44294732cf268ea84908f1135f574ab9489132a332eaa9d5bda547374b15d54"; aarch64-unknown-linux-gnu = "a2d74ebeec0b6778026b6c37814cdc91d14db3b0d8b6d69d036216f4d9cf7e49"; x86_64-apple-darwin = "a5464e7bcbce9647607904a4afa8362382f1fc55d39e7bbaf4483ac00eb5d56a"; + powerpc64le-unknown-linux-gnu = "22deeca259459db31065af7c862fcab7fbfb623200520c65002ed2ba93d87ad2"; }; selectRustPackage = pkgs: pkgs.rust_1_45; diff --git a/infra/libkookie/nixpkgs/pkgs/development/compilers/rust/1_46.nix b/infra/libkookie/nixpkgs/pkgs/development/compilers/rust/1_48.nix index c999b346ee6f..b3a512e58bdc 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/compilers/rust/1_46.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/compilers/rust/1_48.nix @@ -19,24 +19,25 @@ } @ args: import ./default.nix { - rustcVersion = "1.46.0"; - rustcSha256 = "0a17jby2pd050s24cy4dfc0gzvgcl585v3vvyfilniyvjrqknsid"; + rustcVersion = "1.48.0"; + rustcSha256 = "0fz4gbb5hp5qalrl9lcl8yw4kk7ai7wx511jb28nypbxninkwxhf"; # Note: the version MUST be one version prior to the version we're # building - bootstrapVersion = "1.45.2"; + bootstrapVersion = "1.47.0"; # fetch hashes by running `print-hashes.sh 1.45.2` bootstrapHashes = { - i686-unknown-linux-gnu = "5b2050dde23152750de89f7e59acaab6bf088d0beb5854c69c9a545fd254b936"; - x86_64-unknown-linux-gnu = "860feed955726a4d96ffe40758a110053326b9ae11c9e1ee059e9c6222f25643"; - arm-unknown-linux-gnueabihf = "ddb5f59bbdef84e0b7c83049461e003ed031dd881a4622365c3d475102535c60"; - armv7-unknown-linux-gnueabihf = "7a556581f87602705f9c89b04cce621cfbba9050b6fbe478166e91d164567531"; - aarch64-unknown-linux-gnu = "151fad66442d28a4e4786753d1afb559c4a3d359081c64769273a31c2f0f4d30"; - x86_64-apple-darwin = "6e8067624ede10aa23081d62e0086c6f42f7228cc0d00fb5ff24d4dac65249d6"; + i686-unknown-linux-gnu = "84bf092130ea5216fc701871e633563fc1c01b6528f60cb0767e96cd8eec30bf"; + x86_64-unknown-linux-gnu = "d0e11e1756a072e8e246b05d54593402813d047d12e44df281fbabda91035d96"; + arm-unknown-linux-gnueabihf = "82e12affb47596b68d0ca64045f4eb698c10ff15406afca604e12cdd07e17b26"; + armv7-unknown-linux-gnueabihf = "19d0fe3892a8e98f99c5aa84f4d6f260853147650cb71f2bae985c91de6c29af"; + aarch64-unknown-linux-gnu = "753c905e89a714ab9bce6fe1397b721f29c0760c32f09d2f328af3d39919c8e6"; + x86_64-apple-darwin = "84e5be6c5c78734deba911dcf80316be1e4c7da2c59413124d039ad96620612f"; + powerpc64le-unknown-linux-gnu = "5760c3b1897ea70791320c2565f3eef700a3d54059027b84bbe6b8d6157f81c8"; }; - selectRustPackage = pkgs: pkgs.rust_1_46; + selectRustPackage = pkgs: pkgs.rust_1_48; rustcPatches = [ ]; diff --git a/infra/libkookie/nixpkgs/pkgs/development/compilers/rust/binary.nix b/infra/libkookie/nixpkgs/pkgs/development/compilers/rust/binary.nix index 9ae7e51e5fef..b84e390e0b0d 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/compilers/rust/binary.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/compilers/rust/binary.nix @@ -1,4 +1,4 @@ -{ stdenv, makeWrapper, bash, curl, darwin +{ stdenv, makeWrapper, bash, curl, darwin, zlib , version , src , platform @@ -42,17 +42,23 @@ rec { ./install.sh --prefix=$out \ --components=${installComponents} - ${optionalString (stdenv.isLinux && bootstrapping) '' + ${optionalString (stdenv.isLinux && bootstrapping) ('' patchelf \ --set-interpreter $(cat $NIX_CC/nix-support/dynamic-linker) \ "$out/bin/rustc" + '' + optionalString (stdenv.lib.versionAtLeast version "1.46") + # rustc bootstrap needs libz starting from 1.46 + '' + ln -s ${zlib}/lib/libz.so.1 $out/lib/libz.so.1 + ln -s ${zlib}/lib/libz.so $out/lib/libz.so + '' + '' patchelf \ --set-interpreter $(cat $NIX_CC/nix-support/dynamic-linker) \ "$out/bin/rustdoc" patchelf \ --set-interpreter $(cat $NIX_CC/nix-support/dynamic-linker) \ "$out/bin/cargo" - ''} + '')} # Do NOT, I repeat, DO NOT use `wrapProgram` on $out/bin/rustc # (or similar) here. It causes strange effects where rustc loads diff --git a/infra/libkookie/nixpkgs/pkgs/development/compilers/rust/default.nix b/infra/libkookie/nixpkgs/pkgs/development/compilers/rust/default.nix index 74c076c204b4..25876cc63803 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/compilers/rust/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/compilers/rust/default.nix @@ -24,9 +24,10 @@ if platform.isDarwin then "macos" else platform.parsed.kernel.name; - # Target triple. Rust has slightly different naming conventions than we use. + # Returns the name of the rust target, even if it is custom. Adjustments are + # because rust has slightly different naming conventions than we do. toRustTarget = platform: with platform.parsed; let - cpu_ = platform.rustc.arch or { + cpu_ = platform.rustc.platform.arch or { "armv7a" = "armv7"; "armv7l" = "armv7"; "armv6l" = "arm"; @@ -34,6 +35,13 @@ in platform.rustc.config or "${cpu_}-${vendor.name}-${kernel.name}${lib.optionalString (abi.name != "unknown") "-${abi.name}"}"; + # Returns the name of the rust target if it is standard, or the json file + # containing the custom target spec. + toRustTargetSpec = platform: + if (platform.rustc or {}) ? platform + then builtins.toFile (toRustTarget platform + ".json") (builtins.toJSON platform.rustc.platform) + else toRustTarget platform; + # This just contains tools for now. But it would conceivably contain # libraries too, say if we picked some default/recommended versions from # `cratesIO` to build by Hydra and/or try to prefer/bias in Cargo.lock for diff --git a/infra/libkookie/nixpkgs/pkgs/development/compilers/rust/make-rust-platform.nix b/infra/libkookie/nixpkgs/pkgs/development/compilers/rust/make-rust-platform.nix index 6a827cff9a15..4b1f572bebb8 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/compilers/rust/make-rust-platform.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/compilers/rust/make-rust-platform.nix @@ -18,4 +18,8 @@ rec { rustcSrc = callPackage ./rust-src.nix { inherit rustc; }; + + rustLibSrc = callPackage ./rust-lib-src.nix { + inherit rustc; + }; } diff --git a/infra/libkookie/nixpkgs/pkgs/development/compilers/rust/print-hashes.sh b/infra/libkookie/nixpkgs/pkgs/development/compilers/rust/print-hashes.sh index 957011fad376..9180ccb67d91 100755 --- a/infra/libkookie/nixpkgs/pkgs/development/compilers/rust/print-hashes.sh +++ b/infra/libkookie/nixpkgs/pkgs/development/compilers/rust/print-hashes.sh @@ -14,6 +14,7 @@ PLATFORMS=( armv7-unknown-linux-gnueabihf aarch64-unknown-linux-gnu x86_64-apple-darwin + powerpc64le-unknown-linux-gnu ) BASEURL=https://static.rust-lang.org/dist VERSION=${1:-} diff --git a/infra/libkookie/nixpkgs/pkgs/development/compilers/rust/rust-lib-src.nix b/infra/libkookie/nixpkgs/pkgs/development/compilers/rust/rust-lib-src.nix new file mode 100644 index 000000000000..67a7fa3641ad --- /dev/null +++ b/infra/libkookie/nixpkgs/pkgs/development/compilers/rust/rust-lib-src.nix @@ -0,0 +1,11 @@ +{ stdenv, rustc }: + +stdenv.mkDerivation { + name = "rust-lib-src"; + src = rustc.src; + phases = [ "unpackPhase" "installPhase" ]; + + installPhase = '' + mv library $out + ''; +} diff --git a/infra/libkookie/nixpkgs/pkgs/development/compilers/rust/rust-src.nix b/infra/libkookie/nixpkgs/pkgs/development/compilers/rust/rust-src.nix index 8977fb84caf7..489795ecec47 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/compilers/rust/rust-src.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/compilers/rust/rust-src.nix @@ -1,4 +1,4 @@ -{ stdenv, rustc }: +{ stdenv, rustc, minimalContent ? true }: stdenv.mkDerivation { name = "rust-src"; @@ -6,6 +6,9 @@ stdenv.mkDerivation { phases = [ "unpackPhase" "installPhase" ]; installPhase = '' mv src $out - rm -rf $out/{ci,doc,etc,grammar,llvm-project,llvm-emscripten,rtstartup,rustllvm,test,tools,vendor,stdarch} + rm -rf $out/{${if minimalContent + then "ci,doc,etc,grammar,llvm-project,llvm-emscripten,rtstartup,rustllvm,test,tools,vendor,stdarch" + else "ci,doc,etc,grammar,llvm-project,llvm-emscripten,rtstartup,rustllvm,test,vendor" + }} ''; } diff --git a/infra/libkookie/nixpkgs/pkgs/development/compilers/rust/rustc.nix b/infra/libkookie/nixpkgs/pkgs/development/compilers/rust/rustc.nix index 65d8920c4a4c..dab1f2a6bd81 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/compilers/rust/rustc.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/compilers/rust/rustc.nix @@ -70,9 +70,9 @@ in stdenv.mkDerivation rec { "--set=build.cargo=${rustPlatform.rust.cargo}/bin/cargo" "--enable-rpath" "--enable-vendor" - "--build=${rust.toRustTarget stdenv.buildPlatform}" - "--host=${rust.toRustTarget stdenv.hostPlatform}" - "--target=${rust.toRustTarget stdenv.targetPlatform}" + "--build=${rust.toRustTargetSpec stdenv.buildPlatform}" + "--host=${rust.toRustTargetSpec stdenv.hostPlatform}" + "--target=${rust.toRustTargetSpec stdenv.targetPlatform}" "${setBuild}.cc=${ccForBuild}" "${setHost}.cc=${ccForHost}" @@ -92,6 +92,12 @@ in stdenv.mkDerivation rec { "${setTarget}.llvm-config=${llvmSharedForTarget}/bin/llvm-config" ] ++ optionals (stdenv.isLinux && !stdenv.targetPlatform.isRedox) [ "--enable-profiler" # build libprofiler_builtins + ] ++ optionals stdenv.buildPlatform.isMusl [ + "${setBuild}.musl-root=${pkgsBuildBuild.targetPackages.stdenv.cc.libc}" + ] ++ optionals stdenv.hostPlatform.isMusl [ + "${setHost}.musl-root=${pkgsBuildHost.targetPackages.stdenv.cc.libc}" + ] ++ optionals stdenv.targetPlatform.isMusl [ + "${setTarget}.musl-root=${pkgsBuildTarget.targetPackages.stdenv.cc.libc}" ]; # The bootstrap.py will generated a Makefile that then executes the build. diff --git a/infra/libkookie/nixpkgs/pkgs/development/compilers/sbcl/2.0.0.nix b/infra/libkookie/nixpkgs/pkgs/development/compilers/sbcl/2.0.9.nix index 6df98a9a60ea..148ecccf1316 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/compilers/sbcl/2.0.0.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/compilers/sbcl/2.0.9.nix @@ -11,11 +11,11 @@ stdenv.mkDerivation rec { pname = "sbcl"; - version = "2.0.0"; + version = "2.0.9"; src = fetchurl { url = "mirror://sourceforge/project/sbcl/sbcl/${version}/${pname}-${version}-source.tar.bz2"; - sha256 = "1krgd69cirp4ili2pfsh1a0mfvq722jbknlvmf17qhsxh1b94dlh"; + sha256 = "sha256:17wvrcwgp45z9b6arik31fjnz7908qhr5ackxq1y0gqi1hsh1xy4"; }; buildInputs = [texinfo]; diff --git a/infra/libkookie/nixpkgs/pkgs/development/compilers/sbcl/default.nix b/infra/libkookie/nixpkgs/pkgs/development/compilers/sbcl/default.nix index d4a00f57b6a4..3c7fca3c4b03 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/compilers/sbcl/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/compilers/sbcl/default.nix @@ -11,11 +11,11 @@ stdenv.mkDerivation rec { pname = "sbcl"; - version = "2.0.2"; + version = "2.0.8"; src = fetchurl { url = "mirror://sourceforge/project/sbcl/sbcl/${version}/${pname}-${version}-source.tar.bz2"; - sha256 = "07pyzdjnhcpqwvr3rrk4i18maqdywbq1qj93fnpx1h4b7dp08r28"; + sha256 = "sha256:1xwrwvps7drrpyw3wg5h3g2qajmkwqs9gz0fdw1ns9adp7vld390"; }; buildInputs = [texinfo]; diff --git a/infra/libkookie/nixpkgs/pkgs/development/compilers/scala/2.10.nix b/infra/libkookie/nixpkgs/pkgs/development/compilers/scala/2.10.nix deleted file mode 100644 index d41442afaf13..000000000000 --- a/infra/libkookie/nixpkgs/pkgs/development/compilers/scala/2.10.nix +++ /dev/null @@ -1,43 +0,0 @@ -{ stdenv, fetchurl, makeWrapper, jre, gnugrep, coreutils }: - -stdenv.mkDerivation rec { - name = "scala-2.10.7"; - - src = fetchurl { - url = "https://www.scala-lang.org/files/archive/${name}.tgz"; - sha256 = "04gi55lzgrhsb78qw8jmnccqim92rw6898knw0a7gfzn2sci30wj"; - }; - - propagatedBuildInputs = [ jre ] ; - buildInputs = [ makeWrapper ] ; - - installPhase = '' - mkdir -p $out - rm bin/*.bat - mv * $out - - for p in $(ls $out/bin/) ; do - wrapProgram $out/bin/$p \ - --prefix PATH ":" ${coreutils}/bin \ - --prefix PATH ":" ${gnugrep}/bin \ - --prefix PATH ":" ${jre}/bin \ - --set JAVA_HOME ${jre} - done - ''; - - meta = { - description = "A general purpose programming language"; - longDescription = '' - Scala is a general purpose programming language designed to express - common programming patterns in a concise, elegant, and type-safe way. - It smoothly integrates features of object-oriented and functional - languages, enabling Java and other programmers to be more productive. - Code sizes are typically reduced by a factor of two to three when - compared to an equivalent Java application. - ''; - homepage = "https://www.scala-lang.org/"; - license = stdenv.lib.licenses.bsd3; - platforms = stdenv.lib.platforms.all; - branch = "2.10"; - }; -} diff --git a/infra/libkookie/nixpkgs/pkgs/development/compilers/scala/2.11.nix b/infra/libkookie/nixpkgs/pkgs/development/compilers/scala/2.11.nix deleted file mode 100644 index d8fcd3f9a88f..000000000000 --- a/infra/libkookie/nixpkgs/pkgs/development/compilers/scala/2.11.nix +++ /dev/null @@ -1,48 +0,0 @@ -{ stdenv, fetchurl, makeWrapper, jre, gnugrep, coreutils }: - -stdenv.mkDerivation rec { - name = "scala-2.11.12"; - - src = fetchurl { - url = "https://www.scala-lang.org/files/archive/${name}.tgz"; - sha256 = "1a4nc4qp9dm4rps47j92hlmxxqskv67qbdmjqc5zd94wd4rps7di"; - }; - - propagatedBuildInputs = [ jre ] ; - buildInputs = [ makeWrapper ] ; - - installPhase = '' - mkdir -p $out - rm "bin/"*.bat - mv * $out - - # put docs in correct subdirectory - mkdir -p $out/share/doc - mv $out/doc $out/share/doc/${name} - mv $out/man $out/share/man - - for p in $(ls $out/bin/) ; do - wrapProgram $out/bin/$p \ - --prefix PATH ":" ${coreutils}/bin \ - --prefix PATH ":" ${gnugrep}/bin \ - --prefix PATH ":" ${jre}/bin \ - --set JAVA_HOME ${jre} - done - ''; - - meta = { - description = "General purpose programming language"; - longDescription = '' - Scala is a general purpose programming language designed to express - common programming patterns in a concise, elegant, and type-safe way. - It smoothly integrates features of object-oriented and functional - languages, enabling Java and other programmers to be more productive. - Code sizes are typically reduced by a factor of two to three when - compared to an equivalent Java application. - ''; - homepage = "https://www.scala-lang.org/"; - license = stdenv.lib.licenses.bsd3; - platforms = stdenv.lib.platforms.all; - branch = "2.11"; - }; -} diff --git a/infra/libkookie/nixpkgs/pkgs/development/compilers/scala/2.12.nix b/infra/libkookie/nixpkgs/pkgs/development/compilers/scala/2.12.nix deleted file mode 100644 index 1a7c5677de5b..000000000000 --- a/infra/libkookie/nixpkgs/pkgs/development/compilers/scala/2.12.nix +++ /dev/null @@ -1,47 +0,0 @@ -{ stdenv, fetchurl, makeWrapper, jre, gnugrep, coreutils }: - -stdenv.mkDerivation rec { - name = "scala-2.12.12"; - - src = fetchurl { - url = "https://www.scala-lang.org/files/archive/${name}.tgz"; - sha256 = "0avyaa7y8w7494339krcpqhc2p8y5pjk4pz7mqmzdzwy7hgws81m"; - }; - - propagatedBuildInputs = [ jre ] ; - buildInputs = [ makeWrapper ] ; - - installPhase = '' - mkdir -p $out - rm "bin/"*.bat - mv * $out - - # put docs in correct subdirectory - mkdir -p $out/share/doc - mv $out/doc $out/share/doc/scala - mv $out/{LICENSE,NOTICE} $out/share/doc/scala - - for p in $(ls $out/bin/) ; do - wrapProgram $out/bin/$p \ - --prefix PATH ":" ${coreutils}/bin \ - --prefix PATH ":" ${gnugrep}/bin \ - --prefix PATH ":" ${jre}/bin \ - --set JAVA_HOME ${jre} - done - ''; - - meta = { - description = "General purpose programming language"; - longDescription = '' - Scala is a general purpose programming language designed to express - common programming patterns in a concise, elegant, and type-safe way. - It smoothly integrates features of object-oriented and functional - languages, enabling Java and other programmers to be more productive. - Code sizes are typically reduced by a factor of two to three when - compared to an equivalent Java application. - ''; - homepage = "https://www.scala-lang.org/"; - license = stdenv.lib.licenses.bsd3; - platforms = stdenv.lib.platforms.all; - }; -} diff --git a/infra/libkookie/nixpkgs/pkgs/development/compilers/scala/2.13.nix b/infra/libkookie/nixpkgs/pkgs/development/compilers/scala/2.13.nix deleted file mode 100644 index 75996c382a8c..000000000000 --- a/infra/libkookie/nixpkgs/pkgs/development/compilers/scala/2.13.nix +++ /dev/null @@ -1,47 +0,0 @@ -{ stdenv, fetchurl, makeWrapper, jre, gnugrep, coreutils }: - -stdenv.mkDerivation rec { - name = "scala-2.13.3"; - - src = fetchurl { - url = "https://www.scala-lang.org/files/archive/${name}.tgz"; - sha256 = "0zv9w9f6g2cfydsvp8mqcfgv2v3487xp4ca1qndg6v7jrhdp7wy9"; - }; - - propagatedBuildInputs = [ jre ] ; - buildInputs = [ makeWrapper ] ; - - installPhase = '' - mkdir -p $out - rm "bin/"*.bat - mv * $out - - # put docs in correct subdirectory - mkdir -p $out/share/doc - mv $out/doc $out/share/doc/scala - mv $out/{LICENSE,NOTICE} $out/share/doc/scala - - for p in $(ls $out/bin/) ; do - wrapProgram $out/bin/$p \ - --prefix PATH ":" ${coreutils}/bin \ - --prefix PATH ":" ${gnugrep}/bin \ - --prefix PATH ":" ${jre}/bin \ - --set JAVA_HOME ${jre} - done - ''; - - meta = { - description = "General purpose programming language"; - longDescription = '' - Scala is a general purpose programming language designed to express - common programming patterns in a concise, elegant, and type-safe way. - It smoothly integrates features of object-oriented and functional - languages, enabling Java and other programmers to be more productive. - Code sizes are typically reduced by a factor of two to three when - compared to an equivalent Java application. - ''; - homepage = "https://www.scala-lang.org/"; - license = stdenv.lib.licenses.bsd3; - platforms = stdenv.lib.platforms.all; - }; -} diff --git a/infra/libkookie/nixpkgs/pkgs/development/compilers/scala/2.x.nix b/infra/libkookie/nixpkgs/pkgs/development/compilers/scala/2.x.nix new file mode 100644 index 000000000000..6b9ab7d483fe --- /dev/null +++ b/infra/libkookie/nixpkgs/pkgs/development/compilers/scala/2.x.nix @@ -0,0 +1,117 @@ +{ stdenv, lib, fetchurl, makeWrapper, jre, gnugrep, coreutils, nixosTests +, writeScript, common-updater-scripts, git, gnused, nix, nixfmt }: + +with lib; + +let + repo = "git@github.com:scala/scala.git"; + + common = { version, sha256, tests, pname }: + stdenv.mkDerivation rec { + inherit version; + + name = "scala-${version}"; + + src = fetchurl { + inherit sha256; + url = "https://www.scala-lang.org/files/archive/scala-${version}.tgz"; + }; + + propagatedBuildInputs = [ jre ]; + buildInputs = [ makeWrapper ]; + + installPhase = '' + mkdir -p $out + rm bin/*.bat + mv * $out + + # put docs in correct subdirectory + mkdir -p $out/share/doc + mv $out/doc $out/share/doc/${name} + mv $out/man $out/share/man + + for p in $(ls $out/bin/) ; do + wrapProgram $out/bin/$p \ + --prefix PATH ":" ${coreutils}/bin \ + --prefix PATH ":" ${gnugrep}/bin \ + --prefix PATH ":" ${jre}/bin \ + --set JAVA_HOME ${jre} + done + ''; + + passthru = { + inherit tests; + + updateScript = writeScript "update.sh" '' + #!${stdenv.shell} + set -o errexit + PATH=${ + stdenv.lib.makeBinPath [ + common-updater-scripts + coreutils + git + gnused + nix + nixfmt + ] + } + versionSelect='v${versions.major version}.${versions.minor version}.*' + oldVersion="$(nix-instantiate --eval -E "with import ./. {}; lib.getVersion ${pname}" | tr -d '"')" + latestTag="$(git -c 'versionsort.suffix=-' ls-remote --exit-code --refs --sort='version:refname' --tags ${repo} "$versionSelect" | tail --lines=1 | cut --delimiter='/' --fields=3 | sed 's|^v||g')" + if [ "$oldVersion" != "$latestTag" ]; then + nixpkgs="$(git rev-parse --show-toplevel)" + default_nix="$nixpkgs/pkgs/development/compilers/scala/2.x.nix" + update-source-version ${pname} "$latestTag" --version-key=version --print-changes + nixfmt "$default_nix" + else + echo "${pname} is already up-to-date" + fi + ''; + }; + + meta = { + description = "A general purpose programming language"; + longDescription = '' + Scala is a general purpose programming language designed to express + common programming patterns in a concise, elegant, and type-safe way. + It smoothly integrates features of object-oriented and functional + languages, enabling Java and other programmers to be more productive. + Code sizes are typically reduced by a factor of two to three when + compared to an equivalent Java application. + ''; + homepage = "https://www.scala-lang.org/"; + license = licenses.bsd3; + platforms = platforms.all; + branch = versions.majorMinor version; + maintainers = [ maintainers.nequissimus ]; + }; + }; +in { + scala_2_10 = common { + version = "2.10.7"; + sha256 = "koMRmRb2u3cU4HaihAzPItWIGbNVIo7RWRrm92kp8RE="; + tests = [ nixosTests.scala.scala_2_10 ]; + pname = "scala_2_10"; + }; + + scala_2_11 = common { + version = "2.11.12"; + sha256 = "sR19M2mcpPYLw7K2hY/ZU+PeK4UiyUP0zaS2dDFhlqg="; + tests = [ nixosTests.scala.scala_2_11 ]; + pname = "scala_2_11"; + }; + + scala_2_12 = common { + version = "2.12.12"; + sha256 = "NSDNHzye//YrrudfMuUtHl3BIL4szzQGSeRw5I9Sfis="; + tests = [ nixosTests.scala.scala_2_12 ]; + pname = "scala_2_12"; + }; + + scala_2_13 = common { + version = "2.13.4"; + sha256 = "1alcnzmxga00nsvgy8yky91zw5b4q0xg2697vrrdgjlglpxiqwdw"; + tests = [ nixosTests.scala.scala_2_13 ]; + pname = "scala_2_13"; + }; +} diff --git a/infra/libkookie/nixpkgs/pkgs/development/compilers/solc/default.nix b/infra/libkookie/nixpkgs/pkgs/development/compilers/solc/default.nix index ac4bc324868a..0f0af33e7001 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/compilers/solc/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/compilers/solc/default.nix @@ -1,32 +1,37 @@ -{ stdenv, fetchzip, boost, cmake, ncurses, python3, coreutils +{ gccStdenv, fetchzip, boost, cmake, ncurses, python3, coreutils , z3Support ? true, z3 ? null, cvc4Support ? true, cvc4 ? null , cln ? null, gmp ? null }: +# compiling source/libsmtutil/CVC4Interface.cpp breaks on clang on Darwin, +# general commandline tests fail at abiencoderv2_no_warning/ on clang on NixOS +let stdenv = gccStdenv; in + assert z3Support -> z3 != null && stdenv.lib.versionAtLeast z3.version "4.6.0"; assert cvc4Support -> cvc4 != null && cln != null && gmp != null; let - jsoncppURL = "https://github.com/open-source-parsers/jsoncpp/archive/1.9.2.tar.gz"; + jsoncppVersion = "1.9.4"; + jsoncppUrl = "https://github.com/open-source-parsers/jsoncpp/archive/${jsoncppVersion}.tar.gz"; jsoncpp = fetchzip { - url = jsoncppURL; - sha256 = "037d1b1qdmn3rksmn1j71j26bv4hkjv7sn7da261k853xb5899sg"; + url = jsoncppUrl; + sha256 = "0qnx5y6c90fphl9mj9d20j2dfgy6s5yr5l0xnzid0vh71zrp6jwv"; }; in stdenv.mkDerivation rec { pname = "solc"; - version = "0.6.8"; + version = "0.7.4"; # upstream suggests avoid using archive generated by github src = fetchzip { url = "https://github.com/ethereum/solidity/releases/download/v${version}/solidity_${version}.tar.gz"; - sha256 = "1nxds6c10hjqjjk893qw2yljws57li0xigbf3ih85y8y6d587ph0"; + sha256 = "02261l54jdbvxk612z7zsyvmchy1rx4lf27b3f616sd7r56krpkg"; }; postPatch = '' substituteInPlace cmake/jsoncpp.cmake \ - --replace "${jsoncppURL}" ${jsoncpp} + --replace "${jsoncppUrl}" ${jsoncpp} ''; cmakeFlags = [ diff --git a/infra/libkookie/nixpkgs/pkgs/development/compilers/souffle/default.nix b/infra/libkookie/nixpkgs/pkgs/development/compilers/souffle/default.nix index dbc5c1fa517d..ba13cd7b4b27 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/compilers/souffle/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/compilers/souffle/default.nix @@ -10,13 +10,13 @@ let in stdenv.mkDerivation rec { pname = "souffle"; - version = "2.0.1"; + version = "2.0.2"; src = fetchFromGitHub { owner = "souffle-lang"; repo = "souffle"; rev = version; - sha256 = "0f7jwmgv83m85lrb2qwvr4cfwzbqww7pik884xd2593fsfqhpnkn"; + sha256 = "1fa6yssgndrln8qbbw2j7j199glxp63irfrz1c2y424rq82mm2r5"; }; nativeBuildInputs = [ autoreconfHook bison flex mcpp doxygen graphviz makeWrapper perl ]; diff --git a/infra/libkookie/nixpkgs/pkgs/development/compilers/spasm-ng/default.nix b/infra/libkookie/nixpkgs/pkgs/development/compilers/spasm-ng/default.nix new file mode 100644 index 000000000000..8eb0ddb59ef7 --- /dev/null +++ b/infra/libkookie/nixpkgs/pkgs/development/compilers/spasm-ng/default.nix @@ -0,0 +1,32 @@ +{ stdenv, fetchFromGitHub, gcc, gmp, openssl, zlib }: + +stdenv.mkDerivation rec { + pname = "spasm-ng"; + + version = "unstable-2020-08-03"; + + src = fetchFromGitHub { + owner = "alberthdev"; + repo = "spasm-ng"; + rev = "221898beff2442f459b80ab89c8e1035db97868e"; + sha256 = "0xspxmp2fir604b4xsk4hi1gjv61rnq2ypppr7cj981jlhicmvjj"; + }; + + nativeBuildInputs = [ gcc ]; + + buildInputs = [ gmp openssl zlib ]; + + enableParallelBuilding = true; + + installPhase = '' + install -Dm755 spasm -t $out/bin + ''; + + meta = with stdenv.lib; { + homepage = "https://github.com/alberthdev/spasm-ng"; + description = "Z80 assembler with extra features to support development for TI calculators"; + license = licenses.gpl2Plus; + maintainers = with maintainers; [ siraben ]; + platforms = platforms.unix; + }; +} diff --git a/infra/libkookie/nixpkgs/pkgs/development/compilers/stalin/default.nix b/infra/libkookie/nixpkgs/pkgs/development/compilers/stalin/default.nix index 430bc251b4bd..e37b207b4f2e 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/compilers/stalin/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/compilers/stalin/default.nix @@ -37,7 +37,7 @@ stdenv.mkDerivation rec { meta = { homepage = "http://www.ece.purdue.edu/~qobi/software.html"; license = stdenv.lib.licenses.gpl2Plus; - description = "Stalin, an optimizing Scheme compiler"; + description = "An optimizing Scheme compiler"; maintainers = [ ]; platforms = ["i686-linux"]; # doesn't want to work on 64-bit platforms diff --git a/infra/libkookie/nixpkgs/pkgs/development/compilers/unison/default.nix b/infra/libkookie/nixpkgs/pkgs/development/compilers/unison/default.nix index c17f85b4936a..7ae16a77a26f 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/compilers/unison/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/compilers/unison/default.nix @@ -1,21 +1,23 @@ { stdenv, fetchurl, autoPatchelfHook , ncurses5, zlib, gmp +, makeWrapper +, less }: stdenv.mkDerivation rec { pname = "unison-code-manager"; - milestone_id = "M1l"; + milestone_id = "M1m"; version = "1.0.${milestone_id}-alpha"; src = if (stdenv.isDarwin) then fetchurl { url = "https://github.com/unisonweb/unison/releases/download/release/${milestone_id}/unison-osx.tar.gz"; - sha256 = "0qbxakrp3p3k3k8a1m2g24ivs3c8j5rj7ij84i7k548505rva9qr"; + sha256 = "06pxvp753j8pr0pn02l7cswmmas5pk1vlkw83yd04h3f2rx1s61v"; } else fetchurl { url = "https://github.com/unisonweb/unison/releases/download/release/${milestone_id}/unison-linux64.tar.gz"; - sha256 = "152yzv7j4nyp228ngzbhki9fid1xdqrjvl1rwxc05wq30jwwqx0x"; + sha256 = "1qspvfq805d34kz031pf9sqw8kzz7h637kc8lnbjlgvwixxkxc7c"; }; # The tarball is just the prebuilt binary, in the archive root. @@ -23,12 +25,13 @@ stdenv.mkDerivation rec { dontBuild = true; dontConfigure = true; - nativeBuildInputs = stdenv.lib.optional (!stdenv.isDarwin) autoPatchelfHook; + nativeBuildInputs = [ makeWrapper ] ++ (stdenv.lib.optional (!stdenv.isDarwin) autoPatchelfHook); buildInputs = stdenv.lib.optionals (!stdenv.isDarwin) [ ncurses5 zlib gmp ]; installPhase = '' mkdir -p $out/bin mv ucm $out/bin + wrapProgram $out/bin/ucm --prefix PATH ":" "${stdenv.lib.makeBinPath [ less ]}"; ''; meta = with stdenv.lib; { diff --git a/infra/libkookie/nixpkgs/pkgs/development/compilers/vala/default.nix b/infra/libkookie/nixpkgs/pkgs/development/compilers/vala/default.nix index 3b4cd1a5a790..1964d74cf3af 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/compilers/vala/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/compilers/vala/default.nix @@ -123,8 +123,8 @@ in rec { }; vala_0_48 = generic { - version = "0.48.7"; - sha256 = "0lswkb7gj0chas9n3l3dbrm9l71hs77adhvm2v600id2ipi37pi8"; + version = "0.48.9"; + sha256 = "1agyrvslv2yh9ikiw7k5nw6j6il1l2zrzfan0pzdpb9xpg9idslw"; }; vala = vala_0_48; diff --git a/infra/libkookie/nixpkgs/pkgs/development/compilers/wla-dx/default.nix b/infra/libkookie/nixpkgs/pkgs/development/compilers/wla-dx/default.nix index 2d3a527fa142..0cebbfa520f0 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/compilers/wla-dx/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/compilers/wla-dx/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake ]; meta = with stdenv.lib; { - homepage = "http://www.villehelin.com/wla.html"; + homepage = "https://www.villehelin.com/wla.html"; description = "Yet Another GB-Z80/Z80/6502/65C02/6510/65816/HUC6280/SPC-700 Multi Platform Cross Assembler Package"; license = licenses.gpl2; maintainers = with maintainers; [ matthewbauer ]; diff --git a/infra/libkookie/nixpkgs/pkgs/development/compilers/yosys/default.nix b/infra/libkookie/nixpkgs/pkgs/development/compilers/yosys/default.nix index c3185ca4e0e6..b16d76304e47 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/compilers/yosys/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/compilers/yosys/default.nix @@ -14,15 +14,32 @@ , zlib }: +# NOTE: as of late 2020, yosys has switched to an automation robot that +# automatically tags their repository Makefile with a new build number every +# day when changes are committed. please MAKE SURE that the version number in +# the 'version' field exactly matches the YOSYS_VER field in the Yosys +# makefile! +# +# if a change in yosys isn't yet available under a build number like this (i.e. +# it was very recently merged, within an hour), wait a few hours for the +# automation robot to tag the new version, like so: +# +# https://github.com/YosysHQ/yosys/commit/71ca9a825309635511b64b3ec40e5e5e9b6ad49b +# +# note that while most nix packages for "unstable versions" use a date-based +# version scheme, synchronizing the nix package version here with the unstable +# yosys version number helps users report better bugs upstream, and is +# ultimately less confusing than using dates. + stdenv.mkDerivation rec { pname = "yosys"; - version = "2020.08.22"; + version = "0.9+3715"; src = fetchFromGitHub { owner = "YosysHQ"; repo = "yosys"; - rev = "12132b6850747aec99715fdfa3184fe3ebefa015"; - sha256 = "1v6x1y2f3r8vi7pnkgx374rrv02xgmg9yg23f61n7d1v2rd6y5cc"; + rev = "d021f4b4003bb7a374038134c65edd3f67473a92"; + sha256 = "0dgdpigqg8mwkry4233p6z6myjnrb1rq32873yhdfwvwqq230x51"; }; enableParallelBuilding = true; @@ -55,11 +72,17 @@ stdenv.mkDerivation rec { (cd misc && ${protobuf}/bin/protoc --cpp_out ../backends/protobuf/ ./yosys.proto) if ! grep -q "ABCREV = ${shortAbcRev}" Makefile; then - echo "yosys isn't compatible with the provided abc (${shortAbcRev}), failing." + echo "ERROR: yosys isn't compatible with the provided abc (${shortAbcRev}), failing." + exit 1 + fi + + if ! grep -q "YOSYS_VER := ${version}" Makefile; then + echo "ERROR: yosys version in Makefile isn't equivalent to version of the nix package (${version}), failing." exit 1 fi ''; + checkTarget = "test"; doCheck = true; checkInputs = [ verilog ]; @@ -68,10 +91,10 @@ stdenv.mkDerivation rec { # they just assume that 'yosys-abc' is available -- but it's not installed # when using ABCEXTERNAL # - # add a symlink to fake things so that both variants work the same way. - postInstall = '' - ln -sfv ${abc-verifier}/bin/abc $out/bin/yosys-abc - ''; + # add a symlink to fake things so that both variants work the same way. this + # is also needed at build time for the test suite. + postBuild = "ln -sfv ${abc-verifier}/bin/abc ./yosys-abc"; + postInstall = "ln -sfv ${abc-verifier}/bin/abc $out/bin/yosys-abc"; meta = with stdenv.lib; { description = "Open RTL synthesis framework and tools"; diff --git a/infra/libkookie/nixpkgs/pkgs/development/compilers/z88dk/default.nix b/infra/libkookie/nixpkgs/pkgs/development/compilers/z88dk/default.nix index a76e57a08078..890924dddc12 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/compilers/z88dk/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/compilers/z88dk/default.nix @@ -53,7 +53,7 @@ stdenv.mkDerivation rec { homepage = "https://www.z88dk.org"; description = "z80 Development Kit"; license = licenses.clArtistic; - maintainers = [ maintainers.genesis ]; + maintainers = [ ]; platforms = platforms.linux; }; } diff --git a/infra/libkookie/nixpkgs/pkgs/development/compilers/zulu/8.nix b/infra/libkookie/nixpkgs/pkgs/development/compilers/zulu/8.nix index 8df1c05d8b82..bea32475f9a8 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/compilers/zulu/8.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/compilers/zulu/8.nix @@ -1,6 +1,6 @@ { stdenv, lib, fetchurl, unzip, makeWrapper, setJavaClassPath , zulu, glib, libxml2, libav_0_8, ffmpeg_3, libxslt, libGL, alsaLib -, fontconfig, freetype, gnome2, cairo, gdk-pixbuf, atk, xorg +, fontconfig, freetype, pango, gtk2, cairo, gdk-pixbuf, atk, xorg , swingSupport ? true }: let @@ -16,8 +16,8 @@ let libraries = [ stdenv.cc.libc glib libxml2 libav_0_8 ffmpeg_3 libxslt libGL - xorg.libXxf86vm alsaLib fontconfig freetype gnome2.pango - gnome2.gtk cairo gdk-pixbuf atk + xorg.libXxf86vm alsaLib fontconfig freetype pango + gtk2 cairo gdk-pixbuf atk ] ++ (lib.optionals swingSupport (with xorg; [ xorg.libX11 xorg.libXext xorg.libXtst xorg.libXi xorg.libXp xorg.libXt xorg.libXrender stdenv.cc.cc diff --git a/infra/libkookie/nixpkgs/pkgs/development/compilers/zulu/default.nix b/infra/libkookie/nixpkgs/pkgs/development/compilers/zulu/default.nix index 151a9e5f1d2a..73e7bd7d338a 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/compilers/zulu/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/compilers/zulu/default.nix @@ -1,6 +1,6 @@ { stdenv, lib, fetchurl, unzip, makeWrapper, setJavaClassPath , zulu, glib, libxml2, libav_0_8, ffmpeg_3, libxslt, libGL, alsaLib -, fontconfig, freetype, gnome2, cairo, gdk-pixbuf, atk, xorg, zlib +, fontconfig, freetype, pango, gtk2, cairo, gdk-pixbuf, atk, xorg, zlib , swingSupport ? true }: let @@ -16,8 +16,8 @@ let libraries = [ stdenv.cc.libc glib libxml2 libav_0_8 ffmpeg_3 libxslt libGL - xorg.libXxf86vm alsaLib fontconfig freetype gnome2.pango - gnome2.gtk cairo gdk-pixbuf atk zlib + xorg.libXxf86vm alsaLib fontconfig freetype pango + gtk2 cairo gdk-pixbuf atk zlib ] ++ (lib.optionals swingSupport (with xorg; [ xorg.libX11 xorg.libXext xorg.libXtst xorg.libXi xorg.libXp xorg.libXt xorg.libXrender stdenv.cc.cc |