Skip to content

Commit 0a838c1

Browse files
authored
Fix hashes in flake.nix, replace k3d with kind (#1085)
1 parent e524457 commit 0a838c1

File tree

1 file changed

+10
-9
lines changed

1 file changed

+10
-9
lines changed

flake.nix

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -64,13 +64,13 @@
6464

6565
rclone-sdsc = pkgs.rclone.overrideAttrs (old: {
6666
version = "1.71.2";
67-
vendorHash = "sha256-9yEWEM96cRUzp1mRXEzxvOaBZQsf7Zifoe163OtJCPw=";
67+
vendorHash = "sha256-0RK2gc3InPZZnAEgv01fgG19cWeKCsBP6JN2OCVY8O4=";
6868
nativeInstallCheckInputs = [];
6969
src = pkgs.fetchFromGitHub {
7070
owner = "SwissDataScienceCenter";
7171
repo = "rclone";
7272
rev = "v1.71.2+renku-1";
73-
sha256 = "sha256-JJk3H9aExACIxSGwZYgZzuefeoZtJrTUrv7ffk+Xpzg=";
73+
sha256 = "sha256-NhPYEGPgpwe56zExrV3SiYsbKLb3/OuX+UOuezgJQ8w=";
7474
};
7575
});
7676

@@ -104,6 +104,8 @@
104104
DB_NAME = "renku";
105105
DB_PASSWORD = "dev";
106106
PGPASSWORD = "dev";
107+
PGUSER = "dev";
108+
PGDATABASE = "renku";
107109
PSQLRC = pkgs.writeText "rsdrc.sql" ''
108110
SET SEARCH_PATH TO authz,common,connected_services,events,platform,projects,public,resource_pools,secrets,sessions,storage,users
109111
'';
@@ -117,6 +119,7 @@
117119
ZED_TOKEN = "dev";
118120

119121
SOLR_BIN_PATH = "${devshellToolsPkgs.solr}/bin/solr";
122+
TEST_RUN_SOLR_LOCALLY = "true";
120123

121124
shellHook = ''
122125
PYENV_PATH=$(poetry env info --path)
@@ -150,12 +153,7 @@
150153
basedpyright
151154
rclone-sdsc
152155
azure-cli
153-
k3d
154-
(
155-
writeShellScriptBin "pg" ''
156-
psql -h $DB_HOST -p $DB_PORT -U dev $DB_NAME
157-
''
158-
)
156+
kind
159157
(writeShellScriptBin "pyfix" ''
160158
poetry run ruff check --fix
161159
poetry run ruff format
@@ -254,6 +252,8 @@
254252

255253
DB_HOST = "localhost";
256254
DB_PORT = "15432";
255+
PGHOST = "localhost";
256+
PGPORT = "15432";
257257
AUTHZ_DB_HOST = "localhost";
258258
SOLR_URL = "http://localhost:18983";
259259
SOLR_CORE = "renku-search-dev";
@@ -278,10 +278,11 @@
278278

279279
DB_HOST = "rsdevcnt";
280280
DB_PORT = "5432";
281+
PGHOST = "rsdevcnt";
282+
PGPORT = "5432";
281283
AUTHZ_DB_HOST = "localhost";
282284
SOLR_URL = "http://rsdevcnt:8983";
283285
SOLR_CORE = "renku-search-dev";
284-
285286
}
286287
);
287288
};

0 commit comments

Comments
 (0)