Commit Graph
100 Commits
Author SHA1 Message Date
Robert Hensing 91d03cd360 nixos/ssh: Document authorizedKeysFiles properly
(cherry picked from commit dab747106e20268e6d3a7c1a758185bc75507bef)
2021-06-15 19:42:28 +00:00
Robert Hensing 89ecb51a6a nixos/ssh: Add an example of verbatim keys
This confused someone on SO.

(cherry picked from commit 8352cc9a23a5fea11d467a5b8341b24cd162c62a)
2021-06-15 19:42:27 +00:00
Robert Hensing f52ff6ed96 arion: 0.1.2.0 -> 0.1.3.0 2021-06-04 14:02:39 +02:00
Robert Hensing fc30ee8ce7 dockerTools: Fix passthru image tag
It should match the actual image tag.
This fixes the problem introduced in 00996b5e03
https://github.com/NixOS/nixpkgs/pull/115491#pullrequestreview-672789901

(cherry picked from commit ff55c41facaa6812f9cc879a49f6929321881d4f)
2021-06-02 15:02:31 +00:00
Robert Hensing eeefa0a65d podman: Add nixosTests.podman-dnsname to tests
(cherry picked from commit 1d781e5c80d3c392933479a114e9e3857a1d9529)
2021-06-02 10:20:11 +02:00
Robert Hensing c758b69375 nixos/podman-dnsname: init
(cherry picked from commit 54f2f1e5f1c7fd34e564a84443e8490477e26eb7)
2021-06-02 10:20:11 +02:00
Robert Hensing 9e4729617b nixos/podman: Add defaultNetwork.extraPlugins
(cherry picked from commit d81631fb98ea35b107d86f5de287cf727d0dfc18)
2021-06-02 10:20:11 +02:00
Robert Hensing f28df17dfa nixos/containers: Add virtualisation.containers.containersConf.cniPlugins
(cherry picked from commit efba949352271ec77d9d5e7d54f2d16b9c53ee4f)
2021-06-02 10:20:11 +02:00
Robert Hensing 03e08759f7 dnsname-cni: Use wrapper instead of patch for dnsmasq
The patch proved to be an incomplete solution while developing
nixosTests.podman-dnsname

(cherry picked from commit 651777934941480a36f7df9c434e6044957d045d)
2021-06-02 10:20:11 +02:00
Robert Hensing 29ee113277 podman: Add iproute2, fixing docker network rm
(cherry picked from commit db31d8354d9c1988968f076c4e01843330162e03)
2021-06-02 10:20:11 +02:00
Robert Hensing 833b005e37 nixos/podman-network-socket-ghostunnel: init
(cherry picked from commit b6570e723836167640c9b7efc63f327ff17b0755)
2021-06-02 10:20:10 +02:00
Robert Hensing ffde2bb4a1 nixos/podman: Add generic networkSocket interface
(cherry picked from commit 52844efcd67028a481a24103d8e93c7ef2bf4f08)
2021-06-02 10:20:10 +02:00
Robert Hensing 0c5e6d0bea nixos/podman: Add dockerSocket.enable
(cherry picked from commit ff4d83a66727ad13da0f51d00db4eda8a8c50590)
2021-06-02 10:20:10 +02:00
Robert Hensing db05ed8b0d nixos/podman: Change podman socket to new podman group
(cherry picked from commit fb8b0a38433c8e83a53c1dc0a739c5a7ad64e2fc)
2021-06-02 10:20:10 +02:00
Robert Hensing fb8409427c dockerTools: Allow omitting all store paths
Adds includeStorePaths, allowing the omission of the store paths.
You generally want to leave it on, but tooling may disable this
to insert the store paths more efficiently via other means, such
as bind mounting the host store.

