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

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

Browse Source
This commit is contained in:
Sander van der Burg
2013-03-13 15:09:40 +01:00
parent 0f0e4b856a a07ae64cee
commit 0b4bd3afe5
17 changed files with 143 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/development/interpreters/python/docs/default.nix
View File

@@ -3,6 +3,7 @@
let
pythonDocs = {
html = {
recurseForDerivations = true;
python33 = import ./3.3-html.nix {
inherit stdenv fetchurl lib;
};
@@ -23,6 +24,7 @@ pythonDocs = {
};
};
pdf_a4 = {
recurseForDerivations = true;
python33 = import ./3.3-pdf-a4.nix {
inherit stdenv fetchurl lib;
};
@@ -43,6 +45,7 @@ pythonDocs = {
};
};
pdf_letter = {
recurseForDerivations = true;
python33 = import ./3.3-pdf-letter.nix {
inherit stdenv fetchurl lib;
};
@@ -63,6 +66,7 @@ pythonDocs = {
};
};
text = {
recurseForDerivations = true;
python33 = import ./3.3-text.nix {
inherit stdenv fetchurl lib;
};

6
pkgs/development/interpreters/python/docs/generate.sh
View File

@@ -16,7 +16,11 @@ pythonDocs = {
EOF
for type in $TYPES; do
echo " ${type/-/_} = {" >> default.nix
cat >>default.nix <<EOF
${type/-/_} = {
recurseForDerivations = true;
EOF
for version in $VERSIONS; do
major=$(echo -n ${version}| cut -d. -f1)
minor=$(echo -n ${version}| cut -d. -f2)

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

@@ -2,8 +2,8 @@
cabal.mkDerivation (self: {
pname = "NumInstances";
version = "1.0";
sha256 = "1fmg3slwma5f88a2qxj54ny40s67qbdyvsyh506bkp11v54958fy";
version = "1.2";
sha256 = "0s26j3h0xg16lcz95qs21iyfnzx8q8w2k2lnq55gakkr1wl4ap59";
meta = {
description = "Instances of numeric classes for functions and tuples";
license = self.stdenv.lib.licenses.bsd3;

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

@@ -4,8 +4,8 @@
cabal.mkDerivation (self: {
pname = "conduit";
version = "1.0.2";
sha256 = "03hyryljvkbgyvwx63qrkvf2wm1qm8640rsm8yb4mahgzp4r130f";
version = "1.0.3";
sha256 = "1jvbm5v25h1m5a9gd0f417mhpabp3kcfzsjm8887gcyimp2d0z07";
buildDepends = [
liftedBase monadControl resourcet text transformers
transformersBase void

4
pkgs/development/libraries/haskell/ghc-mod/default.nix
View File

@@ -4,8 +4,8 @@
cabal.mkDerivation (self: {
pname = "ghc-mod";
version = "1.12.1";
sha256 = "0m876lfxi0k7v27rg4ipq3rpk7qvsrzfdflp5fayxvmi9wgdvm3r";
version = "1.12.2";
sha256 = "0kwf1szw26iz4sw2slv10birpngf1cfy9jzmllzr0nvybh1pv7a9";
isLibrary = false;
isExecutable = true;
buildDepends = [

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

@@ -4,8 +4,8 @@
cabal.mkDerivation (self: {
pname = "hint";
version = "0.3.3.5";
sha256 = "09pd4b105c2ikf4ap96fz8091qra7hypq3k3ik0kay3bb532hmlq";
version = "0.3.3.6";
sha256 = "080wnds99lg9p4n2h9d4bpgvk73yzc3im2ysn1r8f3nqai4b2can";
buildDepends = [
extensibleExceptions filepath ghcMtl ghcPaths haskellSrc
MonadCatchIOMtl mtl random utf8String

4
pkgs/development/libraries/haskell/http-conduit/default.nix
View File

@@ -9,8 +9,8 @@
cabal.mkDerivation (self: {
pname = "http-conduit";
version = "1.9.1";
sha256 = "1ypwqd5f6m459kjw2x3knig924s93b6yiviy7jlaxllpaw2lrial";
version = "1.9.2.1";
sha256 = "1zzw9gdljn7pmp0d6k051gp1wiw9412c3gdbpwbpng6m5jhk079i";
buildDepends = [
asn1Data base64Bytestring blazeBuilder blazeBuilderConduit
caseInsensitive certificate conduit cookie cprngAes dataDefault

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

@@ -4,8 +4,8 @@
cabal.mkDerivation (self: {
pname = "liblastfm";
version = "0.1.0.0";
sha256 = "1777p2zysha9z389dkzvc22wph5k2xa6f23xk1ckr8j1q5v9dg6x";
version = "0.1.1.0";
sha256 = "1yrgyb0m1gdhsrkv3b8a5a0qii67v9gx1kbv79ixlac60bsm4q95";
buildDepends = [
aeson cereal cryptoApi httpConduit httpTypes network pureMD5 text
];

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

@@ -4,8 +4,8 @@
cabal.mkDerivation (self: {
pname = "monad-logger";
version = "0.3.1";
sha256 = "09bgj436hyyc5x0flkwcxx3m97y5pm8whd5cc6a0q7bc4bnzf80j";
version = "0.3.1.1";
sha256 = "11qqmflcydjfm5py7rkbi9qd0mkhw4kxzxff95wf0jmaia9knvx6";
buildDepends = [
conduit fastLogger monadControl mtl resourcet text transformers
transformersBase

7
pkgs/development/libraries/haskell/numbers/default.nix
View File

@@ -2,14 +2,13 @@
cabal.mkDerivation (self: {
pname = "numbers";
version = "3000.1.0.1";
sha256 = "0r2s47nfdxasnp8j7giwpxls9v48f6ld0gc2hg2p7y2ar5xfrcc4";
version = "3000.1.0.3";
sha256 = "0w2m2m3vp3lpvnc7wkw6pqfz741a68dma4s0asl7cryykwf94xgz";
testDepends = [
QuickCheck testFramework testFrameworkQuickcheck2
];
doCheck = false;
meta = {
homepage = "https://github.com/DanBurton/numbers";
homepage = "https://github.com/DanBurton/numbers#readme";
description = "Various number types";
license = self.stdenv.lib.licenses.bsd3;
platforms = self.ghc.meta.platforms;

4
pkgs/development/libraries/haskell/persistent-template/default.nix
View File

@@ -4,8 +4,8 @@
cabal.mkDerivation (self: {
pname = "persistent-template";
version = "1.1.2.4";
sha256 = "0fsqyv5r6h356shmah6bs75fzds0fsmyizbnvj5ywzhc003jv5h9";
version = "1.1.2.5";
sha256 = "142b02ini1b5c566rzhykv45n4byzvhp9r6yyavy4zyvgdj7ligj";
buildDepends = [ aeson monadControl persistent text transformers ];
testDepends = [ aeson hspec persistent QuickCheck text ];
meta = {

1
pkgs/development/libraries/haskell/punycode/default.nix
View File

@@ -6,6 +6,7 @@ cabal.mkDerivation (self: {
sha256 = "192jgfixnpxdj6jiiz92kx5bi6ij3c389b76q9f4vyfmvcajj1sr";
buildDepends = [ cereal mtl text ];
testDepends = [ cereal encoding HUnit mtl QuickCheck text ];
doCheck = false;
meta = {
homepage = "https://github.com/litherum/punycode";
description = "Encode unicode strings to ascii forms according to RFC 3492";

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

@@ -2,8 +2,8 @@
cabal.mkDerivation (self: {
pname = "smallcheck";
version = "1.0.1";
sha256 = "1b8g7vgvwyz2smx16gbn73k749mazj2zmr2hjhqj4rk0433i6lpk";
version = "1.0.2";
sha256 = "09zlsvgbwgpjwkjhizbzzww2nvkyxvkf214yqxzfaa1cj9xzbbdi";
buildDepends = [ logict mtl ];
meta = {
homepage = "https://github.com/feuerbach/smallcheck";

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

@@ -4,8 +4,8 @@
cabal.mkDerivation (self: {
pname = "threads";
version = "0.5.0.1";
sha256 = "0amyaxa70q6v021nab6v3cfqc40mwj5dr2fwla9d4bm6ppmq6lyy";
version = "0.5.0.2";
sha256 = "14ccmjg56429a3mzx11ccv18bvkqg56ph9kbpmhdx2ajar80g6jm";
buildDepends = [ baseUnicodeSymbols stm ];
testDepends = [
baseUnicodeSymbols concurrentExtra HUnit stm testFramework

4
pkgs/development/libraries/haskell/wai-extra/default.nix
View File

@@ -7,8 +7,8 @@
cabal.mkDerivation (self: {
pname = "wai-extra";
version = "1.3.2.4";
sha256 = "12hdg5h4bk04nhcmjm5mc62dng9np0dlik4b1w1syd2lxqv6pdb9";
version = "1.3.3.1";
sha256 = "0ss58s5m8yp326q0651znifbfl6kpimyhm479wx8r3zx3ndl47q9";
buildDepends = [
ansiTerminal blazeBuilder blazeBuilderConduit caseInsensitive
conduit dataDefault dateCache fastLogger httpTypes network