Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[staging] merge from staging-next #370761

Merged
merged 146 commits into from
Jan 4, 2025
Merged
Changes from all commits
Commits
Show all changes
146 commits
Select commit Hold shift + click to select a range
0b6f4a2
unifi-controller: patchelf unifi's sdnotify
qubitnano Dec 3, 2024
e5b5cf8
nixos/unifi: enable sd_notify
qubitnano Dec 4, 2024
5d10e2b
nixos/unifi: always restart service
qubitnano Dec 4, 2024
f1bdc12
headscale: backport BaseDomain and ServerURL checks
motiejus Nov 21, 2024
7d4abac
vmware-guest: Don't use lib directly for maintainers
kjeremy Dec 12, 2024
26e66c5
Remove with lib from minimal profile; group config
djds Dec 14, 2024
17f32f3
pinentry-rofi: add rofi and coreutils to runtime PATH
jmbaur Dec 18, 2024
e94b558
python3Packages.tinytag: 1.10.4 -> 2.0.0
Sigmanificient Dec 22, 2024
ed4bda4
dell-command-configure: fix missing include in wrapper
magneticflux- Dec 24, 2024
913c5d2
cnijfilter2: add patch to fix missing import
fee1-dead Dec 29, 2024
e7ff77d
rstudio: format with nixfmt
TomaSajt Nov 18, 2024
3f9546f
rstudio: don't use libsForQt5.callPackage
TomaSajt Nov 18, 2024
b43523d
rstudio: clean up by moving values around
TomaSajt Dec 8, 2024
e8cc15f
rstudio: refactor patches and deps, use lib.cmake*
TomaSajt Dec 8, 2024
3ce431a
rstudioWrapper: only symlink share directory if not server
TomaSajt Dec 18, 2024
34b5b9a
thunderbird: fix darwin build
booxter Dec 30, 2024
7c52e7a
caddy: 2.8.4 -> 2.9.0
stepbrobd Dec 31, 2024
df8c70a
alpaca: 3.1.0 -> 3.2.0
Gliczy Jan 1, 2025
4df6154
broot: 1.44.3 -> 1.44.4
DimitarNestorov Jan 1, 2025
7c1fe22
sbt-with-scala-native: 1.10.6 -> 1.10.7
r-ryantm Jan 2, 2025
3a63b6f
sbt: 1.10.6 -> 1.10.7
r-ryantm Jan 2, 2025
5d239cc
fwup: 1.11.0 -> 1.12.0
r-ryantm Jan 2, 2025
783d48a
go-task: update shell completions
iainvm Jan 2, 2025
fb6bdb4
evcxr: add mainProgram
musjj Jan 2, 2025
fb8b7c3
irssi: fix cross build
FliegendeWurst Jan 2, 2025
a6503ea
python312Packages.archinfo: 9.2.134 -> 9.2.135
fabaff Jan 2, 2025
ee18541
python312Packages.ailment: 9.2.134 -> 9.2.135
fabaff Jan 2, 2025
417db03
python312Packages.pyvex: 9.2.134 -> 9.2.135
fabaff Jan 2, 2025
579af0b
python312Packages.claripy: 9.2.134 -> 9.2.135
fabaff Jan 2, 2025
43a7804
python312Packages.cle: 9.2.134 -> 9.2.135
fabaff Jan 2, 2025
a2f3aab
python311Packages.angr: 9.2.134 -> 9.2.135
fabaff Jan 2, 2025
3ed899a
nb: 7.15.0 -> 7.15.1
r-ryantm Jan 2, 2025
b989541
python312Packages.aioacaia: 0.1.11 -> 0.1.12
fabaff Jan 2, 2025
6fa6721
python312Packages.twitchapi: 4.3.1 -> 4.4.0
fabaff Jan 2, 2025
c29e08f
stanc: 2.35.0 -> 2.36.0
r-ryantm Dec 10, 2024
2d34f69
cmdstan: 2.35.0 -> 2.36.0
wegank Dec 18, 2024
e4d3f51
python312Packages.cmdstanpy: 1.2.4 -> 1.2.5
wegank Jan 2, 2025
dab6fb9
python312Packages.keba-kecontact: 4.0.2 -> 4.2.1
fabaff Jan 2, 2025
33510a9
python3Packages.wat: 0.3.0 -> 0.4.3
Jan 2, 2025
085d371
python312Packages.boto3-stubs: 1.35.90 -> 1.35.91
fabaff Jan 2, 2025
64642db
python312Packages.botocore-stubs: 1.35.90 -> 1.35.91
fabaff Jan 2, 2025
0141bba
python312Packages.mypy-boto3-appsync: 1.35.77 -> 1.35.91
fabaff Jan 2, 2025
af9f4a1
python312Packages.mypy-boto3-gamelift: 1.35.59 -> 1.35.91
fabaff Jan 2, 2025
8dfe0e6
python312Packages.mypy-boto3-mediaconnect: 1.35.81 -> 1.35.91
fabaff Jan 2, 2025
da711a2
python312Packages.mypy-boto3-mediaconvert: 1.35.85 -> 1.35.91
fabaff Jan 2, 2025
8308258
python312Packages.mypy-boto3-organizations: 1.35.72 -> 1.35.91
fabaff Jan 2, 2025
709a407
python312Packages.mypy-boto3-sagemaker: 1.35.86 -> 1.35.91
fabaff Jan 2, 2025
bf341a3
python312Packages.mypy-boto3-sqs: 1.35.0 -> 1.35.91
fabaff Jan 2, 2025
8aefa43
chore: set `meta.mainProgram` for a few packages
KiaraGrouwstra Jan 2, 2025
0371b7f
ci/request-reviews: split off a more reusable reviewer processing script
infinisil Jan 3, 2025
0ebab0b
workflows/eval: Reuse process-reviewers.sh
infinisil Jan 3, 2025
ab248be
workflows/eval: Minor cleanup
infinisil Jan 3, 2025
077007a
ci/request-reviews: Don't request reviews from non-repo-collaborators
infinisil Jan 3, 2025
64b7779
symfony-cli: 5.10.5 -> 5.10.6
gaelreyrol Jan 3, 2025
278286c
usql: 0.19.14 -> 0.19.15
r-ryantm Jan 3, 2025
8316e7e
iosevka-bin: 32.3.0 -> 32.3.1
r-ryantm Jan 3, 2025
1439e82
refactor: Sort arguments
roberth Jan 3, 2025
097be59
netlify-cli: Pin to nodejs_20
roberth Jan 3, 2025
8b9f688
haskellPackages.iCalendar: unbreak it
wrvsrx Jan 3, 2025
9890298
libtorrent: 0.15.0 -> 0.15.1
trim21 Jan 3, 2025
c30b953
rtorrent: 0.10.0-unstable-2024-12-15 -> 0.15.1
trim21 Jan 3, 2025
c16c500
audiobookshelf: 2.17.5 -> 2.17.7
adamcstephens Jan 3, 2025
b3df77d
catboost: tweak, fix build
lucasew Jan 3, 2025
c5eecdd
python312Packages.imgw-pib: 1.0.7 -> 1.0.8
dotlambda Jan 3, 2025
1fac09c
bazel_5: use new apple sdk pattern
wegank Jan 3, 2025
2e4aa2b
bazel_6: use new apple sdk pattern
wegank Jan 3, 2025
79660b4
bazel_7: use new apple sdk pattern
wegank Jan 3, 2025
7f40a2c
portfolio: 0.72.2 -> 0.73.0
Shawn8901 Dec 30, 2024
9f0b60a
python312Packages.ahocorapy: init at 1.6.2
dotlambda Jan 3, 2025
14a2097
python312Packages.beacontools: init at 2.1.0
dotlambda Jan 3, 2025
2c596c1
home-assistant: support eddystone_temperature component
dotlambda Jan 3, 2025
a44a3bc
python312Packages.pyjvcprojector: init at 1.1.2
dotlambda Jan 3, 2025
c9589e4
home-assistant: support jvc_projector component
dotlambda Jan 3, 2025
d584a8b
virtualbox: fix X11 shared clipboard
Yarny0 Jan 3, 2025
9e93bb5
jack1: 0.125.0 -> 0.126.0
JohnRTitor Jan 3, 2025
7d27fd2
rocmPackages.llvm.clang: remove -nostdlibinc flag
collares Jan 3, 2025
962d4a8
vscode-extensions.visualjj.visualjj: add sources for the different ar…
drupol Jan 3, 2025
f5ef950
pocl: 0.6.0 -> 6.0-unstable-2025-01-02
JohnRTitor Jan 3, 2025
db3c292
hyprlandPlugins.hyprfocus: fix build
PerchunPak Jan 3, 2025
634ef37
rocmPackages.llvm.clang: remove -nostdlibinc flag (#370180)
collares Jan 3, 2025
d47598b
nb: 7.15.0 -> 7.15.1 (#370332)
toonn Jan 3, 2025
aebede4
hyprlandPlugins.hyprfocus: fix build (#370636)
donovanglover Jan 3, 2025
3e9a292
jack1: 0.125.0 -> 0.126.0 (#370697)
JohnRTitor Jan 3, 2025
2b96961
treewide: replace darwin.apple_sdk_11_0.stdenv with stdenv on darwin
wegank Jan 3, 2025
a32a06f
thunderbird: fix darwin build (#369517)
vcunat Jan 3, 2025
325c094
python312Packages.keras: disable float64 test on darwin
wegank Jan 3, 2025
4491046
treewide: replace darwin.apple_sdk_11_0.stdenv with stdenv on darwin …
emilazy Jan 3, 2025
00a4aad
python3Packages.wat: 0.3.0 -> 0.4.3 (#370381)
pbsds Jan 3, 2025
9fb52ee
workflows/eval: fix maintainer requests (#370456)
JohnRTitor Jan 3, 2025
2707aa7
catboost: tweak, fix build (#370663)
GaetanLepage Jan 3, 2025
20166d1
pocl: 0.6.0 -> 6.0-unstable-2025-01-02 (#370699)
JohnRTitor Jan 3, 2025
ff65ee0
python312Packages.jaxopt: disable more flaky test on darwin
wegank Jan 3, 2025
a545d0b
broot: 1.44.3 -> 1.44.4 (#369992)
matthiasbeyer Jan 3, 2025
910dbea
rtorrent: 0.10.0-unstable-2024-12-15 -> 0.15.1 / libtorrent: 0.14.0 -…
thiagokokada Jan 3, 2025
21bb46c
Fix `netlify-cli` (#370586)
roberth Jan 3, 2025
12055dc
headscale: backport BaseDomain and ServerURL checks (#358255)
wolfgangwalther Jan 3, 2025
5367951
python312Packages.twitchapi: 4.3.1 -> 4.4.0 (#370368)
fabaff Jan 3, 2025
2f73cad
vscode-extensions.visualjj.visualjj: add sources for the different ar…
drupol Jan 3, 2025
614b39a
iosevka-bin: 32.3.0 -> 32.3.1 (#370548)
drupol Jan 3, 2025
30c3d62
symfony-cli: 5.10.5 -> 5.10.6 (#370532)
drupol Jan 3, 2025
e9f2369
helix: 24.07 -> 25.01
GaetanLepage Jan 3, 2025
ad53f9b
chore: set `meta.mainProgram` for a few packages (#370416)
drupol Jan 3, 2025
e38c2df
irssi: fix cross build (#370263)
drupol Jan 3, 2025
33216ab
go-task: update shell completions (#370166)
drupol Jan 3, 2025
313f219
fwup: 1.11.0 -> 1.12.0 (#370136)
drupol Jan 3, 2025
0c69f44
sbt: 1.10.6 -> 1.10.7 (#370133)
drupol Jan 3, 2025
052f232
python312Packages.prophet: 1.1.5 -> 1.1.6
wegank Jan 3, 2025
c94b249
sbt-with-scala-native: 1.10.6 -> 1.10.7 (#370134)
drupol Jan 3, 2025
15ea897
python312Packages.boto3-stubs: 1.35.90 -> 1.35.91, python312Packages.…
fabaff Jan 3, 2025
c4c97a2
python312Packages.mypy-boto3-*: updates (#370414)
fabaff Jan 3, 2025
aebc6d9
python312Packages.keba-kecontact: 4.0.2 -> 4.2.1 (#370376)
fabaff Jan 3, 2025
88b73a3
python311Packages.angr: 9.2.134 -> 9.2.135 (#370271)
fabaff Jan 3, 2025
9afc72e
python312Packages.aioacaia: 0.1.11 -> 0.1.12 (#370357)
fabaff Jan 3, 2025
b64b6df
alpaca: 3.1.0 -> 3.2.0 (#369865)
drupol Jan 3, 2025
31417e5
caddy: 2.8.4 -> 2.9.0 (#369744)
drupol Jan 3, 2025
01988fe
audiobookshelf: 2.17.5 -> 2.17.7 (#370652)
adamcstephens Jan 3, 2025
c5d27a3
stanc: 2.35.0 -> 2.36.0 (#363952)
wegank Jan 3, 2025
79feb86
virtualbox: fix X11 shared clipboard (#370722)
drupol Jan 3, 2025
8d75e9b
portfolio: 0.72.2 -> 0.73.0 (#369408)
Scrumplex Jan 3, 2025
4246e8e
helix: 24.07 -> 25.01 (#370713)
drupol Jan 3, 2025
8781344
home-assistant: support eddystone_temperature component (#370679)
mweinelt Jan 3, 2025
d3ce529
buck2: migrate to `pkgs/by-name`
thoughtpolice Jan 3, 2025
4bc2a5f
buck2: 2024-10-15 -> 2025-01-02
thoughtpolice Jan 3, 2025
14a0b57
home-assistant: support jvc_projector component (#370684)
mweinelt Jan 3, 2025
7f5756b
cnijfilter2: add patch to fix missing import (#369086)
wegank Jan 3, 2025
652dc87
mimir: 2.14.2 -> 2.15.0
adamcstephens Jan 3, 2025
80893e0
bazel_{5,6,7}: use new apple sdk pattern (#370672)
wegank Jan 3, 2025
f4d10f1
rstudio: clean up and refactor (#357034)
TomaSajt Jan 3, 2025
896be7b
treewide: replace darwin.apple_sdk_11_0.stdenv with stdenv on darwin
wegank Jan 3, 2025
c0cb675
python3Packages.tinytag: 1.10.4 -> 2.0.0 (#367456)
rhendric Jan 3, 2025
0cd04d3
treewide: migrate fetchgit `rev = "refs/tags/..."` to `tag`
pbsds Jan 3, 2025
aa8929e
Remove with lib from minimal profile; group config (#365239)
rhendric Jan 3, 2025
6db5f9d
python312Packages.imgw-pib: 1.0.7 -> 1.0.8 (#370677)
dotlambda Jan 3, 2025
de9ea63
treewide: migrate fetchgit `rev = "refs/tags/..."` to `tag` (#368177)
pbsds Jan 3, 2025
42c7314
treewide: replace darwin.apple_sdk_11_0.stdenv with stdenv on darwin …
emilazy Jan 3, 2025
a7f712a
vmware-guest: Don't use lib directly for maintainers (#364628)
rhendric Jan 3, 2025
298a29e
mimir: 2.14.2 -> 2.15.0 (#370743)
happysalada Jan 3, 2025
bceaf35
dell-command-configure: fix missing include in wrapper (#368471)
wegank Jan 3, 2025
268aaf5
usql: 0.19.14 -> 0.19.15 (#370544)
wegank Jan 3, 2025
8918f21
haskellPackages.iCalendar: unbreak it (#370590)
maralorn Jan 4, 2025
3a21ca2
unifi-controller: patchelf unifi's sdnotify, nixos/unifi: enable sd_n…
wegank Jan 4, 2025
ce5e53a
pinentry-rofi: add rofi and coreutils to runtime PATH (#366240)
wegank Jan 4, 2025
db09530
evcxr: add mainProgram (#370179)
GaetanLepage Jan 4, 2025
b16a62c
kicadAddons.kikit, kicadAddons.kikit-library: add pname (#359681)
pinpox Jan 4, 2025
d3d626e
Merge master into staging-next
github-actions[bot] Jan 4, 2025
dbee3b0
Merge remote-tracking branch 'upstream/staging-next' into fix-merge-c…
pbsds Jan 4, 2025
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
The diff you're trying to view is too large. We only load the first 3000 changed files.
24 changes: 20 additions & 4 deletions .github/workflows/eval.yml
Original file line number Diff line number Diff line change
@@ -219,7 +219,7 @@ jobs:
tag:
name: Tag
runs-on: ubuntu-latest
needs: process
needs: [ attrs, process ]
if: needs.process.outputs.baseRunId
permissions:
pull-requests: write
@@ -239,6 +239,21 @@ jobs:
name: comparison
path: comparison

- name: Install Nix
uses: cachix/install-nix-action@08dcb3a5e62fa31e2da3d490afc4176ef55ecd72 # v30

# Important: This workflow job runs with extra permissions,
# so we need to make sure to not run untrusted code from PRs
- name: Check out Nixpkgs at the base commit
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
with:
ref: ${{ needs.attrs.outputs.baseSha }}
path: base
sparse-checkout: ci

- name: Build the requestReviews derivation
run: nix-build base/ci -A requestReviews

- name: Tagging pull request
run: |
# Get all currently set rebuild labels
@@ -271,20 +286,21 @@ jobs:
# maintainers.json contains GitHub IDs. Look up handles to request reviews from.
# There appears to be no API to request reviews based on GitHub IDs
jq -r 'keys[]' comparison/maintainers.json \
| while read -r id; do gh api /user/"$id"; done \
| jq -s '{ reviewers: map(.login) }' \
| while read -r id; do gh api /user/"$id" --jq .login; done \
| GH_TOKEN=${{ steps.app-token.outputs.token }} result/bin/process-reviewers.sh "$REPOSITORY" "$NUMBER" "$AUTHOR" \
> reviewers.json

# Request reviewers from maintainers of changed output paths
GH_TOKEN=${{ steps.app-token.outputs.token }} gh api \
--method POST \
/repos/${{ github.repository }}/pulls/${{ github.event.number }}/requested_reviewers \
/repos/"$REPOSITORY"/pulls/"$NUMBER"/requested_reviewers \
--input reviewers.json

env:
GH_TOKEN: ${{ github.token }}
REPOSITORY: ${{ github.repository }}
NUMBER: ${{ github.event.number }}
AUTHOR: ${{ github.event.pull_request.user.login }}

- name: Add eval summary to commit statuses
if: ${{ github.event_name == 'pull_request_target' }}
1 change: 1 addition & 0 deletions ci/request-reviews/default.nix
Original file line number Diff line number Diff line change
@@ -15,6 +15,7 @@ stdenvNoCC.mkDerivation {
root = ./.;
fileset = lib.fileset.unions [
./get-reviewers.sh
./process-reviewers.sh
./request-reviews.sh
./verify-base-branch.sh
./dev-branches.txt
42 changes: 6 additions & 36 deletions ci/request-reviews/get-reviewers.sh
Original file line number Diff line number Diff line change
@@ -1,27 +1,22 @@
#!/usr/bin/env bash

# Get the code owners of the files changed by a PR,
# suitable to be consumed by the API endpoint to request reviews:
# https://docs.github.com/en/rest/pulls/review-requests?apiVersion=2022-11-28#request-reviewers-for-a-pull-request
# Get the code owners of the files changed by a PR, returning one username per line

set -euo pipefail

log() {
echo "$@" >&2
}

if (( "$#" < 7 )); then
log "Usage: $0 GIT_REPO OWNERS_FILE BASE_REPO BASE_REF HEAD_REF PR_NUMBER PR_AUTHOR"
if (( "$#" < 4 )); then
log "Usage: $0 GIT_REPO OWNERS_FILE BASE_REF HEAD_REF"
exit 1
fi

gitRepo=$1
ownersFile=$2
baseRepo=$3
baseRef=$4
headRef=$5
prNumber=$6
prAuthor=$7
baseRef=$3
headRef=$4

tmp=$(mktemp -d)
trap 'rm -rf "$tmp"' exit
@@ -98,29 +93,4 @@ for file in "${touchedFiles[@]}"; do

done

# Cannot request a review from the author
if [[ -v users[${prAuthor,,}] ]]; then
log "One or more files are owned by the PR author, ignoring"
unset 'users[${prAuthor,,}]'
fi

gh api \
-H "Accept: application/vnd.github+json" \
-H "X-GitHub-Api-Version: 2022-11-28" \
"/repos/$baseRepo/pulls/$prNumber/reviews" \
--jq '.[].user.login' > "$tmp/already-reviewed-by"

# And we don't want to rerequest reviews from people who already reviewed
while read -r user; do
if [[ -v users[${user,,}] ]]; then
log "User $user is a code owner but has already left a review, ignoring"
unset 'users[${user,,}]'
fi
done < "$tmp/already-reviewed-by"

# Turn it into a JSON for the GitHub API call to request PR reviewers
jq -n \
--arg users "${!users[*]}" \
'{
reviewers: $users | split(" "),
}'
printf "%s\n" "${!users[@]}"
65 changes: 65 additions & 0 deletions ci/request-reviews/process-reviewers.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,65 @@
#!/usr/bin/env bash

# Process reviewers for a PR, reading line-separated usernames on stdin,
# returning a JSON suitable to be consumed by the API endpoint to request reviews:
# https://docs.github.com/en/rest/pulls/review-requests?apiVersion=2022-11-28#request-reviewers-for-a-pull-request

set -euo pipefail

log() {
echo "$@" >&2
}

if (( "$#" < 3 )); then
log "Usage: $0 BASE_REPO PR_NUMBER PR_AUTHOR"
exit 1
fi

baseRepo=$1
prNumber=$2
prAuthor=$3

tmp=$(mktemp -d)
trap 'rm -rf "$tmp"' exit

declare -A users=()
while read -r handle && [[ -n "$handle" ]]; do
users[$handle]=
done

# Cannot request a review from the author
if [[ -v users[${prAuthor,,}] ]]; then
log "One or more files are owned by the PR author, ignoring"
unset 'users[${prAuthor,,}]'
fi

gh api \
-H "Accept: application/vnd.github+json" \
-H "X-GitHub-Api-Version: 2022-11-28" \
"/repos/$baseRepo/pulls/$prNumber/reviews" \
--jq '.[].user.login' > "$tmp/already-reviewed-by"

# And we don't want to rerequest reviews from people who already reviewed
while read -r user; do
if [[ -v users[${user,,}] ]]; then
log "User $user is a code owner but has already left a review, ignoring"
unset 'users[${user,,}]'
fi
done < "$tmp/already-reviewed-by"

for user in "${!users[@]}"; do
if ! gh api \
-H "Accept: application/vnd.github+json" \
-H "X-GitHub-Api-Version: 2022-11-28" \
"/repos/$baseRepo/collaborators/$user" >&2; then
log "User $user is not a repository collaborator, probably missed the automated invite to the maintainers team (see <https://github.com/NixOS/nixpkgs/issues/234293>), ignoring"
unset 'users[$user]'
fi
done

# Turn it into a JSON for the GitHub API call to request PR reviewers
jq -n \
--arg users "${!users[*]}" \
'{
reviewers: $users | split(" "),
}'
3 changes: 2 additions & 1 deletion ci/request-reviews/request-reviews.sh
Original file line number Diff line number Diff line change
@@ -78,7 +78,8 @@ if ! "$SCRIPT_DIR"/verify-base-branch.sh "$tmp/nixpkgs.git" "$headRef" "$baseRep
fi

log "Getting code owners to request reviews from"
"$SCRIPT_DIR"/get-reviewers.sh "$tmp/nixpkgs.git" "$ownersFile" "$baseRepo" "$baseBranch" "$headRef" "$prNumber" "$prAuthor" > "$tmp/reviewers.json"
"$SCRIPT_DIR"/get-reviewers.sh "$tmp/nixpkgs.git" "$ownersFile" "$baseBranch" "$headRef" | \
"$SCRIPT_DIR"/process-reviewers.sh "$baseRepo" "$prNumber" "$prAuthor" > "$tmp/reviewers.json"

log "Requesting reviews from: $(<"$tmp/reviewers.json")"

68 changes: 37 additions & 31 deletions nixos/modules/profiles/minimal.nix
Original file line number Diff line number Diff line change
@@ -1,40 +1,46 @@
# This module defines a small NixOS configuration. It does not
# contain any graphical stuff.

{ config, lib, ... }:

with lib;

{
documentation.enable = mkDefault false;

documentation.doc.enable = mkDefault false;

documentation.info.enable = mkDefault false;

documentation.man.enable = mkDefault false;

documentation.nixos.enable = mkDefault false;

# Perl is a default package.
environment.defaultPackages = mkDefault [ ];

environment.stub-ld.enable = mkDefault false;

# The lessopen package pulls in Perl.
programs.less.lessopen = mkDefault null;
lib,
...
}:
let
inherit (lib) mkDefault;
in
{
documentation = {
enable = mkDefault false;
doc.enable = mkDefault false;
info.enable = mkDefault false;
man.enable = mkDefault false;
nixos.enable = mkDefault false;
};

environment = {
# Perl is a default package.
defaultPackages = mkDefault [ ];
stub-ld.enable = mkDefault false;
};

programs = {
# The lessopen package pulls in Perl.
less.lessopen = mkDefault null;
command-not-found.enable = mkDefault false;
};

# This pulls in nixos-containers which depends on Perl.
boot.enableContainers = mkDefault false;

programs.command-not-found.enable = mkDefault false;

services.logrotate.enable = mkDefault false;

services.udisks2.enable = mkDefault false;

xdg.autostart.enable = mkDefault false;
xdg.icons.enable = mkDefault false;
xdg.mime.enable = mkDefault false;
xdg.sounds.enable = mkDefault false;
services = {
logrotate.enable = mkDefault false;
udisks2.enable = mkDefault false;
};

xdg = {
autostart.enable = mkDefault false;
icons.enable = mkDefault false;
mime.enable = mkDefault false;
sounds.enable = mkDefault false;
};
}
4 changes: 2 additions & 2 deletions nixos/modules/services/networking/unifi.nix
Original file line number Diff line number Diff line change
@@ -143,10 +143,10 @@ in
restartTriggers = [ cfg.unifiPackage cfg.mongodbPackage ];

serviceConfig = {
Type = "simple";
Type = "notify";
ExecStart = "${cmd} start";
ExecStop = "${cmd} stop";
Restart = "on-failure";
Restart = "always";
TimeoutSec = "5min";
User = "unifi";
UMask = "0077";
3 changes: 2 additions & 1 deletion nixos/modules/virtualisation/vmware-guest.nix
Original file line number Diff line number Diff line change
@@ -8,6 +8,7 @@ let
inherit (lib)
getExe'
literalExpression
maintainers
mkEnableOption
mkIf
mkOption
@@ -25,7 +26,7 @@ in
];

meta = {
maintainers = [ lib.maintainers.kjeremy ];
maintainers = [ maintainers.kjeremy ];
};

options.virtualisation.vmware.guest = {
2 changes: 1 addition & 1 deletion pkgs/applications/audio/greg/default.nix
Original file line number Diff line number Diff line change
@@ -14,7 +14,7 @@ buildPythonApplication rec {
src = fetchFromGitHub {
owner = "manolomartinez";
repo = pname;
rev = "refs/tags/v${version}";
tag = "v${version}";
sha256 = "sha256-o4+tXVJTgT52JyJOC+Glr2cvZjbTaZL8TIsmz+A4vE4=";
};

2 changes: 1 addition & 1 deletion pkgs/applications/audio/littlegptracker/default.nix
Original file line number Diff line number Diff line change
@@ -20,7 +20,7 @@ stdenv.mkDerivation (finalAttrs: {
src = fetchFromGitHub {
owner = "djdiskmachine";
repo = "littlegptracker";
rev = "refs/tags/${finalAttrs.version}";
tag = finalAttrs.version;
hash = "sha256-1uXC5nJ63YguQuNIkuK0yx9lmrMBqw0WdlmCV8o11cE=";
};

2 changes: 1 addition & 1 deletion pkgs/applications/audio/pithos/default.nix
Original file line number Diff line number Diff line change
@@ -24,7 +24,7 @@ pythonPackages.buildPythonApplication rec {
src = fetchFromGitHub {
owner = pname;
repo = pname;
rev = "refs/tags/${version}";
tag = version;
hash = "sha256-3j6IoMi30BQ8WHK4BxbsW+/3XZx7rBFd47EBENa2GiQ=";
};

2 changes: 1 addition & 1 deletion pkgs/applications/audio/puddletag/default.nix
Original file line number Diff line number Diff line change
@@ -16,7 +16,7 @@ python3.pkgs.buildPythonApplication rec {
src = fetchFromGitHub {
owner = "puddletag";
repo = "puddletag";
rev = "refs/tags/${version}";
tag = version;
hash = "sha256-oScT8YcQoDf2qZ+J7xKm22Sbfym3tkVUrWT5D2LU5e8=";
};

2 changes: 1 addition & 1 deletion pkgs/applications/audio/zynaddsubfx/default.nix
Original file line number Diff line number Diff line change
@@ -72,7 +72,7 @@ stdenv.mkDerivation rec {
src = fetchFromGitHub {
owner = pname;
repo = pname;
rev = "refs/tags/${version}";
tag = version;
fetchSubmodules = true;
hash = "sha256-0siAx141DZx39facXWmKbsi0rHBNpobApTdey07EcXg=";
};
2 changes: 1 addition & 1 deletion pkgs/applications/editors/lapce/default.nix
Original file line number Diff line number Diff line change
@@ -40,7 +40,7 @@ rustPlatform.buildRustPackage rec {
src = fetchFromGitHub {
owner = "lapce";
repo = "lapce";
rev = "refs/tags/v${version}";
tag = "v${version}";
sha256 = "sha256-vBBYNHgZiW5JfGeUG6YZObf4oK0hHxTbsZNTfnIX95Y=";
};

2 changes: 1 addition & 1 deletion pkgs/applications/editors/manuskript/default.nix
Original file line number Diff line number Diff line change
@@ -15,7 +15,7 @@ python3Packages.buildPythonApplication rec {
src = fetchFromGitHub {
repo = pname;
owner = "olivierkes";
rev = "refs/tags/${version}";
tag = version;
hash = "sha256-/Ryvv5mHdZ3iwMpZjOa62h8D2B00pzknJ70DfjDTPPA=";
};

2 changes: 1 addition & 1 deletion pkgs/applications/editors/retext/default.nix
Original file line number Diff line number Diff line change
@@ -25,7 +25,7 @@ python3.pkgs.buildPythonApplication rec {
src = fetchFromGitHub {
owner = "retext-project";
repo = pname;
rev = "refs/tags/${version}";
tag = version;
hash = "sha256-BToW9rPFEbgAErvJ5gtUpNadCLtlRihE7eKKFgO5N68=";
};

Loading