alioth/nixpkgs
3
0
Fork 0
forked from mirrors/nixpkgs
Code Releases Activity

* Delete some obsolete packages.

Browse source 
* Make sure that every package in all-packages.nix has a unique name.
  Not all of them do, but there are now a few helper functions that
  modify the name of a package for display purposes in nix-env (e.g.,
  you get "zlib-1.2.3" and "zlib-1.2.3-static" in "nix-env -qa").

svn path=/nixpkgs/trunk/; revision=8607
This commit is contained in:
Eelco Dolstra 2007-04-26 13:02:30 +00:00
parent c182d49c51
commit 168a93adc5
12 changed files with 53 additions and 142 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
pkgs/applications/networking/browsers/firefox-wrapper/default.nix
View file

@ -1,7 +1,7 @@
{stdenv, firefox, plugins}:
stdenv.mkDerivation {
name = firefox.name;
name = firefox.name + "-with-plugins";
builder = ./builder.sh;
makeWrapper = ../../../../build-support/make-wrapper/make-wrapper.sh;

12
pkgs/os-specific/linux/MAKEDEV-wrapper/builder.sh
View file

@ -1,12 +0,0 @@
source $stdenv/setup
ensureDir "$(dirname $out/dev/MAKEDEV)"
ensureDir "$(dirname $out/sbin/MAKEDEV)"
cat > $out/dev/MAKEDEV << END
#! $SHELL -e
exec $MAKEDEV/dev/MAKEDEV -c $MAKEDEV/etc/makedev.d/ "\$@"
END
chmod +x $out/dev/MAKEDEV
ln -s $out/dev/MAKEDEV $out/sbin/MAKEDEV

9
pkgs/os-specific/linux/MAKEDEV-wrapper/default.nix
View file

@ -1,9 +0,0 @@
{stdenv, MAKEDEV}:
stdenv.mkDerivation {
name = MAKEDEV.name;
builder = ./builder.sh;
inherit MAKEDEV;
}

22
pkgs/os-specific/linux/MAKEDEV/MAKEDEV-install.patch
View file

@ -1,22 +0,0 @@
diff -rc MAKEDEV-3.23/Makefile MAKEDEV-3.23.new/Makefile
*** MAKEDEV-3.23/Makefile 2006-01-27 02:56:12.000000000 +0100
--- MAKEDEV-3.23.new/Makefile 2006-08-06 21:50:06.000000000 +0200
***************
*** 19,26 ****
CONF_WITH_SUBDIR=$(patsubst %,makedev.d/%,$(CONF))
! DESTDIR=
! DESTDIRS=$(DESTDIR)${DESTDIR:+/}
devdir=/dev
makedevdir=/dev
sbindir=/usr/sbin
--- 19,26 ----
CONF_WITH_SUBDIR=$(patsubst %,makedev.d/%,$(CONF))
! DESTDIR=${out}
! DESTDIRS=${out}
devdir=/dev
makedevdir=/dev
sbindir=/usr/sbin

5
pkgs/os-specific/linux/MAKEDEV/builder.sh
View file

@ -1,5 +0,0 @@
source $stdenv/setup
export DESTDIR=$out
genericBuild

10
pkgs/os-specific/linux/MAKEDEV/default.nix
View file

@ -1,10 +0,0 @@
{stdenv, fetchurl}:
stdenv.mkDerivation {
name = "MAKEDEV-3.23.1";
src = fetchurl {
url = http://losser.labs.cs.uu.nl/~armijn/.nix/MAKEDEV-3.23-1.tar.gz;
md5 = "554faf6cbc9a84e4bd58ccfa32d74e2f";
};
patches = [./MAKEDEV-install.patch];
}

12
pkgs/os-specific/linux/kernel/linux-2.6.20.nix
View file

@ -12,14 +12,20 @@
assert stdenv.system == "i686-linux" || stdenv.system == "x86_64-linux";
let lib = import ../../../lib; in
let
lib = import ../../../lib;
version = "2.6.20.7";
in
stdenv.mkDerivation {
name = "linux-2.6.20.7";
name = if userModeLinux then "user-mode-linux-${version}" else "linux-${version}";
builder = ./builder.sh;
src = fetchurl {
url = http://ftp.nl.kernel.org/pub/linux/kernel/v2.6/linux-2.6.20.7.tar.bz2;
url = "http://ftp.nl.kernel.org/pub/linux/kernel/v2.6/linux-${version}.tar.bz2";
sha256 = "1a6flnnaaj11c7cgsr63ix5ln67wih3ffbv473dvsqb0c2rmwvw5";
};

5
pkgs/tools/misc/grub-wrapper/builder.sh
View file

@ -1,5 +0,0 @@
source $stdenv/setup
source $makeWrapper
makeWrapper "$grub/sbin/grub-install" "$out/sbin/grub-install" \
--suffix-each PATH ':' "$diffutils/bin $gnused/bin $gnugrep/bin $coreutils/bin"

10
pkgs/tools/misc/grub-wrapper/default.nix
View file

@ -1,10 +0,0 @@
{stdenv, grub, diffutils, gnused, gnugrep, coreutils}:
stdenv.mkDerivation {
name = grub.name;
builder = ./builder.sh;
makeWrapper = ../../../build-support/make-wrapper/make-wrapper.sh;
inherit grub diffutils gnused gnugrep coreutils;
}

5
pkgs/tools/networking/dhcp-wrapper/builder.sh
View file

@ -1,5 +0,0 @@
source $stdenv/setup
source $makeWrapper
makeWrapper "$dhcp/sbin/dhclient" "$out/sbin/dhclient" \
--set PATH_DHCLIENT_SCRIPT "$dhcp/sbin/dhclient-script"

10
pkgs/tools/networking/dhcp-wrapper/default.nix
View file

@ -1,10 +0,0 @@
{stdenv, dhcp}:
stdenv.mkDerivation {
name = dhcp.name;
builder = ./builder.sh;
makeWrapper = ../../../build-support/make-wrapper/make-wrapper.sh;
inherit dhcp;
}

93
pkgs/top-level/all-packages.nix
View file

@ -150,6 +150,16 @@ rec {
else {};
};
# Change the symbolic name of a package for presentation purposes
# (i.e., so that nix-env users can tell them apart).
setName = name: drv: drv // {inherit name;};
updateName = updater: drv: drv // {name = updater (drv.name);};
# !!! the suffix should really be appended *before* the version, at
# least most of the time.
appendToName = suffix: updateName (name: "${name}-${suffix}");
### STANDARD ENVIRONMENT
@ -279,10 +289,6 @@ rec {
inherit fetchurl stdenv groff nettools coreutils iputils gnused bash;
};
dhcpWrapper = import ../tools/networking/dhcp-wrapper {
inherit stdenv dhcp;
};
diffutils = useFromStdenv (stdenv ? diffutils) stdenv.diffutils
(import ../tools/text/diffutils {
inherit fetchurl stdenv coreutils;
@ -315,9 +321,9 @@ rec {
inherit fetchurl stdenv coreutils;
};
findutilsWrapper = import ../tools/misc/findutils-wrapper {
findutilsWrapper = appendToName "wrapper" (import ../tools/misc/findutils-wrapper {
inherit stdenv findutils;
};
});
gawk = useFromStdenv (stdenv ? gawk) stdenv.gawk
(import ../tools/text/gawk {
@ -337,9 +343,9 @@ rec {
inherit fetchurl stdenv pcre;
});
gnupatch = import ../tools/text/gnupatch {
gnupatch = useFromStdenv (stdenv ? patch) stdenv.patch (import ../tools/text/gnupatch {
inherit fetchurl stdenv;
};
});
gnupg = import ../tools/security/gnupg {
inherit fetchurl stdenv readline;
@ -385,10 +391,6 @@ rec {
inherit fetchurl stdenv;
};
grubWrapper = import ../tools/misc/grub-wrapper {
inherit stdenv grub diffutils gnused gnugrep coreutils;
};
gtkgnutella = import ../tools/networking/p2p/gtk-gnutella {
inherit fetchurl stdenv pkgconfig libxml2;
inherit (gtkLibs) glib gtk;
@ -462,7 +464,7 @@ rec {
inherit fetchurl stdenv e2fsprogs ncurses readline;
};
patch = useFromStdenv (stdenv ? patch) stdenv.patch gnupatch;
patch = gnupatch;
pciutils = import ../tools/system/pciutils {
inherit fetchurl stdenv zlib;
@ -482,10 +484,10 @@ rec {
inherit (xlibs) libX11 libXext;
};
realCurl = import ../tools/networking/curl {
realCurl = useFromStdenv (stdenv ? curl) stdenv.curl (import ../tools/networking/curl {
inherit fetchurl stdenv zlib;
zlibSupport = !stdenv ? isDietLibC;
};
});
rpm = import ../tools/package-management/rpm {
inherit fetchurl stdenv cpio zlib bzip2 file sqlite beecrypt neon elfutils;
@ -591,11 +593,11 @@ rec {
bison = bison23;
});
bashInteractive = import ../shells/bash-interactive {
bashInteractive = appendToName "interactive" (import ../shells/bash-interactive {
inherit fetchurl stdenv ncurses;
bison = bison23;
interactive = true;
};
});
tcsh = import ../shells/tcsh {
inherit fetchurl stdenv ncurses;
@ -642,7 +644,7 @@ rec {
inherit stdenv;
};
gcc = useFromStdenv (stdenv ? gcc) stdenv.gcc gcc41;
gcc = gcc41;
gcc295 = wrapGCC (import ../development/compilers/gcc-2.95 {
inherit fetchurl stdenv noSysDirs;
@ -661,10 +663,10 @@ rec {
profiledCompiler = true;
});
gcc41 = wrapGCC (import ../development/compilers/gcc-4.1 {
gcc41 = useFromStdenv (stdenv ? gcc) stdenv.gcc (wrapGCC (import ../development/compilers/gcc-4.1 {
inherit fetchurl stdenv noSysDirs;
profiledCompiler = false;
});
}));
gccApple = wrapGCC (import ../development/compilers/gcc-apple {
inherit fetchurl stdenv noSysDirs;
@ -690,10 +692,10 @@ rec {
ghc = ghcboot;
};
ghcboot = import ../development/compilers/ghc/boot.nix {
ghcboot = appendToName "boot" (import ../development/compilers/ghc/boot.nix {
inherit fetchurl stdenv perl ncurses;
readline = readline4;
};
});
/*
ghcWrapper = assert uulib.ghc == ghc;
@ -729,10 +731,10 @@ rec {
"/System/Library/Frameworks/JavaVM.framework/Versions/1.5.0/Home"
else
assert supportsJDK;
import ../development/compilers/jdk {
(if pluginSupport then appendToName "plugin" else x: x) (import ../development/compilers/jdk {
inherit fetchurl stdenv unzip installjdk xlibs pluginSupport;
libstdcpp5 = gcc33.gcc;
};
});
jikes = import ../development/compilers/jikes {
inherit fetchurl stdenv;
@ -1102,12 +1104,12 @@ rec {
javaSupport = false;
};
swigWithJava = import ../development/tools/misc/swig {
swigWithJava = appendToName "with-java" (import ../development/tools/misc/swig {
inherit fetchurl stdenv jdk;
perlSupport = false;
pythonSupport = false;
javaSupport = true;
};
});
texinfo = import ../development/tools/misc/texinfo {
inherit fetchurl stdenv ncurses;
@ -1442,10 +1444,10 @@ rec {
inherit fetchurl stdenv libtool;
};
libjpegStatic = import ../development/libraries/libjpeg-static {
libjpegStatic = appendToName "static" (import ../development/libraries/libjpeg-static {
inherit fetchurl stdenv libtool;
static = true;
};
});
libmad = import ../development/libraries/libmad {
inherit fetchurl stdenv;
@ -1517,10 +1519,10 @@ rec {
pythonSupport = false;
};
libxml2Python = import ../development/libraries/libxml2 {
libxml2Python = appendToName "with-python" (import ../development/libraries/libxml2 {
inherit fetchurl stdenv zlib python;
pythonSupport = true;
};
});
libxslt = import ../development/libraries/libxslt {
inherit fetchurl stdenv libxml2;
@ -1690,10 +1692,10 @@ rec {
inherit fetchurl stdenv;
};
zlibStatic = import ../development/libraries/zlib {
zlibStatic = appendToName "static" (import ../development/libraries/zlib {
inherit fetchurl stdenv;
static = true;
};
});
zvbi = import ../development/libraries/zvbi {
inherit fetchurl stdenv libpng x11;
@ -2140,10 +2142,10 @@ rec {
inherit fetchurl stdenv gettext;
};
e2fsprogsDiet = import ../os-specific/linux/e2fsprogs {
e2fsprogsDiet = appendToName "diet" (import ../os-specific/linux/e2fsprogs {
inherit fetchurl gettext;
stdenv = useDietLibC stdenv;
};
});
eject = import ../os-specific/linux/eject {
inherit fetchurl stdenv gettext;
@ -2233,14 +2235,6 @@ rec {
inherit fetchurl stdenv;
};
MAKEDEV = import ../os-specific/linux/MAKEDEV {
inherit fetchurl stdenv;
};
MAKEDEVwrapper = import ../os-specific/linux/MAKEDEV-wrapper {
inherit stdenv MAKEDEV;
};
klibc = import ../os-specific/linux/klibc {
inherit fetchurl stdenv perl bison mktemp kernel;
};
@ -2383,10 +2377,10 @@ rec {
inherit fetchurl stdenv;
};
utillinuxStatic = import ../os-specific/linux/util-linux {
utillinuxStatic = appendToName "static" (import ../os-specific/linux/util-linux {
inherit fetchurl;
stdenv = makeStaticBinaries stdenv;
};
});
wirelesstools = import ../os-specific/linux/wireless-tools {
inherit fetchurl stdenv;
@ -2560,8 +2554,7 @@ rec {
eclipsesdk = eclipse [];
eclipseSpoofax =
eclipse [spoofax];
eclipseSpoofax = appendToName "with-spoofax" (eclipse [spoofax]);
emacs = import ../applications/editors/emacs {
inherit fetchurl stdenv ncurses x11 Xaw3d;
@ -2743,11 +2736,11 @@ rec {
inherit fetchurl stdenv ncurses gettext;
};
nanoDiet = import ../applications/editors/nano {
nanoDiet = appendToName "diet" (import ../applications/editors/nano {
inherit fetchurl gettext;
ncurses = ncursesDiet;
stdenv = useDietLibC stdenv;
};
});
nedit = import ../applications/editors/nedit {
inherit fetchurl stdenv x11;
@ -2868,11 +2861,11 @@ rec {
inherit fetchurl stdenv ncurses;
};
vimDiet = import ../applications/editors/vim-diet {
vimDiet = appendToName "diet" (import ../applications/editors/vim-diet {
inherit fetchurl;
ncurses = ncursesDiet;
stdenv = useDietLibC stdenv;
};
});
vlc = import ../applications/video/vlc {
inherit fetchurl stdenv perl x11 wxGTK