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

Merge branch 'master' into dropbox-py

Browse Source 
Signed-off-by: Moritz Ulrich <moritz@tarn-vedra.de>

Conflicts:
	pkgs/top-level/all-packages.nix
This commit is contained in:
Moritz Ulrich
2013-04-04 00:18:48 +02:00
parent f071e856d3 69ad5c5c04
commit f49becb7a6
166 changed files with 8111 additions and 12390 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -579,6 +579,8 @@ let
cowsay = callPackage ../tools/misc/cowsay { };
cuetools = callPackage ../tools/cd-dvd/cuetools { };
unifdef = callPackage ../development/tools/misc/unifdef { };
"unionfs-fuse" = callPackage ../tools/filesystems/unionfs-fuse { };
@@ -770,6 +772,8 @@ let
libbsd = callPackage ../development/libraries/libbsd { };
lprof = callPackage ../tools/graphics/lprof { };
flvtool2 = callPackage ../tools/video/flvtool2 { };
fontforge = lowPrio (callPackage ../tools/misc/fontforge { });
@@ -811,6 +815,8 @@ let
uni2ascii = callPackage ../tools/text/uni2ascii { };
g500-control = callPackage ../tools/misc/g500-control { };
gawk = callPackage ../tools/text/gawk { };
gdmap = callPackage ../tools/system/gdmap { };
@@ -879,6 +885,8 @@ let
gnuvd = callPackage ../tools/misc/gnuvd { };
googleAuthenticator = callPackage ../os-specific/linux/google-authenticator { };
gource = callPackage ../applications/version-management/gource {};
gptfdisk = callPackage ../tools/system/gptfdisk { };
@@ -1052,6 +1060,8 @@ let
most = callPackage ../tools/misc/most { };
multitail = callPackage ../tools/misc/multitail { };
netperf = callPackage ../applications/networking/netperf { };
ninka = callPackage ../development/tools/misc/ninka { };
@@ -1269,6 +1279,8 @@ let
nzbget = callPackage ../tools/networking/nzbget { };
oathToolkit = callPackage ../tools/security/oath-toolkit { };
obex_data_server = callPackage ../tools/bluetooth/obex-data-server { };
obexd = callPackage ../tools/bluetooth/obexd { };
@@ -1317,6 +1329,8 @@ let
ossec = callPackage ../tools/security/ossec {};
otpw = callPackage ../os-specific/linux/otpw { };
p7zip = callPackage ../tools/archivers/p7zip { };
pal = callPackage ../tools/misc/pal { };
@@ -1464,6 +1478,8 @@ let
recutils = callPackage ../tools/misc/recutils { };
recoll = callPackage ../applications/search/recoll { };
refind = callPackage ../tools/misc/refind { };
reiser4progs = callPackage ../tools/filesystems/reiser4progs { };
@@ -1785,6 +1801,8 @@ let
uptimed = callPackage ../tools/system/uptimed { };
varnish = callPackage ../servers/varnish { };
vlan = callPackage ../tools/networking/vlan { };
wakelan = callPackage ../tools/networking/wakelan { };
@@ -1806,6 +1824,8 @@ let
libxml2 geoip;
};
weighttp = callPackage ../tools/networking/weighttp { };
wget = callPackage ../tools/networking/wget {
inherit (perlPackages) LWP;
};
@@ -1942,6 +1962,8 @@ let
bigloo = callPackage ../development/compilers/bigloo { };
chicken = callPackage ../development/compilers/chicken { };
ccl = builderDefsPackage ../development/compilers/ccl {};
clangUnwrapped = callPackage ../development/compilers/llvm/clang.nix {
@@ -4712,6 +4734,8 @@ let
opensc = opensc_0_11_7;
};
opencolorio = callPackage ../development/libraries/opencolorio { };
ois = callPackage ../development/libraries/ois {};
opal = callPackage ../development/libraries/opal {};
@@ -5234,6 +5258,8 @@ let
jvm = gcj;
xerces = xercesJava; };
xmlsec = callPackage ../development/libraries/xmlsec { };
zziplib = callPackage ../development/libraries/zziplib { };
@@ -5248,6 +5274,7 @@ let
perlPackages = recurseIntoAttrs (import ./perl-packages.nix {
inherit pkgs;
__overrides = (config.perlPackageOverrides or (p: {})) pkgs;
});
perl510Packages = import ./perl-packages.nix {
@@ -5255,6 +5282,7 @@ let
perl = perl510;
buildPerlPackage = import ../development/perl-modules/generic perl510;
};
__overrides = (config.perl510PackageOverrides or (p: {})) pkgs;
};
perlXMLParser = perlPackages.XMLParser;
@@ -5284,9 +5312,10 @@ let
python = python27;
});
plone42Packages = recurseIntoAttrs (import ../development/web/plone {
inherit pkgs buildPythonPackage;
plone43Packages = recurseIntoAttrs (import ../development/web/plone {
inherit pkgs;
python = python27;
pythonPackages = python27Packages;
});
foursuite = callPackage ../development/python-modules/4suite { };
@@ -5834,53 +5863,10 @@ let
kernelPatches = callPackage ../os-specific/linux/kernel/patches.nix { };
linux_2_6_15 = makeOverridable (import ../os-specific/linux/kernel/linux-2.6.15.nix) {
inherit fetchurl perl mktemp module_init_tools;
stdenv = overrideInStdenv stdenv [ gcc34 gnumake381 ];
kernelPatches =
[ kernelPatches.cifs_timeout_2_6_15
];
};
linux_2_6_32 = makeOverridable (import ../os-specific/linux/kernel/linux-2.6.32.nix) {
inherit fetchurl stdenv perl mktemp module_init_tools ubootChooser;
kernelPatches =
[ kernelPatches.fbcondecor_2_6_31
kernelPatches.sec_perm_2_6_24
# kernelPatches.aufs2_2_6_32
kernelPatches.cifs_timeout_2_6_29
# kernelPatches.no_xsave # doesn't apply anymore
kernelPatches.dell_rfkill
];
};
linux_2_6_35 = makeOverridable (import ../os-specific/linux/kernel/linux-2.6.35.nix) {
inherit fetchurl stdenv perl mktemp module_init_tools ubootChooser;
kernelPatches =
[ kernelPatches.fbcondecor_2_6_35
kernelPatches.sec_perm_2_6_24
# kernelPatches.aufs2_2_6_35
kernelPatches.cifs_timeout_2_6_35
] ++ lib.optional (platform.kernelArch == "arm")
kernelPatches.sheevaplug_modules_2_6_35;
};
linux_2_6_35_oldI686 = linux_2_6_35.override {
extraConfig = ''
HIGHMEM64G? n
XEN? n
'';
extraMeta = {
platforms = ["i686-linux"];
maintainers = [lib.maintainers.raskin];
};
};
linux_3_0 = makeOverridable (import ../os-specific/linux/kernel/linux-3.0.nix) {
inherit fetchurl stdenv perl mktemp module_init_tools ubootChooser;
kernelPatches =
[ #kernelPatches.fbcondecor_2_6_38
kernelPatches.sec_perm_2_6_24
[ kernelPatches.sec_perm_2_6_24
# kernelPatches.aufs3_0
];
};
@@ -5888,8 +5874,7 @@ let
linux_3_2 = makeOverridable (import ../os-specific/linux/kernel/linux-3.2.nix) {
inherit fetchurl stdenv perl mktemp module_init_tools ubootChooser;
kernelPatches =
[ #kernelPatches.fbcondecor_2_6_38
kernelPatches.sec_perm_2_6_24
[ kernelPatches.sec_perm_2_6_24
# kernelPatches.aufs3_2
kernelPatches.cifs_timeout_2_6_38
];
@@ -5904,8 +5889,7 @@ let
linux_3_4 = makeOverridable (import ../os-specific/linux/kernel/linux-3.4.nix) {
inherit fetchurl stdenv perl mktemp module_init_tools ubootChooser;
kernelPatches =
[ #kernelPatches.fbcondecor_2_6_38
kernelPatches.sec_perm_2_6_24
[ kernelPatches.sec_perm_2_6_24
# kernelPatches.aufs3_4
] ++ lib.optionals (platform.kernelArch == "mips")
[ kernelPatches.mips_fpureg_emu
@@ -6066,8 +6050,6 @@ let
};
# Build the kernel modules for the some of the kernels.
linuxPackages_2_6_32 = recurseIntoAttrs (linuxPackagesFor linux_2_6_32 linuxPackages_2_6_32);
linuxPackages_2_6_35 = recurseIntoAttrs (linuxPackagesFor linux_2_6_35 linuxPackages_2_6_35);
linuxPackages_3_0 = recurseIntoAttrs (linuxPackagesFor linux_3_0 linuxPackages_3_0);
linuxPackages_3_2 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_3_2 linuxPackages_3_2);
linuxPackages_3_2_xen = recurseIntoAttrs (linuxPackagesFor pkgs.linux_3_2_xen linuxPackages_3_2_xen);
@@ -6075,6 +6057,8 @@ let
linuxPackages_3_6_rpi = recurseIntoAttrs (linuxPackagesFor pkgs.linux_3_6_rpi linuxPackages_3_6_rpi);
linuxPackages_3_7 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_3_7 linuxPackages_3_7);
linuxPackages_3_8 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_3_8 linuxPackages_3_8);
# Update this when adding a new version!
linuxPackages_latest = pkgs.linuxPackages_3_8;
# The current default kernel / kernel modules.
linux = linuxPackages.kernel;
@@ -6368,7 +6352,7 @@ let
};
pthreads = callPackage ../os-specific/windows/pthread-w32 {
mingw_headers = mingw_headers2;
mingw_headers = mingw_headers3;
};
wxMSW = callPackage ../os-specific/windows/wxMSW-2.8 { };
@@ -6757,6 +6741,10 @@ let
inherit (gnome) GConf libglade;
};
darktable12 = callPackage ../applications/graphics/darktable/1.2rc1.nix {
inherit (gnome) GConf libglade;
};
"dd-agent" = callPackage ../tools/networking/dd-agent { };
dia = callPackage ../applications/graphics/dia {
@@ -7586,10 +7574,16 @@ let
ogmtools = callPackage ../applications/video/ogmtools { };
omxplayer = callPackage ../applications/video/omxplayer {
stdenv = overrideGCC stdenv gcc47;
};
oneteam = callPackage ../applications/networking/instant-messengers/oneteam {};
openbox = callPackage ../applications/window-managers/openbox { };
openimageio = callPackage ../applications/graphics/openimageio { };
openjump = callPackage ../applications/misc/openjump { };
openscad = callPackage ../applications/graphics/openscad {};
@@ -7696,7 +7690,9 @@ let
ratpoison = callPackage ../applications/window-managers/ratpoison { };
rawtherapee = callPackage ../applications/graphics/rawtherapee { };
rawtherapee = callPackage ../applications/graphics/rawtherapee {
fftw = fftw.override {float = true;};
};
rcs = callPackage ../applications/version-management/rcs { };
@@ -7752,6 +7748,10 @@ let
dropbox-cli = callPackage ../applications/networking/dropbox-cli { };
lightdm = callPackage ../applications/display-managers/lightdm { };
lightdm_gtk_greeter = callPackage ../applications/display-managers/lightdm-gtk-greeter { };
slim = callPackage ../applications/display-managers/slim { };
sndBase = builderDefsPackage (import ../applications/audio/snd) {
@@ -7766,6 +7766,8 @@ let
guile = guile_1_8;
};
shntool = callPackage ../applications/audio/shntool { };
sonic_visualiser = callPackage ../applications/audio/sonic-visualiser {
inherit (pkgs.vamp) vampSDK;
inherit (pkgs.xlibs) libX11;
@@ -8109,9 +8111,7 @@ let
libxpdf = callPackage ../applications/misc/xpdf/libxpdf.nix { };
xpra = callPackage ../tools/X11/xpra {
inherit (pythonPackages) notify;
};
xpra = callPackage ../tools/X11/xpra { };
xscreensaver = callPackage ../misc/screensavers/xscreensaver {
inherit (gnome) libglade;
@@ -8342,7 +8342,7 @@ let
# You still can override by passing more arguments.
spaceOrbit = callPackage ../games/orbit { };
spring = callPackage ../games/spring { boost = boost149;};
spring = callPackage ../games/spring { };
springLobby = callPackage ../games/spring/springlobby.nix { };
@@ -8778,7 +8778,9 @@ let
gtkwave = callPackage ../applications/science/electronics/gtkwave { };
kicad = callPackage ../applications/science/electronics/kicad { };
kicad = callPackage ../applications/science/electronics/kicad {
wxGTK = wxGTK29;
};
ngspice = callPackage ../applications/science/electronics/ngspice { };
@@ -8919,6 +8921,8 @@ let
mupen64plus = callPackage ../misc/emulators/mupen64plus { };
mupen64plus1_5 = callPackage ../misc/emulators/mupen64plus/1.5.nix { };
nix = nixStable;
nixStable = callPackage ../tools/package-management/nix {
@@ -9106,6 +9110,8 @@ let
inherit (gnome2) zenity;
};
wxmupen64plus = callPackage ../misc/emulators/wxmupen64plus { };
x2x = callPackage ../tools/X11/x2x { };
xosd = callPackage ../misc/xosd { };

1
pkgs/top-level/haskell-defaults.nix
View File

@@ -111,7 +111,6 @@
monadPar = self.monadPar_0_1_0_3;
# deviating from Haskell platform here, to make some packages (notably statistics) compile
jailbreakCabal = self.jailbreakCabal.override { Cabal = self.disableTest self.Cabal_1_14_0; };
cabal2nix = self.cabal2nix.override { Cabal = self.Cabal_1_16_0_3; hackageDb = self.hackageDb.override { Cabal = self.Cabal_1_16_0_3; }; };
};
# Abstraction for Haskell packages collections

29
pkgs/top-level/haskell-packages.nix
View File

@@ -139,7 +139,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
haskellSrc = self.haskellSrc_1_0_1_5; # 7.6 ok
html = self.html_1_0_1_2; # 7.6 ok
HTTP = self.HTTP_4000_2_8; # 7.6 ok
HUnit = self.HUnit_1_2_5_1; # 7.6 ok
HUnit = self.HUnit_1_2_5_2; # 7.6 ok
mtl = self.mtl_2_1_2; # 7.6 ok
network = self.network_2_4_1_2; # 7.6 ok
OpenGL = self.OpenGL_2_8_0_0; # 7.6 ok
@@ -150,7 +150,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
regexBase = self.regexBase_0_93_2; # 7.6 ok
regexCompat = self.regexCompat_0_95_1; # 7.6 ok
regexPosix = self.regexPosix_0_95_2; # 7.6 ok
split = self.split_0_2_1_2; # 7.6 ok
split = self.split_0_2_1_3; # 7.6 ok
stm = self.stm_2_4_2; # 7.6 ok
syb = self.syb_0_4_0; # 7.6 ok
text = self.text_0_11_2_3; # 7.6 ok
@@ -444,7 +444,9 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
accelerate = callPackage ../development/libraries/haskell/accelerate {};
accelerateCuda = callPackage ../development/libraries/haskell/accelerate-cuda {};
accelerateCuda = callPackage ../development/libraries/haskell/accelerate-cuda {
languageCQuote = self.languageCQuote_0_4_4;
};
accelerateExamples = callPackage ../development/libraries/haskell/accelerate-examples {};
@@ -701,6 +703,12 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
dataDefault = callPackage ../development/libraries/haskell/data-default {};
dataDefaultClass = callPackage ../development/libraries/haskell/data-default-class {};
dataDefaultInstancesBase = callPackage ../development/libraries/haskell/data-default-instances-containers {};
dataDefaultInstancesContainers = callPackage ../development/libraries/haskell/data-default-instances-base {};
dataDefaultInstancesDlist = callPackage ../development/libraries/haskell/data-default-instances-dlist {};
dataDefaultInstancesOldLocale = callPackage ../development/libraries/haskell/data-default-instances-old-locale {};
dataenc = callPackage ../development/libraries/haskell/dataenc {};
dataInttrie = callPackage ../development/libraries/haskell/data-inttrie {};
@@ -1134,7 +1142,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
HUnit_1_2_4_2 = callPackage ../development/libraries/haskell/HUnit/1.2.4.2.nix {};
HUnit_1_2_4_3 = callPackage ../development/libraries/haskell/HUnit/1.2.4.3.nix {};
HUnit_1_2_5_1 = callPackage ../development/libraries/haskell/HUnit/1.2.5.1.nix {};
HUnit = self.HUnit_1_2_5_1;
HUnit_1_2_5_2 = callPackage ../development/libraries/haskell/HUnit/1.2.5.2.nix {};
HUnit = self.HUnit_1_2_5_2;
hxt = callPackage ../development/libraries/haskell/hxt {};
@@ -1189,7 +1198,9 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
languageC_0_3_2_1 = callPackage ../development/libraries/haskell/language-c/0.3.2.1.nix {};
languageC = self.languageC_0_4_2;
languageCQuote = callPackage ../development/libraries/haskell/language-c-quote/default.nix {};
languageCQuote_0_4_4 = callPackage ../development/libraries/haskell/language-c-quote/0.4.4.nix {};
languageCQuote_0_7_1 = callPackage ../development/libraries/haskell/language-c-quote/0.7.1.nix {};
languageCQuote = self.languageCQuote_0_7_1;
languageJavascript = callPackage ../development/libraries/haskell/language-javascript {};
@@ -1508,6 +1519,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
QuickCheck2 = self.QuickCheck_2_6;
QuickCheck = self.QuickCheck2;
quickcheckIo = callPackage ../development/libraries/haskell/quickcheck-io {};
RangedSets = callPackage ../development/libraries/haskell/Ranged-sets {};
random_1_0_1_1 = callPackage ../development/libraries/haskell/random/1.0.1.1.nix {};
@@ -1695,8 +1708,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
SMTPClient = callPackage ../development/libraries/haskell/SMTPClient {};
split_0_2_1_1 = callPackage ../development/libraries/haskell/split/0.2.1.1.nix {};
split_0_2_1_2 = callPackage ../development/libraries/haskell/split/0.2.1.2.nix {};
split = self.split_0_2_1_2;
split_0_2_1_3 = callPackage ../development/libraries/haskell/split/0.2.1.3.nix {};
split = self.split_0_2_1_3;
stbImage = callPackage ../development/libraries/haskell/stb-image {};
@@ -1960,6 +1973,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
yap = callPackage ../development/libraries/haskell/yap {};
yeganesh = callPackage ../applications/misc/yeganesh {};
yesod = callPackage ../development/libraries/haskell/yesod {};
yesodAuth = callPackage ../development/libraries/haskell/yesod-auth {};

159
pkgs/top-level/node-packages.nix
View File

@@ -9,9 +9,12 @@ let self = {
patchLatest = srcAttrs:
let src = fetchurl srcAttrs; in
pkgs.runCommand src.name {} ''
mkdir unpack
cd unpack
tar xf ${src}
mv */ package 2>/dev/null || true
sed -i -e "s/: \"latest\"/: \"*\"/" package/package.json
tar cf $out package
tar cf $out *
'';
"abbrev" = self."abbrev-1";
@@ -43,7 +46,7 @@ let self = {
amdefine = "amdefine-0.0.4";
"amdefine->=0.0.4" = self."amdefine-0.0.4";
"amdefine-0.0.4" = self.buildNodePackage rec {
name = "amdefine-0.0.4";
src = fetchurl {
@@ -94,6 +97,33 @@ let self = {
];
};
"aws-sdk" = self."aws-sdk-*";
"aws-sdk-git" = self.buildNodePackage rec {
name = "aws-sdk-0.9.8-pre7b687a0c262ac129fd6eaffeb02de09ee7e6a87c";
src = self.patchLatest {
url = "https://github.com/aws/aws-sdk-js/archive/7b687a0c262ac129fd6eaffeb02de09ee7e6a87c.tar.gz";
sha256 = "1pn43wxi3xz4kjyxf8j7zil5frhd1zpqja8szamgll2pxxnpnr3i";
name = "${name}.tgz";
};
deps = [
self."xml2js-0.2.4"
self."xmlbuilder"
];
};
"aws-sdk-*" = self.buildNodePackage rec {
name = "aws-sdk-0.9.7-pre.8";
src = self.patchLatest {
url = "http://registry.npmjs.org/aws-sdk/-/${name}.tgz";
sha256 = "d3854275981fff76153f79c62745d8d6c59018861729766908c920fff95ea422";
};
deps = [
self."xml2js-0.2.4"
self."xmlbuilder"
];
};
"backbone" = self."backbone-0.9.2";
"backbone-0.9.2" = self.buildNodePackage rec {
@@ -270,6 +300,17 @@ let self = {
"commander" = self."commander-~0.6.1";
"commander-0.5.1" = self.buildNodePackage rec {
name = "commander-0.5.1";
src = fetchurl {
url = "http://registry.npmjs.org/commander/-/${name}.tgz";
sha256 = "91042851d0731b28a5e7c342e5cbce7723a7243d31ae378fa86c45ca9493a924";
};
deps = [
];
};
"commander-~0.6.1" = self.buildNodePackage rec {
name = "commander-0.6.1";
src = fetchurl {
@@ -569,6 +610,47 @@ let self = {
];
};
"htdigest" = self."htdigest-1.0.7";
"htdigest-1.0.7" = self.buildNodePackage rec {
name = "htdigest-1.0.7";
src = fetchurl {
url = "http://registry.npmjs.org/htdigest/-/${name}.tgz";
sha256 = "10fb047addf1c4f1089a26389066d5ff8f5ffa1ccce272a701bb4c2a30d90c58";
};
deps = [
self."commander-0.5.1"
];
};
"htpasswd" = self."htpasswd-1.1.0";
"htpasswd-1.1.0" = self.buildNodePackage rec {
name = "htpasswd-1.1.0";
src = fetchurl {
url = "http://registry.npmjs.org/htpasswd/-/${name}.tgz";
sha256 = "cee9c0a525e717e3565ba6ffea8a64c480bc8a9e7800cb9bfc385d1a8e713ec9";
};
deps = [
self."commander-0.5.1"
];
};
"http-auth" = self."http-auth-*";
"http-auth-*" = self.buildNodePackage rec {
name = "http-auth-1.2.7";
src = fetchurl {
url = "http://registry.npmjs.org/http-auth/-/${name}.tgz";
sha256 = "874dbb5907d03602f31eae959a0927a3112da8e868231d9a2119bb50d2fe63d2";
};
deps = [
self."node-uuid-1.2.0"
self."htpasswd-1.1.0"
self."htdigest-1.0.7"
];
};
"http-signature" = self."http-signature-0.9.9";
"http-signature-0.9.9" = self.buildNodePackage rec {
@@ -805,6 +887,17 @@ let self = {
"node-uuid" = self."node-uuid-1.3.3";
"node-uuid-1.2.0" = self.buildNodePackage rec {
name = "node-uuid-1.2.0";
src = fetchurl {
url = "http://registry.npmjs.org/node-uuid/-/${name}.tgz";
sha256 = "96d3ce178ea0825d27a855630de74243a577dc988512512eea572829b208a3d2";
};
deps = [
];
};
"node-uuid-1.3.3" = self.buildNodePackage rec {
name = "node-uuid-1.3.3";
src = fetchurl {
@@ -897,7 +990,7 @@ let self = {
};
"optparse" = self."optparse-1.0.3";
"optparse-1.0.3" = self.buildNodePackage rec {
name = "optparse-1.0.3";
src = fetchurl {
@@ -905,7 +998,7 @@ let self = {
sha256 = "1cg99i4rq8azxikzqz0ykw4q971azbj49d3m7slj041yscb6m883";
};
deps = [
];
};
@@ -1115,6 +1208,34 @@ let self = {
];
};
"s3http" = self."s3http-*";
"s3http-*" = self.buildNodePackage rec {
name = "s3http-0.0.1";
src = fetchurl {
url = "http://registry.npmjs.org/s3http/-/${name}.tgz";
sha256 = "7140a0ee6df9fb90fd74aa0b68b73f899c6d8e2eaa2de89fde3f634e9bf10dba";
};
deps = [
self."aws-sdk-git"
self."commander-0.5.1"
self."http-auth-*"
];
};
"sax" = self."sax->=0.4.2";
"sax->=0.4.2" = self.buildNodePackage rec {
name = "sax-0.5.2";
src = fetchurl {
url = "http://registry.npmjs.org/sax/-/${name}.tgz";
sha256 = "6bb7cd44e9dfea598997d4ba9d3279dafe75bed7b45904561ca9eb4d85cfd953";
};
deps = [
];
};
"semver" = self."semver-1";
"semver-1" = self."semver-1.0.14";
@@ -1261,9 +1382,9 @@ let self = {
self."requirejs-==0.26.0"
];
};
"swig" = self."swig-0.13.2";
"swig-0.13.2" = self.buildNodePackage rec {
name = "swig-0.13.2";
src = fetchurl {
@@ -1448,6 +1569,32 @@ let self = {
];
};
"xml2js" = self."xml2js-0.2.4";
"xml2js-0.2.4" = self.buildNodePackage rec {
name = "xml2js-0.2.4";
src = fetchurl {
url = "http://registry.npmjs.org/xml2js/-/${name}.tgz";
sha256 = "8daebb075fc7c564d84221a0cef7825ac824db8e312f873daee59a6adf38da28";
};
deps = [
self."sax->=0.4.2"
];
};
"xmlbuilder" = self."xmlbuilder-*";
"xmlbuilder-*" = self.buildNodePackage rec {
name = "xmlbuilder-0.4.2";
src = fetchurl {
url = "http://registry.npmjs.org/xmlbuilder/-/${name}.tgz";
sha256 = "3137e5bf9db1f114767f8ba56be753f2a9f512e38a2df64d7677ae3c9318a0fe";
};
deps = [
];
};
"xmlhttprequest" = self."xmlhttprequest-1.2.2";
"xmlhttprequest-1.2.2" = self.buildNodePackage rec {

30
pkgs/top-level/perl-packages.nix
View File

@@ -5,12 +5,14 @@
for each package in a separate file: the call to the function would
be almost as must code as the function itself. */
{pkgs}:
{pkgs, __overrides}:
rec {
inherit (pkgs) buildPerlPackage fetchurl stdenv perl fetchsvn;
inherit __overrides;
# Helper functions for packages that use Module::Build to build.
buildPerlModule = { buildInputs ? [], ... } @ args:
buildPerlPackage (args // {
@@ -1553,6 +1555,19 @@ rec {
};
};
DBIxClassCandy = buildPerlPackage {
name = "DBIx-Class-Candy-0.002103";
src = fetchurl {
url = mirror://cpan/authors/id/F/FR/FREW/DBIx-Class-Candy-0.002103.tar.gz;
sha256 = "1vcaigvzxq9jjkhw2bkayrnsa76sakr3wrv7009f1dxyfa0iyrsk";
};
propagatedBuildInputs = [ TestDeep TestFatal DBIxClass LinguaENInflect StringCamelCase ];
meta = {
description = "Sugar for your favorite ORM, DBIx::Class";
license = "perl5";
};
};
DBIxClassCursorCached = buildPerlPackage {
name = "DBIx-Class-Cursor-Cached-1.001002";
src = fetchurl {
@@ -1576,6 +1591,19 @@ rec {
propagatedBuildInputs = [DBIxClass HTMLWidget];
};
DBIxClassHelpers = buildPerlPackage {
name = "DBIx-Class-Helpers-2.016005";
src = fetchurl {
url = mirror://cpan/authors/id/F/FR/FREW/DBIx-Class-Helpers-2.016005.tar.gz;
sha256 = "0nkskc0h284l2q3m33553i8g4pr1kcx7vmwz8bi1kmga16bs7nqk";
};
propagatedBuildInputs = [ DBIxClassCandy TestDeep CarpClan DBDSQLite ];
meta = {
description = "Simplify the common case stuff for DBIx::Class.";
license = "perl5";
};
};
DBIxClassIntrospectableM2M = buildPerlPackage {
name = "DBIx-Class-IntrospectableM2M-0.001001";
src = fetchurl {

11
pkgs/top-level/platforms.nix
View File

@@ -105,7 +105,7 @@ rec {
FUSE_FS m
# nixos mounts some cgroup
# systemd uses cgroups
CGROUPS y
# Latencytop
@@ -307,6 +307,12 @@ rec {
kernelAutoModules = false;
kernelExtraConfig =
''
MIGRATION n
COMPACTION n
# nixos mounts some cgroup
CGROUPS y
BLK_DEV_RAM y
BLK_DEV_INITRD y
BLK_DEV_CRYPTOLOOP m
@@ -360,6 +366,9 @@ rec {
EXT3_FS y
REISERFS_FS y
MAGIC_SYSRQ y
# The kernel doesn't boot at all, with FTRACE
FTRACE n
'';
kernelTarget = "vmlinux";
uboot = null;

65
pkgs/top-level/python-packages.nix
View File

@@ -58,6 +58,11 @@ pythonPackages = python.modules // rec {
inherit python buildPythonPackage;
};
pitz = import ../applications/misc/pitz {
inherit (pkgs) stdenv fetchurl;
inherit buildPythonPackage tempita jinja2 pyyaml clepy mock nose decorator docutils;
};
pycairo = import ../development/python-modules/pycairo {
inherit (pkgs) stdenv fetchurl pkgconfig cairo x11;
inherit python;
@@ -589,6 +594,24 @@ pythonPackages = python.modules // rec {
};
});
clepy = buildPythonPackage rec {
name = "clepy-0.3.20";
src = fetchurl {
url = "https://pypi.python.org/packages/source/c/clepy/${name}.tar.gz";
sha256 = "16vibfxms5z4ld8gbkra6dkhqm2cc3jnn0fwp7mw70nlwxnmm51c";
};
buildInputs = [ mock nose decorator ];
meta = {
homepage = http://code.google.com/p/clepy/;
description = "Utilities created by the Cleveland Python users group";
};
};
clientform = buildPythonPackage (rec {
name = "clientform-0.2.10";
@@ -1462,7 +1485,7 @@ pythonPackages = python.modules // rec {
};
buildInputs = [ nose ];
propagatedBuildInputs = [ beautifulsoup4 pyrss2gen feedparser pynzb html5lib dateutil beautifulsoup flask jinja2 requests sqlalchemy pyyaml cherrypy progressbar ];
propagatedBuildInputs = [ beautifulsoup4 pyrss2gen feedparser pynzb html5lib dateutil beautifulsoup flask jinja2 requests sqlalchemy pyyaml cherrypy progressbar deluge ];
meta = {
homepage = http://flexget.com/;
@@ -1685,6 +1708,23 @@ pythonPackages = python.modules // rec {
};
});
http_signature = buildPythonPackage (rec {
name = "http_signature-0.1.4";
src = fetchurl {
url = "http://pypi.python.org/packages/source/h/http_signature/${name}.tar.gz";
md5 = "015061846254bd5d8c5dbc2913985153";
};
propagatedBuildInputs = [pycrypto];
meta = {
homepage = https://github.com/atl/py-http-signature;
description = "";
license = stdenv.lib.licenses.mit;
};
});
httplib2 = buildPythonPackage rec {
name = "httplib2-0.8";
@@ -2753,11 +2793,11 @@ pythonPackages = python.modules // rec {
prettytable = buildPythonPackage rec {
name = "prettytable-0.5";
name = "prettytable-0.7.1";
src = fetchurl {
url = "http://pypi.python.org/packages/source/P/PrettyTable/${name}.tar.gz";
md5 = "13a6930d775395f393afd86948afa4fa";
url = "http://pypi.python.org/packages/source/P/PrettyTable/${name}.tar.bz2";
sha1 = "ad346a18d92c1d95f2295397c7a8a4f489e48851";
};
meta = {
@@ -3867,6 +3907,23 @@ pythonPackages = python.modules // rec {
};
});
smartdc = buildPythonPackage rec {
name = "smartdc-0.1.12";
src = fetchurl {
url = https://pypi.python.org/packages/source/s/smartdc/smartdc-0.1.12.tar.gz;
md5 = "b960f61facafc879142b699050f6d8b4";
};
propagatedBuildInputs = [ requests http_signature ];
meta = {
description = "Joyent SmartDataCenter CloudAPI connector using http-signature authentication via Requests";
homepage = https://github.com/atl/py-smartdc;
license = pkgs.lib.licenses.mit;
};
};
sphinx = buildPythonPackage (rec {
name = "Sphinx-1.1.3";

1165
pkgs/top-level/release-haskell.nix
View File

File diff suppressed because it is too large Load Diff

2
pkgs/top-level/release-small.nix
View File

@@ -177,7 +177,7 @@ with (import ./release-lib.nix);
texLiveExtra = linux;
texinfo = all;
time = linux;
tinycc = ["i686-linux"];
tinycc = linux;
udev = linux;
unrar = linux;
unzip = all;

2
pkgs/top-level/release.nix
View File

@@ -304,7 +304,7 @@ let
texinfo = all;
tightvnc = linux;
time = linux;
tinycc = ["i686-linux"];
tinycc = linux;
uae = linux;
udev = linux;
unrar = linux;