Commit graph

116 commits

Author SHA1 Message Date
R. Ryantm
c598c4f5c0 ssdfs-utils: 4.54 -> 4.56 2025-05-31 09:23:32 +00:00
Peder Bergebakken Sundt
c4f02ff31e treewide: substitute pname for strings 2025-05-29 17:04:28 +02:00
Adam C. Stephens
69ea43926c
ssh-tpm-agent: 0.7.0 -> 0.8.0 (#394097) 2025-05-17 09:05:20 -04:00
Franz Pletz
7d78e04d4d
sslh: 2.2.1 -> 2.2.3 (#407061) 2025-05-16 02:46:42 +02:00
R. Ryantm
92ebb84470 sslh: 2.2.1 -> 2.2.3 2025-05-14 15:54:35 +00:00
R. Ryantm
e37815b84c sshguard: 2.4.3 -> 2.5.1 2025-05-06 08:16:57 +00:00
K900
2925d58767 Merge remote-tracking branch 'origin/master' into staging-next 2025-04-28 11:36:50 +03:00
K900
bada9d0a53 Merge remote-tracking branch 'origin/master' into staging-next 2025-04-27 21:10:10 +03:00
Doron Behar
008fd08f93 ssh-openpgp-auth: 0.2.2 -> 0.2.3 2025-04-27 19:59:08 +03:00
Doron Behar
e5807d89e6 sshd-openpgp-auth: 0.3.0 -> 0.3.1 2025-04-27 19:59:08 +03:00
Nick Cao
16a2ff79f1
sscg: 3.0.6 -> 3.0.7 (#401902) 2025-04-27 09:48:18 -04:00
nixpkgs-ci[bot]
a821261015
Merge master into staging-next 2025-04-27 12:05:44 +00:00
Wolfgang Walther
8378117497
sslh: 2.1.3 -> 2.2.1 (#398803) 2025-04-27 11:48:42 +00:00
K900
e9ed2cb3d5 Merge remote-tracking branch 'origin/master' into staging-next 2025-04-26 08:03:45 +03:00
R. Ryantm
0c3112537c sscg: 3.0.6 -> 3.0.7 2025-04-25 22:12:35 +00:00
R. Ryantm
5efc9303f0 sshs: 4.5.1 -> 4.7.2 2025-04-24 11:44:29 +00:00
K900
b47fbe4156 Merge remote-tracking branch 'origin/staging-next' into staging 2025-04-22 07:50:27 +03:00
R. Ryantm
3d25d8179d sshocker: 0.3.6 -> 0.3.8 2025-04-21 18:55:53 +00: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
b72f5762cb ssdfs-utils: 4.53 -> 4.54 2025-04-18 04:37:22 +00:00
Adam C. Stephens
11963707bf
ssh-tpm-agent: 0.7.0 -> 0.8.0
https://github.com/Foxboron/ssh-tpm-agent/releases/tag/v0.8.0
2025-04-15 14:14:11 -04:00
R. Ryantm
0f1c5f1a12 sslh: 2.1.3 -> 2.2.1 2025-04-15 08:32:31 +00:00
R. Ryantm
9254ce3550 ssdfs-utils: 4.50 -> 4.53 2025-04-08 18:18:15 +00: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
Pol Dellaiera
65a333600d treewide: replace rev with tag 2025-04-07 16:57:22 +02:00
R. Ryantm
4c70fcd60f sscg: 3.0.5 -> 3.0.6 2025-04-07 10:26:04 +00:00
Gaetan Lepage
bfe27cf81c treewide: use a string for versionCheckProgramArg where possible 2025-04-05 14:45:13 +02:00
jopejoe1
464a14d6eb
ssocr: 2.24.1 -> 2.25.0 (#392568) 2025-03-29 16:34:54 +01:00
Jörg Thalheim
f0d4569a7c
ssh-to-age: 1.1.10 -> 1.1.11 (#393800) 2025-03-28 14:15:32 +01:00
Nikolay Korotkiy
d6ba89f598
sshuttle: 1.3.0 → 1.3.1 (#393222) 2025-03-27 22:59:41 +04:00
R. Ryantm
4bdfbb5279 ssh-to-age: 1.1.10 -> 1.1.11 2025-03-27 18:47:50 +00:00
R. Ryantm
8fb844043f ssh-to-pgp: 1.1.4 -> 1.1.6 2025-03-26 18:08:53 +00:00
Nikolay Korotkiy
6f635b21eb
sshuttle: 1.3.0 → 1.3.1 2025-03-26 02:28:06 +04:00
jopejoe1
7d30c40939 treewide: migrate packages to pkgs/by-name, again 2025-03-25 17:00:45 +01:00
R. Ryantm
379972a33f ssocr: 2.24.1 -> 2.25.0 2025-03-24 01:04:46 +00:00
Matthias Beyer
c4b386e311
sshuttle: 1.2.0 -> 1.3.0 (#386671) 2025-03-19 15:30:49 +01:00
Sigmanificient
e6fe6f4b7c treewide: remove unused rec expressions 2025-03-13 21:34:05 +01:00
Sigmanificient
670aba9a64 treewide: remove unused arguments 2025-03-13 18:00:11 +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
381fca5328 sshocker: 0.3.5 -> 0.3.6 2025-03-09 09:28:49 +00:00
Fabian Affolter
5831524024 ssh-mitm: 5.0.0 -> 5.0.1
Diff: https://github.com/ssh-mitm/ssh-mitm/compare/refs/tags/5.0.0...5.0.1

Changelog: https://github.com/ssh-mitm/ssh-mitm/blob/5.0.1/CHANGELOG.md
2025-03-04 07:57:27 +01:00
R. Ryantm
1a9e6f6b07 sshuttle: 1.2.0 -> 1.3.0 2025-03-03 10:43:39 +00:00
Weijia Wang
aa78c09188
ssm-session-manager-plugin: 1.2.694.0 -> 1.2.707.0 (#380123) 2025-02-24 16:06:07 +01:00
Nikolay Korotkiy
97a86007ab
sshuttle: 1.1.2 -> 1.2.0 (#380452) 2025-02-20 11:23:00 +01: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
R. Ryantm
412afdec22 ssm-session-manager-plugin: 1.2.694.0 -> 1.2.707.0 2025-02-07 15:50:30 +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
Alyssa Ross
28f55bb7fd
ssh-openpgp-auth,sshd-openpgp-auth: useFetchCargoVendor
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.
2025-01-24 22:31:26 +01:00
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
Weijia Wang
1e5475a9cd
sse2neon: 1.7.0 -> 1.8.0 (#368251) 2025-01-04 23:21:48 +01:00