Skip to content

Commit

Permalink
Update all Flake Inputs & Add texliveFull to the devShell (#6588)
Browse files Browse the repository at this point in the history
  • Loading branch information
zeme-wana authored Oct 24, 2024
1 parent 7abbf75 commit e294fcb
Show file tree
Hide file tree
Showing 21 changed files with 260 additions and 181 deletions.
5 changes: 3 additions & 2 deletions .editorconfig
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
root = true

[*]
indent_style = space
# TODO decide if we want this
# [*]
# indent_style = space

[*.{nix, hs, lagda, agda}]
charset = utf-8
Expand Down
4 changes: 2 additions & 2 deletions cabal.project
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,9 @@ repository cardano-haskell-packages
-- update either of these.
index-state:
-- Bump both the following dates if you need newer packages from Hackage
, hackage.haskell.org 2024-06-23T03:51:23Z
, hackage.haskell.org 2024-10-16T00:00:00Z
-- Bump this if you need newer packages from CHaP
, cardano-haskell-packages 2024-08-01T16:18:12Z
, cardano-haskell-packages 2024-10-16T00:00:00Z

packages: cardano-constitution
plutus-benchmark
Expand Down
9 changes: 5 additions & 4 deletions cardano-constitution/cardano-constitution.cabal
Original file line number Diff line number Diff line change
Expand Up @@ -118,15 +118,16 @@ test-suite cardano-constitution-test

build-depends:
, aeson
, base >=4.9 && <5
, base >=4.9 && <5
, bytestring
, cardano-constitution
, containers
, directory
, filepath
, plutus-core:{plutus-core, plutus-core-testlib} ^>=1.36
, plutus-ledger-api ^>=1.36
, plutus-tx ^>=1.36
, plutus-core ^>=1.36
, plutus-core:plutus-core-testlib
, plutus-ledger-api ^>=1.36
, plutus-tx ^>=1.36
, QuickCheck
, serialise
, tasty
Expand Down
113 changes: 67 additions & 46 deletions flake.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 2 additions & 1 deletion flake.nix
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,8 @@
inputs.nixpkgs.follows = "nixpkgs";
};

nixpkgs.follows = "haskell-nix/nixpkgs";
nixpkgs.follows = "haskell-nix/nixpkgs-unstable";
nixpkgs-2405.follows = "haskell-nix/nixpkgs-2405";

hackage = {
url = "github:input-output-hk/hackage.nix";
Expand Down
12 changes: 8 additions & 4 deletions nix/agda-packages.nix
Original file line number Diff line number Diff line change
Expand Up @@ -18,15 +18,19 @@
let
Agda = repoRoot.nix.agda-project.hsPkgs.Agda;

frankenAgda = (pkgs.symlinkJoin {
frankenAgdaBin = pkgs.symlinkJoin {
name = "agda";
version = Agda.identifier.version;
paths = [
Agda.components.exes.agda
Agda.components.exes.agda-mode
];
}) //
{
version = Agda.identifier.version;
};

frankenAgda = frankenAgdaBin // {
# Newer Agda is built with enableSeparateBinOutput, hence this hacky workaround.
# https://github.com/NixOS/nixpkgs/commit/294245f7501e0a8e69b83346a4fa5afd4ed33ab3
bin = frankenAgdaBin;
};

frankenPkgs =
Expand Down
10 changes: 5 additions & 5 deletions nix/latex-documents.nix
Original file line number Diff line number Diff line change
Expand Up @@ -46,11 +46,11 @@ let
description = "Multi-currency paper";
};

plutus-core-spec-old = build-latex-doc {
name = "plutus-core-spec-old";
description = "Plutus core specification (old version)";
src = inputs.self + /doc/plutus-core-spec-old;
};
# plutus-core-spec-old = build-latex-doc {
# name = "plutus-core-spec-old";
# description = "Plutus core specification (old version)";
# src = inputs.self + /doc/plutus-core-spec-old;
# };

