Commit Graph

152 Commits

Author SHA1 Message Date
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
Pol Dellaiera
65a333600d treewide: replace rev with tag 2025-04-07 16:57:22 +02:00
Jan Malakhovski
da78730cf6 treewide: use mirror://savannah when possible
... and improve some related `meta` URLs
2025-04-02 18:12:00 +00: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
R. Ryantm
db9c33736e skypeforlinux: 8.138.0.203 -> 8.138.0.213 2025-03-27 23:11:57 +00:00
R. Ryantm
aaf279513f skyscraper: 3.16.0 -> 3.16.1 2025-03-23 08:28:50 +00:00
R. Ryantm
815b5ecde9 skaffold: 2.14.1 -> 2.14.2 2025-03-20 01:44:02 +00:00
R. Ryantm
06210b25bf skim: 0.16.0 -> 0.16.1 2025-03-17 18:58:54 +00:00
R. Ryantm
7053b93326 skypeforlinux: 8.137.0.425 -> 8.138.0.203 2025-03-17 14:01:48 +05:30
Wolfgang Walther
9a7967d46c
skyscraper: 3.14.0 -> 3.16.0 (#389080) 2025-03-16 13:47:54 +00:00
Sigmanificient
e6fe6f4b7c treewide: remove unused rec expressions 2025-03-13 21:34:05 +01: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
R. Ryantm
b8aae30a1a skyscraper: 3.14.0 -> 3.16.0 2025-03-11 20:31:28 +00:00
Arne Keller
d41d4338f4
skyscraper: init at 3.14.0 (#319150) 2025-03-11 11:57:38 +01:00
R. Ryantm
fea053b774 skate: 1.0.0 -> 1.0.1 2025-03-06 15:17:42 +00:00
R. Ryantm
e4b3e4454d skypeforlinux: 8.136.0.203 -> 8.137.0.425 2025-03-04 11:10:18 +00:00
R. Ryantm
9fd226cee0 sketchybar-app-font: 2.0.31 -> 2.0.32 2025-03-01 12:32:00 +00:00
R. Ryantm
87afdc0a5c skeema: 1.12.2 -> 1.12.3 2025-02-28 03:02:17 +00:00
Wolfgang Walther
89df012976
skypilot: 0.7.0 -> 0.8.0 (#382487) 2025-02-25 19:50:05 +01:00
Weijia Wang
06bad3a00a
skaffold: 2.13.2 -> 2.14.1 (#376268) 2025-02-20 17:17:43 +01:00
R. Ryantm
8472b69938 skypeforlinux: 8.136.0.202 -> 8.136.0.203 2025-02-19 14:09:45 +00:00
R. Ryantm
6ddbab442d skypilot: 0.7.0 -> 0.8.0 2025-02-16 04:07:12 +00:00
R. Ryantm
1089bed414 skaffold: 2.13.2 -> 2.14.1 2025-02-15 15:31:19 +01:00
R. Ryantm
f04dfa398d skopeo: 1.17.0 -> 1.18.0 2025-02-13 03:22:52 +00:00
Anderson Torres
cab2a1296e
treewide: remove AndersonTorres from maintainers
As I said before, I want to keep a narrow focus on Nixpkgs. Now that I am back
at undergrad, this focus should be even narrower: I will keep my eyes on Emacs,
and nothing else.
2025-02-12 00:36:02 -03:00
Austin Horstman
e11bcdd568
sketchybar-app-font: 2.0.30 -> 2.0.31 2025-02-09 10:26:14 -06:00
nixpkgs-merge-bot[bot]
f6d9af16e4
skypeforlinux: 8.134.0.202 -> 8.136.0.202 (#379478)
Co-authored-by: mjoerg <mjoerg@users.noreply.github.com>
2025-02-07 08:57:41 +00:00
R. Ryantm
d4d077ddb3 skypeforlinux: 8.134.0.202 -> 8.136.0.202 2025-02-05 02:49:36 +00:00
Alyssa Ross
ce26e2f25a
Merge remote-tracking branch 'origin/master' into staging-next
Conflicts:
	pkgs/by-name/ca/cargo-bundle-licenses/package.nix
	pkgs/by-name/ca/cargo-semver-checks/package.nix
	pkgs/by-name/co/comrak/package.nix
	pkgs/by-name/kr/krabby/package.nix
	pkgs/by-name/pr/pretix/plugins/passbook/package.nix
	pkgs/by-name/ua/uair/package.nix
	pkgs/development/python-modules/dlinfo/default.nix
2025-02-02 19:43:40 +01:00
R. Ryantm
c97e9a5bd6 skeditor: 2.8.3 -> 2.8.5 2025-02-02 08:15:30 +00:00
Alyssa Ross
dffcaaaa64
Merge remote-tracking branch 'origin/master' into staging-next
Conflicts:
	pkgs/applications/virtualization/crosvm/default.nix
	pkgs/by-name/as/ast-grep/package.nix
	pkgs/by-name/ca/cargo-mobile2/package.nix
	pkgs/by-name/cl/clang-tidy-sarif/package.nix
	pkgs/by-name/gg/gg-jj/package.nix
	pkgs/by-name/gi/git-warp-time/package.nix
	pkgs/by-name/je/jellyfin-rpc/package.nix
	pkgs/by-name/ne/netbox2netshot/package.nix
	pkgs/by-name/sy/sydbox/package.nix
	pkgs/by-name/te/television/package.nix
	pkgs/development/python-modules/tinytuya/default.nix
2025-01-31 10:23:31 +01:00
Austin Horstman
f26b1634a6
sketchybar: 2.22.0 -> 2.22.1 2025-01-29 23:44:01 -06: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
Muhammad Falak R Wani
d61756ab35 skim: 0.15.7 -> 0.16.0
Diff: https://github.com/skim-rs/skim/compare/refs/tags/v0.15.7...v0.16.0
Changelog: https://github.com/skim-rs/skim/releases/tag/v0.16.0
Signed-off-by: Muhammad Falak R Wani <falakreyaz@gmail.com>
2025-01-24 20:26:09 +05:30
Alyssa Ross
63bff8c132
treewide: migrate to fetchCargoVendor, batch 1
Cargo 1.84.0 seems to have changed the output format of cargo vendor
again, once again invalidating fetchCargoTarball FOD hashes.  It's
time to fix this once and for all, switching across the board to
fetchCargoVendor, which is not dependent on cargo vendor's output
format.

It should be possible to reproduce this diff.  To do so, get the list
of files changed by this commit, e.g. with git diff --name-only, then
run the following two commands, each with that list of files as their
standard input:

	xargs sed -i 's/^\(. *\)\(cargoHash\)\b/\1useFetchCargoVendor = true;\n\1cargoHash/'
	cut -d / -f 4 | xargs -n 1 nix-update --version=skip

This will take a long time.  It might be possible to parallelize it
using xargs' -P option.  I haven't tested it.
2025-01-23 11:46:43 +01:00
R. Ryantm
05693aeb44 sketchybar-app-font: 2.0.29 -> 2.0.30 2025-01-21 14:12:20 +00:00
Gaétan Lepage
ce4b4d0482
skeditor: 2.8.1 -> 2.8.3; iconConvtools: expand to unix platforms (#365883) 2025-01-16 22:59:07 +01:00
eveeifyeve
620de8b78d skeditor: 2.8.1 -> 2.8.3; iconConvtools: expand to unix platforms
skeditor: renamed deps to fix updator

skeditor: fix script permission

skeditor: 2.8.1 -> 2.8.3

skeditor: removed nix file

skeditor: fix skeditor deps
2025-01-17 01:28:15 +11:00
Andrey Shaat
8e0d80f9e0 skyscraper: init at 3.14.0 2025-01-15 23:25:46 +05:00
Gutyina Gergő
a619bff47c
pnpm: pnpm_9 -> pnpm_10 2025-01-15 10:59:06 +01:00
R. Ryantm
a0b6d7e1f3 sketchybar-app-font: 2.0.28 -> 2.0.29 2025-01-08 07:06:35 +00:00
Peder Bergebakken Sundt
0cd04d3036 treewide: migrate fetchgit rev = "refs/tags/..." to tag 2025-01-04 00:19:17 +01:00
Austin Horstman
ae433b6844
treewide: unpin apple-sdk_11 r-s 2025-01-03 09:11:14 -06:00
R. Ryantm
f519da9cd9 skim: 0.15.5 -> 0.15.7 2025-01-01 03:10:54 +00:00
Francesco Gazzetta
83c2a905d1
ladybird: Update darwin sdk version (#361319) 2024-12-26 23:11:13 +00:00
R. Ryantm
7900f2063e skeema: 1.12.1 -> 1.12.2 2024-12-25 02:22:21 +00:00
Caleb Norton
bcda17cdff
skia: fix skia dynamic linking 2024-12-23 12:58:00 -06:00
K900
9071e4c43f Merge remote-tracking branch 'origin/master' into staging-next 2024-12-22 16:20:00 +03:00
Arne Keller
e89c48ff17
skrive: init at 0.10.0 (#285894) 2024-12-22 12:06:19 +01:00
github-actions[bot]
e1b8fbad4c
Merge master into staging-next 2024-12-22 00:15:48 +00:00