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

Merge remote-tracking branch 'origin/master' into x-updates

Browse source
This commit is contained in:
Eelco Dolstra 2012-10-15 12:16:58 -04:00
parent 1d8e80f1b9 3c2f28c67e
commit 5af277bbd1
40 changed files with 246 additions and 82 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
pkgs/applications/networking/browsers/firefox/16.0.nix
View file

@ -15,19 +15,24 @@ assert stdenv.gcc ? libc && stdenv.gcc.libc != null;
rec {
firefoxVersion = "16.0";
firefoxVersion = "16.0.1";
xulVersion = "16.0"; # this attribute is used by other packages
xulVersion = "16.0.1"; # this attribute is used by other packages
src = fetchurl {
url = "ftp://ftp.mozilla.org/pub/mozilla.org/firefox/releases/${firefoxVersion}/source/firefox-${firefoxVersion}.source.tar.bz2";
sha1 = "8f79e4ccf28c57afd341b9fc258931b5f9e62064";
urls = [
# It is better to use this url for official releases, to take load off Mozilla's ftp server.
"http://releases.mozilla.org/pub/mozilla.org/firefox/releases/${firefoxVersion}/source/firefox-${firefoxVersion}.source.tar.bz2"
# Fall back to this url for versions not available at releases.mozilla.org.
"ftp://ftp.mozilla.org/pub/mozilla.org/firefox/releases/${firefoxVersion}/source/firefox-${firefoxVersion}.source.tar.bz2"
];
sha1 = "ad5723fcf4ec6c6734e2022cecad174290fa425e";
};
commonConfigureFlags =
[ "--enable-optimize"
"--enable-profiling"
#"--enable-profiling"
"--disable-debug"
"--enable-strip"
"--with-system-jpeg"

4
pkgs/applications/networking/irc/weechat/default.nix
View file

@ -2,12 +2,12 @@
, zlib, curl , pkgconfig, libgcrypt, ruby, lua5, tcl, guile }:
stdenv.mkDerivation rec {
version = "0.3.8";
version = "0.3.9";
name = "weechat-${version}";
src = fetchurl {
url = "http://weechat.org/files/src/${name}.tar.gz";
sha256 = "4293eb9d29f11b8ee8c301049d57e535acbea677bc1dc41ab12fe1bb8af0f10e";
sha256 = "8666c788cbb212036197365df3ba3cf964a23e4f644d76ea51d66dbe3be593bb";
};
buildInputs =

1
pkgs/development/interpreters/clisp/default.nix
View file

@ -34,6 +34,7 @@ stdenv.mkDerivation rec {
--with-module=clx/new-clx --with-module=i18n --with-module=bindings/glibc
--with-module=pcre --with-module=rawsock --with-module=readline
--with-module=syscalls --with-module=wildcard --with-module=zlib
--with-threads=POSIX_THREADS
'';
preBuild = ''

4
pkgs/development/libraries/haskell/DSH/default.nix
View file

@ -2,8 +2,8 @@
cabal.mkDerivation (self: {
pname = "DSH";
version = "0.8.0.1";
sha256 = "08bwn7jpnkzvyj2dlpk6zx97iwsjb085vbnc8hwvxnhf9y8wl96s";
version = "0.8.1.0";
sha256 = "13mkpcm34jg7hqc272phiak7rg590hxb6ma3s9lwvp6izcv7vccq";
buildDepends = [ csv FerryCore HaXml HDBC mtl Pathfinder text ];
meta = {
description = "Database Supported Haskell";

4
pkgs/development/libraries/haskell/deepseq-th/default.nix
View file

@ -2,8 +2,8 @@
cabal.mkDerivation (self: {
pname = "deepseq-th";
version = "0.1.0.3";
sha256 = "1xx88i55iskyxrpxbdg0srb64y5siqs1b8qj7bh3i1893qs9sha2";
version = "0.1.0.4";
sha256 = "12wk8higrp12b22zzz1b4ar1q5h7flk22bp2rvswsqri2zkbi965";
buildDepends = [ deepseq ];
meta = {
description = "Template Haskell based deriver for optimised NFData instances";

4
pkgs/development/libraries/haskell/exception-mtl/default.nix
View file

@ -2,8 +2,8 @@
cabal.mkDerivation (self: {
pname = "exception-mtl";
version = "0.3.0.2";
sha256 = "1mhk1z7hz50h8ssr4s7dzdxzn02rr0njxijdddfjjw71fln3nl5h";
version = "0.3.0.3";
sha256 = "1mmkp16c5ixknhm69a2zjrs9q0dd5ragmljnjjd6lxpakdlw64ww";
buildDepends = [ exceptionTransformers mtl transformers ];
meta = {
homepage = "http://www.eecs.harvard.edu/~mainland/";

4
pkgs/development/libraries/haskell/exception-transformers/default.nix
View file

@ -2,8 +2,8 @@
cabal.mkDerivation (self: {
pname = "exception-transformers";
version = "0.3.0.2";
sha256 = "1ah3dimnc980vkr2lycpl4nsb615gxqws6mv9j90mz6g165h9khf";
version = "0.3.0.3";
sha256 = "0z3z5pppaqqbndd4fgv1czr8f9f4a8r86bwc3bcv88yf7y8cfbwz";
buildDepends = [ stm transformers ];
meta = {
homepage = "http://www.eecs.harvard.edu/~mainland/";

4
pkgs/development/libraries/haskell/gloss/default.nix
View file

@ -2,8 +2,8 @@
cabal.mkDerivation (self: {
pname = "gloss";
version = "1.7.6.4";
sha256 = "0nyz9iicc6d96yn6yxzwz08g106qb2aadrxlw120wl01aqfw4xis";
version = "1.7.6.5";
sha256 = "0s02vbcyfqzlmjw68kp3arn3vvmldh04460gm050vbc6rqpc8dkv";
buildDepends = [ bmp GLUT OpenGL ];
meta = {
homepage = "http://gloss.ouroborus.net";

4
pkgs/development/libraries/haskell/highlighting-kate/default.nix
View file

@ -2,8 +2,8 @@
cabal.mkDerivation (self: {
pname = "highlighting-kate";
version = "0.5.3.2";
sha256 = "09yvqxvjzahz0y6yhsfgkx5xm39a74arv294w14sgmhay1wnlwvj";
version = "0.5.3.3";
sha256 = "08jxl2ba0kb4vj1qbdf4sas8bwbxzayzwsxnjvq358x57i5l302n";
isLibrary = true;
isExecutable = true;
buildDepends = [ blazeHtml filepath mtl parsec regexPcreBuiltin ];

4
pkgs/development/libraries/haskell/hjsmin/default.nix
View file

@ -2,8 +2,8 @@
cabal.mkDerivation (self: {
pname = "hjsmin";
version = "0.1.2";
sha256 = "04yk383504blg8x10x5j1fd5mzyybqkhz7jfsyimvz2wz2v86qsb";
version = "0.1.3";
sha256 = "0lz7qsm74hbs8qa5d3khw43ipiimjbvxsrqqmxvp44605ib22y4d";
buildDepends = [ blazeBuilder languageJavascript text ];
meta = {
homepage = "http://github.com/alanz/hjsmin";

5
pkgs/development/libraries/haskell/language-c-quote/default.nix
View file

@ -4,14 +4,13 @@
cabal.mkDerivation (self: {
pname = "language-c-quote";
version = "0.4.1";
sha256 = "1graq6nfmzd2lj6fh1rwyaikfrlzn05pgd347dzrfq5ch35fgg10";
version = "0.4.2";
sha256 = "0l69kn8flx36z3cl9ckdls8w2sq8361w6abmi3gsa80l8yg3cpl4";
buildDepends = [
exceptionMtl exceptionTransformers filepath haskellSrcMeta
mainlandPretty mtl srcloc syb symbol
];
buildTools = [ alex happy ];
jailbreak = true;
meta = {
homepage = "http://www.eecs.harvard.edu/~mainland/";
description = "C/CUDA/OpenCL quasiquoting library";

8
pkgs/development/libraries/haskell/language-javascript/default.nix
View file

@ -1,11 +1,11 @@
{ cabal, blazeBuilder, happy, mtl, utf8Light, utf8String }:
{ cabal, alex, blazeBuilder, happy, mtl, utf8Light, utf8String }:
cabal.mkDerivation (self: {
pname = "language-javascript";
version = "0.5.4";
sha256 = "0hjx12n3pkxcdkppqalv6sl68vjlib37gby89ksay807ndslvb9q";
version = "0.5.5";
sha256 = "1p02n6rh98nvkh7g5kj18ggcnyvds8lqbgjwgzm83bnd5ayizrw7";
buildDepends = [ blazeBuilder mtl utf8Light utf8String ];
buildTools = [ happy ];
buildTools = [ alex happy ];
meta = {
homepage = "http://github.com/alanz/language-javascript";
description = "Parser for JavaScript";

4
pkgs/development/libraries/haskell/mainland-pretty/default.nix
View file

@ -2,8 +2,8 @@
cabal.mkDerivation (self: {
pname = "mainland-pretty";
version = "0.2.2";
sha256 = "0kvn67g2ic46ybgyxpgpzjapwiww9848m9dv8y3xkkl7jd8anpb2";
version = "0.2.4";
sha256 = "0x481k36rz4zvj1nwvrfw1d10vbmmx8gb5f2nc8alnxcbc2y7xwq";
buildDepends = [ srcloc text ];
meta = {
homepage = "http://www.eecs.harvard.edu/~mainland/";

4
pkgs/development/libraries/haskell/numbers/default.nix
View file

@ -2,8 +2,8 @@
cabal.mkDerivation (self: {
pname = "numbers";
version = "3000.1.0.0";
sha256 = "0iqpch8j2i2pnjq8waqb5y95jpmvbzx2r6zsvkja7sl4d578fgpn";
version = "3000.1.0.1";
sha256 = "0r2s47nfdxasnp8j7giwpxls9v48f6ld0gc2hg2p7y2ar5xfrcc4";
meta = {
homepage = "https://github.com/DanBurton/numbers";
description = "Various number types";

4
pkgs/development/libraries/haskell/repa/default.nix
View file

@ -2,8 +2,8 @@
cabal.mkDerivation (self: {
pname = "repa";
version = "3.2.2.1";
sha256 = "0k8i4gm74gc19kfmg2790x1i6im58nqfblq2fq2bilh6rsj8hxh0";
version = "3.2.2.2";
sha256 = "1a7rgpy2qc42zc9si7p1zgi1m9b06dz533d2mvhizzac9k3fb5vq";
buildDepends = [ QuickCheck vector ];
meta = {
homepage = "http://repa.ouroborus.net";

4
pkgs/development/libraries/haskell/srcloc/default.nix
View file

@ -2,8 +2,8 @@
cabal.mkDerivation (self: {
pname = "srcloc";
version = "0.2.1";
sha256 = "03b0ra5g7mqcjjfnhm84mv4ph454j08pb9dwxrv9zfwk1kiqb2ss";
version = "0.3.0";
sha256 = "1ymk8k0r9ckk7dalz3virvvpyrf4nw8xvb23cs6ibdjjbzsphpiz";
buildDepends = [ syb ];
noHaddock = true;
meta = {

4
pkgs/development/libraries/haskell/symbol/default.nix
View file

@ -2,8 +2,8 @@
cabal.mkDerivation (self: {
pname = "symbol";
version = "0.1.3";
sha256 = "1kz4kzbv6bara31pv4vc75r6wvjln6md8gjlsxx8hf50ab8vb68j";
version = "0.1.4";
sha256 = "00318syprv1ixfbr4v7xq86z10f0psxk0b8kaxvawvacm8hp61bn";
buildDepends = [ deepseq syb ];
meta = {
homepage = "http://www.eecs.harvard.edu/~mainland/";

4
pkgs/development/libraries/haskell/warp/default.nix
View file

@ -5,8 +5,8 @@
cabal.mkDerivation (self: {
pname = "warp";
version = "1.3.3.2";
sha256 = "1w2i5nf3qh7p0xfrrp6x34rw3sxa48v703w1vlsikhyjdqs2crq8";
version = "1.3.4.1";
sha256 = "09slbxbk88sjdgs3mibsvp17c85mn2r2sp67fchkmqkhf40lhcxw";
buildDepends = [
blazeBuilder blazeBuilderConduit caseInsensitive conduit hashable
httpTypes liftedBase network networkConduit simpleSendfile

4
pkgs/development/libraries/haskell/yesod-core/default.nix
View file

@ -9,8 +9,8 @@
cabal.mkDerivation (self: {
pname = "yesod-core";
version = "1.1.2.2";
sha256 = "13852r6s7p9b4zvg4pi9qfmgv8g21m0gqlw7bky05jy5a9c8v3a7";
version = "1.1.3.1";
sha256 = "16fb0f9si5r65mw7d8j6221qjw61xgi2v60j7dm9j02ljp68i2bq";
buildDepends = [
aeson blazeBuilder blazeHtml blazeMarkup caseInsensitive cereal
clientsession conduit cookie failure fastLogger hamlet httpTypes

4
pkgs/development/libraries/haskell/yesod-routes/default.nix
View file

@ -2,8 +2,8 @@
cabal.mkDerivation (self: {
pname = "yesod-routes";
version = "1.1.0.1";
sha256 = "1b248ry96p1nyp21c3r9rd3awpdhpqrwj3s6d66pmjf8p0gl5vda";
version = "1.1.0.2";
sha256 = "07nrxqkpc5z32c8lk5wz9m6ql703hdhyd86pfk704frvbic02xly";
buildDepends = [ pathPieces text vector ];
meta = {
homepage = "http://www.yesodweb.com/";

4
pkgs/development/libraries/haskell/yesod/default.nix
View file

@ -8,8 +8,8 @@
cabal.mkDerivation (self: {
pname = "yesod";
version = "1.1.1.2";
sha256 = "0gq4ijfjlkiqw4bp9hxs8r41vlhz33v5l9k1maqjy62d446lrgvw";
version = "1.1.2";
sha256 = "02d40crvsnhasa6jhl0k7hzxnwr9lxmbm7caf2mrvpr4sldzy1ss";
isLibrary = true;
isExecutable = true;
buildDepends = [

25
pkgs/development/libraries/libmnl/default.nix Normal file
View file

@ -0,0 +1,25 @@
{ stdenv, fetchurl }:
stdenv.mkDerivation rec {
name = "libmnl-1.0.3";
src = fetchurl {
url = "http://netfilter.org/projects/libmnl/files/${name}.tar.bz2";
sha1 = "c27e25f67c6422ebf893fc3a844af8085a1c5b63";
};
meta = {
description = "minimalistic user-space library oriented to Netlink developers";
longDescription = ''
libmnl is a minimalistic user-space library oriented to Netlink developers.
There are a lot of common tasks in parsing, validating, constructing of both the Netlink
header and TLVs that are repetitive and easy to get wrong.
This library aims to provide simple helpers that allows you to re-use code and to avoid
re-inventing the wheel.
'';
homepage = http://netfilter.org/projects/libmnl/index.html;
license = "GPLv2+";
platforms = stdenv.lib.platforms.linux;
};
}

26
pkgs/development/libraries/libnetfilter_conntrack/default.nix Normal file
View file

@ -0,0 +1,26 @@
{ stdenv, fetchurl, pkgconfig, libnfnetlink, libmnl }:
stdenv.mkDerivation rec {
name = "libnetfilter_conntrack-1.0.2";
src = fetchurl {
url = "http://netfilter.org/projects/libnetfilter_conntrack/files/${name}.tar.bz2";
md5 = "447114b5d61bb9a9617ead3217c3d3ff";
};
buildInputs = [ pkgconfig libnfnetlink libmnl ];
meta = {
description = "userspace library providing an API to the in-kernel connection tracking state table.";
longDescription = ''
libnetfilter_conntrack is a userspace library providing a programming interface (API) to the
in-kernel connection tracking state table. The library libnetfilter_conntrack has been
previously known as libnfnetlink_conntrack and libctnetlink. This library is currently used
by conntrack-tools among many other applications
'';
homepage = http://netfilter.org/projects/libnetfilter_conntrack/;
license = "GPLv2+";
platforms = stdenv.lib.platforms.linux;
};
}

27
pkgs/development/libraries/libnfnetlink/default.nix Normal file
View file

@ -0,0 +1,27 @@
{ stdenv, fetchurl }:
stdenv.mkDerivation rec {
name = "libnfnetlink-1.0.1";
src = fetchurl {
url = "http://www.netfilter.org/projects/libnfnetlink/files/${name}.tar.bz2";
md5 = "98927583d2016a9fb1936fed992e2c5e";
};
meta = {
description = "low-level library for netfilter related kernel/userspace communication.";
longDescription = ''
libnfnetlink is the low-level library for netfilter related kernel/userspace communication.
It provides a generic messaging infrastructure for in-kernel netfilter subsystems
(such as nfnetlink_log, nfnetlink_queue, nfnetlink_conntrack) and their respective users
and/or management tools in userspace.
This library is not meant as a public API for application developers.
It is only used by other netfilter.org projects, like the aforementioned ones.
'';
homepage = http://www.netfilter.org/projects/libnfnetlink/index.html;
license = "GPLv2";
platforms = stdenv.lib.platforms.linux;
};
}

18
pkgs/development/tools/documentation/haddock/2.13.1.nix Normal file
View file

@ -0,0 +1,18 @@
{ cabal, alex, Cabal, deepseq, filepath, ghcPaths, happy, xhtml }:
cabal.mkDerivation (self: {
pname = "haddock";
version = "2.13.1";
sha256 = "0zsflbc3ayjsn542sa58zl62dd78ykr489f18sh467hrrnaj4pkf";
isLibrary = true;
isExecutable = true;
buildDepends = [ Cabal deepseq filepath ghcPaths xhtml ];
buildTools = [ alex happy ];
meta = {
homepage = "http://www.haskell.org/haddock/";
description = "A documentation-generation tool for Haskell libraries";
license = self.stdenv.lib.licenses.bsd3;
platforms = self.ghc.meta.platforms;
maintainers = [ self.stdenv.lib.maintainers.andres ];
};
})

6
pkgs/development/tools/haskell/BNFC-meta/default.nix
View file

@ -2,12 +2,12 @@
cabal.mkDerivation (self: {
pname = "BNFC-meta";
version = "0.3.0.5";
sha256 = "0blssa72r2ff4avbibw9a4p8gxy228f3lb1vc9aqr881v79b2cpp";
version = "0.4";
sha256 = "0qmkc2h4fqryvq763k6skx6c24h9njh4bsdspfbyq1nzxxb9mvy0";
buildDepends = [ alexMeta happyMeta haskellSrcMeta syb ];
noHaddock = true;
meta = {
description = "Deriving Quasi-Quoters from BNF Grammars";
description = "Deriving Parsers and Quasi-Quoters from BNF Grammars";
license = self.stdenv.lib.licenses.gpl2;
platforms = self.ghc.meta.platforms;
maintainers = [ self.stdenv.lib.maintainers.andres ];

4
pkgs/development/tools/haskell/alex-meta/default.nix
View file

@ -2,8 +2,8 @@
cabal.mkDerivation (self: {
pname = "alex-meta";
version = "0.3.0.4";
sha256 = "0d0ii1djigydj2papcilkr8mazp70vg6hy179h28j9i1bshp3anp";
version = "0.3.0.5";
sha256 = "0f41q5l6z1dcpfx8rxacv4f544zcw7pgvq935mnzzha9fvsxqzk4";
buildDepends = [ haskellSrcMeta QuickCheck ];
noHaddock = true;
meta = {

4
pkgs/os-specific/linux/iptables/default.nix
View file

@ -1,11 +1,11 @@
{stdenv, fetchurl}:
stdenv.mkDerivation rec {
name = "iptables-1.4.10";
name = "iptables-1.4.16.2";
src = fetchurl {
url = "http://www.netfilter.org/projects/iptables/files/${name}.tar.bz2";
md5 = "f382fe693f0b59d87bd47bea65eca198";
md5 = "57220bb26866a713073e5614f88071fc";
};
# Install header files required by miniupnpd.

4
pkgs/os-specific/linux/kernel/linux-3.0.nix
View file

@ -230,7 +230,7 @@ in
import ./generic.nix (
rec {
version = "3.0.45";
version = "3.0.46";
preConfigure = ''
substituteInPlace scripts/depmod.sh --replace '-b "$INSTALL_MOD_PATH"' ""
@ -238,7 +238,7 @@ import ./generic.nix (
src = fetchurl {
url = "mirror://kernel/linux/kernel/v3.x/linux-${version}.tar.xz";
sha256 = "0mgv6iqnfam16v2s8hdxpf2imx49sjhndjc80646lk9053l5rh0d";
sha256 = "1m5zxbnclv1b72pn7zwrmik45pxzsapcj94m39aqq5akq8i149ig";
};
config = configWithPlatform stdenv.platform;

1
pkgs/os-specific/linux/kernel/linux-3.3.nix
View file

@ -253,6 +253,7 @@ import ./generic.nix (
features.iwlwifi = true;
features.efiBootStub = true;
features.netfilterRPFilter = true;
}
// removeAttrs args ["extraConfig"]

5
pkgs/os-specific/linux/kernel/linux-3.4.nix
View file

@ -239,7 +239,7 @@ in
import ./generic.nix (
rec {
version = "3.4.13";
version = "3.4.14";
testing = false;
preConfigure = ''
@ -248,7 +248,7 @@ import ./generic.nix (
src = fetchurl {
url = "mirror://kernel/linux/kernel/v3.x/${if testing then "testing/" else ""}linux-${version}.tar.xz";
sha256 = "16wpnqnjxcrm2aszjdkrn4vlcdm9j35ixnq7myvc432w7pkdqk11";
sha256 = "0kr7yjhw5di2srryd1aypyi8mlxjh9gvmsz1684mj1fdpxi5adq4";
};
config = configWithPlatform stdenv.platform;
@ -257,6 +257,7 @@ import ./generic.nix (
features.iwlwifi = true;
features.efiBootStub = true;
features.needsCifsUtils = true;
features.netfilterRPFilter = true;
}
// removeAttrs args ["extraConfig"]

6
pkgs/os-specific/linux/kernel/linux-3.5.nix
View file

@ -240,7 +240,7 @@ in
import ./generic.nix (
rec {
version = "3.5.6";
version = "3.5.7";
testing = false;
preConfigure = ''
@ -249,7 +249,7 @@ import ./generic.nix (
src = fetchurl {
url = "mirror://kernel/linux/kernel/v3.x/${if testing then "testing/" else ""}linux-${version}.tar.xz";
sha256 = "0z6hklmpm33d1cjwzsny5s03kajp9zmdgxhfrd0aky98x36202gf";
sha256 = "0k3r0qrlfgn7yk35wf4c49yvyy79kzn42qcrf5kms5iir838kini";
};
config = configWithPlatform stdenv.platform;
@ -258,6 +258,8 @@ import ./generic.nix (
features.iwlwifi = true;
features.efiBootStub = true;
features.needsCifsUtils = true;
features.canDisableNetfilterConntrackHelpers = true;
features.netfilterRPFilter = true;
}
// removeAttrs args ["extraConfig"]

6
pkgs/os-specific/linux/kernel/linux-3.6.nix
View file

@ -244,7 +244,7 @@ in
import ./generic.nix (
rec {
version = "3.6.1";
version = "3.6.2";
testing = false;
preConfigure = ''
@ -253,7 +253,7 @@ import ./generic.nix (
src = fetchurl {
url = "mirror://kernel/linux/kernel/v3.x/${if testing then "testing/" else ""}linux-${version}.tar.xz";
sha256 = "0jpjhnp0pnly2nvfhb5z2wqaw66yzr9pd477rsdmx1wi9gsp07mz";
sha256 = "1clxrmxq09bjcxcxi2z2fmbfij0zah5jxy29b0b59hgpg24cfyb0";
};
config = configWithPlatform stdenv.platform;
@ -262,6 +262,8 @@ import ./generic.nix (
features.iwlwifi = true;
features.efiBootStub = true;
features.needsCifsUtils = true;
features.canDisableNetfilterConntrackHelpers = true;
features.netfilterRPFilter = true;
}
// removeAttrs args ["extraConfig"]

23
pkgs/tools/misc/gsmartcontrol/default.nix Normal file
View file

@ -0,0 +1,23 @@
{ fetchurl, stdenv, smartmontools, gtk, gtkmm, libglademm, pkgconfig, pcre }:
stdenv.mkDerivation rec {
version="0.8.7";
name = "gsmartcontrol";
src = fetchurl {
url = "http://artificialtime.com/gsmartcontrol/gsmartcontrol-${version}.tar.bz2";
sha256 = "1ipykzqpfvlr84j38hr7q2cag4imrn1gql10slp8bfrs4h1si3vh";
};
buildInputs = [ smartmontools gtk gtkmm libglademm pkgconfig pcre ];
#installTargets = "install datainstall";
meta = {
description = "GSmartControl is a graphical user interface for smartctl (from smartmontools package), which is a tool for querying and controlling SMART (Self-Monitoring, Analysis, and Reporting Technology) data on modern hard disk drives.";
homepage = http://gsmartcontrol.berlios.de;
license = "GPLv2+";
maintainers = with stdenv.lib.maintainers; [qknight];
platforms = with stdenv.lib.platforms; linux;
};
}

12
pkgs/tools/misc/testdisk/default.nix
View file

@ -1,18 +1,18 @@
{stdenv, fetchurl, ncurses, libjpeg, e2fsprogs, zlib, openssl}:
{stdenv, fetchurl, ncurses, libjpeg, e2fsprogs, zlib, openssl, libuuid}:
stdenv.mkDerivation {
name = "testdisk-6.8";
name = "testdisk-6.13";
src = fetchurl {
url = http://www.cgsecurity.org/testdisk-6.8.tar.bz2;
sha256 = "0cyqikcyi6zj671kkr8vydqskh2r7f3n1v3xks1vh1biaffqq2ir";
url = http://www.cgsecurity.org/testdisk-6.13.tar.bz2;
sha256 = "087jrn41z3ymf1b6njl2bg99pr79v8l1f63f7rn5ni69vz6mq9s8";
};
buildInputs = [ncurses libjpeg e2fsprogs zlib openssl];
buildInputs = [ncurses libjpeg e2fsprogs zlib openssl libuuid];
meta = {
homepage = http://www.cgsecurity.org/wiki/TestDisk;
license = "GPL";
license = "GPLv2+";
longDescription = ''
TestDisk is a program for data recovery, primarily designed to
help recover lost partitions and/or make non-booting disks

21
pkgs/tools/networking/miniupnpd/default.nix
View file

@ -1,33 +1,34 @@
{ stdenv, fetchurl, iptables }:
{ stdenv, fetchurl, iptables, libnfnetlink, libnetfilter_conntrack }:
assert stdenv.isLinux;
stdenv.mkDerivation rec {
name = "miniupnpd-1.4";
name = "miniupnpd-1.7.20121005";
src = fetchurl {
url = "http://miniupnp.free.fr/files/download.php?file=${name}.tar.gz";
sha256 = "06q5agkzv2snjxcsszpm27h8bqv41jijahs8jqnarxdrik97rfl5";
sha256 = "03kaxj808hgj1zf2528pzilgywgh70mh0qivjb5nm3spziiq32sv";
};
buildInputs = [ iptables ];
buildInputs = [ iptables libnfnetlink libnetfilter_conntrack ];
patchPhase = ''
sed -i -e 's/upnputils\.o -lnfnetlink/upnputils.o/' Makefile.linux
'';
NIX_CFLAGS_COMPILE = "-DIPTABLES_143";
NIX_CFLAGS_LINK = "-liptc";
NIX_CFLAGS_LINK = "-liptc -lnfnetlink";
makefile = "Makefile.linux";
makeFlags = "LIBS=";
postBuild = "cat config.h";
installFlags = "PREFIX=$(out) INSTALLPREFIX=$(out)";
postInstall =
preInstall =
''
mkdir -p $out/share/man/man1
cp miniupnpd.1 $out/share/man/man1/
mkdir -p $out/share/man/man8
'';
meta = {

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

@ -4249,6 +4249,8 @@ let
libmng = callPackage ../development/libraries/libmng { };
libmnl = callPackage ../development/libraries/libmnl { };
libmodplug = callPackage ../development/libraries/libmodplug {};
libmpcdec = callPackage ../development/libraries/libmpcdec { };
@ -4267,6 +4269,10 @@ let
libmusicbrainz = libmusicbrainz3;
libnetfilter_conntrack = callPackage ../development/libraries/libnetfilter_conntrack { };
libnfnetlink = callPackage ../development/libraries/libnfnetlink { };
libnih = callPackage ../development/libraries/libnih { };
libnova = callPackage ../development/libraries/libnova { };
@ -8127,6 +8133,10 @@ let
inherit (gnome) gnomedocutils;
};
gsmartcontrol = callPackage ../tools/misc/gsmartcontrol {
inherit (gnome) libglademm;
};
gtypist = callPackage ../games/gtypist { };
hexen = callPackage ../games/hexen { };

11
pkgs/top-level/haskell-packages.nix
View file

@ -120,6 +120,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
haskellPlatformArgs_future = self : {
inherit (self) cabal ghc;
async = self.async_2_0_1_3; # 7.6 ok
cgi = self.cgi_3001_1_8_3; # 7.6 ok
fgl = self.fgl_5_4_2_4; # 7.6 ok
GLUT = self.GLUT_2_3_0_0; # 7.6 ok
@ -137,16 +138,19 @@ 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_1; # 7.6 ok
stm = self.stm_2_4; # 7.6 ok
syb = self.syb_0_3_7; # 7.6 ok
text = self.text_0_11_2_3; # 7.6 ok
transformers = self.transformers_0_3_0_0; # 7.6 ok
vector = self.vector_0_10; # 7.6 ok
xhtml = self.xhtml_3000_2_1; # 7.6 ok
zlib = self.zlib_0_5_4_0; # 7.6 ok
cabalInstall = self.cabalInstall_1_16_0; # 7.6 ok
alex = self.alex_3_0_1; # 7.6 ok
haddock = self.haddock_2_12_0; # 7.6 ok
alex = self.alex_3_0_2; # 7.6 ok
haddock = self.haddock_2_13_1; # 7.6 ok
happy = self.happy_1_18_10; # 7.6 ok
primitive = self.primitive_0_5_0_1; # semi-official, but specified
};
haskellPlatformArgs_2012_4_0_0 = self : {
@ -1816,7 +1820,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
haddock_2_10_0 = callPackage ../development/tools/documentation/haddock/2.10.0.nix {};
haddock_2_11_0 = callPackage ../development/tools/documentation/haddock/2.11.0.nix {};
haddock_2_12_0 = callPackage ../development/tools/documentation/haddock/2.12.0.nix {};
haddock = self.haddock_2_12_0;
haddock_2_13_1 = callPackage ../development/tools/documentation/haddock/2.13.1.nix {};
haddock = self.haddock_2_13_1;
happy_1_18_4 = callPackage ../development/tools/parsing/happy/1.18.4.nix {};
happy_1_18_5 = callPackage ../development/tools/parsing/happy/1.18.5.nix {};

17
pkgs/top-level/python-packages.nix
View file

@ -1718,6 +1718,23 @@ let pythonPackages = python.modules // rec {
};
publicsuffix = buildPythonPackage rec {
name = "publicsuffix-${version}";
version = "1.0.2";
src = fetchurl {
url = "http://pypi.python.org/packages/source/p/publicsuffix/${name}.tar.gz";
md5 = "f86babf56f6e58b564d3853adebcf37a";
};
meta = {
description = "Allows to get the public suffix of a domain name";
homepage = "http://pypi.python.org/pypi/publicsuffix/";
license = pkgs.lib.licenses.mit;
};
};
pyasn1 = buildPythonPackage ({
name = "pyasn1-0.0.11a";

1
pkgs/top-level/release.nix
View file

@ -356,6 +356,7 @@ with (import ./release-lib.nix);
firefox36Pkgs.firefox = linux;
firefox12Pkgs.firefox = linux;
firefox15Pkgs.firefox = linux;
firefox16Pkgs.firefox = linux;
gnome = {
gnome_panel = linux;