bump: update flake lock (#117)

* fix: pgadmin-init in pgadmin-8.2, the command to setup configuration db is `setup-db` * fix: add grafana overlay grafana 10.3.3 from upstream nixpkgs doesn’t work in darwin * chore: free up space in ubuntu-latest --------- Co-authored-by: shivaraj-bh <[email protected]>
juspay · Mar 6, 2024 · e0a1074 · e0a1074
1 parent 9cdee29
commit e0a1074
Show file tree

Hide file tree

Showing 5 changed files with 51 additions and 13 deletions.
diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
@@ -11,6 +11,11 @@ jobs:
       matrix:
         os: [ubuntu-latest, macos-latest, macos-14]
     steps:
+      - name: Free up space
+        if: matrix.os == 'ubuntu-latest'
+        run: |
+          sudo rm -rf "/usr/local/share/boost"
+          sudo rm -rf "$AGENT_TOOLSDIRECTORY"
       - uses: actions/checkout@v3
       - uses: DeterminateSystems/nix-installer-action@main
         with:

diff --git a/nix/pgadmin.nix b/nix/pgadmin.nix
@@ -118,7 +118,7 @@ in
                       ${config.package}/bin/.pgadmin4-setup-wrapped setup
                     else
                       # pgadmin-8.2 has .pgadmin4-cli-wrapped
-                      ${config.package}/bin/.pgadmin4-cli-wrapped setup
+                      ${config.package}/bin/.pgadmin4-cli-wrapped setup-db
                     fi
                   '';
                 };

diff --git a/test/flake.lock b/test/flake.lock
diff --git a/test/overlays/default.nix b/test/overlays/default.nix
@@ -1,3 +1,4 @@
 [
   (import ./pgadmin.nix)
+  (import ./grafana.nix)
 ]
diff --git a/test/overlays/grafana.nix b/test/overlays/grafana.nix
@@ -0,0 +1,32 @@
+(final: prev: {
+  grafana = (prev.callPackage "${prev.path}/pkgs/servers/monitoring/grafana" {
+    buildGoModule = args: prev.buildGoModule (args // {
+
+      vendorHash = "sha256-Ig7Vj3HzMVOjT6Tn8aS4W000uKGoPOCFh2yIfyEWn78=";
+
+      proxyVendor = true;
+
+      offlineCache = args.offlineCache.overrideAttrs (oa: {
+        buildPhase = final.lib.replaceStrings
+          [ "yarn config set --json supportedArchitectures.os '[ \"linux\" ]'" ]
+          [ "yarn config set --json supportedArchitectures.os '[ \"linux\", \"darwin\" ]'" ]
+          oa.buildPhase;
+
+        outputHash =
+          if final.stdenv.isLinux then
+            "sha256-IlNe89T6cfXGy1WY73Yd+wg1bt9UuBCkKSDkrazybQM="
+          else
+            "sha256-pqInPfZEg2tcp8BXg1nnMddRZ1yyZ6KQa2flWd4IZSU=";
+      });
+
+      # exclude the package instead of `rm pkg/util/xorm/go.{mod,sum}`
+      # turns out, only removing the files is not enough, fails with:
+      # > pkg/services/sqlstore/migrator/dialect.go:9:2: module ./pkg/util/xorm: reading pkg/util/xorm/go.mod: open /build/source/pkg/util/xorm/go.mod: no such file or directory
+
+      # both excluding and removing (`go.mod`) is also not an option because excludedPackages expects a `go.mod`
+      excludedPackages = args.excludedPackages ++ [ "xorm" ];
+
+      postConfigure = final.lib.replaceStrings [ "rm pkg/util/xorm/go.{mod,sum}" ] [ "" ] args.postConfigure;
+    });
+  });
+})