|
|
50ef364dbe
|
Merge pull request #9844 from NixOS/pkg-config-gmock
Link both gmock and gtest, not just gtest
(cherry picked from commit 979b00bce9)
Change-Id: Ic12d596e635057d67de277fbeb1602017e7623d0
|
2024-03-04 08:47:39 +01:00 |
|
|
|
2bb0a06346
|
Merge pull request #9841 from obsidiansystems/float-speed-factor
Convert `Machine::speedFactor` from a non-neg int to a non-neg float
(cherry picked from commit 69d0ae27e3)
Change-Id: I2afb5cf9e4fe1384985c58353946135c3d102b42
|
2024-03-04 08:40:38 +01:00 |
|
|
|
044c117a9f
|
Merge pull request #9481 from iFreilicht/disallow-nix-search-without-search-terms
nix search: Disallow empty regex
(cherry picked from commit 1c260fa6d1)
Change-Id: Iaaf3605c24a342fcb05d0b534a9f305533d3b5fa
|
2024-03-04 08:40:12 +01:00 |
|
|
|
20d7b93b0c
|
Merge pull request #9838 from obsidiansystems/systemTypes-set
Make `Machine::systemTypes` a set not vector
(cherry picked from commit f1b0304153)
Change-Id: I6d4f5c0bfc226e9bd66c58c360cd99e3fac9a129
|
2024-03-04 08:39:24 +01:00 |
|
|
|
fad1a25e17
|
Merge pull request #9805 from yshui/prefetch-unpack
Add --unpack to nix store prefetch-file
(cherry picked from commit f51409cf98)
Change-Id: I974b04f3efc8b210a9399a71d3704490cfc2c80c
|
2024-03-04 08:24:18 +01:00 |
|
|
|
b6bb869e52
|
Merge pull request #9632 from cole-h/nix-daemon-testing
Use `nix daemon` in the test suite
(cherry picked from commit e6e160a075)
Change-Id: I537a25d3d48f609cd77b2c3a8ad68e87aebabfe8
|
2024-03-04 08:17:32 +01:00 |
|
|
|
298db5d1cd
|
Merge pull request #9804 from edolstra/missing-nar-crash
Fix crash when NAR is missing from binary cache
(cherry picked from commit 3b20cca962)
Change-Id: I50ff18f4a6de69c323473b4a8e3e098d1f365145
|
2024-03-04 08:16:28 +01:00 |
|
|
|
68f148ed45
|
Merge pull request #9798 from edolstra/remote-store-eof
Print a more helpful message if the daemon crashes
(cherry picked from commit 32706b14a7)
Change-Id: Ief7c465bca7666e2b7e7c9d1dd0c01c5f9014146
|
2024-03-04 08:12:15 +01:00 |
|
|
|
5dd872363a
|
Merge pull request #9797 from edolstra/fix-error-message
Store: :buildPaths(): Fix display of store paths
(cherry picked from commit b5ed36e663)
Change-Id: Ic6008491088dc6febd4a1e44dc2dbb96c47661f4
|
2024-03-04 08:11:46 +01:00 |
|
|
|
e81ee8b337
|
Merge pull request #9785 from hercules-ci/test-substring-negative
tests/functional/lang: Test substring with negative length
(cherry picked from commit 86156d05dd)
Change-Id: I2e2086027a43f8111ba5068ac16590eaa0b798d4
|
2024-03-04 08:07:16 +01:00 |
|
|
|
2c85fcce87
|
Merge pull request #9747 from awakesecurity/mz/fix-quadratic-splitString
Fix performance of builtins.substring for empty substrings
(cherry picked from commit b2deff1947)
Change-Id: I4ddfc8d26a4781c9520fff9807849a073ee7bed8
|
2024-03-04 08:06:36 +01:00 |
|
|
|
64b077cdaa
|
Merge pull request #9763 from L-as/avoid-unnecessary-copy
Avoid unnecessary copy of goal log
(cherry picked from commit 268c49264a)
Change-Id: I5d9de9e43a7ddcb09d25bbc7367c9d83f58c7a75
|
2024-03-04 08:01:03 +01:00 |
|
|
|
e310bbf913
|
Merge pull request #8043 from bobvanderlinden/pr-shell-env
nix: develop: use SHELL from rc script
(cherry picked from commit 0d55d660d5)
Change-Id: I83be6c63b282d7f01a0defa78d9e787c77f1f02d
|
2024-03-04 07:59:32 +01:00 |
|
|
|
180984178d
|
Merge pull request #9648 from cole-h/nix-shell-ordering
nix shell: reflect command line order in PATH order
(cherry picked from commit b91c935c2f)
Change-Id: If16c120bb74857c2817366e74e5b0877eb997260
|
2024-03-04 07:50:55 +01:00 |
|
|
|
aaf1ed1a4c
|
Merge pull request #9726 from DavHau/gitignore
gitignore: add result-*
(cherry picked from commit 47633ceec3)
Change-Id: I4480d7dd8146600d1334c75b39ff3b3b2f9496eb
|
2024-03-04 07:50:42 +01:00 |
|
|
|
5f2eaa1b35
|
Merge pull request #9662 from shlevy/flat-fixed-references-assert
Improve error message for fixed-outputs with references.
(cherry picked from commit ff6de4a9ee)
Change-Id: I733c49760b9a3f1b76a6bece3b250b8579cd6cac
|
2024-03-04 07:50:02 +01:00 |
|
|
|
aac8416eac
|
Merge pull request #9670 from DavHau/log-lines
saner default for log-lines: change to 25
(cherry picked from commit dedbbbb451)
Change-Id: I8847df4aeb6e5c2d2be0e04f2a0a1aa595cb3b2f
|
2024-03-04 07:48:57 +01:00 |
|
|
|
4c56629a52
|
Merge pull request #9692 from 9999years/update-clang-stdenv
Remove `clang11Stdenv`
(cherry picked from commit cbf99c71c6)
Change-Id: I716ce1a54f2006c4a9dc9716e8529fe7858ecebb
|
2024-03-04 07:48:42 +01:00 |
|
|
|
298be50d7d
|
Merge pull request #9690 from obsidiansystems/nixos-23.05-small-again
flake: Go back to regular `nixos-23.05-small`
(cherry picked from commit 1ed245a606)
Change-Id: I33f5fe20cd6bc658a461f560e458b440b3b7e18e
|
2024-03-04 07:47:58 +01:00 |
|
|
|
8f5d0d4c05
|
Merge pull request #9687 from edolstra/withFramedSink-ctrl-c-hang
withFramedSink(): Receive interrupts on the stderr thread
(cherry picked from commit 965cfe9688)
Change-Id: I8320a96957c01ec0e3450d1b3ae38a3baff78d49
|
2024-03-04 07:40:17 +01:00 |
|
|
|
137673de56
|
Merge pull request #9681 from edolstra/eval-optimisations
Optimize empty list constants
(cherry picked from commit 315aade89d)
Change-Id: I0f28ef8a27ccedc45acf44243eec9dc35b733300
|
2024-03-04 07:39:12 +01:00 |
|
|
|
6b279cd10e
|
Merge pull request #9658 from pennae/env-diet
reduce the size of Env by one pointer
(cherry picked from commit 83f5622545)
Change-Id: I5636290526d0165cfc61aee1e7a5b94db4a26cef
|
2024-03-04 07:37:45 +01:00 |
|
|
|
cd326a2aa4
|
Merge pull request #9673 from pennae/drv-parse-opts
optimize derivation parsing
(cherry picked from commit 3511430902)
Change-Id: I00f76dcd464a5811944613731501af504b6e8c29
|
2024-03-04 07:36:51 +01:00 |
|
|
|
96f1a404d0
|
Merge pull request #9617 from 9999years/stack-overflow-segfault
Fix segfault on infinite recursion in some cases
(cherry picked from commit bf1b294bd8)
Change-Id: Id137541426ec8536567835953fccf986a3aebf16
|
2024-03-04 07:35:20 +01:00 |
|
|
|
e1b1e6f7ab
|
Merge pull request #9666 from unblevable/dervation-typo
Fix "dervation" typo
(cherry picked from commit a21c762dab)
Change-Id: Ib6c0521758eb23115cfa243b9f3a34bb6e249e5f
|
2024-03-04 07:33:32 +01:00 |
|
|
|
dd180911d8
|
Merge pull request #9582 from pennae/misc-opts
a packet of small optimizations
(cherry picked from commit ee439734e9)
Change-Id: I125d870710750a32a0dece48f39a3e9132b0d023
|
2024-03-04 07:32:31 +01:00 |
|
|
|
076844e386
|
Merge pull request #9621 from blaggacao/fix/too-restrictive-branch-regex-master
fix: valid branch name
(cherry picked from commit d2016c6b59)
Change-Id: Ic346739b91bf1b10515c9ff3b3e180a64afe6343
|
2024-03-04 07:27:52 +01:00 |
|
|
|
67de43b1d7
|
Merge pull request #9645 from tweag/undeprecate-isNull
Undeprecate isNull
(cherry picked from commit 8e64cd59b0)
Change-Id: If36b85a3fc01ee700bcaf4d5d83a5884a4b5de92
|
2024-03-04 07:27:37 +01:00 |
|
|
|
859da103ae
|
Merge pull request #9637 from 9999years/fix-logging-test-on-macos
Fix `logging.sh` test on macOS
(cherry picked from commit 94a03a810e)
Change-Id: I65dde18ee53ccded31790e0cf1f836c3ad6dc492
|
2024-03-04 07:26:34 +01:00 |
|
|
|
1d6ae6f9ff
|
Merge pull request #9639 from awakesecurity/mz/darwin-UID-override
installer: allow overriding of NIX_FIRST_BUILD_ID on darwin
(cherry picked from commit e85fd92816)
Change-Id: Ifffc3fedd740079345c205f54c62c76053e24846
|
2024-03-04 07:26:19 +01:00 |
|
|
|
6622abb463
|
Merge pull request #9641 from amarshall/darwin-sandbox-stderr
Allow access to /dev/stderr in Darwin sandbox
(cherry picked from commit c6d7013583)
Change-Id: I5657f6f4ee9dad8c978bad0d71f5cac51584e4f2
|
2024-03-04 07:26:03 +01:00 |
|
|
|
2ddf453e0d
|
Merge pull request #9619 from 9999years/remove-blank-lines-in-errors
Remove some blank lines from stack traces
(cherry picked from commit cea8354436)
Change-Id: Ic1af8b09e9994d3c69fd3b37ae47a4bb786a15a1
|
2024-03-04 07:23:44 +01:00 |
|
|
|
7614aa9797
|
Merge pull request #4093 from matthewbauer/eval-system
Add eval-system option
(cherry picked from commit 071dbbee33)
Change-Id: Ia81358c8cfb60241da07a4d0e84b9ee62a18a53f
|
2024-03-04 07:21:01 +01:00 |
|
|
|
64a269ef73
|
Merge pull request #9600 from SharzyL/fix_nix_copy
fix: nix copy ssh-ng:// not respecting --substitute-on-destination
(cherry picked from commit b1c633c6bb)
Change-Id: I77356d14a9011d6dc4cf64776995f7590d918874
|
2024-03-04 07:16:31 +01:00 |
|
|
|
13f78c557b
|
Merge pull request #9589 from obsidiansystems/floating-content-addressing-derivations-eval-store
Fix building CA derivations with and eval store
(cherry picked from commit dfc0cee702)
Change-Id: I28feb5a36d4fe75f0ed3e3e2db6eb56b67d0f371
|
2024-03-04 07:15:08 +01:00 |
|
|
|
bc34274aae
|
Merge pull request #9588 from obsidiansystems/queryDerivationOutputMap-evalStore
Give `Store::queryDerivationOutputMap` and `evalStore` argument
(cherry picked from commit 8cddda4f89)
Change-Id: I394e7e11c3f2e0cd3dbe0f48d757c14c09835e44
|
2024-03-04 07:13:33 +01:00 |
|
|
|
fa03f23923
|
Merge pull request #9587 from amjoseph-nixpkgs/pr/wopBuildDerivation/explain
libstore/daemon.cc: note trust model difference in readDerivation()s
(cherry picked from commit 5c917c3204)
Change-Id: I9945bc84e9529b005eafdc5c08b5bf1553335340
|
2024-03-04 07:13:00 +01:00 |
|
|
|
2e2f2579fa
|
Merge pull request #9575 from hercules-ci/shell-on-hydra
flake.nix: Cache shell inputs through hydra
(cherry picked from commit b1842a4f05)
Change-Id: I9e59b3c7dbf441e74cff3e4f24bbf65170ac505b
|
2024-03-04 07:12:28 +01:00 |
|
|
|
116e48fad3
|
Merge pull request #9573 from hercules-ci/rl-next-md-frontmatter
rl-next: Fix and support markdown frontmatter syntax
(cherry picked from commit 69b7876a08)
Change-Id: I8bfb8967af0943080fdd70d257c34abaf0a9fedf
|
2024-03-04 07:12:09 +01:00 |
|
|
|
2ba9788003
|
Merge pull request #9555 from 9999years/positions-in-errors
Pass positions when evaluating
(cherry picked from commit c8458bd731)
Change-Id: I1b4a5d58973be6264ffdb23b4492da200fdb71be
|
2024-03-04 07:11:25 +01:00 |
|
|
|
d42cd24afe
|
Merge pull request #9563 from obsidiansystems/tryResolve-evalStore
Give `Derivation::tryResolve` an `evalStore` argument
(cherry picked from commit 36ca6adc60)
Change-Id: If76b185a01ffa982e4c49cf333a9b5fbf9edebfe
|
2024-03-04 07:11:25 +01:00 |
|
|
|
dd2926f7ea
|
Merge pull request #9557 from bryanhonof/bryanhonof.fix-apple-double-shenanigans
Add option to libarchive so it behaves correctly
(cherry picked from commit c3827ff634)
Change-Id: Ib0f928851093f4c644bac071d1c8f8aeec803198
|
2024-03-04 07:11:25 +01:00 |
|
|
|
bc32950ac5
|
Merge pull request #9518 from NixOS/fix-static-build
Update Nixpkgs to fix static build
(cherry picked from commit 9817788f6b)
Change-Id: Ibe07a263f4d8f3b230775fb993881e5151a53784
|
2024-03-04 07:11:25 +01:00 |
|
|
|
e9243c849a
|
Merge pull request #9529 from wh0/patch-1
tests: avoid a chroot store without sandbox support
(cherry picked from commit 5910140f25)
Change-Id: Ic2255261334012f36a465a96073f50669952dc26
|
2024-03-04 07:11:25 +01:00 |
|
|
|
94bf5a8018
|
Merge pull request #9494 from sellout/nix-run-execv
Don’t use `execvp` when we know the path
(cherry picked from commit dfa219d03b)
Change-Id: I2226340cebbe935e1f2fe10207daba69683c8cb3
|
2024-03-04 07:11:25 +01:00 |
|
|
|
8505f963a1
|
Merge pull request #9972 from NixOS/allow-unoptimized-builds
Don't hardcode the `-O2` compiler flag
(cherry picked from commit 57ebcadb2f)
Change-Id: I49987181b2381627cb1c37b978b94c3163598af2
|
2024-03-04 07:11:25 +01:00 |
|
|
|
4018fcb9b8
|
Merge pull request #9233 from bouk/bouk/apply-config-inner
config: add included files into parsedContents before applying
(cherry picked from commit 82359eba6b)
Change-Id: Idde3177010fec7b8bafe6088c3c23d5caf491845
|
2024-03-04 07:11:25 +01:00 |
|
|
|
a2d5e803cf
|
Merge pull request #9476 from alois31/restore-progress-bar
nix repl: Only hide the progress bar while waiting for user input
(cherry picked from commit 3bebaefcd0)
Change-Id: Ie7c0db46f7c2cf5f938e66bdd3c31f0b62bdb104
|
2024-03-04 07:11:25 +01:00 |
|
|
|
001be52794
|
Merge pull request #9430 from hercules-ci/remove-vlas
Fix stack overflow in `filter`
(cherry picked from commit cb7f25869d)
Change-Id: Ib90f97a9805bbb4d0e2741551d490f054fc0a675
|
2024-03-04 07:11:25 +01:00 |
|
|
|
a089d8f5f6
|
Merge pull request #9465 from obsidiansystems/build-dir
Use `buildprefix` in a few more places
(cherry picked from commit b6a3fde6b7)
Change-Id: I2790663fa9f8242ac2db6582b7e421d2fdf42942
|
2024-03-04 07:11:25 +01:00 |
|
