Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/hydra
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 027668f0dbf3
Choose a base ref
...
head repository: NixOS/hydra
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: eb5873ae539a
Choose a head ref
  • 8 commits
  • 21 files changed
  • 1 contributor

Commits on Feb 20, 2020

  1. Remove hydra-eval-guile-jobs 

    This hasn't been used in a long time (Guix uses its own CI system),
and it probably doesn't work anymore.

(cherry picked from commit 23c9ca3)
    @edolstra
    edolstra committed Feb 20, 2020
    Copy the full SHA
    15187b0 View commit details

  2. Update aggregate handling 

    (cherry picked from commit cf961ac)
    @edolstra
    edolstra committed Feb 20, 2020
    Copy the full SHA
    2a50daa View commit details

  3. Disable deprecation warnings 

    (cherry picked from commit 950e8be)
    @edolstra
    edolstra committed Feb 20, 2020
    Copy the full SHA
    b790a00 View commit details

  4. Build against nix-master 

    (cherry picked from commit e7f2139)
    @edolstra
    edolstra committed Feb 20, 2020
    Copy the full SHA
    e4f5156 View commit details

  5. Fix nlohmann_json dependency

    @edolstra
    edolstra committed Feb 20, 2020
    Copy the full SHA
    5308e51 View commit details

  6. Fix build 

    (cherry picked from commit 639c660)
    @edolstra
    edolstra committed Feb 20, 2020
    Copy the full SHA
    adf61e5 View commit details

  7. hydra-eval-jobs: Parallelize 

    (cherry picked from commit be8eb9d)
    @edolstra
    edolstra committed Feb 20, 2020
    Copy the full SHA
    c642f78 View commit details

  8. Fix build

    @edolstra
    edolstra committed Feb 20, 2020
    Copy the full SHA
    eb5873a View commit details
1 change: 0 additions & 1 deletion .gitignore
View file
Original file line number Diff line number Diff line change
@@ -15,7 +15,6 @@ Makefile.in
/aclocal.m4
/missing
/install-sh
/src/script/hydra-eval-guile-jobs
/src/sql/hydra-postgresql.sql
/src/sql/hydra-sqlite.sql
/src/sql/tmp.sqlite
13 changes: 1 addition & 12 deletions configure.ac
View file
Original file line number Diff line number Diff line change
@@ -53,15 +53,6 @@ fi

PKG_CHECK_MODULES([NIX], [nix-main nix-expr nix-store])

PKG_CHECK_MODULES([GUILE], [guile-2.0], [HAVE_GUILE=yes], [HAVE_GUILE=no])

if test "x$HAVE_GUILE" = xyes; then
AC_PATH_PROG([GUILE], [guile])
else
GUILE="guile"
fi
AC_SUBST([GUILE])

testPath="$(dirname $(type -p expr))"
AC_SUBST(testPath)

@@ -80,13 +71,11 @@ AC_CONFIG_FILES([
src/lib/Makefile
src/root/Makefile
src/script/Makefile
src/script/hydra-eval-guile-jobs
tests/Makefile
tests/jobs/config.nix
])

AC_CONFIG_COMMANDS([executable-scripts],
[chmod +x src/script/hydra-eval-guile-jobs])
AC_CONFIG_COMMANDS([executable-scripts], [])

AC_CONFIG_HEADER([hydra-config.h])

9 changes: 3 additions & 6 deletions release.nix
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{ hydraSrc ? builtins.fetchGit ./.
, nixpkgs ? builtins.fetchGit { url = https://github.com/NixOS/nixpkgs-channels.git; ref = "nixos-19.09-small"; }
, nixpkgs ? builtins.fetchTarball https://github.com/NixOS/nixpkgs/archive/release-19.09.tar.gz
, officialRelease ? false
, shell ? false
}:
@@ -129,11 +129,10 @@ rec {
buildInputs =
[ makeWrapper autoconf automake libtool unzip nukeReferences pkgconfig sqlite libpqxx
gitAndTools.topGit mercurial darcs subversion bazaar openssl bzip2 libxslt
guile # optional, for Guile + Guix support
perlDeps perl nix
postgresql95 # for running the tests
boost
nlohmann_json
(nlohmann_json.override { multipleHeaders = true; })
];

hydraPath = lib.makeBinPath (
@@ -155,9 +154,7 @@ rec {

preConfigure = "autoreconf -vfi";

NIX_LDFLAGS = [
"-lpthread"
];
NIX_LDFLAGS = [ "-lpthread" ];

enableParallelBuilding = true;

2 changes: 1 addition & 1 deletion src/hydra-eval-jobs/Makefile.am
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
bin_PROGRAMS = hydra-eval-jobs

hydra_eval_jobs_SOURCES = hydra-eval-jobs.cc
hydra_eval_jobs_LDADD = $(NIX_LIBS)
hydra_eval_jobs_LDADD = $(NIX_LIBS) -lnixrust
hydra_eval_jobs_CXXFLAGS = $(NIX_CFLAGS) -I ../libhydra
Loading