From bbee1bade76b36f55e77fb00de068f15bdaa7018 Mon Sep 17 00:00:00 2001 From: Sebastian Nagel Date: Wed, 13 Sep 2023 10:09:05 +0200 Subject: [PATCH] Add aiken to our nix develop shell We intend to create one of the hydra-plutus scripts with aiken. --- flake.lock | 230 ++++++++++++++++++++++++++++++++------------ flake.nix | 2 + nix/hydra/shell.nix | 3 + 3 files changed, 172 insertions(+), 63 deletions(-) diff --git a/flake.lock b/flake.lock index 1e1c8200078..55053db335f 100644 --- a/flake.lock +++ b/flake.lock @@ -66,6 +66,26 @@ "type": "github" } }, + "aiken": { + "inputs": { + "flake-utils": "flake-utils", + "nixpkgs": "nixpkgs", + "rust-overlay": "rust-overlay" + }, + "locked": { + "lastModified": 1727863681, + "narHash": "sha256-lzSItBMYcZ7Q92+u/8XFoFgwslfkUBf8RqsunrIoruQ=", + "owner": "aiken-lang", + "repo": "aiken", + "rev": "c7ae161a39c29656938ce1c8d4f674e387980022", + "type": "github" + }, + "original": { + "owner": "aiken-lang", + "repo": "aiken", + "type": "github" + } + }, "blank": { "locked": { "lastModified": 1625557891, @@ -249,7 +269,7 @@ }, "cardano-automation": { "inputs": { - "flake-utils": "flake-utils", + "flake-utils": "flake-utils_2", "haskellNix": [ "cardano-node", "haskellNix" @@ -276,7 +296,7 @@ }, "cardano-mainnet-mirror": { "inputs": { - "nixpkgs": "nixpkgs_4" + "nixpkgs": "nixpkgs_6" }, "locked": { "lastModified": 1642701714, @@ -650,6 +670,24 @@ } }, "flake-utils": { + "inputs": { + "systems": "systems" + }, + "locked": { + "lastModified": 1689068808, + "narHash": "sha256-6ixXo3wt24N/melDWjq70UuHQLxGV8jZvooRanIHXw0=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "919d646de7be200f3bf08cb76ae1f09402b6f9b4", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, + "flake-utils_2": { "locked": { "lastModified": 1667395993, "narHash": "sha256-nuEHfE/LcWyuSWnS8t12N1wc105Qtau+/OdUAjtQ0rA=", @@ -664,7 +702,7 @@ "type": "github" } }, - "flake-utils_2": { + "flake-utils_3": { "locked": { "lastModified": 1653893745, "narHash": "sha256-0jntwV3Z8//YwuOjzhV2sgJJPt+HY6KhU7VZUL0fKZQ=", @@ -679,7 +717,7 @@ "type": "github" } }, - "flake-utils_3": { + "flake-utils_4": { "locked": { "lastModified": 1659877975, "narHash": "sha256-zllb8aq3YO3h8B/U0/J1WBgAL8EX5yWf5pMj3G0NAmc=", @@ -694,7 +732,7 @@ "type": "github" } }, - "flake-utils_4": { + "flake-utils_5": { "locked": { "lastModified": 1653893745, "narHash": "sha256-0jntwV3Z8//YwuOjzhV2sgJJPt+HY6KhU7VZUL0fKZQ=", @@ -709,7 +747,7 @@ "type": "github" } }, - "flake-utils_5": { + "flake-utils_6": { "locked": { "lastModified": 1644229661, "narHash": "sha256-1YdnJAsNy69bpcjuoKdOYQX0YxZBiCYZo4Twxerqv7k=", @@ -813,7 +851,7 @@ }, "gomod2nix": { "inputs": { - "nixpkgs": "nixpkgs", + "nixpkgs": "nixpkgs_3", "utils": "utils" }, "locked": { @@ -1411,7 +1449,7 @@ "inputs": { "flake-parts": "flake-parts_2", "formal-ledger": "formal-ledger", - "nixpkgs": "nixpkgs_8" + "nixpkgs": "nixpkgs_10" }, "locked": { "lastModified": 1725260503, @@ -1475,7 +1513,7 @@ "iohk-nix": { "inputs": { "blst": "blst_2", - "nixpkgs": "nixpkgs_9", + "nixpkgs": "nixpkgs_11", "secp256k1": "secp256k1_2", "sodium": "sodium_2" }, @@ -1568,7 +1606,7 @@ }, "lint-utils": { "inputs": { - "flake-utils": "flake-utils_5", + "flake-utils": "flake-utils_6", "nixpkgs": [ "haskellNix", "nixpkgs" @@ -1640,7 +1678,7 @@ "inputs": { "crane": "crane", "flake-parts": "flake-parts_3", - "nixpkgs": "nixpkgs_10", + "nixpkgs": "nixpkgs_12", "treefmt-nix": "treefmt-nix" }, "locked": { @@ -1660,7 +1698,7 @@ }, "n2c": { "inputs": { - "flake-utils": "flake-utils_4", + "flake-utils": "flake-utils_5", "nixpkgs": [ "cardano-node", "cardano-automation", @@ -1686,7 +1724,7 @@ "nix": { "inputs": { "lowdown-src": "lowdown-src", - "nixpkgs": "nixpkgs_5", + "nixpkgs": "nixpkgs_7", "nixpkgs-regression": "nixpkgs-regression" }, "locked": { @@ -1744,7 +1782,7 @@ }, "nix-npm-buildpackage": { "inputs": { - "nixpkgs": "nixpkgs_11" + "nixpkgs": "nixpkgs_13" }, "locked": { "lastModified": 1686315622, @@ -1762,8 +1800,8 @@ }, "nix2container": { "inputs": { - "flake-utils": "flake-utils_2", - "nixpkgs": "nixpkgs_2" + "flake-utils": "flake-utils_3", + "nixpkgs": "nixpkgs_4" }, "locked": { "lastModified": 1658567952, @@ -1782,7 +1820,7 @@ "nix_2": { "inputs": { "lowdown-src": "lowdown-src_2", - "nixpkgs": "nixpkgs_7", + "nixpkgs": "nixpkgs_9", "nixpkgs-regression": "nixpkgs-regression_2" }, "locked": { @@ -1840,15 +1878,15 @@ }, "nixpkgs": { "locked": { - "lastModified": 1653581809, - "narHash": "sha256-Uvka0V5MTGbeOfWte25+tfRL3moECDh1VwokWSZUdoY=", - "owner": "NixOS", + "lastModified": 1725103162, + "narHash": "sha256-Ym04C5+qovuQDYL/rKWSR+WESseQBbNAe5DsXNx5trY=", + "owner": "nixos", "repo": "nixpkgs", - "rev": "83658b28fe638a170a19b8933aa008b30640fbd1", + "rev": "12228ff1752d7b7624a54e9c1af4b222b3c1073b", "type": "github" }, "original": { - "owner": "NixOS", + "owner": "nixos", "ref": "nixos-unstable", "repo": "nixpkgs", "type": "github" @@ -2211,6 +2249,37 @@ } }, "nixpkgs_10": { + "locked": { + "lastModified": 1718717814, + "narHash": "sha256-xB7AzKY4BP7yypo6g+sk1tnVK54sBIJMeEBB5CdbhT4=", + "owner": "nixos", + "repo": "nixpkgs", + "rev": "88af533d8ae8d1e7e4648decf7817ebff91abf56", + "type": "github" + }, + "original": { + "owner": "nixos", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_11": { + "locked": { + "lastModified": 1684171562, + "narHash": "sha256-BMUWjVWAUdyMWKk0ATMC9H0Bv4qAV/TXwwPUvTiC5IQ=", + "owner": "nixos", + "repo": "nixpkgs", + "rev": "55af203d468a6f5032a519cba4f41acf5a74b638", + "type": "github" + }, + "original": { + "owner": "nixos", + "ref": "release-22.11", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_12": { "locked": { "lastModified": 1725816686, "narHash": "sha256-0Kq2MkQ/sQX1rhWJ/ySBBQlBJBUK8mPMDcuDhhdBkSU=", @@ -2226,7 +2295,7 @@ "type": "github" } }, - "nixpkgs_11": { + "nixpkgs_13": { "locked": { "lastModified": 1653917367, "narHash": "sha256-04MsJC0g9kE01nBuXThMppZK+yvCZECQnUaZKSU+HJo=", @@ -2241,6 +2310,38 @@ } }, "nixpkgs_2": { + "locked": { + "lastModified": 1718428119, + "narHash": "sha256-WdWDpNaq6u1IPtxtYHHWpl5BmabtpmLnMAx0RdJ/vo8=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "e6cea36f83499eb4e9cd184c8a8e823296b50ad5", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixpkgs-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_3": { + "locked": { + "lastModified": 1653581809, + "narHash": "sha256-Uvka0V5MTGbeOfWte25+tfRL3moECDh1VwokWSZUdoY=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "83658b28fe638a170a19b8933aa008b30640fbd1", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_4": { "locked": { "lastModified": 1654807842, "narHash": "sha256-ADymZpr6LuTEBXcy6RtFHcUZdjKTBRTMYwu19WOx17E=", @@ -2255,7 +2356,7 @@ "type": "github" } }, - "nixpkgs_3": { + "nixpkgs_5": { "locked": { "lastModified": 1665087388, "narHash": "sha256-FZFPuW9NWHJteATOf79rZfwfRn5fE0wi9kRzvGfDHPA=", @@ -2271,7 +2372,7 @@ "type": "github" } }, - "nixpkgs_4": { + "nixpkgs_6": { "locked": { "lastModified": 1642336556, "narHash": "sha256-QSPPbFEwy0T0DrIuSzAACkaANPQaR1lZR/nHZGz9z04=", @@ -2285,7 +2386,7 @@ "type": "indirect" } }, - "nixpkgs_5": { + "nixpkgs_7": { "locked": { "lastModified": 1657693803, "narHash": "sha256-G++2CJ9u0E7NNTAi9n5G8TdDmGJXcIjkJ3NF8cetQB8=", @@ -2301,7 +2402,7 @@ "type": "github" } }, - "nixpkgs_6": { + "nixpkgs_8": { "locked": { "lastModified": 1708343346, "narHash": "sha256-qlzHvterVRzS8fS0ophQpkh0rqw0abijHEOAKm0HmV0=", @@ -2317,7 +2418,7 @@ "type": "github" } }, - "nixpkgs_7": { + "nixpkgs_9": { "locked": { "lastModified": 1657693803, "narHash": "sha256-G++2CJ9u0E7NNTAi9n5G8TdDmGJXcIjkJ3NF8cetQB8=", @@ -2333,37 +2434,6 @@ "type": "github" } }, - "nixpkgs_8": { - "locked": { - "lastModified": 1718717814, - "narHash": "sha256-xB7AzKY4BP7yypo6g+sk1tnVK54sBIJMeEBB5CdbhT4=", - "owner": "nixos", - "repo": "nixpkgs", - "rev": "88af533d8ae8d1e7e4648decf7817ebff91abf56", - "type": "github" - }, - "original": { - "owner": "nixos", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_9": { - "locked": { - "lastModified": 1684171562, - "narHash": "sha256-BMUWjVWAUdyMWKk0ATMC9H0Bv4qAV/TXwwPUvTiC5IQ=", - "owner": "nixos", - "repo": "nixpkgs", - "rev": "55af203d468a6f5032a519cba4f41acf5a74b638", - "type": "github" - }, - "original": { - "owner": "nixos", - "ref": "release-22.11", - "repo": "nixpkgs", - "type": "github" - } - }, "nosys": { "locked": { "lastModified": 1668010795, @@ -2494,6 +2564,7 @@ "root": { "inputs": { "CHaP": "CHaP", + "aiken": "aiken", "cardano-node": "cardano-node", "flake-parts": "flake-parts", "haskellNix": "haskellNix_2", @@ -2511,6 +2582,24 @@ "process-compose-flake": "process-compose-flake" } }, + "rust-overlay": { + "inputs": { + "nixpkgs": "nixpkgs_2" + }, + "locked": { + "lastModified": 1725330199, + "narHash": "sha256-oUkdPJIxP3r3YyVOBLkDVLIJiQV9YlrVqA+jNcdpCvM=", + "owner": "oxalica", + "repo": "rust-overlay", + "rev": "a562172c72d00350f9f2ff830e6515b6e7bee6d5", + "type": "github" + }, + "original": { + "owner": "oxalica", + "repo": "rust-overlay", + "type": "github" + } + }, "secp256k1": { "flake": false, "locked": { @@ -2616,7 +2705,7 @@ "blank": "blank", "devshell": "devshell", "dmerge": "dmerge", - "flake-utils": "flake-utils_3", + "flake-utils": "flake-utils_4", "makes": [ "cardano-node", "cardano-automation", @@ -2634,7 +2723,7 @@ ], "n2c": "n2c", "nixago": "nixago", - "nixpkgs": "nixpkgs_3", + "nixpkgs": "nixpkgs_5", "yants": "yants" }, "locked": { @@ -2688,7 +2777,7 @@ "std", "blank" ], - "nixpkgs": "nixpkgs_6", + "nixpkgs": "nixpkgs_8", "paisano": "paisano", "paisano-tui": "paisano-tui", "terranix": [ @@ -2727,6 +2816,21 @@ "type": "github" } }, + "systems_2": { + "locked": { + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "owner": "nix-systems", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", + "type": "github" + }, + "original": { + "owner": "nix-systems", + "repo": "default", + "type": "github" + } + }, "treefmt-nix": { "inputs": { "nixpkgs": [ @@ -2790,7 +2894,7 @@ }, "utils_2": { "inputs": { - "systems": "systems" + "systems": "systems_2" }, "locked": { "lastModified": 1710146030, diff --git a/flake.nix b/flake.nix index b874b02d248..670a0307a62 100644 --- a/flake.nix +++ b/flake.nix @@ -15,6 +15,7 @@ url = "github:IntersectMBO/cardano-haskell-packages?ref=repo"; flake = false; }; + aiken.url = "github:aiken-lang/aiken"; hls = { url = "github:haskell/haskell-language-server"; flake = false; @@ -168,6 +169,7 @@ ]); devShells = import ./nix/hydra/shell.nix { + inherit (inputs) aiken; inherit inputs pkgs hsPkgs system pkgsLatest; ghc = pkgs.buildPackages.haskell-nix.compiler.${compiler}; }; diff --git a/nix/hydra/shell.nix b/nix/hydra/shell.nix index 2468d894a6d..8bdb0cbe541 100644 --- a/nix/hydra/shell.nix +++ b/nix/hydra/shell.nix @@ -8,6 +8,7 @@ , pkgs , ghc , pkgsLatest +, aiken }: let @@ -18,6 +19,8 @@ let pkgs.cabal-install # Handy tool to debug the cabal build plan pkgs.cabal-plan + # To compile hydra scripts + aiken.packages.${system}.aiken # To interact with cardano-node and integration tests pkgs.cardano-cli # For integration tests