3
0
Fork 0
forked from mirrors/nixpkgs
Commit graph

3235 commits

Author SHA1 Message Date
adisbladis 04a37553f2
Merge pull request #114821 from erosennin/catatonit
catatonit: init at 0.1.5, fix podman --init
2021-03-22 16:04:06 +02:00
Matt McHenry 13bee29b9b restic: allow prune without backup
fixes #97820
2021-03-21 18:47:52 -07:00
Andrey Golovizin fd3f1ec19a nixos/tests/podman: test podman run --init 2021-03-21 21:26:47 +01:00
github-actions[bot] c804f22a81
Merge master into staging-next 2021-03-19 12:26:52 +00:00
Alexander Foremny 297b1ba320 Revert "nixos/systemd: Handle template overrides"
This reverts commit e3b90b6ccc.

This commit broke container tests and thus blocked channels from
advancing.
2021-03-19 09:05:33 +01:00
github-actions[bot] d73a492e83
Merge master into staging-next 2021-03-19 00:41:01 +00:00
Niklas Hambüchen 296c47d7b2
Merge pull request #116282 from nh2/programs-turbovnc
turbovnc: Add programs.turbovnc, add test for headless software OpenGL
2021-03-19 01:12:33 +01:00
Jan Tojnar 0136206b12
Merge branch 'master' into staging-next 2021-03-18 13:35:59 +01:00
Florian Klink 68d6ffc8d5
Merge pull request #115549 from adrianparvino/new-nixos-unstable
systemd: Handle template overrides
2021-03-16 23:05:11 +01:00
github-actions[bot] 3b97019142
Merge master into staging-next 2021-03-14 06:17:28 +00:00
Lancelot SIX 85ad7501ec nixos/tests/spike: Fix assertion 2021-03-14 00:58:50 -05:00
Niklas Hambüchen b46f6cba79 turbovnc: Add programs.turbovnc, add test for headless software OpenGL 2021-03-14 06:27:43 +01:00
Jan Tojnar 01a4d350c7
Merge branch 'master' into staging-next
Reverted https://github.com/NixOS/nixpkgs/pull/115228 for kodi to avoid conflict.

It does not look like unzip would be used but not investigating now to speed up merge conflict resolution.
2021-03-13 19:16:43 +01:00
WilliButz 3971cda05f
Merge pull request #116037 from petabyteboy/feature/jitsi-exporter
prometheus-jitsi-exporter: init at 0.2.18
2021-03-13 13:37:10 +01:00
github-actions[bot] 4181409166
Merge master into staging-next 2021-03-13 06:17:31 +00:00
Aaron Andersen 5a24206e17
Merge pull request #111030 from cript0nauta/miniflux-sudo
nixos/miniflux: don't depend on sudo
2021-03-12 20:42:09 -05:00
Aaron Andersen 47c5175f0c
Merge pull request #93629 from ju1m/croc
nixos/croc: init
2021-03-12 20:34:33 -05:00
Milan Pässler b2bebd7cd5
nixos/prometheus-jitsi-exporter: init 2021-03-12 11:11:16 +01:00
github-actions[bot] 903fc48674
Merge master into staging-next 2021-03-12 00:39:51 +00:00
Benjamin Hipple 17a9f368e3
Merge pull request #115793 from lbpdt/feature/docker-tools-layered-image-name-slashes
dockerTools.buildLayeredImage: image names with registry/ prefix
2021-03-11 14:58:26 -05:00
github-actions[bot] d6257d451b
Merge master into staging-next 2021-03-11 18:23:54 +00:00
WilliButz f5c01cf9d4
Merge pull request #113370 from chkno/prometheus-systemd-exporter-no-flags
prometheus-systemd-exporter: Init at 0.4.0
2021-03-11 19:18:29 +01:00
WilliButz 3ceef8186c
Merge pull request #115185 from Ma27/knot-exporter
prometheus-knot-exporter: init at 2021-01-30; minor module improvements
2021-03-11 18:58:59 +01:00
WilliButz 902a479225
Merge pull request #111364 from lbpdt/feature/prometheus-artifactory-exporter
nixos/prometheus-exporters/artifactory: init at 1.9.0
2021-03-11 18:44:03 +01:00
github-actions[bot] b4d5951d9e
Merge master into staging-next 2021-03-11 12:21:28 +00:00
Maximilian Bosch 7ecc3b0684
Merge pull request #115372 from BBBSnowball/pr-add-config-nextcloud-imagick
nixos/nextcloud: Conditionally enable ImageMagick PHP extension
2021-03-11 12:45:17 +01:00
Adrian Parvin D. Ouano e3b90b6ccc nixos/systemd: Handle template overrides
Adding template overrides allows for custom behavior for specific
instances of a template. Previously, it was not possible to provide
bind mounts for systemd-nspawn. This change allows it.
2021-03-11 10:21:14 +08:00
Benjamin Koch 1bd7941a6b nixos/nextcloud: Use exportReferencesGraph for imagick test 2021-03-11 02:56:11 +01:00
github-actions[bot] 0a8ec23e51
Merge master into staging-next 2021-03-11 00:39:21 +00:00
Louis Blin 419a4fa596 dockerTools.buildLayeredImage: image names with registry/ prefix
When using `buildLayeredImage`, it is not possible to specify an image
name of the form `<registry>/my/image`, although it is a valid name.

