Commit graph

87 commits

Author SHA1 Message Date
Louis Thevenet
bb99f0d648
mcat: 0.2.8 -> 0.3.0
Changelog: https://github.com/Skardyy/mcat/blob/v0.3.0/CHANGELOG.md
2025-05-28 20:15:59 +02:00
Aleksana
7c134e5d06
mcat: init at 0.2.8 (#402539) 2025-05-26 22:47:42 +08:00
Louis Thevenet
1d27760037
mcat: init at 0.2.8 2025-05-17 22:27:40 +02:00
Felix Bargfeldt
44030d8922
mcpelauncher-{client,ui-qt}: 1.2.0-qt6 -> 1.3.0-qt6 (#404963) 2025-05-12 23:43:32 +02:00
awwpotato
0dca53864b
mc: move to by-name 2025-05-10 21:09:45 -07:00
Tert0
11f8d162a7
mcpelauncher-{client,ui-qt}: 1.2.0-qt6 -> 1.3.0-qt6 2025-05-07 17:56:11 +02:00
Pol Dellaiera
800f89ce4f mcphost: init at 0.7.1 2025-05-06 11:42:31 +02:00
K900
6a872ad7a9 Merge remote-tracking branch 'origin/staging-next' into staging 2025-04-23 09:43:14 +03:00
Morxemplum
8923784c13 mcpelauncher-ui-qt: fix build on Qt 6.9 2025-04-23 00:13:06 -04:00
Ihar Hrachyshka
dd0f03a56c treewide: remove usage of deprecated apple_sdk framework stubs
They are not doing anything right now. This is in preparation for their
complete removal from the tree.

Note: several changes that affect the derivation inputs (e.g. removal of
references to stub paths in build instructions) were left out. They will
be cleaned up the next iteration and will require special care.

Note: this PR is a result of a mix of ugly regex (not AST) based
automation and some manual labor. For reference, the regex automation
part was hacked in: https://github.com/booxter/nix-clean-apple_sdk

Signed-off-by: Ihar Hrachyshka <ihar.hrachyshka@gmail.com>
2025-04-19 20:28:20 -04:00
Felix Singer
473b3b1e0c treewide: Remove execute bit from .nix and .patch files
Signed-off-by: Felix Singer <felixsinger@posteo.net>
2025-04-17 02:09:34 +02:00
R. Ryantm
3bb5824d7f mctc-lib: 0.4.0 -> 0.4.1 2025-04-12 17:48:43 +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
R. Ryantm
0e9a3a80c1 mctc-lib: 0.3.2 -> 0.4.0 2025-04-03 02:05:34 +00:00
Peder Bergebakken Sundt
90d7cd4e9a
treewide: replace stdenv.is with stdenv.hostPlatform.is (#386584) 2025-03-28 01:42:45 +01:00
Peder Bergebakken Sundt
e171199c50 treewide: replace stdenv.is with stdenv.hostPlatform.is 2025-03-26 23:14:22 +01:00
Michal Sojka
50c374afc6 mcap-cli: Install shell completion 2025-03-25 17:15:40 +01:00
Arne Keller
6b40448a38
mcrypt: unbreak on GCC 14, modernize (#388546) 2025-03-15 23:09:03 +01:00
Sigmanificient
e6fe6f4b7c treewide: remove unused rec expressions 2025-03-13 21:34:05 +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
Aleksana
e5d31bd8fc
mcpelauncher-client: 1.1.2-qt6 -> 1.2.0-qt6 (#388240) 2025-03-10 17:20:39 +08:00
Petr Zahradnik
1a6ec72e5d mcrypt: modernize 2025-03-09 23:24:01 +01:00
Petr Zahradnik
e42b3fdaa4 mcrypt: unbreak on GCC 14 2025-03-09 23:23:50 +01:00
aleksana
4e8c49719b mcpelauncher-client: add phanirithvij to maintainers 2025-03-09 22:07:04 +08:00
aleksana
69f2c32262 mcpelauncher-ui-qt: 1.1.2-qt6 -> 1.2.0-qt6
Diff:
https://github.com/minecraft-linux/mcpelauncher-ui-manifest/compare/v1.1.2-qt6...v1.2.0-qt6
Changelog:
https://github.com/minecraft-linux/mcpelauncher-ui-manifest/releases/tag/v1.2.0-qt6
2025-03-09 22:06:43 +08:00
aleksana
2c20371748 mcpelauncher-client: 1.1.2-qt6 -> 1.2.0-qt6
Diff:
https://github.com/minecraft-linux/mcpelauncher-manifest/compare/v1.1.2-qt6...v1.2.0-qt6
Changelog:
https://github.com/minecraft-linux/mcpelauncher-manifest/releases/tag/v1.2.0-qt6
2025-03-09 22:06:43 +08:00
TomaSajt
1c119c2696
mchprs: use fetchCargoVendor 2025-03-06 18:49:21 +01:00
Nick Cao
01045e9e45
mcfly: 0.9.2 -> 0.9.3 (#381344) 2025-02-12 14:15:24 -05: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
R. Ryantm
86e14590c1 mcfly: 0.9.2 -> 0.9.3 2025-02-12 03:15:40 +00:00
K900
ec703a9ea8 Merge remote-tracking branch 'origin/master' into staging-next 2025-01-30 09:16:24 +03:00
arexon
df24baa5c3 mcpelauncher-client: fix hard-coded paths 2025-01-29 13:36:42 +02: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
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
Surya Vamsi
fbe603d844 mcontrolcenter: 0.4.1 -> 0.5.0 2025-01-16 20:26:21 +05:30
Moraxyc
9971588613
mcdreforged: move to python-modules 2025-01-16 01:07:30 +08:00
Moraxyc
1140c2d192
mcdreforged: 2.13.2 -> 2.14.0
Diff: https://github.com/MCDReforged/MCDReforged/compare/refs/tags/v2.13.2...v2.14.0

Changelog: https://github.com/MCDReforged/MCDReforged/releases/tag/v2.14.0
2025-01-16 01:00:56 +08:00
Maxim Ianoglo
9b7421fbe6 mcrl2: 202307.1 -> 202407.1 2025-01-07 21:01:13 +02:00
Peder Bergebakken Sundt
0cd04d3036 treewide: migrate fetchgit rev = "refs/tags/..." to tag 2025-01-04 00:19:17 +01:00
Synth Morxemplum
ab633cfc15 mcpelauncher-ui-qt: init at 1.1.2-qt6
Co-authored-by: Aleksana QwQ <me@aleksana.moe>
2024-12-15 21:29:00 +08:00
Synth Morxemplum
90267ec8ee mcpelauncher-client: init at 1.1.2-qt6
Co-authored-by: Aleksana QwQ <me@aleksana.moe>
2024-12-15 21:29:00 +08: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
sodiboo
c3e0876a96 mchprs: remove unused clang from build closure 2024-12-06 08:56:13 +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
github-actions[bot]
9badc90a26
Merge master into staging-next 2024-09-28 00:13:56 +00:00
R. Ryantm
94c90db735 mcdreforged: 2.13.1 -> 2.13.2 2024-09-27 10:36:02 +00:00
Artturin
f0e657f3b1 Merge branch 'master' into staging-next 2024-09-25 06:05:01 +03:00
Artturin
e0464e4788 treewide: replace stdenv.is with stdenv.hostPlatform.is
In preparation for the deprecation of `stdenv.isX`.

These shorthands are not conducive to cross-compilation because they
hide the platforms.

Darwin might get cross-compilation for which the continued usage of `stdenv.isDarwin` will get in the way

One example of why this is bad and especially affects compiler packages
https://www.github.com/NixOS/nixpkgs/pull/343059

There are too many files to go through manually but a treewide should
get users thinking when they see a `hostPlatform.isX` in a place where it
doesn't make sense.

```
fd --type f "\.nix" | xargs sd --fixed-strings "stdenv.is" "stdenv.hostPlatform.is"
fd --type f "\.nix" | xargs sd --fixed-strings "stdenv'.is" "stdenv'.hostPlatform.is"
fd --type f "\.nix" | xargs sd --fixed-strings "clangStdenv.is" "clangStdenv.hostPlatform.is"
fd --type f "\.nix" | xargs sd --fixed-strings "gccStdenv.is" "gccStdenv.hostPlatform.is"
fd --type f "\.nix" | xargs sd --fixed-strings "stdenvNoCC.is" "stdenvNoCC.hostPlatform.is"
fd --type f "\.nix" | xargs sd --fixed-strings "inherit (stdenv) is" "inherit (stdenv.hostPlatform) is"
fd --type f "\.nix" | xargs sd --fixed-strings "buildStdenv.is" "buildStdenv.hostPlatform.is"
fd --type f "\.nix" | xargs sd --fixed-strings "effectiveStdenv.is" "effectiveStdenv.hostPlatform.is"
fd --type f "\.nix" | xargs sd --fixed-strings "originalStdenv.is" "originalStdenv.hostPlatform.is"
```
2024-09-25 00:04:37 +03:00
K900
b24e9a53ca Merge remote-tracking branch 'origin/staging-next' into staging 2024-09-17 09:07:34 +03:00