Commit Graph

52 Commits

Author SHA1 Message Date
R. Ryantm
6ee1ff1813 _3beans: 0-unstable-2026-06-17 -> 0-unstable-2026-08-05 2026-08-11 00:41:42 +00:00
Sandro
4bcdf3f60a _3beans: init at 0-unstable-2026-06-17 (#528345) 2026-08-10 16:32:34 +00:00
AnnoyingRains
250a5883bf _3beans: init at 0-unstable-2026-06-17 2026-08-05 19:13:44 +10:00
jopejoe1
b62797c417 _389-ds-base: 3.1.3 -> 3.3.0 2026-07-01 19:15:26 +02:00
Guy Chronister
28f3c32ccf _3proxy: switch to replace-fail 2026-04-22 08:13:40 -05:00
R. Ryantm
e9489fa080 _3proxy: 0.9.5 -> 0.9.6 2026-04-11 14:44:07 +00:00
azban
897cb09ddf _389-ds-base: add patch to fix CVE-2025-14905
This patch is in the tree but has not yet been included in a release.
2026-04-10 12:57:57 -06:00
azban
82c2735bb6 _389-ds-base: use cargoSetupHook and remove hard-coded vendor path
This was not previously not using cargoSetupHook and therefore had a faulty configuration when building subpackages with vendored packages. This fixes that and removes a hard-coded vendor path from the source cargo config which was interfering with the generated configuration.
2026-04-10 00:44:56 -06:00
R. Ryantm
d9dacb771f _3cpio: 0.13.1 -> 0.14.0 2026-02-11 18:44:01 +00:00
quantenzitrone
9380e05c3c various: switch buildGoModule packages to use finalAttrs
this shouldn't create any rebuilds

the following script was used to generate this:
```fish
#!/usr/bin/env fish

# nix shell .#nixfmt nixpkgs#{nixf-diagnose,ripgrep,sd}

set base (git rev-parse HEAD)

set scope pkgs/by-name
set builder buildGoModule

set files (rg --files-with-matches -F "$builder rec {" $scope | sort -u)

for file in $files
    echo $file
    sd -F "$builder rec {" "$builder (finalAttrs: {" $file
    # version
    sd -F 'version}' 'finalAttrs.version}' $file
    sd -F '${version' '${finalAttrs.version' $file
    sd -F '= version' '= finalAttrs.version' $file
    sd -F 'inherit version;' 'inherit (finalAttrs) version;' $file
    sd -F ' + version;' ' + finalAttrs.version;' $file
    sd 'replaceStrings (.*) version' 'replaceStrings $1 finalAttrs.version' $file
    sd -F 'splitVersion version' 'splitVersion finalAttrs.version' $file
    sd -F 'versionAtLeast version' 'versionAtLeast finalAttrs.version' $file
    sd 'versions\.([a-z]+) version' 'versions.$1 finalAttrs.version' $file
    # src
    sd -F 'src}' 'finalAttrs.src}' $file
    sd -F '${src' '${finalAttrs.src' $file
    sd -F '= src' '= finalAttrs.src' $file
    sd -F 'inherit src;' 'inherit (finalAttrs) src;' $file
    sd -F 'inherit (src' 'inherit (finalAttrs.src' $file
    # meta
    sd -F '${meta' '${finalAttrs.meta' $file
    sd -F '= meta' '= finalAttrs.meta' $file
    sd -F 'inherit (meta' 'inherit (finalAttrs.meta' $file
    # other
    sd -F 'inherit version src;' 'inherit (finalAttrs) version src;' $file
    sd -F 'inherit src version;' 'inherit (finalAttrs) src version;' $file
    sd -F 'makeLibraryPath buildInputs' 'makeLibraryPath finalAttrs.buildInputs' $file
    sd -F 'buildInputs}' 'finalAttrs.buildInputs}' $file
    sd -F 'desktopItem}' 'finalAttrs.desktopItem}' $file
    sd -F 'runtimeLibs}' 'finalAttrs.runtimeLibs}' $file
    sd -F 'libPath}' 'finalAttrs.libPath}' $file
    sd -F 'runtimeDependencies}' 'finalAttrs.runtimeDependencies}' $file
    sd -F 'nativeRuntimeInputs}' 'finalAttrs.nativeRuntimeInputs}' $file
    sd -F '(!doCheck)' '(!finalAttrs.doCheck)' $file
    sd -F 'optional doCheck' 'optional finalAttrs.doCheck' $file
    sd -F 'optionals doCheck' 'optionals finalAttrs.doCheck' $file
    sd -F '++ runtimeDependencies' '++ finalAttrs.runtimeDependencies' $file
    # pname (restored afterwards)
    sd -F 'pname}' 'finalAttrs.pname}' $file
    sd -F '${pname' '${finalAttrs.pname' $file
    sd -F '= pname' '= finalAttrs.pname' $file
    # close finalAttrs lambda
    echo ')' >>$file
    # catch some errors early
    if ! nixfmt $file
        git restore $file
        continue
    end
    if ! nixf-diagnose -i sema-primop-overridden $file
        git restore $file
        continue
    end
end

set torestore (rg -F .finalAttrs --files-with-matches $scope)
if test (count $torestore) -gt 0
    git restore $torestore
end
set torestore (rg -F finalAttrs.pname --files-with-matches $scope)
if test (count $torestore) -gt 0
    git restore $torestore
end

# commit for faster eval times
git add pkgs
git commit --no-gpg-sign -m temp
set torestore

for file in $files
    # file hasn't changed
    if git diff --quiet $base $file
        continue
    end
    # try to eval the package to definitely catch all errors
    echo $file
    set pname (string split / $file -f 4)
    if ! nix eval .#$pname
        set torestore $torestore $file
    end
end

# restore files that don't eval
git reset --soft $base
git restore --staged .
if test (count $torestore) -gt 0
    git restore $torestore
end
```

after that some manual cleanup was done:
- restoring files that cause changes in the number of lines
- restoring files that cause rebuilds
- restoring files that cause merge conflicts with staging
2026-02-07 09:28:59 +01:00
Fernando Rodrigues
6308c3b213 various: switch to finalAttrs pattern (#483882) 2026-01-30 02:32:49 +00:00
quantenzitrone
6b61249106 various: switch to finalAttrs pattern
this shouldn't create any rebuilds
2026-01-30 02:36:22 +01:00
R. Ryantm
f36ef91309 _3cpio: 0.13.0 -> 0.13.1 2026-01-28 16:51:08 +00:00
R. Ryantm
b26da1583e _3cpio: 0.12.0 -> 0.13.0 2026-01-08 18:43:58 +00:00
Wolfgang Walther
53d55066d2 maintainers: drop Br1ght0ne
Reacted to 2 out of 223 maintainer pings in the least 180 days.
2025-12-09 21:05:56 +01:00
Aleksana
0866582290 3cpio: mark broken on darwin due to upstream bug (#459851) 2025-11-14 02:18:55 +00:00
R. Ryantm
7151c88a23 _3cpio: 0.11.0 -> 0.12.0 2025-11-11 15:38:24 +00:00
flurie
88478b7d39 3cpio: mark broken on darwin due to upstream bug 2025-11-09 10:51:16 -05:00
Guy Chronister
4af54f4491 _3llo: fix formatting, qualify lib section 2025-11-03 09:50:44 -06:00
Guy Chronister
74432d9de5 _3llo: migrate to by-name 2025-11-03 08:46:29 -06:00
Wolfgang Walther
c283f32d29 treewide: remove unused with
Auto-fixed by nixf-diagnose.
2025-10-05 10:50:41 +02:00
Guy Chronister
5ca7c1b072 various: migrate rev to tag 2025-09-30 08:51:32 -05:00
arcnmx
1d9b05f27b _389-ds-base: fix build (#439717) 2025-09-03 12:57:13 -04:00
R. Ryantm
61e180fc62 _3cpio: 0.10.2 -> 0.11.0 2025-09-02 14:58:02 +00:00
R. Ryantm
4d5489ddba _3cpio: 0.8.0 -> 0.10.2 2025-08-14 12:40:13 +00:00
Jared Baur
ea96ba8bf0 3cpio: remove useFetchCargoVendor 2025-08-13 04:18:14 -07:00
Jared Baur
ae10ca7f4d 3cpio: init at 0.8.0 (#374890) 2025-08-13 04:09:14 -07:00
Weijia Wang
bb95f4bd14 _389-ds-base: 3.1.2 -> 3.1.3 (#422622) 2025-07-26 02:12:49 +02:00
Wolfgang Walther
5a0711127c treewide: run nixfmt 1.0.0 2025-07-24 13:55:40 +02:00
Jared Baur
6ff8139859 3cpio: init at 0.8.0 2025-07-15 09:20:43 -07:00
R. Ryantm
17cfe1b316 _389-ds-base: 3.1.2 -> 3.1.3 2025-07-05 06:19:28 +00:00
Wael Nasreddine
b1115f873c treewide: migrate rev to tag batch 2 (#419400) 2025-06-24 22:05:21 -07:00
Guy Chronister
b3f74569d7 treewide: migrate rev to tag batch 2 2025-06-24 13:24:35 +00:00
Guy Chronister
33c8949e5f treewide: refactor meta section part 2
adapta-gtk-theme: remove maintainers.

Co-authored-by: Shawn8901 <shawn8901@googlemail.com>
2025-06-23 12:46:23 +00:00
liberodark
c6729488de treewide: remove with lib Part 4 2025-06-07 00:48:50 +02:00
Peder Bergebakken Sundt
c4f02ff31e treewide: substitute pname for strings 2025-05-29 17:04:28 +02: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
misuzu
fb96871507 _3proxy: 0.9.4 -> 0.9.5 (#388667) 2025-03-15 12:52:34 +02: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
misuzu
cecf361efe _3proxy: 0.9.4 -> 0.9.5 2025-03-10 13:50:27 +02:00
Benjamin Staffin
f580aca59b _389-ds-base: fix cargo deps vendoring 2025-02-10 20:31:06 +02:00
R. Ryantm
017ab730c8 _389-ds-base: 3.0.5 -> 3.1.2 2025-02-10 20:31:04 +02:00
Alyssa Ross
c368e3cb07 treewide: migrate to fetchCargoVendor, batch 3
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/fetchCargoTarball/fetchCargoVendor/'
	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 14:35:41 +01:00
misuzu
75e16a4607 3proxy: fixup build with gcc14 2024-12-23 19:51:33 +02:00
R. Ryantm
844db7de26 _389-ds-base: 3.1.1 -> 3.0.5 2024-12-21 10:39:17 +00:00
Silvan Mosberger
4f0dadbf38 treewide: format all inactive Nix files
After final improvements to the official formatter implementation,
this commit now performs the first treewide reformat of Nix files using it.
This is part of the implementation of RFC 166.

Only "inactive" files are reformatted, meaning only files that
aren't being touched by any PR with activity in the past 2 months.
This is to avoid conflicts for PRs that might soon be merged.
Later we can do a full treewide reformat to get the rest,
which should not cause as many conflicts.

A CI check has already been running for some time to ensure that new and
already-formatted files are formatted, so the files being reformatted here
should also stay formatted.

This commit was automatically created and can be verified using

    nix-build a08b3a4d19.tar.gz \
      --argstr baseRev b32a094368
    result/bin/apply-formatting $NIXPKGS_PATH
2024-12-10 20:26:33 +01:00
aleksana
571c71e6f7 treewide: migrate packages to pkgs/by-name, take 1
We are migrating packages that meet below requirements:

1. using `callPackage`
2. called path is a directory
3. overriding set is empty (`{ }`)
4. not containing path expressions other than relative path (to
makenixpkgs-vet happy)
5. not referenced by nix files outside of the directory, other
than`pkgs/top-level/all-packages.nix`
6. not referencing nix files outside of the directory
7. not referencing `default.nix` (since it's changed to `package.nix`)
8. `outPath` doesn't change after migration

The tool is here: https://github.com/Aleksanaa/by-name-migrate.
2024-11-09 20:04:51 +08:00
wxt
a8405a6ad5 _389_ds_base: 2.4.6 -> 3.1.1 2024-10-30 19:29:57 +08:00
wxt
5ac19f8437 _389_ds_base: add passthru.updateScript 2024-10-30 19:02:49 +08:00