Commit Graph

102 Commits

Author SHA1 Message Date
R. Ryantm
2872ee7484 gtree: 1.11.0 -> 1.11.3 2025-04-13 05:14:44 +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
Donovan Glover
ec0c130953
gtk-layer-shell: 0.9.0 -> 0.9.1 (#396707) 2025-04-07 20:33:45 +00:00
Pol Dellaiera
65a333600d treewide: replace rev with tag 2025-04-07 16:57:22 +02:00
R. Ryantm
da2c8afbf9 gtk-layer-shell: 0.9.0 -> 0.9.1 2025-04-07 01:13:25 +00:00
jopejoe1
d96002e6e4
gtranslator: 47.1 -> 48.0 (#394706) 2025-04-05 13:04:00 +02:00
R. Ryantm
0e454ee84f gtree: 1.10.15 -> 1.11.0 2025-04-03 20:20:00 +00: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
40adef352a gtranslator: 47.1 -> 48.0 2025-03-30 19:08:21 +00:00
R. Ryantm
5e21041d0d gtk4-layer-shell: 1.1.0 -> 1.1.1 2025-03-29 13:43:33 +00:00
Grimmauld
c892f85e78 treewide: switch to unpinned freerdp 2025-03-27 10:54:40 +01:00
R. Ryantm
ff7ef81b84 gtree: 1.10.14 -> 1.10.15 2025-03-23 16:32:53 +00:00
Colin
7a546f3018 gtk4-layer-shell: fix cross compilation
devdoc requires emulator to build when cross compiling
2025-03-18 23:53:39 +05:30
Sigmanificient
e6fe6f4b7c treewide: remove unused rec expressions 2025-03-13 21:34:05 +01:00
R. Ryantm
75773be506 gtree: 1.10.13 -> 1.10.14 2025-03-12 05:52:08 +00: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
Jan Tojnar
150a967cef gthumb: 3.12.6 → 3.12.7
https://gitlab.gnome.org/GNOME/gthumb/-/compare/3.12.6...3.12.7
2025-03-09 21:27:34 +01:00
Hilmar Wiegand
ca92591fb4 gtk4-layer-shell: 1.0.4 -> 1.1.0 2025-03-09 13:16:29 +01:00
Bobby Rong
a9b4f7b85d
gtkhtml: Fix compile error (#383120) 2025-02-20 20:32:59 +08:00
Greg Hellings
320d64d83f gtkhtml: Fix compile error
GTKHtml build was failing with an implicit typecast error, so this patch
makes the casting explicit
2025-02-19 19:42:24 -06:00
nixpkgs-ci[bot]
f71ec3ed82
Merge master into staging-next 2025-02-16 06:04:34 +00:00
Bobby Rong
2c783356cb
GNOME updates 2025-02-08 (#380474) 2025-02-16 09:55:23 +08:00
Bobby Rong
7de60b8d15
gtk-frdp: 0-unstable-2024-07-03 → 0-unstable-2024-12-23
6cfdc84015...46ca0beb9b
2025-02-15 19:13:08 +08:00
nixpkgs-ci[bot]
5140d32870
Merge master into staging-next 2025-02-10 00:15:04 +00:00
Jan Tojnar
45ec196909 gtk-vnc: 1.4.0 → 1.5.0
https://gitlab.gnome.org/GNOME/gtk-vnc/-/compare/1.4.0...1.5.0
2025-02-08 22:04:13 +01:00
R. RyanTM
09549ed17f
gtest: 1.15.2 -> 1.16.0 (#380242)
https://github.com/google/googletest/releases/tag/v1.16.0
2025-02-08 02:53:01 +01:00
lyranico
8115847370 gtt: 9 -> 10 2025-02-05 18:47:07 +00:00
R. Ryantm
6de7de04a8 gtuber: 0-unstable-2024-10-11 -> 0-unstable-2025-01-19 2025-01-27 20:34:57 +00:00
FliegendeWurst
fa5f8ef657 gtkradiant: fix GCC 14 build 2025-01-13 15:53:00 +01:00
Jan Tojnar
8fc0e240bd
Merge GNOME updates 2024-10-08 (#372080) 2025-01-10 22:18:43 +01:00
Jan Tojnar
5aff3b0a89 gtk-vnc: 1.3.1 → 1.4.0
https://gitlab.gnome.org/GNOME/gtk-vnc/-/compare/v1.3.1...1.4.0
2025-01-08 10:29:38 +01:00
Emily
b0e229092a gtk-frdp: remove obsolete TARGET_OS_* workaround 2025-01-06 00:47:50 +00:00
Peder Bergebakken Sundt
0cd04d3036 treewide: migrate fetchgit rev = "refs/tags/..." to tag 2025-01-04 00:19:17 +01:00
Wolfgang Walther
9bcd5a71f6
gtklock-userinfo-module: 4.0.0 -> 4.0.1 (#368460) 2025-01-01 21:22:49 +01:00
Weijia Wang
e7a93618c9 gtksheet: fix build 2024-12-31 09:57:16 +01:00
R. Ryantm
013bba020a gtklock-userinfo-module: 4.0.0 -> 4.0.1 2024-12-27 01:14:42 +00:00
github-actions[bot]
6a83ff87ac
Merge master into staging-next 2024-12-19 00:15:19 +00:00
Yueh-Shun Li
905dc8d978 treewide: specify CGO_ENABLED with env.CGO_ENABLED
Programmatically prefixing "CGO_ENABLED =" and "CGO_ENABLED=0;" with
"env.", but excluding the files
* pkgs/build-support/go/module.nix (buildGoModule implementation)
* pkgs/development/compilers/go/* (the Go compiler)
* pkgs/build-support/docker/tarsum.nix (not using buildGoModule)
2024-12-18 23:19:56 +08:00
Vladimír Čunát
f2abf2535c
gtk-engine-murrine: func prototypes for gcc-14 (#362250) 2024-12-13 09:30:52 +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
Silvan Mosberger
84d4f874c2 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 78e9caf153
    result/bin/apply-formatting $NIXPKGS_PATH
2024-12-10 20:23:58 +01:00
github-actions[bot]
c45456d867
Merge master into staging-next 2024-12-08 18:04:12 +00:00
Jan Tojnar
cb530357bc
Merge GNOME updates 2024-12-07 (#362830) 2024-12-08 16:43:14 +01:00
R. Ryantm
df084a4d3c gtree: 1.10.12 -> 1.10.13 2024-12-08 13:56:23 +00:00
K900
2e337411b0 Merge remote-tracking branch 'origin/master' into staging-next 2024-12-08 08:46:20 +03:00
Bobby Rong
342485223d
gtranslator: 47.0 → 47.1
https://gitlab.gnome.org/GNOME/gtranslator/-/compare/47.0...47.1
2024-12-08 08:34:58 +08:00
Jan Tojnar
064ee2cb49 libsoup_2_4: Rename from libsoup
The 2.4 ABI branch has not been supported by upstream for a while now but people still keep accidentally adding it to new packages.
2024-12-08 00:37:52 +01:00
github-actions[bot]
0597be32bd
Merge master into staging-next 2024-12-06 12:05:59 +00:00
Reno Dakota
cd3815932f
gtk-engine-murrine: func prototypes for gcc-14
add function prototypes to various include files to fix
implicit-function-declaration errors on gcc-14
2024-12-06 00:12:03 +00:00
aleksana
97da68eef5 gtk-engine-bluecurve: remove 2024-12-04 16:56:03 +08:00