colin/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #257672 from svanderburg/disnix-updates

Browse Source 
Disnix updates
This commit is contained in:
Sander van der Burg 2023-09-27 21:51:27 +02:00 committed by GitHub
commit 5bf3c4393c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
nixos/modules/services/misc/dysnomia.nix
View File

@ -223,7 +223,7 @@ in
ejabberdUser = config.services.ejabberd.user;
}; }
// lib.optionalAttrs (config.services.mysql.enable) { mysql-database = {
mysqlPort = config.services.mysql.port;
mysqlPort = config.services.mysql.settings.mysqld.port;
mysqlSocket = "/run/mysqld/mysqld.sock";
} // lib.optionalAttrs cfg.enableAuthentication {
mysqlUsername = "root";

4
pkgs/tools/package-management/disnix/disnixos/default.nix
View File

@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "disnixos";
version = "0.9.3";
version = "0.9.4";
src = fetchurl {
url = "https://github.com/svanderburg/disnixos/releases/download/${pname}-${version}/${pname}-${version}.tar.gz";
sha256 = "0nm7g184xh6xzjz4a40a7kgfnpmq043x6v0cynpffa6wd9jv89s9";
sha256 = "0adv6dm6hszjhzkfkw48pmi37zj32plcibk80r6bm907mm7n50lj";
};
nativeBuildInputs = [ pkg-config ];

4
pkgs/tools/package-management/disnix/dysnomia/default.nix
View File

@ -40,10 +40,10 @@ assert enableXinetdService -> xinetd != null;
stdenv.mkDerivation rec {
pname = "dysnomia";
version = "0.10.1";
version = "0.10.2";
src = fetchurl {
url = "https://github.com/svanderburg/dysnomia/releases/download/dysnomia-${version}/dysnomia-${version}.tar.gz";
sha256 = "0w9601g8zpaxrmynx6mh8zz85ldpb8psp7cc6ls8v3srjpj1l5n3";
sha256 = "08ijqbijs2h584dvsb3z858ha385fqd5jfxc51lks9lxxv0sfkr4";
};
configureFlags = [