From eefaf9052053977856d95d916fa6f82379226e4f Mon Sep 17 00:00:00 2001 From: Doron Behar Date: Mon, 6 Sep 2021 08:29:29 +0300 Subject: [PATCH 01/31] mailspring: 1.9.1 -> 1.9.2 --- .../networking/mailreaders/mailspring/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/mailreaders/mailspring/default.nix b/pkgs/applications/networking/mailreaders/mailspring/default.nix index 8fe93fb1a44a..d2e5beb17180 100644 --- a/pkgs/applications/networking/mailreaders/mailspring/default.nix +++ b/pkgs/applications/networking/mailreaders/mailspring/default.nix @@ -19,11 +19,11 @@ stdenv.mkDerivation rec { pname = "mailspring"; - version = "1.9.1"; + version = "1.9.2"; src = fetchurl { url = "https://github.com/Foundry376/Mailspring/releases/download/${version}/mailspring-${version}-amd64.deb"; - sha256 = "mfpwDYRpFULD9Th8tI5yqb5RYWZJHarbWYpfKS3Q6mE="; + sha256 = "sha256-o7w2XHd5FnPYt9j8IIGy6OgKtdeNb/qZ+EiXGEn0NUQ="; }; nativeBuildInputs = [ From 14cd4bb1dd6c860f47457b295957915641cf7da0 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 6 Sep 2021 12:25:15 +0200 Subject: [PATCH 02/31] python3Packages.envoy-utils: init at 0.0.1 --- .../python-modules/envoy-utils/default.nix | 35 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 37 insertions(+) create mode 100644 pkgs/development/python-modules/envoy-utils/default.nix diff --git a/pkgs/development/python-modules/envoy-utils/default.nix b/pkgs/development/python-modules/envoy-utils/default.nix new file mode 100644 index 000000000000..6f04704a8b5f --- /dev/null +++ b/pkgs/development/python-modules/envoy-utils/default.nix @@ -0,0 +1,35 @@ +{ lib +, buildPythonPackage +, fetchPypi +, pythonOlder +, zeroconf +}: + +buildPythonPackage rec { + pname = "envoy-utils"; + version = "0.0.1"; + + disabled = pythonOlder "3.8"; + + src = fetchPypi { + pname = "envoy_utils"; + inherit version; + sha256 = "13zn0d6k2a4nls9vp8cs0w07bgg4138vz18cadjadhm8p6r3bi0c"; + }; + + propagatedBuildInputs = [ + zeroconf + ]; + + # Project has no tests + doCheck = false; + + pythonImportsCheck = [ "envoy_utils" ]; + + meta = with lib; { + description = "Python utilities for the Enphase Envoy"; + homepage = "https://pypi.org/project/envoy-utils/"; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index f7bf364e8bf9..962f7645eddb 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -2366,6 +2366,8 @@ in { envoy-reader = callPackage ../development/python-modules/envoy-reader { }; + envoy-utils = callPackage ../development/python-modules/envoy-utils { }; + enzyme = callPackage ../development/python-modules/enzyme { }; epc = callPackage ../development/python-modules/epc { }; From 51170e3cb823a804a67e9407a0db1cacbb9d3e99 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 6 Sep 2021 12:29:32 +0200 Subject: [PATCH 03/31] python3Packages.envoy-reader: 0.19.0 -> 0.20.0 --- .../python-modules/envoy-reader/default.nix | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/pkgs/development/python-modules/envoy-reader/default.nix b/pkgs/development/python-modules/envoy-reader/default.nix index d72db523a21c..0f2ca79d6411 100644 --- a/pkgs/development/python-modules/envoy-reader/default.nix +++ b/pkgs/development/python-modules/envoy-reader/default.nix @@ -1,30 +1,27 @@ { lib , buildPythonPackage +, envoy-utils , fetchFromGitHub , httpx , pytest-asyncio , pytest-raises -, pytest-runner , pytestCheckHook , respx }: buildPythonPackage rec { pname = "envoy-reader"; - version = "0.19.0"; + version = "0.20.0"; src = fetchFromGitHub { owner = "jesserizzo"; repo = "envoy_reader"; rev = version; - sha256 = "0jyrgm7dc6k66c94gadc69a6xsv2b48wn3b3rbpwgbssi5s7iiz6"; + sha256 = "sha256-nPB1Fvb1qwLHeFkXP2jXixD2ZGA09MtS1qXRhYGt0fM="; }; - nativeBuildInputs = [ - pytest-runner - ]; - propagatedBuildInputs = [ + envoy-utils httpx ]; @@ -35,6 +32,11 @@ buildPythonPackage rec { respx ]; + postPatch = '' + substituteInPlace setup.py \ + --replace "pytest-runner>=5.2" "" + ''; + pythonImportsCheck = [ "envoy_reader" ]; meta = with lib; { From 0d1e42786e6bc5249248e50793f9f8537aaad857 Mon Sep 17 00:00:00 2001 From: Vincent Haupert Date: Tue, 7 Sep 2021 15:52:29 +0200 Subject: [PATCH 04/31] github-runner: make derivation easier to override --- .../github-runner/default.nix | 97 +++++++++---------- 1 file changed, 47 insertions(+), 50 deletions(-) diff --git a/pkgs/development/tools/continuous-integration/github-runner/default.nix b/pkgs/development/tools/continuous-integration/github-runner/default.nix index e2d40630905c..459b68fa6b2b 100644 --- a/pkgs/development/tools/continuous-integration/github-runner/default.nix +++ b/pkgs/development/tools/continuous-integration/github-runner/default.nix @@ -19,9 +19,6 @@ , zlib }: let - pname = "github-actions-runner"; - version = "2.279.0"; - deps = (import ./deps.nix { inherit fetchurl; }); nugetPackages = map (x: { @@ -29,57 +26,14 @@ let path = "${x}"; }) deps; - nugetSource = linkFarm "${pname}-${version}-packages" nugetPackages; + nugetSource = linkFarm "nuget-packages" nugetPackages; dotnetSdk = dotnetCorePackages.sdk_3_1; runtimeId = "linux-x64"; - - disabledTest = [ - # Self-updating is patched out, hence this test will fail - "FullyQualifiedName!=GitHub.Runner.Common.Tests.Listener.RunnerL0.TestRunOnceHandleUpdateMessage" - ] ++ map - # Online tests - (x: "FullyQualifiedName!=GitHub.Runner.Common.Tests.Worker.ActionManagerL0.PrepareActions_${x}") - [ - "CompositeActionWithActionfile_CompositeContainerNested" - "CompositeActionWithActionfile_CompositePrestepNested" - "CompositeActionWithActionfile_MaxLimit" - "CompositeActionWithActionfile_Node" - "DownloadActionFromGraph" - "DownloadActionFromGraph_Legacy" - "NotPullOrBuildImagesMultipleTimes" - "NotPullOrBuildImagesMultipleTimes_Legacy" - "RepositoryActionWithActionYamlFile_DockerHubImage" - "RepositoryActionWithActionYamlFile_DockerHubImage_Legacy" - "RepositoryActionWithActionfileAndDockerfile" - "RepositoryActionWithActionfileAndDockerfile_Legacy" - "RepositoryActionWithActionfile_DockerHubImage" - "RepositoryActionWithActionfile_DockerHubImage_Legacy" - "RepositoryActionWithActionfile_Dockerfile" - "RepositoryActionWithActionfile_Dockerfile_Legacy" - "RepositoryActionWithActionfile_DockerfileRelativePath" - "RepositoryActionWithActionfile_DockerfileRelativePath_Legacy" - "RepositoryActionWithActionfile_Node" - "RepositoryActionWithActionfile_Node_Legacy" - "RepositoryActionWithDockerfile" - "RepositoryActionWithDockerfile_Legacy" - "RepositoryActionWithDockerfileInRelativePath" - "RepositoryActionWithDockerfileInRelativePath_Legacy" - "RepositoryActionWithDockerfilePrepareActions_Repository" - "RepositoryActionWithInvalidWrapperActionfile_Node" - "RepositoryActionWithInvalidWrapperActionfile_Node_Legacy" - "RepositoryActionWithWrapperActionfile_PreSteps" - "RepositoryActionWithWrapperActionfile_PreSteps_Legacy" - ] ++ map - (x: "FullyQualifiedName!=GitHub.Runner.Common.Tests.DotnetsdkDownloadScriptL0.${x}") - [ - "EnsureDotnetsdkBashDownloadScriptUpToDate" - "EnsureDotnetsdkPowershellDownloadScriptUpToDate" - ]; - testFilterXml = lib.concatStringsSep "&" disabledTest; in stdenv.mkDerivation rec { - inherit pname version; + pname = "github-runner"; + version = "2.279.0"; src = fetchFromGitHub { owner = "actions"; @@ -125,7 +79,7 @@ stdenv.mkDerivation rec { # Disable specific tests substituteInPlace src/dir.proj \ --replace 'dotnet test Test/Test.csproj' \ - "dotnet test Test/Test.csproj --filter '${testFilterXml}'" + "dotnet test Test/Test.csproj --filter '${lib.concatStringsSep "&" disabledTests}'" # We don't use a Git checkout substituteInPlace src/dir.proj \ @@ -180,6 +134,49 @@ stdenv.mkDerivation rec { doCheck = true; + disabledTests = [ + # Self-updating is patched out, hence this test will fail + "FullyQualifiedName!=GitHub.Runner.Common.Tests.Listener.RunnerL0.TestRunOnceHandleUpdateMessage" + ] ++ map + # Online tests + (x: "FullyQualifiedName!=GitHub.Runner.Common.Tests.Worker.ActionManagerL0.PrepareActions_${x}") + [ + "CompositeActionWithActionfile_CompositeContainerNested" + "CompositeActionWithActionfile_CompositePrestepNested" + "CompositeActionWithActionfile_MaxLimit" + "CompositeActionWithActionfile_Node" + "DownloadActionFromGraph" + "DownloadActionFromGraph_Legacy" + "NotPullOrBuildImagesMultipleTimes" + "NotPullOrBuildImagesMultipleTimes_Legacy" + "RepositoryActionWithActionYamlFile_DockerHubImage" + "RepositoryActionWithActionYamlFile_DockerHubImage_Legacy" + "RepositoryActionWithActionfileAndDockerfile" + "RepositoryActionWithActionfileAndDockerfile_Legacy" + "RepositoryActionWithActionfile_DockerHubImage" + "RepositoryActionWithActionfile_DockerHubImage_Legacy" + "RepositoryActionWithActionfile_Dockerfile" + "RepositoryActionWithActionfile_Dockerfile_Legacy" + "RepositoryActionWithActionfile_DockerfileRelativePath" + "RepositoryActionWithActionfile_DockerfileRelativePath_Legacy" + "RepositoryActionWithActionfile_Node" + "RepositoryActionWithActionfile_Node_Legacy" + "RepositoryActionWithDockerfile" + "RepositoryActionWithDockerfile_Legacy" + "RepositoryActionWithDockerfileInRelativePath" + "RepositoryActionWithDockerfileInRelativePath_Legacy" + "RepositoryActionWithDockerfilePrepareActions_Repository" + "RepositoryActionWithInvalidWrapperActionfile_Node" + "RepositoryActionWithInvalidWrapperActionfile_Node_Legacy" + "RepositoryActionWithWrapperActionfile_PreSteps" + "RepositoryActionWithWrapperActionfile_PreSteps_Legacy" + ] ++ map + (x: "FullyQualifiedName!=GitHub.Runner.Common.Tests.DotnetsdkDownloadScriptL0.${x}") + [ + "EnsureDotnetsdkBashDownloadScriptUpToDate" + "EnsureDotnetsdkPowershellDownloadScriptUpToDate" + ]; + checkInputs = [ git ]; checkPhase = '' From ebcf2468ac67b473821946a6d5539c001861b465 Mon Sep 17 00:00:00 2001 From: Vincent Haupert Date: Tue, 7 Sep 2021 16:03:38 +0200 Subject: [PATCH 05/31] github-runner: 2.279.0 -> 2.281.1 --- .../tools/continuous-integration/github-runner/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/continuous-integration/github-runner/default.nix b/pkgs/development/tools/continuous-integration/github-runner/default.nix index 459b68fa6b2b..3cfd7d6015a0 100644 --- a/pkgs/development/tools/continuous-integration/github-runner/default.nix +++ b/pkgs/development/tools/continuous-integration/github-runner/default.nix @@ -33,13 +33,13 @@ let in stdenv.mkDerivation rec { pname = "github-runner"; - version = "2.279.0"; + version = "2.281.1"; src = fetchFromGitHub { owner = "actions"; repo = "runner"; - rev = "6b75179ec79e2041b3b5b4e9206b73db2d206aac"; # v${version} - sha256 = "sha256-d7LAHL8Ff7R++d1HuLxWjtiBZRogySe7xHY/xJAcFms="; + rev = "c8caf59bb7adaa87c4cf8f61372670d338a13f2d"; # v${version} + sha256 = "sha256-Nl1FSjwweVqdQEVhqt4PEcqZbF7htNT279yx1nGuAe0="; }; nativeBuildInputs = [ From 1614fc6eb63d012b704cbb34b9c53c823d51c32c Mon Sep 17 00:00:00 2001 From: Vincent Haupert Date: Tue, 7 Sep 2021 16:16:29 +0200 Subject: [PATCH 06/31] github-runner: adapt to latest lttng-ust ref: ab2501bd171f2c930ebd3f3bf6b6a1a228477a08 --- .../tools/continuous-integration/github-runner/default.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/development/tools/continuous-integration/github-runner/default.nix b/pkgs/development/tools/continuous-integration/github-runner/default.nix index 3cfd7d6015a0..b7da1970da2b 100644 --- a/pkgs/development/tools/continuous-integration/github-runner/default.nix +++ b/pkgs/development/tools/continuous-integration/github-runner/default.nix @@ -237,6 +237,10 @@ stdenv.mkDerivation rec { # Stripping breaks the binaries dontStrip = true; + preFixup = '' + patchelf --replace-needed liblttng-ust.so.0 liblttng-ust.so $out/lib/libcoreclrtraceptprovider.so + ''; + postFixup = '' fix_rpath() { patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" $out/lib/$1 From c2073fcb1a41f2ceb2d8bdbbb2132609eed70ead Mon Sep 17 00:00:00 2001 From: Justin Bedo Date: Wed, 8 Sep 2021 15:20:34 +1000 Subject: [PATCH 07/31] singularity: 3.8.2 -> 3.8.3 --- pkgs/applications/virtualization/singularity/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/virtualization/singularity/default.nix b/pkgs/applications/virtualization/singularity/default.nix index 0e83a113e5db..37fad321cada 100644 --- a/pkgs/applications/virtualization/singularity/default.nix +++ b/pkgs/applications/virtualization/singularity/default.nix @@ -15,11 +15,11 @@ with lib; buildGoPackage rec { pname = "singularity"; - version = "3.8.2"; + version = "3.8.3"; src = fetchurl { url = "https://github.com/hpcng/singularity/releases/download/v${version}/singularity-${version}.tar.gz"; - sha256 = "sha256-mWYR3sQCtNNyuLlFbdnsHLQ3EtCFAuRV84UhvRmYVtM="; + sha256 = "sha256-LiLrnuG3P91RuHgxSfDk2DwNLYoMHt9gNBV9UO7vuDU="; }; goPackagePath = "github.com/sylabs/singularity"; From 14ffc3e3bef925374ccfdf43e68eb0f8eefe532f Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 8 Sep 2021 08:47:40 +0200 Subject: [PATCH 08/31] python3Packages.youless-api: 0.12 -> 0.13 --- pkgs/development/python-modules/youless-api/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/youless-api/default.nix b/pkgs/development/python-modules/youless-api/default.nix index bce08bddf2b9..805f99c02288 100644 --- a/pkgs/development/python-modules/youless-api/default.nix +++ b/pkgs/development/python-modules/youless-api/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "youless-api"; - version = "0.12"; + version = "0.13"; disabled = pythonOlder "3.7"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "jongsoftdev"; repo = "youless-python-bridge"; rev = version; - sha256 = "18hymahpblq87i7lv479sizj8mgxawjhj31g4j1lyna1mds3887k"; + sha256 = "sha256-Vywzd8wZG4eI/U69fPYuLpF54zAeuCv3Q81z5UcMGjc="; }; propagatedBuildInputs = [ From 8276a5e677128c1ca77b876e3ccc55603a427fad Mon Sep 17 00:00:00 2001 From: Anthony Cowley Date: Mon, 6 Sep 2021 12:48:45 -0400 Subject: [PATCH 09/31] notmuch: 0.32.3 -> 0.33 --- pkgs/applications/networking/mailreaders/notmuch/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/mailreaders/notmuch/default.nix b/pkgs/applications/networking/mailreaders/notmuch/default.nix index 4e28d93e8926..3247f45b06f1 100644 --- a/pkgs/applications/networking/mailreaders/notmuch/default.nix +++ b/pkgs/applications/networking/mailreaders/notmuch/default.nix @@ -11,11 +11,11 @@ stdenv.mkDerivation rec { pname = "notmuch"; - version = "0.32.3"; + version = "0.33"; src = fetchurl { url = "https://notmuchmail.org/releases/notmuch-${version}.tar.xz"; - sha256 = "114bbyjl2ppmy4pw0b5zwmi7lxiz6xd1k6zq0qcgdv7ahkwgybxy"; + hash = "sha256-iD4EW0v6LEjJpGcQYqQGA6f2Flck3VRhi+66EAVJ0mw="; }; nativeBuildInputs = [ @@ -23,6 +23,7 @@ stdenv.mkDerivation rec { doxygen # (optional) api docs pythonPackages.sphinx # (optional) documentation -> doc/INSTALL texinfo # (optional) documentation -> doc/INSTALL + pythonPackages.cffi ] ++ lib.optional withEmacs emacs; buildInputs = [ From 12c40d9972f698042cfaf63342ce6beca5c62a5d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Wed, 8 Sep 2021 16:04:31 +0200 Subject: [PATCH 10/31] knot-dns: 3.1.1 -> 3.1.2 https://gitlab.nic.cz/knot/knot-dns/-/tags/v3.1.2 The patch was included in this release. --- pkgs/servers/dns/knot-dns/default.nix | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/pkgs/servers/dns/knot-dns/default.nix b/pkgs/servers/dns/knot-dns/default.nix index 4a8ed6a0b080..4363f9665fa4 100644 --- a/pkgs/servers/dns/knot-dns/default.nix +++ b/pkgs/servers/dns/knot-dns/default.nix @@ -1,16 +1,15 @@ { lib, stdenv, fetchurl, pkg-config, gnutls, liburcu, lmdb, libcap_ng, libidn2, libunistring , systemd, nettle, libedit, zlib, libiconv, libintl, libmaxminddb, libbpf, nghttp2, libmnl , autoreconfHook, nixosTests -, fetchpatch }: stdenv.mkDerivation rec { pname = "knot-dns"; - version = "3.1.1"; + version = "3.1.2"; src = fetchurl { url = "https://secure.nic.cz/files/knot-dns/knot-${version}.tar.xz"; - sha256 = "75bfb1acaca774ed3dd781dc74780298dc0fd51b54e4b61015e7487d6cd2067c"; + sha256 = "580087695df350898b2da8a5c2bdf1dc5eb262ed5ff2cb1538cee480a50fa094"; }; outputs = [ "bin" "out" "dev" ]; @@ -26,11 +25,6 @@ stdenv.mkDerivation rec { # They are later created from NixOS itself. ./dont-create-run-time-dirs.patch ./runtime-deps.patch - # rename task_t to worker_task_t to fix redefinition issues on (aach64-)darwin - (fetchpatch { - url = "https://gitlab.nic.cz/knot/knot-dns/-/commit/a70b718085f9b97e556970444313c37a702a60f7.diff"; - sha256 = "0m776pb9iga0lj2gadk23shfrcfrsrzlyaj8800klw7xh6qq32bm"; - }) ]; nativeBuildInputs = [ pkg-config autoreconfHook ]; From 2bcd3dad866e70b0dc4943d3ff32ffcd487ec301 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Janne=20He=C3=9F?= Date: Wed, 8 Sep 2021 20:08:44 +0200 Subject: [PATCH 11/31] nixos/top-level: Check activation script syntax --- nixos/modules/system/activation/top-level.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/nixos/modules/system/activation/top-level.nix b/nixos/modules/system/activation/top-level.nix index 80835d9688f2..616e1422aa8c 100644 --- a/nixos/modules/system/activation/top-level.nix +++ b/nixos/modules/system/activation/top-level.nix @@ -61,6 +61,8 @@ let substituteInPlace $out/dry-activate --subst-var out chmod u+x $out/activate $out/dry-activate unset activationScript dryActivationScript + ${pkgs.runtimeShell} -n $out/activate + ${pkgs.runtimeShell} -n $out/dry-activate cp ${config.system.build.bootStage2} $out/init substituteInPlace $out/init --subst-var-by systemConfig $out From db6133acf173987e87ea1d0d98d7dea3563542b3 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 9 Sep 2021 01:32:28 +0200 Subject: [PATCH 12/31] python3Packages.dpath: 2.0.2 -> 2.0.3 --- pkgs/development/python-modules/dpath/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/dpath/default.nix b/pkgs/development/python-modules/dpath/default.nix index 8756557e64ca..387dbfa1f64d 100644 --- a/pkgs/development/python-modules/dpath/default.nix +++ b/pkgs/development/python-modules/dpath/default.nix @@ -10,13 +10,13 @@ buildPythonPackage rec { pname = "dpath"; - version = "2.0.2"; + version = "2.0.3"; disabled = isPy27; # uses python3 imports src = fetchPypi { inherit pname version; - sha256 = "sha256-BA2+ShAeG2sbZenaJYU08PCwrgCjsf0tWS/oV5/4N64="; + sha256 = "sha256-p6icMudH3zqfKkRrt5dHLjWb66UzlRW3pvZbIzsqMac="; }; # use pytest as nosetests hangs From 8609a1bca3675a36f19552897961111eb1f19f73 Mon Sep 17 00:00:00 2001 From: rnhmjoj Date: Thu, 9 Sep 2021 01:34:21 +0200 Subject: [PATCH 13/31] zimg: 3.0.2 -> 3.0.3 --- pkgs/development/libraries/zimg/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/zimg/default.nix b/pkgs/development/libraries/zimg/default.nix index 76334bb3532f..38b106d474b7 100644 --- a/pkgs/development/libraries/zimg/default.nix +++ b/pkgs/development/libraries/zimg/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "zimg"; - version = "3.0.2"; + version = "3.0.3"; src = fetchFromGitHub { owner = "sekrit-twc"; repo = "zimg"; rev = "release-${version}"; - sha256 = "19qim6vyfas0m09piiw0pw7i0xjzi8vs6bx716gz472nflsg1604"; + sha256 = "0pwgf1mybpa3fs13p6jryzm32vfldyql9biwaypqdcimlnlmyk20"; }; nativeBuildInputs = [ autoreconfHook ]; From 67173fba04df8cf1c375d819a162f80adfe4b3d7 Mon Sep 17 00:00:00 2001 From: rnhmjoj Date: Thu, 9 Sep 2021 02:11:49 +0200 Subject: [PATCH 14/31] monero: 0.17.2.0 -> 0.17.2.3 --- pkgs/applications/blockchains/monero/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/blockchains/monero/default.nix b/pkgs/applications/blockchains/monero/default.nix index 7dd2e569021a..ad07c3eba0b9 100644 --- a/pkgs/applications/blockchains/monero/default.nix +++ b/pkgs/applications/blockchains/monero/default.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation rec { pname = "monero"; - version = "0.17.2.0"; + version = "0.17.2.3"; src = fetchFromGitHub { owner = "monero-project"; repo = "monero"; rev = "v${version}"; - sha256 = "0jwlmrpzisvw1c06cvd5b3s3hd4w0pa1qmrypfwah67qj3x6hnb6"; + sha256 = "0nax991fshfh51grhh2ryfrwwws35k16gzl1l3niva28zff2xmq6"; fetchSubmodules = true; }; From 17bb4a0492a081801d2d613599d3324aa56a9e4f Mon Sep 17 00:00:00 2001 From: rnhmjoj Date: Thu, 9 Sep 2021 02:12:10 +0200 Subject: [PATCH 15/31] monero-gui: 0.17.2.2 -> 0.17.2.3 --- pkgs/applications/blockchains/monero-gui/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/blockchains/monero-gui/default.nix b/pkgs/applications/blockchains/monero-gui/default.nix index d7a27dd4bccc..54e9400e3d58 100644 --- a/pkgs/applications/blockchains/monero-gui/default.nix +++ b/pkgs/applications/blockchains/monero-gui/default.nix @@ -14,13 +14,13 @@ stdenv.mkDerivation rec { pname = "monero-gui"; - version = "0.17.2.2"; + version = "0.17.2.3"; src = fetchFromGitHub { owner = "monero-project"; repo = "monero-gui"; rev = "v${version}"; - sha256 = "1k3grbd3wydy5gv6d8x35skv1v97lhh6awd9i87im9lz4kn8ywkd"; + sha256 = "1d8y5yqyw0db2jdv9mwkczwm2qcwhzyslvq994yq5rvs4vkd8xjg"; }; nativeBuildInputs = [ From 90ec05be8f7475d0f7f8c8c5e81545d5689f6ab1 Mon Sep 17 00:00:00 2001 From: figsoda Date: Wed, 8 Sep 2021 20:56:13 -0400 Subject: [PATCH 16/31] csview: init at 0.3.8 --- pkgs/tools/text/csview/default.nix | 22 ++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 24 insertions(+) create mode 100644 pkgs/tools/text/csview/default.nix diff --git a/pkgs/tools/text/csview/default.nix b/pkgs/tools/text/csview/default.nix new file mode 100644 index 000000000000..60186a6b3b75 --- /dev/null +++ b/pkgs/tools/text/csview/default.nix @@ -0,0 +1,22 @@ +{ fetchFromGitHub, lib, rustPlatform }: + +rustPlatform.buildRustPackage rec { + pname = "csview"; + version = "0.3.8"; + + src = fetchFromGitHub { + owner = "wfxr"; + repo = pname; + rev = "v${version}"; + sha256 = "18bz12yn85h9vj0b18iaziix9km2iwh8gwfs93fddjv6kg87p38q"; + }; + + cargoSha256 = "1my6gl8zq5k7clzapgbf1mmcgq8mmdbhl250rdd1fvfd59wkrwra"; + + meta = with lib; { + description = "A high performance csv viewer with cjk/emoji support"; + homepage = "https://github.com/wfxr/csview"; + license = with licenses; [ mit /* or */ asl20 ]; + maintainers = with maintainers; [ figsoda ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 122658d0848d..dd9376723566 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2442,6 +2442,8 @@ with pkgs; csv2odf = callPackage ../applications/office/csv2odf { }; + csview = callPackage ../tools/text/csview { }; + csvkit = callPackage ../tools/text/csvkit { }; csvtool = callPackage ../development/ocaml-modules/csv/csvtool.nix { }; From 52731e1d01f9d2eabe55b4ab3f1caa28971e6bea Mon Sep 17 00:00:00 2001 From: figsoda Date: Wed, 8 Sep 2021 21:35:11 -0400 Subject: [PATCH 17/31] tv: init at 0.5.1 --- pkgs/tools/text/tv/default.nix | 22 ++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 24 insertions(+) create mode 100644 pkgs/tools/text/tv/default.nix diff --git a/pkgs/tools/text/tv/default.nix b/pkgs/tools/text/tv/default.nix new file mode 100644 index 000000000000..1f0e4078f3f1 --- /dev/null +++ b/pkgs/tools/text/tv/default.nix @@ -0,0 +1,22 @@ +{ fetchFromGitHub, lib, rustPlatform }: + +rustPlatform.buildRustPackage rec { + pname = "tv"; + version = "0.5.1"; + + src = fetchFromGitHub { + owner = "uzimaru0000"; + repo = pname; + rev = "v${version}"; + sha256 = "07gcs64j468213jxcjjv9vywzvfair7gbaiqzqm9wwsdgjyw0wwc"; + }; + + cargoSha256 = "00fi7wimr0rihf6qx20r77w85w2i55kn823gp283lsszbw1z8as9"; + + meta = with lib; { + description = "Format json into table view"; + homepage = "https://github.com/uzimaru0000/tv"; + license = licenses.mit; + maintainers = with maintainers; [ figsoda ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 122658d0848d..721d52723833 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -9698,6 +9698,8 @@ with pkgs; turses = callPackage ../applications/networking/instant-messengers/turses { }; + tv = callPackage ../tools/text/tv { }; + tvm = callPackage ../development/compilers/tvm { }; oysttyer = callPackage ../applications/networking/instant-messengers/oysttyer { }; From 5c002b979bbe3c857ec87f2c84164d8266bc0781 Mon Sep 17 00:00:00 2001 From: figsoda Date: Wed, 8 Sep 2021 22:49:41 -0400 Subject: [PATCH 18/31] mask: init at 0.11.0 --- pkgs/development/tools/mask/default.nix | 25 +++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 27 insertions(+) create mode 100644 pkgs/development/tools/mask/default.nix diff --git a/pkgs/development/tools/mask/default.nix b/pkgs/development/tools/mask/default.nix new file mode 100644 index 000000000000..25ab4ceab5f5 --- /dev/null +++ b/pkgs/development/tools/mask/default.nix @@ -0,0 +1,25 @@ +{ fetchFromGitHub, lib, rustPlatform }: + +rustPlatform.buildRustPackage rec { + pname = "mask"; + version = "0.11.0"; + + src = fetchFromGitHub { + owner = "jakedeichert"; + repo = pname; + rev = "v${version}"; + sha256 = "0gsfs837nzh71df6p6klcsgxp471c8hq14xqd62q5bsv7jg9dygc"; + }; + + cargoSha256 = "1h4sasqdl3rli0v6lizdci0vvr2fvbyhllddxwv8vx8r7w9ry963"; + + # tests require mask to be installed + doCheck = false; + + meta = with lib; { + description = "A CLI task runner defined by a simple markdown file"; + homepage = "https://github.com/jakedeichert/mask"; + license = licenses.mit; + maintainers = with maintainers; [ figsoda ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 122658d0848d..37bf2e2223ae 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6596,6 +6596,8 @@ with pkgs; inherit (darwin.apple_sdk.frameworks) Security; }; + mask = callPackage ../development/tools/mask { }; + mathpix-snipping-tool = callPackage ../tools/misc/mathpix-snipping-tool { }; /* Python 3.8 is currently broken with matrix-synapse since `python38Packages.bleach` fails From 5dd0e70d95cd282d4e4937b509e7d411d2c6fd84 Mon Sep 17 00:00:00 2001 From: Lein Matsumaru Date: Thu, 9 Sep 2021 03:57:44 +0000 Subject: [PATCH 19/31] exploitdb: 2021-09-03 -> 2021-09-08 --- pkgs/tools/security/exploitdb/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/security/exploitdb/default.nix b/pkgs/tools/security/exploitdb/default.nix index b112627656b1..0ad2f6ad26fb 100644 --- a/pkgs/tools/security/exploitdb/default.nix +++ b/pkgs/tools/security/exploitdb/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "exploitdb"; - version = "2021-09-03"; + version = "2021-09-08"; src = fetchFromGitHub { owner = "offensive-security"; repo = pname; rev = version; - sha256 = "sha256-9roj5/DfbbN98jy/aO1Ua4pTMxgr4UbqXFicN2ONQgE="; + sha256 = "sha256-q6XALX0sGzgUm2PRwlDfcQHZFH+8ExageMahXJ+EYdM="; }; installPhase = '' From cfe9aad7f8d4a3b2a4c84934d36b1c4ca6e80e18 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Thu, 9 Sep 2021 04:31:24 +0000 Subject: [PATCH 20/31] python38Packages.google-cloud-storage: 1.42.0 -> 1.42.1 --- .../python-modules/google-cloud-storage/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/google-cloud-storage/default.nix b/pkgs/development/python-modules/google-cloud-storage/default.nix index dcf4028aeef7..be3abb363711 100644 --- a/pkgs/development/python-modules/google-cloud-storage/default.nix +++ b/pkgs/development/python-modules/google-cloud-storage/default.nix @@ -13,11 +13,11 @@ buildPythonPackage rec { pname = "google-cloud-storage"; - version = "1.42.0"; + version = "1.42.1"; src = fetchPypi { inherit pname version; - sha256 = "c1dd3d09198edcf24ec6803dd4545e867d82b998f06a68ead3b6857b1840bdae"; + sha256 = "b37ec5b0cd69aacb09270674c4c14873898cbc77624d17fef41ec0cb08004866"; }; propagatedBuildInputs = [ From 80a925e7981e0689de04e42a3902dfe722a38a94 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Thu, 9 Sep 2021 05:34:41 +0000 Subject: [PATCH 21/31] python38Packages.google-cloud-os-config: 1.4.0 -> 1.5.0 --- .../python-modules/google-cloud-os-config/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/google-cloud-os-config/default.nix b/pkgs/development/python-modules/google-cloud-os-config/default.nix index 33bbb00c306e..b521854c4b18 100644 --- a/pkgs/development/python-modules/google-cloud-os-config/default.nix +++ b/pkgs/development/python-modules/google-cloud-os-config/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "google-cloud-os-config"; - version = "1.4.0"; + version = "1.5.0"; src = fetchPypi { inherit pname version; - sha256 = "d12622901fb2ef5b736606fd00e77900105944c35d737ff794a59fd9a3d71325"; + sha256 = "69764c406c8e1a95b66a84c042b7023c13eaef3bf79e493e60edd9ce62e8f2e4"; }; propagatedBuildInputs = [ google-api-core libcst proto-plus ]; From 307690708af02db7c435367aa854cda623bb892b Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 8 Sep 2021 23:17:33 +0000 Subject: [PATCH 22/31] build(deps): bump cachix/install-nix-action from 13 to 14 Bumps [cachix/install-nix-action](https://github.com/cachix/install-nix-action) from 13 to 14. - [Release notes](https://github.com/cachix/install-nix-action/releases) - [Commits](https://github.com/cachix/install-nix-action/compare/v13...v14) --- updated-dependencies: - dependency-name: cachix/install-nix-action dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- .github/workflows/basic-eval.yml | 2 +- .github/workflows/editorconfig.yml | 2 +- .github/workflows/manual-nixos.yml | 2 +- .github/workflows/manual-nixpkgs.yml | 2 +- .github/workflows/nixos-manual.yml | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/basic-eval.yml b/.github/workflows/basic-eval.yml index 3d12eda314f1..b7bbbd40b451 100644 --- a/.github/workflows/basic-eval.yml +++ b/.github/workflows/basic-eval.yml @@ -15,6 +15,6 @@ jobs: # we don't limit this action to only NixOS repo since the checks are cheap and useful developer feedback steps: - uses: actions/checkout@v2 - - uses: cachix/install-nix-action@v13 + - uses: cachix/install-nix-action@v14 # explicit list of supportedSystems is needed until aarch64-darwin becomes part of the trunk jobset - run: nix-build pkgs/top-level/release.nix -A tarball.nixpkgs-basic-release-checks --arg supportedSystems '[ "aarch64-darwin" "aarch64-linux" "x86_64-linux" "x86_64-darwin" ]' diff --git a/.github/workflows/editorconfig.yml b/.github/workflows/editorconfig.yml index 4960e9fd3d23..1934a24c65af 100644 --- a/.github/workflows/editorconfig.yml +++ b/.github/workflows/editorconfig.yml @@ -28,7 +28,7 @@ jobs: # pull_request_target checks out the base branch by default ref: refs/pull/${{ github.event.pull_request.number }}/merge if: env.PR_DIFF - - uses: cachix/install-nix-action@v13 + - uses: cachix/install-nix-action@v14 if: env.PR_DIFF with: # nixpkgs commit is pinned so that it doesn't break diff --git a/.github/workflows/manual-nixos.yml b/.github/workflows/manual-nixos.yml index edd2755302a1..01bbe1b12bf2 100644 --- a/.github/workflows/manual-nixos.yml +++ b/.github/workflows/manual-nixos.yml @@ -18,7 +18,7 @@ jobs: with: # pull_request_target checks out the base branch by default ref: refs/pull/${{ github.event.pull_request.number }}/merge - - uses: cachix/install-nix-action@v13 + - uses: cachix/install-nix-action@v14 with: # explicitly enable sandbox extra_nix_config: sandbox = true diff --git a/.github/workflows/manual-nixpkgs.yml b/.github/workflows/manual-nixpkgs.yml index e27a281a9332..d0c3f5959157 100644 --- a/.github/workflows/manual-nixpkgs.yml +++ b/.github/workflows/manual-nixpkgs.yml @@ -18,7 +18,7 @@ jobs: with: # pull_request_target checks out the base branch by default ref: refs/pull/${{ github.event.pull_request.number }}/merge - - uses: cachix/install-nix-action@v13 + - uses: cachix/install-nix-action@v14 with: # explicitly enable sandbox extra_nix_config: sandbox = true diff --git a/.github/workflows/nixos-manual.yml b/.github/workflows/nixos-manual.yml index 2a1c1c29738e..70f61a1a3a88 100644 --- a/.github/workflows/nixos-manual.yml +++ b/.github/workflows/nixos-manual.yml @@ -19,7 +19,7 @@ jobs: with: # pull_request_target checks out the base branch by default ref: refs/pull/${{ github.event.pull_request.number }}/merge - - uses: cachix/install-nix-action@v12 + - uses: cachix/install-nix-action@v14 - name: Check DocBook files generated from Markdown are consistent run: | nixos/doc/manual/md-to-db.sh From 4b05f3192eb1ff2ea07f26b8eeb09278a17f5be8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Thu, 9 Sep 2021 10:32:11 +0200 Subject: [PATCH 23/31] python39Packages.google-cloud-asset: remove unused input, outdated postPatch --- .../python-modules/google-cloud-asset/default.nix | 6 ------ 1 file changed, 6 deletions(-) diff --git a/pkgs/development/python-modules/google-cloud-asset/default.nix b/pkgs/development/python-modules/google-cloud-asset/default.nix index d2132533c84c..737df80f39a3 100644 --- a/pkgs/development/python-modules/google-cloud-asset/default.nix +++ b/pkgs/development/python-modules/google-cloud-asset/default.nix @@ -9,7 +9,6 @@ , google-cloud-testutils , libcst , proto-plus -, pytest , pytest-asyncio , pytestCheckHook , mock @@ -24,11 +23,6 @@ buildPythonPackage rec { sha256 = "7d7218ffdd17d64184e1de69ef016f1f070bb0c888785510c4731948b078067d"; }; - postPatch = '' - substituteInPlace setup.py \ - --replace '"google-cloud-org-policy >= 0.1.2, < 0.2.0dev"' '"google-cloud-org-policy >= 0.1.2"' - ''; - propagatedBuildInputs = [ grpc-google-iam-v1 google-api-core From f94193eb397a2dc12df1dc9fa46ad61864abec08 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Thu, 9 Sep 2021 10:32:49 +0200 Subject: [PATCH 24/31] python39Packages.google-resumable-media: remove duplicated checkInput with propagatedBuildInputs --- .../python-modules/google-resumable-media/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/google-resumable-media/default.nix b/pkgs/development/python-modules/google-resumable-media/default.nix index 077fc45526c7..f29604c9da30 100644 --- a/pkgs/development/python-modules/google-resumable-media/default.nix +++ b/pkgs/development/python-modules/google-resumable-media/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ google-auth google-crc32c requests ]; - checkInputs = [ google-auth google-cloud-testutils mock pytestCheckHook pytest-asyncio ]; + checkInputs = [ google-cloud-testutils mock pytestCheckHook pytest-asyncio ]; preCheck = '' # prevent shadowing imports From 6511f4cb3e3222ba6a9b7cb0ae03d66b28465102 Mon Sep 17 00:00:00 2001 From: Pavel Borzenkov Date: Thu, 9 Sep 2021 11:03:41 +0200 Subject: [PATCH 25/31] tremc: fix crash with python 3.9 (#137107) Co-authored-by: Sandro --- pkgs/applications/networking/p2p/tremc/default.nix | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/networking/p2p/tremc/default.nix b/pkgs/applications/networking/p2p/tremc/default.nix index 3518c86790b7..ea6b92c08e7e 100644 --- a/pkgs/applications/networking/p2p/tremc/default.nix +++ b/pkgs/applications/networking/p2p/tremc/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, python3Packages +{ lib, stdenv, fetchFromGitHub, fetchpatch, python3Packages , x11Support ? !stdenv.isDarwin , xclip ? null , pbcopy ? null @@ -21,6 +21,15 @@ python3Packages.buildPythonApplication rec { sha256 = "1fqspp2ckafplahgba54xmx0sjidx1pdzyjaqjhz0ivh98dkx2n5"; }; + patches = [ + # Remove when version >0.9.2 is released + (fetchpatch { + url = "https://github.com/tremc/tremc/commit/bdffff2bd76186a4e3488b83f719fc7f7e3362b6.patch"; + sha256 = "1zip2skh22v0yyv2hmszxn5jshp9m1jpw0fsyfvmqfxzq7m3czy5"; + name = "replace-decodestring-with-decodebytes.patch"; + }) + ]; + buildInputs = with python3Packages; [ python wrapPython From 3e788570514ec7098f2e7fd00edc673fc89b3a21 Mon Sep 17 00:00:00 2001 From: Nikolay Korotkiy Date: Thu, 9 Sep 2021 11:24:50 +0300 Subject: [PATCH 26/31] =?UTF-8?q?josm:=2018118=20=E2=86=92=2018193?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/applications/misc/josm/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/misc/josm/default.nix b/pkgs/applications/misc/josm/default.nix index 71d70774b11a..93e08b660787 100644 --- a/pkgs/applications/misc/josm/default.nix +++ b/pkgs/applications/misc/josm/default.nix @@ -3,20 +3,20 @@ }: let pname = "josm"; - version = "18118"; + version = "18193"; srcs = { jar = fetchurl { url = "https://josm.openstreetmap.de/download/josm-snapshot-${version}.jar"; - sha256 = "01wcbf1mh1gqxnqkc3j6h64h9sz0yd5wiwpyx4ic4d5fwkh65qym"; + sha256 = "sha256-55lrPOlQQx1rmmIzBJ522zSia7RmVNTeHuE20vE1d6A="; }; macosx = fetchurl { url = "https://josm.openstreetmap.de/download/macosx/josm-macos-${version}-java16.zip"; - sha256 = "0i1vglqg49fd3w2bny01l92wj4hvr3y35rrmd1mdff0lc1zhi397"; + sha256 = "sha256-OoDX5tPTLrUgGfBa11dFVyeuXSai8QJNeQLWwot2ksk="; }; pkg = fetchsvn { url = "https://josm.openstreetmap.de/svn/trunk/native/linux/tested"; rev = version; - sha256 = "0gyj9kdzl920mjdmqjgiscqxyqhnvh22l6sjicf059ga0fsr3ki1"; + sha256 = "sha256-uXXS+urNCrGnalIAj49Bp1S+pXya/XhdfEWvPmcKKII="; }; }; in From 34e468dc4268cee86aa019ae9bc52768e60fb5f7 Mon Sep 17 00:00:00 2001 From: Sergei Trofimovich Date: Tue, 7 Sep 2021 10:10:38 +0100 Subject: [PATCH 27/31] lib/systems: add minimal s390x-linux cross-compile support Tested basic functionality as: $ nix-build --arg crossSystem '{ config = "s390x-unknown-linux-gnu"; }' -A re2c $ file ./result/bin/re2c $ ./result/bin/re2c: ELF 64-bit MSB executable, IBM S/390, version 1 (SYSV), dynamically linked, interpreter ...-gnu-2.33-50/lib/ld64.so.1, for GNU/Linux 2.6.32, not stripped $ qemu-s390x ./result/bin/re2c --version re2c 2.2 --- lib/systems/default.nix | 1 + lib/systems/doubles.nix | 5 +++-- lib/systems/examples.nix | 4 ++++ lib/systems/parse.nix | 1 + lib/tests/systems.nix | 2 +- 5 files changed, 10 insertions(+), 3 deletions(-) diff --git a/lib/systems/default.nix b/lib/systems/default.nix index 70ec98b03c16..ef609859abbf 100644 --- a/lib/systems/default.nix +++ b/lib/systems/default.nix @@ -107,6 +107,7 @@ rec { else if final.isMips then "mips" else if final.isPower then "powerpc" else if final.isRiscV then "riscv" + else if final.isS390 then "s390" else final.parsed.cpu.name; qemuArch = diff --git a/lib/systems/doubles.nix b/lib/systems/doubles.nix index e577059687b0..8af3377fb5bf 100644 --- a/lib/systems/doubles.nix +++ b/lib/systems/doubles.nix @@ -28,7 +28,7 @@ let "aarch64-linux" "armv5tel-linux" "armv6l-linux" "armv7a-linux" "armv7l-linux" "i686-linux" "m68k-linux" "mipsel-linux" "powerpc64-linux" "powerpc64le-linux" "riscv32-linux" - "riscv64-linux" "s390-linux" "x86_64-linux" + "riscv64-linux" "s390-linux" "s390x-linux" "x86_64-linux" # MMIXware "mmix-mmixware" @@ -41,7 +41,8 @@ let # none "aarch64-none" "arm-none" "armv6l-none" "avr-none" "i686-none" "msp430-none" "or1k-none" "m68k-none" "powerpc-none" - "riscv32-none" "riscv64-none" "s390-none" "vc4-none" "x86_64-none" + "riscv32-none" "riscv64-none" "s390-none" "s390x-none" "vc4-none" + "x86_64-none" # OpenBSD "i686-openbsd" "x86_64-openbsd" diff --git a/lib/systems/examples.nix b/lib/systems/examples.nix index 32b236d6960c..8dfa22ac787e 100644 --- a/lib/systems/examples.nix +++ b/lib/systems/examples.nix @@ -152,6 +152,10 @@ rec { config = "s390-unknown-linux-gnu"; }; + s390x = { + config = "s390x-unknown-linux-gnu"; + }; + arm-embedded = { config = "arm-none-eabi"; libc = "newlib"; diff --git a/lib/systems/parse.nix b/lib/systems/parse.nix index 77e941a913cf..8a88d8cfbe87 100644 --- a/lib/systems/parse.nix +++ b/lib/systems/parse.nix @@ -106,6 +106,7 @@ rec { riscv64 = { bits = 64; significantByte = littleEndian; family = "riscv"; }; s390 = { bits = 32; significantByte = bigEndian; family = "s390"; }; + s390x = { bits = 64; significantByte = bigEndian; family = "s390"; }; sparc = { bits = 32; significantByte = bigEndian; family = "sparc"; }; sparc64 = { bits = 64; significantByte = bigEndian; family = "sparc"; }; diff --git a/lib/tests/systems.nix b/lib/tests/systems.nix index 661b9bc8690c..2646e792682b 100644 --- a/lib/tests/systems.nix +++ b/lib/tests/systems.nix @@ -28,7 +28,7 @@ with lib.systems.doubles; lib.runTests { testredox = mseteq redox [ "x86_64-redox" ]; testgnu = mseteq gnu (linux /* ++ kfreebsd ++ ... */); testillumos = mseteq illumos [ "x86_64-solaris" ]; - testlinux = mseteq linux [ "aarch64-linux" "armv5tel-linux" "armv6l-linux" "armv7a-linux" "armv7l-linux" "i686-linux" "mipsel-linux" "riscv32-linux" "riscv64-linux" "x86_64-linux" "powerpc64-linux" "powerpc64le-linux" "m68k-linux" "s390-linux" ]; + testlinux = mseteq linux [ "aarch64-linux" "armv5tel-linux" "armv6l-linux" "armv7a-linux" "armv7l-linux" "i686-linux" "mipsel-linux" "riscv32-linux" "riscv64-linux" "x86_64-linux" "powerpc64-linux" "powerpc64le-linux" "m68k-linux" "s390-linux" "s390x-linux" ]; testnetbsd = mseteq netbsd [ "aarch64-netbsd" "armv6l-netbsd" "armv7a-netbsd" "armv7l-netbsd" "i686-netbsd" "m68k-netbsd" "mipsel-netbsd" "powerpc-netbsd" "riscv32-netbsd" "riscv64-netbsd" "x86_64-netbsd" ]; testopenbsd = mseteq openbsd [ "i686-openbsd" "x86_64-openbsd" ]; testwindows = mseteq windows [ "i686-cygwin" "x86_64-cygwin" "i686-windows" "x86_64-windows" ]; From 9e3fee0724f66c7505dc63fa4bb584e3014ac251 Mon Sep 17 00:00:00 2001 From: Bastien Riviere Date: Tue, 7 Sep 2021 11:20:04 +0200 Subject: [PATCH 28/31] qmk-dotty-dict: init at 1.3.0.post1 --- .../python-modules/qmk-dotty-dict/default.nix | 22 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 24 insertions(+) create mode 100644 pkgs/development/python-modules/qmk-dotty-dict/default.nix diff --git a/pkgs/development/python-modules/qmk-dotty-dict/default.nix b/pkgs/development/python-modules/qmk-dotty-dict/default.nix new file mode 100644 index 000000000000..c67d911a3eda --- /dev/null +++ b/pkgs/development/python-modules/qmk-dotty-dict/default.nix @@ -0,0 +1,22 @@ +{ buildPythonPackage, fetchPypi, lib, pytest, setuptools-scm }: + +buildPythonPackage rec { + pname = "qmk_dotty_dict"; + version = "1.3.0.post1"; + + src = fetchPypi { + inherit pname version; + sha256 = "sha256-O2EeOTZgv6poNcaOlHhLroD+B7hJCXi17KsDoNL8fqI="; + }; + + nativeBuildInputs = [ setuptools-scm ]; + + doCheck = false; + + meta = with lib; { + description = "Dictionary wrapper for quick access to deeply nested keys"; + homepage = "https://github.com/pawelzny/dotty_dict"; + license = licenses.mit; + maintainers = with maintainers; [ babariviere ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 66b5a83c70f0..ecb2bf3e0dab 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -7565,6 +7565,8 @@ in { queuelib = callPackage ../development/python-modules/queuelib { }; + qmk-dotty-dict = callPackage ../development/python-modules/qmk-dotty-dict {}; + r2pipe = callPackage ../development/python-modules/r2pipe { }; rabbitpy = callPackage ../development/python-modules/rabbitpy { }; From d4ff22bee83b9428a8994a8ec32fc4a8f39d9345 Mon Sep 17 00:00:00 2001 From: Bastien Riviere Date: Tue, 7 Sep 2021 11:20:44 +0200 Subject: [PATCH 29/31] qmk: 0.0.52 -> 1.0.0 --- pkgs/tools/misc/qmk/default.nix | 24 ++++++++++++++---------- 1 file changed, 14 insertions(+), 10 deletions(-) diff --git a/pkgs/tools/misc/qmk/default.nix b/pkgs/tools/misc/qmk/default.nix index 3fa088d8e2b4..ef25a7361c26 100644 --- a/pkgs/tools/misc/qmk/default.nix +++ b/pkgs/tools/misc/qmk/default.nix @@ -1,18 +1,18 @@ -{ lib -, python3 -, fetchpatch -}: +{ lib, python3, fetchpatch, writeText }: let inherit (python3.pkgs) buildPythonApplication fetchPypi; -in -buildPythonApplication rec { + setuppy = writeText "setup.py" '' + from setuptools import setup + setup() + ''; +in buildPythonApplication rec { pname = "qmk"; - version = "0.0.52"; + version = "1.0.0"; src = fetchPypi { inherit pname version; - sha256 = "sha256-mNF+bRhaL6JhNbROmjYDHkKKokRIALd5FZbRt9Kg5XQ="; + sha256 = "sha256-2mLuxzxFSMw3sLm+OTcgLcOjAdwvJmNhDsynUaYQ+co="; }; nativeBuildInputs = with python3.pkgs; [ @@ -27,7 +27,7 @@ buildPythonApplication rec { appdirs argcomplete colorama - dotty-dict + qmk-dotty-dict hid hjson jsonschema @@ -36,6 +36,10 @@ buildPythonApplication rec { pyusb ]; + postConfigure = '' + cp ${setuppy} setup.py + ''; + # no tests implemented doCheck = false; @@ -57,6 +61,6 @@ buildPythonApplication rec { - ... and many more! ''; license = licenses.mit; - maintainers = with maintainers; [ bhipple ]; + maintainers = with maintainers; [ bhipple babariviere ]; }; } From d61ba9863c07f268fe53b78159ab76c3183c6ca1 Mon Sep 17 00:00:00 2001 From: Pamplemousse Date: Fri, 27 Aug 2021 08:45:33 -0700 Subject: [PATCH 30/31] nodePackages.prisma: init at 2.30.2 --- pkgs/development/node-packages/default.nix | 12 + .../node-packages/node-packages.json | 1 + .../node-packages/node-packages.nix | 155 ++++-- .../tools/database/prisma-engines/default.nix | 61 +++ .../database/prisma-engines/no_tests.patch | 459 ++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 6 files changed, 652 insertions(+), 38 deletions(-) create mode 100644 pkgs/development/tools/database/prisma-engines/default.nix create mode 100644 pkgs/development/tools/database/prisma-engines/no_tests.patch diff --git a/pkgs/development/node-packages/default.nix b/pkgs/development/node-packages/default.nix index 568c75d07ce9..8ad9f2e54a2e 100644 --- a/pkgs/development/node-packages/default.nix +++ b/pkgs/development/node-packages/default.nix @@ -267,6 +267,18 @@ let meta.mainProgram = "postcss"; }; + prisma = super.prisma.override { + nativeBuildInputs = [ pkgs.makeWrapper ]; + postInstall = with pkgs; '' + wrapProgram "$out/bin/prisma" \ + --prefix PRISMA_MIGRATION_ENGINE_BINARY : "${prisma-engines}/bin/migration-engine" \ + --prefix PRISMA_QUERY_ENGINE_BINARY : "${prisma-engines}/bin/query-engine" \ + --prefix PRISMA_QUERY_ENGINE_LIBRARY : "${lib.getLib prisma-engines}/libquery_engine.so.node" + --prefix PRISMA_INTROSPECTION_ENGINE_BINARY : "${prisma-engines}/bin/introspection-engine" \ + --prefix PRISMA_FMT_BINARY : "${prisma-engines}/bin/prisma-fmt" + ''; + }; + pulp = super.pulp.override { # tries to install purescript npmFlags = "--ignore-scripts"; diff --git a/pkgs/development/node-packages/node-packages.json b/pkgs/development/node-packages/node-packages.json index b8ac7e4e7c6d..e4e361757dfe 100644 --- a/pkgs/development/node-packages/node-packages.json +++ b/pkgs/development/node-packages/node-packages.json @@ -205,6 +205,7 @@ , "postcss-cli" , "prettier" , "prettier-plugin-toml" +, "prisma" , "pscid" , "pulp" , "purescript-language-server" diff --git a/pkgs/development/node-packages/node-packages.nix b/pkgs/development/node-packages/node-packages.nix index c34bd5206760..e9b99b055506 100644 --- a/pkgs/development/node-packages/node-packages.nix +++ b/pkgs/development/node-packages/node-packages.nix @@ -5206,6 +5206,15 @@ let sha512 = "I/gRlM2meKPKXFN/1fxLoigPXvAUsivxRCih7vgeO7o4qrNNsl6Ah85l3UBbFi0t7ttjMde2+bS1A32a1Hu0BA=="; }; }; + "@prisma/engines-2.31.0-32.2452cc6313d52b8b9a96999ac0e974d0aedf88db" = { + name = "_at_prisma_slash_engines"; + packageName = "@prisma/engines"; + version = "2.31.0-32.2452cc6313d52b8b9a96999ac0e974d0aedf88db"; + src = fetchurl { + url = "https://registry.npmjs.org/@prisma/engines/-/engines-2.31.0-32.2452cc6313d52b8b9a96999ac0e974d0aedf88db.tgz"; + sha512 = "Q9CwN6e5E5Abso7J3A1fHbcF4NXGRINyMnf7WQ07fXaebxTTARY5BNUzy2Mo5uH82eRVO5v7ImNuR044KTjLJg=="; + }; + }; "@protobufjs/aspromise-1.1.2" = { name = "_at_protobufjs_slash_aspromise"; packageName = "@protobufjs/aspromise"; @@ -5566,13 +5575,13 @@ let sha512 = "cl5uPaGg72z0sCUpF0zsOhwYYUV72Gxc1FwFfxltO8hSvMeFDvwD7JrNE4kHcIcKRjwPGbSH0fdVPUpErZ8Mog=="; }; }; - "@serverless/utils-5.8.1" = { + "@serverless/utils-5.9.0" = { name = "_at_serverless_slash_utils"; packageName = "@serverless/utils"; - version = "5.8.1"; + version = "5.9.0"; src = fetchurl { - url = "https://registry.npmjs.org/@serverless/utils/-/utils-5.8.1.tgz"; - sha512 = "tUOvlGq9xpLrq6dguH4bjAJqycoOUx7aVJIjbX4T7MZxuovxg/x2ZXc+Hrfqq0t+jRKVm78ZjHCjCASJDxbYPA=="; + url = "https://registry.npmjs.org/@serverless/utils/-/utils-5.9.0.tgz"; + sha512 = "cAPOndJ78N5o3Q4WVXfy/z1bE5QPCUwT2DPj06bd3DGHV3api+NZLeOECG4AdcyPREw/9w1oNxw9555q903KwA=="; }; }; "@serverless/utils-china-1.1.4" = { @@ -25478,15 +25487,6 @@ let sha512 = "QJYT/i0QYoiZBQ71ivxdyTqkwKkQ0oxACXHYxH2zYHJEgzi2LsbjgvtzTbLi1SZcF190Db2YP7I7eTsU2egOlw=="; }; }; - "fast-safe-stringify-2.1.0" = { - name = "fast-safe-stringify"; - packageName = "fast-safe-stringify"; - version = "2.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/fast-safe-stringify/-/fast-safe-stringify-2.1.0.tgz"; - sha512 = "xHSIyDJTOVQjtMBGcUokl3tpaOKgTyVTjlHj255V4Q4J1oho3cnrWrf5sCx8z1jq7gzNMv8y0PH53pYYuZUFPQ=="; - }; - }; "fast-safe-stringify-2.1.1" = { name = "fast-safe-stringify"; packageName = "fast-safe-stringify"; @@ -34003,13 +34003,13 @@ let sha512 = "KWYVV1c4i+jbMpaBC+U++4Va0cp8OisU185o73T1vo99hqi7w8tSJfUXYswwqqrjzwxa6KpRK54WhPvwf5w6PQ=="; }; }; - "jest-worker-27.1.0" = { + "jest-worker-27.1.1" = { name = "jest-worker"; packageName = "jest-worker"; - version = "27.1.0"; + version = "27.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/jest-worker/-/jest-worker-27.1.0.tgz"; - sha512 = "mO4PHb2QWLn9yRXGp7rkvXLAYuxwhq1ZYUo0LoDhg8wqvv4QizP1ZWEJOeolgbEgAWZLIEU0wsku8J+lGWfBhg=="; + url = "https://registry.npmjs.org/jest-worker/-/jest-worker-27.1.1.tgz"; + sha512 = "XJKCL7tu+362IUYTWvw8+3S75U7qMiYiRU6u5yqscB48bTvzwN6i8L/7wVTXiFLwkRsxARNM7TISnTvcgv9hxA=="; }; }; "jimp-compact-0.16.1" = { @@ -56400,6 +56400,33 @@ let sha1 = "06cd70795ee58d1462d100a45c660df3179d3b39"; }; }; + "ssb-bendy-butt-0.12.3" = { + name = "ssb-bendy-butt"; + packageName = "ssb-bendy-butt"; + version = "0.12.3"; + src = fetchurl { + url = "https://registry.npmjs.org/ssb-bendy-butt/-/ssb-bendy-butt-0.12.3.tgz"; + sha512 = "fo3Sspdr+cjQzq8F+EKRJiibm06Mt/pzmtAjf0HEOl/pZPTHGFolfsGtZlU4U+RuKOqqZMhxzTXNAwoJ+trdDw=="; + }; + }; + "ssb-bfe-3.1.1" = { + name = "ssb-bfe"; + packageName = "ssb-bfe"; + version = "3.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/ssb-bfe/-/ssb-bfe-3.1.1.tgz"; + sha512 = "0Z1xxYG618sccFJGNIN9om5sokRFJRv/QlIhlnFwiafNLYFdyLP/KGZ8YDZSUP/pyMWZuL8+o++v3Ro6EkIJNA=="; + }; + }; + "ssb-bfe-spec-0.3.0" = { + name = "ssb-bfe-spec"; + packageName = "ssb-bfe-spec"; + version = "0.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/ssb-bfe-spec/-/ssb-bfe-spec-0.3.0.tgz"; + sha512 = "gmsjEKrcKfR7d/926Oq7ijrd4l0CkjtFampk7rqsE+Gzr1ZpzGmHl1YxXn6GdBYy55M1i0V+w+fYAqsgxl5o4Q=="; + }; + }; "ssb-blobs-1.2.2" = { name = "ssb-blobs"; packageName = "ssb-blobs"; @@ -56454,13 +56481,13 @@ let sha512 = "pJAFizB6OcuJLX4RJJuU9HWyPwM2CqLi/vs08lhVIR3TGxacxpavvK5LzbxT+Y3iWkBchOTKS5hHCigA5aaung=="; }; }; - "ssb-db2-2.3.1" = { + "ssb-db2-2.4.0" = { name = "ssb-db2"; packageName = "ssb-db2"; - version = "2.3.1"; + version = "2.4.0"; src = fetchurl { - url = "https://registry.npmjs.org/ssb-db2/-/ssb-db2-2.3.1.tgz"; - sha512 = "SE/GGoLn29JJeeo/SLGzjtPj5xvafn6so8fBNqM0Hfnk03DwZ7iFG0PuB8L5CMold3sLLDXFjuzdacKf85848Q=="; + url = "https://registry.npmjs.org/ssb-db2/-/ssb-db2-2.4.0.tgz"; + sha512 = "UMd6XqBGTHBNPduyEc0ynO+lkCn/8/NTedzDz9XRYQsqk4ed2Js0cWhqeREv0Bz+upfCMmPQBBHASPBw47XTOA=="; }; }; "ssb-ebt-5.6.7" = { @@ -56697,6 +56724,15 @@ let sha512 = "RcXRBLqQMwew+aKkaTZ2K0qq2kwe7he8ZUz8cX4bZ6Sr4+yszhRpxqnN6XeK1hA6TTvUltR0RNgOO/fqT3djRg=="; }; }; + "ssb-typescript-2.5.0" = { + name = "ssb-typescript"; + packageName = "ssb-typescript"; + version = "2.5.0"; + src = fetchurl { + url = "https://registry.npmjs.org/ssb-typescript/-/ssb-typescript-2.5.0.tgz"; + sha512 = "j0Q9nAbp5lKwmvIWEaaf+PT5ITHCCb83JeD3ywm/kHDWwcLGLYG8VuwMM5L3X8H1laIORXlQgZlHhK3nfn8LbA=="; + }; + }; "ssb-unix-socket-1.0.0" = { name = "ssb-unix-socket"; packageName = "ssb-unix-socket"; @@ -56706,6 +56742,15 @@ let sha512 = "Z4jBj917W+dKAiDglwxCpWm8vINOMtkpHQIgk50NQTb5jHqHI5Rcyiy7EO0uRcWwRWqXi1ZwOTEFVyLyyuittA=="; }; }; + "ssb-uri2-1.5.2" = { + name = "ssb-uri2"; + packageName = "ssb-uri2"; + version = "1.5.2"; + src = fetchurl { + url = "https://registry.npmjs.org/ssb-uri2/-/ssb-uri2-1.5.2.tgz"; + sha512 = "jlsN7w6/toFjcRZLDkCC3nq6+rKeS7NhUxZ+xGS1ASltenkudcZvdgczRb+L11ObFND4VCohkO21lVSAJV8hCQ=="; + }; + }; "ssb-validate-4.1.4" = { name = "ssb-validate"; packageName = "ssb-validate"; @@ -69128,7 +69173,7 @@ in sources."is-stream-2.0.1" sources."is-unicode-supported-0.1.0" sources."isexe-2.0.0" - (sources."jest-worker-27.1.0" // { + (sources."jest-worker-27.1.1" // { dependencies = [ sources."supports-color-8.1.1" ]; @@ -72410,7 +72455,7 @@ in sources."es-to-primitive-1.2.1" sources."events-3.3.0" sources."evp_bytestokey-1.0.3" - sources."fast-safe-stringify-2.1.0" + sources."fast-safe-stringify-2.1.1" sources."foreach-2.0.5" sources."fs.realpath-1.0.0" sources."function-bind-1.1.1" @@ -77339,7 +77384,7 @@ in sources."core-util-is-1.0.3" sources."enabled-2.0.0" sources."eventemitter3-4.0.7" - sources."fast-safe-stringify-2.1.0" + sources."fast-safe-stringify-2.1.1" sources."fecha-4.2.1" sources."fn.name-1.1.0" sources."follow-redirects-1.14.3" @@ -84467,7 +84512,7 @@ in sources."fast-deep-equal-3.1.3" sources."fast-glob-3.2.7" sources."fast-json-stable-stringify-2.1.0" - sources."fast-safe-stringify-2.1.0" + sources."fast-safe-stringify-2.1.1" sources."fastq-1.12.0" sources."faye-websocket-0.10.0" sources."fecha-4.2.1" @@ -87330,7 +87375,7 @@ in sources."fast-deep-equal-3.1.3" sources."fast-json-stable-stringify-2.1.0" sources."fast-levenshtein-2.0.6" - sources."fast-safe-stringify-2.1.0" + sources."fast-safe-stringify-2.1.1" sources."fast-text-encoding-1.0.3" (sources."fast-url-parser-1.1.3" // { dependencies = [ @@ -90628,7 +90673,7 @@ in sources."fast-deep-equal-3.1.3" sources."fast-glob-3.2.7" sources."fast-json-stable-stringify-2.1.0" - sources."fast-safe-stringify-2.1.0" + sources."fast-safe-stringify-2.1.1" sources."fastq-1.12.0" sources."figlet-1.5.0" sources."figures-3.2.0" @@ -98950,7 +98995,7 @@ in sources."extsprintf-1.3.0" sources."fast-deep-equal-3.1.3" sources."fast-json-stable-stringify-2.1.0" - sources."fast-safe-stringify-2.1.0" + sources."fast-safe-stringify-2.1.1" sources."fb-watchman-2.0.1" sources."figgy-pudding-3.5.2" sources."file-uri-to-path-1.0.0" @@ -100550,7 +100595,7 @@ in sources."diagnostics-1.1.1" sources."enabled-1.0.2" sources."env-variable-0.0.6" - sources."fast-safe-stringify-2.1.0" + sources."fast-safe-stringify-2.1.1" sources."fecha-2.3.3" sources."inherits-2.0.4" sources."is-arrayish-0.3.2" @@ -101469,7 +101514,7 @@ in sources."fast-equals-2.0.3" sources."fast-glob-2.2.7" sources."fast-levenshtein-2.0.6" - sources."fast-safe-stringify-2.1.0" + sources."fast-safe-stringify-2.1.1" sources."fastq-1.12.0" sources."fd-slicer-1.1.0" sources."fecha-4.2.1" @@ -107653,6 +107698,27 @@ in bypassCache = true; reconstructLock = true; }; + prisma = nodeEnv.buildNodePackage { + name = "prisma"; + packageName = "prisma"; + version = "3.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/prisma/-/prisma-3.0.1.tgz"; + sha512 = "ENmYAopd56nkds5/IOSTGixbkbUN2QdEzB4cp/mtaGB/G0OArbP6cnbA/9u02Pe29RdErbNOoIdCGASjpItJwQ=="; + }; + dependencies = [ + sources."@prisma/engines-2.31.0-32.2452cc6313d52b8b9a96999ac0e974d0aedf88db" + ]; + buildInputs = globalBuildInputs; + meta = { + description = "Prisma is an open-source database toolkit. It includes a JavaScript/TypeScript ORM for Node.js, migrations and a modern GUI to view and edit the data in your database. You can use Prisma in new projects or add it to an existing one."; + homepage = "https://www.prisma.io"; + license = "Apache-2.0"; + }; + production = true; + bypassCache = true; + reconstructLock = true; + }; pscid = nodeEnv.buildNodePackage { name = "pscid"; packageName = "pscid"; @@ -107791,7 +107857,7 @@ in sources."es6-promise-3.3.1" sources."events-2.1.0" sources."evp_bytestokey-1.0.3" - sources."fast-safe-stringify-2.1.0" + sources."fast-safe-stringify-2.1.1" sources."fs.realpath-1.0.0" sources."function-bind-1.1.1" sources."gaze-1.1.3" @@ -111833,7 +111899,7 @@ in ]; }) sources."@serverless/template-1.1.4" - (sources."@serverless/utils-5.8.1" // { + (sources."@serverless/utils-5.9.0" // { dependencies = [ sources."cli-progress-footer-2.0.0" sources."get-stream-6.0.1" @@ -113282,10 +113348,10 @@ in snyk = nodeEnv.buildNodePackage { name = "snyk"; packageName = "snyk"; - version = "1.698.0"; + version = "1.700.0"; src = fetchurl { - url = "https://registry.npmjs.org/snyk/-/snyk-1.698.0.tgz"; - sha512 = "ivOZ1VCRwGvtOG6c3etxLPdwRjjnXvg9aSXRP7oOSZDQvEWouKDh9HpvkTHm8mZgFACw6hU1cmBseHyMfpYnkw=="; + url = "https://registry.npmjs.org/snyk/-/snyk-1.700.0.tgz"; + sha512 = "nhhgv2Dh8Wh/qrt5gjS+RrQjEUfwEOU4W6KZnnQrmVAfFwZ4Uis+pXcoTTJtsg/xJ0/eXV/v2UxA6PKPkYMeOw=="; }; buildInputs = globalBuildInputs; meta = { @@ -113589,6 +113655,7 @@ in sources."base64-js-1.5.1" sources."base64-url-2.3.3" sources."bash-color-0.0.4" + sources."bencode-2.0.2" sources."binary-extensions-1.13.1" sources."binary-search-1.3.6" sources."binary-search-bounds-2.0.5" @@ -114098,6 +114165,7 @@ in sources."push-stream-11.0.1" ]; }) + sources."querystringify-2.2.0" sources."quicktask-1.0.1" sources."railroad-diagrams-1.0.0" sources."randexp-0.4.6" @@ -114193,6 +114261,7 @@ in sources."remove-trailing-separator-1.1.0" sources."repeat-element-1.1.4" sources."repeat-string-1.6.1" + sources."requires-port-1.0.0" sources."resolve-1.20.0" sources."resolve-url-0.2.1" sources."restore-cursor-1.0.1" @@ -114266,12 +114335,19 @@ in sources."source-map-url-0.4.1" sources."split-buffer-1.0.0" sources."split-string-3.1.0" + (sources."ssb-bendy-butt-0.12.3" // { + dependencies = [ + sources."ssb-keys-8.2.0" + ]; + }) + sources."ssb-bfe-3.1.1" + sources."ssb-bfe-spec-0.3.0" sources."ssb-blobs-1.2.2" sources."ssb-caps-1.1.0" sources."ssb-client-4.9.0" sources."ssb-config-3.4.5" sources."ssb-db-19.2.0" - (sources."ssb-db2-2.3.1" // { + (sources."ssb-db2-2.4.0" // { dependencies = [ sources."abstract-leveldown-6.2.3" (sources."flumecodec-0.0.1" // { @@ -114325,7 +114401,9 @@ in sources."ssb-query-2.4.5" sources."ssb-ref-2.16.0" sources."ssb-replicate-1.3.3" + sources."ssb-typescript-2.5.0" sources."ssb-unix-socket-1.0.0" + sources."ssb-uri2-1.5.2" (sources."ssb-validate-4.1.4" // { dependencies = [ sources."ssb-keys-8.2.0" @@ -114418,6 +114496,7 @@ in }) sources."untildify-2.1.0" sources."urix-0.1.0" + sources."url-parse-1.5.3" sources."use-3.1.1" sources."user-home-2.0.0" sources."utf8-byte-length-1.0.4" @@ -120262,7 +120341,7 @@ in sources."isarray-0.0.1" sources."isexe-2.0.0" sources."isobject-3.0.1" - sources."jest-worker-27.1.0" + sources."jest-worker-27.1.1" sources."js-yaml-4.0.0" sources."json-parse-better-errors-1.0.2" sources."json-schema-traverse-0.4.1" @@ -122570,7 +122649,7 @@ in sources."glob-to-regexp-0.4.1" sources."graceful-fs-4.2.8" sources."has-flag-4.0.0" - sources."jest-worker-27.1.0" + sources."jest-worker-27.1.1" sources."json-parse-better-errors-1.0.2" sources."json-schema-traverse-0.4.1" sources."loader-runner-4.2.0" diff --git a/pkgs/development/tools/database/prisma-engines/default.nix b/pkgs/development/tools/database/prisma-engines/default.nix new file mode 100644 index 000000000000..a7021411b4c3 --- /dev/null +++ b/pkgs/development/tools/database/prisma-engines/default.nix @@ -0,0 +1,61 @@ +{ fetchFromGitHub +, lib +, openssl +, pkg-config +, protobuf +, rustPlatform +}: + +rustPlatform.buildRustPackage rec { + pname = "prisma-engines"; + version = "2.30.2"; + + src = fetchFromGitHub { + owner = "prisma"; + repo = "prisma-engines"; + rev = version; + sha256 = "sha256-i4r+TRC8454awbqe35Kg3M9xN2NnP8Sbd/dITtm9MDg="; + }; + + cargoPatches = [ + # Remove test from compilation targets: + # they add time to an already long compilation and some fail out-of-the-box. + ./no_tests.patch + ]; + + # Use system openssl. + OPENSSL_NO_VENDOR = 1; + + cargoSha256 = "sha256-BldEj8+tzY0dIA/fdrPLsFn3ZdfoGq6GsomCUhQBoLM="; + + outputs = [ "out" "lib" "bin" ]; + + nativeBuildInputs = [ pkg-config ]; + buildInputs = [ openssl protobuf ]; + + preBuild = '' + export OPENSSL_DIR=${lib.getDev openssl} + export OPENSSL_LIB_DIR=${openssl.out}/lib + + export PROTOC=${protobuf}/bin/protoc + export PROTOC_INCLUDE="${protobuf}/include"; + + export SQLITE_MAX_VARIABLE_NUMBER=250000 + export SQLITE_MAX_EXPR_DEPTH=10000 + ''; + + postInstall = '' + cp target/release/libquery_engine.so $out/lib/libquery_engine.so.node + ''; + + # Tests are long to compile + doCheck = false; + + meta = with lib; { + description = "A collection of engines that power the core stack for Prisma"; + homepage = "https://www.prisma.io/"; + license = licenses.asl20; + platforms = [ "x86_64-linux" ]; + maintainers = with maintainers; [ pamplemousse ]; + }; +} diff --git a/pkgs/development/tools/database/prisma-engines/no_tests.patch b/pkgs/development/tools/database/prisma-engines/no_tests.patch new file mode 100644 index 000000000000..fb88d92e485d --- /dev/null +++ b/pkgs/development/tools/database/prisma-engines/no_tests.patch @@ -0,0 +1,459 @@ +diff --git a/Cargo.lock b/Cargo.lock +index 1070c7a30..310f7302f 100644 +--- a/Cargo.lock ++++ b/Cargo.lock +@@ -479,18 +479,6 @@ version = "1.2.1" + source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "cf1de2fe8c75bc145a2f577add951f8134889b4795d47466a54a5c846d691693" + +-[[package]] +-name = "bitvec" +-version = "0.19.5" +-source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "8942c8d352ae1838c9dda0b0ca2ab657696ef2232a20147cf1b30ae1a9cb4321" +-dependencies = [ +- "funty", +- "radium", +- "tap", +- "wyz", +-] +- + [[package]] + name = "block-buffer" + version = "0.7.3" +@@ -706,19 +694,6 @@ dependencies = [ + "wasm-bindgen", + ] + +-[[package]] +-name = "console" +-version = "0.14.1" +-source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "3993e6445baa160675931ec041a5e03ca84b9c6e32a056150d3aa2bdda0a1f45" +-dependencies = [ +- "encode_unicode", +- "lazy_static", +- "libc", +- "terminal_size", +- "winapi", +-] +- + [[package]] + name = "const_fn" + version = "0.4.5" +@@ -1011,24 +986,12 @@ dependencies = [ + "uuid", + ] + +-[[package]] +-name = "dtoa" +-version = "0.4.8" +-source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "56899898ce76aaf4a0f24d914c97ea6ed976d42fec6ad33fcbb0a1103e07b2b0" +- + [[package]] + name = "either" + version = "1.6.1" + source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "e78d4f1cc4ae33bbfc157ed5d5a5ef3bc29227303d595861deb238fcec4e9457" + +-[[package]] +-name = "encode_unicode" +-version = "0.3.6" +-source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "a357d28ed41a50f9c765dbfe56cbc04a64e53e5fc58ba79fbc34c10ef3df831f" +- + [[package]] + name = "encoding" + version = "0.2.33" +@@ -1114,18 +1077,6 @@ dependencies = [ + "syn", + ] + +-[[package]] +-name = "enum_dispatch" +-version = "0.3.5" +-source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "8946e241a7774d5327d92749c50806f275f57d031d2229ecbfd65469a8ad338e" +-dependencies = [ +- "once_cell", +- "proc-macro2", +- "quote", +- "syn", +-] +- + [[package]] + name = "enumflags2" + version = "0.7.1" +@@ -1261,12 +1212,6 @@ dependencies = [ + "percent-encoding", + ] + +-[[package]] +-name = "funty" +-version = "1.1.0" +-source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "fed34cd105917e91daa4da6b3728c47b068749d6a62c59811f06ed2ac71d9da7" +- + [[package]] + name = "futures" + version = "0.3.13" +@@ -1573,15 +1518,6 @@ dependencies = [ + "winapi", + ] + +-[[package]] +-name = "html-escape" +-version = "0.2.7" +-source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "d64794b2265e97e459334ed47a7b7369ce8e8ee3d3450c0c363a0b563fc92233" +-dependencies = [ +- "utf8-width", +-] +- + [[package]] + name = "http" + version = "0.2.3" +@@ -1744,21 +1680,6 @@ version = "0.2.3" + source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "64e9829a50b42bb782c1df523f78d332fe371b10c661e78b7a3c34b0198e9fac" + +-[[package]] +-name = "insta" +-version = "1.7.1" +-source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "c4a1b21a2971cea49ca4613c0e9fe8225ecaf5de64090fddc6002284726e9244" +-dependencies = [ +- "console", +- "lazy_static", +- "serde", +- "serde_json", +- "serde_yaml", +- "similar", +- "uuid", +-] +- + [[package]] + name = "instant" + version = "0.1.9" +@@ -1804,34 +1725,6 @@ dependencies = [ + "user-facing-errors", + ] + +-[[package]] +-name = "introspection-engine-tests" +-version = "0.1.0" +-dependencies = [ +- "barrel", +- "datamodel", +- "datamodel-connector", +- "enumflags2", +- "expect-test", +- "indoc", +- "introspection-connector", +- "introspection-core", +- "migration-connector", +- "pretty_assertions", +- "quaint", +- "serde_json", +- "sql-datamodel-connector", +- "sql-introspection-connector", +- "sql-migration-connector", +- "sql-schema-describer", +- "test-macros", +- "test-setup", +- "tokio", +- "tracing", +- "tracing-futures", +- "user-facing-errors", +-] +- + [[package]] + name = "ipconfig" + version = "0.2.2" +@@ -2178,39 +2071,6 @@ dependencies = [ + "user-facing-errors", + ] + +-[[package]] +-name = "migration-engine-tests" +-version = "0.1.0" +-dependencies = [ +- "bigdecimal", +- "chrono", +- "connection-string", +- "datamodel", +- "datamodel-connector", +- "enumflags2", +- "expect-test", +- "indoc", +- "migration-connector", +- "migration-core", +- "once_cell", +- "pretty_assertions", +- "prisma-value", +- "quaint", +- "serde", +- "serde_json", +- "sql-datamodel-connector", +- "sql-migration-connector", +- "sql-schema-describer", +- "tempfile", +- "test-macros", +- "test-setup", +- "tokio", +- "tracing", +- "tracing-futures", +- "url", +- "user-facing-errors", +-] +- + [[package]] + name = "mime" + version = "0.3.16" +@@ -2517,19 +2377,6 @@ dependencies = [ + "socket2 0.4.0", + ] + +-[[package]] +-name = "nom" +-version = "6.1.2" +-source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "e7413f999671bd4745a7b624bd370a569fb6bc574b23c83a3c5ed2e453f3d5e2" +-dependencies = [ +- "bitvec", +- "funty", +- "lexical-core", +- "memchr", +- "version_check", +-] +- + [[package]] + name = "ntapi" + version = "0.3.6" +@@ -2773,18 +2620,6 @@ dependencies = [ + "winapi", + ] + +-[[package]] +-name = "parse-hyperlinks" +-version = "0.19.6" +-source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "9dfd153802fdbad158c1dfa2c5df806a86955ae6e07758af642a4faaa03310ff" +-dependencies = [ +- "html-escape", +- "nom", +- "percent-encoding", +- "thiserror", +-] +- + [[package]] + name = "pbkdf2" + version = "0.7.5" +@@ -3388,72 +3223,6 @@ dependencies = [ + "user-facing-errors", + ] + +-[[package]] +-name = "query-engine-tests" +-version = "0.1.0" +-dependencies = [ +- "anyhow", +- "base64 0.13.0", +- "chrono", +- "colored", +- "datamodel-connector", +- "indoc", +- "insta", +- "prisma-value", +- "query-test-macros", +- "query-tests-setup", +- "serde_json", +- "tokio", +- "tracing", +- "tracing-futures", +- "uuid", +-] +- +-[[package]] +-name = "query-test-macros" +-version = "0.1.0" +-dependencies = [ +- "darling", +- "indoc", +- "itertools 0.10.0", +- "proc-macro2", +- "query-tests-setup", +- "quote", +- "syn", +-] +- +-[[package]] +-name = "query-tests-setup" +-version = "0.1.0" +-dependencies = [ +- "async-trait", +- "colored", +- "datamodel", +- "datamodel-connector", +- "enum_dispatch", +- "enumflags2", +- "indoc", +- "itertools 0.10.0", +- "lazy_static", +- "migration-core", +- "mongodb-datamodel-connector", +- "nom", +- "parse-hyperlinks", +- "prisma-models", +- "query-core", +- "regex", +- "request-handlers", +- "serde", +- "serde_json", +- "sql-datamodel-connector", +- "thiserror", +- "tokio", +- "tracing", +- "tracing-error", +- "tracing-futures", +- "tracing-subscriber", +-] +- + [[package]] + name = "quick-error" + version = "1.2.3" +@@ -3469,12 +3238,6 @@ dependencies = [ + "proc-macro2", + ] + +-[[package]] +-name = "radium" +-version = "0.5.3" +-source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "941ba9d78d8e2f7ce474c015eea4d9c6d25b6a3327f9832ee29a4de27f91bbb8" +- + [[package]] + name = "rand" + version = "0.7.3" +@@ -3922,18 +3685,6 @@ dependencies = [ + "syn", + ] + +-[[package]] +-name = "serde_yaml" +-version = "0.8.17" +-source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "15654ed4ab61726bf918a39cb8d98a2e2995b002387807fa6ba58fdf7f59bb23" +-dependencies = [ +- "dtoa", +- "linked-hash-map", +- "serde", +- "yaml-rust", +-] +- + [[package]] + name = "serial_test" + version = "0.5.1" +@@ -4028,12 +3779,6 @@ dependencies = [ + "libc", + ] + +-[[package]] +-name = "similar" +-version = "1.3.0" +-source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "1ad1d488a557b235fc46dae55512ffbfc429d2482b08b4d9435ab07384ca8aec" +- + [[package]] + name = "simple-mutex" + version = "1.1.5" +@@ -4372,12 +4117,6 @@ version = "0.2.2" + source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "f764005d11ee5f36500a149ace24e00e3da98b0158b3e2d53a7495660d3f4d60" + +-[[package]] +-name = "tap" +-version = "1.0.1" +-source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "55937e1799185b12863d447f42597ed69d9928686b8d88a1df17376a097d8369" +- + [[package]] + name = "tempfile" + version = "3.2.0" +@@ -4392,16 +4131,6 @@ dependencies = [ + "winapi", + ] + +-[[package]] +-name = "terminal_size" +-version = "0.1.16" +-source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "86ca8ced750734db02076f44132d802af0b33b09942331f4459dde8636fd2406" +-dependencies = [ +- "libc", +- "winapi", +-] +- + [[package]] + name = "test-cli" + version = "0.1.0" +@@ -5094,12 +4823,6 @@ dependencies = [ + "user-facing-error-macros", + ] + +-[[package]] +-name = "utf8-width" +-version = "0.1.4" +-source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "9071ac216321a4470a69fb2b28cfc68dcd1a39acd877c8be8e014df6772d8efa" +- + [[package]] + name = "uuid" + version = "0.8.2" +@@ -5361,18 +5084,3 @@ checksum = "7daf138b6b14196e3830a588acf1e86966c694d3e8fb026fb105b8b5dca07e6e" + dependencies = [ + "winapi", + ] +- +-[[package]] +-name = "wyz" +-version = "0.2.0" +-source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "85e60b0d1b5f99db2556934e21937020776a5d31520bf169e851ac44e6420214" +- +-[[package]] +-name = "yaml-rust" +-version = "0.4.5" +-source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "56c1936c4cc7a1c9ab21a1ebb602eb942ba868cbd44a99cb7cdc5892335e1c85" +-dependencies = [ +- "linked-hash-map", +-] +diff --git a/Cargo.toml b/Cargo.toml +index 2411986ea..2eb2bb82d 100644 +--- a/Cargo.toml ++++ b/Cargo.toml +@@ -3,7 +3,6 @@ members = [ + "introspection-engine/connectors/introspection-connector", + "introspection-engine/connectors/sql-introspection-connector", + "introspection-engine/core", +- "introspection-engine/introspection-engine-tests", + "libs/datamodel/connectors/datamodel-connector", + "libs/datamodel/connectors/sql-datamodel-connector", + "libs/datamodel/connectors/mongodb-datamodel-connector", +@@ -12,14 +11,12 @@ members = [ + "migration-engine/connectors/sql-migration-connector", + "migration-engine/connectors/mongodb-migration-connector", + "migration-engine/core", +- "migration-engine/migration-engine-tests", + "query-engine/connectors/query-connector", + "query-engine/connectors/sql-query-connector", + "query-engine/connectors/mongodb-query-connector", + "query-engine/core", + "query-engine/query-engine", + "query-engine/query-engine-node-api", +- "query-engine/connector-test-kit-rs/query-engine-tests", + "query-engine/request-handlers", + "prisma-fmt", + "libs/datamodel/core", diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 965c9f1ce8a8..12d312b657a1 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -302,6 +302,8 @@ with pkgs; mix2nix = callPackage ../development/tools/mix2nix/default.nix { }; + prisma-engines = callPackage ../development/tools/database/prisma-engines { }; + proto-contrib = callPackage ../development/tools/proto-contrib {}; protoc-gen-doc = callPackage ../development/tools/protoc-gen-doc {}; From ca4e1d109552ffb334a5d84e4d426cc975124175 Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Thu, 9 Sep 2021 10:18:43 +0000 Subject: [PATCH 31/31] CODEOWNERS: add myself to lib/systems --- .github/CODEOWNERS | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS index aac92be3a4a0..51bda5f04385 100644 --- a/.github/CODEOWNERS +++ b/.github/CODEOWNERS @@ -19,7 +19,7 @@ # Libraries /lib @edolstra @nbp @infinisil -/lib/systems @nbp @ericson2314 @matthewbauer +/lib/systems @alyssais @nbp @ericson2314 @matthewbauer /lib/generators.nix @edolstra @nbp @Profpatsch /lib/cli.nix @edolstra @nbp @Profpatsch /lib/debug.nix @edolstra @nbp @Profpatsch