mirrors/nixpkgs
1
0
Fork 1
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-09-11 15:08:33 +01:00
Code Issues 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
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 {
inherit stdenv fetchurl;
kernel_ext3cowpatched = kernel;
@ -6678,6 +6666,18 @@ let
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 {
inherit fetchurl stdenv zlib;
};

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

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