From 2f3d764edba24f9f92cad9b5cb1f2d35e1c56ac4 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Thu, 20 Nov 2003 13:58:49 +0000 Subject: [PATCH] * user-environment.nix is no longer needed, since it is now generated by nix-env. svn path=/nixpkgs/trunk/; revision=518 --- pkgs/system/i686-suse-linux.nix | 2 +- pkgs/system/user-environment.nix | 30 ------------------------------ 2 files changed, 1 insertion(+), 31 deletions(-) delete mode 100644 pkgs/system/user-environment.nix diff --git a/pkgs/system/i686-suse-linux.nix b/pkgs/system/i686-suse-linux.nix index 643d2ad2c92..3b5c0e3fd88 100644 --- a/pkgs/system/i686-suse-linux.nix +++ b/pkgs/system/i686-suse-linux.nix @@ -1 +1 @@ -(import ./user-environment.nix) {system = "i686-suse-linux"} +(import ./all-packages.nix) {system = "i686-suse-linux"} diff --git a/pkgs/system/user-environment.nix b/pkgs/system/user-environment.nix deleted file mode 100644 index 60b2293a13f..00000000000 --- a/pkgs/system/user-environment.nix +++ /dev/null @@ -1,30 +0,0 @@ -# Given a system identifier, this function returns a derivation of a -# user environment, i.e., a set of symbolic links to `activated' -# packages. The resulting package is typically passed to the -# `nix-switch' command in order to actually activate it. - -{system}: let { - # All activated packages. - pkgs = (import ./all-packages.nix) {system = system}; - - # The packages selection for inclusion in the user environment. - # This list should be generated automatically by a package - # management user interface. - selectedPkgs = [ - pkgs.subversion - pkgs.pan - pkgs.sylpheed - pkgs.firebird - pkgs.MPlayer - pkgs.MPlayerPlugin - pkgs.gqview - ]; - - # Create a user environment. - body = derivation { - name = "user-environment"; - system = system; - builder = ./populate-linkdirs.pl; - dirs = selectedPkgs; - }; -}