Merge staging-next into staging

This commit is contained in:
github-actions[bot] 2022-04-28 06:02:19 +00:00 committed by GitHub
commit 833ed5cc81
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
81 changed files with 167 additions and 1938 deletions

View File

@ -28,11 +28,12 @@ jobs:
uses: peter-evans/create-pull-request@v3
with:
body: |
Automatic update of terraform providers.
Automatic update by [update-terraform-providers](https://github.com/NixOS/nixpkgs/blob/master/.github/workflows/update-terraform-providers.yml) action.
Created by [update-terraform-providers](https://github.com/NixOS/nixpkgs/blob/master/.github/workflows/update-terraform-providers.yml) action.
Check that all providers build with `@ofborg build terraform-full`
Check that all providers build with:
```
@ofborg build terraform-full
```
branch: terraform-providers-update
delete-branch: false
labels: "2.status: work-in-progress"

View File

@ -13510,7 +13510,7 @@
name = "Andrei Pampu";
};
wolfangaukang = {
email = "liquid.query960@4wrd.cc";
email = "clone.gleeful135+nixpkgs@anonaddy.me";
github = "wolfangaukang";
githubId = 8378365;
name = "P. R. d. O.";

View File

@ -3,7 +3,7 @@
xml:id="chap-pantheon">
<title>Pantheon Desktop</title>
<para>
Pantheon is the desktop environment created for the elementary OS distribution. It is written from scratch in Vala, utilizing GNOME technologies with GTK 3 and Granite.
Pantheon is the desktop environment created for the elementary OS distribution. It is written from scratch in Vala, utilizing GNOME technologies with GTK and Granite.
</para>
<section xml:id="sec-pantheon-enable">
<title>Enabling Pantheon</title>
@ -89,9 +89,9 @@ switchboard-with-plugs.override {
</para>
</listitem>
</varlistentry>
<varlistentry xml:id="sec-pantheon-faq-gnome3-and-pantheon">
<varlistentry xml:id="sec-pantheon-faq-gnome-and-pantheon">
<term>
I cannot enable both GNOME 3 and Pantheon.
I cannot enable both GNOME and Pantheon.
</term>
<listitem>
<para>

View File

@ -1,21 +1,21 @@
{ stdenv, lib, fetchgit, pkg-config, meson, ninja
, enchant, gtkmm3, libchamplain, libgcrypt }:
, enchant, gtkmm3, libchamplain, libgcrypt, shared-mime-info }:
stdenv.mkDerivation rec {
pname = "lifeograph";
version = "2.0.2";
version = "2.0.3";
src = fetchgit {
url = "https://git.launchpad.net/lifeograph";
# Specific commit hash related to version
rev = "d635bbb30011c0d33c33643e6fa5c006f98ed7d6";
sha256 = "0j9wn5bj7cbfnmyyx7ikx961sksv50agnb53prymldbsq43rfgnq";
rev = "v${version}";
sha256 = "sha256-RotbTdTtpwXmo+UKOyp93IAC6CCstv++KtnX2doN+nM=";
};
nativeBuildInputs = [
meson
ninja
pkg-config
shared-mime-info # for update-mime-database
];
buildInputs = [

View File

@ -1,31 +1,38 @@
{ lib
, stdenv
, stdenvNoCC
, fetchFromGitHub
, nix-update-script
, gettext
, meson
, ninja
, gettext
, python3
, sassc
}:
stdenv.mkDerivation rec {
stdenvNoCC.mkDerivation rec {
pname = "elementary-gtk-theme";
version = "6.1.1";
version = "7.0.0";
src = fetchFromGitHub {
owner = "elementary";
repo = "stylesheet";
rev = version;
sha256 = "sha256-gciBn5MQ5Cu+dROL5kCt2GCbNA7W4HOWXyjMBd4OP+8=";
sha256 = "sha256-ZnQ54ktH0/ZyFH6c180YzbkK/TyIDziiwAXi/zqHpe4=";
};
nativeBuildInputs = [
gettext
meson
ninja
python3
sassc
];
postPatch = ''
chmod +x meson/install-to-dir.py
patchShebangs meson/install-to-dir.py
'';
passthru = {
updateScript = nix-update-script {
attrPath = "pantheon.${pname}";

View File

@ -1,5 +1,5 @@
{ lib
, stdenv
, stdenvNoCC
, fetchFromGitHub
, nix-update-script
, meson
@ -7,19 +7,19 @@
, ninja
, hicolor-icon-theme
, gtk3
, xorg
, xcursorgen
, librsvg
}:
stdenv.mkDerivation rec {
stdenvNoCC.mkDerivation rec {
pname = "elementary-icon-theme";
version = "6.1.0";
version = "7.0.0";
src = fetchFromGitHub {
owner = "elementary";
repo = "icons";
rev = version;
sha256 = "sha256-WR4HV0nJKj0WeSFHXLK64O0LhX8myAJE4w0aztyhPn4=";
sha256 = "sha256-tyhKhZPoZ8xVy1KVUWd8BK2meTT3Z6qM787spjE+NL8=";
};
nativeBuildInputs = [
@ -28,7 +28,7 @@ stdenv.mkDerivation rec {
meson
ninja
python3
xorg.xcursorgen
xcursorgen
];
propagatedBuildInputs = [

View File

@ -9,13 +9,13 @@
}:
stdenv.mkDerivation rec {
pname = "glslang";
version = "1.2.198.0";
version = "1.3.211.0";
src = fetchFromGitHub {
owner = "KhronosGroup";
repo = "glslang";
rev = "sdk-${version}";
sha256 = "sha256-FRiqsfoyjUW2kbbphxcy0Hn0TLVaszatM/nnWBrchRY=";
sha256 = "sha256-YLn/Mxuk6mXPGtBBgfwky5Nl1TCAW6i2g+AZLzqVz+A=";
};
# These get set at all-packages, keep onto them for child drvs

View File

@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "spirv-headers";
version = "1.2.198.0";
version = "1.3.211.0";
src = fetchFromGitHub {
owner = "KhronosGroup";
repo = "SPIRV-Headers";
rev = "sdk-${version}";
sha256 = "sha256-cdEiRSCoX0New8ecUh7UTDz/is2v29zhf6Il2N1j3mw=";
sha256 = "sha256-LkIrTFWYvZffLVJJW3152um5LTEsMJEDEsIhBAdhBlk=";
};
nativeBuildInputs = [ cmake ];

View File

@ -1,7 +1,7 @@
{ lib, stdenv, fetchFromGitHub, cmake }:
stdenv.mkDerivation rec {
pname = "vulkan-headers";
version = "1.2.198.0";
version = "1.3.211.0";
nativeBuildInputs = [ cmake ];
@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
owner = "KhronosGroup";
repo = "Vulkan-Headers";
rev = "sdk-${version}";
sha256 = "sha256-SvC0AX1wIZWLzws3ZS8Wi8fbNUw1+An/PRlFIfNj24Y=";
sha256 = "sha256-FqrcFHsUS8e4ZgZpxVc8nNZWdNltniFmMjyyWVoNc7w=";
};
meta = with lib; {

View File

@ -3,14 +3,14 @@
stdenv.mkDerivation rec {
pname = "vulkan-loader";
version = "1.2.198.0";
version = "1.3.211.0";
src = (assert version == vulkan-headers.version;
fetchFromGitHub {
owner = "KhronosGroup";
repo = "Vulkan-Loader";
rev = "sdk-${version}";
sha256 = "sha256-k3eCdZqCjFxpKa0pZ0K4XcORxdSOlr1dFa7C3Qzi04Y=";
sha256 = "sha256-NQu98wA7UK231rpoKDs1yQ6pEyB4wZg7MjFC3JwS2BY=";
});
nativeBuildInputs = [ cmake pkg-config ];

View File

@ -0,0 +1,23 @@
{ lib, buildDunePackage, fetchFromGitHub, ppxlib }:
buildDunePackage rec {
pname = "ocsigen-ppx-rpc";
version = "1.0";
src = fetchFromGitHub {
owner = "ocsigen";
repo = pname;
rev = version;
sha256 = "sha256:0qgasd89ayamgl2rfyxsipznmwa3pjllkyq9qg0g1f41h8ixpsfh";
};
propagatedBuildInputs = [ ppxlib ];
meta = {
inherit (src.meta) homepage;
description = "Syntax for RPCs for Eliom and Ocsigen Start";
license = lib.licenses.lgpl21Only;
maintainers = [ lib.maintainers.vbgl ];
};
}

View File

@ -2,13 +2,15 @@
, cohttp-lwt-unix, eliom
, resource-pooling
, ocamlnet
, ocsigen-ppx-rpc
}:
stdenv.mkDerivation rec {
pname = "ocaml${ocaml.version}-ocsigen-start";
version = "4.5.0";
version = "6.0.1";
nativeBuildInputs = [ ocaml findlib eliom ];
buildInputs = [ ocsigen-ppx-rpc ];
propagatedBuildInputs = [ pgocaml_ppx safepass ocsigen-toolkit yojson resource-pooling cohttp-lwt-unix ocamlnet ];
strictDeps = true;
@ -19,7 +21,7 @@ stdenv.mkDerivation rec {
owner = "ocsigen";
repo = "ocsigen-start";
rev = version;
sha256 = "sha256:1n94r8rbkzxbgcz5w135n6f2cwpc91bdvf7yslcdq4cn713rncmq";
sha256 = "sha256:097bjaxvb1canilmqr8ay3ihig2msq7z8mi0g0rnbciikj1jsrym";
};
preInstall = ''

View File

@ -1,39 +0,0 @@
{ lib
, buildDunePackage
, tezos-stdlib
, tezos-stdlib-unix
, tezos-base
, tezos-shell-services
, tezos-protocol-environment
, tezos-protocol-010-PtGRANAD
, tezos-protocol-010-PtGRANAD-parameters
, tezos-client-010-PtGRANAD
, alcotest-lwt
}:
buildDunePackage {
pname = "tezos-010-PtGRANAD-test-helpers";
inherit (tezos-stdlib) version useDune2;
src = "${tezos-stdlib.base_src}/src/proto_010_PtGRANAD/lib_protocol/test/helpers";
propagatedBuildInputs = [
tezos-base
tezos-stdlib-unix
tezos-shell-services
tezos-protocol-environment
tezos-protocol-010-PtGRANAD
tezos-protocol-010-PtGRANAD-parameters
tezos-client-010-PtGRANAD
alcotest-lwt
];
checkInputs = [
alcotest-lwt
];
doCheck = true;
meta = tezos-stdlib.meta // {
description = "Tezos/Protocol: protocol testing framework";
};
}

View File

@ -1,35 +0,0 @@
{ lib
, buildDunePackage
, tezos-stdlib
, tezos-base
, tezos-client-011-PtHangz2
, tezos-protocol-011-PtHangz2
, tezos-protocol-011-PtHangz2-parameters
, tezos-protocol-environment
, tezos-shell-services
, tezos-stdlib-unix
, tezos-test-helpers
}:
buildDunePackage {
pname = "tezos-011-PtHangz2-test-helpers";
inherit (tezos-stdlib) version useDune2;
src = "${tezos-stdlib.base_src}/src";
propagatedBuildInputs = [
tezos-base
tezos-client-011-PtHangz2
tezos-protocol-011-PtHangz2
tezos-protocol-011-PtHangz2-parameters
tezos-protocol-environment
tezos-shell-services
tezos-stdlib-unix
tezos-test-helpers
];
doCheck = true;
meta = tezos-stdlib.meta // {
description = "Tezos/Protocol: protocol testing framework";
};
}

View File

@ -1,32 +0,0 @@
{ lib
, buildDunePackage
, alcotest
, alcotest-lwt
, tezos-base
, tezos-event-logging-test-helpers
, tezos-stdlib
, tezos-test-helpers
}:
buildDunePackage {
pname = "tezos-base-test-helpers";
inherit (tezos-stdlib) version useDune2;
src = "${tezos-stdlib.base_src}/src/lib_base/test_helpers";
propagatedBuildInputs = [
alcotest
alcotest-lwt
tezos-base
tezos-event-logging-test-helpers
];
checkInputs = [
tezos-test-helpers
];
doCheck = true;
meta = tezos-stdlib.meta // {
description = "Tezos: base test helpers";
};
}

View File

@ -1,37 +0,0 @@
{ lib
, buildDunePackage
, tezos-stdlib
, tezos-crypto
, tezos-hacl-glue-unix
, tezos-micheline
, tezos-test-helpers
, ptime
, ipaddr
, bls12-381-unix
}:
buildDunePackage {
pname = "tezos-base";
inherit (tezos-stdlib) version useDune2;
src = "${tezos-stdlib.base_src}/src/lib_base";
propagatedBuildInputs = [
tezos-crypto
tezos-micheline
tezos-hacl-glue-unix
bls12-381-unix
ptime
ipaddr
];
checkInputs = [
# tezos-test-helpers
];
# circular dependency if we add this
doCheck = false;
meta = tezos-stdlib.meta // {
description = "Tezos: meta-package and pervasive type definitions for Tezos";
};
}

View File

@ -1,28 +0,0 @@
{ lib
, buildDunePackage
, tezos-stdlib
, tezos-stdlib-unix
, alcotest
, alcotest-lwt
}:
buildDunePackage {
pname = "tezos-clic";
inherit (tezos-stdlib) version useDune2;
src = "${tezos-stdlib.base_src}/src/lib_clic";
propagatedBuildInputs = [
tezos-stdlib-unix
];
checkInputs = [
alcotest
alcotest-lwt
];
doCheck = true;
meta = tezos-stdlib.meta // {
description = "Tezos: library of auto-documented command-line-parsing combinators";
};
}

View File

@ -1,38 +0,0 @@
{ lib
, buildDunePackage
, tezos-stdlib
, tezos-mockup-registration
, tezos-proxy
, tezos-signer-backends
, tezos-protocol-010-PtGRANAD-parameters
, tezos-protocol-plugin-010-PtGRANAD
, alcotest-lwt
, ppx_inline_test
, cacert
}:
buildDunePackage {
pname = "tezos-client-010-PtGRANAD";
inherit (tezos-stdlib) version useDune2;
src = "${tezos-stdlib.base_src}/src/proto_010_PtGRANAD/lib_client";
propagatedBuildInputs = [
tezos-mockup-registration
tezos-proxy
tezos-signer-backends
tezos-protocol-010-PtGRANAD-parameters
tezos-protocol-plugin-010-PtGRANAD
ppx_inline_test
];
checkInputs = [
alcotest-lwt
cacert
];
doCheck = true;
meta = tezos-stdlib.meta // {
description = "Tezos/Protocol: protocol specific library for `tezos-client`";
};
}

View File

@ -1,44 +0,0 @@
{ lib
, buildDunePackage
, tezos-stdlib
, tezos-mockup-registration
, tezos-proxy
, tezos-signer-backends
, tezos-protocol-011-PtHangz2-parameters
, tezos-protocol-plugin-011-PtHangz2
, alcotest-lwt
, cacert
, ppx_inline_test
, qcheck-alcotest
, tezos-base-test-helpers
, tezos-test-helpers
}:
buildDunePackage {
pname = "tezos-client-011-PtHangz2";
inherit (tezos-stdlib) version useDune2;
src = "${tezos-stdlib.base_src}/src";
propagatedBuildInputs = [
tezos-mockup-registration
tezos-proxy
tezos-signer-backends
tezos-protocol-011-PtHangz2-parameters
tezos-protocol-plugin-011-PtHangz2
ppx_inline_test
];
checkInputs = [
alcotest-lwt
cacert
qcheck-alcotest
tezos-base-test-helpers
tezos-test-helpers
];
doCheck = true;
meta = tezos-stdlib.meta // {
description = "Tezos/Protocol: protocol specific library for `tezos-client`";
};
}

View File

@ -1,28 +0,0 @@
{ lib
, buildDunePackage
, tezos-stdlib
, tezos-shell-services
, tezos-sapling
, alcotest
}:
buildDunePackage {
pname = "tezos-client-base";
inherit (tezos-stdlib) version useDune2;
src = "${tezos-stdlib.base_src}/src/lib_client_base";
propagatedBuildInputs = [
tezos-shell-services
tezos-sapling
];
checkInputs = [
alcotest
];
doCheck = true;
meta = tezos-stdlib.meta // {
description = "Tezos: protocol registration for the mockup mode";
};
}

View File

@ -1,34 +0,0 @@
{ lib
, buildDunePackage
, tezos-stdlib
, tezos-base
, tezos-shell-services
, irmin
, irmin-pack
, digestif
, alcotest-lwt
}:
buildDunePackage {
pname = "tezos-context";
inherit (tezos-stdlib) version useDune2;
src = "${tezos-stdlib.base_src}/src/lib_context";
propagatedBuildInputs = [
tezos-base
tezos-shell-services
irmin
irmin-pack
digestif
];
checkInputs = [
alcotest-lwt
];
doCheck = true;
meta = tezos-stdlib.meta // {
description = "Tezos: library of auto-documented RPCs (service and hierarchy descriptions)";
};
}

View File

@ -1,42 +0,0 @@
{ lib
, buildDunePackage
, tezos-stdlib
, tezos-rpc
, tezos-clic
, tezos-hacl-glue
, tezos-hacl-glue-unix
, secp256k1-internal
, ringo
, bls12-381
, bls12-381-unix
, tezos-test-helpers
, alcotest-lwt
}:
buildDunePackage {
pname = "tezos-crypto";
inherit (tezos-stdlib) version useDune2;
src = "${tezos-stdlib.base_src}/src/lib_crypto";
propagatedBuildInputs = [
tezos-rpc
tezos-clic
tezos-hacl-glue
tezos-hacl-glue-unix
secp256k1-internal
ringo
bls12-381
bls12-381-unix
];
checkInputs = [
tezos-test-helpers
alcotest-lwt
];
doCheck = true;
meta = tezos-stdlib.meta // {
description = "Tezos: library with all the cryptographic primitives used by Tezos";
};
}

View File

@ -1,23 +0,0 @@
{ lib
, buildDunePackage
, tezos-stdlib
, tezos-protocol-010-PtGRANAD
, tezos-protocol-updater
}:
buildDunePackage {
pname = "tezos-embedded-protocol-010-PtGRANAD";
inherit (tezos-stdlib) version useDune2;
src = "${tezos-stdlib.base_src}/src";
propagatedBuildInputs = [
tezos-protocol-010-PtGRANAD
tezos-protocol-updater
];
doCheck = true;
meta = tezos-stdlib.meta // {
description = "Tezos/Protocol: economic-protocol definition, embedded in `tezos-node`";
};
}

View File

@ -1,23 +0,0 @@
{ lib
, buildDunePackage
, tezos-stdlib
, tezos-protocol-demo-noops
, tezos-protocol-updater
}:
buildDunePackage {
pname = "tezos-embedded-protocol-demo-noops";
inherit (tezos-stdlib) version useDune2;
src = "${tezos-stdlib.base_src}/src";
propagatedBuildInputs = [
tezos-protocol-demo-noops
tezos-protocol-updater
];
doCheck = true;
meta = tezos-stdlib.meta // {
description = "Tezos/Protocol: demo_noops (economic-protocol definition, embedded in `tezos-node`)";
};
}

View File

@ -1,35 +0,0 @@
{ lib
, buildDunePackage
, tezos-stdlib
, data-encoding
, lwt
, lwt-canceler
, tezos-lwt-result-stdlib
, alcotest
, alcotest-lwt
}:
buildDunePackage {
pname = "tezos-error-monad";
inherit (tezos-stdlib) version useDune2;
src = "${tezos-stdlib.base_src}/src/lib_error_monad";
propagatedBuildInputs = [
tezos-stdlib
data-encoding
lwt
lwt-canceler
tezos-lwt-result-stdlib
];
checkInputs = [
alcotest
alcotest-lwt
];
doCheck = true;
meta = tezos-stdlib.meta // {
description = "Tezos: error monad";
};
}

View File

@ -1,25 +0,0 @@
{ lib
, buildDunePackage
, alcotest
, tezos-event-logging
, tezos-stdlib
, tezos-test-helpers
}:
buildDunePackage {
pname = "tezos-event-logging-test-helpers";
inherit (tezos-stdlib) version useDune2;
src = "${tezos-stdlib.base_src}/src/lib_event_logging/test_helpers/";
propagatedBuildInputs = [
alcotest
tezos-event-logging
tezos-test-helpers
];
doCheck = true;
meta = tezos-stdlib.meta // {
description = "Tezos: test helpers for the event logging library";
};
}

