MirrorHub/nixpkgs
0
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-16 14:54:29 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1
278784 commits 258 branches 124 tags 6 GiB
Commit graph

3246 commits

Author SHA1 Message Date
Benjamin Hipple
561cc81ee6
Merge pull request #115857 from lbpdt/feature/docker-tools-layered-base-image 
dockerTools.buildLayeredImage: support fromImage
 2021-03-23 18:15:34 -04:00
Robert Hensing
e0e241c219
Merge pull request #116369 from m1cr0man/master 
nixos/acme: Fix webroot issues
 2021-03-23 21:31:42 +01:00
Louis Blin
aae8588182 dockerTools.buildLayeredImage: support fromImage 
It is now possible to pass a `fromImage` to `buildLayeredImage` and
`streamLayeredImage`, similar to what `buildImage` currently supports.

This will prepend the layers of the given base image to the resulting
image, while ensuring that at most `maxLayers` are used. It will also
ensure that environment variables from the base image are propagated
to the final image.
 2021-03-23 14:50:42 +00:00
Profpatsch
c25ffa8b76
Merge pull request #117073 from sternenseemann/inspircd-3.9.0 
inspircd: init at 3.9.0
 2021-03-23 11:25:58 +01:00
Sander van der Burg
8fc9423565
Merge pull request #116455 from svanderburg/systemdunitpath 
systemd: allow custom unit folders to be configured with SYSTEMD_UNIT…
 2021-03-22 22:58:49 +01:00
Sander van der Burg
5c8ed06fc9 systemd: allow custom unit folders to be configured with SYSTEMD_UNIT_PATH 2021-03-22 20:41:12 +01:00
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
sternenseemann
726db56d68 !fixup simplify zipListsWith call 2021-03-22 14:52:13 +01:00
sternenseemann
66454f0e5a !fixup get rid of trailing comment hack 2021-03-22 14:48:38 +01:00
sternenseemann
4048b39fc1 nixos/modules/inspircd: add simplistic module and nixos test 2021-03-22 14:38:57 +01: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
Lucas Savva
2dd7973751 nixos/acme: Add permissions tests 2021-03-15 19:25:49 +00:00
Lucas Savva
920a3f5a9d nixos/acme: Fix webroot issues 
With the UMask set to 0023, the
mkdir -p command which creates the webroot
could end up unreadable if the web server
changes, as surfaced by the test suite in #114751
On top of this, the following commands
to chown the webroot + subdirectories was
mostly unnecessary. I stripped it back to
only fix the deepest part of the directory,
resolving #115976, and reintroduced a
human readable error message.
 2021-03-15 01:41:40 +00: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