Commit Graph

108 Commits

Author SHA1 Message Date
Nick Cao
bee931454b hydra_unstable: 2022-10-22 -> 2022-11-24 2022-11-24 22:53:10 +01:00
Nick Cao
50fa198362 hydra_unstable: 2022-09-08 -> 2022-10-22 2022-11-01 22:17:37 +01:00
Nick Cao
17b08ee3c2 hydra_unstable: 2022-08-08 -> 2022-09-08 2022-09-08 22:16:25 +02:00
Nick Cao
e066019096 hydra_unstable: 2022-06-30 -> 2022-08-08 2022-08-15 08:33:06 +02:00
Nick Cao
0ef69d1fab
hydra_unstable: change 5s timeout for init to 30s in tests 2022-07-02 16:10:37 +08:00
Nick Cao
fc102563a6
hydra_unstable: 2022-06-16 -> 2022-06-30 2022-06-30 23:39:16 +08:00
Nick Cao
2207d36961
hydra_unstable: add patch for scmdiff 2022-06-17 10:39:49 +08:00
Nick Cao
1747286076
hydra_unstable: 2022-05-03 -> 2022-06-16 2022-06-16 21:19:47 +08:00
Florian Franzen
e0115c36ec hydra_unstable: passthru pinned nix 2022-05-30 11:17:16 +02:00
Nick Cao
0b7f226746
hydra_unstable: temporarily remove flaky ldap test 2022-05-21 22:03:40 +08:00
Nick Cao
e9e0ab3a03
hydra_unstable: 2022-02-07 -> 2022-05-03 2022-05-20 18:03:07 +08:00
Rick van Schijndel
189a38576e hydra_unstable: apply nixpkgs-fmt 2022-05-10 23:32:02 +02:00
Rick van Schijndel
3a7f7c1153 hydra-unstable -> hydra_unstable 2022-05-10 23:32:02 +02:00
Rick van Schijndel
292c63a5d6 hydra: remove multi-version support
This is a legacy of when a "stable" version of hydra existed, and this
probably won't be coming back.

This also removes some obsolete bits which have no effect on the
result of evaluation.

Unlike the original approach in #157072, we're moving the common
expression to "unstable.nix" instead. This allow putting everything in
one commit, satisfies git's rename detection, and remains bisectable.

Co-Authored-By: Bernardo Meurer <bernardo@meurer.org>
Co-Authored-By: Linus Heckemann <git@sphalerite.org>
2022-05-10 23:32:02 +02:00
Rick van Schijndel
33b01d5104 hydra-unstable: drop with stdenv from top
It doesn't appear to be needed and can make it harder to read the build description.
2022-05-10 23:32:02 +02:00
Rick van Schijndel
be5b57be1b hydra-unstable: remove old assertion
I don't think nixpkgs will build with nix 1 anyway, so let's just remove this.
2022-05-10 23:32:01 +02:00
Rick van Schijndel
6951b5c187 hydra-unstable: drop TestMore, which is an alias for null 2022-05-10 22:54:11 +02:00
Linus Heckemann
c07919c76c hydra: fix evaluation with aliases disabled 2022-05-10 14:08:18 +02:00
Linus Heckemann
a07cc04109 hydra: don't force HYDRA_RELEASE 2022-05-09 22:18:51 +02:00
Rick van Schijndel
cec7fc48bb hydra-unstable: 2021-12-17 -> 2022-02-07
Co-authored-by: Linus Heckemann <git@sphalerite.org>
2022-05-09 22:18:50 +02:00
Rick van Schijndel
2e882e0903 hydra-unstable: 2021-08-11 -> 2021-12-17
Adds some new required deps too.
Enable doCheck (tests).