View File

@ -1,28 +0,0 @@
{ lib
, buildDunePackage
, tezos-stdlib
, tezos-error-monad
, data-encoding
, lwt_log
, lwt
}:
buildDunePackage {
pname = "tezos-event-logging";
inherit (tezos-stdlib) version useDune2;
src = "${tezos-stdlib.base_src}/src/lib_event_logging";
propagatedBuildInputs = [
tezos-stdlib
tezos-error-monad
data-encoding
lwt_log
lwt
];
doCheck = true;
meta = tezos-stdlib.meta // {
description = "Tezos: event logging library";
};
}

View File

@ -1,26 +0,0 @@
{ lib
, buildDunePackage
, tezos-stdlib
, tezos-hacl-glue
, ctypes
, hacl-star
}:
buildDunePackage {
pname = "tezos-hacl-glue-unix";
inherit (tezos-stdlib) version useDune2;
src = "${tezos-stdlib.base_src}/src/lib_hacl_glue/unix";
propagatedBuildInputs = [
ctypes
hacl-star
tezos-hacl-glue
];
doCheck = true;
meta = tezos-stdlib.meta // {
description = "Tezos: thin layer of glue around hacl-star (unix implementation)";
};
}

View File

@ -1,17 +0,0 @@
{ lib
, buildDunePackage
, tezos-stdlib
}:
buildDunePackage {
pname = "tezos-hacl-glue";
inherit (tezos-stdlib) version useDune2;
src = "${tezos-stdlib.base_src}/src/lib_hacl_glue/virtual";
doCheck = true;
meta = tezos-stdlib.meta // {
description = "Tezos: thin layer of glue around hacl-star (virtual package)";
};
}