This is due to derivations under `buildLayeredImage` using that image
name as their derivation name, but slashes are not permitted in that
context.

A while ago, #13099 fixed that exact same problem in `buildImage` by
using `baseNameOf name` in derivation names instead of `name`. This
change does the same thing for `buildLayeredImage`.
2021-03-10 17:44:24 +00:00
Sarah Brofeldt fa4bb6566a apacheKafka: init 2.6.1, make default 2021-03-10 08:10:32 +01:00
Sarah Brofeldt 08ef827056 nixos/apache-kafka: Drop default jvmOptions 2021-03-10 08:09:34 +01:00
github-actions[bot] 5d13702776
Merge master into staging-next 2021-03-09 12:25:54 +00:00
rnhmjoj 2120f02960
nixos/tests/privoxy: add test 2021-03-09 11:03:00 +01:00
Benjamin Koch d83a43a396 nixos/nextcloud: Add test for services.nextcloud.disableImagemagick 2021-03-09 01:44:18 +01:00
Julien Moutinho be6463cd9d nixos/croc: init 2021-03-08 01:34:32 +01:00
github-actions[bot] 65cddb74d7
Merge staging-next into staging 2021-03-07 06:17:25 +00:00
Johan Thomsen 7b5c38e973 nixos/kubernetes: docker -> containerd
also, nixos/containerd: module init
2021-03-07 12:51:14 +10:00
Jan Tojnar 1465e8e397
Merge branch 'staging-next' into staging 2021-03-06 19:56:45 +01:00
John Ericson f5a7d8bb41
Merge pull request #115228 from siraben/unzip-buildInputs
treewide: unzip buildInputs to nativeBuildInputs (2)
2021-03-06 13:30:43 -05:00
Ben Siraphob 4f0cdb68d7 treewide: unzip buldInputs to nativeBuildInputs (2) 2021-03-06 15:18:05 +07:00
Martin Weinelt 1050f1487b
nixos/home-assistant: disable tests on the package by default
We are running over 6000 tests by now and they take around 5 minutes
on faster machines and tests alot of components that endusers will not
actually be using. It is sufficient if we run them on package upgrades
and in the passthrough test.
2021-03-06 03:02:06 +01:00
Maximilian Bosch b4bd584b64
nixos/prometheus/exporters/knot: init 2021-03-05 13:13:46 +01:00
davidak 00b47419c6
Merge pull request #103705 from freezeboy/add-plik
plik: init at 1.3.1
2021-03-04 20:28:34 +01:00
Maximilian Bosch 5e5f482f32
nixos/tests/php: add apcu to php to actually test whether extensions are properly loaded 2021-03-04 16:06:37 +01:00
Maximilian Bosch 70ac808b39
nixos/tests/php/fpm: make sure that extensions are actually loaded
The phpinfo output from 127.0.0.1:80 only shows configuration options
and thus leads to false-positives.
2021-03-04 15:59:38 +01:00
taku0 61706fc470
Merge pull request #114853 from lourkeur/fix-string-escaping
nixos/kresd, nixos/dokuwiki, tests/fpm, build-bazel-package, libcutl: fix string escaping
2021-03-03 19:35:16 +09:00
Kim Lindberger 8eea5d0fbd
Merge pull request #114592 from etu/php-minor-fixes
php: various fixes
2021-03-02 09:41:15 +01:00
Elis Hirwing db439da3cd
nixos/tests/php: Select the right versions of the tests depending on version 2021-03-02 09:22:33 +01:00
Kim Lindberger e72375464b
Merge pull request #113635 from talyz/gitlab-improvements
nixos/gitlab: Clean config dir, switch to puma, split PreStart script and more
2021-03-01 13:37:53 +01:00