public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

* splashutils_13 / splashutils_15: these don't depend on the kernel

Browse Source 
version.
* Add klibc and splashutils to the channel.

svn path=/nixpkgs/trunk/; revision=13901
This commit is contained in:
Eelco Dolstra 2009-01-29 15:56:01 +00:00
parent b48cc44ebf
commit edc5cdaf98
2 changed files with 15 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
pkgs/top-level/all-packages.nix
View File

@ -6420,18 +6420,6 @@ let
if kernel.features ? fbConDecor && system != "x86_64-linux" then splashutils_15 else if kernel.features ? fbConDecor && system != "x86_64-linux" then splashutils_15 else
null; null;
splashutils_13 = import ../os-specific/linux/splashutils/1.3.nix {
inherit fetchurl stdenv klibc;
zlib = zlibStatic;
libjpeg = libjpegStatic;
};
splashutils_15 = import ../os-specific/linux/splashutils/1.5.nix {
inherit fetchurl stdenv klibc;
zlib = zlibStatic;
libjpeg = libjpegStatic;
};
ext3cowtools = import ../os-specific/linux/ext3cow-tools { ext3cowtools = import ../os-specific/linux/ext3cow-tools {
inherit stdenv fetchurl; inherit stdenv fetchurl;
kernel_ext3cowpatched = kernel; kernel_ext3cowpatched = kernel;
@ -6678,6 +6666,18 @@ let
inherit fetchurl stdenv; inherit fetchurl stdenv;
}; };
splashutils_13 = import ../os-specific/linux/splashutils/1.3.nix {
inherit fetchurl stdenv klibc;
zlib = zlibStatic;
libjpeg = libjpegStatic;
};
splashutils_15 = import ../os-specific/linux/splashutils/1.5.nix {
inherit fetchurl stdenv klibc;
zlib = zlibStatic;
libjpeg = libjpegStatic;
};
squashfsTools = import ../os-specific/linux/squashfs { squashfsTools = import ../os-specific/linux/squashfs {
inherit fetchurl stdenv zlib; inherit fetchurl stdenv zlib;
}; };

13
pkgs/top-level/build-for-release.nix
View File

@ -98,6 +98,7 @@ let
kbd kbd
kcachegrind kcachegrind
kdebase kdebase
klibc
ktorrent ktorrent
kvm kvm
less less
@ -160,6 +161,8 @@ let
seccure seccure
slim slim
spidermonkey spidermonkey
splashutils_13
splashutils_15
ssmtp ssmtp
strace strace
su su
@ -242,36 +245,26 @@ let
inherit (pkgs.kernelPackages_2_6_23) inherit (pkgs.kernelPackages_2_6_23)
iwlwifi iwlwifi
kernel kernel
klibc
splashutils
; ;
}; };
kernelPackages_2_6_25 = pkgs.recurseIntoAttrs { kernelPackages_2_6_25 = pkgs.recurseIntoAttrs {
inherit (pkgs.kernelPackages_2_6_25) inherit (pkgs.kernelPackages_2_6_25)
kernel kernel
klibc
# splashutils
; ;
}; };
kernelPackages_2_6_26 = pkgs.recurseIntoAttrs { kernelPackages_2_6_26 = pkgs.recurseIntoAttrs {
inherit (pkgs.kernelPackages_2_6_26) inherit (pkgs.kernelPackages_2_6_26)
kernel kernel
klibc
# splashutils
; ;
}; };
kernelPackages_2_6_27 = pkgs.recurseIntoAttrs { kernelPackages_2_6_27 = pkgs.recurseIntoAttrs {
inherit (pkgs.kernelPackages_2_6_27) inherit (pkgs.kernelPackages_2_6_27)
kernel kernel
klibc
# splashutils
; ;
}; };
kernelPackages_2_6_28 = pkgs.recurseIntoAttrs { kernelPackages_2_6_28 = pkgs.recurseIntoAttrs {
inherit (pkgs.kernelPackages_2_6_28) inherit (pkgs.kernelPackages_2_6_28)
kernel kernel
klibc
# splashutils
; ;
}; };
}; };