diff --git a/flake.lock b/flake.lock index 49f2ef27..8c2b75e6 100644 --- a/flake.lock +++ b/flake.lock @@ -20,11 +20,11 @@ ] }, "locked": { - "lastModified": 1736955230, - "narHash": "sha256-uenf8fv2eG5bKM8C/UvFaiJMZ4IpUFaQxk9OH5t/1gA=", + "lastModified": 1747575206, + "narHash": "sha256-NwmAFuDUO/PFcgaGGr4j3ozG9Pe5hZ/ogitWhY+D81k=", "owner": "ryantm", "repo": "agenix", - "rev": "e600439ec4c273cf11e06fe4d9d906fb98fa097c", + "rev": "4835b1dc898959d8547a871ef484930675cb47f1", "type": "github" }, "original": { @@ -33,38 +33,6 @@ "type": "github" } }, - "bats-assert": { - "flake": false, - "locked": { - "lastModified": 1692829535, - "narHash": "sha256-oDqhUQ6Xg7a3xx537SWLGRzqP3oKKeyY4UYGCdz9z/Y=", - "owner": "bats-core", - "repo": "bats-assert", - "rev": "e2d855bc78619ee15b0c702b5c30fb074101159f", - "type": "github" - }, - "original": { - "owner": "bats-core", - "repo": "bats-assert", - "type": "github" - } - }, - "bats-support": { - "flake": false, - "locked": { - "lastModified": 1693050811, - "narHash": "sha256-PxJaH16+QrsfZqtkWVt5K6TwJB5gjIXnbGo+MB84WIU=", - "owner": "bats-core", - "repo": "bats-support", - "rev": "9bf10e876dd6b624fe44423f0b35e064225f7556", - "type": "github" - }, - "original": { - "owner": "bats-core", - "repo": "bats-support", - "type": "github" - } - }, "cachix": { "inputs": { "devenv": [ @@ -85,11 +53,11 @@ ] }, "locked": { - "lastModified": 1744206633, - "narHash": "sha256-pb5aYkE8FOoa4n123slgHiOf1UbNSnKe5pEZC+xXD5g=", + "lastModified": 1747483371, + "narHash": "sha256-0Iz+PqC0i1aJRoyK+WaZMJFFBloFta9atWbs76+7eYw=", "owner": "cachix", "repo": "cachix", - "rev": "8a60090640b96f9df95d1ab99e5763a586be1404", + "rev": "99505198a23126c7ed4188e859655da8c59ce7cf", "type": "github" }, "original": { @@ -100,11 +68,11 @@ }, "crane": { "locked": { - "lastModified": 1744386647, - "narHash": "sha256-DXwQEJllxpYeVOiSlBhQuGjfvkoGHTtILLYO2FvcyzQ=", + "lastModified": 1748047550, + "narHash": "sha256-t0qLLqb4C1rdtiY8IFRH5KIapTY/n3Lqt57AmxEv9mk=", "owner": "ipetkov", "repo": "crane", - "rev": "d02c1cdd7ec539699aa44e6ff912e15535969803", + "rev": "b718a78696060df6280196a6f992d04c87a16aef", "type": "github" }, "original": { @@ -134,11 +102,11 @@ ] }, "locked": { - "lastModified": 1744477385, - "narHash": "sha256-2zsUfDPzJG+L30soukmDSKCeCohIVtE820mZOEdXCD8=", + "lastModified": 1747717470, + "narHash": "sha256-tk2mRZAf8C5uOkMVJHemJ3ld09CYVp/z94/lHqsQ8ZA=", "owner": "cachix", "repo": "devenv", - "rev": "2c37aeb5ab035e8e690599c5ea692f8519d42c4a", + "rev": "c7f2256ee4a4a4ee9cbf1e82a6e49b253c374995", "type": "github" }, "original": { @@ -193,11 +161,11 @@ ] }, "locked": { - "lastModified": 1744145203, - "narHash": "sha256-I2oILRiJ6G+BOSjY+0dGrTPe080L3pbKpc+gCV3Nmyk=", + "lastModified": 1747742835, + "narHash": "sha256-kYL4GCwwznsypvsnA20oyvW8zB/Dvn6K5G/tgMjVMT4=", "owner": "nix-community", "repo": "disko", - "rev": "76c0a6dba345490508f36c1aa3c7ba5b6b460989", + "rev": "df522e787fdffc4f32ed3e1fca9ed0968a384d62", "type": "github" }, "original": { @@ -300,11 +268,11 @@ "rust-analyzer-src": "rust-analyzer-src" }, "locked": { - "lastModified": 1744231114, - "narHash": "sha256-60gLl2rJFt6SRwqWimsTAeHgfsIE1iV0zChdJFOvx8w=", + "lastModified": 1747392669, + "narHash": "sha256-zky3+lndxKRu98PAwVK8kXPdg+Q1NVAhaI7YGrboKYA=", "owner": "nix-community", "repo": "fenix", - "rev": "0ccfe532b1433da8e5a23cd513ff6847e0f6a8c2", + "rev": "c3c27e603b0d9b5aac8a16236586696338856fbb", "type": "github" }, "original": { @@ -316,11 +284,11 @@ "flake-compat": { "flake": false, "locked": { - "lastModified": 1733328505, - "narHash": "sha256-NeCCThCEP3eCl2l/+27kNNK7QrwZB1IJCrXfrbv5oqU=", + "lastModified": 1747046372, + "narHash": "sha256-CIVLLkVgvHYbgI2UpXvIIBJ12HWgX+fjA8Xf8PUmqCY=", "owner": "edolstra", "repo": "flake-compat", - "rev": "ff81ac966bb2cae68946d5ed5fc4994f96d0ffec", + "rev": "9100a0f413b0c601e0533d1d94ffd501ce2e7885", "type": "github" }, "original": { @@ -530,11 +498,11 @@ ] }, "locked": { - "lastModified": 1742649964, - "narHash": "sha256-DwOTp7nvfi8mRfuL1escHDXabVXFGT1VlPD1JHrtrco=", + "lastModified": 1747372754, + "narHash": "sha256-2Y53NGIX2vxfie1rOW0Qb86vjRZ7ngizoo+bnXU9D9k=", "owner": "cachix", "repo": "git-hooks.nix", - "rev": "dcf5072734cb576d2b0c59b2ac44f5050b5eac82", + "rev": "80479b6ec16fefd9c1db3ea13aeb038c60530f46", "type": "github" }, "original": { @@ -577,11 +545,11 @@ ] }, "locked": { - "lastModified": 1742014779, - "narHash": "sha256-I6fG1zrfdLFcp/imGZElig0BJO3YU0QEXLgvwWoOpJ8=", + "lastModified": 1748000383, + "narHash": "sha256-EaAJhwfJGBncgIV/0NlJviid2DP93cTMc9h0q6P6xXk=", "owner": "hercules-ci", "repo": "hercules-ci-effects", - "rev": "524637ef84c177661690b924bf64a1ce18072a2c", + "rev": "231726642197817d20310b9d39dd4afb9e899489", "type": "github" }, "original": { @@ -598,11 +566,11 @@ ] }, "locked": { - "lastModified": 1744117652, - "narHash": "sha256-t7dFCDl4vIOOUMhEZnJF15aAzkpaup9x4ZRGToDFYWI=", + "lastModified": 1747688870, + "narHash": "sha256-ypL9WAZfmJr5V70jEVzqGjjQzF0uCkz+AFQF7n9NmNc=", "owner": "nix-community", "repo": "home-manager", - "rev": "b4e98224ad1336751a2ac7493967a4c9f6d9cb3f", + "rev": "d5f1f641b289553927b3801580598d200a501863", "type": "github" }, "original": { @@ -612,6 +580,27 @@ "type": "github" } }, + "home-manager-unstable": { + "inputs": { + "nixpkgs": [ + "nixos-modules", + "nixpkgs-unstable" + ] + }, + "locked": { + "lastModified": 1748130923, + "narHash": "sha256-e/NSpOYw9ZjrzuNkp5hsrxeXOmYhMUCJ4mEuTFDionE=", + "owner": "nix-community", + "repo": "home-manager", + "rev": "c3d48a17aad6778348abb1c4109add90cc42107c", + "type": "github" + }, + "original": { + "owner": "nix-community", + "repo": "home-manager", + "type": "github" + } + }, "lib-extras": { "inputs": { "devshell": [ @@ -680,11 +669,11 @@ "spectrum": "spectrum" }, "locked": { - "lastModified": 1743083165, - "narHash": "sha256-Fz7AiCJWtoWZ2guJwO3B1h3RuJxYWaCzFIqY0Kmkyrs=", + "lastModified": 1747859546, + "narHash": "sha256-tDu6JFzM86y5L2eLAkkw5Aklzz0DwfohtcxRXw+fCHA=", "owner": "astro", "repo": "microvm.nix", - "rev": "773d5a04e2e10ca7b412270dea11276a496e1b61", + "rev": "91ba136db1a3dd73168639c185fa802eb1157ec1", "type": "github" }, "original": { @@ -741,11 +730,11 @@ ] }, "locked": { - "lastModified": 1741798497, - "narHash": "sha256-E3j+3MoY8Y96mG1dUIiLFm2tZmNbRvSiyN7CrSKuAVg=", + "lastModified": 1745930071, + "narHash": "sha256-bYyjarS3qSNqxfgc89IoVz8cAFDkF9yPE63EJr+h50s=", "owner": "domenkozar", "repo": "nix", - "rev": "f3f44b2baaf6c4c6e179de8cbb1cc6db031083cd", + "rev": "b455edf3505f1bf0172b39a735caef94687d0d9c", "type": "github" }, "original": { @@ -763,11 +752,11 @@ ] }, "locked": { - "lastModified": 1744478979, - "narHash": "sha256-dyN+teG9G82G+m+PX/aSAagkC+vUv0SgUw3XkPhQodQ=", + "lastModified": 1748130652, + "narHash": "sha256-lHwMkKdqE2nUw8+DynnmZlVwd4e0tyNp0KjwfExgXz0=", "owner": "LnL7", "repo": "nix-darwin", - "rev": "43975d782b418ebf4969e9ccba82466728c2851b", + "rev": "e0a7c37735338d5155d70cf46e24b4b0db42a612", "type": "github" }, "original": { @@ -788,11 +777,11 @@ ] }, "locked": { - "lastModified": 1742501024, - "narHash": "sha256-4G0RaAkRQY8Oty0WjoDfIkEAkX7PckUqUGjAQrxhDiA=", + "lastModified": 1744699837, + "narHash": "sha256-mJ1OgxMM2VTTjSVrMZItM8DxttzROYbWkmEPvYF/Kpg=", "owner": "nlewo", "repo": "nix2container", - "rev": "e6315c8307edf2938ae24df0e28b47ca865121de", + "rev": "78aadfc4ee1f9c2ee256e304b180ca356eb6a045", "type": "github" }, "original": { @@ -812,11 +801,11 @@ "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1744423808, - "narHash": "sha256-DiivRNDj39u86uUilkmbgbx2c1NqWVQ3fxw6fFfVO14=", + "lastModified": 1746955667, + "narHash": "sha256-VgVbPqZl8S09EGWFmgX++aFsz0Z7VmskSJGBXFE4eEs=", "owner": "nix-community", "repo": "nixd", - "rev": "3aa27fde1edcf7b126c70a62aad05d120209363c", + "rev": "7d19dfe5b65035aa255b83147375fdd8257459b9", "type": "github" }, "original": { @@ -859,11 +848,11 @@ }, "nixos-2411": { "locked": { - "lastModified": 1744309437, - "narHash": "sha256-QZnNHM823am8apCqKSPdtnzPGTy2ZB4zIXOVoBp5+W0=", + "lastModified": 1747862697, + "narHash": "sha256-U4HaNZ1W26cbOVm0Eb5OdGSnfQVWQKbLSPrSSa78KC0=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "f9ebe33a928b5d529c895202263a5ce46bdf12f7", + "rev": "2baa12ff69913392faf0ace833bc54bba297ea95", "type": "github" }, "original": { @@ -898,11 +887,11 @@ ] }, "locked": { - "lastModified": 1744288162, - "narHash": "sha256-HfVJ7/+iH3LTzD/KVRQKos3OvnKgV2iYRu+sLD/iGX8=", + "lastModified": 1747902977, + "narHash": "sha256-P39dIT2qvpjZzWI+tUIHUQEQ36YKzlOPSXpE5ccikMY=", "owner": "numtide", "repo": "nixos-anywhere", - "rev": "5f021d6671a8c8de22bb80c0bea05b4edc0752ea", + "rev": "b21cc6ab00338644ce7ccdc390343dd3a1ee3960", "type": "github" }, "original": { @@ -923,11 +912,11 @@ ] }, "locked": { - "lastModified": 1744247568, - "narHash": "sha256-u2k94yjX9RZhvUgKP3sdfra8cAJpRFe6IO8HVjAbsDA=", + "lastModified": 1747883839, + "narHash": "sha256-SVoCEKTaQLR7JNO7d9qppTf2HvuYoIkSr6M4+Qm8ZW8=", "owner": "nix-community", "repo": "nixos-images", - "rev": "55f83f47dde5a4457cfefc76c54463e570a67f3c", + "rev": "d4cd92157db8c0525da5f7cd08752751098ffdae", "type": "github" }, "original": { @@ -953,6 +942,7 @@ "git-hooks-nix": "git-hooks-nix", "hercules-ci-effects": "hercules-ci-effects", "home-manager": "home-manager", + "home-manager-unstable": "home-manager-unstable", "microvm": "microvm", "nix-darwin": "nix-darwin", "nix2container": "nix2container", @@ -974,11 +964,11 @@ "vscode-server": "vscode-server" }, "locked": { - "lastModified": 1744622722, - "narHash": "sha256-iXJ5+O4Ic9XMoR99KnfeQlcOwMev67flrHfwJp49VBU=", + "lastModified": 1748206223, + "narHash": "sha256-fjsarhtz3AAsyefXSvfLmtfsquPNGUd7DIMJJBDH6IA=", "owner": "metacraft-labs", "repo": "nixos-modules", - "rev": "0df76e61499e62fc41701674220efe49d4f934e1", + "rev": "c0378ee316bba2c65c00958e46e4d6597db62b77", "type": "github" }, "original": { @@ -989,11 +979,11 @@ }, "nixos-stable": { "locked": { - "lastModified": 1743703532, - "narHash": "sha256-s1KLDALEeqy+ttrvqV3jx9mBZEvmthQErTVOAzbjHZs=", + "lastModified": 1747335874, + "narHash": "sha256-IKKIXTSYJMmUtE+Kav5Rob8SgLPnfnq4Qu8LyT4gdqQ=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "bdb91860de2f719b57eef819b5617762f7120c70", + "rev": "ba8b70ee098bc5654c459d6a95dfc498b91ff858", "type": "github" }, "original": { @@ -1021,11 +1011,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1744463964, - "narHash": "sha256-LWqduOgLHCFxiTNYi3Uj5Lgz0SR+Xhw3kr/3Xd0GPTM=", + "lastModified": 1748026106, + "narHash": "sha256-6m1Y3/4pVw1RWTsrkAK2VMYSzG4MMIj7sqUy7o8th1o=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "2631b0b7abcea6e640ce31cd78ea58910d31e650", + "rev": "063f43f2dbdef86376cc29ad646c45c46e93234c", "type": "github" }, "original": { @@ -1118,11 +1108,11 @@ "rust-analyzer-src": { "flake": false, "locked": { - "lastModified": 1742296961, - "narHash": "sha256-gCpvEQOrugHWLimD1wTFOJHagnSEP6VYBDspq96Idu0=", + "lastModified": 1747323949, + "narHash": "sha256-G4NwzhODScKnXqt2mEQtDFOnI0wU3L1WxsiHX3cID/0=", "owner": "rust-lang", "repo": "rust-analyzer", - "rev": "15d87419f1a123d8f888d608129c3ce3ff8f13d4", + "rev": "f8e784353bde7cbf9a9046285c1caf41ac484ebe", "type": "github" }, "original": { @@ -1135,11 +1125,11 @@ "spectrum": { "flake": false, "locked": { - "lastModified": 1733308308, - "narHash": "sha256-+RcbMAjSxV1wW5UpS9abIG1lFZC8bITPiFIKNnE7RLs=", + "lastModified": 1746869549, + "narHash": "sha256-BKZ/yZO/qeLKh9YqVkKB6wJiDQJAZNN5rk5NsMImsWs=", "ref": "refs/heads/main", - "rev": "80c9e9830d460c944c8f730065f18bb733bc7ee2", - "revCount": 792, + "rev": "d927e78530892ec8ed389e8fae5f38abee00ad87", + "revCount": 862, "type": "git", "url": "https://spectrum-os.org/git/spectrum" }, @@ -1180,22 +1170,19 @@ }, "terranix": { "inputs": { - "bats-assert": "bats-assert", - "bats-support": "bats-support", "flake-parts": "flake-parts_3", "nixpkgs": [ "nixos-modules", "nixpkgs" ], - "systems": "systems_2", - "terranix-examples": "terranix-examples" + "systems": "systems_2" }, "locked": { - "lastModified": 1739437924, - "narHash": "sha256-lRp8/Udbu8c7aR0DGCmteCXJtXsHcQAiVi6GckjEh5c=", + "lastModified": 1747386897, + "narHash": "sha256-mShlhcRElxiuJ7/rpd2yduqsom21wB3GuZUYIVGolEE=", "owner": "terranix", "repo": "terranix", - "rev": "bb56d576da73a2226961eff14f5530b72ca9e2e3", + "rev": "b259af31a70c734db377a5b5a8ce3bf7f2c02fe4", "type": "github" }, "original": { @@ -1204,21 +1191,6 @@ "type": "github" } }, - "terranix-examples": { - "locked": { - "lastModified": 1637156952, - "narHash": "sha256-KqvXIe1yiKOEP9BRYqNQN+LOWPCsWojh0WjEgv5jfEI=", - "owner": "terranix", - "repo": "terranix-examples", - "rev": "921680efb8af0f332d8ad73718d53907f9483e24", - "type": "github" - }, - "original": { - "owner": "terranix", - "repo": "terranix-examples", - "type": "github" - } - }, "treefmt-nix": { "inputs": { "nixpkgs": [ @@ -1249,11 +1221,11 @@ ] }, "locked": { - "lastModified": 1743748085, - "narHash": "sha256-uhjnlaVTWo5iD3LXics1rp9gaKgDRQj6660+gbUU3cE=", + "lastModified": 1747912973, + "narHash": "sha256-XgxghfND8TDypxsMTPU2GQdtBEsHTEc3qWE6RVEk8O0=", "owner": "numtide", "repo": "treefmt-nix", - "rev": "815e4121d6a5d504c0f96e5be2dd7f871e4fd99d", + "rev": "020cb423808365fa3f10ff4cb8c0a25df35065a3", "type": "github" }, "original": { diff --git a/packages/all-packages.nix b/packages/all-packages.nix index c2c8a2d4..0774b326 100644 --- a/packages/all-packages.nix +++ b/packages/all-packages.nix @@ -97,17 +97,10 @@ graphql = callPackage ./graphql/default.nix { inherit cardano-cli cardano-node; }; cardano = callPackage ./cardano/default.nix { inherit cardano-cli cardano-node graphql; }; - polkadot-generic = callPackage ./polkadot/default.nix { - craneLib = craneLib-fenix-stable; - inherit (darwin) libiconv; - inherit (darwinPkgs) - CoreFoundation - Security - SystemConfiguration - ; - }; - polkadot = polkadot-generic { }; - polkadot-fast = polkadot-generic { enableFastRuntime = true; }; + inherit (inputs'.nixpkgs-unstable.legacyPackages) polkadot; + polkadot-fast = polkadot.overrideAttrs (_: { + cargoBuildFeatures = [ "fast-runtime" ]; + }); fetchGitHubReleaseAsset = { diff --git a/packages/polkadot/default.nix b/packages/polkadot/default.nix deleted file mode 100644 index 2085808c..00000000 --- a/packages/polkadot/default.nix +++ /dev/null @@ -1,110 +0,0 @@ -{ - lib, - fetchFromGitHub, - stdenv, - clang, - protobuf, - rocksdb, - rustPlatform, - craneLib, - # Darwin specific: - libiconv, - CoreFoundation, - Security, - SystemConfiguration, - libcxx, -}: -{ - enableFastRuntime ? false, -}: -let - tags = { - "v0.9.40" = { - commitSha1 = "a2b62fb872ba22622aaf8e13f9dcd9a4adcc454f"; - srcSha256 = "sha256-xpor2sWdYD9WTtmPuxvC9MRRLPPMk8yHlD7RwtSijqQ="; - }; - "v0.9.42" = { - commitSha1 = "9b1fc27cec47f01a2c229532ee7ab79cc5bb28ef"; - srcSha256 = "sha256-73YvkpYoRcM9cvEICjqddxT/gJDcEVfP7QrSSyT92JY="; - }; - "v0.9.43" = { - commitSha1 = "ba42b9ce51d25bdaf52d2c61e0763a6e3da50d25"; - srcSha256 = "sha256-KYmMMcQMkkXfWj5ZTr549a/8ftELKo0PUvCrmRMiDaE="; - }; - "v1.0.0" = { - commitSha1 = "1ed6e2e50a4ce61f6cda46a730efc11a07b6ebb3"; - srcSha256 = "sha256-amTWHD5T40jfnD7z0ILGEDNu7Sz60puhkB/agI+F/lo="; - }; - }; - - commonArgs = rec { - version = "0.9.43"; - - CC = "clang"; - CXX = "clang++"; - LFLAGS = "-lc++abi"; - NIX_LDFLAGS = "${LFLAGS}"; - - src = fetchFromGitHub { - owner = "paritytech"; - repo = "polkadot"; - rev = tags."v${version}".commitSha1; - sha256 = tags."v${version}".srcSha256; - }; - - nativeBuildInputs = [ - rustPlatform.bindgenHook - rocksdb - clang - ]; - - buildInputs = - [ - clang - libcxx - libcxx.dev - ] - ++ lib.optionals stdenv.isDarwin [ - libiconv - CoreFoundation - Security - SystemConfiguration - ]; - - SUBSTRATE_CLI_GIT_COMMIT_HASH = tags."v${version}".commitSha1; - PROTOC = "${protobuf}/bin/protoc"; - ROCKSDB_LIB_DIR = "${rocksdb}/lib"; - }; - - cargoArtifacts = craneLib.buildDepsOnly ( - commonArgs - // { - pname = "polkadot"; - } - ); -in -craneLib.buildPackage ( - commonArgs - // rec { - pname = "polkadot" + lib.optionalString enableFastRuntime "-fast"; - inherit cargoArtifacts; - - buildFeatures = [ "jemalloc-allocator" ] ++ lib.optional enableFastRuntime "fast-runtime"; - - doCheck = false; - - meta = with lib; { - description = "Polkadot Node Implementation"; - homepage = "https://polkadot.network"; - license = licenses.gpl3Only; - maintainers = with maintainers; [ - akru - andresilva - asymmetric - FlorianFranzen - RaghavSood - ]; - platforms = platforms.unix; - }; - } -)