Commit Graph

83 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
Arthur Gautier
8fd1ef7eb4 rpm-sequoia: 1.7.0 -> 1.8.0 2025-04-07 13:21:14 -07:00
Pol Dellaiera
65a333600d treewide: replace rev with tag 2025-04-07 16:57:22 +02:00
Peder Bergebakken Sundt
f68791b4d6
rpm-ostree: upgrade pcre to pcre2 (#389094) 2025-03-27 03:27:48 +01:00
Emily
9b27f27924 Revert "treewide: drop copumpkin from maintainers"
Unjustified premature merge that goes against our guidelines and the
decision of another committer.

This reverts commit 5d48f44119.
2025-03-23 16:43:46 +00:00
phaer
5d48f44119 treewide: drop copumpkin from maintainers
Their last commit is from March 28th 2019, about 6 years ago.

This PR is in no way intended to diminish Daniels's accomplishments, and they're welcome to just say so if they'd prefer this PR not to be merged. Also, even if it's merged, of course they're always welcome to return to activity and be added back. The intent of this PR is to give more realistic expectations around the maintainership of these packages, and to invite others to step up for maintainership if they rely on those packages.

If this is merged, they should probably also be removed from the list
of committers for the time being.
2025-03-23 14:11:50 +01:00
Florian Klink
742b17f589
rpiboot: Fix bootfiles location (use INSTALL_PREFIX) (#391442) 2025-03-20 12:01:42 +01:00
Robert Kovacsics
adc17a6105
rpiboot: Fix bootfiles location (use INSTALL_PREFIX)
Since
0952ce01e1
the rpiboot package doesn't hard-code the path, but uses INSTALL_PREFIX,
so we should use that to properly configure the default location for the
bootfiles.
2025-03-20 02:12:57 +00:00
Matthias Beyer
7fdcf46005
rp: init at 2.1.4 (#390159) 2025-03-19 20:01:13 +01:00
R. Ryantm
8ffe2ba3dc rpcemu: 0.9.4 -> 0.9.5 2025-03-16 00:39:32 +00:00
sportshead
e9682d939c
rp: init at 2.1.4
https://github.com/0vercl0k/rp/releases/tag/v2.1.4
2025-03-15 15:13:19 +00:00
Sigmanificient
e6fe6f4b7c treewide: remove unused rec expressions 2025-03-13 21:34:05 +01:00
Florian Klink
98a3184be5
rpiboot: 20250129-123632 -> 20250227-132106 (#388457) 2025-03-12 17:41:44 +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
Thomas Gerbet
d766ff4ccf rpm-ostree: upgrade pcre to pcre2 2025-03-11 22:13:45 +01:00
guylamar2006
0621840952 rpiboot: 20250129-123632 -> 20250227-132106 2025-03-09 10:47:54 -05:00
Nick Cao
bb58cda8d5
rpl: 1.17 -> 1.18 (#387456) 2025-03-06 16:12:04 -05:00
Weijia Wang
89cd9e56a5
rpcs3: 0.0.34-17265-418a99a62 -> 0.0.34-17323-92d070729 (#372036) 2025-03-06 08:29:12 +01:00
R. Ryantm
eac749c181 rpl: 1.17 -> 1.18 2025-03-06 00:32:45 +00:00
Peder Bergebakken Sundt
a7f50af500
rpiboot: fix broken symlink failure (#385719) 2025-03-04 00:38:37 +01:00
Emily Trau
0696bcac30 rpiboot: fix broken symlink failure 2025-02-28 14:29:59 +11:00
emaryn
ecae691634 rpi-imager: 1.8.5 -> 1.9.0 2025-02-27 04:57:59 +08:00
R. Ryantm
9fccb5d2c8 rpl: 1.16.1 -> 1.17 2025-02-20 23:36:13 +00: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
K900
29d8d9b1a7 Merge remote-tracking branch 'origin/master' into staging-next 2025-02-05 22:58:25 +03:00
R. Ryantm
cd152274da rpiboot: 20240926-102326 -> 20250129-123632 2025-02-04 22:47:35 +00:00
Alyssa Ross
6723c183bf
Merge remote-tracking branch 'origin/staging-next' into staging
Conflicts:
	pkgs/by-name/ca/cargo-public-api/package.nix
	pkgs/by-name/ju/just/package.nix
	pkgs/by-name/kd/kdlfmt/package.nix
	pkgs/by-name/mo/mountpoint-s3/package.nix
	pkgs/by-name/wa/wayidle/package.nix
2025-01-26 19:49:51 +01:00
R. Ryantm
6eb3ce8fca rpl: 1.16 -> 1.16.1 2025-01-25 23:08:08 +00: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
github-actions[bot]
c67c39eb74
Merge master into staging-next 2025-01-13 18:04:50 +00:00
R. Ryantm
b84df1b9cc rpl: 1.15.7 -> 1.16 2025-01-12 15:42:41 +00:00
R. Ryantm
53ab149dc7 rpcs3: 0.0.34-17265-418a99a62 -> 0.0.34-17323-92d070729 2025-01-08 05:36:06 +00:00
Peder Bergebakken Sundt
dbee3b0e98 Merge remote-tracking branch 'upstream/staging-next' into fix-merge-conflict-1735949935 2025-01-04 01:24:46 +01:00
Peder Bergebakken Sundt
0cd04d3036 treewide: migrate fetchgit rev = "refs/tags/..." to tag 2025-01-04 00:19:17 +01:00
Jan Tojnar
ab44f61ec7 Merge branch 'staging-next' into staging
Merge conflict in `pkgs/by-name/en/envision/package.nix` between efb2d2b815fe9f7d12f4aab42c83e759db5ec716 (staging) and b9d59c4515ea7cd4595d342c9d87877b544e6dbd+de7a60960219b303cc44ad446f9e7ddaf23b9944 (staging-next).
2024-12-30 01:58:08 +01:00
R. Ryantm
ff583bace9 rpcs3: 0.0.34-17206-9d4ff13c2 -> 0.0.34-17265-418a99a62 2024-12-29 03:48:47 +00:00
github-actions[bot]
1c6904eaad
Merge staging-next into staging 2024-12-19 23:02:44 +00:00
R. Ryantm
49fe76b729 rpcs3: 0.0.33-17070-8b8396b94 -> 0.0.34-17206-9d4ff13c2 2024-12-18 19:12:06 +00:00
Wolfgang Walther
e58e0c158e
various: replace substituteAll with replaceVarsWith
This covers cases which need to use replaceVarsWith because the use
isExecutable = true.
2024-12-15 13:35:30 +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
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
misuzu
d641ace370
rpPPPoE: 3.12 -> 4.0 (#349480) 2024-12-05 16:02:51 +02:00
Dict Xiong
934cf4cdea rpPPPoE: 3.12 -> 4.0 and build kernel mode plugin
The old rpPPPoE package from Roaring Penguin is no longer maintained
and the download link is also inaccessible. So I switch the upstream
to https://github.com/dfskoll/rp-pppoe.

Also, according to the discussions in
https://github.com/dfskoll/rp-pppoe/issues/32, it is strongly
recommended to use rpPPPoE in the kernel mode, as it is more stable
and performant than in the user mode. So I enable the compilation of
the kernel mode plugin `rp-pppoe.so`. It will be available at
`/run/current-system/sw/lib/rp-pppoe.so`.
2024-11-15 11:03:34 +08:00
Arthur Gautier
bed1d1e44a rpm-sequoia: fixup darwin build
When building derivations that depends on rpm on darwin, we get the
following error:
```
dyld[69225]: Library not loaded: /nix/store/cz9sppfrs9ag34lq2pq6wmhspwcnvbxq-rpm-sequoia-1.7.0/lib/librpm_sequoia.1.7.0.dylib
  Referenced from: <0EA94AC5-F54A-3791-9374-4092232F33A1> /nix/store/mak6qp2pvgz19dn0fb0pr2lksgca43qp-rpm-4.20.0/lib/librpmio.10.2.0.dylib
  Reason: tried: '/nix/store/cz9sppfrs9ag34lq2pq6wmhspwcnvbxq-rpm-sequoia-1.7.0/lib/librpm_sequoia.1.7.0.dylib' (no such file), '/System/Vol>
cpio: premature end of archive
```

This commit adds the correct symlinks on darwin.
2024-11-12 14:13:12 -08:00
Arthur Gautier
a2d3ae0286 rpm-sequoia: init at 1.7.0 2024-11-11 11:02:55 -08: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
Artturin
a5e267e59e
rpiboot: add updateScript (#351604) 2024-11-06 00:06:56 +02:00
R. Ryantm
df207b5eb7 rpcs3: 0.0.33-16999-938306a7b -> 0.0.33-17070-8b8396b94 2024-10-30 00:22:26 +00:00
Steffen Vogel
fc489f3789 rpiboot: add updateScript 2024-10-27 10:05:58 +01:00
Steffen Vogel
108e1f1eff rpiboot: add stv0g as maintainer 2024-10-24 20:14:52 +02:00