Commit Graph

135 Commits

Author SHA1 Message Date
Sigmanificient
0bbc8dffae treewide: set meta.license on hooks 2026-05-25 13:48:20 +02:00
David McFarland
2ce3397562 buildDotnetModule: add dontPublish flag 2025-11-24 19:57:00 -04:00
David McFarland
4910a4d394 buildDotnetModule: always use --runtime when there's no solution file 2025-08-14 20:07:33 -03:00
David McFarland
fe10ae4b0f buildDotnet module: work around broken --runtime in dotnet pack 2025-08-14 19:04:17 -03:00
David McFarland
928293691a dotnet-hook: fix incorrect use of --runtime in pack 2025-08-14 19:04:16 -03:00
David McFarland
a298a4dd79 dotnet-hook.sh: fix library path in wrapper
Fixes: 8713126d0f
2025-08-11 12:15:43 -03:00
David McFarland
8713126d0f dotnet-hook.sh: clean up array handling 2025-08-04 10:57:18 -03:00
David McFarland
6fbf1d8a15 dotnet-hook.sh: fix shellcheck warnings 2025-08-04 10:57:18 -03:00
David McFarland
861ed441f6 dotnet-hook.sh: indent 2025-08-04 10:57:18 -03:00
David McFarland
e84eb87a63 dotnetHook: remove unused substitutions 2025-08-04 10:57:18 -03:00
David McFarland
c8ae12c531 dotnetHook: rename phase functions Hook -> Phase 2025-08-04 10:57:18 -03:00
David McFarland
0a734f6b3a buildDotnetModule: combine hooks 2025-08-04 10:57:18 -03:00
Wolfgang Walther
9d243b6e7b treewide: handle *Phases variables __structuredAttrs-agnostically (round 2) (#352709) 2024-12-16 22:36:44 +01:00
Yueh-Shun Li
b8d4a65cb1 dotnetFixupHook: append *Phases with appendToVar 2024-12-17 01:46:04 +08: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
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
github-actions[bot]
171c0c7ed6 Merge master into staging-next 2024-12-07 00:15:17 +00:00
js6pak
895b69405c dotnet: make wrappers usable as DOTNET_ROOT
This simplifies the code a bit and makes it possible to use dotnetCorePackages.combinePackages as dotnet-runtime again.
Partial revert of ddd08e404f.
2024-12-06 10:01:59 -04:00
Wolfgang Walther
217d3132cf various: remove unused substituteAll imports 2024-12-01 14:25:56 +01:00
David McFarland
112a4c48c6 dotnet: add passthru.runtime/aspnetcore to sdk packages 2024-11-17 14:19:25 -04:00
David McFarland
5b462ef57a buildDotnetModule: allow selfContainedBuild property to be omitted with null
Fixes #351892
2024-11-17 14:19:24 -04:00
David McFarland
aa0289eda4 buildDotnetModule: respect self-contained setting in restore 2024-11-17 14:19:24 -04:00
David McFarland
4219a94158 buildDotnetModule: make dotnet-runtime optional 2024-11-17 14:19:24 -04:00
David McFarland
42d69ab59a dotnet: move dotnet_root to $out/share/dotnet 2024-11-17 14:19:23 -04:00
David McFarland
ddd08e404f dotnet: split setup hooks into wrapper for runtime/sdk 2024-11-17 14:19:22 -04:00
Reno Dakota
52bf1163fa treewide: use getLib when accessing clang / libclang / stdenv.cc.cc
In preparation to eliminate the lib output for the unwrapped clang, use
`lib.getLib` to access the `lib` output.
2024-11-07 10:27:41 +00:00
David McFarland
9bb309d5b5 buildDotnetModule: set --no-restore in check/publish/pack 2024-09-24 20:43:24 -03:00
David McFarland
00fe5f61ba buildDotnetModule: remove duplicate attribute key 2024-09-24 20:43:24 -03:00
David McFarland
2c97d67f62 dotnet: split sdk packages by platform 2024-09-24 20:43:24 -03:00
David McFarland
b1685747a7 nuget-package-hook: move package unpacking from buildDotnetModule 2024-09-17 01:12:11 -03:00
David McFarland
c1ee815d03 dotnet-fixup-hook: obey dontFixup 2024-09-17 01:12:11 -03:00
David McFarland
e05c0c4f98 dotnet-fixup-hook: remove confusing logs 2024-09-17 01:12:11 -03:00
David McFarland
773cc0de74 dotnet-sdk-setup-hook: move nuget configuration from dotnetBuildModule 2024-09-17 01:12:11 -03:00
David McFarland
f820d2cf3c dotnetCorePackages: split fetch-deps logic into addNuGetDeps 2024-09-17 01:12:11 -03:00
Sergei Trofimovich
35671aabff dotnet/build-dotnet-module: fix eval of fetch-deps
Without the change the eval fails as:

    $ nix build --no-link -f. csharp-ls.fetch-deps --show-trace
    error:
       … while evaluating a path segment
         at pkgs/build-support/dotnet/build-dotnet-module/default.nix:258:36:
          257|                   else
          258|                     ''$(mktemp -t "${finalAttrs.pname ? finalAttrs.finalPackage.name}-deps-XXXXXX.nix")'';
             |                                    ^
          259|                 nugetToNix = (nuget-to-nix.override { inherit dotnet-sdk; });

       error: cannot coerce a Boolean to a string: false

Switch from `?` operator (attribute presence predicate) to an `or`
("else" form).
2024-09-13 07:12:37 +01:00
David McFarland
cc9c59c478 buildDotnetModule: use individual dependencies for nugetDeps 2024-09-06 16:05:19 -03:00
David McFarland
2d43ecc400 buildDotnetModule: clean-up stdenv attributes
- stop binding attributes we don't care about (e.g. name, doCheck)
- remove attributes we handle in nix (e.g. useAppHost)
- inherit attributes with default values (e.g. packNupkg)
2024-09-05 23:46:23 -03:00
David McFarland
e49642596f buildDotnetModule: set TMPDIR in fetch-deps
Some packages assume TMPDIR is unshared, even in nix-shell.
2024-09-05 22:47:39 -03:00
David McFarland
e530139caa buildDotnetModule: fix tool manifest detection 2024-09-05 22:47:38 -03:00
Ivan Trubach
2d33d5c778 buildDotnetModule: inherit enableParallelBuilding
After this change, enableParallelBuilding defaults to true for packages
using buildDotnetModule. The argument value already defaults to true,
but we did not use it. Note that default values in Nix are not present
in the arguments attribute set, e.g. `args` does not contain `def` for
`{ def ? true }@args: …` function unless this argument is explicitly
passed.
2024-09-03 22:57:52 +03:00
Matt Sturgeon
1c379e3a57 buildDotnetModule: add testFilters arg
In addition to the existing `disabledTests`, allow defining more general
test filters using `testFilters`.
2024-08-22 19:52:07 +01:00
Matt Sturgeon
79d26048de buildDotnetModule: add finalAttrs support
Allow users to pass arguments to `buildDotnetModule` in the form:

```nix
buildDotnetModule (finalAttrs: {
  # Args
})
```

Exposing the behaviour of the underlying `mkDerivation` and allowing
packages to be defined in a recursive way that works correctly even when
the package is overridden, e.g. using `overrideAttrs`.

Added some simple test cases that piggyback on the existing
`structured-attrs` test.
2024-08-06 16:33:49 +01:00
Matt Sturgeon
77a13aa9ad buildDotnetModule: format with nixfmt 2024-08-01 13:58:28 +01:00
David McFarland
d3ca5027fa dotnet: use unpacked nuget packages 2024-07-31 00:47:14 -03:00
David McFarland
7402aa90cf buildDotnetModule: fix typo 2024-07-30 12:16:45 -03:00
David McFarland
0c1f3e6c93 buildDotnetModule: remove nugetDeps from derivation args
This allows fetch-deps to work even when the deps file is missing.
2024-07-30 12:16:45 -03:00
Smaug123
7924a2513e dotnet: fix fetchDeps null handling 2024-07-16 08:34:23 +01:00
Smaug123
45037a9d73 buildDotnetModule: split fetch-deps script to new file
This makes the minimal change to put the script in a new file.
It does not fix the resulting ShellCheck warnings (which would
have been present in the previous version; I've just exposed
them).
2024-07-12 09:53:13 +01:00
Ivan Trubach
4caf9a61f9 buildDotnetModule: convert makeWrapperArgs to an array 2024-06-19 00:34:15 +03:00
David McFarland
b5447275d2 Merge pull request #313005 from tie/dotnet-cross
buildDotnetModule: fix structured attributes support
2024-06-17 09:43:51 -03:00