movefasta/nixpkgs
1
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2025-06-09 19:13:26 +03:00
Code Issues Projects Releases Packages Wiki Activity
809795 commits 209 branches 129 tags 8.6 GiB
Commit graph

68 commits

Author SHA1 Message Date
R. Ryantm
ed4ef2dfa6 fblog: 4.13.1 -> 4.14.0 2025-05-15 20:13:30 +00:00
Emily
7961536642 fb303: 2025.02.10.00 -> 2025.04.21.00 
Diff: https://github.com/facebook/fb303/compare/refs/tags/v2025.02.10.00...v2025.04.21.00
 2025-04-23 18:23:27 +01:00
Emily
7856babe15 fbthrift: 2025.02.10.00 -> 2025.04.21.00 
Diff: https://github.com/facebook/fbthrift/compare/refs/tags/v2025.02.10.00...v2025.04.21.00
 2025-04-23 18:23:26 +01:00
Sigmanificient
0489b3976a treewide: remove unused patches files 2025-04-01 13:59:25 +02: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
Wolfgang Walther
b19d0f6d3d
treewide: replace substituteAll with replaceVars 2025-02-10 22:51:56 +01:00
K900
d0c70b4cfd fb303: 2025.02.03.00 -> 2025.02.10.00 
Diff: https://github.com/facebook/fb303/compare/refs/tags/v2025.02.03.00...v2025.02.10.00
 2025-02-10 19:25:39 +03:00
K900
d63e9f2366 fbthrift: 2025.02.03.00 -> 2025.02.10.00 
Diff: https://github.com/facebook/fbthrift/compare/refs/tags/v2025.02.03.00...v2025.02.10.00
 2025-02-10 19:25:35 +03:00
K900
c07476dd6f fb303: 2025.01.27.00 -> 2025.02.03.00 
Diff: https://github.com/facebook/fb303/compare/refs/tags/v2025.01.27.00...v2025.02.03.00
 2025-02-10 18:41:32 +03:00
K900
c916433300 fbthrift: 2025.01.27.00 -> 2025.02.03.00 
Diff: https://github.com/facebook/fbthrift/compare/refs/tags/v2025.01.27.00...v2025.02.03.00
 2025-02-10 18:41:32 +03:00
