summary refs log tree commit diff
path: root/pkgs/build-support
Commit message (Collapse)AuthorAge
* Merge pull request #250500 from trofi/fix-buildFHSEnv-BINTOOLS-wrapperAtemu2023-08-31
|\ | | | | buildFHSEnv: fix `NIX_LDFLAGS` propagation to `ld` wrapper
| * buildFHSEnv: fix `NIX_LDFLAGS` propagation to `ld` wrapperSergei Trofimovich2023-08-21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Before the change the following command did not work: $ nix develop -i --impure --expr 'with import <nixpkgs> { system = "i686-linux"; }; (buildFHSUserEnv { name = "t"; targetPkgs = ps: with ps; [ libmpc stdenv.cc ]; }).env' $ ld -lmpc -o a ld: cannot find -lmpc: No such file or directory It is expected to work as `NIX_LDFLAGS` does contain valid values: $ echo $NIX_LDFLAGS -L/usr/lib -L/usr/lib32 Note that for `gcc` it does work: $ printf "int main(){}" | gcc -x c - -lmpc -o a It happens because `HOST` role is enabled for `cc`: $ echo $NIX_CC_WRAPPER_TARGET_HOST_i686_unknown_linux_gnu 1 But not for `BINTOOLS`: $ echo $NIX_BINTOOLS_WRAPPER_TARGET_HOST_i686_unknown_linux_gnu <empty> The change adds BINTOOLS role and fixes linking: $ nix develop -i --impure --expr 'with import ~/nm { system = "i686-linux"; }; (buildFHSUserEnv { name = "t"; targetPkgs = ps: with ps; [ libmpc stdenv.cc ]; }).env' $ printf "int main(){}" | gcc -x c - -lmpc -o a $ ld -lmpc -o a ld: warning: cannot find entry symbol _start; not setting start address
* | Merge pull request #251409 from gilice/flutter-313Maciej Krüger2023-08-30
|\ \
| * | buildDartApplication: Supply CA bundle to Dart in FODhacker10242023-08-29
| | | | | | | | | | | | DART_VM_OPTIONS is not effective.
| * | flutter: Supply CA bundle in sandboxhacker10242023-08-29
| | |
* | | fetchDebianPatch: Handle the case of `lib*` packagesnicoo2023-08-30
| | |
* | | fetchDebianPatch: add testnicoo2023-08-30
| | |
* | | fetchDebianPatch: Rename `patch` parameter, make `name` overrideablenicoo2023-08-30
| | | | | | | | | | | | This allows using the fetcher with `invalidateFetcherByDrvHash` for testing.
* | | fetchDebianPatch: initnicoo2023-08-30
| | |
* | | Merge pull request #252067 from lucasew/fix-buildFlutterApplication-passthruArtturi2023-08-29
|\ \ \
| * | | flutter.buildFlutterApplication: fix passthru being ignoredlucasew2023-08-28
| | | | | | | | | | | | | | | | Signed-off-by: lucasew <lucas59356@gmail.com>
* | | | emacsWithPackages: load compiled site-start.el of $emacs if possibleLin Jian2023-08-28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The first log in *Message* before this patch: Loading /nix/store/bikm18vy6v07hmrvrll501i68440w9iw-emacs-29.1-rc1/share/emacs/site-lisp/site-start.el (source)...done and after this patch: Loading /nix/store/bikm18vy6v07hmrvrll501i68440w9iw-emacs-29.1-rc1/share/emacs/site-lisp/site-start (native compiled elisp)...done
* | | | emacsWithPackages: do not symlink $emacs/share/emacsLin Jian2023-08-28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | I see no reason to symlink this dir. Doing so may shadow unwanted libraries since the site-start.el of Emacs adds paths under NIX_PROFILES to load-path. It is added in [1] to fix "building emacs". However, I have no issue in building and using Emacs after removing it. [1]: https://github.com/NixOS/nixpkgs/pull/89351
* | | | emacsWithPackages: do not add the wrapper path twiceLin Jian2023-08-28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | "$out/share/emacs/site-lisp" is added to load-path in wrapper.sh[1] using EMACSLOADPATH and "$out/share/emacs/native-lisp/" is added to native-comp-eln-load-path in wrapper.sh[2] using EMACSNATIVELOADPATH. There is no point to add them again here. Additionally, the trailing "/" in "$out/share/emacs/native-lisp/" causes duplicate entries in native-comp-eln-load-path: ("/nix/store/hash1-emacs-packages-deps/share/emacs/native-lisp/" ; [3] "/home/user/.emacs.d/eln-cache/" "/nix/store/hash1-emacs-packages-deps/share/emacs/native-lisp" ; [2] "/nix/store/hash2-emacs-29.1-rc1/lib/emacs/29.1/native-lisp/") load-path does not change with this patch applied. [1]: https://github.com/NixOS/nixpkgs/blob/1476c13422db64b12ee879e4f8715ccac3240285/pkgs/build-support/emacs/wrapper.sh#L47 [2]: https://github.com/NixOS/nixpkgs/blob/1476c13422db64b12ee879e4f8715ccac3240285/pkgs/build-support/emacs/wrapper.sh#L50 [3]: https://github.com/NixOS/nixpkgs/blob/1476c13422db64b12ee879e4f8715ccac3240285/pkgs/build-support/emacs/wrapper.nix#L166
* | | | cc-wrapper: don't use fortify-headers for non-gcc compilersRobert Scott2023-08-28
| | | |
* | | | Merge master into staging-nextgithub-actions[bot]2023-08-26
|\ \ \ \ | | |/ / | |/| |
| * | | Merge pull request #238407 from RaitoBezarius/licenses-for-nc-pluginsRyan Lahfa2023-08-26
| |\ \ \
| | * | | fetchNextcloudApp: remove backwards compat for old interfaceMaximilian Bosch2023-08-20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The `name` & `version` attributes only existed in a previous form of the API before it was switched over to using `fetchzip` & `applyPatches`[1]. The attributes existed to be able to throw an evaluation error with upgrade instructions when this was used. However, this was before 22.11, so this shouldn't be in use anymore (and if somebody is doing a migration from a very old NixOS, this is still documented in the 22.11 release-notes[2]). Anyways, this simplifies the code a little bit and also having both `appName`/`appVersion` and `name`/`version` in there is quite confusing. But still, I figured it's less confusing to not re-use attributes that were deprecated in the past, hence the alternative naming. [1] 3ca9b9a8ad1b9dee2ec40eecca557f0578786b93 [2] d41b381310f5dcde1434b23406532f54ebdeea22
| | * | | nextcloud*Packages: expose proper license informationMaximilian Bosch2023-08-20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This change makes sure that each Nextcloud plugin installed provides a `meta` section with proper license information. Unfortunately, the metadata from the appstore is useless for this purpose since it doesn't differentiate between e.g. AGPL 3.x and AGPL 3.x or any later version. In fact, this isn't consistent between their software, e.g. `bookmarks` has `agpl3Plus` according to the files' headers[1] whereas `twofactor_nextcloud_notification` is AGPL 3 only[2]. I don't think there's any trivial and reasonable way to retrieve this information programatically, so I decided to change the format of `nextcloud-apps.json`[3] to also contain the license in the form of the license attribute we have in `lib/licenses.nix`, i.e. GNU AGPL 3 or later is `agpl3Plus`. I retrieved the information using the following approach: * go to the source code of $app at the revision we currently have packaged * check for a license identifier (does it specify the license only or the license "or any later version")? * first in `src/main.js` because most apps from Nextcloud itself used actual spdx identifiers in the frontend's source-code. * then in `lib/AppInfo/Application.php` which each Nextcloud app has. License changes should be updated accordingly when updating the apps. As with any other package in nixpkgs as well, this currently needs to be done manually (or as part of the review process)[4]. Also, I decided to change the `name` of the `applyPatches` derivation from `source-patched` to `nextcloud-app-${appName}-${appVersion}`. When deploying a lot of apps (and probably displaying the diff using `nix store diff-closures` on deploy), the current output isn't very helpful. This is purely optional because I didn't want to break the interface of `fetchNextcloudApp` again. [1] https://github.com/nextcloud/bookmarks/blob/v13.1.0/lib/AppInfo/Application.php#L6 [2] https://github.com/nextcloud/twofactor_nextcloud_notification/blob/v3.7.0/lib/AppInfo/Application.php [3] This isn't really well-defined since it's preprocessed with `jq(1)` before passing the apps to nc4nix. [4] Though notable license changes (e.g. agpl -> gpl) would also pop up in the diff of <nextcloudversion>.json, so this is pretty easy to catch.
| | * | | applyPatches: fix adding meta informationMaximilian Bosch2023-08-20
| | | | |
| | * | | fetchNextcloudApp: meta propagation for licenses, etc.Raito Bezarius2023-08-20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This improves the metadata propgation for nc4nix-generated packages. Adds: - licenses (best effort given spdxId doesn't seem guaranteed here) - homepage - longDescription
| | * | | trivial-builders/applyPatches: carry `meta` information to the patched sourceRaito Bezarius2023-08-20
| | | |/ | | |/| | | | | | | | | | | | | | | | | There is no reason to not carry licenses and other information to any patched source. This should improve our metadata in those situations.
| * | | Merge pull request #251534 from ↵Adam Joseph2023-08-26
| |\ \ \ | | | | | | | | | | | | | | | | | | | | amjoseph-nixpkgs/pr/default-crate-overrides/libseat-sys default-crate-overrides: add libseat-sys
| | * | | default-crate-overrides: add libseat-sysAdam Joseph2023-08-26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is needed for building `cosmic-comp` using `crate2nix` instead of `buildRustPackage` (like https://github.com/NixOS/nixpkgs/pull/251365/ does).
| * | | | Merge pull request #246867 from markuskowa/add-mpi-hookmarkuskowa2023-08-26
| |\ \ \ \ | | |/ / / | |/| | | add mpiCheckPhaseHook
| | * | | mpiCheckPhaseHook: add new setup hook for MPI aware check phasesMarkus Kowalewski2023-08-22
| | |/ / | | | | | | | | | | | | | | | | | | | | Add this hook to checkPhase to allow for running MPI application in the sandbox. It detects the MPI implementations and sets the respective environment variables.
* | | | Merge master into staging-nextgithub-actions[bot]2023-08-25
|\| | |
| * | | emacsWithPackages: add a note for EMACSNATIVELOADPATHLin Jian2023-08-25
| | | |
| * | | emacsWithPackages: remove redundant colonsLin Jian2023-08-25
| | | |
| * | | emacsWithPackages: fix logic of adding EMACSNATIVELOADPATHLin Jian2023-08-25
| | |/ | |/| | | | | | | | | | Without this change, EMACSNATIVELOADPATH will not be added if EMACSLOADPATH is added.
* | | Merge master into staging-nextgithub-actions[bot]2023-08-24
|\| |
| * | Merge pull request #250577 from shlevy/nix-buffer-new-emacsShea Levy2023-08-24
| |\ \ | | | | | | | | nixBufferBuilders fixes
| | * | nixBufferBuilders: Don't assume the user has used eshellShea Levy2023-08-18
| | | |
| | * | Fix nixBufferBuilders for newer emacsShea Levy2023-08-17
| | | |
* | | | Merge master into staging-nextgithub-actions[bot]2023-08-24
|\| | |
| * | | build-support/vm: fix makeImageTestScriptBrian McGee2023-08-24
| | | | | | | | | | | | | | | | | | | | | | | | `qemu-img create` now requires an additional `-F <second_image_format>` flag. https://github.com/qemu/qemu/blob/master/docs/about/removed-features.rst#qemu-img-backing-file-without-format-removed-in-61
* | | | Merge master into staging-nextgithub-actions[bot]2023-08-23
|\| | |
| * | | Merge pull request #247527 from oxij/metrics/fetchzipAdam Joseph2023-08-23
| |\ \ \ | | | | | | | | | | fetchzip: cleanup and improve metrics
| | * | | fetchurl: cleanup a bit by moving the warning into assertJan Malakhovski2023-08-08
| | | | |
| | * | | fetchzip: cleanup and improve metrics a bitJan Malakhovski2023-08-08
| | | | |
| * | | | Merge pull request #249091 from TomaSajt/dotnet-fixOTABI Tomoya2023-08-23
| |\ \ \ \ | | | | | | | | | | | | Fix useDotnetFromEnv's DOTNET_ROOT detection
| | * | | | Fix useDotnetFromEnv's DOTNET_ROOT detectionTomaSajt2023-08-08
| | |/ / /
| * | | | Merge pull request #249176 from TomaSajt/build-dotnet-global-tool-fixOTABI Tomoya2023-08-23
| |\ \ \ \ | | | | | | | | | | | | buildDotnetGlobalTool: fix typo
| | * | | | buildDotnetGlobalTool: fix typoTomaSajt2023-08-14
| | | |/ / | | |/| |
* | | | | Merge staging-next into staginggithub-actions[bot]2023-08-22
|\| | | |
| * | | | Revert "buildGoModule: set GOPROXY to go default"zowoq2023-08-22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 3392d56b728983d5437cf50b0872515c24b87a05. Fixed in cbc976a97c3372e1eec5db021db994b85e098d12
* | | | | Merge staging-next into staginggithub-actions[bot]2023-08-20
|\| | | |
| * | | | Merge master into staging-nextgithub-actions[bot]2023-08-20
| |\ \ \ \ | | | |_|/ | | |/| |
| | * | | Merge pull request #249879 from dotlambda/carto-buildNpmPackageRobert Schütz2023-08-20
| | |\ \ \ | | | | | | | | | | | | carto: use buildNpmPackage
| | | * | | buildNpmPackage: use installManPageRobert Schütz2023-08-19
| | | | | |
generated by cgit-pink 1.4.1 (git 2.36.1) at 2024-06-26 18:58:45 +0000