Commit Graph

25 Commits

Author SHA1 Message Date
Stefan Frijters
79a0d9bcb3 elfutils: enable structuredAttrs 2026-08-11 13:35:44 +02:00
Stefan Frijters
16cf4a503d elfutils: enable strictDeps 2026-08-11 13:35:33 +02:00
nixpkgs-ci[bot]
c4c9ab3a7d Merge master into staging-next 2026-07-01 00:47:18 +00:00
Ryan Burns
33bc39603c elfutils: always depend on pkg-config (#509848) 2026-06-30 20:25:09 +00:00
Sergei Zimmerman
851fd9401f elfutils: apply patch allowing R_386_TLS_DESC in shared libraries with elflint
Submitted a patch upstream that already got merged to main, so grab it now.
Tests fail without it on i686-linux.

[1]: https://patchwork.sourceware.org/project/elfutils/patch/20260512211127.4157383-1-sergei@zimmerman.foo/
2026-05-28 23:39:10 +03:00
Sergei Trofimovich
40041739c7 elfutils: 0.194 -> 0.195
Changes: https://www.mail-archive.com/elfutils-devel@sourceware.org/msg09139.html
2026-04-19 09:16:29 +01:00
Peter Collingbourne
c7fcbdc544 elfutils: always depend on pkg-config
This elfutils commit:
30b5592a34
moved the pkg-config check to the top level, causing the build to fail
with debuginfod disabled. Fix it by making our pkg-config depdendency
unconditional.
2026-04-14 00:53:07 -07:00
Aleksi Hannula
b10ce0908d elfutils: Fix build on aarch64-linux 2026-03-12 14:08:16 +02:00
quantenzitrone
626f23ce26 various: switch packages to use finalAttrs
this shouldn't create any rebuilds

the following script was used to generate this:
```fish
#!/usr/bin/env fish

# nix shell .#nixfmt nixpkgs#{nixf-diagnose,ripgrep,sd}

set base (git rev-parse HEAD)

set scope pkgs/by-name

set files (rg --files-with-matches -F 'stdenv.mkDerivation rec {' $scope | sort -u)

for file in $files
    echo $file
    sd -F 'stdenv.mkDerivation rec {' 'stdenv.mkDerivation (finalAttrs: {' $file
    # version
    sd -F 'version}' 'finalAttrs.version}' $file
    sd -F '${version' '${finalAttrs.version' $file
    sd -F '= version' '= finalAttrs.version' $file
    sd -F 'inherit version;' 'inherit (finalAttrs) version;' $file
    sd -F ' + version;' ' + finalAttrs.version;' $file
    sd 'replaceStrings (.*) version' 'replaceStrings $1 finalAttrs.version' $file
    sd -F 'splitVersion version' 'splitVersion finalAttrs.version' $file
    sd -F 'versionAtLeast version' 'versionAtLeast finalAttrs.version' $file
    sd 'versions\.([a-z]+) version' 'versions.$1 finalAttrs.version' $file
    # src
    sd -F 'src}' 'finalAttrs.src}' $file
    sd -F '${src' '${finalAttrs.src' $file
    sd -F '= src' '= finalAttrs.src' $file
    sd -F 'inherit src;' 'inherit (finalAttrs) src;' $file
    sd -F 'inherit (src' 'inherit (finalAttrs.src' $file
    # meta
    sd -F '${meta' '${finalAttrs.meta' $file
    sd -F '= meta' '= finalAttrs.meta' $file
    sd -F 'inherit (meta' 'inherit (finalAttrs.meta' $file
    # other
    sd -F 'inherit version src;' 'inherit (finalAttrs) version src;' $file
    sd -F 'makeLibraryPath buildInputs' 'makeLibraryPath finalAttrs.buildInputs' $file
    sd -F 'buildInputs}' 'finalAttrs.buildInputs}' $file
    sd -F 'desktopItem}' 'finalAttrs.desktopItem}' $file
    sd -F 'runtimeLibs}' 'finalAttrs.runtimeLibs}' $file
    sd -F 'libPath}' 'finalAttrs.libPath}' $file
    sd -F 'runtimeDependencies}' 'finalAttrs.runtimeDependencies}' $file
    sd -F 'nativeRuntimeInputs}' 'finalAttrs.nativeRuntimeInputs}' $file
    sd -F '(!doCheck)' '(!finalAttrs.doCheck)' $file
    sd -F 'optional doCheck' 'optional finalAttrs.doCheck' $file
    sd -F 'optionals doCheck' 'optionals finalAttrs.doCheck' $file
    sd -F '++ runtimeDependencies' '++ finalAttrs.runtimeDependencies' $file
    # pname (restored afterwards)
    sd -F 'pname}' 'finalAttrs.pname}' $file
    sd -F '${pname' '${finalAttrs.pname' $file
    sd -F '= pname' '= finalAttrs.pname' $file
    # close finalAttrs lambda
    echo ')' >>$file
    # catch some errors early
    if ! nixfmt $file
        git restore $file
        continue
    end
    if ! nixf-diagnose -i sema-primop-overridden $file
        git restore $file
        continue
    end
end

set torestore (rg -F .finalAttrs --files-with-matches $scope)
if test (count $torestore) -gt 0
    git restore $torestore
end
set torestore (rg -F finalAttrs.pname --files-with-matches $scope)
if test (count $torestore) -gt 0
    git restore $torestore
end

# commit for faster eval times
git add pkgs
git commit --no-gpg-sign -m temp
set torestore

for file in $files
    # file hasn't changed
    if git diff --quiet $base $file
        continue
    end
    # try to eval the package to definitely catch all errors
    echo $file
    set pname (string split / $file -f 4)
    if ! nix eval .#$pname
        set torestore $torestore $file
    end
end

# restore files that don't eval
git reset --soft $base
git restore --staged .
if test (count $torestore) -gt 0
    git restore $torestore
end
```

after that some manual cleanup was done:
- restoring files that cause changes in the number of lines
- restoring files that cause rebuilds
- restoring files that cause merge conflicts with staging
2026-02-07 09:59:05 +01:00
Silvan Mosberger
fef3b38230 various: add meta.identifier.cpeParts to a batch of packages (#484003) 2026-02-06 15:22:38 +00:00
quantenzitrone
9c8e96055a various: fix pname misuse in urls 2026-02-05 01:51:59 +01:00
Markus Sütter
196b385317 various: add meta.identifier.cpeParts to a batch of packages 2026-02-02 09:22:55 +01:00
Wolfgang Walther
46c0c0eae7 Merge branch 'staging-next' into staging 2025-12-10 18:42:31 +01:00
Ihar Hrachyshka
567e8dfd8e treewide: clean up 'meta = with' pattern
This commit was created by a combination of scripts and tools:
- an ast-grep script to prefix things in meta with `lib.`,
- a modified nixf-diagnose / nixf combination to remove unused `with
lib;`, and
- regular nixfmt.

Co-authored-by: Wolfgang Walther <walther@technowledgy.de>
2025-12-10 18:09:49 +01:00
Arnout Engelen
0ca2e4c851 elfutils: patch for run-sysroot test 2025-12-05 15:57:00 +01:00
Sergei Trofimovich
ed2347dcec elfutils: 0.193 -> 0.194
Changes: https://www.mail-archive.com/elfutils-devel@sourceware.org/msg08584.html
2025-10-26 15:53:08 +00:00
Wolfgang Walther
5a0711127c treewide: run nixfmt 1.0.0 2025-07-24 13:55:40 +02:00
Sergei Trofimovich
340cc31a82 elfutils: build out of tree on libc++
`elfutils` has a `stack` binary built in `src`.

When built in source tree this breaks when `#include <stack>` is
transitively included in
`libc++` via `<iostream>`.

The trigger set of options is `-I $(srcdir)` which turns to `-I .` with
`./stack` present.

The fix turns the above to `-I ../src` without `./stack` present.

The change is conditional on `LLVM` to avoid `stdenv` rebuild. We will
turn it into unconditional in `staging` once this gets merged.

While at it dropped `CFLAGS` / `CXXFLAGS` overrides.
2025-06-24 09:04:13 +01:00
Vladimír Čunát
9fe2db9bda elfutils: 0.192 -> 0.193 (#402441) 2025-05-28 11:22:13 +02:00
Robert Scott
5da561c2ec elfutils: disable strictflexarrays3 hardening flag 2025-05-24 11:10:27 +01:00
Sergei Trofimovich
86b0198a2a elfutils: 0.192 -> 0.193
Changes: https://www.mail-archive.com/elfutils-devel@sourceware.org/msg08098.html
2025-05-02 14:38:34 +01:00
Tristan Ross
d271727234 elfutils: rebase cxx-header-collision.patch 2025-01-02 12:27:46 -08: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
Sergei Trofimovich
adb928625e elfutils: 0.191 -> 0.192
Changes: https://sourceware.org/pipermail/elfutils-devel/2024q4/007540.html
2024-11-09 22:41:48 +00: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