Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[pull] master from NixOS:master #28

Open
wants to merge 8,538 commits into
base: master
Choose a base branch
from
Open
Changes from 1 commit
Commits
Show all changes
8538 commits
Select commit Hold shift + click to select a range
03dc3c5
Merge pull request #11869 from NixOS/unbloat-nix-everything
Ericson2314 Nov 13, 2024
b9f8c4a
fix(libmain/common-args): do not exceed maximum allowed verbosity
xokdvium Nov 13, 2024
cb7c7af
Merge pull request #11853 from xokdvium/dev/fix-verbosity-overflow-an…
Mic92 Nov 13, 2024
e53e0a0
Fix typo in nix-collect-garbage.md
dbdr Nov 14, 2024
a95f6ea
Merge pull request #11882 from dbdr/patch-1
fricklerhandwerk Nov 14, 2024
33a0fa8
nix path-info: Don't write to std::cout directly
edolstra Nov 14, 2024
3e4a83f
Use range-based for
edolstra Nov 14, 2024
2f3764a
.github/ci: Add nix-docker test
roberth Nov 15, 2024
c9433c0
.github/ci: Push docker only when test succeeds
roberth Nov 15, 2024
b479036
Merge pull request #11884 from DeterminateSystems/nix-path-info-cout
edolstra Nov 15, 2024
3f6855c
doc/nix fmt: Mention nixfmt-rfc-style instead of nixfmt(-classic)
myclevorname Nov 17, 2024
68e15be
Merge pull request #11844 from roberth/papercut-nix-log
Ericson2314 Nov 18, 2024
4387c5a
Merge pull request #11894 from myclevorname/nixfmt
fricklerhandwerk Nov 18, 2024
d8d5929
Merge pull request #9854 from the-sun-will-rise-tomorrow/docker-user
roberth Nov 18, 2024
d65fac0
Add --print-errorlogs to mesonCheckFlags
roberth Nov 18, 2024
428af8c
tests/functional/flakes/develop.sh: Don't hang
edolstra Nov 18, 2024
d8a80e1
Merge pull request #11899 from NixOS/meson-print-errorlogs
edolstra Nov 18, 2024
61d0758
Merge pull request #11866 from DeterminateSystems/callFunction-span
roberth Nov 18, 2024
0498e22
Merge pull request #11901 from DeterminateSystems/fix-nix-develop-test
edolstra Nov 18, 2024
c4b95db
Fix issue 11892
roberth Nov 18, 2024
6b0acee
Merge pull request #11902 from roberth/fix-issue-11892
roberth Nov 18, 2024
e224a35
docs/flake: document how to build a pull request
Mic92 Nov 19, 2024
3b76d01
Merge pull request #11907 from Mic92/pull-request
fricklerhandwerk Nov 19, 2024
dd48389
document shallow clone options in git fetchers
Mic92 Nov 19, 2024
8502819
Clean up flakeref parsing
edolstra Nov 19, 2024
868b4d3
nix flake init: Operate on a SourcePath
edolstra Nov 19, 2024
f1b4f14
Trivial changes from lazy-trees
edolstra Nov 19, 2024
a58e38d
Make EvalState::getBuiltin safe for missing attr
roberth Nov 19, 2024
af07f33
resolveLookupPathPath(): Return a SourcePath instead of a string
edolstra Nov 19, 2024
370dfcb
Merge pull request #11911 from DeterminateSystems/trivial
edolstra Nov 19, 2024
8a36d2d
Add EvalState::getBuiltins
roberth Nov 19, 2024
5c258d7
refactor: Use EvalState::getBuiltins()
roberth Nov 19, 2024
e948c8e
Bump fetcher cache version
roberth Nov 19, 2024
8637f3d
Merge pull request #11910 from DeterminateSystems/flake-init
roberth Nov 19, 2024
ce6b5de
Merge pull request #11913 from DeterminateSystems/source-path-in-look…
roberth Nov 19, 2024
32becc8
Merge pull request #11914 from roberth/evalstate-get-builtins
roberth Nov 19, 2024
4fca22b
Update issue and pull request templates
Pandapip1 Nov 19, 2024
df9ccdf
BasicDerivation: Add applyRewrites() method
edolstra Nov 19, 2024
ced8d31
gc: resume GC after a pathinuse error
picnoir Nov 20, 2024
1800853
fix(libexpr/eval-inline): get rid of references to nullptr env
xokdvium Nov 14, 2024
a7e1f2d
Merge pull request #11912 from DeterminateSystems/apply-rewrites
Ericson2314 Nov 20, 2024
c13c606
Merge pull request #11922 from picnoir/pic/catch-gc-exception
Mic92 Nov 20, 2024
ad7ad01
EvalState::callPathFilter(): Remove unnecessary pathArg argument
edolstra Nov 20, 2024
5533b0c
Move shebang flake tests into a separate test
edolstra Nov 20, 2024
fd2df5f
Rename nonFlakeDir -> scriptDir
edolstra Nov 20, 2024
e1cb905
Move --commit-lock-file-summary tests into a separate file
edolstra Nov 20, 2024
4cafea7
Add a utility function for creating/registering a simple flake
edolstra Nov 20, 2024
5883647
Merge pull request #11924 from DeterminateSystems/remove-callPathFilt…
Mic92 Nov 20, 2024
5256aa0
Merge pull request #11881 from xokdvium/dev/get-rid-of-nullptr-refere…
Mic92 Nov 20, 2024
6832ee5
Move non-flake input tests into a separate file
edolstra Nov 20, 2024
d002324
Merge remote-tracking branch 'origin/master' into nix-copy-gc
edolstra Nov 20, 2024
db05256
Formatting
edolstra Nov 20, 2024
18ab72a
Merge pull request #11657 from DeterminateSystems/nix-copy-gc
edolstra Nov 20, 2024
2f24030
Move bug report list to comment and make it more nix-specific
Pandapip1 Nov 20, 2024
82f6fba
Merge pull request #11668 from DeterminateSystems/schema-migrations
Ericson2314 Nov 20, 2024
671df02
shellcheck
edolstra Nov 20, 2024
e122ace
Fix VM test
edolstra Nov 20, 2024
4a18c78
flake_regressions: Pass -L to nix build
edolstra Nov 20, 2024
b767987
Merge pull request #11926 from DeterminateSystems/split-flake-tests
edolstra Nov 20, 2024
fa17927
Merge pull request #11917 from Pandapip1/update-issue-template-consis…
Mic92 Nov 21, 2024
45b0158
Merge pull request #11915 from NixOS/bump-fetcher-cache-version
edolstra Nov 21, 2024
f4f4b69
fetchTree: Don't crash if narHash is missing
edolstra Nov 21, 2024
965ca18
Merge build-utils-meson/{diagnostics,threads} into build-utils-meson/…
edolstra Nov 21, 2024
ed120a6
Use -O3 again
edolstra Nov 21, 2024
ba07446
doc: Clarify that nix-shell still uses shell from host environment (#…
CyberShadow Nov 21, 2024
09e989f
Merge pull request #11934 from DeterminateSystems/fix-optimization
Ericson2314 Nov 22, 2024
838d3c1
Merge pull request #11933 from DeterminateSystems/no-narHash
Mic92 Nov 22, 2024
ebb19cc
Drop std::make_pair
edolstra Nov 22, 2024
feb4668
Merge pull request #11909 from DeterminateSystems/flakeref
edolstra Nov 22, 2024
3e9cc78
Merge pull request #11908 from Mic92/pull-request
tomberek Nov 22, 2024
756758d
chore: get rid of dead code and unused variables where appropriate
xokdvium Nov 22, 2024
09ddc34
refactor(libfetchers/registry): use standard remove_if + erase
xokdvium Nov 23, 2024
fb6e37b
Merge pull request #11943 from xokdvium/dev/registry-remove-use-erase
Mic92 Nov 24, 2024
acb60fc
Merge pull request #11937 from xokdvium/dev/exterminate-dead-variables
Mic92 Nov 24, 2024
fbffd47
build(lib{expr,store,util}-test-support): depend on -c libraries
xokdvium Nov 23, 2024
66f0132
Merge pull request #11942 from xokdvium/dev/make-test-support-headers…
Ericson2314 Nov 24, 2024
4145d18
Rename install-nix-from-closure.sh into install-nix-from-tarball.sh
abitrolly Nov 23, 2024
bb1a1fd
Merge pull request #11938 from abitrolly/closure-to-tarball
Mic92 Nov 24, 2024
82a23d9
libexpr-c: Add nix_eval_state_builder
roberth Nov 22, 2024
1bd7517
Doc nix_get_path_string
roberth Nov 22, 2024
f06f611
refactor: Extract unsafe_new_with_self
roberth Nov 22, 2024
4eecf3c
Add nix-flake-c, nix_flake_init_global, nix_flake_settings_new
roberth Nov 22, 2024
d004c52
test: Change FAIL to throw
roberth Nov 24, 2024
6db6b26
.github/ci: Set max-jobs to 1, to reduce peak memory usage
roberth Nov 25, 2024
46b0f77
Merge pull request #11940 from NixOS/c-api-libflake
roberth Nov 25, 2024
6502dc4
ci(Mergify): configuration update
roberth Nov 25, 2024
7e68306
Merge pull request #11950 from NixOS/mergify/roberth/config-update
roberth Nov 25, 2024
3fb7481
source-accessor: fix case where normalization goes beyond root
Mic92 Nov 24, 2024
3180c09
Merge pull request #11951 from Mic92/libstore
Mic92 Nov 25, 2024
57fea81
Work around gcc warning
edolstra Nov 25, 2024
4fc5295
Merge pull request #11953 from DeterminateSystems/fix-warning
Ericson2314 Nov 25, 2024
fafaec5
fix(treewide): remove unnecessary copying in range for loops
xokdvium Nov 23, 2024
f9980b5
fix(libutil/config): declare virtual dtor for AbstractConfig
xokdvium Nov 25, 2024
121020f
Merge pull request #11956 from xokdvium/dev/get-rid-of-non-virtual-dt…
Ericson2314 Nov 25, 2024
5b8728d
more readable errors if symlinks cannot be created
Mic92 Nov 26, 2024
4f50b1d
Merge pull request #11944 from xokdvium/dev/remove-unnecessary-copies
edolstra Nov 26, 2024
d0f84fd
Merge pull request #11959 from Mic92/better-errors
edolstra Nov 26, 2024
d67aa03
src/perl/meson.build: fall back to 'bz2' library lookup
trofi Nov 26, 2024
ad7e838
Merge pull request #11974 from trofi/nix-bz2-fallback
Ericson2314 Nov 26, 2024
2679e55
tests/functional/meson.build: always look up `ls` as a `coreutils` proxy
trofi Nov 26, 2024
d467f7a
Merge pull request #11976 from trofi/coreutils-by-ls
Mic92 Nov 27, 2024
21ddd20
mergify: drop installer test
Mic92 Nov 27, 2024
a5c7709
docker: Fix command "nix profile install", Don't require --impure
h0nIg Nov 27, 2024
37fd805
shellcheck: simplify install-nix-from-tarball.sh
abitrolly Nov 27, 2024
8034589
parser-state: fix attribute merging
rhendric Aug 14, 2024
2d5a9f0
Merge pull request #11982 from abitrolly/tarball-clean-script
Mic92 Nov 27, 2024
5756caf
Merge pull request #11294 from rhendric/rhendric/fix-11268
Mic92 Nov 27, 2024
e5e0900
Work around gcc warning
edolstra Nov 28, 2024
daa8ceb
Merge pull request #11986 from DeterminateSystems/fix-warning
edolstra Nov 28, 2024
10c578e
Merge pull request #11980 from h0nIg/patch-1
edolstra Nov 29, 2024
6400048
Merge pull request #11977 from Mic92/installer
roberth Nov 29, 2024
04975f7
install: Allow to specify alternative `sudo` command
abitrolly Oct 28, 2024
e83481f
Allow `sudo` alternatives when installing from tarball
abitrolly Nov 23, 2024
747cf4e
fix: Add splicing to fix the manual in cross
roberth Nov 6, 2024
8e0913b
Merge pull request #11820 from hercules-ci/fix-cross-manual
edolstra Dec 2, 2024
d67e24a
fix: Add missing manpages to meson.build
roberth Dec 2, 2024
038ab46
Restore org.nixos.nix-daemon.plist installation
roberth Dec 3, 2024
63c0f0d
Install init system configs only when relevant
roberth Dec 3, 2024
ff00eeb
Merge pull request #12000 from NixOS/fix-men
Mic92 Dec 3, 2024
abcfdb4
s3-binary-cache: show the error's request ID
mupdt Dec 4, 2024
a8a572b
Merge pull request #12007 from mupdt/s3-binary-cache-error-request-id
edolstra Dec 4, 2024
3b21ea4
HttpBinaryCacheStore: Improve error message for unauthorized caches
edolstra Dec 4, 2024
d1894f3
tests: derivation-advanced-attributes unset NIX_STORE
wh0 Dec 5, 2024
52f1cd0
nix hash convert: Support SRI hashes that lack trailing '=' characters
edolstra Dec 5, 2024
33b645c
nix hash convert: Don't fail on uppercase base-16 hashes
edolstra Dec 5, 2024
408c2fa
nix hash: Don't print 'nix hash' deprecation message
edolstra Dec 5, 2024
4137ead
Disable suid and atime on the /nix mount point on Darwin
grahamc Dec 5, 2024
49fa31f
Fix typo (#12015)
dwt Dec 5, 2024
a7cdb55
Merge pull request #12013 from DeterminateSystems/fix-11996
roberth Dec 5, 2024
ab5a9cf
Merge pull request #12016 from grahamc/patch-2
Mic92 Dec 6, 2024
ad296ea
Test: more specific error message for `head`
mightyiam Dec 6, 2024
ad3a67a
optimize string concat
Dec 7, 2024
3081e7c
Merge pull request #12025 from NaN-git/strlen
edolstra Dec 9, 2024
8b9e0f8
nix flake lock: Fail if there is an unlocked input
edolstra Dec 9, 2024
e82ff51
tests/functional/dependencies.nix: Refactor, replace arcane let
roberth Nov 20, 2024
ee03fd4
libutil: handle json builder log messages with unexpected format
lheckemann Oct 11, 2024
1485937
tests/functional/dependencies.nix: Check that we tolerate syntax and …
roberth Nov 20, 2024
03d4bfd
Push log source description out of libutil and report build hook @nix…
roberth Nov 21, 2024
8490fba
Improve error messages for head/elemAt
edolstra Dec 9, 2024
1edf868
rename: nix-tests -> nix-daemon-compat-tests
roberth Dec 9, 2024
d0b4db9
rename: build-utils-meson -> nix-meson-build-support
roberth Dec 9, 2024
1421420
test: Move unusual-logging to run only in logging test case
roberth Dec 9, 2024
f3c722c
Remove redundant warning: prefix from structured build log warning
roberth Dec 9, 2024
c783cd2
tests: Make unusual logging test conditional on fixed daemon version
roberth Dec 9, 2024
6d86839
Use version correctly in nix-daemon-compat-tests derivation
roberth Dec 9, 2024
62d3957
Remove dead code from nix-daemon-compat-tests packaging
roberth Dec 9, 2024
8ecf848
Merge pull request #12030 from roberth/rename-nix-daemon-compat-tests
edolstra Dec 9, 2024
b6250dc
Merge pull request #12029 from roberth/meson-build-support
roberth Dec 9, 2024
8768239
Install .nix-channels and nix.conf with 644 instead of 664
cole-h Dec 9, 2024
35dd19d
ensure clang-format is using the same version on all platforms
Mic92 Dec 9, 2024
9b40618
tests/nixos: disable documentation to improve eval speed
Mic92 Dec 9, 2024
3a9d64b
fromJSON/fromTOML: throw if string contains null byte
Dec 7, 2024
747256c
Merge pull request #11921 from NixOS/log-json-tolerant
Ericson2314 Dec 9, 2024
41a464c
tests/libstore.hh: reformat with clang-format after update
Mic92 Sep 24, 2024
b5cdf2e
mergify: don't use rebase merge method
Mic92 Dec 10, 2024
8c25eac
Merge pull request #12031 from DeterminateSystems/fixup-mode-typos
Mic92 Dec 10, 2024
7bd8ece
Merge pull request #12009 from DeterminateSystems/401-cache
Mic92 Dec 10, 2024
50ba851
Merge pull request #12024 from NaN-git/null-char
edolstra Dec 10, 2024
6d97d57
Prune unneeded .gitignore entries
edolstra Dec 11, 2024
da2c254
Merge pull request #12033 from Mic92/various-picks
edolstra Dec 11, 2024
be04e68
Merge pull request #12036 from Mic92/mergify
edolstra Dec 11, 2024
9cf1b0c
Merge pull request #11761 from abitrolly/alt-sudo
mergify[bot] Dec 12, 2024
f1187cb
Merge pull request #12039 from DeterminateSystems/gitignore
mergify[bot] Dec 12, 2024
691b1ea
speed up ci by splitting off eval and build
Mic92 Dec 14, 2024
31b3a34
binary-tarball: create tarball without listing files
Mic92 Dec 14, 2024
9f2b925
ci: disable apparmor restrictions
Mic92 Dec 14, 2024
9389b27
Merge pull request #12050 from Mic92/ci
mergify[bot] Dec 14, 2024
4f831e2
Fix `nix upgrade-nix` profile search
gcurtis Dec 12, 2024
44bc4c6
Merge pull request #12023 from mightyiam/head-called-on-empty-list
mergify[bot] Dec 14, 2024
3666113
Implement shellSplitString for proper handling of NIX_SSHOPTS with sp…
elikoga Dec 6, 2024
77e391b
Merge pull request #12012 from wh0/patch-1
mergify[bot] Dec 14, 2024
bf24092
Merge pull request #12020 from elikoga/ssh-opts-split-as-shell-args
mergify[bot] Dec 14, 2024
7d1c41f
C API: typo
roberth Dec 13, 2024
80ee736
C API: document nix_store_open NULL URI
roberth Dec 13, 2024
472912f
C API: Add nix_store_get_storedir
roberth Dec 12, 2024
2a98168
C API: Add nix_store_real_path
roberth Dec 12, 2024
6a23803
Merge pull request #12044 from roberth/c-api-nix-store
mergify[bot] Dec 14, 2024
da7f7ba
functional-tests: skip tests if the kernel restricts unprivileged use…
Mic92 Dec 14, 2024
6162e12
installer: make sure we can always test the installer in ci and locally
Mic92 Dec 14, 2024
df3eb4f
mergify: updated required tests
Mic92 Dec 15, 2024
ccaa4c2
upgrade-nix: don't double quote path on error
Mic92 Dec 15, 2024
3663480
Merge pull request #12048 from gcurtis/fix-upgrade-nix
mergify[bot] Dec 15, 2024
7ddf730
Ignore local registries for lock file generation
edolstra Dec 6, 2024
2baab64
Merge pull request #12028 from DeterminateSystems/fail-on-unlocked
mergify[bot] Dec 16, 2024
2f32cf6
Merge pull request #12068 from Mic92/ignore-local-registries
mergify[bot] Dec 16, 2024
d8117c8
libexpr: always initialize displacement
Mic92 Dec 16, 2024
d1f20e3
Make FetchedFlake a struct
edolstra Dec 16, 2024
d2e1d49
lookupInFlakeCache(): Fix O(n) time lookup
edolstra Dec 10, 2024
b167e2c
Work around clang/libc++ issue
edolstra Dec 11, 2024
bdf579d
Merge pull request #12051 from Mic92/ci-follow-up
edolstra Dec 16, 2024
f8eb2f6
Merge pull request #12038 from DeterminateSystems/flake-cache
edolstra Dec 16, 2024
18770c7
Merge pull request #12059 from Mic92/installer-test
roberth Dec 16, 2024
08361f0
EvalState::realiseContext(): Allow access to the entire closure
edolstra Dec 13, 2024
a24d1c3
Merge pull request #12045 from DeterminateSystems/allow-closure
roberth Dec 16, 2024
cd002ae
flake.nix: switch to nixpkgs 24.11
Mic92 Sep 22, 2024
9131905
use libgit2 from nixpkgs
Mic92 Sep 22, 2024
1a8bd84
remove upstreamed busybox-sandbox-shell
Mic92 Sep 22, 2024
81b6b79
remove upstreamed libseccomp
Mic92 Sep 22, 2024
b5ad051
remove upstreamed toml11 package override
Mic92 Sep 22, 2024
cf0ba0d
netbsd: disable cross-compilation
Mic92 Sep 25, 2024
2512619
switch to lowdown-unsandboxed package
Mic92 Dec 3, 2024
20ee83f
tests/nixos: disable nixos-option
Mic92 Dec 9, 2024
51463d2
Fix flake.lock/flake.nix mix-up
Jayman2000 Dec 16, 2024
da7e3be
Merge pull request #12080 from Jayman2000/flake.lock-original-descrip…
edolstra Dec 16, 2024
331bf3e
Git fetcher: Calculate a fingerprint for dirty workdirs
edolstra Nov 29, 2024
d044a05
Don't fingerprint dirty repos with submodules for now
edolstra Dec 3, 2024
f469bc2
Cache result of Input::getFingerprint()
edolstra Dec 4, 2024
7ba933e
Cache calls to GitRepo::getWorkdirInfo()
edolstra Dec 4, 2024
b9f60fa
Fix macOS build
edolstra Dec 4, 2024
33852ea
Optimisation
edolstra Dec 4, 2024
757ea70
Add a test
edolstra Dec 17, 2024
00f08de
Merge pull request #11992 from DeterminateSystems/dirty-git-fingerprint
edolstra Dec 17, 2024
b338140
fix missing includes in various headers
Mic92 Dec 16, 2024
b9bbdbe
ca-fd-leak: add missing c casts
Mic92 Dec 16, 2024
eda331e
libutil/windows: only define headers/code if we are actually on windows
Mic92 Dec 16, 2024
3392a96
ca-fd-leak: fix various unsafe c handling
Mic92 Dec 16, 2024
6848154
regex-combinators: fix linter error when adding string_view and string
Mic92 Dec 16, 2024
5cd5391
checks: re-enable perlBindings
Mic92 Dec 15, 2024
8117f16
Merge pull request #12063 from Mic92/speed-up-ci
mergify[bot] Dec 17, 2024
3f3feae
Merge pull request #12071 from Mic92/clang-tidy
mergify[bot] Dec 17, 2024
a8e1b47
filesystem/deletePath: remove unnecessary quotes from error message
Mic92 Dec 19, 2024
535724f
tests/nixos/s3-binary-cache-store: test that "object does not exist" …
cole-h Dec 19, 2024
f0c1262
tests/nixos/s3-binary-cache-store: disable default substituter so it …
cole-h Dec 19, 2024
b978fa8
libstore: fixup unformatted uri when S3 getObject fails
cole-h Dec 19, 2024
6126007
Merge pull request #12091 from cole-h/fixup-s3-bad-error-formatting
edolstra Dec 19, 2024
f72752c
Merge pull request #12089 from Mic92/delete-path
edolstra Dec 20, 2024
4a91e62
fix: ignore symlinks in fsync-store-paths
CertainLach Dec 25, 2024
bff9296
Merge pull request #12103 from CertainLach/fsync-store-paths-symlinks
mergify[bot] Dec 25, 2024
fe5f02c
ci: lock Ubuntu runner to ubuntu-22.04
trueNAHO Dec 27, 2024
cf69c99
Make `readFileType` doc string consistent
knotapun Dec 27, 2024
92e3095
try to calculate character width
Dec 15, 2024
b3eab02
Merge pull request #12066 from NaN-git/utf-8
Mic92 Dec 28, 2024
8a3fc27
Merge pull request #12110 from knotapun/patch-1
mergify[bot] Dec 28, 2024
1e2cace
fix documentation of substring
Dec 28, 2024
b5f1065
ci: update Ubuntu runner to ubuntu-24.04
trueNAHO Dec 27, 2024
ce1e9ba
ci: lock macOS runner to macos-14
trueNAHO Dec 27, 2024
5c968be
m4/gcc_bug_80431.m4: drop unused file
trofi Dec 29, 2024
edbfe86
libcmd: update to support lowdown-1.4 API
trofi Dec 29, 2024
968aabf
Merge pull request #12114 from NaN-git/doc-fix
fricklerhandwerk Dec 30, 2024
a7f5563
Merge pull request #12116 from trofi/drop-m4
roberth Dec 30, 2024
61c3559
Merge pull request #12115 from trofi/libcmd-lowdown-1.4-support
roberth Dec 30, 2024
1a402e0
test: test eval of newlines with raw output
not-my-profile Dec 31, 2024
3859b3b
Merge pull request #11566 from Mic92/nixpkgs-upgrade
roberth Dec 31, 2024
7a8a286
feat(nix-instantiate): add --raw flag
not-my-profile Dec 31, 2024
5e21bdc
.github/ci: Use fixed names
roberth Dec 31, 2024
18f0770
Merge pull request #12119 from not-my-profile/nix-instantiate-raw
mergify[bot] Dec 31, 2024
4a2310a
toJSON: re-throw serialization exception
Dec 31, 2024
4f3960e
Merge pull request #12127 from NaN-git/json-ser
roberth Dec 31, 2024
5ebc8d4
Merge pull request #12109 from trueNAHO/workflows-lock-ubuntu-and-mac…
Mic92 Jan 1, 2025
deb3533
Merge pull request #12126 from NixOS/workflow-name
Mic92 Jan 1, 2025
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
doc/nix fmt: Mention nixfmt-rfc-style instead of nixfmt(-classic)
  • Loading branch information
myclevorname authored Nov 17, 2024
commit 3f6855c31b8d35b39148a86c2c28c7e2f367b739
4 changes: 2 additions & 2 deletions src/nix/fmt.md
Original file line number Diff line number Diff line change
Expand Up @@ -22,13 +22,13 @@ With [nixpkgs-fmt](https://github.com/nix-community/nixpkgs-fmt):
}
```

With [nixfmt](https://github.com/serokell/nixfmt):
With [nixfmt](https://github.com/NixOS/nixfmt):

```nix
# flake.nix
{
outputs = { nixpkgs, self }: {
formatter.x86_64-linux = nixpkgs.legacyPackages.x86_64-linux.nixfmt;
formatter.x86_64-linux = nixpkgs.legacyPackages.x86_64-linux.nixfmt-rfc-style;
};
}
```
Expand Down