Commit Graph

208 Commits

Author SHA1 Message Date
R. Ryantm
8342c2ebc4 puffin: 2.1.1 -> 2.1.3 2025-04-15 05:23:33 +00:00
nixpkgs-ci[bot]
568e990505
Merge master into staging-next 2025-04-12 00:15:26 +00:00
jopejoe1
82d80188fa
pulumiPackages.pulumi-language-scala: init at 0.3.2 (#390358) 2025-04-11 20:52:22 +02:00
K900
aece6a0c1f Merge remote-tracking branch 'origin/master' into staging-next 2025-04-11 21:17:42 +03:00
Wolfgang Walther
c1f3bc6a53
pulumi: 3.156.0 -> 3.162.0 (#393740) 2025-04-11 14:52:45 +00:00
Ivan Trubach
468f5af126 pulumi: skip flaky test 2025-04-11 16:03:26 +03:00
Ivan Trubach
c2fad35d4c pulumi: fix check phase 2025-04-11 15:37:56 +03:00
Ivan Trubach
78f7900d21 pulumi: 3.156.0 -> 3.162.0 2025-04-11 15:37:56 +03:00
Ivan Trubach
cc4b71fb86 pulumi: add pulumiPackages.pulumi-{go,nodejs,python} to passthru.tests 2025-04-11 15:37:56 +03:00
Ivan Trubach
a0763eb343 pulumi: add python3Packages.pulumi to passthru.tests 2025-04-11 15:37:56 +03:00
Ivan Trubach
930daefcf0 pulumi: add update script 2025-04-11 15:37:55 +03:00
K900
f42e00d66e Merge remote-tracking branch 'origin/master' into staging-next 2025-04-08 10:29:26 +03: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
K900
b3146d4446 Merge remote-tracking branch 'origin/master' into staging-next 2025-04-07 21:21:10 +03:00
Pol Dellaiera
65a333600d treewide: replace rev with tag 2025-04-07 16:57:22 +02:00
nikolaiser
a985d07b19
pulumiPackages.pulumi-language-scala: init at 0.3.2 2025-04-06 14:12:10 +02:00
nixpkgs-ci[bot]
9760071a02
Merge master into staging-next 2025-04-06 10:40:20 +00:00
R. Ryantm
6cb5cf2168 puncia: 0.29 -> 0.30 2025-04-06 04:20:49 +00:00
Silvan Mosberger
e52d633a63 Merge remote-tracking branch 'upstream/staging-next' into staging 2025-04-02 18:30:54 +02:00
Nick Cao
c09a2dd9a2
pulsar: 1.127.0 -> 1.127.1 (#395034) 2025-04-01 17:09:30 -04: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
Peder Bergebakken Sundt
c642a1dc82 pulsar: 1.127.0 -> 1.127.1
Changelog: https://github.com/pulsar-edit/pulsar/blob/v1.127.1/CHANGELOG.md
2025-03-31 10:15:05 +02:00
nixpkgs-ci[bot]
66681a870f
Merge staging-next into staging 2025-03-28 18:06:07 +00:00
Matthieu Coudron
a70347d654
pulumiPackages: move implementation to pkgs/by-name (#386789)
Moves pulumiPackages to pkgs/by-name/pu/pulumi/plugins.
    Updates pulumiPackages implementation to use makeScopeWithSplicing.
    Renames pulumi-{go,nodejs,python} for consistency with other plugins (with an alias if config.allowAliases option is enabled in Nixpkgs).
    Adds testResourceSchema and pulumiTestHook for plugin version bumps in the next PR.
2025-03-28 17:28:13 +01:00
nixpkgs-ci[bot]
3f8948732b
Merge staging-next into staging 2025-03-27 18:05:35 +00:00
Peder Bergebakken Sundt
0b00016a20 pulsar: 1.126.0 -> 1.127.0
Changelog: https://github.com/pulsar-edit/pulsar/blob/v1.127.0/CHANGELOG.md
2025-03-27 02:50:51 +01:00
Ivan Trubach
9e91d89012 pulumiPackages: format with nixfmt 2025-03-25 18:41:12 +03:00
Ivan Trubach
500ee16a0d pulumiPackages.pulumi-python: add smoke test 2025-03-25 18:41:12 +03:00
Ivan Trubach
893eed259e pulumiPackages: rename $f.nix to ${f%.nix}/package.nix 2025-03-25 18:41:12 +03:00
Ivan Trubach
16aef35e9d pulumiPackages: add pulumiTestHook helper 2025-03-25 18:41:12 +03:00
Ivan Trubach
71143d17c4 pulumiPackages: add testResourceSchema helper 2025-03-25 18:41:11 +03:00
Ivan Trubach
375e54f81a pulumiPackages.pulumi-{go,nodejs,python}: rename from pulumi-language-{go,nodejs,python} 2025-03-25 18:41:11 +03:00
Ivan Trubach
f891f97079 pulumiPackages: make scope with splicing 2025-03-25 18:31:01 +03:00
Ivan Trubach
f6d23ee78e pulumiPackages: move implementation to pkgs/by-name/pu/pulumi/plugins 2025-03-25 18:31:01 +03:00
Ivan Trubach
55e531a5e5 pulumi: move withPackages implementation to separate file
Also do not set LD_LIBRARY_PATH for wrapper. Pulumi and its plugins are
self-contained executables, so it does not make sense to set it.
2025-03-25 18:27:08 +03:00
nixpkgs-ci[bot]
b4d0fe2499
Merge staging-next into staging 2025-03-24 00:16:41 +00:00
Weijia Wang
1a509fb0de
publii: 0.46.3 -> 0.46.4 (#385794) 2025-03-23 19:36:40 +01:00
Weijia Wang
7478e2ae85
pulumi: 3.152.0 -> 3.156.0 (#389692) 2025-03-23 19:31:47 +01:00
R. Ryantm
33fab27ef2 publii: 0.46.3 -> 0.46.4 2025-03-23 18:38:03 +01:00
nixpkgs-ci[bot]
75be9dd1a0
Merge staging-next into staging 2025-03-14 12:06:11 +00:00
R. Ryantm
da7ecedfce pulumi: 3.152.0 -> 3.156.0 2025-03-14 00:24:27 +00:00
Sigmanificient
e6fe6f4b7c treewide: remove unused rec expressions 2025-03-13 21:34:05 +01:00
R. Ryantm
9e3481f9c1 publicsuffix-list: 0-unstable-2025-02-12 -> 0-unstable-2025-03-12 2025-03-13 12:41:07 +00:00
R. Ryantm
a501814a5f pulumi-esc: 0.12.0 -> 0.13.0 2025-03-13 01:05:02 +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
nixpkgs-ci[bot]
9a807b1916
Merge master into staging-next 2025-03-11 17:36:38 +00:00
Arnout Engelen
f887c1da04
treewide: remove gebner from maintainers
gebner has been an amazing maintainer, but appears to have moved on:
the last commit on nixpkgs appears to have been in Feb 2023, and
they have not been responding to pings (e.g.
https://github.com/NixOS/nixpkgs/issues/347764).

They also approved https://github.com/NixOS/nixpkgs/pull/337292 before,
but that PR had some additional changes and was closed without merging.

This PR is in no way intended to diminuish Gabriel'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.

This seems in line with https://github.com/NixOS/nixpkgs/tree/master/maintainers#how-to-lose-maintainer-status
2025-03-11 14:37:35 +01:00
nixpkgs-ci[bot]
fd2aa7b174
Merge master into staging-next 2025-03-09 12:04:44 +00:00
Peder Bergebakken Sundt
345ae0c950 pulsar: 1.125.0 -> 1.126.0
Changelog: https://github.com/pulsar-edit/pulsar/blob/v1.126.0/CHANGELOG.md
2025-03-06 18:34:45 +01:00
nixpkgs-ci[bot]
a3678b544f
Merge staging-next into staging 2025-03-03 00:16:25 +00:00