···8Reviewing guidelines: https://nixos.org/manual/nixpkgs/unstable/#chap-reviewing-contributions
9-->
1011-###### Motivation for this change
1200001314###### Things done
15
···8Reviewing guidelines: https://nixos.org/manual/nixpkgs/unstable/#chap-reviewing-contributions
9-->
1011+###### Description of changes
1213+<!--
14+For package updates please link to a changelog or describe changes, this helps your fellow maintainers discover breaking updates.
15+For new packages please briefly describe the package or provide a link to its homepage.
16+-->
1718###### Things done
19
+6-4
nixos/modules/services/web-apps/keycloak.nix
···693 RemainAfterExit = true;
694 User = "postgres";
695 Group = "postgres";
0696 };
697 script = ''
698 set -o errexit -o pipefail -o nounset -o errtrace
···701 create_role="$(mktemp)"
702 trap 'rm -f "$create_role"' ERR EXIT
703704- echo "CREATE ROLE keycloak WITH LOGIN PASSWORD '$(<'${cfg.database.passwordFile}')' CREATEDB" > "$create_role"
0705 psql -tAc "SELECT 1 FROM pg_roles WHERE rolname='keycloak'" | grep -q 1 || psql -tA --file="$create_role"
706 psql -tAc "SELECT 1 FROM pg_database WHERE datname = 'keycloak'" | grep -q 1 || psql -tAc 'CREATE DATABASE "keycloak" OWNER "keycloak"'
707 '';
···717 RemainAfterExit = true;
718 User = config.services.mysql.user;
719 Group = config.services.mysql.group;
0720 };
721 script = ''
722 set -o errexit -o pipefail -o nounset -o errtrace
723 shopt -s inherit_errexit
724-725- db_password="$(<'${cfg.database.passwordFile}')"
726 ( echo "CREATE USER IF NOT EXISTS 'keycloak'@'localhost' IDENTIFIED BY '$db_password';"
727- echo "CREATE DATABASE keycloak CHARACTER SET utf8 COLLATE utf8_unicode_ci;"
728 echo "GRANT ALL PRIVILEGES ON keycloak.* TO 'keycloak'@'localhost';"
729 ) | mysql -N
730 '';
···693 RemainAfterExit = true;
694 User = "postgres";
695 Group = "postgres";
696+ LoadCredential = [ "db_password:${cfg.database.passwordFile}" ];
697 };
698 script = ''
699 set -o errexit -o pipefail -o nounset -o errtrace
···702 create_role="$(mktemp)"
703 trap 'rm -f "$create_role"' ERR EXIT
704705+ db_password="$(<"$CREDENTIALS_DIRECTORY/db_password")"
706+ echo "CREATE ROLE keycloak WITH LOGIN PASSWORD '$db_password' CREATEDB" > "$create_role"
707 psql -tAc "SELECT 1 FROM pg_roles WHERE rolname='keycloak'" | grep -q 1 || psql -tA --file="$create_role"
708 psql -tAc "SELECT 1 FROM pg_database WHERE datname = 'keycloak'" | grep -q 1 || psql -tAc 'CREATE DATABASE "keycloak" OWNER "keycloak"'
709 '';
···719 RemainAfterExit = true;
720 User = config.services.mysql.user;
721 Group = config.services.mysql.group;
722+ LoadCredential = [ "db_password:${cfg.database.passwordFile}" ];
723 };
724 script = ''
725 set -o errexit -o pipefail -o nounset -o errtrace
726 shopt -s inherit_errexit
727+ db_password="$(<"$CREDENTIALS_DIRECTORY/db_password")"
0728 ( echo "CREATE USER IF NOT EXISTS 'keycloak'@'localhost' IDENTIFIED BY '$db_password';"
729+ echo "CREATE DATABASE IF NOT EXISTS keycloak CHARACTER SET utf8 COLLATE utf8_unicode_ci;"
730 echo "GRANT ALL PRIVILEGES ON keycloak.* TO 'keycloak'@'localhost';"
731 ) | mysql -N
732 '';
···3, disabled
4, src
5, meta
06, ...
7}@args:
89with args;
1011buildPythonPackage rec {
12- inherit pname version src meta;
1314 # Disable imagefont tests, because they don't work well with infinality:
15 # https://github.com/python-pillow/Pillow/issues/1259
···3, disabled
4, src
5, meta
6+, passthru ? {}
7, ...
8}@args:
910with args;
1112buildPythonPackage rec {
13+ inherit pname version src meta passthru;
1415 # Disable imagefont tests, because they don't work well with infinality:
16 # https://github.com/python-pillow/Pillow/issues/1259
···99 python-subunit = subunit; # added 2021-09-10
100 pytest_xdist = pytest-xdist; # added 2021-01-04
101 python_simple_hipchat = python-simple-hipchat; # added 2021-07-21
0102 qasm2image = throw "qasm2image is no longer maintained (since November 2018), and is not compatible with the latest pythonPackages.qiskit versions."; # added 2020-12-09
103 qiskit-aqua = throw "qiskit-aqua has been removed due to deprecation, with its functionality moved to different qiskit packages";
104 rdflib-jsonld = throw "rdflib-jsonld is not compatible with rdflib 6"; # added 2021-11-05
···99 python-subunit = subunit; # added 2021-09-10
100 pytest_xdist = pytest-xdist; # added 2021-01-04
101 python_simple_hipchat = python-simple-hipchat; # added 2021-07-21
102+ pytwitchapi = twitchapi; # added 2022-03-07
103 qasm2image = throw "qasm2image is no longer maintained (since November 2018), and is not compatible with the latest pythonPackages.qiskit versions."; # added 2020-12-09
104 qiskit-aqua = throw "qiskit-aqua has been removed due to deprecation, with its functionality moved to different qiskit packages";
105 rdflib-jsonld = throw "rdflib-jsonld is not compatible with rdflib 6"; # added 2021-11-05