cafkafk/nixpkgs
cafkafk/nixpkgs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 2

Merge pull request #164300 from svanderburg/disnix-updates

Browse source 
Bump DisnixOS version and apply compatibility fixes
This commit is contained in:
Sander van der Burg 2022-03-15 22:16:59 +01:00 committed by GitHub
commit 18f4e0ee4a
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 8 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

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

6
pkgs/tools/package-management/disnix/dysnomia/default.nix
View file

@ -1,7 +1,7 @@
{ lib, stdenv, fetchurl, netcat { lib, stdenv, fetchurl, netcat
# Optional packages # Optional packages
, systemd ? null, ejabberd ? null, mysql ? null, postgresql ? null, subversion ? null , systemd ? null, ejabberd ? null, mariadb ? null, postgresql ? null, subversion ? null
, mongodb ? null, mongodb-tools ? null, influxdb ? null, supervisor ? null, docker ? null , mongodb ? null, mongodb-tools ? null, influxdb ? null, supervisor ? null, docker ? null
, nginx ? null, s6-rc ? null, xinetd ? null , nginx ? null, s6-rc ? null, xinetd ? null
@ -26,7 +26,7 @@
, getopt , getopt
}: }:
assert enableMySQLDatabase -> mysql != null; assert enableMySQLDatabase -> mariadb != null;
assert enablePostgreSQLDatabase -> postgresql != null; assert enablePostgreSQLDatabase -> postgresql != null;
assert enableSubversionRepository -> subversion != null; assert enableSubversionRepository -> subversion != null;
assert enableEjabberdDump -> ejabberd != null; assert enableEjabberdDump -> ejabberd != null;
@ -68,7 +68,7 @@ stdenv.mkDerivation rec {
buildInputs = [ getopt netcat ] buildInputs = [ getopt netcat ]
++ lib.optional stdenv.isLinux systemd ++ lib.optional stdenv.isLinux systemd
++ lib.optional enableEjabberdDump ejabberd ++ lib.optional enableEjabberdDump ejabberd
++ lib.optional enableMySQLDatabase mysql.out ++ lib.optional enableMySQLDatabase mariadb.out
++ lib.optional enablePostgreSQLDatabase postgresql ++ lib.optional enablePostgreSQLDatabase postgresql
++ lib.optional enableSubversionRepository subversion ++ lib.optional enableSubversionRepository subversion
++ lib.optionals enableMongoDatabase [ mongodb mongodb-tools ] ++ lib.optionals enableMongoDatabase [ mongodb mongodb-tools ]

4
pkgs/top-level/all-packages.nix
View file

@ -33722,7 +33722,9 @@ with pkgs;
disnixos = callPackage ../tools/package-management/disnix/disnixos { }; disnixos = callPackage ../tools/package-management/disnix/disnixos { };
DisnixWebService = callPackage ../tools/package-management/disnix/DisnixWebService { }; DisnixWebService = callPackage ../tools/package-management/disnix/DisnixWebService {
jdk = jdk8;
};
i3a = callPackage ../misc/i3a { }; i3a = callPackage ../misc/i3a { };