Commit graph

96 commits

Author SHA1 Message Date
Peder Bergebakken Sundt
3cc2f5fd4b treewide: substitute finalAttrs.pname for strings 2025-06-02 06:16:01 +02:00
Wolfgang Walther
3030e629bf
iroh: 0.34.1 -> 0.35.0 (#406566) 2025-06-01 10:51:44 +00:00
Mauricio Collares
9709fef3cb
irpf: 2025-1.2 -> 2025-1.3 (#408594) 2025-05-29 15:04:00 -03:00
Florian Klink
4612572032 irccat: 0.4.8 -> 0.4.12 2025-05-20 12:30:04 +02:00
R. Ryantm
962b58fcf2 irpf: 2025-1.2 -> 2025-1.3 2025-05-19 04:50:33 +00:00
Weijia Wang
7185d541e6
iredis: 1.15.0 -> 1.15.1 (#402357) 2025-05-18 15:46:30 +02:00
R. Ryantm
31f979909c iroh: 0.34.1 -> 0.35.0 2025-05-12 20:33:35 +00:00
R. Ryantm
6055ada9ac iredis: 1.15.0 -> 1.15.1 2025-04-27 20:29:23 +00:00
nixpkgs-ci[bot]
a821261015
Merge master into staging-next 2025-04-27 12:05:44 +00:00
Wolfgang Walther
8c856370be
irpf: 2025-1.1 -> 2025-1.2 (#397052) 2025-04-27 11:50:20 +00:00
K900
f96ac2dcd6 Merge remote-tracking branch 'origin/master' into staging-next 2025-04-26 09:07:48 +03:00
Fernando Rodrigues
05580f4b44
treewide: switch instances of lib.teams.*.members to the new meta.teams attribute
Follow-up to #394797.

Signed-off-by: Fernando Rodrigues <alpha@sigmasquadron.net>
2025-04-25 22:20:17 -03:00
Ihar Hrachyshka
dd0f03a56c treewide: remove usage of deprecated apple_sdk framework stubs
They are not doing anything right now. This is in preparation for their
complete removal from the tree.

Note: several changes that affect the derivation inputs (e.g. removal of
references to stub paths in build instructions) were left out. They will
be cleaned up the next iteration and will require special care.

Note: this PR is a result of a mix of ugly regex (not AST) based
automation and some manual labor. For reference, the regex automation
part was hacked in: https://github.com/booxter/nix-clean-apple_sdk

Signed-off-by: Ihar Hrachyshka <ihar.hrachyshka@gmail.com>
2025-04-19 20:28:20 -04:00
R. Ryantm
17e101934e irust: 1.72.0 -> 1.73.0 2025-04-17 23:28:33 +00:00
nixpkgs-ci[bot]
6c98e107c7
Merge master into staging-next 2025-04-09 00:15:45 +00:00
R. Ryantm
00669552fd iroh: 0.34.0 -> 0.34.1 2025-04-08 17:11:32 +02:00
R. Ryantm
21a3af88ff irpf: 2025-1.1 -> 2025-1.2 2025-04-08 09:48:46 +00:00
K900
f42e00d66e Merge remote-tracking branch 'origin/master' into staging-next 2025-04-08 10:29:26 +03:00
Winter
a19cd4ffb1 Revert "treewide: replace rev with tag"
This reverts commit 65a333600d.

This wasn't tested for correctness with something like fodwatch [0],
and should not have been (self-)merged so quickly, especially without
further review.

It also resulted in the breakage of at least one package [1] (and that's
the one we know of and was caught).

A few packages that were updated in between this commit and this revert
were not reverted back to using `rev`, but other than that, this is a
1:1 revert.

[0]: https://codeberg.org/raphaelr/fodwatch
[1]: https://github.com/NixOS/nixpkgs/pull/396904 / 758551e458
2025-04-08 02:57:25 -04:00
K900
0842b11f2b Merge remote-tracking branch 'origin/master' into staging-next 2025-04-08 09:29:48 +03:00
Peder Bergebakken Sundt
53ea89891f
irqbalance: link against libsystemd (#393656) 2025-04-08 01:28:26 +02:00
K900
b3146d4446 Merge remote-tracking branch 'origin/master' into staging-next 2025-04-07 21:21:10 +03:00
Pol Dellaiera
65a333600d treewide: replace rev with tag 2025-04-07 16:57:22 +02:00
K900
74d5b70eb2 Merge remote-tracking branch 'origin/master' into staging-next 2025-04-07 09:36:05 +03:00
Wolfgang Walther
eab418ea1e
irpf: 2025-1.0 -> 2025-1.1 (#393945) 2025-04-06 20:22:54 +00:00
Grimmauld
c87e7f23f0 ironwail: fix missing libGL 2025-04-03 08:57:29 +02:00
Silvan Mosberger
e52d633a63 Merge remote-tracking branch 'upstream/staging-next' into staging 2025-04-02 18:30:54 +02:00
Silvan Mosberger
374e6bcc40 treewide: Format all Nix files
Format all Nix files using the officially approved formatter,
making the CI check introduced in the previous commit succeed:

  nix-build ci -A fmt.check

This is the next step of the of the [implementation](https://github.com/NixOS/nixfmt/issues/153)
of the accepted [RFC 166](https://github.com/NixOS/rfcs/pull/166).

This commit will lead to merge conflicts for a number of PRs,
up to an estimated ~1100 (~33%) among the PRs with activity in the past 2
months, but that should be lower than what it would be without the previous
[partial treewide format](https://github.com/NixOS/nixpkgs/pull/322537).

Merge conflicts caused by this commit can now automatically be resolved while rebasing using the
[auto-rebase script](8616af08d9/maintainers/scripts/auto-rebase).

If you run into any problems regarding any of this, please reach out to the
[formatting team](https://nixos.org/community/teams/formatting/) by
pinging @NixOS/nix-formatting.
2025-04-01 20:10:43 +02:00
nixpkgs-ci[bot]
8c63a3f00d
Merge staging-next into staging 2025-03-29 00:15:41 +00:00
R. Ryantm
eab9920c7b irpf: 2025-1.0 -> 2025-1.1 2025-03-28 09:15:25 +00:00
R. Ryantm
fe89f698cf iroh: 0.33.0 -> 0.34.0 2025-03-27 16:44:14 +00:00
h7x4
01cbc86e67
irqbalance: link against libsystemd
This enables irqbalance to provide systemd-native journal output
2025-03-27 10:10:13 +01:00
K900
aca918e668 Merge remote-tracking branch 'origin/staging-next' into staging 2025-03-25 21:06:52 +03:00
jopejoe1
7d30c40939 treewide: migrate packages to pkgs/by-name, again 2025-03-25 17:00:45 +01:00
nixpkgs-ci[bot]
080d906664
Merge staging-next into staging 2025-03-24 06:05:33 +00:00
nixpkgs-merge-bot[bot]
f069afa623
irust: 1.71.30 -> 1.72.0 (#390691)
Co-authored-by: lelgenio <lelgenio@lelgenio.com>
2025-03-24 04:26:17 +00:00
K900
85b2817da5 Merge remote-tracking branch 'origin/staging-next' into staging 2025-03-20 13:14:18 +03:00
K900
1c1e56fb16 treewide: redis -> valkey
Upstream Redis' last free version is going EOL soon, and often has
build issues with flaky tests and such. Use Valkey, which is
both fully open and actively maintained.
2025-03-20 11:37:17 +03:00
Martin Weinelt
3252fa2be8
redisTestHook,memcachedTestHook: init; prevent hanging Darwin build after test failures (#357879) 2025-03-19 12:54:41 +01:00
Olivér Falvai
1f4f4cd769
irrd: use redisTestHook 2025-03-18 20:24:04 +01:00
R. Ryantm
8cd320a05e irust: 1.71.30 -> 1.72.0 2025-03-17 14:30:56 +00:00
rafaelrc7
078fea9c5c
irpf: 2024-1.6 -> 2025-1.0 2025-03-16 23:13:56 -03:00
Wolfgang Walther
71a02c6ab8
iroh: 0.32.1 -> 0.33.0 (#386819) 2025-03-16 12:46:42 +00:00
Peder Bergebakken Sundt
357d2530e5 treewide: substitute pname for strings
Inspired by https://github.com/NixOS/nixpkgs/pull/387725#issuecomment-2704943777, script is based on https://github.com/NixOS/nixpkgs/pull/336172 using what i learned in https://github.com/NixOS/nixpkgs/pull/386865, part of https://github.com/NixOS/nixpkgs/issues/346453

Should be zero rebuilds.

All candidates were made using:

```shell

export NIXPKGS_ALLOW_UNFREE=1
export NIXPKGS_ALLOW_INSECURE=1
export NIXPKGS_ALLOW_BROKEN=1

git-wait restore .

test -s packages.json || ( set -x;
  time nix-env --extra-experimental-features no-url-literals --option system x86_64-linux -f ./. -qaP --json --meta --drv-path --out-path --show-trace --no-allow-import-from-derivation --arg config '{ allowAliases = false; }' > packages.json
)

list_attrpath_fname_col() {
    jq <packages.json 'to_entries[] | select(.value.meta.position==null|not) | "\(.key)\t\(.value.meta.position)"' -r |
        sed -e "s#\t$(realpath .)/#\t#" |
        sed -e 's#:\([0-9]*\)$#\t\1#' |
        grep . |
        grep -iv haskell |
        grep -iv /top-level/ |
        grep -iv chicken |
        grep pkgs/by-name/ |
        grep -iv build |
        grep -E '/(package|default)\.nix'
}

FLOCKDIR="$(mktemp -d)"
N_WORKERS=4
while read attrpath fname col; do
    grep -qE 'repo *= *("\$\{pname\}"|pname);' "$fname" || continue

    echo | (
        # mutex on fname
        flock --nonblock 200 || {
            >&2 echo "failed to aquire lock for $fname"
            exit 1
        }

        echo "$attrpath"
        data="$(nix eval --impure  --expr 'with import ./. {}; { inherit ('"$attrpath"') pname drvPath passthru meta; drvPath2='"$attrpath"'.src.drvPath; }' --json)" || exit
        test -n "$data" || exit
        pname="$(jq <<<"$data" .pname -r)"
        test -n "$pname" || exit

        (set -x
            sd -F '${pname}'  "$pname"         "$fname"
            sd -F ' = pname;' " = \"$pname\";" "$fname"
        )

        data2="$(nix eval --impure  --expr 'with import ./. {}; { inherit ('"$attrpath"') pname drvPath passthru meta; drvPath2='"$attrpath"'.src.drvPath; }' --json)"
        if [[ "$data" = "$data2" ]]; then
            (set -x; git-wait add "$fname")
        else
            (set -x; git-wait restore "$fname")
            exit
        fi

        (set -x
            sd -F ' rec {' ' {' "$fname"
        )

        data3="$(nix eval --impure  --expr 'with import ./. {}; { inherit ('"$attrpath"') pname drvPath passthru meta; drvPath2='"$attrpath"'.src.drvPath; }' --json 2>/dev/nul)"

        if [[ "$data" = "$data3" ]]; then
            (set -x; git-wait add "$fname")
        else
            (set -x; git-wait restore "$fname")
        fi

    ) 200>"$FLOCKDIR"/"$(sha256sum - <<<"$fname" | cut -d' ' -f1)".lock &

    while [[ $(jobs -p | wc -l) -ge $N_WORKERS ]]; do
        wait -n < <(jobs -p) || true
    done

done < <(list_attrpath_fname_col)

wait

git restore .

time nix-env --extra-experimental-features no-url-literals --option system x86_64-linux -f ./. -qaP --json --meta --drv-path --out-path --show-trace --no-allow-import-from-derivation --arg config '{ allowAliases = false; }' > packages2.json
```

`diff packages{,2}.json` is empty, indicating that no package nor src derivation has changed.
I checked and cherry-picked the changes using `GIT_DIFF_OPTS='-u15' git -c interactive.singleKey=true add --patch`
2025-03-11 23:55:31 +01:00
Weijia Wang
34ce1b7782
ircdHybrid: 8.2.45 -> 8.2.46 (#375977) 2025-03-06 09:47:54 +01:00
Weijia Wang
05dd23b11f
irpf: 2024-1.5 -> 2024-1.6 (#372909) 2025-03-05 23:19:15 +01:00
R. Ryantm
d19370a133 iroh: 0.32.1 -> 0.33.0 2025-03-03 19:39:13 +00:00
R. Ryantm
cb2735b089 ircdHybrid: 8.2.45 -> 8.2.46 2025-02-25 17:38:07 +01:00
R. Ryantm
b10ff3a8d3 iroh: 0.31.0 -> 0.32.1 2025-02-18 20:29:40 +00:00
Alyssa Ross
502c77492b
Merge remote-tracking branch 'origin/staging-next' into staging
Conflicts:
	pkgs/applications/editors/vim/plugins/non-generated/avante-nvim/default.nix
	pkgs/applications/editors/vim/plugins/non-generated/cord-nvim/default.nix
	pkgs/applications/version-management/git-stack/default.nix
	pkgs/by-name/bo/boxbuddy/package.nix
	pkgs/by-name/ca/capnproto-rust/package.nix
	pkgs/by-name/ca/cargo-binstall/package.nix
	pkgs/by-name/ca/cargo-deb/package.nix
	pkgs/by-name/ca/cargo-modules/package.nix
	pkgs/by-name/cl/clapboard/package.nix
	pkgs/by-name/do/dotslash/package.nix
	pkgs/by-name/fe/felix-fm/package.nix
	pkgs/by-name/gi/gitlab-ci-ls/package.nix
	pkgs/by-name/go/gotify-desktop/package.nix
	pkgs/by-name/ha/handlr-regex/package.nix
	pkgs/by-name/ir/iroh/package.nix
	pkgs/by-name/ma/manga-tui/package.nix
	pkgs/by-name/ob/obs-cmd/package.nix
	pkgs/by-name/ox/oxlint/package.nix
	pkgs/by-name/pi/pik/package.nix
	pkgs/by-name/re/reindeer/package.nix
	pkgs/by-name/rn/rnr/package.nix
	pkgs/by-name/ro/routinator/package.nix
	pkgs/by-name/rw/rwpspread/package.nix
	pkgs/by-name/sk/skim/package.nix
	pkgs/by-name/so/sope/package.nix
	pkgs/by-name/so/soteria/package.nix
	pkgs/by-name/sp/spacer/package.nix
	pkgs/by-name/st/stylance-cli/package.nix
	pkgs/by-name/su/subxt/package.nix
	pkgs/by-name/sw/swayfx-unwrapped/package.nix
	pkgs/by-name/te/television/package.nix
	pkgs/by-name/to/toast/package.nix
	pkgs/by-name/wa/wastebin/package.nix
	pkgs/by-name/wi/wit-bindgen/package.nix
	pkgs/by-name/wo/workshop-runner/package.nix
	pkgs/development/interpreters/wasmtime/default.nix
	pkgs/development/tools/rust/cargo-edit/default.nix
	pkgs/development/tools/sentry-cli/default.nix
	pkgs/misc/t-rec/default.nix
	pkgs/tools/video/yaydl/default.nix
2025-01-26 14:55:08 +01:00