Eelco Dolstra
5f1340219b
Add builtins.patch
...
This replaces the 'patches' argument to builtins.fetchTree with
something more generic. So instead of 'builtins.fetchTree { patches =
... }' you can do 'builtins.patch { src = builtins.fetchTree { ... };
patchFiles = ... }'.
2022-06-10 13:10:22 +02:00
Eelco Dolstra
2b30df7b46
PatchingInputAccessor: Allow empty lines in patches
2022-06-10 12:44:50 +02:00
Eelco Dolstra
baee9fe7a2
Fix bad exception reported by @layus
2022-06-09 21:33:13 +02:00
Eelco Dolstra
dbe7fcebff
Merge remote-tracking branch 'origin/master' into lazy-trees
2022-06-09 21:27:16 +02:00
Eelco Dolstra
1bc17ae617
Merge pull request #6635 from sidkshatriya/small-move-optimization
...
nix-store: small std::move() optimization
2022-06-09 13:48:48 +02:00
Sidharth Kshatriya
3efea3d28a
nix-store: small std::move() optimization
2022-06-09 16:25:26 +05:30
Eelco Dolstra
12e86c0735
Merge pull request #6630 from edolstra/boost-dylib
...
Remove ${boost}/lib from the RPATH
2022-06-08 17:55:21 +02:00
Eelco Dolstra
4a3f217bde
Remove ${boost}/lib from the RPATH
2022-06-08 15:51:35 +02:00
Théophane Hufschmitt
694b12052a
Merge pull request #6624 from NixOS/new-flake-style
...
flake.nix: Convert to new naming convention
2022-06-08 13:34:09 +02:00
Eelco Dolstra
e88892dc21
Merge pull request #6627 from asymmetric/key-comment
...
Fix missing ` in key manual
2022-06-08 12:10:52 +02:00
Lorenzo Manacorda
814ddfa5f5
Fix missing ` in key manual
2022-06-08 11:46:50 +02:00
Eelco Dolstra
b2dea231cf
Merge pull request #6618 from afishhh/search-exclude
...
Add `-e`/`--exclude` flag to `nix search`
2022-06-07 19:01:36 +02:00
Fishhh
9ae22b1fde
Use grep -c instead of grep|wc -l in some nix search tests
2022-06-07 18:25:59 +02:00
Fishhh
0338cf5539
Add tests for --exclude flag in nix search
2022-06-07 18:25:52 +02:00
Fishhh
e009367c8d
Remove redundant std::moves in calls to hiliteMatches
2022-06-07 18:25:52 +02:00
Fishhh
b42358b9be
Add --exclude flag to nix search
...
If a package's attribute path, description or name contains matches for any of the
regexes specified via `-e` or `--exclude` that package is excluded from
the final output.
2022-06-07 18:25:48 +02:00
Eelco Dolstra
8977cdee6a
Merge pull request #6598 from cole-h/update-flake-for-real
...
flake: update to 22.05
2022-06-07 15:13:16 +02:00
Eelco Dolstra
faf80fa920
Convert to new flake style
...
https://github.com/NixOS/nix/issues/5532
2022-06-07 14:36:23 +02:00
Eelco Dolstra
0f8754cd30
Fix 22.05 eval warnings
2022-06-07 14:27:10 +02:00
Eelco Dolstra
5a9d83aa59
Disable cross builds on platforms other than x86_64-linux
...
Needed because evaluation was broken on x86_64-darwin.
2022-06-07 14:27:06 +02:00
Eelco Dolstra
739c358c68
Merge pull request #6602 from cw789/patch-2
...
Explain exactly what nix-upgrade nix does
2022-06-07 13:08:56 +02:00
Fishhh
d137ceccef
Fix incorrect comment in hiliteMatches
2022-06-05 20:30:18 +02:00
Eelco Dolstra
1dd7253133
Merge pull request #6603 from abathur/installer_fix_vi_swapfile
...
darwin-install: work around existing vim swap files
2022-06-03 08:51:48 +02:00
Eelco Dolstra
2097c30b08
Merge pull request #6600 from asymmetric/hash-comment
...
schema.sql: add comment about hash being in base16
2022-06-03 08:51:07 +02:00
Eelco Dolstra
b2edca1def
Merge pull request #6610 from edolstra/random-fixes
...
Random fixes/improvements from the lazy-trees branch
2022-06-03 08:50:16 +02:00
Eelco Dolstra
28e08822a3
Avoid unnecessary string copy
2022-06-02 21:26:28 +02:00
Eelco Dolstra
abb80cfa4c
Add operator for concatenating strings and string_views
2022-06-02 21:26:21 +02:00
Eelco Dolstra
24b3a500a7
Typo
2022-06-02 21:21:10 +02:00
Eelco Dolstra
81a486c607
Shut up clang warnings
2022-06-02 21:19:54 +02:00
Eelco Dolstra
2868acb4a5
tests/flakes.sh: Fix some ignored breakage
2022-06-02 21:19:16 +02:00
Eelco Dolstra
a1516f6120
tests/flakes.sh: Fix some ignored breakage
2022-06-02 17:05:32 +02:00
Eelco Dolstra
f70f7db42a
Fix clang error
2022-06-02 16:57:19 +02:00
Eelco Dolstra
7c0f08f79b
Shut up clang warnings
2022-06-02 16:55:28 +02:00
Eelco Dolstra
1dc58110fe
Avoid unnecessary string copy
2022-06-02 16:48:53 +02:00
Eelco Dolstra
e7c42e55e9
Fetch non-flake inputs using lazyFetch()
2022-06-02 16:26:00 +02:00
Eelco Dolstra
1c7d0b716d
Give a better error message in case of unlocked inputs
2022-06-02 16:15:57 +02:00
Chris Wögi
51b3cc151e
Explain exactly what nix-upgrade nix does
2022-06-02 15:05:27 +02:00
Eelco Dolstra
1395210a68
Typo
2022-06-02 14:46:19 +02:00
Eelco Dolstra
9d772bbf96
Remove 'nix flake archive'
...
This is because flakes are no longer substitutable.
2022-06-02 14:41:36 +02:00
Eelco Dolstra
76c71c015b
Typo
2022-06-02 14:04:03 +02:00
Eelco Dolstra
8a0a55fe12
Fix subflake handling
...
Relative 'path:' flake inputs now use the containing flake's
InputAccessor. This has the following implications:
* They're no longer locked in the lock file.
* They don't cause an additional copy to the store.
* They can reference the containing directory (i.e. a subflake can
have an input '../foo', so long as it doesn't go outside the
top-level containing flake).
Note: this is not a complete fix for subflake handling, since the lock
file currently makes it ambiguous what the containing flake is. We'll
probably need to add another field to the lock file for that.
Fixes #6352 .
2022-06-02 13:48:55 +02:00
Théophane Hufschmitt
1892355766
Merge pull request #5813 from pennae/lto
...
enable LTO in optimized builds
2022-06-01 19:07:58 +02:00
Théophane Hufschmitt
a5f7b934bd
Merge branch 'master' into lto
2022-06-01 17:55:03 +02:00
Travis A. Everett
505d6ee5e2
darwin-install: work around existing vim swapfiles
...
User on Matrix reported install problems which presented as
"vifs:editing error" which we traced back to vim griping about an
existing swap file. When opened interactively, it did this:
E325: ATTENTION
Found a swap file by the name "/etc/.fstab.swp"
owned by: root dated: Sön Apr 24 16:54:10 2022
file name: /private/etc/fstab
modified: YES
user name: root host name: MBP.local
process ID: 1698
While opening file "/etc/fstab"
dated: Sön Apr 24 16:56:27 2022
NEWER than swap file!
...
2022-06-01 09:41:00 -05:00
Lorenzo Manacorda
a9358a6097
schema.sql: add comment about hash being in base16
2022-06-01 14:59:57 +02:00
Eelco Dolstra
6ab3b86cf5
Return narHash when available
2022-06-01 14:20:38 +02:00
Eelco Dolstra
b01ee2a93d
nix flake init: Fix
2022-06-01 13:54:34 +02:00
Eelco Dolstra
da553de7b1
Fix template checking
2022-06-01 13:38:17 +02:00
Eelco Dolstra
6285c91619
nix profile upgrade: Handle unlockable inputs properly
2022-06-01 13:25:13 +02:00
Eelco Dolstra
f917970df8
Set locked flag
2022-06-01 13:16:23 +02:00