Apply patch for missing std:: specifier before std::strings.
2022-05-09 22:18:50 +02:00
Ben Siraphob
21faf9fc29
treewide: move autoconf, automake to nativeBuildInputs 2022-03-30 20:17:24 -05:00
Nick Cao
192eb5d896
hydra-unstable: fixup eval.patch 2022-02-26 13:53:35 +08:00
Artturi
b398f196e6
Merge pull request #158455 from NickCao/nix-unstable
nixUnstable: pre20220127 -> pre20220207
2022-02-26 07:42:03 +02:00
Nick Cao
0930709272
hydra-unstable: fix build with nixVersions.unstable 2022-02-26 13:13:33 +08:00
Maximilian Bosch
a215ce7fa5
hydra-unstable: remove ma27 from maintainer list
I'm deploying my own Hydra via flakes for a while now and while this
package actually needs more love and a few updates, I don't have the
capacity to take care of this.
2022-02-10 12:25:45 +01:00
Bernardo Meurer
0419f3b47b
hydra: don't use nixUnstable alias 2022-01-26 12:39:42 -08:00
Bernardo Meurer
5210313299
nixStable: make an alias of nix 2022-01-26 10:32:56 -08:00
Maximilian Bosch
9c6dc5d264
hydra-unstable: add missing perl deps 2021-08-11 11:35:57 +02:00
happysalada
247b53f484 hydra-unstable: 2021-05-03 -> 2021-08-11 2021-08-11 15:14:48 +09:00
Jonathan Ringer
3394da8775 hydra-unstable: fix build, pin libpqxx to 6.4.5 2021-06-24 00:47:07 -07:00
Eelco Dolstra
62ee635d53
Replace nixFlakes -> nixUnstable 2021-05-21 15:23:52 +02:00
Cole Helbling
451477e741
hydra-unstable: 2021-04-29 -> 2021-05-03
This incorporates a few more API fixes that have been made to Hydra since the
last bump.
2021-05-04 12:39:17 -07:00
regnat
bdc95ab29e hydraUnstable: 2021-03-29 -> 2021-04-29
Required to work with the latest nixUnstable
2021-05-03 16:51:15 +02:00
Sandro Jäckel
3453b89f4b
lzma: deprecate alias 2021-04-04 19:49:52 +02:00
Antoine Eiche
e4a1014dd7 hydra-unstable: 2021-03-10 -> 2021-03-29 2021-03-29 22:48:04 +02:00
Shea Levy
d47ac89233
hydra: Put mdbook in nativeBuildInputs where it belongs 2021-03-11 10:44:23 -05:00
Shea Levy
9c5f8a20b4
nixUnstable: 2.4pre20201205_a5d85d0 -> 2.4pre20210308_1c0e3e4
hydra-unstable: 2020-10-20 -> 2021-03-10
2021-03-10 14:13:00 -05:00
Sandro Jäckel
2cd8ce7796
hydra: remove unused inputs 2021-02-18 17:18:22 +01:00
Ben Siraphob
c522fec274 pkgs/development/tools: stdenv.lib -> lib 2021-01-23 20:30:03 +07:00
Jonathan Ringer
9bb3fccb5b treewide: pkgs.pkgconfig -> pkgs.pkg-config, move pkgconfig to alias.nix
continuation of #109595

pkgconfig was aliased in 2018, however, it remained in
all-packages.nix due to its wide usage. This cleans
up the remaining references to pkgs.pkgsconfig and
moves the entry to aliases.nix.

