nimbus: 24.6.0 -> 24.12.0

Author: bbjubjub2494

pkgs/nimbus/default.nix

@@ -1,63 +1,19 @@
 {
+  applyPatches,
   fetchFromGitHub,
-  lib,
-  stdenv,
-  lsb-release,
-  which,
-  cmake,
   pkgs,
-  writeShellScriptBin,
-  buildFlags ? ["nimbus_beacon_node" "nimbus_validator_client"],
+  targets ? ["nimbus_beacon_node" "nimbus_validator_client"],
 }: let
-  nim1 = pkgs.nim-unwrapped-1.overrideAttrs rec {
-    version = "1.6.18";
-    src = pkgs.fetchurl {
-      url = "https://nim-lang.org/download/nim-${version}.tar.xz";
-      hash = "sha256-UCQaxyIpG6ljdT8EWqo1h7c8GqKK4pxXPBWluKYCoss=";
-    };
-  };
-in
-  stdenv.mkDerivation rec {
-    pname = "nimbus-eth2";
-    version = "24.6.0";
-
+  version = "24.12.0";
+  src = applyPatches {
     src = fetchFromGitHub {
       owner = "status-im";
-      repo = pname;
+      repo = "nimbus-eth2";
       rev = "v${version}";
-      hash = "sha256-cSQfuwMz0JDALJKeYpq25vvqq4SnAKkqW6kRNWGG788=";
+      hash = "sha256-DBvsnGr91a69eCj1hAeoVOpxas5rfaT36rIxWEmvIVg=";
       fetchSubmodules = true;
     };
-
-    fakeGit = writeShellScriptBin "git" "echo ${version}";
-
-    # Dunno why we need `lsb-release`, looks like for nim itself
-    # without `which` it can't find gcc
-    nativeBuildInputs = [fakeGit lsb-release nim1 which cmake];
-    enableParallelBuilding = true;
-
-    NIMFLAGS = "-d:disableMarchNative -d:release";
-
-    makeFlags = ["USE_SYSTEM_NIM=1"];
-    inherit buildFlags;
-    dontConfigure = true;
-
-    preBuild = ''
-      patchShebangs scripts vendor/nimbus-build-system/scripts
-      make nimbus-build-system-paths
-    '';
-
-    installPhase = ''
-      mkdir -p $out/bin
-      rm -f build/generate_makefile
-      cp build/* $out/bin
-    '';
-
-    meta = {
-      description = "Nim implementation of the Ethereum Beacon Chain";
-      homepage = "https://github.com/status-im/nimbus-eth2";
-      license = lib.licenses.asl20;
-      mainProgram = "nimbus_beacon_node";
-      platforms = ["x86_64-linux"];
-    };
-  }
+    patches = [./fix-hash.patch];
+  };
+in
+  import "${src}/nix" {inherit pkgs targets;}

pkgs/nimbus/fix-hash.patch

@@ -0,0 +1,11 @@
+diff --git a/nix/nimble.nix b/nix/nimble.nix
+index 5343aaa81..770f8fa5a 100644
+--- a/nix/nimble.nix
++++ b/nix/nimble.nix
+@@ -8,5 +8,5 @@ in pkgs.fetchFromGitHub {
+   repo = "nimble";
+   rev = tools.findKeyValue "^ +NimbleStableCommit = \"([a-f0-9]+)\".+" sourceFile;
+   # WARNING: Requires manual updates when Nim compiler version changes.
+-  hash = "sha256-sa0irAZjQRZLduEMBPf7sHlY1FigBJTR/vIH4ihii/w=";
++  hash = "sha256-MVHf19UbOWk8Zba2scj06PxdYYOJA6OXrVyDQ9Ku6Us=";
+ }