Commit Graph

62 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
R. Ryantm
f20871279a ddev: 1.24.3 -> 1.24.4 2025-04-01 12:40:57 +00:00
Franz Pletz
22c74583f0
ddrescue: 1.29 -> 1.29.1 (#392087) 2025-03-29 16:55:23 +01:00
jopejoe1
e77c2830a0
ddnet-server: build fixes (#391366) 2025-03-25 13:42:17 +01:00
Cosima Neidahl
0cc95b585c
ddm: 3.0.2 -> 4.0.0 (#390460) 2025-03-23 13:40:44 +01:00
R. Ryantm
93dff566ad ddrescue: 1.29 -> 1.29.1 2025-03-22 12:42:49 +00:00
R. Ryantm
6e5a271601 ddccontrol-db: 20250220 -> 20250320 2025-03-20 14:48:07 +00:00
Sefa Eyeoglu
894f30ecbf
ddnet-server: set correct mainProgram
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
2025-03-19 21:08:57 +01:00
Sefa Eyeoglu
acd3e908a0
ddnet-server: fix Darwin build
The server variant of the ddnet package does not ship the client, so we
don't need to patch in libsteam_api.dylib

Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
2025-03-19 21:07:07 +01:00
R. Ryantm
c1934a44da ddns-go: 6.9.0 -> 6.9.1 2025-03-19 05:28:51 +00:00
OPNA2608
7ee41dfbc5 ddm: 3.0.2 -> 4.0.0
- Game is now served as an asar file, and tries to make a directory for an image cache in the store
  - Unpack the asar file so we can patch code
  - Apply patch to generate image cache under ~/.cache/ddm/images,and read everything else from store
2025-03-16 20:04:34 +01:00
Toma
00c1e4a186 Revert "treewide: remove duplicated logic for NIXOS_OZONE_WL"
This reverts commit 5f8d564052.
2025-03-14 22:10:44 +01:00
TomaSajt
5f8d564052 treewide: remove duplicated logic for NIXOS_OZONE_WL 2025-03-14 20:20:45 +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
0f122ad9e4 ddns-go: 6.8.1 -> 6.9.0 2025-03-07 18:40:21 +00:00
Peder Bergebakken Sundt
17caf82441
ddev: install autocompletion scripts (#384953) 2025-03-04 00:56:24 +01:00
Cosima Neidahl
c9ce18fd2f
ddm: init at 3.0.2 (#385063) 2025-03-03 12:32:37 +01:00
Sandro
6851837245
ddnet: 18.9 -> 19.0 (#385026) 2025-02-28 01:28:02 +01:00
R. Ryantm
d87cbab4c6 ddev: 1.24.2 -> 1.24.3 2025-02-26 12:54:20 +00:00
Sefa Eyeoglu
8a031ae182
ddnet: fix licenses
See 33ae913350/license.txt

Upstream code is licensed under zlib, some assets are CC-BY-SA-3.0 and
fonts are OFL-1.1

Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
2025-02-26 09:21:27 +01:00
Sefa Eyeoglu
eeb1ab1688
ddnet: modernize src
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
2025-02-26 09:12:19 +01:00
OPNA2608
e31fc87768 ddm: init at 3.0.2 2025-02-25 17:41:31 +01:00
Sefa Eyeoglu
65bcebfa19
ddnet: move to by-name
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
2025-02-25 15:12:18 +01:00
Remy van Velthuijsen
86275edcce
ddev: install autocompletion scripts 2025-02-24 22:33:42 +01:00
R. Ryantm
1e4fb01a29 ddccontrol-db: 20250106 -> 20250220 2025-02-21 01:18:09 +00:00
R. Ryantm
5c4f0b02f9 ddcutil: 2.1.4 -> 2.2.0 2025-02-18 12:33:08 +00:00
Wolfgang Walther
d61bc6ba5a
ddev: add remyvv as maintainer (#379796) 2025-02-16 13:51:27 +01:00
Vladimir Panteleev
70217298be
dduper: fix build 2025-02-06 13:55:47 +00:00
Remy van Velthuijsen
c9e03a8eda
ddev: add remyvv as maintainer 2025-02-06 11:03:55 +01:00
K900
29d8d9b1a7 Merge remote-tracking branch 'origin/master' into staging-next 2025-02-05 22:58:25 +03:00
misuzu
e3c14019c6
ddev: 1.24.1 -> 1.24.2 (#375463) 2025-02-05 21:11:08 +02:00
Martin Weinelt
909803a20e
Merge remote-tracking branch 'origin/master' into staging-next
Conflicts:
- pkgs/by-name/au/automatic-timezoned/package.nix
- pkgs/by-name/da/darklua/package.nix
- pkgs/by-name/ki/kittycad-kcl-lsp/package.nix
- pkgs/by-name/li/limbo/package.nix
- pkgs/by-name/mi/minijinja/package.nix
- pkgs/by-name/pa/pay-respects/package.nix
- pkgs/by-name/ri/river-bsp-layout/package.nix
- pkgs/by-name/sv/svgbob/package.nix
- pkgs/by-name/tu/tui-journal/package.nix
- pkgs/by-name/wa/waypipe/package.nix
- pkgs/development/python-modules/zxcvbn-rs-py/default.nix
2025-01-29 16:08:53 +01:00
Nick Cao
f1e822355b
ddns-go: 6.8.0 -> 6.8.1 (#377487) 2025-01-28 14:54:07 -05:00
John Otwell
402d9281fe ddclient: 3.11.2 -> 4.0.0
The pre-4.0 version is inconsistent with at least one API (Porkbun)
[Release notes](https://github.com/ddclient/ddclient/releases/tag/v4.0.0)
2025-01-28 19:33:27 +01:00
R. Ryantm
30e99bbff7 ddns-go: 6.8.0 -> 6.8.1 2025-01-28 05:02:44 +00:00
Alyssa Ross
e2afb6a831 treewide: migrate to fetchCargoVendor, batch 6
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.

These cases could have been included in batch 1, except that
nix-update also changes the formatting of source hash.  It should be
possible to verify this in the same way as batch 1, except that the
commands will additionally result in non-functional source hash
changes that I didn't include here.
2025-01-26 15:16:11 +01:00
R. Ryantm
402855c6ca ddev: 1.24.1 -> 1.24.2 2025-01-21 08:10:06 +00:00
R. Ryantm
18340cc3ee ddns-go: 6.7.7 -> 6.8.0 2025-01-15 00:58:22 +00:00
Darragh Elliott
99f659a0a5 ddns-updater: 2.7.0 -> 2.9.0 2025-01-11 12:15:08 +00:00
delliottxyz
130c218c61
Revert "ddns-updater: disable updates" 2025-01-10 13:27:23 +00:00
Franz Pletz
8c1a80ad5a
ddrescue: 1.28 -> 1.29 (#371305) 2025-01-06 16:44:33 +01:00
R. Ryantm
5154c6c36c ddccontrol-db: 20240920 -> 20250106 2025-01-06 10:47:23 +00:00
R. Ryantm
fc3ac053dd ddrescue: 1.28 -> 1.29 2025-01-06 00:32:29 +00:00
Peder Bergebakken Sundt
0cd04d3036 treewide: migrate fetchgit rev = "refs/tags/..." to tag 2025-01-04 00:19:17 +01:00
Austin Horstman
ba263d86c0
ddccontrol: 1.0.0 -> 1.0.3 2024-12-29 23:03:57 -06:00
R. Ryantm
4a0fadb3d4 ddev: 1.23.5 -> 1.24.1 2024-12-17 16:42:39 +00:00
R. Ryantm
89b854db13 ddns-go: 6.7.6 -> 6.7.7 2024-12-13 05:35:48 +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