diff options
| author | Liliana Marie Prikler <liliana.prikler@gmail.com> | 2023-09-30 11:54:32 +0200 |
|---|---|---|
| committer | Liliana Marie Prikler <liliana.prikler@gmail.com> | 2023-09-30 11:54:32 +0200 |
| commit | 7d134b57b79188f8c878625d4e09f9bd6181e8c0 (patch) | |
| tree | fae437f88c666ccf877518b53ea3707f4bc04ec3 /nix | |
| parent | b18b2d13488f2a92331ccad2dc8cbb54ee15582f (diff) | |
| parent | ee5de9cdf2e9d914638fcac8b5f25bdddfb73dfc (diff) | |
Merge branch 'master' into gnome-team
Diffstat (limited to 'nix')
| -rw-r--r-- | nix/libstore/builtins.cc | 5 | ||||
| -rw-r--r-- | nix/local.mk | 5 |
2 files changed, 5 insertions, 5 deletions
diff --git a/nix/libstore/builtins.cc b/nix/libstore/builtins.cc index 4111ac4760..6bf467354a 100644 --- a/nix/libstore/builtins.cc +++ b/nix/libstore/builtins.cc @@ -1,5 +1,5 @@ /* GNU Guix --- Functional package management for GNU - Copyright (C) 2016, 2017, 2018, 2019 Ludovic Courtès <ludo@gnu.org> + Copyright (C) 2016-2019, 2023 Ludovic Courtès <ludo@gnu.org> This file is part of GNU Guix. @@ -58,7 +58,8 @@ static void builtinDownload(const Derivation &drv, static const std::map<std::string, derivationBuilder> builtins = { - { "download", builtinDownload } + { "download", builtinDownload }, + { "git-download", builtinDownload } }; derivationBuilder lookupBuiltinBuilder(const std::string & name) diff --git a/nix/local.mk b/nix/local.mk index 61d59937e8..44a26dd2c8 100644 --- a/nix/local.mk +++ b/nix/local.mk @@ -153,9 +153,8 @@ systemdservicedir = $(libdir)/systemd/system nodist_systemdservice_DATA = \ etc/gnu-store.mount \ etc/guix-daemon.service \ - etc/guix-gc.service \ - etc/guix-gc.timer \ - etc/guix-publish.service + etc/guix-publish.service \ + etc/guix-gc.service etc/%.mount: etc/%.mount.in \ $(top_builddir)/config.status |