python3Packages.pkgconfig remained unchanged because
it's the canonical name of the upstream package
on pypi.
2021-01-19 01:16:25 -08:00
Alyssa Ross
3893d6c6d7 gitAndTools: move everything to the top level
The comment at the top of git-and-tools/default.nix said:

    /* All git-relates tools live here, in a separate attribute set so that users
     * can get a fast overview over what's available.

but unfortunately that hasn't actually held up in practice.

Git-related packages have continued to be added to the top level, or
into gitAndTools, or sometimes both, basically at random, so having
gitAndTools is just confusing.  In fact, until I looked as part of
working on getting rid of gitAndTools, one program (ydiff) was
packaged twice independently, once in gitAndTools and once at the top
level (I fixed this in 98c3490196).

So I think it's for the best if we move away from gitAndTools, and
just put all the packages it previously contained at the top level.
I've implemented this here by just making gitAndTools an alias for the
top level -- this saves having loads of lines in aliases.nix.  This
means that people can keep referring to gitAndTools in their
configuration, but it won't be allowed to be used within Nixpkgs, and
it won't be presented to new users by e.g. nix search.

The only other change here that I'm aware of is that
appendToName "minimal" is not longer called on the default git
package, because doing that would have necessitated having a private
gitBase variable like before.  I think it makes more sense not to do
that anyway, and reserve the "minimal" suffix only for gitMinimal.
2021-01-14 21:27:48 +00:00
Orivej Desh
de753c64f9 hydraUnstable: patch to support nixUnstable 2.4pre20201205_a5d85d0
Upstream PR: https://github.com/NixOS/hydra/pull/840
2021-01-06 06:05:52 +00:00
Maximilian Bosch
1308817e05
nixos/hydra: remove hydra-migration upgrade path
This should NOT be backported to 20.09!

When 21.03 is released, the DB changes are about a year old and
operators had two release cycles for the upgrade. At this point it
should be fair to remove the compat layer to reduce the complexity of
the module itself.
2020-10-21 18:03:04 +02:00
Maximilian Bosch
1bb8808e1a
hydra-unstable: 2020-09-02 -> 2020-10-20 2020-10-21 18:03:04 +02:00
Maximilian Bosch
1c55613cd7
hydra-unstable: 2020-08-04 -> 2020-09-02
Needed to fix Hydra with latest `nixUnstable`.
2020-09-03 22:34:13 +02:00
Maximilian Bosch
ae9ab324b7
hydra-unstable: 2020-07-28 -> 2020-08-04
Moving just one patch forward to fix importing store-paths from
`hydra-queue-runner`[1]. The other patches[2] require a newer
`pkgs.nixUnstable` and can't be used currently due to this.

[1] https://github.com/NixOS/nixpkgs/pull/93945#issuecomment-668244478
[2] 77c33c1d71...4b5813051b
2020-08-04 15:29:09 +02:00
Ivan Kozik
0d7bdd6d8e hydra-unstable: 2020-06-23 -> 2020-07-28
This fixes the build:

config.status: creating hydra-config.h
config.status: executing depfiles commands
config.status: executing libtool commands
config.status: executing executable-scripts commands
building
build flags: -j8 -l8 SHELL=/nix/store/c4wxsn4jays9j31y5z9f83nr2cp7l4pa-bash-4.4-p23/bin/bash
make  all-recursive
make[1]: Entering directory '/build/source'
Making all in src
make[2]: Entering directory '/build/source/src'
Making all in hydra-evaluator
make[3]: Entering directory '/build/source/src/hydra-evaluator'
g++ -DHAVE_CONFIG_H -I. -I../..    -std=c++17 -I/nix/store/2xhb4hlskn33pbyph36v4wxcan56dnrw-boehm-gc-8.0.4-dev/include -I/nix/store/5rjgsqjdm71cflfb68q7m771a1rqcsk3-nix-2.4pre20200719_a79b6dd-dev/include/nix -Wall -I ../libhydra -Wno-deprecated-declarations -g -O2 -std=c++17 -include nix/config.h -c -o hydra_evaluator-hydra-evaluator.o `test -f 'hydra-evaluator.cc' || echo './'`hydra-evaluator.cc
hydra-evaluator.cc:27:27: error: template argument 1 is invalid
   27 |     std::unique_ptr<Config> config;
      |                           ^
hydra-evaluator.cc:27:27: error: template argument 2 is invalid
hydra-evaluator.cc: In constructor 'Evaluator::Evaluator()':
hydra-evaluator.cc:61:56: error: base operand of '->' is not a pointer
   61 |         , maxEvals(std::max((size_t) 1, (size_t) config->getIntOption("max_concurrent_evals", 4)))
      |                                                        ^~
hydra-evaluator.cc:60:44: error: invalid user-defined conversion from 'std::_MakeUniq<Config>::__single_object' {aka 'std::unique_ptr<Config, std::default_delete<Config> >'} to 'int' [-fpermissive]
   60 |         : config(std::make_unique<::Config>())
      |                  ~~~~~~~~~~~~~~~~~~~~~~~~~~^~
In file included from /nix/store/3krz9s8ni3bqy4hy35ycmq8assrrb4f6-gcc-9.3.0/include/c++/9.3.0/memory:80,
                 from /nix/store/d97d0wixvlprz59z57maqj1pmda55r3b-libpqxx-6.4.5/include/pqxx/binarystring.hxx:17,
                 from /nix/store/d97d0wixvlprz59z57maqj1pmda55r3b-libpqxx-6.4.5/include/pqxx/binarystring:4,
                 from /nix/store/d97d0wixvlprz59z57maqj1pmda55r3b-libpqxx-6.4.5/include/pqxx/pqxx:3,
                 from ../libhydra/db.hh:3,
                 from hydra-evaluator.cc:1:
/nix/store/3krz9s8ni3bqy4hy35ycmq8assrrb4f6-gcc-9.3.0/include/c++/9.3.0/bits/unique_ptr.h:374:16: note: candidate is: 'std::unique_ptr<_Tp, _Dp>::operator bool() const [with _Tp = Config; _Dp = std::default_delete<Config>]' <near match>
  374 |       explicit operator bool() const noexcept
      |                ^~~~~~~~
/nix/store/3krz9s8ni3bqy4hy35ycmq8assrrb4f6-gcc-9.3.0/include/c++/9.3.0/bits/unique_ptr.h:374:16: note:   return type 'bool' of explicit conversion function cannot be converted to 'int' with a qualification conversion
make[3]: *** [Makefile:440: hydra_evaluator-hydra-evaluator.o] Error 1
make[3]: Leaving directory '/build/source/src/hydra-evaluator'
make[2]: *** [Makefile:360: all-recursive] Error 1
make[2]: Leaving directory '/build/source/src'
make[1]: *** [Makefile:414: all-recursive] Error 1
make[1]: Leaving directory '/build/source'
make: *** [Makefile:344: all] Error 2
builder for '/nix/store/g967cc3j6rc3nnpx2s4klpr03ig9zzyp-hydra-2020-06-23.drv' failed with exit code 2
2020-07-28 23:40:41 +00:00
Maximilian Bosch
39e3c15706
hydra-unstable: 2020-06-01 -> 2020-06-23
Fixes the build the changes from b505bf202b.
2020-06-23 15:57:22 +02:00
Maximilian Bosch
c18016cfbf
hydra-unstable: 2020-04-16 -> 2020-06-01 2020-06-02 15:39:42 +02:00