From 234c4340c2cdd9a083f298d933c7139586429f82 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Fri, 29 May 2009 14:46:27 +0000 Subject: [PATCH] * helpers -> lib. svn path=/nixos/branches/modular-nixos/; revision=15797 --- {helpers => lib}/make-iso9660-image.nix | 0 {helpers => lib}/make-iso9660-image.sh | 0 {helpers => lib}/unpack-theme.nix | 0 {helpers => lib}/unpack-theme.sh | 0 modules/system/boot/stage-1.nix | 2 +- modules/tasks/tty-backgrounds.nix | 2 +- 6 files changed, 2 insertions(+), 2 deletions(-) rename {helpers => lib}/make-iso9660-image.nix (100%) rename {helpers => lib}/make-iso9660-image.sh (100%) rename {helpers => lib}/unpack-theme.nix (100%) rename {helpers => lib}/unpack-theme.sh (100%) diff --git a/helpers/make-iso9660-image.nix b/lib/make-iso9660-image.nix similarity index 100% rename from helpers/make-iso9660-image.nix rename to lib/make-iso9660-image.nix diff --git a/helpers/make-iso9660-image.sh b/lib/make-iso9660-image.sh similarity index 100% rename from helpers/make-iso9660-image.sh rename to lib/make-iso9660-image.sh diff --git a/helpers/unpack-theme.nix b/lib/unpack-theme.nix similarity index 100% rename from helpers/unpack-theme.nix rename to lib/unpack-theme.nix diff --git a/helpers/unpack-theme.sh b/lib/unpack-theme.sh similarity index 100% rename from helpers/unpack-theme.sh rename to lib/unpack-theme.sh diff --git a/modules/system/boot/stage-1.nix b/modules/system/boot/stage-1.nix index cb8bb7b32433..8e092990699d 100644 --- a/modules/system/boot/stage-1.nix +++ b/modules/system/boot/stage-1.nix @@ -239,7 +239,7 @@ let suffix = "/bin/splash_helper"; symlink = "/${kernelPackages.splashutils.helperName}"; } # */ - { object = import ../../../helpers/unpack-theme.nix { + { object = import ../../../lib/unpack-theme.nix { inherit (pkgs) stdenv; theme = config.services.ttyBackgrounds.defaultTheme; }; diff --git a/modules/tasks/tty-backgrounds.nix b/modules/tasks/tty-backgrounds.nix index 1e5f8f08d954..073ac90df2e2 100644 --- a/modules/tasks/tty-backgrounds.nix +++ b/modules/tasks/tty-backgrounds.nix @@ -100,7 +100,7 @@ let themes = map (x: if x ? theme then (unpackTheme x.theme) else "default") backgrounds; }; - unpackTheme = theme: import ../../helpers/unpack-theme.nix { + unpackTheme = theme: import ../../lib/unpack-theme.nix { inherit stdenv theme; };