Commit Graph

14 Commits

Author SHA1 Message Date
Mathias Zhang
d482071703 flaca: 3.5.3 -> 3.6.1 2026-04-01 03:20:46 +08:00
Mathias Zhang
b958eea332 flaca: 3.4.2 -> 3.5.3 2025-12-14 20:26:28 +08:00
Ihar Hrachyshka
567e8dfd8e treewide: clean up 'meta = with' pattern
This commit was created by a combination of scripts and tools:
- an ast-grep script to prefix things in meta with `lib.`,
- a modified nixf-diagnose / nixf combination to remove unused `with
lib;`, and
- regular nixfmt.

Co-authored-by: Wolfgang Walther <walther@technowledgy.de>
2025-12-10 18:09:49 +01:00
Mathias Zhang
6c4892dcea flaca: 3.3.2 -> 3.4.2 2025-08-10 23:49:07 +08:00
TomaSajt
398b16e16c treewide: remove useFetchCargoVendor usages 2025-07-26 11:39:35 +02:00
Mathias Zhang
4d3ac9fe9d flaca: 3.2.3 -> 3.3.2 2025-04-12 12:53:22 +08: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
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
Mathias Zhang
304716bb79 flaca: 3.2.0 -> 3.2.3 2025-02-26 08:38:34 +08: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
Mathias Zhang
173fc04efd flaca: 3.1.6 -> 3.2.0 2025-01-09 01:25:26 +08:00
h7x4
8f55b011e0 treewide: add meta.changelog (#346488)
* guix: add meta.changelog

* zile: add meta.changelog

* zoom: add meta.changelog

* zotify: add meta.changelog

* zpaqfranz: add meta.changelog

* zunit: add meta.changelog

* zxwing-cpp: add meta.changelog

* zxpy: add meta.changelog

* zydis: add meta.changelog

* zziplib: add meta.changelog

* j: add meta.changelog

* kyua: add meta.changelog

* json2ts: add meta.changelog

* igir: add meta.changelog

* ios-webkit-debug-proxy: add meta.changelog

* gpaste: add meta.changelog

* polkit_gnome: add meta.changelog

* papers: add meta.changelog

* libmsgraph: add meta.changelog

* quadrapassel: add meta.changelog

* gnome-nibbles: add meta.changelog

* decibels: add meta.changelog

* libgedit-amtk: add meta.changelog

* simple-scan: add meta.changelog

* gnome-klotski: add meta.changelog

* gnome-sound-recorder: add meta.changelog

* gnome-remote-desktop: add meta.changelog

* gnome-robots: add meta.changelog

* gnome-shell-extensions: add meta.changelog

* gnome-panel: add meta.changelog

* gnome-session: add meta.changelog

* gnome-keyring: add meta.changelog

* devhelp: add meta.changelog

* libgnome-keyring: add meta.changelog

* ghex: add meta.changelog

* gnome-connections: add meta.changelog

* lightsoff: add meta.changelog

* gnome-flashback: add meta.changelog

* livi: add meta.changelog

* mutter: add meta.changelog

* hitori: add meta.changelog

* gnome-initial-setup: add meta.changelog

* gnome-bluetooth: add meta.changelog

* gnome-shell: add meta.changelog

* gnome-sudoku: add meta.changelog

* ideamaker: add meta.changelog

* i2p: add meta.changelog

* lms: add meta.changelog

* adwaita-icon-theme: add meta.changelog

* gnome-applets: add meta.changelog

* flac123: add meta.changelog

* flaca: add meta.changelog

* flameshot: add meta.changelog

* flaresolverr: add meta.changelog

* a52dec: add meta.changelog

* hexbinhex: add meta.changelog

* dwl: add meta.changelog

* msolve: add meta.changelog

* jcli: add meta.changelog

* nmap: add meta.changelog

* nmapsi4: add meta.changelog

* labctl: add meta.changelog

* _1oom: add meta.changelog

* libipuz: add meta.changelog

* metacity: add meta.changelog

* sushi: add meta.changelog

* rygel: add meta.changelog

* zenity: add meta.changelog

* crosswords: add meta.changelog

* gnome-mahjongg: add meta.changelog

* alacarte: add meta.changelog

* loupe: add meta.changelog

* cheese: add meta.changelog

* atomix: add meta.changelog

* swell-foop: add meta.changelog

* alfis: add meta.changelog

* aperture: add meta.changelog

* atomic-swap: add meta.changelog

* besu: add meta.changelog

* bisq: add meta.changelog

* bitcoin-abc: add meta.changelog

* bitcoin-knots: add meta.changelog

* bitcd: add meta.changelog

* btcdeb: add meta.changelog

* btcpayserver: add meta.changelog

* 86box: add meta.changelog

* darling: add meta.changelog

* dosbox: add meta.changelog

* firebird-emu: add meta.changelog

* maiko: add meta.changelog

* accerciser: add meta.changelog

* adwaita-icon-theme-legacy: add meta.changelog

* dconf-editor: add meta.changelog

* eog: add meta.changelog

* evolution-data-server: add meta.changelog

* file-roller: add meta.changelog

* four-in-a-row: add meta.changelog

* gdm: add meta.changelog

* geary: add meta.changelog

* gitg: add meta.changelog

* gnome2048: add meta.changelog

* gnome-backgrounds: add meta.changelog

* gnome-text-editor: add meta.changelog

* gnome-tour: add meta.changelog

* gnome-user-share: add meta.changelog

* gxml: add meta.changelog

* tali: add meta.changelog

* totem: add meta.changelog

* mobile-broadband-provider-info: add meta.changelog

* avr: add meta.changelog

* brev-cli: add meta.changelog

* juce: add meta.changelog

* loc: add meta.changelog

* resholve: add meta.changelog

* rpiboot: add meta.changelog

* gerbera: add meta.changelog

* kdocker: add meta.changelog

* pmenu: add meta.changelog

* advancecomp: add meta.changelog

* adriconf: add meta.changelog

* interception-tools: add meta.changelog

* nabi: add meta.changelog

* gorilla-cli: add meta.changelog

* heygpt: add meta.changelog

* 6tunnel: add meta.changelog

* aria2: add meta.changelog

* logmein-hamachi: add meta.changelog

* maphosts: add meta.changelog

* qcal: add meta.changelog

* adreaper: add meta.changelog

* aflplusplus: add meta.changelog

* aide: add meta.changelog

* cameradar: add meta.changelog

* wpscan: add meta.changelog

* aha: add meta.changelog

* xcat: add meta.changelog
2024-10-04 22:35:12 +03:00
Mathias Zhang
b83043cf57 flaca: migrate to pkgs/by-name 2024-08-17 17:05:27 +08:00