From 017272d60638658155c613409155f5c90a84ff08 Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Tue, 22 Aug 2023 08:01:10 -0400 Subject: [PATCH 01/21] Add Plutus benchmarking machine config --- flake.lock | 203 +++++++++++++++++++++++++++++++++++--------- flake.nix | 47 ++++++++++ nixos/ax41-nvme.nix | 132 ++++++++++++++++++++++++++++ 3 files changed, 342 insertions(+), 40 deletions(-) create mode 100644 nixos/ax41-nvme.nix diff --git a/flake.lock b/flake.lock index 04623b5d..d1845e50 100644 --- a/flake.lock +++ b/flake.lock @@ -167,15 +167,16 @@ "inputs": { "bitte": "bitte", "iogo": "iogo", - "nixpkgs": "nixpkgs_13", + "nix-deployer": "nix-deployer", + "nixpkgs": "nixpkgs_14", "ragenix": "ragenix_2" }, "locked": { - "lastModified": 1671562644, - "narHash": "sha256-zEfdg/z8pSqCn0puxgvKxa9ie87c7DY6QCSsTxPd8k4=", + "lastModified": 1690399428, + "narHash": "sha256-ziGk2TcHyA7hYZiJflvt3O9cguEaARj6045zt7kv9Cg=", "owner": "input-output-hk", "repo": "devshell-capsules", - "rev": "6660a8b43f563df66e2375adb4e2a54cd8792d5f", + "rev": "4b0311abd0f9f0f614d260b64cf9a87a8f6dc250", "type": "github" }, "original": { @@ -215,15 +216,15 @@ "inputs": { "flake-compat": "flake-compat_2", "nix": "nix_4", - "nixpkgs": "nixpkgs_15", + "nixpkgs": "nixpkgs_16", "pre-commit-hooks": "pre-commit-hooks" }, "locked": { - "lastModified": 1678256717, - "narHash": "sha256-qUJJEs0yQI3e43zFSwZymrMZjNCyTrTdvZM29v+F91A=", + "lastModified": 1692462990, + "narHash": "sha256-0hzA1DzbBfy6Yw4mb0FovRcP1+64AIRKGMSvaQiMctc=", "owner": "cachix", "repo": "devenv", - "rev": "ca23892d8b9f788be8d1d358c673c8d0f9b4f68f", + "rev": "49ebb9b0a85949f364bacf0088c4142ed451f59e", "type": "github" }, "original": { @@ -277,6 +278,24 @@ "type": "github" } }, + "disko": { + "inputs": { + "nixpkgs": "nixpkgs_17" + }, + "locked": { + "lastModified": 1692199161, + "narHash": "sha256-GqKApvQ1JCf5DzH/Q+P4nwuHb6MaQGaWTu41lYzveF4=", + "owner": "nix-community", + "repo": "disko", + "rev": "4eed2457b053c4bbad7d90d2b3a1d539c2c9009c", + "type": "github" + }, + "original": { + "owner": "nix-community", + "repo": "disko", + "type": "github" + } + }, "fenix": { "inputs": { "nixpkgs": "nixpkgs_3", @@ -356,11 +375,11 @@ "nixpkgs-lib": "nixpkgs-lib" }, "locked": { - "lastModified": 1677714448, - "narHash": "sha256-Hq8qLs8xFu28aDjytfxjdC96bZ6pds21Yy09mSC156I=", + "lastModified": 1690933134, + "narHash": "sha256-ab989mN63fQZBFrkk4Q8bYxQCktuHmBIBqUG1jl6/FQ=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "dc531e3a9ce757041e1afaff8ee932725ca60002", + "rev": "59cf3f1447cfc75087e7273b04b31e689a8599fb", "type": "github" }, "original": { @@ -430,12 +449,15 @@ } }, "flake-utils_5": { + "inputs": { + "systems": "systems" + }, "locked": { - "lastModified": 1667395993, - "narHash": "sha256-nuEHfE/LcWyuSWnS8t12N1wc105Qtau+/OdUAjtQ0rA=", + "lastModified": 1685518550, + "narHash": "sha256-o2d0KcvaXzTrPRIo0kOLV0/QXHhDQ5DTi+OxcjO8xqY=", "owner": "numtide", "repo": "flake-utils", - "rev": "5aed5285a952e0b949eb3ba02c12fa4fcfef535f", + "rev": "a1720a10a6cfe8234c0e93907ffe81be440f4cef", "type": "github" }, "original": { @@ -633,6 +655,22 @@ "type": "github" } }, + "lowdown-src_5": { + "flake": false, + "locked": { + "lastModified": 1633514407, + "narHash": "sha256-Dw32tiMjdK9t3ETl5fzGrutQTzh2rufgZV4A/BbxuD4=", + "owner": "kristapsdz", + "repo": "lowdown", + "rev": "d2c2b44ff6c27b936ec27358a2653caaef8f73b8", + "type": "github" + }, + "original": { + "owner": "kristapsdz", + "repo": "lowdown", + "type": "github" + } + }, "nix": { "inputs": { "lowdown-src": "lowdown-src", @@ -654,6 +692,27 @@ "type": "github" } }, + "nix-deployer": { + "inputs": { + "lowdown-src": "lowdown-src_4", + "nixpkgs": "nixpkgs_13", + "nixpkgs-regression": "nixpkgs-regression_3" + }, + "locked": { + "lastModified": 1682676126, + "narHash": "sha256-CEj8KOj9wN285+c2VWnJhDsSF6OqSvOA9eY/naAuGpQ=", + "owner": "NixOS", + "repo": "nix", + "rev": "4504ee295738a2e7a1cb0a5d9cf94d03e861b5f5", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "2.14-maintenance", + "repo": "nix", + "type": "github" + } + }, "nix_2": { "inputs": { "lowdown-src": "lowdown-src_2", @@ -695,12 +754,12 @@ }, "nix_4": { "inputs": { - "lowdown-src": "lowdown-src_4", + "lowdown-src": "lowdown-src_5", "nixpkgs": [ "devenv", "nixpkgs" ], - "nixpkgs-regression": "nixpkgs-regression_3" + "nixpkgs-regression": "nixpkgs-regression_4" }, "locked": { "lastModified": 1676545802, @@ -734,11 +793,11 @@ "nixpkgs-lib": { "locked": { "dir": "lib", - "lastModified": 1677407201, - "narHash": "sha256-3blwdI9o1BAprkvlByHvtEm5HAIRn/XPjtcfiunpY7s=", + "lastModified": 1690881714, + "narHash": "sha256-h/nXluEqdiQHs1oSgkOOWF+j8gcJMWhwnZ9PFabN6q0=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "7f5639fa3b68054ca0b062866dc62b22c3f11505", + "rev": "9e1960bc196baf6881340d53dccb203a951745a2", "type": "github" }, "original": { @@ -795,18 +854,34 @@ "type": "github" } }, + "nixpkgs-regression_4": { + "locked": { + "lastModified": 1643052045, + "narHash": "sha256-uGJ0VXIhWKGXxkeNnq4TvV3CIOkUJ3PAoLZ3HMzNVMw=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "215d4d0fd80ca5163643b03a33fde804a29cc1e2", + "type": "github" + }, + "original": { + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "215d4d0fd80ca5163643b03a33fde804a29cc1e2", + "type": "github" + } + }, "nixpkgs-stable": { "locked": { - "lastModified": 1673800717, - "narHash": "sha256-SFHraUqLSu5cC6IxTprex/nTsI81ZQAtDvlBvGDWfnA=", + "lastModified": 1685801374, + "narHash": "sha256-otaSUoFEMM+LjBI1XL/xGB5ao6IwnZOXc47qhIgJe8U=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "2f9fd351ec37f5d479556cd48be4ca340da59b8f", + "rev": "c37ca420157f4abc31e26f436c1145f8951ff373", "type": "github" }, "original": { "owner": "NixOS", - "ref": "nixos-22.11", + "ref": "nixos-23.05", "repo": "nixpkgs", "type": "github" } @@ -877,11 +952,27 @@ }, "nixpkgs_13": { "locked": { - "lastModified": 1658119717, - "narHash": "sha256-4upOZIQQ7Bc4CprqnHsKnqYfw+arJeAuU+QcpjYBXW0=", + "lastModified": 1670461440, + "narHash": "sha256-jy1LB8HOMKGJEGXgzFRLDU1CBGL0/LlkolgnqIsF0D8=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "04a75b2eecc0acf6239acf9dd04485ff8d14f425", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixos-22.11-small", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_14": { + "locked": { + "lastModified": 1684212024, + "narHash": "sha256-/3ZvkPuIXdyZqPR53qC7aaV5wiwMOY+ddbESOykZ9Vo=", "owner": "nixos", "repo": "nixpkgs", - "rev": "9eb60f25aff0d2218c848dd4574a0ab5e296cabe", + "rev": "d4825e5e4ac1de7d5bb99381534fd0af3875a26d", "type": "github" }, "original": { @@ -891,7 +982,7 @@ "type": "github" } }, - "nixpkgs_14": { + "nixpkgs_15": { "locked": { "lastModified": 1644525281, "narHash": "sha256-D3VuWLdnLmAXIkooWAtbTGSQI9Fc1lkvAr94wTxhnTU=", @@ -907,13 +998,13 @@ "type": "github" } }, - "nixpkgs_15": { + "nixpkgs_16": { "locked": { - "lastModified": 1677534593, - "narHash": "sha256-PuZSAHeq4/9pP/uYH1FcagQ3nLm/DrDrvKi/xC9glvw=", + "lastModified": 1678875422, + "narHash": "sha256-T3o6NcQPwXjxJMn2shz86Chch4ljXgZn746c2caGxd8=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "3ad64d9e2d5bf80c877286102355b1625891ae9a", + "rev": "126f49a01de5b7e35a43fd43f891ecf6d3a51459", "type": "github" }, "original": { @@ -923,13 +1014,29 @@ "type": "github" } }, - "nixpkgs_16": { + "nixpkgs_17": { "locked": { - "lastModified": 1678268259, - "narHash": "sha256-q+ZWNJfXKgIKwsZBir0yXrmIV/4tOv5BflxDAfGISps=", + "lastModified": 1691853136, + "narHash": "sha256-wTzDsRV4HN8A2Sl0SVQY0q8ILs90CD43Ha//7gNZE+E=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "90ef5c3c337d8d9f0c97e7641ece70a41f6c16a2", + "rev": "f0451844bbdf545f696f029d1448de4906c7f753", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixpkgs-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_18": { + "locked": { + "lastModified": 1692557222, + "narHash": "sha256-TCOtZaioLf/jTEgfa+nyg0Nwq5Uc610Z+OFV75yUgGw=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "0b07d4957ee1bd7fd3bdfd12db5f361bd70175a6", "type": "github" }, "original": { @@ -1157,11 +1264,11 @@ "nixpkgs-stable": "nixpkgs-stable" }, "locked": { - "lastModified": 1677160285, - "narHash": "sha256-tBzpCjMP+P3Y3nKLYvdBkXBg3KvTMo3gvi8tLQaqXVY=", + "lastModified": 1688056373, + "narHash": "sha256-2+SDlNRTKsgo3LBRiMUcoEUb6sDViRNQhzJquZ4koOI=", "owner": "cachix", "repo": "pre-commit-hooks.nix", - "rev": "2bd861ab81469428d9c823ef72c4bb08372dd2c4", + "rev": "5843cf069272d92b60c3ed9e55b7a8989c01d4c7", "type": "github" }, "original": { @@ -1195,7 +1302,7 @@ "inputs": { "agenix": "agenix_3", "flake-utils": "flake-utils_4", - "nixpkgs": "nixpkgs_14", + "nixpkgs": "nixpkgs_15", "rust-overlay": "rust-overlay_2" }, "locked": { @@ -1216,8 +1323,9 @@ "inputs": { "capsules": "capsules", "devenv": "devenv", + "disko": "disko", "flake-parts": "flake-parts", - "nixpkgs": "nixpkgs_16" + "nixpkgs": "nixpkgs_18" } }, "rust-analyzer-src": { @@ -1355,6 +1463,21 @@ "type": "github" } }, + "systems": { + "locked": { + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "owner": "nix-systems", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", + "type": "github" + }, + "original": { + "owner": "nix-systems", + "repo": "default", + "type": "github" + } + }, "terranix": { "inputs": { "bats-assert": "bats-assert", diff --git a/flake.nix b/flake.nix index 2deee68e..b255fab6 100644 --- a/flake.nix +++ b/flake.nix @@ -4,6 +4,7 @@ flake-parts.url = "github:hercules-ci/flake-parts"; capsules.url = "github:input-output-hk/devshell-capsules"; devenv.url = "github:cachix/devenv"; + disko.url = "github:nix-community/disko"; }; outputs = inputs@{ self, flake-parts, devenv, capsules, nixpkgs, ... }: flake-parts.lib.mkFlake { inherit inputs; } { @@ -14,6 +15,52 @@ # Raw flake outputs (generally not system-dependent) flake = { devenvModules = import ./devenvModules; + nixosConfigurations.plutus-bench = nixpkgs.lib.nixosSystem { + system = "x86_64-linux"; + specialArgs = { inherit inputs; }; + modules = [ + ./nixos/ax41-nvme.nix + { + system.stateVersion = "23.05"; + hetzner-dedicated.nic = { + ipv4 = "65.108.236.230"; + netmask4 = 26; + gateway4 = "65.108.236.193"; + ipv6 = "2a01:4f9:1a:b0de::2"; + netmask6 = 64; + mac = "a8:a1:59:a2:95:40"; + }; + users.users.root.openssh.authorizedKeys.keys = [ "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAID/fJqgjwPG7b5SRPtCovFmtjmAksUSNg3xHWyqBM4Cs shlevy@shlevy-laptop" ]; + networking.nameservers = [ "185.12.64.1" "185.12.64.2" "2a01:4ff:ff00::add:1" "2a01:4ff:ff00::add:2" ]; + } + ({ pkgs, lib, ... }: { + environment.systemPackages = [ pkgs.git ]; + nixpkgs.config.permittedInsecurePackages = [ + "nodejs-16.20.2" + ]; + nix.settings = { + max-jobs = 12; + cores = 0; + sandbox = true; + substituters = lib.mkAfter [ "https://cache.iog.io" ]; + trusted-public-keys = [ + "hydra.iohk.io:f/Ea+s+dFdN+3Y/G+FDgSq+a5NEWhJGzdjvKNGv0/EQ=" + ]; + trusted-users = [ "root" ]; + builders-use-substitutes = true; + experimental-features = [ "nix-command" "flakes" ]; + bash-prompt = ''\n\[\033[1;32m\][\[\e]0;\u@\h: \w\a\]\u@\h:\w \[\033[01;31m\](dev-shell)\[\033[01;32m\]]\$ \[\033[0m\]''; + }; + services.github-runner = { + enable = true; + extraLabels = [ "plutus-benchmark" ]; + name = "plutus-benchmark"; + tokenFile = "/root/runner-pat"; + url = "https://github.com/input-output-hk/plutus"; + }; + }) + ]; + }; }; # Flake outputs that will be split by system perSystem = { config, pkgs, inputs', self', ... }: { diff --git a/nixos/ax41-nvme.nix b/nixos/ax41-nvme.nix new file mode 100644 index 00000000..3e1062b3 --- /dev/null +++ b/nixos/ax41-nvme.nix @@ -0,0 +1,132 @@ +{ inputs, config, lib, ... }: let + inherit (lib) mkOption types; + + cfg = config.hetzner-dedicated.nic; +in assert (inputs ? disko); { + imports = [ inputs.disko.nixosModules.disko ]; + + options.hetzner-dedicated.nic = { + ipv4 = mkOption { + description = "The IPv4 address of the main NIC"; + type = types.str; + example = "65.108.236.230"; + }; + netmask4 = mkOption { + description = "The IPv4 netmask of the main NIC"; + type = types.int; + example = 26; + }; + gateway4 = mkOption { + description = "The IPv4 network gateway of the main NIC"; + type = types.str; + example = "65.108.236.193"; + }; + ipv6 = mkOption { + description = "The IPv6 address of the main NIC"; + type = types.str; + example = "2a01:4f9:1a:b0de::2"; + }; + netmask6 = mkOption { + description = "The IPv6 netmask of the main NIC"; + type = types.int; + example = 64; + }; + gateway6 = mkOption { + description = "The IPv6 network gateway of the main NIC"; + type = types.str; + default = "fe80::1"; + }; + mac = mkOption { + description = "The MAC address of the main NIC"; + type = types.str; + example = "a8:a1:59:a2:95:40"; + }; + }; + + config = { + boot = { + initrd.availableKernelModules = [ "ahci" "nvme" "ext4" ]; + + kernelModules = [ "kvm-amd" ]; + + loader.grub = { + copyKernels = true; + devices = [ "/dev/disk/by-path/pci-0000:2c:00.0-nvme-1" ]; + enable = true; + fsIdentifier = "uuid"; + }; + }; + + disko.devices.disk = { + disk0 = { + device = "/dev/disk/by-path/pci-0000:2c:00.0-nvme-1"; + content = { + type = "table"; + format = "gpt"; + partitions = [ + { + name = "boot"; + start = "0"; + end = "1M"; + part-type = "primary"; + flags = [ "bios_grub" ]; + } + { + name = "root"; + start = "1M"; + end = "100%"; + fs-type = "ext4"; + content = { + type = "filesystem"; + format = "ext4"; + mountpoint = "/"; + }; + } + ]; + }; + }; + disk1 = { + device = "/dev/disk/by-path/pci-0000:2d:00.0-nvme-1"; + content = { + type = "table"; + format = "gpt"; + partitions = [ + { + name = "nix"; + start = "0"; + end = "100%"; + fs-type = "ext4"; + content = { + type = "filesystem"; + format = "ext4"; + mountpoint = "/nix"; + }; + } + ]; + }; + }; + }; + + systemd.network.links."10-main" = { + matchConfig.PermanentMACAddress = cfg.mac; + linkConfig.Name = "main"; + }; + + networking = { + interfaces.main = { + ipv4.addresses = [ { address = cfg.ipv4; prefixLength = cfg.netmask4; } ]; + + ipv6.addresses = [ { address = cfg.ipv6; prefixLength = cfg.netmask6; } ]; + }; + + defaultGateway = cfg.gateway4; + + defaultGateway6 = { + address = cfg.gateway6; + interface = "main"; + }; + }; + + services.openssh.enable = true; + }; +} From 34be9a23630d3f3c14c3cb852dfb5b88f8d01b7e Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Thu, 7 Sep 2023 08:52:43 -0400 Subject: [PATCH 02/21] Update GH runner --- flake.lock | 36 ++++++++++++++++++------------------ flake.nix | 2 ++ 2 files changed, 20 insertions(+), 18 deletions(-) diff --git a/flake.lock b/flake.lock index d1845e50..cb614df9 100644 --- a/flake.lock +++ b/flake.lock @@ -220,11 +220,11 @@ "pre-commit-hooks": "pre-commit-hooks" }, "locked": { - "lastModified": 1692462990, - "narHash": "sha256-0hzA1DzbBfy6Yw4mb0FovRcP1+64AIRKGMSvaQiMctc=", + "lastModified": 1693830477, + "narHash": "sha256-6j1oNRpjGseDbgg6mJ9H3gmX5U+VAubOLV+iFL9WW30=", "owner": "cachix", "repo": "devenv", - "rev": "49ebb9b0a85949f364bacf0088c4142ed451f59e", + "rev": "f839f486b98609f3477c0410b31a6f831b390d48", "type": "github" }, "original": { @@ -283,11 +283,11 @@ "nixpkgs": "nixpkgs_17" }, "locked": { - "lastModified": 1692199161, - "narHash": "sha256-GqKApvQ1JCf5DzH/Q+P4nwuHb6MaQGaWTu41lYzveF4=", + "lastModified": 1693905783, + "narHash": "sha256-ALIQLAzTJ6iy46U7tL62Nxd7247683kOR6TlSU6PXhU=", "owner": "nix-community", "repo": "disko", - "rev": "4eed2457b053c4bbad7d90d2b3a1d539c2c9009c", + "rev": "b2ea7d62581fa50d3e19a949b85fe04c1e8d7384", "type": "github" }, "original": { @@ -375,11 +375,11 @@ "nixpkgs-lib": "nixpkgs-lib" }, "locked": { - "lastModified": 1690933134, - "narHash": "sha256-ab989mN63fQZBFrkk4Q8bYxQCktuHmBIBqUG1jl6/FQ=", + "lastModified": 1693611461, + "narHash": "sha256-aPODl8vAgGQ0ZYFIRisxYG5MOGSkIczvu2Cd8Gb9+1Y=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "59cf3f1447cfc75087e7273b04b31e689a8599fb", + "rev": "7f53fdb7bdc5bb237da7fefef12d099e4fd611ca", "type": "github" }, "original": { @@ -793,11 +793,11 @@ "nixpkgs-lib": { "locked": { "dir": "lib", - "lastModified": 1690881714, - "narHash": "sha256-h/nXluEqdiQHs1oSgkOOWF+j8gcJMWhwnZ9PFabN6q0=", + "lastModified": 1693471703, + "narHash": "sha256-0l03ZBL8P1P6z8MaSDS/MvuU8E75rVxe5eE1N6gxeTo=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "9e1960bc196baf6881340d53dccb203a951745a2", + "rev": "3e52e76b70d5508f3cec70b882a29199f4d1ee85", "type": "github" }, "original": { @@ -1016,11 +1016,11 @@ }, "nixpkgs_17": { "locked": { - "lastModified": 1691853136, - "narHash": "sha256-wTzDsRV4HN8A2Sl0SVQY0q8ILs90CD43Ha//7gNZE+E=", + "lastModified": 1693714546, + "narHash": "sha256-3EMJZeGSZT6pD1eNwI/6Yc0R4rxklNvJ2SDFcsCnjpM=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "f0451844bbdf545f696f029d1448de4906c7f753", + "rev": "d816b5ab44187a2dd84806630ce77a733724f95f", "type": "github" }, "original": { @@ -1032,11 +1032,11 @@ }, "nixpkgs_18": { "locked": { - "lastModified": 1692557222, - "narHash": "sha256-TCOtZaioLf/jTEgfa+nyg0Nwq5Uc610Z+OFV75yUgGw=", + "lastModified": 1693844670, + "narHash": "sha256-t69F2nBB8DNQUWHD809oJZJVE+23XBrth4QZuVd6IE0=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "0b07d4957ee1bd7fd3bdfd12db5f361bd70175a6", + "rev": "3c15feef7770eb5500a4b8792623e2d6f598c9c1", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index b255fab6..ba89f46a 100644 --- a/flake.nix +++ b/flake.nix @@ -35,6 +35,7 @@ } ({ pkgs, lib, ... }: { environment.systemPackages = [ pkgs.git ]; + # Remove when more actions have node 20 support nixpkgs.config.permittedInsecurePackages = [ "nodejs-16.20.2" ]; @@ -57,6 +58,7 @@ name = "plutus-benchmark"; tokenFile = "/root/runner-pat"; url = "https://github.com/input-output-hk/plutus"; + nodeRuntimes = [ "node16" "node20" ]; }; }) ]; From 51a118ec00befff0995b4c993276cb4342486cff Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Wed, 27 Sep 2023 09:10:01 -0400 Subject: [PATCH 03/21] Update GH runner again --- flake.lock | 31 ++++++++++++++++--------------- flake.nix | 1 + 2 files changed, 17 insertions(+), 15 deletions(-) diff --git a/flake.lock b/flake.lock index cb614df9..497a431a 100644 --- a/flake.lock +++ b/flake.lock @@ -220,11 +220,11 @@ "pre-commit-hooks": "pre-commit-hooks" }, "locked": { - "lastModified": 1693830477, - "narHash": "sha256-6j1oNRpjGseDbgg6mJ9H3gmX5U+VAubOLV+iFL9WW30=", + "lastModified": 1695196688, + "narHash": "sha256-4C+HSXd69qQe12m8Pc6PgLmJGDKURcqkhVdwRu0xrBw=", "owner": "cachix", "repo": "devenv", - "rev": "f839f486b98609f3477c0410b31a6f831b390d48", + "rev": "d3b37c5d6fce8919b9a86c4a3bcacd2d0534341a", "type": "github" }, "original": { @@ -283,11 +283,11 @@ "nixpkgs": "nixpkgs_17" }, "locked": { - "lastModified": 1693905783, - "narHash": "sha256-ALIQLAzTJ6iy46U7tL62Nxd7247683kOR6TlSU6PXhU=", + "lastModified": 1695204792, + "narHash": "sha256-8hsi2L8e5EiWZBcbjmKTDWXXLsi4BOC2FEjaZFPdjWo=", "owner": "nix-community", "repo": "disko", - "rev": "b2ea7d62581fa50d3e19a949b85fe04c1e8d7384", + "rev": "f43f106e91fe4f6591cf80cc5c8179e841c6e922", "type": "github" }, "original": { @@ -1016,11 +1016,11 @@ }, "nixpkgs_17": { "locked": { - "lastModified": 1693714546, - "narHash": "sha256-3EMJZeGSZT6pD1eNwI/6Yc0R4rxklNvJ2SDFcsCnjpM=", + "lastModified": 1694948089, + "narHash": "sha256-d2B282GmQ9o8klc22/Rbbbj6r99EnELQpOQjWMyv0rU=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "d816b5ab44187a2dd84806630ce77a733724f95f", + "rev": "5148520bfab61f99fd25fb9ff7bfbb50dad3c9db", "type": "github" }, "original": { @@ -1032,16 +1032,17 @@ }, "nixpkgs_18": { "locked": { - "lastModified": 1693844670, - "narHash": "sha256-t69F2nBB8DNQUWHD809oJZJVE+23XBrth4QZuVd6IE0=", - "owner": "NixOS", + "lastModified": 1695207459, + "narHash": "sha256-CyJbKWNueiEqIzKMq1NcGGFOt9Y+eWHOkLvaPGGmADI=", + "owner": "nixos", "repo": "nixpkgs", - "rev": "3c15feef7770eb5500a4b8792623e2d6f598c9c1", + "rev": "90a8d5ad19fd7dc974b83adffa988de163df5456", "type": "github" }, "original": { - "id": "nixpkgs", - "type": "indirect" + "owner": "nixos", + "repo": "nixpkgs", + "type": "github" } }, "nixpkgs_2": { diff --git a/flake.nix b/flake.nix index ba89f46a..cf0de925 100644 --- a/flake.nix +++ b/flake.nix @@ -5,6 +5,7 @@ capsules.url = "github:input-output-hk/devshell-capsules"; devenv.url = "github:cachix/devenv"; disko.url = "github:nix-community/disko"; + nixpkgs.url = "github:nixos/nixpkgs"; }; outputs = inputs@{ self, flake-parts, devenv, capsules, nixpkgs, ... }: flake-parts.lib.mkFlake { inherit inputs; } { From 2eda931d29f48fb9a4f4f4e6bc29778fc30923ce Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Mon, 4 Dec 2023 10:10:56 -0500 Subject: [PATCH 04/21] Update GH runner --- flake.lock | 7 ++++--- flake.nix | 7 +------ 2 files changed, 5 insertions(+), 9 deletions(-) diff --git a/flake.lock b/flake.lock index 497a431a..1a7ef3d1 100644 --- a/flake.lock +++ b/flake.lock @@ -1032,15 +1032,16 @@ }, "nixpkgs_18": { "locked": { - "lastModified": 1695207459, - "narHash": "sha256-CyJbKWNueiEqIzKMq1NcGGFOt9Y+eWHOkLvaPGGmADI=", + "lastModified": 1701539137, + "narHash": "sha256-nVO/5QYpf1GwjvtpXhyxx5M3U/WN0MwBro4Lsk+9mL0=", "owner": "nixos", "repo": "nixpkgs", - "rev": "90a8d5ad19fd7dc974b83adffa988de163df5456", + "rev": "933d7dc155096e7575d207be6fb7792bc9f34f6d", "type": "github" }, "original": { "owner": "nixos", + "ref": "nixos-23.11", "repo": "nixpkgs", "type": "github" } diff --git a/flake.nix b/flake.nix index cf0de925..3d9b3e79 100644 --- a/flake.nix +++ b/flake.nix @@ -5,7 +5,7 @@ capsules.url = "github:input-output-hk/devshell-capsules"; devenv.url = "github:cachix/devenv"; disko.url = "github:nix-community/disko"; - nixpkgs.url = "github:nixos/nixpkgs"; + nixpkgs.url = "github:nixos/nixpkgs/nixos-23.11"; }; outputs = inputs@{ self, flake-parts, devenv, capsules, nixpkgs, ... }: flake-parts.lib.mkFlake { inherit inputs; } { @@ -36,10 +36,6 @@ } ({ pkgs, lib, ... }: { environment.systemPackages = [ pkgs.git ]; - # Remove when more actions have node 20 support - nixpkgs.config.permittedInsecurePackages = [ - "nodejs-16.20.2" - ]; nix.settings = { max-jobs = 12; cores = 0; @@ -59,7 +55,6 @@ name = "plutus-benchmark"; tokenFile = "/root/runner-pat"; url = "https://github.com/input-output-hk/plutus"; - nodeRuntimes = [ "node16" "node20" ]; }; }) ]; From a04503cc3324161fec9aa8d652217fd50b62a67f Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Thu, 7 Dec 2023 11:05:42 -0500 Subject: [PATCH 05/21] Bring back node16 --- flake.lock | 12 ++++++------ flake.nix | 8 +++++++- 2 files changed, 13 insertions(+), 7 deletions(-) diff --git a/flake.lock b/flake.lock index 1a7ef3d1..bcc81a7d 100644 --- a/flake.lock +++ b/flake.lock @@ -1032,16 +1032,16 @@ }, "nixpkgs_18": { "locked": { - "lastModified": 1701539137, - "narHash": "sha256-nVO/5QYpf1GwjvtpXhyxx5M3U/WN0MwBro4Lsk+9mL0=", - "owner": "nixos", + "lastModified": 1701964518, + "narHash": "sha256-eajacdD62Z2mC408zWGjJ0OqRjVbryNn2GTumXkvipE=", + "owner": "shlevy", "repo": "nixpkgs", - "rev": "933d7dc155096e7575d207be6fb7792bc9f34f6d", + "rev": "4c3a5d6199fa310b6b8741a909a055b3f222a526", "type": "github" }, "original": { - "owner": "nixos", - "ref": "nixos-23.11", + "owner": "shlevy", + "ref": "node-16-GHA-revert", "repo": "nixpkgs", "type": "github" } diff --git a/flake.nix b/flake.nix index 3d9b3e79..545068df 100644 --- a/flake.nix +++ b/flake.nix @@ -5,7 +5,7 @@ capsules.url = "github:input-output-hk/devshell-capsules"; devenv.url = "github:cachix/devenv"; disko.url = "github:nix-community/disko"; - nixpkgs.url = "github:nixos/nixpkgs/nixos-23.11"; + nixpkgs.url = "github:shlevy/nixpkgs/node-16-GHA-revert"; }; outputs = inputs@{ self, flake-parts, devenv, capsules, nixpkgs, ... }: flake-parts.lib.mkFlake { inherit inputs; } { @@ -36,6 +36,11 @@ } ({ pkgs, lib, ... }: { environment.systemPackages = [ pkgs.git ]; + # Remove when GHA removes upstream + nixpkgs.config.permittedInsecurePackages = [ + "nodejs-16.20.2" + ]; + nix.settings = { max-jobs = 12; cores = 0; @@ -55,6 +60,7 @@ name = "plutus-benchmark"; tokenFile = "/root/runner-pat"; url = "https://github.com/input-output-hk/plutus"; + nodeRuntimes = [ "node16" "node20" ]; }; }) ]; From 7d8143ffd9338a35a1ee0968802734195d446745 Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Fri, 8 Dec 2023 07:38:14 -0500 Subject: [PATCH 06/21] Use IOHK nixpkgs fork --- flake.lock | 4 ++-- flake.nix | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/flake.lock b/flake.lock index bcc81a7d..ff7ac566 100644 --- a/flake.lock +++ b/flake.lock @@ -1034,13 +1034,13 @@ "locked": { "lastModified": 1701964518, "narHash": "sha256-eajacdD62Z2mC408zWGjJ0OqRjVbryNn2GTumXkvipE=", - "owner": "shlevy", + "owner": "input-output-hk", "repo": "nixpkgs", "rev": "4c3a5d6199fa310b6b8741a909a055b3f222a526", "type": "github" }, "original": { - "owner": "shlevy", + "owner": "input-output-hk", "ref": "node-16-GHA-revert", "repo": "nixpkgs", "type": "github" diff --git a/flake.nix b/flake.nix index 545068df..2d71fd5d 100644 --- a/flake.nix +++ b/flake.nix @@ -5,7 +5,7 @@ capsules.url = "github:input-output-hk/devshell-capsules"; devenv.url = "github:cachix/devenv"; disko.url = "github:nix-community/disko"; - nixpkgs.url = "github:shlevy/nixpkgs/node-16-GHA-revert"; + nixpkgs.url = "github:input-output-hk/nixpkgs/node-16-GHA-revert"; }; outputs = inputs@{ self, flake-parts, devenv, capsules, nixpkgs, ... }: flake-parts.lib.mkFlake { inherit inputs; } { From ebb9559be2ba15b92c9b3af9faad8f3e6bbdc4b1 Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Tue, 23 Jan 2024 07:30:08 -0500 Subject: [PATCH 07/21] bench: Add Rene pubkey --- flake.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/flake.nix b/flake.nix index 2d71fd5d..c21f9516 100644 --- a/flake.nix +++ b/flake.nix @@ -31,7 +31,10 @@ netmask6 = 64; mac = "a8:a1:59:a2:95:40"; }; - users.users.root.openssh.authorizedKeys.keys = [ "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAID/fJqgjwPG7b5SRPtCovFmtjmAksUSNg3xHWyqBM4Cs shlevy@shlevy-laptop" ]; + users.users.root.openssh.authorizedKeys.keys = + [ "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAID/fJqgjwPG7b5SRPtCovFmtjmAksUSNg3xHWyqBM4Cs shlevy@shlevy-laptop" + "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQDbXkgUEf6TLnEWXwc5wjxhr45wKHJFEVIWIkz9E9ZrnZ4BfH6rI4+tiWn6QihpXnS7zwPqWgCaeLkWzHXwqFmHPzFv1PNVYT1BcuddRFceWcTNXxwJ2JTDXtadH5F/ZyDI2SRsbPfGa1iLca/ANUOQVb4yI3PSALD4BPd5G19mf/8HTZGL0wnYbq9JG7FHKG/8UheuoLf4En6Dk65JLTKvhdnASV5uMJOqmNaI3Q5v6YjVNokPLOqal/PN9/ERJ+jQIB65fFdSV4U55/jHFne1CdtEae77Qymi9JoLg1L4gbS9Dgmu09Asv4FB+jH4HQRUIkCKQig6Blp/HVrAPWVud2IgULgEqw/l07BBVThWbdmxd32YtAkhveNX6FHQO3Fhjk1J2wAXpOgZFVBiRbaCP9PyZe5yKK7crajnIAIzzOUv+SrHLvUN06wrAqUxCNJ8tnb/VZI0m2DXblKXfMxAQ/yoyjD8OlvlWz89MyPCiq4Ep9RbFWQw2YyW17JQp+U= renebarbosa@Renes-MacBook-Air.local" + ]; networking.nameservers = [ "185.12.64.1" "185.12.64.2" "2a01:4ff:ff00::add:1" "2a01:4ff:ff00::add:2" ]; } ({ pkgs, lib, ... }: { From d8257e36e10d9514922e05d41a5e69d6c752d3af Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ren=C3=AA=20Barbosa?= Date: Tue, 23 Jan 2024 12:38:10 -0300 Subject: [PATCH 08/21] adding kernelParams to enable amd-pstate --- nixos/ax41-nvme.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/nixos/ax41-nvme.nix b/nixos/ax41-nvme.nix index 3e1062b3..2cb4a8c9 100644 --- a/nixos/ax41-nvme.nix +++ b/nixos/ax41-nvme.nix @@ -49,6 +49,8 @@ in assert (inputs ? disko); { kernelModules = [ "kvm-amd" ]; + kernelParams = [ "amd_pstate.shared_mem=1 amd_pstate=passive" ]; + loader.grub = { copyKernels = true; devices = [ "/dev/disk/by-path/pci-0000:2c:00.0-nvme-1" ]; From 2d43b4fa015557d754779594e3c01dd7604fa844 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ren=C3=AA=20Barbosa?= Date: Tue, 23 Jan 2024 13:43:48 -0300 Subject: [PATCH 09/21] adding kernelParams to enable amd-pstate --- nixos/ax41-nvme.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/ax41-nvme.nix b/nixos/ax41-nvme.nix index 2cb4a8c9..a2dce16b 100644 --- a/nixos/ax41-nvme.nix +++ b/nixos/ax41-nvme.nix @@ -49,7 +49,7 @@ in assert (inputs ? disko); { kernelModules = [ "kvm-amd" ]; - kernelParams = [ "amd_pstate.shared_mem=1 amd_pstate=passive" ]; + kernelParams = [ "amd_pstate.shared_mem=1" "amd_pstate=passive" ]; loader.grub = { copyKernels = true; From 10aeece28c2f162e4484f52a5bf16555a0928a08 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ren=C3=AA=20Barbosa?= Date: Tue, 23 Jan 2024 16:51:44 -0300 Subject: [PATCH 10/21] chore: add powerManagement config --- flake.nix | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/flake.nix b/flake.nix index c21f9516..27ae9ba7 100644 --- a/flake.nix +++ b/flake.nix @@ -36,6 +36,13 @@ "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQDbXkgUEf6TLnEWXwc5wjxhr45wKHJFEVIWIkz9E9ZrnZ4BfH6rI4+tiWn6QihpXnS7zwPqWgCaeLkWzHXwqFmHPzFv1PNVYT1BcuddRFceWcTNXxwJ2JTDXtadH5F/ZyDI2SRsbPfGa1iLca/ANUOQVb4yI3PSALD4BPd5G19mf/8HTZGL0wnYbq9JG7FHKG/8UheuoLf4En6Dk65JLTKvhdnASV5uMJOqmNaI3Q5v6YjVNokPLOqal/PN9/ERJ+jQIB65fFdSV4U55/jHFne1CdtEae77Qymi9JoLg1L4gbS9Dgmu09Asv4FB+jH4HQRUIkCKQig6Blp/HVrAPWVud2IgULgEqw/l07BBVThWbdmxd32YtAkhveNX6FHQO3Fhjk1J2wAXpOgZFVBiRbaCP9PyZe5yKK7crajnIAIzzOUv+SrHLvUN06wrAqUxCNJ8tnb/VZI0m2DXblKXfMxAQ/yoyjD8OlvlWz89MyPCiq4Ep9RbFWQw2YyW17JQp+U= renebarbosa@Renes-MacBook-Air.local" ]; networking.nameservers = [ "185.12.64.1" "185.12.64.2" "2a01:4ff:ff00::add:1" "2a01:4ff:ff00::add:2" ]; + powerManagement = { + cpufreq = { + cpuFreqGovernor = "userspace"; + min = 3600000; # 3.6 GHz + max = 4210000; # 4.2 GHz + }; + }; } ({ pkgs, lib, ... }: { environment.systemPackages = [ pkgs.git ]; From bda667070d0ed95aee365569466aa8c8d0e60229 Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Thu, 1 Feb 2024 09:40:43 -0500 Subject: [PATCH 11/21] Update nixpkgs for newer github runner --- flake.lock | 6 +++--- flake.nix | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/flake.lock b/flake.lock index ff7ac566..7459f61b 100644 --- a/flake.lock +++ b/flake.lock @@ -1032,11 +1032,11 @@ }, "nixpkgs_18": { "locked": { - "lastModified": 1701964518, - "narHash": "sha256-eajacdD62Z2mC408zWGjJ0OqRjVbryNn2GTumXkvipE=", + "lastModified": 1706722661, + "narHash": "sha256-kR94vPKOQ2LMLDv4y6HpsnzYtCz2yy4+wYWGHYQqxRA=", "owner": "input-output-hk", "repo": "nixpkgs", - "rev": "4c3a5d6199fa310b6b8741a909a055b3f222a526", + "rev": "987a35d2e7939e9a3d13cbb3595e9da17eea9779", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 27ae9ba7..d831e56d 100644 --- a/flake.nix +++ b/flake.nix @@ -37,8 +37,8 @@ ]; networking.nameservers = [ "185.12.64.1" "185.12.64.2" "2a01:4ff:ff00::add:1" "2a01:4ff:ff00::add:2" ]; powerManagement = { + cpuFreqGovernor = "userspace"; cpufreq = { - cpuFreqGovernor = "userspace"; min = 3600000; # 3.6 GHz max = 4210000; # 4.2 GHz }; From f7079a13b10c4108d3d9ad8f7476584ad6142422 Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Tue, 13 Feb 2024 15:25:08 -0500 Subject: [PATCH 12/21] Update nixpkgs for github-runner --- flake.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/flake.lock b/flake.lock index 7459f61b..f017a151 100644 --- a/flake.lock +++ b/flake.lock @@ -1032,11 +1032,11 @@ }, "nixpkgs_18": { "locked": { - "lastModified": 1706722661, - "narHash": "sha256-kR94vPKOQ2LMLDv4y6HpsnzYtCz2yy4+wYWGHYQqxRA=", + "lastModified": 1707845076, + "narHash": "sha256-gxRfTdgRqX7gcrXlD1soKaCtne+rKm5ByyCcNt6tm/k=", "owner": "input-output-hk", "repo": "nixpkgs", - "rev": "987a35d2e7939e9a3d13cbb3595e9da17eea9779", + "rev": "48e2c132795327bc8f1a1cfb29fe85e688fd5cb5", "type": "github" }, "original": { From 4a0480b3c79a749707bf8849320d3efaf1f80c05 Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Fri, 22 Mar 2024 11:03:42 -0400 Subject: [PATCH 13/21] GHA bump --- flake.lock | 19 +++++++++---------- flake.nix | 3 ++- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/flake.lock b/flake.lock index f017a151..fe2a8006 100644 --- a/flake.lock +++ b/flake.lock @@ -1032,18 +1032,17 @@ }, "nixpkgs_18": { "locked": { - "lastModified": 1707845076, - "narHash": "sha256-gxRfTdgRqX7gcrXlD1soKaCtne+rKm5ByyCcNt6tm/k=", - "owner": "input-output-hk", - "repo": "nixpkgs", - "rev": "48e2c132795327bc8f1a1cfb29fe85e688fd5cb5", - "type": "github" + "lastModified": 1709147067, + "narHash": "sha256-JaVDL7W5zRFpO9mRUE8kOtOP/wpT5Mjdtt5unAWStC8=", + "ref": "refs/heads/node-16-GHA-revert", + "rev": "f6e59824017255bd6177c61c0db7225f1768d17f", + "revCount": 556210, + "type": "git", + "url": "file:///home/shlevy/src/nixpkgs/node-16-GHA-revert" }, "original": { - "owner": "input-output-hk", - "ref": "node-16-GHA-revert", - "repo": "nixpkgs", - "type": "github" + "type": "git", + "url": "file:///home/shlevy/src/nixpkgs/node-16-GHA-revert" } }, "nixpkgs_2": { diff --git a/flake.nix b/flake.nix index d831e56d..617eea30 100644 --- a/flake.nix +++ b/flake.nix @@ -5,7 +5,7 @@ capsules.url = "github:input-output-hk/devshell-capsules"; devenv.url = "github:cachix/devenv"; disko.url = "github:nix-community/disko"; - nixpkgs.url = "github:input-output-hk/nixpkgs/node-16-GHA-revert"; + nixpkgs.url = "/home/shlevy/src/nixpkgs/node-16-GHA-revert"; }; outputs = inputs@{ self, flake-parts, devenv, capsules, nixpkgs, ... }: flake-parts.lib.mkFlake { inherit inputs; } { @@ -34,6 +34,7 @@ users.users.root.openssh.authorizedKeys.keys = [ "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAID/fJqgjwPG7b5SRPtCovFmtjmAksUSNg3xHWyqBM4Cs shlevy@shlevy-laptop" "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQDbXkgUEf6TLnEWXwc5wjxhr45wKHJFEVIWIkz9E9ZrnZ4BfH6rI4+tiWn6QihpXnS7zwPqWgCaeLkWzHXwqFmHPzFv1PNVYT1BcuddRFceWcTNXxwJ2JTDXtadH5F/ZyDI2SRsbPfGa1iLca/ANUOQVb4yI3PSALD4BPd5G19mf/8HTZGL0wnYbq9JG7FHKG/8UheuoLf4En6Dk65JLTKvhdnASV5uMJOqmNaI3Q5v6YjVNokPLOqal/PN9/ERJ+jQIB65fFdSV4U55/jHFne1CdtEae77Qymi9JoLg1L4gbS9Dgmu09Asv4FB+jH4HQRUIkCKQig6Blp/HVrAPWVud2IgULgEqw/l07BBVThWbdmxd32YtAkhveNX6FHQO3Fhjk1J2wAXpOgZFVBiRbaCP9PyZe5yKK7crajnIAIzzOUv+SrHLvUN06wrAqUxCNJ8tnb/VZI0m2DXblKXfMxAQ/yoyjD8OlvlWz89MyPCiq4Ep9RbFWQw2YyW17JQp+U= renebarbosa@Renes-MacBook-Air.local" + "ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBCHdILXJXPGYkjB8QbX246cRT9jLNZq0P8a9+r14Xm6pjX9r0Uj0o+b0zysZR+GcupwDZ9/GkGiKm5LfB9xgP48= shlevy@avp.shealevy.com" ]; networking.nameservers = [ "185.12.64.1" "185.12.64.2" "2a01:4ff:ff00::add:1" "2a01:4ff:ff00::add:2" ]; powerManagement = { From 1d4e37ca28abf89ab3ba7abdc279c6cd6d9e9a3a Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Wed, 27 Mar 2024 16:14:39 -0400 Subject: [PATCH 14/21] GHA bump --- flake.lock | 19 ++++++++++--------- flake.nix | 2 +- 2 files changed, 11 insertions(+), 10 deletions(-) diff --git a/flake.lock b/flake.lock index fe2a8006..ca39a846 100644 --- a/flake.lock +++ b/flake.lock @@ -1032,17 +1032,18 @@ }, "nixpkgs_18": { "locked": { - "lastModified": 1709147067, - "narHash": "sha256-JaVDL7W5zRFpO9mRUE8kOtOP/wpT5Mjdtt5unAWStC8=", - "ref": "refs/heads/node-16-GHA-revert", - "rev": "f6e59824017255bd6177c61c0db7225f1768d17f", - "revCount": 556210, - "type": "git", - "url": "file:///home/shlevy/src/nixpkgs/node-16-GHA-revert" + "lastModified": 1711569985, + "narHash": "sha256-vC3Mn0J4ihqgR//KiQyLLK95hjrAnkEGfzpCpcP7TJ0=", + "owner": "shlevy", + "repo": "nixpkgs", + "rev": "5cce2759a27a3b3425709ea14e06883942653c21", + "type": "github" }, "original": { - "type": "git", - "url": "file:///home/shlevy/src/nixpkgs/node-16-GHA-revert" + "owner": "shlevy", + "ref": "node-16-GHA-revert", + "repo": "nixpkgs", + "type": "github" } }, "nixpkgs_2": { diff --git a/flake.nix b/flake.nix index 617eea30..9c434fc7 100644 --- a/flake.nix +++ b/flake.nix @@ -5,7 +5,7 @@ capsules.url = "github:input-output-hk/devshell-capsules"; devenv.url = "github:cachix/devenv"; disko.url = "github:nix-community/disko"; - nixpkgs.url = "/home/shlevy/src/nixpkgs/node-16-GHA-revert"; + nixpkgs.url = "github:shlevy/nixpkgs/node-16-GHA-revert"; }; outputs = inputs@{ self, flake-parts, devenv, capsules, nixpkgs, ... }: flake-parts.lib.mkFlake { inherit inputs; } { From 905c0a1e69f3db237da6b139a3fa661123e98d40 Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Wed, 10 Apr 2024 10:52:47 -0400 Subject: [PATCH 15/21] nixpkgs bump --- flake.lock | 462 ++++++++++++++++++++++++++++++++++++++++++++++------- 1 file changed, 402 insertions(+), 60 deletions(-) diff --git a/flake.lock b/flake.lock index ca39a846..495434c6 100644 --- a/flake.lock +++ b/flake.lock @@ -163,6 +163,30 @@ "type": "github" } }, + "cachix": { + "inputs": { + "devenv": "devenv_2", + "flake-compat": "flake-compat_3", + "nixpkgs": [ + "devenv", + "nixpkgs" + ], + "pre-commit-hooks": "pre-commit-hooks" + }, + "locked": { + "lastModified": 1710475558, + "narHash": "sha256-egKrPCKjy/cE+NqCj4hg2fNX/NwLCf0bRDInraYXDgs=", + "owner": "cachix", + "repo": "cachix", + "rev": "661bbb7f8b55722a0406456b15267b5426a3bda6", + "type": "github" + }, + "original": { + "owner": "cachix", + "repo": "cachix", + "type": "github" + } + }, "capsules": { "inputs": { "bitte": "bitte", @@ -214,21 +238,53 @@ }, "devenv": { "inputs": { - "flake-compat": "flake-compat_2", + "cachix": "cachix", + "flake-compat": "flake-compat_5", + "nix": "nix_5", + "nixpkgs": "nixpkgs_17", + "pre-commit-hooks": "pre-commit-hooks_2" + }, + "locked": { + "lastModified": 1711676035, + "narHash": "sha256-m8AHpQR0WVVEoWWOpXVNvqfB5cXiMRnHfcYYm2zg7tk=", + "owner": "cachix", + "repo": "devenv", + "rev": "19098329b4e79f60705d7fb241a3617266658f98", + "type": "github" + }, + "original": { + "owner": "cachix", + "repo": "devenv", + "type": "github" + } + }, + "devenv_2": { + "inputs": { + "flake-compat": [ + "devenv", + "cachix", + "flake-compat" + ], "nix": "nix_4", "nixpkgs": "nixpkgs_16", - "pre-commit-hooks": "pre-commit-hooks" + "poetry2nix": "poetry2nix", + "pre-commit-hooks": [ + "devenv", + "cachix", + "pre-commit-hooks" + ] }, "locked": { - "lastModified": 1695196688, - "narHash": "sha256-4C+HSXd69qQe12m8Pc6PgLmJGDKURcqkhVdwRu0xrBw=", + "lastModified": 1708704632, + "narHash": "sha256-w+dOIW60FKMaHI1q5714CSibk99JfYxm0CzTinYWr+Q=", "owner": "cachix", "repo": "devenv", - "rev": "d3b37c5d6fce8919b9a86c4a3bcacd2d0534341a", + "rev": "2ee4450b0f4b95a1b90f2eb5ffea98b90e48c196", "type": "github" }, "original": { "owner": "cachix", + "ref": "python-rewrite", "repo": "devenv", "type": "github" } @@ -280,14 +336,14 @@ }, "disko": { "inputs": { - "nixpkgs": "nixpkgs_17" + "nixpkgs": "nixpkgs_18" }, "locked": { - "lastModified": 1695204792, - "narHash": "sha256-8hsi2L8e5EiWZBcbjmKTDWXXLsi4BOC2FEjaZFPdjWo=", + "lastModified": 1711588700, + "narHash": "sha256-vBB5HoQVnA6c/UrDOhLXKAahEwSRccw2YXYHxD7qoi4=", "owner": "nix-community", "repo": "disko", - "rev": "f43f106e91fe4f6591cf80cc5c8179e841c6e922", + "rev": "502241afa3de2a24865ddcbe4c122f4546e32092", "type": "github" }, "original": { @@ -370,16 +426,80 @@ "type": "github" } }, + "flake-compat_3": { + "flake": false, + "locked": { + "lastModified": 1696426674, + "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=", + "owner": "edolstra", + "repo": "flake-compat", + "rev": "0f9255e01c2351cc7d116c072cb317785dd33b33", + "type": "github" + }, + "original": { + "owner": "edolstra", + "repo": "flake-compat", + "type": "github" + } + }, + "flake-compat_4": { + "flake": false, + "locked": { + "lastModified": 1696426674, + "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=", + "owner": "edolstra", + "repo": "flake-compat", + "rev": "0f9255e01c2351cc7d116c072cb317785dd33b33", + "type": "github" + }, + "original": { + "owner": "edolstra", + "repo": "flake-compat", + "type": "github" + } + }, + "flake-compat_5": { + "flake": false, + "locked": { + "lastModified": 1696426674, + "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=", + "owner": "edolstra", + "repo": "flake-compat", + "rev": "0f9255e01c2351cc7d116c072cb317785dd33b33", + "type": "github" + }, + "original": { + "owner": "edolstra", + "repo": "flake-compat", + "type": "github" + } + }, + "flake-compat_6": { + "flake": false, + "locked": { + "lastModified": 1673956053, + "narHash": "sha256-4gtG9iQuiKITOjNQQeQIpoIB6b16fm+504Ch3sNKLd8=", + "owner": "edolstra", + "repo": "flake-compat", + "rev": "35bb57c0c8d8b62bbfd284272c928ceb64ddbde9", + "type": "github" + }, + "original": { + "owner": "edolstra", + "repo": "flake-compat", + "type": "github" + } + }, "flake-parts": { "inputs": { "nixpkgs-lib": "nixpkgs-lib" }, "locked": { - "lastModified": 1693611461, - "narHash": "sha256-aPODl8vAgGQ0ZYFIRisxYG5MOGSkIczvu2Cd8Gb9+1Y=", + "lastModified": 1709336216, + "narHash": "sha256-Dt/wOWeW6Sqm11Yh+2+t0dfEWxoMxGBvv3JpIocFl9E=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "7f53fdb7bdc5bb237da7fefef12d099e4fd611ca", + "rev": "f7b3c975cf067e56e7cda6cb098ebe3fb4d74ca2", "type": "github" }, "original": { @@ -453,11 +573,47 @@ "systems": "systems" }, "locked": { - "lastModified": 1685518550, - "narHash": "sha256-o2d0KcvaXzTrPRIo0kOLV0/QXHhDQ5DTi+OxcjO8xqY=", + "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_6": { + "inputs": { + "systems": "systems_2" + }, + "locked": { + "lastModified": 1701680307, + "narHash": "sha256-kAuep2h5ajznlPMD9rnQyffWG8EM/C73lejGofXvdM8=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "4022d587cbbfd70fe950c1e2083a02621806a725", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, + "flake-utils_7": { + "inputs": { + "systems": "systems_3" + }, + "locked": { + "lastModified": 1701680307, + "narHash": "sha256-kAuep2h5ajznlPMD9rnQyffWG8EM/C73lejGofXvdM8=", "owner": "numtide", "repo": "flake-utils", - "rev": "a1720a10a6cfe8234c0e93907ffe81be440f4cef", + "rev": "4022d587cbbfd70fe950c1e2083a02621806a725", "type": "github" }, "original": { @@ -467,6 +623,29 @@ } }, "gitignore": { + "inputs": { + "nixpkgs": [ + "devenv", + "cachix", + "pre-commit-hooks", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1703887061, + "narHash": "sha256-gGPa9qWNc6eCXT/+Z5/zMkyYOuRZqeFZBDbopNZQkuY=", + "owner": "hercules-ci", + "repo": "gitignore.nix", + "rev": "43e1aa1308018f37118e34d3a9cb4f5e75dc11d5", + "type": "github" + }, + "original": { + "owner": "hercules-ci", + "repo": "gitignore.nix", + "type": "github" + } + }, + "gitignore_2": { "inputs": { "nixpkgs": [ "devenv", @@ -475,11 +654,11 @@ ] }, "locked": { - "lastModified": 1660459072, - "narHash": "sha256-8DFJjXG8zqoONA1vXtgeKXy68KdJL5UaXR8NtVMUbx8=", + "lastModified": 1703887061, + "narHash": "sha256-gGPa9qWNc6eCXT/+Z5/zMkyYOuRZqeFZBDbopNZQkuY=", "owner": "hercules-ci", "repo": "gitignore.nix", - "rev": "a20de23b925fd8264fd7fad6454652e142fd7f73", + "rev": "43e1aa1308018f37118e34d3a9cb4f5e75dc11d5", "type": "github" }, "original": { @@ -655,22 +834,6 @@ "type": "github" } }, - "lowdown-src_5": { - "flake": false, - "locked": { - "lastModified": 1633514407, - "narHash": "sha256-Dw32tiMjdK9t3ETl5fzGrutQTzh2rufgZV4A/BbxuD4=", - "owner": "kristapsdz", - "repo": "lowdown", - "rev": "d2c2b44ff6c27b936ec27358a2653caaef8f73b8", - "type": "github" - }, - "original": { - "owner": "kristapsdz", - "repo": "lowdown", - "type": "github" - } - }, "nix": { "inputs": { "lowdown-src": "lowdown-src", @@ -713,6 +876,30 @@ "type": "github" } }, + "nix-github-actions": { + "inputs": { + "nixpkgs": [ + "devenv", + "cachix", + "devenv", + "poetry2nix", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1688870561, + "narHash": "sha256-4UYkifnPEw1nAzqqPOTL2MvWtm3sNGw1UTYTalkTcGY=", + "owner": "nix-community", + "repo": "nix-github-actions", + "rev": "165b1650b753316aa7f1787f3005a8d2da0f5301", + "type": "github" + }, + "original": { + "owner": "nix-community", + "repo": "nix-github-actions", + "type": "github" + } + }, "nix_2": { "inputs": { "lowdown-src": "lowdown-src_2", @@ -754,24 +941,50 @@ }, "nix_4": { "inputs": { - "lowdown-src": "lowdown-src_5", + "flake-compat": "flake-compat_2", "nixpkgs": [ + "devenv", + "cachix", "devenv", "nixpkgs" ], "nixpkgs-regression": "nixpkgs-regression_4" }, "locked": { - "lastModified": 1676545802, - "narHash": "sha256-EK4rZ+Hd5hsvXnzSzk2ikhStJnD63odF7SzsQ8CuSPU=", + "lastModified": 1708577783, + "narHash": "sha256-92xq7eXlxIT5zFNccLpjiP7sdQqQI30Gyui2p/PfKZM=", + "owner": "domenkozar", + "repo": "nix", + "rev": "ecd0af0c1f56de32cbad14daa1d82a132bf298f8", + "type": "github" + }, + "original": { + "owner": "domenkozar", + "ref": "devenv-2.21", + "repo": "nix", + "type": "github" + } + }, + "nix_5": { + "inputs": { + "flake-compat": "flake-compat_6", + "nixpkgs": [ + "devenv", + "nixpkgs" + ], + "nixpkgs-regression": "nixpkgs-regression_5" + }, + "locked": { + "lastModified": 1710500156, + "narHash": "sha256-zvCqeUO2GLOm7jnU23G4EzTZR7eylcJN+HJ5svjmubI=", "owner": "domenkozar", "repo": "nix", - "rev": "7c91803598ffbcfe4a55c44ac6d49b2cf07a527f", + "rev": "c5bbf14ecbd692eeabf4184cc8d50f79c2446549", "type": "github" }, "original": { "owner": "domenkozar", - "ref": "relaxed-flakes", + "ref": "devenv-2.21", "repo": "nix", "type": "github" } @@ -793,11 +1006,11 @@ "nixpkgs-lib": { "locked": { "dir": "lib", - "lastModified": 1693471703, - "narHash": "sha256-0l03ZBL8P1P6z8MaSDS/MvuU8E75rVxe5eE1N6gxeTo=", + "lastModified": 1709237383, + "narHash": "sha256-cy6ArO4k5qTx+l5o+0mL9f5fa86tYUX3ozE1S+Txlds=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "3e52e76b70d5508f3cec70b882a29199f4d1ee85", + "rev": "1536926ef5621b09bba54035ae2bb6d806d72ac8", "type": "github" }, "original": { @@ -870,18 +1083,50 @@ "type": "github" } }, + "nixpkgs-regression_5": { + "locked": { + "lastModified": 1643052045, + "narHash": "sha256-uGJ0VXIhWKGXxkeNnq4TvV3CIOkUJ3PAoLZ3HMzNVMw=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "215d4d0fd80ca5163643b03a33fde804a29cc1e2", + "type": "github" + }, + "original": { + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "215d4d0fd80ca5163643b03a33fde804a29cc1e2", + "type": "github" + } + }, "nixpkgs-stable": { "locked": { - "lastModified": 1685801374, - "narHash": "sha256-otaSUoFEMM+LjBI1XL/xGB5ao6IwnZOXc47qhIgJe8U=", + "lastModified": 1704874635, + "narHash": "sha256-YWuCrtsty5vVZvu+7BchAxmcYzTMfolSPP5io8+WYCg=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "c37ca420157f4abc31e26f436c1145f8951ff373", + "rev": "3dc440faeee9e889fe2d1b4d25ad0f430d449356", "type": "github" }, "original": { "owner": "NixOS", - "ref": "nixos-23.05", + "ref": "nixos-23.11", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs-stable_2": { + "locked": { + "lastModified": 1704874635, + "narHash": "sha256-YWuCrtsty5vVZvu+7BchAxmcYzTMfolSPP5io8+WYCg=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "3dc440faeee9e889fe2d1b4d25ad0f430d449356", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixos-23.11", "repo": "nixpkgs", "type": "github" } @@ -1000,11 +1245,11 @@ }, "nixpkgs_16": { "locked": { - "lastModified": 1678875422, - "narHash": "sha256-T3o6NcQPwXjxJMn2shz86Chch4ljXgZn746c2caGxd8=", + "lastModified": 1692808169, + "narHash": "sha256-x9Opq06rIiwdwGeK2Ykj69dNc2IvUH1fY55Wm7atwrE=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "126f49a01de5b7e35a43fd43f891ecf6d3a51459", + "rev": "9201b5ff357e781bf014d0330d18555695df7ba8", "type": "github" }, "original": { @@ -1016,11 +1261,27 @@ }, "nixpkgs_17": { "locked": { - "lastModified": 1694948089, - "narHash": "sha256-d2B282GmQ9o8klc22/Rbbbj6r99EnELQpOQjWMyv0rU=", + "lastModified": 1710236354, + "narHash": "sha256-vWrciFdq49vve43g4pbi7NjmL4cwG1ifXnQx+dU3T5E=", + "owner": "cachix", + "repo": "devenv-nixpkgs", + "rev": "829e73affeadfb4198a7105cbe3a03153d13edc9", + "type": "github" + }, + "original": { + "owner": "cachix", + "ref": "rolling", + "repo": "devenv-nixpkgs", + "type": "github" + } + }, + "nixpkgs_18": { + "locked": { + "lastModified": 1711401922, + "narHash": "sha256-QoQqXoj8ClGo0sqD/qWKFWezgEwUL0SUh37/vY2jNhc=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "5148520bfab61f99fd25fb9ff7bfbb50dad3c9db", + "rev": "07262b18b97000d16a4bdb003418bd2fb067a932", "type": "github" }, "original": { @@ -1030,7 +1291,7 @@ "type": "github" } }, - "nixpkgs_18": { + "nixpkgs_19": { "locked": { "lastModified": 1711569985, "narHash": "sha256-vC3Mn0J4ihqgR//KiQyLLK95hjrAnkEGfzpCpcP7TJ0=", @@ -1251,26 +1512,77 @@ "type": "github" } }, + "poetry2nix": { + "inputs": { + "flake-utils": "flake-utils_5", + "nix-github-actions": "nix-github-actions", + "nixpkgs": [ + "devenv", + "cachix", + "devenv", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1692876271, + "narHash": "sha256-IXfZEkI0Mal5y1jr6IRWMqK8GW2/f28xJenZIPQqkY0=", + "owner": "nix-community", + "repo": "poetry2nix", + "rev": "d5006be9c2c2417dafb2e2e5034d83fabd207ee3", + "type": "github" + }, + "original": { + "owner": "nix-community", + "repo": "poetry2nix", + "type": "github" + } + }, "pre-commit-hooks": { + "inputs": { + "flake-compat": "flake-compat_4", + "flake-utils": "flake-utils_6", + "gitignore": "gitignore", + "nixpkgs": [ + "devenv", + "cachix", + "nixpkgs" + ], + "nixpkgs-stable": "nixpkgs-stable" + }, + "locked": { + "lastModified": 1708018599, + "narHash": "sha256-M+Ng6+SePmA8g06CmUZWi1AjG2tFBX9WCXElBHEKnyM=", + "owner": "cachix", + "repo": "pre-commit-hooks.nix", + "rev": "5df5a70ad7575f6601d91f0efec95dd9bc619431", + "type": "github" + }, + "original": { + "owner": "cachix", + "repo": "pre-commit-hooks.nix", + "type": "github" + } + }, + "pre-commit-hooks_2": { "inputs": { "flake-compat": [ "devenv", "flake-compat" ], - "flake-utils": "flake-utils_5", - "gitignore": "gitignore", + "flake-utils": "flake-utils_7", + "gitignore": "gitignore_2", "nixpkgs": [ "devenv", "nixpkgs" ], - "nixpkgs-stable": "nixpkgs-stable" + "nixpkgs-stable": "nixpkgs-stable_2" }, "locked": { - "lastModified": 1688056373, - "narHash": "sha256-2+SDlNRTKsgo3LBRiMUcoEUb6sDViRNQhzJquZ4koOI=", + "lastModified": 1708018599, + "narHash": "sha256-M+Ng6+SePmA8g06CmUZWi1AjG2tFBX9WCXElBHEKnyM=", "owner": "cachix", "repo": "pre-commit-hooks.nix", - "rev": "5843cf069272d92b60c3ed9e55b7a8989c01d4c7", + "rev": "5df5a70ad7575f6601d91f0efec95dd9bc619431", "type": "github" }, "original": { @@ -1327,7 +1639,7 @@ "devenv": "devenv", "disko": "disko", "flake-parts": "flake-parts", - "nixpkgs": "nixpkgs_18" + "nixpkgs": "nixpkgs_19" } }, "rust-analyzer-src": { @@ -1480,6 +1792,36 @@ "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" + } + }, + "systems_3": { + "locked": { + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "owner": "nix-systems", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", + "type": "github" + }, + "original": { + "owner": "nix-systems", + "repo": "default", + "type": "github" + } + }, "terranix": { "inputs": { "bats-assert": "bats-assert", From 73b419116f16be82025bbb51903508459369bc8d Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Wed, 10 Apr 2024 10:58:15 -0400 Subject: [PATCH 16/21] Lorenzo --- flake.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/flake.nix b/flake.nix index 9c434fc7..e1950924 100644 --- a/flake.nix +++ b/flake.nix @@ -35,6 +35,7 @@ [ "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAID/fJqgjwPG7b5SRPtCovFmtjmAksUSNg3xHWyqBM4Cs shlevy@shlevy-laptop" "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQDbXkgUEf6TLnEWXwc5wjxhr45wKHJFEVIWIkz9E9ZrnZ4BfH6rI4+tiWn6QihpXnS7zwPqWgCaeLkWzHXwqFmHPzFv1PNVYT1BcuddRFceWcTNXxwJ2JTDXtadH5F/ZyDI2SRsbPfGa1iLca/ANUOQVb4yI3PSALD4BPd5G19mf/8HTZGL0wnYbq9JG7FHKG/8UheuoLf4En6Dk65JLTKvhdnASV5uMJOqmNaI3Q5v6YjVNokPLOqal/PN9/ERJ+jQIB65fFdSV4U55/jHFne1CdtEae77Qymi9JoLg1L4gbS9Dgmu09Asv4FB+jH4HQRUIkCKQig6Blp/HVrAPWVud2IgULgEqw/l07BBVThWbdmxd32YtAkhveNX6FHQO3Fhjk1J2wAXpOgZFVBiRbaCP9PyZe5yKK7crajnIAIzzOUv+SrHLvUN06wrAqUxCNJ8tnb/VZI0m2DXblKXfMxAQ/yoyjD8OlvlWz89MyPCiq4Ep9RbFWQw2YyW17JQp+U= renebarbosa@Renes-MacBook-Air.local" "ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBCHdILXJXPGYkjB8QbX246cRT9jLNZq0P8a9+r14Xm6pjX9r0Uj0o+b0zysZR+GcupwDZ9/GkGiKm5LfB9xgP48= shlevy@avp.shealevy.com" + "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIGWEZvh2alpzkTFXCcIbCFu+EJ5ARP0GBqbwYlhzhKof" ]; networking.nameservers = [ "185.12.64.1" "185.12.64.2" "2a01:4ff:ff00::add:1" "2a01:4ff:ff00::add:2" ]; powerManagement = { From 9a9575ff85f2a9f500fe79027c3e271973fdfe3c Mon Sep 17 00:00:00 2001 From: zeme-wana <15709674+zeme-wana@users.noreply.github.com> Date: Wed, 8 May 2024 15:10:27 +0200 Subject: [PATCH 17/21] Update nixpkgs flake input to include github-runner 2.315.0 --- flake.lock | 10 +++++----- flake.nix | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/flake.lock b/flake.lock index 495434c6..5b064bf5 100644 --- a/flake.lock +++ b/flake.lock @@ -1293,15 +1293,15 @@ }, "nixpkgs_19": { "locked": { - "lastModified": 1711569985, - "narHash": "sha256-vC3Mn0J4ihqgR//KiQyLLK95hjrAnkEGfzpCpcP7TJ0=", - "owner": "shlevy", + "lastModified": 1715109887, + "narHash": "sha256-uyRA0U6azsVJod0sYKjtwfH4ZOGh+OgBb9G6jGJnM1s=", + "owner": "input-output-hk", "repo": "nixpkgs", - "rev": "5cce2759a27a3b3425709ea14e06883942653c21", + "rev": "eea5ebd2e7743bc2347e588c9f5584ede6533fc5", "type": "github" }, "original": { - "owner": "shlevy", + "owner": "input-output-hk", "ref": "node-16-GHA-revert", "repo": "nixpkgs", "type": "github" diff --git a/flake.nix b/flake.nix index e1950924..8b3d23e2 100644 --- a/flake.nix +++ b/flake.nix @@ -5,7 +5,7 @@ capsules.url = "github:input-output-hk/devshell-capsules"; devenv.url = "github:cachix/devenv"; disko.url = "github:nix-community/disko"; - nixpkgs.url = "github:shlevy/nixpkgs/node-16-GHA-revert"; + nixpkgs.url = "github:input-output-hk/nixpkgs/node-16-GHA-revert"; }; outputs = inputs@{ self, flake-parts, devenv, capsules, nixpkgs, ... }: flake-parts.lib.mkFlake { inherit inputs; } { From b30bbfed12c92204a05782f2a9e312a056226d7e Mon Sep 17 00:00:00 2001 From: zeme-wana <15709674+zeme-wana@users.noreply.github.com> Date: Wed, 8 May 2024 16:26:22 +0200 Subject: [PATCH 18/21] Update nixpkgs flake input to include github-runner 2.316.1 --- flake.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/flake.lock b/flake.lock index 5b064bf5..a1482b97 100644 --- a/flake.lock +++ b/flake.lock @@ -1293,11 +1293,11 @@ }, "nixpkgs_19": { "locked": { - "lastModified": 1715109887, - "narHash": "sha256-uyRA0U6azsVJod0sYKjtwfH4ZOGh+OgBb9G6jGJnM1s=", + "lastModified": 1715177952, + "narHash": "sha256-2oY84E/ZVBCvs3odpixb0nFu77TDUtS9XDfileqgqzM=", "owner": "input-output-hk", "repo": "nixpkgs", - "rev": "eea5ebd2e7743bc2347e588c9f5584ede6533fc5", + "rev": "3afa40cb1fdd201efa6f80c8f9debc771d8c3b3c", "type": "github" }, "original": { From 408a9b9edcd77954463b60dced4c1b6a60399c92 Mon Sep 17 00:00:00 2001 From: zeme-wana <15709674+zeme-wana@users.noreply.github.com> Date: Thu, 23 May 2024 12:42:34 +0200 Subject: [PATCH 19/21] Add diffutils to environment.systemPackages --- flake.nix | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/flake.nix b/flake.nix index 8b3d23e2..464170a7 100644 --- a/flake.nix +++ b/flake.nix @@ -47,7 +47,10 @@ }; } ({ pkgs, lib, ... }: { - environment.systemPackages = [ pkgs.git ]; + environment.systemPackages = [ + pkgs.git + pkgs.diffutils + ]; # Remove when GHA removes upstream nixpkgs.config.permittedInsecurePackages = [ "nodejs-16.20.2" @@ -71,7 +74,7 @@ extraLabels = [ "plutus-benchmark" ]; name = "plutus-benchmark"; tokenFile = "/root/runner-pat"; - url = "https://github.com/input-output-hk/plutus"; + url = "https://github.com/IntersectMBO/plutus"; nodeRuntimes = [ "node16" "node20" ]; }; }) From 5c41a761521d6987b879a275da041a6d50d19396 Mon Sep 17 00:00:00 2001 From: zeme-wana <15709674+zeme-wana@users.noreply.github.com> Date: Tue, 4 Jun 2024 13:46:46 +0200 Subject: [PATCH 20/21] Added diff and rsync to extraPackages --- flake.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/flake.nix b/flake.nix index 464170a7..6eb26d8c 100644 --- a/flake.nix +++ b/flake.nix @@ -76,6 +76,10 @@ tokenFile = "/root/runner-pat"; url = "https://github.com/IntersectMBO/plutus"; nodeRuntimes = [ "node16" "node20" ]; + extraPackages = [ + pkgs.rsync + pkgs.diffutils + ]; }; }) ]; From 953a91d7184e88969ac6e004f4b74dc3f6a41074 Mon Sep 17 00:00:00 2001 From: zeme-wana <15709674+zeme-wana@users.noreply.github.com> Date: Tue, 4 Jun 2024 14:36:34 +0200 Subject: [PATCH 21/21] Added wget and curl to extraPackages for github-runner --- flake.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/flake.nix b/flake.nix index 6eb26d8c..680ab58e 100644 --- a/flake.nix +++ b/flake.nix @@ -79,6 +79,8 @@ extraPackages = [ pkgs.rsync pkgs.diffutils + pkgs.wget + pkgs.curl ]; }; })