1
0
Fork 0
mirror of https://github.com/NixOS/nix synced 2025-06-27 16:51:15 +02:00
Commit graph

19501 commits

Author SHA1 Message Date
Robert Hensing
038ab46d7a Restore org.nixos.nix-daemon.plist installation 2024-12-03 16:37:07 +01:00
Brian Camacho
169d62a382 Merge branch 'master' into lfs 2024-12-02 15:06:28 -05:00
Brian Camacho
79a6438c68 fix sizeCallback 2024-12-02 14:53:19 -05:00
Brian Camacho
85d6efb40d trim storepath in test 2024-12-02 14:52:51 -05:00
Robert Hensing
d67e24afec fix: Add missing manpages to meson.build 2024-12-02 17:42:11 +01:00
Eelco Dolstra
8e0913b84a
Merge pull request #11820 from hercules-ci/fix-cross-manual
Fix cross build (was: fix manual)
2024-12-02 16:51:59 +01:00
Robert Hensing
747cf4e50f fix: Add splicing to fix the manual in cross
We *could* use a "native" manual instead - ie reusing a native
`nixpkgsFor.${buildPlatform}`, but this works, and also
works for possible cases where we have a custom or patched build tool.
2024-12-02 15:55:18 +01:00
Anatoli Babenia
e83481f5a8 Allow sudo alternatives when installing from tarball 2024-12-01 14:36:58 +03:00
Anatoli Babenia
04975f7c32 install: Allow to specify alternative sudo command 2024-11-30 10:07:29 +03:00
Robert Hensing
6400048116
Merge pull request #11977 from Mic92/installer
mergify: drop installer test
2024-11-29 15:54:50 +01:00
Eelco Dolstra
10c578ec4b
Merge pull request #11980 from h0nIg/patch-1
docker: Fix command "nix profile install", Don't require --impure
2024-11-29 13:13:28 +01:00
Eelco Dolstra
daa8ceb022
Merge pull request #11986 from DeterminateSystems/fix-warning
Work around gcc warning
2024-11-28 16:13:30 +01:00
Eelco Dolstra
e5e09006f9 Work around gcc warning
Same as 57fea81f8a.
2024-11-28 15:25:51 +01:00
Jörg Thalheim
5756caf1c3
Merge pull request #11294 from rhendric/rhendric/fix-11268
parser-state: fix attribute merging
2024-11-27 22:23:34 +01:00
Jörg Thalheim
2d5a9f064a
Merge pull request #11982 from abitrolly/tarball-clean-script
shellcheck: simplify install-nix-from-tarball.sh
2024-11-27 21:53:09 +01:00
Ryan Hendrickson
8034589d7e parser-state: fix attribute merging 2024-11-27 21:41:47 +01:00
Eelco Dolstra
985b2f9df3 Remove FIXME 2024-11-27 15:23:56 +01:00
Anatoli Babenia
37fd80588f shellcheck: simplify install-nix-from-tarball.sh 2024-11-27 17:11:36 +03:00
h0nIg
a5c7709f97
docker: Fix command "nix profile install", Don't require --impure 2024-11-27 13:24:46 +01:00
Jörg Thalheim
21ddd2022e mergify: drop installer test 2024-11-27 07:40:23 +01:00
Jörg Thalheim
d467f7a019
Merge pull request #11976 from trofi/coreutils-by-ls
tests/functional/meson.build: always look up `ls` as a `coreutils` proxy
2024-11-27 07:23:15 +01:00
Sergei Trofimovich
2679e55232 tests/functional/meson.build: always look up ls as a coreutils proxy
Without the change `meson setup` fails on `Gentoo or Debian as those
don't use multicall binary:

    $ meson setup ..
    ...
    Executing subproject nix-functional-tests
    ...
    ../src/nix-functional-tests/meson.build:24:14: ERROR: Program 'coreutils' not found or not executable

The change always uses `ls` to look `coreutils` up.

Closes: https://github.com/NixOS/nix/issues/11975
2024-11-26 23:08:10 +00:00
John Ericson
ad7e83855c
Merge pull request #11974 from trofi/nix-bz2-fallback
src/perl/meson.build: fall back to 'bz2' library lookup
2024-11-26 16:37:55 -05:00
Sergei Trofimovich
d67aa03414 src/perl/meson.build: fall back to 'bz2' library lookup
Upstream `bzip2` does not provide `pkg-config` files. As a result an
attempt to build `nix` on some distributions like Gentoo failos the
configure as:

    $ meson setup ..
    ...
    Executing subproject perl
    ...
    perl| Run-time dependency bzip2 found: NO (tried pkgconfig and cmake)
    ../src/perl/meson.build:68:12: ERROR: Dependency "bzip2" not found, tried pkgconfig and cmake

The change falls back to `bz2` library for such cases.
2024-11-26 18:37:53 +00:00
Eelco Dolstra
d0f84fd2a5
Merge pull request #11959 from Mic92/better-errors
more readable errors if symlinks cannot be created
2024-11-26 18:06:27 +01:00
Eelco Dolstra
4f50b1d178
Merge pull request #11944 from xokdvium/dev/remove-unnecessary-copies
fix(treewide): remove unnecessary copying in range for loops
2024-11-26 12:56:51 +01:00
Jörg Thalheim
5b8728d393 more readable errors if symlinks cannot be created
Before:

filesystem error: cannot create symlink: Permission denied [/nix/store/1s2p3a4rs172336hj2l8n20nz74hf71j-nix-eval-jobs-2.24.1.drv] [/1s2p3a4rs172336hj2l8n20nz74hf71j-nix-eval-jobs-2.24.1.drv.tmp-2772352-1316231068]

Now:

creating symlink '/wfxz2q489c811n08cdqj7ywxm3n4z6m5-nix-eval-jobs-2.24.1.drv.tmp-2971297-324653080' -> '/nix/store/wfxz2q489c811n08cdqj7ywxm3n4z6m5-nix-eval-jobs-2.24.1.drv': Permission denied
2024-11-26 09:35:40 +01:00
Leandro Reina
6778d24a27 Add (currently failing) test for flake inputs 2024-11-25 23:56:32 +01:00
Leandro Reina
2bb2dc1ede Fix lint 2024-11-25 23:35:29 +01:00
John Ericson
121020fc50
Merge pull request #11956 from xokdvium/dev/get-rid-of-non-virtual-dtor-warning
fix(libutil/config): declare virtual dtor for AbstractConfig
2024-11-25 17:00:27 -05:00
Sergei Zimmerman
f9980b5715 fix(libutil/config): declare virtual dtor for AbstractConfig
This prevents any potential cases of deletion through base pointer and its
non-virtual dtor, which might leak memory. Also gets rid of the warning:

/nix/store/fg7ass3a5m5pgl26qzfdniicbwbgzccy-gcc-13.2.0/include/c++/13.2.0/bits/stl_construct.h:88:2: warning: destructor called on non-final 'nix::flake::Settings' that has virtual functions but non-virtual destructor [-Wdelete-non-abstract-non-virtual-dtor]
   88 |         __location->~_Tp();
....
../src/libflake-c/nix_api_flake.cc:10:30: note: in instantiation of function template specialization 'nix::make_ref<nix::flake::Settings>' requested here
   10 |         auto settings = nix::make_ref<nix::flake::Settings>();
2024-11-26 00:17:30 +03:00
Sergei Zimmerman
fafaec5ac3 fix(treewide): remove unnecessary copying in range for loops
This gets rid of unnecessary copies in range-based-for loops and
local variables, when they are used solely as `const &`.

Also added a fixme comment about a suspicious move out of const,
which might not be intended.
2024-11-26 00:06:29 +03:00
Leandro Reina
38fb40204f Fix lfs toURL missing argument 2024-11-25 21:01:47 +01:00
Leandro Reina
d201b2872e Pass lfs flag to submodules 2024-11-25 21:01:16 +01:00
Leandro Reina
c9a8bd6f4d Work around https://github.com/libgit2/libgit2/issues/6946 2024-11-25 21:00:45 +01:00
John Ericson
4fc5295328
Merge pull request #11953 from DeterminateSystems/fix-warning
Work around gcc warning
2024-11-25 10:40:06 -05:00
Eelco Dolstra
57fea81f8a Work around gcc warning
This shuts up a 300-line warning that includes

  /nix/store/fg7ass3a5m5pgl26qzfdniicbwbgzccy-gcc-13.2.0/include/c++/13.2.0/bits/stl_tree.h:182:25: warning: ‘*(std::_Rb_tree_header*)((char*)&<unnamed> + offsetof(nix::value_type, nix::DerivedPath::<unnamed>.std::variant<nix::DerivedPathOpaque, nix::DerivedPathBuilt>::<unnamed>.std::__detail::__variant::_Variant_base<nix::DerivedPathOpaque, nix::DerivedPathBuilt>::<unnamed>.std::__detail::__variant::_Move_assign_base<false, nix::DerivedPathOpaque, nix::DerivedPathBuilt>::<unnamed>.std::__detail::__variant::_Copy_assign_base<false, nix::DerivedPathOpaque, nix::DerivedPathBuilt>::<unnamed>.std::__detail::__variant::_Move_ctor_base<false, nix::DerivedPathOpaque, nix::DerivedPathBuilt>::<unnamed>.std::__detail::__variant::_Copy_ctor_base<false, nix::DerivedPathOpaque, nix::DerivedPathBuilt>::<unnamed>.std::__detail::__variant::_Variant_storage<false, nix::DerivedPathOpaque, nix::DerivedPathBuilt>::_M_u) + 24).std::_Rb_tree_header::_M_header.std::_Rb_tree_node_base::_M_parent’ may be used uninitialized [-Wmaybe-uninitialized]
    182 |       if (__x._M_header._M_parent != nullptr)
        |           ~~~~~~~~~~~~~~^~~~~~~~~
2024-11-25 16:01:54 +01:00
Jörg Thalheim
3180c09723
Merge pull request #11951 from Mic92/libstore
source-accessor: fix case where normalization goes beyond root
2024-11-25 15:46:18 +01:00
Jörg Thalheim
3fb7481e64 source-accessor: fix case where normalization goes beyond root
fixes https://github.com/NixOS/nix/issues/11936
2024-11-25 15:11:36 +01:00
Robert Hensing
7e68306a4b
Merge pull request #11950 from NixOS/mergify/roberth/config-update
ci(Mergify): configuration update
2024-11-25 12:41:32 +01:00
Robert Hensing
6502dc4d6a ci(Mergify): configuration update
Signed-off-by: Robert Hensing <null>
2024-11-25 12:06:54 +01:00
Robert Hensing
46b0f7755f
Merge pull request #11940 from NixOS/c-api-libflake
C API: Add libflake-c
2024-11-25 10:00:56 +01:00
Robert Hensing
6db6b269ed .github/ci: Set max-jobs to 1, to reduce peak memory usage 2024-11-25 09:22:26 +01:00
Robert Hensing
d004c524b8 test: Change FAIL to throw
[FAIL()] is a macro with `return`, making it unsuitable for helpers.

This uses std::runtime_error, because gtest does not seem to provide an
exception type of its own for this purpose. [AssertionException] is for
a different use case.

[FAIL()]: https://google.github.io/googletest/reference/assertions.html#FAIL
[AssertionException]: 35d0c36560/docs/reference/testing.md (assertionexception-assertionexception)
2024-11-24 23:57:24 +01:00
Robert Hensing
4eecf3c20a Add nix-flake-c, nix_flake_init_global, nix_flake_settings_new 2024-11-24 23:57:24 +01:00
Robert Hensing
f06f611ff3 refactor: Extract unsafe_new_with_self 2024-11-24 23:57:24 +01:00
Robert Hensing
1bd7517801 Doc nix_get_path_string 2024-11-24 23:57:24 +01:00
Robert Hensing
82a23d9b6b libexpr-c: Add nix_eval_state_builder 2024-11-24 23:57:24 +01:00
Jörg Thalheim
bb1a1fdb60
Merge pull request #11938 from abitrolly/closure-to-tarball
Rename install-nix-from-closure.sh into install-nix-from-tarball.sh.in
2024-11-24 23:03:27 +01:00
Anatoli Babenia
4145d18435 Rename install-nix-from-closure.sh into install-nix-from-tarball.sh
Because it is only used as /install script from tarball.
2024-11-24 22:29:17 +01:00