Merge pull request #172378 from Mindavi/hydra-updates-3
Hydra updates 3
This commit is contained in:
commit
a7ee915179
|
@ -1,6 +1,6 @@
|
||||||
#! /usr/bin/env nix-shell
|
#! /usr/bin/env nix-shell
|
||||||
#! nix-shell -p "haskellPackages.ghcWithPackages (p: [p.aeson p.req])"
|
#! nix-shell -p "haskellPackages.ghcWithPackages (p: [p.aeson p.req])"
|
||||||
#! nix-shell -p hydra-unstable
|
#! nix-shell -p hydra_unstable
|
||||||
#! nix-shell -i runhaskell
|
#! nix-shell -i runhaskell
|
||||||
|
|
||||||
{-
|
{-
|
||||||
|
|
|
@ -99,8 +99,8 @@ in
|
||||||
|
|
||||||
package = mkOption {
|
package = mkOption {
|
||||||
type = types.package;
|
type = types.package;
|
||||||
default = pkgs.hydra-unstable;
|
default = pkgs.hydra_unstable;
|
||||||
defaultText = literalExpression "pkgs.hydra-unstable";
|
defaultText = literalExpression "pkgs.hydra_unstable";
|
||||||
description = "The Hydra package.";
|
description = "The Hydra package.";
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
|
@ -11,7 +11,7 @@ let
|
||||||
inherit (import ./common.nix { inherit system; }) baseConfig;
|
inherit (import ./common.nix { inherit system; }) baseConfig;
|
||||||
|
|
||||||
hydraPkgs = {
|
hydraPkgs = {
|
||||||
inherit (pkgs) hydra-unstable;
|
inherit (pkgs) hydra_unstable;
|
||||||
};
|
};
|
||||||
|
|
||||||
makeHydraTest = with pkgs.lib; name: package: makeTest {
|
makeHydraTest = with pkgs.lib; name: package: makeTest {
|
||||||
|
|
|
@ -1,26 +0,0 @@
|
||||||
{ lib, fetchFromGitHub, callPackage, nixVersions, nixosTests, fetchpatch }:
|
|
||||||
|
|
||||||
{
|
|
||||||
hydra-unstable = callPackage ./common.nix {
|
|
||||||
version = "2022-02-07";
|
|
||||||
src = fetchFromGitHub {
|
|
||||||
owner = "NixOS";
|
|
||||||
repo = "hydra";
|
|
||||||
rev = "517dce285a851efd732affc084c7083aed2e98cd";
|
|
||||||
sha256 = "sha256-abWhd/VLNse3Gz7gcVbFANJLAhHV4nbOKjhVDmq/Zmg=";
|
|
||||||
};
|
|
||||||
patches = [
|
|
||||||
./eval.patch
|
|
||||||
./missing-std-string.patch
|
|
||||||
(fetchpatch {
|
|
||||||
url = "https://github.com/NixOS/hydra/commit/5ae26aa7604f714dcc73edcb74fe71ddc8957f6c.patch";
|
|
||||||
sha256 = "sha256-wkbWo8SFbT3qwVxwkKQWpQT5Jgb1Bb51yiLTlFdDN/I=";
|
|
||||||
})
|
|
||||||
];
|
|
||||||
nix = nixVersions.nix_2_6;
|
|
||||||
|
|
||||||
tests = {
|
|
||||||
basic = nixosTests.hydra.hydra-unstable;
|
|
||||||
};
|
|
||||||
};
|
|
||||||
}
|
|
|
@ -1,29 +1,61 @@
|
||||||
{ stdenv, nix, perlPackages, buildEnv
|
{ stdenv
|
||||||
, makeWrapper, autoconf, automake, libtool, unzip, pkg-config, sqlite, libpqxx_6
|
, lib
|
||||||
, top-git, mercurial, darcs, subversion, breezy, openssl, bzip2, libxslt
|
, nix
|
||||||
, perl, postgresql, nukeReferences, git, boehmgc, nlohmann_json
|
, perlPackages
|
||||||
, docbook_xsl, openssh, gnused, coreutils, findutils, gzip, xz, gnutar
|
, buildEnv
|
||||||
, rpm, dpkg, cdrkit, pixz, lib, boost, autoreconfHook, src ? null, version ? null
|
, makeWrapper
|
||||||
, migration ? false, patches ? []
|
, autoconf
|
||||||
, tests ? {}, mdbook
|
, automake
|
||||||
|
, libtool
|
||||||
|
, unzip
|
||||||
|
, pkg-config
|
||||||
|
, sqlite
|
||||||
|
, libpqxx_6
|
||||||
|
, top-git
|
||||||
|
, mercurial
|
||||||
|
, darcs
|
||||||
|
, subversion
|
||||||
|
, breezy
|
||||||
|
, openssl
|
||||||
|
, bzip2
|
||||||
|
, libxslt
|
||||||
|
, perl
|
||||||
|
, postgresql
|
||||||
|
, nukeReferences
|
||||||
|
, git
|
||||||
|
, boehmgc
|
||||||
|
, nlohmann_json
|
||||||
|
, docbook_xsl
|
||||||
|
, openssh
|
||||||
|
, gnused
|
||||||
|
, coreutils
|
||||||
|
, findutils
|
||||||
|
, gzip
|
||||||
|
, xz
|
||||||
|
, gnutar
|
||||||
|
, rpm
|
||||||
|
, dpkg
|
||||||
|
, cdrkit
|
||||||
|
, pixz
|
||||||
|
, boost
|
||||||
|
, autoreconfHook
|
||||||
|
, mdbook
|
||||||
, foreman
|
, foreman
|
||||||
, python3
|
, python3
|
||||||
, libressl
|
, libressl
|
||||||
, cacert
|
, cacert
|
||||||
, glibcLocales
|
, glibcLocales
|
||||||
|
, fetchFromGitHub
|
||||||
|
, fetchpatch
|
||||||
|
, nixosTests
|
||||||
}:
|
}:
|
||||||
|
|
||||||
with stdenv;
|
|
||||||
|
|
||||||
if lib.versions.major nix.version == "1"
|
|
||||||
then throw "This Hydra version doesn't support Nix 1.x"
|
|
||||||
else
|
|
||||||
|
|
||||||
let
|
let
|
||||||
perlDeps = buildEnv {
|
perlDeps = buildEnv {
|
||||||
name = "hydra-perl-deps";
|
name = "hydra-perl-deps";
|
||||||
paths = with perlPackages; lib.closePropagation
|
paths = with perlPackages; lib.closePropagation
|
||||||
[ ModulePluggable
|
[
|
||||||
|
ModulePluggable
|
||||||
AuthenSASL
|
AuthenSASL
|
||||||
CatalystActionREST
|
CatalystActionREST
|
||||||
CatalystAuthenticationStoreDBIxClass
|
CatalystAuthenticationStoreDBIxClass
|
||||||
|
@ -92,15 +124,37 @@ let
|
||||||
git
|
git
|
||||||
];
|
];
|
||||||
};
|
};
|
||||||
in stdenv.mkDerivation rec {
|
in
|
||||||
|
stdenv.mkDerivation rec {
|
||||||
pname = "hydra";
|
pname = "hydra";
|
||||||
|
version = "2022-02-07";
|
||||||
|
|
||||||
inherit stdenv src version patches;
|
src = fetchFromGitHub {
|
||||||
|
owner = "NixOS";
|
||||||
|
repo = "hydra";
|
||||||
|
rev = "517dce285a851efd732affc084c7083aed2e98cd";
|
||||||
|
sha256 = "sha256-abWhd/VLNse3Gz7gcVbFANJLAhHV4nbOKjhVDmq/Zmg=";
|
||||||
|
};
|
||||||
|
|
||||||
buildInputs =
|
buildInputs =
|
||||||
[ makeWrapper libtool unzip nukeReferences sqlite libpqxx_6
|
[
|
||||||
top-git mercurial darcs subversion breezy openssl bzip2 libxslt
|
makeWrapper
|
||||||
perlDeps perl nix
|
libtool
|
||||||
|
unzip
|
||||||
|
nukeReferences
|
||||||
|
sqlite
|
||||||
|
libpqxx_6
|
||||||
|
top-git
|
||||||
|
mercurial
|
||||||
|
darcs
|
||||||
|
subversion
|
||||||
|
breezy
|
||||||
|
openssl
|
||||||
|
bzip2
|
||||||
|
libxslt
|
||||||
|
perlDeps
|
||||||
|
perl
|
||||||
|
nix
|
||||||
postgresql # for running the tests
|
postgresql # for running the tests
|
||||||
nlohmann_json
|
nlohmann_json
|
||||||
boost
|
boost
|
||||||
|
@ -108,9 +162,26 @@ in stdenv.mkDerivation rec {
|
||||||
];
|
];
|
||||||
|
|
||||||
hydraPath = lib.makeBinPath (
|
hydraPath = lib.makeBinPath (
|
||||||
[ sqlite subversion openssh nix coreutils findutils pixz
|
[
|
||||||
gzip bzip2 xz gnutar unzip git top-git mercurial /*darcs*/ gnused breezy
|
sqlite
|
||||||
] ++ lib.optionals stdenv.isLinux [ rpm dpkg cdrkit ] );
|
subversion
|
||||||
|
openssh
|
||||||
|
nix
|
||||||
|
coreutils
|
||||||
|
findutils
|
||||||
|
pixz
|
||||||
|
gzip
|
||||||
|
bzip2
|
||||||
|
xz
|
||||||
|
gnutar
|
||||||
|
unzip
|
||||||
|
git
|
||||||
|
top-git
|
||||||
|
mercurial /*darcs*/
|
||||||
|
gnused
|
||||||
|
breezy
|
||||||
|
] ++ lib.optionals stdenv.isLinux [ rpm dpkg cdrkit ]
|
||||||
|
);
|
||||||
|
|
||||||
nativeBuildInputs = [ autoreconfHook pkg-config mdbook autoconf automake ];
|
nativeBuildInputs = [ autoreconfHook pkg-config mdbook autoconf automake ];
|
||||||
|
|
||||||
|
@ -122,6 +193,15 @@ in stdenv.mkDerivation rec {
|
||||||
libressl.nc
|
libressl.nc
|
||||||
];
|
];
|
||||||
|
|
||||||
|
patches = [
|
||||||
|
./eval.patch
|
||||||
|
./missing-std-string.patch
|
||||||
|
(fetchpatch {
|
||||||
|
url = "https://github.com/NixOS/hydra/commit/5ae26aa7604f714dcc73edcb74fe71ddc8957f6c.patch";
|
||||||
|
sha256 = "sha256-wkbWo8SFbT3qwVxwkKQWpQT5Jgb1Bb51yiLTlFdDN/I=";
|
||||||
|
})
|
||||||
|
];
|
||||||
|
|
||||||
configureFlags = [ "--with-docbook-xsl=${docbook_xsl}/xml/xsl/docbook" ];
|
configureFlags = [ "--with-docbook-xsl=${docbook_xsl}/xml/xsl/docbook" ];
|
||||||
|
|
||||||
NIX_CFLAGS_COMPILE = "-pthread";
|
NIX_CFLAGS_COMPILE = "-pthread";
|
||||||
|
@ -158,7 +238,10 @@ in stdenv.mkDerivation rec {
|
||||||
|
|
||||||
doCheck = true;
|
doCheck = true;
|
||||||
|
|
||||||
passthru = { inherit perlDeps migration tests; };
|
passthru = {
|
||||||
|
inherit perlDeps;
|
||||||
|
tests.basic = nixosTests.hydra.hydra_unstable;
|
||||||
|
};
|
||||||
|
|
||||||
meta = with lib; {
|
meta = with lib; {
|
||||||
description = "Nix-based continuous build system";
|
description = "Nix-based continuous build system";
|
|
@ -552,7 +552,8 @@ mapAliases ({
|
||||||
holochain-go = throw "holochain-go was abandoned by upstream"; # Added 2022-01-01
|
holochain-go = throw "holochain-go was abandoned by upstream"; # Added 2022-01-01
|
||||||
htmlTidy = throw "'htmlTidy' has been renamed to/replaced by 'html-tidy'"; # Converted to throw 2022-02-22
|
htmlTidy = throw "'htmlTidy' has been renamed to/replaced by 'html-tidy'"; # Converted to throw 2022-02-22
|
||||||
ht-rust = xh; # Added 2021-02-13
|
ht-rust = xh; # Added 2021-02-13
|
||||||
hydra-flakes = throw "hydra-flakes: Flakes support has been merged into Hydra's master. Please use `hydra-unstable` now"; # Added 2020-04-06
|
hydra-flakes = throw "hydra-flakes: Flakes support has been merged into Hydra's master. Please use `hydra_unstable` now"; # Added 2020-04-06
|
||||||
|
hydra-unstable = hydra_unstable; # added 2022-05-10
|
||||||
|
|
||||||
### I ###
|
### I ###
|
||||||
|
|
||||||
|
|
|
@ -17858,8 +17858,7 @@ with pkgs;
|
||||||
|
|
||||||
hwloc = callPackage ../development/libraries/hwloc {};
|
hwloc = callPackage ../development/libraries/hwloc {};
|
||||||
|
|
||||||
inherit (callPackage ../development/tools/misc/hydra { })
|
hydra_unstable = callPackage ../development/tools/misc/hydra/unstable.nix { nix = nixVersions.nix_2_6; };
|
||||||
hydra-unstable;
|
|
||||||
|
|
||||||
hydra-cli = callPackage ../development/tools/misc/hydra-cli { };
|
hydra-cli = callPackage ../development/tools/misc/hydra-cli { };
|
||||||
|
|
||||||
|
|
|
@ -24501,6 +24501,12 @@ let
|
||||||
url = "mirror://cpan/authors/id/C/CV/CVLIBRARY/UUID4-Tiny-0.002.tar.gz";
|
url = "mirror://cpan/authors/id/C/CV/CVLIBRARY/UUID4-Tiny-0.002.tar.gz";
|
||||||
sha256 = "e7535b31e386d432dec7adde214348389e1d5cf753e7ed07f1ae04c4360840cf";
|
sha256 = "e7535b31e386d432dec7adde214348389e1d5cf753e7ed07f1ae04c4360840cf";
|
||||||
};
|
};
|
||||||
|
postPatch = lib.optionalString (stdenv.isAarch64) ''
|
||||||
|
# https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/tree/include/uapi/asm-generic/unistd.h
|
||||||
|
# printf SYS_getrandom | gcc -include sys/syscall.h -E -
|
||||||
|
substituteInPlace lib/UUID4/Tiny.pm \
|
||||||
|
--replace "syscall( 318" "syscall( 278"
|
||||||
|
'';
|
||||||
meta = {
|
meta = {
|
||||||
description = "Cryptographically secure v4 UUIDs for Linux x64";
|
description = "Cryptographically secure v4 UUIDs for Linux x64";
|
||||||
license = with lib.licenses; [ artistic1 gpl1Plus ];
|
license = with lib.licenses; [ artistic1 gpl1Plus ];
|
||||||
|
|
|
@ -4,7 +4,7 @@
|
||||||
https://hydra.nixos.org/jobset/nixpkgs/haskell-updates.
|
https://hydra.nixos.org/jobset/nixpkgs/haskell-updates.
|
||||||
|
|
||||||
To debug this expression you can use `hydra-eval-jobs` from
|
To debug this expression you can use `hydra-eval-jobs` from
|
||||||
`pkgs.hydra-unstable` which prints the jobset description
|
`pkgs.hydra_unstable` which prints the jobset description
|
||||||
to `stdout`:
|
to `stdout`:
|
||||||
|
|
||||||
$ hydra-eval-jobs -I . pkgs/top-level/release-haskell.nix
|
$ hydra-eval-jobs -I . pkgs/top-level/release-haskell.nix
|
||||||
|
|
Loading…
Reference in a new issue