diff options
| author | Matthew Bauer <mjbauer95@gmail.com> | 2020-12-24 14:16:09 -0600 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-12-24 14:16:09 -0600 |
| commit | ede534a3a1aabc574a9fefe268a0a7a97a73138b (patch) | |
| tree | 142c4393bc76c020c3f902618cf757762e963475 | |
| parent | d4870462f8f539adeaa6dca476aff6f1f31e1981 (diff) | |
| parent | a93916b1905cd7b968e92cd94a3e4a595bff2e0f (diff) | |
Merge branch 'master' into support-libcxx10
145 files changed, 4972 insertions, 1134 deletions
@@ -10,7 +10,6 @@ makefiles = \ src/nix/local.mk \ src/resolve-system-dependencies/local.mk \ scripts/local.mk \ - corepkgs/local.mk \ misc/bash/local.mk \ misc/systemd/local.mk \ misc/launchd/local.mk \ diff --git a/corepkgs/local.mk b/corepkgs/local.mk deleted file mode 100644 index 0bc91cfab..000000000 --- a/corepkgs/local.mk +++ /dev/null @@ -1,4 +0,0 @@ -corepkgs_FILES = \ - fetchurl.nix - -$(foreach file,$(corepkgs_FILES),$(eval $(call install-data-in,$(d)/$(file),$(datadir)/nix/corepkgs))) diff --git a/doc/manual/generate-manpage.nix b/doc/manual/generate-manpage.nix index fbd7f3e7d..c2c748464 100644 -- |