Skip to content

Commit 51a7493

Browse files
authored
Revert "mark trivial derivations with __snowkiteOmissible" (#245)
This reverts commit ce06d81. Superceaded by --omit-local snowkite option
1 parent bb82520 commit 51a7493

File tree

9 files changed

+1
-13
lines changed

9 files changed

+1
-13
lines changed

nixos/lib/systemd-lib.nix

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -59,8 +59,6 @@ in rec {
5959
pkgs.runCommand "unit-${mkPathSafeName name}"
6060
{ preferLocalBuild = true;
6161
allowSubstitutes = false;
62-
__snowkiteOmissible = true;
63-
6462
# unit.text can be null. But variables that are null listed in
6563
# passAsFile are ignored by nix, resulting in no file being created,
6664
# making the mv operation fail.
@@ -76,7 +74,6 @@ in rec {
7674
pkgs.runCommand "unit-${mkPathSafeName name}-disabled"
7775
{ preferLocalBuild = true;
7876
allowSubstitutes = false;
79-
__snowkiteOmissible = true;
8077
}
8178
''
8279
name=${shellEscape name}
@@ -201,7 +198,6 @@ in rec {
201198
in pkgs.runCommand "${type}-units"
202199
{ preferLocalBuild = true;
203200
allowSubstitutes = false;
204-
__snowkiteOmissible = true;
205201
} ''
206202
mkdir -p $out
207203

nixos/modules/services/hardware/udev.nix

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,6 @@ let
4646
{ preferLocalBuild = true;
4747
allowSubstitutes = false;
4848
packages = unique (map toString udevPackages);
49-
__snowkiteOmissible = true;
5049
}
5150
''
5251
mkdir -p $out
@@ -150,7 +149,6 @@ let
150149
{ preferLocalBuild = true;
151150
allowSubstitutes = false;
152151
packages = unique (map toString ([udev] ++ cfg.packages));
153-
__snowkiteOmissible = true;
154152
}
155153
''
156154
mkdir -p etc/udev/hwdb.d

nixos/modules/services/logging/journalwatch.nix

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ let
3737
# to the /nix/store path, we still need the subdirectory "journalwatch" inside that
3838
# to match journalwatch's expectations
3939
journalwatchConfigDir = pkgs.runCommand "journalwatch-config"
40-
{ preferLocalBuild = true; allowSubstitutes = false; __snowkiteOmissible = true; }
40+
{ preferLocalBuild = true; allowSubstitutes = false; }
4141
''
4242
mkdir -p $out/journalwatch
4343
ln -sf ${journalwatchConfig} $out/journalwatch/config

nixos/modules/system/activation/top-level.nix

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,6 @@ let
5050
preferLocalBuild = true;
5151
allowSubstitutes = false;
5252
passAsFile = [ "extraDependencies" ];
53-
__snowkiteOmissible = true;
5453
buildCommand = systemBuilder;
5554

5655
systemd = config.systemd.package;

nixos/tests/hydra/common.nix

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@
88
builder = "/bin/sh";
99
allowSubstitutes = false;
1010
preferLocalBuild = true;
11-
__snowkiteOmissible = true;
1211
args = ["-c" "echo success > $out; exit 0"];
1312
};
1413
}

pkgs/build-support/build-fhsenv-chroot/env.nix

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -256,5 +256,4 @@ in stdenv.mkDerivation {
256256
'';
257257
preferLocalBuild = true;
258258
allowSubstitutes = false;
259-
__snowkiteOmissible = true;
260259
}

pkgs/build-support/emacs/wrapper.nix

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,6 @@ runCommand
5454

5555
preferLocalBuild = true;
5656
allowSubstitutes = false;
57-
__snowkiteOmissible = true;
5857

5958
# Store all paths we want to add to emacs here, so that we only need to add
6059
# one path to the load lists

pkgs/development/libraries/dbus/make-dbus-conf.nix

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@ runCommand "dbus-1"
1818
inherit serviceDirectories suidHelper apparmor;
1919
preferLocalBuild = true;
2020
allowSubstitutes = false;
21-
__snowkiteOmissible = true;
2221

2322
nativeBuildInputs = [
2423
libxslt.bin

pkgs/development/libraries/fontconfig/make-fonts-cache.nix

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@ runCommand "fc-cache"
55
nativeBuildInputs = [ fontconfig.bin ];
66
preferLocalBuild = true;
77
allowSubstitutes = false;
8-
__snowkiteOmissible = true;
98
passAsFile = [ "fontDirs" ];
109
fontDirs = ''
1110
<!-- Font directories -->

0 commit comments

Comments
 (0)