From 10dab38a8cc427e72dacf7d98087963deb88c9ce Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Emilio=20L=C3=B3pez?=
 <2642849+elopez@users.noreply.github.com>
Date: Thu, 18 Dec 2025 10:31:10 -0300
Subject: [PATCH] flake: update nixpkgs, stay on GHC 9.8 (#1501)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* flake: update nixpkgs, stay on GHC 9.8

* flake: update rest of inputs

• Updated input 'flake-compat':
    'github:edolstra/flake-compat/9100a0f413b0c601e0533d1d94ffd501ce2e7885?narHash=sha256-CIVLLkVgvHYbgI2UpXvIIBJ12HWgX%2BfjA8Xf8PUmqCY%3D' (2025-05-12)
  → 'github:edolstra/flake-compat/65f23138d8d09a92e30f1e5c87611b23ef451bf3?narHash=sha256-4VBOP18BFeiPkyhy9o4ssBNQEvfvv1kXkasAYd0%2BrrA%3D' (2025-12-07)
• Updated input 'foundry':
    'github:shazow/foundry.nix/6d8688b32523e7e3fd8bf6acad2c8ef20d75997f?narHash=sha256-h0HXTojT3x0QAUk315Ww7SJTHoGCGCFXZkgSx4vfRcE%3D' (2025-08-22)
  → 'github:shazow/foundry.nix/85455ab02f1cedbdb2079f428d0297abea952eb2?narHash=sha256-s/he6rna4VArSdBffTAgcYTsodb4QyfR6E4noRg4t48%3D' (2025-11-24)
• Updated input 'solc-pkgs':
    'github:hellwolf/solc.nix/d83e90df2fa8359a690f6baabf76099432193c3f?narHash=sha256-cqEHv7uCV0LibmQphyiXZ1%2BjYtGjMNb9Pae4tfcAcF8%3D' (2025-08-28)
  → 'github:hellwolf/solc.nix/740364bdc3df632cce49e37e8bec858a91991dc4?narHash=sha256-gqHLugmqY5CzTlJBNuwC5FOaPl3X6Z/UlI8/fPt/jyY%3D' (2025-12-03)
• Updated input 'solc-pkgs/solc-macos-amd64-list-json':
    'https://github.com/argotorg/solc-bin/raw/26fc3fd/macosx-amd64/list.json?narHash=sha256-AvITkfpNYgCypXuLJyqco0li%2BunVw39BAfdOZvd/SPE%3D'
  → 'https://github.com/argotorg/solc-bin/raw/0c6f116/macosx-amd64/list.json?narHash=sha256-oJrt1d/kxej9rUrdXQIhb19Yp/n76xqlUwkkZujzNUo%3D'

* flake: add numa on linux builds

* release: stop pushing echidna builds themselves to cachix

These generate a lot of churn
---
 .github/workflows/release.yml |  1 +
 flake.lock                    | 30 +++++++++++++++---------------
 flake.nix                     | 10 +++++++++-
 3 files changed, 25 insertions(+), 16 deletions(-)

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 5e05bae4..cf1186a0 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -51,6 +51,7 @@ jobs:
         with:
           name: trailofbits
           authToken: ${{ secrets.CACHIX_AUTH_TOKEN }}
+          pushFilter: "(-echidna-.+$)"
 
       - name: Obtain version number
         id: version
diff --git a/flake.lock b/flake.lock
index ed29e0d5..5c016010 100644
--- a/flake.lock
+++ b/flake.lock
@@ -3,11 +3,11 @@
     "flake-compat": {
       "flake": false,
       "locked": {
-        "lastModified": 1747046372,
-        "narHash": "sha256-CIVLLkVgvHYbgI2UpXvIIBJ12HWgX+fjA8Xf8PUmqCY=",
+        "lastModified": 1765121682,
+        "narHash": "sha256-4VBOP18BFeiPkyhy9o4ssBNQEvfvv1kXkasAYd0+rrA=",
         "owner": "edolstra",
         "repo": "flake-compat",
-        "rev": "9100a0f413b0c601e0533d1d94ffd501ce2e7885",
+        "rev": "65f23138d8d09a92e30f1e5c87611b23ef451bf3",
         "type": "github"
       },
       "original": {
@@ -75,11 +75,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1755853824,
-        "narHash": "sha256-h0HXTojT3x0QAUk315Ww7SJTHoGCGCFXZkgSx4vfRcE=",
+        "lastModified": 1763975537,
+        "narHash": "sha256-s/he6rna4VArSdBffTAgcYTsodb4QyfR6E4noRg4t48=",
         "owner": "shazow",
         "repo": "foundry.nix",
-        "rev": "6d8688b32523e7e3fd8bf6acad2c8ef20d75997f",
+        "rev": "85455ab02f1cedbdb2079f428d0297abea952eb2",
         "type": "github"
       },
       "original": {
@@ -91,11 +91,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1755577059,
-        "narHash": "sha256-5hYhxIpco8xR+IpP3uU56+4+Bw7mf7EMyxS/HqUYHQY=",
+        "lastModified": 1765934234,
+        "narHash": "sha256-pJjWUzNnjbIAMIc5gRFUuKCDQ9S1cuh3b2hKgA7Mc4A=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "97eb7ee0da337d385ab015a23e15022c865be75c",
+        "rev": "af84f9d270d404c17699522fab95bbf928a2d92f",
         "type": "github"
       },
       "original": {
@@ -117,13 +117,13 @@
     "solc-macos-amd64-list-json": {
       "flake": false,
       "locked": {
-        "narHash": "sha256-AvITkfpNYgCypXuLJyqco0li+unVw39BAfdOZvd/SPE=",
+        "narHash": "sha256-oJrt1d/kxej9rUrdXQIhb19Yp/n76xqlUwkkZujzNUo=",
         "type": "file",
-        "url": "https://github.com/argotorg/solc-bin/raw/26fc3fd/macosx-amd64/list.json"
+        "url": "https://github.com/argotorg/solc-bin/raw/0c6f116/macosx-amd64/list.json"
       },
       "original": {
         "type": "file",
-        "url": "https://github.com/argotorg/solc-bin/raw/26fc3fd/macosx-amd64/list.json"
+        "url": "https://github.com/argotorg/solc-bin/raw/0c6f116/macosx-amd64/list.json"
       }
     },
     "solc-pkgs": {
@@ -135,11 +135,11 @@
         "solc-macos-amd64-list-json": "solc-macos-amd64-list-json"
       },
       "locked": {
-        "lastModified": 1756368702,
-        "narHash": "sha256-cqEHv7uCV0LibmQphyiXZ1+jYtGjMNb9Pae4tfcAcF8=",
+        "lastModified": 1764792431,
+        "narHash": "sha256-gqHLugmqY5CzTlJBNuwC5FOaPl3X6Z/UlI8/fPt/jyY=",
         "owner": "hellwolf",
         "repo": "solc.nix",
-        "rev": "d83e90df2fa8359a690f6baabf76099432193c3f",
+        "rev": "740364bdc3df632cce49e37e8bec858a91991dc4",
         "type": "github"
       },
       "original": {
diff --git a/flake.nix b/flake.nix
index cd0baf99..4f39366a 100644
--- a/flake.nix
+++ b/flake.nix
@@ -21,7 +21,14 @@
       let
         pkgs = import nixpkgs {
           inherit system;
-          overlays = [solc-pkgs.overlay foundry.overlay];
+          overlays = [
+            solc-pkgs.overlay
+            foundry.overlay
+            (final: prev: {
+              # build with GHC 9.8
+              haskellPackages = prev.haskell.packages.ghc98;
+            })
+          ];
         };
 
         # prefer musl on Linux, static glibc + threading does not work properly
@@ -48,6 +55,7 @@
           # darwin provides these
           (zlib.override { static = true; shared = false; })
           (libffi.overrideAttrs (_: { dontDisableStatic = true; }))
+          (lib.getLib numactl)
         ];
 
         hevm = pkgs: pkgs.lib.pipe