vriska/hydra
0
0
Fork 0
forked from lix-project/hydra
Code Pull requests Activity

Update to NixOS 20.09

Browse source 
This allows us to make use of the openldap modules for hashed passwords.
In 20.03 the openldap expression didn't yet build those modules.
This commit is contained in:
Andreas Rammhold 2020-10-12 17:16:31 +02:00
parent 46a8d6d531
commit 656b0c27b3
No known key found for this signature in database
GPG key ID: E432E410B5E48C86
2 changed files with 9 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
flake.lock
View file

@ -52,16 +52,16 @@
}, },
"nixpkgs_2": { "nixpkgs_2": {
"locked": { "locked": {
"lastModified": 1599903709, "lastModified": 1602230526,
"narHash": "sha256-tinVKY7zRdSXmVOp7BAulNtIb2iP5nvNp5UAxihKXNI=", "narHash": "sha256-3/ucBPYg42P+1ji5/7q227Ek/Eq2C7zeiB9sZl5UpIY=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "252bfe0107587d40092057f338e9ffcf7bbd90cb", "rev": "0b8799ecaaf0dc6b4c11583a3c96ca5b40fcfdfb",
"type": "github" "type": "github"
}, },
"original": { "original": {
"id": "nixpkgs", "id": "nixpkgs",
"ref": "nixos-20.03", "ref": "nixos-20.09",
"type": "indirect" "type": "indirect"
} }
}, },

8
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
@ -162,7 +162,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
perlDeps perl final.nix perlDeps perl final.nix
boost boost
postgresql_11 postgresql_11
@ -177,7 +177,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" ];
@ -202,6 +202,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 = ''