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

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

Browse Source
This commit is contained in:
Eelco Dolstra
2013-03-07 19:33:52 +01:00
parent da437144fa d742d26b0d
commit 674c51af3c
121 changed files with 1677 additions and 727 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/applications/audio/drumkv1/default.nix
+21
View File
@@ -0,0 +1,21 @@
{ stdenv, fetchurl, jackaudio, libsndfile, lv2, qt4 }:
stdenv.mkDerivation rec {
name = "drumkv1-${version}";
version = "0.3.2";
src = fetchurl {
url = "mirror://sourceforge/drumkv1/${name}.tar.gz";
sha256 = "0bafg06iavri9dmg7hpz554kpqf1iv9crcdq46y4n4wyyxd7kajl";
};
buildInputs = [ jackaudio libsndfile lv2 qt4 ];
meta = with stdenv.lib; {
description = "An old-school drum-kit sampler synthesizer with stereo fx";
homepage = http://drumkv1.sourceforge.net/;
license = licenses.gpl2Plus;
platforms = platforms.linux;
maintainers = [ maintainers.goibhniu ];
};
}
pkgs/applications/audio/jack-oscrolloscope/default.nix
+26
View File
@@ -0,0 +1,26 @@
{ stdenv, fetchurl, SDL, jackaudio, mesa, pkgconfig }:
stdenv.mkDerivation rec {
name = "jack_oscrolloscope-${version}";
version = "0.7";
src = fetchurl {
url = "http://das.nasophon.de/download/${name}.tar.gz";
sha256 = "1pl55in0sj7h5r06n1v91im7d18pplvhbjhjm1fdl39zwnyxiash";
};
buildInputs = [ SDL jackaudio mesa pkgconfig ];
installPhase = ''
mkdir -p $out/bin
mv jack_oscrolloscope $out/bin/
'';
meta = with stdenv.lib; {
description = "A simple waveform viewer for JACK";
homepage = http://das.nasophon.de/jack_oscrolloscope;
license = licenses.gpl2;
maintainers = [ maintainers.goibhniu ];
platforms = stdenv.lib.platforms.linux;
};
}
pkgs/applications/audio/mopidy/default.nix
+1 -1
View File
@@ -14,7 +14,7 @@ pythonPackages.buildPythonPackage rec {
};
propagatedBuildInputs = with pythonPackages; [
gst_python pygobject pykka pyspotify pylast
gst_python pygobject pykka pyspotify pylast cherrypy ws4py
];
# python zip complains about old timestamps
pkgs/applications/audio/mopidy/git.nix
+1 -1
View File
@@ -14,7 +14,7 @@ pythonPackages.buildPythonPackage rec {
};
propagatedBuildInputs = with pythonPackages; [
gst_python pygobject pykka pyspotify pylast
gst_python pygobject pykka pyspotify pylast cherrypy ws4py
];
# python zip complains about old timestamps
pkgs/applications/audio/samplv1/default.nix
+21
View File
@@ -0,0 +1,21 @@
{ stdenv, fetchurl, jackaudio, libsndfile, lv2, qt4 }:
stdenv.mkDerivation rec {
name = "samplv1-${version}";
version = "0.3.2";
src = fetchurl {
url = "mirror://sourceforge/samplv1/${name}.tar.gz";
sha256 = "1j6q3ywbdsyhskc60p7k8ph058ylrrmjmri3q1wr2d2akcaqvb7m";
};
buildInputs = [ jackaudio libsndfile lv2 qt4 ];
meta = with stdenv.lib; {
description = "An old-school all-digital polyphonic sampler synthesizer with stereo fx";
homepage = http://samplv1.sourceforge.net/;
license = licenses.gpl2Plus;
platforms = platforms.linux;
maintainers = [ maintainers.goibhniu ];
};
}
pkgs/applications/audio/synthv1/default.nix
+21
View File
@@ -0,0 +1,21 @@
{ stdenv, fetchurl, qt4, jackaudio, lv2 }:
stdenv.mkDerivation rec {
name = "synthv1-${version}";
version = "0.3.2";
src = fetchurl {
url = "mirror://sourceforge/synthv1/${name}.tar.gz";
sha256 = "1230yf49qfw540yvp5n7sh6mf3k8590pzwc5mragd3nd6k6apgw9";
};
buildInputs = [ qt4 jackaudio lv2 ];
meta = with stdenv.lib; {
description = "An old-school 4-oscillator subtractive polyphonic synthesizer with stereo fx";
homepage = http://synthv1.sourceforge.net/;
license = licenses.gpl2Plus;
platforms = platforms.linux;
maintainers = [ maintainers.goibhniu ];
};
}
pkgs/applications/graphics/mypaint/default.nix
+35
View File
@@ -0,0 +1,35 @@
{ stdenv, fetchurl, gettext, glib, gtk, json_c, lcms2, libpng
, makeWrapper, pkgconfig, pygtk, python, pythonPackages, scons, swig
}:
stdenv.mkDerivation rec {
name = "mypaint-${version}";
version = "1.1.0";
src = fetchurl {
url = "http://download.gna.org/mypaint/${name}.tar.bz2";
sha256 = "0f7848hr65h909c0jkcx616flc0r4qh53g3kd1cgs2nr1pjmf3bq";
};
buildInputs = [
gettext glib gtk json_c lcms2 libpng makeWrapper pkgconfig pygtk
python scons swig
];
propagatedBuildInputs = [ pythonPackages.numpy ];
buildPhase = "scons prefix=$out";
installPhase = ''
scons prefix=$out install
wrapProgram $out/bin/mypaint --prefix PYTHONPATH : $PYTHONPATH
'';
meta = with stdenv.lib; {
description = "A graphics application for digital painters";
homepage = http://mypaint.intilinux.com;
license = licenses.gpl2Plus;
platforms = platforms.linux;
maintainers = [ maintainers.goibhniu ];
};
}
pkgs/applications/misc/zathura/builder.sh
+11 -1
View File
@@ -1,11 +1,21 @@
source $stdenv/setup
mkdir -pv $out/bin/
mkdir -pv $out/share/
mkdir -pv $out/share/applications/
mkdir -pv $out/share/pixmaps/
cat > $out/bin/zathura <<EOF
#!/bin/sh
exec $zathura --plugins-dir=$plugins_path "\$@"
exec $zathura_core/bin/zathura --plugins-dir=$plugins_path "\$@"
EOF
cp -rv $zathura_core/share/man $out/share
cp -rv $zathura_core/share/locale $out/share
cp -rv $icon $out/share/pixmaps/pwmt.xpm
cat $zathura_core/share/applications/zathura.desktop > $out/share/applications/zathura.desktop
echo "Icon=pwmt" >> $out/share/applications/zathura.desktop
chmod 755 $out/bin/zathura
pkgs/applications/misc/zathura/core/default.nix
+9 -2
View File
@@ -1,4 +1,4 @@
{ stdenv, fetchurl, pkgconfig, gtk, girara, gettext }:
{ stdenv, fetchurl, pkgconfig, gtk, girara, gettext, docutils }:
stdenv.mkDerivation rec {
@@ -13,7 +13,14 @@ stdenv.mkDerivation rec {
buildInputs = [ pkgconfig gtk girara gettext ];
makeFlags = "PREFIX=$(out)";
# Bug in zathura build system: we should remove empty manfiles in order them
# to be compiled properly
preBuild = ''
rm zathura.1
rm zathurarc.5
'';
makeFlags = [ "PREFIX=$(out)" "RSTTOMAN=${docutils}/bin/rst2man.py" "VERBOSE=1" ];
meta = {
homepage = http://pwmt.org/projects/zathura/;
pkgs/applications/misc/zathura/default.nix
+6 -4
View File
@@ -1,4 +1,4 @@
{ callPackage, pkgs }:
{ callPackage, pkgs, fetchurl }:
rec {
inherit (pkgs) stdenv;
@@ -11,7 +11,9 @@ rec {
zathura_ps = callPackage ./ps { };
zathuraWrapper = stdenv.mkDerivation rec {
zathuraWrapper = stdenv.mkDerivation {
inherit zathura_core;
name = "zathura-${zathura_core.version}";
@@ -21,7 +23,7 @@ rec {
zathura_ps
];
zathura = "${zathura_core}/bin/zathura";
icon = ./icon.xpm;
builder = ./builder.sh;
@@ -36,7 +38,7 @@ rec {
'';
license = stdenv.lib.licenses.zlib;
platforms = stdenv.lib.platforms.linux;
maintainers = [ stdenv.lib.maintainers.garbas ];
maintainers = [ stdenv.lib.maintainers.garbas stdenv.lib.maintainers.smironov ];
};
};
}
pkgs/applications/misc/zathura/icon.xpm
+120
View File
@@ -0,0 +1,120 @@
/* XPM */
static char *freeimage[] = {
/* width height num_colors chars_per_pixel */
"16 16 96 2",
/* colors */
" c #1e1e1e",
" . c #222222",
" X c #212121",
" o c #535353",
" O c #a4a4a4",
" + c #202020",
" @ c #252525",
" # c #3c3c3c",
" $ c #292929",
" % c #979797",
" & c #cccccc",
" * c #303030",
" = c #1f1f1f",
" - c #494949",
" ; c #dddddd",
" : c #696969",
" > c #232323",
" , c #262626",
" < c #adadad",
" 1 c #bbbbbb",
" 2 c #1d1d1d",
" 3 c #1c1c1c",
" 4 c #5e5e5e",
" 5 c #e8e8e8",
" 6 c #9c9c9c",
" 7 c #242424",
" 8 c #b1b1b1",
" 9 c #b3b3b3",
" 0 c #090909",
" q c #161616",
" w c #131313",
" e c #4d4d4d",
" r c #dedede",
" t c #afafaf",
" y c #282828",
" u c #393939",
" i c #c4c4c4",
" p c #dcdcdc",
" a c #9a9a9a",
" s c #a2a2a2",
" d c #ababab",
" f c #313131",
" g c #a7a7a7",
" h c #e4e4e4",
" j c #f2f2f2",
" k c #eaeaea",
" l c #e2e2e2",
" z c #f0f0f0",
" x c #d5d5d5",
" c c #737373",
" v c #323232",
" b c #808080",
" n c #7a7a7a",
" m c #d3d3d3",
" M c #e5e5e5",
" N c #8a8a8a",
" B c #cbcbcb",
" V c #b5b5b5",
" C c #b9b9b9",
" Z c #272727",
" A c #b4b4b4",
" S c #bababa",
" D c #2d2d2d",
" F c #414141",
" G c #444444",
" H c #f4f4f4",
" J c #838383",
" K c #cfcfcf",
" L c #fafafa",
" P c #efefef",
" I c #e3e3e3",
" U c #8d8d8d",
" Y c #656565",
" T c #ffffff",
" R c #fbfbfb",
" E c #e9e9e9",
" W c #bdbdbd",
" Q c #e1e1e1",
" ! c #dfdfdf",
" ~ c #646464",
" ^ c #3a3a3a",
" / c #a1a1a1",
" ( c #999999",
" ) c #c0c0c0",
" _ c #3b3b3b",
" ` c #acacac",
" ' c #050505",
" ] c #151515",
" [ c #1b1b1b",
" { c #1a1a1a",
" } c #b2b2b2",
" | c #a5a5a5",
". c #c5c5c5",
".. c #a6a6a6",
".X c #bfbfbf",
".o c #747474",
/* pixels */
" ",
" . . . X X X X . o O + X . . ",
" . . X @ # $ . @ % & * = . . ",
" . . - ; : > , < 1 2 X . . ",
" . . 3 4 5 6 7 7 8 9 0 q q 3 ",
" . + w e r t y u i p a s d 4 ",
" X f g h j k p l z z x g c v ",
" X f b n m M N c B V 3 , > X ",
" X X w V C $ Z A S + $ , . ",
" D F G u S H 1 J K L P I U @ ",
" Y T T T R E & W Q ! d g ~ 7 ",
" ^ / 6 ( ; ) _ 2 ` 8 ' ] [ X ",
" + > 7 { A } 7 @ |. $ + . . ",
" X X X ].. 8 Z 7 n.X + X . . ",
" . . . { n.o 7 . @ y X X . . ",
" "
};
pkgs/applications/networking/browsers/chromium/sources.nix
+9 -9
View File
@@ -1,18 +1,18 @@
# This file is autogenerated from update.sh in the same directory.
{
dev = {
version = "26.0.1410.12";
url = "http://commondatastorage.googleapis.com/chromium-browser-official/chromium-26.0.1410.12.tar.xz";
sha256 = "1cfzvlldzgm53jwys5zbrd4rszkinsr4n5ky5rcg6p6nw73b4hmj";
version = "26.0.1410.28";
url = "http://commondatastorage.googleapis.com/chromium-browser-official/chromium-26.0.1410.28.tar.xz";
sha256 = "1g32xyh06xsqkli0g83flqr1qvx2yxb7vaqshf9wcyqgkyzvy7il";
};
beta = {
version = "26.0.1410.12";
url = "http://commondatastorage.googleapis.com/chromium-browser-official/chromium-26.0.1410.12.tar.xz";
sha256 = "1cfzvlldzgm53jwys5zbrd4rszkinsr4n5ky5rcg6p6nw73b4hmj";
version = "26.0.1410.28";
url = "http://commondatastorage.googleapis.com/chromium-browser-official/chromium-26.0.1410.28.tar.xz";
sha256 = "1g32xyh06xsqkli0g83flqr1qvx2yxb7vaqshf9wcyqgkyzvy7il";
};
stable = {
version = "25.0.1364.97";
url = "http://commondatastorage.googleapis.com/chromium-browser-official/chromium-25.0.1364.97.tar.bz2";
sha256 = "1r8khcic82m6g5i7669q8fxsfhjrlvp99iggqc5qpihljsz33ghm";
version = "25.0.1364.152";
url = "http://commondatastorage.googleapis.com/chromium-browser-official/chromium-25.0.1364.152.tar.bz2";
sha256 = "1v8zpqk3q21d5hars1clss75n187hlg4zxbr68jj1ysmqclzbni8";
};
}
pkgs/applications/networking/p2p/transmission/default.nix
+10 -7
View File
@@ -1,20 +1,23 @@
{ stdenv, fetchurl, pkgconfig, openssl, curl, intltool, libevent, gtkClient ? true, gtk }:
{ stdenv, fetchurl, pkgconfig, openssl, curl, intltool, libevent,
file, inotifyTools, gtk ? null }:
stdenv.mkDerivation rec {
name = "transmission-2.52";
name = "transmission-2.60"; # transmission >= 2.61 requires gtk3
src = fetchurl {
url = "http://download.transmissionbt.com/files/${name}.tar.xz";
sha256 = "05sfq5h3731xc9a1k5r1q4gbs9yk0dr229asfxjjgg0lw1xzppdw";
sha256 = "1ramdliyy8j7qqpkxg643lda11ynxwfhq6qcs31fr3h9x72l0rg4";
};
buildInputs = [ pkgconfig openssl curl intltool libevent ] ++
stdenv.lib.optional gtkClient gtk;
buildInputs = [ pkgconfig openssl curl intltool libevent
file inotifyTools gtk ];
configureFlags = if gtkClient then "--enable-gtk" else "--disable-gtk";
preConfigure = ''
sed -i -e 's|/usr/bin/file|${file}/bin/file|g' configure
'';
postInstall = ''
rm $out/share/icons/hicolor/icon-theme.cache
rm -f $out/share/icons/hicolor/icon-theme.cache
'';
meta = {
pkgs/applications/version-management/git-and-tools/github-backup/default.nix
+6 -2
View File
@@ -1,11 +1,15 @@
{ cabal, extensibleExceptions, filepath, github, hslogger, IfElse
{ cabal, fetchurl, extensibleExceptions, filepath, github, hslogger, IfElse
, MissingH, mtl, network, prettyShow
}:
cabal.mkDerivation (self: {
pname = "github-backup";
version = "1.20120314";
sha256 = "07ilb6cg1kbz4id53l4m46wjxzs7yxcmpz6280ym6k885dras5v2";
src = fetchurl {
url = "https://github.com/joeyh/github-backup/archive/1.20120314.tar.gz";
sha256 = "0rmgkylsnxbry02g5bxq5af03azgydfz6dzyvqzbhnkwavhqdlqy";
name = "github-backup-${self.pname}.tar.gz";
};
isLibrary = false;
isExecutable = true;
buildDepends = [
pkgs/applications/video/mkvtoolnix/default.nix
+3 -4
View File
@@ -16,11 +16,11 @@
}:
stdenv.mkDerivation rec {
name = "mkvtoolnix-5.9.0";
name = "mkvtoolnix-6.1.0";
src = fetchurl {
url = "http://www.bunkus.org/videotools/mkvtoolnix/sources/${name}.tar.bz2";
sha256 = "1qdxzi72w5p77brlpp7y7llsgzlvl4p8fk1kzg934cqw6cqza4yr";
url = "http://www.bunkus.org/videotools/mkvtoolnix/sources/${name}.tar.xz";
sha256 = "01k5al3886cyi97kynx5hf98z5p7mb8vd2m057gbp1k10zblcb9x";
};
buildInputs = [ libmatroska flac libvorbis file boost lzo xdg_utils expat wxGTK zlib ruby gettext pkgconfig curl ];
@@ -39,4 +39,3 @@ stdenv.mkDerivation rec {
homepage = http://www.bunkus.org/videotools/mkvtoolnix/;
};
}
pkgs/applications/video/mplayer/default.nix
+5
View File
@@ -152,6 +152,8 @@ stdenv.mkDerivation rec {
NIX_LDFLAGS = stdenv.lib.optionalString x11Support "-lX11 -lXext";
installTargets = [ "install" ] ++ stdenv.lib.optional x11Support "install-gui";
enableParallelBuilding = true;
# Provide a reasonable standard font. Maybe we should symlink here.
@@ -159,6 +161,9 @@ stdenv.mkDerivation rec {
''
mkdir -p $out/share/mplayer
cp ${freefont_ttf}/share/fonts/truetype/FreeSans.ttf $out/share/mplayer/subfont.ttf
if test -f $out/share/applications/mplayer.desktop ; then
echo "NoDisplay=True" >> $out/share/applications/mplayer.desktop
fi
'';
crossAttrs = {
pkgs/build-support/release/source-tarball.nix
+6 -14
View File
@@ -6,23 +6,15 @@
, buildInputs ? []
, name ? "source-tarball"
, version ? "0"
, versionSuffix ?
, versionSuffix ?
if officialRelease
then ""
else "pre${toString (src.rev or src.revCount or "")}"
, src, stdenv, autoconf, automake, libtool
, # By default, provide all the GNU Build System as input.
bootstrapBuildInputs ? [ autoconf automake libtool ]
, ... } @ args:
let
# By default, provide all the GNU Build System as input.
bootstrapBuildInputs =
if (args ? bootstrapBuildInputs)
then args.bootstrapBuildInputs
else [ autoconf automake libtool ];
in
stdenv.mkDerivation (
# First, attributes that can be overriden by the caller (via args):
@@ -82,17 +74,17 @@ stdenv.mkDerivation (
}
# Then, the caller-supplied attributes.
// args //
// args //
# And finally, our own stuff.
{
name = name + "-" + version + versionSuffix;
buildInputs = buildInputs ++ bootstrapBuildInputs;
preUnpack = ''
mkdir -p $out/nix-support
'';
'';
postUnpack = ''
# Set all source files to the current date. This is because Nix
pkgs/development/compilers/sbcl/default.nix
+4 -4
View File
@@ -4,11 +4,11 @@ let
s= # Generated upstream information
rec {
baseName="sbcl";
version="1.1.4";
version="1.1.5";
name="${baseName}-${version}";
hash="1k7p986hsd3yygzrsc0w68maflvhbg4gcmi3rbylyn0mi8pxb2s6";
url="mirror://sourceforge/project/sbcl/sbcl/${version}/sbcl-${version}-source.tar.bz2";
sha256="1k7p986hsd3yygzrsc0w68maflvhbg4gcmi3rbylyn0mi8pxb2s6";
hash="01wi9aah9rrs7rbjrjrkwjxq03kapyzm48iyhz38fvaqhl7phw78";
url="mirror://sourceforge/project/sbcl/sbcl/1.1.5/sbcl-1.1.5-source.tar.bz2";
sha256="01wi9aah9rrs7rbjrjrkwjxq03kapyzm48iyhz38fvaqhl7phw78";
};
buildInputs = with a; [
clisp makeWrapper
pkgs/development/interpreters/python/docs/2.6-html.nix
+7 -4
View File
@@ -1,15 +1,18 @@
# This file was generated and will be overwritten by ./generate.sh
{ stdenv, fetchurl }:
{ stdenv, fetchurl, lib }:
stdenv.mkDerivation {
stdenv.mkDerivation rec {
name = "python26-docs-html-2.6.8";
src = fetchurl {
url = http://docs.python.org/ftp/python/doc/2.6.8/python-2.6.8-docs-html.tar.bz2;
sha256 = "09kznik9ahmnrqw9gkr7mjv3b3zr258f2fm27n12hrrwwsaszkni";
};
installPhase = ''
mkdir -p $out/share/docs
cp -R ./ $out/share/docs/
mkdir -p $out/share/doc/python26
cp -R ./ $out/share/doc/python26/html
'';
meta = {
maintainers = [ lib.maintainers.chaoflow ];
};
}
pkgs/development/interpreters/python/docs/2.6-pdf-a4.nix
+7 -4
View File
@@ -1,15 +1,18 @@
# This file was generated and will be overwritten by ./generate.sh
{ stdenv, fetchurl }:
{ stdenv, fetchurl, lib }:
stdenv.mkDerivation {
stdenv.mkDerivation rec {
name = "python26-docs-pdf-a4-2.6.8";
src = fetchurl {
url = http://docs.python.org/ftp/python/doc/2.6.8/python-2.6.8-docs-pdf-a4.tar.bz2;
sha256 = "07k8n9zhd59s1yn8ahsizkaqnv969p0f2c2acxgxrxhhyy842pp8";
};
installPhase = ''
mkdir -p $out/share/docs
cp -R ./ $out/share/docs/
mkdir -p $out/share/doc/python26
cp -R ./ $out/share/doc/python26/pdf-a4
'';
meta = {
maintainers = [ lib.maintainers.chaoflow ];
};
}
pkgs/development/interpreters/python/docs/2.6-pdf-letter.nix
+7 -4
View File
@@ -1,15 +1,18 @@
# This file was generated and will be overwritten by ./generate.sh
{ stdenv, fetchurl }:
{ stdenv, fetchurl, lib }:
stdenv.mkDerivation {
stdenv.mkDerivation rec {
name = "python26-docs-pdf-letter-2.6.8";
src = fetchurl {
url = http://docs.python.org/ftp/python/doc/2.6.8/python-2.6.8-docs-pdf-letter.tar.bz2;
sha256 = "01r87m8hb7f9ql4j9zcjcrr9150nsk23sj8cy02vygr83sc1ldmq";
};
installPhase = ''
mkdir -p $out/share/docs
cp -R ./ $out/share/docs/
mkdir -p $out/share/doc/python26
cp -R ./ $out/share/doc/python26/pdf-letter
'';
meta = {
maintainers = [ lib.maintainers.chaoflow ];
};
}
pkgs/development/interpreters/python/docs/2.6-text.nix
+7 -4
View File
@@ -1,15 +1,18 @@
# This file was generated and will be overwritten by ./generate.sh
{ stdenv, fetchurl }:
{ stdenv, fetchurl, lib }:
stdenv.mkDerivation {
stdenv.mkDerivation rec {
name = "python26-docs-text-2.6.8";
src = fetchurl {
url = http://docs.python.org/ftp/python/doc/2.6.8/python-2.6.8-docs-text.tar.bz2;
sha256 = "05wsdh6ilgkclgak09fq7fsx5kflkmqq8dyxi2rpydx289cw3a8c";
};
installPhase = ''
mkdir -p $out/share/docs
cp -R ./ $out/share/docs/
mkdir -p $out/share/doc/python26
cp -R ./ $out/share/doc/python26/text
'';
meta = {
maintainers = [ lib.maintainers.chaoflow ];
};
}
pkgs/development/interpreters/python/docs/2.7-html.nix
+7 -4
View File
@@ -1,15 +1,18 @@
# This file was generated and will be overwritten by ./generate.sh
{ stdenv, fetchurl }:
{ stdenv, fetchurl, lib }:
stdenv.mkDerivation {
stdenv.mkDerivation rec {
name = "python27-docs-html-2.7.3";
src = fetchurl {
url = http://docs.python.org/ftp/python/doc/2.7.3/python-2.7.3-docs-html.tar.bz2;
sha256 = "1hg92n0mzl9w6j33b2h0bf2vy6fsxnpxfdc3qw760vcm0y00155j";
};
installPhase = ''
mkdir -p $out/share/docs
cp -R ./ $out/share/docs/
mkdir -p $out/share/doc/python27
cp -R ./ $out/share/doc/python27/html
'';
meta = {
maintainers = [ lib.maintainers.chaoflow ];
};
}
pkgs/development/interpreters/python/docs/2.7-pdf-a4.nix
+7 -4
View File
@@ -1,15 +1,18 @@
# This file was generated and will be overwritten by ./generate.sh
{ stdenv, fetchurl }:
{ stdenv, fetchurl, lib }:
stdenv.mkDerivation {
stdenv.mkDerivation rec {
name = "python27-docs-pdf-a4-2.7.3";
src = fetchurl {
url = http://docs.python.org/ftp/python/doc/2.7.3/python-2.7.3-docs-pdf-a4.tar.bz2;
sha256 = "13da88panq5b6qfhf8k4dgqgxkg4ydcac5cx69a3f35s1w90xdjr";
};
installPhase = ''
mkdir -p $out/share/docs
cp -R ./ $out/share/docs/
mkdir -p $out/share/doc/python27
cp -R ./ $out/share/doc/python27/pdf-a4
'';
meta = {
maintainers = [ lib.maintainers.chaoflow ];
};
}
pkgs/development/interpreters/python/docs/2.7-pdf-letter.nix
+7 -4
View File
@@ -1,15 +1,18 @@
# This file was generated and will be overwritten by ./generate.sh
{ stdenv, fetchurl }:
{ stdenv, fetchurl, lib }:
stdenv.mkDerivation {
stdenv.mkDerivation rec {
name = "python27-docs-pdf-letter-2.7.3";
src = fetchurl {
url = http://docs.python.org/ftp/python/doc/2.7.3/python-2.7.3-docs-pdf-letter.tar.bz2;
sha256 = "0x41phsdrpivhzkchswsliyx3a10n7gzc9irkrw6rz22j81bfydg";
};
installPhase = ''
mkdir -p $out/share/docs
cp -R ./ $out/share/docs/
mkdir -p $out/share/doc/python27
cp -R ./ $out/share/doc/python27/pdf-letter
'';
meta = {
maintainers = [ lib.maintainers.chaoflow ];
};
}
pkgs/development/interpreters/python/docs/2.7-text.nix
+7 -4
View File
@@ -1,15 +1,18 @@
# This file was generated and will be overwritten by ./generate.sh
{ stdenv, fetchurl }:
{ stdenv, fetchurl, lib }:
stdenv.mkDerivation {
stdenv.mkDerivation rec {
name = "python27-docs-text-2.7.3";
src = fetchurl {
url = http://docs.python.org/ftp/python/doc/2.7.3/python-2.7.3-docs-text.tar.bz2;
sha256 = "1rxlb3jhh3892y65i45nk1y2lx981fr22a5hmfkp9gvjvdykjnzp";
};
installPhase = ''
mkdir -p $out/share/docs
cp -R ./ $out/share/docs/
mkdir -p $out/share/doc/python27
cp -R ./ $out/share/doc/python27/text
'';
meta = {
maintainers = [ lib.maintainers.chaoflow ];
};
}
pkgs/development/interpreters/python/docs/3.0-html.nix
+7 -4
View File
@@ -1,15 +1,18 @@
# This file was generated and will be overwritten by ./generate.sh
{ stdenv, fetchurl }:
{ stdenv, fetchurl, lib }:
stdenv.mkDerivation {
stdenv.mkDerivation rec {
name = "python30-docs-html-3.0.1";
src = fetchurl {
url = http://docs.python.org/ftp/python/doc/3.0.1/python-3.0.1-docs-html.tar.bz2;
sha256 = "0ybjnhg8qfr9kc4axm5xlghkz9dmsg6b1caj6m4gz28q89vggv3c";
};
installPhase = ''
mkdir -p $out/share/docs
cp -R ./ $out/share/docs/
mkdir -p $out/share/doc/python30
cp -R ./ $out/share/doc/python30/html
'';
meta = {
maintainers = [ lib.maintainers.chaoflow ];
};
}
pkgs/development/interpreters/python/docs/3.0-pdf-a4.nix
+7 -4
View File
@@ -1,15 +1,18 @@
# This file was generated and will be overwritten by ./generate.sh
{ stdenv, fetchurl }:
{ stdenv, fetchurl, lib }:
stdenv.mkDerivation {
stdenv.mkDerivation rec {
name = "python30-docs-pdf-a4-3.0.1";
src = fetchurl {
url = http://docs.python.org/ftp/python/doc/3.0.1/python-3.0.1-docs-pdf-a4.tar.bz2;
sha256 = "1qgcydqxxhy317lkzzs2v5as4hcwcblir8y3mdr173qsg51iggra";
};
installPhase = ''
mkdir -p $out/share/docs
cp -R ./ $out/share/docs/
mkdir -p $out/share/doc/python30
cp -R ./ $out/share/doc/python30/pdf-a4
'';
meta = {
maintainers = [ lib.maintainers.chaoflow ];
};
}
pkgs/development/interpreters/python/docs/3.0-pdf-letter.nix
+7 -4
View File
@@ -1,15 +1,18 @@
# This file was generated and will be overwritten by ./generate.sh
{ stdenv, fetchurl }:
{ stdenv, fetchurl, lib }:
stdenv.mkDerivation {
stdenv.mkDerivation rec {
name = "python30-docs-pdf-letter-3.0.1";
src = fetchurl {
url = http://docs.python.org/ftp/python/doc/3.0.1/python-3.0.1-docs-pdf-letter.tar.bz2;
sha256 = "1x59q0k6fv55vvpsgr5xcq66k5zsd0f142cp6aa4rb6c81i31yml";
};
installPhase = ''
mkdir -p $out/share/docs
cp -R ./ $out/share/docs/
mkdir -p $out/share/doc/python30
cp -R ./ $out/share/doc/python30/pdf-letter
'';
meta = {
maintainers = [ lib.maintainers.chaoflow ];
};
}
pkgs/development/interpreters/python/docs/3.0-text.nix
+7 -4
View File
@@ -1,15 +1,18 @@
# This file was generated and will be overwritten by ./generate.sh
{ stdenv, fetchurl }:
{ stdenv, fetchurl, lib }:
stdenv.mkDerivation {
stdenv.mkDerivation rec {
name = "python30-docs-text-3.0.1";
src = fetchurl {
url = http://docs.python.org/ftp/python/doc/3.0.1/python-3.0.1-docs-text.tar.bz2;
sha256 = "12qlh9ywbnw50wk5siq7lmhr935dd16q3vjbii6gfv0g80b1byzx";
};
installPhase = ''
mkdir -p $out/share/docs
cp -R ./ $out/share/docs/
mkdir -p $out/share/doc/python30
cp -R ./ $out/share/doc/python30/text
'';
meta = {
maintainers = [ lib.maintainers.chaoflow ];
};
}
pkgs/development/interpreters/python/docs/3.1-html.nix
+7 -4
View File
@@ -1,15 +1,18 @@
# This file was generated and will be overwritten by ./generate.sh
{ stdenv, fetchurl }:
{ stdenv, fetchurl, lib }:
stdenv.mkDerivation {
stdenv.mkDerivation rec {
name = "python31-docs-html-3.1.5";
src = fetchurl {
url = http://docs.python.org/ftp/python/doc/3.1.5/python-3.1.5-docs-html.tar.bz2;
sha256 = "187shb92218k0i07hj9ak1kqbqjcxkivmwxlzj18v791l7x7qcpz";
};
installPhase = ''
mkdir -p $out/share/docs
cp -R ./ $out/share/docs/
mkdir -p $out/share/doc/python31
cp -R ./ $out/share/doc/python31/html
'';
meta = {
maintainers = [ lib.maintainers.chaoflow ];
};
}
pkgs/development/interpreters/python/docs/3.1-pdf-a4.nix
+7 -4
View File
@@ -1,15 +1,18 @@
# This file was generated and will be overwritten by ./generate.sh
{ stdenv, fetchurl }:
{ stdenv, fetchurl, lib }:
stdenv.mkDerivation {
stdenv.mkDerivation rec {
name = "python31-docs-pdf-a4-3.1.5";
src = fetchurl {
url = http://docs.python.org/ftp/python/doc/3.1.5/python-3.1.5-docs-pdf-a4.tar.bz2;
sha256 = "0kbj6b43gnwlb1czkzmirasmc31j10plq0rlb9s9rh8phqnbmhx1";
};
installPhase = ''
mkdir -p $out/share/docs
cp -R ./ $out/share/docs/
mkdir -p $out/share/doc/python31
cp -R ./ $out/share/doc/python31/pdf-a4
'';
meta = {
maintainers = [ lib.maintainers.chaoflow ];
};
}
pkgs/development/interpreters/python/docs/3.1-pdf-letter.nix
+7 -4
View File
@@ -1,15 +1,18 @@
# This file was generated and will be overwritten by ./generate.sh
{ stdenv, fetchurl }:
{ stdenv, fetchurl, lib }:
stdenv.mkDerivation {
stdenv.mkDerivation rec {
name = "python31-docs-pdf-letter-3.1.5";
src = fetchurl {
url = http://docs.python.org/ftp/python/doc/3.1.5/python-3.1.5-docs-pdf-letter.tar.bz2;
sha256 = "0s202vrjfa8dnp3vpfjb21bmqym9wyj8jn2glgwjzk63z6fwb60i";
};
installPhase = ''
mkdir -p $out/share/docs
cp -R ./ $out/share/docs/
mkdir -p $out/share/doc/python31
cp -R ./ $out/share/doc/python31/pdf-letter
'';
meta = {
maintainers = [ lib.maintainers.chaoflow ];
};
}
pkgs/development/interpreters/python/docs/3.1-text.nix
+7 -4
View File
@@ -1,15 +1,18 @@
# This file was generated and will be overwritten by ./generate.sh
{ stdenv, fetchurl }:
{ stdenv, fetchurl, lib }:
stdenv.mkDerivation {
stdenv.mkDerivation rec {
name = "python31-docs-text-3.1.5";
src = fetchurl {
url = http://docs.python.org/ftp/python/doc/3.1.5/python-3.1.5-docs-text.tar.bz2;
sha256 = "1jsfgfgdi1i2l3lhdk7ss5gwrcg3qhhh8syfrwz8xrv2klmmmn9b";
};
installPhase = ''
mkdir -p $out/share/docs
cp -R ./ $out/share/docs/
mkdir -p $out/share/doc/python31
cp -R ./ $out/share/doc/python31/text
'';
meta = {
maintainers = [ lib.maintainers.chaoflow ];
};
}
pkgs/development/interpreters/python/docs/3.2-html.nix
+7 -4
View File
@@ -1,15 +1,18 @@
# This file was generated and will be overwritten by ./generate.sh
{ stdenv, fetchurl }:
{ stdenv, fetchurl, lib }:
stdenv.mkDerivation {
stdenv.mkDerivation rec {
name = "python32-docs-html-3.2.3";
src = fetchurl {
url = http://docs.python.org/ftp/python/doc/3.2.3/python-3.2.3-docs-html.tar.bz2;
sha256 = "058pryg0gn0rlpswkj1z0xvpr39s3ymx3dwqfhhf83w0mlysdm0x";
};
installPhase = ''
mkdir -p $out/share/docs
cp -R ./ $out/share/docs/
mkdir -p $out/share/doc/python32
cp -R ./ $out/share/doc/python32/html
'';
meta = {
maintainers = [ lib.maintainers.chaoflow ];
};
}
pkgs/development/interpreters/python/docs/3.2-pdf-a4.nix
+7 -4
View File
@@ -1,15 +1,18 @@
# This file was generated and will be overwritten by ./generate.sh
{ stdenv, fetchurl }:
{ stdenv, fetchurl, lib }:
stdenv.mkDerivation {
stdenv.mkDerivation rec {
name = "python32-docs-pdf-a4-3.2.3";
src = fetchurl {
url = http://docs.python.org/ftp/python/doc/3.2.3/python-3.2.3-docs-pdf-a4.tar.bz2;
sha256 = "1lw1sbk3nx70k2zxgjc36ryvyzlxndzsvhrxyzdy9sjfhasyd807";
};
installPhase = ''
mkdir -p $out/share/docs
cp -R ./ $out/share/docs/
mkdir -p $out/share/doc/python32
cp -R ./ $out/share/doc/python32/pdf-a4
'';
meta = {
maintainers = [ lib.maintainers.chaoflow ];
};
}
pkgs/development/interpreters/python/docs/3.2-pdf-letter.nix
+7 -4
View File
@@ -1,15 +1,18 @@
# This file was generated and will be overwritten by ./generate.sh
{ stdenv, fetchurl }:
{ stdenv, fetchurl, lib }:
stdenv.mkDerivation {
stdenv.mkDerivation rec {
name = "python32-docs-pdf-letter-3.2.3";
src = fetchurl {
url = http://docs.python.org/ftp/python/doc/3.2.3/python-3.2.3-docs-pdf-letter.tar.bz2;
sha256 = "199ibzslw3zrwjd49582vc5q6ghp5ig8zalvslawz0xkz1226wg2";
};
installPhase = ''
mkdir -p $out/share/docs
cp -R ./ $out/share/docs/
mkdir -p $out/share/doc/python32
cp -R ./ $out/share/doc/python32/pdf-letter
'';
meta = {
maintainers = [ lib.maintainers.chaoflow ];
};
}
pkgs/development/interpreters/python/docs/3.2-text.nix
+7 -4
View File
@@ -1,15 +1,18 @@
# This file was generated and will be overwritten by ./generate.sh
{ stdenv, fetchurl }:
{ stdenv, fetchurl, lib }:
stdenv.mkDerivation {
stdenv.mkDerivation rec {
name = "python32-docs-text-3.2.3";
src = fetchurl {
url = http://docs.python.org/ftp/python/doc/3.2.3/python-3.2.3-docs-text.tar.bz2;
sha256 = "1jdc9rj2b4vsbvg5mq6vcdfa2b72avhhvjw7rn7k3kl521cvxs09";
};
installPhase = ''
mkdir -p $out/share/docs
cp -R ./ $out/share/docs/
mkdir -p $out/share/doc/python32
cp -R ./ $out/share/doc/python32/text
'';
meta = {
maintainers = [ lib.maintainers.chaoflow ];
};
}
pkgs/development/interpreters/python/docs/3.3-html.nix
+7 -4
View File
@@ -1,15 +1,18 @@
# This file was generated and will be overwritten by ./generate.sh
{ stdenv, fetchurl }:
{ stdenv, fetchurl, lib }:
stdenv.mkDerivation {
stdenv.mkDerivation rec {
name = "python33-docs-html-3.3.0";
src = fetchurl {
url = http://docs.python.org/ftp/python/doc/3.3.0/python-3.3.0-docs-html.tar.bz2;
sha256 = "0vv24b9qi7gznv687ik0pa2w1rq9grqivy44znvj2ysjfg7mc2c1";
};
installPhase = ''
mkdir -p $out/share/docs
cp -R ./ $out/share/docs/
mkdir -p $out/share/doc/python33
cp -R ./ $out/share/doc/python33/html
'';
meta = {
maintainers = [ lib.maintainers.chaoflow ];
};
}
pkgs/development/interpreters/python/docs/3.3-pdf-a4.nix
+7 -4
View File
@@ -1,15 +1,18 @@
# This file was generated and will be overwritten by ./generate.sh
{ stdenv, fetchurl }:
{ stdenv, fetchurl, lib }:
stdenv.mkDerivation {
stdenv.mkDerivation rec {
name = "python33-docs-pdf-a4-3.3.0";
src = fetchurl {
url = http://docs.python.org/ftp/python/doc/3.3.0/python-3.3.0-docs-pdf-a4.tar.bz2;
sha256 = "1y6n13bxlw8a11khy3ynfbz8z0kpf2lvh32dvy8scyw3hrk6wdxp";
};
installPhase = ''
mkdir -p $out/share/docs
cp -R ./ $out/share/docs/
mkdir -p $out/share/doc/python33
cp -R ./ $out/share/doc/python33/pdf-a4
'';
meta = {
maintainers = [ lib.maintainers.chaoflow ];
};
}
pkgs/development/interpreters/python/docs/3.3-pdf-letter.nix
+7 -4
View File
@@ -1,15 +1,18 @@
# This file was generated and will be overwritten by ./generate.sh
{ stdenv, fetchurl }:
{ stdenv, fetchurl, lib }:
stdenv.mkDerivation {
stdenv.mkDerivation rec {
name = "python33-docs-pdf-letter-3.3.0";
src = fetchurl {
url = http://docs.python.org/ftp/python/doc/3.3.0/python-3.3.0-docs-pdf-letter.tar.bz2;
sha256 = "0mcj1i47nx81fc9zk1cic4c4p139qjcqlzf4hnnkzvb3jcgy5z6k";
};
installPhase = ''
mkdir -p $out/share/docs
cp -R ./ $out/share/docs/
mkdir -p $out/share/doc/python33
cp -R ./ $out/share/doc/python33/pdf-letter
'';
meta = {
maintainers = [ lib.maintainers.chaoflow ];
};
}
pkgs/development/interpreters/python/docs/3.3-text.nix
+7 -4
View File
@@ -1,15 +1,18 @@
# This file was generated and will be overwritten by ./generate.sh
{ stdenv, fetchurl }:
{ stdenv, fetchurl, lib }:
stdenv.mkDerivation {
stdenv.mkDerivation rec {
name = "python33-docs-text-3.3.0";
src = fetchurl {
url = http://docs.python.org/ftp/python/doc/3.3.0/python-3.3.0-docs-text.tar.bz2;
sha256 = "10vk2fixg1aglqmsf89kn98rlirrbhnrk1285vzfbynf2iavxw0n";
};
installPhase = ''
mkdir -p $out/share/docs
cp -R ./ $out/share/docs/
mkdir -p $out/share/doc/python33
cp -R ./ $out/share/doc/python33/text
'';
meta = {
maintainers = [ lib.maintainers.chaoflow ];
};
}
pkgs/development/interpreters/python/docs/default.nix
+77 -69
View File
@@ -1,77 +1,85 @@
{ stdenv, fetchurl }:
{ stdenv, fetchurl, lib }:
let
pythonDocs = {
python33_html = import ./3.3-html.nix {
inherit stdenv fetchurl;
html = {
python33 = import ./3.3-html.nix {
inherit stdenv fetchurl lib;
};
python32 = import ./3.2-html.nix {
inherit stdenv fetchurl lib;
};
python31 = import ./3.1-html.nix {
inherit stdenv fetchurl lib;
};
python30 = import ./3.0-html.nix {
inherit stdenv fetchurl lib;
};
python27 = import ./2.7-html.nix {
inherit stdenv fetchurl lib;
};
python26 = import ./2.6-html.nix {
inherit stdenv fetchurl lib;
};
};
python33_pdf_a4 = import ./3.3-pdf-a4.nix {
inherit stdenv fetchurl;
pdf_a4 = {
python33 = import ./3.3-pdf-a4.nix {
inherit stdenv fetchurl lib;
};
python32 = import ./3.2-pdf-a4.nix {
inherit stdenv fetchurl lib;
};
python31 = import ./3.1-pdf-a4.nix {
inherit stdenv fetchurl lib;
};
python30 = import ./3.0-pdf-a4.nix {
inherit stdenv fetchurl lib;
};
python27 = import ./2.7-pdf-a4.nix {
inherit stdenv fetchurl lib;
};
python26 = import ./2.6-pdf-a4.nix {
inherit stdenv fetchurl lib;
};
};
python33_pdf_letter = import ./3.3-pdf-letter.nix {
inherit stdenv fetchurl;
pdf_letter = {
python33 = import ./3.3-pdf-letter.nix {
inherit stdenv fetchurl lib;
};
python32 = import ./3.2-pdf-letter.nix {
inherit stdenv fetchurl lib;
};
python31 = import ./3.1-pdf-letter.nix {
inherit stdenv fetchurl lib;
};
python30 = import ./3.0-pdf-letter.nix {
inherit stdenv fetchurl lib;
};
python27 = import ./2.7-pdf-letter.nix {
inherit stdenv fetchurl lib;
};
python26 = import ./2.6-pdf-letter.nix {
inherit stdenv fetchurl lib;
};
};
python33_text = import ./3.3-text.nix {
inherit stdenv fetchurl;
};
python32_html = import ./3.2-html.nix {
inherit stdenv fetchurl;
};
python32_pdf_a4 = import ./3.2-pdf-a4.nix {
inherit stdenv fetchurl;
};
python32_pdf_letter = import ./3.2-pdf-letter.nix {
inherit stdenv fetchurl;
};
python32_text = import ./3.2-text.nix {
inherit stdenv fetchurl;
};
python31_html = import ./3.1-html.nix {
inherit stdenv fetchurl;
};
python31_pdf_a4 = import ./3.1-pdf-a4.nix {
inherit stdenv fetchurl;
};
python31_pdf_letter = import ./3.1-pdf-letter.nix {
inherit stdenv fetchurl;
};
python31_text = import ./3.1-text.nix {
inherit stdenv fetchurl;
};
python30_html = import ./3.0-html.nix {
inherit stdenv fetchurl;
};
python30_pdf_a4 = import ./3.0-pdf-a4.nix {
inherit stdenv fetchurl;
};
python30_pdf_letter = import ./3.0-pdf-letter.nix {
inherit stdenv fetchurl;
};
python30_text = import ./3.0-text.nix {
inherit stdenv fetchurl;
};
python27_html = import ./2.7-html.nix {
inherit stdenv fetchurl;
};
python27_pdf_a4 = import ./2.7-pdf-a4.nix {
inherit stdenv fetchurl;
};
python27_pdf_letter = import ./2.7-pdf-letter.nix {
inherit stdenv fetchurl;
};
python27_text = import ./2.7-text.nix {
inherit stdenv fetchurl;
};
python26_html = import ./2.6-html.nix {
inherit stdenv fetchurl;
};
python26_pdf_a4 = import ./2.6-pdf-a4.nix {
inherit stdenv fetchurl;
};
python26_pdf_letter = import ./2.6-pdf-letter.nix {
inherit stdenv fetchurl;
};
python26_text = import ./2.6-text.nix {
inherit stdenv fetchurl;
text = {
python33 = import ./3.3-text.nix {
inherit stdenv fetchurl lib;
};
python32 = import ./3.2-text.nix {
inherit stdenv fetchurl lib;
};
python31 = import ./3.1-text.nix {
inherit stdenv fetchurl lib;
};
python30 = import ./3.0-text.nix {
inherit stdenv fetchurl lib;
};
python27 = import ./2.7-text.nix {
inherit stdenv fetchurl lib;
};
python26 = import ./2.6-text.nix {
inherit stdenv fetchurl lib;
};
};
}; in pythonDocs
pkgs/development/interpreters/python/docs/generate.sh
+9 -7
View File
@@ -9,14 +9,15 @@ ${VERSIONS}
cat >default.nix <<EOF
{ stdenv, fetchurl }:
{ stdenv, fetchurl, lib }:
let
pythonDocs = {
EOF
for version in $VERSIONS; do
for type in $TYPES; do
for type in $TYPES; do
echo " ${type/-/_} = {" >> default.nix
for version in $VERSIONS; do
major=$(echo -n ${version}| cut -d. -f1)
minor=$(echo -n ${version}| cut -d. -f2)
outfile=${major}.${minor}-${type}.nix
@@ -38,16 +39,17 @@ for version in $VERSIONS; do
-e "s,URL,${url}," \
-e "s,SHA,${sha}," < template.nix > ${outfile}
attrname=python${major}${minor}_$(echo -n ${type} |sed -e "s,-,_,g")
attrname=python${major}${minor}
cat >>default.nix <<EOF
${attrname} = import ./${major}.${minor}-${type}.nix {
inherit stdenv fetchurl;
};
${attrname} = import ./${major}.${minor}-${type}.nix {
inherit stdenv fetchurl lib;
};
EOF
echo "done."
echo
done
echo " };" >> default.nix
done
echo "}; in pythonDocs" >> default.nix
pkgs/development/interpreters/python/docs/template.nix
+7 -4
View File
@@ -1,15 +1,18 @@
# This file was generated and will be overwritten by ./generate.sh
{ stdenv, fetchurl }:
{ stdenv, fetchurl, lib }:
stdenv.mkDerivation {
stdenv.mkDerivation rec {
name = "pythonMAJORMINOR-docs-TYPE-VERSION";
src = fetchurl {
url = URL;
sha256 = "SHA";
};
installPhase = ''
mkdir -p $out/share/docs
cp -R ./ $out/share/docs/
mkdir -p $out/share/doc/pythonMAJORMINOR
cp -R ./ $out/share/doc/pythonMAJORMINOR/TYPE
'';
meta = {
maintainers = [ lib.maintainers.chaoflow ];
};
}
pkgs/development/interpreters/ruby/fix-gem-nix-versions.patch
+35
View File
@@ -0,0 +1,35 @@
diff --git a/lib/nix/gem-nix-command.rb b/lib/nix/gem-nix-command.rb
index 8d3733e..ba942ff 100644
--- a/lib/nix/gem-nix-command.rb
+++ b/lib/nix/gem-nix-command.rb
@@ -108,11 +108,12 @@ class Gem::Commands::NixCommand < Gem::Command
# args to dep informations
args.each { |arg|
- if arg =~ /(.+)-?(.*)?/ then
+ if arg =~ /(.+)-([0-9][^-]+)/ then
gem_name = $1
- version = $2.empty? ? Gem::Requirement.default : Gem::Version.new($2)
+ version = Gem::Version.new($2)
else
- raise Gem::CommandLineError, "couldn't parse arg. expected: name or name-version"
+ gem_name = arg
+ version = Gem::Requirement.default
end
adddep(Gem::Dependency.new gem_name, version)
@@ -162,7 +163,13 @@ class Gem::Commands::NixCommand < Gem::Command
spec, source_uri = find_gem_with_source(dep)
full_name = spec.full_name
- return if @gems_with_deps.key?(full_name)
+ if @gems_with_deps.key?(full_name)
+ unless @gems_with_deps[full_name].nil?
+ return @gems_with_deps[full_name][0]
+ else
+ return nil
+ end
+ end
@gems_with_deps[full_name] = nil # there maybe circular dependencies. thus mark this gem seen as early as possible
# development deps can't be found. Some are old. Thus only add rutime dependencies
pkgs/development/interpreters/ruby/generated.nix
+56 -56
View File
@@ -17,47 +17,47 @@ g: # Get dependencies from patched gems
bitbucket_backup = g.bitbucket_backup_0_2_2;
builder = g.builder_3_2_0;
buildr = g.buildr_1_4_10;
bundler = g.bundler_1_3_0;
childprocess = g.childprocess_0_3_8;
bundler = g.bundler_1_3_1;
childprocess = g.childprocess_0_3_9;
daemons = g.daemons_1_1_9;
diff_lcs = g.diff_lcs_1_1_3;
dimensions = g.dimensions_1_2_0;
erubis = g.erubis_2_7_0;
eventmachine = g.eventmachine_1_0_0;
eventmachine = g.eventmachine_1_0_1;
fakes3 = g.fakes3_0_1_5;
ffi = g.ffi_1_4_0;
foreman = g.foreman_0_61_0;
highline = g.highline_1_6_15;
hike = g.hike_1_2_1;
hoe = g.hoe_3_1_0;
i18n = g.i18n_0_6_1;
i18n = g.i18n_0_6_4;
journey = g.journey_1_0_4;
jruby_pageant = g.jruby_pageant_1_1_1;
jsduck = g.jsduck_4_6_2;
json = g.json_1_7_7;
json_pure = g.json_pure_1_7_7;
libv8 = g.libv8_3_3_10_4_x86_64_linux;
libv8 = g.libv8_3_3_10_4;
macaddr = g.macaddr_1_6_1;
mail = g.mail_2_4_4;
mime_types = g.mime_types_1_21;
minitar = g.minitar_0_5_3;
multi_json = g.multi_json_1_6_1;
net_sftp = g.net_sftp_2_0_5;
net_ssh = g.net_ssh_2_6_5;
net_ssh = g.net_ssh_2_6_6;
nix = g.nix_0_1_1;
nokogiri = g.nokogiri_1_5_6;
parallel = g.parallel_0_6_2;
polyglot = g.polyglot_0_3_3;
rack = g.rack_1_5_2;
rack_cache = g.rack_cache_1_2;
rack_protection = g.rack_protection_1_3_2;
rack_protection = g.rack_protection_1_4_0;
rack_ssl = g.rack_ssl_1_3_3;
rack_test = g.rack_test_0_6_2;
rails = g.rails_3_2_12;
railties = g.railties_3_2_12;
rake = g.rake_10_0_3;
rb_fsevent = g.rb_fsevent_0_9_3;
rdiscount = g.rdiscount_2_0_7;
rdiscount = g.rdiscount_2_0_7_1;
rdoc = g.rdoc_3_12_2;
rjb = g.rjb_1_4_6;
rspec = g.rspec_2_11_0;
@@ -67,16 +67,16 @@ g: # Get dependencies from patched gems
rubyforge = g.rubyforge_2_0_4;
rubyzip = g.rubyzip_0_9_9;
sass = g.sass_3_2_6;
selenium_webdriver = g.selenium_webdriver_2_30_0;
selenium_webdriver = g.selenium_webdriver_2_31_0;
sinatra = g.sinatra_1_3_2;
sprockets = g.sprockets_2_2_2;
systemu = g.systemu_2_5_2;
therubyracer = g.therubyracer_0_10_2;
thin = g.thin_1_5_0;
thor = g.thor_0_17_0;
tilt = g.tilt_1_3_3;
tilt = g.tilt_1_3_4;
treetop = g.treetop_1_4_12;
tzinfo = g.tzinfo_0_3_35;
tzinfo = g.tzinfo_0_3_36;
uuid = g.uuid_2_3_7;
uuidtools = g.uuidtools_2_1_3;
websocket = g.websocket_1_0_7;
@@ -156,7 +156,7 @@ installed versions.'';
longDescription = ''Databases on Rails. Build a persistent domain model by mapping database tables to Ruby classes. Strong conventions for associations, validations, aggregations, migrations, and testing come baked-in.'';
};
name = ''activerecord-3.2.12'';
requiredGems = [ g.activesupport_3_2_12 g.activemodel_3_2_12 g.arel_3_0_2 g.tzinfo_0_3_35 ];
requiredGems = [ g.activesupport_3_2_12 g.activemodel_3_2_12 g.arel_3_0_2 g.tzinfo_0_3_36 ];
sha256 = ''0fl8iyv3gcy72y79iv4ccyck8ik02rrl3pdy7yxfhlnqgryp8syi'';
};
activeresource_3_2_12 = {
@@ -178,7 +178,7 @@ installed versions.'';
longDescription = ''A toolkit of support libraries and Ruby core extensions extracted from the Rails framework. Rich support for multibyte strings, internationalization, time zones, and testing.'';
};
name = ''activesupport-3.2.12'';
requiredGems = [ g.i18n_0_6_1 g.multi_json_1_6_1 ];
requiredGems = [ g.i18n_0_6_4 g.multi_json_1_6_1 ];
sha256 = ''1giqkprxjf5gyfyhn5nz9q8a5gi3v8irxhkpqr00zc5fw1azllsg'';
};
arel_3_0_2 = {
@@ -316,30 +316,30 @@ for those one-off tasks, with a language that's a joy to use.
'';
};
name = ''buildr-1.4.10'';
requiredGems = [ g.rake_0_9_2_2 g.builder_3_1_3 g.net_ssh_2_6_0 g.net_sftp_2_0_5 g.rubyzip_0_9_9 g.highline_1_6_2 g.json_pure_1_7_5 g.rubyforge_2_0_4 g.hoe_3_1_0 g.rjb_1_4_2 g.atoulme_Antwrap_0_7_4 g.diff_lcs_1_1_3 g.rspec_expectations_2_11_3 g.rspec_mocks_2_11_3 g.rspec_core_2_11_1 g.rspec_2_11_0 g.xml_simple_1_1_1 g.minitar_0_5_3 g.bundler_1_3_0 ];
requiredGems = [ g.rake_0_9_2_2 g.builder_3_1_3 g.net_ssh_2_6_0 g.net_sftp_2_0_5 g.rubyzip_0_9_9 g.highline_1_6_2 g.json_pure_1_7_5 g.rubyforge_2_0_4 g.hoe_3_1_0 g.rjb_1_4_2 g.atoulme_Antwrap_0_7_4 g.diff_lcs_1_1_3 g.rspec_expectations_2_11_3 g.rspec_mocks_2_11_3 g.rspec_core_2_11_1 g.rspec_2_11_0 g.xml_simple_1_1_1 g.minitar_0_5_3 g.bundler_1_3_1 ];
sha256 = ''1x192r8ab5zr9rlp1i9b3pi3y74f9pj2w491wkgshgwj22akh6vn'';
};
bundler_1_3_0 = {
bundler_1_3_1 = {
basename = ''bundler'';
meta = {
description = ''The best way to manage your application's dependencies'';
homepage = ''http://gembundler.com'';
longDescription = ''Bundler manages an application's dependencies through its entire life, across many machines, systematically and repeatably'';
};
name = ''bundler-1.3.0'';
name = ''bundler-1.3.1'';
requiredGems = [ ];
sha256 = ''16ss4fh97wbg5n5l00wkinxdsj7bjgqzv9h6yhygv45wi8rbf8zp'';
sha256 = ''1nmvfsk9148nkl0bdcs167kiihp89zwkyvjs0khvi4df6s9km725'';
};
childprocess_0_3_8 = {
childprocess_0_3_9 = {
basename = ''childprocess'';
meta = {
description = ''This gem aims at being a simple and reliable solution for controlling external programs running in the background on any Ruby / OS combination.'';
homepage = ''http://github.com/jarib/childprocess'';
longDescription = ''This gem aims at being a simple and reliable solution for controlling external programs running in the background on any Ruby / OS combination.'';
};
name = ''childprocess-0.3.8'';
name = ''childprocess-0.3.9'';
requiredGems = [ g.ffi_1_4_0 ];
sha256 = ''08rp4krw0g60567ih4w51ndlq2pg92al0dycy0bs0m3msq68nlq4'';
sha256 = ''0jbz2ix7ff9ry8717lhcq9w8j8yd45akw48giwgdqccay5mlph7d'';
};
daemons_1_1_9 = {
basename = ''daemons'';
@@ -411,7 +411,7 @@ is the MIT license.'';
requiredGems = [ ];
sha256 = ''1fj827xqjs91yqsydf0zmfyw9p4l2jz5yikg3mppz6d7fi8kyrb3'';
};
eventmachine_1_0_0 = {
eventmachine_1_0_1 = {
basename = ''eventmachine'';
meta = {
description = ''Ruby/EventMachine library'';
@@ -427,9 +427,9 @@ are provided with the package, primarily to serve as examples. The real goal
of EventMachine is to enable programs to easily interface with other programs
using TCP/IP, especially if custom protocols are required.'';
};
name = ''eventmachine-1.0.0'';
name = ''eventmachine-1.0.1'';
requiredGems = [ ];
sha256 = ''1qshsikskkfbbhai9s0qhmnpa326m83k9yzivwvkl2dc1ffpk2pz'';
sha256 = ''1v7im8v9y5jb863794irgnlqzdg669w6v1g89sln0l511gjnjv52'';
};
fakes3_0_1_5 = {
basename = ''fakes3'';
@@ -524,16 +524,16 @@ For extra goodness, see: http://seattlerb.rubyforge.org/hoe/Hoe.pdf'';
requiredGems = [ g.rake_0_9_6 ];
sha256 = ''0i961x0hrd6fs1nsfham87dhn64gqpnai27l14jag7qbnp3a79yp'';
};
i18n_0_6_1 = {
i18n_0_6_4 = {
basename = ''i18n'';
meta = {
description = ''New wave Internationalization support for Ruby'';
homepage = ''http://github.com/svenfuchs/i18n'';
longDescription = ''New wave Internationalization support for Ruby.'';
};
name = ''i18n-0.6.1'';
name = ''i18n-0.6.4'';
requiredGems = [ ];
sha256 = ''0x3lhp1vl1k4dfqx6k93hhxcpjkz57y8cf007ws7p845ywk6ibfl'';
sha256 = ''0wz1rnrs4n21j1rw9a120j2pfdkbikp1yvxaqi3mk30iw6mx4p0f'';
};
journey_1_0_4 = {
basename = ''journey'';
@@ -565,7 +565,7 @@ For extra goodness, see: http://seattlerb.rubyforge.org/hoe/Hoe.pdf'';
longDescription = ''Documentation generator for Sencha JS frameworks'';
};
name = ''jsduck-4.6.2'';
requiredGems = [ g.rdiscount_2_0_7 g.json_1_7_7 g.parallel_0_6_2 g.therubyracer_0_10_2 g.dimensions_1_2_0 ];
requiredGems = [ g.rdiscount_2_0_7_1 g.json_1_7_7 g.parallel_0_6_2 g.therubyracer_0_10_2 g.dimensions_1_2_0 ];
sha256 = ''035w4igfa6yy6234ff4zbiqfjn0bhwqs6k8kji52l7gzgskwmzln'';
};
json_1_7_7 = {
@@ -601,16 +601,16 @@ For extra goodness, see: http://seattlerb.rubyforge.org/hoe/Hoe.pdf'';
requiredGems = [ ];
sha256 = ''0jxp0amx9xhka0ixnhvfgwc5ydr82hkxp81pvw32z31arx7jrwl6'';
};
libv8_3_3_10_4_x86_64_linux = {
libv8_3_3_10_4 = {
basename = ''libv8'';
meta = {
description = ''Distribution of the V8 JavaScript engine'';
homepage = ''http://github.com/fractaloop/libv8'';
longDescription = ''Distributes the V8 JavaScript engine in binary and source forms in order to support fast builds of The Ruby Racer'';
};
name = ''libv8-3.3.10.4-x86_64-linux'';
name = ''libv8-3.3.10.4'';
requiredGems = [ ];
sha256 = ''13lnmkm9z3xqyi8rlsycfd7wybv044pxcisrkyq0cx7ig91a0dmc'';
sha256 = ''0zy585rs1ihm8nsw525wgmbkcq7aqy1k9dbkk8s6953adl0bpz42'';
};
macaddr_1_6_1 = {
basename = ''macaddr'';
@@ -631,7 +631,7 @@ For extra goodness, see: http://seattlerb.rubyforge.org/hoe/Hoe.pdf'';
longDescription = ''A really Ruby Mail handler.'';
};
name = ''mail-2.4.4'';
requiredGems = [ g.mime_types_1_21 g.treetop_1_4_12 g.i18n_0_6_1 ];
requiredGems = [ g.mime_types_1_21 g.treetop_1_4_12 g.i18n_0_6_4 ];
sha256 = ''0idylz5pnlz34mrxm7gs9jbll2c0k0y9dq2qarhxk30gwyvjaxi3'';
};
mime_types_1_21 = {
@@ -696,7 +696,7 @@ added from the the {LTSW collection}[http://www.ltsw.se/knbase/internet/mime.htp
longDescription = ''A pure Ruby implementation of the SFTP client protocol'';
};
name = ''net-sftp-2.0.5'';
requiredGems = [ g.net_ssh_2_6_5 ];
requiredGems = [ g.net_ssh_2_6_6 ];
sha256 = ''0lqk735wspm8rbiyxpbil8ikrqcyg00ss1df7fny0761c3as6m0v'';
};
net_ssh_2_6_0 = {
@@ -710,16 +710,16 @@ added from the the {LTSW collection}[http://www.ltsw.se/knbase/internet/mime.htp
requiredGems = [ g.jruby_pageant_1_1_1 ];
sha256 = ''18fsgps4a9dfrjszkl3py8j7vw0xwi70bcp59ccj2rlr6i1jv5gw'';
};
net_ssh_2_6_5 = {
net_ssh_2_6_6 = {
basename = ''net_ssh'';
meta = {
description = ''Net::SSH: a pure-Ruby implementation of the SSH2 client protocol.'';
homepage = ''https://github.com/net-ssh/net-ssh'';
longDescription = ''Net::SSH: a pure-Ruby implementation of the SSH2 client protocol. It allows you to write programs that invoke and interact with processes on remote servers, via SSH2.'';
};
name = ''net-ssh-2.6.5'';
name = ''net-ssh-2.6.6'';
requiredGems = [ ];
sha256 = ''1f21r78b0rm9gyzdc96fzih27nrags3pk00zlhfviqlfbmb1c48x'';
sha256 = ''00fdnwv3jf311jjcc51lq8w26r62vzma91i79h5hj8i1ylrilx51'';
};
nix_0_1_1 = {
basename = ''nix'';
@@ -818,16 +818,16 @@ Also see http://rack.github.com/.
requiredGems = [ g.rack_1_5_2 ];
sha256 = ''073ffpsqmy4nqxz178qisb3a4v3305c49ypj0jw6s9mkz02yvgq2'';
};
rack_protection_1_3_2 = {
rack_protection_1_4_0 = {
basename = ''rack_protection'';
meta = {
description = ''You should use protection!'';
homepage = ''http://github.com/rkh/rack-protection'';
longDescription = ''You should use protection!'';
};
name = ''rack-protection-1.3.2'';
name = ''rack-protection-1.4.0'';
requiredGems = [ g.rack_1_5_2 ];
sha256 = ''0f69d491xciq1hb3mm26nxnsb3pvlf3gdkggj4ryiphimsy05n0k'';
sha256 = ''0dfydg04fzj9rz34npy6cpp0827lij440s7fls0db41lz4vb94k0'';
};
rack_ssl_1_3_3 = {
basename = ''rack_ssl'';
@@ -863,7 +863,7 @@ request helpers feature.'';
longDescription = ''Ruby on Rails is a full-stack web framework optimized for programmer happiness and sustainable productivity. It encourages beautiful code by favoring convention over configuration.'';
};
name = ''rails-3.2.12'';
requiredGems = [ g.activesupport_3_2_12 g.actionpack_3_2_12 g.activerecord_3_2_12 g.activeresource_3_2_12 g.actionmailer_3_2_12 g.railties_3_2_12 g.bundler_1_3_0 ];
requiredGems = [ g.activesupport_3_2_12 g.actionpack_3_2_12 g.activerecord_3_2_12 g.activeresource_3_2_12 g.actionmailer_3_2_12 g.railties_3_2_12 g.bundler_1_3_1 ];
sha256 = ''1jjnm74nzl5v3461c0mrbpa471yd6s8hnkmnxb64c2rm95c61wxz'';
};
railties_3_2_12 = {
@@ -921,15 +921,15 @@ request helpers feature.'';
requiredGems = [ ];
sha256 = ''0bdnxwdxj4r1kdxfi5nszbsb126njrr81p912g64xxs2bgxd1bp1'';
};
rdiscount_2_0_7 = {
rdiscount_2_0_7_1 = {
basename = ''rdiscount'';
meta = {
description = ''Fast Implementation of Gruber's Markdown in C'';
homepage = ''http://github.com/rtomayko/rdiscount'';
};
name = ''rdiscount-2.0.7'';
name = ''rdiscount-2.0.7.1'';
requiredGems = [ ];
sha256 = ''1cj9dn59xqjaglvzvd1ninid62xmih74az0glqqb90n2p42s2zs1'';
sha256 = ''1xjwi99wfyjhn72h8k709kbq2npqmw2zvikszxfg6in83yb8vmxn'';
};
rdoc_3_12_2 = {
basename = ''rdoc'';
@@ -1057,16 +1057,16 @@ See RDoc for a description of RDoc's markup and basic use.'';
requiredGems = [ ];
sha256 = ''10xy6k663399r881cj30fapbdsrq8jwzvnp97y8n3mhxmrvzpq28'';
};
selenium_webdriver_2_30_0 = {
selenium_webdriver_2_31_0 = {
basename = ''selenium_webdriver'';
meta = {
description = ''The next generation developer focused tool for automated testing of webapps'';
homepage = ''http://selenium.googlecode.com'';
longDescription = ''WebDriver is a tool for writing automated tests of websites. It aims to mimic the behaviour of a real user, and as such interacts with the HTML of the application.'';
};
name = ''selenium-webdriver-2.30.0'';
requiredGems = [ g.multi_json_1_6_1 g.rubyzip_0_9_9 g.childprocess_0_3_8 g.websocket_1_0_7 ];
sha256 = ''1ybx8v9m5y8ykbdbldd1mglz0xhg30iv0708ig0vzjl2522sg6v1'';
name = ''selenium-webdriver-2.31.0'';
requiredGems = [ g.multi_json_1_6_1 g.rubyzip_0_9_9 g.childprocess_0_3_9 g.websocket_1_0_7 ];
sha256 = ''1nv3ff31g183kdb97jjz0y7ny3vdnccd09pgblpj87bzhrrdfv3r'';
};
sinatra_1_3_2 = {
basename = ''sinatra'';
@@ -1076,7 +1076,7 @@ See RDoc for a description of RDoc's markup and basic use.'';
longDescription = ''Sinatra is a DSL for quickly creating web applications in Ruby with minimal effort.'';
};
name = ''sinatra-1.3.2'';
requiredGems = [ g.rack_1_5_2 g.rack_protection_1_3_2 g.tilt_1_3_3 ];
requiredGems = [ g.rack_1_5_2 g.rack_protection_1_4_0 g.tilt_1_3_4 ];
sha256 = ''05blf915zpiwyz7agcn9rwdmddwxz0z4l3gd4qlqmrgd2vkw4sxc'';
};
sprockets_2_2_2 = {
@@ -1087,7 +1087,7 @@ See RDoc for a description of RDoc's markup and basic use.'';
longDescription = ''Sprockets is a Rack-based asset packaging system that concatenates and serves JavaScript, CoffeeScript, CSS, LESS, Sass, and SCSS.'';
};
name = ''sprockets-2.2.2'';
requiredGems = [ g.hike_1_2_1 g.multi_json_1_6_1 g.rack_1_5_2 g.tilt_1_3_3 ];
requiredGems = [ g.hike_1_2_1 g.multi_json_1_6_1 g.rack_1_5_2 g.tilt_1_3_4 ];
sha256 = ''15ngw3bjbyr31ygzmmdxxa30ylah6pdn8akgdy9w30vfx2vr7s7s'';
};
systemu_2_5_2 = {
@@ -1109,7 +1109,7 @@ See RDoc for a description of RDoc's markup and basic use.'';
longDescription = ''Call javascript code and manipulate javascript objects from ruby. Call ruby code and manipulate ruby objects from javascript.'';
};
name = ''therubyracer-0.10.2'';
requiredGems = [ g.libv8_3_3_10_4_x86_64_linux ];
requiredGems = [ g.libv8_3_3_10_4 ];
sha256 = ''111hm2l613v06sy7pzjzmnyi4x11rg3c2syhnpv8fn0wnn9rdiyb'';
};
thin_1_5_0 = {
@@ -1120,7 +1120,7 @@ See RDoc for a description of RDoc's markup and basic use.'';
longDescription = ''A thin and fast web server'';
};
name = ''thin-1.5.0'';
requiredGems = [ g.rack_1_5_2 g.eventmachine_1_0_0 g.daemons_1_1_9 ];
requiredGems = [ g.rack_1_5_2 g.eventmachine_1_0_1 g.daemons_1_1_9 ];
sha256 = ''14sd2qbbk6y108z6v723mh3f1mk8s4fwxmmn9f8dk4xkhk4rwvq1'';
};
thor_0_17_0 = {
@@ -1134,16 +1134,16 @@ See RDoc for a description of RDoc's markup and basic use.'';
requiredGems = [ ];
sha256 = ''0gf46qafcfgmi20a2mnb3wkd9y6spgy2hq22h70377daj4zjxla2'';
};
tilt_1_3_3 = {
tilt_1_3_4 = {
basename = ''tilt'';
meta = {
description = ''Generic interface to multiple Ruby template engines'';
homepage = ''http://github.com/rtomayko/tilt/'';
longDescription = ''Generic interface to multiple Ruby template engines'';
};
name = ''tilt-1.3.3'';
name = ''tilt-1.3.4'';
requiredGems = [ ];
sha256 = ''18qdl8nllbgwipa2ab9df3wlfgvsc8ml78hbypwc17b9qwv9bbs8'';
sha256 = ''0hw59shnf3vgpx1jv24mj0d48m72h5cm1d4bianhhkjj82mc406a'';
};
treetop_1_4_12 = {
basename = ''treetop'';
@@ -1155,16 +1155,16 @@ See RDoc for a description of RDoc's markup and basic use.'';
requiredGems = [ g.polyglot_0_3_3 g.polyglot_0_3_3 ];
sha256 = ''1jlfjq67n933sm0px0s2j965v1kl1rj8fbx6xk8y4yppkv6ygxc8'';
};
tzinfo_0_3_35 = {
tzinfo_0_3_36 = {
basename = ''tzinfo'';
meta = {
description = ''Daylight-savings aware timezone library'';
homepage = ''http://tzinfo.rubyforge.org/'';
longDescription = ''TZInfo is a Ruby library that uses the standard tz (Olson) database to provide daylight savings aware transformations between times in different time zones.'';
};
name = ''tzinfo-0.3.35'';
name = ''tzinfo-0.3.36'';
requiredGems = [ ];
sha256 = ''1c52ndjqcxpgxhlclbxf98clcpni216xk5zgrkcd4px84riyjbmp'';
sha256 = ''1dk7jnhrr5lbhckgq7bh6yxgy8j7vd13qb4kr4vlk76j5ngs2whv'';
};
uuid_2_3_7 = {
basename = ''uuid'';
pkgs/development/interpreters/ruby/patches.nix
+7
View File
@@ -20,6 +20,13 @@ in
rails = { gemFlags = "--no-ri --no-rdoc"; };
ncurses = { propagatedBuildInputs = [ ncurses ]; };
nix = {
postInstall = ''
cd $out/${ruby.gemPath}/gems/nix*
patch -Np1 -i ${./fix-gem-nix-versions.patch}
'';
};
ncursesw = { propagatedBuildInputs = [ ncurses ]; };
pkgs/development/libraries/ffmpeg/1.0.nix
-85
View File
@@ -1,85 +0,0 @@
{ stdenv, fetchurl, pkgconfig, yasm, zlib, bzip2, alsaLib
, mp3Support ? true, lame ? null
, speexSupport ? true, speex ? null
, theoraSupport ? true, libtheora ? null
, vorbisSupport ? true, libvorbis ? null
, vpxSupport ? false, libvpx ? null
, x264Support ? true, x264 ? null
, xvidSupport ? true, xvidcore ? null
, vdpauSupport ? true, libvdpau ? null
, faacSupport ? false, faac ? null
, dc1394Support ? false, libdc1394 ? null
, x11grabSupport ? false, libXext ? null, libXfixes ? null
}:
assert speexSupport -> speex != null;
assert theoraSupport -> libtheora != null;
assert vorbisSupport -> libvorbis != null;
assert vpxSupport -> libvpx != null;
assert x264Support -> x264 != null;
assert xvidSupport -> xvidcore != null;
assert vdpauSupport -> libvdpau != null;
assert faacSupport -> faac != null;
assert x11grabSupport -> libXext != null && libXfixes != null;
stdenv.mkDerivation rec {
name = "ffmpeg-1.0";
src = fetchurl {
url = "http://www.ffmpeg.org/releases/${name}.tar.bz2";
sha256 = "1jbi85z2zkk3fh09l9f1s70kpvsz8706ay4lsw75395q8vic70hd";
};
# `--enable-gpl' (as well as the `postproc' and `swscale') mean that
# the resulting library is GPL'ed, so it can only be used in GPL'ed
# applications.
configureFlags = [
"--enable-gpl"
"--enable-postproc"
"--enable-swscale"
"--disable-ffplay"
"--enable-shared"
"--enable-runtime-cpudetect"
]
++ stdenv.lib.optional mp3Support "--enable-libmp3lame"
++ stdenv.lib.optional speexSupport "--enable-libspeex"
++ stdenv.lib.optional theoraSupport "--enable-libtheora"
++ stdenv.lib.optional vorbisSupport "--enable-libvorbis"
++ stdenv.lib.optional vpxSupport "--enable-libvpx"
++ stdenv.lib.optional x264Support "--enable-libx264"
++ stdenv.lib.optional xvidSupport "--enable-libxvid"
++ stdenv.lib.optional vdpauSupport "--enable-vdpau"
++ stdenv.lib.optional faacSupport "--enable-libfaac --enable-nonfree"
++ stdenv.lib.optional dc1394Support "--enable-libdc1394"
++ stdenv.lib.optional x11grabSupport "--enable-x11grab";
buildInputs = [ pkgconfig lame yasm zlib bzip2 alsaLib ]
++ stdenv.lib.optional mp3Support lame
++ stdenv.lib.optional speexSupport speex
++ stdenv.lib.optional theoraSupport libtheora
++ stdenv.lib.optional vorbisSupport libvorbis
++ stdenv.lib.optional vpxSupport libvpx
++ stdenv.lib.optional x264Support x264
++ stdenv.lib.optional xvidSupport xvidcore
++ stdenv.lib.optional vdpauSupport libvdpau
++ stdenv.lib.optional faacSupport faac
++ stdenv.lib.optional dc1394Support libdc1394
++ stdenv.lib.optionals x11grabSupport [ libXext libXfixes ];
enableParallelBuilding = true;
crossAttrs = {
dontSetConfigureCross = true;
configureFlags = configureFlags ++ [
"--cross-prefix=${stdenv.cross.config}-"
"--enable-cross-compile"
"--target_os=linux"
"--arch=${stdenv.cross.arch}"
];
};
meta = {
homepage = http://www.ffmpeg.org/;
description = "A complete, cross-platform solution to record, convert and stream audio and video";
};
}
pkgs/development/libraries/gmp/5.0.5.nix
+7
View File
@@ -23,6 +23,13 @@ stdenv.mkDerivation rec {
enableParallelBuilding = true;
crossAttrs = {
# Disable stripping to avoid "libgmp.a: Archive has no index"
# (see <http://hydra.nixos.org/build/4268666>.)
dontStrip = true;
dontCrossStrip = true;
};
meta = {
description = "GMP, the GNU multiple precision arithmetic library";
pkgs/development/libraries/haskell/OpenAL/default.nix
+2 -2
View File
@@ -2,8 +2,8 @@
cabal.mkDerivation (self: {
pname = "OpenAL";
version = "1.4.0.1";
sha256 = "180f84sjakhd1b8h5n3l92by2wmic20n6ax0z5fi3fvk9w73khyv";
version = "1.4.0.2";
sha256 = "19q4pd5i2w330qh895z0cgim4m4f4gxqf4ya1192fchqmgcz1svz";
buildDepends = [ ObjectName StateVar Tensor ];
extraLibraries = [ openal ];
meta = {
pkgs/development/libraries/haskell/QuickCheck/2.6.nix
+15
View File
@@ -0,0 +1,15 @@
{ cabal, random }:
cabal.mkDerivation (self: {
pname = "QuickCheck";
version = "2.6";
sha256 = "03cp7mshjy2yrg31i13b9kmc2a6lrmrbl1sh9s8lswcj305c00c0";
buildDepends = [ random ];
meta = {
homepage = "http://code.haskell.org/QuickCheck";
description = "Automatic testing of Haskell programs";
license = self.stdenv.lib.licenses.bsd3;
platforms = self.ghc.meta.platforms;
maintainers = [ self.stdenv.lib.maintainers.andres ];
};
})
pkgs/development/libraries/haskell/basic-prelude/default.nix
+2 -2
View File
@@ -4,8 +4,8 @@
cabal.mkDerivation (self: {
pname = "basic-prelude";
version = "0.3.3.0";
sha256 = "1b3fydswi7sj2j5d3jfynd9r5qg8pzlv1qdb9xp56ig01ig18cyv";
version = "0.3.4.0";
sha256 = "0layc06df7df4mf4zafj87c4klsvkxbhi69dkv4ag9fkzvs62sz6";
buildDepends = [
hashable liftedBase ReadArgs systemFilepath text transformers
unorderedContainers vector
pkgs/development/libraries/haskell/bifunctors/default.nix
+2 -2
View File
@@ -2,8 +2,8 @@
cabal.mkDerivation (self: {
pname = "bifunctors";
version = "3.2";
sha256 = "03bszf1127iw5kimjbag5gmgzz7h2qzcd9f7jb53jpiadfhjfx0a";
version = "3.2.0.1";
sha256 = "1biicx0zi48wzzi7vkhzvrdyk59hmmm1bqbsga6x5nbrbf3qrkm6";
buildDepends = [ semigroupoids semigroups tagged ];
meta = {
homepage = "http://github.com/ekmett/bifunctors/";
pkgs/development/libraries/haskell/binary/default.nix
+5 -4
View File
@@ -1,13 +1,14 @@
{ cabal, QuickCheck, random, testFramework
{ cabal, Cabal, filepath, HUnit, QuickCheck, random, testFramework
, testFrameworkQuickcheck2
}:
cabal.mkDerivation (self: {
pname = "binary";
version = "0.6.4.0";
sha256 = "0vq80fzhwil5bx4a2vbd3jvfh1awhg1pwxgvq3lvbi37yzl0ydgh";
version = "0.7.0.1";
sha256 = "16srrp0qx9hsr7820b2q3sp9wp8y8sxxi8rvsh63n48w4l3canxq";
testDepends = [
QuickCheck random testFramework testFrameworkQuickcheck2
Cabal filepath HUnit QuickCheck random testFramework
testFrameworkQuickcheck2
];
meta = {
homepage = "https://github.com/kolmodin/binary";
pkgs/development/libraries/haskell/blaze-html/default.nix
+2 -2
View File
@@ -4,8 +4,8 @@
cabal.mkDerivation (self: {
pname = "blaze-html";
version = "0.6.0.0";
sha256 = "0n8jpmslcs29pfyb8jhp43dg4058ahd9y3kf2p2wr3r6b9yr5dll";
version = "0.6.1.0";
sha256 = "1y2z2md62kpl57qcvwvswmrjq7zhkqwfv8zr2acdvcxcxnyc47fm";
buildDepends = [ blazeBuilder blazeMarkup text ];
testDepends = [
blazeBuilder blazeMarkup HUnit QuickCheck testFramework
pkgs/development/libraries/haskell/classy-prelude-conduit/default.nix
+2 -2
View File
@@ -4,8 +4,8 @@
cabal.mkDerivation (self: {
pname = "classy-prelude-conduit";
version = "0.5.2";
sha256 = "11krzhy78z0srjy5g6h8ssv5n3ml8ryx92x0zdjigqxw4zq9ic72";
version = "0.5.3";
sha256 = "1rmx439kdjipyz2s3v2s1xv1mb55kb4njl9k6f8mfhykgac39rhz";
buildDepends = [
classyPrelude conduit monadControl resourcet transformers void
xmlConduit
pkgs/development/libraries/haskell/classy-prelude/default.nix
+2 -2
View File
@@ -4,8 +4,8 @@
cabal.mkDerivation (self: {
pname = "classy-prelude";
version = "0.5.2";
sha256 = "1nmhx6fs783v67b5ygdlmpxbsj41brj32i1sx9gyjyhfvr40wiw5";
version = "0.5.3";
sha256 = "0xlhdxkxvrzj9y8wdl2f1pz94zz2gfa9vfbia9prhr7skirxvsad";
buildDepends = [
basicPrelude hashable liftedBase systemFilepath text transformers
unorderedContainers vector
pkgs/development/libraries/haskell/conduit/default.nix
+2 -2
View File
@@ -4,8 +4,8 @@
cabal.mkDerivation (self: {
pname = "conduit";
version = "1.0.1";
sha256 = "1r3d30cap4f7qxi9v2ab5w31w9ay19z848d4l8klf1np9xs27hki";
version = "1.0.2";
sha256 = "03hyryljvkbgyvwx63qrkvf2wm1qm8640rsm8yb4mahgzp4r130f";
buildDepends = [
liftedBase monadControl resourcet text transformers
transformersBase void
pkgs/development/libraries/haskell/diagrams/core.nix
+2 -3
View File
@@ -4,13 +4,12 @@
cabal.mkDerivation (self: {
pname = "diagrams-core";
version = "0.6.0.1";
sha256 = "0kw0rxk9a2zkpnbx4bfd0japm75y29ldvdn7i3c93kvz0p6jc2wa";
version = "0.6.0.2";
sha256 = "1g4b1zabgfdpaf7y3804r3w04ll4sqqrf71rm9389dg17ghc1q85";
buildDepends = [
dualTree MemoTrie monoidExtras newtype semigroups vectorSpace
vectorSpacePoints
];
jailbreak = true;
meta = {
homepage = "http://projects.haskell.org/diagrams";
description = "Core libraries for diagrams EDSL";
pkgs/development/libraries/haskell/flexible-defaults/default.nix
+2 -2
View File
@@ -2,8 +2,8 @@
cabal.mkDerivation (self: {
pname = "flexible-defaults";
version = "0.0.1.0";
sha256 = "0vq8ci3zbzmw8abjd12dhjiqzz4ckr99c1fqk32qsp5bvm81bdma";
version = "0.0.1.1";
sha256 = "0cbp8hb7y29xz3hl780173cs6ca4df0r98fz7v3drqr46aq55ipl";
buildDepends = [ thExtras transformers ];
meta = {
homepage = "https://github.com/mokus0/flexible-defaults";
pkgs/development/libraries/haskell/ghc-mod/default.nix
+6 -6
View File
@@ -1,20 +1,20 @@
{ cabal, Cabal, convertible, emacs, filepath, ghcPaths, ghcSybUtils
, hlint, hspec, ioChoice, regexPosix, syb, time, transformers
, hlint, hspec, ioChoice, syb, time, transformers
}:
cabal.mkDerivation (self: {
pname = "ghc-mod";
version = "1.11.5";
sha256 = "0lcq4ffmv017pdy58p91qn5d4hmcxcqzk8dvnmh7m4m7saslqivp";
version = "1.12.0";
sha256 = "01jq6hk8vcy47nc6gd4379k6kgjiyxy99j4pnc7nsdm63gnmr5l1";
isLibrary = false;
isExecutable = true;
buildDepends = [
Cabal convertible filepath ghcPaths ghcSybUtils hlint ioChoice
regexPosix syb time transformers
Cabal convertible filepath ghcPaths ghcSybUtils hlint ioChoice syb
time transformers
];
testDepends = [
Cabal convertible filepath ghcPaths ghcSybUtils hlint hspec
ioChoice regexPosix syb time transformers
ioChoice syb time transformers
];
buildTools = [ emacs ];
postInstall = ''
pkgs/development/libraries/haskell/ghc-vis/default.nix
+2 -2
View File
@@ -4,8 +4,8 @@
cabal.mkDerivation (self: {
pname = "ghc-vis";
version = "0.6";
sha256 = "0gvfs0f6fjg4bzq9q6rrhin6gk1pbyw9qbigi90cz1fg10nq7nzi";
version = "0.6.1";
sha256 = "0q0v1l44vagcg0nl4iv8m872g4qblj9syjlcgbf6fpgx1fqnyp24";
buildDepends = [
cairo deepseq fgl ghcHeapView graphviz gtk mtl svgcairo text
transformers xdot
pkgs/development/libraries/haskell/github/default.nix
+8 -3
View File
@@ -1,12 +1,17 @@
{ cabal, aeson, attoparsec, caseInsensitive, conduit, dataDefault
{ cabal, fetchurl, aeson, attoparsec, caseInsensitive, conduit, dataDefault
, failure, HTTP, httpConduit, httpTypes, network, text, time
, unorderedContainers, vector
}:
cabal.mkDerivation (self: {
pname = "github";
version = "0.5.0";
sha256 = "1zq9cwvpd6s8xd1ki2ifsj79vd4rm8vab9731f2p8zdm8g7mh5gd";
version = "0.5.0-patched";
src = fetchurl {
url = "https://github.com/mike-burns/github/archive/df415af64ebd4a28f1f8e5cc726e933545efdd7e.tar.gz";
sha256 = "1d1ya5j1qz1nf5kfkxp48gb0xbcr4fmf9y0kfpd3gxivfrdkfrig";
name = "github-${self.version}.tar.gz";
};
patches = [ (fetchurl { url = "https://github.com/mike-burns/github/pull/33.patch"; sha256 = "1d0m73ygzpk5rd6ahbrf58mxca56s5sd70yrf7fn2r1bh0rlacap"; }) ];
buildDepends = [
aeson attoparsec caseInsensitive conduit dataDefault failure HTTP
httpConduit httpTypes network text time unorderedContainers vector
pkgs/development/libraries/haskell/happstack/happstack-server.nix
+2 -3
View File
@@ -7,8 +7,8 @@
cabal.mkDerivation (self: {
pname = "happstack-server";
version = "7.1.6";
sha256 = "0gifq625kclam6sgblwa8a1vhxmx8saanzlrikch0l9q0l95nfwd";
version = "7.1.7";
sha256 = "1gd7qa224z04aya44fdrbhpiy5iw88wjcvqihz6l95ks9ilbzmg7";
buildDepends = [
base64Bytestring blazeHtml extensibleExceptions filepath hslogger
html monadControl mtl network parsec sendfile syb systemFilepath
@@ -16,7 +16,6 @@ cabal.mkDerivation (self: {
utf8String xhtml zlib
];
testDepends = [ HUnit parsec zlib ];
doCheck = false;
meta = {
homepage = "http://happstack.com";
description = "Web related tools and services";
pkgs/development/libraries/haskell/highlighting-kate/default.nix
+2 -2
View File
@@ -2,8 +2,8 @@
cabal.mkDerivation (self: {
pname = "highlighting-kate";
version = "0.5.3.7";
sha256 = "04wa1al83v5ak6gvrwqy2b63mda0qfi2ircxfs9ddk1gkdscrlrl";
version = "0.5.3.8";
sha256 = "1fdgmwhiw05mgbgsrgyzvdqzklw9r10nswxfpnxkh5ivfxrhz82w";
isLibrary = true;
isExecutable = true;
buildDepends = [ blazeHtml filepath mtl parsec regexPcre ];
pkgs/development/libraries/haskell/hp2any-core/default.nix
+2 -2
View File
@@ -2,8 +2,8 @@
cabal.mkDerivation (self: {
pname = "hp2any-core";
version = "0.11.1";
sha256 = "146bigmch7dawyyakj0w55p0jdpnxkj8q5izjsswqqk0pdxia546";
version = "0.11.2";
sha256 = "1gmw9bggw8hsp6pi0xgrryf0sqjb1aaxbwh85q5h72h4ixskwn1y";
buildDepends = [ attoparsec filepath network time ];
meta = {
homepage = "http://www.haskell.org/haskellwiki/Hp2any";
pkgs/development/libraries/haskell/hp2any-graph/default.nix
+2 -2
View File
@@ -4,8 +4,8 @@
cabal.mkDerivation (self: {
pname = "hp2any-graph";
version = "0.5.3";
sha256 = "1al20pxfgkgwynrx7vr0i57342s91lcm3cnd9qjx8b6vkqmzykkq";
version = "0.5.4";
sha256 = "1lhp9saw51w09fhk94hz31rjawnnxavd7x3lxjc8xn1778wp3v9h";
isLibrary = true;
isExecutable = true;
buildDepends = [
pkgs/development/libraries/haskell/persistent-sqlite/default.nix
+2 -2
View File
@@ -4,8 +4,8 @@
cabal.mkDerivation (self: {
pname = "persistent-sqlite";
version = "1.1.4.1";
sha256 = "0rhvbbzlzgzx4na7ffa2jx2zinzbb6b1jxf8964hcxx7iyzcycjj";
version = "1.1.5";
sha256 = "1kqxp0qsvxfz352yg9k1wgb2nfm7kcz8xdj9q537ilh99wxkp6cl";
buildDepends = [
aeson conduit monadControl monadLogger persistent text transformers
];
pkgs/development/libraries/haskell/resourcet/default.nix
+2 -2
View File
@@ -4,8 +4,8 @@
cabal.mkDerivation (self: {
pname = "resourcet";
version = "0.4.4";
sha256 = "0ad1hl7bl9qid4brchb95gvnylfchmxncgdvgljb5lci7gy9r31z";
version = "0.4.5";
sha256 = "1i2n0y4ridlzi2fn319f8jg1whb10gajgyvbz0rx2mwxj15bbgni";
buildDepends = [
liftedBase monadControl mtl transformers transformersBase
];
pkgs/development/libraries/haskell/shakespeare-js/default.nix
+2 -2
View File
@@ -2,8 +2,8 @@
cabal.mkDerivation (self: {
pname = "shakespeare-js";
version = "1.1.2";
sha256 = "0iwajn0d0yngzp10j9qbb2gpq1g7r390yqd7pj5dri35rjc6mr8n";
version = "1.1.2.1";
sha256 = "049nn0p236wbm2majkih87n2c7h65xrnf6gydsi7najxccjl7y8z";
buildDepends = [ aeson shakespeare text ];
testDepends = [ aeson hspec HUnit shakespeare text ];
meta = {
pkgs/development/libraries/haskell/shelly/default.nix
+2 -2
View File
@@ -4,8 +4,8 @@
cabal.mkDerivation (self: {
pname = "shelly";
version = "0.15.4";
sha256 = "1b8fn5fa350hhlswn97g6zn9454nzn9sz60x55j959phwys0fcdk";
version = "0.15.4.1";
sha256 = "12m11s22izz0ny1syb1ykp2hi9n240myf0nhapvn8jx1fgf5iyck";
buildDepends = [
mtl systemFileio systemFilepath text time unixCompat
];
pkgs/development/libraries/haskell/syb/0.4.0.nix
+15
View File
@@ -0,0 +1,15 @@
{ cabal, HUnit, mtl }:
cabal.mkDerivation (self: {
pname = "syb";
version = "0.4.0";
sha256 = "1wxz8y2dcjl407l596qswcl9cakbb5cs4wzwlyy6qjz7lyd0h0gj";
testDepends = [ HUnit mtl ];
meta = {
homepage = "http://www.cs.uu.nl/wiki/GenericProgramming/SYB";
description = "Scrap Your Boilerplate";
license = self.stdenv.lib.licenses.bsd3;
platforms = self.ghc.meta.platforms;
maintainers = [ self.stdenv.lib.maintainers.andres ];
};
})
pkgs/development/libraries/haskell/th-extras/default.nix
+3 -3
View File
@@ -2,12 +2,12 @@
cabal.mkDerivation (self: {
pname = "th-extras";
version = "0.0.0.1";
sha256 = "13d9fs48z87inma3kg9b7lfjp3h8j85fav6awd1zj3i2nl214hff";
version = "0.0.0.2";
sha256 = "15sqf2jjnqcssq8hp80fk0ysgwqykjjc31gvvmzg4sypskpjs8cl";
buildDepends = [ syb ];
meta = {
homepage = "https://github.com/mokus0/th-extras";
description = "A grab bag of useful functions for use with Template Haskell";
description = "A grab bag of functions for use with Template Haskell";
license = self.stdenv.lib.licenses.publicDomain;
platforms = self.ghc.meta.platforms;
maintainers = [ self.stdenv.lib.maintainers.andres ];
pkgs/development/libraries/haskell/uu-parsinglib/default.nix
+2 -2
View File
@@ -2,8 +2,8 @@
cabal.mkDerivation (self: {
pname = "uu-parsinglib";
version = "2.7.4.1";
sha256 = "1aya95j7dd0yal0ygy6d4w4wmlhgn5ddy3c5f6ncl4k3kg7hjxd1";
version = "2.7.4.2";
sha256 = "10ddm6x9km3lzs9ahqpsl9krvslsn9glimwzq4hspgsp6izd1dmq";
buildDepends = [ ListLike time ];
meta = {
homepage = "http://www.cs.uu.nl/wiki/bin/view/HUT/ParserCombinators";
pkgs/development/libraries/haskell/xdot/default.nix
+2 -2
View File
@@ -2,8 +2,8 @@
cabal.mkDerivation (self: {
pname = "xdot";
version = "0.2.2";
sha256 = "1n7lwshfn5rzbk4fxlkn02fxki2xh5m0304hnb1d5mchxyzhfdan";
version = "0.2.3";
sha256 = "0xb8igsqydiw1w00frn4mxkflhxkayif2vivxmq5fk53am2f43wy";
buildDepends = [ cairo graphviz gtk mtl polyparse text ];
meta = {
description = "Parse Graphviz xdot files and interactively view them using GTK and Cairo";
pkgs/development/libraries/haskell/xml-conduit/default.nix
+2 -2
View File
@@ -6,8 +6,8 @@
cabal.mkDerivation (self: {
pname = "xml-conduit";
version = "1.1.0.2";
sha256 = "17wv4rngmn8jvg6c3ia48w5q9s9dww9aisrmans9llqs7ks3ndqc";
version = "1.1.0.3";
sha256 = "04mnn6j9bbkhvav04gl9cbd4rldl7bwgcapvykwvf2p3nb3d7bi4";
buildDepends = [
attoparsec attoparsecConduit blazeBuilder blazeBuilderConduit
blazeHtml blazeMarkup conduit dataDefault failure monadControl
pkgs/development/libraries/haskell/yaml/default.nix
+2 -2
View File
@@ -4,8 +4,8 @@
cabal.mkDerivation (self: {
pname = "yaml";
version = "0.8.2.1";
sha256 = "1p0hi9psm42bsmm14gfdkj4wrbcgzkishcih6rwc2bcvn2i0hyyw";
version = "0.8.2.3";
sha256 = "1ds6969gbkxgkm2fha0ifmssjl7by9glgix165v0h8i7fx9wx3wa";
buildDepends = [
aeson attoparsec conduit resourcet text transformers
unorderedContainers vector
pkgs/development/libraries/haskell/yesod-test/default.nix
+2 -2
View File
@@ -6,8 +6,8 @@
cabal.mkDerivation (self: {
pname = "yesod-test";
version = "0.3.4";
sha256 = "18sz1blnrgijcq6psqk2b5zxbizpgam1cy1vcxc4nrfryfscr42b";
version = "0.3.5";
sha256 = "095hwl1dm4mk467la68x3lilj0c056603kl0nn8ra4glcr86273j";
buildDepends = [
attoparsec blazeBuilder blazeHtml blazeMarkup caseInsensitive
cookie hspec htmlConduit httpTypes HUnit monadControl network
pkgs/development/libraries/haskell/yesod/default.nix
+2 -2
View File
@@ -12,8 +12,8 @@
cabal.mkDerivation (self: {
pname = "yesod";
version = "1.1.9.1";
sha256 = "0kysj3akf2pvhsiy6f8yfs41mrya86b8ddskqzzibjmdyipiqksj";
version = "1.1.9.2";
sha256 = "1rv9mk842b9qwdzal9y5cn2z5z2rl6490600jg1xbsg0x0nl7hdj";
isLibrary = true;
isExecutable = true;
buildDepends = [
pkgs/development/libraries/haskell/zip-archive/default.nix
+2 -3
View File
@@ -4,13 +4,12 @@
cabal.mkDerivation (self: {
pname = "zip-archive";
version = "0.1.3.3";
sha256 = "0zzps6s6lsv35qv1xx1fwipk2nwv255wpa956mvzbwdr47pgqjwi";
version = "0.1.3.4";
sha256 = "0hvndr3gb7fiv4qjwjvic5mg7wq7h7nw3c3v5xq8fnlr1l943vyb";
isLibrary = true;
isExecutable = true;
buildDepends = [ binary digest filepath mtl time utf8String zlib ];
testDepends = [ HUnit time ];
doCheck = false;
meta = {
homepage = "http://github.com/jgm/zip-archive";
description = "Library for creating and modifying zip archives";
pkgs/development/libraries/libchop/default.nix
+3
View File
@@ -9,7 +9,10 @@ stdenv.mkDerivation rec {
sha256 = "0fpdyxww41ba52d98blvnf543xvirq1v9xz1i3x1gm9lzlzpmc2g";
};
patches = [ ./gets-undeclared.patch ];
nativeBuildInputs = [ pkgconfig gperf ];
buildInputs =
[ zlib bzip2 lzo
libgcrypt
pkgs/development/libraries/libchop/gets-undeclared.patch
+71
View File
@@ -0,0 +1,71 @@
This patch is needed to allow builds with newer versions of
the GNU libc (2.16+).
commit 66712c23388e93e5c518ebc8515140fa0c807348
Author: Eric Blake <eblake@redhat.com>
Date: Thu Mar 29 13:30:41 2012 -0600
stdio: don't assume gets any more
Gnulib intentionally does not have a gets module, and now that C11
and glibc have dropped it, we should be more proactive about warning
any user on a platform that still has a declaration of this dangerous
interface.
* m4/stdio_h.m4 (gl_STDIO_H, gl_STDIO_H_DEFAULTS): Drop gets
support.
* modules/stdio (Makefile.am): Likewise.
* lib/stdio-read.c (gets): Likewise.
* tests/test-stdio-c++.cc: Likewise.
* m4/warn-on-use.m4 (gl_WARN_ON_USE_PREPARE): Fix comment.
* lib/stdio.in.h (gets): Make warning occur in more places.
* doc/posix-functions/gets.texi (gets): Update documentation.
Reported by Christer Solskogen.
Signed-off-by: Eric Blake <eblake@redhat.com>
diff --git a/lib/stdio.in.h b/lib/stdio.in.h
index aa7b599..c377b6e 100644
--- a/lib/stdio.in.h
+++ b/lib/stdio.in.h
@@ -698,22 +698,11 @@ _GL_WARN_ON_USE (getline, "getline is unportable - "
# endif
#endif
-#if @GNULIB_GETS@
-# if @REPLACE_STDIO_READ_FUNCS@ && @GNULIB_STDIO_H_NONBLOCKING@
-# if !(defined __cplusplus && defined GNULIB_NAMESPACE)
-# undef gets
-# define gets rpl_gets
-# endif
-_GL_FUNCDECL_RPL (gets, char *, (char *s) _GL_ARG_NONNULL ((1)));
-_GL_CXXALIAS_RPL (gets, char *, (char *s));
-# else
-_GL_CXXALIAS_SYS (gets, char *, (char *s));
-# undef gets
-# endif
-_GL_CXXALIASWARN (gets);
/* It is very rare that the developer ever has full control of stdin,
- so any use of gets warrants an unconditional warning. Assume it is
- always declared, since it is required by C89. */
+ so any use of gets warrants an unconditional warning; besides, C11
+ removed it. */
+#undef gets
+#if HAVE_RAW_DECL_GETS
_GL_WARN_ON_USE (gets, "gets is a security hole - use fgets instead");
#endif
@@ -1053,9 +1042,9 @@ _GL_WARN_ON_USE (snprintf, "snprintf is unportable - "
# endif
#endif
-/* Some people would argue that sprintf should be handled like gets
- (for example, OpenBSD issues a link warning for both functions),
- since both can cause security holes due to buffer overruns.
+/* Some people would argue that all sprintf uses should be warned about
+ (for example, OpenBSD issues a link warning for it),
+ since it can cause security holes due to buffer overruns.
However, we believe that sprintf can be used safely, and is more
efficient than snprintf in those safe cases; and as proof of our
belief, we use sprintf in several gnulib modules. So this header
pkgs/development/libraries/openmpi/default.nix
+8 -3
View File
@@ -1,11 +1,16 @@
{stdenv, fetchurl, gfortran}:
stdenv.mkDerivation {
name = "openmpi-1.4.2";
name = "openmpi-1.6.4";
src = fetchurl {
url = http://www.open-mpi.org/software/ompi/v1.4/downloads/openmpi-1.4.2.tar.bz2 ;
sha1 = "3e85092433d0e399cc7a51c018f9d13562f78b80";
url = http://www.open-mpi.org/software/ompi/v1.6/downloads/openmpi-1.6.4.tar.bz2 ;
sha1 = "38095d3453519177272f488d5058a98f7ebdbf10";
};
buildInputs = [ gfortran ];
meta = {
homePage = http://www.open-mpi.org/;
description = "Open source MPI-2 implementation";
longDescription = "The Open MPI Project is an open source MPI-2 implementation that is developed and maintained by a consortium of academic, research, and industry partners. Open MPI is therefore able to combine the expertise, technologies, and resources from all across the High Performance Computing community in order to build the best MPI library available. Open MPI offers advantages for system and software vendors, application developers and computer science researchers.";
};
}
pkgs/development/libraries/sodium/default.nix
+28
View File
@@ -0,0 +1,28 @@
{stdenv, fetchurl}:
let
s = # Generated upstream information
rec {
baseName="sodium";
version="0.3";
name="${baseName}-${version}";
hash="0l1p0d7ag186hhs65kifp8jfgf4mm9rngv41bhq35d7d9gw2d2lh";
url="http://download.dnscrypt.org/libsodium/releases/libsodium-0.3.tar.gz";
sha256="0l1p0d7ag186hhs65kifp8jfgf4mm9rngv41bhq35d7d9gw2d2lh";
};
buildInputs = [
];
in
stdenv.mkDerivation {
inherit (s) name version;
inherit buildInputs;
src = fetchurl {
inherit (s) url sha256;
};
meta = {
inherit (s) version;
description = ''A cryptography library with simple API'';
license = stdenv.lib.licenses.mit ;
maintainers = [stdenv.lib.maintainers.raskin];
platforms = stdenv.lib.platforms.linux;
};
}
pkgs/development/libraries/sodium/default.upstream
+1
View File
@@ -0,0 +1 @@
url http://download.dnscrypt.org/libsodium/releases/
pkgs/development/mobile/androidenv/build-app.nix
+3
View File
@@ -37,5 +37,8 @@ stdenv.mkDerivation {
installPhase = ''
mkdir -p $out
mv bin/*-${if release then "release" else "debug"}.apk $out
mkdir -p $out/nix-support
echo "file binary-dist $(ls $out/*.apk)" > $out/nix-support/hydra-build-products
'';
}
pkgs/development/mobile/titaniumenv/build-app.nix
+5
View File
@@ -113,6 +113,11 @@ stdenv.mkDerivation {
"cp -av build/iphone/build/* $out"
else if target == "iphone" then ""
else throw "Target: ${target} is not supported!"}
${if target == "android" then ''
mkdir -p $out/nix-support
echo "file binary-dist $(ls $out/*.apk)" > $out/nix-support/hydra-build-products
'' else ""}
'';
failureHook = stdenv.lib.optionalString (release && target == "iphone") deleteKeychain;
pkgs/development/mobile/titaniumenv/examples/default.nix
+9 -13
View File
@@ -1,37 +1,33 @@
{ nixpkgs ? <nixpkgs> }:
let
pkgs = import <nixpkgs> {};
pkgs_i686 = import <nixpkgs> { system = "i686-linux"; };
pkgs = import nixpkgs {};
pkgs_darwin_x86_64 = import nixpkgs { system = "x86_64-darwin"; };
in
rec {
titaniumenv = import ./.. {
inherit pkgs pkgs_i686;
};
kitchensink_android = import ./kitchensink {
inherit titaniumenv;
inherit (pkgs) fetchgit;
inherit (pkgs) fetchgit titaniumenv;
target = "android";
};
kitchensink_iphone = import ./kitchensink {
inherit titaniumenv;
inherit (pkgs) fetchgit;
inherit (pkgs_darwin_x86_64) fetchgit titaniumenv;
target = "iphone";
};
emulate_kitchensink = import ./emulate-kitchensink {
inherit (titaniumenv) androidenv;
inherit (pkgs.titaniumenv) androidenv;
kitchensink = kitchensink_android;
};
simulate_kitchensink_iphone = import ./simulate-kitchensink {
inherit (titaniumenv) xcodeenv;
inherit (pkgs_darwin_x86_64.titaniumenv) xcodeenv;
kitchensink = kitchensink_iphone;
device = "iPhone";
};
simulate_kitchensink_ipad = import ./simulate-kitchensink {
inherit (titaniumenv) xcodeenv;
inherit (pkgs_darwin_x86_64.titaniumenv) xcodeenv;
kitchensink = kitchensink_iphone;
device = "iPad";
};
pkgs/development/tools/haskell/cabal2nix/default.nix
+2 -2
View File
@@ -3,8 +3,8 @@
cabal.mkDerivation (self: {
pname = "cabal2nix";
version = "1.44";
sha256 = "1j2w5g75nir0ax9pvn1fyj5l1c4s84mbj400any9v0bpv624mffm";
version = "1.45";
sha256 = "0xj4qkh4kp2q1a73q5da71spzskpxcfnn4pga9s492baf9yflhlf";
isLibrary = false;
isExecutable = true;
buildDepends = [ Cabal filepath hackageDb HTTP mtl regexPosix ];
pkgs/development/tools/misc/ctags/default.nix
+14 -13
View File
@@ -1,24 +1,26 @@
{stdenv, fetchurl, sourceFromHead, automake, autoconf}:
{ stdenv, fetchsvn, automake, autoconf}:
stdenv.mkDerivation rec {
name = "ctags-svn";
# REGION AUTO UPDATE: { name="ctags"; type = "svn"; url = "https://ctags.svn.sourceforge.net/svnroot/ctags/trunk"; }
src= sourceFromHead "ctags-749.tar.gz"
(fetchurl { url = "http://mawercer.de/~nix/repos/ctags-749.tar.gz"; sha256 = "01dd4bf2e55dbedc38def81febef60eece912cb7624df1c0a2cf1ed6e4bc4ecf"; });
# END
name = "ctags-${revision}";
revision = "804";
preConfigure = ''
autoheader
autoconf
'';
src = fetchsvn {
url = "http://ctags.svn.sourceforge.net/svnroot/ctags/trunk";
rev = revision;
sha256 = "16gln1mah2jqp32ki1z0187dwkbjx1xcnmyiardcq6c9w3p4qwcr";
};
buildInputs = [ automake autoconf ];
preConfigure = "autoreconf -i";
# don't use $T(E)MP which is set to the build directory
configureFlags="--enable-tmpdir=/tmp";
meta = {
homepage = "http://ctags.sourceforge.net/";
description = "Exuberant Ctags, a tool for fast source code browsing";
license = stdenv.lib.licenses.gpl2Plus;
longDescription = ''
Ctags generates an index (or tag) file of language objects found
@@ -29,9 +31,8 @@ stdenv.mkDerivation rec {
programming languages are supported.
'';
homepage = http://ctags.sourceforge.net/;
license = "GPLv2+";
platforms = stdenv.lib.platforms.unix;
maintainers = [ stdenv.lib.maintainers.simons ];
};
}
pkgs/development/tools/misc/gob2/default.nix
+5 -4
View File
@@ -1,10 +1,11 @@
{ stdenv, fetchurl, pkgconfig, glib, bison, flex }:
{ stdenv, fetchurl_gnome, pkgconfig, glib, bison, flex }:
stdenv.mkDerivation rec {
name = "gob2-2.0.18";
name = src.pkgname;
src = fetchurl {
url = "http://ftp.5z.com/pub/gob/${name}.tar.gz";
src = fetchurl_gnome {
project = "gob2";
major = "2"; minor = "0"; patchlevel = "18"; extension = "gz";
sha256 = "1r242s3rsxyqiw2ic2gdpvvrx903jgjd1aa4mkl26in5k9zk76fa";
};
pkgs/games/eduke32/default.nix
+5 -5
View File
@@ -1,14 +1,14 @@
{stdenv, fetchurl, SDL, SDL_mixer, libvorbis, mesa, gtk, pkgconfig, nasm, makeDesktopItem}:
{stdenv, fetchurl, SDL, SDL_mixer, libvorbis, mesa, gtk, pkgconfig, nasm, libvpx, flac, makeDesktopItem}:
stdenv.mkDerivation rec {
name = "eduke32-1944";
name = "eduke32-3542";
src = fetchurl {
url = http://dukeworld.duke4.net/eduke32/synthesis/20110724-1944/eduke32_src_20110724-1944.tar.bz2;
sha256 = "0y2y9agydfkdq4krp4lz22br3p23as6hrqhq7l9djw0pm2y76fqh";
url = http://dukeworld.duke4.net/eduke32/synthesis/20130303-3542/eduke32_src_20130303-3542.tar.bz2;
sha256 = "0v1q2bkmpnac5l9x97nnlhrrb95518vmhxx48zv3ncvmpafl1mqc";
};
buildInputs = [ SDL SDL_mixer libvorbis mesa gtk pkgconfig ]
buildInputs = [ SDL SDL_mixer libvorbis mesa gtk pkgconfig libvpx flac ]
++ stdenv.lib.optional (stdenv.system == "i686-linux") nasm;
NIX_CFLAGS_COMPILE = "-I${SDL}/include/SDL";
pkgs/games/xboard/default.nix
+7 -6
View File
@@ -1,19 +1,20 @@
{stdenv, fetchurl, libX11, xproto, libXt, libXaw, libSM, libICE, libXmu
, libXext, gnuchess, texinfo, libXpm
, libXext, gnuchess, texinfo, libXpm, pkgconfig, librsvg, cairo
}:
let
s = # Generated upstream information
rec {
baseName="xboard";
version="4.6.2";
version="4.7.0";
name="${baseName}-${version}";
hash="1pw90fh1crf0nkqyql54z728vn2093hwdh2v5i5703z9qv9g4mrf";
url="http://ftp.gnu.org/gnu/xboard/xboard-4.6.2.tar.gz";
sha256="1pw90fh1crf0nkqyql54z728vn2093hwdh2v5i5703z9qv9g4mrf";
hash="15azbnyfapjppfni9k99sk68af1kg60nnh95rz8jgb3i2xv5y5m7";
url="http://ftp.gnu.org/gnu/xboard/xboard-4.7.0.tar.gz";
sha256="15azbnyfapjppfni9k99sk68af1kg60nnh95rz8jgb3i2xv5y5m7";
};
buildInputs = [
libX11 xproto libXt libXaw libSM libICE libXmu
libXext gnuchess texinfo libXpm
libXext gnuchess texinfo libXpm pkgconfig librsvg
cairo
];
in
stdenv.mkDerivation {
pkgs/lib/attrsets.nix
+12 -1
View File
@@ -194,7 +194,7 @@ rec {
(as: !(as ? "type" && as.type == "derivation"))
(x: ... do something ...)
attrs
*/
*/
mapAttrsRecursiveCond = cond: f: set:
let
recurse = path: set:
@@ -208,6 +208,17 @@ rec {
in recurse [] set;
/* Generate an attribute set by mapping a function over a list of
attribute names.
Example:
genAttrs [ "foo" "bar" ] (name: "x_" + name)
=> { foo = "x_foo"; bar = "x_bar"; }
*/
genAttrs = names: f:
listToAttrs (map (n: nameValuePair n (f n)) names);
/* Check whether the argument is a derivation. */
isDerivation = x: isAttrs x && x ? type && x.type == "derivation";
pkgs/misc/emulators/wine/default.nix
+3 -2
View File
@@ -7,12 +7,12 @@ assert stdenv.isLinux;
assert stdenv.gcc.gcc != null;
stdenv.mkDerivation rec {
version = "1.5.23";
version = "1.5.25";
name = "wine-${version}";
src = fetchurl {
url = "mirror://sourceforge/wine/${name}.tar.bz2";
sha256 = "1wgs2bdl3sn3j0za7fk9zfjlii1x6qkvmyw4jxzz1mfw6nizswzr";
sha256 = "0812ryv1v0gqr13vmvjci09k89qhcr1qs0n052z4zw0vpipjd4rx";
};
gecko = fetchurl {
@@ -49,6 +49,7 @@ stdenv.mkDerivation rec {
meta = {
homepage = "http://www.winehq.org/";
license = "LGPL";
inherit version;
description = "An Open Source implementation of the Windows API on top of X, OpenGL, and Unix";
maintainers = [stdenv.lib.maintainers.raskin stdenv.lib.maintainers.simons];
platforms = stdenv.lib.platforms.linux;
pkgs/os-specific/linux/bbswitch/default.nix
+10 -3
View File
@@ -1,9 +1,14 @@
{ stdenv, fetchurl, kernel }:
let
baseName = "bbswitch-0.4.2";
baseName = "bbswitch-0.5";
name = "${baseName}-${kernel.version}";
linux38Compatibility = fetchurl {
url = "http://github.com/Bumblebee-Project/bbswitch/commit/5593d95.patch";
sha256 = "0m6y5sdagf4brhk1lsp86rx94xf628sixzf6j71bn7jnqs4jslr6";
};
in
stdenv.mkDerivation {
@@ -11,15 +16,17 @@ stdenv.mkDerivation {
src = fetchurl {
url = "http://github.com/downloads/Bumblebee-Project/bbswitch/${baseName}.tar.gz";
sha256 = "06j3cm1rk3lcbv54k0magrijykrzmkrna8n5cc274iz59842lga3";
sha256 = "19775r3bsf5l3ssbayr30fij09gavj2qjrr438hdcmzswvlj2dpv";
};
patches = [ linux38Compatibility ];
preBuild = ''
substituteInPlace Makefile \
--replace "\$(shell uname -r)" "${kernel.modDirVersion}" \
--replace "/lib/modules" "${kernel}/lib/modules"
'';
installPhase = ''
ensureDir $out/lib/modules/${kernel.modDirVersion}/misc
cp bbswitch.ko $out/lib/modules/${kernel.modDirVersion}/misc
pkgs/os-specific/linux/cifs-utils/default.nix
+2
View File
@@ -8,6 +8,8 @@ stdenv.mkDerivation rec {
sha256 = "0f619nw1163bcmfc83mmqj31qdkl68wfm81vynx3d8q0m0k1ll7i";
};
patches = [ ./find-systemd-ask-password-via-path.patch ];
makeFlags = "root_sbindir=$(out)/sbin";
meta = {
pkgs/os-specific/linux/cifs-utils/find-systemd-ask-password-via-path.patch
+22
View File
@@ -0,0 +1,22 @@
diff -ubr cifs-utils-5.9-orig/mount.cifs.c cifs-utils-5.9/mount.cifs.c
--- cifs-utils-5.9-orig/mount.cifs.c 2013-03-05 10:53:19.375464790 +0100
+++ cifs-utils-5.9/mount.cifs.c 2013-03-05 11:41:40.704946110 +0100
@@ -1634,7 +1634,7 @@
}
/*
- * If systemd is running and /bin/systemd-ask-password --
+ * If systemd is running and systemd-ask-password --
* is available, then use that else fallback on getpass(..)
*
* Returns: @input or NULL on error
@@ -1657,7 +1657,7 @@
FILE *ask_pass_fp = NULL;
cmd = ret = NULL;
- if (asprintf(&cmd, "/bin/systemd-ask-password \"%s\"", prompt) >= 0) {
+ if (asprintf(&cmd, "/run/current-system/sw/bin/systemd-ask-password \"%s\"", prompt) >= 0) {
ask_pass_fp = popen (cmd, "re");
free (cmd);
}
Only in cifs-utils-5.9/: mount.cifs.c.orig
pkgs/os-specific/linux/kernel/generic.nix
+5 -1
View File
@@ -39,6 +39,8 @@
, # After the builder did a 'make all' (kernel + modules)
# we force building the target asked: bzImage/zImage/uImage/...
postBuild ? "make $makeFlags $kernelTarget; make $makeFlags -C scripts unifdef"
, extraNativeBuildInputs ? []
, ...
}:
@@ -83,7 +85,8 @@ stdenv.mkDerivation {
# For UML and non-PC, just ignore all options that don't apply (We are lazy).
ignoreConfigErrors = stdenv.platform.name != "pc";
nativeBuildInputs = [ perl mktemp ];
nativeBuildInputs = [ perl mktemp ] ++ extraNativeBuildInputs;
buildInputs = lib.optional (stdenv.platform.uboot != null)
(ubootChooser stdenv.platform.uboot);
@@ -130,6 +133,7 @@ stdenv.mkDerivation {
" (with patches: "
+ lib.concatStrings (lib.intersperse ", " (map (x: x.name) kernelPatches))
+ ")");
inherit version;
license = "GPLv2";
homepage = http://www.kernel.org/;
maintainers = [

Some files were not shown because too many files have changed in this diff Show More