Commit graph

27 commits

Author SHA1 Message Date
Aleksana
b26ac34bc3
qmk: add bootloadhid as a propagatedBuildInput for hardware support (#409805) 2025-05-23 20:22:42 +08:00
TheTaoOfSu
6fb834fb3c qmk: add bootloadhid as a propagatedBuildInput to support flashing more hardware 2025-05-22 17:05:39 +02:00
R. Ryantm
c3ed7942c9 qmmp: 2.2.5 -> 2.2.6 2025-05-22 07:30:11 +02:00
Bjørn Forsman
c83285ade3 qmmp: move to pkgs/by-name
Do the necessary adaptation to be compatible with pkgs/by-name, by
taking top-level qt6 as input instead of the individual qt modules
(qtbase, ...), which were previously explicitly taken from qt6Packages.

No rebuild.
2025-05-10 09:15:34 +02:00
R. Ryantm
b4ed4d0dd0 qmk: 1.1.6 -> 1.1.7 2025-04-28 04:27:34 +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
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
emaryn
ea700201cc
qmk-udev-rules: 0.23.3 -> 0.27.13 (#385013)
Co-authored-by: emaryn <emaryn@users.noreply.github.com>
2025-02-25 23:23:56 +01:00
R. Ryantm
47f92261d9 qmk: 1.1.5 -> 1.1.6 2025-02-16 20:35:28 +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
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
Silvan Mosberger
667d42c00d 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 57b193d8dd
    result/bin/apply-formatting $NIXPKGS_PATH
2024-12-10 20:27:17 +01:00
Emily
a5bc214253 qmk: use the default GCC version for AVR
Upstream previously recommended GCC 8 when targeting AVR because
of binary size concerns. They have since removed this warning in
<https://github.com/qmk/qmk_firmware/pull/24206>, as more recent GCC
versions have resolved the issues.

Building `keyboardio/model01` before:

     * The firmware size is fine - 26984/28672 (94%, 1688 bytes free)

And after:

     * The firmware size is fine - 27200/28672 (94%, 1472 bytes free)

+216 bytes (1.008× the total size) is not a big deal. Since upstream
is fine with it these days, we can be too, and not keep around an
unsupported compiler just for QMK.
2024-11-22 18:03:01 +00: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
Martin Weinelt
52cfd83eee
hyperhdr: init at 20.0.0.0 (#306321) 2024-10-04 02:24:50 +02:00
Anderson Torres
fb86fc7d25 qmplay2: nixfmt-rfc-style
(Can someone explain what happened with buildInputs??)
2024-07-26 12:34:46 -03:00
Anderson Torres
644bdba6d0 qmplay2: 24.05.23 -> 24.06.16 2024-07-26 12:34:46 -03:00
Anderson Torres
5a499e703f qmplay2: 24.04.07 -> 24.05.23 2024-07-26 12:34:46 -03:00
Anderson Torres
466acbdd50 qmplay2: fix longDescription
Grammar and punctuation.
2024-07-26 12:34:18 -03:00
Anderson Torres
f667a7e270 qmplay2: delete changelog link
Until a better idea for an unbreakable reference template appears.

(Maybe a local file ref?)
2024-07-26 09:23:23 -03:00
Anderson Torres
3900d02aa8 qmplay2: set strictDeps 2024-07-26 09:23:23 -03:00
Anderson Torres
eec12ba4fd qmplay2: create symlink at postInstall 2024-07-26 09:23:08 -03:00
Anderson Torres
365e7e5d07 qmplay2: fetch submodules directly (get rid of fetchSubmodules) 2024-07-26 09:19:37 -03:00
Anderson Torres
02dfdf731e qmplay2: detach sources acquisition to sources.nix
Because it uses fetchSubmodules, and maybe in the future it will
become discouraged.
2024-07-26 09:19:37 -03:00
Anderson Torres
8d69d77244 qmplay2: migrate to by-name 2024-07-26 09:19:37 -03:00
Martin Weinelt
0d669f4f6f qmqtt: init at 1.0.3 2024-04-23 22:36:16 +02:00