View File

@ -1,42 +0,0 @@
{ lib
, buildDunePackage
, tezos-stdlib
, tezos-context
, tezos-lmdb
, tezos-validation
, tezos-shell-services
, tezos-protocol-compiler
, lwt-watcher
, alcotest-lwt
}:
buildDunePackage {
pname = "tezos-legacy-store";
inherit (tezos-stdlib) version useDune2;
src = "${tezos-stdlib.base_src}/src/lib_store/legacy_store";
propagatedBuildInputs = [
tezos-context
tezos-lmdb
tezos-validation
tezos-shell-services
lwt-watcher
];
nativeBuildInputs = [
tezos-protocol-compiler
];
strictDeps = true;
checkInputs = [
alcotest-lwt
];
# A lot of extra deps with wide dependency cones needed
doCheck = false;
meta = tezos-stdlib.meta // {
description = "Tezos: custom economic-protocols environment implementation for `tezos-client` and testing";
};
}

View File

@ -1,51 +0,0 @@
{ lib
, fetchFromGitLab
, pkg-config
, buildDunePackage
, lmdb
, rresult
, cstruct
, alcotest
}:
let
version = "7.4";
src = fetchFromGitLab {
owner = "tezos";
repo = "tezos";
rev = "v${version}";
sha256 = "0sghc60xzr02pmmkr626pnhzrnczf7mki7qyxzzfn7rbbdbrf4wp";
};
in
buildDunePackage {
pname = "tezos-lmdb";
version = version;
src = "${src}/vendors/ocaml-lmdb";
useDune2 = true;
nativeBuildInputs = [
pkg-config
];
propagatedBuildInputs = [
rresult
lmdb
];
strictDeps = true;
checkInputs = [
cstruct
alcotest
];
doCheck = false;
meta = {
description = "Legacy Tezos OCaml binding to LMDB (Consider ocaml-lmdb instead)";
license = lib.licenses.isc;
maintainers = [ lib.maintainers.ulrikstrid ];
};
}

View File

@ -1,31 +0,0 @@
{ lib
, buildDunePackage
, ocaml
, tezos-stdlib
, lwt
, alcotest-lwt
, tezos-test-helpers
}:
buildDunePackage {
pname = "tezos-lwt-result-stdlib";
inherit (tezos-stdlib) version useDune2;
src = "${tezos-stdlib.base_src}/src/lib_lwt_result_stdlib";
minimalOCamlVersion = "4.12";
propagatedBuildInputs = [
lwt
];
checkInputs = [
alcotest-lwt
tezos-test-helpers
];
doCheck = true;
meta = tezos-stdlib.meta // {
description = "Tezos: error-aware stdlib replacement";
};
}

View File

@ -1,32 +0,0 @@
{ lib
, buildDunePackage
, tezos-stdlib
, tezos-error-monad
, uutf
, alcotest
, alcotest-lwt
, ppx_inline_test
}:
buildDunePackage {
pname = "tezos-micheline";
inherit (tezos-stdlib) version useDune2;
src = "${tezos-stdlib.base_src}/src/lib_micheline";
propagatedBuildInputs = [
tezos-error-monad
uutf
ppx_inline_test
];
checkInputs = [
alcotest
alcotest-lwt
];
doCheck = true;
meta = tezos-stdlib.meta // {
description = "Tezos: internal AST and parser for the Michelson language";
};
}

View File

