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

Mark some packages as low priority and disambiguate some others

Browse source
This commit is contained in:
Eelco Dolstra 2012-11-29 15:08:29 +01:00
parent ab1b0e6359
commit 79725bb5bc
8 changed files with 28 additions and 76 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
pkgs/applications/networking/browsers/netsurf/libnsgif.nix
View file

@ -1,6 +1,6 @@
args: with args; args: with args;
stdenv.mkDerivation { stdenv.mkDerivation {
name = "libnsbmp-0.0.1"; name = "libnsgif-0.0.1";
src = fetchurl { src = fetchurl {
url = http://www.netsurf-browser.org/projects/releases/libnsgif-0.0.1-src.tar.gz; url = http://www.netsurf-browser.org/projects/releases/libnsgif-0.0.1-src.tar.gz;
@ -10,7 +10,7 @@ stdenv.mkDerivation {
installPhase = "make PREFIX=$out install"; installPhase = "make PREFIX=$out install";
buildInputs = []; buildInputs = [];
meta = { meta = {
description = "Libnsbmp is a decoding library for gif image file formats"; # used by netsurf description = "Libnsbmp is a decoding library for gif image file formats"; # used by netsurf
homepage = http://www.netsurf-browser.org/projects/libnsgif/; homepage = http://www.netsurf-browser.org/projects/libnsgif/;
license = "MIT"; license = "MIT";

2
pkgs/applications/virtualization/virtualbox/guest-additions/default.nix
View file

@ -4,7 +4,7 @@
let version = "4.2.2"; in let version = "4.2.2"; in
stdenv.mkDerivation { stdenv.mkDerivation {
name = "VirtualBox-GuestAdditions-${version}"; name = "VirtualBox-GuestAdditions-${version}-${kernel.version}";
src = fetchurl { src = fetchurl {
url = "http://download.virtualbox.org/virtualbox/${version}/VBoxGuestAdditions_${version}.iso"; url = "http://download.virtualbox.org/virtualbox/${version}/VBoxGuestAdditions_${version}.iso";

46
pkgs/development/libraries/liblrdf/default.nix
View file

@ -1,46 +0,0 @@
x@{builderDefsPackage
, libtool, autoconf, automake, ladspaH, librdf_raptor, pkgconfig, zlib
, ...}:
builderDefsPackage
(a :
let
helperArgNames = ["stdenv" "fetchurl" "builderDefsPackage"] ++
[];
buildInputs = map (n: builtins.getAttr n x)
(builtins.attrNames (builtins.removeAttrs x helperArgNames));
sourceInfo = rec {
baseName="liblrdf";
version="0.4.0";
project="lrdf";
name="${baseName}-${version}";
url="mirror://sourceforge/project/${project}/${baseName}/${version}/${name}.tar.gz";
hash="015jv7pp0a0qxgljgdvf7d01nj4fx0zgzg0wayjp7v86pa38xscm";
};
in
rec {
src = a.fetchurl {
url = sourceInfo.url;
sha256 = sourceInfo.hash;
};
inherit (sourceInfo) name version;
inherit buildInputs;
/* doConfigure should be removed if not needed */
phaseNames = ["doConfigure" "doMakeInstall"];
meta = {
description = "Lightweight RDF library with special support for LADSPA";
maintainers = with a.lib.maintainers;
[
raskin
];
platforms = with a.lib.platforms;
linux;
license = a.lib.licenses.gpl2;
};
passthru = {
};
}) x

5
pkgs/os-specific/linux/cryptodev/default.nix
View file

@ -1,10 +1,11 @@
{ fetchurl, stdenv, kernel, onlyHeaders ? false }: { fetchurl, stdenv, kernel, onlyHeaders ? false }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "cryptodev-linux-1.5"; pname = "cryptodev-linux-1.5";
name = "${pname}-${kernel.version}";
src = fetchurl { src = fetchurl {
url = "http://download.gna.org/cryptodev-linux/${name}.tar.gz"; url = "http://download.gna.org/cryptodev-linux/${pname}.tar.gz";
sha256 = "13hybl5p0ck0vgi2gxmiwa2810gcfk78kdy17ai8nczj8il15mn0"; sha256 = "13hybl5p0ck0vgi2gxmiwa2810gcfk78kdy17ai8nczj8il15mn0";
}; };

2
pkgs/os-specific/linux/ov511/ov511-2.30-default.nix
View file

@ -1,7 +1,7 @@
{stdenv, fetchurl, kernel}: {stdenv, fetchurl, kernel}:
stdenv.mkDerivation { stdenv.mkDerivation {
name = "ov511-2.30"; name = "ov511-2.30-${kernel.version}";
builder = ./ov511-2.30-builder.sh; builder = ./ov511-2.30-builder.sh;
src = fetchurl { src = fetchurl {
url = http://nixos.org/tarballs/ov511-2.30.tar.bz2; url = http://nixos.org/tarballs/ov511-2.30.tar.bz2;

2
pkgs/os-specific/linux/spl/default.nix
View file

@ -1,7 +1,7 @@
{ stdenv, fetchurl, kernel, perl, autoconf, automake, libtool, coreutils, gawk }: { stdenv, fetchurl, kernel, perl, autoconf, automake, libtool, coreutils, gawk }:
stdenv.mkDerivation { stdenv.mkDerivation {
name = "spl-0.6.0-rc12"; name = "spl-0.6.0-rc12-${kernel.version}";
src = fetchurl { src = fetchurl {
url = http://github.com/downloads/zfsonlinux/spl/spl-0.6.0-rc12.tar.gz; url = http://github.com/downloads/zfsonlinux/spl/spl-0.6.0-rc12.tar.gz;
sha256 = "166853pqa294f78mn4j4x9pri79lyv3j2h8m9fzhfy7d7gxfqljk"; sha256 = "166853pqa294f78mn4j4x9pri79lyv3j2h8m9fzhfy7d7gxfqljk";

3
pkgs/os-specific/linux/zfs/default.nix
View file

@ -1,7 +1,8 @@
{ stdenv, fetchurl, kernel, spl, perl, autoconf, automake, libtool, zlib, libuuid, coreutils, utillinux }: { stdenv, fetchurl, kernel, spl, perl, autoconf, automake, libtool, zlib, libuuid, coreutils, utillinux }:
stdenv.mkDerivation { stdenv.mkDerivation {
name = "zfs-0.6.0-rc12"; name = "zfs-0.6.0-rc12-${kernel.version}";
src = fetchurl { src = fetchurl {
url = http://github.com/downloads/zfsonlinux/zfs/zfs-0.6.0-rc12.tar.gz; url = http://github.com/downloads/zfsonlinux/zfs/zfs-0.6.0-rc12.tar.gz;
sha256 = "1mipy6v63y8z3c5chn813x8c2r8mwyja1v19dvars3j85105xf1y"; sha256 = "1mipy6v63y8z3c5chn813x8c2r8mwyja1v19dvars3j85105xf1y";

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

@ -723,7 +723,7 @@ let
flvtool2 = callPackage ../tools/video/flvtool2 { }; flvtool2 = callPackage ../tools/video/flvtool2 { };
fontforge = callPackage ../tools/misc/fontforge { }; fontforge = lowPrio (callPackage ../tools/misc/fontforge { });
fontforgeX = callPackage ../tools/misc/fontforge { fontforgeX = callPackage ../tools/misc/fontforge {
withX11 = true; withX11 = true;
@ -1564,7 +1564,6 @@ let
trickle = callPackage ../tools/networking/trickle {}; trickle = callPackage ../tools/networking/trickle {};
ttf2pt1 = callPackage ../tools/misc/ttf2pt1 { }; ttf2pt1 = callPackage ../tools/misc/ttf2pt1 { };
ttf2pt1_cl_pdf = callPackage ../tools/misc/ttf2pt1 { };
ucl = callPackage ../development/libraries/ucl { }; ucl = callPackage ../development/libraries/ucl { };
@ -1683,7 +1682,7 @@ let
unzip = callPackage ../tools/archivers/unzip { }; unzip = callPackage ../tools/archivers/unzip { };
unzipNLS = unzip.override { enableNLS = true; }; unzipNLS = lowPrio (unzip.override { enableNLS = true; });
uptimed = callPackage ../tools/system/uptimed { }; uptimed = callPackage ../tools/system/uptimed { };
@ -1817,8 +1816,6 @@ let
dash = callPackage ../shells/dash { }; dash = callPackage ../shells/dash { };
ipython = callPackage ../shells/ipython { };
tcsh = callPackage ../shells/tcsh { }; tcsh = callPackage ../shells/tcsh { };
rush = callPackage ../shells/rush { }; rush = callPackage ../shells/rush { };
@ -2421,7 +2418,7 @@ let
oraclejdk = pkgs.jdkdistro true false; oraclejdk = pkgs.jdkdistro true false;
oraclejre = pkgs.jdkdistro false false; oraclejre = lowPrio (pkgs.jdkdistro false false);
jrePlugin = lowPrio (pkgs.jdkdistro false true); jrePlugin = lowPrio (pkgs.jdkdistro false true);
@ -2962,10 +2959,10 @@ let
inherit noSysDirs; inherit noSysDirs;
}; };
binutils_gold = callPackage ../development/tools/misc/binutils { binutils_gold = lowPrio (callPackage ../development/tools/misc/binutils {
inherit noSysDirs; inherit noSysDirs;
gold = true; gold = true;
}; });
binutilsCross = lowPrio (forceBuildDrv (import ../development/tools/misc/binutils { binutilsCross = lowPrio (forceBuildDrv (import ../development/tools/misc/binutils {
inherit stdenv fetchurl zlib; inherit stdenv fetchurl zlib;
@ -3193,7 +3190,7 @@ let
buildNativeInput after the renaming. buildNativeInput after the renaming.
*/ */
pkgconfig = forceBuildDrv (callPackage ../development/tools/misc/pkgconfig { }); pkgconfig = forceBuildDrv (callPackage ../development/tools/misc/pkgconfig { });
pkgconfigUpstream = pkgconfig.override { vanilla = true; }; pkgconfigUpstream = lowPrio (pkgconfig.override { vanilla = true; });
premake = callPackage ../development/tools/misc/premake { }; premake = callPackage ../development/tools/misc/premake { };
@ -4126,7 +4123,7 @@ let
liblo = callPackage ../development/libraries/liblo { }; liblo = callPackage ../development/libraries/liblo { };
liblrdf = callPackage ../development/libraries/liblrdf {}; liblrdf = librdf;
liblscp = callPackage ../development/libraries/liblscp { }; liblscp = callPackage ../development/libraries/liblscp { };
@ -4389,9 +4386,9 @@ let
libunwind = callPackage ../development/libraries/libunwind { }; libunwind = callPackage ../development/libraries/libunwind { };
libv4l = v4l_utils.override { libv4l = lowPrio (v4l_utils.override {
withQt4 = false; withQt4 = false;
}; });
libva = callPackage ../development/libraries/libva { }; libva = callPackage ../development/libraries/libva { };
@ -4443,9 +4440,9 @@ let
pythonSupport = false; pythonSupport = false;
}; };
libxml2Python = libxml2.override { libxml2Python = lowPrio (libxml2.override {
pythonSupport = true; pythonSupport = true;
}; });
libxmlxx = callPackage ../development/libraries/libxmlxx { }; libxmlxx = callPackage ../development/libraries/libxmlxx { };
@ -4585,7 +4582,7 @@ let
nspr = callPackage ../development/libraries/nspr { }; nspr = callPackage ../development/libraries/nspr { };
nss = callPackage ../development/libraries/nss { }; nss = lowPrio (callPackage ../development/libraries/nss { });
nssTools = callPackage ../development/libraries/nss { nssTools = callPackage ../development/libraries/nss {
includeTools = true; includeTools = true;
@ -5482,16 +5479,15 @@ let
samba = callPackage ../servers/samba { }; samba = callPackage ../servers/samba { };
# A lightweight Samba, useful for non-Linux-based OSes. # A lightweight Samba, useful for non-Linux-based OSes.
samba_light = callPackage ../servers/samba { samba_light = lowPrio (callPackage ../servers/samba {
pam = null; pam = null;
fam = null; fam = null;
cups = null; cups = null;
acl = null; acl = null;
openldap = null; openldap = null;
# libunwind 1.0.1 is not ported to GNU/Hurd. # libunwind 1.0.1 is not ported to GNU/Hurd.
libunwind = null; libunwind = null;
}; });
shishi = callPackage ../servers/shishi { }; shishi = callPackage ../servers/shishi { };
@ -5651,7 +5647,7 @@ let
inherit fontconfig gpm freetype pkgconfig ncurses; inherit fontconfig gpm freetype pkgconfig ncurses;
}; };
fbtermStdenv = callPackage ../os-specific/linux/fbterm/stdenv.nix { }; fbtermStdenv = lowPrio (callPackage ../os-specific/linux/fbterm/stdenv.nix { });
fuse = callPackage ../os-specific/linux/fuse { }; fuse = callPackage ../os-specific/linux/fuse { };
@ -7216,7 +7212,7 @@ let
librsvg = null; librsvg = null;
}; };
imagemagickBig = callPackage ../applications/graphics/ImageMagick { }; imagemagickBig = lowPrio (callPackage ../applications/graphics/ImageMagick { });
# Impressive, formerly known as "KeyJNote". # Impressive, formerly known as "KeyJNote".
impressive = callPackage ../applications/office/impressive { impressive = callPackage ../applications/office/impressive {
@ -8092,10 +8088,10 @@ let
castle_combat = callPackage ../games/castle-combat { }; castle_combat = callPackage ../games/castle-combat { };
construoBase = callPackage ../games/construo { construoBase = lowPrio (callPackage ../games/construo {
mesa = null; mesa = null;
freeglut = null; freeglut = null;
}; });
construo = construoBase.override { construo = construoBase.override {
inherit mesa freeglut; inherit mesa freeglut;