K900
2a921eaeb5
fbthrift: 2025.01.06.00 -> 2025.01.27.00 (#378331) 2025-02-09 09:27:46 +03:00
K900
4359e88cb7
fb303: 2025.01.06.00 -> 2025.01.27.00 (#378328) 2025-02-09 09:26:30 +03:00
R. Ryantm
fc6f8e0a5b fbthrift: 2025.01.06.00 -> 2025.01.27.00 2025-01-31 18:14:07 +00:00
R. Ryantm
51906a01b5 fb303: 2025.01.06.00 -> 2025.01.27.00 2025-01-31 17:46:26 +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
Emily
6070282af3 fb303: add patch for glog ≥ 0.7.0 2025-01-06 23:21:23 +00:00
Emily
43fecd0b05 fb303: 2024.12.09.00 -> 2025.01.06.00 
Diff: https://github.com/facebook/fb303/compare/refs/tags/v2024.12.09.00...v2025.01.06.00
 2025-01-06 23:09:30 +00:00
Emily
9a008831fd fbthrift: add patch for glog ≥ 0.7.0 2025-01-06 23:09:30 +00:00
Emily
fb02dbce96 fbthrift: 2024.12.09.00 -> 2025.01.06.00 
Diff: https://github.com/facebook/fbthrift/compare/refs/tags/v2024.12.09.00...v2025.01.06.00
 2025-01-06 22:54:19 +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
github-actions[bot]
328b3c1416
Merge staging-next into staging 2025-01-03 18:05:13 +00:00
Austin Horstman
ce1f9eb417
treewide: unpin apple-sdk_11 2025-01-03 10:20:01 -06:00
github-actions[bot]
50a13d1dc8
Merge staging-next into staging 2025-01-03 12:06:11 +00:00
FliegendeWurst
71399ae0c8 fbvnc: fix build with GCC 14 2025-01-03 08:27:28 +01:00
techknowlogick
5959b9f6c9 fb303: 2024.11.18.00 -> 2024.12.09.00 
Diff: https://github.com/facebook/fb303/compare/refs/tags/v2024.11.18.00...2024.12.09.00
 2024-12-19 20:07:31 -05:00
techknowlogick
73b6872ab6 fbthrift: 2024.11.18.00 -> 2024.12.09.00 
Diff: https://github.com/facebook/fbthrift/compare/refs/tags/v2024.11.18.00...2024.12.09.00
 2024-12-19 20:07:31 -05: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
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
K900
d209d800b7 treewide: mesa -> libgbm (where appropriate) 
This will likely break things, but anything broken should be easily noticeable.
 2024-12-05 12:37:39 +03:00
Emily
e22927367d
fb303: add techknowlogick to maintainers 
(cherry picked from commit c9719114fd)
(cherry picked from commit 6d3c21c970)
 2024-11-30 15:11:30 +01:00
Emily
72c9c31e85
fb303: add emily to maintainers 
(cherry picked from commit d4b587f878)
(cherry picked from commit 58ac7d870f)
 2024-11-30 15:11:30 +01:00
Emily
90b414f6da
fb303: add update script 
(cherry picked from commit 172efded7a)
(cherry picked from commit 9858748e14)
 2024-11-30 15:11:30 +01:00
Emily
8d9e9c0b79
fb303: split outputs 
(cherry picked from commit 79dc5a8b54)
(cherry picked from commit 51d81d4953)
 2024-11-30 15:11:29 +01:00
Emily
e6213d5a4d
fb303: condition shared libraries on platform setting 
(cherry picked from commit 72f24cc293)
(cherry picked from commit a95aa410a8)
 2024-11-30 15:11:29 +01:00
Emily
a6d05097d2
fb303: 2024.03.11.00 -> 2024.11.18.00 
Diff: https://github.com/facebook/fb303/compare/refs/tags/v2024.03.11.00...v2024.11.18.00
(cherry picked from commit 633f8f77b2)
(cherry picked from commit 4567e56a7f)
 2024-11-30 15:11:29 +01:00
Emily
6266ce9ebf
fb303: use Ninja 
(cherry picked from commit 2801ca739a)
(cherry picked from commit 17d32ff843)
 2024-11-30 15:11:29 +01:00
Emily
05f382622d
fb303: use lib.cmakeBool 
(cherry picked from commit 068ceb04d0)
(cherry picked from commit 5e98b4b331)
 2024-11-30 15:11:29 +01:00
Emily
5b0e064340
fb303: remove python3 input 
(cherry picked from commit f7efb7b813)
(cherry picked from commit f1d8260b18)
 2024-11-30 15:11:29 +01:00
Emily
6d8f62f2f8
fb303: add explicit gflags input 
(cherry picked from commit 01b30ede82)
(cherry picked from commit f7f8b9c30d)
 2024-11-30 15:11:28 +01:00
Emily
0642824e7f
fb303: reorder inputs to match upstream file 
(cherry picked from commit ef6c8fc06f)
(cherry picked from commit 43f7996c26)
 2024-11-30 15:11:28 +01:00
Emily
8732b37e60
fb303: reorder attributes 
(cherry picked from commit 025d0edf86)
(cherry picked from commit 96a214a588)
 2024-11-30 15:11:28 +01:00
Emily
e99730c8c7
fb303: use hash 
(cherry picked from commit 5be8fbd184)
(cherry picked from commit bfd8f83cd0)
 2024-11-30 15:11:28 +01:00
Emily
80dcc25e43
fb303: use refs/tags/ 
(cherry picked from commit 29125310cc)
(cherry picked from commit b8940bcbf0)
 2024-11-30 15:11:28 +01:00
Emily
668359885b
fb303: remove with lib; 
(cherry picked from commit fa9cad876b)
(cherry picked from commit 96a8b82093)
 2024-11-30 15:11:28 +01:00
Emily
f8ac058129
fb303: use finalAttrs 
(cherry picked from commit 3c20ddd66d)
(cherry picked from commit b7a013ff3c)
 2024-11-30 15:11:27 +01:00
Emily
752764c06b
fb303: move to pkgs/by-name 
(cherry picked from commit be97ac3fe6)
(cherry picked from commit 219a361956)
 2024-11-30 15:11:27 +01:00
Emily
21d5e06f9b
fbthrift: add techknowlogick to maintainers 
(cherry picked from commit 143f253756)
(cherry picked from commit 245f8fc341)
 2024-11-30 15:11:27 +01:00
Emily
ed8dc3578e
fbthrift: add emily to maintainers 
(cherry picked from commit 0293bf6af5)
(cherry picked from commit afe3a7249c)
 2024-11-30 15:11:26 +01:00