@ -1,27 +0,0 @@
{ lib
, buildDunePackage
, tezos-stdlib
, tezos-client-base
, tezos-protocol-environment
, tezos-rpc-http-client
, resto-cohttp-self-serving-client
}:
buildDunePackage {
pname = "tezos-mockup-proxy";
inherit (tezos-stdlib) version useDune2;
src = "${tezos-stdlib.base_src}/src/lib_mockup_proxy";
propagatedBuildInputs = [
tezos-client-base
tezos-protocol-environment
tezos-rpc-http-client
resto-cohttp-self-serving-client
];
doCheck = true;
meta = tezos-stdlib.meta // {
description = "Tezos: local RPCs";
};
}

View File

@ -1,23 +0,0 @@
{ lib
, buildDunePackage
, tezos-stdlib
, tezos-client-base
, tezos-protocol-environment
}:
buildDunePackage {
pname = "tezos-mockup-registration";
inherit (tezos-stdlib) version useDune2;
src = "${tezos-stdlib.base_src}/src/lib_mockup";
propagatedBuildInputs = [
tezos-client-base
tezos-protocol-environment
];
doCheck = true;
meta = tezos-stdlib.meta // {
description = "Tezos: protocol registration for the mockup mode";
};
}

View File

@ -1,19 +0,0 @@
{ lib
, buildDunePackage
, tezos-stdlib
, tezos-base
}:
buildDunePackage {
pname = "tezos-p2p-services";
inherit (tezos-stdlib) version useDune2;
src = "${tezos-stdlib.base_src}/src/lib_p2p_services";
propagatedBuildInputs = [
tezos-base
];
meta = tezos-stdlib.meta // {
description = "Tezos: descriptions of RPCs exported by `tezos-p2p`";
};
}

View File

@ -1,38 +0,0 @@
{ lib
, buildDunePackage
, alcotest-lwt
, astring
, lwt
, lwt-canceler
, lwt-watcher
, ringo
, tezos-base-test-helpers
, tezos-p2p-services
, tezos-stdlib
}:
buildDunePackage {
pname = "tezos-p2p";
inherit (tezos-stdlib) version useDune2;
src = "${tezos-stdlib.base_src}/src/lib_p2p";
propagatedBuildInputs = [
lwt
lwt-canceler
lwt-watcher
ringo
tezos-p2p-services
];
checkInputs = [
alcotest-lwt
astring
tezos-base-test-helpers
];
doCheck = false; # some tests fail
meta = tezos-stdlib.meta // {
description = "Tezos: library for a pool of P2P connections";
};
}

View File

@ -1,23 +0,0 @@
{ lib
, buildDunePackage
, tezos-stdlib
, tezos-protocol-010-PtGRANAD
, tezos-protocol-environment
}:
buildDunePackage {
pname = "tezos-protocol-010-PtGRANAD-parameters";
inherit (tezos-stdlib) version useDune2;
src = "${tezos-stdlib.base_src}/src/proto_010_PtGRANAD/lib_parameters";
propagatedBuildInputs = [
tezos-protocol-010-PtGRANAD
tezos-protocol-environment
];
doCheck = true;
meta = tezos-stdlib.meta // {
description = "Tezos/Protocol: parameters";
};
}

View File

@ -1,28 +0,0 @@
{ lib
, buildDunePackage
, tezos-stdlib
, tezos-protocol-compiler
, tezos-protocol-environment
}:
buildDunePackage {
pname = "tezos-protocol-010-PtGRANAD";
inherit (tezos-stdlib) version useDune2;
src = "${tezos-stdlib.base_src}/src";
nativeBuildInputs = [
tezos-protocol-compiler
];
buildInputs = [
tezos-protocol-environment
];
strictDeps = true;
doCheck = true;
meta = tezos-stdlib.meta // {
description = "Tezos/Protocol: economic-protocol definition";
};
}

View File

@ -1,23 +0,0 @@
{ lib
, buildDunePackage
, tezos-stdlib
, tezos-protocol-011-PtHangz2
, tezos-protocol-environment
}:
buildDunePackage {
pname = "tezos-protocol-011-PtHangz2-parameters";
inherit (tezos-stdlib) version useDune2;
src = "${tezos-stdlib.base_src}/src";
propagatedBuildInputs = [
tezos-protocol-011-PtHangz2
tezos-protocol-environment
];
doCheck = true;
meta = tezos-stdlib.meta // {
description = "Tezos/Protocol: parameters";
};
}

View File

@ -1,28 +0,0 @@
{ lib
, buildDunePackage
, tezos-stdlib
, tezos-protocol-compiler
, tezos-protocol-environment
}:
buildDunePackage {
pname = "tezos-protocol-011-PtHangz2";
inherit (tezos-stdlib) version useDune2;
src = "${tezos-stdlib.base_src}/src";
nativeBuildInputs = [
tezos-protocol-compiler
];
buildInputs = [
tezos-protocol-environment
];
strictDeps = true;
doCheck = true;
meta = tezos-stdlib.meta // {
description = "Tezos/Protocol: economic-protocol definition";
};
}

View File

@ -1,21 +0,0 @@
{ lib
, buildDunePackage
, tezos-stdlib
, tezos-protocol-compiler
}:
buildDunePackage {
pname = "tezos-protocol-alpha";
inherit (tezos-stdlib) version useDune2;
src = "${tezos-stdlib.base_src}/src";
propagatedBuildInputs = [
tezos-protocol-compiler
];
doCheck = true;
meta = tezos-stdlib.meta // {
description = "Tezos/Protocol: economic-protocol definition";
};
}

View File

@ -1,34 +0,0 @@
{ lib
, buildDunePackage
, ocaml
, tezos-stdlib
, tezos-version
, tezos-protocol-environment
, ocp-ocamlres
, pprint
}:
if lib.versionAtLeast ocaml.version "4.13" then
throw "tezos-protocol-compiler-${tezos-stdlib.version} is not available for OCaml > 4.12"
else
buildDunePackage {
pname = "tezos-protocol-compiler";
inherit (tezos-stdlib) version useDune2;
src = "${tezos-stdlib.base_src}/src/lib_protocol_compiler";
minimalOCamlVersion = "4.12";
propagatedBuildInputs = [
tezos-version
tezos-protocol-environment
ocp-ocamlres
pprint
];
doCheck = true;
meta = tezos-stdlib.meta // {
description = "Tezos: economic-protocol compiler";
};
}

View File

@ -1,21 +0,0 @@
{ lib
, buildDunePackage
, tezos-stdlib
, tezos-protocol-compiler
}:
buildDunePackage {
pname = "tezos-protocol-demo-noops";
inherit (tezos-stdlib) version useDune2;
src = "${tezos-stdlib.base_src}/src/";
propagatedBuildInputs = [
tezos-protocol-compiler
];
doCheck = true;
meta = tezos-stdlib.meta // {
description = "Tezos/Protocol: demo_noops economic-protocol definition";
};
}

View File

@ -1,18 +0,0 @@
{ lib
, buildDunePackage
, tezos-stdlib
}:
buildDunePackage {
pname = "tezos-protocol-environment-packer";
inherit (tezos-stdlib) version useDune2;
src = "${tezos-stdlib.base_src}/src/lib_protocol_environment";
minimalOCamlVersion = "4.03";
doCheck = true;
meta = tezos-stdlib.meta // {
description = "Tezos: sigs/structs packer for economic protocol environment";
};
}

View File

@ -1,42 +0,0 @@
{ lib
, buildDunePackage
, ocaml
, tezos-stdlib
, tezos-protocol-environment-packer
, zarith
}:
buildDunePackage {
pname = "tezos-protocol-environment-sigs";
inherit (tezos-stdlib) version useDune2;
src = "${tezos-stdlib.base_src}/src/lib_protocol_environment";
minimalOCamlVersion = "4.12";
postPatch = ''
ls ./sigs/v0
cp -f ${zarith}/lib/ocaml/${ocaml.version}/site-lib/zarith/z.mli ./sigs/v1/z.mli
cp -f ${zarith}/lib/ocaml/${ocaml.version}/site-lib/zarith/z.mli ./sigs/v2/z.mli
cp -f ${zarith}/lib/ocaml/${ocaml.version}/site-lib/zarith/z.mli ./sigs/v3/z.mli
sed -i 's/out_channel/Stdlib.out_channel/g' ./sigs/v1/z.mli
sed -i 's/Buffer/Stdlib.Buffer/g' ./sigs/v1/z.mli
sed -i 's/out_channel/Stdlib.out_channel/g' ./sigs/v2/z.mli
sed -i 's/Buffer/Stdlib.Buffer/g' ./sigs/v2/z.mli
sed -i 's/out_channel/Stdlib.out_channel/g' ./sigs/v3/z.mli
sed -i 's/Buffer/Stdlib.Buffer/g' ./sigs/v3/z.mli
'';
propagatedBuildInputs = [
tezos-protocol-environment-packer
];
checkInputs = [
tezos-stdlib
];
doCheck = true;
meta = tezos-stdlib.meta // {
description = "Tezos: restricted typing environment for the economic protocols";
};
}

