Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

hydra: 0-unstable-2024-10-24 -> 0-unstable-2024-11-25 #356391

Merged
merged 1 commit into from
Nov 27, 2024
Merged

hydra: 0-unstable-2024-10-24 -> 0-unstable-2024-11-25 #356391

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 15 additions & 11 deletions pkgs/by-name/hy/hydra/package.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,6 @@
, nukeReferences
, git
, nlohmann_json
, docbook_xsl
, openssh
, openldap
, gnused
Expand All @@ -35,13 +34,14 @@
, cdrkit
, pixz
, boost
, autoreconfHook
, mdbook
, foreman
, python3
, libressl
, cacert
, glibcLocales
, meson
, ninja
, fetchFromGitHub
, nixosTests
, unstableGitUpdater
Expand Down Expand Up @@ -81,6 +81,7 @@ let
DigestSHA1
EmailMIME
EmailSender
FileCopyRecursive
FileLibMagic
FileSlurper
FileWhich
Expand Down Expand Up @@ -124,15 +125,17 @@ let
in
stdenv.mkDerivation (finalAttrs: {
pname = "hydra";
version = "0-unstable-2024-10-24";
version = "0-unstable-2024-11-25";

src = fetchFromGitHub {
owner = "NixOS";
repo = "hydra";
rev = "f974891c76e295240017dd7f04d50ecb4b70284e";
hash = "sha256-xVSu4ZNdlOEh2KcloDvhVeiFSYgk22W5fDvQlwn+kbE=";
rev = "e75a4cbda86eed897ac853b256c8fd10829bc7e0";
hash = "sha256-CCiBM7jV/zLegMizyfRETiYE8XYMEqzPXFAWPwjjMFc=";
};

outputs = [ "out" "doc" ];

buildInputs = [
unzip
libpqxx
Expand Down Expand Up @@ -177,7 +180,8 @@ stdenv.mkDerivation (finalAttrs: {
);

nativeBuildInputs = [
autoreconfHook
meson
ninja
makeWrapper
pkg-config
mdbook
Expand All @@ -193,10 +197,7 @@ stdenv.mkDerivation (finalAttrs: {
openldap
];

configureFlags = [ "--with-docbook-xsl=${docbook_xsl}/xml/xsl/docbook" ];

env = {
NIX_CFLAGS_COMPILE = "-pthread";
OPENLDAP_ROOT = openldap;
};

Expand All @@ -205,10 +206,13 @@ stdenv.mkDerivation (finalAttrs: {
PERL5LIB=$(pwd)/src/lib:$PERL5LIB;
'';

enableParallelBuilding = true;
mesonBuildType = "release";

preCheck = ''
postPatch = ''
patchShebangs .
'';

preCheck = ''
export LOGNAME=''${LOGNAME:-foo}
# set $HOME for bzr so it can create its trace file
export HOME=$(mktemp -d)
Expand Down