(cherry picked from commit 5259d66b7487b94233821e28aafb0683ae3f1df6)
2021-06-02 07:51:33 +00:00
Robert Hensing 2e0ff58c76 dockerTools: Format
(cherry picked from commit 69de7cc12abfa1d0434750e5d346c299992a57ec)
2021-06-02 07:51:32 +00:00
Robert Hensing dc9cb63de4 nixos/ghostunnel: init 2021-05-20 10:41:52 +02:00
Robert Hensing 76993d0b76 ghostunnel: init at 1.5.3
A simple TLS proxy with mutual authentication support
for securing non-TLS backend applications.
2021-05-20 10:41:52 +02:00
Robert Hensing 14f54a8b3c tests.trivial: Add meta 2021-05-19 11:41:45 +02:00
Robert Hensing 35406647fd tests.trivial: Avoid evaluation and ${pkgs.path} dep
> There is an issue in the test added by #123111.
> [it] introduces a dependency on the contents of nixpkgs,
> making every change evaluate with a different hash.
2021-05-19 01:06:09 +02:00
Robert Hensing 81c7dd1dae podman-compose: 0.1.5 -> 0.2.0pre-2021-05-18 2021-05-19 00:08:40 +02:00
Robert Hensing ed4523186e writeReferencesToFile: docs and tests 2021-05-15 17:04:25 +02:00
Robert Hensing cc60f81e69 writeDirectReferencesToFile: init 2021-05-15 17:04:25 +02:00
Robert Hensing 7b0e0ca35e nixos-install-tools: init
The essential commands from the NixOS installer as a package

With this package, you get the commands like nixos-generate-config and
nixos-install that you would otherwise only find on a NixOS system, such
as an installer image.

This way, you can install NixOS using a machine that only has Nix.