View File

@ -1,25 +0,0 @@
{ lib
, buildDunePackage
, tezos-stdlib
, tezos-crypto
, tezos-protocol-environment-packer
, bls12-381-legacy
}:
buildDunePackage {
pname = "tezos-protocol-environment-structs";
inherit (tezos-stdlib) version useDune2;
src = "${tezos-stdlib.base_src}/src/lib_protocol_environment";
propagatedBuildInputs = [
tezos-crypto
tezos-protocol-environment-packer
bls12-381-legacy
];
doCheck = true;
meta = tezos-stdlib.meta // {
description = "Tezos: restricted typing environment for the economic protocols";
};
}

View File

@ -1,43 +0,0 @@
{ lib
, ocaml
, buildDunePackage
, bls12-381
, bls12-381-legacy
, tezos-stdlib
, tezos-base
, tezos-sapling
, tezos-context
, tezos-protocol-environment-sigs
, tezos-protocol-environment-structs
, tezos-test-helpers
, zarith
, alcotest-lwt
}:
buildDunePackage {
pname = "tezos-protocol-environment";
inherit (tezos-stdlib) version useDune2;
src = "${tezos-stdlib.base_src}/src/lib_protocol_environment";
propagatedBuildInputs = [
bls12-381
bls12-381-legacy
tezos-sapling
tezos-base
tezos-context
tezos-protocol-environment-sigs
tezos-protocol-environment-structs
zarith # this might break, since they actually want 1.11
];
checkInputs = [
alcotest-lwt
tezos-test-helpers
];
doCheck = true;
meta = tezos-stdlib.meta // {
description = "Tezos: custom economic-protocols environment implementation for `tezos-client` and testing";
};
}

View File

@ -1,23 +0,0 @@
{ lib
, buildDunePackage
, tezos-stdlib
, tezos-protocol-010-PtGRANAD
, tezos-protocol-environment
}:
buildDunePackage {
pname = "tezos-protocol-plugin-010-PtGRANAD";
inherit (tezos-stdlib) version useDune2;
src = "${tezos-stdlib.base_src}/src/proto_010_PtGRANAD/lib_plugin";
buildInputs = [
tezos-protocol-010-PtGRANAD
tezos-protocol-environment
];
doCheck = true;
meta = tezos-stdlib.meta // {
description = "Tezos/Protocol: protocol plugin registerer";
};
}

View File

@ -1,23 +0,0 @@
{ lib
, buildDunePackage
, tezos-stdlib
, tezos-protocol-011-PtHangz2
, tezos-protocol-environment
}:
buildDunePackage {
pname = "tezos-protocol-plugin-011-PtHangz2";
inherit (tezos-stdlib) version useDune2;
src = "${tezos-stdlib.base_src}/src";
buildInputs = [
tezos-protocol-011-PtHangz2
tezos-protocol-environment
];
doCheck = true;
meta = tezos-stdlib.meta // {
description = "Tezos/Protocol: protocol plugin";
};
}

View File

@ -1,21 +0,0 @@
{ lib
, buildDunePackage
, tezos-stdlib
, tezos-protocol-alpha
}:
buildDunePackage {
pname = "tezos-protocol-plugin-alpha";
inherit (tezos-stdlib) version useDune2;
src = "${tezos-stdlib.base_src}/src";
propagatedBuildInputs = [
tezos-protocol-alpha
];
doCheck = true;
meta = tezos-stdlib.meta // {
description = "Tezos/Protocol: protocol plugin";
};
}

View File

@ -1,26 +0,0 @@
{ lib
, ocaml
, buildDunePackage
, tezos-stdlib
, tezos-protocol-compiler
, tezos-shell-context
, lwt-exit
}:
buildDunePackage {
pname = "tezos-protocol-updater";
inherit (tezos-stdlib) version useDune2;
src = "${tezos-stdlib.base_src}/src/lib_protocol_updater";
propagatedBuildInputs = [
tezos-shell-context
lwt-exit
tezos-protocol-compiler
];
doCheck = true;
meta = tezos-stdlib.meta // {
description = "Tezos: economic-protocol dynamic loading for `tezos-node`";
};
}

View File

@ -1,36 +0,0 @@
{ lib
, buildDunePackage
, tezos-stdlib
, tezos-mockup-proxy
, tezos-context
, ringo-lwt
, alcotest-lwt
, qcheck-alcotest
, tezos-base-test-helpers
, tezos-shell-services-test-helpers
}:
buildDunePackage {
pname = "tezos-proxy";
inherit (tezos-stdlib) version useDune2;
src = "${tezos-stdlib.base_src}/src/lib_proxy";
propagatedBuildInputs = [
ringo-lwt
tezos-mockup-proxy
tezos-context
];
checkInputs = [
alcotest-lwt
qcheck-alcotest
tezos-base-test-helpers
tezos-shell-services-test-helpers
];
doCheck = true;
meta = tezos-stdlib.meta // {
description = "Tezos: protocol registration for the mockup mode";
};
}

View File

@ -1,34 +0,0 @@
{ lib
, buildDunePackage
, tezos-stdlib
, tezos-base
, lwt-watcher
, alcotest-lwt
, qcheck-alcotest
, tezos-base-test-helpers
, tezos-test-helpers
}:
buildDunePackage {
pname = "tezos-requester";
inherit (tezos-stdlib) version useDune2;
src = "${tezos-stdlib.base_src}/src/lib_requester";
propagatedBuildInputs = [
tezos-base
lwt-watcher
];
checkInputs = [
alcotest-lwt
qcheck-alcotest
tezos-base-test-helpers
tezos-test-helpers
];
doCheck = true;
meta = tezos-stdlib.meta // {
description = "Tezos: generic resource fetching service";
};
}

View File

@ -1,23 +0,0 @@
{ lib
, buildDunePackage
, tezos-stdlib
, tezos-rpc-http-client
, cohttp-lwt-unix
}:
buildDunePackage {
pname = "tezos-rpc-http-client-unix";
inherit (tezos-stdlib) version useDune2;
src = "${tezos-stdlib.base_src}/src/lib_rpc_http";
propagatedBuildInputs = [
tezos-rpc-http-client
cohttp-lwt-unix
];
doCheck = true;
meta = tezos-stdlib.meta // {
description = "Tezos: unix implementation of the RPC client";
};
}

View File

@ -1,23 +0,0 @@
{ lib
, buildDunePackage
, tezos-stdlib
, tezos-rpc-http
, resto-cohttp-client
}:
buildDunePackage {
pname = "tezos-rpc-http-client";
inherit (tezos-stdlib) version useDune2;
src = "${tezos-stdlib.base_src}/src/lib_rpc_http";
propagatedBuildInputs = [
tezos-rpc-http
resto-cohttp-client
];
doCheck = true;
meta = tezos-stdlib.meta // {
description = "Tezos: library of auto-documented RPCs (http client)";
};
}

View File

@ -1,25 +0,0 @@
{ lib
, buildDunePackage
, tezos-stdlib
, tezos-base
, resto-directory
, resto-cohttp
}:
buildDunePackage {
pname = "tezos-rpc-http";
inherit (tezos-stdlib) version useDune2;
src = "${tezos-stdlib.base_src}/src/lib_rpc_http";
propagatedBuildInputs = [
tezos-base
resto-directory
resto-cohttp
];
doCheck = true;
meta = tezos-stdlib.meta // {
description = "Tezos: library of auto-documented RPCs (http server and client)";
};
}

View File

@ -1,25 +0,0 @@
{ lib
, buildDunePackage
, tezos-stdlib
, tezos-error-monad
, resto
, resto-directory
}:
buildDunePackage {
pname = "tezos-rpc";
inherit (tezos-stdlib) version useDune2;
src = "${tezos-stdlib.base_src}/src/lib_rpc";
propagatedBuildInputs = [
tezos-error-monad
resto
resto-directory
];
doCheck = true;
meta = tezos-stdlib.meta // {
description = "Tezos: library of auto-documented RPCs (service and hierarchy descriptions)";
};
}

View File

