Skip to content

Commit e0a1074

Browse files
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]>
1 parent 9cdee29 commit e0a1074

File tree

5 files changed

+51
-13
lines changed

5 files changed

+51
-13
lines changed

.github/workflows/ci.yaml

+5
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,11 @@ jobs:
1111
matrix:
1212
os: [ubuntu-latest, macos-latest, macos-14]
1313
steps:
14+
- name: Free up space
15+
if: matrix.os == 'ubuntu-latest'
16+
run: |
17+
sudo rm -rf "/usr/local/share/boost"
18+
sudo rm -rf "$AGENT_TOOLSDIRECTORY"
1419
- uses: actions/checkout@v3
1520
- uses: DeterminateSystems/nix-installer-action@main
1621
with:

nix/pgadmin.nix

+1-1
Original file line numberDiff line numberDiff line change
@@ -118,7 +118,7 @@ in
118118
${config.package}/bin/.pgadmin4-setup-wrapped setup
119119
else
120120
# pgadmin-8.2 has .pgadmin4-cli-wrapped
121-
${config.package}/bin/.pgadmin4-cli-wrapped setup
121+
${config.package}/bin/.pgadmin4-cli-wrapped setup-db
122122
fi
123123
'';
124124
};

test/flake.lock

+12-12
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

test/overlays/default.nix

+1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
11
[
22
(import ./pgadmin.nix)
3+
(import ./grafana.nix)
34
]

test/overlays/grafana.nix

+32
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,32 @@
1+
(final: prev: {
2+
grafana = (prev.callPackage "${prev.path}/pkgs/servers/monitoring/grafana" {
3+
buildGoModule = args: prev.buildGoModule (args // {
4+
5+
vendorHash = "sha256-Ig7Vj3HzMVOjT6Tn8aS4W000uKGoPOCFh2yIfyEWn78=";
6+
7+
proxyVendor = true;
8+
9+
offlineCache = args.offlineCache.overrideAttrs (oa: {
10+
buildPhase = final.lib.replaceStrings
11+
[ "yarn config set --json supportedArchitectures.os '[ \"linux\" ]'" ]
12+
[ "yarn config set --json supportedArchitectures.os '[ \"linux\", \"darwin\" ]'" ]
13+
oa.buildPhase;
14+
15+
outputHash =
16+
if final.stdenv.isLinux then
17+
"sha256-IlNe89T6cfXGy1WY73Yd+wg1bt9UuBCkKSDkrazybQM="
18+
else
19+
"sha256-pqInPfZEg2tcp8BXg1nnMddRZ1yyZ6KQa2flWd4IZSU=";
20+
});
21+
22+
# exclude the package instead of `rm pkg/util/xorm/go.{mod,sum}`
23+
# turns out, only removing the files is not enough, fails with:
24+
# > 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
25+
26+
# both excluding and removing (`go.mod`) is also not an option because excludedPackages expects a `go.mod`
27+
excludedPackages = args.excludedPackages ++ [ "xorm" ];
28+
29+
postConfigure = final.lib.replaceStrings [ "rm pkg/util/xorm/go.{mod,sum}" ] [ "" ] args.postConfigure;
30+
});
31+
});
32+
})

0 commit comments

Comments
 (0)