From 2dc967e6567e2fd33a1580300adca5ed60c5db5b Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Mon, 1 Dec 2003 14:37:42 +0000 Subject: [PATCH] * Change system name to i686-linux. * A helper Nix expression used to populate the cache on losser. svn path=/nixpkgs/trunk/; revision=558 --- pkgs/system/all-packages.nix | 2 +- pkgs/system/i686-linux.nix | 1 + pkgs/system/i686-suse-linux.nix | 1 - pkgs/system/populate-cache.nix | 4 ++++ 4 files changed, 6 insertions(+), 2 deletions(-) create mode 100644 pkgs/system/i686-linux.nix delete mode 100644 pkgs/system/i686-suse-linux.nix create mode 100644 pkgs/system/populate-cache.nix diff --git a/pkgs/system/all-packages.nix b/pkgs/system/all-packages.nix index 28f769f8478..de4b3977d83 100644 --- a/pkgs/system/all-packages.nix +++ b/pkgs/system/all-packages.nix @@ -44,7 +44,7 @@ # Select the right instantiation. body = - if system == "i686-suse-linux" + if system == "i686-linux" then stdenvLinuxPkgs else stdenvNixPkgs; } diff --git a/pkgs/system/i686-linux.nix b/pkgs/system/i686-linux.nix new file mode 100644 index 00000000000..c35e5a27ed0 --- /dev/null +++ b/pkgs/system/i686-linux.nix @@ -0,0 +1 @@ +(import ./all-packages.nix) {system = "i686-linux"} diff --git a/pkgs/system/i686-suse-linux.nix b/pkgs/system/i686-suse-linux.nix deleted file mode 100644 index 3b5c0e3fd88..00000000000 --- a/pkgs/system/i686-suse-linux.nix +++ /dev/null @@ -1 +0,0 @@ -(import ./all-packages.nix) {system = "i686-suse-linux"} diff --git a/pkgs/system/populate-cache.nix b/pkgs/system/populate-cache.nix new file mode 100644 index 00000000000..e249c168447 --- /dev/null +++ b/pkgs/system/populate-cache.nix @@ -0,0 +1,4 @@ +let { + pkgs = import ./i686-linux.nix; + body = [pkgs.subversion pkgs.pan pkgs.sylpheed pkgs.MPlayer]; +} \ No newline at end of file