nix-super/src
Maximilian Bosch 04cd2da84c
Merge branch 'master' into structured-attrs-shell
Conflicts:
        src/nix/develop.cc
        src/nix/get-env.sh
        tests/shell.nix
2021-07-12 15:49:39 +02:00
..
build-remote Fix the remote build of CA derivations 2021-06-21 14:18:33 +02:00
cpptoml Revert the enum struct change 2020-06-18 22:11:26 +00:00
libcmd Merge pull request #4969 from serokell/balsoft/fix-nixConfig-flake-registry 2021-07-08 12:35:08 +02:00
libexpr Merge pull request #4995 from NixOS/fetchgit-name-attribute 2021-07-09 00:32:13 +02:00
libfetchers Merge pull request #4988 from NixOS/fetchgit-name-attribute 2021-07-08 14:33:49 +02:00
libmain Respect TERM=dumb more consistently 2021-07-01 18:19:01 -06:00
libstore Merge branch 'master' into structured-attrs-shell 2021-07-12 15:49:39 +02:00
libutil Merge pull request #4967 from Pamplemousse/specific_errors 2021-07-03 10:34:56 +02:00
nix Merge branch 'master' into structured-attrs-shell 2021-07-12 15:49:39 +02:00
nix-build Merge branch 'master' into structured-attrs-shell 2021-07-12 15:49:39 +02:00
nix-channel Initialize plugins after handling initial command line flags 2021-02-24 08:22:17 -05:00
nix-collect-garbage Initialize plugins after handling initial command line flags 2021-02-24 08:22:17 -05:00
nix-copy-closure Use RealisedPaths in copyPaths 2021-02-25 17:18:48 +01:00
nix-env Rename Buildable 2021-04-05 09:52:25 -04:00
nix-instantiate Initialize plugins after handling initial command line flags 2021-02-24 08:22:17 -05:00
nix-store Rename Buildable 2021-04-05 09:52:25 -04:00
nlohmann Revert "Use upstream nlohmann_json" 2021-04-05 21:24:55 +01:00
resolve-system-dependencies Apply OS checks to host platform, not build 2021-06-23 15:00:36 +00:00