Artturi
fa3a4a18c0
Merge pull request #192459 from danielfullmer/fix-cc-wrapper-libdir
2023-09-07 01:58:51 +03:00
github-actions[bot]
aba6d8043f
Merge staging-next into staging
2023-09-06 18:01:28 +00:00
Silvan Mosberger
7cbc8215fd
Merge pull request #252865 from emily-is-my-username/fix/fetchgit-deepclone
...
`fetchgit`: don't shallow clone if `deepClone` is requested
2023-09-06 14:08:06 +02:00
github-actions[bot]
848091ac53
Merge staging-next into staging
2023-09-06 06:01:30 +00:00
github-actions[bot]
82535bc9c1
Merge master into staging-next
2023-09-06 06:00:55 +00:00
Lin Jian
cae7f23ed8
build-support/emacs: fix name when overrideAttrs is used
...
Before:
nix-repl> (pkgs.emacs.pkgs.eglot.overrideAttrs { version = "6.0"; }).name
"emacs-eglot-1.15"
After:
nix-repl> (pkgs.emacs.pkgs.eglot.overrideAttrs { version = "6.0"; }).name
"emacs-eglot-6.0"
2023-09-06 02:24:07 +00:00
Lin Jian
35ccb9db3f
build-support/emacs: make version non-optional
...
I do not think there is a good reason for it to be optional.
There were only two packages without a version attr. The version attr
is added to them in this patch.
2023-09-06 02:24:07 +00:00
github-actions[bot]
1a5c2acd74
Merge staging-next into staging
2023-09-05 00:02:47 +00:00
github-actions[bot]
77a8486bb3
Merge master into staging-next
2023-09-05 00:02:14 +00:00
Artturi
b80a27d04f
Merge pull request #249567 from antonmosich/typo
2023-09-05 00:38:52 +03:00
Artturi
31c9deb4f7
Merge pull request #218783 from timbertson/stripExcludeExtensions
2023-09-05 00:37:17 +03:00
Artturi
d5139e3017
Merge pull request #245909 from Artturin/setupshchanges2
2023-09-04 20:41:16 +03:00
Artturin
fa98c56f75
setup-hooks/separate-debug-info.sh: Warn if necessary variables are not set
...
`$OBJCOPY` is not available in bootstrap tools
`stdenv.__bootPackages.stdenv.__bootPackages.stdenv.__bootPackages.stdenv.__bootPackages.stdenv.__bootPackages.bash.stdenv.cc.bintools`
2023-09-03 23:02:45 +03:00
Tim Cuthbertson
0bffcc3f3c
setup-hooks/strip: add stripExclude
2023-09-03 20:18:10 +03:00
Artturin
1db1e3c467
stdenv: Fix possible issues discovered with
...
```
set -o errexit -o nounset -o pipefail
shopt -s inherit_errexit
```
in `stdenv/default-builder.sh`
2023-09-02 03:25:36 +03:00
github-actions[bot]
14f4a764c5
Merge master into staging-next
2023-09-02 00:02:17 +00:00
figsoda
eee0a82ee0
Merge pull request #251369 from srid/writeShellApplication-meta
2023-09-01 16:53:49 -04:00
Vladimír Čunát
e1b1a251f7
Merge #252459 : win-dll-links: also copy dll from dependencies
...
...into staging-next. It's a topologically earlier remerge.
2023-09-01 07:17:35 +02:00
brano543
1086f093a9
win-dll-links: also copy dll from dependencies
...
Fixes running `pkgsCross.mingwW64._7zz` in wine.
Fixes issue 38451
```
tree result/bin
result/bin
├── 7zz.exe
└── mcfgthread-12.dll -> ../../wmgj476qjfw26f9aij1d64lxrjfv6kk0-mcfgthreads-x86_64-w64-mingw32-git/bin/mcfgthread-12.dll
```
Co-authored-by: marius david <marius@mariusdavid.fr>
2023-08-31 21:47:48 +03:00
Atemu
4867914ee3
Merge pull request #250500 from trofi/fix-buildFHSEnv-BINTOOLS-wrapper
...
buildFHSEnv: fix `NIX_LDFLAGS` propagation to `ld` wrapper
2023-08-31 18:58:34 +02:00
Maciej Krüger
b9ab9a92b9
Merge pull request #251409 from gilice/flutter-313
2023-08-30 22:00:14 +02:00
nicoo
76aedfaaee
fetchDebianPatch: Handle the case of lib*
packages
2023-08-30 08:28:45 +00:00
nicoo
e4162c9e7b
fetchDebianPatch: add test
2023-08-30 07:55:07 +00:00
nicoo
d4e265327f
fetchDebianPatch: Rename patch
parameter, make name
overrideable
...
This allows using the fetcher with `invalidateFetcherByDrvHash` for testing.
2023-08-30 07:53:05 +00:00
nicoo
741ed30e77
fetchDebianPatch: init
2023-08-30 07:53:04 +00:00
Artturi
bacceeba12
Merge pull request #252067 from lucasew/fix-buildFlutterApplication-passthru
2023-08-29 17:48:06 +03:00
hacker1024
1dcba055e5
buildDartApplication: Supply CA bundle to Dart in FOD
...
DART_VM_OPTIONS is not effective.
2023-08-29 13:12:15 +02:00
hacker1024
41bbc2c311
flutter: Supply CA bundle in sandbox
2023-08-29 13:12:01 +02:00
lucasew
acafc8e76e
flutter.buildFlutterApplication: fix passthru being ignored
...
Signed-off-by: lucasew <lucas59356@gmail.com>
2023-08-28 22:54:36 -03:00
Lin Jian
6505082e72
emacsWithPackages: load compiled site-start.el of $emacs if possible
...
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
2023-08-28 15:46:04 +00:00
Lin Jian
e8f6a5ce34
emacsWithPackages: do not symlink $emacs/share/emacs
...
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
2023-08-28 15:46:04 +00:00
Lin Jian
f5fbea9761
emacsWithPackages: do not add the wrapper path twice
...
"$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]: 1476c13422/pkgs/build-support/emacs/wrapper.sh (L47)
[2]: 1476c13422/pkgs/build-support/emacs/wrapper.sh (L50)
[3]: 1476c13422/pkgs/build-support/emacs/wrapper.nix (L166)
2023-08-28 15:46:04 +00:00
Robert Scott
df02fcb79b
cc-wrapper: don't use fortify-headers for non-gcc compilers
2023-08-28 15:06:44 +01:00
github-actions[bot]
4cdbb53d13
Merge master into staging-next
2023-08-26 12:01:05 +00:00
Ryan Lahfa
3506ce32c5
Merge pull request #238407 from RaitoBezarius/licenses-for-nc-plugins
2023-08-26 13:38:21 +02:00
Adam Joseph
52374770b0
Merge pull request #251534 from amjoseph-nixpkgs/pr/default-crate-overrides/libseat-sys
...
default-crate-overrides: add libseat-sys
2023-08-26 10:52:14 +00:00
markuskowa
212d454c2a
Merge pull request #246867 from markuskowa/add-mpi-hook
...
add mpiCheckPhaseHook
2023-08-26 11:54:56 +02:00
Adam Joseph
2ea678ed48
default-crate-overrides: add libseat-sys
...
This is needed for building `cosmic-comp` using `crate2nix` instead
of `buildRustPackage` (like
https://github.com/NixOS/nixpkgs/pull/251365/ does).
2023-08-26 01:08:29 -07:00
github-actions[bot]
e79f8fd118
Merge master into staging-next
2023-08-25 18:00:58 +00:00
Lin Jian
3e025f1393
emacsWithPackages: add a note for EMACSNATIVELOADPATH
2023-08-25 17:42:21 +00:00
Lin Jian
7f8cd3d8f9
emacsWithPackages: remove redundant colons
2023-08-25 17:42:21 +00:00
Lin Jian
d380784357
emacsWithPackages: fix logic of adding EMACSNATIVELOADPATH
...
Without this change, EMACSNATIVELOADPATH will not be added if
EMACSLOADPATH is added.
2023-08-25 17:42:21 +00:00
Sridhar Ratnakumar
250d324776
trivial-builders: add meta to writeShellApplication
2023-08-25 09:38:21 -04:00
github-actions[bot]
abaaf09a76
Merge master into staging-next
2023-08-24 18:00:52 +00:00
Shea Levy
c7417f5a3c
Merge pull request #250577 from shlevy/nix-buffer-new-emacs
...
nixBufferBuilders fixes
2023-08-24 08:53:56 -04:00
github-actions[bot]
4328391132
Merge master into staging-next
2023-08-24 12:01:05 +00:00
Brian McGee
9aa91ec7b5
build-support/vm: fix makeImageTestScript
...
`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
2023-08-24 09:09:43 +01:00
github-actions[bot]
b179570bca
Merge master into staging-next
2023-08-23 06:01:21 +00:00
Adam Joseph
be547cb31f
Merge pull request #247527 from oxij/metrics/fetchzip
...
fetchzip: cleanup and improve metrics
2023-08-23 05:12:47 +00:00
OTABI Tomoya
ccaca85500
Merge pull request #249091 from TomaSajt/dotnet-fix
...
Fix useDotnetFromEnv's DOTNET_ROOT detection
2023-08-23 14:04:47 +09:00