diff options
author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2022-09-27 18:04:13 +0000 |
---|---|---|
committer | GitHub <noreply@github.com> | 2022-09-27 18:04:13 +0000 |
commit | 3f66160994a8a1061841e7fb3c4e2b31b9902d83 (patch) | |
tree | 1220b9c0761b86b5e5e8ba678549eb182aff5420 /nixos | |
parent | 6f691051994ec6430b811582ff1a5fe4174928cf (diff) | |
parent | 5ac22c7a8b6222c0f6934b672a56818dd32ab4b0 (diff) | |
download | nixpkgs-3f66160994a8a1061841e7fb3c4e2b31b9902d83.tar nixpkgs-3f66160994a8a1061841e7fb3c4e2b31b9902d83.tar.gz nixpkgs-3f66160994a8a1061841e7fb3c4e2b31b9902d83.tar.bz2 nixpkgs-3f66160994a8a1061841e7fb3c4e2b31b9902d83.tar.lz nixpkgs-3f66160994a8a1061841e7fb3c4e2b31b9902d83.tar.xz nixpkgs-3f66160994a8a1061841e7fb3c4e2b31b9902d83.tar.zst nixpkgs-3f66160994a8a1061841e7fb3c4e2b31b9902d83.zip |
Merge master into staging-next
Diffstat (limited to 'nixos')
-rw-r--r-- | nixos/release-small.nix | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/nixos/release-small.nix b/nixos/release-small.nix index 1d51b4e7f28..8367610fb7f 100644 --- a/nixos/release-small.nix +++ b/nixos/release-small.nix @@ -69,7 +69,7 @@ in rec { imagemagick jdk linux - mysql + mariadb nginx nodejs openssh |