@ -1,35 +0,0 @@
{ lib
, buildDunePackage
, ocaml
, tezos-stdlib
, tezos-crypto
, tezos-rust-libs
, tezos-base-test-helpers
, alcotest-lwt
}:
buildDunePackage {
pname = "tezos-sapling";
inherit (tezos-stdlib) version useDune2;
src = "${tezos-stdlib.base_src}/src/lib_sapling";
propagatedBuildInputs = [
tezos-crypto
tezos-rust-libs
];
checkInputs = [
alcotest-lwt
tezos-base-test-helpers
];
# requires the "zcash-params" files
doCheck = false;
# This is a hack to work around the hack used in the dune files
OPAM_SWITCH_PREFIX = "${tezos-rust-libs}";
meta = tezos-stdlib.meta // {
description = "Tezos/Protocol: economic-protocol definition";
};
}

View File

@ -1,21 +0,0 @@
{ lib
, buildDunePackage
, tezos-stdlib
, tezos-protocol-environment
}:
buildDunePackage {
pname = "tezos-shell-context";
inherit (tezos-stdlib) version useDune2;
src = "${tezos-stdlib.base_src}/src/lib_protocol_environment";
propagatedBuildInputs = [
tezos-protocol-environment
];
doCheck = true;
meta = tezos-stdlib.meta // {
description = "Tezos: economic-protocols environment implementation for `tezos-node`";
};
}

View File

@ -1,32 +0,0 @@
{ lib
, buildDunePackage
, tezos-stdlib
, tezos-test-helpers
, tezos-base
, tezos-shell-services
, qcheck-core
, qcheck-alcotest
}:
buildDunePackage {
pname = "tezos-shell-services-test-helpers";
inherit (tezos-stdlib) version useDune2;
src = "${tezos-stdlib.base_src}/src/lib_shell_services/test_helpers/";
propagatedBuildInputs = [
tezos-base
tezos-shell-services
tezos-test-helpers
qcheck-core
];
checkInputs = [
qcheck-alcotest
];
doCheck = true;
meta = tezos-stdlib.meta // {
description = "Tezos: shell_services test helpers";
};
}

View File

@ -1,30 +0,0 @@
{ lib
, buildDunePackage
, tezos-stdlib
, tezos-workers
, tezos-p2p-services
, tezos-version
, alcotest-lwt
}:
buildDunePackage {
pname = "tezos-shell-services";
inherit (tezos-stdlib) version useDune2;
src = "${tezos-stdlib.base_src}/src/lib_shell_services";
propagatedBuildInputs = [
tezos-workers
tezos-p2p-services
tezos-version
];
doCheck = true;
checkInputs = [
alcotest-lwt
];
meta = tezos-stdlib.meta // {
description = "Tezos: descriptions of RPCs exported by `tezos-shell`";
};
}

View File

@ -1,44 +0,0 @@
{ lib
, buildDunePackage
, tezos-stdlib
, tezos-p2p
, tezos-requester
, tezos-validation
, tezos-store
, lwt-canceler
, alcotest-lwt
, qcheck-alcotest
, tezos-base-test-helpers
, tezos-embedded-protocol-demo-noops
, tezos-protocol-plugin-alpha
, tezos-test-helpers
}:
buildDunePackage {
pname = "tezos-shell";
inherit (tezos-stdlib) version useDune2;
src = "${tezos-stdlib.base_src}/src/lib_shell";
propagatedBuildInputs = [
lwt-canceler
tezos-p2p
tezos-requester
tezos-store
tezos-validation
];
checkInputs = [
alcotest-lwt
qcheck-alcotest
tezos-base-test-helpers
tezos-embedded-protocol-demo-noops
tezos-protocol-plugin-alpha
tezos-test-helpers
];
doCheck = true;
meta = tezos-stdlib.meta // {
description = "Tezos: descriptions of RPCs exported by `tezos-shell`";
};
}

View File

@ -1,30 +0,0 @@
{ lib
, buildDunePackage
, tezos-stdlib
, tezos-rpc-http-client-unix
, tezos-signer-services
, alcotest
, alcotest-lwt
}:
buildDunePackage {
pname = "tezos-signer-backends";
inherit (tezos-stdlib) version useDune2;
src = "${tezos-stdlib.base_src}/src/lib_signer_backends";
propagatedBuildInputs = [
tezos-rpc-http-client-unix
tezos-signer-services
];
checkInputs = [
alcotest
alcotest-lwt
];
doCheck = true;
meta = tezos-stdlib.meta // {
description = "Tezos: remote-signature backends for `tezos-client`";
};
}

View File

@ -1,21 +0,0 @@
{ lib
, buildDunePackage
, tezos-stdlib
, tezos-client-base
}:
buildDunePackage {
pname = "tezos-signer-services";
inherit (tezos-stdlib) version useDune2;
src = "${tezos-stdlib.base_src}/src/lib_signer_services";
propagatedBuildInputs = [
tezos-client-base
];
doCheck = true;
meta = tezos-stdlib.meta // {
description = "Tezos: descriptions of RPCs exported by `tezos-signer`";
};
}

View File

@ -1,33 +0,0 @@
{ lib
, buildDunePackage
, tezos-stdlib
, tezos-event-logging
, re
, ptime
, mtime
, ipaddr
, ezjsonm
, fmt
}:
buildDunePackage {
pname = "tezos-stdlib-unix";
inherit (tezos-stdlib) version useDune2;
src = "${tezos-stdlib.base_src}/src/lib_stdlib_unix";
propagatedBuildInputs = [
tezos-event-logging
re
ptime
mtime
ipaddr
ezjsonm
fmt
];
doCheck = true;
meta = tezos-stdlib.meta // {
description = "Tezos: yet-another local-extension of the OCaml standard library (unix-specific fragment)";
};
}

View File

@ -1,64 +0,0 @@
{ lib
, fetchFromGitLab
, buildDunePackage
, hex
, lwt
, zarith
, alcotest
, alcotest-lwt
, crowbar
, bigstring
, lwt_log
, ppx_inline_test
, qcheck-alcotest
, tezos-test-helpers
}:
buildDunePackage rec {
pname = "tezos-stdlib";
version = "11.0";
base_src = fetchFromGitLab {
owner = "tezos";
repo = "tezos";
rev = "v${version}";
sha256 = "uUYd1DxH2bdCQlevQt3oGxvg0ai5EiCD2mti5SiueU8=";
};
src = "${base_src}/src/lib_stdlib";
minimalOCamlVersion = "4.08";
useDune2 = true;
preBuild = ''
rm -rf vendors
'';
propagatedBuildInputs = [
hex
lwt
zarith
ppx_inline_test
];
checkInputs = [
bigstring
lwt_log
alcotest
alcotest-lwt
crowbar
bigstring
lwt_log
qcheck-alcotest
# tezos-test-helpers
];
# circular dependency if we add this
doCheck = false;
meta = {
description = "Tezos: yet-another local-extension of the OCaml standard library";
license = lib.licenses.mit;
maintainers = [ lib.maintainers.ulrikstrid ];
};
}

View File

@ -1,50 +0,0 @@
{ lib
, buildDunePackage
, tezos-stdlib
, tezos-protocol-updater
, tezos-validation
, tezos-legacy-store
, tezos-protocol-compiler
, index
, camlzip
, tar-unix
, ringo-lwt
, digestif
, alcotest-lwt
, lwt-watcher
}:
buildDunePackage {
pname = "tezos-store";
inherit (tezos-stdlib) version useDune2;
src = "${tezos-stdlib.base_src}/src/lib_store";
propagatedBuildInputs = [
index
camlzip
tar-unix
ringo-lwt
digestif
lwt-watcher
tezos-protocol-updater
tezos-validation
tezos-legacy-store
];
nativeBuildInputs = [
tezos-protocol-compiler
];
strictDeps = true;
checkInputs = [
alcotest-lwt
];
# A lot of extra deps with wide dependency cones needed
doCheck = false;
meta = tezos-stdlib.meta // {
description = "Tezos: custom economic-protocols environment implementation for `tezos-client` and testing";
};
}

View File

@ -1,28 +0,0 @@
{ lib
, fetchFromGitLab
, buildDunePackage
, qcheck-alcotest
, alcotest
, alcotest-lwt
, uri
, tezos-stdlib
}:
buildDunePackage rec {
pname = "tezos-test-helpers";
inherit (tezos-stdlib) version useDune2;
src = "${tezos-stdlib.base_src}/src/lib_test";
propagatedBuildInputs = [
qcheck-alcotest
alcotest
alcotest-lwt
uri
];
doCheck = true;
meta = tezos-stdlib.meta // {
description = "Tezos: yet-another local-extension of the OCaml standard library";
};
}

