delroth/hydra
0
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Merge branch 'master' of github.com:NixOS/hydra into master

Browse source
This commit is contained in:
Eelco Dolstra 2020-10-20 12:19:53 +02:00
parent 338d946620 869671e556
commit 90a2f8eb2b
2 changed files with 13 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
flake.lock
View file

@ -60,7 +60,7 @@
}, },
"original": { "original": {
"id": "nixpkgs", "id": "nixpkgs",
"ref": "nixos-20.03", "ref": "nixos-20.09",
"type": "indirect" "type": "indirect"
} }
}, },

17
flake.nix
View file

@ -1,7 +1,7 @@
{ {
description = "A Nix-based continuous build system"; description = "A Nix-based continuous build system";
inputs.nixpkgs.url = "nixpkgs/nixos-20.03"; inputs.nixpkgs.url = "nixpkgs/nixos-20.09";
outputs = { self, nixpkgs, nix }: outputs = { self, nixpkgs, nix }:
let let
@ -161,7 +161,7 @@
buildInputs = buildInputs =
[ makeWrapper autoconf automake libtool unzip nukeReferences pkgconfig libpqxx [ makeWrapper autoconf automake libtool unzip nukeReferences pkgconfig libpqxx
gitAndTools.topGit mercurial darcs subversion bazaar openssl bzip2 libxslt gitAndTools.topGit mercurial darcs subversion breezy openssl bzip2 libxslt
final.nix perlDeps perl final.nix perlDeps perl
boost boost
postgresql_11 postgresql_11
@ -176,7 +176,7 @@
hydraPath = lib.makeBinPath ( hydraPath = lib.makeBinPath (
[ subversion openssh final.nix coreutils findutils pixz [ subversion openssh final.nix coreutils findutils pixz
gzip bzip2 lzma gnutar unzip git gitAndTools.topGit mercurial darcs gnused bazaar gzip bzip2 lzma gnutar unzip git gitAndTools.topGit mercurial darcs gnused breezy
] ++ lib.optionals stdenv.isLinux [ rpm dpkg cdrkit ] ); ] ++ lib.optionals stdenv.isLinux [ rpm dpkg cdrkit ] );
configureFlags = [ "--with-docbook-xsl=${docbook_xsl}/xml/xsl/docbook" ]; configureFlags = [ "--with-docbook-xsl=${docbook_xsl}/xml/xsl/docbook" ];
@ -201,6 +201,8 @@
preCheck = '' preCheck = ''
patchShebangs . patchShebangs .
export LOGNAME=''${LOGNAME:-foo} export LOGNAME=''${LOGNAME:-foo}
# set $HOME for bzr so it can create its trace file
export HOME=$(mktemp -d)
''; '';
postInstall = '' postInstall = ''
@ -363,9 +365,14 @@
rootpw = "notapassword"; rootpw = "notapassword";
database = "bdb"; database = "bdb";
dataDir = "/var/lib/openldap"; dataDir = "/var/lib/openldap";
extraConfig = ''
moduleload pw-sha2
'';
extraDatabaseConfig = '' extraDatabaseConfig = ''
''; '';
# userPassword generated via `slappasswd -o module-load=pw-sha2 -h '{SSHA256}'`
# The admin user has the password `password and `user` has the password `foobar`.
declarativeContents = '' declarativeContents = ''
dn: dc=example dn: dc=example
dc: example dc: example
@ -398,7 +405,7 @@
sn: user sn: user
cn: user cn: user
mail: user@example mail: user@example
userPassword: foobar userPassword: {SSHA256}B9rfUbNgv8nIGn1Hm5qbVQdv6AIQb012ORJwegqELB0DWCzoMCY+4A==
dn: cn=admin,ou=users,dc=example dn: cn=admin,ou=users,dc=example
objectClass: organizationalPerson objectClass: organizationalPerson
@ -406,7 +413,7 @@
sn: admin sn: admin
cn: admin cn: admin
mail: admin@example mail: admin@example
userPassword: password userPassword: {SSHA256}meKP7fSWhkzXFC1f8RWRb8V8ssmN/VQJp7xJrUFFcNUDuwP1PbitMg==
''; '';
}; };
systemd.services.hdyra-server.environment.CATALYST_DEBUG = "1"; systemd.services.hdyra-server.environment.CATALYST_DEBUG = "1";