plutus-core-spec = build-latex-doc {
name = "plutus-core-spec";
Expand Down
1 change: 1 addition & 0 deletions nix/outputs.nix
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,7 @@ in
{
packages.plutus-metatheory-site = repoRoot.nix.plutus-metatheory-site;
packages.pre-commit-check = ghc96.pre-commit-check;
packages.agda-project = repoRoot.nix.agda-project.hsPkgs.Agda.components.exes.agda;
}

(lib.optionalAttrs (system == "x86_64-linux" || system == "x86_64-darwin")
Expand Down
7 changes: 6 additions & 1 deletion nix/plutus-metatheory-site.nix
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,12 @@ let

plutus-metatheory-site = pkgs.runCommand "plutus-metatheory-site"
{
buildInputs = [ pkgs.jekyll pkgs.linkchecker ];
buildInputs = [
pkgs.jekyll
# TODO lickcheker is broke in nixpkgs-usnstable, remove this when it's fixed
# pkgs.linkchecker
inputs.nixpkgs-2405.legacyPackages.linkchecker
];
}
''
mkdir "$out"
Expand Down
Loading

1 comment on commit e294fcb

@github-actions
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

⚠️ Performance Alert ⚠️

Possible performance regression was detected for benchmark 'Plutus Benchmarks'.
Benchmark result of this commit is worse than the previous benchmark result exceeding threshold 1.05.

Benchmark suite Current: e294fcb Previous: 7abbf75 Ratio
validation-auction_1-2 907.7 μs 632 μs 1.44
validation-auction_1-3 894.6 μs 623.8 μs 1.43
validation-auction_1-4 327.3 μs 255.1 μs 1.28
validation-multisig-sm-2 543.2 μs 384 μs 1.41
validation-multisig-sm-3 550.5 μs 390.5 μs 1.41
validation-multisig-sm-4 556.4 μs 393.8 μs 1.41
validation-multisig-sm-5 756.7 μs 563.2 μs 1.34
validation-multisig-sm-6 498.1 μs 394.6 μs 1.26
validation-multisig-sm-7 405.7 μs 385.3 μs 1.05
validation-multisig-sm-9 543.2 μs 412.1 μs 1.32
validation-multisig-sm-10 775.3 μs 610.1 μs 1.27
validation-ping-pong_2-1 282.6 μs 264.6 μs 1.07
validation-prism-1 240.1 μs 169.3 μs 1.42
validation-prism-2 583.8 μs 412.1 μs 1.42
validation-prism-3 408.5 μs 369.4 μs 1.11
validation-stablecoin_1-3 1272 μs 1047 μs 1.21
validation-stablecoin_1-4 297.3 μs 209.8 μs 1.42
validation-stablecoin_1-5 1895 μs 1343 μs 1.41
validation-stablecoin_1-6 366 μs 257.8 μs 1.42
validation-stablecoin_2-1 1277 μs 910.6 μs 1.40
validation-stablecoin_2-2 279.2 μs 196.4 μs 1.42
validation-stablecoin_2-3 1468 μs 1043 μs 1.41
validation-stablecoin_2-4 297.2 μs 209.1 μs 1.42
validation-token-account-1 266.6 μs 189.4 μs 1.41
validation-token-account-2 474.7 μs 337.1 μs 1.41
validation-uniswap-1 587 μs 417.4 μs 1.41
validation-uniswap-2 313 μs 220.5 μs 1.42
validation-uniswap-3 2492 μs 1770 μs 1.41
validation-uniswap-4 479 μs 336.6 μs 1.42
validation-uniswap-5 1637 μs 1164 μs 1.41
validation-uniswap-6 453.5 μs 320.2 μs 1.42
validation-vesting-1 494.8 μs 362.9 μs 1.36
validation-decode-future-increase-margin-1 239 μs 224.8 μs 1.06
validation-decode-future-increase-margin-4 982.3 μs 659.2 μs 1.49
validation-decode-future-increase-margin-5 979.1 μs 655 μs 1.49
validation-decode-future-pay-out-1 275 μs 226 μs 1.22
validation-decode-future-pay-out-2 450.8 μs 308.3 μs 1.46
validation-decode-future-pay-out-3 450.6 μs 304.7 μs 1.48
validation-decode-future-pay-out-4 881.4 μs 658.9 μs 1.34
validation-decode-future-settle-early-1 239.3 μs 225.9 μs 1.06
validation-decode-future-settle-early-2 345.3 μs 311.3 μs 1.11
validation-decode-game-sm-success_1-3 530.6 μs 503.1 μs 1.05
validation-decode-game-sm-success_2-2 226.2 μs 156.3 μs 1.45
validation-decode-game-sm-success_2-3 530.4 μs 498.8 μs 1.06
validation-decode-game-sm-success_2-4 180 μs 162.7 μs 1.11
validation-decode-game-sm-success_2-5 750.9 μs 706.9 μs 1.06
validation-decode-multisig-sm-3 833.4 μs 792.9 μs 1.05
validation-decode-multisig-sm-4 831.9 μs 786.9 μs 1.06
validation-decode-multisig-sm-5 833 μs 791.6 μs 1.05
validation-decode-multisig-sm-8 834 μs 717.6 μs 1.16
validation-decode-multisig-sm-9 825.8 μs 558.3 μs 1.48
validation-decode-multisig-sm-10 833.9 μs 717.4 μs 1.16
validation-decode-prism-3 341.7 μs 322.2 μs 1.06
validation-decode-stablecoin_1-1 1223 μs 1164 μs 1.05
validation-decode-stablecoin_1-3 1227 μs 1168 μs 1.05
validation-decode-stablecoin_2-1 1202 μs 963.9 μs 1.25
validation-decode-uniswap-1 344 μs 322.7 μs 1.07
validation-decode-uniswap-2 342.5 μs 319.3 μs 1.07
validation-decode-uniswap-3 1046 μs 916.4 μs 1.14
validation-decode-uniswap-4 250.2 μs 176.6 μs 1.42
nofib-clausify/formula5 63460 μs 53590 μs 1.18
nofib-knights/4x4 25350 μs 21650 μs 1.17
nofib-knights/6x6 66910 μs 46490 μs 1.44
nofib-knights/8x8 102800 μs 81950 μs 1.25
nofib-primetest/05digits 11000 μs 10260 μs 1.07
nofib-primetest/10digits 29020 μs 20060 μs 1.45
nofib-primetest/30digits 89800 μs 61880 μs 1.45
nofib-primetest/50digits 148400 μs 102500 μs 1.45
nofib-queens5x5/bt 104100 μs 72520 μs 1.44
nofib-queens5x5/bm 93540 μs 75870 μs 1.23
nofib-queens5x5/bjbt2 99700 μs 82560 μs 1.21
nofib-queens5x5/fc 228600 μs 174300 μs 1.31
marlowe-semantics/0003040402030103010203030303000200000104030002040304020400000102 1491 μs 1317 μs 1.13
marlowe-semantics/004025fd712d6c325ffa12c16d157064192992faf62e0b991d7310a2f91666b8 1150 μs 808.7 μs 1.42
marlowe-semantics/0101010001010101010101000100010100000001010000010001000001000101 1120 μs 936.7 μs 1.20
marlowe-semantics/04000f0b04051006000e060f09080d0b090d0104050a0b0f0506070f0a070008 801.1 μs 733.9 μs 1.09
marlowe-semantics/0543a00ba1f63076c1db6bf94c6ff13ae7d266dd7544678743890b0e8e1add63 1450 μs 1014 μs 1.43
marlowe-semantics/0705030002040601010206030604080208020207000101060706050502040301 1418 μs 988.4 μs 1.43
marlowe-semantics/07070c070510030509010e050d00040907050e0a0d06030f1006030701020607 1466 μs 1026 μs 1.43
marlowe-semantics/0bcfd9487614104ec48de2ea0b2c0979866a95115748c026f9ec129384c262c4 1604 μs 1121 μs 1.43
marlowe-semantics/0be82588e4e4bf2ef428d2f44b7687bbb703031d8de696d90ec789e70d6bc1d8 1956 μs 1365 μs 1.43
marlowe-semantics/0f1d0110001b121d051e15140c0c05141d151c1f1d201c040f10091b020a0e1a 677.1 μs 473.2 μs 1.43
marlowe-semantics/119fbea4164e2bf21d2b53aa6c2c4e79414fe55e4096f5ce2e804735a7fbaf91 1086 μs 760.1 μs 1.43
marlowe-semantics/12910f24d994d451ff379b12c9d1ecdb9239c9b87e5d7bea570087ec506935d5 698.4 μs 487.5 μs 1.43
marlowe-semantics/18cefc240debc0fcab14efdd451adfd02793093efe7bc76d6322aed6ddb582ad 1086 μs 754.5 μs 1.44
marlowe-semantics/bb5345bfbbc460af84e784b900ec270df1948bb1d1e29eacecd022eeb168b315 1376 μs 1031 μs 1.33
marlowe-semantics/c4bb185380df6e9b66fc1ee0564f09a8d1253a51a0c0c7890f2214df9ac19274 1062 μs 740.1 μs 1.43
marlowe-semantics/cdb9d5c233b288a5a9dcfbd8d5c1831a0bb46eec7a26fa31b80ae69d44805efc 1265 μs 1111 μs 1.14
marlowe-semantics/ced1ea04649e093a501e43f8568ac3e6b37cd3eccec8cac9c70a4857b88a5eb8 1204 μs 845.2 μs 1.42
marlowe-role-payout/4fbcfdb577a56b842d6f6938187a783f71d9da7519353e3da3ef0c564e1eb344 295 μs 205.6 μs 1.43
marlowe-role-payout/5a0725d49c733130eda8bc6ed5234f7f6ff8c9dd2d201e8806125e5fbcc081f9 257.7 μs 180.3 μs 1.43
marlowe-role-payout/5a2aae344e569a2c644dd9fa8c7b1f129850937eb562b7748c275f9e40bed596 246.9 μs 172 μs 1.44
marlowe-role-payout/5ade103e9530dd0d572fe1b053ea65ad925c6ebbe321e873ace8b804363fa82c 332.4 μs 233.8 μs 1.42
marlowe-role-payout/5d4c62a0671c65a14f6a15093e3efc4f1816d95a5a58fd92486bedaae8d9526b 283.5 μs 198 μs 1.43
marlowe-role-payout/5efe992e306e31cc857c64a62436ad2f9325acc5b4a74a8cebccdfd853ce63d2 254.9 μs 177.9 μs 1.43
marlowe-role-payout/622a7f3bc611b5149253c9189da022a9ff296f60a5b7c172a6dc286faa7284fa 280.2 μs 203.8 μs 1.37

This comment was automatically generated by workflow using github-action-benchmark.

CC: @IntersectMBO/plutus-core

Please sign in to comment.