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

Merge branch 'master' of github.com:NixOS/nixpkgs

Browse Source
This commit is contained in:
Russell O'Connor 2013-07-14 23:43:00 -04:00
commit 9fe9527f57
15 changed files with 39 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
pkgs/development/libraries/aspell/dictionaries.nix
View File

@ -29,14 +29,14 @@ let
in {
de = buildDict {
shortName = "de-20120607";
shortName = "de-20030222-1";
fullName = "German";
src = fetchurl {
url = https://www.j3e.de/ispell/igerman98/dict/igerman98-20120607.tar.bz2;
sha256 = "1m9jzxwrh0hwsrjs6l98v88miia45y643nbayzjjria2harq7yy5";
url = mirror://gnu/aspell/dict/de/aspell6-de-20030222-1.tar.bz2;
sha256 = "01p92qj66cqb346gk7hjfynaap5sbcn85xz07kjfdq623ghr8v5s";
};
};
en = buildDict {
shortName = "en-7.1-0";
fullName = "English";
@ -45,7 +45,7 @@ in {
sha256 = "02ldfiny4iakgfgy4sdrzjqdzi7l1rmb6y30lv31kfy5x31g77gz";
};
};
es = buildDict {
shortName = "es-1.11-2";
fullName = "Spanish";
@ -54,7 +54,7 @@ in {
sha256 = "1k5g328ac1hdpp6fsg57d8md6i0aqcwlszp3gbmp5706wyhpydmd";
};
};
eo = buildDict {
shortName = "eo-2.1.20000225a-2";
fullName = "Esperanto";
@ -72,7 +72,7 @@ in {
sha256 = "14ffy9mn5jqqpp437kannc3559bfdrpk7r36ljkzjalxa53i0hpr";
};
};
it = buildDict {
shortName = "it-2.2_20050523-0";
fullName = "Italian";
@ -81,7 +81,7 @@ in {
sha256 = "1gdf7bc1a0kmxsmphdqq8pl01h667mjsj6hihy6kqy14k5qdq69v";
};
};
la = buildDict {
shortName = "la-20020503-0";
fullName = "Latin";
@ -90,7 +90,7 @@ in {
sha256 = "1199inwi16dznzl087v4skn66fl7h555hi2palx6s1f3s54b11nl";
};
};
nl = buildDict {
shortName = "nl-0.50-2";
fullName = "Dutch";
@ -103,7 +103,7 @@ in {
echo "add nl.rws" > $out/lib/aspell/nederlands.multi
'';
};
pl = buildDict {
shortName = "pl-6.0_20061121-0";
fullName = "Polish";
@ -112,7 +112,7 @@ in {
sha256 = "0kap4kh6bqbb22ypja1m5z3krc06vv4n0hakiiqmv20anzy42xq1";
};
};
ru = buildDict {
shortName = "ru-0.99f7-1";
fullName = "Russian";
@ -121,5 +121,5 @@ in {
sha256 = "0ip6nq43hcr7vvzbv4lwwmlwgfa60hrhsldh9xy3zg2prv6bcaaw";
};
};
}

4
pkgs/development/libraries/haskell/SDL/default.nix
View File

@ -2,8 +2,8 @@
cabal.mkDerivation (self: {
pname = "SDL";
version = "0.6.4";
sha256 = "1zrfx2nw0k8lfkr6vnwsp5wr3yz62v0bq60p4sdzj7gm01bz92g0";
version = "0.6.5";
sha256 = "1vlf1bvp4cbgr31qk6aqikhgn9jbgj7lrvnjzv3ibykm1hhd6vdb";
extraLibraries = [ SDL ];
meta = {
description = "Binding to libSDL";

1
pkgs/development/libraries/haskell/abstract-deque/default.nix
View File

@ -6,6 +6,7 @@ cabal.mkDerivation (self: {
sha256 = "12g4y3j59nkjw9ja247m8ydhj6a033lzfbqkp4a5slrqdxfdlvyb";
buildDepends = [ HUnit random testFramework testFrameworkHunit ];
testDepends = [ HUnit random testFramework testFrameworkHunit ];
doCheck = false;
meta = {
homepage = "https://github.com/rrnewton/haskell-lockfree-queue/wiki";
description = "Abstract, parameterized interface to mutable Deques";

4
pkgs/development/libraries/haskell/acid-state/default.nix
View File

@ -4,8 +4,8 @@
cabal.mkDerivation (self: {
pname = "acid-state";
version = "0.11.3";
sha256 = "0808wcr2n9r3z94ljlzalzkfr7ri327vm5s8xif42n9dw600xi0j";
version = "0.11.4";
sha256 = "1z9jswg5c2wp9k2lfp0yx7mvw6iiyizm72s552lgjn8i3slq8481";
buildDepends = [
cereal extensibleExceptions filepath mtl network safecopy stm
];

8
pkgs/development/libraries/haskell/comonad/default.nix
View File

@ -1,10 +1,10 @@
{ cabal, doctest, filepath, semigroups, transformers }:
{ cabal, doctest, filepath, semigroups, tagged, transformers }:
cabal.mkDerivation (self: {
pname = "comonad";
version = "3.0.3";
sha256 = "1wngwa1cdww5c631dcil0c7mgkqx9bj7m5i63p7d9ymhpyx9sw2l";
buildDepends = [ semigroups transformers ];
version = "3.1";
sha256 = "0sl9b3f1vwpjdvnrxv7b8n512w05pv4in6qx3l4sbksdp1zjvcyv";
buildDepends = [ semigroups tagged transformers ];
testDepends = [ doctest filepath ];
meta = {
homepage = "http://github.com/ekmett/comonad/";

4
pkgs/development/libraries/haskell/comonads-fd/default.nix
View File

@ -4,8 +4,8 @@
cabal.mkDerivation (self: {
pname = "comonads-fd";
version = "3.0.2";
sha256 = "1gzgld895b11j556nc5pj7nbafx746b1z49bx4z38l9wq6qzbvqa";
version = "3.0.3";
sha256 = "06x545yq5xc3kphjipkgjrgrfvvkjpy0wji9d5fw44ca91nzglww";
buildDepends = [
comonad comonadTransformers mtl semigroups transformers
];

1
pkgs/development/libraries/haskell/haskell-src-meta/default.nix
View File

@ -5,6 +5,7 @@ cabal.mkDerivation (self: {
version = "0.6.0.2";
sha256 = "1msqnsavghsc5bil3mm9swpi9a54pki4162jdfwwvlzvdmfvk9hp";
buildDepends = [ haskellSrcExts syb thOrphans uniplate ];
jailbreak = true;
meta = {
description = "Parse source to template-haskell abstract syntax";
license = self.stdenv.lib.licenses.bsd3;

4
pkgs/development/libraries/haskell/monad-par-extras/default.nix
View File

@ -2,8 +2,8 @@
cabal.mkDerivation (self: {
pname = "monad-par-extras";
version = "0.3.2";
sha256 = "1k0j3n803z4lv5impz6xd1nzav35dl5f68nlw2ppgg1bbfpvdv6b";
version = "0.3.3";
sha256 = "0bl4bd6jzdc5zm20q1g67ppkfh6j6yn8fwj6msjayj621cck67p2";
buildDepends = [
abstractPar cereal deepseq mtl random transformers
];

4
pkgs/development/libraries/haskell/pipes-concurrency/default.nix
View File

@ -2,8 +2,8 @@
cabal.mkDerivation (self: {
pname = "pipes-concurrency";
version = "1.2.0";
sha256 = "058v9d3wf9n1d25rhdq5vj60p8mll5yv2zn2k1092bg7qisip1fq";
version = "1.2.1";
sha256 = "036cn6pafqpf2811iigablks3zk747bnzji9ykrgwhpja427vlbl";
buildDepends = [ pipes stm ];
meta = {
description = "Concurrency for the pipes ecosystem";

4
pkgs/development/libraries/haskell/shelly/default.nix
View File

@ -3,8 +3,8 @@
cabal.mkDerivation (self: {
pname = "shelly";
version = "1.3.0.6";
sha256 = "0sm55f02cm89m8szhf9zb2jww86amzd6wdk44b3cqr7aza08clvj";
version = "1.3.0.7";
sha256 = "08ydsvgc8n0bvk5vcz3a3rpdbnranlbv8y84imkkh7i0p3nqyg2m";
buildDepends = [
mtl systemFileio systemFilepath text time unixCompat
];

1
pkgs/development/libraries/haskell/snap/snap.nix
View File

@ -19,6 +19,7 @@ cabal.mkDerivation (self: {
snapCore snapServer stm syb text time transformers
unorderedContainers vector vectorAlgorithms xmlhtml
];
jailbreak = true;
meta = {
homepage = "http://snapframework.com/";
description = "Top-level package for the Snap Web Framework";

4
pkgs/development/libraries/haskell/th-orphans/default.nix
View File

@ -2,8 +2,8 @@
cabal.mkDerivation (self: {
pname = "th-orphans";
version = "0.6";
sha256 = "1ablf4c8vp9kzvr75ngl5yz3ip5klk6zmq7bcqcvks758b9c6qgj";
version = "0.7";
sha256 = "0fb0wkpvb8wc12gpgm90jfsgcm4p1wf8p0m5xjk64zkcjrdxjr80";
buildDepends = [ thLift ];
noHaddock = true;
meta = {

4
pkgs/development/libraries/libva/default.nix
View File

@ -1,11 +1,11 @@
{ stdenv, fetchurl, libX11, pkgconfig, libXext, mesa, libdrm, libXfixes }:
stdenv.mkDerivation rec {
name = "libva-1.1.1";
name = "libva-1.2.1";
src = fetchurl {
url = "http://www.freedesktop.org/software/vaapi/releases/libva/${name}.tar.bz2";
sha256 = "0kfdcrzcr82g15l0vvmm6rqr0f0604d4dgrza78gn6bfx7rppby0";
sha1 = "f716a4cadd670b14f44a2e833f96a2c509956339";
};
buildInputs = [ libX11 libXext pkgconfig mesa libdrm libXfixes ];

4
pkgs/tools/archivers/cromfs/default.nix
View File

@ -1,11 +1,11 @@
{ stdenv, fetchurl, pkgconfig, fuse, perl }:
stdenv.mkDerivation rec {
name = "cromfs-1.5.10";
name = "cromfs-1.5.10.1";
src = fetchurl {
url = "http://bisqwit.iki.fi/src/arch/${name}.tar.bz2";
sha256 = "1w079zb5scv6bj919ndr0fkiirq2bkyjrnmwqrr9yzwbyinzg73j";
sha256 = "0fg6vnbxr5jk4gqj31yqc9fj1gp3bj955qhxav28nvc6sbql7ac2";
};
patchPhase = ''sed -i 's@/bin/bash@/bin/sh@g' configure'';

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

@ -7181,7 +7181,7 @@ let
chromium = lowPrio (callPackage ../applications/networking/browsers/chromium {
channel = "stable";
gconf = gnome.GConf;
pulseSupport = config.pulseaudio or false;
pulseSupport = config.pulseaudio or true;
});
chromiumBeta = lowPrio (chromium.override { channel = "beta"; });
@ -7536,7 +7536,7 @@ let
libpng = libpng.override { apngSupport = true; };
};
firefoxWrapper = lowPrio (wrapFirefox { browser = firefoxPkgs.firefox; });
firefoxWrapper = wrapFirefox { browser = firefoxPkgs.firefox; };
flac = callPackage ../applications/audio/flac { };