Merge branch 'main' into luca_joss/update-simapp-v8

informalsystems · Feb 6, 2024 · 3301f7a · 3301f7a
2 parents 8ee4d14 + 937fa04
commit 3301f7a
Show file tree

Hide file tree

Showing 6 changed files with 30 additions and 29 deletions.
diff --git a/flake.lock b/flake.lock
diff --git a/lib/default.nix b/lib/default.nix
@@ -71,7 +71,7 @@ nix-std: {
     src,
     engine,
     vendorHash,
-    additionalLdFlags ? "",
+    additionalLdFlags ? [],
     appName ? null,
     preCheck ? null,
     goVersion ? "1.19",
@@ -127,14 +127,15 @@ nix-std: {
           if preCheck == null
           then ''export HOME="$(mktemp -d)"''
           else preCheck;
-        ldflags = ''
-          -X github.com/cosmos/cosmos-sdk/version.Name=${name}
-          -X github.com/cosmos/cosmos-sdk/version.AppName=${ldFlagAppName}
-          -X github.com/cosmos/cosmos-sdk/version.Version=${version}
-          -X github.com/cosmos/cosmos-sdk/version.Commit=${rev}
-          -X github.com/${engine}/version.TMCoreSemVer=${dependency-version}
-          ${additionalLdFlags}
-        '';
+        ldflags =
+          [
+            "-X github.com/cosmos/cosmos-sdk/version.Name=${name}"
+            "-X github.com/cosmos/cosmos-sdk/version.AppName=${ldFlagAppName}"
+            "-X github.com/cosmos/cosmos-sdk/version.Version=${version}"
+            "-X github.com/cosmos/cosmos-sdk/version.Commit=${rev}"
+            "-X github.com/${engine}/version.TMCoreSemVer=${dependency-version}"
+          ]
+          ++ additionalLdFlags;
       }
       // buildGoModuleArgs);
 in {

diff --git a/packages/crescent.nix b/packages/crescent.nix
@@ -10,7 +10,7 @@ mkCosmosGoApp {
   vendorHash = "sha256-WLLQKXjPRhK19oEdqp2UBZpi9W7wtYjJMj07omH41K0=";
   tags = ["netgo"];
   engine = "tendermint/tendermint";
-  additionalLdFlags = ''
-    -X github.com/cosmos/cosmos-sdk/types.reDnmString=[a-zA-Z][a-zA-Z0-9/:]{2,127}
-  '';
+  additionalLdFlags = [
+    "-X github.com/cosmos/cosmos-sdk/types.reDnmString=[a-zA-Z][a-zA-Z0-9/:]{2,127}"
+  ];
 }
diff --git a/packages/ignite-cli.nix b/packages/ignite-cli.nix
@@ -7,9 +7,9 @@ buildGoModule rec {
   src = ignite-cli-src;
   vendorHash = "sha256-P1NYgvdobi6qy1sSKFwkBwPRpLuvCJE5rCD2s/vvm14=";
   doCheck = false;
-  ldflags = ''
-    -X github.com/ignite/cli/ignite/version.Head=${src.rev}
-    -X github.com/ignite/cli/ignite/version.Version=v0.24.0
-    -X github.com/ignite/cli/ignite/version.Date=${builtins.toString (src.lastModified)}
-  '';
+  ldflags = [
+    "-X github.com/ignite/cli/ignite/version.Head=${src.rev}"
+    "-X github.com/ignite/cli/ignite/version.Version=v0.24.0"
+    "-X github.com/ignite/cli/ignite/version.Date=${builtins.toString (src.lastModified)}"
+  ];
 }
diff --git a/packages/sifchain.nix b/packages/sifchain.nix
@@ -10,10 +10,10 @@ mkCosmosGoApp {
   vendorHash = "sha256-AX5jLfH9RnoGZm5MVyM69NnxVjYMR45CNaKzQn5hsXg=";
   tags = ["netgo"];
   engine = "tendermint/tendermint";
-  additionalLdFlags = ''
-    -X github.com/cosmos/cosmos-sdk/version.ServerName=sifnoded
-    -X github.com/cosmos/cosmos-sdk/version.ClientName=sifnoded
-  '';
+  additionalLdFlags = [
+    "-X github.com/cosmos/cosmos-sdk/version.ServerName=sifnoded"
+    "-X github.com/cosmos/cosmos-sdk/version.ClientName=sifnoded"
+  ];
   appName = "sifnoded";
   doCheck = false;
 }
diff --git a/packages/simd.nix b/packages/simd.nix
@@ -18,9 +18,9 @@ buildGoModule {
     "./orm"
     "./store/tools"
   ];
-  ldflags = ''
-    -X github.com/cosmos/cosmos-sdk/version.AppName=simd
-    -X github.com/cosmos/cosmos-sdk/version.Version=v0.46.0
-    -X github.com/cosmos/cosmos-sdk/version.Commit=${cosmos-sdk-src.rev}
-  '';
+  ldflags = [
+    "-X github.com/cosmos/cosmos-sdk/version.AppName=simd"
+    "-X github.com/cosmos/cosmos-sdk/version.Version=v0.46.0"
+    "-X github.com/cosmos/cosmos-sdk/version.Commit=${cosmos-sdk-src.rev}"
+  ];
 }