lix-project/hydra
1
0
Fork 1
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

Update to Nix 2.10

Browse source
This commit is contained in:
Eelco Dolstra 2022-07-12 12:14:50 +02:00
parent 389ed2e110
commit 8dd1daac8a
2 changed files with 14 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
flake.nix
View file

@ -5,7 +5,7 @@
# even 2.7.0's Nixpkgs pin). # even 2.7.0's Nixpkgs pin).
inputs.newNixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable-small"; inputs.newNixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable-small";
inputs.nixpkgs.follows = "nix/nixpkgs"; inputs.nixpkgs.follows = "nix/nixpkgs";
inputs.nix.url = "github:NixOS/nix/2.9.1"; inputs.nix.url = "github:NixOS/nix/2.10.0";
outputs = { self, newNixpkgs, nixpkgs, nix }: outputs = { self, newNixpkgs, nixpkgs, nix }:
let let
@ -14,7 +14,7 @@
pkgs = import nixpkgs { pkgs = import nixpkgs {
system = "x86_64-linux"; system = "x86_64-linux";
overlays = [ self.overlay nix.overlay ]; overlays = [ self.overlay nix.overlays.default ];
}; };
# NixOS configuration used for VM tests. # NixOS configuration used for VM tests.
@ -332,7 +332,7 @@
url = "mirror://cpan/authors/id/A/AA/AAR/Net-LDAP-Server-0.43.tar.gz"; url = "mirror://cpan/authors/id/A/AA/AAR/Net-LDAP-Server-0.43.tar.gz";
sha256 = "0qmh3cri3fpccmwz6bhwp78yskrb3qmalzvqn0a23hqbsfs4qv6x"; sha256 = "0qmh3cri3fpccmwz6bhwp78yskrb3qmalzvqn0a23hqbsfs4qv6x";
}; };
propagatedBuildInputs = with final.perlPackages; [ NetLDAP ConvertASN1 ]; propagatedBuildInputs = with final.perlPackages; [ perlldap ConvertASN1 ];
meta = { meta = {
description = "LDAP server side protocol handling"; description = "LDAP server side protocol handling";
license = with final.lib.licenses; [ artistic1 ]; license = with final.lib.licenses; [ artistic1 ];
@ -359,7 +359,7 @@
url = "mirror://cpan/authors/id/K/KA/KARMAN/Net-LDAP-Server-Test-0.22.tar.gz"; url = "mirror://cpan/authors/id/K/KA/KARMAN/Net-LDAP-Server-Test-0.22.tar.gz";
sha256 = "13idip7jky92v4adw60jn2gcc3zf339gsdqlnc9nnvqzbxxp285i"; sha256 = "13idip7jky92v4adw60jn2gcc3zf339gsdqlnc9nnvqzbxxp285i";
}; };
propagatedBuildInputs = with final.perlPackages; [ NetLDAP NetLDAPServer TestMore DataDump NetLDAPSID ]; propagatedBuildInputs = with final.perlPackages; [ perlldap NetLDAPServer DataDump NetLDAPSID ];
meta = { meta = {
description = "test Net::LDAP code"; description = "test Net::LDAP code";
license = with final.lib.licenses; [ artistic1 ]; license = with final.lib.licenses; [ artistic1 ];
@ -373,8 +373,8 @@
url = "mirror://cpan/authors/id/I/IL/ILMARI/Catalyst-Authentication-Store-LDAP-1.016.tar.gz"; url = "mirror://cpan/authors/id/I/IL/ILMARI/Catalyst-Authentication-Store-LDAP-1.016.tar.gz";
sha256 = "0cm399vxqqf05cjgs1j5v3sk4qc6nmws5nfhf52qvpbwc4m82mq8"; sha256 = "0cm399vxqqf05cjgs1j5v3sk4qc6nmws5nfhf52qvpbwc4m82mq8";
}; };
propagatedBuildInputs = with final.perlPackages; [ NetLDAP CatalystPluginAuthentication ClassAccessorFast ]; propagatedBuildInputs = with final.perlPackages; [ perlldap CatalystPluginAuthentication ClassAccessor ];
buildInputs = with final.perlPackages; [ TestMore TestMockObject TestException NetLDAPServerTest ]; buildInputs = with final.perlPackages; [ TestMockObject TestException NetLDAPServerTest ];
meta = { meta = {
description = "Authentication from an LDAP Directory"; description = "Authentication from an LDAP Directory";
license = with final.lib.licenses; [ artistic1 ]; license = with final.lib.licenses; [ artistic1 ];
@ -486,7 +486,6 @@
CatalystPluginSessionStateCookie CatalystPluginSessionStateCookie
CatalystPluginSessionStoreFastMmap CatalystPluginSessionStoreFastMmap
CatalystPluginStackTrace CatalystPluginStackTrace
CatalystPluginUnicodeEncoding
CatalystTraitForRequestProxyBase CatalystTraitForRequestProxyBase
CatalystViewDownload CatalystViewDownload
CatalystViewJSON CatalystViewJSON
@ -533,7 +532,6 @@
TermSizeAny TermSizeAny
TermReadKey TermReadKey
Test2Harness Test2Harness
TestMore
TestPostgreSQL TestPostgreSQL
TextDiff TextDiff
TextTable TextTable
@ -558,9 +556,9 @@
libtool libtool
unzip unzip
nukeReferences nukeReferences
pkgconfig pkg-config
libpqxx libpqxx
gitAndTools.topGit top-git
mercurial mercurial
darcs darcs
subversion subversion
@ -585,7 +583,7 @@
cacert cacert
# FIXME: foreman is broken on all nix/nixpkgs pin, up to and # FIXME: foreman is broken on all nix/nixpkgs pin, up to and
# including 2.7.0 # including 2.7.0
newNixpkgs.legacyPackages.${final.system}.foreman newNixpkgs.legacyPackages.${final.stdenv.system}.foreman
glibcLocales glibcLocales
libressl.nc libressl.nc
openldap openldap
@ -602,11 +600,11 @@
pixz pixz
gzip gzip
bzip2 bzip2
lzma xz
gnutar gnutar
unzip unzip
git git
gitAndTools.topGit top-git
mercurial mercurial
darcs darcs
gnused gnused
@ -661,7 +659,7 @@
dontStrip = true; dontStrip = true;
meta.description = "Build of Hydra on ${system}"; meta.description = "Build of Hydra on ${final.stdenv.system}";
passthru = { inherit perlDeps; inherit (final) nix; }; passthru = { inherit perlDeps; inherit (final) nix; };
}; };
}; };
@ -966,7 +964,7 @@
nixosModules.hydra = { nixosModules.hydra = {
imports = [ ./hydra-module.nix ]; imports = [ ./hydra-module.nix ];
nixpkgs.overlays = [ self.overlay nix.overlay ]; nixpkgs.overlays = [ self.overlay nix.overlays.default ];
}; };
nixosModules.hydraTest = { nixosModules.hydraTest = {

2
hydra-module.nix
View file

@ -268,7 +268,7 @@ in
environment = env // { environment = env // {
HYDRA_DBI = "${env.HYDRA_DBI};application_name=hydra-init"; HYDRA_DBI = "${env.HYDRA_DBI};application_name=hydra-init";
}; };
path = [ pkgs.utillinux ]; path = [ pkgs.util-linux ];
preStart = '' preStart = ''
ln -sf ${hydraConf} ${baseDir}/hydra.conf ln -sf ${hydraConf} ${baseDir}/hydra.conf