View File

@ -1,28 +0,0 @@
{ lib
, buildDunePackage
, tezos-stdlib
, tezos-protocol-updater
, tezos-protocol-compiler
}:
buildDunePackage {
pname = "tezos-validation";
inherit (tezos-stdlib) version useDune2;
src = "${tezos-stdlib.base_src}/src/lib_validation";
propagatedBuildInputs = [
tezos-protocol-updater
];
nativeBuildInputs = [
tezos-protocol-compiler
];
strictDeps = true;
doCheck = true;
meta = tezos-stdlib.meta // {
description = "Tezos: library for blocks validation";
};
}

View File

@ -1,21 +0,0 @@
{ lib
, buildDunePackage
, tezos-stdlib
, tezos-base
}:
buildDunePackage {
pname = "tezos-version";
inherit (tezos-stdlib) version useDune2;
src = "${tezos-stdlib.base_src}/src/lib_version";
propagatedBuildInputs = [
tezos-base
];
doCheck = true;
meta = tezos-stdlib.meta // {
description = "Tezos: version information generated from Git";
};
}

View File

@ -1,21 +0,0 @@
{ lib
, buildDunePackage
, tezos-stdlib
, tezos-base
}:
buildDunePackage {
pname = "tezos-workers";
inherit (tezos-stdlib) version useDune2;
src = "${tezos-stdlib.base_src}/src/lib_workers";
propagatedBuildInputs = [
tezos-base
];
doCheck = true;
meta = tezos-stdlib.meta // {
description = "Tezos: worker library";
};
}

View File

@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "spirv-tools";
version = "1.2.198.0";
version = "1.3.211.0";
src = fetchFromGitHub {
owner = "KhronosGroup";
repo = "SPIRV-Tools";
rev = "sdk-${version}";
sha256 = "sha256-8EJbTPY5dvsqx32POf2HcCV3j2fA68GtGZA66l9V4TI=";
sha256 = "sha256-DoE+UCJOTB8JidC208wgfV1trZC4r9uFvwRPUhJVaII=";
};
nativeBuildInputs = [ cmake python3 ];

View File

@ -1,10 +1,15 @@
{ lib
, callPackage
, stdenv
, fetchFromGitHub
, cmake
, pkgconfig
, glslang
, libffi
, libX11
, libXau
, libxcb
, libXdmcp
, libXrandr
, spirv-headers
, spirv-tools
@ -13,16 +18,11 @@
}:
let
robin-hood-hashing = fetchFromGitHub {
owner = "martinus";
repo = "robin-hood-hashing";
rev = "3.11.3"; # pin
sha256 = "1gm3lwjkh6h8m7lfykzd0jzhfqjmjchindkmxc008rwvxafsd1pl";
};
robin-hood-hashing = callPackage ./robin-hood-hashing.nix {};
in
stdenv.mkDerivation rec {
pname = "vulkan-validation-layers";
version = "1.2.198.0";
version = "1.3.211.0";
# If we were to use "dev" here instead of headers, the setupHook would be
# placed in that output instead of "out".
@ -34,7 +34,7 @@ stdenv.mkDerivation rec {
owner = "KhronosGroup";
repo = "Vulkan-ValidationLayers";
rev = "sdk-${version}";
sha256 = "sha256-/pnXT55EQZcnjOzY2vBwp+gM6l2hktZHwB9yKP8vVTU=";
sha256 = "sha256-NGpFfekZtB0rvnGxYVDo808xzgBuo8ZC4bjXjQnTpxU=";
});
# Include absolute paths to layer libraries in their associated
@ -45,12 +45,17 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [
cmake
pkgconfig
];
buildInputs = [
libX11
libxcb
libXau
libXdmcp
libXrandr
libffi
libxcb
spirv-tools
vulkan-headers
wayland
];
@ -60,6 +65,7 @@ stdenv.mkDerivation rec {
"-DSPIRV_HEADERS_INSTALL_DIR=${spirv-headers}"
"-DROBIN_HOOD_HASHING_INSTALL_DIR=${robin-hood-hashing}"
"-DBUILD_LAYER_SUPPORT_FILES=ON"
"-DPKG_CONFIG_EXECUTABLE=${pkgconfig}/bin/pkg-config"
# Hide dev warnings that are useless for packaging
"-Wno-dev"
];

View File

@ -0,0 +1,33 @@
{ stdenv
, lib
, fetchFromGitHub
, cmake
}:
stdenv.mkDerivation rec {
pname = "robin-hood-hashing";
version = "3.11.5"; # pin
src = fetchFromGitHub {
owner = "martinus";
repo = "robin-hood-hashing";
rev = version; # pin
sha256 = "sha256-J4u9Q6cXF0SLHbomP42AAn5LSKBYeVgTooOhqxOIpuM=";
};
nativeBuildInputs = [
cmake
];
cmakeFlags = [
"-DRH_STANDALONE_PROJECT=OFF"
];
meta = with lib; {
description = "A faster, more efficient replacement for std::unordered_map / std::unordered_set";
homepage = "https://github.com/martinus/robin-hood-hashing";
platforms = platforms.linux;
license = licenses.mit;
maintainers = [ ];
};
}

View File

