Eelco Dolstra a5ee9a3e99 Resolve conflicts

2024-12-06 12:13:51 +01:00

..

build-remote

build-remote: only allocate storeUri once

2024-07-25 14:04:03 +02:00

external-api-docs

make doxygen build more silent

2024-10-22 09:53:49 +02:00

internal-api-docs

make doxygen build more silent

2024-10-22 09:53:49 +02:00

libcmd

Remove warning that interpretation of .drv has changed

2024-11-26 11:27:41 +00:00

libexpr

Merge remote-tracking branch 'origin/master' into flake-substitution

2024-11-11 13:57:24 +01:00

libexpr-c

Revert "Merge pull request #11804 from obsidiansystems/remove-old-make"

2024-11-07 13:46:37 +01:00

libexpr-test-support

Revert "Merge pull request #11804 from obsidiansystems/remove-old-make"

2024-11-07 13:46:37 +01:00

libexpr-tests

Revert "Merge pull request #11804 from obsidiansystems/remove-old-make"

2024-11-07 13:46:37 +01:00

libfetchers

Bump fetcher cache version

2024-11-26 11:19:29 +00:00

libfetchers-tests

Revert "Merge pull request #11804 from obsidiansystems/remove-old-make"

2024-11-07 13:46:37 +01:00

libflake

Don't allow __final in fetchTree

2024-11-08 19:27:54 +01:00

libflake-tests

Revert "Merge pull request #11804 from obsidiansystems/remove-old-make"

2024-11-07 13:46:37 +01:00

libmain

Merge pull request #11826 from DeterminateSystems/revert-11804

2024-11-08 12:04:55 +01:00

libmain-c

Set Windows API version in Meson

2024-11-05 23:36:08 +11:00

libstore

Merge pull request #11843 from xokdvium/dev/move-fixes

2024-11-09 21:57:27 +01:00

libstore-c

Revert "Merge pull request #11804 from obsidiansystems/remove-old-make"

2024-11-07 13:46:37 +01:00

libstore-test-support

Revert "Merge pull request #11804 from obsidiansystems/remove-old-make"

2024-11-07 13:46:37 +01:00

libstore-tests

Revert "Merge pull request #11804 from obsidiansystems/remove-old-make"

2024-11-07 13:46:37 +01:00

libutil

nix hash convert: Support SRI hashes that lack trailing '=' characters

2024-12-05 22:30:32 +00:00

libutil-c

Revert "Merge pull request #11804 from obsidiansystems/remove-old-make"

2024-11-07 13:46:37 +01:00

libutil-test-support

Revert "Merge pull request #11804 from obsidiansystems/remove-old-make"

2024-11-07 13:46:37 +01:00

libutil-tests

Filter OSC 8 correctly

2024-11-26 11:20:35 +00:00

nix

Resolve conflicts

2024-12-06 12:13:51 +01:00

nix-build

Fix issue 11892

2024-11-26 11:19:29 +00:00

nix-channel

Don't use OS_STR in nix-channel.cc

2024-08-18 18:27:20 +05:30

nix-collect-garbage

More std::filesystem for nix-collect-garbage

2024-08-26 17:29:23 -04:00

nix-copy-closure

Restrict some code to StoreDirConfig

2023-11-04 19:05:36 -04:00

nix-env

MacOS built: add workaround for missing view() member of std::ostringstream

2024-10-07 02:05:53 +02:00

nix-instantiate

No global settings in libnixfetchers and libnixflake

2024-07-12 08:50:28 -04:00

nix-store

Clean up standard stream logic

2024-11-07 15:11:41 -05:00

perl

Revert "Merge pull request #11804 from obsidiansystems/remove-old-make"

2024-11-07 13:46:37 +01:00

nix-functional-tests

Build Functional tests with Meson

2024-08-14 15:35:40 -04:00

nix-manual

Build the manual with Meson

2024-10-09 11:58:17 -04:00