Commit Graph
100 Commits
Author SHA1 Message Date
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 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 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
Robert Hensing 2cc48d915f haskellPackages.servant-swagger: dontCheck
Tests did not compile.
Message:

test/Servant/SwaggerSpec.hs:44:14: error:
    • No instance for (HasSwagger
                         (Fragment Int :> Servant.Test.ComprehensiveAPI.GET))
        arising from a use of ‘toSwagger’
    • In the expression: toSwagger comprehensiveAPI
      In an equation for ‘_x’: _x = toSwagger comprehensiveAPI
      In the second argument of ‘($)’, namely
        ‘do let _x = toSwagger comprehensiveAPI
            True `shouldBe` True’
   |
44 |     let _x = toSwagger comprehensiveAPI
   |              ^^^^^^^^^^^^^^^^^^^^^^^^^^
2020-11-27 20:59:59 +01:00
Robert Hensing c8ae3d870c setup.sh: export XDG_DATA_DIRS for consistency
By exporting it, we always make the new directories available
to subprocesses, regardless of whether the environment
variable existed before `nix-shell` was invoked.
2020-11-25 08:44:04 -08:00
Robert Hensing 84c58abdc4 setup.sh: Only load XDG_DATA_DIRS for executable inputs
This avoids the scenario where strictDeps is off and cross-compiled
XDG_DATA_DIRS content is brought into the environment.

While probably harmless for data like manpages and completion scripts,
this would cause issues when XDG_DATA_DIRS is used to find executables
or plugins. The Qt framework is known to behave like this and might
have run into incompatibilities.
2020-11-25 08:44:04 -08:00
Robert Hensing 0f13cccb95 setup.sh: Support XDG_DATA_DIRS
XDG_DATA_DIRS is to /share as PATH is to /bin.

It was defined as part of the XDG basedir specification.
https://specifications.freedesktop.org/basedir-spec/basedir-spec-latest.html

While it originated from the X Desktop Group, it is not limited to
the X11 ecosystem, as evidenced by its use in bash-completion.

The removal of ` && -d "$pkg/bin"` is ok, because this optimization is
already performed by `addToSearchPath`.
2020-11-25 08:44:04 -08:00
Robert HensingandEelco Dolstra 4dd5da0ad0 nixUnstable: pre20201102_550e11f -> pre20201118_79aa7d9
Co-authored-by: Eelco Dolstra <edolstra@gmail.com>
2020-11-20 13:11:05 +01:00
Robert Hensing 739b762e56 Revert "firefox: set build timeout at eight hours"
The default timeout is 10h on Hydra currently, so this timeout
setting is pointless or counterproductive.
This commit seems to have been made in error
https://github.com/NixOS/nixpkgs/pull/96767#issuecomment-724104413

This reverts commit c57fedb14b27292f6433287740e2eec303363ec3.
2020-11-11 18:39:04 +01:00
Robert Hensing 5e1cf83383 Revert "libical: skip timezone tests"
This reverts commit 9c5154b5aa.
2020-11-06 14:48:28 +01:00
Robert Hensing d328ba130b tzdata: Revert to the "fat" "bloated" format
The timezone dumps have switched to a "slim" format since 2020b.
This has broken various packages, including
 - go 1.4 (used for bootstrapping)
 - haskellPackages.tz
 - libical

The "fat" format can still be generated, as this commit shows.
It seems to create files that are *mostly* the slim versions with
some more data attached.
2020-11-06 14:48:28 +01:00
Robert Hensing 7ac71d78a3 ghc8102: Fix whitespace 2020-11-06 11:35:19 +01:00
Robert Hensing 6057cb9786 ghc*: Increase build timeout to 1 day
The default of 10 hours is insufficient for some of the slower
platforms like macOS and aarch64.
2020-11-06 11:07:48 +01:00
Robert Hensing 1a5556867e Merge master into staging 2020-11-04 23:57:57 +01:00
Robert Hensing 6b377f2968 ghc8102Binary*: simplify meta
Not distributing dependencies via hydraPlatforms does not work,
so we keep meta simple.

(cherry picked from commit 4643796794897f2baa3a8015de5a9c9fd416f1ae)
2020-11-04 23:47:38 +01:00
Robert Hensing dda47e489a ghc8102BinaryMinimal: Re-add docs, remove more profiling files
(cherry picked from commit 7bd21d3e2da8b9ae394258cef9f18bf0a8dd2d47)
2020-11-04 23:47:38 +01:00
Robert Hensing 83163b43e4 postgresql: Fix timetz test failure
A recent addition to the test suite turned out to be sensitive to
DST. The main code is ok. Patch only required to make test succeed.

See https://git.postgresql.org/gitweb/?p=postgresql.git;a=commit;h=4a071afbd056282746a5bc9362e87f579a56402d
2020-11-04 09:58:09 +01:00
Robert Hensing f73df04874 haskell.compiler.integer-simple: Exclude ghc8102Binary*
(cherry picked from commit fc1562695bdfe26c38f473e4639ab0a1c349a953)
2020-11-04 09:55:56 +01:00
Robert Hensing f8ad73b9d8 haskell.compiler.ghc8102BinaryMinimal: init
To stay within hydra limit of 2^31 output size on aarch64-linux
2020-11-03 12:01:41 +01:00
Robert Hensing a4019a40b3 lib/sources.nix: Prefer lib for readFile inherit 2020-10-22 13:57:23 +02:00
Robert Hensing fe4a58eec0 lib: Add lib.trace for consistency
This puts it among the trace* family of functions derived from it.
2020-10-22 13:46:48 +02:00
Robert Hensing f8ab5fcd8d lib/modules: Simplify inherits 2020-10-22 13:46:48 +02:00
Robert Hensing 9a4bed1a80 lib: Add lib.isFloat for consistency
Unlike the other three is* functions in lib.trivial, it was only
available as lib.trivial.isFloat
2020-10-22 13:46:48 +02:00
Robert Hensing c9f8f66248 lib/options.nix: Use merge-friendly inherit syntax 2020-10-22 13:46:48 +02:00
Robert Hensing afa6c51f27 lib: Use Nix's static scope checking, fix error message, optimize
Nix can perform static scope checking, but whenever code is inside
a `with` expression, the analysis breaks down, because it can't
know statically what's in the attribute set whose attributes were
brought into scope. In those cases, Nix has to assume that
everything works out.

Except it doesnt. Removing `with` from lib/ revealed an undefined
variable in an error message.

If that doesn't convince you that we're better off without `with`,
I can tell you that this PR results in a 3% evaluation performance
improvement because Nix can look up local variables by index.
This adds up with applications like the module system.

Furthermore, removing `with` makes the binding site of each
variable obvious, which helps with comprehension.
2020-10-22 13:46:47 +02:00
Robert Hensing 5aa2a98dfa lib/types.nix: Use // instead of mergeAttrs 2020-10-22 13:46:47 +02:00