@ -2,14 +2,14 @@
stdenv.mkDerivation rec {
pname = "vulkan-extension-layer";
version = "1.2.198.0";
version = "1.3.211.0";
src = (assert version == vulkan-headers.version;
fetchFromGitHub {
owner = "KhronosGroup";
repo = "Vulkan-ExtensionLayer";
rev = "sdk-${version}";
sha256 = "sha256-g674rw8lXyP1WUoJmbRRL7s+1Yxs00sR04+hTQ3l3dE=";
sha256 = "sha256-ixCfHnp6YAOuR4NMTGjhhqkfm0H7ZcO/8xKFJqw16YE=";
});
nativeBuildInputs = [ cmake jq ];

View File

@ -23,14 +23,14 @@
stdenv.mkDerivation rec {
pname = "vulkan-tools-lunarg";
# The version must match that in vulkan-headers
version = "1.2.189.1";
version = "1.3.211.0";
src = (assert version == vulkan-headers.version;
fetchFromGitHub {
owner = "LunarG";
repo = "VulkanTools";
rev = "sdk-${version}";
sha256 = "0431dgplv5wiz8bj0ja91mbpc2qhjgdhqhrgaqarvyvjr1f7jw52";
sha256 = "sha256-Pkz2FV0AnTKm/4jVmkQNkYzpxpKJaSoy2fRAhVh5OKU=";
fetchSubmodules = true;
});

View File

@ -1,9 +1,24 @@
{ stdenv, lib, fetchFromGitHub, cmake, glslang, libX11, libxcb
, libXrandr, vulkan-headers, vulkan-loader, wayland }:
{ lib
, stdenv
, fetchFromGitHub
, cmake
, pkgconfig
, glslang
, libffi
, libX11
, libXau
, libxcb
, libXdmcp
, libXrandr
, vulkan-headers
, vulkan-loader
, wayland
, wayland-protocols
}:
stdenv.mkDerivation rec {
pname = "vulkan-tools";
version = "1.2.198.0";
version = "1.3.211.0";
# It's not strictly necessary to have matching versions here, however
# since we're using the SDK version we may as well be consistent with
@ -13,11 +28,27 @@ stdenv.mkDerivation rec {
owner = "KhronosGroup";
repo = "Vulkan-Tools";
rev = "sdk-${version}";
sha256 = "sha256-oNJm9Gi41aA5krkpkQI0EYdIlMcQpdodv9yqXhnNURA=";
sha256 = "sha256-iXsWTKNllPZy1Kpo3JHzEEus3Hu9LofvMB3c4Gn6/DM=";
});
nativeBuildInputs = [ cmake ];
buildInputs = [ glslang libX11 libxcb libXrandr vulkan-headers vulkan-loader wayland ];
nativeBuildInputs = [
cmake
pkgconfig
];
buildInputs = [
glslang
libffi
libX11
libXau
libxcb
libXdmcp
libXrandr
vulkan-headers
vulkan-loader
wayland
wayland-protocols
];
libraryPath = lib.strings.makeLibraryPath [ vulkan-loader ];
@ -28,6 +59,7 @@ stdenv.mkDerivation rec {
"-DBUILD_ICD=OFF"
# vulkaninfo loads libvulkan using dlopen, so we have to add it manually to RPATH
"-DCMAKE_INSTALL_RPATH=${libraryPath}"
"-DPKG_CONFIG_EXECUTABLE=${pkgconfig}/bin/pkg-config"
# Hide dev warnings that are useless for packaging
"-Wno-dev"
];

View File

@ -10,6 +10,7 @@
, pycryptodomex
, websockets
, mutagen
, atomicparsleySupport ? true
, ffmpegSupport ? true
, rtmpSupport ? true
, phantomjsSupport ? false
@ -37,11 +38,12 @@ buildPythonPackage rec {
# - atomicparsley: embedding thumbnails
makeWrapperArgs =
let
packagesToBinPath = [ atomicparsley ]
packagesToBinPath = []
++ lib.optional atomicparsleySupport atomicparsley
++ lib.optional ffmpegSupport ffmpeg
++ lib.optional rtmpSupport rtmpdump
++ lib.optional phantomjsSupport phantomjs2;
in
in lib.optionalString (packagesToBinPath != [])
[ ''--prefix PATH : "${lib.makeBinPath packagesToBinPath}"'' ];
setupPyBuildFlags = [

View File

@ -990,6 +990,8 @@ let
ocplib-simplex = callPackage ../development/ocaml-modules/ocplib-simplex { };
ocsigen-ppx-rpc = callPackage ../development/ocaml-modules/ocsigen-ppx-rpc { };
ocsigen_server = callPackage ../development/ocaml-modules/ocsigen-server { };
ocsigen-start = callPackage ../development/ocaml-modules/ocsigen-start { };
@ -1339,67 +1341,6 @@ let
terminal_size = callPackage ../development/ocaml-modules/terminal_size { };
tezos-010-PtGRANAD-test-helpers = callPackage ../development/ocaml-modules/tezos/010-PtGRANAD-test-helpers.nix { };
tezos-011-PtHangz2-test-helpers = callPackage ../development/ocaml-modules/tezos/011-PtHangz2-test-helpers.nix { };
tezos-base = callPackage ../development/ocaml-modules/tezos/base.nix { };
tezos-base-test-helpers = callPackage ../development/ocaml-modules/tezos/base-test-helpers.nix { };
tezos-clic = callPackage ../development/ocaml-modules/tezos/clic.nix { };
tezos-client-010-PtGRANAD = callPackage ../development/ocaml-modules/tezos/client-010-PtGRANAD.nix { };
tezos-client-011-PtHangz2 = callPackage ../development/ocaml-modules/tezos/client-011-PtHangz2.nix { };
tezos-client-base = callPackage ../development/ocaml-modules/tezos/client-base.nix { };
tezos-context = callPackage ../development/ocaml-modules/tezos/context.nix { };
tezos-crypto = callPackage ../development/ocaml-modules/tezos/crypto.nix { };
tezos-embedded-protocol-010-PtGRANAD = callPackage ../development/ocaml-modules/tezos/embedded-protocol-010-PtGRANAD.nix { };
tezos-embedded-protocol-demo-noops = callPackage ../development/ocaml-modules/tezos/embedded-protocol-demo-noops.nix { };
tezos-error-monad = callPackage ../development/ocaml-modules/tezos/error-monad.nix { };
tezos-event-logging = callPackage ../development/ocaml-modules/tezos/event-logging.nix { };
tezos-event-logging-test-helpers = callPackage ../development/ocaml-modules/tezos/event-logging-test-helpers.nix { };
tezos-legacy-store = callPackage ../development/ocaml-modules/tezos/legacy-store.nix { };
tezos-lmdb = callPackage ../development/ocaml-modules/tezos/lmdb.nix { };
tezos-hacl-glue = callPackage ../development/ocaml-modules/tezos/hacl-glue.nix { };
tezos-hacl-glue-unix = callPackage ../development/ocaml-modules/tezos/hacl-glue-unix.nix { };
tezos-lwt-result-stdlib = callPackage ../development/ocaml-modules/tezos/lwt-result-stdlib.nix { };
tezos-micheline = callPackage ../development/ocaml-modules/tezos/micheline.nix { };
tezos-mockup-proxy = callPackage ../development/ocaml-modules/tezos/mockup-proxy.nix { };
tezos-mockup-registration = callPackage ../development/ocaml-modules/tezos/mockup-registration.nix { };
tezos-p2p-services = callPackage ../development/ocaml-modules/tezos/p2p-services.nix { };
tezos-p2p = callPackage ../development/ocaml-modules/tezos/p2p.nix { };
tezos-protocol-010-PtGRANAD = callPackage ../development/ocaml-modules/tezos/protocol-010-PtGRANAD.nix { };
tezos-protocol-010-PtGRANAD-parameters = callPackage ../development/ocaml-modules/tezos/protocol-010-PtGRANAD-parameters.nix { };
tezos-protocol-011-PtHangz2 = callPackage ../development/ocaml-modules/tezos/protocol-011-PtHangz2.nix { };
tezos-protocol-011-PtHangz2-parameters = callPackage ../development/ocaml-modules/tezos/protocol-011-PtHangz2-parameters.nix { };
tezos-protocol-alpha = callPackage ../development/ocaml-modules/tezos/protocol-alpha.nix { };
tezos-protocol-compiler = callPackage ../development/ocaml-modules/tezos/protocol-compiler.nix { };
tezos-protocol-demo-noops = callPackage ../development/ocaml-modules/tezos/protocol-demo-noops.nix { };
tezos-protocol-environment-packer = callPackage ../development/ocaml-modules/tezos/protocol-environment-packer.nix { };
tezos-protocol-environment-sigs = callPackage ../development/ocaml-modules/tezos/protocol-environment-sigs.nix { };
tezos-protocol-environment-structs = callPackage ../development/ocaml-modules/tezos/protocol-environment-structs.nix { };
tezos-protocol-environment = callPackage ../development/ocaml-modules/tezos/protocol-environment.nix { };
tezos-protocol-plugin-010-PtGRANAD = callPackage ../development/ocaml-modules/tezos/protocol-plugin-010-PtGRANAD.nix { };
tezos-protocol-plugin-011-PtHangz2 = callPackage ../development/ocaml-modules/tezos/protocol-plugin-011-PtHangz2.nix { };
tezos-protocol-plugin-alpha = callPackage ../development/ocaml-modules/tezos/protocol-plugin-alpha.nix { };
tezos-protocol-updater = callPackage ../development/ocaml-modules/tezos/protocol-updater.nix { };
tezos-proxy = callPackage ../development/ocaml-modules/tezos/proxy.nix { };
tezos-requester = callPackage ../development/ocaml-modules/tezos/requester.nix { };
tezos-rpc-http-client-unix = callPackage ../development/ocaml-modules/tezos/rpc-http-client-unix.nix { };
tezos-rpc-http-client = callPackage ../development/ocaml-modules/tezos/rpc-http-client.nix { };
tezos-rpc-http = callPackage ../development/ocaml-modules/tezos/rpc-http.nix { };
tezos-rpc = callPackage ../development/ocaml-modules/tezos/rpc.nix { };
tezos-sapling = callPackage ../development/ocaml-modules/tezos/sapling.nix { };
tezos-shell-context = callPackage ../development/ocaml-modules/tezos/shell-context.nix { };
tezos-shell-services = callPackage ../development/ocaml-modules/tezos/shell-services.nix { };
tezos-shell-services-test-helpers = callPackage ../development/ocaml-modules/tezos/shell-services-test-helpers.nix { };
tezos-shell = callPackage ../development/ocaml-modules/tezos/shell.nix { };
tezos-signer-backends = callPackage ../development/ocaml-modules/tezos/signer-backends.nix { };
tezos-signer-services = callPackage ../development/ocaml-modules/tezos/signer-services.nix { };
tezos-stdlib-unix = callPackage ../development/ocaml-modules/tezos/stdlib-unix.nix { };
tezos-stdlib = callPackage ../development/ocaml-modules/tezos/stdlib.nix { };
tezos-test-helpers = callPackage ../development/ocaml-modules/tezos/test-helpers.nix { };
tezos-store = callPackage ../development/ocaml-modules/tezos/store.nix { };
tezos-validation = callPackage ../development/ocaml-modules/tezos/validation.nix { };
tezos-version = callPackage ../development/ocaml-modules/tezos/version.nix { };
tezos-workers = callPackage ../development/ocaml-modules/tezos/workers.nix { };
theora = callPackage ../development/ocaml-modules/theora { };
toml = callPackage ../development/ocaml-modules/toml { };

View File

@ -11103,8 +11103,10 @@ in {
yt-dlp = callPackage ../tools/misc/yt-dlp { };
yt-dlp-light = callPackage ../tools/misc/yt-dlp {
atomicparsleySupport = false;
ffmpegSupport = false;
phantomjsSupport = false;
rtmpSupport = false;
};
youtube-search = callPackage ../development/python-modules/youtube-search { };