It also includes the manpages, which are important because the commands
rely on those for providing --help.
2021-05-13 01:29:02 +02:00
Robert Hensing 75c4fc1c8b nixos/testing-python.nix: Move makeWrapper to nativeBuildInputs 2021-05-09 03:04:03 +02:00
Robert Hensing 8c868f47a8 Revert "nixos/tests/docker-tools*: remove useless formatter"
Annoyed with the interference of the python formatting of
generated code (see #72964), I took matters into my own hands
as maintainer of dockerTools.

Afterwards, I've created a PR, hoping to unstuck the discussion.

@aszlig took notice and thanks to his python ecosystem knowledge,
the testing efforts of @blaggacao and @Ma27, and a sense of
shared suffering and comraderie we were able to change the
situation for the better in #122201.

Now, we have a proper linter that actually helps contributors,
so it's time to turn it back on again.

I'm glad we could make it happen this quickly!

Thanks!

This reverts commit 4035049af3.
2021-05-09 02:57:17 +02:00
Robert Hensing b9e7fb14e2 nixos/tests/nfs: lint 2021-05-09 02:28:07 +02:00
Robert Hensing 06b070ffe7 nixosTests.acme: lint 2021-05-09 02:28:04 +02:00
Robert Hensingandaszlig 56d9637119 nixos/testing: Set up scope for testScript linter
Our test driver exposes a bunch of variables and functions, which
pyflakes doesn't recognise by default because it assumes that the test
script is executed standalone. In reality however the test driver script
is using exec() on the testScript.

Fortunately pyflakes has $PYFLAKES_BUILTINS, which are the attributes
that are globally available on all modules to be checked. Since we only
have one module, using this environment variable is fine as opposed to
my first approach to this, which tried to use the unstable internal API
of pyflakes.

The attributes are gathered by the main derivation of the test driver,
because we don't want to end up defining a new attribute in the test
driver module just to being confused why using it in a test will result
in an error.

Another way we could have gathered these attributes would be in
mkDriver, which is where the linting takes place. However, we do have a
different set of Python dependencies in scope and duplicating these will
again just cause confusion over having it at one location only.

Signed-off-by: aszlig <aszlig@nix.build>
Co-Authored-By: aszlig <aszlig@nix.build>
2021-05-09 02:26:51 +02:00
Robert Hensing 71087b2bc4 nixos/testing-python.nix: Expose driver
(cherry picked from commit a2c9220568648b4528154ebd8e657add243ed0b4)
2021-05-09 02:26:40 +02:00
Robert Hensing 8e3c5eb501 treewide: xvfb_run -> xvfb-run 2021-05-08 15:48:41 +02:00
Robert Hensing 726306003a xvfb-run: rename from xvfb_run 2021-05-08 15:46:09 +02:00
Robert Hensing 4035049af3 nixos/tests/docker-tools*: remove useless formatter 2021-05-08 15:03:20 +02:00
Robert Hensing a67c97a5eb nixos/tests/docker-tools*: Add myself as maintainer where missing
I should have done this when I became maintainer for dockerTools,
but it's the PR reviews that matter.
2021-05-08 15:00:19 +02:00
Robert Hensing 0f000b836e haskellPackages.hercules-ci-optparse-applicative: 2021-03-05 -> 2021-03-18 2021-05-07 20:47:02 +02:00
Robert Hensing 66fd2ea7ee openapi-generator-cli: Invoke install hooks 2021-05-06 16:25:26 +02:00
Robert Hensing cd855e6746 openapi-generator-cli: Use jre_headless 2021-05-06 16:25:26 +02:00
Robert Hensing 99d5c97a8c openapi-generator-cli: Add passthru.tests.example 2021-05-06 16:25:24 +02:00
Robert Hensing 89fffee73f openapi-generator-cli: 5.0.0 -> 5.1.0 2021-05-06 11:24:56 +02:00
Robert Hensing 377f9ca78d elmPackages.elm-json: 0.2.7 -> 0.2.10 2021-05-06 11:21:40 +02:00
Robert Hensing a36e6760e9 Revert "lib/modules: Issue type deprecation warnings recursively"
This reverts commit 4b54aedee5.
2021-05-05 18:53:34 +02:00
Robert Hensing e7412dde1f Revert "lib/tests: Add type deprecation tests"
This reverts commit 8b957e3b30.
2021-05-05 18:53:28 +02:00
Robert Hensing 7bd3c0c2df hercules-ci-agent: Add passthru test for NixOS module eval 2021-05-04 16:58:07 +02:00
Robert Hensing 519a435b08 nixos/hercules-ci-agent: Set default labels 2021-05-04 16:29:05 +02:00
Robert Hensing 4abd56732e nixos/hercules-ci-agent: Set default concurrency to auto 2021-05-04 16:28:31 +02:00
Robert Hensing 162b8fba12 testing-python.nix: document runTests pos argument 2021-05-03 13:33:41 +02:00
Robert Hensing 58117bc220 nixos/cassandra: extraUsers -> users 2021-04-29 08:51:40 +02:00
Robert Hensing 472d3b710d nixos/cassandra: add myself as maintainer 2021-04-29 08:46:51 +02:00
Robert Hensing 6ad6271d82 nixos/cassandra: remove unnecessary literalExample calls 2021-04-29 08:43:58 +02:00
Robert Hensing 726669ace8 cassandra: use Nix scope checking 2021-04-29 08:40:12 +02:00
Robert Hensing 19ba3d97d2 cassandra: format 2021-04-29 08:40:12 +02:00
Robert Hensing 85ae7d02da nix: Run sandbox tests
on linux.

To find problems like this earlier: https://github.com/NixOS/nix/pull/4659
2021-04-02 10:51:31 +02:00
Robert Hensing f70a6453e5 nixopsUnstable: 2.0.0-pre (2021-02-03) -> 2.0.0-pre (2021-03-24) 2021-03-24 12:41:01 +01:00
Robert Hensing cda907d895 nixosTest: fix meta.position 2021-03-23 15:14:31 +01:00
Robert Hensing 9011d59758 logstash-*-oss: Add passthru.tests 2021-03-23 14:42:40 +01:00
Robert Hensing 05f8f9ac35 logstash: Use jdk11_headless 2021-03-23 14:42:40 +01:00
Robert Hensing e7e6e8d5c3 nixos/logstash: Don't set unnecessary JAVA_HOME 2021-03-23 14:42:40 +01:00
Robert Hensing 169c6b4b14 nixosTest: Make system.nixos.revision constant
Make the revision metadata constant, in order to avoid needless retesting.

The human version (e.g. 21.05-pre) is left as is, because it is useful
for external modules that test with e.g. nixosTest and rely on that
version number.
2021-03-22 21:39:43 +01:00
Robert Hensing 2f7be87a8a nixos/doc: Update Writing Documentation to use nix-shell 2021-03-22 21:21:08 +01:00
Robert Hensing 12e7698a65 nixos/doc/manual/Makefile: Do not format
Formatting has been neglected. Running `make` would format dozens
of files, which is a great way of scaring away newcomers and those
with less git experience. It would also annoy the heck out of
regular contributors.

The purpose of formatting is to avoid a small annoyance, so it
should not become a big annoyance that makes people give up on
their work.
2021-03-22 21:15:11 +01:00
Robert Hensing 641aa9e27d adoptopenjdk-{13,14}: mark insecure 2021-03-19 16:37:16 +01:00
Robert Hensing abfbcb13bc haskellPackages: Add packages maintained by roberth 2021-03-09 16:38:20 +01:00
Robert Hensing fdfbd17b70 hci: init at 0.1.0 2021-03-09 16:38:20 +01:00
Robert Hensing c0a3fd18ca hercules-ci-agent: Fix and update build 2021-03-09 16:38:20 +01:00
Robert Hensing b53965f1d2 doc/README.md: Add more links 2021-03-06 12:35:33 +01:00
Robert Hensing 7d551ead60 doc: Format 2021-03-04 18:10:57 +01:00
Robert Hensing 0a4a486096 doc/README.md: init 2021-03-04 18:10:39 +01:00
Robert Hensing a1cf35fbfd doc/builders/images/dockertools.section.md: Fix link labels 2021-03-04 17:44:33 +01:00
Robert Hensing f0e20e0975 acme: Determine offline whether renewal is due 2021-03-01 23:41:52 +01:00
Robert Hensing d18e47b760 cassandra: Invoke install hooks
Thanks @r-rmcgibbo for pointing that out
2021-02-18 12:17:30 +01:00
Robert Hensing da3bd95ffe cassandra: 3.11.9 -> 3.11.10 2021-02-18 11:50:19 +01:00
Robert Hensing ac852f63d3 cassandra_3_0: 3.0.23 -> 3.0.24 2021-02-18 11:50:14 +01:00
Robert Hensing 4ca1c4bcd5 cassandra_2*: mark as insecure 2021-02-18 11:50:14 +01:00
Robert Hensing 46a4d53063 qtwebengine: Increase build timeout to 24h
The default 10h timeout caused the cancellation of builds on
aarch64-linux builders.
Perhaps counterintuitively, this wastes resources because it
requires a restart, but never completes.

https://hydra.nixos.org/build/136917190
2021-02-16 10:17:55 +01:00
Robert Hensing 696294ea9f Improve todo 2021-02-10 10:36:00 +01:00
Robert Hensing 460ba46a4a nixos/hercules-ci-agent: Add myself to meta.maintainers 2021-02-10 09:50:27 +01:00
Robert Hensing 0c22957751 nixos/hercules-ci-agent: Improve concurrentTasks option doc 2021-02-10 09:49:57 +01:00
Robert Hensing fbabab7b16 nixos/hercules-ci-agent: Format with nixpkgs-fmt 2021-02-10 09:49:21 +01:00
Robert Hensing c808983caa nixos/hercules-ci-agent: Remove patchNix 2021-02-06 15:35:42 +01:00
Robert Hensing 04946f4246 nixos/vault: extraConfigPaths -> extraSettingsPaths
Align with RFC42 language, even if in advance of the actual settings
attribute.
2021-01-19 18:14:29 +01:00
Robert Hensing 3936d85ec3 nixos/systemd: allow preStart with other ExecStartPre cmdlines
Declaring them as lists enables the concatenation, supporting
lib.mkBefore, lib.mkOrder, etc.

This is useful when you need to extend a service with a pre-start
script that needs to run as root.
2021-01-19 16:29:29 +01:00
Robert Hensing 9797139cbb dockerTools: typo
Italian.
2021-01-15 14:23:51 +01:00
Robert Hensing a31607f904 dockerTools: Don't apologize
Warning about future breaking changes is wrong.

 - It suggests that the maintainers don't value backwards compatibility.
   They do.
 - It implies that other parts of Nixpkgs won't ever break. They will.
 - It implies that a well-defined "public" interface exists. It doesn't.
 - If the reasons above didn't apply, it should have been in the manual
   instead.

Breaking changes will come, especially to the interface. That can be the
only way we can make progress without breaking the image _contents_.

I don't think dockerTools is any different from most of Nixpkgs in
these regards.
2021-01-06 13:02:19 +01:00
Robert Hensing 653f18b48f nixosTests.vault-postgresql: init 2021-01-04 19:00:30 +01:00
Robert Hensing b413e7fd2a nixos/vault: Allow multiple config files 2021-01-04 19:00:30 +01:00
Robert Hensing 1eabc4cff1 nixosTests.vault: increase memorySize to 512 2021-01-04 19:00:29 +01:00
Robert Hensing fb3b144fd1 cachix: Add shell completion 2020-12-18 20:27:53 +01:00
Robert Hensing 90c92550f6 ormolu: Add shell completion 2020-12-18 20:27:53 +01:00
Robert Hensing f48b8dd5f6 niv: Add shell completion 2020-12-18 20:27:53 +01:00
Robert Hensing ae13cc9790 haskell.lib.generateOptparseApplicativeCompletion: support separate bin 2020-12-18 20:27:53 +01:00
Robert Hensing 5cacf0fcec dockerTools: use go.GOARCH as default arch 2020-12-15 02:15:35 -08:00
Robert Hensing d4b7efe531 nixosTests.docker-tools-cross: init
Not everyone has a suitable remote builder set up, so the cross-compilation
tests that _include_ running the result are separate. That way, most people
can run the majority of the test suite without the extra setup.
2020-12-15 02:15:12 -08:00
Robert Hensing ccdfb9c6ea cassandra: Add myself as maintainer 2020-12-14 15:37:46 +01:00
Robert Hensing ba5e222245 fetchMavenArtifact: fix generated url 2020-12-11 13:58:19 +01:00
Robert Hensing f0568c2228 fetchMavenArtifact: switch mirrors to https
Maven repositories are disabling HTTP support for security.
Even though Nix adds some security with its own hash validation,
broken mirrors are a, well, suboptimal experience.
I don't know of any plans by sonatype, but it seems like a matter
of time.

https://www.lightbend.com/blog/lightbend-to-require-https-on-repos-starting-august-5-2020
2020-12-11 11:43:23 +01:00
Robert Hensing a298710dd1 cassandra: Add passthru.tests 2020-12-09 13:24:48 +01:00
Robert Hensing 72a5301610 nixos/lib/testing-python.nix: Wire up passthru 2020-12-09 13:24:03 +01:00
Robert Hensing 031dabe1ca bolt: Disable atime tests 2020-12-07 08:44:08 +01:00
Robert Hensing f1f8539583 haskellPackages.hercules-ci-agent: Configure unbroken 2020-11-27 20:59:59 +01:00
Robert Hensing 5598ed7480 haskellPackages.hercules-ci-agent: Update Cabal for Setup 2020-11-27 20:59:59 +01:00