From 6a004f7e4cc0f819dcec2c67f2e57760e6c5115d Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 20 Mar 2022 13:53:49 +0000 Subject: [PATCH 001/164] gtk-layer-shell: 0.6.0 -> 0.7.0 https://github.com/wmww/gtk-layer-shell/releases/tag/v0.7.0 --- pkgs/development/libraries/gtk-layer-shell/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/gtk-layer-shell/default.nix b/pkgs/development/libraries/gtk-layer-shell/default.nix index d8010cdc63b4..2c1d3b457497 100644 --- a/pkgs/development/libraries/gtk-layer-shell/default.nix +++ b/pkgs/development/libraries/gtk-layer-shell/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { pname = "gtk-layer-shell"; - version = "0.6.0"; + version = "0.7.0"; outputs = [ "out" "dev" "devdoc" ]; @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { owner = "wmww"; repo = "gtk-layer-shell"; rev = "v${version}"; - sha256 = "sha256-jLWXBoYcVoUSzw4OIYVM5iPvsmpy+Wg5TbDpo8cll80="; + sha256 = "sha256-0S1WBpxXpWoMOecJQS6FKEXRZdw4E5hrjURPyhkxiMc="; }; nativeBuildInputs = [ From 291e69a67a207a637726fcaa6bdc80cafd05fd72 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sun, 22 May 2022 10:25:51 +0200 Subject: [PATCH 002/164] gtk-layer-shell: install demo --- pkgs/development/libraries/gtk-layer-shell/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/libraries/gtk-layer-shell/default.nix b/pkgs/development/libraries/gtk-layer-shell/default.nix index 2c1d3b457497..ba7950d72561 100644 --- a/pkgs/development/libraries/gtk-layer-shell/default.nix +++ b/pkgs/development/libraries/gtk-layer-shell/default.nix @@ -16,6 +16,7 @@ stdenv.mkDerivation rec { version = "0.7.0"; outputs = [ "out" "dev" "devdoc" ]; + outputBin = "devdoc"; # for demo src = fetchFromGitHub { owner = "wmww"; @@ -41,6 +42,7 @@ stdenv.mkDerivation rec { mesonFlags = [ "-Ddocs=true" + "-Dexamples=true" ]; meta = with lib; { From d6915ebb3f5011bc66b88a591b267b71ff884525 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Sat, 7 Aug 2021 03:20:36 +0000 Subject: [PATCH 003/164] buildFHSUserEnvBubblewrap: allow for non-x86 platforms --- pkgs/build-support/build-fhs-userenv-bubblewrap/env.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/build-support/build-fhs-userenv-bubblewrap/env.nix b/pkgs/build-support/build-fhs-userenv-bubblewrap/env.nix index 945b9287ed00..b934f44da90b 100644 --- a/pkgs/build-support/build-fhs-userenv-bubblewrap/env.nix +++ b/pkgs/build-support/build-fhs-userenv-bubblewrap/env.nix @@ -22,8 +22,10 @@ # /lib will link to /lib32 let - is64Bit = stdenv.hostPlatform.parsed.cpu.bits == 64; - isMultiBuild = multiPkgs != null && is64Bit; + inherit (stdenv) is64Bit; + + # use of glibc_multi is only supported on x86_64-linux + isMultiBuild = multiPkgs != null && stdenv.isx86_64 && stdenv.isLinux; isTargetBuild = !isMultiBuild; # list of packages (usually programs) which are only be installed for the From d48f6467e223216fbb886043c51de8c8dcbf2cfe Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Sat, 7 Aug 2021 03:21:16 +0000 Subject: [PATCH 004/164] plex: use buildFHSUserEnvBubblewrap --- pkgs/top-level/all-packages.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index c6e0cc915c0b..c650468c1840 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -9444,7 +9444,9 @@ with pkgs; inherit (callPackage ../servers/plik { }) plik plikd; - plex = callPackage ../servers/plex { }; + plex = callPackage ../servers/plex { + buildFHSUserEnv = buildFHSUserEnvBubblewrap; + }; plexRaw = callPackage ../servers/plex/raw.nix { }; psitransfer = callPackage ../servers/psitransfer { }; From 2c7cc7977f400be7b3194725ac4112b3d5f3e37f Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 28 Jul 2022 21:20:39 +0000 Subject: [PATCH 005/164] libp11: 0.4.11 -> 0.4.12 --- pkgs/development/libraries/libp11/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libp11/default.nix b/pkgs/development/libraries/libp11/default.nix index eb577a7f5a17..70a433ddc280 100644 --- a/pkgs/development/libraries/libp11/default.nix +++ b/pkgs/development/libraries/libp11/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { pname = "libp11"; - version = "0.4.11"; + version = "0.4.12"; src = fetchFromGitHub { owner = "OpenSC"; repo = "libp11"; rev = "${pname}-${version}"; - sha256 = "0hcl706i04nw5c1sj7l6sj6m0yjq6qijz345v498jll58fp5wif8"; + sha256 = "sha256-Xqjl12xT30ZXWYzPWNN3jWY9pxojhd7Kq0OC7rABt4M="; }; configureFlags = [ From efb35dff8a38ea5277fa29aecc5920de2c022714 Mon Sep 17 00:00:00 2001 From: Adam Joseph Date: Thu, 28 Jul 2022 14:02:46 -0700 Subject: [PATCH 006/164] stdenv/linux/bootstrap-files: add mipsel-linux (mips32) --- pkgs/stdenv/linux/bootstrap-files/mipsel.nix | 25 ++++++++++++++++++++ 1 file changed, 25 insertions(+) create mode 100644 pkgs/stdenv/linux/bootstrap-files/mipsel.nix diff --git a/pkgs/stdenv/linux/bootstrap-files/mipsel.nix b/pkgs/stdenv/linux/bootstrap-files/mipsel.nix new file mode 100644 index 000000000000..42f2e871d92e --- /dev/null +++ b/pkgs/stdenv/linux/bootstrap-files/mipsel.nix @@ -0,0 +1,25 @@ +# +# Files came from this Hydra build: +# +# https://hydra.nixos.org/build/185311909 +# +# Which used nixpkgs revision 5bd14b3cfe2f87a2e2b074645aba39c69563e4bc +# to instantiate: +# +# /nix/store/184fa520zv8ls9fzcqyfa5dmkp8kf6xr-stdenv-bootstrap-tools-mipsel-unknown-linux-gnu.drv +# +# and then built: +# +# /nix/store/i46mrzinxi9a5incliwhksmk947ff4wn-stdenv-bootstrap-tools-mipsel-unknown-linux-gnu +# +{ + busybox = import { + url = "http://tarballs.nixos.org/stdenv-linux/mipsel/5bd14b3cfe2f87a2e2b074645aba39c69563e4bc/busybox"; + hash = "sha256-EhuzjL52VEIOfEcFdVGZaDMClQbMc9V9ISrTUNaA7HQ="; + executable = true; + }; + bootstrapTools = import { + url = "http://tarballs.nixos.org/stdenv-linux/mipsel/5bd14b3cfe2f87a2e2b074645aba39c69563e4bc/bootstrap-tools.tar.xz"; + hash = "sha256-OEGgLJOLnV+aobsb+P8mY3Dp8qbeVODBH6x3aUE/MGM="; + }; +} From 8f512e2c5d8ba8ae8a8e9756ce401a92f0a4b180 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 28 Jul 2022 21:51:38 +0000 Subject: [PATCH 007/164] librepo: 1.14.2 -> 1.14.3 --- pkgs/tools/package-management/librepo/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/package-management/librepo/default.nix b/pkgs/tools/package-management/librepo/default.nix index 09dce930d5cc..382043a01e90 100644 --- a/pkgs/tools/package-management/librepo/default.nix +++ b/pkgs/tools/package-management/librepo/default.nix @@ -13,7 +13,7 @@ }: stdenv.mkDerivation rec { - version = "1.14.2"; + version = "1.14.3"; pname = "librepo"; outputs = [ "out" "dev" "py" ]; @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { owner = "rpm-software-management"; repo = "librepo"; rev = version; - sha256 = "sha256-KpGbHBgywaXV7r8W5CPS2N1GohdDFiOwAJmrrjS1m5g="; + sha256 = "sha256-duMFVePhXIrUtVVv8eRp352z9I6tU/8mEOdbYF3+ll8="; }; nativeBuildInputs = [ From 3670639415ad0e12934af9df2b833217c2102c66 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 29 Jul 2022 00:58:44 +0000 Subject: [PATCH 008/164] mod: 0.4.1 -> 0.4.2 --- pkgs/development/tools/mod/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/mod/default.nix b/pkgs/development/tools/mod/default.nix index c1d17bba57b9..837b431a5f46 100644 --- a/pkgs/development/tools/mod/default.nix +++ b/pkgs/development/tools/mod/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "mod"; - version = "0.4.1"; + version = "0.4.2"; src = fetchFromGitHub { owner = "marwan-at-work"; repo = "mod"; rev = "v${version}"; - sha256 = "sha256-IPdZ2PSS4rYVoMxrunse8Z2NHXLjXAoBcDvB6D70ki0="; + sha256 = "sha256-ZmBh59za1OaFObmNzLtuLKkbR0mBeh6OeD+EHton0nE="; }; - vendorSha256 = "sha256-1+06/yXi07iWZhcCEGNnoL2DpeVRYMW/NdyEhZQePbk="; + vendorSha256 = "sha256-+87QR3l9XBJVsx4+8ixaidTHaKyLAxMA9CguOlTVoHM="; doCheck = false; From 3aa2d9376dc7d9b8a23b9bd43785e127f7e00ba4 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 29 Jul 2022 01:18:01 +0000 Subject: [PATCH 009/164] mustache-go: 1.3.1 -> 1.4.0 --- pkgs/development/tools/mustache-go/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/mustache-go/default.nix b/pkgs/development/tools/mustache-go/default.nix index 70997a7a29d5..46df83a66cdf 100644 --- a/pkgs/development/tools/mustache-go/default.nix +++ b/pkgs/development/tools/mustache-go/default.nix @@ -2,14 +2,14 @@ buildGoModule rec { pname = "mustache-go"; - version = "1.3.1"; + version = "1.4.0"; src = fetchFromGitHub { owner = "cbroglie"; repo = "mustache"; rev = "v${version}"; fetchSubmodules = true; - sha256 = "sha256-3mGxbgxZFL05ZKn6T85tYYjaEkEJbIUkCwlNJTwoIfc="; + sha256 = "sha256-A7LIkidhpFmhIjiDu9KdmSIdqFNsV3N8J2QEo7yT+DE="; }; vendorSha256 = "sha256-FYdsLcW6FYxSgixZ5US9cBPABOAVwidC3ejUNbs1lbA="; From 9ffab81e141bb7c7b243d16feb3e08f68d6b1fef Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 31 Jul 2022 01:24:03 +0000 Subject: [PATCH 010/164] stellarsolver: 2.3 -> 2.4 --- .../libraries/science/astronomy/stellarsolver/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/science/astronomy/stellarsolver/default.nix b/pkgs/development/libraries/science/astronomy/stellarsolver/default.nix index 9236ac55eb65..ff1cb5026fdf 100644 --- a/pkgs/development/libraries/science/astronomy/stellarsolver/default.nix +++ b/pkgs/development/libraries/science/astronomy/stellarsolver/default.nix @@ -3,13 +3,13 @@ mkDerivation rec { pname = "stellarsolver"; - version = "2.3"; + version = "2.4"; src = fetchFromGitHub { owner = "rlancaste"; repo = pname; rev = version; - sha256 = "sha256-DSydgn9brVQlVNfW8Lnw/ZNs7aftokkCuJshgqmegpY="; + sha256 = "sha256-HYNkpgkiRtA1ZsiFkmYk3MT3fKgs2d2neSExVXBbsPc="; }; nativeBuildInputs = [ cmake ]; From 063d68accc0931d58611199d615a0b525f6ac04b Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 31 Jul 2022 19:04:09 +0000 Subject: [PATCH 011/164] log4cplus: 2.0.7 -> 2.0.8 --- pkgs/development/libraries/log4cplus/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/log4cplus/default.nix b/pkgs/development/libraries/log4cplus/default.nix index 160cdabed708..6cc40fc70921 100644 --- a/pkgs/development/libraries/log4cplus/default.nix +++ b/pkgs/development/libraries/log4cplus/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "log4cplus"; - version = "2.0.7"; + version = "2.0.8"; src = fetchurl { url = "mirror://sourceforge/log4cplus/log4cplus-${version}.tar.bz2"; - sha256 = "sha256-j626/uK6TlWKD3iEJhPJ+yOcd12D8jNA0JEITA4bEqs="; + sha256 = "sha256-yjaqNmA20cYfwDZqn/vPMrrVXXSHiyw2qcNNzAC4oMo="; }; meta = { From 6741a9f308db5f60cac969f4d4c170f41fc7634f Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 31 Jul 2022 19:35:55 +0000 Subject: [PATCH 012/164] lombok: 1.18.22 -> 1.18.24 --- pkgs/development/libraries/java/lombok/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/java/lombok/default.nix b/pkgs/development/libraries/java/lombok/default.nix index 3cc046ac119b..f7f2a619a1c9 100644 --- a/pkgs/development/libraries/java/lombok/default.nix +++ b/pkgs/development/libraries/java/lombok/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "lombok"; - version = "1.18.22"; + version = "1.18.24"; src = fetchurl { url = "https://projectlombok.org/downloads/lombok-${version}.jar"; - sha256 = "sha256-7O8VgUEdeoLMBCgWZ+4LrF18ClqudM/DhDA5bJHDGDE="; + sha256 = "sha256-01hLwtsD8Fn5hPsKnBGarB+g2leKRI5p/D9os2WEx0k="; }; nativeBuildInputs = [ makeWrapper ]; From 15e3765c4e5ec347935e737f57c1b20874f2de69 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 31 Jul 2022 23:45:12 +0000 Subject: [PATCH 013/164] maven: 3.8.5 -> 3.8.6 --- .../development/tools/build-managers/apache-maven/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/build-managers/apache-maven/default.nix b/pkgs/development/tools/build-managers/apache-maven/default.nix index 001d0edf49ac..8e8df20795b3 100644 --- a/pkgs/development/tools/build-managers/apache-maven/default.nix +++ b/pkgs/development/tools/build-managers/apache-maven/default.nix @@ -4,13 +4,13 @@ assert jdk != null; stdenv.mkDerivation rec { pname = "apache-maven"; - version = "3.8.5"; + version = "3.8.6"; builder = ./builder.sh; src = fetchurl { url = "mirror://apache/maven/maven-3/${version}/binaries/${pname}-${version}-bin.tar.gz"; - sha256 = "sha256-iOMHAPMqP2Dg0o0PEqNSXSm3wgxy0TAVPfW11tiQxnM="; + sha256 = "sha256-xwR6SN62Jqvyb3GrNkPSltubHmfx+qfZiGN96sh2tak="; }; nativeBuildInputs = [ makeWrapper ]; From a7b9a7b1e8c74843a321a5ad36e9b90da763bd6e Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 1 Aug 2022 06:49:21 +0000 Subject: [PATCH 014/164] pkcs11helper: 1.28 -> 1.29.0 --- pkgs/development/libraries/pkcs11helper/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/pkcs11helper/default.nix b/pkgs/development/libraries/pkcs11helper/default.nix index 4de361a59842..660313092202 100644 --- a/pkgs/development/libraries/pkcs11helper/default.nix +++ b/pkgs/development/libraries/pkcs11helper/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "pkcs11-helper"; - version = "1.28"; + version = "1.29.0"; src = fetchFromGitHub { owner = "OpenSC"; repo = "pkcs11-helper"; rev = "${pname}-${version}"; - sha256 = "sha256-gy04f62TX42mW4hKD/jTZXTpz9v6gQXNrY/pv8Ie4p0="; + sha256 = "sha256-HPaPmsCJ81NaS7mgRGbR7KFG6AM3s6HXdWKdfREhcLc="; }; nativeBuildInputs = [ autoreconfHook pkg-config ]; From cce0acf4bcce6baf64b6f236549c0ae0754390fe Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 1 Aug 2022 13:48:06 +0000 Subject: [PATCH 015/164] elinks: 0.15.0 -> 0.15.1 --- pkgs/applications/networking/browsers/elinks/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/browsers/elinks/default.nix b/pkgs/applications/networking/browsers/elinks/default.nix index 1daa5d351a8c..3278191a9c53 100644 --- a/pkgs/applications/networking/browsers/elinks/default.nix +++ b/pkgs/applications/networking/browsers/elinks/default.nix @@ -13,13 +13,13 @@ assert enablePython -> python != null; stdenv.mkDerivation rec { pname = "elinks"; - version = "0.15.0"; + version = "0.15.1"; src = fetchFromGitHub { owner = "rkd77"; repo = "felinks"; rev = "v${version}"; - sha256 = "sha256-2TF0rbmjwhwV2AVUXjfzoprzpeqrETis3AFhMftpaZQ="; + sha256 = "sha256-9OEi4UF/4/IRtccJou3QuevQzWjA6PuU5IVlT7qqGZ0="; }; buildInputs = [ From decaf3e0efe2f3fa2fb4ad328914fe7fb8cbce64 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Wed, 20 Jul 2022 22:15:21 +0200 Subject: [PATCH 016/164] nixos/dex: replace arbitrary secrets via environmentFile --- nixos/modules/services/web-apps/dex.nix | 28 +++++++++++++++++++------ 1 file changed, 22 insertions(+), 6 deletions(-) diff --git a/nixos/modules/services/web-apps/dex.nix b/nixos/modules/services/web-apps/dex.nix index eebf4b740c77..82fdcd212f96 100644 --- a/nixos/modules/services/web-apps/dex.nix +++ b/nixos/modules/services/web-apps/dex.nix @@ -11,15 +11,26 @@ let settingsFormat = pkgs.formats.yaml {}; configFile = settingsFormat.generate "config.yaml" filteredSettings; - startPreScript = pkgs.writeShellScript "dex-start-pre" ('' - '' + (concatStringsSep "\n" (builtins.map (file: '' - ${pkgs.replace-secret}/bin/replace-secret '${file}' '${file}' /run/dex/config.yaml - '') secretFiles))); + startPreScript = pkgs.writeShellScript "dex-start-pre" + (concatStringsSep "\n" (map (file: '' + replace-secret '${file}' '${file}' /run/dex/config.yaml + '') + secretFiles)); in { options.services.dex = { enable = mkEnableOption "the OpenID Connect and OAuth2 identity provider"; + environmentFile = mkOption { + type = types.nullOr types.path; + default = null; + description = '' + Environment file (see systemd.exec(5) + "EnvironmentFile=" section for the syntax) to define variables for dex. + This option can be used to safely include secret keys into the dex configuration. + ''; + }; + settings = mkOption { type = settingsFormat.type; default = {}; @@ -48,6 +59,9 @@ in description = lib.mdDoc '' The available options can be found in [the example configuration](https://github.com/dexidp/dex/blob/v${pkgs.dex.version}/config.yaml.dist). + + It's also possible to refer to environment variables (defined in [services.dex.environmentFile](#opt-services.dex.environmentFile)) + using the syntax `$VARIABLE_NAME`. ''; }; }; @@ -57,15 +71,15 @@ in description = "dex identity provider"; wantedBy = [ "multi-user.target" ]; after = [ "networking.target" ] ++ (optional (cfg.settings.storage.type == "postgres") "postgresql.service"); - + path = with pkgs; [ replace-secret ]; serviceConfig = { ExecStart = "${pkgs.dex-oidc}/bin/dex serve /run/dex/config.yaml"; ExecStartPre = [ "${pkgs.coreutils}/bin/install -m 600 ${configFile} /run/dex/config.yaml" "+${startPreScript}" ]; - RuntimeDirectory = "dex"; + RuntimeDirectory = "dex"; AmbientCapabilities = "CAP_NET_BIND_SERVICE"; BindReadOnlyPaths = [ "/nix/store" @@ -109,6 +123,8 @@ in TemporaryFileSystem = "/:ro"; # Does not work well with the temporary root #UMask = "0066"; + } // optionalAttrs (cfg.environmentFile != null) { + EnvironmentFile = cfg.environmentFile; }; }; }; From 16dbcfa7d696192c00c31c0c0df48b4925f43835 Mon Sep 17 00:00:00 2001 From: majewsky Date: Fri, 22 Jul 2022 19:48:24 +0200 Subject: [PATCH 017/164] maintainers: add majewsky --- maintainers/maintainer-list.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index dddc6290d4a2..846ecfffab1b 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -7904,6 +7904,12 @@ githubId = 31056089; name = "Tom Ho"; }; + majewsky = { + email = "majewsky@gmx.net"; + github = "majewsky"; + githubId = 24696; + name = "Stefan Majewsky"; + }; majiir = { email = "majiir@nabaal.net"; github = "Majiir"; From d6b6e4fa6b68205a1508ed4f55690e7b77809451 Mon Sep 17 00:00:00 2001 From: Jonas Heinrich Date: Fri, 5 Aug 2022 11:42:33 +0200 Subject: [PATCH 018/164] hatch: init at 1.3.1 --- pkgs/development/tools/hatch/default.nix | 69 ++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 71 insertions(+) create mode 100644 pkgs/development/tools/hatch/default.nix diff --git a/pkgs/development/tools/hatch/default.nix b/pkgs/development/tools/hatch/default.nix new file mode 100644 index 000000000000..777028a008f9 --- /dev/null +++ b/pkgs/development/tools/hatch/default.nix @@ -0,0 +1,69 @@ +{ lib +, stdenv +, fetchFromGitHub +, python3 +, git +}: + +python3.pkgs.buildPythonApplication rec { + pname = "hatch"; + version = "1.3.1"; + format = "pyproject"; + + src = fetchFromGitHub { + owner = "pypa"; + repo = "hatch"; + rev = "hatch-v${version}"; + sha256 = "sha256-ftT86HX5CVbiHe5yzXT2gNl8Rx+f+fmiAJRnOuDpvYI="; + }; + + propagatedBuildInputs = with python3.pkgs; [ + click + hatchling + httpx + keyring + pexpect + pyperclip + rich + shellingham + tomli-w + tomlkit + userpath + virtualenv + ]; + + checkInputs = with python3.pkgs; [ + git + pytestCheckHook + pytest-mock + ]; + + preCheck = '' + export HOME=$(mktemp -d); + ''; + + disabledTests = [ + # AssertionError: assert (1980, 1, 2, 0, 0, 0) == (2020, 2, 2, 0, 0, 0) + "test_default" + "test_explicit_path" + "test_default_auto_detection" + "test_editable_default" + "test_editable_default_extra_dependencies" + "test_editable_default_force_include" + "test_editable_default_force_include_option" + "test_editable_exact" + "test_editable_exact_extra_dependencies" + "test_editable_exact_force_include" + "test_editable_exact_force_include_build_data_precedence" + "test_editable_pth" + # AssertionError: assert len(extract_installed_requirements(output.splitlines())) > 0 + "test_creation_allow_system_packages" + ]; + + meta = with lib; { + description = "Modern, extensible Python project manager"; + homepage = "https://hatch.pypa.io/latest/"; + license = licenses.mit; + maintainers = with maintainers; [ onny ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 593e6a4504da..bd334d914e16 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7171,6 +7171,8 @@ with pkgs; haste-server = callPackage ../servers/haste-server { }; + hatch = python3Packages.callPackage ../development/tools/hatch { }; + hal-hardware-analyzer = libsForQt5.callPackage ../applications/science/electronics/hal-hardware-analyzer { }; half = callPackage ../development/libraries/half { }; From 89f690790ae8638042a450a94d22d9bd94fd72d1 Mon Sep 17 00:00:00 2001 From: Emily Trau Date: Mon, 1 Aug 2022 03:10:32 +1000 Subject: [PATCH 019/164] stegsolve: init at 1.3 --- pkgs/tools/graphics/stegsolve/default.nix | 47 +++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 49 insertions(+) create mode 100644 pkgs/tools/graphics/stegsolve/default.nix diff --git a/pkgs/tools/graphics/stegsolve/default.nix b/pkgs/tools/graphics/stegsolve/default.nix new file mode 100644 index 000000000000..56ad908d41a2 --- /dev/null +++ b/pkgs/tools/graphics/stegsolve/default.nix @@ -0,0 +1,47 @@ +{ lib, stdenv, fetchurl, jre, makeWrapper, copyDesktopItems, makeDesktopItem }: + +stdenv.mkDerivation rec { + pname = "stegsolve"; + version = "1.3"; + + src = fetchurl { + # No versioned binary is published :( + url = "http://www.caesum.com/handbook/Stegsolve.jar"; + sha256 = "0np5zb28sg6yzkp1vic80pm8iiaamvjpbf5dxmi9kwvqcrh4jyq0"; + }; + + dontUnpack = true; + + desktopItems = [ + (makeDesktopItem { + type = "Application"; + name = pname; + desktopName = "Stegsolve"; + comment = "A steganographic image analyzer, solver and data extractor for challanges"; + exec = pname; + categories = [ "Graphics" ]; + }) + ]; + + nativeBuildInputs = [ makeWrapper copyDesktopItems ]; + + installPhase = '' + runHook preInstall + + export JAR=$out/share/java/stegsolve/stegsolve.jar + install -D $src $JAR + makeWrapper ${jre}/bin/java $out/bin/stegsolve \ + --add-flags "-jar $JAR" + + runHook postInstall + ''; + + meta = with lib; { + description = "A steganographic image analyzer, solver and data extractor for challanges"; + homepage = "http://www.caesum.com/handbook/stego.htm"; + sourceProvenance = with sourceTypes; [ binaryBytecode ]; + license = licenses.unfree; + maintainers = with maintainers; [ emilytrau ]; + platforms = platforms.all; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index eb54ec331072..09f8a37c07a0 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -21263,6 +21263,8 @@ with pkgs; stb = callPackage ../development/libraries/stb { }; + stegsolve = callPackage ../tools/graphics/stegsolve { }; + StormLib = callPackage ../development/libraries/StormLib { }; stxxl = callPackage ../development/libraries/stxxl { }; From 9f54821839aa92156837dcfb63a8bb85a85ce464 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Mon, 18 Jul 2022 23:48:29 +0200 Subject: [PATCH 020/164] portunus: init at 1.1.0-beta.2 --- pkgs/servers/portunus/default.nix | 31 +++++++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 33 insertions(+) create mode 100644 pkgs/servers/portunus/default.nix diff --git a/pkgs/servers/portunus/default.nix b/pkgs/servers/portunus/default.nix new file mode 100644 index 000000000000..c0ee915c7bbe --- /dev/null +++ b/pkgs/servers/portunus/default.nix @@ -0,0 +1,31 @@ +{ lib +, buildGoModule +, fetchFromGitHub +}: + +buildGoModule rec { + pname = "portunus"; + version = "1.1.0-beta.2"; + + src = fetchFromGitHub { + owner = "majewsky"; + repo = "portunus"; + rev = "v${version}"; + sha256 = "sha256-hGOMbaEWecgQvpk/2E8mcJZ9QMjllIhS3RBr7PKnbjQ="; + }; + + vendorSha256 = null; + + postInstall = '' + mv $out/bin/{,portunus-}orchestrator + mv $out/bin/{,portunus-}server + ''; + + meta = with lib; { + description = "Self-contained user/group management and authentication service"; + homepage = "https://github.com/majewsky/portunus"; + license = licenses.gpl3Plus; + platforms = platforms.linux; + maintainers = with maintainers; [ majewsky ] ++ teams.c3d2.members; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 16995579c690..86a44bc906f2 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -22306,6 +22306,8 @@ with pkgs; podgrab = callPackage ../servers/misc/podgrab { }; + portunus = callPackage ../servers/portunus { }; + prosody = callPackage ../servers/xmpp/prosody { withExtraLibs = []; withExtraLuaPackages = _: []; From 49da90755b3c9d9d94246c0cabefc5d5fbac9550 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Tue, 19 Jul 2022 00:11:41 +0200 Subject: [PATCH 021/164] nixos/portunus: init --- nixos/modules/module-list.nix | 1 + nixos/modules/services/misc/portunus.nix | 288 +++++++++++++++++++++++ 2 files changed, 289 insertions(+) create mode 100644 nixos/modules/services/misc/portunus.nix diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index 616f357663ca..bfa6d12afc70 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -618,6 +618,7 @@ ./services/misc/plikd.nix ./services/misc/podgrab.nix ./services/misc/polaris.nix + ./services/misc/portunus.nix ./services/misc/prowlarr.nix ./services/misc/tautulli.nix ./services/misc/pinnwand.nix diff --git a/nixos/modules/services/misc/portunus.nix b/nixos/modules/services/misc/portunus.nix new file mode 100644 index 000000000000..a2247272fa26 --- /dev/null +++ b/nixos/modules/services/misc/portunus.nix @@ -0,0 +1,288 @@ +{ config, lib, pkgs, ... }: + +with lib; + +let + cfg = config.services.portunus; + +in +{ + options.services.portunus = { + enable = mkEnableOption "Portunus, a self-contained user/group management and authentication service for LDAP"; + + domain = mkOption { + type = types.str; + example = "sso.example.com"; + description = "Subdomain which gets reverse proxied to Portunus webserver."; + }; + + port = mkOption { + type = types.port; + default = 8080; + description = '' + Port where the Portunus webserver should listen on. + + This must be put behind a TLS-capable reverse proxy because Portunus only listens on localhost. + ''; + }; + + package = mkOption { + type = types.package; + default = pkgs.portunus; + defaultText = "pkgs.portunus"; + description = "The Portunus package to use."; + }; + + seedPath = mkOption { + type = types.nullOr types.path; + default = null; + description = '' + Path to a portunus seed file in json format. + See for available options. + ''; + }; + + stateDir = mkOption { + type = types.path; + default = "/var/lib/portunus"; + description = "Path where Portunus stores its state."; + }; + + user = mkOption { + type = types.str; + default = "portunus"; + description = "User account under which Portunus runs its webserver."; + }; + + group = mkOption { + type = types.str; + default = "portunus"; + description = "Group account under which Portunus runs its webserver."; + }; + + dex = { + enable = mkEnableOption '' + Dex ldap connector. + + To activate dex, first a search user must be created in the Portunus web ui + and then the password must to be set as the DEX_SEARCH_USER_PASSWORD environment variable + in the setting. + ''; + + oidcClients = mkOption { + type = types.listOf (types.submodule { + options = { + callbackURL = mkOption { + type = types.str; + description = "URL where the OIDC client should redirect"; + }; + id = mkOption { + type = types.str; + description = "ID of the OIDC client"; + }; + }; + }); + default = [ ]; + example = [ + { + callbackURL = "https://example.com/client/oidc/callback"; + id = "service"; + } + ]; + description = '' + List of OIDC clients. + + The OIDC secret must be set as the DEX_CLIENT_''${id} environment variable + in the setting. + ''; + }; + + port = mkOption { + type = types.port; + default = 5556; + description = "Port where dex should listen on."; + }; + }; + + ldap = { + package = mkOption { + type = types.package; + default = pkgs.openldap; + defaultText = "pkgs.openldap"; + description = "The OpenLDAP package to use."; + }; + + searchUserName = mkOption { + type = types.str; + default = ""; + example = "admin"; + description = '' + The login name of the search user. + This user account must be configured in Portunus either manually or via seeding. + ''; + }; + + suffix = mkOption { + type = types.str; + example = "dc=example,dc=org"; + description = '' + The DN of the topmost entry in your LDAP directory. + Please refer to the Portunus documentation for more information on how this impacts the structure of the LDAP directory. + ''; + }; + + tls = mkOption { + type = types.bool; + default = false; + description = '' + Wether to enable LDAPS protocol. + This also adds two entries to the /etc/hosts file to point to localhost, + so that CLIs and programs can use ldaps protocol and verify the certificate without opening the firewall port for the protocol. + + This requires a TLS certificate for to be configured via . + ''; + }; + + user = mkOption { + type = types.str; + default = "openldap"; + description = "User account under which Portunus runs its LDAP server."; + }; + + group = mkOption { + type = types.str; + default = "openldap"; + description = "Group account under which Portunus runs its LDAP server."; + }; + }; + }; + + config = mkIf cfg.enable { + assertions = [ + { + assertion = cfg.dex.enable -> cfg.ldap.searchUserName != ""; + message = "services.portunus.dex.enable requires services.portunus.ldap.searchUserName to be set."; + } + ]; + + # add ldapsearch(1) etc. to interactive shells + environment.systemPackages = [ cfg.ldap.package ]; + + # allow connecting via ldaps /w certificate without opening ports + networking.hosts = mkIf cfg.ldap.tls { + "::1" = [ cfg.domain ]; + "127.0.0.1" = [ cfg.domain ]; + }; + + services.dex = mkIf cfg.dex.enable { + enable = true; + settings = { + issuer = "https://${cfg.domain}/dex"; + web.http = "127.0.0.1:${toString cfg.dex.port}"; + storage = { + type = "sqlite3"; + config.file = "/var/lib/dex/dex.db"; + }; + enablePasswordDB = false; + connectors = [{ + type = "ldap"; + id = "ldap"; + name = "LDAP"; + config = { + host = "${cfg.domain}:636"; + bindDN = "uid=${cfg.ldap.searchUserName},ou=users,${cfg.ldap.suffix}"; + bindPW = "$DEX_SEARCH_USER_PASSWORD"; + userSearch = { + baseDN = "ou=users,${cfg.ldap.suffix}"; + filter = "(objectclass=person)"; + username = "uid"; + idAttr = "uid"; + emailAttr = "mail"; + nameAttr = "cn"; + preferredUsernameAttr = "uid"; + }; + groupSearch = { + baseDN = "ou=groups,${cfg.ldap.suffix}"; + filter = "(objectclass=groupOfNames)"; + nameAttr = "cn"; + userMatchers = [{ userAttr = "DN"; groupAttr = "member"; }]; + }; + }; + }]; + + staticClients = forEach cfg.dex.oidcClients (client: { + inherit (client) id; + redirectURIs = [ client.callbackURI ]; + name = "OIDC for ${client.id}"; + secret = "$DEX_CLIENT_${client.id}"; + }); + }; + }; + + systemd.services = { + dex.serviceConfig = mkIf cfg.dex.enable { + # `dex.service` is super locked down out of the box, but we need some + # place to write the SQLite database. This creates $STATE_DIRECTORY below + # /var/lib/private because DynamicUser=true, but it gets symlinked into + # /var/lib/dex inside the unit + StateDirectory = "dex"; + }; + + portunus = { + description = "Self-contained authentication service"; + wantedBy = [ "multi-user.target" ]; + after = [ "network.target" ]; + serviceConfig.ExecStart = "${cfg.package.out}/bin/portunus-orchestrator"; + environment = { + PORTUNUS_LDAP_SUFFIX = cfg.ldap.suffix; + PORTUNUS_SERVER_BINARY = "${cfg.package}/bin/portunus-server"; + PORTUNUS_SERVER_GROUP = cfg.group; + PORTUNUS_SERVER_USER = cfg.user; + PORTUNUS_SERVER_HTTP_LISTEN = "[::]:${toString cfg.port}"; + PORTUNUS_SERVER_STATE_DIR = cfg.stateDir; + PORTUNUS_SLAPD_BINARY = "${cfg.ldap.package}/libexec/slapd"; + PORTUNUS_SLAPD_GROUP = cfg.ldap.group; + PORTUNUS_SLAPD_USER = cfg.ldap.user; + PORTUNUS_SLAPD_SCHEMA_DIR = "${cfg.ldap.package}/etc/schema"; + } // (optionalAttrs (cfg.seedPath != null) ({ + PORTUNUS_SEED_PATH = cfg.seedPath; + })) // (optionalAttrs cfg.ldap.tls ( + let + acmeDirectory = config.security.acme.certs."${cfg.domain}".directory; + in + { + PORTUNUS_SLAPD_TLS_CA_CERTIFICATE = "/etc/ssl/certs/ca-certificates.crt"; + PORTUNUS_SLAPD_TLS_CERTIFICATE = "${acmeDirectory}/cert.pem"; + PORTUNUS_SLAPD_TLS_DOMAIN_NAME = cfg.domain; + PORTUNUS_SLAPD_TLS_PRIVATE_KEY = "${acmeDirectory}/key.pem"; + })); + }; + }; + + users.users = mkMerge [ + (mkIf (cfg.ldap.user == "openldap") { + openldap = { + group = cfg.ldap.group; + isSystemUser = true; + }; + }) + (mkIf (cfg.user == "portunus") { + portunus = { + group = cfg.group; + isSystemUser = true; + }; + }) + ]; + + users.groups = mkMerge [ + (mkIf (cfg.ldap.user == "openldap") { + openldap = { }; + }) + (mkIf (cfg.user == "portunus") { + portunus = { }; + }) + ]; + }; + + meta.maintainers = [ majewsky ] ++ teams.c3d2.members; +} From d7cfb2ce9a2ae15b48e181a985b65ccf53e4b903 Mon Sep 17 00:00:00 2001 From: adisbladis Date: Tue, 9 Aug 2022 15:14:10 +0800 Subject: [PATCH 022/164] sqlc: 1.14.0 -> 1.15.0 --- pkgs/development/tools/database/sqlc/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/database/sqlc/default.nix b/pkgs/development/tools/database/sqlc/default.nix index 85031b3aad70..b9f589b4c0c7 100644 --- a/pkgs/development/tools/database/sqlc/default.nix +++ b/pkgs/development/tools/database/sqlc/default.nix @@ -1,7 +1,7 @@ { lib, buildGoModule, fetchFromGitHub }: let - version = "1.14.0"; + version = "1.15.0"; in buildGoModule { pname = "sqlc"; @@ -11,11 +11,11 @@ buildGoModule { owner = "kyleconroy"; repo = "sqlc"; rev = "v${version}"; - sha256 = "sha256-+JkNuN5Hv1g1+UpJEBZpf7QV/3A85IVzMa5cfeRSQRo="; + sha256 = "sha256-Ufa5A+lsFSyxe7s0DbLhWW298Y1yaSCazMjGBryyMYY="; }; proxyVendor = true; - vendorSha256 = "sha256-QG/pIsK8krBaO5IDgln10jpCnlw3XC8sIYyzuwYjTs0="; + vendorSha256 = "sha256-KatF4epCzyQCoAGk1verjAYNrFcmcLiVyDI2542Vm3k="; subPackages = [ "cmd/sqlc" ]; From 5e3486c15c26c0e0053bbebdf59fac2b6b995ba1 Mon Sep 17 00:00:00 2001 From: adisbladis Date: Tue, 9 Aug 2022 15:45:53 +0800 Subject: [PATCH 023/164] sqlc: Eliminate use of `with` --- pkgs/development/tools/database/sqlc/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/database/sqlc/default.nix b/pkgs/development/tools/database/sqlc/default.nix index b9f589b4c0c7..12133f6daa87 100644 --- a/pkgs/development/tools/database/sqlc/default.nix +++ b/pkgs/development/tools/database/sqlc/default.nix @@ -19,10 +19,10 @@ buildGoModule { subPackages = [ "cmd/sqlc" ]; - meta = with lib; { + meta = { description = "Generate type-safe code from SQL"; homepage = "https://sqlc.dev/"; - license = licenses.mit; - maintainers = [ maintainers.adisbladis ]; + license = lib.licenses.mit; + maintainers = [ lib.maintainers.adisbladis ]; }; } From e2fc23b9c678567b52f6ec8bd19d685fefa84942 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 10 Aug 2022 13:01:10 +0000 Subject: [PATCH 024/164] dar: 2.7.6 -> 2.7.7 --- pkgs/tools/backup/dar/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/backup/dar/default.nix b/pkgs/tools/backup/dar/default.nix index f4f2a2630098..41ecdd1ea780 100644 --- a/pkgs/tools/backup/dar/default.nix +++ b/pkgs/tools/backup/dar/default.nix @@ -9,12 +9,12 @@ with lib; stdenv.mkDerivation rec { - version = "2.7.6"; + version = "2.7.7"; pname = "dar"; src = fetchurl { url = "mirror://sourceforge/dar/${pname}-${version}.tar.gz"; - sha256 = "sha256-PV5ESJE1B2gQnX6QUeJgOb3rkG3jApTn4NcRBbh9bao="; + sha256 = "sha256-wD4vUu/WWi8Ee2C77aJGDLUlFl4b4y8RC2Dgzs4/LMk="; }; outputs = [ "out" "dev" ]; From a47212c175d3c484e05551fce118ac74cd44a674 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 10 Aug 2022 13:29:59 +0000 Subject: [PATCH 025/164] fio: 3.30 -> 3.31 --- pkgs/tools/system/fio/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/system/fio/default.nix b/pkgs/tools/system/fio/default.nix index 42ece88147ba..5939729492d3 100644 --- a/pkgs/tools/system/fio/default.nix +++ b/pkgs/tools/system/fio/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { pname = "fio"; - version = "3.30"; + version = "3.31"; src = fetchFromGitHub { owner = "axboe"; repo = "fio"; rev = "fio-${version}"; - sha256 = "sha256-X2B8xlCLSHDgTaH55TUJq4WcaObZy/fvfkQ0j3J9Kzo="; + sha256 = "sha256-wqm9yjrJKP3JgsLmPnu14Pi2zm0iTdGcTOGOqXmZslM="; }; buildInputs = [ python3 zlib ] From 7feea0d062f74588ba614b58aa2c753599befc9c Mon Sep 17 00:00:00 2001 From: talyz Date: Tue, 9 Aug 2022 19:44:21 +0200 Subject: [PATCH 026/164] discourse: 2.9.0.beta4 -> 2.9.0.beta9 Co-authored-by: Tobias Stenzel --- nixos/modules/services/web-apps/discourse.nix | 4 +- pkgs/servers/web-apps/discourse/default.nix | 20 +- .../web-apps/discourse/rubyEnv/Gemfile | 22 +- .../web-apps/discourse/rubyEnv/Gemfile.lock | 256 ++++++----- .../web-apps/discourse/rubyEnv/gemset.nix | 410 +++++++++++------- 5 files changed, 414 insertions(+), 298 deletions(-) diff --git a/nixos/modules/services/web-apps/discourse.nix b/nixos/modules/services/web-apps/discourse.nix index 20ad653429a5..1e2326d81801 100644 --- a/nixos/modules/services/web-apps/discourse.nix +++ b/nixos/modules/services/web-apps/discourse.nix @@ -6,7 +6,7 @@ let cfg = config.services.discourse; opt = options.services.discourse; - # Keep in sync with https://github.com/discourse/discourse_docker/blob/master/image/base/Dockerfile#L5 + # Keep in sync with https://github.com/discourse/discourse_docker/blob/main/image/base/slim.Dockerfile#L5 upstreamPostgresqlVersion = lib.getVersion pkgs.postgresql_13; postgresqlPackage = if config.services.postgresql.enable then @@ -604,7 +604,6 @@ in cors_origin = ""; serve_static_assets = false; sidekiq_workers = 5; - rtl_css = false; connection_reaper_age = 30; connection_reaper_interval = 30; relative_url_root = null; @@ -940,7 +939,6 @@ in proxy_cache discourse; proxy_cache_key "$scheme,$host,$request_uri"; proxy_cache_valid 200 301 302 7d; - proxy_cache_valid any 1m; ''; }; "/message-bus/" = proxy { diff --git a/pkgs/servers/web-apps/discourse/default.nix b/pkgs/servers/web-apps/discourse/default.nix index 19860ad7886d..6986cf5271e7 100644 --- a/pkgs/servers/web-apps/discourse/default.nix +++ b/pkgs/servers/web-apps/discourse/default.nix @@ -11,13 +11,13 @@ }@args: let - version = "2.9.0.beta4"; + version = "2.9.0.beta9"; src = fetchFromGitHub { owner = "discourse"; repo = "discourse"; rev = "v${version}"; - sha256 = "sha256-DpUEBGLgjcroVzdDG8/nGvC+ym19ZkGa7qvHKZZ1mH4="; + sha256 = "sha256-pavNdAbk9yuWRg++p1MCmpBMuYKDs63QbJpHrPS9oAY="; }; runtimeDeps = [ @@ -161,7 +161,7 @@ let yarnOfflineCache = fetchYarnDeps { yarnLock = src + "/app/assets/javascripts/yarn.lock"; - sha256 = "1l4nfc14cm42lkilsawfhdcnv1ln7m7bpan9a804abv4hwrs3f52"; + sha256 = "14d7y29460ggqcjnc9vk1q2lnxfl6ycyp8rc103g3gs2bl5sb6r0"; }; assets = stdenv.mkDerivation { @@ -177,6 +177,8 @@ let nodejs-14_x ]; + outputs = [ "out" "javascripts" ]; + patches = [ # Use the Ruby API version in the plugin gem path, to match the # one constructed by bundlerEnv @@ -253,6 +255,10 @@ let mv public/assets $out + rm -r app/assets/javascripts/plugins + mv app/assets/javascripts $javascripts + ln -sf /run/discourse/assets/javascripts/plugins $javascripts/plugins + runHook postInstall ''; @@ -301,7 +307,10 @@ let # path, not their relative state directory path. This gets rid of # warnings and means we don't have to link back to lib from the # state directory. - find config -type f -execdir sed -Ei "s,(\.\./)+(lib|app)/,$out/share/discourse/\2/," {} \; + find config -type f -name "*.rb" -execdir \ + sed -Ei "s,(\.\./)+(lib|app)/,$out/share/discourse/\2/," {} \; + find config -maxdepth 1 -type f -name "*.rb" -execdir \ + sed -Ei "s,require_relative (\"|')([[:alnum:]].*)(\"|'),require_relative '$out/share/discourse/config/\2'," {} \; ''; buildPhase = '' @@ -322,9 +331,10 @@ let ln -sf /var/log/discourse $out/share/discourse/log ln -sf /var/lib/discourse/tmp $out/share/discourse/tmp ln -sf /run/discourse/config $out/share/discourse/config - ln -sf /run/discourse/assets/javascripts/plugins $out/share/discourse/app/assets/javascripts/plugins ln -sf /run/discourse/public $out/share/discourse/public ln -sf ${assets} $out/share/discourse/public.dist/assets + rm -r $out/share/discourse/app/assets/javascripts + ln -sf ${assets.javascripts} $out/share/discourse/app/assets/javascripts ${lib.concatMapStringsSep "\n" (p: "ln -sf ${p} $out/share/discourse/plugins/${p.pluginName or ""}") plugins} runHook postInstall diff --git a/pkgs/servers/web-apps/discourse/rubyEnv/Gemfile b/pkgs/servers/web-apps/discourse/rubyEnv/Gemfile index 2766c3feadc0..b2116cc8ac3e 100644 --- a/pkgs/servers/web-apps/discourse/rubyEnv/Gemfile +++ b/pkgs/servers/web-apps/discourse/rubyEnv/Gemfile @@ -18,7 +18,7 @@ else # this allows us to include the bits of rails we use without pieces we do not. # # To issue a rails update bump the version number here - rails_version = '6.1.4.7' + rails_version = '7.0.3.1' gem 'actionmailer', rails_version gem 'actionpack', rails_version gem 'actionview', rails_version @@ -31,7 +31,9 @@ end gem 'json' -gem 'sprockets' +# TODO: At the moment Discourse does not work with Sprockets 4, we would need to correct internals +# This is a desired upgrade we should get to. +gem 'sprockets', '3.7.2' # this will eventually be added to rails, # allows us to precompile all our templates in the unicorn master @@ -39,7 +41,7 @@ gem 'actionview_precompiler', require: false gem 'seed-fu' -gem 'mail', git: 'https://github.com/discourse/mail.git', require: false +gem 'mail', git: 'https://github.com/discourse/mail.git' gem 'mini_mime' gem 'mini_suffix' @@ -66,7 +68,7 @@ gem 'http_accept_language', require: false gem 'discourse-ember-rails', '0.18.6', require: 'ember-rails' gem 'discourse-ember-source', '~> 3.12.2' gem 'ember-handlebars-template', '0.8.0' -gem 'discourse-fonts' +gem 'discourse-fonts', require: 'discourse_fonts' gem 'barber' @@ -103,7 +105,8 @@ gem 'omniauth-oauth2', require: false gem 'omniauth-google-oauth2' -gem 'oj' +# pending: https://github.com/ohler55/oj/issues/789 +gem 'oj', '3.13.14' gem 'pg' gem 'mini_sql' @@ -143,7 +146,6 @@ end # Allow everywhere for now cause we are allowing asset debugging in production group :assets do gem 'uglifier' - gem 'rtlit', require: false # for css rtling end group :test do @@ -168,7 +170,7 @@ group :test, :development do gem 'shoulda-matchers', require: false gem 'rspec-html-matchers' gem 'byebug', require: ENV['RM_INFO'].nil?, platform: :mri - gem "rubocop-discourse", require: false + gem 'rubocop-discourse', require: false, github: 'discourse/rubocop-discourse' gem 'parallel_tests' gem 'rswag-specs' @@ -188,7 +190,7 @@ if ENV["ALLOW_DEV_POPULATE"] == "1" gem 'discourse_dev_assets' gem 'faker', "~> 2.16" else - group :development do + group :development, :test do gem 'discourse_dev_assets' gem 'faker', "~> 2.16" end @@ -266,3 +268,7 @@ gem 'colored2', require: false gem 'maxminddb' gem 'rails_failover', require: false + +# workaround for faraday-net_http, see +# https://github.com/ruby/net-imap/issues/16#issuecomment-803086765 +gem 'net-http' diff --git a/pkgs/servers/web-apps/discourse/rubyEnv/Gemfile.lock b/pkgs/servers/web-apps/discourse/rubyEnv/Gemfile.lock index 4e832c8abdb1..95c706acab3f 100644 --- a/pkgs/servers/web-apps/discourse/rubyEnv/Gemfile.lock +++ b/pkgs/servers/web-apps/discourse/rubyEnv/Gemfile.lock @@ -5,25 +5,36 @@ GIT mail (2.8.0.edge) mini_mime (>= 0.1.1) +GIT + remote: https://github.com/discourse/rubocop-discourse.git + revision: a5aea6e5f150b1eb7765a805bec0ff618cb718b3 + specs: + rubocop-discourse (2.5.0) + rubocop (>= 1.1.0) + rubocop-rspec (>= 2.0.0) + GEM remote: https://rubygems.org/ specs: - actionmailer (6.1.4.7) - actionpack (= 6.1.4.7) - actionview (= 6.1.4.7) - activejob (= 6.1.4.7) - activesupport (= 6.1.4.7) + actionmailer (7.0.3.1) + actionpack (= 7.0.3.1) + actionview (= 7.0.3.1) + activejob (= 7.0.3.1) + activesupport (= 7.0.3.1) mail (~> 2.5, >= 2.5.4) + net-imap + net-pop + net-smtp rails-dom-testing (~> 2.0) - actionpack (6.1.4.7) - actionview (= 6.1.4.7) - activesupport (= 6.1.4.7) - rack (~> 2.0, >= 2.0.9) + actionpack (7.0.3.1) + actionview (= 7.0.3.1) + activesupport (= 7.0.3.1) + rack (~> 2.0, >= 2.2.0) rack-test (>= 0.6.3) rails-dom-testing (~> 2.0) rails-html-sanitizer (~> 1.0, >= 1.2.0) - actionview (6.1.4.7) - activesupport (= 6.1.4.7) + actionview (7.0.3.1) + activesupport (= 7.0.3.1) builder (~> 3.1) erubi (~> 1.4) rails-dom-testing (~> 2.0) @@ -32,20 +43,19 @@ GEM actionview (>= 6.0.a) active_model_serializers (0.8.4) activemodel (>= 3.0) - activejob (6.1.4.7) - activesupport (= 6.1.4.7) + activejob (7.0.3.1) + activesupport (= 7.0.3.1) globalid (>= 0.3.6) - activemodel (6.1.4.7) - activesupport (= 6.1.4.7) - activerecord (6.1.4.7) - activemodel (= 6.1.4.7) - activesupport (= 6.1.4.7) - activesupport (6.1.4.7) + activemodel (7.0.3.1) + activesupport (= 7.0.3.1) + activerecord (7.0.3.1) + activemodel (= 7.0.3.1) + activesupport (= 7.0.3.1) + activesupport (7.0.3.1) concurrent-ruby (~> 1.0, >= 1.0.2) i18n (>= 1.6, < 2) minitest (>= 5.1) tzinfo (~> 2.0) - zeitwerk (~> 2.3) addressable (2.8.0) public_suffix (>= 2.0.2, < 5.0) annotate (3.2.0) @@ -53,23 +63,23 @@ GEM rake (>= 10.4, < 14.0) ast (2.4.2) aws-eventstream (1.2.0) - aws-partitions (1.516.0) - aws-sdk-core (3.121.2) + aws-partitions (1.583.0) + aws-sdk-core (3.130.2) aws-eventstream (~> 1, >= 1.0.2) - aws-partitions (~> 1, >= 1.239.0) + aws-partitions (~> 1, >= 1.525.0) aws-sigv4 (~> 1.1) jmespath (~> 1.0) - aws-sdk-kms (1.44.0) - aws-sdk-core (~> 3, >= 3.112.0) + aws-sdk-kms (1.56.0) + aws-sdk-core (~> 3, >= 3.127.0) aws-sigv4 (~> 1.1) - aws-sdk-s3 (1.96.1) - aws-sdk-core (~> 3, >= 3.112.0) + aws-sdk-s3 (1.114.0) + aws-sdk-core (~> 3, >= 3.127.0) aws-sdk-kms (~> 1) + aws-sigv4 (~> 1.4) + aws-sdk-sns (1.53.0) + aws-sdk-core (~> 3, >= 3.127.0) aws-sigv4 (~> 1.1) - aws-sdk-sns (1.46.0) - aws-sdk-core (~> 3, >= 3.121.2) - aws-sigv4 (~> 1.1) - aws-sigv4 (1.4.0) + aws-sigv4 (1.5.0) aws-eventstream (~> 1, >= 1.0.2) barber (0.12.2) ember-source (>= 1.0, < 3.1) @@ -80,10 +90,10 @@ GEM rack (>= 0.9.0) binding_of_caller (1.0.0) debug_inspector (>= 0.0.1) - bootsnap (1.11.1) + bootsnap (1.13.0) msgpack (~> 1.2) builder (3.2.4) - bullet (7.0.1) + bullet (7.0.2) activesupport (>= 3.0.0) uniform_notifier (~> 1.11) byebug (11.1.3) @@ -94,7 +104,7 @@ GEM colored2 (3.1.2) concurrent-ruby (1.1.10) connection_pool (2.2.5) - cose (1.2.0) + cose (1.2.1) cbor (~> 0.5.9) openssl-signature_algorithm (~> 1.0) cppjieba_rb (0.4.2) @@ -105,7 +115,8 @@ GEM addressable debug_inspector (1.1.0) diff-lcs (1.5.0) - diffy (3.4.0) + diffy (3.4.2) + digest (3.1.0) discourse-ember-rails (0.18.6) active_model_serializers ember-data-source (>= 1.0.0.beta.5) @@ -115,7 +126,7 @@ GEM railties (>= 3.1) discourse-ember-source (3.12.2.3) discourse-fonts (0.0.9) - discourse_dev_assets (0.0.3) + discourse_dev_assets (0.0.4) faker (~> 2.16) literate_randomizer docile (1.4.0) @@ -128,12 +139,12 @@ GEM barber (>= 0.11.0) sprockets (>= 3.3, < 4.1) ember-source (2.18.2) - erubi (1.10.0) - excon (0.92.2) + erubi (1.11.0) + excon (0.92.4) execjs (2.8.1) exifr (1.3.9) - fabrication (2.28.0) - faker (2.20.0) + fabrication (2.30.0) + faker (2.22.0) i18n (>= 1.8.11, < 2) fakeweb (1.3.0) faraday (1.10.0) @@ -152,8 +163,8 @@ GEM faraday-em_synchrony (1.0.0) faraday-excon (1.1.0) faraday-httpclient (1.0.1) - faraday-multipart (1.0.3) - multipart-post (>= 1.2, < 3) + faraday-multipart (1.0.4) + multipart-post (~> 2) faraday-net_http (1.0.1) faraday-net_http_persistent (1.2.0) faraday-patron (1.0.0) @@ -175,7 +186,7 @@ GEM hkdf (0.3.0) htmlentities (4.3.4) http_accept_language (2.1.1) - i18n (1.10.0) + i18n (1.12.0) concurrent-ruby (~> 1.0) image_optim (0.31.1) exifr (~> 1.2, >= 1.2.2) @@ -183,23 +194,22 @@ GEM image_size (>= 1.5, < 4) in_threads (~> 1.3) progress (~> 3.0, >= 3.0.1) - image_size (3.0.1) + image_size (3.0.2) in_threads (1.6.0) - ipaddr (1.2.4) jmespath (1.6.1) - jquery-rails (4.4.0) + jquery-rails (4.5.0) rails-dom-testing (>= 1, < 3) railties (>= 4.2.0) thor (>= 0.14, < 2.0) - json (2.6.1) + json (2.6.2) json-schema (2.8.1) addressable (>= 2.4) - json_schemer (0.2.20) + json_schemer (0.2.21) ecma-re-validator (~> 0.3) hana (~> 1.3) regexp_parser (~> 2.0) uri_template (~> 0.7) - jwt (2.3.0) + jwt (2.4.1) kgio (2.11.4) libv8-node (16.10.0.0) listen (3.7.1) @@ -214,8 +224,8 @@ GEM logstash-event (1.2.02) logstash-logger (0.26.1) logstash-event (~> 1.2) - logster (2.11.0) - loofah (2.16.0) + logster (2.11.2) + loofah (2.18.0) crass (~> 1.0.2) nokogiri (>= 1.5.9) lru_redux (1.1.0) @@ -229,30 +239,46 @@ GEM mini_portile2 (2.8.0) mini_racer (0.6.2) libv8-node (~> 16.10.0.0) - mini_scheduler (0.13.0) + mini_scheduler (0.14.0) sidekiq (>= 4.2.3) mini_sql (1.4.0) mini_suffix (0.3.3) ffi (~> 1.9) - minitest (5.15.0) - mocha (1.13.0) - msgpack (1.5.1) + minitest (5.16.2) + mocha (1.14.0) + msgpack (1.5.4) multi_json (1.15.0) multi_xml (0.6.0) - multipart-post (2.1.1) + multipart-post (2.2.3) mustache (1.1.1) + net-http (0.2.2) + uri + net-imap (0.2.3) + digest + net-protocol + strscan + net-pop (0.1.1) + digest + net-protocol + timeout + net-protocol (0.1.3) + timeout + net-smtp (0.3.1) + digest + net-protocol + timeout nio4r (2.5.8) - nokogiri (1.13.4) + nokogiri (1.13.8) mini_portile2 (~> 2.8.0) racc (~> 1.4) - oauth (0.5.8) + oauth (0.5.10) oauth2 (1.4.7) faraday (>= 0.8, < 2.0) jwt (>= 1.0, < 3.0) multi_json (~> 1.3) multi_xml (~> 0.5) rack (>= 1.2, < 3) - oj (3.13.11) + oj (3.13.14) omniauth (1.9.1) hashie (>= 3.4.6) rack (>= 1.6.2, < 3) @@ -275,17 +301,16 @@ GEM omniauth-twitter (1.4.0) omniauth-oauth (~> 1.1) rack - openssl (2.2.1) - ipaddr - openssl-signature_algorithm (1.1.1) - openssl (~> 2.0) + openssl (3.0.0) + openssl-signature_algorithm (1.2.1) + openssl (> 2.0, < 3.1) optimist (3.0.1) parallel (1.22.1) - parallel_tests (3.8.1) + parallel_tests (3.11.1) parallel - parser (3.1.2.0) + parser (3.1.2.1) ast (~> 2.4.1) - pg (1.3.5) + pg (1.4.3) progress (3.6.0) pry (0.13.1) coderay (~> 1.1) @@ -300,17 +325,17 @@ GEM nio4r (~> 2.0) r2 (0.2.7) racc (1.6.0) - rack (2.2.3) + rack (2.2.4) rack-mini-profiler (3.0.0) rack (>= 1.2.0) - rack-protection (2.2.0) + rack-protection (2.2.2) rack - rack-test (1.1.0) - rack (>= 1.0, < 3) + rack-test (2.0.2) + rack (>= 1.3) rails-dom-testing (2.0.3) activesupport (>= 4.2.0) nokogiri (>= 1.6) - rails-html-sanitizer (1.4.2) + rails-html-sanitizer (1.4.3) loofah (~> 2.3) rails_failover (0.8.1) activerecord (> 6.0, < 7.1) @@ -319,12 +344,13 @@ GEM rails_multisite (4.0.1) activerecord (> 5.0, < 7.1) railties (> 5.0, < 7.1) - railties (6.1.4.7) - actionpack (= 6.1.4.7) - activesupport (= 6.1.4.7) + railties (7.0.3.1) + actionpack (= 7.0.3.1) + activesupport (= 7.0.3.1) method_source - rake (>= 0.13) + rake (>= 12.2) thor (~> 1.0) + zeitwerk (~> 2.5) rainbow (3.1.1) raindrops (0.20.0) rake (13.0.6) @@ -336,16 +362,16 @@ GEM msgpack (>= 0.4.3) optimist (>= 3.0.0) rchardet (1.8.0) - redis (4.5.1) + redis (4.7.1) redis-namespace (1.8.2) redis (>= 3.0.4) - regexp_parser (2.3.0) + regexp_parser (2.5.0) request_store (1.5.1) rack (>= 1.4) rexml (3.2.5) rinku (2.0.6) rotp (6.2.0) - rqrcode (2.1.1) + rqrcode (2.1.2) chunky_png (~> 1.0) rqrcode_core (~> 1.0) rqrcode_core (1.2.0) @@ -358,13 +384,13 @@ GEM rspec-expectations (3.11.0) diff-lcs (>= 1.2.0, < 2.0) rspec-support (~> 3.11.0) - rspec-html-matchers (0.9.4) + rspec-html-matchers (0.10.0) nokogiri (~> 1) - rspec (>= 3.0.0.a, < 4) + rspec (>= 3.0.0.a) rspec-mocks (3.11.1) diff-lcs (>= 1.2.0, < 2.0) rspec-support (~> 3.11.0) - rspec-rails (5.1.1) + rspec-rails (5.1.2) actionpack (>= 5.2) activesupport (>= 5.2) railties (>= 5.2) @@ -379,23 +405,20 @@ GEM activesupport (>= 3.1, < 7.1) json-schema (~> 2.2) railties (>= 3.1, < 7.1) - rtlit (0.0.5) - rubocop (1.27.0) + rubocop (1.34.1) + json (~> 2.3) parallel (~> 1.10) - parser (>= 3.1.0.0) + parser (>= 3.1.2.1) rainbow (>= 2.2.2, < 4.0) regexp_parser (>= 1.8, < 3.0) - rexml - rubocop-ast (>= 1.16.0, < 2.0) + rexml (>= 3.2.5, < 4.0) + rubocop-ast (>= 1.20.0, < 2.0) ruby-progressbar (~> 1.7) unicode-display_width (>= 1.4.0, < 3.0) - rubocop-ast (1.17.0) + rubocop-ast (1.21.0) parser (>= 3.1.1.0) - rubocop-discourse (2.5.0) - rubocop (>= 1.1.0) - rubocop-rspec (>= 2.0.0) - rubocop-rspec (2.9.0) - rubocop (~> 1.19) + rubocop-rspec (2.12.1) + rubocop (~> 1.31) ruby-prof (1.4.3) ruby-progressbar (1.11.0) ruby-readability (0.7.0) @@ -420,17 +443,17 @@ GEM activesupport (>= 3.1) shoulda-matchers (5.1.0) activesupport (>= 5.2.0) - sidekiq (6.4.1) + sidekiq (6.5.4) connection_pool (>= 2.2.2) rack (~> 2.0) - redis (>= 4.2.0) + redis (>= 4.5.0) simplecov (0.21.2) docile (~> 1.1) simplecov-html (~> 0.11) simplecov_json_formatter (~> 0.1) simplecov-html (0.12.3) simplecov_json_formatter (0.1.4) - sprockets (4.0.3) + sprockets (3.7.2) concurrent-ruby (~> 1.0) rack (> 1, < 3) sprockets-rails (3.4.2) @@ -438,46 +461,49 @@ GEM activesupport (>= 5.2) sprockets (>= 3.0.0) sshkey (2.0.0) - stackprof (0.2.19) - test-prof (1.0.8) + stackprof (0.2.20) + strscan (3.0.4) + test-prof (1.0.9) thor (1.2.1) - tilt (2.0.10) - tzinfo (2.0.4) + tilt (2.0.11) + timeout (0.3.0) + tzinfo (2.0.5) concurrent-ruby (~> 1.0) uglifier (4.2.0) execjs (>= 0.3.0, < 3) unf (0.1.4) unf_ext - unf_ext (0.0.8.1) - unicode-display_width (2.1.0) + unf_ext (0.0.8.2) + unicode-display_width (2.2.0) unicorn (6.1.0) kgio (~> 2.6) raindrops (~> 0.7) uniform_notifier (1.16.0) + uri (0.11.0) uri_template (0.7.0) - webmock (3.14.0) + webmock (3.17.1) addressable (>= 2.8.0) crack (>= 0.3.2) hashdiff (>= 0.4.0, < 2.0.0) webpush (1.1.0) hkdf (~> 0.2) jwt (~> 2.0) - xorcist (1.1.2) + xorcist (1.1.3) yaml-lint (0.0.10) - zeitwerk (2.5.4) + zeitwerk (2.6.0) PLATFORMS ruby DEPENDENCIES - actionmailer (= 6.1.4.7) - actionpack (= 6.1.4.7) - actionview (= 6.1.4.7) + actionmailer (= 7.0.3.1) + actionpack (= 7.0.3.1) + actionview (= 7.0.3.1) actionview_precompiler active_model_serializers (~> 0.8.3) - activemodel (= 6.1.4.7) - activerecord (= 6.1.4.7) - activesupport (= 6.1.4.7) + activemodel (= 7.0.3.1) + activerecord (= 7.0.3.1) + activesupport (= 7.0.3.1) addressable annotate aws-sdk-s3 @@ -537,8 +563,9 @@ DEPENDENCIES mocha multi_json mustache + net-http nokogiri - oj + oj (= 3.13.14) omniauth omniauth-facebook omniauth-github @@ -556,7 +583,7 @@ DEPENDENCIES rack-protection rails_failover rails_multisite - railties (= 6.1.4.7) + railties (= 7.0.3.1) rake rb-fsevent rbtrace @@ -571,8 +598,7 @@ DEPENDENCIES rspec-rails rss rswag-specs - rtlit - rubocop-discourse + rubocop-discourse! ruby-prof ruby-readability rubyzip @@ -583,7 +609,7 @@ DEPENDENCIES shoulda-matchers sidekiq simplecov - sprockets + sprockets (= 3.7.2) sprockets-rails sshkey stackprof diff --git a/pkgs/servers/web-apps/discourse/rubyEnv/gemset.nix b/pkgs/servers/web-apps/discourse/rubyEnv/gemset.nix index 84f4c37dfb22..95a0d999a981 100644 --- a/pkgs/servers/web-apps/discourse/rubyEnv/gemset.nix +++ b/pkgs/servers/web-apps/discourse/rubyEnv/gemset.nix @@ -1,14 +1,14 @@ { actionmailer = { - dependencies = ["actionpack" "actionview" "activejob" "activesupport" "mail" "rails-dom-testing"]; + dependencies = ["actionpack" "actionview" "activejob" "activesupport" "mail" "net-imap" "net-pop" "net-smtp" "rails-dom-testing"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0rjm6rx3qbqgxczy2a8l6hff72166hsf878fy2v1ik4pp8rh9cxa"; + sha256 = "1wdh4av6w6calnvvms6r8w3k3gaw0xy1lgsrjjf5d5gxq09nk7y7"; type = "gem"; }; - version = "6.1.4.7"; + version = "7.0.3.1"; }; actionpack = { dependencies = ["actionview" "activesupport" "rack" "rack-test" "rails-dom-testing" "rails-html-sanitizer"]; @@ -16,10 +16,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0cr02mj9wic0xbdrhjipk58cdljsfl4mplhqr9whn3l5qg8x5814"; + sha256 = "1f9y1qjnrwbwab3hf6nzlpr4v1fr1wq39l6dw3i1y3i6n8w04sb5"; type = "gem"; }; - version = "6.1.4.7"; + version = "7.0.3.1"; }; actionview = { dependencies = ["activesupport" "builder" "erubi" "rails-dom-testing" "rails-html-sanitizer"]; @@ -27,10 +27,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "02x8cxq2bhgj5r9vpdjz8a56awg22gqvnqn01dqwyx8ny6sirzac"; + sha256 = "1csycx6zlzrp6pw58s4nkm2qaz720cdhgxjkwjsd0qla75kvsyln"; type = "gem"; }; - version = "6.1.4.7"; + version = "7.0.3.1"; }; actionview_precompiler = { dependencies = ["actionview"]; @@ -60,10 +60,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1g8dpxjzj7k3sjfjhfia21bwzmgc721lafpk2napravmq1qi0rkj"; + sha256 = "03hn978lx6lasac267mincy6wwcir5gyix7gwrbvvk7rg7bsbmbk"; type = "gem"; }; - version = "6.1.4.7"; + version = "7.0.3.1"; }; activemodel = { dependencies = ["activesupport"]; @@ -71,10 +71,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "01mzgr5pdxcki023p96bj77by1iblv9bq6pwmbly931bjwhr5irv"; + sha256 = "0s9gjs1a49n7rfhz84glw6w62swlrqdqjhs8421kaa72iwxavq16"; type = "gem"; }; - version = "6.1.4.7"; + version = "7.0.3.1"; }; activerecord = { dependencies = ["activemodel" "activesupport"]; @@ -82,21 +82,21 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1idirwh7dzhzcjsssnghqyjl87inh84za0cmrf8g323p9qsx879l"; + sha256 = "1lb838wvarms8bs8hvfkccdsp4cjc0y9wjsxvw71h4ir3mys4jqg"; type = "gem"; }; - version = "6.1.4.7"; + version = "7.0.3.1"; }; activesupport = { - dependencies = ["concurrent-ruby" "i18n" "minitest" "tzinfo" "zeitwerk"]; + dependencies = ["concurrent-ruby" "i18n" "minitest" "tzinfo"]; groups = ["default" "development" "test"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "04j9cgv729mcz2jwr312nr5aswv07s6kjynmf59w61j395dfcvw9"; + sha256 = "15lbq28v48i6q118p02m5zs9c63y1kv2h5krb3ss6q2vyaxhnfz7"; type = "gem"; }; - version = "6.1.4.7"; + version = "7.0.3.1"; }; addressable = { dependencies = ["public_suffix"]; @@ -145,10 +145,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1jx44f1hc41712k8fqmzrbpqs2j9yl0msdqcmmfp0pirkbqw6ri0"; + sha256 = "0bg0v08n9mgvpnvkx8aznrax25lkrfsi5sjfdlccm7dadnada5fg"; type = "gem"; }; - version = "1.516.0"; + version = "1.583.0"; }; aws-sdk-core = { dependencies = ["aws-eventstream" "aws-partitions" "aws-sigv4" "jmespath"]; @@ -156,10 +156,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0d44wgbzlwc6gb2ql9cayljdwhlvz9byp2grk0n9favb7rq42fwc"; + sha256 = "0hajbavfngn99hcz6n20162jygvwdflldvnlrza7z32hizawaaan"; type = "gem"; }; - version = "3.121.2"; + version = "3.130.2"; }; aws-sdk-kms = { dependencies = ["aws-sdk-core" "aws-sigv4"]; @@ -167,10 +167,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0407yggwsy89fzh387vq3af5azplci5v0a8y97h7r6da4jrv1ksm"; + sha256 = "14dcfqqdx1dy7qwrdyqdvqjs53kswm4njvg34f61jpl9xi3h2yf3"; type = "gem"; }; - version = "1.44.0"; + version = "1.56.0"; }; aws-sdk-s3 = { dependencies = ["aws-sdk-core" "aws-sdk-kms" "aws-sigv4"]; @@ -178,10 +178,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0q28bdmpm2c2fw9wh00zhqxnb8p2nzdfi5l6wwa6bl63fm28816h"; + sha256 = "1r6dxz3llgxbbm66jq5mkzk0i6qsxwv0d9s0ipwb23vv3bgp23yf"; type = "gem"; }; - version = "1.96.1"; + version = "1.114.0"; }; aws-sdk-sns = { dependencies = ["aws-sdk-core" "aws-sigv4"]; @@ -189,10 +189,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1s2ggpwg7v0s0f4bw3887r5y92cbnrjld53lm69irqmx0h7q2564"; + sha256 = "0d3fhll3hqc23fvj7p0ncjrr0fri7spy21r0hfkqjhijm0q1xqg9"; type = "gem"; }; - version = "1.46.0"; + version = "1.53.0"; }; aws-sigv4 = { dependencies = ["aws-eventstream"]; @@ -200,10 +200,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1wh1y79v0s4zgby2m79bnifk65hwf5pvk2yyrxzn2jkjjq8f8fqa"; + sha256 = "0xp7diwq7nv4vvxrl9x3lis2l4x6bissrfzbfyy6rv5bmj5w109z"; type = "gem"; }; - version = "1.4.0"; + version = "1.5.0"; }; barber = { dependencies = ["ember-source" "execjs"]; @@ -252,10 +252,10 @@ }]; source = { remotes = ["https://rubygems.org"]; - sha256 = "0bjhh8pngmvnrsri2h6a753pgv0xdkbbgi1bmv6c7q137sp37jbg"; + sha256 = "0y1ycmvyd7swp6gy85m7znwilvb61zzcx6najgq0d1glq0p2hwy6"; type = "gem"; }; - version = "1.11.1"; + version = "1.13.0"; }; builder = { groups = ["default" "development" "test"]; @@ -273,10 +273,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0q90zk8di7a12by3d81nl78yy90rdml77vi3waxmgzqhvs6na4vj"; + sha256 = "10cwf4pi2i1r1hpz06sishj95aa9m65ymd61sl2vp57ncsrqcyab"; type = "gem"; }; - version = "7.0.1"; + version = "7.0.2"; }; byebug = { groups = ["development" "test"]; @@ -372,10 +372,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1gx239d2fracq9az74wfdwmp5zm7zpzkcgchwnv2ng33d8r33p3m"; + sha256 = "0cf29s40xf6a9k0idswfbabkswr0k5iqfrg61v40bzfrv0fdg440"; type = "gem"; }; - version = "1.2.0"; + version = "1.2.1"; }; cppjieba_rb = { groups = ["default"]; @@ -444,10 +444,20 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0nrg7kpgz6cn1gv2saj2fa5sfiykamvd7vn9lw2v625k7pjwf31l"; + sha256 = "1qcsv29ljfhy76gq4xi8zpn6dc6nv15c41r131bdr38kwpxjzd1n"; type = "gem"; }; - version = "3.4.0"; + version = "3.4.2"; + }; + digest = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "00vwzvxgby22h7jhwadqqf9ssbkp3ag2pl4g7q3zf1y8mlk7rk39"; + type = "gem"; + }; + version = "3.1.0"; }; discourse-ember-rails = { dependencies = ["active_model_serializers" "ember-data-source" "ember-handlebars-template" "ember-source" "jquery-rails" "railties"]; @@ -482,14 +492,14 @@ }; discourse_dev_assets = { dependencies = ["faker" "literate_randomizer"]; - groups = ["development"]; + groups = ["development" "test"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0c6cxrf6kvv4pg6fsig71dn5nrzy7jxbxmyi8206m1ijgpj8nddg"; + sha256 = "0ncd6n34vm7qd5mpza8wrqfkgfc6xbd5rxjcbdnvsv94zxr75rm1"; type = "gem"; }; - version = "0.0.3"; + version = "0.0.4"; }; docile = { groups = ["default" "test"]; @@ -563,20 +573,20 @@ }]; source = { remotes = ["https://rubygems.org"]; - sha256 = "09l8lz3j00m898li0yfsnb6ihc63rdvhw3k5xczna5zrjk104f2l"; + sha256 = "11bz1v1cxabm8672gabrw542zyg51dizlcvdck6vvwzagxbjv9zx"; type = "gem"; }; - version = "1.10.0"; + version = "1.11.0"; }; excon = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "01pcl1vx60x3f28rs6iw1lgqxycgb2yxq2p45k7b4a8liadykhba"; + sha256 = "0cdc76kgr4f1mq4jwbmq1qvr9c15hb4r1cx4dvrdra13vy9sckb5"; type = "gem"; }; - version = "0.92.2"; + version = "0.92.4"; }; execjs = { groups = ["assets" "default"]; @@ -603,21 +613,21 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0rgbmk044akxa84z9vdl8lkmd9z4xy3na1w0vh12pz02drxd93j9"; + sha256 = "0bxssmjp49whzq2zv7w751gr4nkdaiwcxd1vda0byigwyrnj6f5q"; type = "gem"; }; - version = "2.28.0"; + version = "2.30.0"; }; faker = { dependencies = ["i18n"]; - groups = ["development"]; + groups = ["development" "test"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1694ndj701a8q4c4bwxz53kx94ih1rr4pgr4gk7a6c8k4jsbjgwi"; + sha256 = "1na8p9r9zdvz75aihjczhamlygrjs9dj7pcbxgg8vfavrx8d89b5"; type = "gem"; }; - version = "2.20.0"; + version = "2.22.0"; }; fakeweb = { groups = ["test"]; @@ -686,10 +696,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "03qfi9020ynf7hkdiaq01sd2mllvw7fg4qiin3pk028b4wv23j3j"; + sha256 = "09871c4hd7s5ws1wl4gs7js1k2wlby6v947m2bbzg43pnld044lh"; type = "gem"; }; - version = "1.0.3"; + version = "1.0.4"; }; faraday-net_http = { groups = ["default"]; @@ -918,10 +928,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0b2qyvnk4yynlg17ymkq4g5xgr275637fhl1mjh0valw3cb1fhhg"; + sha256 = "1vdcchz7jli1p0gnc669a7bj3q1fv09y9ppf0y3k0vb1jwdwrqwi"; type = "gem"; }; - version = "1.10.0"; + version = "1.12.0"; }; image_optim = { dependencies = ["exifr" "fspath" "image_size" "in_threads" "progress"]; @@ -939,10 +949,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "130yn87pcnr5sblssm88hnvg8hc76isgrnhlf1d9355zhv4i2hsz"; + sha256 = "033k72f8n28psm89wv1qwsrnqyzz57ihyivyi442wha6vr9iyjz3"; type = "gem"; }; - version = "3.0.1"; + version = "3.0.2"; }; in_threads = { groups = ["default"]; @@ -954,16 +964,6 @@ }; version = "1.6.0"; }; - ipaddr = { - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "13qd34nzpgp3fxfjbvaqg3dcnfr0cgl5vjvcqy0hfllbvfcklnbq"; - type = "gem"; - }; - version = "1.2.4"; - }; jmespath = { groups = ["default"]; platforms = []; @@ -980,20 +980,20 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0dkhm8lan1vnyl3ll0ks2q06576pdils8a1dr354vfc1y5dqw15i"; + sha256 = "0fdbln0w43n2b2kwhmm6w302iydgkd2hvw8pp0hnj0dykmy9vf54"; type = "gem"; }; - version = "4.4.0"; + version = "4.5.0"; }; json = { - groups = ["default"]; + groups = ["default" "development" "test"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1z9grvjyfz16ag55hg522d3q4dh07hf391sf9s96npc0vfi85xkz"; + sha256 = "0yk5d10yvspkc5jyvx9gc1a9pn1z8v4k2hvjk1l88zixwf3wf3cl"; type = "gem"; }; - version = "2.6.1"; + version = "2.6.2"; }; json-schema = { dependencies = ["addressable"]; @@ -1012,20 +1012,20 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1ahcnfw3lchyyq7ixjfghkw709fbm8mkqsqq9yhd9in3bhzywa88"; + sha256 = "11dsw41f1zai3k8kxxjhmjlycwg67irqaqmiw4jbw12wdc6cxa6d"; type = "gem"; }; - version = "0.2.20"; + version = "0.2.21"; }; jwt = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0bg8pjx0mpvl10k6d8a6gc8dzlv2z5jkqcjbjcirnk032iriq838"; + sha256 = "1lsk71qh5d7bm1qqrjvcwhp4h71ckkdbzxnw4xkd9cin8gjfvvr6"; type = "gem"; }; - version = "2.3.0"; + version = "2.4.1"; }; kgio = { groups = ["default"]; @@ -1111,10 +1111,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0mamk8hgdhjcd33jf1w3j2kayvpyyscysvnmbhq3mw5kjji89cam"; + sha256 = "15kcv5agmash3szsl4aj5ns4daxp439w8czw0fvq4qgf92y4fi8s"; type = "gem"; }; - version = "2.11.0"; + version = "2.11.2"; }; loofah = { dependencies = ["crass" "nokogiri"]; @@ -1122,10 +1122,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "15s6z5bvhdhnqv4wg8zcz3mhbc7i4dbqskv5jvhprz33ak7682km"; + sha256 = "18ymp6l3bv7abz07k6qbbi9c9vsiahq30d2smh4qzsvag8j5m5v1"; type = "gem"; }; - version = "2.16.0"; + version = "2.18.0"; }; lru_redux = { groups = ["default"]; @@ -1248,10 +1248,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1cy9c2wv19m4h2sv9fs66hh1an7hq3y9513678dzx43vm3kjvhz5"; + sha256 = "0g8mi0l90kkdvh45xz1gcmv3yzpj7d4dvgrhk8lg7lwn82d06yzw"; type = "gem"; }; - version = "0.13.0"; + version = "0.14.0"; }; mini_sql = { groups = ["default"]; @@ -1279,20 +1279,20 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "06xf558gid4w8lwx13jwfdafsch9maz8m0g85wnfymqj63x5nbbd"; + sha256 = "14a9ign0hj3z3j4cpfplj2djaskx3skzyx4fl3x53d7saxmhrgn1"; type = "gem"; }; - version = "5.15.0"; + version = "5.16.2"; }; mocha = { groups = ["development" "test"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "15s53ggsykk69kxqvs4416s8yxdhz6caggva55n8sjgy4ixzwp10"; + sha256 = "0ffd7zn24lwhp3xp747jfg4zxgqbm04ar7shhjy2iv5xg1pz01lr"; type = "gem"; }; - version = "1.13.0"; + version = "1.14.0"; }; msgpack = { groups = ["default"]; @@ -1303,10 +1303,10 @@ }]; source = { remotes = ["https://rubygems.org"]; - sha256 = "1i0gbypr1yxwfkaxzrk0i1wz4n6v3mw7z24k65jy3q1h5lda5xbw"; + sha256 = "02af38s49111wglqzcjcpa7bwg6psjgysrjvgk05h3x4zchb6gd5"; type = "gem"; }; - version = "1.5.1"; + version = "1.5.4"; }; multi_json = { groups = ["default"]; @@ -1333,10 +1333,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1zgw9zlwh2a6i1yvhhc4a84ry1hv824d6g2iw2chs3k5aylpmpfj"; + sha256 = "1n0kvnrcrjn31jb97kcx3wj1f5kkjza7yygfq8rxzf3i57g7jaa6"; type = "gem"; }; - version = "2.1.1"; + version = "2.2.3"; }; mustache = { groups = ["default"]; @@ -1348,6 +1348,61 @@ }; version = "1.1.1"; }; + net-http = { + dependencies = ["uri"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1j4f0wgyps0qyms4p6fjqva63xy13wvy7bx5qg5gmzzwm3kqs1fr"; + type = "gem"; + }; + version = "0.2.2"; + }; + net-imap = { + dependencies = ["digest" "net-protocol" "strscan"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1rl79ykmxa2k4dlk6ykrb9l0a4h101q1gd8c4qv3cl0p9h68zmbn"; + type = "gem"; + }; + version = "0.2.3"; + }; + net-pop = { + dependencies = ["digest" "net-protocol" "timeout"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1slsl3xlbf0cqzmf2q1rfqbm61xvxzmr0h9zprwlbm1xn1cvn9xb"; + type = "gem"; + }; + version = "0.1.1"; + }; + net-protocol = { + dependencies = ["timeout"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "051cc82dl41a66c9sxv4lx4slqk7sz1v4iy0hdk6gpjyjszf4hxd"; + type = "gem"; + }; + version = "0.1.3"; + }; + net-smtp = { + dependencies = ["digest" "net-protocol" "timeout"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1s358kfv9mnfxcjbpr1d5a2gs1q7wkw7ffpn86mf1b3s9p31bw9s"; + type = "gem"; + }; + version = "0.3.1"; + }; nio4r = { groups = ["default"]; platforms = []; @@ -1364,20 +1419,20 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1g43ii497cwdqhfnaxfl500bq5yfc5hfv5df1lvf6wcjnd708ihd"; + sha256 = "0g7axlq2y6gzmixzzzhw3fn6nhrhg469jj8gfr7gs8igiclpkhkr"; type = "gem"; }; - version = "1.13.4"; + version = "1.13.8"; }; oauth = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0h6nfg2pibc17fch0795d4bcy41a92im5zrsrgs31zdhrl6zf4w0"; + sha256 = "1asrxrbgzgzf1r9rb0c785zyyaq9v5z7v3k1avsais2sh9q1y763"; type = "gem"; }; - version = "0.5.8"; + version = "0.5.10"; }; oauth2 = { dependencies = ["faraday" "jwt" "multi_json" "multi_xml" "rack"]; @@ -1395,10 +1450,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0bm8sdh7vz7ss3y21v961rd8nww23w5g4yhgvnd7jk331kdjyyzl"; + sha256 = "0bbbncvkqxbbi608vq2v7b3zzgrqac3syk403zhhbwrg352mv88q"; type = "gem"; }; - version = "3.13.11"; + version = "3.13.14"; }; omniauth = { dependencies = ["hashie" "rack"]; @@ -1478,15 +1533,14 @@ version = "1.4.0"; }; openssl = { - dependencies = ["ipaddr"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0wkx3b598mxmr3idfbgas0cnrds54bfivnn1ip0d7z7kcr5vzbzn"; + sha256 = "1azzx975qr078isvg8i0hmsr2l98kgnlfrnbb2jdm9b5kwifx1h4"; type = "gem"; }; - version = "2.2.1"; + version = "3.0.0"; }; openssl-signature_algorithm = { dependencies = ["openssl"]; @@ -1494,10 +1548,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "173p9agv45hj62fdgl9bzqr9f6xg7hi2sf5iyd3ahiwbv220x332"; + sha256 = "0rwjga70kbg0rmwgksb2if34ndh9cy0fgrimkx3hjz9c68ssvpxg"; type = "gem"; }; - version = "1.1.1"; + version = "1.2.1"; }; optimist = { groups = ["default"]; @@ -1529,10 +1583,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "01kzjshbim0w5ax7vcjfxvb83x2pglws7qr43x0qkd731f8w10f7"; + sha256 = "1jgqdwfgd4g3mfi854f2n0v615z3n59l24nya7v6cdnaixn5x02y"; type = "gem"; }; - version = "3.8.1"; + version = "3.11.1"; }; parser = { dependencies = ["ast"]; @@ -1540,20 +1594,20 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0xhfghgidj8cbdnqp01f7kvnrv1f60izpkd9dhxsvpdzkfsdg97d"; + sha256 = "1q31n7yj59wka8xl8s5wkf66hm4pgvblx95czyxffprdnlhrir2p"; type = "gem"; }; - version = "3.1.2.0"; + version = "3.1.2.1"; }; pg = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "10ryzmc3r5ja6g90a9ycsxcxsy5872xa1vf01jam0bm74zq3zmi6"; + sha256 = "1ypj64nhq3grs9zh40vmyfyhmxlhljjsbg5q0jxhlxg5v76ij0mb"; type = "gem"; }; - version = "1.3.5"; + version = "1.4.3"; }; progress = { groups = ["default"]; @@ -1648,10 +1702,10 @@ }]; source = { remotes = ["https://rubygems.org"]; - sha256 = "0i5vs0dph9i5jn8dfc6aqd6njcafmb20rwqngrf759c9cvmyff16"; + sha256 = "0axc6w0rs4yj0pksfll1hjgw1k6a5q0xi2lckh91knfb72v348pa"; type = "gem"; }; - version = "2.2.3"; + version = "2.2.4"; }; rack-mini-profiler = { dependencies = ["rack"]; @@ -1670,10 +1724,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1hz6h6d67r217qi202qmxq2xkn3643ay3iybhl3dq3qd6j8nm3b2"; + sha256 = "169jzzgvbjrqmz4q55wp9pg4ji2h90mggcdxy152gv5vp96l2hgx"; type = "gem"; }; - version = "2.2.0"; + version = "2.2.2"; }; rack-test = { dependencies = ["rack"]; @@ -1681,10 +1735,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0rh8h376mx71ci5yklnpqqn118z3bl67nnv5k801qaqn1zs62h8m"; + sha256 = "0rjl709krgf499dhjdapg580l2qaj9d91pwzk8ck8fpnazlx1bdd"; type = "gem"; }; - version = "1.1.0"; + version = "2.0.2"; }; rails-dom-testing = { dependencies = ["activesupport" "nokogiri"]; @@ -1703,10 +1757,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "09qrfi3pgllxb08r024lln9k0qzxs57v0slsj8616xf9c0cwnwbk"; + sha256 = "1mj0b7ay10a2fgwj70kjw7mlyrp7a5la8lx8zmwhy40bkansdfrf"; type = "gem"; }; - version = "1.4.2"; + version = "1.4.3"; }; rails_failover = { dependencies = ["activerecord" "concurrent-ruby" "railties"]; @@ -1731,15 +1785,15 @@ version = "4.0.1"; }; railties = { - dependencies = ["actionpack" "activesupport" "method_source" "rake" "thor"]; + dependencies = ["actionpack" "activesupport" "method_source" "rake" "thor" "zeitwerk"]; groups = ["default" "development" "test"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0g6hvhvqdmgabcpmdiby4b77ni3rsgd5p7sd1qkqj34r4an0ldyd"; + sha256 = "0lnrhx0sdixz5xm2vi482ngs4alh8l725kh96v6mfk0x0qlbdsaw"; type = "gem"; }; - version = "6.1.4.7"; + version = "7.0.3.1"; }; rainbow = { groups = ["default" "development" "test"]; @@ -1828,10 +1882,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "03r9739q3vq38g456snf3rk9hadf955bs5im6qs6m69h19mrz2yw"; + sha256 = "1xid9av3apfz5mszwqgl6v0n58g6038lsfdz0p53xb9ywpa5dcpc"; type = "gem"; }; - version = "4.5.1"; + version = "4.7.1"; }; redis-namespace = { dependencies = ["redis"]; @@ -1849,10 +1903,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0a6nxfq3ln1i109jx172n33s73a90l8g04h8p56bmw9phj467h9k"; + sha256 = "1rfd3q17p7q7pa67844q8b16ipy6ksh8mkzynpm1zldqbb9x4xm0"; type = "gem"; }; - version = "2.3.0"; + version = "2.5.0"; }; request_store = { dependencies = ["rack"]; @@ -1901,10 +1955,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "10sq4aknch9rzpy8af77rqxk8rr59d33slg1kwg9h7fw9f1spmjn"; + sha256 = "0s97q1rqmw7rzsdr500hr4f2k6s24n8qk1klciz5q94zvdrygx3p"; type = "gem"; }; - version = "2.1.1"; + version = "2.1.2"; }; rqrcode_core = { groups = ["default"]; @@ -1955,10 +2009,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0883rqv77n2wawnk5lp3la48l7pckyz8l013qddngzmksi5p1v3f"; + sha256 = "1bp9q28qw4xmxknrrp3ppcr08bbcnnand6r9prw4920407mvy96l"; type = "gem"; }; - version = "0.9.4"; + version = "0.10.0"; }; rspec-mocks = { dependencies = ["diff-lcs" "rspec-support"]; @@ -1977,10 +2031,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0jj5zs9h2ll8iz699ac4bysih7y4csnf8h5h80bm6ppbf02ly8fa"; + sha256 = "1cqw7bhj4a4rhh1x9i5gjm9r91ckhjyngw0zcr7jw2jnfis10d7l"; type = "gem"; }; - version = "5.1.1"; + version = "5.1.2"; }; rspec-support = { groups = ["default" "development" "test"]; @@ -2014,26 +2068,16 @@ }; version = "2.5.1"; }; - rtlit = { - groups = ["assets"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0srfh7cl95srjiwbyc9pmn3w739zlvyj89hyj0bm7g92zrsd27qm"; - type = "gem"; - }; - version = "0.0.5"; - }; rubocop = { - dependencies = ["parallel" "parser" "rainbow" "regexp_parser" "rexml" "rubocop-ast" "ruby-progressbar" "unicode-display_width"]; + dependencies = ["json" "parallel" "parser" "rainbow" "regexp_parser" "rexml" "rubocop-ast" "ruby-progressbar" "unicode-display_width"]; groups = ["default" "development" "test"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "00d9nzlnbxr3jqkya2b2rcahs9l22qpdk5qf3y7pws8m555l8slk"; + sha256 = "1n08wns7qaxja8g5fnixicybj1rdq3cjli33l7v1856saizp9lpf"; type = "gem"; }; - version = "1.27.0"; + version = "1.34.1"; }; rubocop-ast = { dependencies = ["parser"]; @@ -2041,19 +2085,21 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1k9izkr5rhw3zc309yjp17z7496l74j4li3zrcgpgqfnqwz695qx"; + sha256 = "0s4m9h9hzrpfmsnswvfimafmjwfa79cbqh9dvq18cja32dhrhpcg"; type = "gem"; }; - version = "1.17.0"; + version = "1.21.0"; }; rubocop-discourse = { dependencies = ["rubocop" "rubocop-rspec"]; groups = ["development" "test"]; platforms = []; source = { - remotes = ["https://rubygems.org"]; - sha256 = "01f4y7am9cq276zl8vsgv64w8wfmhpbzg7vzsifhgnnh92g6s04g"; - type = "gem"; + fetchSubmodules = false; + rev = "a5aea6e5f150b1eb7765a805bec0ff618cb718b3"; + sha256 = "1h25i2ykp1m0j07ij0gq2p632ri01lnykwl3lcishmxncddcz247"; + type = "git"; + url = "https://github.com/discourse/rubocop-discourse.git"; }; version = "2.5.0"; }; @@ -2063,10 +2109,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "051gq9pz49iv4gq34d3n089iaa6cb418n2fhin6gd6fpysbi3nf6"; + sha256 = "1y93hhhcs2j7z8gz8xagwwjs243rskryx4fm62piq9i58lnx4y4j"; type = "gem"; }; - version = "2.9.0"; + version = "2.12.1"; }; ruby-prof = { groups = ["development"]; @@ -2184,10 +2230,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0fq3nxpj1c9s2bi056p9cldb7zy45bgdkjq8721zypw1pkvllb7f"; + sha256 = "1zyq0faxkrk9jxqchzjlazpycjh8fg33h84qi654yv9c7a146r2z"; type = "gem"; }; - version = "6.4.1"; + version = "6.5.4"; }; simplecov = { dependencies = ["docile" "simplecov-html" "simplecov_json_formatter"]; @@ -2226,10 +2272,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "19k5cwg8gyb6lkmz4kab7c5nlplpgj64jy7vw8p5l2i2ysq5hym0"; + sha256 = "182jw5a0fbqah5w9jancvfmjbk88h8bxdbwnl4d3q809rpxdg8ay"; type = "gem"; }; - version = "4.0.3"; + version = "3.7.2"; }; sprockets-rails = { dependencies = ["actionpack" "activesupport" "sprockets"]; @@ -2261,20 +2307,30 @@ }]; source = { remotes = ["https://rubygems.org"]; - sha256 = "19rnk17rz0lhf7l9awy0s7xxyw91ydcqxlx0576xvwyi79jh6a2m"; + sha256 = "17ih8nb2v4adihb8fihmja72f55dm0ds92j8asadsjm9mpci4bgc"; type = "gem"; }; - version = "0.2.19"; + version = "0.2.20"; + }; + strscan = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "00ip0m5ad5ywkj4na07qxcyi9wgdh6b877s0ibx5al23abzkxak9"; + type = "gem"; + }; + version = "3.0.4"; }; test-prof = { groups = ["test"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "04yxdm2cdhwp0wsp8891f06cprp4442p3mlgpdc4pziflpfvaw05"; + sha256 = "1xxw3w131mymawr94zkw5y5wgywix53rakfm0bq8s9ccqdx9mm9v"; type = "gem"; }; - version = "1.0.8"; + version = "1.0.9"; }; thor = { groups = ["default" "development" "test"]; @@ -2291,10 +2347,20 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0rn8z8hda4h41a64l0zhkiwz2vxw9b1nb70gl37h1dg2k874yrlv"; + sha256 = "186nfbcsk0l4l86gvng1fw6jq6p6s7rc0caxr23b3pnbfb20y63v"; type = "gem"; }; - version = "2.0.10"; + version = "2.0.11"; + }; + timeout = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "00cy93b6803j3aw5nail4l0zdrj54i5n2dlk6j9z998swcjbv3b2"; + type = "gem"; + }; + version = "0.3.0"; }; tzinfo = { dependencies = ["concurrent-ruby"]; @@ -2302,10 +2368,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "10qp5x7f9hvlc0psv9gsfbxg4a7s0485wsbq1kljkxq94in91l4z"; + sha256 = "0rx114mpqnw2k4h98vc0rs0x0bmf0img84yh8mkkjkal07cjydf5"; type = "gem"; }; - version = "2.0.4"; + version = "2.0.5"; }; uglifier = { dependencies = ["execjs"]; @@ -2334,20 +2400,20 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0bf120xbq23zjyf8zi8h1576d71g58srr8rndig0whn10w72vrxz"; + sha256 = "1yj2nz2l101vr1x9w2k83a0fag1xgnmjwp8w8rw4ik2rwcz65fch"; type = "gem"; }; - version = "0.0.8.1"; + version = "0.0.8.2"; }; unicode-display_width = { groups = ["default" "development" "test"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0csjm9shhfik0ci9mgimb7hf3xgh7nx45rkd9rzgdz6vkwr8rzxn"; + sha256 = "1nlfck6z986fngp0r74maswmyb1rcksc8xc3mfpw9cj23c3s8zwn"; type = "gem"; }; - version = "2.1.0"; + version = "2.2.0"; }; unicorn = { dependencies = ["kgio" "raindrops"]; @@ -2376,6 +2442,16 @@ }; version = "1.16.0"; }; + uri = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1w00162maixmqp7nwm8mmbvwnnpmjilwbim8yk2ypxy3x3ih6l69"; + type = "gem"; + }; + version = "0.11.0"; + }; uri_template = { groups = ["default"]; platforms = []; @@ -2392,10 +2468,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1l8vh8p0g92cqcvv0ra3mblsa4nczh0rz8nbwbkc3g3yzbva85xk"; + sha256 = "06jbjl78szxkri3wx0mzsdhx2z2af11kp35k5rsrppchbssgagcj"; type = "gem"; }; - version = "3.14.0"; + version = "3.17.1"; }; webpush = { dependencies = ["hkdf" "jwt"]; @@ -2413,10 +2489,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1q7hr3qyn1hczv9fglqc2cbaax0fb37gjjr0y24x19mmp817csdn"; + sha256 = "1dbbiy8xlcfvn9ais37xfb5rci4liwakkmxzbkp72wmvlgcrf339"; type = "gem"; }; - version = "1.1.2"; + version = "1.1.3"; }; yaml-lint = { groups = ["development"]; @@ -2433,9 +2509,9 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "09bq7j2p6mkbxnsg71s253dm2463kg51xc7bmjcxgyblqbh4ln7m"; + sha256 = "0xjdr2szxvn3zb1sb5l8nfd6k9jr3b4qqbbg1mj9grf68m3fxckc"; type = "gem"; }; - version = "2.5.4"; + version = "2.6.0"; }; } From f34bc06abc7af57dd6074d7e2a0d2dd1ca386ccb Mon Sep 17 00:00:00 2001 From: talyz Date: Tue, 9 Aug 2022 19:47:40 +0200 Subject: [PATCH 027/164] discourse: Filter out :require_name option when creating the Gemfile :require_name is internal to Discourse and Bundler throws an error when it's passed through to the Gemfile. --- pkgs/servers/web-apps/discourse/update.py | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/servers/web-apps/discourse/update.py b/pkgs/servers/web-apps/discourse/update.py index 64f374bad703..9fc14b177114 100755 --- a/pkgs/servers/web-apps/discourse/update.py +++ b/pkgs/servers/web-apps/discourse/update.py @@ -407,6 +407,7 @@ def update_plugins(): gemfile_text = '' for line in repo.get_file('plugin.rb', rev).splitlines(): if 'gem ' in line: + line = ','.join(filter(lambda x: ":require_name" not in x, line.split(','))) gemfile_text = gemfile_text + line + os.linesep version_file_match = version_file_regex.match(line) From a3cc1609cdfcf5988ad1f6966b5c275f4b4a00a1 Mon Sep 17 00:00:00 2001 From: talyz Date: Tue, 9 Aug 2022 19:50:27 +0200 Subject: [PATCH 028/164] discourse: Update plugins --- .../plugins/discourse-assign/default.nix | 4 +- .../plugins/discourse-calendar/Gemfile.lock | 8 ++-- .../plugins/discourse-calendar/default.nix | 4 +- .../plugins/discourse-calendar/gemset.nix | 16 +++---- .../discourse-canned-replies/default.nix | 4 +- .../discourse-chat-integration/default.nix | 4 +- .../plugins/discourse-checklist/default.nix | 4 +- .../discourse-data-explorer/default.nix | 4 +- .../plugins/discourse-docs/default.nix | 4 +- .../plugins/discourse-github/Gemfile.lock | 8 ++-- .../plugins/discourse-github/default.nix | 4 +- .../plugins/discourse-github/gemset.nix | 12 +++--- .../plugins/discourse-math/default.nix | 4 +- .../plugins/discourse-migratepassword/Gemfile | 4 ++ .../discourse-migratepassword/Gemfile.lock | 15 ++++++- .../discourse-migratepassword/default.nix | 4 +- .../discourse-migratepassword/gemset.nix | 42 +++++++++++++++++++ .../discourse-openid-connect/default.nix | 4 +- .../plugins/discourse-prometheus/default.nix | 4 +- .../discourse-saved-searches/default.nix | 4 +- .../plugins/discourse-solved/default.nix | 4 +- .../discourse-spoiler-alert/default.nix | 4 +- .../plugins/discourse-voting/default.nix | 4 +- .../discourse-yearly-review/default.nix | 4 +- 24 files changed, 115 insertions(+), 58 deletions(-) diff --git a/pkgs/servers/web-apps/discourse/plugins/discourse-assign/default.nix b/pkgs/servers/web-apps/discourse/plugins/discourse-assign/default.nix index 3cf491a2f42d..8dc8377ac95e 100644 --- a/pkgs/servers/web-apps/discourse/plugins/discourse-assign/default.nix +++ b/pkgs/servers/web-apps/discourse/plugins/discourse-assign/default.nix @@ -5,8 +5,8 @@ mkDiscoursePlugin { src = fetchFromGitHub { owner = "discourse"; repo = "discourse-assign"; - rev = "7a854fe5046783bcff6cc24fca818056e1b9414a"; - sha256 = "sha256-SGGwj0V4mTXD33tLnH76tQD/f6IvDbacq23XbaRdLsI="; + rev = "030cdc2d9c06cd2fed24fa47861b0213fd2d854e"; + sha256 = "sha256-3JBBxgWWkCAHci+Cv69o+4JY1b70yOckE+1y5ipl5a8="; }; meta = with lib; { homepage = "https://github.com/discourse/discourse-docs"; diff --git a/pkgs/servers/web-apps/discourse/plugins/discourse-calendar/Gemfile.lock b/pkgs/servers/web-apps/discourse/plugins/discourse-calendar/Gemfile.lock index 4a4ff3b0e178..4de4b6e42dde 100644 --- a/pkgs/servers/web-apps/discourse/plugins/discourse-calendar/Gemfile.lock +++ b/pkgs/servers/web-apps/discourse/plugins/discourse-calendar/Gemfile.lock @@ -1,18 +1,18 @@ GEM remote: https://rubygems.org/ specs: - activesupport (7.0.2.3) + activesupport (7.0.3.1) concurrent-ruby (~> 1.0, >= 1.0.2) i18n (>= 1.6, < 2) minitest (>= 5.1) tzinfo (~> 2.0) concurrent-ruby (1.1.10) - i18n (1.10.0) + i18n (1.12.0) concurrent-ruby (~> 1.0) - minitest (5.15.0) + minitest (5.16.2) rrule (0.4.4) activesupport (>= 2.3) - tzinfo (2.0.4) + tzinfo (2.0.5) concurrent-ruby (~> 1.0) PLATFORMS diff --git a/pkgs/servers/web-apps/discourse/plugins/discourse-calendar/default.nix b/pkgs/servers/web-apps/discourse/plugins/discourse-calendar/default.nix index d935b37b5a11..922adc60b618 100644 --- a/pkgs/servers/web-apps/discourse/plugins/discourse-calendar/default.nix +++ b/pkgs/servers/web-apps/discourse/plugins/discourse-calendar/default.nix @@ -6,8 +6,8 @@ mkDiscoursePlugin { src = fetchFromGitHub { owner = "discourse"; repo = "discourse-calendar"; - rev = "eb8bc3e864c6f735fa5a005e854f8c37411b6288"; - sha256 = "sha256-fc3oQj2NqaTfmokJUryd2oBd/eVAcNOMMT0ZT45bU28="; + rev = "3cf82dcc6c717965e1d1ff384965e2ee215402f0"; + sha256 = "sha256-D6FP+vgCqi+wLV+gFAPTAAND3os7mcvpl2z8c5JiFxo="; }; meta = with lib; { homepage = "https://github.com/discourse/discourse-calendar"; diff --git a/pkgs/servers/web-apps/discourse/plugins/discourse-calendar/gemset.nix b/pkgs/servers/web-apps/discourse/plugins/discourse-calendar/gemset.nix index 69f2648831ce..e2db1930298d 100644 --- a/pkgs/servers/web-apps/discourse/plugins/discourse-calendar/gemset.nix +++ b/pkgs/servers/web-apps/discourse/plugins/discourse-calendar/gemset.nix @@ -5,10 +5,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1jpydd414j0fig3r0f6ci67mchclg6cq2qgqbq9zplrbg40pzfi8"; + sha256 = "15lbq28v48i6q118p02m5zs9c63y1kv2h5krb3ss6q2vyaxhnfz7"; type = "gem"; }; - version = "7.0.2.3"; + version = "7.0.3.1"; }; concurrent-ruby = { groups = ["default"]; @@ -26,20 +26,20 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0b2qyvnk4yynlg17ymkq4g5xgr275637fhl1mjh0valw3cb1fhhg"; + sha256 = "1vdcchz7jli1p0gnc669a7bj3q1fv09y9ppf0y3k0vb1jwdwrqwi"; type = "gem"; }; - version = "1.10.0"; + version = "1.12.0"; }; minitest = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "06xf558gid4w8lwx13jwfdafsch9maz8m0g85wnfymqj63x5nbbd"; + sha256 = "14a9ign0hj3z3j4cpfplj2djaskx3skzyx4fl3x53d7saxmhrgn1"; type = "gem"; }; - version = "5.15.0"; + version = "5.16.2"; }; rrule = { dependencies = ["activesupport"]; @@ -58,9 +58,9 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "10qp5x7f9hvlc0psv9gsfbxg4a7s0485wsbq1kljkxq94in91l4z"; + sha256 = "0rx114mpqnw2k4h98vc0rs0x0bmf0img84yh8mkkjkal07cjydf5"; type = "gem"; }; - version = "2.0.4"; + version = "2.0.5"; }; } diff --git a/pkgs/servers/web-apps/discourse/plugins/discourse-canned-replies/default.nix b/pkgs/servers/web-apps/discourse/plugins/discourse-canned-replies/default.nix index 07e58652d9fe..07d1afb2da49 100644 --- a/pkgs/servers/web-apps/discourse/plugins/discourse-canned-replies/default.nix +++ b/pkgs/servers/web-apps/discourse/plugins/discourse-canned-replies/default.nix @@ -5,8 +5,8 @@ mkDiscoursePlugin { src = fetchFromGitHub { owner = "discourse"; repo = "discourse-canned-replies"; - rev = "18af3367d9eda8842e8ff0de96c90aa2f0bdb0a3"; - sha256 = "sha256-v8QOR0/9RUJ1zFmzhKYe/GEev3Jl4AlXWkQyuquyuJY="; + rev = "faa586b095a9ec5b0088bdfa7b04a3aba9f44521"; + sha256 = "sha256-f/9JtPtYZsRIzk3cBlXAtdG25oep7/Kl74JsGkoP4PI="; }; meta = with lib; { homepage = "https://github.com/discourse/discourse-canned-replies"; diff --git a/pkgs/servers/web-apps/discourse/plugins/discourse-chat-integration/default.nix b/pkgs/servers/web-apps/discourse/plugins/discourse-chat-integration/default.nix index f96348e6f273..6f70efa90ab1 100644 --- a/pkgs/servers/web-apps/discourse/plugins/discourse-chat-integration/default.nix +++ b/pkgs/servers/web-apps/discourse/plugins/discourse-chat-integration/default.nix @@ -5,8 +5,8 @@ mkDiscoursePlugin { src = fetchFromGitHub { owner = "discourse"; repo = "discourse-chat-integration"; - rev = "eaa7de8c2b659d107c2b16ac0d469592aff79d7c"; - sha256 = "sha256-7anXDbltMBM22dBnE5FFwNk7IJEUFZgDzR4Q/AYn6ng="; + rev = "c68fde5d2bbb92cad24a35ff61586453d67264f5"; + sha256 = "sha256-Gmy8I/MbIdicHqZjlwNDz8PdCdxptzynd1pyL4BM5z4="; }; meta = with lib; { homepage = "https://github.com/discourse/discourse-chat-integration"; diff --git a/pkgs/servers/web-apps/discourse/plugins/discourse-checklist/default.nix b/pkgs/servers/web-apps/discourse/plugins/discourse-checklist/default.nix index d1bcd57fc66a..e8de49349f0c 100644 --- a/pkgs/servers/web-apps/discourse/plugins/discourse-checklist/default.nix +++ b/pkgs/servers/web-apps/discourse/plugins/discourse-checklist/default.nix @@ -5,8 +5,8 @@ mkDiscoursePlugin { src = fetchFromGitHub { owner = "discourse"; repo = "discourse-checklist"; - rev = "68941e370e132c17fc2aa21ac40c033df72c9771"; - sha256 = "sha256-jJM/01fKxc1RBcSPt9/KDxMkBMH2AOp9dINxSneNhAs="; + rev = "8763292e9a02fc2fed6d39c59c3cf5401dcdd950"; + sha256 = "sha256-xUsTjoG25efIumrf6XX8rAKWjfcAhZiqQz9pfnG3pQU="; }; meta = with lib; { homepage = "https://github.com/discourse/discourse-checklist"; diff --git a/pkgs/servers/web-apps/discourse/plugins/discourse-data-explorer/default.nix b/pkgs/servers/web-apps/discourse/plugins/discourse-data-explorer/default.nix index 8073d89df817..198b1e5aba52 100644 --- a/pkgs/servers/web-apps/discourse/plugins/discourse-data-explorer/default.nix +++ b/pkgs/servers/web-apps/discourse/plugins/discourse-data-explorer/default.nix @@ -5,8 +5,8 @@ mkDiscoursePlugin { src = fetchFromGitHub { owner = "discourse"; repo = "discourse-data-explorer"; - rev = "baaac7ce671e716559329ae756988cc395d7079e"; - sha256 = "sha256-bUCRfbKXdNbiJnU3xPMhG3s8kH7wQQoS2kV7ScHGOMQ="; + rev = "bf56ab3559328cdf89cdd5b32ec32f41aa87017e"; + sha256 = "sha256-JoqOmv/x9aiSXBAwXO1PSg0E/1eb19dNXxqCLOIyHvo="; }; meta = with lib; { homepage = "https://github.com/discourse/discourse-data-explorer"; diff --git a/pkgs/servers/web-apps/discourse/plugins/discourse-docs/default.nix b/pkgs/servers/web-apps/discourse/plugins/discourse-docs/default.nix index 071b1eb5dd9b..3587c9ef2a13 100644 --- a/pkgs/servers/web-apps/discourse/plugins/discourse-docs/default.nix +++ b/pkgs/servers/web-apps/discourse/plugins/discourse-docs/default.nix @@ -5,8 +5,8 @@ mkDiscoursePlugin { src = fetchFromGitHub { owner = "discourse"; repo = "discourse-docs"; - rev = "72b2e87e84221588bc2ff08961a492044f1f8237"; - sha256 = "sha256-moR4TJYffh6JwC7oxeS4+Cyngi88Ht2eTbSEJJ4JKdY="; + rev = "13bab928c72c847c4c3f7ebb8600343b48f14a5f"; + sha256 = "sha256-Gno+dbu8/l/cdrzJZL82DmMilZ5zJScFaQ88x8Hum0k="; }; meta = with lib; { homepage = "https://github.com/discourse/discourse-docs"; diff --git a/pkgs/servers/web-apps/discourse/plugins/discourse-github/Gemfile.lock b/pkgs/servers/web-apps/discourse/plugins/discourse-github/Gemfile.lock index ba0516980977..b31ad9452c4d 100644 --- a/pkgs/servers/web-apps/discourse/plugins/discourse-github/Gemfile.lock +++ b/pkgs/servers/web-apps/discourse/plugins/discourse-github/Gemfile.lock @@ -3,7 +3,7 @@ GEM specs: addressable (2.8.0) public_suffix (>= 2.0.2, < 5.0) - faraday (1.10.0) + faraday (1.10.1) faraday-em_http (~> 1.0) faraday-em_synchrony (~> 1.0) faraday-excon (~> 1.1) @@ -19,14 +19,14 @@ GEM faraday-em_synchrony (1.0.0) faraday-excon (1.1.0) faraday-httpclient (1.0.1) - faraday-multipart (1.0.3) - multipart-post (>= 1.2, < 3) + faraday-multipart (1.0.4) + multipart-post (~> 2) faraday-net_http (1.0.1) faraday-net_http_persistent (1.2.0) faraday-patron (1.0.0) faraday-rack (1.0.0) faraday-retry (1.0.3) - multipart-post (2.1.1) + multipart-post (2.2.3) octokit (4.22.0) faraday (>= 0.9) sawyer (~> 0.8.0, >= 0.5.3) diff --git a/pkgs/servers/web-apps/discourse/plugins/discourse-github/default.nix b/pkgs/servers/web-apps/discourse/plugins/discourse-github/default.nix index f9ccaed863ef..e53ac21892b0 100644 --- a/pkgs/servers/web-apps/discourse/plugins/discourse-github/default.nix +++ b/pkgs/servers/web-apps/discourse/plugins/discourse-github/default.nix @@ -6,8 +6,8 @@ mkDiscoursePlugin { src = fetchFromGitHub { owner = "discourse"; repo = "discourse-github"; - rev = "36cbacdd32916435391b4700c024074da3bcbe74"; - sha256 = "sha256-R4Kp7NFMIXYDcAZlOUdhNdN/mmQMgXlLFolzo2OZahw="; + rev = "739bdf9ecc0bfe5256a4814fbc758168552ae069"; + sha256 = "sha256-pD6sqvUfHUb/5J0HpgqHmYsJnrFcB1ubZR/PMU/GApU="; }; meta = with lib; { homepage = "https://github.com/discourse/discourse-github"; diff --git a/pkgs/servers/web-apps/discourse/plugins/discourse-github/gemset.nix b/pkgs/servers/web-apps/discourse/plugins/discourse-github/gemset.nix index 7bab2858b652..ab21dcdc72fb 100644 --- a/pkgs/servers/web-apps/discourse/plugins/discourse-github/gemset.nix +++ b/pkgs/servers/web-apps/discourse/plugins/discourse-github/gemset.nix @@ -16,10 +16,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "00palwawk897p5gypw5wjrh93d4p0xz2yl9w93yicb4kq7amh8d4"; + sha256 = "037w5kg3y9jrwgg7izfn1pmzngy0hdhcr7slmxwqa3mdb4rx9r9q"; type = "gem"; }; - version = "1.10.0"; + version = "1.10.1"; }; faraday-em_http = { groups = ["default"]; @@ -67,10 +67,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "03qfi9020ynf7hkdiaq01sd2mllvw7fg4qiin3pk028b4wv23j3j"; + sha256 = "09871c4hd7s5ws1wl4gs7js1k2wlby6v947m2bbzg43pnld044lh"; type = "gem"; }; - version = "1.0.3"; + version = "1.0.4"; }; faraday-net_http = { groups = ["default"]; @@ -127,10 +127,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1zgw9zlwh2a6i1yvhhc4a84ry1hv824d6g2iw2chs3k5aylpmpfj"; + sha256 = "1n0kvnrcrjn31jb97kcx3wj1f5kkjza7yygfq8rxzf3i57g7jaa6"; type = "gem"; }; - version = "2.1.1"; + version = "2.2.3"; }; octokit = { dependencies = ["faraday" "sawyer"]; diff --git a/pkgs/servers/web-apps/discourse/plugins/discourse-math/default.nix b/pkgs/servers/web-apps/discourse/plugins/discourse-math/default.nix index d65087cca737..b18bf07789b0 100644 --- a/pkgs/servers/web-apps/discourse/plugins/discourse-math/default.nix +++ b/pkgs/servers/web-apps/discourse/plugins/discourse-math/default.nix @@ -5,8 +5,8 @@ mkDiscoursePlugin { src = fetchFromGitHub { owner = "discourse"; repo = "discourse-math"; - rev = "b875a21b4d5225b61cb525531d30eaf852db6237"; - sha256 = "sha256-UKba9ZaVjIxOqUYdl00Z2sLt3Y+exBX7MJax8EzXB1Q="; + rev = "bcaccbd845825e99c39060e3898e8d5ea1bba927"; + sha256 = "sha256-c/4oVDBhDiPrLSooU9TgDQJSij8i+QYCoNqDCicXPJk="; }; meta = with lib; { homepage = "https://github.com/discourse/discourse-math"; diff --git a/pkgs/servers/web-apps/discourse/plugins/discourse-migratepassword/Gemfile b/pkgs/servers/web-apps/discourse/plugins/discourse-migratepassword/Gemfile index 0fcdf01d56f9..a00258a7e5af 100644 --- a/pkgs/servers/web-apps/discourse/plugins/discourse-migratepassword/Gemfile +++ b/pkgs/servers/web-apps/discourse/plugins/discourse-migratepassword/Gemfile @@ -2,5 +2,9 @@ source "https://rubygems.org" +# gem "rails" gem 'bcrypt', '3.1.3' gem 'unix-crypt', '1.3.0' +gem 'ffi', '1.15.5', require: false +gem 'ffi-compiler', '1.0.1', require: false +gem 'argon2', '2.1.1' diff --git a/pkgs/servers/web-apps/discourse/plugins/discourse-migratepassword/Gemfile.lock b/pkgs/servers/web-apps/discourse/plugins/discourse-migratepassword/Gemfile.lock index 2c9fb9049304..255d3f2d2401 100644 --- a/pkgs/servers/web-apps/discourse/plugins/discourse-migratepassword/Gemfile.lock +++ b/pkgs/servers/web-apps/discourse/plugins/discourse-migratepassword/Gemfile.lock @@ -1,15 +1,26 @@ GEM remote: https://rubygems.org/ specs: + argon2 (2.1.1) + ffi (~> 1.14) + ffi-compiler (~> 1.0) bcrypt (3.1.3) + ffi (1.15.5) + ffi-compiler (1.0.1) + ffi (>= 1.0.0) + rake + rake (13.0.6) unix-crypt (1.3.0) PLATFORMS - x86_64-linux + ruby DEPENDENCIES + argon2 (= 2.1.1) bcrypt (= 3.1.3) + ffi (= 1.15.5) + ffi-compiler (= 1.0.1) unix-crypt (= 1.3.0) BUNDLED WITH - 2.2.20 + 2.3.9 diff --git a/pkgs/servers/web-apps/discourse/plugins/discourse-migratepassword/default.nix b/pkgs/servers/web-apps/discourse/plugins/discourse-migratepassword/default.nix index 4c46dfb181e7..962c10ad7db5 100644 --- a/pkgs/servers/web-apps/discourse/plugins/discourse-migratepassword/default.nix +++ b/pkgs/servers/web-apps/discourse/plugins/discourse-migratepassword/default.nix @@ -6,8 +6,8 @@ mkDiscoursePlugin { src = fetchFromGitHub { owner = "communiteq"; repo = "discourse-migratepassword"; - rev = "91d6a008de91853becca01846aa4662bd227670e"; - sha256 = "sha256-aKj0zXyXDnG20qVdhGvn4fwXiBeHFj2pv4bTUP81MP0="; + rev = "7d33a57b4bd2a37badc64d5eca57d7ca01d62937"; + sha256 = "sha256-BDBXgsLVHYiSSjvN4Y13ffwfWk6nuVLoJE1YKgGmLTA="; }; meta = with lib; { homepage = "https://github.com/communiteq/discourse-migratepassword"; diff --git a/pkgs/servers/web-apps/discourse/plugins/discourse-migratepassword/gemset.nix b/pkgs/servers/web-apps/discourse/plugins/discourse-migratepassword/gemset.nix index 22b4053bbd4e..00877ed48199 100644 --- a/pkgs/servers/web-apps/discourse/plugins/discourse-migratepassword/gemset.nix +++ b/pkgs/servers/web-apps/discourse/plugins/discourse-migratepassword/gemset.nix @@ -1,4 +1,15 @@ { + argon2 = { + dependencies = ["ffi" "ffi-compiler"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0g4qsdq072fyrsa7r0sg456dhrb017jmzdbnnzl2c80ha40bbmhg"; + type = "gem"; + }; + version = "2.1.1"; + }; bcrypt = { groups = ["default"]; platforms = []; @@ -9,6 +20,37 @@ }; version = "3.1.3"; }; + ffi = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1862ydmclzy1a0cjbvm8dz7847d9rch495ib0zb64y84d3xd4bkg"; + type = "gem"; + }; + version = "1.15.5"; + }; + ffi-compiler = { + dependencies = ["ffi" "rake"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0c2caqm9wqnbidcb8dj4wd3s902z15qmgxplwyfyqbwa0ydki7q1"; + type = "gem"; + }; + version = "1.0.1"; + }; + rake = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "15whn7p9nrkxangbs9hh75q585yfn66lv0v2mhj6q6dl6x8bzr2w"; + type = "gem"; + }; + version = "13.0.6"; + }; unix-crypt = { groups = ["default"]; platforms = []; diff --git a/pkgs/servers/web-apps/discourse/plugins/discourse-openid-connect/default.nix b/pkgs/servers/web-apps/discourse/plugins/discourse-openid-connect/default.nix index e3c52319d279..e4624104179b 100644 --- a/pkgs/servers/web-apps/discourse/plugins/discourse-openid-connect/default.nix +++ b/pkgs/servers/web-apps/discourse/plugins/discourse-openid-connect/default.nix @@ -6,8 +6,8 @@ mkDiscoursePlugin { src = fetchFromGitHub { owner = "discourse"; repo = "discourse-openid-connect"; - rev = "e897702139b9c0dca40b9385427ba8bad0e1eae9"; - sha256 = "sha256-miosXf4to60BqGsbXYEL37G38uVHrz2/2Pizn0Rlp2o="; + rev = "6534ceb4529f86499b4a77300c851a7f69f016e0"; + sha256 = "sha256-25vVNH9HRddDTiwqPtFo2JdE1Fo3hNMjXn5GMWA1jzs="; }; meta = with lib; { homepage = "https://github.com/discourse/discourse-openid-connect"; diff --git a/pkgs/servers/web-apps/discourse/plugins/discourse-prometheus/default.nix b/pkgs/servers/web-apps/discourse/plugins/discourse-prometheus/default.nix index e5d7259099ad..07c942303e7f 100644 --- a/pkgs/servers/web-apps/discourse/plugins/discourse-prometheus/default.nix +++ b/pkgs/servers/web-apps/discourse/plugins/discourse-prometheus/default.nix @@ -6,8 +6,8 @@ src = fetchFromGitHub { owner = "discourse"; repo = "discourse-prometheus"; - rev = "43536e4a4977718972a673dc2475ae07df9a0a45"; - sha256 = "sha256-7sQldPLY7YW/sr4WBHWxJVvhvRK0LwO3+52HAIJFvY4="; + rev = "e8caf83e0bcbb55effb86e99324aa15259f608cc"; + sha256 = "sha256-X3VU4TUth/6j/x9hVpw2GLRZHDCnDfxLbveZUQrFfVU="; }; patches = [ diff --git a/pkgs/servers/web-apps/discourse/plugins/discourse-saved-searches/default.nix b/pkgs/servers/web-apps/discourse/plugins/discourse-saved-searches/default.nix index 682032bb9d0f..ad9c2f91c837 100644 --- a/pkgs/servers/web-apps/discourse/plugins/discourse-saved-searches/default.nix +++ b/pkgs/servers/web-apps/discourse/plugins/discourse-saved-searches/default.nix @@ -5,8 +5,8 @@ mkDiscoursePlugin { src = fetchFromGitHub { owner = "discourse"; repo = "discourse-saved-searches"; - rev = "f008809ee3bf3a8a5c11daff0807d59ab4336a0c"; - sha256 = "sha256-/OyFL/9fLdVpsFQIlnjQ6ser6hdEs4X434nAaqKCTUE="; + rev = "836981c3d5c51353165a2dad05de5054fe7a1b77"; + sha256 = "sha256-UisVi+JKZovge0SFFlgxX4WXLOtWKX/RDMVR7Vrc8so="; }; meta = with lib; { homepage = "https://github.com/discourse/discourse-saved-searches"; diff --git a/pkgs/servers/web-apps/discourse/plugins/discourse-solved/default.nix b/pkgs/servers/web-apps/discourse/plugins/discourse-solved/default.nix index ebec54bc6e5d..5eaf0e18a6a6 100644 --- a/pkgs/servers/web-apps/discourse/plugins/discourse-solved/default.nix +++ b/pkgs/servers/web-apps/discourse/plugins/discourse-solved/default.nix @@ -5,8 +5,8 @@ mkDiscoursePlugin { src = fetchFromGitHub { owner = "discourse"; repo = "discourse-solved"; - rev = "17ba805a06ddfc27c6435eb20c0f8466f1708be8"; - sha256 = "sha256-G48c1khRVnCPXA8ujpDmEzL10uLC9e2sYVLVEXWIk0s="; + rev = "e6cce5486df906ede74aa1b17ab308a145a99b88"; + sha256 = "sha256-hgoCPMlE5qJbdftwOW/zRcp8C7S0h/W2XrfFjLrNpgw="; }; meta = with lib; { homepage = "https://github.com/discourse/discourse-solved"; diff --git a/pkgs/servers/web-apps/discourse/plugins/discourse-spoiler-alert/default.nix b/pkgs/servers/web-apps/discourse/plugins/discourse-spoiler-alert/default.nix index b4f7e000fd64..6b0a203c232f 100644 --- a/pkgs/servers/web-apps/discourse/plugins/discourse-spoiler-alert/default.nix +++ b/pkgs/servers/web-apps/discourse/plugins/discourse-spoiler-alert/default.nix @@ -5,8 +5,8 @@ mkDiscoursePlugin { src = fetchFromGitHub { owner = "discourse"; repo = "discourse-spoiler-alert"; - rev = "4a07519cf9d7ac713f5e21ba770adb127524a22d"; - sha256 = "sha256-pMTXdjqI4GrLNfZMbyPdeW+Jwieh6I4O/pT2Yyf4ltA="; + rev = "a1e4d543e1bafeb11cbb9d09a887ce210b7eecb8"; + sha256 = "sha256-lZUT+ix1mLomeIdYIOz1vgY6sLVSPOhM85/FkXZFfWc="; }; meta = with lib; { homepage = "https://github.com/discourse/discourse-spoiler-alert"; diff --git a/pkgs/servers/web-apps/discourse/plugins/discourse-voting/default.nix b/pkgs/servers/web-apps/discourse/plugins/discourse-voting/default.nix index 4d0f71fdd7f6..ea5c172e6141 100644 --- a/pkgs/servers/web-apps/discourse/plugins/discourse-voting/default.nix +++ b/pkgs/servers/web-apps/discourse/plugins/discourse-voting/default.nix @@ -5,8 +5,8 @@ mkDiscoursePlugin { src = fetchFromGitHub { owner = "discourse"; repo = "discourse-voting"; - rev = "1da667721269ca01ef53c35ec0470486b490e72c"; - sha256 = "sha256-VCMv6YWHY24v9KyO4q0YSSYK+mszOVqP46slOh8okvY="; + rev = "b6118e9e50a2bec6bbb995db235657c7097bfaa9"; + sha256 = "sha256-dXJS5ZcyBstE8mSTukUDg0H1ytEJs679wvVuojoUPY4="; }; meta = with lib; { homepage = "https://github.com/discourse/discourse-voting"; diff --git a/pkgs/servers/web-apps/discourse/plugins/discourse-yearly-review/default.nix b/pkgs/servers/web-apps/discourse/plugins/discourse-yearly-review/default.nix index e38aa7f83571..bd4dbc6bd137 100644 --- a/pkgs/servers/web-apps/discourse/plugins/discourse-yearly-review/default.nix +++ b/pkgs/servers/web-apps/discourse/plugins/discourse-yearly-review/default.nix @@ -5,8 +5,8 @@ mkDiscoursePlugin { src = fetchFromGitHub { owner = "discourse"; repo = "discourse-yearly-review"; - rev = "ef4855f6afa16ef86013bba7da8e50a63e11b493"; - sha256 = "sha256-IVKGysAKr+lKV1CO1JJIMLtzcvpK8joWjx8Bfy+dx8Y="; + rev = "76b35ac9b20725250140602e5d12a82b31383d35"; + sha256 = "sha256-RtmnRXh8AbKSe+kuBcORv5FcKYez7WU2owcW16LFCns="; }; meta = with lib; { homepage = "https://github.com/discourse/discourse-yearly-review"; From 839d828b9c367e384c41077d4c76494515c156aa Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Fri, 12 Aug 2022 15:51:22 +0000 Subject: [PATCH 029/164] treewide: firmware: stdenv -> stdenvNoCC None of these packages use a compiler, except for alsa-firmware, which has the appropriate compiler in depsBuildBuild already. Tested by building a NixOS system with hardware.enableAllFirmware = true. --- pkgs/data/misc/wireless-regdb/default.nix | 4 ++-- .../linux/alsa-project/alsa-firmware/default.nix | 4 ++-- pkgs/os-specific/linux/firmware/b43-firmware/5.1.138.nix | 5 ++--- .../linux/firmware/b43-firmware/6.30.163.46.nix | 4 ++-- .../linux/firmware/broadcom-bt-firmware/default.nix | 7 ++----- .../linux/firmware/facetimehd-calibration/default.nix | 4 ++-- .../linux/firmware/facetimehd-firmware/default.nix | 4 ++-- .../linux/firmware/intel2200BGFirmware/default.nix | 4 ++-- .../linux/firmware/libreelec-dvb-firmware/default.nix | 4 ++-- .../linux/firmware/raspberrypi-wireless/default.nix | 4 ++-- pkgs/os-specific/linux/firmware/rt5677/default.nix | 4 ++-- .../linux/firmware/rtl8192su-firmware/default.nix | 4 ++-- .../linux/firmware/rtl8723bs-firmware/default.nix | 4 ++-- .../linux/firmware/rtl8761b-firmware/default.nix | 4 ++-- .../linux/firmware/xow_dongle-firmware/default.nix | 6 ++---- pkgs/os-specific/linux/firmware/zd1211/default.nix | 4 ++-- 16 files changed, 32 insertions(+), 38 deletions(-) diff --git a/pkgs/data/misc/wireless-regdb/default.nix b/pkgs/data/misc/wireless-regdb/default.nix index 2c92896b5a1c..cef187bf2578 100644 --- a/pkgs/data/misc/wireless-regdb/default.nix +++ b/pkgs/data/misc/wireless-regdb/default.nix @@ -1,6 +1,6 @@ -{ lib, stdenv, fetchurl }: +{ lib, stdenvNoCC, fetchurl }: -stdenv.mkDerivation rec { +stdenvNoCC.mkDerivation rec { pname = "wireless-regdb"; version = "2022.06.06"; diff --git a/pkgs/os-specific/linux/alsa-project/alsa-firmware/default.nix b/pkgs/os-specific/linux/alsa-project/alsa-firmware/default.nix index 2ef971a8cf7f..8ddc97890e92 100644 --- a/pkgs/os-specific/linux/alsa-project/alsa-firmware/default.nix +++ b/pkgs/os-specific/linux/alsa-project/alsa-firmware/default.nix @@ -1,6 +1,6 @@ -{ lib, buildPackages, stdenv, autoreconfHook, fetchurl }: +{ lib, buildPackages, stdenvNoCC, autoreconfHook, fetchurl }: -stdenv.mkDerivation rec { +stdenvNoCC.mkDerivation rec { pname = "alsa-firmware"; version = "1.2.4"; diff --git a/pkgs/os-specific/linux/firmware/b43-firmware/5.1.138.nix b/pkgs/os-specific/linux/firmware/b43-firmware/5.1.138.nix index 98d793c5d998..a5683a1ce535 100644 --- a/pkgs/os-specific/linux/firmware/b43-firmware/5.1.138.nix +++ b/pkgs/os-specific/linux/firmware/b43-firmware/5.1.138.nix @@ -1,8 +1,8 @@ -{ lib, stdenv, fetchurl, b43FirmwareCutter }: +{ lib, stdenvNoCC, fetchurl, b43FirmwareCutter }: let version = "5.100.138"; in -stdenv.mkDerivation { +stdenvNoCC.mkDerivation { pname = "b43-firmware"; inherit version; @@ -24,4 +24,3 @@ stdenv.mkDerivation { license = lib.licenses.unfree; }; } - diff --git a/pkgs/os-specific/linux/firmware/b43-firmware/6.30.163.46.nix b/pkgs/os-specific/linux/firmware/b43-firmware/6.30.163.46.nix index 92c179726d25..e117db45b182 100644 --- a/pkgs/os-specific/linux/firmware/b43-firmware/6.30.163.46.nix +++ b/pkgs/os-specific/linux/firmware/b43-firmware/6.30.163.46.nix @@ -1,6 +1,6 @@ -{ lib, stdenv, fetchurl, b43FirmwareCutter }: +{ lib, stdenvNoCC, fetchurl, b43FirmwareCutter }: -stdenv.mkDerivation rec { +stdenvNoCC.mkDerivation rec { pname = "b43-firmware"; version = "6.30.163.46"; diff --git a/pkgs/os-specific/linux/firmware/broadcom-bt-firmware/default.nix b/pkgs/os-specific/linux/firmware/broadcom-bt-firmware/default.nix index a0985cad0dbe..073d443bee41 100644 --- a/pkgs/os-specific/linux/firmware/broadcom-bt-firmware/default.nix +++ b/pkgs/os-specific/linux/firmware/broadcom-bt-firmware/default.nix @@ -1,9 +1,6 @@ -{ lib, stdenv, fetchurl, cabextract, bt-fw-converter }: +{ lib, stdenvNoCC, fetchurl, cabextract, bt-fw-converter }: -# Kernels between 4.2 and 4.7 will not work with -# this packages as they expect the firmware to be named "BCM.hcd" -# see: https://github.com/NixOS/nixpkgs/pull/25478#issuecomment-299034865 -stdenv.mkDerivation rec { +stdenvNoCC.mkDerivation rec { pname = "broadcom-bt-firmware"; version = "12.0.1.1012"; diff --git a/pkgs/os-specific/linux/firmware/facetimehd-calibration/default.nix b/pkgs/os-specific/linux/firmware/facetimehd-calibration/default.nix index 86a3924c0e28..ca6782688728 100644 --- a/pkgs/os-specific/linux/firmware/facetimehd-calibration/default.nix +++ b/pkgs/os-specific/linux/firmware/facetimehd-calibration/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, unrar-wrapper, pkgs }: +{ lib, stdenvNoCC, fetchurl, unrar-wrapper, pkgs }: let @@ -24,7 +24,7 @@ let in -stdenv.mkDerivation { +stdenvNoCC.mkDerivation { pname = "facetimehd-calibration"; inherit version; diff --git a/pkgs/os-specific/linux/firmware/facetimehd-firmware/default.nix b/pkgs/os-specific/linux/firmware/facetimehd-firmware/default.nix index 1c3d8fbbaf7d..6679f1f19e75 100644 --- a/pkgs/os-specific/linux/firmware/facetimehd-firmware/default.nix +++ b/pkgs/os-specific/linux/firmware/facetimehd-firmware/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, cpio, xz, pkgs }: +{ lib, stdenvNoCC, fetchurl, cpio, xz, pkgs }: let @@ -33,7 +33,7 @@ let in -stdenv.mkDerivation { +stdenvNoCC.mkDerivation { pname = "facetimehd-firmware"; inherit version; diff --git a/pkgs/os-specific/linux/firmware/intel2200BGFirmware/default.nix b/pkgs/os-specific/linux/firmware/intel2200BGFirmware/default.nix index 7c195cd2d7ca..716c5e4d8288 100644 --- a/pkgs/os-specific/linux/firmware/intel2200BGFirmware/default.nix +++ b/pkgs/os-specific/linux/firmware/intel2200BGFirmware/default.nix @@ -1,8 +1,8 @@ -{ stdenv +{ stdenvNoCC , lib , fetchurl }: -stdenv.mkDerivation rec { +stdenvNoCC.mkDerivation rec { pname = "intel2200BGFirmware"; version = "3.1"; diff --git a/pkgs/os-specific/linux/firmware/libreelec-dvb-firmware/default.nix b/pkgs/os-specific/linux/firmware/libreelec-dvb-firmware/default.nix index 2103012d3ed9..9579ff11c739 100644 --- a/pkgs/os-specific/linux/firmware/libreelec-dvb-firmware/default.nix +++ b/pkgs/os-specific/linux/firmware/libreelec-dvb-firmware/default.nix @@ -1,6 +1,6 @@ -{ stdenv, fetchFromGitHub, lib}: +{ stdenvNoCC, fetchFromGitHub, lib}: -stdenv.mkDerivation rec { +stdenvNoCC.mkDerivation rec { pname = "libreelec-dvb-firmware"; version = "1.4.2"; diff --git a/pkgs/os-specific/linux/firmware/raspberrypi-wireless/default.nix b/pkgs/os-specific/linux/firmware/raspberrypi-wireless/default.nix index c9192744a46a..730e839bd457 100644 --- a/pkgs/os-specific/linux/firmware/raspberrypi-wireless/default.nix +++ b/pkgs/os-specific/linux/firmware/raspberrypi-wireless/default.nix @@ -1,6 +1,6 @@ -{ lib, stdenv, fetchFromGitHub }: +{ lib, stdenvNoCC, fetchFromGitHub }: -stdenv.mkDerivation { +stdenvNoCC.mkDerivation { pname = "raspberrypi-wireless-firmware"; version = "2021-12-06"; diff --git a/pkgs/os-specific/linux/firmware/rt5677/default.nix b/pkgs/os-specific/linux/firmware/rt5677/default.nix index f21d34bbe533..47e0068cc348 100644 --- a/pkgs/os-specific/linux/firmware/rt5677/default.nix +++ b/pkgs/os-specific/linux/firmware/rt5677/default.nix @@ -1,6 +1,6 @@ -{ lib, stdenv, fetchFromGitHub }: +{ lib, stdenvNoCC, fetchFromGitHub }: -stdenv.mkDerivation { +stdenvNoCC.mkDerivation { name = "rt5677-firmware"; src = fetchFromGitHub { diff --git a/pkgs/os-specific/linux/firmware/rtl8192su-firmware/default.nix b/pkgs/os-specific/linux/firmware/rtl8192su-firmware/default.nix index 3363140ad569..53f32ac31f9d 100644 --- a/pkgs/os-specific/linux/firmware/rtl8192su-firmware/default.nix +++ b/pkgs/os-specific/linux/firmware/rtl8192su-firmware/default.nix @@ -1,6 +1,6 @@ -{ lib, stdenv, fetchFromGitHub }: +{ lib, stdenvNoCC, fetchFromGitHub }: with lib; -stdenv.mkDerivation { +stdenvNoCC.mkDerivation { pname = "rtl8192su"; version = "unstable-2016-10-05"; diff --git a/pkgs/os-specific/linux/firmware/rtl8723bs-firmware/default.nix b/pkgs/os-specific/linux/firmware/rtl8723bs-firmware/default.nix index f3ea80348b3b..8e486e1c4b2c 100644 --- a/pkgs/os-specific/linux/firmware/rtl8723bs-firmware/default.nix +++ b/pkgs/os-specific/linux/firmware/rtl8723bs-firmware/default.nix @@ -1,6 +1,6 @@ -{ lib, stdenv, linuxPackages }: +{ lib, stdenvNoCC, linuxPackages }: with lib; -stdenv.mkDerivation { +stdenvNoCC.mkDerivation { pname = "rtl8723bs-firmware"; version = linuxPackages.rtl8723bs.version; inherit (linuxPackages.rtl8723bs) src; diff --git a/pkgs/os-specific/linux/firmware/rtl8761b-firmware/default.nix b/pkgs/os-specific/linux/firmware/rtl8761b-firmware/default.nix index 925521696da9..c3fbe79537c4 100644 --- a/pkgs/os-specific/linux/firmware/rtl8761b-firmware/default.nix +++ b/pkgs/os-specific/linux/firmware/rtl8761b-firmware/default.nix @@ -1,6 +1,6 @@ -{ lib, stdenv, fetchFromGitHub }: +{ lib, stdenvNoCC, fetchFromGitHub }: -stdenv.mkDerivation { +stdenvNoCC.mkDerivation { name = "rtl8761b-firmware"; src = fetchFromGitHub { diff --git a/pkgs/os-specific/linux/firmware/xow_dongle-firmware/default.nix b/pkgs/os-specific/linux/firmware/xow_dongle-firmware/default.nix index 72e3817f2aa2..824615a4baf2 100644 --- a/pkgs/os-specific/linux/firmware/xow_dongle-firmware/default.nix +++ b/pkgs/os-specific/linux/firmware/xow_dongle-firmware/default.nix @@ -1,6 +1,6 @@ -{ stdenv, lib, fetchurl, cabextract }: +{ stdenvNoCC, lib, fetchurl, cabextract }: -stdenv.mkDerivation rec { +stdenvNoCC.mkDerivation rec { pname = "xow_dongle-firmware"; version = "2017-07"; @@ -32,5 +32,3 @@ stdenv.mkDerivation rec { platforms = platforms.linux; }; } - - diff --git a/pkgs/os-specific/linux/firmware/zd1211/default.nix b/pkgs/os-specific/linux/firmware/zd1211/default.nix index 075e46a5de55..6b86277ebc6e 100644 --- a/pkgs/os-specific/linux/firmware/zd1211/default.nix +++ b/pkgs/os-specific/linux/firmware/zd1211/default.nix @@ -1,9 +1,9 @@ -{ stdenv +{ stdenvNoCC , lib , fetchurl }: -stdenv.mkDerivation rec { +stdenvNoCC.mkDerivation rec { pname = "zd1211-firmware"; version = "1.5"; From 71eb3c8e8e72c6591afbeb86f20062eafd8389b0 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 13 Aug 2022 19:46:49 +0000 Subject: [PATCH 030/164] phrase-cli: 2.4.12 -> 2.5.1 --- pkgs/tools/misc/phrase-cli/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/misc/phrase-cli/default.nix b/pkgs/tools/misc/phrase-cli/default.nix index 36749fcedfac..232d1b368e1f 100644 --- a/pkgs/tools/misc/phrase-cli/default.nix +++ b/pkgs/tools/misc/phrase-cli/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "phrase-cli"; - version = "2.4.12"; + version = "2.5.1"; src = fetchFromGitHub { owner = "phrase"; repo = "phrase-cli"; rev = version; - sha256 = "sha256-+/hs6v3ereja2NtGApVBA3rTib5gAiGndbDg+FybWco="; + sha256 = "sha256-nDeX8h2rGKIuN2h29Fmr5V7THVXnw23lyn/FKUQ3veM="; }; - vendorSha256 = "sha256-Pt+F2ICuOQZBjMccK1qq/ueGOvnjDmAM5YLRINk2u/g="; + vendorSha256 = "sha256-Y/COa58r/1wN+bkUolXov+LOy0nyXgbUYbkmRWXxl0E="; ldflags = [ "-X=github.com/phrase/phrase-cli/cmd.PHRASE_CLIENT_VERSION=${version}" ]; From f6e0ba1bafc3f3263787f6b46c754b7a63bd6b45 Mon Sep 17 00:00:00 2001 From: Thomas Watson Date: Sat, 13 Aug 2022 17:40:36 -0500 Subject: [PATCH 031/164] phodav: expose udev rules --- pkgs/tools/networking/phodav/default.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/tools/networking/phodav/default.nix b/pkgs/tools/networking/phodav/default.nix index 284159dfc9ab..fb2fce8bdeb1 100644 --- a/pkgs/tools/networking/phodav/default.nix +++ b/pkgs/tools/networking/phodav/default.nix @@ -44,6 +44,11 @@ stdenv.mkDerivation rec { outputs = [ "out" "dev" "lib" ]; + # We need to do this in pre-configure before the data/ folder disappears. + preConfigure = '' + install -vDt $out/lib/udev/rules.d/ data/*-spice-webdavd.rules + ''; + meta = with lib; { description = "WebDav server implementation and library using libsoup"; homepage = "https://wiki.gnome.org/phodav"; From db1c79d7673f2f15a9fe86e2b600348202d98b9e Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 14 Aug 2022 04:02:56 +0000 Subject: [PATCH 032/164] vendir: 0.26.0 -> 0.30.0 --- pkgs/development/tools/vendir/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/vendir/default.nix b/pkgs/development/tools/vendir/default.nix index d6ff0825737a..b20db017ce3c 100644 --- a/pkgs/development/tools/vendir/default.nix +++ b/pkgs/development/tools/vendir/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "vendir"; - version = "0.26.0"; + version = "0.30.0"; src = fetchFromGitHub { owner = "vmware-tanzu"; repo = "carvel-vendir"; rev = "v${version}"; - sha256 = "sha256-a/fftMJuN6YnjPP0Gk6bMckoCouwgtxhf23OuyLR5Tk="; + sha256 = "sha256-iIqfm07qO5qf7mYHdBJVRiokRLHdE7qS2mjaeU9G3U4="; }; vendorSha256 = null; From 72540a2a804f521ce039dc3abd975e81855da2c5 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 14 Aug 2022 11:05:40 +0000 Subject: [PATCH 033/164] hpx: 1.7.1 -> 1.8.1 --- pkgs/development/libraries/hpx/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/hpx/default.nix b/pkgs/development/libraries/hpx/default.nix index 0474fd3bc487..2464e95c6b6d 100644 --- a/pkgs/development/libraries/hpx/default.nix +++ b/pkgs/development/libraries/hpx/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { pname = "hpx"; - version = "1.7.1"; + version = "1.8.1"; src = fetchFromGitHub { owner = "STEllAR-GROUP"; repo = "hpx"; rev = version; - sha256 = "1knx7kr8iw4b7nh116ygd00y68y84jjb4fj58jkay7n5qlrxh604"; + sha256 = "sha256-YJ4wHaPE5E6ngUAYrQB1SkW4IoHW71tUDKKNANVA9Xw="; }; buildInputs = [ asio boost hwloc gperftools ]; From 0b3c6edb04bd86eeb7c68ba0873aec47e1b562e5 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 14 Aug 2022 14:14:51 +0000 Subject: [PATCH 034/164] ombi: 4.16.12 -> 4.22.5 --- pkgs/servers/ombi/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/servers/ombi/default.nix b/pkgs/servers/ombi/default.nix index a8251b1c42e1..e5531dc2665e 100644 --- a/pkgs/servers/ombi/default.nix +++ b/pkgs/servers/ombi/default.nix @@ -10,14 +10,14 @@ let "Unsupported system: ${stdenv.hostPlatform.system}"); hash = { - x64-linux_hash = "sha256-8Y6I6vitkgIV6WMXF1YXzgRfhJd/O6hcdpC9yZLpDA4="; - arm64-linux_hash = "sha256-OXbJbwjNDd3GNL4bvuZLwNOjfAp8YBnJiylid0w8kLI="; - x64-osx_hash = "sha256-BoYqplC8ahMhpgntZVozyPCp08YqmiZ3ED7TgKlXPXc="; + x64-linux_hash = "sha256-7l9NT0brk6c7H3oqe9IjTY+5Ji2c5a4vB4vomqmv7x8="; + arm64-linux_hash = "sha256-UKVCpFS4m2DMkgG62V7uSQyLG/Zt6z3GSogd30A/4nY="; + x64-osx_hash = "sha256-xUu4nsAzBDCKUJWmim3UXVgFzwa6fg9mj/eD3OW1ILY="; }."${arch}-${os}_hash"; in stdenv.mkDerivation rec { pname = "ombi"; - version = "4.16.12"; + version = "4.22.5"; sourceRoot = "."; From 3d058aeef7cb6c9d67fca760f885eb422722235c Mon Sep 17 00:00:00 2001 From: Stig Palmquist Date: Sun, 14 Aug 2022 16:17:58 +0200 Subject: [PATCH 035/164] perlPackages.TestMockHTTPTiny: init at 0.002 --- pkgs/top-level/perl-packages.nix | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 272cbeb38e66..6883f6b880bc 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -22605,6 +22605,21 @@ let }; }; + TestMockHTTPTiny = buildPerlPackage { + pname = "Test-Mock-HTTP-Tiny"; + version = "0.002"; + src = fetchurl { + url = "mirror://cpan/authors/id/O/OD/ODYNIEC/Test-Mock-HTTP-Tiny-0.002.tar.gz"; + sha256 = "sha256-+c+tfYUEZQvtNJO8bSyoLXuRvDcTyGxDXnXriKxb5eY="; + }; + propagatedBuildInputs = [ TestDeep URI ]; + meta = { + homepage = "https://github.com/odyniec/p5-Test-Mock-HTTP-Tiny.git"; + description = "Record and replay HTTP requests/responses with HTTP::Tiny"; + license = with lib.licenses; [ artistic1 gpl1Plus ]; + }; + }; + TestMockModule = buildPerlModule { pname = "Test-MockModule"; version = "0.175.0"; From b0de4903142e92c9c5d50fcc0d89320ed4663959 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 14 Aug 2022 17:00:06 +0000 Subject: [PATCH 036/164] prometheus-openldap-exporter: 2.2.1 -> 2.2.2 --- pkgs/servers/monitoring/prometheus/openldap-exporter.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/monitoring/prometheus/openldap-exporter.nix b/pkgs/servers/monitoring/prometheus/openldap-exporter.nix index 20447d1c315f..5f5bd6503e01 100644 --- a/pkgs/servers/monitoring/prometheus/openldap-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/openldap-exporter.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "openldap_exporter"; - version = "2.2.1"; + version = "2.2.2"; src = fetchFromGitHub { owner = "tomcz"; repo = pname; rev = "v${version}"; - sha256 = "sha256-ok2fTYz1oQiNdTPsssPb/VuFqny1i8nKTngSpKgCpC4="; + sha256 = "sha256-1u+89odwV/lz34wtrK91lET2bOqkH6kRA7JCjzsmiEg="; }; vendorSha256 = null; From 9c52987b51dc3af5dade4dcaa04a3b0ff0bd1d0a Mon Sep 17 00:00:00 2001 From: Thomas Watson Date: Sat, 13 Aug 2022 17:41:12 -0500 Subject: [PATCH 037/164] nixos/spice-webdavd: init --- nixos/modules/module-list.nix | 1 + nixos/modules/services/misc/spice-webdavd.nix | 38 +++++++++++++++++++ 2 files changed, 39 insertions(+) create mode 100644 nixos/modules/services/misc/spice-webdavd.nix diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index 837bc7635a06..f9ee74d2cedb 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -637,6 +637,7 @@ ./services/misc/sonarr.nix ./services/misc/sourcehut ./services/misc/spice-vdagentd.nix + ./services/misc/spice-webdavd.nix ./services/misc/ssm-agent.nix ./services/misc/sssd.nix ./services/misc/subsonic.nix diff --git a/nixos/modules/services/misc/spice-webdavd.nix b/nixos/modules/services/misc/spice-webdavd.nix new file mode 100644 index 000000000000..bfb5b262ee1a --- /dev/null +++ b/nixos/modules/services/misc/spice-webdavd.nix @@ -0,0 +1,38 @@ +{ config, pkgs, lib, ... }: + +with lib; +let + cfg = config.services.spice-webdavd; +in +{ + options = { + services.spice-webdavd = { + enable = mkEnableOption "the spice guest webdav proxy daemon"; + + package = mkOption { + default = pkgs.phodav; + defaultText = literalExpression "pkgs.phodav"; + type = types.package; + description = "spice-webdavd provider package to use."; + }; + }; + }; + + config = mkIf cfg.enable { + # ensure the webdav fs this exposes can actually be mounted + services.davfs2.enable = true; + + # add the udev rule which starts the proxy when the spice socket is present + services.udev.packages = [ cfg.package ]; + + systemd.services.spice-webdavd = { + description = "spice-webdav proxy daemon"; + + serviceConfig = { + Type = "simple"; + ExecStart = "${cfg.package}/bin/spice-webdavd -p 9843"; + Restart = "on-success"; + }; + }; + }; +} From bec3c1757918f88d4e8ac149fbfda4fc0b2998cc Mon Sep 17 00:00:00 2001 From: Someone Serge Date: Thu, 19 Aug 2021 23:02:22 +0300 Subject: [PATCH 038/164] python3Packages.jupyter: fix missing logos augment the relative python.sitePackages="lib/site-packagesXX" to a full /nix/store/... path --- pkgs/applications/editors/jupyter/kernel.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/editors/jupyter/kernel.nix b/pkgs/applications/editors/jupyter/kernel.nix index 0fd59ca391e9..3640de28e8ac 100644 --- a/pkgs/applications/editors/jupyter/kernel.nix +++ b/pkgs/applications/editors/jupyter/kernel.nix @@ -15,8 +15,8 @@ let "{connection_file}" ]; language = "python"; - logo32 = "${env.sitePackages}/ipykernel/resources/logo-32x32.png"; - logo64 = "${env.sitePackages}/ipykernel/resources/logo-64x64.png"; + logo32 = "${env}/${env.sitePackages}/ipykernel/resources/logo-32x32.png"; + logo64 = "${env}/${env.sitePackages}/ipykernel/resources/logo-64x64.png"; }; }; From 2f2e89365ee6d8673cd781487da33ca8d18cd541 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 15 Aug 2022 19:31:31 +0200 Subject: [PATCH 039/164] python310Packages.debuglater: 1.4.1 -> 1.4.2 --- pkgs/development/python-modules/debuglater/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/debuglater/default.nix b/pkgs/development/python-modules/debuglater/default.nix index 6adbde7f5134..6d48c4bc5a70 100644 --- a/pkgs/development/python-modules/debuglater/default.nix +++ b/pkgs/development/python-modules/debuglater/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "debuglater"; - version = "1.4.1"; + version = "1.4.2"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "ploomber"; repo = pname; rev = version; - hash = "sha256-n/Q6yt3q/+6QCGWNmaFrUK/phba6IVu42DMcvVj4vb0="; + hash = "sha256-6XIBPnH2LWc3GpSS8Eh2VG21v8+Em7cmvmQIJKzFi6M="; }; propagatedBuildInputs = [ From cbf423d754116227bf1e1eb3bef47728ac0c5272 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 15 Aug 2022 20:05:11 +0200 Subject: [PATCH 040/164] python310Packages.netmiko: 4.1.1 -> 4.1.2 --- pkgs/development/python-modules/netmiko/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/netmiko/default.nix b/pkgs/development/python-modules/netmiko/default.nix index 9686ae0f0881..97a6b7fac0d7 100644 --- a/pkgs/development/python-modules/netmiko/default.nix +++ b/pkgs/development/python-modules/netmiko/default.nix @@ -3,11 +3,11 @@ buildPythonPackage rec { pname = "netmiko"; - version = "4.1.1"; + version = "4.1.2"; src = fetchPypi { inherit pname version; - sha256 = "sha256-ZSmxHaFm0wCarBEzp+7bL7r2EQxRm7tLT0j4ZdjarJo="; + sha256 = "sha256-9e3iooZw09/TRwBhRoZl+A+bSQbtIOaw+02eHJvmevw="; }; buildInputs = [ setuptools ]; From b8d78111a42a2aa194a2f1f83680b8bba5cef71d Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 15 Aug 2022 20:27:12 +0200 Subject: [PATCH 041/164] python310Packages.pyswitchbot: 0.18.7 -> 0.18.10 --- pkgs/development/python-modules/pyswitchbot/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pyswitchbot/default.nix b/pkgs/development/python-modules/pyswitchbot/default.nix index 0258e3c8b517..1f42d140d564 100644 --- a/pkgs/development/python-modules/pyswitchbot/default.nix +++ b/pkgs/development/python-modules/pyswitchbot/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "pyswitchbot"; - version = "0.18.7"; + version = "0.18.10"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "Danielhiversen"; repo = "pySwitchbot"; rev = "refs/tags/${version}"; - hash = "sha256-TAFrrCwlcbKoQk6puoSx2sk1WeucThf7614RNQ1NFbM="; + hash = "sha256-tK5U94rHPz/LHU4qAj1yv8CtMhjpAIQ1ktFooVIIqiw="; }; propagatedBuildInputs = [ From fcc47aec15d3eea8fc1fe685bb5efa1b4af37467 Mon Sep 17 00:00:00 2001 From: Nicolas Benes Date: Sun, 14 Aug 2022 10:12:20 +0200 Subject: [PATCH 042/164] collectd: unpin libsigrok The pinning of `libsigrok` was introduced in 300e49510124 for `collectd-5.5.1`. It is now at 5.12.0 and the pinning seems outdated. --- pkgs/top-level/all-packages.nix | 8 -------- 1 file changed, 8 deletions(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 9ff8d0d543c9..c4d018cdf1ae 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5004,7 +5004,6 @@ with pkgs; convertlit = callPackage ../tools/text/convertlit { }; collectd = callPackage ../tools/system/collectd { - libsigrok = libsigrok_0_3; # not compatible with >= 0.4.0 yet jdk = jdk8; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731 inherit (darwin.apple_sdk.frameworks) IOKit; }; @@ -15856,13 +15855,6 @@ with pkgs; libsigrok = callPackage ../development/tools/libsigrok { python = python3; }; - # old version: - libsigrok_0_3 = libsigrok.override { - python = python3; - version = "0.3.0"; - sha256 = "0l3h7zvn3w4c1b9dgvl3hirc4aj1csfkgbk87jkpl7bgl03nk4j3"; - doInstallCheck = false; - }; libsigrokdecode = callPackage ../development/tools/libsigrokdecode { python3 = python38; From 3e730a51e61f46d5ec55451181f8792d054efd26 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 15 Aug 2022 22:39:57 +0000 Subject: [PATCH 043/164] fioctl: 0.26 -> 0.27 --- pkgs/tools/admin/fioctl/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/admin/fioctl/default.nix b/pkgs/tools/admin/fioctl/default.nix index d2dcc1d4953d..5f64adfaff26 100644 --- a/pkgs/tools/admin/fioctl/default.nix +++ b/pkgs/tools/admin/fioctl/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "fioctl"; - version = "0.26"; + version = "0.27"; src = fetchFromGitHub { owner = "foundriesio"; repo = "fioctl"; rev = "v${version}"; - sha256 = "sha256-IrbzWQEtCEG2UUkExWgs7A81RiJLXDAOrr8q4mPwcOI="; + sha256 = "sha256-RnVwvD/Iy6UvztnQ03LFaCLWHrS6Aw5Ir4e033bBW7g="; }; - vendorSha256 = "sha256-lstUcyxDVcUtgVY5y5EGgSFZgHbchQ9izf8sCq5vTVQ="; + vendorSha256 = "sha256-ObS/100Tfq4rhOrwU+PPBzDwY3tKwH+Z0wm0bX0W8cE="; ldflags = [ "-s" "-w" From 90ba8bfb8a8cadb6736d24d18473274647d8a105 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 15 Aug 2022 22:44:49 +0000 Subject: [PATCH 044/164] findomain: 8.1.1 -> 8.2.0 --- pkgs/tools/networking/findomain/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/networking/findomain/default.nix b/pkgs/tools/networking/findomain/default.nix index a1020a319a7d..105dce78c0ac 100644 --- a/pkgs/tools/networking/findomain/default.nix +++ b/pkgs/tools/networking/findomain/default.nix @@ -10,16 +10,16 @@ rustPlatform.buildRustPackage rec { pname = "findomain"; - version = "8.1.1"; + version = "8.2.0"; src = fetchFromGitHub { owner = "Edu4rdSHL"; repo = pname; rev = version; - sha256 = "sha256-ngT9ZtPsCzcmZbwpmzbEcSUTHPezzdyAB12qrm5Z6n0="; + sha256 = "sha256-VT4iPm6CbuKw9D53eSvunRC4Yvn94D5J95JJyq1Za9M="; }; - cargoSha256 = "sha256-nHNS1Uskggm5e1paWRSiL4HHcooDbYe0toMwR05OkDQ="; + cargoSha256 = "sha256-gwBsIFhMHTISlKXCBqhzYhq0p5yX0OE0/zcU1yTOADQ="; nativeBuildInputs = [ installShellFiles perl ]; buildInputs = lib.optionals stdenv.isDarwin [ libiconv Security ]; From 9c6f7712a246d1c1aae7279de9684897dc015542 Mon Sep 17 00:00:00 2001 From: ajs124 Date: Tue, 16 Aug 2022 01:19:55 +0200 Subject: [PATCH 045/164] mariadb: sha256 -> hash --- pkgs/servers/sql/mariadb/default.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/servers/sql/mariadb/default.nix b/pkgs/servers/sql/mariadb/default.nix index 71b638b9ab8c..2e11bbbf032f 100644 --- a/pkgs/servers/sql/mariadb/default.nix +++ b/pkgs/servers/sql/mariadb/default.nix @@ -31,7 +31,7 @@ commonOptions = packageSettings: rec { # attributes common to both builds src = fetchurl { url = "https://downloads.mariadb.com/MariaDB/mariadb-${version}/source/mariadb-${version}.tar.gz"; - inherit (packageSettings) sha256; + inherit (packageSettings) hash; }; nativeBuildInputs = [ cmake pkg-config ] @@ -239,26 +239,26 @@ in { mariadb_104 = mariadbPackage { # Supported until 2024-06-18 version = "10.4.25"; - sha256 = "1y3ym8pb0pyra3dwy8sbzc4656c4y7g1savgyrsvf1mw2573r5pz"; + hash = "sha256:1y3ym8pb0pyra3dwy8sbzc4656c4y7g1savgyrsvf1mw2573r5pz"; }; mariadb_105 = mariadbPackage { # Supported until 2025-06-24 version = "10.5.16"; - sha256 = "19nj7ilk1aqs9zvvzhx4619pgfqjp7ac90ffr3fdaw4viljqfgn1"; + hash = "sha256:19nj7ilk1aqs9zvvzhx4619pgfqjp7ac90ffr3fdaw4viljqfgn1"; }; mariadb_106 = mariadbPackage { # Supported until 2026-07 version = "10.6.8"; - sha256 = "0f6lkvv0dbq64y7zpks7nvhy1n08gad0i0dp0s2zpgfcb62liaap"; + hash = "sha256:0f6lkvv0dbq64y7zpks7nvhy1n08gad0i0dp0s2zpgfcb62liaap"; }; mariadb_107 = mariadbPackage { # Supported until 2023-02 version = "10.7.4"; - sha256 = "0ws17azsw3f26pkphjkyxmmi9qbv9gwidvz0ll6g482m6afrrpbk"; + hash = "sha256:0ws17azsw3f26pkphjkyxmmi9qbv9gwidvz0ll6g482m6afrrpbk"; }; mariadb_108 = mariadbPackage { # Supported until 2023-05 version = "10.8.3"; - sha256 = "14h80lfb9b3rv3fd8nkljbqhx6dmwjnqkz6c3ynixb3na72sszl8"; + hash = "sha256:14h80lfb9b3rv3fd8nkljbqhx6dmwjnqkz6c3ynixb3na72sszl8"; }; } From 7ea9e62df1ffe2d59de1d0ea271620cd44bd641e Mon Sep 17 00:00:00 2001 From: ajs124 Date: Tue, 16 Aug 2022 01:20:37 +0200 Subject: [PATCH 046/164] mariadb_104: 10.4.25 -> 10.4.26 https://mariadb.com/kb/en/mariadb-10426-release-notes/ Fixes: - CVE-2022-32089 - CVE-2022-32081 - CVE-2018-25032 - CVE-2022-32091 - CVE-2022-32084 --- pkgs/servers/sql/mariadb/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/sql/mariadb/default.nix b/pkgs/servers/sql/mariadb/default.nix index 2e11bbbf032f..63522457761a 100644 --- a/pkgs/servers/sql/mariadb/default.nix +++ b/pkgs/servers/sql/mariadb/default.nix @@ -238,8 +238,8 @@ in stdenv.mkDerivation (common // { in { mariadb_104 = mariadbPackage { # Supported until 2024-06-18 - version = "10.4.25"; - hash = "sha256:1y3ym8pb0pyra3dwy8sbzc4656c4y7g1savgyrsvf1mw2573r5pz"; + version = "10.4.26"; + hash = "sha256-cVrH4jr8O4pVnGzJmM2xlz2Q9iGyvddgPixuU4YLLd8="; }; mariadb_105 = mariadbPackage { # Supported until 2025-06-24 From aeb72f7668c480ff4d90f7119d6343011c8d5b2e Mon Sep 17 00:00:00 2001 From: ajs124 Date: Tue, 16 Aug 2022 01:22:59 +0200 Subject: [PATCH 047/164] mariadb_105: 10.5.16 -> 10.5.17 https://mariadb.com/kb/en/mariadb-10517-release-notes/ Fixes: - CVE-2022-32082 - CVE-2022-32089 - CVE-2022-32081 - CVE-2018-25032 - CVE-2022-32091 - CVE-2022-32084 --- pkgs/servers/sql/mariadb/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/sql/mariadb/default.nix b/pkgs/servers/sql/mariadb/default.nix index 63522457761a..c0036f9d7759 100644 --- a/pkgs/servers/sql/mariadb/default.nix +++ b/pkgs/servers/sql/mariadb/default.nix @@ -243,8 +243,8 @@ in { }; mariadb_105 = mariadbPackage { # Supported until 2025-06-24 - version = "10.5.16"; - hash = "sha256:19nj7ilk1aqs9zvvzhx4619pgfqjp7ac90ffr3fdaw4viljqfgn1"; + version = "10.5.17"; + hash = "sha256-hJyEC3b0hWUDtD7zqEH8lx6LUYjI3zaQkTv1aZaRt2E="; }; mariadb_106 = mariadbPackage { # Supported until 2026-07 From c7aba71f1ce2df31b26f9eeef9d470e90b4b72f8 Mon Sep 17 00:00:00 2001 From: ajs124 Date: Tue, 16 Aug 2022 01:23:59 +0200 Subject: [PATCH 048/164] mariadb_106: 10.6.8 -> 10.6.9 https://mariadb.com/kb/en/mariadb-1069-release-notes/ Fixes: - CVE-2022-32082 - CVE-2022-32089 - CVE-2022-32081 - CVE-2018-25032 - CVE-2022-32091 - CVE-2022-32084 --- pkgs/servers/sql/mariadb/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/sql/mariadb/default.nix b/pkgs/servers/sql/mariadb/default.nix index c0036f9d7759..c2c52abdbc24 100644 --- a/pkgs/servers/sql/mariadb/default.nix +++ b/pkgs/servers/sql/mariadb/default.nix @@ -248,8 +248,8 @@ in { }; mariadb_106 = mariadbPackage { # Supported until 2026-07 - version = "10.6.8"; - hash = "sha256:0f6lkvv0dbq64y7zpks7nvhy1n08gad0i0dp0s2zpgfcb62liaap"; + version = "10.6.9"; + hash = "sha256-N5Wfi1+8ZNlOGA3NiuW9+v1AYgOgf0j3vs1rinYzdEw="; }; mariadb_107 = mariadbPackage { # Supported until 2023-02 From 4131e59c77428ca97ece087d8b709f40fc0dad0a Mon Sep 17 00:00:00 2001 From: ajs124 Date: Tue, 16 Aug 2022 01:25:57 +0200 Subject: [PATCH 049/164] mariadb_107: 10.7.4 -> 10.7.5 https://mariadb.com/kb/en/mariadb-1075-release-notes/ Fixes: - CVE-2022-32082 - CVE-2022-32089 - CVE-2022-32081 - CVE-2018-25032 - CVE-2022-32091 - CVE-2022-32084 --- pkgs/servers/sql/mariadb/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/sql/mariadb/default.nix b/pkgs/servers/sql/mariadb/default.nix index c2c52abdbc24..47a7f2ded045 100644 --- a/pkgs/servers/sql/mariadb/default.nix +++ b/pkgs/servers/sql/mariadb/default.nix @@ -252,9 +252,9 @@ in { hash = "sha256-N5Wfi1+8ZNlOGA3NiuW9+v1AYgOgf0j3vs1rinYzdEw="; }; mariadb_107 = mariadbPackage { - # Supported until 2023-02 - version = "10.7.4"; - hash = "sha256:0ws17azsw3f26pkphjkyxmmi9qbv9gwidvz0ll6g482m6afrrpbk"; + # Supported until 2023-02. TODO: remove ahead of 22.11 release. + version = "10.7.5"; + hash = "sha256-f/OkzNoe7S8aZBO4DE7WjMqRFzD1Aaaf1/STo0oJVLo="; }; mariadb_108 = mariadbPackage { # Supported until 2023-05 From e710cd5106ed3d890f9cfa7ba21c36635eea0e49 Mon Sep 17 00:00:00 2001 From: ajs124 Date: Tue, 16 Aug 2022 01:26:18 +0200 Subject: [PATCH 050/164] mariadb_108: 10.8.3 -> 10.8.4 https://mariadb.com/kb/en/mariadb-1084-release-notes/ Fixes: - CVE-2022-32082 - CVE-2022-32089 - CVE-2022-32081 - CVE-2018-25032 - CVE-2022-32091 - CVE-2022-32084 --- pkgs/servers/sql/mariadb/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/sql/mariadb/default.nix b/pkgs/servers/sql/mariadb/default.nix index 47a7f2ded045..706188b40305 100644 --- a/pkgs/servers/sql/mariadb/default.nix +++ b/pkgs/servers/sql/mariadb/default.nix @@ -258,7 +258,7 @@ in { }; mariadb_108 = mariadbPackage { # Supported until 2023-05 - version = "10.8.3"; - hash = "sha256:14h80lfb9b3rv3fd8nkljbqhx6dmwjnqkz6c3ynixb3na72sszl8"; + version = "10.8.4"; + hash = "sha256-ZexgyjZYjs0RzYw/wM414dYDAp4SN4z4i6qGX9CJEWY="; }; } From 0ca8b7442429c132ff94f9834806c0a2ede89243 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 16 Aug 2022 00:52:52 +0000 Subject: [PATCH 051/164] microdnf: 3.8.1 -> 3.9.0 --- pkgs/tools/package-management/microdnf/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/package-management/microdnf/default.nix b/pkgs/tools/package-management/microdnf/default.nix index 6a3d5808c73c..597fc5cc11a9 100644 --- a/pkgs/tools/package-management/microdnf/default.nix +++ b/pkgs/tools/package-management/microdnf/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "microdnf"; - version = "3.8.1"; + version = "3.9.0"; src = fetchFromGitHub { owner = "rpm-software-management"; repo = pname; rev = version; - sha256 = "sha256-yKIhXjeiCOq5JsAquaPnYAJZk53FioOKGIAT2xYfLO8="; + sha256 = "sha256-PDvA25QSju16d83f0UVpUiDU8XDuC2dKRi3LaItFRmk="; }; nativeBuildInputs = [ pkg-config cmake gettext help2man ]; From 4666fc08fcc3669a83f9acafa37accd78de4c11e Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 16 Aug 2022 05:51:07 +0000 Subject: [PATCH 052/164] python310Packages.vowpalwabbit: 9.2.0 -> 9.3.0 --- pkgs/development/python-modules/vowpalwabbit/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/vowpalwabbit/default.nix b/pkgs/development/python-modules/vowpalwabbit/default.nix index 8e501972443e..8bc7c0badc1e 100644 --- a/pkgs/development/python-modules/vowpalwabbit/default.nix +++ b/pkgs/development/python-modules/vowpalwabbit/default.nix @@ -18,11 +18,11 @@ buildPythonPackage rec { pname = "vowpalwabbit"; - version = "9.2.0"; + version = "9.3.0"; src = fetchPypi{ inherit pname version; - sha256 = "sha256-hh1AdMO9G2OwnG4qFiEbMHVpKwFGc7MBiOnde0vN9aU="; + sha256 = "sha256-lIvSpgnXHiFEMrdObAODh5/T/J8rXsPVIRyWCnt2w7Q="; }; nativeBuildInputs = [ From 8cf6dd815f1b0feae6375bf6fa097e35b4fdf411 Mon Sep 17 00:00:00 2001 From: Charlotte Van Petegem Date: Mon, 8 Aug 2022 15:03:08 +0200 Subject: [PATCH 053/164] androidenv: fix build of build-tools >= 33 mainDexClasses seems to have been removed in this version of build-tools. (Seems to, because the release notes are not updated at all, unfortunately: https://developer.android.com/studio/releases/build-tools). --- pkgs/development/mobile/androidenv/build-tools.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/development/mobile/androidenv/build-tools.nix b/pkgs/development/mobile/androidenv/build-tools.nix index 641560f19928..da2c3f31a45e 100644 --- a/pkgs/development/mobile/androidenv/build-tools.nix +++ b/pkgs/development/mobile/androidenv/build-tools.nix @@ -14,8 +14,10 @@ deployAndroidPackage { autoPatchelf --no-recurse $packageBaseDir ''} - wrapProgram $PWD/mainDexClasses \ - --prefix PATH : ${pkgs.jdk8}/bin + ${lib.optionalString (lib.toInt (lib.versions.major package.revision) < 33) '' + wrapProgram $PWD/mainDexClasses \ + --prefix PATH : ${pkgs.jdk8}/bin + ''} ''; noAuditTmpdir = true; # The checker script gets confused by the build-tools path that is incorrectly identified as a reference to /build } From 1c0b45cfb81742a4ee999a4ad875a8f18cdc6c2b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Tue, 16 Aug 2022 11:41:43 +0200 Subject: [PATCH 054/164] dnscontrol: 3.18.1 -> 3.19.0 --- pkgs/applications/networking/dnscontrol/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/dnscontrol/default.nix b/pkgs/applications/networking/dnscontrol/default.nix index c50b05b05116..a740153be81b 100644 --- a/pkgs/applications/networking/dnscontrol/default.nix +++ b/pkgs/applications/networking/dnscontrol/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "dnscontrol"; - version = "3.18.1"; + version = "3.19.0"; src = fetchFromGitHub { owner = "StackExchange"; repo = pname; rev = "v${version}"; - sha256 = "sha256-G4FfKTlMuJ0YKsNQnMFjXq6ZBuLJjlCg7GqFPHcsHFM="; + sha256 = "sha256-bP9tksdP/hNjC4opACLYHad8jj137+WQfb3bM8A6tVQ="; }; - vendorSha256 = "sha256-g2T3TmwkF1ft5XRimZLrTmm0Km5HcX/0aQtUjA5TZzw="; + vendorSha256 = "sha256-/lFH/4fQgK0LAqLIn39r+hi0pqNlJuupWlLhOhDh0TU="; ldflags = [ "-s" "-w" ]; From c6f7c997927ef403c4b164398e13682bd5c5bf02 Mon Sep 17 00:00:00 2001 From: Nikolay Korotkiy Date: Mon, 1 Aug 2022 11:36:08 +0300 Subject: [PATCH 055/164] o: init at 2.55.1 --- pkgs/applications/editors/o/default.nix | 43 +++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 45 insertions(+) create mode 100644 pkgs/applications/editors/o/default.nix diff --git a/pkgs/applications/editors/o/default.nix b/pkgs/applications/editors/o/default.nix new file mode 100644 index 000000000000..20bb6e7ac02e --- /dev/null +++ b/pkgs/applications/editors/o/default.nix @@ -0,0 +1,43 @@ +{ lib, stdenv, buildGoModule, fetchFromGitHub, installShellFiles, makeWrapper, pkg-config +, tcsh +, withGui ? stdenv.isLinux, vte # vte is broken on darwin +}: + +buildGoModule rec { + pname = "o"; + version = "2.55.1"; + + src = fetchFromGitHub { + owner = "xyproto"; + repo = "o"; + rev = "v${version}"; + hash = "sha256-owueLd6kR/bDFxKI9QOUgriH63XRsEEpIFfp5aRTSbI="; + }; + + postPatch = '' + substituteInPlace ko/main.cpp --replace '/bin/csh' '${tcsh}/bin/tcsh' + ''; + + vendorSha256 = null; + + nativeBuildInputs = [ installShellFiles makeWrapper pkg-config ]; + + buildInputs = lib.optional withGui vte; + + preBuild = "cd v2"; + + postInstall = '' + cd .. + installManPage o.1 + '' + lib.optionalString withGui '' + make install-gui PREFIX=$out + wrapProgram $out/bin/ko --prefix PATH : $out/bin + ''; + + meta = with lib; { + description = "Config-free text editor and IDE limited to VT100"; + homepage = "https://github.com/xyproto/o"; + license = licenses.bsd3; + maintainers = with maintainers; [ sikmir ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index ce94bb7392ea..2976a13d7ba8 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -26648,6 +26648,8 @@ with pkgs; edbrowse = callPackage ../applications/editors/edbrowse { }; + o = callPackage ../applications/editors/o { }; + oed = callPackage ../applications/editors/oed { }; ekho = callPackage ../applications/audio/ekho { }; From 1f744728a9eaa7abf36608a3a9ff1eed4eaa0cef Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 16 Aug 2022 10:05:40 +0000 Subject: [PATCH 056/164] ansible-lint: 6.3.0 -> 6.4.0 --- pkgs/development/python-modules/ansible-lint/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/ansible-lint/default.nix b/pkgs/development/python-modules/ansible-lint/default.nix index a3867db819f4..90da98520120 100644 --- a/pkgs/development/python-modules/ansible-lint/default.nix +++ b/pkgs/development/python-modules/ansible-lint/default.nix @@ -20,13 +20,13 @@ buildPythonPackage rec { pname = "ansible-lint"; - version = "6.3.0"; + version = "6.4.0"; format = "pyproject"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "sha256-9X9SCuXYEM4GIVfcfWM5kK0vvsgbu7NMzEzjoMIfzTg="; + sha256 = "sha256-xadjBsrpBqJgz3KGyofE0DukSSsu17/qIa0R/fPH6NE="; }; postPatch = '' From 9bf60e07c1ec87ee143c0670d53f50e632e12f3e Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 16 Aug 2022 10:44:56 +0000 Subject: [PATCH 057/164] cargo-license: 0.4.2 -> 0.5.0 --- pkgs/development/tools/rust/cargo-license/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/rust/cargo-license/default.nix b/pkgs/development/tools/rust/cargo-license/default.nix index 6202e297b9a9..8d6e8ca6ebfe 100644 --- a/pkgs/development/tools/rust/cargo-license/default.nix +++ b/pkgs/development/tools/rust/cargo-license/default.nix @@ -2,14 +2,14 @@ rustPlatform.buildRustPackage rec { pname = "cargo-license"; - version = "0.4.2"; + version = "0.5.0"; src = fetchCrate { inherit pname version; - sha256 = "sha256-rAHw5B/rK0N8myTzTyv/IUq3o+toWO5HOSaHQko2lPI="; + sha256 = "sha256-z68idQqjH0noNZLwoTtnLrIOXZPG4kAYS9+7yrFXKOA="; }; - cargoSha256 = "sha256-DkINY3j0x0fUynMX8+pxNFwKI/YGqEv1M2a55FuKBGY="; + cargoSha256 = "sha256-8QgDKgJC5l2h5ysQaICjToI7gGxnmlolTwEtxHJMlj8="; meta = with lib; { description = "Cargo subcommand to see license of dependencies"; From 78ab54f5479a36d67262639bab572149075e9db6 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 16 Aug 2022 11:27:19 +0000 Subject: [PATCH 058/164] exodus: 22.7.29 -> 22.8.12 --- pkgs/applications/blockchains/exodus/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/blockchains/exodus/default.nix b/pkgs/applications/blockchains/exodus/default.nix index 82da3f29173b..f3884106a4d9 100644 --- a/pkgs/applications/blockchains/exodus/default.nix +++ b/pkgs/applications/blockchains/exodus/default.nix @@ -4,11 +4,11 @@ cups, vivaldi-ffmpeg-codecs, libpulseaudio, at-spi2-core, libxkbcommon, mesa }: stdenv.mkDerivation rec { pname = "exodus"; - version = "22.7.29"; + version = "22.8.12"; src = fetchzip { url = "https://downloads.exodus.io/releases/${pname}-linux-x64-${version}.zip"; - sha256 = "sha256-vshcXuFuOuXlmdgqK+pj6dAbeYGNR2YA79AzkeUzNtk="; + sha256 = "sha256-jNzHh4zYhFzpFZAC9rHmwjTdFkbpROSEN3qpL7geiOU="; }; installPhase = '' From fd99bc4e3903d0559cbd3b71e096aeb0ee51fa39 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 16 Aug 2022 13:03:31 +0000 Subject: [PATCH 059/164] igrep: 0.5.0 -> 0.5.1 --- pkgs/tools/text/igrep/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/text/igrep/default.nix b/pkgs/tools/text/igrep/default.nix index bb93574f1ffb..7869e1f478e2 100644 --- a/pkgs/tools/text/igrep/default.nix +++ b/pkgs/tools/text/igrep/default.nix @@ -9,16 +9,16 @@ rustPlatform.buildRustPackage rec { pname = "igrep"; - version = "0.5.0"; + version = "0.5.1"; src = fetchFromGitHub { owner = "konradsz"; repo = "igrep"; rev = "v${version}"; - sha256 = "sha256-mJtxqwbqofiDuiGokn24qdnck27w7w/3A5mdqZIU88U="; + sha256 = "sha256-Blfkis0Ix0qhSt83YxRqJQJ2oQQK9DGmI60OkyQN5CE="; }; - cargoSha256 = "sha256-ikU4SRLu7PQGbidPmf2W39e3sE8QY8YMU6Q0eWhgvLM="; + cargoSha256 = "sha256-wEprTtD9/kKtGsbpj7gR+PjsDSAdl39ZoeU5BAGERRQ="; buildInputs = lib.optionals stdenv.isDarwin [ Security ]; From d6ed6a2b8b62f75f3265591b690fe9bcdbb42005 Mon Sep 17 00:00:00 2001 From: Jamie Quigley Date: Tue, 16 Aug 2022 11:49:23 +0100 Subject: [PATCH 060/164] alejandra: 2.0.0 -> 3.0.0 Also add self as maintainer --- pkgs/tools/nix/alejandra/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/tools/nix/alejandra/default.nix b/pkgs/tools/nix/alejandra/default.nix index 5c430e0bc168..73f114d96ef9 100644 --- a/pkgs/tools/nix/alejandra/default.nix +++ b/pkgs/tools/nix/alejandra/default.nix @@ -7,16 +7,16 @@ rustPlatform.buildRustPackage rec { pname = "alejandra"; - version = "2.0.0"; + version = "3.0.0"; src = fetchFromGitHub { owner = "kamadorueda"; repo = "alejandra"; rev = version; - sha256 = "sha256-imWi48JxT7l/1toc7NElP1/CBEbChTQ3n0gjBz6L7so="; + sha256 = "sha256-xFumnivtVwu5fFBOrTxrv6fv3geHKF04RGP23EsDVaI="; }; - cargoSha256 = "sha256-pcNU7Wk98LQuRg/ItsJ+dxXcSdYROJVYifF74jIrqEo="; + cargoSha256 = "sha256-tF8E9mnvkTXoViVss9cNjpU4UkEsARp4RtlxKWq55hc="; passthru.tests = { version = testers.testVersion { package = alejandra; }; @@ -27,6 +27,6 @@ rustPlatform.buildRustPackage rec { homepage = "https://github.com/kamadorueda/alejandra"; changelog = "https://github.com/kamadorueda/alejandra/blob/${version}/CHANGELOG.md"; license = licenses.unlicense; - maintainers = with maintainers; [ _0x4A6F kamadorueda ]; + maintainers = with maintainers; [ _0x4A6F kamadorueda sciencentistguy ]; }; } From c20b56187c3274b70c8f1041c2e955ecd41279c9 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 16 Aug 2022 13:39:44 +0000 Subject: [PATCH 061/164] jmol: 14.32.66 -> 14.32.68 --- pkgs/applications/science/chemistry/jmol/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/science/chemistry/jmol/default.nix b/pkgs/applications/science/chemistry/jmol/default.nix index 052cf68eaba6..4e1497acc055 100644 --- a/pkgs/applications/science/chemistry/jmol/default.nix +++ b/pkgs/applications/science/chemistry/jmol/default.nix @@ -25,14 +25,14 @@ let }; in stdenv.mkDerivation rec { - version = "14.32.66"; + version = "14.32.68"; pname = "jmol"; src = let baseVersion = "${lib.versions.major version}.${lib.versions.minor version}"; in fetchurl { url = "mirror://sourceforge/jmol/Jmol/Version%20${baseVersion}/Jmol%20${version}/Jmol-${version}-binary.tar.gz"; - sha256 = "sha256-6L5hsJKiLnFKBtLJZnNxmnVcZTdu8Pmj5Md5QIoRxdU="; + sha256 = "sha256-CCVy+24O5rlAxnd01TeYqcOhDoSrxebfR1Ez7VDDrW4="; }; patchPhase = '' From 0b0c92af76de9c064a205c80e89fa138b0cb0646 Mon Sep 17 00:00:00 2001 From: Nicolas Benes Date: Sun, 14 Aug 2022 10:12:19 +0200 Subject: [PATCH 062/164] libsigrok: 0.5.1 -> 0.5.2 * bump version * enable hidapi: add support for many serial devices, such as digital multimeters and data loggers * enable ieee1284 and bluetooth support on Linux * install udev rules --- pkgs/development/tools/libsigrok/default.nix | 34 ++++++++++++++++---- 1 file changed, 28 insertions(+), 6 deletions(-) diff --git a/pkgs/development/tools/libsigrok/default.nix b/pkgs/development/tools/libsigrok/default.nix index 5a11db8b3b94..eceb267c139d 100644 --- a/pkgs/development/tools/libsigrok/default.nix +++ b/pkgs/development/tools/libsigrok/default.nix @@ -1,15 +1,29 @@ -{ lib, stdenv, fetchurl, pkg-config, libzip, glib, libusb1, libftdi1, check -, libserialport, librevisa, doxygen, glibmm, python -, version ? "0.5.1", sha256 ? "171b553dir5gn6w4f7n37waqk62nq2kf1jykx4ifjacdz5xdw3z4", doInstallCheck ? true +{ lib +, stdenv +, fetchurl +, pkg-config +, libzip +, glib +, libusb1 +, libftdi1 +, check +, libserialport +, librevisa +, doxygen +, glibmm +, python +, hidapi +, libieee1284 +, bluez }: stdenv.mkDerivation rec { - inherit version doInstallCheck; pname = "libsigrok"; + version = "0.5.2"; src = fetchurl { url = "https://sigrok.org/download/source/${pname}/${pname}-${version}.tar.gz"; - inherit sha256; + sha256 = "0g6fl684bpqm5p2z4j12c62m45j1dircznjina63w392ns81yd2d"; }; firmware = fetchurl { @@ -17,16 +31,24 @@ stdenv.mkDerivation rec { sha256 = "14sd8xqph4kb109g073daiavpadb20fcz7ch1ipn0waz7nlly4sw"; }; + enableParallelBuilding = true; + nativeBuildInputs = [ doxygen pkg-config python ]; - buildInputs = [ libzip glib libusb1 libftdi1 check libserialport librevisa glibmm ]; + buildInputs = [ + libzip glib libusb1 libftdi1 check libserialport librevisa glibmm hidapi + ] ++ lib.optionals stdenv.isLinux [ libieee1284 bluez ]; strictDeps = true; postInstall = '' + mkdir -p $out/etc/udev/rules.d + cp contrib/*.rules $out/etc/udev/rules.d + mkdir -p "$out/share/sigrok-firmware/" tar --strip-components=1 -xvf "${firmware}" -C "$out/share/sigrok-firmware/" ''; + doInstallCheck = true; installCheckPhase = '' # assert that c++ bindings are included # note that this is only true for modern (>0.5) versions; the 0.3 series does not have these From bc36ea147b85d13fb37ecf5e87afc79617e6ac43 Mon Sep 17 00:00:00 2001 From: Nicolas Benes Date: Sun, 14 Aug 2022 10:12:19 +0200 Subject: [PATCH 063/164] sigrok-firmware-fx2lafw: init at 0.1.7 Cross-compile the firmware files instead of downloading the binaries. Bump 0.1.6 -> 0.1.7. --- pkgs/development/tools/libsigrok/default.nix | 8 ++--- .../tools/sigrok-firmware-fx2lafw/default.nix | 35 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 3 files changed, 39 insertions(+), 6 deletions(-) create mode 100644 pkgs/development/tools/sigrok-firmware-fx2lafw/default.nix diff --git a/pkgs/development/tools/libsigrok/default.nix b/pkgs/development/tools/libsigrok/default.nix index eceb267c139d..6df1a043b6ad 100644 --- a/pkgs/development/tools/libsigrok/default.nix +++ b/pkgs/development/tools/libsigrok/default.nix @@ -15,6 +15,7 @@ , hidapi , libieee1284 , bluez +, sigrok-firmware-fx2lafw }: stdenv.mkDerivation rec { @@ -26,11 +27,6 @@ stdenv.mkDerivation rec { sha256 = "0g6fl684bpqm5p2z4j12c62m45j1dircznjina63w392ns81yd2d"; }; - firmware = fetchurl { - url = "https://sigrok.org/download/binary/sigrok-firmware-fx2lafw/sigrok-firmware-fx2lafw-bin-0.1.6.tar.gz"; - sha256 = "14sd8xqph4kb109g073daiavpadb20fcz7ch1ipn0waz7nlly4sw"; - }; - enableParallelBuilding = true; nativeBuildInputs = [ doxygen pkg-config python ]; @@ -45,7 +41,7 @@ stdenv.mkDerivation rec { cp contrib/*.rules $out/etc/udev/rules.d mkdir -p "$out/share/sigrok-firmware/" - tar --strip-components=1 -xvf "${firmware}" -C "$out/share/sigrok-firmware/" + cp ${sigrok-firmware-fx2lafw}/share/sigrok-firmware/* "$out/share/sigrok-firmware/" ''; doInstallCheck = true; diff --git a/pkgs/development/tools/sigrok-firmware-fx2lafw/default.nix b/pkgs/development/tools/sigrok-firmware-fx2lafw/default.nix new file mode 100644 index 000000000000..86b1f3be33c1 --- /dev/null +++ b/pkgs/development/tools/sigrok-firmware-fx2lafw/default.nix @@ -0,0 +1,35 @@ +{ lib +, stdenv +, fetchurl +, sdcc +}: + +stdenv.mkDerivation rec { + pname = "sigrok-firmware-fx2lafw"; + version = "0.1.7"; + + src = fetchurl { + url = "https://sigrok.org/download/source/sigrok-firmware-fx2lafw/sigrok-firmware-fx2lafw-${version}.tar.gz"; + sha256 = "sha256-o/RA1qhSpG4sXRmfwcjk2s0Aa8BODVV2KY7lXQVqzjs="; + }; + + enableParallelBuilding = true; + + nativeBuildInputs = [ sdcc ]; + + meta = with lib; { + description = "Firmware for FX2 logic analyzers"; + homepage = "https://sigrok.org/"; + + # licensing details explained in: + # https://sigrok.org/gitweb/?p=sigrok-firmware-fx2lafw.git;a=blob;f=README;hb=HEAD#l122 + license = with licenses; [ + gpl2Plus # overall + lgpl21Plus # fx2lib, Hantek 6022BE, Sainsmart DDS120 firmwares + ]; + + sourceProvenance = with sourceTypes; [ fromSource ]; + platforms = platforms.all; + maintainers = with maintainers; [ panicgh ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index c4d018cdf1ae..76fa96ea96a1 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -15864,6 +15864,8 @@ with pkgs; libsigrok4dsl = callPackage ../applications/science/electronics/dsview/libsigrok4dsl.nix { }; libsigrokdecode4dsl = callPackage ../applications/science/electronics/dsview/libsigrokdecode4dsl.nix { }; + sigrok-firmware-fx2lafw = callPackage ../development/tools/sigrok-firmware-fx2lafw { }; + cli11 = callPackage ../development/tools/misc/cli11 { }; datree = callPackage ../development/tools/datree { }; From d8f986d90268bc641df910f1c916dbf6cb8fb31c Mon Sep 17 00:00:00 2001 From: Nicolas Benes Date: Sun, 14 Aug 2022 10:12:20 +0200 Subject: [PATCH 064/164] pulseview: 0.4.1 -> 0.4.2 --- .../science/electronics/pulseview/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/science/electronics/pulseview/default.nix b/pkgs/applications/science/electronics/pulseview/default.nix index e9496ce60c22..af8daf71309a 100644 --- a/pkgs/applications/science/electronics/pulseview/default.nix +++ b/pkgs/applications/science/electronics/pulseview/default.nix @@ -1,15 +1,15 @@ { mkDerivation, lib, fetchurl, fetchpatch, pkg-config, cmake, glib, boost, libsigrok , libsigrokdecode, libserialport, libzip, udev, libusb1, libftdi1, glibmm -, pcre, librevisa, python3, qtbase, qtsvg +, pcre, librevisa, python3, qtbase, qtsvg, qttools }: mkDerivation rec { pname = "pulseview"; - version = "0.4.1"; + version = "0.4.2"; src = fetchurl { url = "https://sigrok.org/download/source/pulseview/${pname}-${version}.tar.gz"; - sha256 = "0bvgmkgz37n2bi9niskpl05hf7rsj1lj972fbrgnlz25s4ywxrwy"; + sha256 = "1jxbpz1h3m1mgrxw74rnihj8vawgqdpf6c33cqqbyd8v7rxgfhph"; }; nativeBuildInputs = [ cmake pkg-config ]; @@ -17,7 +17,7 @@ mkDerivation rec { buildInputs = [ glib boost libsigrok libsigrokdecode libserialport libzip udev libusb1 libftdi1 glibmm pcre librevisa python3 - qtbase qtsvg + qtbase qtsvg qttools ]; patches = [ From 1239258e5260ac18355dc2fe145e3b232ff82f53 Mon Sep 17 00:00:00 2001 From: Sebastian Neubauer Date: Tue, 16 Aug 2022 15:58:03 +0200 Subject: [PATCH 065/164] typos: 1.10.1 -> 1.11.1 --- pkgs/development/tools/typos/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/typos/default.nix b/pkgs/development/tools/typos/default.nix index ee5c636509af..5c2550e89093 100644 --- a/pkgs/development/tools/typos/default.nix +++ b/pkgs/development/tools/typos/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "typos"; - version = "1.10.1"; + version = "1.11.1"; src = fetchFromGitHub { owner = "crate-ci"; repo = pname; rev = "v${version}"; - hash = "sha256-CdmzGqqzMvLYAXJ2hpjoOQ8FA53PzGspWdjTFWlshYI="; + hash = "sha256-jQmihZl1mKBHg7HLKAbe9uuL1QM+cF0beFj8htz0IOU="; }; - cargoHash = "sha256-X41CSz52S2M4rUsX/GiDGoBpZgUS8UNPvHg7rxbsG0k="; + cargoHash = "sha256-bO9QMMJY+gQyV811qXdwiH1oxW+5Q+dZqG/oT35Eze4="; meta = with lib; { description = "Source code spell checker"; From abba1aa01e5aff2e7d216d394d08328ac6a82762 Mon Sep 17 00:00:00 2001 From: Kira Bruneau Date: Tue, 2 Aug 2022 16:16:41 -0400 Subject: [PATCH 066/164] =?UTF-8?q?python3Packages.debugpy:=201.6.2=20?= =?UTF-8?q?=E2=86=92=201.6.3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/development/python-modules/debugpy/default.nix | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) diff --git a/pkgs/development/python-modules/debugpy/default.nix b/pkgs/development/python-modules/debugpy/default.nix index e492677d138b..ca7e2d920107 100644 --- a/pkgs/development/python-modules/debugpy/default.nix +++ b/pkgs/development/python-modules/debugpy/default.nix @@ -4,7 +4,6 @@ , pythonOlder , fetchFromGitHub , substituteAll -, fetchpatch , gdb , django , flask @@ -18,7 +17,7 @@ buildPythonPackage rec { pname = "debugpy"; - version = "1.6.2"; + version = "1.6.3"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -27,7 +26,7 @@ buildPythonPackage rec { owner = "Microsoft"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-jcokiAZ2WwyIvsXNIUzvMIrRttR76RwDSE7gk0xHExc="; + sha256 = "sha256-ERsqs+pCJfYQInOWPBhM/7hC5TTfQAksYJwFCcd+vlk="; }; patches = [ @@ -52,13 +51,6 @@ buildPythonPackage rec { # To avoid this issue, debugpy should be installed using python.withPackages: # python.withPackages (ps: with ps; [ debugpy ]) ./fix-test-pythonpath.patch - - # Fix compiling attach library from source - # https://github.com/microsoft/debugpy/pull/978 - (fetchpatch { - url = "https://github.com/microsoft/debugpy/commit/08b3b13cba9035f4ab3308153aef26e3cc9275f9.patch"; - sha256 = "sha256-8E+Y40mYQou9T1ozWslEK2XNQtuy5+MBvPvDLt4eQak="; - }) ]; # Remove pre-compiled "attach" libraries and recompile for host platform From 138e71667ef13c54ec4377eac91c62085f6b1d2b Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 16 Aug 2022 14:49:17 +0000 Subject: [PATCH 067/164] libnbd: 1.14.0 -> 1.14.1 --- pkgs/development/libraries/libnbd/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libnbd/default.nix b/pkgs/development/libraries/libnbd/default.nix index 9ff3ee15a174..2156e9c2f97f 100644 --- a/pkgs/development/libraries/libnbd/default.nix +++ b/pkgs/development/libraries/libnbd/default.nix @@ -12,11 +12,11 @@ stdenv.mkDerivation rec { pname = "libnbd"; - version = "1.14.0"; + version = "1.14.1"; src = fetchurl { url = "https://download.libguestfs.org/libnbd/${lib.versions.majorMinor version}-stable/${pname}-${version}.tar.gz"; - hash = "sha256-fwVAMqZGX1HZMA/81qb67K5gwSqtcT1HnLBLdqDr4Cc="; + hash = "sha256-LwgXVWOWwyc9OUJEKHkDQEfGBy41XsdbRuG+zluFc3E="; }; nativeBuildInputs = [ From 9fee9397f93452a699b6fe099fb37681dfa7df61 Mon Sep 17 00:00:00 2001 From: Sebastian Neubauer Date: Thu, 14 Jul 2022 11:56:03 +0000 Subject: [PATCH 068/164] =?UTF-8?q?rocm-smi:=205.1.0=20=E2=86=92=205.2.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/tools/system/rocm-smi/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/system/rocm-smi/default.nix b/pkgs/tools/system/rocm-smi/default.nix index 2cce74b0534d..7ee123152686 100644 --- a/pkgs/tools/system/rocm-smi/default.nix +++ b/pkgs/tools/system/rocm-smi/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "rocm-smi"; - version = "5.1.0"; + version = "5.2.0"; src = fetchFromGitHub { owner = "RadeonOpenCompute"; repo = "rocm_smi_lib"; rev = "rocm-${version}"; - hash = "sha256-11o4xUyeQ3W/RPY62r8ahwcljKh/rkVSyTk5ruTU66U="; + hash = "sha256-7e8nCCyFhecfC4TJrpqMI5buVZstynYgDWaa+LF85GA="; }; nativeBuildInputs = [ cmake wrapPython ]; From bd36820a5f867bb7cdde99ba97eb9b50258d3153 Mon Sep 17 00:00:00 2001 From: Sebastian Neubauer Date: Thu, 14 Jul 2022 11:56:33 +0000 Subject: [PATCH 069/164] =?UTF-8?q?rocm-cmake:=205.1.0=20=E2=86=92=205.2.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/development/tools/build-managers/rocm-cmake/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/build-managers/rocm-cmake/default.nix b/pkgs/development/tools/build-managers/rocm-cmake/default.nix index 5dabaaab5d66..2526957ccbce 100644 --- a/pkgs/development/tools/build-managers/rocm-cmake/default.nix +++ b/pkgs/development/tools/build-managers/rocm-cmake/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "rocm-cmake"; - version = "5.1.0"; + version = "5.2.0"; src = fetchFromGitHub { owner = "RadeonOpenCompute"; repo = "rocm-cmake"; rev = "rocm-${version}"; - hash = "sha256-7jLn0FIjsww1lu1J9MB0s/Ksnw66BL1U0jQwiwmgw64="; + hash = "sha256-2YALk3G5BhrsXZZHjGSSuk8tCi5sNGuB2VB4uvozyZo="; }; nativeBuildInputs = [ cmake ]; From 2825ccd27ee9389ad3fdfb5797f945c9bd6ac678 Mon Sep 17 00:00:00 2001 From: Jiajie Chen Date: Mon, 18 Jul 2022 15:29:06 +0800 Subject: [PATCH 070/164] python310Packages.chalice: 1.26.6 -> 1.27.1 --- .../python-modules/chalice/default.nix | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/pkgs/development/python-modules/chalice/default.nix b/pkgs/development/python-modules/chalice/default.nix index d309bc71731b..052120d893d0 100644 --- a/pkgs/development/python-modules/chalice/default.nix +++ b/pkgs/development/python-modules/chalice/default.nix @@ -24,15 +24,22 @@ buildPythonPackage rec { pname = "chalice"; - version = "1.26.6"; + version = "1.27.1"; src = fetchFromGitHub { owner = "aws"; repo = pname; rev = version; - sha256 = "sha256-6Y5pJg6N/F97zvkyo4r6MoThi79kI53AvlHNOmOCpFA="; + sha256 = "sha256-Qz8kYXu2NmcgtW8GbmLPfB4BOearEycE6EMmQRXmWeI="; }; + postPatch = '' + substituteInPlace setup.py \ + --replace "attrs>=19.3.0,<21.5.0" "attrs" \ + --replace "pip>=9,<22.2" "pip" \ + --replace "typing==3.6.4" "typing" + ''; + propagatedBuildInputs = [ attrs botocore @@ -58,13 +65,6 @@ buildPythonPackage rec { websocket-client ]; - postPatch = '' - sed -i setup.py -e "/pip>=/c\'pip'," - substituteInPlace setup.py \ - --replace "typing==3.6.4" "typing" \ - --replace "jmespath>=0.9.3,<1.0.0" "jmespath>=0.9.3,<2.0.0" - ''; - disabledTestPaths = [ # Don't check the templates and the sample app "chalice/templates" From 2d7cec86d1d05df983ec5e8750d477e89a5f9500 Mon Sep 17 00:00:00 2001 From: Sebastian Neubauer Date: Thu, 14 Jul 2022 11:57:46 +0000 Subject: [PATCH 071/164] =?UTF-8?q?rocm-thunk:=205.1.0=20=E2=86=92=205.2.1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/development/libraries/rocm-thunk/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/rocm-thunk/default.nix b/pkgs/development/libraries/rocm-thunk/default.nix index c7280108159c..583d9b59900e 100644 --- a/pkgs/development/libraries/rocm-thunk/default.nix +++ b/pkgs/development/libraries/rocm-thunk/default.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation rec { pname = "rocm-thunk"; - version = "5.1.0"; + version = "5.2.1"; src = fetchFromGitHub { owner = "RadeonOpenCompute"; repo = "ROCT-Thunk-Interface"; rev = "rocm-${version}"; - hash = "sha256-Qvbvfe1fhoLTkDnzG0WzfAxbyDoEJwkzVvlBGTBkq0w="; + hash = "sha256-iXhlEofPAQNxeZzDgdF1DdflIKfSI7rHGTqOybHnnHM="; }; preConfigure = '' From 5296e4c139652949f78f784b9c36cc9a14db5f67 Mon Sep 17 00:00:00 2001 From: Sebastian Neubauer Date: Thu, 14 Jul 2022 11:57:59 +0000 Subject: [PATCH 072/164] =?UTF-8?q?rocm-runtime:=205.1.1=20=E2=86=92=205.2?= =?UTF-8?q?.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/development/libraries/rocm-runtime/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/rocm-runtime/default.nix b/pkgs/development/libraries/rocm-runtime/default.nix index 9eb9218addaf..4fc378d0603f 100644 --- a/pkgs/development/libraries/rocm-runtime/default.nix +++ b/pkgs/development/libraries/rocm-runtime/default.nix @@ -14,13 +14,13 @@ stdenv.mkDerivation rec { pname = "rocm-runtime"; - version = "5.1.1"; + version = "5.2.0"; src = fetchFromGitHub { owner = "RadeonOpenCompute"; repo = "ROCR-Runtime"; rev = "rocm-${version}"; - hash = "sha256-IP5ylfUXOFkw9+Frfh+tNaZ83ozAbOK9kO2AzFVzzWk="; + hash = "sha256-TY0YPgNzxBLXAj7fncLQ01cSJyydveOLHrimCmLS32o="; }; sourceRoot = "source/src"; From 0ba376caec24b15627e73b999d9bc0701313916f Mon Sep 17 00:00:00 2001 From: Sebastian Neubauer Date: Thu, 14 Jul 2022 11:58:10 +0000 Subject: [PATCH 073/164] =?UTF-8?q?rocm-opencl-runtime:=205.1.1=20?= =?UTF-8?q?=E2=86=92=205.2.1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/development/libraries/rocm-opencl-runtime/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/rocm-opencl-runtime/default.nix b/pkgs/development/libraries/rocm-opencl-runtime/default.nix index 26bf783f4486..65a6e6b33f1b 100644 --- a/pkgs/development/libraries/rocm-opencl-runtime/default.nix +++ b/pkgs/development/libraries/rocm-opencl-runtime/default.nix @@ -24,13 +24,13 @@ stdenv.mkDerivation rec { pname = "rocm-opencl-runtime"; - version = "5.1.1"; + version = "5.2.1"; src = fetchFromGitHub { owner = "RadeonOpenCompute"; repo = "ROCm-OpenCL-Runtime"; rev = "rocm-${version}"; - hash = "sha256-O7q3uTjspO/rZ2+8+g7pRfBXsCRaEr4DZxEqABHbOeY="; + hash = "sha256-Mk7Wssz34Uxtb9PRIEGrTn/tXtqxLMrq0damA/p/DsY="; }; nativeBuildInputs = [ cmake rocm-cmake ]; From abe07d40c81135694ce7472080d5a0d1039e1b52 Mon Sep 17 00:00:00 2001 From: Sebastian Neubauer Date: Thu, 14 Jul 2022 11:58:21 +0000 Subject: [PATCH 074/164] =?UTF-8?q?rocm-device-libs:=205.1.0=20=E2=86=92?= =?UTF-8?q?=205.2.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/development/libraries/rocm-device-libs/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/rocm-device-libs/default.nix b/pkgs/development/libraries/rocm-device-libs/default.nix index a8519d3d692b..0d2cdca61042 100644 --- a/pkgs/development/libraries/rocm-device-libs/default.nix +++ b/pkgs/development/libraries/rocm-device-libs/default.nix @@ -10,13 +10,13 @@ stdenv.mkDerivation rec { pname = "rocm-device-libs"; - version = "5.1.0"; + version = "5.2.0"; src = fetchFromGitHub { owner = "RadeonOpenCompute"; repo = "ROCm-Device-Libs"; rev = "rocm-${version}"; - hash = "sha256-kmCk+BpM1QCJzEAkru2LK3CGwVXNUEZBFicmwnrPcx8="; + hash = "sha256-TBCSznHyiaiOcBR9irybCnOgfqPiNNn4679PCQwrLhA="; }; nativeBuildInputs = [ cmake ]; From cee5171afce4cae135d564561139bbbae58a57bb Mon Sep 17 00:00:00 2001 From: Sebastian Neubauer Date: Thu, 14 Jul 2022 11:58:29 +0000 Subject: [PATCH 075/164] =?UTF-8?q?rocm-comgr:=205.1.0=20=E2=86=92=205.2.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/development/libraries/rocm-comgr/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/rocm-comgr/default.nix b/pkgs/development/libraries/rocm-comgr/default.nix index 6994b7cda3d1..cf269525d536 100644 --- a/pkgs/development/libraries/rocm-comgr/default.nix +++ b/pkgs/development/libraries/rocm-comgr/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "rocm-comgr"; - version = "5.1.0"; + version = "5.2.0"; src = fetchFromGitHub { owner = "RadeonOpenCompute"; repo = "ROCm-CompilerSupport"; rev = "rocm-${version}"; - hash = "sha256-zlCM3Zue7MEhL1c0gUPwRNgdjzyyF9BEP3UxE8RYkKk="; + hash = "sha256-5C5bRdrt3xZAlRgtiIRTMAuwsFvVM4Win96P5+Pf5ZM="; }; sourceRoot = "source/lib/comgr"; From 1e33c54fd8acc64536afca0579e7dbffc63cae25 Mon Sep 17 00:00:00 2001 From: Sebastian Neubauer Date: Thu, 14 Jul 2022 11:58:38 +0000 Subject: [PATCH 076/164] =?UTF-8?q?rocclr:=205.1.0=20=E2=86=92=205.2.1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/development/libraries/rocclr/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/rocclr/default.nix b/pkgs/development/libraries/rocclr/default.nix index 8afb0d044183..57c4970d5fd7 100644 --- a/pkgs/development/libraries/rocclr/default.nix +++ b/pkgs/development/libraries/rocclr/default.nix @@ -7,13 +7,13 @@ stdenv.mkDerivation rec { pname = "rocclr"; - version = "5.1.0"; + version = "5.2.1"; src = fetchFromGitHub { owner = "ROCm-Developer-Tools"; repo = "ROCclr"; rev = "rocm-${version}"; - hash = "sha256-SFWEGKffhuiTE7ICbkElVV5cldXu4Xbwvjb6LiNmijA="; + hash = "sha256-bNIc1JF8f88xC18BheKZCZYjWb4gUZOMWlt/5198iGE="; }; patches = [ From 35be36c724f65498e13eee10d5410cb01baee21c Mon Sep 17 00:00:00 2001 From: Sebastian Neubauer Date: Thu, 14 Jul 2022 11:59:58 +0000 Subject: [PATCH 077/164] =?UTF-8?q?llvmPackages=5Frocm.llvm:=205.1.1=20?= =?UTF-8?q?=E2=86=92=205.2.1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/development/compilers/llvm/rocm/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/compilers/llvm/rocm/default.nix b/pkgs/development/compilers/llvm/rocm/default.nix index e700e1a08b2c..a2c269251d1f 100644 --- a/pkgs/development/compilers/llvm/rocm/default.nix +++ b/pkgs/development/compilers/llvm/rocm/default.nix @@ -1,12 +1,12 @@ { stdenv, lib, buildPackages, fetchFromGitHub, callPackage, wrapCCWith, overrideCC }: let - version = "5.1.1"; + version = "5.2.1"; src = fetchFromGitHub { owner = "RadeonOpenCompute"; repo = "llvm-project"; rev = "rocm-${version}"; - hash = "sha256-5SGIWiyfHvfwIUc4bhdWrlhBfK5ssA7tm5r3zKdr3kg="; + hash = "sha256-sudH8hnjReyuCFm2CBEPd8W88SjAARgCd1MTIJaDjTI="; }; in rec { clang = wrapCCWith rec { From 9513a3b0c20b34582ee186cb0677d8aff1117941 Mon Sep 17 00:00:00 2001 From: Sebastian Neubauer Date: Thu, 14 Jul 2022 14:30:03 +0200 Subject: [PATCH 078/164] hip: 5.1.1 -> 5.2.1 --- pkgs/development/compilers/hip/default.nix | 33 ++++++++++++++++++---- 1 file changed, 27 insertions(+), 6 deletions(-) diff --git a/pkgs/development/compilers/hip/default.nix b/pkgs/development/compilers/hip/default.nix index f073eca91d5c..0254f645c0cb 100644 --- a/pkgs/development/compilers/hip/default.nix +++ b/pkgs/development/compilers/hip/default.nix @@ -31,13 +31,13 @@ let hip = stdenv.mkDerivation rec { pname = "hip"; - version = "5.1.1"; + version = "5.2.1"; src = fetchFromGitHub { owner = "ROCm-Developer-Tools"; repo = "HIP"; rev = "rocm-${version}"; - hash = "sha256-/kIZrbzq1u1pIs1jlmRYZNUGteqVQTI4TlXsHsVIUKE="; + hash = "sha256-aXI55bdhAuPUEdQZukKAdtLWA+8UIxjPJ4LTamR/ENk="; }; # - fix bash paths @@ -102,13 +102,13 @@ let in stdenv.mkDerivation rec { pname = "hip"; - version = "5.1.1"; + version = "5.2.1"; src = fetchFromGitHub { owner = "ROCm-Developer-Tools"; repo = "hipamd"; rev = "rocm-${version}"; - hash = "sha256-TuCMRJb6G/bhD8hG6Ot7MIkgBoShjVboeXrlGh9eYpQ="; + hash = "sha256-YsvM+HjoBiukXAMCdE/dpQNMnpP6XRXDuxV1487rok0="; }; nativeBuildInputs = [ cmake python3 makeWrapper perl ]; @@ -145,9 +145,30 @@ stdenv.mkDerivation rec { passthru.updateScript = writeScript "update.sh" '' #!/usr/bin/env nix-shell - #!nix-shell -i bash -p curl jq common-updater-scripts + #!nix-shell -i bash -p curl jq common-updater-scripts nix-prefetch-github + version="$(curl -sL "https://api.github.com/repos/ROCm-Developer-Tools/HIP/tags" | jq '.[].name | split("-") | .[1] | select( . != null )' --raw-output | sort -n | tail -1)" + current_version="$(grep "version =" pkgs/development/compilers/hip/default.nix | head -n1 | cut -d'"' -f2)" + if [[ "$version" != "$current_version" ]]; then + tarball_meta="$(nix-prefetch-github ROCm-Developer-Tools HIP --rev "rocm-$version")" + tarball_hash="$(nix to-base64 sha256-$(jq -r '.sha256' <<< "$tarball_meta"))" + sed -i -z "pkgs/development/compilers/hip/default.nix" \ + -e 's,version = "[^'"'"'"]*",version = "'"$version"'",1' \ + -e 's,hash = "[^'"'"'"]*",hash = "sha256-'"$tarball_hash"'",1' + else + echo hip already up-to-date + fi + version="$(curl -sL "https://api.github.com/repos/ROCm-Developer-Tools/hipamd/tags" | jq '.[].name | split("-") | .[1] | select( . != null )' --raw-output | sort -n | tail -1)" - update-source-version hip "$version" + current_version="$(grep "version =" pkgs/development/compilers/hip/default.nix | tail -n1 | cut -d'"' -f2)" + if [[ "$version" != "$current_version" ]]; then + tarball_meta="$(nix-prefetch-github ROCm-Developer-Tools hipamd --rev "rocm-$version")" + tarball_hash="$(nix to-base64 sha256-$(jq -r '.sha256' <<< "$tarball_meta"))" + sed -i -z "pkgs/development/compilers/hip/default.nix" \ + -e 's,version = "[^'"'"'"]*",version = "'"$version"'",2' \ + -e 's,hash = "[^'"'"'"]*",hash = "sha256-'"$tarball_hash"'",2' + else + echo hipamd already up-to-date + fi ''; meta = with lib; { From 27882f4e0e88b418867387b4f232189e4cbd7c5e Mon Sep 17 00:00:00 2001 From: booklearner Date: Tue, 16 Aug 2022 13:09:16 -0400 Subject: [PATCH 079/164] maintainers: update email (`booklearner`) Signed-off-by: booklearner --- maintainers/maintainer-list.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 0259d9ede1e5..fdbeccb45b67 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -1778,7 +1778,7 @@ }; booklearner = { name = "booklearner"; - email = "hey@booklearner.org"; + email = "booklearner@proton.me"; matrix = "@booklearner:matrix.org"; github = "booklearner"; githubId = 103979114; From 396f9b2a5b11939c4734185c586f68ed6ba90291 Mon Sep 17 00:00:00 2001 From: "Winston R. Milling" Date: Tue, 16 Aug 2022 12:10:56 -0500 Subject: [PATCH 080/164] maintainers: add wrmilling --- maintainers/maintainer-list.nix | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index ab372e9926c0..f451920fa342 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -13976,6 +13976,15 @@ github = "wr0belj"; githubId = 40501814; }; + wrmilling = { + name = "Winston R. Milling"; + email = "Winston@Milli.ng"; + github = "WRMilling"; + githubId = 6162814; + keys = [{ + fingerprint = "21E1 6B8D 2EE8 7530 6A6C 9968 D830 77B9 9F8C 6643"; + }]; + }; wscott = { email = "wsc9tt@gmail.com"; github = "wscott"; From 7768df2d2ad751fa36003396985993a1fcb0ddab Mon Sep 17 00:00:00 2001 From: "Winston R. Milling" Date: Tue, 16 Aug 2022 12:11:18 -0500 Subject: [PATCH 081/164] armcord: init at 3.0.7 --- .../instant-messengers/armcord/default.nix | 129 ++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 131 insertions(+) create mode 100644 pkgs/applications/networking/instant-messengers/armcord/default.nix diff --git a/pkgs/applications/networking/instant-messengers/armcord/default.nix b/pkgs/applications/networking/instant-messengers/armcord/default.nix new file mode 100644 index 000000000000..6f6a6e0b337e --- /dev/null +++ b/pkgs/applications/networking/instant-messengers/armcord/default.nix @@ -0,0 +1,129 @@ +{ lib +, stdenv +, fetchurl +, autoPatchelfHook +, dpkg +, makeWrapper +, alsa-lib +, at-spi2-atk +, at-spi2-core +, atk +, cairo +, cups +, dbus +, expat +, ffmpeg +, fontconfig +, freetype +, gdk-pixbuf +, glib +, gtk3 +, libappindicator-gtk3 +, libdbusmenu +, libdrm +, libnotify +, libpulseaudio +, libsecret +, libuuid +, libxkbcommon +, mesa +, nss +, pango +, systemd +, xdg-utils +, xorg +}: + +stdenv.mkDerivation rec { + pname = "armcord"; + version = "3.0.7"; + + src = let + base = "https://github.com/ArmCord/ArmCord/releases/download"; + in { + x86_64-linux = fetchurl { + url = "${base}/v${version}/ArmCord_${version}_amd64.deb"; + sha256 = "b2a583e6abbc6e5dc3f7370a33f21fc4e7963c6cbe7555e954156c77e9577261"; + }; + aarch64-linux = fetchurl { + url = "${base}/v${version}/ArmCord_${version}_arm64.deb"; + sha256 = "8c32a14ab8e5bdf865a6523cb4b5cec8f3f870b95f99be9661a4dd0df33aae1d"; + }; + }.${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}"); + + nativeBuildInputs = [ autoPatchelfHook dpkg makeWrapper ]; + + buildInputs = [ + alsa-lib + at-spi2-atk + at-spi2-core + atk + cairo + cups + dbus + expat + ffmpeg + fontconfig + freetype + gdk-pixbuf + glib + gtk3 + pango + systemd + mesa # for libgbm + nss + libuuid + libdrm + libnotify + libsecret + libpulseaudio + libxkbcommon + libappindicator-gtk3 + xorg.libX11 + xorg.libxcb + xorg.libXcomposite + xorg.libXcursor + xorg.libXdamage + xorg.libXext + xorg.libXfixes + xorg.libXi + xorg.libXrandr + xorg.libXrender + xorg.libXScrnSaver + xorg.libxshmfence + xorg.libXtst + ]; + + sourceRoot = "."; + unpackCmd = "dpkg-deb -x $src ."; + + installPhase = '' + runHook preInstall + + mkdir -p "$out/bin" + cp -R "opt" "$out" + cp -R "usr/share" "$out/share" + chmod -R g-w "$out" + + # Wrap the startup command + makeWrapper $out/opt/ArmCord/armcord $out/bin/armcord \ + --prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath buildInputs}" \ + --prefix PATH : ${lib.makeBinPath [ xdg-utils ]} \ + "''${gappsWrapperArgs[@]}" + + # Fix desktop link + substituteInPlace $out/share/applications/armcord.desktop \ + --replace /opt/ArmCord/ $out/bin/ + + runHook postInstall + ''; + + meta = with lib; { + description = "Lightweight, alternative desktop client for Discord"; + homepage = "https://github.com/ArmCord/ArmCord"; + sourceProvenance = with sourceTypes; [ binaryNativeCode ]; + license = licenses.osl3; + maintainers = with maintainers; [ wrmilling ]; + platforms = [ "x86_64-linux" "aarch64-linux" ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 08b85f5721d1..6fd5e42b01ac 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -26046,6 +26046,8 @@ with pkgs; }; + armcord = callPackage ../applications/networking/instant-messengers/armcord { }; + aumix = callPackage ../applications/audio/aumix { gtkGUI = false; }; From ec590fdd24430f672bec6704c6507e59d72a60b5 Mon Sep 17 00:00:00 2001 From: Sebastian Neubauer Date: Tue, 16 Aug 2022 19:20:55 +0200 Subject: [PATCH 082/164] llvmPackages_rocm: compile as one derivation This is the supported way rocm is tested. It makes packaging in nix a *lot* easier (see the code size). An important change is the dontLink detection in the clang/clang++ wrapper script: When compiling with --cuda-device-only, the linker must not be set, otherwise e.g. the blender kernels fail to compile. --- pkgs/development/compilers/hip/default.nix | 11 +- .../development/compilers/llvm/rocm/clang.nix | 72 ------ .../llvm/rocm/compiler-rt/default.nix | 64 ----- .../compilers/llvm/rocm/default.nix | 35 ++- .../llvm/rocm/install-symlinks.patch | 23 ++ pkgs/development/compilers/llvm/rocm/lld.nix | 43 ---- .../llvm/rocm/{llvm/default.nix => llvm.nix} | 55 +---- .../compilers/llvm/rocm/llvm/outputs.patch | 16 -- .../libraries/rocm-comgr/cmake.patch | 224 ++++++++++++++++++ .../libraries/rocm-comgr/default.nix | 9 +- .../libraries/rocm-device-libs/default.nix | 6 +- .../libraries/rocm-opencl-runtime/default.nix | 4 - .../libraries/rocm-runtime/default.nix | 3 +- pkgs/top-level/all-packages.nix | 10 +- 14 files changed, 290 insertions(+), 285 deletions(-) delete mode 100644 pkgs/development/compilers/llvm/rocm/clang.nix delete mode 100644 pkgs/development/compilers/llvm/rocm/compiler-rt/default.nix create mode 100644 pkgs/development/compilers/llvm/rocm/install-symlinks.patch delete mode 100644 pkgs/development/compilers/llvm/rocm/lld.nix rename pkgs/development/compilers/llvm/rocm/{llvm/default.nix => llvm.nix} (63%) delete mode 100644 pkgs/development/compilers/llvm/rocm/llvm/outputs.patch create mode 100644 pkgs/development/libraries/rocm-comgr/cmake.patch diff --git a/pkgs/development/compilers/hip/default.nix b/pkgs/development/compilers/hip/default.nix index 0254f645c0cb..81f558a733a7 100644 --- a/pkgs/development/compilers/hip/default.nix +++ b/pkgs/development/compilers/hip/default.nix @@ -1,9 +1,7 @@ { stdenv , binutils-unwrapped , clang -, clang-unwrapped , cmake -, compiler-rt , fetchFromGitHub , fetchpatch , file @@ -11,7 +9,6 @@ , libglvnd , libX11 , libxml2 -, lld , llvm , makeWrapper , numactl @@ -63,8 +60,9 @@ let -e 's,^\($HIP_COMPILER=\).*$,\1"clang";,' \ -e 's,^\($HIP_RUNTIME=\).*$,\1"ROCclr";,' \ -e 's,^\([[:space:]]*$HSA_PATH=\).*$,\1"${rocm-runtime}";,'g \ - -e 's,^\([[:space:]]*\)$HIP_CLANG_INCLUDE_PATH = abs_path("$HIP_CLANG_PATH/../lib/clang/$HIP_CLANG_VERSION/include");,\1$HIP_CLANG_INCLUDE_PATH = "${clang-unwrapped}/lib/clang/$HIP_CLANG_VERSION/include";,' \ + -e 's,^\([[:space:]]*\)$HIP_CLANG_INCLUDE_PATH = abs_path("$HIP_CLANG_PATH/../lib/clang/$HIP_CLANG_VERSION/include");,\1$HIP_CLANG_INCLUDE_PATH = "${llvm}/lib/clang/$HIP_CLANG_VERSION/include";,' \ -e 's,^\([[:space:]]*$HIPCXXFLAGS .= " -isystem \\"$HIP_CLANG_INCLUDE_PATH/..\\"\)";,\1 -isystem ${rocm-runtime}/include";,' \ + -e 's,$HIP_CLANG_PATH/../lib/clang/$HIP_CLANG_VERSION,$HIP_CLANG_PATH/../resource-root,g' \ -e 's,`file,`${file}/bin/file,g' \ -e 's,`readelf,`${binutils-unwrapped}/bin/readelf,' \ -e 's, ar , ${binutils-unwrapped}/bin/ar ,g' \ @@ -115,8 +113,6 @@ stdenv.mkDerivation rec { buildInputs = [ libxml2 numactl libglvnd libX11 ]; propagatedBuildInputs = [ clang - compiler-rt - lld llvm rocm-comgr rocm-device-libs @@ -139,7 +135,8 @@ stdenv.mkDerivation rec { ]; postInstall = '' - wrapProgram $out/bin/hipcc --set HIP_PATH $out --set HSA_PATH ${rocm-runtime} --set HIP_CLANG_PATH ${clang}/bin --prefix PATH : ${lld}/bin --set NIX_CC_WRAPPER_TARGET_HOST_${stdenv.cc.suffixSalt} 1 --prefix NIX_LDFLAGS ' ' -L${compiler-rt}/lib --prefix NIX_LDFLAGS_FOR_TARGET ' ' -L${compiler-rt}/lib --add-flags "-nogpuinc" + patchShebangs $out/bin + wrapProgram $out/bin/hipcc --set HIP_PATH $out --set HSA_PATH ${rocm-runtime} --set HIP_CLANG_PATH ${clang}/bin --prefix PATH : ${llvm}/bin --set ROCM_PATH $out wrapProgram $out/bin/hipconfig --set HIP_PATH $out --set HSA_PATH ${rocm-runtime} --set HIP_CLANG_PATH ${clang}/bin ''; diff --git a/pkgs/development/compilers/llvm/rocm/clang.nix b/pkgs/development/compilers/llvm/rocm/clang.nix deleted file mode 100644 index 2fac661b58a1..000000000000 --- a/pkgs/development/compilers/llvm/rocm/clang.nix +++ /dev/null @@ -1,72 +0,0 @@ -{ stdenv -, lib -, fetchFromGitHub -, cmake -, python3 -, llvm -, clang-tools-extra_src ? null -, lld - -, version -, src -}: - -stdenv.mkDerivation rec { - inherit version src; - - pname = "clang"; - - nativeBuildInputs = [ cmake python3 ]; - - buildInputs = [ llvm ]; - - hardeningDisable = [ "all" ]; - - cmakeFlags = [ - "-DLLVM_CMAKE_PATH=${llvm}/lib/cmake/llvm" - "-DLLVM_MAIN_SRC_DIR=${llvm.src}" - "-DCLANG_SOURCE_DIR=${src}" - "-DLLVM_ENABLE_RTTI=ON" - ]; - - VCSVersion = '' - #undef LLVM_REVISION - #undef LLVM_REPOSITORY - #undef CLANG_REVISION - #undef CLANG_REPOSITORY - ''; - - postUnpack = lib.optionalString (!(isNull clang-tools-extra_src)) '' - ln -s ${clang-tools-extra_src} $sourceRoot/tools/extra - ''; - - # Rather than let cmake extract version information from LLVM or - # clang source control repositories, we generate the wanted - # `VCSVersion.inc` file ourselves and remove it from the - # depencencies of the `clangBasic` target. - preConfigure = '' - sed 's/ ''${version_inc}//' -i lib/Basic/CMakeLists.txt - sed 's|sys::path::parent_path(BundlerExecutable)|StringRef("${llvm}/bin")|' -i tools/clang-offload-bundler/ClangOffloadBundler.cpp - sed 's|\([[:space:]]*std::string Linker = \)getToolChain().GetProgramPath(getShortName())|\1"${lld}/bin/ld.lld"|' -i lib/Driver/ToolChains/AMDGPU.cpp - substituteInPlace lib/Driver/ToolChains/AMDGPU.h --replace ld.lld ${lld}/bin/ld.lld - sed 's|configure_file(AST/gen_ast_dump_json_test.py ''${LLVM_TOOLS_BINARY_DIR}/gen_ast_dump_json_test.py COPYONLY)||' -i test/CMakeLists.txt - ''; - - postConfigure = '' - mkdir -p lib/Basic - echo "$VCSVersion" > lib/Basic/VCSVersion.inc - ''; - - passthru = { - isClang = true; - inherit llvm; - }; - - meta = with lib; { - description = "ROCm fork of the clang C/C++/Objective-C/Objective-C++ LLVM compiler frontend"; - homepage = "https://llvm.org/"; - license = with licenses; [ ncsa ]; - maintainers = with maintainers; [ acowley lovesegfault ]; - platforms = platforms.linux; - }; -} diff --git a/pkgs/development/compilers/llvm/rocm/compiler-rt/default.nix b/pkgs/development/compilers/llvm/rocm/compiler-rt/default.nix deleted file mode 100644 index dfc21e7fe013..000000000000 --- a/pkgs/development/compilers/llvm/rocm/compiler-rt/default.nix +++ /dev/null @@ -1,64 +0,0 @@ -{ stdenv, lib, version, src, cmake, python3, llvm, libcxxabi, fetchpatch }: -stdenv.mkDerivation rec { - pname = "compiler-rt"; - inherit version src; - - nativeBuildInputs = [ cmake python3 llvm ]; - - NIX_CFLAGS_COMPILE = [ - "-DSCUDO_DEFAULT_OPTIONS=DeleteSizeMismatch=0:DeallocationTypeMismatch=0" - ]; - - cmakeFlags = [ - "-DCOMPILER_RT_DEFAULT_TARGET_ONLY=ON" - "-DCMAKE_C_COMPILER_TARGET=${stdenv.hostPlatform.config}" - "-DCMAKE_ASM_COMPILER_TARGET=${stdenv.hostPlatform.config}" - "-DCOMPILER_RT_BUILD_SANITIZERS=OFF" - "-DCOMPILER_RT_BUILD_XRAY=OFF" - "-DCOMPILER_RT_BUILD_LIBFUZZER=OFF" - "-DCOMPILER_RT_BUILD_PROFILE=OFF" - "-DCMAKE_C_COMPILER_WORKS=ON" - "-DCMAKE_CXX_COMPILER_WORKS=ON" - "-DCOMPILER_RT_BAREMETAL_BUILD=ON" - "-DCMAKE_SIZEOF_VOID_P=${toString (stdenv.hostPlatform.parsed.cpu.bits / 8)}" - "-DCOMPILER_RT_BUILD_BUILTINS=ON" - "-DCMAKE_C_FLAGS=-nodefaultlibs" - #https://stackoverflow.com/questions/53633705/cmake-the-c-compiler-is-not-able-to-compile-a-simple-test-program - "-DCMAKE_TRY_COMPILE_TARGET_TYPE=STATIC_LIBRARY" - ]; - - outputs = [ "out" "dev" ]; - - prePatch = '' - cd compiler-rt - ''; - - # TSAN requires XPC on Darwin, which we have no public/free source files for. We can depend on the Apple frameworks - # to get it, but they're unfree. Since LLVM is rather central to the stdenv, we patch out TSAN support so that Hydra - # can build this. If we didn't do it, basically the entire nixpkgs on Darwin would have an unfree dependency and we'd - # get no binary cache for the entire platform. If you really find yourself wanting the TSAN, make this controllable by - # a flag and turn the flag off during the stdenv build. - postPatch = lib.optionalString (!stdenv.isDarwin) '' - substituteInPlace cmake/builtin-config-ix.cmake \ - --replace 'set(X86 i386)' 'set(X86 i386 i486 i586 i686)' - ''; - - # Hack around weird upsream RPATH bug - postInstall = '' - ln -s "$out/lib"/*/* "$out/lib" - ln -s $out/lib/*/clang_rt.crtbegin-*.o $out/lib/crtbegin.o - ln -s $out/lib/*/clang_rt.crtend-*.o $out/lib/crtend.o - ln -s $out/lib/*/clang_rt.crtbegin_shared-*.o $out/lib/crtbeginS.o - ln -s $out/lib/*/clang_rt.crtend_shared-*.o $out/lib/crtendS.o - ''; - - enableParallelBuilding = true; - - meta = with lib; { - description = "ROCm fork of the LLVM Compiler runtime libraries"; - homepage = "https://github.com/RadeonOpenCompute/llvm-project"; - license = licenses.ncsa; - maintainers = with maintainers; [ acowley lovesegfault ]; - platforms = platforms.linux; - }; -} diff --git a/pkgs/development/compilers/llvm/rocm/default.nix b/pkgs/development/compilers/llvm/rocm/default.nix index a2c269251d1f..20c1a20b68af 100644 --- a/pkgs/development/compilers/llvm/rocm/default.nix +++ b/pkgs/development/compilers/llvm/rocm/default.nix @@ -10,23 +10,27 @@ let }; in rec { clang = wrapCCWith rec { - cc = clang-unwrapped; + cc = llvm; extraBuildCommands = '' clang_version=`${cc}/bin/clang -v 2>&1 | grep "clang version " | grep -E -o "[0-9.-]+"` rsrc="$out/resource-root" mkdir "$rsrc" ln -s "${cc}/lib/clang/$clang_version/include" "$rsrc" - ln -s "${compiler-rt}/lib" "$rsrc/lib" + ln -s "${cc}/lib/clang/$clang_version/lib" "$rsrc/lib" echo "-resource-dir=$rsrc" >> $out/nix-support/cc-cflags echo "--gcc-toolchain=${stdenv.cc.cc}" >> $out/nix-support/cc-cflags - echo "-Wno-unused-command-line-argument" >> $out/nix-support/cc-cflags rm $out/nix-support/add-hardening.sh touch $out/nix-support/add-hardening.sh + # GPU compilation uses builtin lld + substituteInPlace $out/bin/clang \ + --replace '-MM) dontLink=1 ;;' $'-MM | --cuda-device-only) dontLink=1 ;;\n--cuda-host-only | --cuda-compile-host-device) dontLink=0 ;;' + substituteInPlace $out/bin/clang++ \ + --replace '-MM) dontLink=1 ;;' $'-MM | --cuda-device-only) dontLink=1 ;;\n--cuda-host-only | --cuda-compile-host-device) dontLink=0 ;;' ''; }; clangNoCompilerRt = wrapCCWith rec { - cc = clang-unwrapped; + cc = llvm; extraBuildCommands = '' clang_version=`${cc}/bin/clang -v 2>&1 | grep "clang version " | grep -E -o "[0-9.-]+"` rsrc="$out/resource-root" @@ -34,28 +38,17 @@ in rec { ln -s "${cc}/lib/clang/$clang_version/include" "$rsrc" echo "-resource-dir=$rsrc" >> $out/nix-support/cc-cflags echo "--gcc-toolchain=${stdenv.cc.cc}" >> $out/nix-support/cc-cflags - echo "-Wno-unused-command-line-argument" >> $out/nix-support/cc-cflags rm $out/nix-support/add-hardening.sh touch $out/nix-support/add-hardening.sh + # GPU compilation uses builtin lld + substituteInPlace $out/bin/clang \ + --replace '-MM) dontLink=1 ;;' $'-MM | --cuda-device-only) dontLink=1 ;;\n--cuda-host-only | --cuda-compile-host-device) dontLink=0 ;;' + substituteInPlace $out/bin/clang++ \ + --replace '-MM) dontLink=1 ;;' $'-MM | --cuda-device-only) dontLink=1 ;;\n--cuda-host-only | --cuda-compile-host-device) dontLink=0 ;;' ''; }; - clang-unwrapped = callPackage ./clang.nix { - inherit lld llvm version; - src = "${src}/clang"; - }; - - compiler-rt = callPackage ./compiler-rt { - inherit version llvm; - inherit src; - stdenv = overrideCC stdenv clangNoCompilerRt; - }; - - lld = callPackage ./lld.nix { - inherit llvm src version; - }; - - llvm = callPackage ./llvm { + llvm = callPackage ./llvm.nix { inherit src version; }; } diff --git a/pkgs/development/compilers/llvm/rocm/install-symlinks.patch b/pkgs/development/compilers/llvm/rocm/install-symlinks.patch new file mode 100644 index 000000000000..8d9bb83632db --- /dev/null +++ b/pkgs/development/compilers/llvm/rocm/install-symlinks.patch @@ -0,0 +1,23 @@ +diff --git a/llvm/cmake/modules/LLVMInstallSymlink.cmake b/llvm/cmake/modules/LLVMInstallSymlink.cmake +index b5c35f706cb7..ac25e40b1436 100644 +--- a/cmake/modules/LLVMInstallSymlink.cmake ++++ b/cmake/modules/LLVMInstallSymlink.cmake +@@ -4,11 +4,16 @@ + + include(GNUInstallDirs) + ++set(CMAKE_MODULE_PATH "${CMAKE_CURRENT_LIST_DIR}/../../../cmake/Modules" ${CMAKE_MODULE_PATH}) ++include(ExtendPath) ++ + function(install_symlink name target outdir) + set(DESTDIR $ENV{DESTDIR}) +- set(bindir "${DESTDIR}${CMAKE_INSTALL_PREFIX}/${outdir}") ++ message(STATUS "Creating ${name} at ${bindir} (${CMAKE_MODULE_PATH})") ++ extend_path(prefixed_outdir "${CMAKE_INSTALL_PREFIX}" "${outdir}") ++ set(bindir "${DESTDIR}${prefixed_outdir}") + +- message(STATUS "Creating ${name}") ++ message(STATUS "Creating ${name} at ${bindir}") + + execute_process( + COMMAND "${CMAKE_COMMAND}" -E create_symlink "${target}" "${name}" diff --git a/pkgs/development/compilers/llvm/rocm/lld.nix b/pkgs/development/compilers/llvm/rocm/lld.nix deleted file mode 100644 index 272e430c1fcd..000000000000 --- a/pkgs/development/compilers/llvm/rocm/lld.nix +++ /dev/null @@ -1,43 +0,0 @@ -{ stdenv -, lib -, cmake -, libxml2 -, llvm -, ninja - -, version -, src -}: - -stdenv.mkDerivation rec { - inherit version src; - - sourceRoot = "${src.name}/lld"; - - pname = "lld"; - - nativeBuildInputs = [ cmake ninja ]; - - buildInputs = [ libxml2 llvm ]; - - outputs = [ "out" "dev" ]; - - cmakeFlags = [ "-DLLVM_MAIN_SRC_DIR=${src}/llvm" ]; - - 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 lib; { - description = "ROCm fork of the LLVM Linker"; - homepage = "https://github.com/RadeonOpenCompute/llvm-project"; - license = licenses.ncsa; - maintainers = with maintainers; [ acowley lovesegfault ]; - platforms = platforms.linux; - }; -} diff --git a/pkgs/development/compilers/llvm/rocm/llvm/default.nix b/pkgs/development/compilers/llvm/rocm/llvm.nix similarity index 63% rename from pkgs/development/compilers/llvm/rocm/llvm/default.nix rename to pkgs/development/compilers/llvm/rocm/llvm.nix index 80a387b3650d..557d19466860 100644 --- a/pkgs/development/compilers/llvm/rocm/llvm/default.nix +++ b/pkgs/development/compilers/llvm/rocm/llvm.nix @@ -1,5 +1,6 @@ { stdenv , lib +, fetchgit , fetchFromGitHub , writeScript , cmake @@ -12,7 +13,6 @@ , zlib , debugVersion ? false , enableManpages ? false -, enableSharedLibraries ? false , version , src @@ -30,28 +30,18 @@ in stdenv.mkDerivation rec { sourceRoot = "${src.name}/llvm"; - outputs = [ "out" "python" ] - ++ lib.optional enableSharedLibraries "lib"; - nativeBuildInputs = [ cmake ninja python3 ]; - buildInputs = [ libxml2 libffi ]; + buildInputs = [ libxml2 ]; propagatedBuildInputs = [ ncurses zlib ]; cmakeFlags = with stdenv; [ "-DCMAKE_BUILD_TYPE=${if debugVersion then "Debug" else "Release"}" "-DLLVM_INSTALL_UTILS=ON" # Needed by rustc - "-DLLVM_BUILD_TESTS=OFF" - "-DLLVM_ENABLE_FFI=ON" - "-DLLVM_ENABLE_RTTI=ON" - "-DLLVM_ENABLE_DUMP=ON" "-DLLVM_TARGETS_TO_BUILD=AMDGPU;${llvmNativeTarget}" + "-DLLVM_ENABLE_PROJECTS=clang;lld;compiler-rt" ] - ++ - lib.optional - enableSharedLibraries - "-DLLVM_LINK_LLVM_DYLIB=ON" ++ lib.optionals enableManpages [ "-DLLVM_BINUTILS_INCDIR=${libbfd.dev}/include" "-DLLVM_BUILD_DOCS=ON" @@ -61,39 +51,16 @@ in stdenv.mkDerivation rec { "-DSPHINX_WARNINGS_AS_ERRORS=OFF" ]; + patches = [ + ./install-symlinks.patch + ]; + postPatch = '' patchShebangs lib/OffloadArch/make_generated_offload_arch_h.sh - '' + lib.optionalString enableSharedLibraries '' - substitute '${./outputs.patch}' ./outputs.patch --subst-var lib - patch -p1 < ./outputs.patch + substituteInPlace ../clang/cmake/modules/CMakeLists.txt \ + --replace 'FILES_MATCHING' 'NO_SOURCE_PERMISSIONS FILES_MATCHING' ''; - # hacky fix: created binaries need to be run before installation - preBuild = '' - mkdir -p $out/ - ln -sv $PWD/lib $out - ''; - - postBuild = '' - rm -fR $out - ''; - - preCheck = '' - export LD_LIBRARY_PATH=$LD_LIBRARY_PATH''${LD_LIBRARY_PATH:+:}$PWD/lib - ''; - - postInstall = '' - moveToOutput share/opt-viewer "$python" - '' - + lib.optionalString enableSharedLibraries '' - moveToOutput "lib/libLLVM-*" "$lib" - moveToOutput "lib/libLLVM${stdenv.hostPlatform.extensions.sharedLibrary}" "$lib" - substituteInPlace "$out/lib/cmake/llvm/LLVMExports-${if debugVersion then "debug" else "release"}.cmake" \ - --replace "\''${_IMPORT_PREFIX}/lib/libLLVM-" "$lib/lib/libLLVM-" - ''; - - passthru.src = src; - updateScript = writeScript "update.sh" '' #!/usr/bin/env nix-shell #!nix-shell -i bash -p curl jq common-updater-scripts nix-prefetch-github @@ -111,11 +78,13 @@ in stdenv.mkDerivation rec { fi ''; + passthru.isClang = true; + meta = with lib; { description = "ROCm fork of the LLVM compiler infrastructure"; homepage = "https://github.com/RadeonOpenCompute/llvm-project"; license = with licenses; [ ncsa ]; - maintainers = with maintainers; [ acowley lovesegfault ]; + maintainers = with maintainers; [ acowley lovesegfault Flakebi ]; platforms = platforms.linux; }; } diff --git a/pkgs/development/compilers/llvm/rocm/llvm/outputs.patch b/pkgs/development/compilers/llvm/rocm/llvm/outputs.patch deleted file mode 100644 index 878460e05b8a..000000000000 --- a/pkgs/development/compilers/llvm/rocm/llvm/outputs.patch +++ /dev/null @@ -1,16 +0,0 @@ -diff --git a/tools/llvm-config/llvm-config.cpp b/tools/llvm-config/llvm-config.cpp -index 94d426b..37f7794 100644 ---- a/tools/llvm-config/llvm-config.cpp -+++ b/tools/llvm-config/llvm-config.cpp -@@ -333,6 +333,11 @@ int main(int argc, char **argv) { - ActiveIncludeOption = "-I" + ActiveIncludeDir; - } - -+ /// Nix-specific multiple-output handling: override ActiveLibDir -+ if (!IsInDevelopmentTree) { -+ ActiveLibDir = std::string("@lib@") + "/lib" + LLVM_LIBDIR_SUFFIX; -+ } -+ - /// We only use `shared library` mode in cases where the static library form - /// of the components provided are not available; note however that this is - /// skipped if we're run from within the build dir. However, once installed, diff --git a/pkgs/development/libraries/rocm-comgr/cmake.patch b/pkgs/development/libraries/rocm-comgr/cmake.patch new file mode 100644 index 000000000000..0c599e2403c5 --- /dev/null +++ b/pkgs/development/libraries/rocm-comgr/cmake.patch @@ -0,0 +1,224 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index eac270a..27610ec 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -53,10 +53,6 @@ set(SOURCES + + if(COMGR_BUILD_SHARED_LIBS) + add_library(amd_comgr SHARED ${SOURCES}) +- # Windows doesn't have a strip utility, so CMAKE_STRIP won't be set. +- if((CMAKE_BUILD_TYPE STREQUAL "Release") AND NOT ("${CMAKE_STRIP}" STREQUAL "")) +- add_custom_command(TARGET amd_comgr POST_BUILD COMMAND ${CMAKE_STRIP} $) +- endif() + else() + add_library(amd_comgr STATIC ${SOURCES}) + endif() +@@ -141,8 +137,8 @@ if (UNIX) + list(APPEND AMD_COMGR_PUBLIC_LINKER_OPTIONS -pthread) + if (NOT APPLE AND COMGR_BUILD_SHARED_LIBS) + configure_file( +- ${CMAKE_CURRENT_SOURCE_DIR}/src/exportmap.in +- ${CMAKE_CURRENT_BINARY_DIR}/src/exportmap @ONLY) ++ src/exportmap.in ++ src/exportmap @ONLY) + list(APPEND AMD_COMGR_PRIVATE_LINKER_OPTIONS + "-Wl,--version-script=${CMAKE_CURRENT_BINARY_DIR}/src/exportmap") + # When building a shared library with -fsanitize=address we can't be +@@ -154,6 +150,9 @@ if (UNIX) + -Wl,--no-undefined) + endif() + endif() ++ ++ # Strip in release build ++ set_target_properties(amd_comgr PROPERTIES LINK_FLAGS_RELEASE -s) + elseif (CMAKE_CXX_COMPILER_ID STREQUAL "MSVC") + list(APPEND AMD_COMGR_PRIVATE_COMPILE_OPTIONS + "/wd4244" #[[Suppress 'argument' : conversion from 'type1' to 'type2', possible loss of data]] +@@ -169,10 +168,6 @@ endif() + # the shared header. + list(APPEND AMD_COMGR_PRIVATE_COMPILE_DEFINITIONS AMD_COMGR_EXPORT) + +-configure_file( +- ${CMAKE_CURRENT_SOURCE_DIR}/include/amd_comgr.h.in +- ${CMAKE_CURRENT_BINARY_DIR}/include/amd_comgr.h @ONLY) +- + include(bc2h) + include(opencl_pch) + include(DeviceLibs) +@@ -203,8 +198,11 @@ target_compile_definitions(amd_comgr + PRIVATE "${AMD_COMGR_PRIVATE_COMPILE_DEFINITIONS}") + target_include_directories(amd_comgr + PUBLIC +- $ +- $) ++ $) ++ ++configure_file( ++ include/amd_comgr.h.in ++ include/amd_comgr.h @ONLY) + + set(AMD_COMGR_CONFIG_NAME amd_comgr-config.cmake) + set(AMD_COMGR_TARGETS_NAME amd_comgr-targets.cmake) +@@ -220,29 +218,30 @@ if (NOT COMGR_BUILD_SHARED_LIBS) + endif() + + set(AMD_COMGR_TARGETS_PATH +- "${CMAKE_CURRENT_BINARY_DIR}/${AMD_COMGR_PACKAGE_PREFIX}/${AMD_COMGR_TARGETS_NAME}") +-set(AMD_COMGR_VERSION_PATH +- "${CMAKE_CURRENT_BINARY_DIR}/${AMD_COMGR_PACKAGE_PREFIX}/${AMD_COMGR_VERSION_NAME}") +-export(TARGETS amd_comgr +- FILE "${AMD_COMGR_PACKAGE_PREFIX}/${AMD_COMGR_TARGETS_NAME}") ++ "${AMD_COMGR_PACKAGE_PREFIX}/${AMD_COMGR_TARGETS_NAME}") + configure_file("cmake/${AMD_COMGR_CONFIG_NAME}.in" +- "${AMD_COMGR_PACKAGE_PREFIX}/${AMD_COMGR_CONFIG_NAME}" ++ ${AMD_COMGR_CONFIG_NAME} + @ONLY) +-write_basic_package_version_file("${AMD_COMGR_VERSION_PATH}" ++write_basic_package_version_file("${CMAKE_CURRENT_BINARY_DIR}/${AMD_COMGR_VERSION_NAME}" + VERSION "${amd_comgr_VERSION}" + COMPATIBILITY SameMajorVersion) + + install(TARGETS amd_comgr + EXPORT amd_comgr_export +- COMPONENT amd-comgr +- RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} +- LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} +- ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}) ++ COMPONENT amd-comgr) ++install(EXPORT amd_comgr_export ++ DESTINATION "${AMD_COMGR_PACKAGE_PREFIX}" ++ FILE "${AMD_COMGR_TARGETS_NAME}") + + install(FILES + "${CMAKE_CURRENT_BINARY_DIR}/include/amd_comgr.h" + COMPONENT amd-comgr + DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}) ++install(FILES ++ "${CMAKE_CURRENT_BINARY_DIR}/${AMD_COMGR_CONFIG_NAME}" ++ "${CMAKE_CURRENT_BINARY_DIR}/${AMD_COMGR_VERSION_NAME}" ++ COMPONENT amd-comgr ++ DESTINATION ${AMD_COMGR_PACKAGE_PREFIX}) + + install(FILES + "README.md" +@@ -251,37 +250,6 @@ install(FILES + COMPONENT amd-comgr + DESTINATION ${CMAKE_INSTALL_DATADIR}/amd_comgr) + +-# Generate the install-tree package. +-set(AMD_COMGR_PREFIX_CODE " +-# Derive absolute install prefix from config file path. +-get_filename_component(AMD_COMGR_PREFIX \"\${CMAKE_CURRENT_LIST_FILE}\" PATH)") +-string(REGEX REPLACE "/" ";" count "${AMD_COMGR_PACKAGE_PREFIX}") +-foreach(p ${count}) +- set(AMD_COMGR_PREFIX_CODE "${AMD_COMGR_PREFIX_CODE} +-get_filename_component(AMD_COMGR_PREFIX \"\${AMD_COMGR_PREFIX}\" PATH)") +-endforeach() +- +-if (NOT COMGR_BUILD_SHARED_LIBS) +- string(APPEND AMD_COMGR_PREFIX_CODE "\ninclude(CMakeFindDependencyMacro)\n") +- string(APPEND AMD_COMGR_PREFIX_CODE "find_dependency(Clang REQUIRED)\n") +- string(APPEND AMD_COMGR_PREFIX_CODE "find_dependency(LLD REQUIRED)\n") +-endif() +- +-set(AMD_COMGR_TARGETS_PATH "\${AMD_COMGR_PREFIX}/${AMD_COMGR_PACKAGE_PREFIX}/${AMD_COMGR_TARGETS_NAME}") +-configure_file("cmake/${AMD_COMGR_CONFIG_NAME}.in" +- "${CMAKE_CURRENT_BINARY_DIR}/${AMD_COMGR_CONFIG_NAME}.install" +- @ONLY) +-install(FILES +- "${CMAKE_CURRENT_BINARY_DIR}/${AMD_COMGR_CONFIG_NAME}.install" +- DESTINATION "${AMD_COMGR_PACKAGE_PREFIX}" +- RENAME "${AMD_COMGR_CONFIG_NAME}") +-install(EXPORT amd_comgr_export +- DESTINATION "${AMD_COMGR_PACKAGE_PREFIX}" +- FILE "${AMD_COMGR_TARGETS_NAME}") +-install(FILES +- "${AMD_COMGR_VERSION_PATH}" +- DESTINATION "${AMD_COMGR_PACKAGE_PREFIX}") +- + set(CLANG_LIBS + clangFrontendTool) + +diff --git a/cmake/bc2h.cmake b/cmake/bc2h.cmake +index 146fe2b..9134985 100644 +--- a/cmake/bc2h.cmake ++++ b/cmake/bc2h.cmake +@@ -1,40 +1,41 @@ +-file(WRITE ${CMAKE_CURRENT_BINARY_DIR}/bc2h.c +-"#include \n" +-"int main(int argc, char **argv){\n" +-" FILE *ifp, *ofp;\n" +-" int c, i, l;\n" +-" if (argc != 4) return 1;\n" +-" ifp = fopen(argv[1], \"rb\");\n" +-" if (!ifp) return 1;\n" +-" i = fseek(ifp, 0, SEEK_END);\n" +-" if (i < 0) return 1;\n" +-" l = ftell(ifp);\n" +-" if (l < 0) return 1;\n" +-" i = fseek(ifp, 0, SEEK_SET);\n" +-" if (i < 0) return 1;\n" +-" ofp = fopen(argv[2], \"wb+\");\n" +-" if (!ofp) return 1;\n" +-" fprintf(ofp, \"#define %s_size %d\\n\\n\"\n" +-" \"#if defined __GNUC__\\n\"\n" +-" \"__attribute__((aligned (4096)))\\n\"\n" +-" \"#elif defined _MSC_VER\\n\"\n" +-" \"__declspec(align(4096))\\n\"\n" +-" \"#endif\\n\"\n" +-" \"static const unsigned char %s[%s_size+1] = {\",\n" +-" argv[3], l,\n" +-" argv[3], argv[3]);\n" +-" i = 0;\n" +-" while ((c = getc(ifp)) != EOF) {\n" +-" if (0 == (i&7)) fprintf(ofp, \"\\n \");\n" +-" fprintf(ofp, \" 0x%02x,\", c);\n" +-" ++i;\n" +-" }\n" +-" fprintf(ofp, \" 0x00\\n};\\n\\n\");\n" +-" fclose(ifp);\n" +-" fclose(ofp);\n" +-" return 0;\n" +-"}\n" +-) ++file(GENERATE OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/bc2h.c ++ CONTENT ++"#include ++int main(int argc, char **argv){ ++ FILE *ifp, *ofp; ++ int c, i, l; ++ if (argc != 4) return 1; ++ ifp = fopen(argv[1], \"rb\"); ++ if (!ifp) return 1; ++ i = fseek(ifp, 0, SEEK_END); ++ if (i < 0) return 1; ++ l = ftell(ifp); ++ if (l < 0) return 1; ++ i = fseek(ifp, 0, SEEK_SET); ++ if (i < 0) return 1; ++ ofp = fopen(argv[2], \"wb+\"); ++ if (!ofp) return 1; ++ fprintf(ofp, \"#define %s_size %d\\n\\n\" ++ \"#if defined __GNUC__\\n\" ++ \"__attribute__((aligned (4096)))\\n\" ++ \"#elif defined _MSC_VER\\n\" ++ \"__declspec(align(4096))\\n\" ++ \"#endif\\n\" ++ \"static const unsigned char %s[%s_size+1] = {\", ++ argv[3], l, ++ argv[3], argv[3]); ++ i = 0; ++ while ((c = getc(ifp)) != EOF) { ++ if (0 == (i&7)) fprintf(ofp, \"\\n \"); ++ fprintf(ofp, \" 0x%02x,\", c); ++ ++i; ++ } ++ fprintf(ofp, \" 0x00\\n};\\n\\n\"); ++ fclose(ifp); ++ fclose(ofp); ++ return 0; ++} ++") + + add_executable(bc2h ${CMAKE_CURRENT_BINARY_DIR}/bc2h.c) + if (CMAKE_CXX_COMPILER_ID STREQUAL "MSVC") diff --git a/pkgs/development/libraries/rocm-comgr/default.nix b/pkgs/development/libraries/rocm-comgr/default.nix index cf269525d536..db9e012e4eec 100644 --- a/pkgs/development/libraries/rocm-comgr/default.nix +++ b/pkgs/development/libraries/rocm-comgr/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, writeScript, cmake, clang, rocm-device-libs, lld, llvm }: +{ lib, stdenv, fetchFromGitHub, writeScript, cmake, clang, rocm-device-libs, llvm }: stdenv.mkDerivation rec { pname = "rocm-comgr"; @@ -15,18 +15,19 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake ]; - buildInputs = [ clang rocm-device-libs lld llvm ]; + buildInputs = [ clang rocm-device-libs llvm ]; cmakeFlags = [ - "-DCLANG=${clang}/bin/clang" "-DCMAKE_BUILD_TYPE=Release" "-DCMAKE_C_COMPILER=${clang}/bin/clang" "-DCMAKE_CXX_COMPILER=${clang}/bin/clang++" "-DCMAKE_PREFIX_PATH=${llvm}/lib/cmake/llvm" - "-DLLD_INCLUDE_DIRS=${lld.src}/include" + "-DLLD_INCLUDE_DIRS=${llvm}/include" "-DLLVM_TARGETS_TO_BUILD=\"AMDGPU;X86\"" ]; + patches = [ ./cmake.patch ]; + passthru.updateScript = writeScript "update.sh" '' #!/usr/bin/env nix-shell #!nix-shell -i bash -p curl jq common-updater-scripts diff --git a/pkgs/development/libraries/rocm-device-libs/default.nix b/pkgs/development/libraries/rocm-device-libs/default.nix index 0d2cdca61042..08690f3fa450 100644 --- a/pkgs/development/libraries/rocm-device-libs/default.nix +++ b/pkgs/development/libraries/rocm-device-libs/default.nix @@ -3,8 +3,6 @@ , writeScript , cmake , clang -, clang-unwrapped -, lld , llvm }: @@ -21,10 +19,10 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake ]; - buildInputs = [ clang lld llvm ]; + buildInputs = [ clang llvm ]; cmakeFlags = [ - "-DCMAKE_PREFIX_PATH=${llvm}/lib/cmake/llvm;${clang-unwrapped}/lib/cmake/clang" + "-DCMAKE_PREFIX_PATH=${llvm}/lib/cmake/llvm;${llvm}/lib/cmake/clang" "-DLLVM_TARGETS_TO_BUILD='AMDGPU;X86'" "-DCLANG=${clang}/bin/clang" ]; diff --git a/pkgs/development/libraries/rocm-opencl-runtime/default.nix b/pkgs/development/libraries/rocm-opencl-runtime/default.nix index 65a6e6b33f1b..699f00449cc7 100644 --- a/pkgs/development/libraries/rocm-opencl-runtime/default.nix +++ b/pkgs/development/libraries/rocm-opencl-runtime/default.nix @@ -6,11 +6,9 @@ , cmake , rocm-cmake , clang -, clang-unwrapped , glew , libglvnd , libX11 -, lld , llvm , mesa , numactl @@ -37,11 +35,9 @@ stdenv.mkDerivation rec { buildInputs = [ clang - clang-unwrapped glew libglvnd libX11 - lld llvm mesa numactl diff --git a/pkgs/development/libraries/rocm-runtime/default.nix b/pkgs/development/libraries/rocm-runtime/default.nix index 4fc378d0603f..36d178ea0433 100644 --- a/pkgs/development/libraries/rocm-runtime/default.nix +++ b/pkgs/development/libraries/rocm-runtime/default.nix @@ -3,7 +3,6 @@ , fetchFromGitHub , writeScript , addOpenGLRunpath -, clang-unwrapped , cmake , xxd , elfutils @@ -27,7 +26,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake xxd ]; - buildInputs = [ clang-unwrapped elfutils llvm numactl ]; + buildInputs = [ elfutils llvm numactl ]; cmakeFlags = [ "-DBITCODE_DIR=${rocm-device-libs}/amdgcn/bitcode" diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 9466bd6d8b6c..b66e944f343c 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -14132,27 +14132,27 @@ with pkgs; rocclr = callPackage ../development/libraries/rocclr { }; hip = callPackage ../development/compilers/hip { - inherit (llvmPackages_rocm) clang clang-unwrapped compiler-rt lld llvm; + inherit (llvmPackages_rocm) clang llvm; }; rocm-cmake = callPackage ../development/tools/build-managers/rocm-cmake { }; rocm-comgr = callPackage ../development/libraries/rocm-comgr { - inherit (llvmPackages_rocm) clang lld llvm; + inherit (llvmPackages_rocm) clang llvm; }; rocm-device-libs = callPackage ../development/libraries/rocm-device-libs { - inherit (llvmPackages_rocm) clang clang-unwrapped lld llvm; + inherit (llvmPackages_rocm) clang llvm; }; rocm-opencl-icd = callPackage ../development/libraries/rocm-opencl-icd { }; rocm-opencl-runtime = callPackage ../development/libraries/rocm-opencl-runtime { - inherit (llvmPackages_rocm) clang clang-unwrapped lld llvm; + inherit (llvmPackages_rocm) clang llvm; }; rocm-runtime = callPackage ../development/libraries/rocm-runtime { - inherit (llvmPackages_rocm) clang-unwrapped llvm; + inherit (llvmPackages_rocm) llvm; }; rocm-smi = python3Packages.callPackage ../tools/system/rocm-smi { }; From c62bab4a92d3311f1be145cb8b44ca1a81673340 Mon Sep 17 00:00:00 2001 From: Charlotte Van Petegem Date: Tue, 16 Aug 2022 20:43:32 +0200 Subject: [PATCH 083/164] mautrix-whatsapp: 0.6.0 -> 0.6.1 --- pkgs/servers/mautrix-whatsapp/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/mautrix-whatsapp/default.nix b/pkgs/servers/mautrix-whatsapp/default.nix index 493f067f0f92..c32e1ef450cf 100644 --- a/pkgs/servers/mautrix-whatsapp/default.nix +++ b/pkgs/servers/mautrix-whatsapp/default.nix @@ -2,18 +2,18 @@ buildGoModule rec { pname = "mautrix-whatsapp"; - version = "0.6.0"; + version = "0.6.1"; src = fetchFromGitHub { owner = "mautrix"; repo = "whatsapp"; rev = "v${version}"; - sha256 = "zhFc6BAurjrp0pHa48Eb8Iypww6o6YXPXp2ba2CXB6Q="; + sha256 = "1AcjcE57ttjypnLU/+qpPsvApiuJfSX0qbPEQKOWfIM="; }; buildInputs = [ olm ]; - vendorSha256 = "EiaQDEsysTiXNHKhbfGVgVdMKgfdUHm48eooGR1rtQg="; + vendorSha256 = "4CA/kDGohoJfdiXALN8M8fuPHQUrU2REHqVI7kKMnoY="; doCheck = false; From 5f6251aab7f747359320b1edbd2236dfebdfaedf Mon Sep 17 00:00:00 2001 From: kilianar Date: Tue, 16 Aug 2022 21:48:45 +0200 Subject: [PATCH 084/164] numix-icon-theme-circle: 22.08.07 -> 22.08.15 https://github.com/numixproject/numix-icon-theme-circle/releases/tag/22.08.15 --- pkgs/data/icons/numix-icon-theme-circle/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/data/icons/numix-icon-theme-circle/default.nix b/pkgs/data/icons/numix-icon-theme-circle/default.nix index 2385d413d3c4..1caa99ff9f80 100644 --- a/pkgs/data/icons/numix-icon-theme-circle/default.nix +++ b/pkgs/data/icons/numix-icon-theme-circle/default.nix @@ -2,13 +2,13 @@ stdenvNoCC.mkDerivation rec { pname = "numix-icon-theme-circle"; - version = "22.08.07"; + version = "22.08.15"; src = fetchFromGitHub { owner = "numixproject"; repo = pname; rev = version; - sha256 = "sha256-nYRiAp8cHDyWGlb/s6ysiI2w2Oo7yj1HnKPo0EOqvhY="; + sha256 = "sha256-2Ay5wykXuXKwcGFvFKu6SIFKdWFMdBvHwgSrqNCszMM="; }; nativeBuildInputs = [ gtk3 ]; From a09957f96b56d9eccbbb3835511d7779e96676d9 Mon Sep 17 00:00:00 2001 From: kilianar Date: Tue, 16 Aug 2022 21:49:57 +0200 Subject: [PATCH 085/164] numix-icon-theme-square: 22.08.07 -> 22.08.15 https://github.com/numixproject/numix-icon-theme-square/releases/tag/22.08.15 --- pkgs/data/icons/numix-icon-theme-square/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/data/icons/numix-icon-theme-square/default.nix b/pkgs/data/icons/numix-icon-theme-square/default.nix index 35f9f72591db..3c24621f42e7 100644 --- a/pkgs/data/icons/numix-icon-theme-square/default.nix +++ b/pkgs/data/icons/numix-icon-theme-square/default.nix @@ -2,13 +2,13 @@ stdenvNoCC.mkDerivation rec { pname = "numix-icon-theme-square"; - version = "22.08.07"; + version = "22.08.15"; src = fetchFromGitHub { owner = "numixproject"; repo = pname; rev = version; - sha256 = "sha256-AWDahl9DUAEYY7OW9E323LOdM37INcAbEXA19FYRObE="; + sha256 = "sha256-VJsxZFzraCQPNr/zS7ElPk52Tq5YHrFxaQJMUuHcnLw="; }; nativeBuildInputs = [ gtk3 ]; From a3d5cf1dd2853306d50397d8bfdee0d7566704e4 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 16 Aug 2022 21:48:46 +0000 Subject: [PATCH 086/164] python310Packages.recoll: 1.32.5 -> 1.32.7 --- pkgs/applications/search/recoll/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/search/recoll/default.nix b/pkgs/applications/search/recoll/default.nix index 7ba18bf9edc5..d73cd11036a4 100644 --- a/pkgs/applications/search/recoll/default.nix +++ b/pkgs/applications/search/recoll/default.nix @@ -35,11 +35,11 @@ mkDerivation rec { pname = "recoll"; - version = "1.32.5"; + version = "1.32.7"; src = fetchurl { url = "https://www.lesbonscomptes.com/${pname}/${pname}-${version}.tar.gz"; - sha256 = "sha256-UvRpJkapN9nXHy3TY7SVdZ/sy8f3QCHkg3/FM0oP9VY="; + sha256 = "sha256-ygim9LsLUZv5FaBiqbeq3E80NHPMHweJVwggjWYzfbo="; }; configureFlags = [ "--enable-recollq" "--disable-webkit" "--without-systemd" ] From fb5bceb3ff3b99f6531908f46526cb55c7d29eac Mon Sep 17 00:00:00 2001 From: Bernardo Meurer Date: Tue, 16 Aug 2022 18:15:15 -0400 Subject: [PATCH 087/164] nixos/fwupd: enable udisks2 Without this, you get a warning that fwupd is unable to find the ESP partition. c.f. https://github.com/fwupd/fwupd/wiki/PluginFlag:esp-not-found --- nixos/modules/services/hardware/fwupd.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/nixos/modules/services/hardware/fwupd.nix b/nixos/modules/services/hardware/fwupd.nix index 241c9d143d32..eb5f6dcf8fd0 100644 --- a/nixos/modules/services/hardware/fwupd.nix +++ b/nixos/modules/services/hardware/fwupd.nix @@ -125,6 +125,8 @@ in { services.udev.packages = [ cfg.package ]; + services.udisks2.enable = true; + systemd.packages = [ cfg.package ]; }; From 2a122411d0d938fe4b5389bc49964b4442eb1dc4 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 16 Aug 2022 22:57:00 +0000 Subject: [PATCH 088/164] tracy: 0.8.1 -> 0.8.2.1 --- pkgs/development/tools/tracy/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/tracy/default.nix b/pkgs/development/tools/tracy/default.nix index 2904e20c99fc..074dfd142c17 100644 --- a/pkgs/development/tools/tracy/default.nix +++ b/pkgs/development/tools/tracy/default.nix @@ -6,13 +6,13 @@ let disableLTO = stdenv.cc.isClang && stdenv.isDarwin; # workaround issue #19098 in stdenv.mkDerivation rec { pname = "tracy"; - version = "0.8.1"; + version = "0.8.2.1"; src = fetchFromGitHub { owner = "wolfpld"; repo = "tracy"; rev = "v${version}"; - sha256 = "sha256-4z3tos/sQUCL5UAcvqHzIzwoxo1fCGldNpmKsCXKJDs="; + sha256 = "sha256-SVzNy0JP/JrUYgelypBn8SPO+Ksm1rq2yGnxk1hCLkQ="; }; nativeBuildInputs = [ pkg-config ]; From e714f357fd1f9632329751a8c0e1c68cdf19fec5 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 16 Aug 2022 23:05:22 +0000 Subject: [PATCH 089/164] symfony-cli: 5.4.12 -> 5.4.13 --- pkgs/development/tools/symfony-cli/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/symfony-cli/default.nix b/pkgs/development/tools/symfony-cli/default.nix index 850ad6ca298b..d231f764a91f 100644 --- a/pkgs/development/tools/symfony-cli/default.nix +++ b/pkgs/development/tools/symfony-cli/default.nix @@ -2,14 +2,14 @@ buildGoModule rec { pname = "symfony-cli"; - version = "5.4.12"; - vendorSha256 = "sha256-P83dH+4vcf+UWphsqqJs03oJ47JLwUYt1cgnuCaM5lA="; + version = "5.4.13"; + vendorSha256 = "sha256-/HJgMCRfSS3ln/bW7pb6x9ugece8MFHTLHARTNMHNEU="; src = fetchFromGitHub { owner = "symfony-cli"; repo = "symfony-cli"; rev = "v${version}"; - sha256 = "sha256-8cJqcvBXjyy9Sk5ZYw0LZs1zPVWrc6udL3qKdIjTklI="; + sha256 = "sha256-yTCq+kx86TGjDZ9Cx4d4ni1Q8yvgXSmJP3YD1owrLN8="; }; postInstall = '' From b9b7c80f7a76ffdc3e20e5208d3acfff0904227a Mon Sep 17 00:00:00 2001 From: D Anzorge Date: Sun, 14 Aug 2022 00:00:04 +0200 Subject: [PATCH 090/164] cataclysm-dda: update locale path patch --- pkgs/games/cataclysm-dda/common.nix | 7 +------ .../cataclysm-dda/locale-path-stable.patch | 20 +++++++++++++++++++ pkgs/games/cataclysm-dda/stable.nix | 5 +++++ 3 files changed, 26 insertions(+), 6 deletions(-) create mode 100644 pkgs/games/cataclysm-dda/locale-path-stable.patch diff --git a/pkgs/games/cataclysm-dda/common.nix b/pkgs/games/cataclysm-dda/common.nix index af20169a6e08..4e39a64c4001 100644 --- a/pkgs/games/cataclysm-dda/common.nix +++ b/pkgs/games/cataclysm-dda/common.nix @@ -40,12 +40,7 @@ stdenv.mkDerivation { buildInputs = cursesDeps ++ optionals tiles tilesDeps; postPatch = '' - patchShebangs . - - # Locale patch required for Darwin builds, see: - # https://github.com/NixOS/nixpkgs/pull/74064#issuecomment-560083970 - sed -i src/translations.cpp \ - -e 's@#elif (defined(__linux__) || (defined(MACOSX) && !defined(TILES)))@#elif 1@' + patchShebangs lang/compile_mo.sh ''; makeFlags = [ diff --git a/pkgs/games/cataclysm-dda/locale-path-stable.patch b/pkgs/games/cataclysm-dda/locale-path-stable.patch new file mode 100644 index 000000000000..db8592646f0d --- /dev/null +++ b/pkgs/games/cataclysm-dda/locale-path-stable.patch @@ -0,0 +1,20 @@ +diff --git a/src/translations.cpp b/src/translations.cpp +index fa0ee479b2..0e470098dc 100644 +--- a/src/translations.cpp ++++ b/src/translations.cpp +@@ -141,15 +141,11 @@ void select_language() + std::string locale_dir() + { + std::string loc_dir; +-#if !defined(__ANDROID__) && ((defined(__linux__) || defined(BSD) || (defined(MACOSX) && !defined(TILES)))) + if( !PATH_INFO::base_path().empty() ) { + loc_dir = PATH_INFO::base_path() + "share/locale"; + } else { + loc_dir = PATH_INFO::langdir(); + } +-#else +- loc_dir = PATH_INFO::langdir(); +-#endif + return loc_dir; + } + diff --git a/pkgs/games/cataclysm-dda/stable.nix b/pkgs/games/cataclysm-dda/stable.nix index 453f5ceacae1..52f3ca41f480 100644 --- a/pkgs/games/cataclysm-dda/stable.nix +++ b/pkgs/games/cataclysm-dda/stable.nix @@ -19,6 +19,11 @@ let sha256 = "sha256-2su1uQaWl9WG41207dRvOTdVKcQsEz/y0uTi9JX52uI="; }; + patches = [ + # Unconditionally look for translation files in $out/share/locale + ./locale-path-stable.patch + ]; + makeFlags = common.makeFlags ++ [ # Makefile declares version as 0.F, with no minor release number "VERSION=${version}" From c784cdbf6b98e3e3aefb678b6ee8309cbb8bee15 Mon Sep 17 00:00:00 2001 From: Mauricio Collares Date: Tue, 16 Aug 2022 20:46:05 -0300 Subject: [PATCH 091/164] biber: import patch for Perl 5.36.0 compat --- pkgs/tools/typesetting/biber/default.nix | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/pkgs/tools/typesetting/biber/default.nix b/pkgs/tools/typesetting/biber/default.nix index 992da3578e51..b85dfcff3e2e 100644 --- a/pkgs/tools/typesetting/biber/default.nix +++ b/pkgs/tools/typesetting/biber/default.nix @@ -24,6 +24,14 @@ perlPackages.buildPerlModule { src = "${biberSource}/source/bibtex/biber/biblatex-biber.tar.gz"; + patches = [ + # Perl 5.36.0 compatibility: https://github.com/plk/biber/pull/411 + (fetchpatch { + url = "https://github.com/plk/biber/commit/d9e961710074d266ad6bdf395c98868d91952088.patch"; + sha256 = "08fx7mvq78ndnj59xv3crncih7a8201rr31367kphysz2msjbj52"; + }) + ]; + buildInputs = with perlPackages; [ autovivification BusinessISBN BusinessISMN BusinessISSN ConfigAutoConf DataCompare DataDump DateSimple EncodeEUCJPASCII EncodeHanExtra EncodeJIS2K From ab2905f473e91062d6cf6fb918020868fa4e1fca Mon Sep 17 00:00:00 2001 From: nixpkgs-upkeep-bot Date: Wed, 17 Aug 2022 00:25:55 +0000 Subject: [PATCH 092/164] vscodium: 1.70.1 -> 1.70.1.22228 --- pkgs/applications/editors/vscode/vscodium.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/applications/editors/vscode/vscodium.nix b/pkgs/applications/editors/vscode/vscodium.nix index f6b52a4fede7..7d671496cfc6 100644 --- a/pkgs/applications/editors/vscode/vscodium.nix +++ b/pkgs/applications/editors/vscode/vscodium.nix @@ -15,11 +15,11 @@ let archive_fmt = if stdenv.isDarwin then "zip" else "tar.gz"; sha256 = { - x86_64-linux = "1jvi34ym7d6j5zl9d7wg3rcy34f4ji907mixfmvs7g0z1vlra2sv"; - x86_64-darwin = "19nnkx2l4rvm23r8ii2a0jn8lvanmshwsjrsgmi7dcnf68143601"; - aarch64-linux = "17rx5v3kzwzkzhckly8s413370mrh7rcyhpnppmn39gkvy68ydhs"; - aarch64-darwin = "0ff0yn3kcb35s775w0k2l3szs137ph593qa7y3p2h4sbfsrgljxz"; - armv7l-linux = "0qhik2qhbwpjrbkpdc8cblvrh1hqld69il78zmayq1bbkqzhhmp5"; + x86_64-linux = "04jmp9z9b8gqq1nxfw186fnyd0glcp0s8iiy5g2zy2y7jsllm5qi"; + x86_64-darwin = "119k1q1dnnhzdyv3wx13ghpwvsrmb1s8ira50ldlac3dr54rhjc9"; + aarch64-linux = "0sr9q4rm63p6lgg3qq86hmkcyg4i6znijw1k5h0sv1qc9hrlq6gv"; + aarch64-darwin = "0n742ka8ap35klx5yiba08fyqfq5077l8f8b8r5if91rcdwmkwm1"; + armv7l-linux = "0a5wd91ksdgabalgmk9pwjjl2haxdidyxz3bnrmrvr1hnlylq1mh"; }.${system} or throwSystem; sourceRoot = if stdenv.isDarwin then "" else "."; @@ -29,7 +29,7 @@ in # Please backport all compatible updates to the stable release. # This is important for the extension ecosystem. - version = "1.70.1"; + version = "1.70.1.22228"; pname = "vscodium"; executableName = "codium"; From 953213ab851f20c33c2e71e7cad13367ebc36d80 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Christian=20K=C3=B6gler?= Date: Sun, 14 Aug 2022 18:12:08 +0200 Subject: [PATCH 093/164] oneDDN: 2.3.2 -> 2.6.1 --- pkgs/development/libraries/oneDNN/default.nix | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/pkgs/development/libraries/oneDNN/default.nix b/pkgs/development/libraries/oneDNN/default.nix index a4c4bb057251..8137f2b55b31 100644 --- a/pkgs/development/libraries/oneDNN/default.nix +++ b/pkgs/development/libraries/oneDNN/default.nix @@ -5,13 +5,13 @@ # https://github.com/oneapi-src/oneDNN#oneapi-deep-neural-network-library-onednn stdenv.mkDerivation rec { pname = "oneDNN"; - version = "2.3.2"; + version = "2.6.1"; src = fetchFromGitHub { owner = "oneapi-src"; repo = "oneDNN"; rev = "v${version}"; - sha256 = "sha256-sfTcBthrnt7m9AnzdwWl9yLu1jRpwUp8i9s9DlA3IJo="; + sha256 = "sha256-cO8hT5ZrA9VegxOFH9fHm3YKK4A6XmaWIAfPTytNu6I="; }; outputs = [ "out" "dev" "doc" ]; @@ -21,12 +21,6 @@ stdenv.mkDerivation rec { # Tests fail on some Hydra builders, because they do not support SSE4.2. doCheck = false; - # The cmake install gets tripped up and installs a nix tree into $out, in - # addition to the correct install; clean it up. - postInstall = '' - rm -r $out/nix - ''; - meta = with lib; { description = "oneAPI Deep Neural Network Library (oneDNN)"; homepage = "https://01.org/oneDNN"; From 579237dbf5fa9722b204b62406d2e1a21516df51 Mon Sep 17 00:00:00 2001 From: Brian McKenna Date: Sat, 15 Jan 2022 07:29:24 +1000 Subject: [PATCH 094/164] onnxruntime: init at 1.10.0 (resurrected) --- .../libraries/onnxruntime/default.nix | 135 ++++++++++++++++++ pkgs/top-level/aliases.nix | 1 - pkgs/top-level/all-packages.nix | 2 + 3 files changed, 137 insertions(+), 1 deletion(-) create mode 100644 pkgs/development/libraries/onnxruntime/default.nix diff --git a/pkgs/development/libraries/onnxruntime/default.nix b/pkgs/development/libraries/onnxruntime/default.nix new file mode 100644 index 000000000000..4e41513bb191 --- /dev/null +++ b/pkgs/development/libraries/onnxruntime/default.nix @@ -0,0 +1,135 @@ +{ stdenv +, lib +, fetchFromGitHub +, fetchpatch +, runCommand +, patchutils +, pkg-config +, glibcLocales +, cmake +, python3 +, libpng +, zlib +, eigen +, protobuf +, nsync +, flatbuffers +, howard-hinnant-date +, re2 +, nlohmann_json +, boost +, oneDNN +}: + +let + externals = { + pytorch_cpuinfo = fetchFromGitHub { + owner = "pytorch"; + repo = "cpuinfo"; + rev = "5916273f79a21551890fd3d56fc5375a78d1598d"; + sha256 = "sha256-nXBnloVTuB+AVX59VDU/Wc+Dsx94o92YQuHp3jowx2A="; + }; + onnx = fetchFromGitHub { + owner = "onnx"; + repo = "onnx"; + rev = "be76ca7148396176784ba8733133b9fb1186ea0d"; + sha256 = "sha256-WwbfUijV67LL69RPgz+4m6EcwSyBNFweGUe0jkYRpbg="; + }; + "SafeInt/safeint" = fetchFromGitHub { + owner = "dcleblanc"; + repo = "SafeInt"; + rev = "a104e0cf23be4fe848f7ef1f3e8996fe429b06bb"; + sha256 = "sha256-LmQNIoHPqvl8asn86P33SDn+lCg8LpLfxUmoG9CGEdc="; + }; + }; +in +stdenv.mkDerivation rec { + pname = "onnxruntime"; + version = "1.10.0"; + + src = fetchFromGitHub { + owner = "microsoft"; + repo = "onnxruntime"; + rev = "v${version}"; + sha256 = "sha256-kWl0xrbTQL2FBSvpiqTcaj8uZV+ZV8gJJvj4/I0jopw="; + }; + + preConfigure = lib.concatStringsSep "\n" (lib.mapAttrsToList (name: path: '' + rmdir cmake/external/${name} + ln -s ${path} cmake/external/${name} + '') externals); + + patches = [ + # Exclude the flatbuffers change which breaks things + (runCommand "filtered" { + AUR_PATCH = fetchpatch { + name = "aur-build-fixes.patch"; + url = "https://aur.archlinux.org/cgit/aur.git/plain/build-fixes.patch?h=python-onnxruntime&id=0185531906bda3a9aba93bbb0f3dcfeb0ae671ad"; + sha256 = "sha256-bAJWThTbECQaoqDdkjHLneg6I1BshGMyCWaj7nfACvA="; + }; + } '' + ${patchutils}/bin/filterdiff --hunks 1,2 $AUR_PATCH > $out + '') + (fetchpatch { + name = "system-dnnl.patch"; + url = "https://aur.archlinux.org/cgit/aur.git/plain/system-dnnl.diff?h=python-onnxruntime&id=0185531906bda3a9aba93bbb0f3dcfeb0ae671ad"; + sha256 = "sha256-58RBrQnAWNtc/1pmFs+PkZ6qCsL1LfMY3P0exMKzotA="; + }) + ]; + + # TODO: build server, and move .so's to lib output + outputs = [ "out" "dev" ]; + + nativeBuildInputs = [ + cmake + pkg-config + python3 + ]; + + buildInputs = [ + libpng + zlib + protobuf + nsync + flatbuffers + howard-hinnant-date + re2 + nlohmann_json + boost + oneDNN + ]; + + cmakeDir = "../cmake"; + + cmakeFlags = [ + "-Donnxruntime_PREFER_SYSTEM_LIB=ON" + "-Donnxruntime_BUILD_SHARED_LIB=ON" + "-Donnxruntime_ENABLE_LTO=ON" + "-Donnxruntime_BUILD_UNIT_TESTS=OFF" + "-Donnxruntime_USE_PREINSTALLED_EIGEN=ON" + "-Donnxruntime_USE_MPI=ON" + "-Deigen_SOURCE_PATH=${eigen.src}" + "-Donnxruntime_USE_DNNL=YES" + ]; + + enableParallelBuilding = true; + + meta = { + description = "Cross-platform, high performance scoring engine for ML models"; + longDescription = '' + ONNX Runtime is a performance-focused complete scoring engine + for Open Neural Network Exchange (ONNX) models, with an open + extensible architecture to continually address the latest developments + in AI and Deep Learning. ONNX Runtime stays up to date with the ONNX + standard with complete implementation of all ONNX operators, and + supports all ONNX releases (1.2+) with both future and backwards + compatibility. + ''; + homepage = "https://github.com/microsoft/onnxruntime"; + changelog = "https://github.com/microsoft/onnxruntime/releases"; + # https://github.com/microsoft/onnxruntime/blob/master/BUILD.md#architectures + platforms = lib.platforms.unix; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ jonringer puffnfresh ]; + }; +} diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index bd27f1db3182..3d1eb0c2035a 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -989,7 +989,6 @@ mapAliases ({ odpdown = throw "odpdown has been removed because it lacks python3 support"; # Added 2022-04-25 ofp = throw "ofp is not compatible with odp-dpdk"; olifant = throw "olifant has been removed from nixpkgs, as it was unmaintained"; # Added 2021-08-05 - onnxruntime = throw "onnxruntime has been removed due to poor maintainability"; # Added 2020-12-04 openbazaar = throw "openbazzar has been removed from nixpkgs as upstream has abandoned the project"; # Added 2022-01-06 openbazaar-client = throw "openbazzar-client has been removed from nixpkgs as upstream has abandoned the project"; # Added 2022-01-06 opencascade_oce = throw "'opencascade_oce' has been renamed to/replaced by 'opencascade'"; # Converted to throw 2022-02-22 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index bd7a49ef54fe..bc770ddbc03d 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4382,6 +4382,8 @@ with pkgs; online-judge-tools = with python3.pkgs; toPythonApplication online-judge-tools; + onnxruntime = callPackage ../development/libraries/onnxruntime { }; + xkbd = callPackage ../applications/misc/xkbd { }; libpsm2 = callPackage ../os-specific/linux/libpsm2 { }; From da9cf977b7d2c0ee780277d26664628a7c087712 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Christian=20K=C3=B6gler?= Date: Sun, 14 Aug 2022 18:37:57 +0200 Subject: [PATCH 095/164] onnxruntime: 1.10.0 -> 1.12.1 --- .../libraries/onnxruntime/default.nix | 92 ++++++++----------- 1 file changed, 37 insertions(+), 55 deletions(-) diff --git a/pkgs/development/libraries/onnxruntime/default.nix b/pkgs/development/libraries/onnxruntime/default.nix index 4e41513bb191..e3ef22676412 100644 --- a/pkgs/development/libraries/onnxruntime/default.nix +++ b/pkgs/development/libraries/onnxruntime/default.nix @@ -2,74 +2,43 @@ , lib , fetchFromGitHub , fetchpatch -, runCommand -, patchutils +, fetchurl , pkg-config -, glibcLocales , cmake , python3 , libpng , zlib , eigen , protobuf -, nsync -, flatbuffers , howard-hinnant-date -, re2 , nlohmann_json , boost , oneDNN +, gtest }: let - externals = { - pytorch_cpuinfo = fetchFromGitHub { - owner = "pytorch"; - repo = "cpuinfo"; - rev = "5916273f79a21551890fd3d56fc5375a78d1598d"; - sha256 = "sha256-nXBnloVTuB+AVX59VDU/Wc+Dsx94o92YQuHp3jowx2A="; - }; - onnx = fetchFromGitHub { - owner = "onnx"; - repo = "onnx"; - rev = "be76ca7148396176784ba8733133b9fb1186ea0d"; - sha256 = "sha256-WwbfUijV67LL69RPgz+4m6EcwSyBNFweGUe0jkYRpbg="; - }; - "SafeInt/safeint" = fetchFromGitHub { - owner = "dcleblanc"; - repo = "SafeInt"; - rev = "a104e0cf23be4fe848f7ef1f3e8996fe429b06bb"; - sha256 = "sha256-LmQNIoHPqvl8asn86P33SDn+lCg8LpLfxUmoG9CGEdc="; - }; + # prefetch abseil + # Note: keep URL in sync with `cmake/external/abseil-cpp.cmake` + abseil = fetchurl { + url = "https://github.com/abseil/abseil-cpp/archive/refs/tags/20211102.0.zip"; + sha256 = "sha256-pFZ/8C+spnG5XjHTFbqxi0K2xvGmDpHG6oTlohQhEsI="; }; in stdenv.mkDerivation rec { pname = "onnxruntime"; - version = "1.10.0"; + version = "1.12.1"; src = fetchFromGitHub { owner = "microsoft"; repo = "onnxruntime"; rev = "v${version}"; - sha256 = "sha256-kWl0xrbTQL2FBSvpiqTcaj8uZV+ZV8gJJvj4/I0jopw="; + sha256 = "sha256-wwllEemiHTp9aJcCd1gsTS4WUVMp5wW+4i/+6DzmAeM="; + fetchSubmodules = true; }; - preConfigure = lib.concatStringsSep "\n" (lib.mapAttrsToList (name: path: '' - rmdir cmake/external/${name} - ln -s ${path} cmake/external/${name} - '') externals); - patches = [ - # Exclude the flatbuffers change which breaks things - (runCommand "filtered" { - AUR_PATCH = fetchpatch { - name = "aur-build-fixes.patch"; - url = "https://aur.archlinux.org/cgit/aur.git/plain/build-fixes.patch?h=python-onnxruntime&id=0185531906bda3a9aba93bbb0f3dcfeb0ae671ad"; - sha256 = "sha256-bAJWThTbECQaoqDdkjHLneg6I1BshGMyCWaj7nfACvA="; - }; - } '' - ${patchutils}/bin/filterdiff --hunks 1,2 $AUR_PATCH > $out - '') + # Use dnnl from nixpkgs instead of submodules (fetchpatch { name = "system-dnnl.patch"; url = "https://aur.archlinux.org/cgit/aur.git/plain/system-dnnl.diff?h=python-onnxruntime&id=0185531906bda3a9aba93bbb0f3dcfeb0ae671ad"; @@ -77,44 +46,57 @@ stdenv.mkDerivation rec { }) ]; - # TODO: build server, and move .so's to lib output - outputs = [ "out" "dev" ]; - nativeBuildInputs = [ cmake pkg-config python3 + gtest ]; buildInputs = [ libpng zlib protobuf - nsync - flatbuffers howard-hinnant-date - re2 nlohmann_json boost oneDNN ]; + # TODO: build server, and move .so's to lib output + outputs = [ "out" "dev" ]; + + enableParallelBuilding = true; + cmakeDir = "../cmake"; cmakeFlags = [ "-Donnxruntime_PREFER_SYSTEM_LIB=ON" "-Donnxruntime_BUILD_SHARED_LIB=ON" "-Donnxruntime_ENABLE_LTO=ON" - "-Donnxruntime_BUILD_UNIT_TESTS=OFF" + "-Donnxruntime_BUILD_UNIT_TESTS=ON" "-Donnxruntime_USE_PREINSTALLED_EIGEN=ON" "-Donnxruntime_USE_MPI=ON" "-Deigen_SOURCE_PATH=${eigen.src}" "-Donnxruntime_USE_DNNL=YES" ]; - enableParallelBuilding = true; + doCheck = true; - meta = { + postPatch = '' + substituteInPlace cmake/external/abseil-cpp.cmake \ + --replace "${abseil.url}" "${abseil}" + ''; + + postInstall = '' + # perform parts of `tools/ci_build/github/linux/copy_strip_binary.sh` + install -m644 -Dt $out/include \ + ../include/onnxruntime/core/framework/provider_options.h \ + ../include/onnxruntime/core/providers/cpu/cpu_provider_factory.h \ + ../include/onnxruntime/core/session/onnxruntime_*.h + ''; + + meta = with lib; { description = "Cross-platform, high performance scoring engine for ML models"; longDescription = '' ONNX Runtime is a performance-focused complete scoring engine @@ -126,10 +108,10 @@ stdenv.mkDerivation rec { compatibility. ''; homepage = "https://github.com/microsoft/onnxruntime"; - changelog = "https://github.com/microsoft/onnxruntime/releases"; + changelog = "https://github.com/microsoft/onnxruntime/releases/tag/v${version}"; # https://github.com/microsoft/onnxruntime/blob/master/BUILD.md#architectures - platforms = lib.platforms.unix; - license = lib.licenses.mit; - maintainers = with lib.maintainers; [ jonringer puffnfresh ]; + platforms = platforms.unix; + license = licenses.mit; + maintainers = with maintainers; [ jonringer puffnfresh ck3d ]; }; } From c9af8982551f903e634084b35b2597c98beed0ab Mon Sep 17 00:00:00 2001 From: Alex James Date: Mon, 15 Aug 2022 23:09:42 -0500 Subject: [PATCH 096/164] dockerTools.buildImage: make VM memSize configurable Fixes #186752. This adds buildVMMemorySize (defaults to 512 MiB) to buildImage, which is passed to vm.runInLinuxVM. This is needed for larger base images, which may otherwise cause container build failures due to OOM in the VM. --- doc/builders/images/dockertools.section.md | 7 +++++++ pkgs/build-support/docker/default.nix | 10 ++++++++-- 2 files changed, 15 insertions(+), 2 deletions(-) diff --git a/doc/builders/images/dockertools.section.md b/doc/builders/images/dockertools.section.md index d8deb6cfbc8c..6fdd4b5cadd3 100644 --- a/doc/builders/images/dockertools.section.md +++ b/doc/builders/images/dockertools.section.md @@ -36,6 +36,9 @@ buildImage { WorkingDir = "/data"; Volumes = { "/data" = { }; }; }; + + diskSize = 1024; + buildVMMemorySize = 512; } ``` @@ -59,6 +62,10 @@ The above example will build a Docker image `redis/latest` from the given base i - `config` is used to specify the configuration of the containers that will be started off the built image in Docker. The available options are listed in the [Docker Image Specification v1.2.0](https://github.com/moby/moby/blob/master/image/spec/v1.2.md#image-json-field-descriptions). +- `diskSize` is used to specify the disk size of the VM used to build the image in megabytes. By default it's 1024 MiB. + +- `buildVMMemorySize` is used to specify the memory size of the VM to build the image in megabytes. By default it's 512 MiB. + After the new layer has been created, its closure (to which `contents`, `config` and `runAsRoot` contribute) will be copied in the layer itself. Only new dependencies that are not already in the existing layers will be copied. At the end of the process, only one new single layer will be produced and added to the resulting image. diff --git a/pkgs/build-support/docker/default.nix b/pkgs/build-support/docker/default.nix index 39008df74f17..7468f056005a 100644 --- a/pkgs/build-support/docker/default.nix +++ b/pkgs/build-support/docker/default.nix @@ -205,6 +205,7 @@ rec { , fromImageName ? null , fromImageTag ? null , diskSize ? 1024 + , buildVMMemorySize ? 512 , preMount ? "" , postMount ? "" , postUmount ? "" @@ -218,6 +219,7 @@ rec { destination = "./image"; }; inherit fromImage fromImageName fromImageTag; + memSize = buildVMMemorySize; nativeBuildInputs = [ util-linux e2fsprogs jshon rsync jq ]; } '' @@ -407,6 +409,8 @@ rec { fromImageTag ? null , # How much disk to allocate for the temporary virtual machine. diskSize ? 1024 + , # How much memory to allocate for the temporary virtual machine. + buildVMMemorySize ? 512 , # Commands (bash) to run on the layer; these do not require sudo. extraCommands ? "" }: @@ -418,7 +422,7 @@ rec { runWithOverlay { name = "docker-layer-${name}"; - inherit fromImage fromImageName fromImageTag diskSize; + inherit fromImage fromImageName fromImageTag diskSize buildVMMemorySize; preMount = lib.optionalString (copyToRoot != null && copyToRoot != [ ]) '' echo "Adding contents..." @@ -517,6 +521,8 @@ rec { runAsRoot ? null , # Size of the virtual machine disk to provision when building the image. diskSize ? 1024 + , # Size of the virtual machine memory to provision when building the image. + buildVMMemorySize ? 512 , # Time of creation of the image. created ? "1970-01-01T00:00:01Z" , # Deprecated. @@ -563,7 +569,7 @@ rec { mkRootLayer { name = baseName; inherit baseJson fromImage fromImageName fromImageTag - keepContentsDirlinks runAsRoot diskSize + keepContentsDirlinks runAsRoot diskSize buildVMMemorySize extraCommands; copyToRoot = rootContents; }; From 738dcf6608aa4860d9ef348a5a863d2d1310f413 Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Wed, 17 Aug 2022 11:37:48 +1000 Subject: [PATCH 097/164] terraform-providers.dome9: remove broken vendoring, needs to be fixed upstream --- .../networking/cluster/terraform-providers/default.nix | 1 + .../cluster/terraform-providers/providers.json | 9 --------- 2 files changed, 1 insertion(+), 9 deletions(-) diff --git a/pkgs/applications/networking/cluster/terraform-providers/default.nix b/pkgs/applications/networking/cluster/terraform-providers/default.nix index fcc70509e7a1..4ce10a30f7df 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/default.nix +++ b/pkgs/applications/networking/cluster/terraform-providers/default.nix @@ -70,6 +70,7 @@ let in lib.optionalAttrs config.allowAliases { b2 = removed "b2" "2022/06"; + dome9 = removed "dome9" "2022/08"; opc = archived "opc" "2022/05"; oraclepaas = archived "oraclepaas" "2022/05"; template = archived "template" "2022/05"; diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index 52ff28cfc72e..fac8e778d658 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -348,15 +348,6 @@ "vendorSha256": "sha256-aPt1y7UEL+Y4aRm0rfHr/yJ393NP2oAqgz7+fo/msQo=", "version": "2.20.2" }, - "dome9": { - "owner": "dome9", - "provider-source-address": "registry.terraform.io/dome9/dome9", - "repo": "terraform-provider-dome9", - "rev": "v1.27.4", - "sha256": "sha256-+3jIq7f21CkuF3UZYV3o+ZIdoQi0hFgO/qXwdhkcaPI=", - "vendorSha256": null, - "version": "1.27.4" - }, "elasticsearch": { "owner": "phillbaker", "provider-source-address": "registry.terraform.io/phillbaker/elasticsearch", From 50be8adfef2d6eb9a6996d451a307ac3b9073df9 Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Wed, 17 Aug 2022 11:38:39 +1000 Subject: [PATCH 098/164] terraform-providers.ncloud: remove broken vendoring, needs to be fixed upstream --- .../networking/cluster/terraform-providers/default.nix | 1 + .../cluster/terraform-providers/providers.json | 9 --------- 2 files changed, 1 insertion(+), 9 deletions(-) diff --git a/pkgs/applications/networking/cluster/terraform-providers/default.nix b/pkgs/applications/networking/cluster/terraform-providers/default.nix index 4ce10a30f7df..312bf72f5a5a 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/default.nix +++ b/pkgs/applications/networking/cluster/terraform-providers/default.nix @@ -71,6 +71,7 @@ let lib.optionalAttrs config.allowAliases { b2 = removed "b2" "2022/06"; dome9 = removed "dome9" "2022/08"; + ncloud = removed "ncloud" "2022/08"; opc = archived "opc" "2022/05"; oraclepaas = archived "oraclepaas" "2022/05"; template = archived "template" "2022/05"; diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index fac8e778d658..acffa01ce67b 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -767,15 +767,6 @@ "vendorSha256": null, "version": "2.1.0" }, - "ncloud": { - "owner": "NaverCloudPlatform", - "provider-source-address": "registry.terraform.io/NaverCloudPlatform/ncloud", - "repo": "terraform-provider-ncloud", - "rev": "v2.2.9", - "sha256": "sha256-D9B3IJZZOCR/kzFee3sBPEbDcAL33kIef/NAYDuJv7U=", - "vendorSha256": "sha256-DPK/RF63rz5AQY/LybT8I6z6vSvqrFqypslhquRrgfg=", - "version": "2.2.9" - }, "netlify": { "owner": "AegirHealth", "provider-source-address": "registry.terraform.io/AegirHealth/netlify", From 817f5c4a8a91264eb287591962db7e23c626568f Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Wed, 17 Aug 2022 04:16:48 +0000 Subject: [PATCH 099/164] terraform-providers: update 2022-08-17 --- .../terraform-providers/providers.json | 90 +++++++++---------- 1 file changed, 45 insertions(+), 45 deletions(-) diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index acffa01ce67b..9ab1a586edee 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -32,10 +32,10 @@ "owner": "aiven", "provider-source-address": "registry.terraform.io/aiven/aiven", "repo": "terraform-provider-aiven", - "rev": "v3.5.0", - "sha256": "sha256-MLcC3fGQaXdtB+4/is30mn9+jbq7UUULFs7DxKE2jxM=", - "vendorSha256": "sha256-mnj8AlVKrTgCOexA9CZELxB1rYtOflXg+dBrSu++enI=", - "version": "3.5.0" + "rev": "v3.5.1", + "sha256": "sha256-EJPf8jDANrjg+XPhFn6L7GPUya2WbrSUX8/hQldQmnQ=", + "vendorSha256": "sha256-X9AJM4OsJ2/zl2Mm6gaz5wA6hk9AfOlUFYYN9Ojirrc=", + "version": "3.5.1" }, "akamai": { "owner": "akamai", @@ -51,10 +51,10 @@ "owner": "aliyun", "provider-source-address": "registry.terraform.io/aliyun/alicloud", "repo": "terraform-provider-alicloud", - "rev": "v1.180.0", - "sha256": "sha256-vBRik7iS9hUCdj4RfiwXswuIGOHlCMt0QHV2k9yIiGs=", + "rev": "v1.181.0", + "sha256": "sha256-zJagnn/nfueGwevgQaaiB5Y3DF6214JPa/fD/XctLHU=", "vendorSha256": "sha256-kjr93pVmMZgeJgeG8hG86CDWr95gCIAhf93OQ4tJ9kw=", - "version": "1.180.0" + "version": "1.181.0" }, "ansible": { "owner": "nbering", @@ -307,10 +307,10 @@ "owner": "digitalocean", "provider-source-address": "registry.terraform.io/digitalocean/digitalocean", "repo": "terraform-provider-digitalocean", - "rev": "v2.21.0", - "sha256": "sha256-ei3nr3SAxQBXQikzPtRs9Y6VyOavTg9GXnLVfAI7QvU=", + "rev": "v2.22.1", + "sha256": "sha256-Sc2altZo/8Y1UYpZjT8beq3VUljJAdzyXexB9Yi5WQI=", "vendorSha256": null, - "version": "2.21.0" + "version": "2.22.1" }, "dme": { "owner": "DNSMadeEasy", @@ -397,10 +397,10 @@ "owner": "FlexibleEngineCloud", "provider-source-address": "registry.terraform.io/FlexibleEngineCloud/flexibleengine", "repo": "terraform-provider-flexibleengine", - "rev": "v1.31.1", - "sha256": "sha256-QB3O9Ez+hFgBE1yYi1kqtC3WW//Ueg/Ij4p2WbQz/AE=", - "vendorSha256": "sha256-P2/yK6aLNdmC8g5dMKK0hpAdj76KtewzVVHQsVgr3J4=", - "version": "1.31.1" + "rev": "v1.32.0", + "sha256": "sha256-zO5bt17cwMnv6kk1McRPOrs4UJ15MBpTRT2WoDovXG4=", + "vendorSha256": "sha256-jX98VUNTOa0C9WiAiFUiFQ9W7vhRdXCgmmxz84CmEpw=", + "version": "1.32.0" }, "fortios": { "deleteVendor": true, @@ -426,10 +426,10 @@ "owner": "integrations", "provider-source-address": "registry.terraform.io/integrations/github", "repo": "terraform-provider-github", - "rev": "v4.28.0", - "sha256": "sha256-Pu8I+tAcrEN8ZtBv/gH1VguO1GVk3tnqeJ50cLh7/HQ=", + "rev": "v4.29.0", + "sha256": "sha256-on43tlkPxtQFwjbr5zOvzgO8RfcGc8XbUXZURa81Kkc=", "vendorSha256": null, - "version": "4.28.0" + "version": "4.29.0" }, "gitlab": { "owner": "gitlabhq", @@ -445,20 +445,20 @@ "provider-source-address": "registry.terraform.io/hashicorp/google", "proxyVendor": true, "repo": "terraform-provider-google", - "rev": "v4.31.0", - "sha256": "sha256-Y9iyWjC+XLkselVIhaM0N7iNelbdlF9jV7AjTYiD8RM=", - "vendorSha256": "sha256-hu1uK1yW07NlV3/DnKQxdGhbrzpq6MADmgkRr4+VQ1w=", - "version": "4.31.0" + "rev": "v4.32.0", + "sha256": "sha256-idekFsYnrQ4wHjAIPlZn8dSEqOP9KWQvaqImIN/mJA8=", + "vendorSha256": "sha256-LvWKVuHWOsMwucCQtrRMQ3wRnbGMid7jBG47wvBCvmY=", + "version": "4.32.0" }, "google-beta": { "owner": "hashicorp", "provider-source-address": "registry.terraform.io/hashicorp/google-beta", "proxyVendor": true, "repo": "terraform-provider-google-beta", - "rev": "v4.31.0", - "sha256": "sha256-5Ieq8LvhrlFevMgr7JKeGCkWWejjOvKhKfXpPvsNzRU=", - "vendorSha256": "sha256-hu1uK1yW07NlV3/DnKQxdGhbrzpq6MADmgkRr4+VQ1w=", - "version": "4.31.0" + "rev": "v4.32.0", + "sha256": "sha256-9iYS8lc4+QPnwMMscU/5mcDlaQrKV8Srhn9o64hZq6k=", + "vendorSha256": "sha256-LvWKVuHWOsMwucCQtrRMQ3wRnbGMid7jBG47wvBCvmY=", + "version": "4.32.0" }, "googleworkspace": { "owner": "hashicorp", @@ -545,10 +545,10 @@ "owner": "huaweicloud", "provider-source-address": "registry.terraform.io/huaweicloud/huaweicloud", "repo": "terraform-provider-huaweicloud", - "rev": "v1.38.2", - "sha256": "sha256-ZbfSpno3yEJ7u6g1dBWMza2uLS1FXEzvSKi+mMLbVGQ=", + "rev": "v1.39.0", + "sha256": "sha256-ckjCINqaW8taEzmBEjje3s15OmaAi9LWcSd7vgJyDug=", "vendorSha256": null, - "version": "1.38.2" + "version": "1.39.0" }, "huaweicloudstack": { "owner": "huaweicloud", @@ -653,10 +653,10 @@ "owner": "launchdarkly", "provider-source-address": "registry.terraform.io/launchdarkly/launchdarkly", "repo": "terraform-provider-launchdarkly", - "rev": "v2.8.0", - "sha256": "sha256-H/oKgylo8LLmx2v0BTj6Vb7JQbf9JCooFmsziog6r4E=", + "rev": "v2.9.0", + "sha256": "sha256-/9J0c79zm3s0i1Um+w+etlpsd37svtovqmBXnGZ1tog=", "vendorSha256": "sha256-Ef07RvkqXR/7qf8gHayxczBJ/ChHDmxR6+/wzaokkzk=", - "version": "2.8.0" + "version": "2.9.0" }, "libvirt": { "owner": "dmacvicar", @@ -889,10 +889,10 @@ "owner": "opsgenie", "provider-source-address": "registry.terraform.io/opsgenie/opsgenie", "repo": "terraform-provider-opsgenie", - "rev": "v0.6.11", - "sha256": "sha256-R+IKAI86DhQ2E74VpswqG75p7PRzSV77at2+dAyI5RI=", + "rev": "v0.6.14", + "sha256": "sha256-IoN7z8/ZPEr6pW7vnDjY65+gAtncV1fr+YsnggSZuZA=", "vendorSha256": null, - "version": "0.6.11" + "version": "0.6.14" }, "ovh": { "owner": "ovh", @@ -1024,10 +1024,10 @@ "owner": "jianyuan", "provider-source-address": "registry.terraform.io/jianyuan/sentry", "repo": "terraform-provider-sentry", - "rev": "v0.9.3", - "sha256": "sha256-FTwJ0H5k5zeglgjur3O6b4GybWAmVF4K7QmNMlvHnlY=", - "vendorSha256": "sha256-lmnZLgCTpKGhk+rUWwL2GQoBAXlU006Sk1GZrcEvhD4=", - "version": "0.9.3" + "rev": "v0.9.4", + "sha256": "sha256-dNyUp+gXrOvMQu5tEnv2dOsXihyd19gdYakIo7+h3pY=", + "vendorSha256": "sha256-ohPZpFCjawaymVHZoCstPeu+p0erRnfnpbjipT6Sp20=", + "version": "0.9.4" }, "shell": { "owner": "scottwinkler", @@ -1114,19 +1114,19 @@ "owner": "tencentcloudstack", "provider-source-address": "registry.terraform.io/tencentcloudstack/tencentcloud", "repo": "terraform-provider-tencentcloud", - "rev": "v1.77.1", - "sha256": "sha256-U/gmvLHu/Gt7pfxXAQYEQdpS1r7Epees2VkaHdnK1VI=", + "rev": "v1.77.3", + "sha256": "sha256-OHE8o4KJ2dsSS/Erl7MrRrAl8DTIxotEg69S9fuh7iY=", "vendorSha256": null, - "version": "1.77.1" + "version": "1.77.3" }, "tfe": { "owner": "hashicorp", "provider-source-address": "registry.terraform.io/hashicorp/tfe", "repo": "terraform-provider-tfe", - "rev": "v0.35.0", - "sha256": "sha256-YSQrDiaADEi8eTnFaXfsX3wz4bst/h/gVts4YjWbVzI=", - "vendorSha256": "sha256-Qa0EKVaMFpSpTc5z4KhAeK8bhDNPeac1QzeTSNkUwA0=", - "version": "0.35.0" + "rev": "v0.36.0", + "sha256": "sha256-xMIrEkjcYkM/LXdu/0gNX6iMJKZhGs9z2vQBbDHdelo=", + "vendorSha256": "sha256-ck6H22N5IXJVa0KeXM0Ntv+16l97v8GaT7xfGme57QE=", + "version": "0.36.0" }, "thunder": { "owner": "a10networks", From 04c142749cce5f7bd13d9b09175e72ae2c6e35d8 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 17 Aug 2022 01:28:03 +0000 Subject: [PATCH 100/164] wireless-regdb: 2022.06.06 -> 2022.08.12 --- pkgs/data/misc/wireless-regdb/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/data/misc/wireless-regdb/default.nix b/pkgs/data/misc/wireless-regdb/default.nix index cef187bf2578..1bf0abc41ae5 100644 --- a/pkgs/data/misc/wireless-regdb/default.nix +++ b/pkgs/data/misc/wireless-regdb/default.nix @@ -2,11 +2,11 @@ stdenvNoCC.mkDerivation rec { pname = "wireless-regdb"; - version = "2022.06.06"; + version = "2022.08.12"; src = fetchurl { url = "https://www.kernel.org/pub/software/network/${pname}/${pname}-${version}.tar.xz"; - sha256 = "sha256-rAD5fv7M5QRu0GnR2T8zZf35lMfHhUqPxQgx6VlTcjA="; + sha256 = "sha256-Wcj30Xlm23Gyf5DnNe6PW0LKNSdpSoxebptWvTecO4Q="; }; dontBuild = true; From 03e32b7093afd6afd1cd63c54ae522328e453354 Mon Sep 17 00:00:00 2001 From: Jiajie Chen Date: Wed, 17 Aug 2022 01:10:56 +0800 Subject: [PATCH 101/164] buildah: support build for darwin --- pkgs/development/tools/buildah/default.nix | 5 +++-- pkgs/development/tools/buildah/wrapper.nix | 2 ++ 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/buildah/default.nix b/pkgs/development/tools/buildah/default.nix index d0c630ab488e..bacbdcffc15e 100644 --- a/pkgs/development/tools/buildah/default.nix +++ b/pkgs/development/tools/buildah/default.nix @@ -1,4 +1,5 @@ { lib +, stdenv , buildGoModule , fetchFromGitHub , go-md2man @@ -32,8 +33,9 @@ buildGoModule rec { nativeBuildInputs = [ go-md2man installShellFiles pkg-config ]; buildInputs = [ - btrfs-progs gpgme + ] ++ lib.optionals stdenv.isLinux [ + btrfs-progs libapparmor libseccomp libselinux @@ -62,6 +64,5 @@ buildGoModule rec { changelog = "https://github.com/containers/buildah/releases/tag/v${version}"; license = licenses.asl20; maintainers = with maintainers; [ Profpatsch ] ++ teams.podman.members; - platforms = platforms.linux; }; } diff --git a/pkgs/development/tools/buildah/wrapper.nix b/pkgs/development/tools/buildah/wrapper.nix index a31dece7df5e..66cb060a8180 100644 --- a/pkgs/development/tools/buildah/wrapper.nix +++ b/pkgs/development/tools/buildah/wrapper.nix @@ -2,6 +2,7 @@ , runCommand , makeWrapper , lib +, stdenv , extraPackages ? [] , buildah , runc # Default container runtime @@ -20,6 +21,7 @@ let preferLocalBuild = true; binPath = lib.makeBinPath ([ + ] ++ lib.optionals stdenv.isLinux [ runc crun conmon From ace5332dcb78675cf21d7219b1d628614be21697 Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Wed, 17 Aug 2022 15:50:45 +1000 Subject: [PATCH 102/164] buildah: drop GIT_COMMIT not needed since 1.27.0 --- pkgs/development/tools/buildah/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/tools/buildah/default.nix b/pkgs/development/tools/buildah/default.nix index bacbdcffc15e..a31a95671c1e 100644 --- a/pkgs/development/tools/buildah/default.nix +++ b/pkgs/development/tools/buildah/default.nix @@ -45,7 +45,7 @@ buildGoModule rec { buildPhase = '' runHook preBuild patchShebangs . - make bin/buildah GIT_COMMIT="unknown" + make bin/buildah make -C docs GOMD2MAN="${go-md2man}/bin/go-md2man" runHook postBuild ''; From 9fa27cd43ef82ce8704cbf06356f9cc8010fe486 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 17 Aug 2022 06:09:37 +0000 Subject: [PATCH 103/164] docker-buildx: 0.8.2 -> 0.9.0 --- pkgs/applications/virtualization/docker/buildx.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/virtualization/docker/buildx.nix b/pkgs/applications/virtualization/docker/buildx.nix index b9d5a3e9275d..6aee614b816e 100644 --- a/pkgs/applications/virtualization/docker/buildx.nix +++ b/pkgs/applications/virtualization/docker/buildx.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "docker-buildx"; - version = "0.8.2"; + version = "0.9.0"; src = fetchFromGitHub { owner = "docker"; repo = "buildx"; rev = "v${version}"; - sha256 = "sha256-AGRdmYKd76k5tmBTTqsSHj3yOU8QSd11G5ito0O/dWY="; + sha256 = "sha256-fWtPoOUI5tgY9Xsf/FAZPlaagC5FR5FBHysWv788Pik="; }; vendorSha256 = null; From c7af7831338f90966115b7931fbd47fbf7f73c62 Mon Sep 17 00:00:00 2001 From: Han Verstraete Date: Thu, 24 Feb 2022 23:16:19 +0100 Subject: [PATCH 104/164] faas-cli: add git wrapper --- pkgs/development/tools/faas-cli/default.nix | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/pkgs/development/tools/faas-cli/default.nix b/pkgs/development/tools/faas-cli/default.nix index f35f64b0bc8a..07ea3a210e9a 100644 --- a/pkgs/development/tools/faas-cli/default.nix +++ b/pkgs/development/tools/faas-cli/default.nix @@ -1,4 +1,10 @@ -{ lib, stdenv, buildGoModule, fetchFromGitHub }: +{ lib +, stdenv +, buildGoModule +, fetchFromGitHub +, makeWrapper +, git +}: let faasPlatform = platform: let cpuName = platform.parsed.cpu.name; in { @@ -18,6 +24,8 @@ buildGoModule rec { sha256 = "sha256-nHpsScpVQhSoqvNZ+xTv2cA3lV1MyPZAgNLZRuyvksE="; }; + nativeBuildInputs = [ makeWrapper ]; + CGO_ENABLED = 0; vendorSha256 = null; @@ -31,6 +39,11 @@ buildGoModule rec { "-X github.com/openfaas/faas-cli/commands.Platform=${faasPlatform stdenv.targetPlatform}" ]; + postInstall = '' + wrapProgram "$out/bin/faas-cli" \ + --prefix PATH : ${lib.makeBinPath [ git ]} + ''; + meta = with lib; { homepage = "https://github.com/openfaas/faas-cli"; description = "Official CLI for OpenFaaS "; From f4eec8f9ae4a6ee223019804175ccbc4d690cb5f Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 17 Aug 2022 07:35:57 +0000 Subject: [PATCH 105/164] matrix-synapse: 1.64.0 -> 1.65.0 --- pkgs/servers/matrix-synapse/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/matrix-synapse/default.nix b/pkgs/servers/matrix-synapse/default.nix index 8f5240b42eb1..90f747370f8e 100644 --- a/pkgs/servers/matrix-synapse/default.nix +++ b/pkgs/servers/matrix-synapse/default.nix @@ -11,11 +11,11 @@ in with python3.pkgs; buildPythonApplication rec { pname = "matrix-synapse"; - version = "1.64.0"; + version = "1.65.0"; src = fetchPypi { inherit pname version; - sha256 = "sha256-hybl63hbhuUYnMi03z0Yp7L4n0x01z5uR8r5ZwHzgfI="; + sha256 = "sha256-Kn5o6RKR3mMHvACPiMvIGKmjkAwdjcw6EY6MJXKKeAE="; }; buildInputs = [ openssl ]; From f3b982df76b368a5ad5f2bec4f0fb789e2f767d9 Mon Sep 17 00:00:00 2001 From: Adam Joseph Date: Wed, 17 Aug 2022 01:46:20 -0700 Subject: [PATCH 106/164] patchelf: drop patch due to version bump --- pkgs/development/tools/misc/patchelf/default.nix | 9 --------- 1 file changed, 9 deletions(-) diff --git a/pkgs/development/tools/misc/patchelf/default.nix b/pkgs/development/tools/misc/patchelf/default.nix index 7ce8b93e613e..66ac8c66096d 100644 --- a/pkgs/development/tools/misc/patchelf/default.nix +++ b/pkgs/development/tools/misc/patchelf/default.nix @@ -16,15 +16,6 @@ stdenv.mkDerivation rec { strictDeps = true; - patches = - # This patch fixes a MIPS-specific bug in patchelf; we want Hydra - # to generate a bootstrap-files tarball for MIPS that includes - # this fix. The patches below can be dropped on the next version bump. - lib.optionals stdenv.targetPlatform.isMips [ - # https://github.com/NixOS/patchelf/pull/380 - ./patches/380.patch - ]; - setupHook = [ ./setup-hook.sh ]; enableParallelBuilding = true; From 372af7edf6b452928461ba9b4294ad735b9e7d9f Mon Sep 17 00:00:00 2001 From: Luke Granger-Brown Date: Wed, 17 Aug 2022 09:57:43 +0100 Subject: [PATCH 107/164] aiolifx-connection: init at 1.0.0 This package is very simple and a little silly but it's needed for Home Assistant's Lifx integration now apparently. --- .../aiolifx-connection/default.nix | 38 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 40 insertions(+) create mode 100644 pkgs/development/python-modules/aiolifx-connection/default.nix diff --git a/pkgs/development/python-modules/aiolifx-connection/default.nix b/pkgs/development/python-modules/aiolifx-connection/default.nix new file mode 100644 index 000000000000..92cece410ee4 --- /dev/null +++ b/pkgs/development/python-modules/aiolifx-connection/default.nix @@ -0,0 +1,38 @@ +{ lib +, fetchPypi +, buildPythonPackage +, pythonOlder +, aiolifx +}: + +buildPythonPackage rec { + pname = "aiolifx-connection"; + version = "1.0.0"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; + + src = fetchPypi { + pname = "aiolifx_connection"; + inherit version; + hash = "sha256:09fydp5fqqh1s0vav39mw98i1la6qcgk17gch0m5ihyl9q50ks13"; + }; + + propagatedBuildInputs = [ + aiolifx + ]; + + # tests are not implemented + doCheck = false; + + pythonImportsCheck = [ + "aiolifx_connection" + ]; + + meta = with lib; { + description = "Wrapper for aiolifx to connect to a single LIFX device"; + homepage = "https://github.com/bdraco/aiolifx_connection"; + license = licenses.bsd3; + maintainers = with maintainers; [ lukegb ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 9c5aacd7bfb2..a8f6c06c03c3 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -361,6 +361,8 @@ in { aiolifx = callPackage ../development/python-modules/aiolifx { }; + aiolifx-connection = callPackage ../development/python-modules/aiolifx-connection { }; + aiolifx-effects = callPackage ../development/python-modules/aiolifx-effects { }; aiolimiter = callPackage ../development/python-modules/aiolimiter { }; From cc4f3421ad640228a24fcfa5fd4059e7c4f8c5df Mon Sep 17 00:00:00 2001 From: Luke Granger-Brown Date: Wed, 17 Aug 2022 09:58:14 +0100 Subject: [PATCH 108/164] home-assistant: add aiolifx-connection dependency Reran update.sh for the current version to regenerate component-packages.nix. --- pkgs/servers/home-assistant/component-packages.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/servers/home-assistant/component-packages.nix b/pkgs/servers/home-assistant/component-packages.nix index 304a36281b3d..632e6a919d05 100644 --- a/pkgs/servers/home-assistant/component-packages.nix +++ b/pkgs/servers/home-assistant/component-packages.nix @@ -1448,10 +1448,11 @@ ]; "lifx" = ps: with ps; [ aiohttp-cors + aiolifx-connection aiolifx aiolifx-effects ifaddr - ]; # missing inputs: aiolifx-connection + ]; "lifx_cloud" = ps: with ps; [ ]; "light" = ps: with ps; [ @@ -3557,6 +3558,7 @@ "lcn" "lg_soundbar" "life360" + "lifx" "light" "litterrobot" "local_file" From 962766009d79d151579d102efbecf2425a39fec8 Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Wed, 17 Aug 2022 11:23:50 +0200 Subject: [PATCH 109/164] grafana: 9.0.7 -> 9.1.0 ChangeLog: https://github.com/grafana/grafana/releases/tag/v9.1.0 --- pkgs/servers/monitoring/grafana/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/servers/monitoring/grafana/default.nix b/pkgs/servers/monitoring/grafana/default.nix index c25c34c125a9..54a1dd620ee1 100644 --- a/pkgs/servers/monitoring/grafana/default.nix +++ b/pkgs/servers/monitoring/grafana/default.nix @@ -2,7 +2,7 @@ buildGoModule rec { pname = "grafana"; - version = "9.0.7"; + version = "9.1.0"; excludedPackages = [ "alert_webhook_listener" "clean-swagger" "release_publisher" "slow_proxy" "slow_proxy_mac" "macaron" "devenv" ]; @@ -10,15 +10,15 @@ buildGoModule rec { rev = "v${version}"; owner = "grafana"; repo = "grafana"; - sha256 = "sha256-rmcoyYBTT1po0TphmoGSoiS13W98LvjBhizKkhZVMzE="; + sha256 = "sha256-idwoecfAm6bbiC0sXwz/b/KXA+f9GRtDZjMR5Ff4yt4="; }; srcStatic = fetchurl { url = "https://dl.grafana.com/oss/release/grafana-${version}.linux-amd64.tar.gz"; - sha256 = "sha256-9mXmot/UjMNrfDQ1MXSQvjn6cBBNQ4gP7bJvpBqBIKc="; + sha256 = "sha256-TFGgwdZRz77bSimbhGsD06Wi9RwWJ1dNm9RPAnIZ9gE="; }; - vendorSha256 = "sha256-6Z1qvn5HTybKAjsst8kSGYCbEIBsPyhNswVGGiMD9B8="; + vendorSha256 = "sha256-6mf49PWp3htCDvXIQuc/mmqqFXFJcP8jDoDSQGi4rKc="; nativeBuildInputs = [ wire ]; From 7ed0a6f85f4f86acd0fde7ba91f7cea4b9d7c0a9 Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Tue, 9 Aug 2022 17:13:21 +0200 Subject: [PATCH 110/164] =?UTF-8?q?ocamlPackages.graphql:=200.13.0=20?= =?UTF-8?q?=E2=86=92=200.14.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ocamlPackages.irmin-graphql: mark as broken --- pkgs/development/ocaml-modules/graphql/default.nix | 2 +- pkgs/development/ocaml-modules/graphql/lwt.nix | 2 +- pkgs/development/ocaml-modules/graphql/parser.nix | 12 +++++------- pkgs/development/ocaml-modules/irmin/graphql.nix | 1 + 4 files changed, 8 insertions(+), 9 deletions(-) diff --git a/pkgs/development/ocaml-modules/graphql/default.nix b/pkgs/development/ocaml-modules/graphql/default.nix index f3adfdc87a9d..5bf61789e83a 100644 --- a/pkgs/development/ocaml-modules/graphql/default.nix +++ b/pkgs/development/ocaml-modules/graphql/default.nix @@ -3,7 +3,7 @@ buildDunePackage rec { pname = "graphql"; - inherit (graphql_parser) version useDune2 src; + inherit (graphql_parser) version src; propagatedBuildInputs = [ graphql_parser rresult yojson ]; diff --git a/pkgs/development/ocaml-modules/graphql/lwt.nix b/pkgs/development/ocaml-modules/graphql/lwt.nix index 187856da0d61..8fd6abfb8fb4 100644 --- a/pkgs/development/ocaml-modules/graphql/lwt.nix +++ b/pkgs/development/ocaml-modules/graphql/lwt.nix @@ -3,7 +3,7 @@ buildDunePackage rec { pname = "graphql-lwt"; - inherit (graphql) version useDune2 src; + inherit (graphql) version src; propagatedBuildInputs = [ graphql ocaml_lwt ]; diff --git a/pkgs/development/ocaml-modules/graphql/parser.nix b/pkgs/development/ocaml-modules/graphql/parser.nix index 62f8ca1ef129..feea74f67807 100644 --- a/pkgs/development/ocaml-modules/graphql/parser.nix +++ b/pkgs/development/ocaml-modules/graphql/parser.nix @@ -1,16 +1,14 @@ -{ lib, buildDunePackage, fetchurl, alcotest, fmt, menhir, re }: +{ lib, buildDunePackage, ocaml, fetchurl, alcotest, fmt, menhir, re }: buildDunePackage rec { pname = "graphql_parser"; - version = "0.13.0"; + version = "0.14.0"; - useDune2 = true; - - minimumOCamlVersion = "4.03"; + minimalOCamlVersion = "4.05"; src = fetchurl { url = "https://github.com/andreas/ocaml-graphql-server/releases/download/${version}/graphql-${version}.tbz"; - sha256 = "0gb5y99ph0nz5y3pc1gxq1py4wji2hyf2ydbp0hv23v00n50hpsm"; + sha256 = "sha256-v4v1ueF+NV7LvYIVinaf4rE450Z1P9OiMAito6/NHAY="; }; nativeBuildInputs = [ menhir ]; @@ -18,7 +16,7 @@ buildDunePackage rec { checkInputs = [ alcotest ]; - doCheck = true; + doCheck = lib.versionAtLeast ocaml.version "4.08"; meta = { homepage = "https://github.com/andreas/ocaml-graphql-server"; diff --git a/pkgs/development/ocaml-modules/irmin/graphql.nix b/pkgs/development/ocaml-modules/irmin/graphql.nix index 03c8f1eca291..3074cfd368e1 100644 --- a/pkgs/development/ocaml-modules/irmin/graphql.nix +++ b/pkgs/development/ocaml-modules/irmin/graphql.nix @@ -24,6 +24,7 @@ buildDunePackage rec { meta = irmin.meta // { description = "GraphQL server for Irmin"; + broken = true; # Not compatible with graphql 0.14 }; } From 6ccc885f06d513f7a91ca17ee1db3db1c0a2247b Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 17 Aug 2022 01:25:44 +0000 Subject: [PATCH 111/164] vouch-proxy: 0.37.0 -> 0.37.3 --- pkgs/servers/vouch-proxy/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/vouch-proxy/default.nix b/pkgs/servers/vouch-proxy/default.nix index ed7544e7b2e2..b812454fc4c5 100644 --- a/pkgs/servers/vouch-proxy/default.nix +++ b/pkgs/servers/vouch-proxy/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "vouch-proxy"; - version = "0.37.0"; + version = "0.37.3"; src = fetchFromGitHub { owner = "vouch"; repo = "vouch-proxy"; rev = "v${version}"; - sha256 = "0rcc5b3v5d9v4y78z5fnjbn1k10xy8cpgxjhqc7j22k9wkic05mh"; + sha256 = "sha256-zXt1Xo6xq1g1putx4q6z7SEXK4lNGRgRnNPXajL5Znw="; }; - vendorSha256 = "0pi230xcaf0wkphfn3s4h3riviihxlqwyb9lzfdvh8h5dpizxwc9"; + vendorSha256 = "sha256-E1x1QTagXkL4NQ7REDuTHpUaadiz72e3jMLPVquSSV4="; ldflags = [ "-s" "-w" From b2422f6a3ab66bc0b7479e2f9a76f5317d73680d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Thu, 11 Aug 2022 12:02:48 +0000 Subject: [PATCH 112/164] python310Packages.pyflakes: 2.4.0 -> 2.5.0 https://github.com/PyCQA/pyflakes/blob/2.5.0/NEWS.rst --- .../python-modules/pyflakes/default.nix | 27 +++++++++++++------ 1 file changed, 19 insertions(+), 8 deletions(-) diff --git a/pkgs/development/python-modules/pyflakes/default.nix b/pkgs/development/python-modules/pyflakes/default.nix index f8e00b20e726..64f554a00efd 100644 --- a/pkgs/development/python-modules/pyflakes/default.nix +++ b/pkgs/development/python-modules/pyflakes/default.nix @@ -1,23 +1,34 @@ -{ lib, buildPythonPackage, fetchPypi, pythonOlder, unittest2 }: +{ lib +, buildPythonPackage +, pythonOlder +, fetchPypi +, pytestCheckHook +}: buildPythonPackage rec { pname = "pyflakes"; - version = "2.4.0"; + version = "2.5.0"; + + disabled = pythonOlder "3.6"; + + format = "setuptools"; src = fetchPypi { inherit pname version; - sha256 = "05a85c2872edf37a4ed30b0cce2f6093e1d0581f8c19d7393122da7e25b2b24c"; + sha256 = "491feb020dca48ccc562a8c0cbe8df07ee13078df59813b83959cbdada312ea3"; }; - checkInputs = [ unittest2 ]; + checkInputs = [ + pytestCheckHook + ]; - # some tests are output dependent, which have changed slightly - doCheck = pythonOlder "3.9"; + pythonImportsCheck = [ "pyflakes" ]; meta = with lib; { - homepage = "https://launchpad.net/pyflakes"; + homepage = "https://github.com/PyCQA/pyflakes"; + changelog = "https://github.com/PyCQA/pyflakes/blob/${version}/NEWS.rst"; description = "A simple program which checks Python source files for errors"; license = licenses.mit; - maintainers = with maintainers; [ ]; + maintainers = with maintainers; [ dotlambda ]; }; } From 6d3a1b00f6fc1ccb99dfac69ae8ca3073680a757 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Thu, 11 Aug 2022 12:09:14 +0000 Subject: [PATCH 113/164] python310Packages.pycodestyle: 2.8.0 -> 2.9.1 https://github.com/PyCQA/pycodestyle/blob/2.9.1/CHANGES.txt --- .../python-modules/pycodestyle/default.nix | 25 +++++++++++-------- 1 file changed, 15 insertions(+), 10 deletions(-) diff --git a/pkgs/development/python-modules/pycodestyle/default.nix b/pkgs/development/python-modules/pycodestyle/default.nix index 865c1febddcf..9904353bfccd 100644 --- a/pkgs/development/python-modules/pycodestyle/default.nix +++ b/pkgs/development/python-modules/pycodestyle/default.nix @@ -1,4 +1,5 @@ { buildPythonPackage +, pythonOlder , fetchPypi , lib , python @@ -6,26 +7,30 @@ buildPythonPackage rec { pname = "pycodestyle"; - version = "2.8.0"; + version = "2.9.1"; + + disabled = pythonOlder "3.6"; + + format = "setuptools"; src = fetchPypi { inherit pname version; - sha256 = "0zxyrg8029lzjhima6l5nk6y0z6lm5wfp9qchz3s33j3xx3mipgd"; + sha256 = "2c9607871d58c76354b697b42f5d57e1ada7d261c261efac224b664affdc5785"; }; - dontUseSetuptoolsCheck = true; - - # https://github.com/PyCQA/pycodestyle/blob/2.5.0/tox.ini#L14 + # https://github.com/PyCQA/pycodestyle/blob/2.9.1/tox.ini#L13 checkPhase = '' - ${python.interpreter} pycodestyle.py --max-doc-length=72 --testsuite testsuite - ${python.interpreter} pycodestyle.py --statistics pycodestyle.py - ${python.interpreter} pycodestyle.py --max-doc-length=72 --doctest + ${python.interpreter} -m pycodestyle --statistics pycodestyle.py + ${python.interpreter} -m pycodestyle --max-doc-length=72 --testsuite testsuite + ${python.interpreter} -m pycodestyle --max-doc-length=72 --doctest ${python.interpreter} -m unittest discover testsuite -vv ''; + pythonImportsCheck = [ "pycodestyle" ]; + meta = with lib; { - description = "Python style guide checker (formerly called pep8)"; - homepage = "https://pycodestyle.readthedocs.io"; + description = "Python style guide checker"; + homepage = "https://pycodestyle.pycqa.org/"; license = licenses.mit; maintainers = with maintainers; [ kamadorueda From a6b0f5faaa2ea543868af8e67e39960dc0c672f4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Thu, 11 Aug 2022 12:01:29 +0000 Subject: [PATCH 114/164] python310Packages.pylama: 8.3.8 -> 8.4.1 https://github.com/klen/pylama/blob/8.4.1/Changelog --- pkgs/development/python-modules/pylama/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pylama/default.nix b/pkgs/development/python-modules/pylama/default.nix index be3854d1352e..41e2b86202d7 100644 --- a/pkgs/development/python-modules/pylama/default.nix +++ b/pkgs/development/python-modules/pylama/default.nix @@ -17,7 +17,7 @@ let pylama = buildPythonPackage rec { pname = "pylama"; - version = "8.3.8"; + version = "8.4.1"; format = "setuptools"; @@ -26,7 +26,7 @@ let pylama = buildPythonPackage rec { owner = "klen"; repo = "pylama"; rev = version; - hash = "sha256-g6Lq5NaieUI/alxqoVFfL5VaCHwB/jLcp02/N1W69yE="; + hash = "sha256-WOGtZ412tX3YH42JCd5HIngunluwtMmQrOSUZp23LPU="; }; patches = [ From b52e388cb3379a26ac459c46260b4a5710327219 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Thu, 11 Aug 2022 12:30:45 +0000 Subject: [PATCH 115/164] python310Packages.flake8: 4.0.1 -> 5.0.4 --- .../python-modules/flake8/default.nix | 45 +++++++------------ 1 file changed, 16 insertions(+), 29 deletions(-) diff --git a/pkgs/development/python-modules/flake8/default.nix b/pkgs/development/python-modules/flake8/default.nix index 73dc7403b25f..d2827d7f2194 100644 --- a/pkgs/development/python-modules/flake8/default.nix +++ b/pkgs/development/python-modules/flake8/default.nix @@ -1,62 +1,49 @@ { lib , buildPythonPackage -, fetchPypi , pythonOlder -, configparser -, enum34 +, fetchFromGitHub , mccabe , pycodestyle , pyflakes -, functools32 -, typing , importlib-metadata -, mock +, pythonAtLeast , pytestCheckHook }: buildPythonPackage rec { pname = "flake8"; - version = "4.0.1"; + version = "5.0.4"; - src = fetchPypi { - inherit pname version; - sha256 = "03c7mnk34wfz7a0m5zq0273y94awz69fy5iww8alh4a4v96h6vl0"; + disabled = pythonOlder "3.6"; + + format = "setuptools"; + + src = fetchFromGitHub { + owner = "PyCQA"; + repo = "flake8"; + rev = version; + hash = "sha256-Os8HIoM07/iOBMm+0WxdQj32pJJOJ8mkh+yLHpqkLXg="; }; - postPatch = '' - substituteInPlace setup.cfg \ - --replace "mccabe>=0.6.0,<0.7.0" "mccabe>=0.7.0,<0.8.0" - ''; - propagatedBuildInputs = [ - pyflakes - pycodestyle mccabe - ] ++ lib.optionals (pythonOlder "3.2") [ - configparser - functools32 - ] ++ lib.optionals (pythonOlder "3.4") [ - enum34 - ] ++ lib.optionals (pythonOlder "3.5") [ - typing + pycodestyle + pyflakes ] ++ lib.optionals (pythonOlder "3.8") [ importlib-metadata ]; # Tests fail on Python 3.7 due to importlib using a deprecated interface - doCheck = !(pythonOlder "3.8"); + doCheck = pythonAtLeast "3.7"; checkInputs = [ - mock pytestCheckHook ]; - disabled = pythonOlder "3.6"; - meta = with lib; { description = "Flake8 is a wrapper around pyflakes, pycodestyle and mccabe."; homepage = "https://github.com/pycqa/flake8"; license = licenses.mit; - maintainers = with maintainers; [ ]; + maintainers = with maintainers; [ dotlambda ]; }; } From 47e7f78fcb4eb96aedeee430a0c4922bdf61d751 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Thu, 11 Aug 2022 12:40:23 +0000 Subject: [PATCH 116/164] python310Packages.pytest-flake8: 1.0.7 -> 1.1.1 and mark broken https://github.com/tholo/pytest-flake8/blob/1.1.1/CHANGELOG --- .../python-modules/pytest-flake8/default.nix | 35 +++++++++---------- 1 file changed, 17 insertions(+), 18 deletions(-) diff --git a/pkgs/development/python-modules/pytest-flake8/default.nix b/pkgs/development/python-modules/pytest-flake8/default.nix index 231ddf97c948..7d1b29fbd34b 100644 --- a/pkgs/development/python-modules/pytest-flake8/default.nix +++ b/pkgs/development/python-modules/pytest-flake8/default.nix @@ -1,38 +1,37 @@ -{lib, buildPythonPackage, fetchPypi, pythonOlder, fetchpatch, pytest, flake8}: +{ lib +, buildPythonPackage +, pythonOlder +, fetchPypi +, flake8 +, pytestCheckHook +}: buildPythonPackage rec { pname = "pytest-flake8"; - version = "1.0.7"; + version = "1.1.1"; - disabled = pythonOlder "3.5"; + disabled = pythonOlder "3.7"; - # although pytest is a runtime dependency, do not add it as - # propagatedBuildInputs in order to allow packages depend on another version - # of pytest more easily - checkInputs = [ pytest ]; - propagatedBuildInputs = [ flake8 ]; + format = "setuptools"; src = fetchPypi { inherit pname version; - sha256 = "f0259761a903563f33d6f099914afef339c085085e643bee8343eb323b32dd6b"; + sha256 = "ba4f243de3cb4c2486ed9e70752c80dd4b636f7ccb27d4eba763c35ed0cd316e"; }; - # see https://github.com/tholo/pytest-flake8/pull/82/commits - patches = [ - (fetchpatch { - url = "https://github.com/tholo/pytest-flake8/commit/eda4ef74c0f25b856fe282742ea206b21e94c24c.patch"; - sha256 = "0kq0wshds00rk6wvkn6ccjrjyqxg7m9l7dlyaqw974asizw6byci"; - }) + propagatedBuildInputs = [ + flake8 ]; - checkPhase = '' - pytest . - ''; + checkInputs = [ + pytestCheckHook + ]; meta = { description = "py.test plugin for efficiently checking PEP8 compliance"; homepage = "https://github.com/tholo/pytest-flake8"; maintainers = with lib.maintainers; [ jluttine ]; license = lib.licenses.bsd2; + broken = true; # https://github.com/tholo/pytest-flake8/issues/87 }; } From 19acadab73869fab9db6a77fc68cb32438e0e250 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Thu, 11 Aug 2022 12:46:45 +0000 Subject: [PATCH 117/164] python310Packages.openapi-schema-validator: don't use pytest-flake8 --- .../python-modules/openapi-schema-validator/default.nix | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/openapi-schema-validator/default.nix b/pkgs/development/python-modules/openapi-schema-validator/default.nix index c32b85190191..2471df794fc0 100644 --- a/pkgs/development/python-modules/openapi-schema-validator/default.nix +++ b/pkgs/development/python-modules/openapi-schema-validator/default.nix @@ -5,7 +5,6 @@ , pytestCheckHook , isodate , jsonschema -, pytest-flake8 , pytest-cov , rfc3339-validator , six @@ -30,7 +29,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ isodate jsonschema six strict-rfc3339 rfc3339-validator ]; - checkInputs = [ pytestCheckHook pytest-cov pytest-flake8 ]; + checkInputs = [ pytestCheckHook pytest-cov ]; pythonImportsCheck = [ "openapi_schema_validator" ]; meta = with lib; { From 12163dff9f6922a26ce2444755ca505088e959f6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Thu, 11 Aug 2022 12:48:14 +0000 Subject: [PATCH 118/164] vulnix: don't use pytest-flake8 --- pkgs/tools/security/vulnix/default.nix | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/pkgs/tools/security/vulnix/default.nix b/pkgs/tools/security/vulnix/default.nix index 90d4e0f509b9..c3eb53c3b207 100644 --- a/pkgs/tools/security/vulnix/default.nix +++ b/pkgs/tools/security/vulnix/default.nix @@ -13,6 +13,11 @@ python3Packages.buildPythonApplication rec { sha256 = "07v3ddvvhi3bslwrlin45kz48i3va2lzd6ny0blj5i2z8z40qcfm"; }; + postPatch = '' + substituteInPlace setup.cfg \ + --replace "--flake8" "" + ''; + outputs = [ "out" "doc" "man" ]; nativeBuildInputs = [ ronn ]; @@ -20,7 +25,6 @@ python3Packages.buildPythonApplication rec { freezegun pytest pytest-cov - pytest-flake8 ]; propagatedBuildInputs = [ From a1bc7b4dbe4f0f979d810e71b40e1ab6c1768d33 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Thu, 11 Aug 2022 12:54:15 +0000 Subject: [PATCH 119/164] python310Packages.marshmallow-enum: don't use pytest-flake8 --- .../development/python-modules/marshmallow-enum/default.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/marshmallow-enum/default.nix b/pkgs/development/python-modules/marshmallow-enum/default.nix index 16af840b036b..a7852afb7082 100644 --- a/pkgs/development/python-modules/marshmallow-enum/default.nix +++ b/pkgs/development/python-modules/marshmallow-enum/default.nix @@ -5,7 +5,6 @@ , pytestCheckHook , isPy27 , enum34 -, pytest-flake8 }: buildPythonPackage rec { @@ -19,13 +18,16 @@ buildPythonPackage rec { sha256 = "1ihrcmyfjabivg6hc44i59hnw5ijlg1byv3zs1rqxfynp8xr7398"; }; + postPatch = '' + sed -i '/addopts/d' tox.ini + ''; + propagatedBuildInputs = [ marshmallow ] ++ lib.optionals isPy27 [ enum34 ]; checkInputs = [ pytestCheckHook - pytest-flake8 ]; disabledTests = [ From a2859007976e49d5f7f60046cd483c39d1f6bb45 Mon Sep 17 00:00:00 2001 From: Simon Bruder Date: Tue, 26 Jul 2022 11:28:15 +0200 Subject: [PATCH 120/164] python3Packages.argparse_addons: init at 0.8.0 --- .../argparse-addons/default.nix | 21 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 23 insertions(+) create mode 100644 pkgs/development/python-modules/argparse-addons/default.nix diff --git a/pkgs/development/python-modules/argparse-addons/default.nix b/pkgs/development/python-modules/argparse-addons/default.nix new file mode 100644 index 000000000000..1116ff3c3039 --- /dev/null +++ b/pkgs/development/python-modules/argparse-addons/default.nix @@ -0,0 +1,21 @@ +{ lib, buildPythonPackage, fetchPypi }: + +buildPythonPackage rec { + pname = "argparse-addons"; + version = "0.8.0"; + + src = fetchPypi { + pname = "argparse_addons"; + inherit version; + sha256 = "sha256-uwiBB5RNM56NLnCnYwXd41FUTixb3rrxwttWrS5tzeg="; + }; + + pythonImportsCheck = [ "argparse_addons" ]; + + meta = with lib; { + description = "Additional Python argparse types and actions"; + homepage = "https://github.com/eerimoq/argparse_addons"; + license = licenses.mit; + maintainers = with maintainers; [ frogamic sbruder ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 9c5aacd7bfb2..3bd9ed7f19c9 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -685,6 +685,8 @@ in { argon2-cffi-bindings = callPackage ../development/python-modules/argon2-cffi-bindings { }; + argparse-addons = callPackage ../development/python-modules/argparse-addons { }; + args = callPackage ../development/python-modules/args { }; aria2p = callPackage ../development/python-modules/aria2p { }; From af149e56ef63d127c9beeb76f5fa2a01d7bf9cbb Mon Sep 17 00:00:00 2001 From: Simon Bruder Date: Tue, 26 Jul 2022 11:31:45 +0200 Subject: [PATCH 121/164] python3Packages.bincopy: init at 17.10.2 --- .../python-modules/bincopy/default.nix | 26 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 28 insertions(+) create mode 100644 pkgs/development/python-modules/bincopy/default.nix diff --git a/pkgs/development/python-modules/bincopy/default.nix b/pkgs/development/python-modules/bincopy/default.nix new file mode 100644 index 000000000000..d5ec4774010c --- /dev/null +++ b/pkgs/development/python-modules/bincopy/default.nix @@ -0,0 +1,26 @@ +{ lib, buildPythonPackage, fetchPypi, argparse-addons, humanfriendly, pyelftools }: + +buildPythonPackage rec { + pname = "bincopy"; + version = "17.10.2"; + + src = fetchPypi { + inherit pname version; + sha256 = "sha256-d1l+kqyGkBvctfKRHxCpve/8mLa7nTfDwXzxgJznce4="; + }; + + propagatedBuildInputs = [ + argparse-addons + humanfriendly + pyelftools + ]; + + pythonImportsCheck = [ "bincopy" ]; + + meta = with lib; { + description = "Mangling of various file formats that conveys binary information (Motorola S-Record, Intel HEX, TI-TXT, ELF and binary files)"; + homepage = "https://github.com/eerimoq/bincopy"; + license = licenses.mit; + maintainers = with maintainers; [ frogamic sbruder ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 3bd9ed7f19c9..b6cc1b7db6b1 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -1307,6 +1307,8 @@ in { binaryornot = callPackage ../development/python-modules/binaryornot { }; + bincopy = callPackage ../development/python-modules/bincopy { }; + binho-host-adapter = callPackage ../development/python-modules/binho-host-adapter { }; binwalk = callPackage ../development/python-modules/binwalk { }; From 1a941b4b5f4940d3082d3042c3c5b3add8333369 Mon Sep 17 00:00:00 2001 From: Simon Bruder Date: Tue, 26 Jul 2022 12:41:11 +0200 Subject: [PATCH 122/164] libusbsio: init at 2.1.11 Many thanks to David Runge (dvzrv), who made an effort to get this available under a free license earlier this year: https://github.com/NXPmicro/spsdk/issues/36 --- .../libraries/libusbsio/default.nix | 37 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 39 insertions(+) create mode 100644 pkgs/development/libraries/libusbsio/default.nix diff --git a/pkgs/development/libraries/libusbsio/default.nix b/pkgs/development/libraries/libusbsio/default.nix new file mode 100644 index 000000000000..1982311919ba --- /dev/null +++ b/pkgs/development/libraries/libusbsio/default.nix @@ -0,0 +1,37 @@ +{ lib, stdenv, fetchzip, pkg-config, libusb1, systemdMinimal }: +let + binDirPrefix = if stdenv.isDarwin then "osx_" else "linux_"; +in +stdenv.mkDerivation rec { + pname = "libusbsio"; + version = "2.1.11"; + + src = fetchzip { + url = "https://www.nxp.com/downloads/en/libraries/libusbsio-${version}-src.zip"; + sha256 = "sha256-qgoeaGWTWdTk5XpJwoauckEQlqB9lp5x2+TN09vQttI="; + }; + + postPatch = '' + rm -r bin/* + ''; + + nativeBuildInputs = [ pkg-config ]; + buildInputs = [ + libusb1 + systemdMinimal # libudev + ]; + + installPhase = '' + runHook preInstall + install -D bin/${binDirPrefix}${stdenv.hostPlatform.parsed.cpu.name}/libusbsio${stdenv.hostPlatform.extensions.sharedLibrary} $out/lib/libusbsio${stdenv.hostPlatform.extensions.sharedLibrary} + runHook postInstall + ''; + + meta = with lib; { + homepage = "https://www.nxp.com/design/software/development-software/library-for-windows-macos-and-ubuntu-linux:LIBUSBSIO"; + description = "Library for communicating with devices connected via the USB bridge on LPC-Link2 and MCU-Link debug probes on supported NXP microcontroller evaluation boards"; + platforms = platforms.all; + license = licenses.bsd3; + maintainers = with maintainers; [ frogamic sbruder ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index bc770ddbc03d..ee3167e45ea1 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -19946,6 +19946,8 @@ with pkgs; libusbmuxd = callPackage ../development/libraries/libusbmuxd { }; + libusbsio = callPackage ../development/libraries/libusbsio { }; + libutempter = callPackage ../development/libraries/libutempter { }; libuldaq = callPackage ../development/libraries/libuldaq { }; From 45206b2012c479f8fb73759b0f4d0d8740437c43 Mon Sep 17 00:00:00 2001 From: Simon Bruder Date: Tue, 26 Jul 2022 12:41:34 +0200 Subject: [PATCH 123/164] python3Packages.libusbsio: init Its version is synced with libusbsio. --- .../python-modules/libusbsio/default.nix | 34 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 4 +++ 2 files changed, 38 insertions(+) create mode 100644 pkgs/development/python-modules/libusbsio/default.nix diff --git a/pkgs/development/python-modules/libusbsio/default.nix b/pkgs/development/python-modules/libusbsio/default.nix new file mode 100644 index 000000000000..b6cab59570b9 --- /dev/null +++ b/pkgs/development/python-modules/libusbsio/default.nix @@ -0,0 +1,34 @@ +{ lib, buildPythonPackage, libusbsio }: + +buildPythonPackage rec { + pname = "libusbsio"; + inherit (libusbsio) version; + + src = "${libusbsio.src}/python"; + + # The source includes both the python module directly and also a source tarball for it. + # The direct files lack setup information, the tarball includes unwanted binaries. + # This takes only the setup files from the tarball. + postUnpack = '' + tar -C python --strip-components=1 -xf python/dist/libusbsio-${version}.tar.gz libusbsio-${version}/{setup.py,setup.cfg,pyproject.toml} + rm -r python/dist + ''; + + postPatch = '' + substituteInPlace libusbsio/libusbsio.py \ + --replace "dllpath = LIBUSBSIO._lookup_dll_path(dfltdir, dllname)" 'dllpath = "${libusbsio}/lib/" + dllname' + ''; + + buildInputs = [ libusbsio ]; + + doCheck = false; # they require a device to be connected over USB + + pythonImportsCheck = [ "libusbsio" ]; + + meta = with lib; { + description = "NXP Secure Provisioning SDK"; + homepage = "https://github.com/NXPmicro/spsdk"; + license = licenses.bsd3; + maintainers = with maintainers; [ frogamic sbruder ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index b6cc1b7db6b1..b89cd79705ff 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -5128,6 +5128,10 @@ in { inherit (pkgs) libusb1; }; + libusbsio = callPackage ../development/python-modules/libusbsio { + inherit (pkgs) libusbsio; + }; + libversion = callPackage ../development/python-modules/libversion { inherit (pkgs) libversion; }; From 7a7f1ae4540e4da505eb609dd9f95c018033ccc2 Mon Sep 17 00:00:00 2001 From: Simon Bruder Date: Tue, 26 Jul 2022 14:58:33 +0200 Subject: [PATCH 124/164] python3Packages.cmsis-pack-manager: init at 0.4.0 --- .../cmsis-pack-manager/Cargo.lock | 2047 +++++++++++++++++ .../cmsis-pack-manager/default.nix | 77 + pkgs/top-level/python-packages.nix | 4 + 3 files changed, 2128 insertions(+) create mode 100644 pkgs/development/python-modules/cmsis-pack-manager/Cargo.lock create mode 100644 pkgs/development/python-modules/cmsis-pack-manager/default.nix diff --git a/pkgs/development/python-modules/cmsis-pack-manager/Cargo.lock b/pkgs/development/python-modules/cmsis-pack-manager/Cargo.lock new file mode 100644 index 000000000000..2d6cb8fd9934 --- /dev/null +++ b/pkgs/development/python-modules/cmsis-pack-manager/Cargo.lock @@ -0,0 +1,2047 @@ +# This file is automatically @generated by Cargo. +# It is not intended for manual editing. +version = 3 + +[[package]] +name = "addr2line" +version = "0.17.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b9ecd88a8c8378ca913a680cd98f0f13ac67383d35993f86c90a70e3f137816b" +dependencies = [ + "gimli", +] + +[[package]] +name = "adler" +version = "1.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe" + +[[package]] +name = "ansi_term" +version = "0.12.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d52a9bb7ec0cf484c551830a7ce27bd20d67eac647e1befb56b0be4ee39a55d2" +dependencies = [ + "winapi 0.3.9", +] + +[[package]] +name = "app_dirs" +version = "1.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e73a24bad9bd6a94d6395382a6c69fe071708ae4409f763c5475e14ee896313d" +dependencies = [ + "ole32-sys", + "shell32-sys", + "winapi 0.2.8", + "xdg", +] + +[[package]] +name = "atty" +version = "0.2.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d9b39be18770d11421cdb1b9947a45dd3f37e93092cbf377614828a319d5fee8" +dependencies = [ + "hermit-abi", + "libc", + "winapi 0.3.9", +] + +[[package]] +name = "autocfg" +version = "0.1.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0dde43e75fd43e8a1bf86103336bc699aa8d17ad1be60c76c0bdfd4828e19b78" +dependencies = [ + "autocfg 1.1.0", +] + +[[package]] +name = "autocfg" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" + +[[package]] +name = "backtrace" +version = "0.3.66" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cab84319d616cfb654d03394f38ab7e6f0919e181b1b57e1fd15e7fb4077d9a7" +dependencies = [ + "addr2line", + "cc", + "cfg-if 1.0.0", + "libc", + "miniz_oxide", + "object", + "rustc-demangle", +] + +[[package]] +name = "base-x" +version = "0.2.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4cbbc9d0964165b47557570cce6c952866c2678457aca742aafc9fb771d30270" + +[[package]] +name = "base64" +version = "0.10.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0b25d992356d2eb0ed82172f5248873db5560c4721f564b13cb5193bda5e668e" +dependencies = [ + "byteorder", +] + +[[package]] +name = "bitflags" +version = "1.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" + +[[package]] +name = "bumpalo" +version = "3.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "37ccbd214614c6783386c1af30caf03192f17891059cecc394b4fb119e363de3" + +[[package]] +name = "byteorder" +version = "1.4.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "14c189c53d098945499cdfa7ecc63567cf3886b3332b312a5b4585d8d3a6a610" + +[[package]] +name = "bytes" +version = "0.4.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "206fdffcfa2df7cbe15601ef46c813fce0965eb3286db6b56c583b814b51c81c" +dependencies = [ + "byteorder", + "either", + "iovec", +] + +[[package]] +name = "cc" +version = "1.0.73" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2fff2a6927b3bb87f9595d67196a70493f627687a71d87a0d692242c33f58c11" + +[[package]] +name = "cfg-if" +version = "0.1.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4785bdd1c96b2a846b2bd7cc02e86b6b3dbf14e7e53446c4f54c92a361040822" + +[[package]] +name = "cfg-if" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" + +[[package]] +name = "chrono" +version = "0.4.19" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "670ad68c9088c2a963aaa298cb369688cf3f9465ce5e2d4ca10e6e0098a1ce73" +dependencies = [ + "libc", + "num-integer", + "num-traits", + "time 0.1.44", + "winapi 0.3.9", +] + +[[package]] +name = "clap" +version = "2.34.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a0610544180c38b88101fecf2dd634b174a62eef6946f84dfc6a7127512b381c" +dependencies = [ + "ansi_term", + "atty", + "bitflags", + "strsim", + "textwrap", + "unicode-width", + "vec_map", +] + +[[package]] +name = "cloudabi" +version = "0.0.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ddfc5b9aa5d4507acaf872de71051dfd0e309860e88966e1051e462a077aac4f" +dependencies = [ + "bitflags", +] + +[[package]] +name = "cmsis-cffi" +version = "0.3.0" +dependencies = [ + "cmsis-pack", + "ctor", + "failure", + "log", + "simplelog", +] + +[[package]] +name = "cmsis-cli" +version = "0.3.0" +dependencies = [ + "app_dirs", + "clap", + "cmsis-pack", + "failure", + "log", + "pbr", + "simplelog", +] + +[[package]] +name = "cmsis-pack" +version = "0.3.0" +dependencies = [ + "failure", + "futures", + "log", + "minidom", + "quick-xml", + "reqwest", + "rustc-demangle", + "serde", + "serde_derive", + "serde_json", + "time 0.2.27", + "tokio-core", +] + +[[package]] +name = "const_fn" +version = "0.4.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fbdcdcb6d86f71c5e97409ad45898af11cbc995b4ee8112d59095a28d376c935" + +[[package]] +name = "cookie" +version = "0.12.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "888604f00b3db336d2af898ec3c1d5d0ddf5e6d462220f2ededc33a87ac4bbd5" +dependencies = [ + "time 0.1.44", + "url 1.7.2", +] + +[[package]] +name = "cookie_store" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "46750b3f362965f197996c4448e4a0935e791bf7d6631bfce9ee0af3d24c919c" +dependencies = [ + "cookie", + "failure", + "idna 0.1.5", + "log", + "publicsuffix", + "serde", + "serde_json", + "time 0.1.44", + "try_from", + "url 1.7.2", +] + +[[package]] +name = "crc32fast" +version = "1.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b540bd8bc810d3885c6ea91e2018302f68baba2129ab3e88f32389ee9370880d" +dependencies = [ + "cfg-if 1.0.0", +] + +[[package]] +name = "crossbeam-channel" +version = "0.5.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c2dd04ddaf88237dc3b8d8f9a3c1004b506b54b3313403944054d23c0870c521" +dependencies = [ + "cfg-if 1.0.0", + "crossbeam-utils 0.8.11", +] + +[[package]] +name = "crossbeam-deque" +version = "0.7.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c20ff29ded3204c5106278a81a38f4b482636ed4fa1e6cfbeef193291beb29ed" +dependencies = [ + "crossbeam-epoch", + "crossbeam-utils 0.7.2", + "maybe-uninit", +] + +[[package]] +name = "crossbeam-epoch" +version = "0.8.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "058ed274caafc1f60c4997b5fc07bf7dc7cca454af7c6e81edffe5f33f70dace" +dependencies = [ + "autocfg 1.1.0", + "cfg-if 0.1.10", + "crossbeam-utils 0.7.2", + "lazy_static", + "maybe-uninit", + "memoffset", + "scopeguard", +] + +[[package]] +name = "crossbeam-queue" +version = "0.2.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "774ba60a54c213d409d5353bda12d49cd68d14e45036a285234c8d6f91f92570" +dependencies = [ + "cfg-if 0.1.10", + "crossbeam-utils 0.7.2", + "maybe-uninit", +] + +[[package]] +name = "crossbeam-utils" +version = "0.7.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c3c7c73a2d1e9fc0886a08b93e98eb643461230d5f1925e4036204d5f2e261a8" +dependencies = [ + "autocfg 1.1.0", + "cfg-if 0.1.10", + "lazy_static", +] + +[[package]] +name = "crossbeam-utils" +version = "0.8.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "51887d4adc7b564537b15adcfb307936f8075dfcd5f00dde9a9f1d29383682bc" +dependencies = [ + "cfg-if 1.0.0", + "once_cell", +] + +[[package]] +name = "ct-logs" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4d3686f5fa27dbc1d76c751300376e167c5a43387f44bb451fd1c24776e49113" +dependencies = [ + "sct", +] + +[[package]] +name = "ctor" +version = "0.1.22" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f877be4f7c9f246b183111634f75baa039715e3f46ce860677d3b19a69fb229c" +dependencies = [ + "quote", + "syn", +] + +[[package]] +name = "dirs" +version = "4.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ca3aa72a6f96ea37bbc5aa912f6788242832f75369bdfdadcb0e38423f100059" +dependencies = [ + "dirs-sys", +] + +[[package]] +name = "dirs-sys" +version = "0.3.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1b1d1d91c932ef41c0f2663aa8b0ca0342d444d842c06914aa0a7e352d0bada6" +dependencies = [ + "libc", + "redox_users", + "winapi 0.3.9", +] + +[[package]] +name = "discard" +version = "1.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "212d0f5754cb6769937f4501cc0e67f4f4483c8d2c3e1e922ee9edbe4ab4c7c0" + +[[package]] +name = "dtoa" +version = "0.4.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "56899898ce76aaf4a0f24d914c97ea6ed976d42fec6ad33fcbb0a1103e07b2b0" + +[[package]] +name = "either" +version = "1.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3f107b87b6afc2a64fd13cac55fe06d6c8859f12d4b14cbcdd2c67d0976781be" + +[[package]] +name = "encoding_rs" +version = "0.8.31" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9852635589dc9f9ea1b6fe9f05b50ef208c85c834a562f0c6abb1c475736ec2b" +dependencies = [ + "cfg-if 1.0.0", +] + +[[package]] +name = "failure" +version = "0.1.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d32e9bd16cc02eae7db7ef620b392808b89f6a5e16bb3497d159c6b92a0f4f86" +dependencies = [ + "backtrace", + "failure_derive", +] + +[[package]] +name = "failure_derive" +version = "0.1.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "aa4da3c766cd7a0db8242e326e9e4e081edd567072893ed320008189715366a4" +dependencies = [ + "proc-macro2", + "quote", + "syn", + "synstructure", +] + +[[package]] +name = "flate2" +version = "1.0.24" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f82b0f4c27ad9f8bfd1f3208d882da2b09c301bc1c828fd3a00d0216d2fbbff6" +dependencies = [ + "crc32fast", + "miniz_oxide", +] + +[[package]] +name = "fnv" +version = "1.0.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1" + +[[package]] +name = "form_urlencoded" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5fc25a87fa4fd2094bffb06925852034d90a17f0d1e05197d4956d3555752191" +dependencies = [ + "matches", + "percent-encoding 2.1.0", +] + +[[package]] +name = "fuchsia-cprng" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a06f77d526c1a601b7c4cdd98f54b5eaabffc14d5f2f0296febdc7f357c6d3ba" + +[[package]] +name = "fuchsia-zircon" +version = "0.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2e9763c69ebaae630ba35f74888db465e49e259ba1bc0eda7d06f4a067615d82" +dependencies = [ + "bitflags", + "fuchsia-zircon-sys", +] + +[[package]] +name = "fuchsia-zircon-sys" +version = "0.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3dcaa9ae7725d12cdb85b3ad99a434db70b468c09ded17e012d86b5c1010f7a7" + +[[package]] +name = "futures" +version = "0.1.31" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3a471a38ef8ed83cd6e40aa59c1ffe17db6855c18e3604d9c4ed8c08ebc28678" + +[[package]] +name = "futures-cpupool" +version = "0.1.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ab90cde24b3319636588d0c35fe03b1333857621051837ed769faefb4c2162e4" +dependencies = [ + "futures", + "num_cpus", +] + +[[package]] +name = "getrandom" +version = "0.2.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4eb1a864a501629691edf6c15a593b7a51eebaa1e8468e9ddc623de7c9b58ec6" +dependencies = [ + "cfg-if 1.0.0", + "libc", + "wasi 0.11.0+wasi-snapshot-preview1", +] + +[[package]] +name = "gimli" +version = "0.26.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "22030e2c5a68ec659fde1e949a745124b48e6fa8b045b7ed5bd1fe4ccc5c4e5d" + +[[package]] +name = "h2" +version = "0.1.26" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a5b34c246847f938a410a03c5458c7fee2274436675e76d8b903c08efc29c462" +dependencies = [ + "byteorder", + "bytes", + "fnv", + "futures", + "http", + "indexmap", + "log", + "slab", + "string", + "tokio-io", +] + +[[package]] +name = "hashbrown" +version = "0.12.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888" + +[[package]] +name = "hermit-abi" +version = "0.1.19" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "62b467343b94ba476dcb2500d242dadbb39557df889310ac77c5d99100aaac33" +dependencies = [ + "libc", +] + +[[package]] +name = "http" +version = "0.1.21" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d6ccf5ede3a895d8856620237b2f02972c1bbc78d2965ad7fe8838d4a0ed41f0" +dependencies = [ + "bytes", + "fnv", + "itoa 0.4.8", +] + +[[package]] +name = "http-body" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6741c859c1b2463a423a1dbce98d418e6c3c3fc720fb0d45528657320920292d" +dependencies = [ + "bytes", + "futures", + "http", + "tokio-buf", +] + +[[package]] +name = "httparse" +version = "1.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "496ce29bb5a52785b44e0f7ca2847ae0bb839c9bd28f69acac9b99d461c0c04c" + +[[package]] +name = "hyper" +version = "0.12.36" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5c843caf6296fc1f93444735205af9ed4e109a539005abb2564ae1d6fad34c52" +dependencies = [ + "bytes", + "futures", + "futures-cpupool", + "h2", + "http", + "http-body", + "httparse", + "iovec", + "itoa 0.4.8", + "log", + "net2", + "rustc_version", + "time 0.1.44", + "tokio", + "tokio-buf", + "tokio-executor", + "tokio-io", + "tokio-reactor", + "tokio-tcp", + "tokio-threadpool", + "tokio-timer", + "want", +] + +[[package]] +name = "hyper-rustls" +version = "0.17.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "719d85c7df4a7f309a77d145340a063ea929dcb2e025bae46a80345cffec2952" +dependencies = [ + "bytes", + "ct-logs", + "futures", + "hyper", + "rustls", + "tokio-io", + "tokio-rustls", + "webpki", + "webpki-roots", +] + +[[package]] +name = "idna" +version = "0.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "38f09e0f0b1fb55fdee1f17470ad800da77af5186a1a76c026b679358b7e844e" +dependencies = [ + "matches", + "unicode-bidi", + "unicode-normalization", +] + +[[package]] +name = "idna" +version = "0.2.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "418a0a6fab821475f634efe3ccc45c013f742efe03d853e8d3355d5cb850ecf8" +dependencies = [ + "matches", + "unicode-bidi", + "unicode-normalization", +] + +[[package]] +name = "indexmap" +version = "1.9.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "10a35a97730320ffe8e2d410b5d3b69279b98d2c14bdb8b70ea89ecf7888d41e" +dependencies = [ + "autocfg 1.1.0", + "hashbrown", +] + +[[package]] +name = "iovec" +version = "0.1.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b2b3ea6ff95e175473f8ffe6a7eb7c00d054240321b84c57051175fe3c1e075e" +dependencies = [ + "libc", +] + +[[package]] +name = "itoa" +version = "0.4.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b71991ff56294aa922b450139ee08b3bfc70982c6b2c7562771375cf73542dd4" + +[[package]] +name = "itoa" +version = "1.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "112c678d4050afce233f4f2852bb2eb519230b3cf12f33585275537d7e41578d" + +[[package]] +name = "js-sys" +version = "0.3.59" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "258451ab10b34f8af53416d1fdab72c22e805f0c92a1136d59470ec0b11138b2" +dependencies = [ + "wasm-bindgen", +] + +[[package]] +name = "kernel32-sys" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7507624b29483431c0ba2d82aece8ca6cdba9382bff4ddd0f7490560c056098d" +dependencies = [ + "winapi 0.2.8", + "winapi-build", +] + +[[package]] +name = "lazy_static" +version = "1.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" + +[[package]] +name = "libc" +version = "0.2.126" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "349d5a591cd28b49e1d1037471617a32ddcda5731b99419008085f72d5a53836" + +[[package]] +name = "lock_api" +version = "0.3.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c4da24a77a3d8a6d4862d95f72e6fdb9c09a643ecdb402d754004a557f2bec75" +dependencies = [ + "scopeguard", +] + +[[package]] +name = "log" +version = "0.4.17" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "abb12e687cfb44aa40f41fc3978ef76448f9b6038cad6aef4259d3c095a2382e" +dependencies = [ + "cfg-if 1.0.0", +] + +[[package]] +name = "matches" +version = "0.1.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a3e378b66a060d48947b590737b30a1be76706c8dd7b8ba0f2fe3989c68a853f" + +[[package]] +name = "maybe-uninit" +version = "2.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "60302e4db3a61da70c0cb7991976248362f30319e88850c487b9b95bbf059e00" + +[[package]] +name = "memchr" +version = "2.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2dffe52ecf27772e601905b7522cb4ef790d2cc203488bbd0e2fe85fcb74566d" + +[[package]] +name = "memoffset" +version = "0.5.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "043175f069eda7b85febe4a74abbaeff828d9f8b448515d3151a14a3542811aa" +dependencies = [ + "autocfg 1.1.0", +] + +[[package]] +name = "mime" +version = "0.3.16" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2a60c7ce501c71e03a9c9c0d35b861413ae925bd979cc7a4e30d060069aaac8d" + +[[package]] +name = "mime_guess" +version = "2.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4192263c238a5f0d0c6bfd21f336a313a4ce1c450542449ca191bb657b4642ef" +dependencies = [ + "mime", + "unicase", +] + +[[package]] +name = "minidom" +version = "0.12.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fe549115a674f5ec64c754d85e37d6f42664bd0ef4ffb62b619489ad99c6cb1a" +dependencies = [ + "quick-xml", +] + +[[package]] +name = "miniz_oxide" +version = "0.5.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6f5c75688da582b8ffc1f1799e9db273f32133c49e048f614d22ec3256773ccc" +dependencies = [ + "adler", +] + +[[package]] +name = "mio" +version = "0.6.23" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4afd66f5b91bf2a3bc13fad0e21caedac168ca4c707504e75585648ae80e4cc4" +dependencies = [ + "cfg-if 0.1.10", + "fuchsia-zircon", + "fuchsia-zircon-sys", + "iovec", + "kernel32-sys", + "libc", + "log", + "miow", + "net2", + "slab", + "winapi 0.2.8", +] + +[[package]] +name = "mio-uds" +version = "0.6.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "afcb699eb26d4332647cc848492bbc15eafb26f08d0304550d5aa1f612e066f0" +dependencies = [ + "iovec", + "libc", + "mio", +] + +[[package]] +name = "miow" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ebd808424166322d4a38da87083bfddd3ac4c131334ed55856112eb06d46944d" +dependencies = [ + "kernel32-sys", + "net2", + "winapi 0.2.8", + "ws2_32-sys", +] + +[[package]] +name = "net2" +version = "0.2.37" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "391630d12b68002ae1e25e8f974306474966550ad82dac6886fb8910c19568ae" +dependencies = [ + "cfg-if 0.1.10", + "libc", + "winapi 0.3.9", +] + +[[package]] +name = "num-integer" +version = "0.1.45" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "225d3389fb3509a24c93f5c29eb6bde2586b98d9f016636dff58d7c6f7569cd9" +dependencies = [ + "autocfg 1.1.0", + "num-traits", +] + +[[package]] +name = "num-traits" +version = "0.2.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "578ede34cf02f8924ab9447f50c28075b4d3e5b269972345e7e0372b38c6cdcd" +dependencies = [ + "autocfg 1.1.0", +] + +[[package]] +name = "num_cpus" +version = "1.13.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "19e64526ebdee182341572e50e9ad03965aa510cd94427a4549448f285e957a1" +dependencies = [ + "hermit-abi", + "libc", +] + +[[package]] +name = "object" +version = "0.29.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "21158b2c33aa6d4561f1c0a6ea283ca92bc54802a93b263e910746d679a7eb53" +dependencies = [ + "memchr", +] + +[[package]] +name = "ole32-sys" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5d2c49021782e5233cd243168edfa8037574afed4eba4bbaf538b3d8d1789d8c" +dependencies = [ + "winapi 0.2.8", + "winapi-build", +] + +[[package]] +name = "once_cell" +version = "1.13.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "18a6dbe30758c9f83eb00cbea4ac95966305f5a7772f3f42ebfc7fc7eddbd8e1" + +[[package]] +name = "parking_lot" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f842b1982eb6c2fe34036a4fbfb06dd185a3f5c8edfaacdf7d1ea10b07de6252" +dependencies = [ + "lock_api", + "parking_lot_core", + "rustc_version", +] + +[[package]] +name = "parking_lot_core" +version = "0.6.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b876b1b9e7ac6e1a74a6da34d25c42e17e8862aa409cbbbdcfc8d86c6f3bc62b" +dependencies = [ + "cfg-if 0.1.10", + "cloudabi", + "libc", + "redox_syscall 0.1.57", + "rustc_version", + "smallvec", + "winapi 0.3.9", +] + +[[package]] +name = "pbr" +version = "1.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ff5751d87f7c00ae6403eb1fcbba229b9c76c9a30de8c1cf87182177b168cea2" +dependencies = [ + "crossbeam-channel", + "libc", + "time 0.1.44", + "winapi 0.3.9", +] + +[[package]] +name = "percent-encoding" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "31010dd2e1ac33d5b46a5b413495239882813e0369f8ed8a5e266f173602f831" + +[[package]] +name = "percent-encoding" +version = "2.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d4fd5641d01c8f18a23da7b6fe29298ff4b55afcccdf78973b24cf3175fee32e" + +[[package]] +name = "proc-macro-hack" +version = "0.5.19" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dbf0c48bc1d91375ae5c3cd81e3722dff1abcf81a30960240640d223f59fe0e5" + +[[package]] +name = "proc-macro2" +version = "1.0.42" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c278e965f1d8cf32d6e0e96de3d3e79712178ae67986d9cf9151f51e95aac89b" +dependencies = [ + "unicode-ident", +] + +[[package]] +name = "publicsuffix" +version = "1.5.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "95b4ce31ff0a27d93c8de1849cf58162283752f065a90d508f1105fa6c9a213f" +dependencies = [ + "idna 0.2.3", + "url 2.2.2", +] + +[[package]] +name = "quick-xml" +version = "0.17.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fe1e430bdcf30c9fdc25053b9c459bb1a4672af4617b6c783d7d91dc17c6bbb0" +dependencies = [ + "memchr", +] + +[[package]] +name = "quote" +version = "1.0.20" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3bcdf212e9776fbcb2d23ab029360416bb1706b1aea2d1a5ba002727cbcab804" +dependencies = [ + "proc-macro2", +] + +[[package]] +name = "rand" +version = "0.6.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6d71dacdc3c88c1fde3885a3be3fbab9f35724e6ce99467f7d9c5026132184ca" +dependencies = [ + "autocfg 0.1.8", + "libc", + "rand_chacha", + "rand_core 0.4.2", + "rand_hc", + "rand_isaac", + "rand_jitter", + "rand_os", + "rand_pcg", + "rand_xorshift", + "winapi 0.3.9", +] + +[[package]] +name = "rand_chacha" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "556d3a1ca6600bfcbab7c7c91ccb085ac7fbbcd70e008a98742e7847f4f7bcef" +dependencies = [ + "autocfg 0.1.8", + "rand_core 0.3.1", +] + +[[package]] +name = "rand_core" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7a6fdeb83b075e8266dcc8762c22776f6877a63111121f5f8c7411e5be7eed4b" +dependencies = [ + "rand_core 0.4.2", +] + +[[package]] +name = "rand_core" +version = "0.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9c33a3c44ca05fa6f1807d8e6743f3824e8509beca625669633be0acbdf509dc" + +[[package]] +name = "rand_hc" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7b40677c7be09ae76218dc623efbf7b18e34bced3f38883af07bb75630a21bc4" +dependencies = [ + "rand_core 0.3.1", +] + +[[package]] +name = "rand_isaac" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ded997c9d5f13925be2a6fd7e66bf1872597f759fd9dd93513dd7e92e5a5ee08" +dependencies = [ + "rand_core 0.3.1", +] + +[[package]] +name = "rand_jitter" +version = "0.1.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1166d5c91dc97b88d1decc3285bb0a99ed84b05cfd0bc2341bdf2d43fc41e39b" +dependencies = [ + "libc", + "rand_core 0.4.2", + "winapi 0.3.9", +] + +[[package]] +name = "rand_os" +version = "0.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7b75f676a1e053fc562eafbb47838d67c84801e38fc1ba459e8f180deabd5071" +dependencies = [ + "cloudabi", + "fuchsia-cprng", + "libc", + "rand_core 0.4.2", + "rdrand", + "winapi 0.3.9", +] + +[[package]] +name = "rand_pcg" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "abf9b09b01790cfe0364f52bf32995ea3c39f4d2dd011eac241d2914146d0b44" +dependencies = [ + "autocfg 0.1.8", + "rand_core 0.4.2", +] + +[[package]] +name = "rand_xorshift" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cbf7e9e623549b0e21f6e97cf8ecf247c1a8fd2e8a992ae265314300b2455d5c" +dependencies = [ + "rand_core 0.3.1", +] + +[[package]] +name = "rdrand" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "678054eb77286b51581ba43620cc911abf02758c91f93f479767aed0f90458b2" +dependencies = [ + "rand_core 0.3.1", +] + +[[package]] +name = "redox_syscall" +version = "0.1.57" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "41cc0f7e4d5d4544e8861606a285bb08d3e70712ccc7d2b84d7c0ccfaf4b05ce" + +[[package]] +name = "redox_syscall" +version = "0.2.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "534cfe58d6a18cc17120fbf4635d53d14691c1fe4d951064df9bd326178d7d5a" +dependencies = [ + "bitflags", +] + +[[package]] +name = "redox_users" +version = "0.4.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b033d837a7cf162d7993aded9304e30a83213c648b6e389db233191f891e5c2b" +dependencies = [ + "getrandom", + "redox_syscall 0.2.15", + "thiserror", +] + +[[package]] +name = "reqwest" +version = "0.9.24" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f88643aea3c1343c804950d7bf983bd2067f5ab59db6d613a08e05572f2714ab" +dependencies = [ + "base64", + "bytes", + "cookie", + "cookie_store", + "encoding_rs", + "flate2", + "futures", + "http", + "hyper", + "hyper-rustls", + "log", + "mime", + "mime_guess", + "rustls", + "serde", + "serde_json", + "serde_urlencoded", + "time 0.1.44", + "tokio", + "tokio-executor", + "tokio-io", + "tokio-rustls", + "tokio-threadpool", + "tokio-timer", + "url 1.7.2", + "uuid", + "webpki-roots", + "winreg", +] + +[[package]] +name = "ring" +version = "0.16.20" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3053cf52e236a3ed746dfc745aa9cacf1b791d846bdaf412f60a8d7d6e17c8fc" +dependencies = [ + "cc", + "libc", + "once_cell", + "spin", + "untrusted", + "web-sys", + "winapi 0.3.9", +] + +[[package]] +name = "rustc-demangle" +version = "0.1.21" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7ef03e0a2b150c7a90d01faf6254c9c48a41e95fb2a8c2ac1c6f0d2b9aefc342" + +[[package]] +name = "rustc_version" +version = "0.2.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "138e3e0acb6c9fb258b19b67cb8abd63c00679d2851805ea151465464fe9030a" +dependencies = [ + "semver", +] + +[[package]] +name = "rustls" +version = "0.16.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b25a18b1bf7387f0145e7f8324e700805aade3842dd3db2e74e4cdeb4677c09e" +dependencies = [ + "base64", + "log", + "ring", + "sct", + "webpki", +] + +[[package]] +name = "ryu" +version = "1.0.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f3f6f92acf49d1b98f7a81226834412ada05458b7364277387724a237f062695" + +[[package]] +name = "scoped-tls" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "332ffa32bf586782a3efaeb58f127980944bbc8c4d6913a86107ac2a5ab24b28" + +[[package]] +name = "scopeguard" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d29ab0c6d3fc0ee92fe66e2d99f700eab17a8d57d1c1d3b748380fb20baa78cd" + +[[package]] +name = "sct" +version = "0.6.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b362b83898e0e69f38515b82ee15aa80636befe47c3b6d3d89a911e78fc228ce" +dependencies = [ + "ring", + "untrusted", +] + +[[package]] +name = "semver" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1d7eb9ef2c18661902cc47e535f9bc51b78acd254da71d375c2f6720d9a40403" +dependencies = [ + "semver-parser", +] + +[[package]] +name = "semver-parser" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "388a1df253eca08550bef6c72392cfe7c30914bf41df5269b68cbd6ff8f570a3" + +[[package]] +name = "serde" +version = "1.0.140" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fc855a42c7967b7c369eb5860f7164ef1f6f81c20c7cc1141f2a604e18723b03" +dependencies = [ + "serde_derive", +] + +[[package]] +name = "serde_derive" +version = "1.0.140" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6f2122636b9fe3b81f1cb25099fcf2d3f542cdb1d45940d56c713158884a05da" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "serde_json" +version = "1.0.82" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "82c2c1fdcd807d1098552c5b9a36e425e42e9fbd7c6a37a8425f390f781f7fa7" +dependencies = [ + "itoa 1.0.2", + "ryu", + "serde", +] + +[[package]] +name = "serde_urlencoded" +version = "0.5.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "642dd69105886af2efd227f75a520ec9b44a820d65bc133a9131f7d229fd165a" +dependencies = [ + "dtoa", + "itoa 0.4.8", + "serde", + "url 1.7.2", +] + +[[package]] +name = "sha1" +version = "0.6.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c1da05c97445caa12d05e848c4a4fcbbea29e748ac28f7e80e9b010392063770" +dependencies = [ + "sha1_smol", +] + +[[package]] +name = "sha1_smol" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ae1a47186c03a32177042e55dbc5fd5aee900b8e0069a8d70fba96a9375cd012" + +[[package]] +name = "shell32-sys" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9ee04b46101f57121c9da2b151988283b6beb79b34f5bb29a58ee48cb695122c" +dependencies = [ + "winapi 0.2.8", + "winapi-build", +] + +[[package]] +name = "simplelog" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2b2736f58087298a448859961d3f4a0850b832e72619d75adc69da7993c2cd3c" +dependencies = [ + "chrono", + "log", + "termcolor", +] + +[[package]] +name = "slab" +version = "0.4.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4614a76b2a8be0058caa9dbbaf66d988527d86d003c11a94fbd335d7661edcef" +dependencies = [ + "autocfg 1.1.0", +] + +[[package]] +name = "smallvec" +version = "0.6.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b97fcaeba89edba30f044a10c6a3cc39df9c3f17d7cd829dd1446cab35f890e0" +dependencies = [ + "maybe-uninit", +] + +[[package]] +name = "spin" +version = "0.5.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6e63cff320ae2c57904679ba7cb63280a3dc4613885beafb148ee7bf9aa9042d" + +[[package]] +name = "standback" +version = "0.2.17" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e113fb6f3de07a243d434a56ec6f186dfd51cb08448239fe7bcae73f87ff28ff" +dependencies = [ + "version_check", +] + +[[package]] +name = "stdweb" +version = "0.4.20" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d022496b16281348b52d0e30ae99e01a73d737b2f45d38fed4edf79f9325a1d5" +dependencies = [ + "discard", + "rustc_version", + "stdweb-derive", + "stdweb-internal-macros", + "stdweb-internal-runtime", + "wasm-bindgen", +] + +[[package]] +name = "stdweb-derive" +version = "0.5.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c87a60a40fccc84bef0652345bbbbbe20a605bf5d0ce81719fc476f5c03b50ef" +dependencies = [ + "proc-macro2", + "quote", + "serde", + "serde_derive", + "syn", +] + +[[package]] +name = "stdweb-internal-macros" +version = "0.2.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "58fa5ff6ad0d98d1ffa8cb115892b6e69d67799f6763e162a1c9db421dc22e11" +dependencies = [ + "base-x", + "proc-macro2", + "quote", + "serde", + "serde_derive", + "serde_json", + "sha1", + "syn", +] + +[[package]] +name = "stdweb-internal-runtime" +version = "0.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "213701ba3370744dcd1a12960caa4843b3d68b4d1c0a5d575e0d65b2ee9d16c0" + +[[package]] +name = "string" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d24114bfcceb867ca7f71a0d3fe45d45619ec47a6fbfa98cb14e14250bfa5d6d" +dependencies = [ + "bytes", +] + +[[package]] +name = "strsim" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8ea5119cdb4c55b55d432abb513a0429384878c15dde60cc77b1c99de1a95a6a" + +[[package]] +name = "syn" +version = "1.0.98" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c50aef8a904de4c23c788f104b7dddc7d6f79c647c7c8ce4cc8f73eb0ca773dd" +dependencies = [ + "proc-macro2", + "quote", + "unicode-ident", +] + +[[package]] +name = "synstructure" +version = "0.12.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f36bdaa60a83aca3921b5259d5400cbf5e90fc51931376a9bd4a0eb79aa7210f" +dependencies = [ + "proc-macro2", + "quote", + "syn", + "unicode-xid", +] + +[[package]] +name = "termcolor" +version = "1.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bab24d30b911b2376f3a13cc2cd443142f0c81dda04c118693e35b3835757755" +dependencies = [ + "winapi-util", +] + +[[package]] +name = "textwrap" +version = "0.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d326610f408c7a4eb6f51c37c330e496b08506c9457c9d34287ecc38809fb060" +dependencies = [ + "unicode-width", +] + +[[package]] +name = "thiserror" +version = "1.0.31" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bd829fe32373d27f76265620b5309d0340cb8550f523c1dda251d6298069069a" +dependencies = [ + "thiserror-impl", +] + +[[package]] +name = "thiserror-impl" +version = "1.0.31" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0396bc89e626244658bef819e22d0cc459e795a5ebe878e6ec336d1674a8d79a" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "time" +version = "0.1.44" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6db9e6914ab8b1ae1c260a4ae7a49b6c5611b40328a735b21862567685e73255" +dependencies = [ + "libc", + "wasi 0.10.0+wasi-snapshot-preview1", + "winapi 0.3.9", +] + +[[package]] +name = "time" +version = "0.2.27" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4752a97f8eebd6854ff91f1c1824cd6160626ac4bd44287f7f4ea2035a02a242" +dependencies = [ + "const_fn", + "libc", + "standback", + "stdweb", + "time-macros", + "version_check", + "winapi 0.3.9", +] + +[[package]] +name = "time-macros" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "957e9c6e26f12cb6d0dd7fc776bb67a706312e7299aed74c8dd5b17ebb27e2f1" +dependencies = [ + "proc-macro-hack", + "time-macros-impl", +] + +[[package]] +name = "time-macros-impl" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fd3c141a1b43194f3f56a1411225df8646c55781d5f26db825b3d98507eb482f" +dependencies = [ + "proc-macro-hack", + "proc-macro2", + "quote", + "standback", + "syn", +] + +[[package]] +name = "tinyvec" +version = "1.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "87cc5ceb3875bb20c2890005a4e226a4651264a5c75edb2421b52861a0a0cb50" +dependencies = [ + "tinyvec_macros", +] + +[[package]] +name = "tinyvec_macros" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cda74da7e1a664f795bb1f8a87ec406fb89a02522cf6e50620d016add6dbbf5c" + +[[package]] +name = "tokio" +version = "0.1.22" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5a09c0b5bb588872ab2f09afa13ee6e9dac11e10a0ec9e8e3ba39a5a5d530af6" +dependencies = [ + "bytes", + "futures", + "mio", + "num_cpus", + "tokio-codec", + "tokio-current-thread", + "tokio-executor", + "tokio-fs", + "tokio-io", + "tokio-reactor", + "tokio-sync", + "tokio-tcp", + "tokio-threadpool", + "tokio-timer", + "tokio-udp", + "tokio-uds", +] + +[[package]] +name = "tokio-buf" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8fb220f46c53859a4b7ec083e41dec9778ff0b1851c0942b211edb89e0ccdc46" +dependencies = [ + "bytes", + "either", + "futures", +] + +[[package]] +name = "tokio-codec" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "25b2998660ba0e70d18684de5d06b70b70a3a747469af9dea7618cc59e75976b" +dependencies = [ + "bytes", + "futures", + "tokio-io", +] + +[[package]] +name = "tokio-core" +version = "0.1.18" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "87b1395334443abca552f63d4f61d0486f12377c2ba8b368e523f89e828cffd4" +dependencies = [ + "bytes", + "futures", + "iovec", + "log", + "mio", + "scoped-tls", + "tokio", + "tokio-executor", + "tokio-io", + "tokio-reactor", + "tokio-timer", +] + +[[package]] +name = "tokio-current-thread" +version = "0.1.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b1de0e32a83f131e002238d7ccde18211c0a5397f60cbfffcb112868c2e0e20e" +dependencies = [ + "futures", + "tokio-executor", +] + +[[package]] +name = "tokio-executor" +version = "0.1.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fb2d1b8f4548dbf5e1f7818512e9c406860678f29c300cdf0ebac72d1a3a1671" +dependencies = [ + "crossbeam-utils 0.7.2", + "futures", +] + +[[package]] +name = "tokio-fs" +version = "0.1.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "297a1206e0ca6302a0eed35b700d292b275256f596e2f3fea7729d5e629b6ff4" +dependencies = [ + "futures", + "tokio-io", + "tokio-threadpool", +] + +[[package]] +name = "tokio-io" +version = "0.1.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "57fc868aae093479e3131e3d165c93b1c7474109d13c90ec0dda2a1bbfff0674" +dependencies = [ + "bytes", + "futures", + "log", +] + +[[package]] +name = "tokio-reactor" +version = "0.1.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "09bc590ec4ba8ba87652da2068d150dcada2cfa2e07faae270a5e0409aa51351" +dependencies = [ + "crossbeam-utils 0.7.2", + "futures", + "lazy_static", + "log", + "mio", + "num_cpus", + "parking_lot", + "slab", + "tokio-executor", + "tokio-io", + "tokio-sync", +] + +[[package]] +name = "tokio-rustls" +version = "0.10.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2d7cf08f990090abd6c6a73cab46fed62f85e8aef8b99e4b918a9f4a637f0676" +dependencies = [ + "bytes", + "futures", + "iovec", + "rustls", + "tokio-io", + "webpki", +] + +[[package]] +name = "tokio-sync" +version = "0.1.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "edfe50152bc8164fcc456dab7891fa9bf8beaf01c5ee7e1dd43a397c3cf87dee" +dependencies = [ + "fnv", + "futures", +] + +[[package]] +name = "tokio-tcp" +version = "0.1.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "98df18ed66e3b72e742f185882a9e201892407957e45fbff8da17ae7a7c51f72" +dependencies = [ + "bytes", + "futures", + "iovec", + "mio", + "tokio-io", + "tokio-reactor", +] + +[[package]] +name = "tokio-threadpool" +version = "0.1.18" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "df720b6581784c118f0eb4310796b12b1d242a7eb95f716a8367855325c25f89" +dependencies = [ + "crossbeam-deque", + "crossbeam-queue", + "crossbeam-utils 0.7.2", + "futures", + "lazy_static", + "log", + "num_cpus", + "slab", + "tokio-executor", +] + +[[package]] +name = "tokio-timer" +version = "0.2.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "93044f2d313c95ff1cb7809ce9a7a05735b012288a888b62d4434fd58c94f296" +dependencies = [ + "crossbeam-utils 0.7.2", + "futures", + "slab", + "tokio-executor", +] + +[[package]] +name = "tokio-udp" +version = "0.1.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e2a0b10e610b39c38b031a2fcab08e4b82f16ece36504988dcbd81dbba650d82" +dependencies = [ + "bytes", + "futures", + "log", + "mio", + "tokio-codec", + "tokio-io", + "tokio-reactor", +] + +[[package]] +name = "tokio-uds" +version = "0.2.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ab57a4ac4111c8c9dbcf70779f6fc8bc35ae4b2454809febac840ad19bd7e4e0" +dependencies = [ + "bytes", + "futures", + "iovec", + "libc", + "log", + "mio", + "mio-uds", + "tokio-codec", + "tokio-io", + "tokio-reactor", +] + +[[package]] +name = "try-lock" +version = "0.2.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "59547bce71d9c38b83d9c0e92b6066c4253371f15005def0c30d9657f50c7642" + +[[package]] +name = "try_from" +version = "0.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "283d3b89e1368717881a9d51dad843cc435380d8109c9e47d38780a324698d8b" +dependencies = [ + "cfg-if 0.1.10", +] + +[[package]] +name = "unicase" +version = "2.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "50f37be617794602aabbeee0be4f259dc1778fabe05e2d67ee8f79326d5cb4f6" +dependencies = [ + "version_check", +] + +[[package]] +name = "unicode-bidi" +version = "0.3.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "099b7128301d285f79ddd55b9a83d5e6b9e97c92e0ea0daebee7263e932de992" + +[[package]] +name = "unicode-ident" +version = "1.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "15c61ba63f9235225a22310255a29b806b907c9b8c964bcbd0a2c70f3f2deea7" + +[[package]] +name = "unicode-normalization" +version = "0.1.21" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "854cbdc4f7bc6ae19c820d44abdc3277ac3e1b2b93db20a636825d9322fb60e6" +dependencies = [ + "tinyvec", +] + +[[package]] +name = "unicode-width" +version = "0.1.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3ed742d4ea2bd1176e236172c8429aaf54486e7ac098db29ffe6529e0ce50973" + +[[package]] +name = "unicode-xid" +version = "0.2.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "957e51f3646910546462e67d5f7599b9e4fb8acdd304b087a6494730f9eebf04" + +[[package]] +name = "untrusted" +version = "0.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a156c684c91ea7d62626509bce3cb4e1d9ed5c4d978f7b4352658f96a4c26b4a" + +[[package]] +name = "url" +version = "1.7.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dd4e7c0d531266369519a4aa4f399d748bd37043b00bde1e4ff1f60a120b355a" +dependencies = [ + "idna 0.1.5", + "matches", + "percent-encoding 1.0.1", +] + +[[package]] +name = "url" +version = "2.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a507c383b2d33b5fc35d1861e77e6b383d158b2da5e14fe51b83dfedf6fd578c" +dependencies = [ + "form_urlencoded", + "idna 0.2.3", + "matches", + "percent-encoding 2.1.0", +] + +[[package]] +name = "uuid" +version = "0.7.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "90dbc611eb48397705a6b0f6e917da23ae517e4d127123d2cf7674206627d32a" +dependencies = [ + "rand", +] + +[[package]] +name = "vec_map" +version = "0.8.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f1bddf1187be692e79c5ffeab891132dfb0f236ed36a43c7ed39f1165ee20191" + +[[package]] +name = "version_check" +version = "0.9.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f" + +[[package]] +name = "want" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b6395efa4784b027708f7451087e647ec73cc74f5d9bc2e418404248d679a230" +dependencies = [ + "futures", + "log", + "try-lock", +] + +[[package]] +name = "wasi" +version = "0.10.0+wasi-snapshot-preview1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1a143597ca7c7793eff794def352d41792a93c481eb1042423ff7ff72ba2c31f" + +[[package]] +name = "wasi" +version = "0.11.0+wasi-snapshot-preview1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" + +[[package]] +name = "wasm-bindgen" +version = "0.2.82" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fc7652e3f6c4706c8d9cd54832c4a4ccb9b5336e2c3bd154d5cccfbf1c1f5f7d" +dependencies = [ + "cfg-if 1.0.0", + "wasm-bindgen-macro", +] + +[[package]] +name = "wasm-bindgen-backend" +version = "0.2.82" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "662cd44805586bd52971b9586b1df85cdbbd9112e4ef4d8f41559c334dc6ac3f" +dependencies = [ + "bumpalo", + "log", + "once_cell", + "proc-macro2", + "quote", + "syn", + "wasm-bindgen-shared", +] + +[[package]] +name = "wasm-bindgen-macro" +version = "0.2.82" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b260f13d3012071dfb1512849c033b1925038373aea48ced3012c09df952c602" +dependencies = [ + "quote", + "wasm-bindgen-macro-support", +] + +[[package]] +name = "wasm-bindgen-macro-support" +version = "0.2.82" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5be8e654bdd9b79216c2929ab90721aa82faf65c48cdf08bdc4e7f51357b80da" +dependencies = [ + "proc-macro2", + "quote", + "syn", + "wasm-bindgen-backend", + "wasm-bindgen-shared", +] + +[[package]] +name = "wasm-bindgen-shared" +version = "0.2.82" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6598dd0bd3c7d51095ff6531a5b23e02acdc81804e30d8f07afb77b7215a140a" + +[[package]] +name = "web-sys" +version = "0.3.59" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ed055ab27f941423197eb86b2035720b1a3ce40504df082cac2ecc6ed73335a1" +dependencies = [ + "js-sys", + "wasm-bindgen", +] + +[[package]] +name = "webpki" +version = "0.21.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b8e38c0608262c46d4a56202ebabdeb094cef7e560ca7a226c6bf055188aa4ea" +dependencies = [ + "ring", + "untrusted", +] + +[[package]] +name = "webpki-roots" +version = "0.17.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a262ae37dd9d60f60dd473d1158f9fbebf110ba7b6a5051c8160460f6043718b" +dependencies = [ + "webpki", +] + +[[package]] +name = "winapi" +version = "0.2.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "167dc9d6949a9b857f3451275e911c3f44255842c1f7a76f33c55103a909087a" + +[[package]] +name = "winapi" +version = "0.3.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419" +dependencies = [ + "winapi-i686-pc-windows-gnu", + "winapi-x86_64-pc-windows-gnu", +] + +[[package]] +name = "winapi-build" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2d315eee3b34aca4797b2da6b13ed88266e6d612562a0c46390af8299fc699bc" + +[[package]] +name = "winapi-i686-pc-windows-gnu" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6" + +[[package]] +name = "winapi-util" +version = "0.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "70ec6ce85bb158151cae5e5c87f95a8e97d2c0c4b001223f33a334e3ce5de178" +dependencies = [ + "winapi 0.3.9", +] + +[[package]] +name = "winapi-x86_64-pc-windows-gnu" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" + +[[package]] +name = "winreg" +version = "0.6.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b2986deb581c4fe11b621998a5e53361efe6b48a151178d0cd9eeffa4dc6acc9" +dependencies = [ + "winapi 0.3.9", +] + +[[package]] +name = "ws2_32-sys" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d59cefebd0c892fa2dd6de581e937301d8552cb44489cdff035c6187cb63fa5e" +dependencies = [ + "winapi 0.2.8", + "winapi-build", +] + +[[package]] +name = "xdg" +version = "2.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0c4583db5cbd4c4c0303df2d15af80f0539db703fa1c68802d4cbbd2dd0f88f6" +dependencies = [ + "dirs", +] diff --git a/pkgs/development/python-modules/cmsis-pack-manager/default.nix b/pkgs/development/python-modules/cmsis-pack-manager/default.nix new file mode 100644 index 000000000000..8c5c8c7afed1 --- /dev/null +++ b/pkgs/development/python-modules/cmsis-pack-manager/default.nix @@ -0,0 +1,77 @@ +{ lib +, fetchPypi +, rustPlatform +, stdenv +, Security +, writeShellScriptBin +, buildPythonPackage +, setuptools-scm +, appdirs +, milksnake +, pyyaml +, hypothesis +, jinja2 +, mock +, pytestCheckHook +}: +let + pname = "cmsis-pack-manager"; + version = "0.4.0"; + + src = fetchPypi { + inherit pname version; + sha256 = "sha256-NeUG6PFI2eTwq5SNtAB6ZMA1M3z1JmMND29V9/O5sgw="; + }; + + native = rustPlatform.buildRustPackage { + name = "${pname}-${version}-native"; + + inherit src; + + buildInputs = lib.optionals stdenv.isDarwin [ + Security + ]; + + sourceRoot = "${pname}-${version}/rust"; + cargoLock.lockFile = ./Cargo.lock; + + postPatch = '' + cp ${./Cargo.lock} Cargo.lock + ''; + + cargoBuildFlags = [ "--lib" ]; + }; +in +buildPythonPackage rec { + inherit pname version src; + + # The cargo build is already run in a separate derivation + postPatch = '' + substituteInPlace setup.py \ + --replace "'cargo', 'build'," "'true'," + ''; + + nativeBuildInputs = [ setuptools-scm ]; + propagatedBuildInputs = [ appdirs milksnake pyyaml ]; + + checkInputs = [ hypothesis jinja2 mock pytestCheckHook ]; + + preBuild = '' + mkdir -p rust/target/release/deps + ln -s ${native}/lib/libcmsis_cffi${stdenv.hostPlatform.extensions.sharedLibrary} rust/target/release/deps/ + ''; + + preCheck = '' + # Otherwise the test uses a dummy library (missing all symbols) + ln -sf ../build/lib/cmsis_pack_manager/_native__lib${stdenv.hostPlatform.extensions.sharedLibrary} cmsis_pack_manager/_native__lib${stdenv.hostPlatform.extensions.sharedLibrary} + ''; + + pythonImportsCheck = [ "cmsis_pack_manager" ]; + + meta = with lib; { + description = "A Rust and Python module for handling CMSIS Pack files"; + homepage = "https://github.com/pyocd/cmsis-pack-manager"; + license = licenses.asl20; + maintainers = with maintainers; [ frogamic sbruder ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index b89cd79705ff..7efc91541c7d 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -1886,6 +1886,10 @@ in { inherit (pkgs) cmigemo; }; + cmsis-pack-manager = callPackage ../development/python-modules/cmsis-pack-manager { + inherit (pkgs.darwin.apple_sdk.frameworks) Security; + }; + cmsis-svd = callPackage ../development/python-modules/cmsis-svd { }; cntk = callPackage ../development/python-modules/cntk { }; From beeffa2453ecf81a0c76cd9daed6bad4e7198d83 Mon Sep 17 00:00:00 2001 From: Simon Bruder Date: Tue, 26 Jul 2022 18:05:14 +0200 Subject: [PATCH 125/164] python3Packages.hexdump: init at 3.3 --- .../python-modules/hexdump/default.nix | 32 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 34 insertions(+) create mode 100644 pkgs/development/python-modules/hexdump/default.nix diff --git a/pkgs/development/python-modules/hexdump/default.nix b/pkgs/development/python-modules/hexdump/default.nix new file mode 100644 index 000000000000..75da23e9859b --- /dev/null +++ b/pkgs/development/python-modules/hexdump/default.nix @@ -0,0 +1,32 @@ +{ lib, buildPythonPackage, fetchPypi }: + +buildPythonPackage rec { + pname = "hexdump"; + version = "3.3"; + + src = fetchPypi { + inherit pname version; + sha256 = "sha256-14GkOwwWrOP5Nmqt5z6K06e9UTfVjwtFqy0/VIdvINs="; + extension = "zip"; + }; + + # the source zip has no prefix, so everything gets unpacked to /build otherwise + sourceRoot = "source"; + unpackPhase = '' + runHook preUnpack + mkdir source + pushd source + unzip $src + popd + runHook postUnpack + ''; + + pythonImportsCheck = [ "hexdump" ]; + + meta = with lib; { + description = "Library to dump binary data to hex format and restore from there"; + homepage = "https://pypi.org/project/hexdump/"; # BitBucket site returns 404 + license = licenses.publicDomain; + maintainers = with maintainers; [ frogamic sbruder ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 7efc91541c7d..8c0f9fcb5954 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -4089,6 +4089,8 @@ in { hexbytes = callPackage ../development/python-modules/hexbytes { }; + hexdump = callPackage ../development/python-modules/hexdump { }; + hg-commitsigs = callPackage ../development/python-modules/hg-commitsigs { }; hg-evolve = callPackage ../development/python-modules/hg-evolve { }; From 2e61922fc25591dc9ea475db6dd08288a149be5b Mon Sep 17 00:00:00 2001 From: Simon Bruder Date: Wed, 27 Jul 2022 10:58:29 +0200 Subject: [PATCH 126/164] pyocd: init at 0.34.1 --- pkgs/development/embedded/pyocd/default.nix | 72 +++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 74 insertions(+) create mode 100644 pkgs/development/embedded/pyocd/default.nix diff --git a/pkgs/development/embedded/pyocd/default.nix b/pkgs/development/embedded/pyocd/default.nix new file mode 100644 index 000000000000..52cf703a71aa --- /dev/null +++ b/pkgs/development/embedded/pyocd/default.nix @@ -0,0 +1,72 @@ +{ lib +, buildPythonPackage +, fetchPypi +, fetchpatch +, capstone +, cmsis-pack-manager +, colorama +, intelhex +, intervaltree +, natsort +, prettytable +, pyelftools +, pylink-square +, pyusb +, pyyaml +, typing-extensions +, stdenv +, hidapi +, pytestCheckHook +}: + +buildPythonPackage rec { + pname = "pyocd"; + version = "0.34.1"; + + src = fetchPypi { + inherit pname version; + sha256 = "sha256-Fpa2IEsLOQ8ylGI/5D6h+22j1pvrvE9IMIyhCtyM6qU="; + }; + + patches = [ + # https://github.com/pyocd/pyOCD/pull/1332 + (fetchpatch { + name = "libusb-package-optional.patch"; + url = "https://github.com/pyocd/pyOCD/commit/0b980cf253e3714dd2eaf0bddeb7172d14089649.patch"; + sha256 = "sha256-B2+50VntcQELeakJbCeJdgI1iBU+h2NkXqba+LRYa/0="; + }) + ]; + + propagatedBuildInputs = [ + capstone + cmsis-pack-manager + colorama + intelhex + intervaltree + natsort + prettytable + pyelftools + pylink-square + pyusb + pyyaml + typing-extensions + ] ++ lib.optionals (!stdenv.isLinux) [ + hidapi + ]; + + checkInputs = [ pytestCheckHook ]; + + pythonImportsCheck = [ "pyocd" ]; + + postPatch = '' + substituteInPlace setup.cfg \ + --replace "libusb-package>=1.0,<2.0" "" + ''; + + meta = with lib; { + description = "Python library for programming and debugging Arm Cortex-M microcontrollers"; + homepage = "https://pyocd.io/"; + license = licenses.asl20; + maintainers = with maintainers; [ frogamic sbruder ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index ee3167e45ea1..3b5530f47b64 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -10032,6 +10032,8 @@ with pkgs; pympress = callPackage ../applications/office/pympress { }; + pyocd = python3Packages.callPackage ../development/embedded/pyocd { }; + pyspread = libsForQt5.callPackage ../applications/office/pyspread { }; teapot = callPackage ../applications/office/teapot { }; From 3820a027141bb0623b86e23a172af64812839176 Mon Sep 17 00:00:00 2001 From: Simon Bruder Date: Fri, 29 Jul 2022 15:54:46 +0200 Subject: [PATCH 127/164] python3Packages.pypemicro: init at 0.1.9 --- .../python-modules/pypemicro/default.nix | 24 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 26 insertions(+) create mode 100644 pkgs/development/python-modules/pypemicro/default.nix diff --git a/pkgs/development/python-modules/pypemicro/default.nix b/pkgs/development/python-modules/pypemicro/default.nix new file mode 100644 index 000000000000..e1d9d68e92d8 --- /dev/null +++ b/pkgs/development/python-modules/pypemicro/default.nix @@ -0,0 +1,24 @@ +{ lib, buildPythonPackage, fetchPypi, autoPatchelfHook }: + +buildPythonPackage rec { + pname = "pypemicro"; + version = "0.1.9"; + + src = fetchPypi { + inherit pname version; + sha256 = "sha256-HouDBlqfokKhbdWWDCfaUJrqIEC5f+sSnVmsrRseFmU="; + }; + + pythonImportsCheck = [ "pypemicro" ]; + + # tests are neither pytest nor unittest compatible and require a device + # connected via USB + doCheck = false; + + meta = with lib; { + description = "Python interface for PEMicro debug probes"; + homepage = "https://github.com/NXPmicro/pypemicro"; + license = with licenses; [ bsd3 unfree ]; # it includes shared libraries for which no license is available (https://github.com/NXPmicro/pypemicro/issues/10) + maintainers = with maintainers; [ frogamic sbruder ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 8c0f9fcb5954..86d47bb8f9ef 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -6659,6 +6659,8 @@ in { psrpcore = callPackage ../development/python-modules/psrpcore { }; + pypemicro = callPackage ../development/python-modules/pypemicro { }; + pyprecice = callPackage ../development/python-modules/pyprecice { }; pypsrp = callPackage ../development/python-modules/pypsrp { }; From c400724f94d0294ca285bcd63792fb81b886d0bf Mon Sep 17 00:00:00 2001 From: Simon Bruder Date: Thu, 4 Aug 2022 16:58:14 +0200 Subject: [PATCH 128/164] python3Packages.oscrypto: patch ctypes call The ctypes call did not work, because it requires binutils.bintools to be available in every downstream dependency. Fixes #176917. --- pkgs/development/python-modules/oscrypto/default.nix | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/oscrypto/default.nix b/pkgs/development/python-modules/oscrypto/default.nix index 96d4416ec965..e4735aa4334d 100644 --- a/pkgs/development/python-modules/oscrypto/default.nix +++ b/pkgs/development/python-modules/oscrypto/default.nix @@ -22,9 +22,16 @@ buildPythonPackage rec { hash = "sha256-CmDypmlc/kb6ONCUggjT1Iqd29xNSLRaGh5Hz36dvOw="; }; + postPatch = '' + for file in oscrypto/_openssl/_lib{crypto,ssl}_c{ffi,types}.py; do + substituteInPlace $file \ + --replace "get_library('crypto', 'libcrypto.dylib', '42')" "'${openssl.out}/lib/libcrypto${stdenv.hostPlatform.extensions.sharedLibrary}'" \ + --replace "get_library('ssl', 'libssl', '44')" "'${openssl.out}/lib/libssl${stdenv.hostPlatform.extensions.sharedLibrary}'" + done + ''; + propagatedBuildInputs = [ asn1crypto - openssl ]; checkInputs = [ From f06e9ce0364fa0f8130d869d010fb598f434b902 Mon Sep 17 00:00:00 2001 From: Simon Bruder Date: Wed, 27 Jul 2022 13:58:41 +0200 Subject: [PATCH 129/164] python3Packages.spsdk: init at 1.6.3 --- .../python-modules/spsdk/default.nix | 116 ++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 118 insertions(+) create mode 100644 pkgs/development/python-modules/spsdk/default.nix diff --git a/pkgs/development/python-modules/spsdk/default.nix b/pkgs/development/python-modules/spsdk/default.nix new file mode 100644 index 000000000000..ce566fb94a89 --- /dev/null +++ b/pkgs/development/python-modules/spsdk/default.nix @@ -0,0 +1,116 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, fetchpatch +, dos2unix +, pythonRelaxDepsHook +, asn1crypto +, astunparse +, bincopy +, bitstring +, click +, click-option-group +, cmsis-pack-manager +, commentjson +, crcmod +, cryptography +, deepmerge +, fastjsonschema +, hexdump +, jinja2 +, libusbsio +, oscrypto +, pycryptodome +, pylink-square +, pyocd +, pypemicro +, pyserial +, ruamel-yaml +, sly +, pytestCheckHook +, voluptuous +}: + +buildPythonPackage rec { + pname = "spsdk"; + version = "1.6.3"; + + src = fetchFromGitHub { + owner = "NXPmicro"; + repo = pname; + rev = version; + sha256 = "sha256-JMhd2XdbjEN6SUzFgcBHd/dStiuYeXXis6pfijSfUso="; + }; + + patches = [ + # https://github.com/NXPmicro/spsdk/pull/43 + (fetchpatch { + name = "cryptography-37-compat.patch"; + url = "https://github.com/NXPmicro/spsdk/commit/a85b854de1093de593d27fa64de442224ab2e0fd.patch"; + sha256 = "sha256-4pXV/8RaNuGl7KNdoGD/8YnPQ2ZmUQOjXWA/Yy0Kxu8="; + }) + # https://github.com/NXPmicro/spsdk/pull/41 + (fetchpatch { + name = "blhost-click-8-1-compat.patch"; + url = "https://github.com/NXPmicro/spsdk/commit/5112b1b69aa681d265035475e73d28ea0c8cb6ab.patch"; + sha256 = "sha256-Okz6Er6OVuAA5IlB5IabSa/gUSLa+E2Ltd+J3uoIg6o="; + }) + ]; + + nativeBuildInputs = [ pythonRelaxDepsHook ]; + pythonRelaxDeps = [ + "cmsis-pack-manager" + "cryptography" + "deepmerge" + "jinja2" + "pylink-square" + "pyocd" + ]; + pythonRemoveDeps = [ "pyocd-pemicro" ]; + + propagatedBuildInputs = [ + asn1crypto + astunparse + bincopy + bitstring + click + click-option-group + cmsis-pack-manager + commentjson + crcmod + cryptography + deepmerge + fastjsonschema + hexdump + jinja2 + libusbsio + oscrypto + pycryptodome + pylink-square + pyocd + pypemicro + pyserial + ruamel-yaml + sly + ]; + + checkInputs = [ + pytestCheckHook + voluptuous + ]; + + disabledTests = [ + # tests also fail on debian, so presumable they are broken + "test_elftosb_mbi_signed" + "test_elftosb_sb31" + ]; + + pythonImportsCheck = [ "spsdk" ]; + + meta = with lib; { + description = "NXP Secure Provisioning SDK"; + homepage = "https://github.com/NXPmicro/spsdk"; + license = licenses.bsd3; + maintainers = with maintainers; [ frogamic sbruder ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 86d47bb8f9ef..6674029e17e0 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -10293,6 +10293,8 @@ in { spotipy = callPackage ../development/python-modules/spotipy { }; + spsdk = callPackage ../development/python-modules/spsdk { }; + spur = callPackage ../development/python-modules/spur { }; spyder = callPackage ../development/python-modules/spyder { }; From d6bbf7d2d15a2935d30e46a23e77acabd2c0668d Mon Sep 17 00:00:00 2001 From: Simon Bruder Date: Wed, 27 Jul 2022 14:10:26 +0200 Subject: [PATCH 130/164] pynitrokey: 0.4.9 -> 0.4.26 --- pkgs/tools/security/pynitrokey/default.nix | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/security/pynitrokey/default.nix b/pkgs/tools/security/pynitrokey/default.nix index b50550e74368..af8fd944cf81 100644 --- a/pkgs/tools/security/pynitrokey/default.nix +++ b/pkgs/tools/security/pynitrokey/default.nix @@ -1,15 +1,15 @@ -{ python3Packages, lib }: +{ python3Packages, lib, nrfutil }: with python3Packages; buildPythonApplication rec { pname = "pynitrokey"; - version = "0.4.9"; + version = "0.4.26"; format = "flit"; src = fetchPypi { inherit pname version; - sha256 = "sha256-mhH6mVgLRX87PSGTFkj1TE75jU1lwcaRZWbC67T+vWo="; + sha256 = "sha256-OuLR6txvoOpOUYpkjA5UkXUIIa1hYCwTmmPuUC3i4zM="; }; propagatedBuildInputs = [ @@ -18,17 +18,25 @@ buildPythonApplication rec { ecdsa fido2 intelhex + nrfutil pyserial pyusb requests pygments python-dateutil + spsdk urllib3 cffi cbor nkdfu ]; + # spsdk is patched to allow for newer cryptography + postPatch = '' + substituteInPlace pyproject.toml \ + --replace "cryptography >=3.4.4,<37" "cryptography" + ''; + # no tests doCheck = false; From 7d959092b6905231a5e30b18271e1fded39fb7f3 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 17 Aug 2022 11:04:05 +0000 Subject: [PATCH 131/164] gitleaks: 8.10.3 -> 8.11.0 --- pkgs/tools/security/gitleaks/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/security/gitleaks/default.nix b/pkgs/tools/security/gitleaks/default.nix index 4cd4d2c0a4ea..5a0d90218f3e 100644 --- a/pkgs/tools/security/gitleaks/default.nix +++ b/pkgs/tools/security/gitleaks/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "gitleaks"; - version = "8.10.3"; + version = "8.11.0"; src = fetchFromGitHub { owner = "zricethezav"; repo = pname; rev = "v${version}"; - sha256 = "sha256-uLCV0eSsQhx9/U/iaAPI25w4Q6pI0PeHAPAQvOJwSWI="; + sha256 = "sha256-6zuxEEJlSppR6yBWNKjfNOndICWMnAHaO4mOI9pP7aQ="; }; - vendorSha256 = "sha256-X8z9iKRR3PptNHwy1clZG8QsClsjbW45nZb2fHGfSYk="; + vendorSha256 = "sha256-KtBE8zOCSh/sItEpEA+I2cG3U44FJ2wxxVX3F6choUY="; ldflags = [ "-s" From 2ff9f7d156c4bf24dc04127dc968547f5c155a4b Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 17 Aug 2022 11:04:24 +0000 Subject: [PATCH 132/164] git-cliff: 0.8.1 -> 0.9.0 --- .../version-management/git-and-tools/git-cliff/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/version-management/git-and-tools/git-cliff/default.nix b/pkgs/applications/version-management/git-and-tools/git-cliff/default.nix index 2e467b657d64..086281a1d15c 100644 --- a/pkgs/applications/version-management/git-and-tools/git-cliff/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git-cliff/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "git-cliff"; - version = "0.8.1"; + version = "0.9.0"; src = fetchFromGitHub { owner = "orhun"; repo = "git-cliff"; rev = "v${version}"; - sha256 = "sha256-lRONRLTByhMalN9BKilCcQn2c9f4cxOnHJLL0l0jaOs="; + sha256 = "sha256-xmpT4xzajarc/1Iu0GqLthQlh0N9tJ1LdqJXrB4EN9Q="; }; - cargoSha256 = "sha256-1r/k3DQ/vjIjMpOHYCRRosbZ22iAFkuq4EbZUcZoWn0="; + cargoSha256 = "sha256-f4tB37WiHompXjXqdVy+dNEIn5rhNqda8JTSVUOOlcE="; # attempts to run the program on .git in src which is not deterministic doCheck = false; From 97bcc3a2e01a78539f16fc0e07fa1603937f7e5a Mon Sep 17 00:00:00 2001 From: GGG KILLER Date: Wed, 17 Aug 2022 09:35:01 -0300 Subject: [PATCH 133/164] omnisharp-roslyn: 1.38.2 -> 1.39.1 (#182409) Co-authored-by: Sandro --- .../tools/omnisharp-roslyn/default.nix | 57 ++++++++-- .../tools/omnisharp-roslyn/deps.nix | 107 ++++++++---------- .../tools/omnisharp-roslyn/updater.sh | 66 +++++++++++ 3 files changed, 164 insertions(+), 66 deletions(-) create mode 100755 pkgs/development/tools/omnisharp-roslyn/updater.sh diff --git a/pkgs/development/tools/omnisharp-roslyn/default.nix b/pkgs/development/tools/omnisharp-roslyn/default.nix index 7818273f80f3..871ba6d2ab92 100644 --- a/pkgs/development/tools/omnisharp-roslyn/default.nix +++ b/pkgs/development/tools/omnisharp-roslyn/default.nix @@ -1,31 +1,72 @@ -{ lib, fetchFromGitHub, buildDotnetModule, dotnetCorePackages }: - +{ buildDotnetModule +, dotnetCorePackages +, fetchFromGitHub +, icu +, lib +, patchelf +, stdenv +}: let - sdkVersion = dotnetCorePackages.sdk_6_0.version; + inherit (dotnetCorePackages) sdk_6_0; in buildDotnetModule rec { pname = "omnisharp-roslyn"; - version = "1.38.2"; + version = "1.39.1"; src = fetchFromGitHub { owner = "OmniSharp"; repo = pname; rev = "v${version}"; - sha256 = "7XJIdotfffu8xo+S6xlc1zcK3oY9QIg1CJhCNJh5co0="; + sha256 = "Fd9fS5iSEynZfRwZexDlVndE/zSZdUdugR0VgXXAdmI="; }; projectFile = "src/OmniSharp.Stdio.Driver/OmniSharp.Stdio.Driver.csproj"; nugetDeps = ./deps.nix; + nativeBuildInputs = [ + patchelf + ]; + dotnetInstallFlags = [ "--framework net6.0" ]; + dotnetBuildFlags = [ "--framework net6.0" ]; + dotnetFlags = [ + # These flags are set by the cake build. + "-property:PackageVersion=${version}" + "-property:AssemblyVersion=${version}.0" + "-property:FileVersion=${version}.0" + "-property:InformationalVersion=${version}" + "-property:RuntimeFrameworkVersion=6.0.0-preview.7.21317.1" + "-property:RollForward=LatestMajor" + ]; postPatch = '' # Relax the version requirement substituteInPlace global.json \ - --replace '6.0.100' '${sdkVersion}' + --replace '7.0.100-preview.4.22252.9' '${sdk_6_0.version}' + # Patch the project files so we can compile them properly + for project in src/OmniSharp.Http.Driver/OmniSharp.Http.Driver.csproj src/OmniSharp.LanguageServerProtocol/OmniSharp.LanguageServerProtocol.csproj src/OmniSharp.Stdio.Driver/OmniSharp.Stdio.Driver.csproj; do + substituteInPlace $project \ + --replace 'win7-x64;win7-x86;win10-arm64' 'linux-x64;linux-arm64;osx-x64;osx-arm64' + done ''; - postFixup = '' + dontDotnetFixup = true; # we'll fix it ourselves + postFixup = lib.optionalString stdenv.isLinux '' + # Emulate what .NET 7 does to its binaries while a fix doesn't land in buildDotnetModule + patchelf --set-interpreter $(patchelf --print-interpreter ${sdk_6_0}/dotnet) \ + --set-rpath $(patchelf --print-rpath ${sdk_6_0}/dotnet) \ + $out/lib/omnisharp-roslyn/OmniSharp + + '' + '' + # Now create a wrapper without DOTNET_ROOT + # we explicitly don't set DOTNET_ROOT as it should get the one from PATH + # as you can use any .NET SDK higher than 6 to run OmniSharp and you most + # likely will NOT want the .NET 6 runtime running it (as it'll use that to + # detect the SDKs for its own use, so it's better to let it find it in PATH). + makeWrapper $out/lib/omnisharp-roslyn/OmniSharp $out/bin/OmniSharp \ + --prefix LD_LIBRARY_PATH : ${sdk_6_0.icu}/lib \ + --set-default DOTNET_ROOT ${sdk_6_0} + # Delete files to mimick hacks in https://github.com/OmniSharp/omnisharp-roslyn/blob/bdc14ca/build.cake#L594 rm $out/lib/omnisharp-roslyn/NuGet.*.dll rm $out/lib/omnisharp-roslyn/System.Configuration.ConfigurationManager.dll @@ -37,7 +78,7 @@ buildDotnetModule rec { platforms = platforms.unix; sourceProvenance = with sourceTypes; [ fromSource - binaryNativeCode # dependencies + binaryNativeCode # dependencies ]; license = licenses.mit; maintainers = with maintainers; [ tesq0 ericdallo corngood mdarocha ]; diff --git a/pkgs/development/tools/omnisharp-roslyn/deps.nix b/pkgs/development/tools/omnisharp-roslyn/deps.nix index 8bb5c8bb6548..f96ad2fa941e 100644 --- a/pkgs/development/tools/omnisharp-roslyn/deps.nix +++ b/pkgs/development/tools/omnisharp-roslyn/deps.nix @@ -3,13 +3,15 @@ (fetchNuGet { pname = "Cake.Scripting.Transport"; version = "0.9.0"; sha256 = "1gpbvframx4dx4mzfh44cib6dfd26q7878vf073m9gv3y43sws7b"; }) (fetchNuGet { pname = "Dotnet.Script.DependencyModel"; version = "1.3.1"; sha256 = "0bi9rg6c77qav8mb0rbvs5pczf9f0ii8i11c9vyib53bv6fiifxp"; }) (fetchNuGet { pname = "Dotnet.Script.DependencyModel.NuGet"; version = "1.3.1"; sha256 = "1v2xd0f2xrkgdznnjad5vhjan51k9qwi4piyg5vdz9mvywail51q"; }) - (fetchNuGet { pname = "Humanizer.Core"; version = "2.2.0"; sha256 = "08mzg65y9d3zvq16rsmpapcdan71ggq2mpks6k777h3wlm2sh3p5"; }) + (fetchNuGet { pname = "Humanizer.Core"; version = "2.14.1"; sha256 = "1ai7hgr0qwd7xlqfd92immddyi41j3ag91h3594yzfsgsy6yhyqi"; }) (fetchNuGet { pname = "ICSharpCode.Decompiler"; version = "7.1.0.6543"; sha256 = "1xrajs5dcd7aqsg9ibhdcy39yrd8737kknkmqf907n7fqs2jxr46"; }) (fetchNuGet { pname = "McMaster.Extensions.CommandLineUtils"; version = "3.1.0"; sha256 = "075n1mfsxwz514r94l8i3ax0wp43c3xb4f9w25a96h6xxnj0k2hd"; }) (fetchNuGet { pname = "MediatR"; version = "8.1.0"; sha256 = "0cqx7yfh998xhsfk5pr6229lcjcs1jxxyqz7dwskc9jddl6a2akp"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.win-arm64"; version = "6.0.6"; sha256 = "0991cx7z1bs4a8dn5135vh6mf2qxh0hg16n6j7cfgys74vh2b7ma"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.win-x64"; version = "6.0.6"; sha256 = "1i66xw8h6qw1p0yf09hdy6l42bkhw3qi8q6zi7933mdkd4r3qr9n"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.win-x86"; version = "6.0.6"; sha256 = "1lzg1x7i5kpmf4lkf1v2mqv3szq3vvsl5dpgjm0vfy1yaw308zaw"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.App.Ref"; version = "6.0.6"; sha256 = "08pjgsq2vcsdy4vgff146izvxq5hpg02a8lvih0wcsgghv1m1qki"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-arm64"; version = "6.0.0-preview.7.21317.1"; sha256 = "0m1qlzj1d8fhljvc5xk1smvs20h7j2x6jbrjiiiw9pfnfylcr79j"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/825db618-e3eb-4426-ba54-b1d6e6c944d8/nuget/v3/flat2/microsoft.aspnetcore.app.runtime.linux-arm64/6.0.0-preview.7.21317.1/microsoft.aspnetcore.app.runtime.linux-arm64.6.0.0-preview.7.21317.1.nupkg"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-x64"; version = "6.0.0-preview.7.21317.1"; sha256 = "0jq1vnlqfg2359y0rb8ndf04nrg8f8j1smjwldssb24a92q153iy"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/825db618-e3eb-4426-ba54-b1d6e6c944d8/nuget/v3/flat2/microsoft.aspnetcore.app.runtime.linux-x64/6.0.0-preview.7.21317.1/microsoft.aspnetcore.app.runtime.linux-x64.6.0.0-preview.7.21317.1.nupkg"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.osx-arm64"; version = "6.0.0-preview.7.21317.1"; sha256 = "16shhyj1429509blhnscxaylbmdsryis1mwxrc4a1j04mf2p2g03"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/825db618-e3eb-4426-ba54-b1d6e6c944d8/nuget/v3/flat2/microsoft.aspnetcore.app.runtime.osx-arm64/6.0.0-preview.7.21317.1/microsoft.aspnetcore.app.runtime.osx-arm64.6.0.0-preview.7.21317.1.nupkg"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.osx-x64"; version = "6.0.0-preview.7.21317.1"; sha256 = "0pnbc1661r3gnqfidayja5jm9s5sjjb639pgk2c629g6qqvvaisv"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/825db618-e3eb-4426-ba54-b1d6e6c944d8/nuget/v3/flat2/microsoft.aspnetcore.app.runtime.osx-x64/6.0.0-preview.7.21317.1/microsoft.aspnetcore.app.runtime.osx-x64.6.0.0-preview.7.21317.1.nupkg"; }) (fetchNuGet { pname = "Microsoft.Bcl.AsyncInterfaces"; version = "1.1.1"; sha256 = "0a1ahssqds2ympr7s4xcxv5y8jgxs7ahd6ah6fbgglj4rki1f1vw"; }) (fetchNuGet { pname = "Microsoft.Bcl.AsyncInterfaces"; version = "5.0.0"; sha256 = "0cp5jbax2mf6xr3dqiljzlwi05fv6n9a35z337s92jcljiq674kf"; }) (fetchNuGet { pname = "Microsoft.Bcl.AsyncInterfaces"; version = "6.0.0"; sha256 = "15gqy2m14fdlvy1g59207h5kisznm355kbw010gy19vh47z8gpz3"; }) @@ -21,17 +23,17 @@ (fetchNuGet { pname = "Microsoft.Build.Utilities.Core"; version = "17.0.0"; sha256 = "0b7kylnvdqs81nmxdw7alwij8b19wm00iqicb9gkiklxjfyd8xav"; }) (fetchNuGet { pname = "Microsoft.CodeAnalysis.Analyzers"; version = "3.3.3"; sha256 = "09m4cpry8ivm9ga1abrxmvw16sslxhy2k5sl14zckhqb1j164im6"; }) (fetchNuGet { pname = "Microsoft.CodeAnalysis.AnalyzerUtilities"; version = "3.3.0"; sha256 = "0b2xy6m3l1y6j2xc97cg5llia169jv4nszrrrqclh505gpw6qccz"; }) - (fetchNuGet { pname = "Microsoft.CodeAnalysis.Common"; version = "4.2.0-3.22169.1"; sha256 = "0505svp6y5nbmkh22gz6g4bcxxsmbpc9jy08h8lz5z4i3bikl30b"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/microsoft.codeanalysis.common/4.2.0-3.22169.1/microsoft.codeanalysis.common.4.2.0-3.22169.1.nupkg"; }) - (fetchNuGet { pname = "Microsoft.CodeAnalysis.CSharp"; version = "4.2.0-3.22169.1"; sha256 = "1shvi06n4n2yxvmjzvvx5h9zcc1jwqjfcxr2lbagdcq9bmnvlikw"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/microsoft.codeanalysis.csharp/4.2.0-3.22169.1/microsoft.codeanalysis.csharp.4.2.0-3.22169.1.nupkg"; }) - (fetchNuGet { pname = "Microsoft.CodeAnalysis.CSharp.Features"; version = "4.2.0-3.22169.1"; sha256 = "1aq1qqdvq06h6247m3hpgzkgwpj3a48jl5b98hp4aj9kb5wkmnil"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/microsoft.codeanalysis.csharp.features/4.2.0-3.22169.1/microsoft.codeanalysis.csharp.features.4.2.0-3.22169.1.nupkg"; }) - (fetchNuGet { pname = "Microsoft.CodeAnalysis.CSharp.Scripting"; version = "4.2.0-3.22169.1"; sha256 = "0nhng62lfn4r300g2z3vp4qw51w8vzb5gl3wkd77p9lx2n1ma7n2"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/microsoft.codeanalysis.csharp.scripting/4.2.0-3.22169.1/microsoft.codeanalysis.csharp.scripting.4.2.0-3.22169.1.nupkg"; }) - (fetchNuGet { pname = "Microsoft.CodeAnalysis.CSharp.Workspaces"; version = "4.2.0-3.22169.1"; sha256 = "16vsx5yb3fmyx1nqnbsd5iy46v7s0gf8aikxl12yy7ajdd4mapxj"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/microsoft.codeanalysis.csharp.workspaces/4.2.0-3.22169.1/microsoft.codeanalysis.csharp.workspaces.4.2.0-3.22169.1.nupkg"; }) - (fetchNuGet { pname = "Microsoft.CodeAnalysis.Elfie"; version = "1.0.0-rc14"; sha256 = "0774fkq08a3h0yn22glfcvwzrwc0ll7dh71k0p1mg7m3biyy8a2f"; }) - (fetchNuGet { pname = "Microsoft.CodeAnalysis.ExternalAccess.OmniSharp"; version = "4.2.0-3.22169.1"; sha256 = "02c7m8gy3jkbvn8dcrzc00ngg80xq90cfa1yspk4y4pdcjf6mrbc"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/microsoft.codeanalysis.externalaccess.omnisharp/4.2.0-3.22169.1/microsoft.codeanalysis.externalaccess.omnisharp.4.2.0-3.22169.1.nupkg"; }) - (fetchNuGet { pname = "Microsoft.CodeAnalysis.ExternalAccess.OmniSharp.CSharp"; version = "4.2.0-3.22169.1"; sha256 = "1wj6r0ara77fibvxh8s518isgwxwcd41c0iw7fmvz2pd94l16hgz"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/microsoft.codeanalysis.externalaccess.omnisharp.csharp/4.2.0-3.22169.1/microsoft.codeanalysis.externalaccess.omnisharp.csharp.4.2.0-3.22169.1.nupkg"; }) - (fetchNuGet { pname = "Microsoft.CodeAnalysis.Features"; version = "4.2.0-3.22169.1"; sha256 = "1xpsjsxm7hnl9wzfp0nz9prv72jgf0r9ljqynab3gaipsdaswddk"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/microsoft.codeanalysis.features/4.2.0-3.22169.1/microsoft.codeanalysis.features.4.2.0-3.22169.1.nupkg"; }) - (fetchNuGet { pname = "Microsoft.CodeAnalysis.Scripting.Common"; version = "4.2.0-3.22169.1"; sha256 = "0w0z3njcbq6n0a24xvxcp461898zlkwqs6p1gdpnpxks5vvgah12"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/microsoft.codeanalysis.scripting.common/4.2.0-3.22169.1/microsoft.codeanalysis.scripting.common.4.2.0-3.22169.1.nupkg"; }) - (fetchNuGet { pname = "Microsoft.CodeAnalysis.Workspaces.Common"; version = "4.2.0-3.22169.1"; sha256 = "0psy2ifls96mif6kvr242v1s1zmawdljwmcxaj20rl3m7v0nlwmd"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/microsoft.codeanalysis.workspaces.common/4.2.0-3.22169.1/microsoft.codeanalysis.workspaces.common.4.2.0-3.22169.1.nupkg"; }) + (fetchNuGet { pname = "Microsoft.CodeAnalysis.Common"; version = "4.4.0-1.22369.1"; sha256 = "0kmzgwj3kyzrv5k7cfcy0178bdvf6n5bshkslgzxzgmr5118y5c7"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/microsoft.codeanalysis.common/4.4.0-1.22369.1/microsoft.codeanalysis.common.4.4.0-1.22369.1.nupkg"; }) + (fetchNuGet { pname = "Microsoft.CodeAnalysis.CSharp"; version = "4.4.0-1.22369.1"; sha256 = "1z0rf4vw9d5nbchc6hr8dv96dpkjkanv74ghv88say0h34japnvw"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/microsoft.codeanalysis.csharp/4.4.0-1.22369.1/microsoft.codeanalysis.csharp.4.4.0-1.22369.1.nupkg"; }) + (fetchNuGet { pname = "Microsoft.CodeAnalysis.CSharp.Features"; version = "4.4.0-1.22369.1"; sha256 = "1fgndnm3ic6f5jv6rdmaw5ps73a5m95dqlichawymmkqnrr15y9q"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/microsoft.codeanalysis.csharp.features/4.4.0-1.22369.1/microsoft.codeanalysis.csharp.features.4.4.0-1.22369.1.nupkg"; }) + (fetchNuGet { pname = "Microsoft.CodeAnalysis.CSharp.Scripting"; version = "4.4.0-1.22369.1"; sha256 = "04b4byz6sqq5gz03xj8zsgaf4l0dqcnb21wy5jf27ax5j6avb85v"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/microsoft.codeanalysis.csharp.scripting/4.4.0-1.22369.1/microsoft.codeanalysis.csharp.scripting.4.4.0-1.22369.1.nupkg"; }) + (fetchNuGet { pname = "Microsoft.CodeAnalysis.CSharp.Workspaces"; version = "4.4.0-1.22369.1"; sha256 = "1s6hh1cqkap9p0drwq1rqc5b6kzmdqfba3c5l7v7c1kzwaa8k3q3"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/microsoft.codeanalysis.csharp.workspaces/4.4.0-1.22369.1/microsoft.codeanalysis.csharp.workspaces.4.4.0-1.22369.1.nupkg"; }) + (fetchNuGet { pname = "Microsoft.CodeAnalysis.Elfie"; version = "1.0.0"; sha256 = "1y5r6pm9rp70xyiaj357l3gdl4i4r8xxvqllgdyrwn9gx2aqzzqk"; }) + (fetchNuGet { pname = "Microsoft.CodeAnalysis.ExternalAccess.OmniSharp"; version = "4.4.0-1.22369.1"; sha256 = "0lawpffk4y4435dmyrd38paxf04vlvfxsdn2xg1r9ch0l7a2cxb3"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/microsoft.codeanalysis.externalaccess.omnisharp/4.4.0-1.22369.1/microsoft.codeanalysis.externalaccess.omnisharp.4.4.0-1.22369.1.nupkg"; }) + (fetchNuGet { pname = "Microsoft.CodeAnalysis.ExternalAccess.OmniSharp.CSharp"; version = "4.4.0-1.22369.1"; sha256 = "0z55hzv2pk9nbpwj9q6hr9ml60g3dj12vmx34bjldvspxkxjjilc"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/microsoft.codeanalysis.externalaccess.omnisharp.csharp/4.4.0-1.22369.1/microsoft.codeanalysis.externalaccess.omnisharp.csharp.4.4.0-1.22369.1.nupkg"; }) + (fetchNuGet { pname = "Microsoft.CodeAnalysis.Features"; version = "4.4.0-1.22369.1"; sha256 = "0ijpr2r5ahnh7s6sds9ihzw8383q2dmbrrm4yfs78sxwnhabmgy0"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/microsoft.codeanalysis.features/4.4.0-1.22369.1/microsoft.codeanalysis.features.4.4.0-1.22369.1.nupkg"; }) + (fetchNuGet { pname = "Microsoft.CodeAnalysis.Scripting.Common"; version = "4.4.0-1.22369.1"; sha256 = "1aq0dlfvbpifbapa75jj4sf4jqpb4w5y76xcvbg8gvgvvmahfkqk"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/microsoft.codeanalysis.scripting.common/4.4.0-1.22369.1/microsoft.codeanalysis.scripting.common.4.4.0-1.22369.1.nupkg"; }) + (fetchNuGet { pname = "Microsoft.CodeAnalysis.Workspaces.Common"; version = "4.4.0-1.22369.1"; sha256 = "0v47hxzydwyvy6246ix144kgyiz7b1xbc4s7aan83cpj21j5g4vs"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/microsoft.codeanalysis.workspaces.common/4.4.0-1.22369.1/microsoft.codeanalysis.workspaces.common.4.4.0-1.22369.1.nupkg"; }) (fetchNuGet { pname = "Microsoft.CSharp"; version = "4.0.1"; sha256 = "0zxc0apx1gcx361jlq8smc9pfdgmyjh6hpka8dypc9w23nlsh6yj"; }) (fetchNuGet { pname = "Microsoft.CSharp"; version = "4.7.0"; sha256 = "0gd67zlw554j098kabg887b5a6pq9kzavpa3jjy5w53ccjzjfy8j"; }) (fetchNuGet { pname = "Microsoft.DiaSymReader"; version = "1.4.0"; sha256 = "0li9shnm941jza40kqfkbbys77mrr55nvi9h3maq9fipq4qwx92d"; }) @@ -69,12 +71,15 @@ (fetchNuGet { pname = "Microsoft.Extensions.Primitives"; version = "2.0.0"; sha256 = "1xppr5jbny04slyjgngxjdm0maxdh47vq481ps944d7jrfs0p3mb"; }) (fetchNuGet { pname = "Microsoft.Extensions.Primitives"; version = "6.0.0"; sha256 = "1kjiw6s4yfz9gm7mx3wkhp06ghnbs95icj9hi505shz9rjrg42q2"; }) (fetchNuGet { pname = "Microsoft.NET.StringTools"; version = "1.0.0"; sha256 = "06yakiyzgss399giivfx6xdrnfxqfsvy5fzm90scjanvandv0sdj"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Host.win-arm64"; version = "6.0.6"; sha256 = "1rzp7ik9lgr48vrhdpi50f784ma049q40ax95ipfbd8d5ibibmf4"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Host.win-x64"; version = "6.0.6"; sha256 = "186ammhxnkh4m68f1s70rca23025lwzhxnc7m82wjg18rwz2vnkl"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Host.win-x86"; version = "6.0.6"; sha256 = "09qvkwp419w6kqya42zlm0xh7aaamnny26z19rhchrv33rh16m6h"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.win-arm64"; version = "6.0.6"; sha256 = "0aabgvm2pl28injcay77l6ccz8r7bk1gxw5jrxbbjiirkv3r4gbl"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.win-x64"; version = "6.0.6"; sha256 = "1a6hvkiy2z6z7v7rw1q61qqlw7w0hzc4my3rm94kwgjcv5qkpr5k"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.win-x86"; version = "6.0.6"; sha256 = "1kzkn9ssa9h4cfgnlcljw8qj2f7ln8ywzag6k4xx3i40pa7z5fhd"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Host.linux-arm64"; version = "6.0.0-preview.7.21317.1"; sha256 = "02pqxy48yzywijrqhzg7ip6jslnkf1w788yyfvk9flxq2anlax9l"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/825db618-e3eb-4426-ba54-b1d6e6c944d8/nuget/v3/flat2/microsoft.netcore.app.host.linux-arm64/6.0.0-preview.7.21317.1/microsoft.netcore.app.host.linux-arm64.6.0.0-preview.7.21317.1.nupkg"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Host.linux-x64"; version = "6.0.0-preview.7.21317.1"; sha256 = "1249kp3bdgf23ayk8qdrdahxzgf5ibiwjqjc42c92vv3gq7976iz"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/825db618-e3eb-4426-ba54-b1d6e6c944d8/nuget/v3/flat2/microsoft.netcore.app.host.linux-x64/6.0.0-preview.7.21317.1/microsoft.netcore.app.host.linux-x64.6.0.0-preview.7.21317.1.nupkg"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Host.osx-arm64"; version = "6.0.0-preview.7.21317.1"; sha256 = "0bhqamkqj697rb4gn47fjh39565pf83fhvp2cxzvkiwl6hvyj5n6"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/825db618-e3eb-4426-ba54-b1d6e6c944d8/nuget/v3/flat2/microsoft.netcore.app.host.osx-arm64/6.0.0-preview.7.21317.1/microsoft.netcore.app.host.osx-arm64.6.0.0-preview.7.21317.1.nupkg"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Host.osx-x64"; version = "6.0.0-preview.7.21317.1"; sha256 = "1a9flva8llnwmn8bmlriflzrcazzzxfr7xm4m27apdc9fmci4kgv"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/825db618-e3eb-4426-ba54-b1d6e6c944d8/nuget/v3/flat2/microsoft.netcore.app.host.osx-x64/6.0.0-preview.7.21317.1/microsoft.netcore.app.host.osx-x64.6.0.0-preview.7.21317.1.nupkg"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Ref"; version = "6.0.6"; sha256 = "146fr1gbs8bb5cbiz94xqddd29bnbi18ljnsd0yw2dqhf3ln0vpf"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-arm64"; version = "6.0.0-preview.7.21317.1"; sha256 = "0ah6lkvxk81c1xz32jz7x49gwllcw84jssx17g1mq2k49vp5s6ss"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/825db618-e3eb-4426-ba54-b1d6e6c944d8/nuget/v3/flat2/microsoft.netcore.app.runtime.linux-arm64/6.0.0-preview.7.21317.1/microsoft.netcore.app.runtime.linux-arm64.6.0.0-preview.7.21317.1.nupkg"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-x64"; version = "6.0.0-preview.7.21317.1"; sha256 = "1pq0x10jmxzk0zhky3hq2wc3ffx2mjv57zjq6z75yd8x2yiww153"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/825db618-e3eb-4426-ba54-b1d6e6c944d8/nuget/v3/flat2/microsoft.netcore.app.runtime.linux-x64/6.0.0-preview.7.21317.1/microsoft.netcore.app.runtime.linux-x64.6.0.0-preview.7.21317.1.nupkg"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.osx-arm64"; version = "6.0.0-preview.7.21317.1"; sha256 = "1nc6rcr5qnh32bsvj78zj2078srp3d4qc0gdd79kqajgp0lckqc2"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/825db618-e3eb-4426-ba54-b1d6e6c944d8/nuget/v3/flat2/microsoft.netcore.app.runtime.osx-arm64/6.0.0-preview.7.21317.1/microsoft.netcore.app.runtime.osx-arm64.6.0.0-preview.7.21317.1.nupkg"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.osx-x64"; version = "6.0.0-preview.7.21317.1"; sha256 = "13523hyx9s11c84qjmv3miyfgjkyy8879ki3wny2xkfw8ldzm91p"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/825db618-e3eb-4426-ba54-b1d6e6c944d8/nuget/v3/flat2/microsoft.netcore.app.runtime.osx-x64/6.0.0-preview.7.21317.1/microsoft.netcore.app.runtime.osx-x64.6.0.0-preview.7.21317.1.nupkg"; }) (fetchNuGet { pname = "Microsoft.NETCore.Platforms"; version = "1.0.1"; sha256 = "01al6cfxp68dscl15z7rxfw9zvhm64dncsw09a1vmdkacsa2v6lr"; }) (fetchNuGet { pname = "Microsoft.NETCore.Platforms"; version = "1.1.0"; sha256 = "08vh1r12g6ykjygq5d3vq09zylgb84l63k49jc4v8faw9g93iqqm"; }) (fetchNuGet { pname = "Microsoft.NETCore.Platforms"; version = "2.0.0"; sha256 = "1fk2fk2639i7nzy58m9dvpdnzql4vb8yl8vr19r2fp8lmj9w2jr0"; }) @@ -87,19 +92,16 @@ (fetchNuGet { pname = "Microsoft.NETFramework.ReferenceAssemblies.net472"; version = "1.0.0"; sha256 = "1bqinq2nxnpqxziypg1sqy3ly0nymxxjpn8fwkn3rl4vl6gdg3rc"; }) (fetchNuGet { pname = "Microsoft.SourceLink.Common"; version = "1.0.0"; sha256 = "1zxkpx01zdv17c39iiy8fx25ran89n14qwddh1f140v1s4dn8z9c"; }) (fetchNuGet { pname = "Microsoft.SourceLink.GitHub"; version = "1.0.0"; sha256 = "029ixyaqn48cjza87m5qf0g1ynyhlm6irgbx1n09src9g666yhpd"; }) - (fetchNuGet { pname = "Microsoft.TestPlatform.ObjectModel"; version = "17.0.0"; sha256 = "1bh5scbvl6ndldqv20sl34h4y257irm9ziv2wyfc3hka6912fhn7"; }) - (fetchNuGet { pname = "Microsoft.TestPlatform.TranslationLayer"; version = "17.0.0"; sha256 = "08c6d9aiicpj8hsjb77rz7d2vmw7ivkcc0l1vgdgxddzjhjpy0pi"; }) - (fetchNuGet { pname = "Microsoft.VisualStudio.RemoteControl"; version = "16.3.44"; sha256 = "0kjvxpx45vvaxqm6k632gqi0zaw7w5m4h8wgmsaj15r4ihl49c3a"; }) + (fetchNuGet { pname = "Microsoft.TestPlatform.ObjectModel"; version = "17.2.0"; sha256 = "0l05smcgjzdfa5f60f9q5lylap3i21aswxbava92s19bgv46w2rv"; }) + (fetchNuGet { pname = "Microsoft.TestPlatform.TranslationLayer"; version = "17.2.0"; sha256 = "0yzwsmyb1pz761rg03zjimbqhngqj2vgzppp0ypqhdxbp5gmh2k9"; }) (fetchNuGet { pname = "Microsoft.VisualStudio.SDK.EmbedInteropTypes"; version = "15.0.12"; sha256 = "083pva0a0xxvqqrjv75if25wr3rq034wgjhbax74zhzdb665nzsw"; }) (fetchNuGet { pname = "Microsoft.VisualStudio.Setup.Configuration.Interop"; version = "1.14.114"; sha256 = "062mqkmjf4k6zm3wi9ih0lzypfsnv82lgh88r35fj66akihn86gv"; }) (fetchNuGet { pname = "Microsoft.VisualStudio.Setup.Configuration.Interop"; version = "1.16.30"; sha256 = "14022lx03vdcqlvbbdmbsxg5pqfx1rfq2jywxlyaz9v68cvsb0g4"; }) (fetchNuGet { pname = "Microsoft.VisualStudio.Threading"; version = "16.7.56"; sha256 = "13x0xrsjxd86clf9cjjwmpzlyp8pkrf13riya7igs8zy93zw2qap"; }) (fetchNuGet { pname = "Microsoft.VisualStudio.Threading.Analyzers"; version = "16.7.56"; sha256 = "04v9df0k7bsc0rzgkw4mnvi43pdrh42vk6xdcwn9m6im33m0nnz2"; }) - (fetchNuGet { pname = "Microsoft.VisualStudio.Utilities.Internal"; version = "16.3.36"; sha256 = "1sg4vjm7735rkvxdmsb7wvjqrxy4gcvhhczv5dhpjayg7885k8cx"; }) (fetchNuGet { pname = "Microsoft.VisualStudio.Validation"; version = "15.5.31"; sha256 = "1ah99rn922qa0sd2k3h64m324f2r32pw8cn4cfihgvwx4qdrpmgw"; }) (fetchNuGet { pname = "Microsoft.Win32.Primitives"; version = "4.3.0"; sha256 = "0j0c1wj4ndj21zsgivsc24whiya605603kxrbiw6wkfdync464wq"; }) (fetchNuGet { pname = "Microsoft.Win32.Registry"; version = "4.3.0"; sha256 = "1gxyzxam8163vk1kb6xzxjj4iwspjsz9zhgn1w9rjzciphaz0ig7"; }) - (fetchNuGet { pname = "Microsoft.Win32.Registry"; version = "4.5.0"; sha256 = "1zapbz161ji8h82xiajgriq6zgzmb1f3ar517p2h63plhsq5gh2q"; }) (fetchNuGet { pname = "Microsoft.Win32.Registry"; version = "4.6.0"; sha256 = "0i4y782yrqqyx85pg597m20gm0v126w0j9ddk5z7xb3crx4z9f2s"; }) (fetchNuGet { pname = "Microsoft.Win32.SystemEvents"; version = "4.7.0"; sha256 = "0pjll2a62hc576hd4wgyasva0lp733yllmk54n37svz5ac7nfz0q"; }) (fetchNuGet { pname = "Nerdbank.Streams"; version = "2.6.81"; sha256 = "06wihcaga8537ibh0mkj28m720m6vzkqk562zkynhca85nd236yi"; }) @@ -110,25 +112,25 @@ (fetchNuGet { pname = "Newtonsoft.Json"; version = "13.0.1"; sha256 = "0fijg0w6iwap8gvzyjnndds0q4b8anwxxvik7y8vgq97dram4srb"; }) (fetchNuGet { pname = "Newtonsoft.Json"; version = "9.0.1"; sha256 = "0mcy0i7pnfpqm4pcaiyzzji4g0c8i3a5gjz28rrr28110np8304r"; }) (fetchNuGet { pname = "NuGet.Common"; version = "5.2.0"; sha256 = "14y7axpmdl9fg8jfc42gxpcq9wj8k3vzc07npmgjnzqlp5xjyyac"; }) - (fetchNuGet { pname = "NuGet.Common"; version = "6.0.0"; sha256 = "0vbvmx2zzg54fv6617afi3z49cala70qj7jfxqnldjbc1z2c4b7r"; }) + (fetchNuGet { pname = "NuGet.Common"; version = "6.3.0-preview.1.32"; sha256 = "1vvfs5f7lir3ds9hm4k511h44vilh29a0cb90ssz2ag3dx3bg2ly"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/nuget.common/6.3.0-preview.1.32/nuget.common.6.3.0-preview.1.32.nupkg"; }) (fetchNuGet { pname = "NuGet.Configuration"; version = "5.2.0"; sha256 = "0b4dkym3vnj7qldnqqq6h6ry0gkql5c2ps5wy72b8s4fc3dmnvf1"; }) - (fetchNuGet { pname = "NuGet.Configuration"; version = "6.0.0"; sha256 = "1qnrahn4rbb55ra4zg9c947kbm9wdiv344f12c3b4c5i7bfmivx3"; }) + (fetchNuGet { pname = "NuGet.Configuration"; version = "6.3.0-preview.1.32"; sha256 = "0pgz4dbg2li611szh9qmljpkxbjl4q4v981mmcw8f8v85ifjqigh"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/nuget.configuration/6.3.0-preview.1.32/nuget.configuration.6.3.0-preview.1.32.nupkg"; }) (fetchNuGet { pname = "NuGet.DependencyResolver.Core"; version = "5.2.0"; sha256 = "156yjfsk9pzqviiwy69lxfqf61yyj4hn4vdgfcbqvw4d567i150r"; }) - (fetchNuGet { pname = "NuGet.DependencyResolver.Core"; version = "6.0.0"; sha256 = "04w7wbfsb647apqrrzx3gj2jjlg09wdzmxj62bx43ngr34i4q83n"; }) - (fetchNuGet { pname = "NuGet.Frameworks"; version = "5.0.0"; sha256 = "18ijvmj13cwjdrrm52c8fpq021531zaz4mj4b4zapxaqzzxf2qjr"; }) + (fetchNuGet { pname = "NuGet.DependencyResolver.Core"; version = "6.3.0-preview.1.32"; sha256 = "11rqfv30iz5php6y77rm85a54sfixhhx128c2pys2pkqc9y636kl"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/nuget.dependencyresolver.core/6.3.0-preview.1.32/nuget.dependencyresolver.core.6.3.0-preview.1.32.nupkg"; }) + (fetchNuGet { pname = "NuGet.Frameworks"; version = "5.11.0"; sha256 = "0wv26gq39hfqw9md32amr5771s73f5zn1z9vs4y77cgynxr73s4z"; }) (fetchNuGet { pname = "NuGet.Frameworks"; version = "5.2.0"; sha256 = "1fh4rp26m77jq5dyln68wz9qm217la9vv21amis2qvcy6gknk2wp"; }) - (fetchNuGet { pname = "NuGet.Frameworks"; version = "6.0.0"; sha256 = "11p6mhh36s3vmnylfzw125fqivjk1xj75bvcxdav8n4sbk7d3gqs"; }) + (fetchNuGet { pname = "NuGet.Frameworks"; version = "6.3.0-preview.1.32"; sha256 = "13ba96pn5d6ks0lymn8m0kz0dkbnxvnzv4ll4abym8lnfh8rw0px"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/nuget.frameworks/6.3.0-preview.1.32/nuget.frameworks.6.3.0-preview.1.32.nupkg"; }) (fetchNuGet { pname = "NuGet.LibraryModel"; version = "5.2.0"; sha256 = "0vxd0y7rzzxvmxji9bzp95p2rx48303r3nqrlhmhhfc4z5fxjlqk"; }) - (fetchNuGet { pname = "NuGet.LibraryModel"; version = "6.0.0"; sha256 = "0pg4m6v2j5vvld7s57fvx28ix7wlah6dakhi55qpavmkmnzp6g3f"; }) + (fetchNuGet { pname = "NuGet.LibraryModel"; version = "6.3.0-preview.1.32"; sha256 = "10i35n5jx64qbl86gcizhk3pgxd9f15c7ilma7xdwjjkcg30nknd"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/nuget.librarymodel/6.3.0-preview.1.32/nuget.librarymodel.6.3.0-preview.1.32.nupkg"; }) (fetchNuGet { pname = "NuGet.Packaging"; version = "5.2.0"; sha256 = "14frrbdkka9jd6g52bv4lbqnpckw09yynr08f9kfgbc3j8pklqqb"; }) - (fetchNuGet { pname = "NuGet.Packaging"; version = "6.0.0"; sha256 = "0vlcda74h6gq3q569kbbz4n3d26vihxaldvvi2md3phqf8jpvhjb"; }) - (fetchNuGet { pname = "NuGet.Packaging.Core"; version = "6.0.0"; sha256 = "1kk7rf7cavdicxb4bmwcgwykr53nrk38m6r49hvs85jhhvg9jmyf"; }) + (fetchNuGet { pname = "NuGet.Packaging"; version = "6.3.0-preview.1.32"; sha256 = "0wv12r94ws977zkyqi4kb2vvi2micv5x8h2wafzjyiphcpc20pvl"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/nuget.packaging/6.3.0-preview.1.32/nuget.packaging.6.3.0-preview.1.32.nupkg"; }) + (fetchNuGet { pname = "NuGet.Packaging.Core"; version = "6.3.0-preview.1.32"; sha256 = "0wcqmdia97zck6isckk5sv1nmw03148grhl37wwyckc3wvx4zdak"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/nuget.packaging.core/6.3.0-preview.1.32/nuget.packaging.core.6.3.0-preview.1.32.nupkg"; }) (fetchNuGet { pname = "NuGet.ProjectModel"; version = "5.2.0"; sha256 = "1j23jk2zql52v2nqgi0k6d7z63pjjzrvw8y1s38zpf0sn7lzdr0h"; }) - (fetchNuGet { pname = "NuGet.ProjectModel"; version = "6.0.0"; sha256 = "1fldxlw88jqgy0cfgfa7drqpxf909kfchcvk4nxj7vyhza2q715y"; }) + (fetchNuGet { pname = "NuGet.ProjectModel"; version = "6.3.0-preview.1.32"; sha256 = "1nji9s8j08zbx01ng7b3kc3hp41pgvs1if0rq7lxgfp7ajs2cxik"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/nuget.projectmodel/6.3.0-preview.1.32/nuget.projectmodel.6.3.0-preview.1.32.nupkg"; }) (fetchNuGet { pname = "NuGet.Protocol"; version = "5.2.0"; sha256 = "1vlrrlcy7p2sf23wqax8mfhplnzppd73xqlr2g83ya056w0yf2rd"; }) - (fetchNuGet { pname = "NuGet.Protocol"; version = "6.0.0"; sha256 = "16rs9hfra4bly8jp0lxsg0gbpi9wvxh7nrxrdkbjm01vb0azw823"; }) + (fetchNuGet { pname = "NuGet.Protocol"; version = "6.3.0-preview.1.32"; sha256 = "1k1vjcgdjrpxw52qgmmcviiic72jsk9afblxcsr391rnz871jkbs"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/nuget.protocol/6.3.0-preview.1.32/nuget.protocol.6.3.0-preview.1.32.nupkg"; }) (fetchNuGet { pname = "NuGet.Versioning"; version = "5.2.0"; sha256 = "08ay8bhddj9yiq6h9lk814l65fpx5gh1iprkl7pcp78g57a6k45k"; }) - (fetchNuGet { pname = "NuGet.Versioning"; version = "6.0.0"; sha256 = "0xxrz0p9vd2ax8hcrdxcp3h6gv8qcy6mngp49dvg1ijjjr1jb85k"; }) + (fetchNuGet { pname = "NuGet.Versioning"; version = "6.3.0-preview.1.32"; sha256 = "1aamlp2k26xdrgq5sjyhw5nfxzhbrv87q2a96hh37ipxya11smgv"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/nuget.versioning/6.3.0-preview.1.32/nuget.versioning.6.3.0-preview.1.32.nupkg"; }) (fetchNuGet { pname = "OmniSharp.Extensions.JsonRpc"; version = "0.19.0"; sha256 = "0m9lw21iz90ayl35f24ir3vbiydf4sjqw590qqgwknykpzsi1ai2"; }) (fetchNuGet { pname = "OmniSharp.Extensions.JsonRpc.Generators"; version = "0.19.0"; sha256 = "17akjdh9dnyxr01lnlsa41ca52psqnny8j3wxz904zs15pz932ln"; }) (fetchNuGet { pname = "OmniSharp.Extensions.LanguageProtocol"; version = "0.19.0"; sha256 = "06d4wakdaj42c9qnlhdyqrjnm97azp4hrvfg70f96ldl765y9vrf"; }) @@ -167,17 +169,14 @@ (fetchNuGet { pname = "runtime.ubuntu.14.04-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "160p68l2c7cqmyqjwxydcvgw7lvl1cr0znkw8fp24d1by9mqc8p3"; }) (fetchNuGet { pname = "runtime.ubuntu.16.04-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "15zrc8fgd8zx28hdghcj5f5i34wf3l6bq5177075m2bc2j34jrqy"; }) (fetchNuGet { pname = "runtime.ubuntu.16.10-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "1p4dgxax6p7rlgj4q73k73rslcnz4wdcv8q2flg1s8ygwcm58ld5"; }) - (fetchNuGet { pname = "runtime.win.Microsoft.Win32.Primitives"; version = "4.3.0"; sha256 = "0k1h8nnp1s0p8rjwgjyj1387cc1yycv0k22igxc963lqdzrx2z36"; }) - (fetchNuGet { pname = "runtime.win.System.Console"; version = "4.3.0"; sha256 = "0x2yajfrbc5zc6g7nmlr44xpjk6p1hxjq47jn3xki5j7i33zw9jc"; }) - (fetchNuGet { pname = "runtime.win.System.Diagnostics.Debug"; version = "4.3.0"; sha256 = "16fbn4bcynad1ygdq0yk1wmckvs8jvrrf104xa5dc2hlc8y3x58f"; }) - (fetchNuGet { pname = "runtime.win.System.IO.FileSystem"; version = "4.3.0"; sha256 = "1c01nklbxywszsbfaxc76hsz7gdxac3jkphrywfkdsi3v4bwd6g8"; }) - (fetchNuGet { pname = "runtime.win.System.Net.Primitives"; version = "4.3.0"; sha256 = "1dixh195bi7473n17hspll6i562gghdz9m4jk8d4kzi1mlzjk9cf"; }) - (fetchNuGet { pname = "runtime.win.System.Net.Sockets"; version = "4.3.0"; sha256 = "0lr3zki831vs6qhk5wckv2b9qbfk9rcj0ds2926qvj1b9y9m6sck"; }) - (fetchNuGet { pname = "runtime.win.System.Runtime.Extensions"; version = "4.3.0"; sha256 = "1700famsxndccfbcdz9q14qb20p49lax67mqwpgy4gx3vja1yczr"; }) - (fetchNuGet { pname = "runtime.win10-arm64.runtime.native.System.IO.Compression"; version = "4.3.0"; sha256 = "1jrmrmqscn8cn2n3piar8n85gfsra7vlai23w9ldzprh0y4dw3v1"; }) - (fetchNuGet { pname = "runtime.win7-x64.runtime.native.System.IO.Compression"; version = "4.3.0"; sha256 = "1dmbmksnxg12fk2p0k7rzy16448mddr2sfrnqs0rhhrzl0z22zi5"; }) - (fetchNuGet { pname = "runtime.win7-x86.runtime.native.System.IO.Compression"; version = "4.3.0"; sha256 = "08ppln62lcq3bz2kyxqyvh98payd5a7w8fzmb53mznkcfv32n55b"; }) - (fetchNuGet { pname = "runtime.win7.System.Private.Uri"; version = "4.3.0"; sha256 = "0bxkcmklp556dc43bra8ngc8wymcbbflcydi0xwq0j22gm66xf2m"; }) + (fetchNuGet { pname = "runtime.unix.Microsoft.Win32.Primitives"; version = "4.3.0"; sha256 = "0y61k9zbxhdi0glg154v30kkq7f8646nif8lnnxbvkjpakggd5id"; }) + (fetchNuGet { pname = "runtime.unix.System.Console"; version = "4.3.0"; sha256 = "1pfpkvc6x2if8zbdzg9rnc5fx51yllprl8zkm5npni2k50lisy80"; }) + (fetchNuGet { pname = "runtime.unix.System.Diagnostics.Debug"; version = "4.3.0"; sha256 = "1lps7fbnw34bnh3lm31gs5c0g0dh7548wfmb8zz62v0zqz71msj5"; }) + (fetchNuGet { pname = "runtime.unix.System.IO.FileSystem"; version = "4.3.0"; sha256 = "14nbkhvs7sji5r1saj2x8daz82rnf9kx28d3v2qss34qbr32dzix"; }) + (fetchNuGet { pname = "runtime.unix.System.Net.Primitives"; version = "4.3.0"; sha256 = "0bdnglg59pzx9394sy4ic66kmxhqp8q8bvmykdxcbs5mm0ipwwm4"; }) + (fetchNuGet { pname = "runtime.unix.System.Net.Sockets"; version = "4.3.0"; sha256 = "03npdxzy8gfv035bv1b9rz7c7hv0rxl5904wjz51if491mw0xy12"; }) + (fetchNuGet { pname = "runtime.unix.System.Private.Uri"; version = "4.3.0"; sha256 = "1jx02q6kiwlvfksq1q9qr17fj78y5v6mwsszav4qcz9z25d5g6vk"; }) + (fetchNuGet { pname = "runtime.unix.System.Runtime.Extensions"; version = "4.3.0"; sha256 = "0pnxxmm8whx38dp6yvwgmh22smknxmqs5n513fc7m4wxvs1bvi4p"; }) (fetchNuGet { pname = "SQLitePCLRaw.bundle_green"; version = "2.0.7"; sha256 = "083saqlwx1hbhy0rv7vi973aw7jv8q53fcxlrprx1wgxdwnbi5ni"; }) (fetchNuGet { pname = "SQLitePCLRaw.core"; version = "2.0.7"; sha256 = "0b25qz3h1aarza2b74alsl9v6czns3y61i8p10yqgd9djk1b1byj"; }) (fetchNuGet { pname = "SQLitePCLRaw.lib.e_sqlite3"; version = "2.0.7"; sha256 = "0wkrzcpc9vcd27gwj6w537i1i5i3h5zsips8b9v9ngk003n50mia"; }) @@ -194,19 +193,14 @@ (fetchNuGet { pname = "System.Collections.Immutable"; version = "1.5.0"; sha256 = "1d5gjn5afnrf461jlxzawcvihz195gayqpcfbv6dd7pxa9ialn06"; }) (fetchNuGet { pname = "System.Collections.Immutable"; version = "1.7.1"; sha256 = "1nh4nlxfc7lbnbl86wwk1a3jwl6myz5j6hvgh5sp4krim9901hsq"; }) (fetchNuGet { pname = "System.Collections.Immutable"; version = "5.0.0"; sha256 = "1kvcllagxz2q92g81zkz81djkn2lid25ayjfgjalncyc68i15p0r"; }) + (fetchNuGet { pname = "System.Collections.Immutable"; version = "6.0.0"; sha256 = "1js98kmjn47ivcvkjqdmyipzknb9xbndssczm8gq224pbaj1p88c"; }) (fetchNuGet { pname = "System.ComponentModel.Annotations"; version = "5.0.0"; sha256 = "021h7x98lblq9avm1bgpa4i31c2kgsa7zn4sqhxf39g087ar756j"; }) (fetchNuGet { pname = "System.ComponentModel.Composition"; version = "4.5.0"; sha256 = "196ihd17in5idnxq5l5xvpa1fhqamnihjg3mcmv1k4n8bjrrj5y7"; }) - (fetchNuGet { pname = "System.Composition"; version = "1.0.31"; sha256 = "0aa27jz73qb0xm6dyxv22qhfrmyyqjyn2dvvsd9asi82lcdh9i61"; }) (fetchNuGet { pname = "System.Composition"; version = "6.0.0"; sha256 = "1p7hysns39cc24af6dwd4m48bqjsrr3clvi4aws152mh2fgyg50z"; }) - (fetchNuGet { pname = "System.Composition.AttributedModel"; version = "1.0.31"; sha256 = "1ipyb86hvw754kmk47vjmzyilvj5hymg9nqabz70sbgsz1fygrdv"; }) (fetchNuGet { pname = "System.Composition.AttributedModel"; version = "6.0.0"; sha256 = "1mqrblb0l65hw39d0hnspqcv85didpn4wbiwhfgj4784wzqx2w6k"; }) - (fetchNuGet { pname = "System.Composition.Convention"; version = "1.0.31"; sha256 = "00gqcdrql7vhynxh4xq0s9j5nw27kghmn2n773v7lhzjh3ash18r"; }) (fetchNuGet { pname = "System.Composition.Convention"; version = "6.0.0"; sha256 = "02km3yb94p1c4s7liyhkmda0g71zm1rc8ijsfmy4bnlkq15xjw3b"; }) - (fetchNuGet { pname = "System.Composition.Hosting"; version = "1.0.31"; sha256 = "1f1bnk3j7ndx9r7zpzibmrhw78clys1pspl20j2dhnmkiwhl23vy"; }) (fetchNuGet { pname = "System.Composition.Hosting"; version = "6.0.0"; sha256 = "0big5nk8c44rxp6cfykhk7rxvn2cgwa99w6c3v2a36adc3lj36ky"; }) - (fetchNuGet { pname = "System.Composition.Runtime"; version = "1.0.31"; sha256 = "1shfybfzsn4g6aim4pggb5ha31g0fz2kkk0519c4vj6m166g39ws"; }) (fetchNuGet { pname = "System.Composition.Runtime"; version = "6.0.0"; sha256 = "0vq5ik63yii1784gsa2f2kx9w6xllmm8b8rk0arid1jqdj1nyrlw"; }) - (fetchNuGet { pname = "System.Composition.TypedParts"; version = "1.0.31"; sha256 = "1m4j19zx50lbbdx1xxbgpsd1dai2r3kzkyapw47kdvkb89qjkl63"; }) (fetchNuGet { pname = "System.Composition.TypedParts"; version = "6.0.0"; sha256 = "0y9pq3y60nyrpfy51f576a0qjjdh61mcv8vnik32pm4bz56h9q72"; }) (fetchNuGet { pname = "System.Configuration.ConfigurationManager"; version = "4.5.0"; sha256 = "1frpy24mn6q7hgwayj98kkx89z861f5dmia4j6zc0a2ydgx8x02c"; }) (fetchNuGet { pname = "System.Configuration.ConfigurationManager"; version = "4.7.0"; sha256 = "0pav0n21ghf2ax6fiwjbng29f27wkb4a2ddma0cqx04s97yyk25d"; }) @@ -233,7 +227,6 @@ (fetchNuGet { pname = "System.IO.Compression.ZipFile"; version = "4.3.0"; sha256 = "1yxy5pq4dnsm9hlkg9ysh5f6bf3fahqqb6p8668ndy5c0lk7w2ar"; }) (fetchNuGet { pname = "System.IO.FileSystem"; version = "4.0.1"; sha256 = "0kgfpw6w4djqra3w5crrg8xivbanh1w9dh3qapb28q060wb9flp1"; }) (fetchNuGet { pname = "System.IO.FileSystem"; version = "4.3.0"; sha256 = "0z2dfrbra9i6y16mm9v1v6k47f0fm617vlb7s5iybjjsz6g1ilmw"; }) - (fetchNuGet { pname = "System.IO.FileSystem.AccessControl"; version = "4.5.0"; sha256 = "1gq4s8w7ds1sp8f9wqzf8nrzal40q5cd2w4pkf4fscrl2ih3hkkj"; }) (fetchNuGet { pname = "System.IO.FileSystem.Primitives"; version = "4.0.1"; sha256 = "1s0mniajj3lvbyf7vfb5shp4ink5yibsx945k6lvxa96r8la1612"; }) (fetchNuGet { pname = "System.IO.FileSystem.Primitives"; version = "4.3.0"; sha256 = "0j6ndgglcf4brg2lz4wzsh1av1gh8xrzdsn9f0yznskhqn1xzj9c"; }) (fetchNuGet { pname = "System.IO.Pipelines"; version = "4.7.3"; sha256 = "0djp59x56klidi04xx8p5jc1nchv5zvd1d59diphqxwvgny3aawy"; }) @@ -339,12 +332,10 @@ (fetchNuGet { pname = "System.Text.RegularExpressions"; version = "4.3.0"; sha256 = "1bgq51k7fwld0njylfn7qc5fmwrk2137gdq7djqdsw347paa9c2l"; }) (fetchNuGet { pname = "System.Threading"; version = "4.0.11"; sha256 = "19x946h926bzvbsgj28csn46gak2crv2skpwsx80hbgazmkgb1ls"; }) (fetchNuGet { pname = "System.Threading"; version = "4.3.0"; sha256 = "0rw9wfamvhayp5zh3j7p1yfmx9b5khbf4q50d8k5rk993rskfd34"; }) - (fetchNuGet { pname = "System.Threading.Overlapped"; version = "4.3.0"; sha256 = "1nahikhqh9nk756dh8p011j36rlcp1bzz3vwi2b4m1l2s3vz8idm"; }) (fetchNuGet { pname = "System.Threading.Tasks"; version = "4.0.11"; sha256 = "0nr1r41rak82qfa5m0lhk9mp0k93bvfd7bbd9sdzwx9mb36g28p5"; }) (fetchNuGet { pname = "System.Threading.Tasks"; version = "4.3.0"; sha256 = "134z3v9abw3a6jsw17xl3f6hqjpak5l682k2vz39spj4kmydg6k7"; }) - (fetchNuGet { pname = "System.Threading.Tasks.Dataflow"; version = "5.0.0"; sha256 = "028fimgwn5j9fv6m547c975a8b90d9qcnb89k5crjyspsnjcqbhy"; }) + (fetchNuGet { pname = "System.Threading.Tasks.Dataflow"; version = "6.0.0"; sha256 = "1b4vyjdir9kdkiv2fqqm4f76h0df68k8gcd7jb2b38zgr2vpnk3c"; }) (fetchNuGet { pname = "System.Threading.Tasks.Extensions"; version = "4.0.0"; sha256 = "1cb51z062mvc2i8blpzmpn9d9mm4y307xrwi65di8ri18cz5r1zr"; }) - (fetchNuGet { pname = "System.Threading.Tasks.Extensions"; version = "4.3.0"; sha256 = "1xxcx2xh8jin360yjwm4x4cf5y3a2bwpn2ygkfkwkicz7zk50s2z"; }) (fetchNuGet { pname = "System.Threading.Tasks.Extensions"; version = "4.5.3"; sha256 = "0g7r6hm572ax8v28axrdxz1gnsblg6kszq17g51pj14a5rn2af7i"; }) (fetchNuGet { pname = "System.Threading.Tasks.Extensions"; version = "4.5.4"; sha256 = "0y6ncasgfcgnjrhynaf0lwpkpkmv4a07sswwkwbwb5h7riisj153"; }) (fetchNuGet { pname = "System.Threading.Thread"; version = "4.3.0"; sha256 = "0y2xiwdfcph7znm2ysxanrhbqqss6a3shi1z3c779pj2s523mjx4"; }) diff --git a/pkgs/development/tools/omnisharp-roslyn/updater.sh b/pkgs/development/tools/omnisharp-roslyn/updater.sh new file mode 100755 index 000000000000..4f4d910302b9 --- /dev/null +++ b/pkgs/development/tools/omnisharp-roslyn/updater.sh @@ -0,0 +1,66 @@ +#! /usr/bin/env nix-shell +#! nix-shell -i bash -p curl jq common-updater-scripts nuget-to-nix +# shellcheck shell=bash + +# WARNING: you need BOTH .NET 7 and 6 to run this script (and they must be on your path +# using dotnetCorePackages.combinePackages). + +set -euo pipefail +SDK7_VERSION=$(dotnet --version) + +replaceInPlace(){ + local contents + contents=$(cat "$1") + contents=${contents//$2/$3} + echo "$contents">"$1" +} + +cd "$(dirname "${BASH_SOURCE[0]}")" + +deps_file="$(realpath "./deps.nix")" + +new_version="$(curl -s "https://api.github.com/repos/OmniSharp/omnisharp-roslyn/releases?per_page=1" | jq -r '.[0].name')" +old_version="$(sed -nE 's/\s*version = "(.*)".*/\1/p' ./default.nix)" + +if [[ "$new_version" == "$old_version" ]]; then + echo "Already up to date!" + exit 0 +fi + +cd ../../../.. +update-source-version omnisharp-roslyn "${new_version//v}" +store_src="$(nix-build . -A omnisharp-roslyn.src --no-out-link)" +src="$(mktemp -d /tmp/omnisharp-roslyn-src.XXX)" + +cp -rT "$store_src" "$src" +chmod -R +w "$src" +trap 'rm -r "$src"' EXIT + +pushd "$src" + +export DOTNET_NOLOGO=1 +export DOTNET_CLI_TELEMETRY_OPTOUT=1 + +mkdir ./nuget_pkgs + +replaceInPlace global.json '7.0.100-preview.4.22252.9' "$SDK7_VERSION" + +# This is only needed for restore as we'll build for the runtime that is compiling the code in the nix build. +for project in src/OmniSharp.Stdio.Driver/OmniSharp.Stdio.Driver.csproj src/OmniSharp.LanguageServerProtocol/OmniSharp.LanguageServerProtocol.csproj; do + replaceInPlace $project \ + 'win7-x64;win7-x86;win10-arm64' \ + 'linux-x64;linux-arm64;osx-x64;osx-arm64' +done + +for project in src/OmniSharp.Stdio.Driver/OmniSharp.Stdio.Driver.csproj; do + dotnet restore "$project" \ + --packages ./nuget_pkgs \ + -property:PackageVersion="${new_version//v}" \ + -property:AssemblyVersion="${new_version//v}".0 \ + -property:FileVersion="${new_version//v}".0 \ + -property:InformationalVersion="${new_version//v}" \ + -property:RuntimeFrameworkVersion=6.0.0-preview.7.21317.1 \ + -property:RollForward=LatestMajor +done + +nuget-to-nix ./nuget_pkgs > "$deps_file" From 1c318448a5713fa74e4b201c041b440ed50564d1 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 17 Aug 2022 14:34:59 +0200 Subject: [PATCH 134/164] esphome: 2022.6.2 -> 2022.8.0 https://github.com/esphome/esphome/releases/tag/2022.8.0 --- pkgs/tools/misc/esphome/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/esphome/default.nix b/pkgs/tools/misc/esphome/default.nix index 21d35ccf82e9..e3a5da9ca450 100644 --- a/pkgs/tools/misc/esphome/default.nix +++ b/pkgs/tools/misc/esphome/default.nix @@ -15,14 +15,14 @@ let in with python.pkgs; buildPythonApplication rec { pname = "esphome"; - version = "2022.6.2"; + version = "2022.8.0"; format = "setuptools"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "refs/tags/${version}"; - sha256 = "sha256-VD2ZTsNIgWtIuWPv1ZQS7G1PlDr2cgYWqXrSuriZWtw="; + hash = "sha256-lukK++CRpl7ucX9RuYa4qhHBbBY4oc/ijqGopeIaXPY="; }; postPatch = '' From 8d05ef51d11dcaa32dc37e38c563674f579bbc5b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sebasti=C3=A1n=20Mancilla?= Date: Mon, 15 Aug 2022 11:02:34 -0400 Subject: [PATCH 135/164] python310Packages.nbconvert: use mistune 2.x mistune 0.8 was removed by #186272. --- .../python-modules/nbconvert/default.nix | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/pkgs/development/python-modules/nbconvert/default.nix b/pkgs/development/python-modules/nbconvert/default.nix index 9b85586f7d9b..df01318a6ea1 100644 --- a/pkgs/development/python-modules/nbconvert/default.nix +++ b/pkgs/development/python-modules/nbconvert/default.nix @@ -3,6 +3,7 @@ , buildPythonPackage , defusedxml , fetchPypi +, fetchpatch , ipywidgets , jinja2 , jupyterlab-pygments @@ -30,10 +31,22 @@ buildPythonPackage rec { # various exporter templates patches = [ ./templates.patch + + # Use mistune 2.x + (fetchpatch { + name = "support-mistune-2.x.patch"; + url = "https://github.com/jupyter/nbconvert/commit/e870d9a4a61432a65bee5466c5fa80c9ee28966e.patch"; + hash = "sha256-kdOmE7BnkRy2lsNQ2OVrEXXZntJUPJ//b139kSsfKmI="; + excludes = [ "pyproject.toml" ]; + }) ]; postPatch = '' substituteAllInPlace ./nbconvert/exporters/templateexporter.py + + # Use mistune 2.x + substituteInPlace setup.py \ + --replace "mistune>=0.8.1,<2" "mistune>=2.0.3,<3" ''; propagatedBuildInputs = [ From 36af4fe49e8a15db26461eb408cb9d9cb9a4adc6 Mon Sep 17 00:00:00 2001 From: Sandro Date: Wed, 17 Aug 2022 14:41:33 +0200 Subject: [PATCH 136/164] python310Packages.jupyterlab-lsp: remove unused input --- pkgs/development/python-modules/jupyterlab-lsp/default.nix | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/jupyterlab-lsp/default.nix b/pkgs/development/python-modules/jupyterlab-lsp/default.nix index 276632a327c5..069e7c16f0a5 100644 --- a/pkgs/development/python-modules/jupyterlab-lsp/default.nix +++ b/pkgs/development/python-modules/jupyterlab-lsp/default.nix @@ -1,5 +1,4 @@ -{ stdenv -, lib +{ lib , buildPythonPackage , fetchPypi , jupyterlab From ab223b256df93eafc241568f8803abdd6cb66e63 Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Wed, 10 Aug 2022 15:28:49 +0200 Subject: [PATCH 137/164] =?UTF-8?q?coqPackages.coq-ext-lib:=200.11.6=20?= =?UTF-8?q?=E2=86=92=200.11.7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/development/coq-modules/coq-ext-lib/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/coq-modules/coq-ext-lib/default.nix b/pkgs/development/coq-modules/coq-ext-lib/default.nix index 2f5bcfe83e7d..b6f124b3f0fb 100644 --- a/pkgs/development/coq-modules/coq-ext-lib/default.nix +++ b/pkgs/development/coq-modules/coq-ext-lib/default.nix @@ -5,6 +5,7 @@ with lib; mkCoqDerivation rec { owner = "coq-ext-lib"; inherit version; defaultVersion = with versions; switch coq.coq-version [ + { case = range "8.11" "8.16"; out = "0.11.7"; } { case = range "8.8" "8.16"; out = "0.11.6"; } { case = range "8.8" "8.14"; out = "0.11.4"; } { case = range "8.8" "8.13"; out = "0.11.3"; } @@ -12,6 +13,7 @@ with lib; mkCoqDerivation rec { { case = "8.6"; out = "0.9.5"; } { case = "8.5"; out = "0.9.4"; } ] null; + release."0.11.7".sha256 = "sha256-HkxUny0mxDDT4VouBBh8btwxGZgsb459kBufTLLnuEY="; release."0.11.6".sha256 = "0w6iyrdszz7zc8kaybhy3mwjain2d2f83q79xfd5di0hgdayh7q7"; release."0.11.4".sha256 = "0yp8mhrhkc498nblvhq1x4j6i9aiidkjza4wzvrkp9p8rgx5g5y3"; release."0.11.3".sha256 = "1w99nzpk72lffxis97k235axss5lmzhy5z3lga2i0si95mbpil42"; From 9184a6819290cb164cd70d2a87d5e60fe7133c6f Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 17 Aug 2022 13:19:19 +0000 Subject: [PATCH 138/164] libdnf: 0.67.0 -> 0.68.0 --- pkgs/tools/package-management/libdnf/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/package-management/libdnf/default.nix b/pkgs/tools/package-management/libdnf/default.nix index 6ef5467d9e9d..1cfccdd098f3 100644 --- a/pkgs/tools/package-management/libdnf/default.nix +++ b/pkgs/tools/package-management/libdnf/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { pname = "libdnf"; - version = "0.67.0"; + version = "0.68.0"; src = fetchFromGitHub { owner = "rpm-software-management"; repo = pname; rev = version; - sha256 = "sha256-ajYrR4MBHjGWaQwFmLSmZkazY93b05Ur4/E+mb/By9E="; + sha256 = "sha256-vXk+ob2lBCXF0+VUSxUpZL60Vn1dJTdyQAgsJkCnml8="; }; nativeBuildInputs = [ From d58caed42b260ce54b33f7af517bef5cab25b1dc Mon Sep 17 00:00:00 2001 From: K900 Date: Wed, 17 Aug 2022 13:40:52 +0000 Subject: [PATCH 139/164] =?UTF-8?q?n8n:=200.190.0=20=E2=86=92=200.191.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../networking/n8n/node-packages.nix | 187 +++++++++--------- 1 file changed, 98 insertions(+), 89 deletions(-) diff --git a/pkgs/applications/networking/n8n/node-packages.nix b/pkgs/applications/networking/n8n/node-packages.nix index 1bffef8d467f..3f02ea67c8f8 100644 --- a/pkgs/applications/networking/n8n/node-packages.nix +++ b/pkgs/applications/networking/n8n/node-packages.nix @@ -94,6 +94,15 @@ let sha512 = "Lx7A3k2JIXpIbixfUaOOG79WNSo/Y7dhZ0LaLhaayyZ6PwQdVsEQXAR+oIPqPSfgPzv7RtwPSVviJ2APrsQKvQ=="; }; }; + "@azure/core-http-compat-1.3.0" = { + name = "_at_azure_slash_core-http-compat"; + packageName = "@azure/core-http-compat"; + version = "1.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@azure/core-http-compat/-/core-http-compat-1.3.0.tgz"; + sha512 = "ZN9avruqbQ5TxopzG3ih3KRy52n8OAbitX3fnZT5go4hzu0J+KVPSzkL+Wt3hpJpdG8WIfg1sBD1tWkgUdEpBA=="; + }; + }; "@azure/core-lro-2.2.5" = { name = "_at_azure_slash_core-lro"; packageName = "@azure/core-lro"; @@ -157,13 +166,13 @@ let sha512 = "BPDz1sK7Ul9t0l9YKLEa8PHqWU4iCfhGJ+ELJl6c8CP3TpJt2urNCbm0ZHsthmxRsYoMPbz2Dvzj30zXZVmAFw=="; }; }; - "@azure/keyvault-keys-4.4.0" = { + "@azure/keyvault-keys-4.5.0" = { name = "_at_azure_slash_keyvault-keys"; packageName = "@azure/keyvault-keys"; - version = "4.4.0"; + version = "4.5.0"; src = fetchurl { - url = "https://registry.npmjs.org/@azure/keyvault-keys/-/keyvault-keys-4.4.0.tgz"; - sha512 = "W9sPZebXYa3aar7BGIA+fAsq/sy1nf2TZAETbkv7DRawzVLrWv8QoVVceqNHjy3cigT4HNxXjaPYCI49ez5CUA=="; + url = "https://registry.npmjs.org/@azure/keyvault-keys/-/keyvault-keys-4.5.0.tgz"; + sha512 = "F+0qpUrIxp1/uuQ3sFsAf4rTXErFwmuVLoXlD2e3ebrONrmYjqszwmlN4tBqAag1W9wGuZTL0jE8X8b+LB83ow=="; }; }; "@azure/logger-1.0.3" = { @@ -283,13 +292,13 @@ let sha512 = "RxSa9VjcDWgWCYsaLdZItdCnJj7p4LxggaEk+Y3MP0dHKoxez8ioG07DVekVbZZqccsrL+oPB/N9AzVPxj4blg=="; }; }; - "@js-joda/core-5.2.0" = { + "@js-joda/core-5.3.0" = { name = "_at_js-joda_slash_core"; packageName = "@js-joda/core"; - version = "5.2.0"; + version = "5.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/@js-joda/core/-/core-5.2.0.tgz"; - sha512 = "0OriPYIaMLB3XiLQMe0BXKVIqeriTn3H7JMOzTsHEtt7Zqq+TetCu97KnAhU3ckiQZKBxfZshft+H1OC4D1lXw=="; + url = "https://registry.npmjs.org/@js-joda/core/-/core-5.3.0.tgz"; + sha512 = "3uObVJ08i0vSbtsTWQ8omy8XUlVDnoest5MOLp6delLUZev8bu++S+3Aua7xWPPWzQt9pcuwDqjEOKslQVDj8g=="; }; }; "@jsdevtools/ono-7.1.3" = { @@ -400,13 +409,13 @@ let sha512 = "sBpko86IrTscc39EvHUhL+c++81BVTsIZ3ETu/vG+cCdi0N6vb2DoahR67A9FI2CGnxRRHjnTfa3m6LulwNATA=="; }; }; - "@oclif/core-1.13.10" = { + "@oclif/core-1.14.1" = { name = "_at_oclif_slash_core"; packageName = "@oclif/core"; - version = "1.13.10"; + version = "1.14.1"; src = fetchurl { - url = "https://registry.npmjs.org/@oclif/core/-/core-1.13.10.tgz"; - sha512 = "nwpjXwWscETdvO+/z94V1zd95vnzmCB6VRaobR4BdBllwWU6jHF/eCi1Ud2Tk9RSedChoLneZuDCkKnRCmxyng=="; + url = "https://registry.npmjs.org/@oclif/core/-/core-1.14.1.tgz"; + sha512 = "FgAjfY3Cvzj+i8j08WiD/8adJhZvclFESXAE8Kcp7qglErFKUFK9XY9BS2NyIzLN1NCKc52A64pWunVvPv8g3w=="; }; }; "@oclif/errors-1.3.5" = { @@ -688,13 +697,13 @@ let sha512 = "zm6xBQpFDIDM6o9r6HSgDeIcLy82TKWctCXEPbJJcXb5AKmi5BNNdLXneixK4lplX3PqIVcwLBCGE/kAGnlD4A=="; }; }; - "@types/lodash-4.14.182" = { + "@types/lodash-4.14.183" = { name = "_at_types_slash_lodash"; packageName = "@types/lodash"; - version = "4.14.182"; + version = "4.14.183"; src = fetchurl { - url = "https://registry.npmjs.org/@types/lodash/-/lodash-4.14.182.tgz"; - sha512 = "/THyiqyQAP9AfARo4pF+aCGcyiQ94tX/Is2I7HofNRqoYLgN1PBoOWu2/zTA5zMxzP5EFutMtWtGAFRKUe961Q=="; + url = "https://registry.npmjs.org/@types/lodash/-/lodash-4.14.183.tgz"; + sha512 = "UXavyuxzXKMqJPEpFPri6Ku5F9af6ZJXUneHhvQJxavrEjuHkFp2YnDWHcxJiG7hk8ZkWqjcyNeW1s/smZv5cw=="; }; }; "@types/lodash.intersection-4.4.7" = { @@ -742,13 +751,13 @@ let sha512 = "/SNsDidUFCvqqcWDwxv2feww/yqhNeTRL5CVoL3jU4Goc4kKEL10T7Eye65ZqPNi4HRx8sAEX59pV1aEH7drNA=="; }; }; - "@types/node-18.6.5" = { + "@types/node-18.7.6" = { name = "_at_types_slash_node"; packageName = "@types/node"; - version = "18.6.5"; + version = "18.7.6"; src = fetchurl { - url = "https://registry.npmjs.org/@types/node/-/node-18.6.5.tgz"; - sha512 = "Xjt5ZGUa5WusGZJ4WJPbOT8QOqp6nDynVFRKcUt32bOgvXEoc6o085WNkYTMO7ifAj2isEfQQ2cseE+wT6jsRw=="; + url = "https://registry.npmjs.org/@types/node/-/node-18.7.6.tgz"; + sha512 = "EdxgKRXgYsNITy5mjjXjVE/CS8YENSdhiagGrLqjG0pvA2owgJ6i4l7wy/PFZGC0B1/H20lWKN7ONVDNYDZm7A=="; }; }; "@types/node-fetch-2.6.2" = { @@ -1030,13 +1039,13 @@ let sha512 = "P43ePfOAIupkguHUycrc4qJ9kz8ZiuOUijaETwX7THt0Y/GNK7v0aa8rY816xWjZ7rJdA5XdMcpVFTKMq+RvWg=="; }; }; - "app-root-path-3.0.0" = { + "app-root-path-3.1.0" = { name = "app-root-path"; packageName = "app-root-path"; - version = "3.0.0"; + version = "3.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/app-root-path/-/app-root-path-3.0.0.tgz"; - sha512 = "qMcx+Gy2UZynHjOHOIXPNvpf+9cjvk3cWrBBK7zg4gH9+clobJRb9NGzcT7mQTcV/6Gm/1WelUtqxVXnNlrwcw=="; + url = "https://registry.npmjs.org/app-root-path/-/app-root-path-3.1.0.tgz"; + sha512 = "biN3PwB2gUtjaYy/isrU3aNWI5w+fAfvHkSvCKeQGxhmYpwKFUxudR3Yya+KqVRHBmEDYh+/lTozYCFbmzX4nA=="; }; }; "append-field-1.0.0" = { @@ -1246,22 +1255,22 @@ let sha512 = "DMD0KiN46eipeziST1LPP/STfDU0sufISXmjSgvVsoU2tqxctQeASejWcfNtxYKqETM1UxQ8sp2OrSBWpHY6sw=="; }; }; - "avsc-5.7.4" = { + "avsc-5.7.5" = { name = "avsc"; packageName = "avsc"; - version = "5.7.4"; + version = "5.7.5"; src = fetchurl { - url = "https://registry.npmjs.org/avsc/-/avsc-5.7.4.tgz"; - sha512 = "z4oo33lmnvvNRqfUe3YjDGGpqu/L2+wXBIhMtwq6oqZ+exOUAkQYM6zd2VWKF7AIlajOF8ZZuPFfryTG9iLC/w=="; + url = "https://registry.npmjs.org/avsc/-/avsc-5.7.5.tgz"; + sha512 = "vkyt1+sj6qaD9oMtqqLE2pZ2IcHI66kFx8lpnVuXp55SnNPjKghfOhVfZpaDwDPpY0oVWP3Qu1uHZWxF3E856A=="; }; }; - "aws-sdk-2.1191.0" = { + "aws-sdk-2.1196.0" = { name = "aws-sdk"; packageName = "aws-sdk"; - version = "2.1191.0"; + version = "2.1196.0"; src = fetchurl { - url = "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.1191.0.tgz"; - sha512 = "G8hWvuc+3rxTfHqsnUwGx/fy8zlnVPtlNesXMHlwU/l4oBx3+Weg0Nhng6HvLGzUJifzlnSKDXrOsWVkHtuZ1w=="; + url = "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.1196.0.tgz"; + sha512 = "iOGhCY5IqGfHCJ70p0H/uxkXDh/96KanAMfhnGGbIKbpVliuEV7SYxTfsWORaaUHey+N8FE6OMKfzo7F4X+wQg=="; }; }; "aws-sign2-0.7.0" = { @@ -4621,13 +4630,13 @@ let sha512 = "xOqorG21Va+3CjpFOfFTU7SWohHH2uIX9ZY4Byz6J+lvpfvc486tOAT/G9GfbrKtJ9O7NCX9o0aC2lxqbnZ9EA=="; }; }; - "libphonenumber-js-1.10.11" = { + "libphonenumber-js-1.10.12" = { name = "libphonenumber-js"; packageName = "libphonenumber-js"; - version = "1.10.11"; + version = "1.10.12"; src = fetchurl { - url = "https://registry.npmjs.org/libphonenumber-js/-/libphonenumber-js-1.10.11.tgz"; - sha512 = "ehoihx4HpRXO6FH/uJ0EnaEV4dVU+FDny+jv0S6k9JPyPsAIr0eXDAFvGRMBKE1daCtyHAaFSKCiuCxrOjVAzQ=="; + url = "https://registry.npmjs.org/libphonenumber-js/-/libphonenumber-js-1.10.12.tgz"; + sha512 = "xTFBs3ipFQNmjCUkDj6ZzRJvs97IyazFHBKWtrQrLiYs0Zk0GANob1hkMRlQUQXbJrpQGwnI+/yU4oyD4ohvpw=="; }; }; "libqp-1.1.0" = { @@ -5386,49 +5395,49 @@ let sha512 = "z81GNO7nnYMEhrGh9LeymoE4+Yr0Wn5McHIZMK5cfQCl+NDX08sCZgUc9/6MHni9IWuFLm1Z3HTCXu2z9fN62Q=="; }; }; - "n8n-core-0.130.0" = { + "n8n-core-0.131.0" = { name = "n8n-core"; packageName = "n8n-core"; - version = "0.130.0"; + version = "0.131.0"; src = fetchurl { - url = "https://registry.npmjs.org/n8n-core/-/n8n-core-0.130.0.tgz"; - sha512 = "fWqLRMOZ2aXuMrVns6kVX5eWTJVbrrslgQA9aZESMysR/P6eVVnBAcB948YMDHAZB9EeFGBzxCJCdCGdF3VVUQ=="; + url = "https://registry.npmjs.org/n8n-core/-/n8n-core-0.131.0.tgz"; + sha512 = "XDR0udjVD1t16DZKT3Bx0oFa/qnDjv9KSJRmzUxcTzU2QzcLJ3nv3mi/E7AObUGOvXsKgKRSdsFyWoMcPGb5cQ=="; }; }; - "n8n-design-system-0.30.0" = { + "n8n-design-system-0.31.0" = { name = "n8n-design-system"; packageName = "n8n-design-system"; - version = "0.30.0"; + version = "0.31.0"; src = fetchurl { - url = "https://registry.npmjs.org/n8n-design-system/-/n8n-design-system-0.30.0.tgz"; - sha512 = "ZZRGms10PjTGzw7W8UPe5MXKuJ9eMZr+z9+mO7jywQg1ADzG+JCIgAcdad2II/V46nM4hkilGk0EI+IaBg0R/g=="; + url = "https://registry.npmjs.org/n8n-design-system/-/n8n-design-system-0.31.0.tgz"; + sha512 = "RvE18Fv4tzvsuDZwszWuEodzVoHcKVxYdAA57qIKZyxLbwtLYe2MoBtmOeKlQBvYaZBIwxLFbPnm2fZvIfMdsA=="; }; }; - "n8n-editor-ui-0.156.0" = { + "n8n-editor-ui-0.157.0" = { name = "n8n-editor-ui"; packageName = "n8n-editor-ui"; - version = "0.156.0"; + version = "0.157.0"; src = fetchurl { - url = "https://registry.npmjs.org/n8n-editor-ui/-/n8n-editor-ui-0.156.0.tgz"; - sha512 = "otgW18usDm9pD4Zz6JADNFhb3iMRjcHHcgv897uvk7oZC9nHr9VAQry0bOCMvO4bm3oJug37KkM6eNm02EY+tg=="; + url = "https://registry.npmjs.org/n8n-editor-ui/-/n8n-editor-ui-0.157.0.tgz"; + sha512 = "SzS6xCIa7D1nDnvV0p6OOOc2s9gxuJNkQ3UzWw3VG6C5vtsBhpKDsUZ2BKlCLip2jLZgeNAFHCmttSmXHmm9Lg=="; }; }; - "n8n-nodes-base-0.188.0" = { + "n8n-nodes-base-0.189.0" = { name = "n8n-nodes-base"; packageName = "n8n-nodes-base"; - version = "0.188.0"; + version = "0.189.0"; src = fetchurl { - url = "https://registry.npmjs.org/n8n-nodes-base/-/n8n-nodes-base-0.188.0.tgz"; - sha512 = "+R15NaRM9H767h7D/kwsQCpXhxmNQDMr3LMwhwPrUAXKGTZbk9YLZWhMlQaewhjGgQV69qo94OS9/Wb2FkvzMg=="; + url = "https://registry.npmjs.org/n8n-nodes-base/-/n8n-nodes-base-0.189.0.tgz"; + sha512 = "8Xdbtz26wpvO5MguARdc/vOflmKyOCazV9rt9OMsT6HJLTFq1U4xgEw85VWB9GQJPbDvXPRPqilTedKgM9POlw=="; }; }; - "n8n-workflow-0.112.0" = { + "n8n-workflow-0.113.0" = { name = "n8n-workflow"; packageName = "n8n-workflow"; - version = "0.112.0"; + version = "0.113.0"; src = fetchurl { - url = "https://registry.npmjs.org/n8n-workflow/-/n8n-workflow-0.112.0.tgz"; - sha512 = "6HE3WP4kMdifNJ0plmcye1VU4PKbxlUXr5wIF/74M5M+yLusoMJn2kSLEQ4KO50WYwByl8qttXBbBIjrkM8lNw=="; + url = "https://registry.npmjs.org/n8n-workflow/-/n8n-workflow-0.113.0.tgz"; + sha512 = "ajeZR9etpx9Tjy10X/bbmKYEBp8edUMUrUTL5qLmQLEODoua/NV7C7NCZwlVUtsTbIeTq9Osas2tYhDI74Cubw=="; }; }; "named-placeholders-1.1.2" = { @@ -5611,13 +5620,13 @@ let sha512 = "KUdDsspqx89sD4UUyUKzdlUOper3hRkDVkrKh/89G+d9WKsU5ox51NWS4tB1XR5dPUdR4SP0E3molyEfOvSa3g=="; }; }; - "nodemailer-6.7.7" = { + "nodemailer-6.7.8" = { name = "nodemailer"; packageName = "nodemailer"; - version = "6.7.7"; + version = "6.7.8"; src = fetchurl { - url = "https://registry.npmjs.org/nodemailer/-/nodemailer-6.7.7.tgz"; - sha512 = "pOLC/s+2I1EXuSqO5Wa34i3kXZG3gugDssH+ZNCevHad65tc8vQlCQpOLaUjopvkRQKm2Cki2aME7fEOPRy3bA=="; + url = "https://registry.npmjs.org/nodemailer/-/nodemailer-6.7.8.tgz"; + sha512 = "2zaTFGqZixVmTxpJRCFC+Vk5eGRd/fYtvIR+dl5u9QXLTQWGIf48x/JXvo58g9sa0bU6To04XUv554Paykum3g=="; }; }; "nopt-5.0.0" = { @@ -5728,13 +5737,13 @@ let sha512 = "EFVjAYfzWqWsBMRHPMAXLCDIJnpMhdWAqR7xG6M6a2cs6PMFpl/+Z20w9zDW4vkxOFfddegBKq9Rehd0bxWE7A=="; }; }; - "object.assign-4.1.3" = { + "object.assign-4.1.4" = { name = "object.assign"; packageName = "object.assign"; - version = "4.1.3"; + version = "4.1.4"; src = fetchurl { - url = "https://registry.npmjs.org/object.assign/-/object.assign-4.1.3.tgz"; - sha512 = "ZFJnX3zltyjcYJL0RoCJuzb+11zWGyaDbjgxZbdV7rFEcHQuYxrZqhow67aA7xpes6LhojyFDaBKAFfogQrikA=="; + url = "https://registry.npmjs.org/object.assign/-/object.assign-4.1.4.tgz"; + sha512 = "1mxKf0e58bvyjSCtKYY4sRe9itRk3PJpquJOjeIkz885CczcI4IvJJDLPS72oowuSh+pBxUFROpX+TU++hxhZQ=="; }; }; "object.getownpropertydescriptors-2.1.4" = { @@ -8752,13 +8761,13 @@ let sha512 = "xl/50/Cf32VsGq/1R8jJE5ajH1yMCQkpmoS10QbFZWl2Oor4H0Me64Pu2yxvsRWK3m6soJbmGfzSR7BYmDcWAA=="; }; }; - "xss-1.0.13" = { + "xss-1.0.14" = { name = "xss"; packageName = "xss"; - version = "1.0.13"; + version = "1.0.14"; src = fetchurl { - url = "https://registry.npmjs.org/xss/-/xss-1.0.13.tgz"; - sha512 = "clu7dxTm1e8Mo5fz3n/oW3UCXBfV89xZ72jM8yzo1vR/pIS0w3sgB3XV2H8Vm6zfGnHL0FzvLJPJEBhd86/z4Q=="; + url = "https://registry.npmjs.org/xss/-/xss-1.0.14.tgz"; + sha512 = "og7TEJhXvn1a7kzZGQ7ETjdQVS2UfZyTlsEdDOqvQF7GoxNfY+0YLCzBy1kPdsDDx4QuNAonQPddpsn6Xl/7sw=="; }; }; "xtend-4.0.2" = { @@ -8929,10 +8938,10 @@ in n8n = nodeEnv.buildNodePackage { name = "n8n"; packageName = "n8n"; - version = "0.190.0"; + version = "0.191.0"; src = fetchurl { - url = "https://registry.npmjs.org/n8n/-/n8n-0.190.0.tgz"; - sha512 = "FsvOBZL1FsFuZp9ut6+s97t/Oz5MAIpqNsS/Pdh4ZmJz5XoiTYn1UchlGF4NziUYzvWmdEV96uxo1IU/i8VtSw=="; + url = "https://registry.npmjs.org/n8n/-/n8n-0.191.0.tgz"; + sha512 = "HnnhsQqWcx4azUB9DZHtdT+nJBr7gWEr5c/sr7PFrcZwLoF1fW8ydxTGj6weyl62GggrE+RBR4MuKRVRNY7hcg=="; }; dependencies = [ sources."@apidevtools/json-schema-ref-parser-8.0.0" @@ -8967,6 +8976,7 @@ in sources."universalify-0.1.2" ]; }) + sources."@azure/core-http-compat-1.3.0" (sources."@azure/core-lro-2.2.5" // { dependencies = [ sources."tslib-2.4.0" @@ -9002,9 +9012,8 @@ in sources."tslib-2.4.0" ]; }) - (sources."@azure/keyvault-keys-4.4.0" // { + (sources."@azure/keyvault-keys-4.5.0" // { dependencies = [ - sources."@azure/core-tracing-1.0.0-preview.13" sources."tslib-2.4.0" ]; }) @@ -9041,7 +9050,7 @@ in sources."string_decoder-0.10.31" ]; }) - sources."@js-joda/core-5.2.0" + sources."@js-joda/core-5.3.0" sources."@jsdevtools/ono-7.1.3" sources."@kafkajs/confluent-schema-registry-1.0.6" sources."@kwsites/file-exists-1.1.1" @@ -9057,7 +9066,7 @@ in sources."tslib-2.4.0" ]; }) - (sources."@oclif/core-1.13.10" // { + (sources."@oclif/core-1.14.1" // { dependencies = [ (sources."chalk-4.1.2" // { dependencies = [ @@ -9116,13 +9125,13 @@ in sources."@types/json-diff-0.5.2" sources."@types/json-schema-7.0.11" sources."@types/jsonwebtoken-8.5.8" - sources."@types/lodash-4.14.182" + sources."@types/lodash-4.14.183" sources."@types/lodash.intersection-4.4.7" sources."@types/lossless-json-1.0.1" sources."@types/mime-3.0.1" sources."@types/minimatch-3.0.5" sources."@types/multer-1.4.7" - sources."@types/node-18.6.5" + sources."@types/node-18.7.6" (sources."@types/node-fetch-2.6.2" // { dependencies = [ sources."form-data-3.0.1" @@ -9162,7 +9171,7 @@ in sources."ansicolors-0.3.2" sources."any-promise-1.3.0" sources."anymatch-3.1.2" - sources."app-root-path-3.0.0" + sources."app-root-path-3.1.0" sources."append-field-1.0.0" sources."aproba-2.0.0" (sources."are-we-there-yet-2.0.0" // { @@ -9197,8 +9206,8 @@ in ]; }) sources."available-typed-arrays-1.0.5" - sources."avsc-5.7.4" - (sources."aws-sdk-2.1191.0" // { + sources."avsc-5.7.5" + (sources."aws-sdk-2.1196.0" // { dependencies = [ sources."buffer-4.9.2" sources."events-1.1.1" @@ -9705,7 +9714,7 @@ in sources."iconv-lite-0.6.3" ]; }) - sources."libphonenumber-js-1.10.11" + sources."libphonenumber-js-1.10.12" sources."libqp-1.1.0" sources."limiter-1.1.5" sources."linkify-it-4.0.0" @@ -9836,15 +9845,15 @@ in ]; }) sources."mz-2.7.0" - sources."n8n-core-0.130.0" - sources."n8n-design-system-0.30.0" - sources."n8n-editor-ui-0.156.0" - (sources."n8n-nodes-base-0.188.0" // { + sources."n8n-core-0.131.0" + sources."n8n-design-system-0.31.0" + sources."n8n-editor-ui-0.157.0" + (sources."n8n-nodes-base-0.189.0" // { dependencies = [ sources."iconv-lite-0.6.3" ]; }) - sources."n8n-workflow-0.112.0" + sources."n8n-workflow-0.113.0" (sources."named-placeholders-1.1.2" // { dependencies = [ sources."lru-cache-4.1.5" @@ -9877,7 +9886,7 @@ in sources."node-html-parser-5.4.1" sources."node-ssh-12.0.5" sources."nodeify-1.0.1" - sources."nodemailer-6.7.7" + sources."nodemailer-6.7.8" sources."nopt-5.0.0" sources."normalize-path-3.0.0" sources."normalize-wheel-1.0.1" @@ -9889,7 +9898,7 @@ in sources."object-inspect-1.12.2" sources."object-keys-1.1.1" sources."object-treeify-1.1.33" - sources."object.assign-4.1.3" + sources."object.assign-4.1.4" sources."object.getownpropertydescriptors-2.1.4" sources."on-finished-2.4.1" sources."on-headers-1.0.2" @@ -10375,7 +10384,7 @@ in sources."xml2js-0.4.23" sources."xmlbuilder-11.0.1" sources."xregexp-2.0.0" - (sources."xss-1.0.13" // { + (sources."xss-1.0.14" // { dependencies = [ sources."commander-2.20.3" ]; From 9e773ac11fcab22a8ce17cf967a15f3d576ef7b6 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 17 Aug 2022 16:02:08 +0200 Subject: [PATCH 140/164] nuclei: 2.7.5 -> 2.7.6 --- pkgs/tools/security/nuclei/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/security/nuclei/default.nix b/pkgs/tools/security/nuclei/default.nix index 16f35f3c9823..f441772dbc17 100644 --- a/pkgs/tools/security/nuclei/default.nix +++ b/pkgs/tools/security/nuclei/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "nuclei"; - version = "2.7.5"; + version = "2.7.6"; src = fetchFromGitHub { owner = "projectdiscovery"; repo = pname; rev = "v${version}"; - sha256 = "sha256-R9Z+xcmrzv89ocDWfWqSLhrgeOSmsnqmPYGUmULAJAI="; + sha256 = "sha256-KFTVXHATWeKL+fvB52IekT9WMa61Aca0bDJ7g1n1kfU="; }; - vendorSha256 = "sha256-jvgwVtYndf+xbGJycnUidMUMDGFRIVJtSAA4Akd64Dk="; + vendorSha256 = "sha256-hzKGqX0YPo4lhp0RTmeQlhUsvG2XhZxkl/TtI9YjEoY="; modRoot = "./v2"; subPackages = [ From fe5e97d2b8b45f4aa240c9b9e1fbfa70b35f1341 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 17 Aug 2022 16:08:06 +0200 Subject: [PATCH 141/164] dnstwist: 20220131 -> 20220815 --- pkgs/tools/networking/dnstwist/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/networking/dnstwist/default.nix b/pkgs/tools/networking/dnstwist/default.nix index 3fa6e352bc8e..03f31e5064b8 100644 --- a/pkgs/tools/networking/dnstwist/default.nix +++ b/pkgs/tools/networking/dnstwist/default.nix @@ -5,13 +5,13 @@ python3.pkgs.buildPythonApplication rec { pname = "dnstwist"; - version = "20220131"; + version = "20220815"; src = fetchFromGitHub { owner = "elceef"; repo = pname; rev = version; - sha256 = "sha256-2sRKRzYR6F2cvz9K7MBe2JIorJkPQ5M2/SRKXGTBVGk="; + sha256 = "sha256-cmwgnjhfTqehMCu6mN0840NIaTN8gf4r098ULVj0yPI="; }; propagatedBuildInputs = with python3.pkgs; [ From 435d3c17ed4031070ef4b804e403d926a795e62e Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 17 Aug 2022 16:11:29 +0200 Subject: [PATCH 142/164] python310Packages.archinfo: 9.2.13 -> 9.2.14 --- pkgs/development/python-modules/archinfo/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/archinfo/default.nix b/pkgs/development/python-modules/archinfo/default.nix index 3c5bead9d03c..651404e7fedc 100644 --- a/pkgs/development/python-modules/archinfo/default.nix +++ b/pkgs/development/python-modules/archinfo/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "archinfo"; - version = "9.2.13"; + version = "9.2.14"; format = "pyproject"; disabled = pythonOlder "3.6"; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "angr"; repo = pname; rev = "v${version}"; - hash = "sha256-ili+jbrCKQCRD5eIWZBZqlX8wRaHiY6fC1QFEE2YOng="; + hash = "sha256-kWZ5z9Tn0SAqrGP4gtGfPny+kj/2ibSdTwp+0RCx40s="; }; checkInputs = [ From d9e7c010510b4f1084fc9ca4a067717b37a9c8e3 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 17 Aug 2022 16:11:34 +0200 Subject: [PATCH 143/164] python310Packages.ailment: 9.2.13 -> 9.2.14 --- pkgs/development/python-modules/ailment/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/ailment/default.nix b/pkgs/development/python-modules/ailment/default.nix index c56b09cb9b57..30c524ce9bce 100644 --- a/pkgs/development/python-modules/ailment/default.nix +++ b/pkgs/development/python-modules/ailment/default.nix @@ -7,7 +7,7 @@ buildPythonPackage rec { pname = "ailment"; - version = "9.2.13"; + version = "9.2.14"; format = "pyproject"; disabled = pythonOlder "3.6"; @@ -16,7 +16,7 @@ buildPythonPackage rec { owner = "angr"; repo = pname; rev = "v${version}"; - hash = "sha256-fnCeNW0Rccu6e1WrmLeHgUnlxMHh9t1q10DtzyVymP8="; + hash = "sha256-Axjyqn1TtZbYdgaC6hOhIQM3FBs0a1oHNK8wLuWQLHM="; }; propagatedBuildInputs = [ From e7e8cbffebdbf3beac09df540e14ec787d9845c0 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 17 Aug 2022 16:11:51 +0200 Subject: [PATCH 144/164] python310Packages.pyvex: 9.2.13 -> 9.2.14 --- pkgs/development/python-modules/pyvex/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pyvex/default.nix b/pkgs/development/python-modules/pyvex/default.nix index 6d365ef07b46..7a8d9f2b40ee 100644 --- a/pkgs/development/python-modules/pyvex/default.nix +++ b/pkgs/development/python-modules/pyvex/default.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "pyvex"; - version = "9.2.13"; + version = "9.2.14"; format = "pyproject"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - hash = "sha256-YW8kfCs9j4Ay0Kw75MFZDp24NZrcmQ+82sOdJdpBsPI="; + hash = "sha256-xKy/+MbJJEYWXalvYhVi/J7IAn1CSrvkeg18vM0fy4k="; }; propagatedBuildInputs = [ From b324a8a0ccc7ea4e5365dc7c544c6a7cdfebea87 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 17 Aug 2022 16:11:57 +0200 Subject: [PATCH 145/164] python310Packages.claripy: 9.2.13 -> 9.2.14 --- pkgs/development/python-modules/claripy/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/claripy/default.nix b/pkgs/development/python-modules/claripy/default.nix index 1459493ef0c8..78457c2da6ce 100644 --- a/pkgs/development/python-modules/claripy/default.nix +++ b/pkgs/development/python-modules/claripy/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "claripy"; - version = "9.2.13"; + version = "9.2.14"; format = "pyproject"; disabled = pythonOlder "3.6"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "angr"; repo = pname; rev = "v${version}"; - hash = "sha256-kZs2BYVfXCqi1v/cnJCDtLsEKc7xh8nG59G4N1RVSjs="; + hash = "sha256-802ToJGxwJSFcnl3suQMPNz0/7HnqvqxCpy9u7iU6EE="; }; propagatedBuildInputs = [ From e094abb0023c858438f460be2479294fea7cbf9d Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 17 Aug 2022 16:12:02 +0200 Subject: [PATCH 146/164] python310Packages.cle: 9.2.13 -> 9.2.14 --- pkgs/development/python-modules/cle/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/cle/default.nix b/pkgs/development/python-modules/cle/default.nix index 7a0177ad2d43..1932856fd956 100644 --- a/pkgs/development/python-modules/cle/default.nix +++ b/pkgs/development/python-modules/cle/default.nix @@ -15,7 +15,7 @@ let # The binaries are following the argr projects release cycle - version = "9.2.13"; + version = "9.2.14"; # Binary files from https://github.com/angr/binaries (only used for testing and only here) binaries = fetchFromGitHub { @@ -37,7 +37,7 @@ buildPythonPackage rec { owner = "angr"; repo = pname; rev = "v${version}"; - hash = "sha256-mgEDYUh3ZYvlcj8u3M3Rpfi57CA0MYuf2C3eZ4ElAzA="; + hash = "sha256-ueR5reEmaI9drFMQn/CBHCW7DmsTWWYi1zCNaUQ2y7g="; }; propagatedBuildInputs = [ From c68e496f8e21d71e8613be1e4f354854006e3228 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 17 Aug 2022 16:12:10 +0200 Subject: [PATCH 147/164] python310Packages.angr: 9.2.13 -> 9.2.14 --- pkgs/development/python-modules/angr/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/angr/default.nix b/pkgs/development/python-modules/angr/default.nix index 63165f6214e1..dde5372e1870 100644 --- a/pkgs/development/python-modules/angr/default.nix +++ b/pkgs/development/python-modules/angr/default.nix @@ -46,7 +46,7 @@ in buildPythonPackage rec { pname = "angr"; - version = "9.2.13"; + version = "9.2.14"; format = "pyproject"; disabled = pythonOlder "3.6"; @@ -55,7 +55,7 @@ buildPythonPackage rec { owner = pname; repo = pname; rev = "v${version}"; - hash = "sha256-yEYqwyRJ/LN9q0f5vJIVMnVXQxRht73zDifWeevGc80="; + hash = "sha256-lxquiow2hI0xqdPLyZTZtxIo5nR60OtJV/kf6ukGF4c="; }; propagatedBuildInputs = [ From 2e1e0b51c28d62b2454906406bd60abdb9c9b1a9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=81tila=20Saraiva?= Date: Wed, 17 Aug 2022 12:05:59 -0300 Subject: [PATCH 148/164] obs-studio-plugins.obs-vkcapture: 1.1.5 -> 1.1.6 --- pkgs/applications/video/obs-studio/plugins/obs-vkcapture.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/video/obs-studio/plugins/obs-vkcapture.nix b/pkgs/applications/video/obs-studio/plugins/obs-vkcapture.nix index c48dde0cf2f9..e3710828cb34 100644 --- a/pkgs/applications/video/obs-studio/plugins/obs-vkcapture.nix +++ b/pkgs/applications/video/obs-studio/plugins/obs-vkcapture.nix @@ -13,13 +13,13 @@ stdenv.mkDerivation rec { pname = "obs-vkcapture"; - version = "1.1.5"; + version = "1.1.6"; src = fetchFromGitHub { owner = "nowrep"; repo = pname; rev = "v${version}"; - hash = "sha256-eZbZBff/M0S9VASiKoGJAqZ6NMADH7uH8J0m6XGY3jY="; + hash = "sha256-TNXoeNktMde7GfFhZRHXlARdnkJTY4oNZTKA4hu7e3Q="; }; nativeBuildInputs = [ cmake ninja ]; From 9bb0d53a4a2a3b38ee17ea84f584772b736f7688 Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Thu, 11 Aug 2022 07:44:27 +0200 Subject: [PATCH 149/164] =?UTF-8?q?alt-ergo:=202.4.1=20=E2=86=92=202.4.2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../science/logic/alt-ergo/default.nix | 22 ++++++++----------- 1 file changed, 9 insertions(+), 13 deletions(-) diff --git a/pkgs/applications/science/logic/alt-ergo/default.nix b/pkgs/applications/science/logic/alt-ergo/default.nix index 553f133c7f7c..e5aee4d140aa 100644 --- a/pkgs/applications/science/logic/alt-ergo/default.nix +++ b/pkgs/applications/science/logic/alt-ergo/default.nix @@ -2,28 +2,30 @@ let pname = "alt-ergo"; - version = "2.4.1"; + version = "2.4.2"; + + configureScript = "ocaml unix.cma configure.ml"; src = fetchFromGitHub { owner = "OCamlPro"; repo = pname; rev = version; - sha256 = "0hglj1p0753w2isds01h90knraxa42d2jghr35dpwf9g8a1sm9d3"; + sha256 = "sha256-8pJ/1UAbheQaLFs5Uubmmf5D0oFJiPxF6e2WTZgRyAc="; }; in let alt-ergo-lib = ocamlPackages.buildDunePackage rec { pname = "alt-ergo-lib"; - inherit version src; + inherit version src configureScript; configureFlags = [ pname ]; nativeBuildInputs = [ which ]; buildInputs = with ocamlPackages; [ dune-configurator ]; - propagatedBuildInputs = with ocamlPackages; [ num ocplib-simplex stdlib-shims zarith ]; + propagatedBuildInputs = with ocamlPackages; [ num ocplib-simplex seq stdlib-shims zarith ]; }; in let alt-ergo-parsers = ocamlPackages.buildDunePackage rec { pname = "alt-ergo-parsers"; - inherit version src; + inherit version src configureScript; configureFlags = [ pname ]; nativeBuildInputs = [ which ocamlPackages.menhir ]; propagatedBuildInputs = [ alt-ergo-lib ] ++ (with ocamlPackages; [ camlzip psmt2-frontend ]); @@ -31,18 +33,12 @@ let alt-ergo-parsers = ocamlPackages.buildDunePackage rec { ocamlPackages.buildDunePackage { - inherit pname version src; - - # Ensure compatibility with Menhir ≥ 20211215 - patches = fetchpatch { - url = "https://github.com/OCamlPro/alt-ergo/commit/0f9c45af352657c3aec32fca63d11d44f5126df8.patch"; - sha256 = "sha256:0zaj3xbk2s8k8jl0id3nrhdfq9mv0n378cbawwx3sziiizq7djbg"; - }; + inherit pname version src configureScript; configureFlags = [ pname ]; nativeBuildInputs = [ which ocamlPackages.menhir ]; - buildInputs = [ alt-ergo-parsers ocamlPackages.cmdliner ]; + buildInputs = [ alt-ergo-parsers ocamlPackages.cmdliner_1_1 ]; meta = { description = "High-performance theorem prover and SMT solver"; From 3b2da12acb516d8c892385bf641f415964286b6f Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 17 Aug 2022 15:28:26 +0000 Subject: [PATCH 150/164] minio-certgen: 1.2.0 -> 1.2.1 --- pkgs/tools/security/minio-certgen/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/security/minio-certgen/default.nix b/pkgs/tools/security/minio-certgen/default.nix index 6e2403ad7c10..ddcd55ef3ff4 100644 --- a/pkgs/tools/security/minio-certgen/default.nix +++ b/pkgs/tools/security/minio-certgen/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "minio-certgen"; - version = "1.2.0"; + version = "1.2.1"; src = fetchFromGitHub { owner = "minio"; repo = "certgen"; rev = "v${version}"; - sha256 = "sha256-FBx4v29ZuhXwubWivIXReO5Ge/rPt1J3LbXlprC7E9c="; + sha256 = "sha256-qi+SeNLW/jE2dGar4Lf16TKRT3ZTmWB/j8EsnoyrdxI="; }; vendorSha256 = null; From 8e35fb01ab30474be53e2b269f0e3a19113cb7f2 Mon Sep 17 00:00:00 2001 From: Peter Hoeg Date: Fri, 12 Aug 2022 10:53:45 +0800 Subject: [PATCH 151/164] msmtp: 1.8.20 -> 1.8.22 --- .../applications/networking/msmtp/default.nix | 4 +- .../applications/networking/msmtp/paths.patch | 44 ++++++++++--------- 2 files changed, 26 insertions(+), 22 deletions(-) diff --git a/pkgs/applications/networking/msmtp/default.nix b/pkgs/applications/networking/msmtp/default.nix index 47ba4b1e6988..8006d81c9298 100644 --- a/pkgs/applications/networking/msmtp/default.nix +++ b/pkgs/applications/networking/msmtp/default.nix @@ -24,13 +24,13 @@ let inherit (lib) getBin getExe optionals; - version = "1.8.20"; + version = "1.8.22"; src = fetchFromGitHub { owner = "marlam"; repo = "msmtp-mirror"; rev = "msmtp-${version}"; - hash = "sha256-RcQZ7Vm8UjJJoogkmUmZ+/2fz7C4AcVYY/kTOlfz7+I="; + hash = "sha256-Jt/uvGBrYYr6ua6LVPiP0nuRiIkxBJASdgHBNHivzxQ="; }; meta = with lib; { diff --git a/pkgs/applications/networking/msmtp/paths.patch b/pkgs/applications/networking/msmtp/paths.patch index 1a62aa4caed1..c5e8776e11d3 100644 --- a/pkgs/applications/networking/msmtp/paths.patch +++ b/pkgs/applications/networking/msmtp/paths.patch @@ -1,31 +1,35 @@ +commit 35cab741af069571cf4c55e0ce1ae96617d5778c +Author: Peter Hoeg +Date: Fri Aug 12 10:52:22 2022 +0800 + + nixify + diff --git a/scripts/msmtpq/msmtpq b/scripts/msmtpq/msmtpq -index 1b39fc6..4baa19b 100755 +index d8b4039..1ab89f8 100755 --- a/scripts/msmtpq/msmtpq +++ b/scripts/msmtpq/msmtpq -@@ -70,8 +70,8 @@ MSMTP=msmtp +@@ -71,7 +71,7 @@ fi ## ( chmod 0700 msmtp.queue ) ## - ## the queue dir - modify this to reflect where you'd like it to be (no quotes !!) --Q=~/.msmtp.queue --[ -d "$Q" ] || mkdir -m 0700 "$Q" || \ + ## the queue dir - export this variable to reflect where you'd like it to be (no quotes !!) +-Q=${Q:-~/.msmtp.queue} +Q=${MSMTP_QUEUE:-~/.msmtp.queue} -+[ -d "$Q" ] || mkdir -m 0700 -p "$Q" || \ + [ -d "$Q" ] || mkdir -m 0700 -p "$Q" || \ err '' "msmtpq : can't find or create msmtp queue directory [ $Q ]" '' # if not present - complain ; quit ## - ## set the queue log file var to the location of the msmtp queue log file -@@ -84,7 +84,10 @@ Q=~/.msmtp.queue - ## (doing so would be inadvisable under most conditions, however) +@@ -85,8 +85,10 @@ Q=${Q:-~/.msmtp.queue} ## - ## the queue log file - modify (or comment out) to taste (but no quotes !!) --LOG=~/log/msmtp.queue.log + ## the queue log file - export this variable to change where logs are stored (but no quotes !!) + ## Set it to "" (empty string) to disable logging. +-[ -v LOG ] || LOG=~/log/msmtp.queue.log +LOG=${MSMTP_LOG:-~/log/msmtp.queue.log} -+[ -d "$(dirname "$LOG")" ] || mkdir -p "$(dirname "$LOG")" + [ -d "$(dirname "$LOG")" ] || mkdir -p "$(dirname "$LOG")" + +JOURNAL=@journal@ ## ====================================================================================== ## msmtpq can use the following environment variables : -@@ -138,6 +141,7 @@ on_exit() { # unlock the queue on exit if the lock was +@@ -139,6 +141,7 @@ on_exit() { # unlock the queue on exit if the lock was ## display msg to user, as well ## log() { @@ -33,14 +37,14 @@ index 1b39fc6..4baa19b 100755 local ARG RC PFX PFX="$('date' +'%Y %d %b %H:%M:%S')" # time stamp prefix - "2008 13 Mar 03:59:45 " -@@ -155,10 +159,19 @@ log() { +@@ -156,10 +159,19 @@ log() { done fi -+ if [ "$JOURNAL" == "Y" ]; then -+ for ARG ; do -+ [ -n "$ARG" ] && \ -+ echo "$ARG" | systemd-cat -t $NAME -p info ++ if [ "$JOURNAL" = "Y" ]; then ++ for ARG; do ++ [ -n "$ARG" ] && ++ echo "$ARG" | systemd-cat -t "$NAME" -p info + done + fi + @@ -48,8 +52,8 @@ index 1b39fc6..4baa19b 100755 [ -n "$LKD" ] && lock_queue -u # unlock here (if locked) [ -n "$LOG" ] && \ echo " exit code = $RC" >> "$LOG" # logging ok ; send exit code to log -+ [ "$JOURNAL" == "Y" ] && \ -+ echo "exit code= $RC" | systemd-cat -t $NAME -p emerg ++ [ "$JOURNAL" = "Y" ] && \ ++ echo "exit code= $RC" | systemd-cat -t "$NAME" -p emerg exit "$RC" # exit w/return code fi } From f0f76224f47976f49fa591523e6e395a3445f29f Mon Sep 17 00:00:00 2001 From: Peter Hoeg Date: Tue, 16 Aug 2022 13:27:33 +0800 Subject: [PATCH 152/164] drop commit text --- pkgs/applications/networking/msmtp/paths.patch | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/pkgs/applications/networking/msmtp/paths.patch b/pkgs/applications/networking/msmtp/paths.patch index c5e8776e11d3..7114dc4eca15 100644 --- a/pkgs/applications/networking/msmtp/paths.patch +++ b/pkgs/applications/networking/msmtp/paths.patch @@ -1,9 +1,4 @@ -commit 35cab741af069571cf4c55e0ce1ae96617d5778c -Author: Peter Hoeg -Date: Fri Aug 12 10:52:22 2022 +0800 - - nixify - +35cab741af069571cf4c55e0ce1ae96617d5778c nixify diff --git a/scripts/msmtpq/msmtpq b/scripts/msmtpq/msmtpq index d8b4039..1ab89f8 100755 --- a/scripts/msmtpq/msmtpq From 96021cfb7198217b49aca8f7d342deb2df55dee6 Mon Sep 17 00:00:00 2001 From: Darwin Corn Date: Wed, 20 Apr 2022 07:45:14 -0700 Subject: [PATCH 153/164] spacebar: 1.2.1 -> 1.4.0 --- pkgs/os-specific/darwin/spacebar/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/darwin/spacebar/default.nix b/pkgs/os-specific/darwin/spacebar/default.nix index 8cfbaa3f9a3b..2656c10f6dc3 100644 --- a/pkgs/os-specific/darwin/spacebar/default.nix +++ b/pkgs/os-specific/darwin/spacebar/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "spacebar"; - version = "1.2.1"; + version = "1.4.0"; src = fetchFromGitHub { owner = "cmacrae"; repo = pname; rev = "v${version}"; - sha256 = "0f5ddn3sx13rwwh0nfl784160s8ml3m5593d5fz2b1996aznzrsx"; + sha256 = "sha256-4LiG43kPZtsm7SQ/28RaGMpYsDshCaGvc1mouPG3jFM="; }; buildInputs = [ Carbon Cocoa ScriptingBridge SkyLight ]; From d61d4e71ba9a8f56e9f2092b7cfa9cffa4253971 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 16 Aug 2022 15:47:08 +0000 Subject: [PATCH 154/164] mupdf: 1.19.0 -> 1.20.3 --- pkgs/applications/misc/mupdf/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/mupdf/default.nix b/pkgs/applications/misc/mupdf/default.nix index 99812bcdc8c9..88f804ccf81f 100644 --- a/pkgs/applications/misc/mupdf/default.nix +++ b/pkgs/applications/misc/mupdf/default.nix @@ -35,12 +35,12 @@ let in stdenv.mkDerivation rec { - version = "1.19.0"; + version = "1.20.3"; pname = "mupdf"; src = fetchurl { url = "https://mupdf.com/downloads/archive/${pname}-${version}-source.tar.gz"; - sha256 = "1vfyhlqq1a0k0drcggly4bgsjasmf6lmpfbdi5xcrwdbzkagrbr1"; + sha256 = "sha256-a2AHD27sIOjYfStc0iz0kCAxGjzxXuEJmOPl9fmEses="; }; patches = [ ./0001-Use-command-v-in-favor-of-which.patch From d3e5bd022862cc1bcae505ddf746531269d51dd4 Mon Sep 17 00:00:00 2001 From: Will Fancher Date: Wed, 17 Aug 2022 10:47:13 -0400 Subject: [PATCH 155/164] nixos: Don't enable packagekit by default --- nixos/modules/services/desktops/system-config-printer.nix | 3 ++- nixos/modules/services/x11/desktop-managers/gnome.nix | 3 ++- nixos/modules/services/x11/desktop-managers/pantheon.nix | 3 ++- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/nixos/modules/services/desktops/system-config-printer.nix b/nixos/modules/services/desktops/system-config-printer.nix index 09c68c587b43..55f27b0e6534 100644 --- a/nixos/modules/services/desktops/system-config-printer.nix +++ b/nixos/modules/services/desktops/system-config-printer.nix @@ -34,7 +34,8 @@ with lib; ]; # for $out/bin/install-printer-driver - services.packagekit.enable = true; + # TODO: Enable once #177946 is resolved + # services.packagekit.enable = true; }; diff --git a/nixos/modules/services/x11/desktop-managers/gnome.nix b/nixos/modules/services/x11/desktop-managers/gnome.nix index bbecd2796aee..b69102f046a2 100644 --- a/nixos/modules/services/x11/desktop-managers/gnome.nix +++ b/nixos/modules/services/x11/desktop-managers/gnome.nix @@ -361,7 +361,8 @@ in services.gnome.tracker-miners.enable = mkDefault true; services.gnome.tracker.enable = mkDefault true; services.hardware.bolt.enable = mkDefault true; - services.packagekit.enable = mkDefault true; + # TODO: Enable once #177946 is resolved + # services.packagekit.enable = mkDefault true; services.udisks2.enable = true; services.upower.enable = config.powerManagement.enable; services.xserver.libinput.enable = mkDefault true; # for controlling touchpad settings via gnome control center diff --git a/nixos/modules/services/x11/desktop-managers/pantheon.nix b/nixos/modules/services/x11/desktop-managers/pantheon.nix index 2ada36c12a46..94de7f4dd7db 100644 --- a/nixos/modules/services/x11/desktop-managers/pantheon.nix +++ b/nixos/modules/services/x11/desktop-managers/pantheon.nix @@ -134,7 +134,8 @@ in services.bamf.enable = true; services.colord.enable = mkDefault true; services.fwupd.enable = mkDefault true; - services.packagekit.enable = mkDefault true; + # TODO: Enable once #177946 is resolved + # services.packagekit.enable = mkDefault true; services.power-profiles-daemon.enable = mkDefault true; services.touchegg.enable = mkDefault true; services.touchegg.package = pkgs.pantheon.touchegg; From 881512e23f51f0c00f5adb58788998aca65ebea3 Mon Sep 17 00:00:00 2001 From: LoveIsGrief Date: Wed, 10 Aug 2022 22:46:00 +0200 Subject: [PATCH 156/164] x11: Source .profile and .xprofile Other popular distros (OpenSuse, Ubuntu, Gentoo, Arch) read $HOME/.profile when starting X11 display managers. When moving to nixOS, that is then broken leading to unpredictable behavior (probably programs not working). This adds similar behavior to https://github.com/sddm/sddm/blob/develop/data/scripts/Xsession Related to #185979 --- nixos/modules/services/x11/display-managers/default.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/nixos/modules/services/x11/display-managers/default.nix b/nixos/modules/services/x11/display-managers/default.nix index cc94fe7c0bef..03bf5d1cd2da 100644 --- a/nixos/modules/services/x11/display-managers/default.nix +++ b/nixos/modules/services/x11/display-managers/default.nix @@ -35,6 +35,10 @@ let # Shared environment setup for graphical sessions. . /etc/profile + if test -f ~/.profile; then + source ~/.profile + fi + cd "$HOME" # Allow the user to execute commands at the beginning of the X session. From bdf889ce6daadb9425157351b7927ae380062857 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 16 Aug 2022 15:04:31 +0000 Subject: [PATCH 157/164] libjaylink: 0.2.0 -> 0.3.0 --- pkgs/development/libraries/libjaylink/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libjaylink/default.nix b/pkgs/development/libraries/libjaylink/default.nix index 6aac7675dcdc..bf42624f7651 100644 --- a/pkgs/development/libraries/libjaylink/default.nix +++ b/pkgs/development/libraries/libjaylink/default.nix @@ -5,14 +5,14 @@ stdenv.mkDerivation rec { pname = "libjaylink"; - version = "0.2.0"; + version = "0.3.0"; src = fetchFromGitLab { domain = "gitlab.zapb.de"; owner = "libjaylink"; repo = "libjaylink"; rev = version; - sha256 = "0ndyfh51hiqyv2yscpj6qd091w7myxxjid3a6rx8f6k233vy826q"; + sha256 = "sha256-90obLaSE3oxrocyJWZ4+j4U4GuPIZEiiIQqenu4vsJg="; }; nativeBuildInputs = [ autoreconfHook pkg-config ]; From 59888d2218772b7bfde2929be29e586de418beb5 Mon Sep 17 00:00:00 2001 From: K900 Date: Wed, 17 Aug 2022 22:36:45 +0300 Subject: [PATCH 158/164] build-fhs-userenv-bubblewrap: fix eval --- pkgs/build-support/build-fhs-userenv-bubblewrap/env.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/build-support/build-fhs-userenv-bubblewrap/env.nix b/pkgs/build-support/build-fhs-userenv-bubblewrap/env.nix index ddd97704b859..7ebcba73708c 100644 --- a/pkgs/build-support/build-fhs-userenv-bubblewrap/env.nix +++ b/pkgs/build-support/build-fhs-userenv-bubblewrap/env.nix @@ -22,7 +22,7 @@ # /lib will link to /lib32 let - inherit (stdenv) is64Bit; + inherit (stdenv) is64bit; # use of glibc_multi is only supported on x86_64-linux isMultiBuild = multiPkgs != null && stdenv.isx86_64 && stdenv.isLinux; @@ -141,7 +141,7 @@ let setupLibDirsTarget = '' # link content of targetPaths cp -rsHf ${staticUsrProfileTarget}/lib lib - ln -s lib lib${if is64Bit then "64" else "32"} + ln -s lib lib${if is64bit then "64" else "32"} ''; # setup /lib, /lib32 and /lib64 From f766110c2058332247d38ef4bec6bf4da35bbd20 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 17 Aug 2022 20:06:20 +0000 Subject: [PATCH 159/164] python310Packages.hcloud: 1.17.0 -> 1.18.0 --- pkgs/development/python-modules/hcloud/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/hcloud/default.nix b/pkgs/development/python-modules/hcloud/default.nix index ad8e79b63fd1..3d8c2e53db27 100644 --- a/pkgs/development/python-modules/hcloud/default.nix +++ b/pkgs/development/python-modules/hcloud/default.nix @@ -11,14 +11,14 @@ buildPythonPackage rec { pname = "hcloud"; - version = "1.17.0"; + version = "1.18.0"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-+BQuBDi+J3xvod3uE67NXaFStIxt7H/Ulw3vG13CGeI="; + hash = "sha256-oh2UDN6PDB/RCgWBsGGOuECm9ZJAT6r9tgcBAfRSX/Y="; }; propagatedBuildInputs = [ From 2e8dc051ebd58ca27c4f3e429bc1eaa4c3e6c347 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 17 Aug 2022 20:37:52 +0000 Subject: [PATCH 160/164] python310Packages.iminuit: 2.15.2 -> 2.16.0 --- pkgs/development/python-modules/iminuit/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/iminuit/default.nix b/pkgs/development/python-modules/iminuit/default.nix index 386bd1961208..246f04618f2d 100644 --- a/pkgs/development/python-modules/iminuit/default.nix +++ b/pkgs/development/python-modules/iminuit/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "iminuit"; - version = "2.15.2"; + version = "2.16.0"; format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - hash = "sha256-YKx9L+lAXJIGZ1IpJz9AFhHT9d+iKUJUFkbEYltZ8eo="; + hash = "sha256-ECSlGdvI/VLV/So3ef1IWwm8J8QFVt74tvkWlUIxmdY="; }; nativeBuildInputs = [ From d17a7fb13de9ffb9b220ec65e3b311b94682f519 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 17 Aug 2022 22:51:52 +0200 Subject: [PATCH 161/164] python310Packages.hahomematic: 2022.8.7 -> 2022.8.8 --- pkgs/development/python-modules/hahomematic/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/hahomematic/default.nix b/pkgs/development/python-modules/hahomematic/default.nix index 33274119a309..fac21f83d565 100644 --- a/pkgs/development/python-modules/hahomematic/default.nix +++ b/pkgs/development/python-modules/hahomematic/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "hahomematic"; - version = "2022.8.7"; + version = "2022.8.8"; format = "pyproject"; disabled = pythonOlder "3.9"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "danielperna84"; repo = pname; rev = "refs/tags/${version}"; - sha256 = "sha256-HSxGCytQ099GCG3LanExOEp9DYeboQ2fS0QxHbtSI3s="; + sha256 = "sha256-H5XGidHvFF75uuDoUHyN5N81M+F2m47vUYwtHSCM8W0="; }; propagatedBuildInputs = [ From 42ca2379ba38a09bd740ae2fad7d95d32b907c35 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 17 Aug 2022 22:52:23 +0200 Subject: [PATCH 162/164] python310Packages.hahomematic: 2022.8.8 -> 2022.8.9 --- pkgs/development/python-modules/hahomematic/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/hahomematic/default.nix b/pkgs/development/python-modules/hahomematic/default.nix index fac21f83d565..394fcc53e369 100644 --- a/pkgs/development/python-modules/hahomematic/default.nix +++ b/pkgs/development/python-modules/hahomematic/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "hahomematic"; - version = "2022.8.8"; + version = "2022.8.9"; format = "pyproject"; disabled = pythonOlder "3.9"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "danielperna84"; repo = pname; rev = "refs/tags/${version}"; - sha256 = "sha256-H5XGidHvFF75uuDoUHyN5N81M+F2m47vUYwtHSCM8W0="; + sha256 = "sha256-tiCSemX68Bfe3+E+xMhHKfMH8ZW5ffE89vv66Vmvju4="; }; propagatedBuildInputs = [ From ee0fedf7c2b8197ff39eab858ec721d4f6e084cb Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 17 Aug 2022 22:52:45 +0200 Subject: [PATCH 163/164] python310Packages.hahomematic: 2022.8.9 -> 2022.8.10 --- pkgs/development/python-modules/hahomematic/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/hahomematic/default.nix b/pkgs/development/python-modules/hahomematic/default.nix index 394fcc53e369..f90e414d17e7 100644 --- a/pkgs/development/python-modules/hahomematic/default.nix +++ b/pkgs/development/python-modules/hahomematic/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "hahomematic"; - version = "2022.8.9"; + version = "2022.8.10"; format = "pyproject"; disabled = pythonOlder "3.9"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "danielperna84"; repo = pname; rev = "refs/tags/${version}"; - sha256 = "sha256-tiCSemX68Bfe3+E+xMhHKfMH8ZW5ffE89vv66Vmvju4="; + sha256 = "sha256-JyHIX0G6REIRJDxSrGwZr0mMvAE0R1/zkullh/SXAXA="; }; propagatedBuildInputs = [ From 3e43b5e4bc1d80da0a39bf0155357d9bd4495cae Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 15 Aug 2022 22:04:33 +0000 Subject: [PATCH 164/164] python310Packages.pymupdf: 1.20.1 -> 1.20.2 --- pkgs/development/python-modules/pymupdf/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pymupdf/default.nix b/pkgs/development/python-modules/pymupdf/default.nix index a516525e3bba..daf2197f8337 100644 --- a/pkgs/development/python-modules/pymupdf/default.nix +++ b/pkgs/development/python-modules/pymupdf/default.nix @@ -13,12 +13,12 @@ buildPythonPackage rec { pname = "pymupdf"; - version = "1.20.1"; + version = "1.20.2"; src = fetchPypi { pname = "PyMuPDF"; inherit version; - sha256 = "sha256-MFwaZLj7L9Rl4nzIvcvw9kIk8Oxtd2Pj9fLKZ4MTZkk="; + sha256 = "sha256-Au7fAfV8a6+16GZ86gCIotJSJkPEcQDxkIvsOmioSIg="; }; postPatch = ''