mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-12-26 15:44:20 +00:00
571c71e6f7
We are migrating packages that meet below requirements: 1. using `callPackage` 2. called path is a directory 3. overriding set is empty (`{ }`) 4. not containing path expressions other than relative path (to makenixpkgs-vet happy) 5. not referenced by nix files outside of the directory, other than`pkgs/top-level/all-packages.nix` 6. not referencing nix files outside of the directory 7. not referencing `default.nix` (since it's changed to `package.nix`) 8. `outPath` doesn't change after migration The tool is here: https://github.com/Aleksanaa/by-name-migrate.
39 lines
1012 B
Diff
39 lines
1012 B
Diff
From 592de67191a3969fcccef6293740c7142793d461 Mon Sep 17 00:00:00 2001
|
|
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
|
|
Date: Wed, 1 Nov 2023 21:54:05 +0100
|
|
Subject: [PATCH] skip installing example configuration
|
|
MIME-Version: 1.0
|
|
Content-Type: text/plain; charset=UTF-8
|
|
Content-Transfer-Encoding: 8bit
|
|
|
|
This requires root if prefix dir is pointed to /etc,
|
|
which we cannot do in nix builds.
|
|
|
|
Signed-off-by: Jörg Thalheim <joerg@thalheim.io>
|
|
---
|
|
meson.build | 8 ++++----
|
|
1 file changed, 4 insertions(+), 4 deletions(-)
|
|
|
|
diff --git a/meson.build b/meson.build
|
|
index 5f5935f..8373013 100644
|
|
--- a/meson.build
|
|
+++ b/meson.build
|
|
@@ -114,10 +114,10 @@ else
|
|
runstatedir = rundir
|
|
endif
|
|
|
|
-install_data(
|
|
- sources: 'ksmbd.conf.example',
|
|
- install_dir: get_option('sysconfdir') / 'ksmbd',
|
|
-)
|
|
+#install_data(
|
|
+# sources: 'ksmbd.conf.example',
|
|
+# install_dir: get_option('sysconfdir') / 'ksmbd',
|
|
+#)
|
|
|
|
systemdsystemunitdir = get_option('systemdsystemunitdir')
|
|
if systemdsystemunitdir == ''
|
|
--
|
|
2.42.0
|
|
|