Commit Graph

273 Commits

Author SHA1 Message Date
Toma
6b2a649d49
satisfactorymodmanager: init at 3.0.3 (#348137) 2025-04-15 11:26:05 -04:00
Weijia Wang
c160c31cac
sarasa-gothic: 1.0.29 -> 1.0.30 (#398253) 2025-04-14 10:39:08 +02:00
R. Ryantm
844544c8dd sarasa-gothic: 1.0.29 -> 1.0.30 2025-04-13 00:53:34 +00:00
nat
de77c4e6db
safe-rm: use --replace-fail 2025-04-13 02:39:01 +02:00
R. Ryantm
afd8fe7372 saucectl: 0.194.1 -> 0.194.2 2025-04-11 13:20:04 +00:00
R. Ryantm
5f64a1615c sabnzbd: 4.4.1 -> 4.5.0 2025-04-09 10:09:28 +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
Peder Bergebakken Sundt
9ca173b4cd
saber: 0.25.3 -> 0.25.4 (#394278) 2025-04-08 00:26:14 +02:00
Pol Dellaiera
65a333600d treewide: replace rev with tag 2025-04-07 16:57:22 +02:00
Gaetan Lepage
bfe27cf81c treewide: use a string for versionCheckProgramArg where possible 2025-04-05 14:45:13 +02:00
Mauricio Collares
1988766aa2
sage: 10.6.rc1 -> 10.6 (#395478) 2025-04-02 11:46:41 -03:00
Mauricio Collares
84aa7f6a21 sage: 10.6.rc1 -> 10.6 2025-04-02 10:08:20 -03:00
Nick Cao
7f3634c4e8
saucectl: 0.194.0 -> 0.194.1 (#395143) 2025-04-01 17:21:42 -04:00
Markus Kowalewski
31c8df7192
saunafs: 4.8.0 -> 4.8.1 (#394985) 2025-04-01 20:42:18 +02:00
Silvan Mosberger
374e6bcc40 treewide: Format all Nix files
Format all Nix files using the officially approved formatter,
making the CI check introduced in the previous commit succeed:

  nix-build ci -A fmt.check

This is the next step of the of the [implementation](https://github.com/NixOS/nixfmt/issues/153)
of the accepted [RFC 166](https://github.com/NixOS/rfcs/pull/166).

This commit will lead to merge conflicts for a number of PRs,
up to an estimated ~1100 (~33%) among the PRs with activity in the past 2
months, but that should be lower than what it would be without the previous
[partial treewide format](https://github.com/NixOS/nixpkgs/pull/322537).

Merge conflicts caused by this commit can now automatically be resolved while rebasing using the
[auto-rebase script](8616af08d9/maintainers/scripts/auto-rebase).

If you run into any problems regarding any of this, please reach out to the
[formatting team](https://nixos.org/community/teams/formatting/) by
pinging @NixOS/nix-formatting.
2025-04-01 20:10:43 +02:00
R. Ryantm
3f9085b9f8 saucectl: 0.194.0 -> 0.194.1 2025-04-01 10:46:18 +00:00
R. Ryantm
4029df17e4 saunafs: 4.8.0 -> 4.8.1 2025-03-31 19:03:20 +00:00
Mauricio Collares
816a772c6e
sage: 10.5 -> 10.6.rc1 (#393143) 2025-03-30 15:51:11 -03:00
Mauricio Collares
faff103de6 sageWithDoc: 10.5 -> 10.6.rc1 2025-03-30 15:12:24 -03:00
R. Ryantm
7fe270455b sane-airscan: 0.99.32 -> 0.99.33 2025-03-29 18:56:46 +00:00
emaryn
1bd6fbf055 saber: 0.25.3 -> 0.25.4 2025-03-29 19:12:47 +08:00
R. Ryantm
34e99ac01d saw-tools: 1.2 -> 1.3 2025-03-26 08:02:14 +00:00
jopejoe1
7d30c40939 treewide: migrate packages to pkgs/by-name, again 2025-03-25 17:00:45 +01:00
Peder Bergebakken Sundt
badeba75aa
sanoid: fix sudo for syncoid (#391043) 2025-03-24 23:23:50 +01:00
Nick Cao
af21e30ad4
{salut,silicon,snx-rs,sonusmix,squirreldisk}: use fetchCargoVendor (#392693) 2025-03-24 17:18:17 -04:00
TomaSajt
402c9647e1
salut: use fetchCargoVendor 2025-03-24 13:02:20 +01:00
R. Ryantm
fd257a8d4b saucectl: 0.193.0 -> 0.194.0 2025-03-21 12:18:18 +00:00
R. Ryantm
5e8defe22b samrewritten: 202008-unstable-2025-01-09 -> 202008-unstable-2025-03-11 2025-03-19 06:04:38 +00:00
Tillmann Gaida
eeaf071c8d sanoid: fix sudo for syncoid 2025-03-18 19:32:05 +01:00
Mauricio Collares
058b0863e5
sage: remove optional jmol dep (and thus also jre8) (#382929) 2025-03-18 11:46:56 -03: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
nixpkgs-ci[bot]
97bfcc4bcd
Merge master into staging-next 2025-03-11 00:15:17 +00:00
Yarny0
fea4433fb5 samsung-unified-linux-driver (all): resolve with lib; in meta
https://github.com/NixOS/nixpkgs/issues/371862
2025-03-10 15:46:00 +01:00
Yarny0
3948577e2a samsung-unified-linux-driver (all): use finalAttrs pattern 2025-03-10 15:39:22 +01:00
Alex Epelde
7b58756c03 sage: higher quality notebook icon
Icon found [here](https://github.com/sagemath/sage/blob/master/src/sage/ext_data/notebook-ipython/logo-64x64.png).
2025-03-08 22:23:23 -05:00
Aleksana
e8678650e3
saga: Fix compiling on Darwin (#384655) 2025-03-08 22:24:30 +08:00
R. Ryantm
ee164ade86 saunafs: 4.7.0 -> 4.8.0 2025-03-04 21:15:46 +00:00
R. Ryantm
59073e08c1 sarasa-gothic: 1.0.28 -> 1.0.29 2025-03-03 00:56:27 +00:00
Peder Bergebakken Sundt
df87905239
librep: fix build on gcc-14 & modernize (#384557) 2025-03-02 17:26:37 +01:00
Petr Zahradnik
5f960ba9cd sawfish: modernize 2025-02-24 23:53:10 +01:00
Mauricio Collares
b18e444cd7
eclib: 20240408 -> 20250122 (#355572) 2025-02-24 17:24:38 +01:00
Mauricio Collares
ffcbedd6e3 sage: import eclib update patch 2025-02-24 15:19:46 +01:00
Peder Bergebakken Sundt
5aba99242e treewide: fix typos in comments
Made with

```shell
git restore .
fd '\.nix$' pkgs/ --type f -j1 -x bash -xc "$(cat <<"EOF"
    typos --no-check-filenames --write-changes "$1"
    git diff --exit-code "$1" && exit
    #( git diff "$1" | grep -qE "^\+ +[^# ]") && git restore "$1"
    count1="$( bat --language nix --diff --style changes "$1" --theme "Monokai Extended" --color always | aha --no-header | grep -E '^<span style="color:olive;">~</span> ' | wc -l )"
    count2="$( bat --language nix --diff --style changes "$1" --theme "Monokai Extended" --color always | aha --no-header | grep -E '^<span style="color:olive;">~</span> (<span style="color:#f8f8f2;"> *</span>)?<span style="color:#75715e;">.*</span>$' | wc -l )"
    [[ $count1 -ne $count2 ]] && git restore "$1"
EOF
)" -- {}
```

and filtered with `GIT_DIFF_OPTS='--unified=15' git -c interactive.singleKey=true add --patch`

I initially tried using the tree-sitter cli, python bindings and even ast-grep through various means, but this is what I ended up with.
2025-02-24 10:44:41 +01:00
Palmer Cox
6e27715c6d saga: Fix compiling on Darwin 2025-02-23 21:01:25 -05:00
Andrew Marshall
89de2178e4 sage: remove optional jmol dep (and thus also jre8)
We are now past Sage 10.5, and jmol is now optional so unneeded in the
default env.

See https://github.com/sagemath/sage/issues/31027
2025-02-17 15:54:23 -05:00
Sandro
bbea96f543
lomiri.lomiri-calendar-app: init at 1.1.2 (#366949) 2025-02-16 14:30:15 +01:00
Gaétan Lepage
7b75c7a591
Bwa-mem2: fix compilation issue (#380725) 2025-02-14 21:02:34 +01:00
Alexis Praga
d6f2566ca9 safestringlib: init at 1.2.0-unstable-2024-10-21
To fix compilation issues in bwa-mem2, an update of this library is required.
Latest, unstable version compiles more easily than the last stable release.
2025-02-13 23:21:10 +01:00
OPNA2608
6c7b4c7972 {libsForQt5,qt6Packages}.sailfish-access-control-plugin: init at 0.0.11 2025-02-13 17:31:00 +01:00