mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-11-01 23:22:37 +00:00
Merge branch 'master' into x-updates
This commit is contained in:
Shea Levy
commit
4497344e49
@ -1,19 +1,19 @@
|
||||
# This file is autogenerated from update.sh in the same directory.
|
||||
# VHASH: 5e5af2017fa2e05f11aa741c6f87fff0549b93e3bc2aa40e6cc0a0aff84ba010
|
||||
# VHASH: 545cfbcd1fc31d037d1e6b5382995075d2a875a51d181cc26851e49dbd2227d8
|
||||
{
|
||||
dev = {
|
||||
version = "21.0.1180.15";
|
||||
url = "http://commondatastorage.googleapis.com/chromium-browser-official/chromium-21.0.1180.15.tar.bz2";
|
||||
sha256 = "0ahsrsyw4928vg1kl3dv44q77ksp85crw6m7fy20nq46qihb0mxa";
|
||||
version = "22.0.1207.1";
|
||||
url = "http://commondatastorage.googleapis.com/chromium-browser-official/chromium-22.0.1207.1.tar.bz2";
|
||||
sha256 = "1kzzaaczz1mwsfw7fn8la6h4yls2wy537ypabqgwyim01jhfmilp";
|
||||
};
|
||||
beta = {
|
||||
version = "20.0.1132.47";
|
||||
url = "http://commondatastorage.googleapis.com/chromium-browser-official/chromium-20.0.1132.47.tar.bz2";
|
||||
sha256 = "1rd1lfn9xchf4nrgi46van5aigqxj2n303890sslc4bcj6p8fkm3";
|
||||
version = "21.0.1180.41";
|
||||
url = "http://commondatastorage.googleapis.com/chromium-browser-official/chromium-21.0.1180.41.tar.bz2";
|
||||
sha256 = "1225ny7y5msyk44lb5dspd4aq0yiaawsb5xi9g8iimiv80j4h34a";
|
||||
};
|
||||
stable = {
|
||||
version = "20.0.1132.47";
|
||||
url = "http://commondatastorage.googleapis.com/chromium-browser-official/chromium-20.0.1132.47.tar.bz2";
|
||||
sha256 = "1rd1lfn9xchf4nrgi46van5aigqxj2n303890sslc4bcj6p8fkm3";
|
||||
version = "20.0.1132.57";
|
||||
url = "http://commondatastorage.googleapis.com/chromium-browser-official/chromium-20.0.1132.57.tar.bz2";
|
||||
sha256 = "06v4ybvaj3gx1v4visfyfzbq2q3xasa8xlf05f4wi2bf62vcc98j";
|
||||
};
|
||||
}
|
||||
|
||||
@ -9,22 +9,22 @@
|
||||
assert stdenv.isLinux && stdenv.gcc.gcc != null && stdenv.gcc.libc != null;
|
||||
|
||||
let
|
||||
mirror = ftp://ftp.ussg.iu.edu/pub/opera;
|
||||
mirror = http://get.geo.opera.com/pub/opera;
|
||||
in
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "opera-11.64-1403";
|
||||
name = "opera-12.00-1467";
|
||||
|
||||
src =
|
||||
if stdenv.system == "i686-linux" then
|
||||
fetchurl {
|
||||
url = "${mirror}/linux/1164/${name}.i386.linux.tar.xz";
|
||||
sha256 = "8b7998586b1b3f8f5722beef7ebb621c0f15915c260b096249e9db5973e30d82";
|
||||
url = "${mirror}/linux/1200/${name}.i386.linux.tar.xz";
|
||||
sha256 = "d5683f5a4cf0cfd9ce715359b77909c7923c85bcec98513907c1844285356fdc";
|
||||
}
|
||||
else if stdenv.system == "x86_64-linux" then
|
||||
fetchurl {
|
||||
url = "${mirror}/linux/1164/${name}.x86_64.linux.tar.xz";
|
||||
sha256 = "3b2012cbab826a04417deb56b85d8d31f9c17130071304736bcfa572f78b4c69";
|
||||
url = "${mirror}/linux/1200/${name}.x86_64.linux.tar.xz";
|
||||
sha256 = "7c3dbe122b1fd20123f1b48a420dea080cc24ede4183d47d66b383c2b7ca5051";
|
||||
}
|
||||
else throw "Opera is not supported on ${stdenv.system} (only i686-linux and x86_64 linux are supported)";
|
||||
|
||||
|
||||
@ -1,21 +1,19 @@
|
||||
{stdenv, fetchurl, readline, openssh}:
|
||||
{stdenv, fetchurl, readline, libssh, intltool}:
|
||||
|
||||
stdenv.mkDerivation {
|
||||
name = "yafc-1.1.1";
|
||||
stdenv.mkDerivation rec {
|
||||
name = "yafc";
|
||||
version = "1.2.0";
|
||||
src = fetchurl {
|
||||
url = mirror://sourceforge/yafc/yafc-1.1.1.tar.bz2;
|
||||
sha256 = "ab72b2ed89fb75dbe8ebd119458cf513392225f367cccfad881e9780aefcd7e6";
|
||||
url = "https://github.com/downloads/sebastinas/yafc/${name}-${version}.tar.xz";
|
||||
sha256 = "0h5cbvvfkigvzfqqzvgqpn8m0ilyng3rgyh85c0mi48klzv8kb58";
|
||||
};
|
||||
|
||||
buildInputs = [readline openssh];
|
||||
|
||||
patchPhase = "
|
||||
sed -e 's@/usr/bin/ssh@${openssh}/bin/ssh@' -i src/main.c
|
||||
";
|
||||
buildInputs = [ readline libssh intltool ];
|
||||
|
||||
meta = {
|
||||
description = "ftp/sftp client with readline, autocompletion and bookmarks";
|
||||
homepage = http://yafc.sourceforge.net;
|
||||
homepage = http://www.yafc-ftp.com;
|
||||
maintainers = [ stdenv.lib.maintainers.page ];
|
||||
license = "GPLv2+";
|
||||
};
|
||||
}
|
||||
|
||||
@ -6,7 +6,7 @@ with stdenv.lib;
|
||||
|
||||
let
|
||||
|
||||
version = "4.0.3";
|
||||
version = "4.1.2";
|
||||
|
||||
libDir = if stdenv.is64bit then "lib64" else "lib";
|
||||
|
||||
@ -30,23 +30,24 @@ let
|
||||
}
|
||||
];
|
||||
|
||||
in
|
||||
ipxeSrc =
|
||||
{ url = http://xenbits.xensource.com/xen-extfiles/ipxe-git-v1.0.0.tar.gz;
|
||||
sha256 = "d3128bfda9a1542049c278755f85bbcbb8441da7bfd702d511ce237fcf86a723";
|
||||
};
|
||||
in
|
||||
|
||||
stdenv.mkDerivation {
|
||||
name = "xen-${version}";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://bits.xensource.com/oss-xen/release/${version}/xen-${version}.tar.gz";
|
||||
sha256 = "0p4i7mm8cdsr8i9z3dij6nriyvz6la2rhm7jkyk2n8h62nnxi1b5";
|
||||
sha256 = "7d9c93057cf480d3f1efa792b19285a84fa3c06060ea5c5c453be00887389b0d";
|
||||
};
|
||||
|
||||
patches =
|
||||
[ # Xen looks for headers in /usr/include and for libraries using
|
||||
# ldconfig. Don't do that.
|
||||
./has-header.patch
|
||||
|
||||
# GCC 4.5 compatibility.
|
||||
./gcc-4.5.patch
|
||||
];
|
||||
|
||||
buildInputs =
|
||||
@ -102,12 +103,18 @@ stdenv.mkDerivation {
|
||||
--replace 'XENDOM_CONFIG=/etc/sysconfig/xendomains' "" \
|
||||
--replace /bin/ls ls
|
||||
|
||||
grep -rl /etc/xen * | xargs sed -i 's|/etc/xen|$out/etc/xen|g'
|
||||
|
||||
# Xen's stubdoms need various sources that it usually fetches at
|
||||
# build time using wget. We can't have that.
|
||||
${flip concatMapStrings stubdomSrcs (x: let src = fetchurl x; in ''
|
||||
cp ${src} stubdom/${src.name}
|
||||
'')}
|
||||
|
||||
${let src = fetchurl ipxeSrc; in ''
|
||||
cp ${src} tools/firmware/etherboot/ipxe.tar.gz
|
||||
''}
|
||||
|
||||
# Hack to get `gcc -m32' to work without having 32-bit Glibc headers.
|
||||
mkdir -p tools/include/gnu
|
||||
touch tools/include/gnu/stubs-32.h
|
||||
|
||||
@ -1,39 +0,0 @@
|
||||
http://lists.xensource.com/archives/html/xen-devel/2010-07/msg01276.html
|
||||
|
||||
diff -ru -x '*~' xen-4.0.1-orig//extras/mini-os/arch/x86/mm.c xen-4.0.1//extras/mini-os/arch/x86/mm.c
|
||||
--- xen-4.0.1-orig//extras/mini-os/arch/x86/mm.c 2010-08-25 12:22:07.000000000 +0200
|
||||
+++ xen-4.0.1//extras/mini-os/arch/x86/mm.c 2010-12-22 20:10:05.000000000 +0100
|
||||
@@ -281,7 +281,7 @@
|
||||
/*
|
||||
* Mark portion of the address space read only.
|
||||
*/
|
||||
-extern void shared_info;
|
||||
+extern char shared_info[PAGE_SIZE];
|
||||
static void set_readonly(void *text, void *etext)
|
||||
{
|
||||
unsigned long start_address =
|
||||
diff -ru -x '*~' xen-4.0.1-orig//extras/mini-os/minios.mk xen-4.0.1//extras/mini-os/minios.mk
|
||||
--- xen-4.0.1-orig//extras/mini-os/minios.mk 2010-08-25 12:22:07.000000000 +0200
|
||||
+++ xen-4.0.1//extras/mini-os/minios.mk 2010-12-22 20:03:11.000000000 +0100
|
||||
@@ -10,6 +10,7 @@
|
||||
DEF_CFLAGS += $(call cc-option,$(CC),-fno-stack-protector,)
|
||||
DEF_CFLAGS += $(call cc-option,$(CC),-fgnu89-inline)
|
||||
DEF_CFLAGS += -Wstrict-prototypes -Wnested-externs -Wpointer-arith -Winline
|
||||
+DEF_CFLAGS += -Wno-uninitialized
|
||||
DEF_CPPFLAGS += -D__XEN_INTERFACE_VERSION__=$(XEN_INTERFACE_VERSION)
|
||||
|
||||
DEF_ASFLAGS += -D__ASSEMBLY__
|
||||
diff -ru -x '*~' xen-4.0.1-orig//extras/mini-os/netfront.c xen-4.0.1//extras/mini-os/netfront.c
|
||||
--- xen-4.0.1-orig//extras/mini-os/netfront.c 2010-08-25 12:22:07.000000000 +0200
|
||||
+++ xen-4.0.1//extras/mini-os/netfront.c 2010-12-22 19:56:59.000000000 +0100
|
||||
@@ -25,8 +25,8 @@
|
||||
|
||||
|
||||
|
||||
-#define NET_TX_RING_SIZE __RING_SIZE((struct netif_tx_sring *)0, PAGE_SIZE)
|
||||
-#define NET_RX_RING_SIZE __RING_SIZE((struct netif_rx_sring *)0, PAGE_SIZE)
|
||||
+#define NET_TX_RING_SIZE __CONST_RING_SIZE(netif_tx, PAGE_SIZE)
|
||||
+#define NET_RX_RING_SIZE __CONST_RING_SIZE(netif_rx, PAGE_SIZE)
|
||||
#define GRANT_INVALID_REF 0
|
||||
|
||||
|
||||
@ -13,6 +13,8 @@ stdenv.mkDerivation rec {
|
||||
buildInputs = [ which pkgconfig libxcb xcbutilkeysyms xcbutil bison xcbutilwm
|
||||
libstartup_notification libX11 pcre libev yajl flex libXcursor perl ];
|
||||
|
||||
patchPhase = "patchShebangs .";
|
||||
|
||||
configurePhase = "makeFlags=PREFIX=$out";
|
||||
|
||||
meta = {
|
||||
|
||||
24
pkgs/data/fonts/tipa/default.nix
Normal file
24
pkgs/data/fonts/tipa/default.nix
Normal file
@ -0,0 +1,24 @@
|
||||
{ stdenv, fetchurl }:
|
||||
|
||||
stdenv.mkDerivation {
|
||||
name = "tipa-1.3";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://debian/pool/main/t/tipa/tipa_1.3.orig.tar.gz";
|
||||
sha256 = "1q1sisxdcd2zd9b7mnagr2mxf9v3n1r4s5892zx5ly4r0niyya9m";
|
||||
};
|
||||
|
||||
installPhase = ''
|
||||
export PREFIX="$out/texmf"
|
||||
mkdir -p "$PREFIX" "$out/share"
|
||||
make install PREFIX="$PREFIX"
|
||||
|
||||
ln -s $out/texmf* $out/share/
|
||||
'';
|
||||
|
||||
meta = {
|
||||
description = "Phonetic font for TeX";
|
||||
};
|
||||
}
|
||||
|
||||
|
||||
@ -1,13 +1,13 @@
|
||||
{ stdenv, fetchurl, ghc, perl, gmp, ncurses }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
version = "7.5.20120706";
|
||||
version = "7.5.20120714";
|
||||
|
||||
name = "ghc-${version}";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://haskell.org/ghc/dist/current/dist/${name}-src.tar.bz2";
|
||||
sha256 = "196aghpgzf5k47l603fynxxjjkkk5f6y2cylxv3skavvd1g16bs2";
|
||||
sha256 = "02jicyqqr18yixf970f1rfrn64bm528aig6s9566galji063p6ah";
|
||||
};
|
||||
|
||||
buildInputs = [ ghc perl gmp ncurses ];
|
||||
|
||||
20
pkgs/development/interpreters/cython/default.nix
Normal file
20
pkgs/development/interpreters/cython/default.nix
Normal file
@ -0,0 +1,20 @@
|
||||
{ stdenv, fetchurl, python, pkgconfig }:
|
||||
|
||||
stdenv.mkDerivation {
|
||||
name = "cython-0.16";
|
||||
|
||||
src = fetchurl {
|
||||
url = http://www.cython.org/release/Cython-0.16.tar.gz;
|
||||
sha256 = "1yz6jwv25xx5mbr2nm4l7mi65gvpm63dzi3vrw73p51wbpy525lp";
|
||||
};
|
||||
|
||||
buildPhase = "python setup.py build --build-base $out";
|
||||
|
||||
installPhase = "python setup.py install --prefix=$out";
|
||||
|
||||
buildInputs = [ python pkgconfig ];
|
||||
|
||||
meta = {
|
||||
description = "An interpreter to help writing C extensions for Python";
|
||||
};
|
||||
}
|
||||
@ -1,26 +1,19 @@
|
||||
{ stdenv, fetchurl, builderDefs, python }:
|
||||
{ stdenv, fetchurl, pythonPackages }:
|
||||
|
||||
let
|
||||
let version = "0.9.5.1.1"; in
|
||||
|
||||
localDefs = builderDefs.passthru.function {
|
||||
pythonPackages.buildPythonPackage rec {
|
||||
name = "pyrex-${version}";
|
||||
|
||||
src = fetchurl {
|
||||
url = http://www.cosc.canterbury.ac.nz/greg.ewing/python/Pyrex/oldtar/Pyrex-0.9.5.1.1.tar.gz;
|
||||
sha256 = "0lxxvn4mjfb83swcbqb5908q4iy53w4ip5i0f9angm2va1jyhd3z";
|
||||
};
|
||||
src = fetchurl {
|
||||
url = "http://www.cosc.canterbury.ac.nz/greg.ewing/python/Pyrex/oldtar/Pyrex-${version}.tar.gz";
|
||||
sha256 = "0lxxvn4mjfb83swcbqb5908q4iy53w4ip5i0f9angm2va1jyhd3z";
|
||||
};
|
||||
|
||||
buildInputs = [python];
|
||||
doCheck = false;
|
||||
|
||||
};
|
||||
|
||||
in with localDefs;
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "pyrex-0.9.5.1.1";
|
||||
builder = writeScript (name + "-builder")
|
||||
(textClosure localDefs [installPythonPackage doForceShare]);
|
||||
meta = {
|
||||
description = "Python package compiler or something like that";
|
||||
inherit src;
|
||||
homepage = http://www.cosc.canterbury.ac.nz/greg.ewing/python/Pyrex/;
|
||||
description = "A language for writing Python extension modules";
|
||||
};
|
||||
}
|
||||
|
||||
@ -1,26 +1,19 @@
|
||||
{ stdenv, fetchurl, builderDefs, python }:
|
||||
{ stdenv, fetchurl, pythonPackages }:
|
||||
|
||||
let
|
||||
let version = "0.9.6.4"; in
|
||||
|
||||
localDefs = builderDefs.passthru.function {
|
||||
|
||||
src = fetchurl {
|
||||
url = http://www.cosc.canterbury.ac.nz/greg.ewing/python/Pyrex/oldtar/Pyrex-0.9.6.4.tar.gz;
|
||||
sha256 = "18pd9f8al3l6i27cc0ddhgg7hxf28lnfs75x4a8jzscydxgiq5a8";
|
||||
};
|
||||
|
||||
buildInputs = [python];
|
||||
pythonPackages.buildPythonPackage rec {
|
||||
name = "pyrex-${version}";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://www.cosc.canterbury.ac.nz/greg.ewing/python/Pyrex/oldtar/Pyrex-${version}.tar.gz";
|
||||
sha256 = "18pd9f8al3l6i27cc0ddhgg7hxf28lnfs75x4a8jzscydxgiq5a8";
|
||||
};
|
||||
|
||||
in with localDefs;
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "pyrex-0.9.6.4";
|
||||
builder = writeScript (name + "-builder")
|
||||
(textClosure localDefs [installPythonPackage doForceShare]);
|
||||
doCheck = false;
|
||||
|
||||
meta = {
|
||||
description = "Python package compiler or something like that";
|
||||
inherit src;
|
||||
homepage = http://www.cosc.canterbury.ac.nz/greg.ewing/python/Pyrex/;
|
||||
description = "A language for writing Python extension modules";
|
||||
};
|
||||
}
|
||||
|
||||
15
pkgs/development/libraries/haskell/HUnit/1.2.5.0.nix
Normal file
15
pkgs/development/libraries/haskell/HUnit/1.2.5.0.nix
Normal file
@ -0,0 +1,15 @@
|
||||
{ cabal, deepseq }:
|
||||
|
||||
cabal.mkDerivation (self: {
|
||||
pname = "HUnit";
|
||||
version = "1.2.5.0";
|
||||
sha256 = "0yxa3clrrjwg9faa3vsqb44xdzhdgwji56lrh7sa7dgq8bv1h6nr";
|
||||
buildDepends = [ deepseq ];
|
||||
meta = {
|
||||
homepage = "http://hunit.sourceforge.net/";
|
||||
description = "A unit testing framework for Haskell";
|
||||
license = self.stdenv.lib.licenses.bsd3;
|
||||
platforms = self.ghc.meta.platforms;
|
||||
maintainers = [ self.stdenv.lib.maintainers.andres ];
|
||||
};
|
||||
})
|
||||
@ -2,8 +2,8 @@
|
||||
|
||||
cabal.mkDerivation (self: {
|
||||
pname = "Hipmunk";
|
||||
version = "5.2.0.9";
|
||||
sha256 = "0c0s5spsyp67ajfzck8f29px2xid8aiws12l3dswvp50d74a9mlq";
|
||||
version = "5.2.0.10";
|
||||
sha256 = "0kq6dlx1g7dra7nsfmrc13yvnl7wh00fadmgln9v2vyf0ww82x95";
|
||||
buildDepends = [ StateVar transformers ];
|
||||
meta = {
|
||||
homepage = "http://patch-tag.com/r/felipe/hipmunk/home";
|
||||
|
||||
14
pkgs/development/libraries/haskell/IOSpec/default.nix
Normal file
14
pkgs/development/libraries/haskell/IOSpec/default.nix
Normal file
@ -0,0 +1,14 @@
|
||||
{ cabal, mtl, QuickCheck, Stream }:
|
||||
|
||||
cabal.mkDerivation (self: {
|
||||
pname = "IOSpec";
|
||||
version = "0.2.5";
|
||||
sha256 = "0r6vqg39h6vzwlb33cvk72k4mh6jd8rpdcnkqsfxdqmsk7h8x84j";
|
||||
buildDepends = [ mtl QuickCheck Stream ];
|
||||
meta = {
|
||||
description = "A pure specification of the IO monad";
|
||||
license = self.stdenv.lib.licenses.bsd3;
|
||||
platforms = self.ghc.meta.platforms;
|
||||
maintainers = [ self.stdenv.lib.maintainers.andres ];
|
||||
};
|
||||
})
|
||||
@ -5,6 +5,9 @@ cabal.mkDerivation (self: {
|
||||
version = "0.2.2.4";
|
||||
sha256 = "0cabjx0gkbk5blqkm9pmnz8kmi3573367365gny4r3m431iwxgnf";
|
||||
buildDepends = [ mtl time ];
|
||||
patchPhase = ''
|
||||
sed -i -e 's|base .*,|base,|' -e 's|mtl .*,|mtl,|' benchpress.cabal
|
||||
'';
|
||||
meta = {
|
||||
homepage = "http://github.com/tibbe/benchpress";
|
||||
description = "Micro-benchmarking with detailed statistics";
|
||||
|
||||
16
pkgs/development/libraries/haskell/brainfuck/default.nix
Normal file
16
pkgs/development/libraries/haskell/brainfuck/default.nix
Normal file
@ -0,0 +1,16 @@
|
||||
{ cabal, mtl }:
|
||||
|
||||
cabal.mkDerivation (self: {
|
||||
pname = "brainfuck";
|
||||
version = "0.1";
|
||||
sha256 = "0lsw62g4ir8idjjadsdf46p8mqd88mysn0b499bk3x5l5js858z3";
|
||||
isLibrary = true;
|
||||
isExecutable = true;
|
||||
buildDepends = [ mtl ];
|
||||
meta = {
|
||||
description = "Brainfuck interpreter";
|
||||
license = "GPL";
|
||||
platforms = self.ghc.meta.platforms;
|
||||
maintainers = [ self.stdenv.lib.maintainers.andres ];
|
||||
};
|
||||
})
|
||||
14
pkgs/development/libraries/haskell/data-inttrie/default.nix
Normal file
14
pkgs/development/libraries/haskell/data-inttrie/default.nix
Normal file
@ -0,0 +1,14 @@
|
||||
{ cabal }:
|
||||
|
||||
cabal.mkDerivation (self: {
|
||||
pname = "data-inttrie";
|
||||
version = "0.0.7";
|
||||
sha256 = "19d586p2pj38pirrkip9z6yxrdbpiqsbnczmnyvd8slndilqz0ip";
|
||||
meta = {
|
||||
homepage = "http://github.com/luqui/data-inttrie";
|
||||
description = "A lazy, infinite trie of integers";
|
||||
license = self.stdenv.lib.licenses.bsd3;
|
||||
platforms = self.ghc.meta.platforms;
|
||||
maintainers = [ self.stdenv.lib.maintainers.andres ];
|
||||
};
|
||||
})
|
||||
@ -0,0 +1,15 @@
|
||||
{ cabal, dataInttrie }:
|
||||
|
||||
cabal.mkDerivation (self: {
|
||||
pname = "data-memocombinators";
|
||||
version = "0.4.3";
|
||||
sha256 = "0mzvjgccm23y7mfaz9iwdy64amf69d7i8yq9fc9mjx1nyzxdrgsc";
|
||||
buildDepends = [ dataInttrie ];
|
||||
meta = {
|
||||
homepage = "http://github.com/luqui/data-memocombinators";
|
||||
description = "Combinators for building memo tables";
|
||||
license = self.stdenv.lib.licenses.bsd3;
|
||||
platforms = self.ghc.meta.platforms;
|
||||
maintainers = [ self.stdenv.lib.maintainers.andres ];
|
||||
};
|
||||
})
|
||||
@ -18,6 +18,9 @@ cabal.mkDerivation (self: {
|
||||
safe SHA syb tagsoup text time url utf8String xhtml xml xssSanitize
|
||||
zlib
|
||||
];
|
||||
patchPhase = ''
|
||||
sed -i -e 's|hslogger.*,|hslogger,|' gitit.cabal
|
||||
'';
|
||||
meta = {
|
||||
homepage = "http://gitit.net";
|
||||
description = "Wiki using happstack, git or darcs, and pandoc";
|
||||
|
||||
15
pkgs/development/libraries/haskell/glpk-hs/default.nix
Normal file
15
pkgs/development/libraries/haskell/glpk-hs/default.nix
Normal file
@ -0,0 +1,15 @@
|
||||
{ cabal, deepseq, glpk, mtl }:
|
||||
|
||||
cabal.mkDerivation (self: {
|
||||
pname = "glpk-hs";
|
||||
version = "0.3.2";
|
||||
sha256 = "0y7imgzcnh6x36m5f6mns5ay1xhxy5p6i5nh16p2ywzjj0padcg8";
|
||||
buildDepends = [ deepseq mtl ];
|
||||
extraLibraries = [ glpk ];
|
||||
meta = {
|
||||
description = "Comprehensive GLPK linear programming bindings";
|
||||
license = self.stdenv.lib.licenses.bsd3;
|
||||
platforms = self.ghc.meta.platforms;
|
||||
maintainers = [ self.stdenv.lib.maintainers.andres ];
|
||||
};
|
||||
})
|
||||
@ -2,8 +2,8 @@
|
||||
|
||||
cabal.mkDerivation (self: {
|
||||
pname = "hslogger-template";
|
||||
version = "2.0.0";
|
||||
sha256 = "1x8c132ckxjhnhlrnm92h0hkalkrgcc91cn73kv9kvcwy9b2fqcr";
|
||||
version = "2.0.1";
|
||||
sha256 = "1m8h4i8cxxw83vhbw61njvv86qdcff6zi3bf0nyhc4cq7pfrzqvj";
|
||||
buildDepends = [ hslogger mtl ];
|
||||
meta = {
|
||||
description = "Automatic generation of hslogger functions";
|
||||
|
||||
@ -0,0 +1,20 @@
|
||||
{ cabal, binary, haskellSrc, mtl, network, random, regexCompat
|
||||
, regexPosix, syb, tagsoup, utf8String, zlib
|
||||
}:
|
||||
|
||||
cabal.mkDerivation (self: {
|
||||
pname = "lambdabot-utils";
|
||||
version = "4.2.1";
|
||||
sha256 = "1a5rj8zjvfhziwldikgki92lg9bwv6h9ysp6yqip6lja18h4lilx";
|
||||
buildDepends = [
|
||||
binary haskellSrc mtl network random regexCompat regexPosix syb
|
||||
tagsoup utf8String zlib
|
||||
];
|
||||
meta = {
|
||||
homepage = "http://haskell.org/haskellwiki/Lambdabot";
|
||||
description = "Utility libraries for the advanced IRC bot, Lambdabot";
|
||||
license = "GPL";
|
||||
platforms = self.ghc.meta.platforms;
|
||||
maintainers = [ self.stdenv.lib.maintainers.andres ];
|
||||
};
|
||||
})
|
||||
27
pkgs/development/libraries/haskell/lambdabot/default.nix
Normal file
27
pkgs/development/libraries/haskell/lambdabot/default.nix
Normal file
@ -0,0 +1,27 @@
|
||||
{ cabal, arrows, binary, brainfuck, dataMemocombinators, filepath
|
||||
, haskellSrc, haskellSrcExts, HTTP, IOSpec, lambdabotUtils, logict
|
||||
, MonadRandom, mtl, network, numbers, oeis, parsec, random
|
||||
, readline, regexCompat, show, syb, tagsoup, unlambda, utf8String
|
||||
, vectorSpace
|
||||
}:
|
||||
|
||||
cabal.mkDerivation (self: {
|
||||
pname = "lambdabot";
|
||||
version = "4.2.3.3";
|
||||
sha256 = "1fxxmrm390pnqpf7v4kap2asaqh02sphl8r6inq4sdy1zs2rxrvk";
|
||||
isLibrary = true;
|
||||
isExecutable = true;
|
||||
buildDepends = [
|
||||
arrows binary brainfuck dataMemocombinators filepath haskellSrc
|
||||
haskellSrcExts HTTP IOSpec lambdabotUtils logict MonadRandom mtl
|
||||
network numbers oeis parsec random readline regexCompat show syb
|
||||
tagsoup unlambda utf8String vectorSpace
|
||||
];
|
||||
meta = {
|
||||
homepage = "http://haskell.org/haskellwiki/Lambdabot";
|
||||
description = "Lambdabot is a development tool and advanced IRC bot";
|
||||
license = "GPL";
|
||||
platforms = self.ghc.meta.platforms;
|
||||
maintainers = [ self.stdenv.lib.maintainers.andres ];
|
||||
};
|
||||
})
|
||||
15
pkgs/development/libraries/haskell/logict/default.nix
Normal file
15
pkgs/development/libraries/haskell/logict/default.nix
Normal file
@ -0,0 +1,15 @@
|
||||
{ cabal, mtl }:
|
||||
|
||||
cabal.mkDerivation (self: {
|
||||
pname = "logict";
|
||||
version = "0.5.0.1";
|
||||
sha256 = "0k3acw6fwhqz4qaz7k85fx5b43hwc926il0mljc69gjrgw0c8nzv";
|
||||
buildDepends = [ mtl ];
|
||||
meta = {
|
||||
homepage = "http://code.haskell.org/~dolio/logict";
|
||||
description = "A backtracking logic-programming monad";
|
||||
license = self.stdenv.lib.licenses.bsd3;
|
||||
platforms = self.ghc.meta.platforms;
|
||||
maintainers = [ self.stdenv.lib.maintainers.andres ];
|
||||
};
|
||||
})
|
||||
14
pkgs/development/libraries/haskell/numbers/default.nix
Normal file
14
pkgs/development/libraries/haskell/numbers/default.nix
Normal file
@ -0,0 +1,14 @@
|
||||
{ cabal }:
|
||||
|
||||
cabal.mkDerivation (self: {
|
||||
pname = "numbers";
|
||||
version = "3000.0.0.0";
|
||||
sha256 = "073xjrnbv6z16va2h3arlxq3z8kywb961dwh4jcm8g7w5m84b2xb";
|
||||
meta = {
|
||||
homepage = "https://github.com/DanBurton/numbers";
|
||||
description = "Various number types";
|
||||
license = self.stdenv.lib.licenses.bsd3;
|
||||
platforms = self.ghc.meta.platforms;
|
||||
maintainers = [ self.stdenv.lib.maintainers.andres ];
|
||||
};
|
||||
})
|
||||
14
pkgs/development/libraries/haskell/oeis/default.nix
Normal file
14
pkgs/development/libraries/haskell/oeis/default.nix
Normal file
@ -0,0 +1,14 @@
|
||||
{ cabal, HTTP, network }:
|
||||
|
||||
cabal.mkDerivation (self: {
|
||||
pname = "oeis";
|
||||
version = "0.3.1";
|
||||
sha256 = "0kxs25b1z0b807vhrn8v7chsdsw8civqiym8767fy2rk5si0i4w2";
|
||||
buildDepends = [ HTTP network ];
|
||||
meta = {
|
||||
description = "Interface to the Online Encyclopedia of Integer Sequences";
|
||||
license = self.stdenv.lib.licenses.bsd3;
|
||||
platforms = self.ghc.meta.platforms;
|
||||
maintainers = [ self.stdenv.lib.maintainers.andres ];
|
||||
};
|
||||
})
|
||||
@ -0,0 +1,20 @@
|
||||
{ cabal, aeson, conduit, monadControl, persistent, postgresqlLibpq
|
||||
, postgresqlSimple, text, time, transformers
|
||||
}:
|
||||
|
||||
cabal.mkDerivation (self: {
|
||||
pname = "persistent-postgresql";
|
||||
version = "0.9.1";
|
||||
sha256 = "0kzw4lq4i6lj149aws4ca4z43jmwvcbjr5gf5lk0pwcmzp6chr32";
|
||||
buildDepends = [
|
||||
aeson conduit monadControl persistent postgresqlLibpq
|
||||
postgresqlSimple text time transformers
|
||||
];
|
||||
meta = {
|
||||
homepage = "http://www.yesodweb.com/book/persistent";
|
||||
description = "Backend for the persistent library using postgresql";
|
||||
license = self.stdenv.lib.licenses.mit;
|
||||
platforms = self.ghc.meta.platforms;
|
||||
maintainers = [ self.stdenv.lib.maintainers.andres ];
|
||||
};
|
||||
})
|
||||
@ -0,0 +1,15 @@
|
||||
{ cabal, postgresql }:
|
||||
|
||||
cabal.mkDerivation (self: {
|
||||
pname = "postgresql-libpq";
|
||||
version = "0.8.2";
|
||||
sha256 = "10i3yc5fxlmnrb8j9p2a9w7h49p3ain36qpshlb34chdk9xh3l7g";
|
||||
extraLibraries = [ postgresql ];
|
||||
meta = {
|
||||
homepage = "http://github.com/lpsmith/postgresql-libpq";
|
||||
description = "low-level binding to libpq";
|
||||
license = self.stdenv.lib.licenses.bsd3;
|
||||
platforms = self.ghc.meta.platforms;
|
||||
maintainers = [ self.stdenv.lib.maintainers.andres ];
|
||||
};
|
||||
})
|
||||
@ -0,0 +1,19 @@
|
||||
{ cabal, attoparsec, blazeBuilder, blazeTextual, postgresqlLibpq
|
||||
, text, time, transformers, vector
|
||||
}:
|
||||
|
||||
cabal.mkDerivation (self: {
|
||||
pname = "postgresql-simple";
|
||||
version = "0.1.4.3";
|
||||
sha256 = "0q0mkkd22hji7ns25i86shy1504d0d4mc3fqljpfffm6m36855kc";
|
||||
buildDepends = [
|
||||
attoparsec blazeBuilder blazeTextual postgresqlLibpq text time
|
||||
transformers vector
|
||||
];
|
||||
meta = {
|
||||
description = "Mid-Level PostgreSQL client library";
|
||||
license = self.stdenv.lib.licenses.bsd3;
|
||||
platforms = self.ghc.meta.platforms;
|
||||
maintainers = [ self.stdenv.lib.maintainers.andres ];
|
||||
};
|
||||
})
|
||||
14
pkgs/development/libraries/haskell/show/default.nix
Normal file
14
pkgs/development/libraries/haskell/show/default.nix
Normal file
@ -0,0 +1,14 @@
|
||||
{ cabal, QuickCheck, random, smallcheck, syb }:
|
||||
|
||||
cabal.mkDerivation (self: {
|
||||
pname = "show";
|
||||
version = "0.4.1.2";
|
||||
sha256 = "1qaphxjaxng7d0kcn3vvxbvqljzzs1hvmsrdsm3pbi19qlsavd5w";
|
||||
buildDepends = [ QuickCheck random smallcheck syb ];
|
||||
meta = {
|
||||
description = "'Show' instances for Lambdabot";
|
||||
license = "GPL";
|
||||
platforms = self.ghc.meta.platforms;
|
||||
maintainers = [ self.stdenv.lib.maintainers.andres ];
|
||||
};
|
||||
})
|
||||
@ -2,8 +2,8 @@
|
||||
|
||||
cabal.mkDerivation (self: {
|
||||
pname = "simple-sendfile";
|
||||
version = "0.2.4";
|
||||
sha256 = "1c7imvkb5aq5mlg6a1r36fp9klniicbj56n32yvzj4qqf1zy2pbx";
|
||||
version = "0.2.5";
|
||||
sha256 = "1g9plryh86lc03rf1s8m36wyc2yqp4y6f02viq9c4g1k85rkbs53";
|
||||
buildDepends = [ network ];
|
||||
meta = {
|
||||
description = "Cross platform library for the sendfile system call";
|
||||
|
||||
16
pkgs/development/libraries/haskell/unlambda/default.nix
Normal file
16
pkgs/development/libraries/haskell/unlambda/default.nix
Normal file
@ -0,0 +1,16 @@
|
||||
{ cabal, mtl }:
|
||||
|
||||
cabal.mkDerivation (self: {
|
||||
pname = "unlambda";
|
||||
version = "0.1";
|
||||
sha256 = "0xmn5w5vza6z2i3fs2hv2jgmb1lyk918viknsx3lk36i1dbyivgi";
|
||||
isLibrary = true;
|
||||
isExecutable = true;
|
||||
buildDepends = [ mtl ];
|
||||
meta = {
|
||||
description = "Unlambda interpreter";
|
||||
license = "GPL";
|
||||
platforms = self.ghc.meta.platforms;
|
||||
maintainers = [ self.stdenv.lib.maintainers.andres ];
|
||||
};
|
||||
})
|
||||
21
pkgs/development/libraries/silgraphite/default.nix
Normal file
21
pkgs/development/libraries/silgraphite/default.nix
Normal file
@ -0,0 +1,21 @@
|
||||
{ stdenv, fetchurl, pkgconfig, freetype, libXft, pango, fontconfig }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
version = "2.3.1";
|
||||
name = "silgraphite-2.3.1";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://sourceforge/silgraphite/silgraphite/${version}/${name}.tar.gz";
|
||||
sha256 = "9b07c6e91108b1fa87411af4a57e25522784cfea0deb79b34ced608444f2ed65";
|
||||
};
|
||||
|
||||
buildInputs = [pkgconfig freetype libXft pango fontconfig];
|
||||
|
||||
NIX_CFLAGS_COMPILE = "-I${freetype}/include/freetype2";
|
||||
|
||||
meta = {
|
||||
description = "An advanced font engine";
|
||||
maintainers = [ stdenv.lib.maintainers.raskin ];
|
||||
platforms = stdenv.lib.platforms.linux;
|
||||
};
|
||||
}
|
||||
41
pkgs/development/libraries/tbb/default.nix
Normal file
41
pkgs/development/libraries/tbb/default.nix
Normal file
@ -0,0 +1,41 @@
|
||||
{ stdenv, fetchurl }:
|
||||
|
||||
stdenv.mkDerivation {
|
||||
name = "tbb-4.0-u5";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://threadingbuildingblocks.org/uploads/77/187/4.0%20update%205/tbb40_20120613oss_src.tgz";
|
||||
sha256 = "aaa98146049e55f6ac969298340eeb49df61395403fcc1480824a4ecd0d46192";
|
||||
};
|
||||
|
||||
checkTarget = "test";
|
||||
doCheck = false;
|
||||
|
||||
installPhase = ''
|
||||
mkdir -p $out/{lib,share/doc}
|
||||
cp "build/"*release*"/"*so* $out/lib/
|
||||
mv include $out/
|
||||
rm $out/include/index.html
|
||||
mv doc/html $out/share/doc/tbb
|
||||
'';
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
meta = {
|
||||
homepage = "http://threadingbuildingblocks.org/";
|
||||
description = "Intel Thread Building Blocks C++ Library";
|
||||
license = "LGPLv3+";
|
||||
|
||||
longDescription = ''
|
||||
Intel Threading Building Blocks offers a rich and complete approach to
|
||||
expressing parallelism in a C++ program. It is a library that helps you
|
||||
take advantage of multi-core processor performance without having to be a
|
||||
threading expert. Intel TBB is not just a threads-replacement library. It
|
||||
represents a higher-level, task-based parallelism that abstracts platform
|
||||
details and threading mechanisms for scalability and performance.
|
||||
'';
|
||||
|
||||
maintainers = [ stdenv.lib.maintainers.simons ];
|
||||
platforms = stdenv.lib.platforms.linux;
|
||||
};
|
||||
}
|
||||
@ -2,8 +2,8 @@
|
||||
|
||||
cabal.mkDerivation (self: {
|
||||
pname = "BNFC";
|
||||
version = "2.4.2.0";
|
||||
sha256 = "0nnalzsql1k5y3s93g5y2hy2gcdsrbi8r7cwzmdcy4vyy589pin0";
|
||||
version = "2.4.2.1";
|
||||
sha256 = "0a6ic9mqkxk2gql7dzik2bhm5iikgx035wxlz8iafxf45159dl14";
|
||||
isLibrary = false;
|
||||
isExecutable = true;
|
||||
buildDepends = [ mtl ];
|
||||
|
||||
@ -2,8 +2,8 @@
|
||||
|
||||
cabal.mkDerivation (self: {
|
||||
pname = "hslogger";
|
||||
version = "1.1.5";
|
||||
sha256 = "0lk966csxxyjjdg5jg4pzzl5118zj8ms78vn1n9imb7f4vcs8vk7";
|
||||
version = "1.2.0";
|
||||
sha256 = "17ipnz7zd403x2gi2086chrgcnk76304hdxr5mv4phg4rm8w226y";
|
||||
isLibrary = true;
|
||||
isExecutable = true;
|
||||
buildDepends = [ mtl network time ];
|
||||
|
||||
@ -23,6 +23,7 @@
|
||||
marcweber = "Marc Weber <marco-oweber@gmx.de>";
|
||||
mornfall = "Petr Ročkai <me@mornfall.net>";
|
||||
neznalek = "Vladimír Čunát <vcunat@gmail.com>";
|
||||
page = "Carles Pagès <page@cubata.homelinux.net>";
|
||||
phreedom = "Evgeny Egorochkin <phreedom.stdin@gmail.com>";
|
||||
pierron = "Nicolas B. Pierron <nixos@nbp.name>";
|
||||
piotr = "Piotr Pietraszkiewicz <ppietrasa@gmail.com>";
|
||||
|
||||
@ -158,14 +158,15 @@ rec {
|
||||
(tail x))))) condList)) ;
|
||||
|
||||
|
||||
# !!! This function has O(n^2) performance, so you probably don't want to use it!
|
||||
uniqList = {inputList, outputList ? []}:
|
||||
if (inputList == []) then outputList else
|
||||
let x=head inputList;
|
||||
newOutputList = outputList ++
|
||||
(if elem x outputList then [] else [x]);
|
||||
in uniqList {outputList=newOutputList;
|
||||
inputList = (tail inputList);};
|
||||
# This function has O(n^2) performance.
|
||||
uniqList = {inputList, acc ? []} :
|
||||
let go = xs : acc :
|
||||
if xs == []
|
||||
then []
|
||||
else let x = head xs;
|
||||
y = if elem x acc then [] else [x];
|
||||
in y ++ go (tail xs) (y ++ acc);
|
||||
in go inputList acc;
|
||||
|
||||
uniqListExt = {inputList, outputList ? [],
|
||||
getter ? (x : x), compare ? (x: y: x==y)}:
|
||||
@ -214,16 +215,22 @@ rec {
|
||||
modifySumArgs = f: x: innerModifySumArgs f x {};
|
||||
|
||||
|
||||
innerClosePropagation = ready: list: if list == [] then ready else
|
||||
if ! isAttrs (head list) then
|
||||
/* builtins.trace ("not an attrSet: ${lib.showVal (head list)}") */
|
||||
innerClosePropagation ready (tail list)
|
||||
else
|
||||
innerClosePropagation
|
||||
(ready ++ [(head list)])
|
||||
((tail list)
|
||||
++ (maybeAttrNullable "propagatedBuildInputs" [] (head list))
|
||||
++ (maybeAttrNullable "propagatedBuildNativeInputs" [] (head list)));
|
||||
innerClosePropagation = acc : xs :
|
||||
if xs == []
|
||||
then acc
|
||||
else let y = head xs;
|
||||
ys = tail xs;
|
||||
in if ! isAttrs y
|
||||
then innerClosePropagation acc ys
|
||||
else let acc' = [y] ++ acc;
|
||||
in innerClosePropagation
|
||||
acc'
|
||||
(uniqList { inputList = (maybeAttrNullable "propagatedBuildInputs" [] y)
|
||||
++ (maybeAttrNullable "propagatedBuildNativeInputs" [] y)
|
||||
++ ys;
|
||||
acc = acc';
|
||||
}
|
||||
);
|
||||
|
||||
closePropagation = list: (uniqList {inputList = (innerClosePropagation [] list);});
|
||||
|
||||
|
||||
@ -1,16 +1,15 @@
|
||||
{ stdenv, fetchurl, pkgconfig, bc, perl, pam
|
||||
, libXext, libXScrnSaver, libX11, libXrandr, libXmu, libXxf86vm, libXrender
|
||||
, libXxf86misc
|
||||
, libjpeg, mesa, gtk, libxml2, libglade
|
||||
{ stdenv, fetchurl, pkgconfig, bc, perl, pam, libXext, libXScrnSaver, libX11
|
||||
, libXrandr, libXmu, libXxf86vm, libXrender, libXxf86misc, libjpeg, mesa, gtk
|
||||
, libxml2, libglade
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
version = "5.15";
|
||||
version = "5.18";
|
||||
name = "xscreensaver-${version}";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://www.jwz.org/xscreensaver/${name}.tar.gz";
|
||||
sha256 = "4f6d1f1e4c15dbb74e2296f8fe57a73d47d602515178c248bbc838f779d5082d";
|
||||
sha256 = "3d70edb8f46511f5427f21b4ba4d8323f336888f60268d16731f5231c6883db9";
|
||||
};
|
||||
|
||||
buildInputs =
|
||||
@ -19,6 +18,16 @@ stdenv.mkDerivation rec {
|
||||
libXxf86misc
|
||||
];
|
||||
|
||||
patchPhase =
|
||||
''
|
||||
# Fix build error in version 5.18. Remove this patch when updating
|
||||
# to a later version.
|
||||
sed -i -e '/AF_LINK/d' hacks/glx/sonar-icmp.c
|
||||
# Fix path to GTK.
|
||||
sed -e 's%@GTK_DATADIR@%@datadir@% ; s%@PO_DATADIR@%@datadir@%' \
|
||||
-i driver/Makefile.in po/Makefile.in.in
|
||||
'';
|
||||
|
||||
configureFlags =
|
||||
[ "--with-gl" "--with-pam" "--with-pixbuf" "--with-proc-interrupts"
|
||||
"--with-dpms-ext" "--with-randr-ext" "--with-xinerama-ext"
|
||||
@ -27,12 +36,6 @@ stdenv.mkDerivation rec {
|
||||
"--with-x-app-defaults=\${out}/share/xscreensaver/app-defaults"
|
||||
];
|
||||
|
||||
preConfigure =
|
||||
''
|
||||
sed -e 's%@GTK_DATADIR@%@datadir@% ; s%@PO_DATADIR@%@datadir@%' \
|
||||
-i driver/Makefile.in po/Makefile.in.in
|
||||
'';
|
||||
|
||||
meta = {
|
||||
homepage = "http://www.jwz.org/xscreensaver/";
|
||||
description = "A set of screensavers";
|
||||
|
||||
@ -1,33 +1,26 @@
|
||||
a :
|
||||
let
|
||||
s = import ./src-for-default.nix;
|
||||
buildInputs = with a; [
|
||||
devicemapper
|
||||
];
|
||||
in
|
||||
rec {
|
||||
src = a.fetchUrlFromSrcInfo s;
|
||||
{ stdenv, fetchurl, devicemapper }:
|
||||
|
||||
inherit (s) name;
|
||||
inherit buildInputs;
|
||||
configureFlags = [];
|
||||
stdenv.mkDerivation rec {
|
||||
name = "dmraid-1.0.0.rc15";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://people.redhat.com/~heinzm/sw/dmraid/src/old/${name}.tar.bz2";
|
||||
sha256 = "01bcaq0sc329ghgj7f182xws7jgjpdc41bvris8fsiprnxc7511h";
|
||||
};
|
||||
|
||||
preConfigure = "cd */";
|
||||
|
||||
buildInputs = [ devicemapper ];
|
||||
|
||||
/* doConfigure should be removed if not needed */
|
||||
phaseNames = ["doConfigure" "doMakeInstall"];
|
||||
goSrcDir = "cd */";
|
||||
|
||||
meta = {
|
||||
description = "Old-style RAID configuration utility.";
|
||||
description = "Old-style RAID configuration utility";
|
||||
longDescritipn = ''
|
||||
Old RAID configuration utility (still under development, though).
|
||||
It is fully compatible with modern kernels and mdadm recognizes
|
||||
its volumes. May be needed for rescuing an older system or nuking
|
||||
the metadata when reformatting.
|
||||
'';
|
||||
maintainers = [
|
||||
a.lib.maintainers.raskin
|
||||
];
|
||||
platforms = with a.lib.platforms;
|
||||
linux;
|
||||
maintainers = [ stdenv.lib.maintainers.raskin ];
|
||||
platforms = stdenv.lib.platforms.linux;
|
||||
};
|
||||
}
|
||||
|
||||
@ -1,9 +0,0 @@
|
||||
rec {
|
||||
version="1.0.0.rc15";
|
||||
name="dmraid-1.0.0.rc15";
|
||||
hash="01bcaq0sc329ghgj7f182xws7jgjpdc41bvris8fsiprnxc7511h";
|
||||
url="http://people.redhat.com/~heinzm/sw/dmraid/src/old/dmraid-${version}.tar.bz2";
|
||||
advertisedUrl="http://people.redhat.com/~heinzm/sw/dmraid/src/old/dmraid-1.0.0.rc15.tar.bz2";
|
||||
|
||||
|
||||
}
|
||||
@ -1,6 +0,0 @@
|
||||
{
|
||||
downloadPage = "http://people.redhat.com/~heinzm/sw/dmraid/src/old/?C=M;O=D";
|
||||
baseName = "dmraid";
|
||||
sourceRegexp = "^.*[.]tar[.]bz2\$";
|
||||
versionExtractorSedScript = ''s/.*-(.*)[.]tar[.]bz2/\1/'';
|
||||
}
|
||||
@ -26,6 +26,8 @@ stdenv.mkDerivation rec {
|
||||
scons PREFIX=$out LIBDIR=$out/lib SHAREDIR=$out/share/libffado \
|
||||
PYPKGDIR=$out/$PYLIBSUFFIX install
|
||||
|
||||
sed -e "s#/usr/local#$out#g" -i $out/bin/ffado-diag
|
||||
|
||||
PYDIR=$out/$PYLIBSUFFIX
|
||||
wrapProgram $out/bin/ffado-mixer --prefix PYTHONPATH : \
|
||||
$PYTHONPATH:$PYDIR:${pyqt4}/$LIBSUFFIX:${pythonDBus}/$LIBSUFFIX:
|
||||
|
||||
@ -237,7 +237,7 @@ in
|
||||
import ./generic.nix (
|
||||
|
||||
rec {
|
||||
version = "3.2.22";
|
||||
version = "3.2.23";
|
||||
testing = false;
|
||||
|
||||
modDirVersion = version;
|
||||
@ -248,7 +248,7 @@ import ./generic.nix (
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://kernel/linux/kernel/v3.0/${if testing then "testing/" else ""}linux-${version}.tar.xz";
|
||||
sha256 = "1nf3ph06p743jjxfgwwcy8156mx4fi1cy7zi7hc1gz5bq4c0k8mw";
|
||||
sha256 = "1fmxr9qdz239aqf63j1648rvfngysqqk8qzwb1wjsn5hzrahsxmw";
|
||||
};
|
||||
|
||||
config = configWithPlatform stdenv.platform;
|
||||
|
||||
@ -239,7 +239,7 @@ in
|
||||
import ./generic.nix (
|
||||
|
||||
rec {
|
||||
version = "3.4.4";
|
||||
version = "3.4.5";
|
||||
testing = false;
|
||||
|
||||
preConfigure = ''
|
||||
@ -248,7 +248,7 @@ import ./generic.nix (
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://kernel/linux/kernel/v3.x/${if testing then "testing/" else ""}linux-${version}.tar.xz";
|
||||
sha256 = "0l4h7amhsmgpnii8rgwi32nd7ajsifk2xckjd39pfzwdifacw5yw";
|
||||
sha256 = "17m58d2mc2mgr49hlwhic03s0z1mjyp7lhfvfmpqi3qszrz3xij3";
|
||||
};
|
||||
|
||||
config = configWithPlatform stdenv.platform;
|
||||
|
||||
30
pkgs/os-specific/linux/xf86-video-nested/default.nix
Normal file
30
pkgs/os-specific/linux/xf86-video-nested/default.nix
Normal file
@ -0,0 +1,30 @@
|
||||
{ stdenv, fetchgit, autoconf, automake, fontsproto, libX11, libXext
|
||||
, libtool, pkgconfig, renderproto, utilmacros, xorgserver
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation {
|
||||
name = "xf86-video-nested-2011-09-12";
|
||||
|
||||
# Breaks at 8d80f2e415e9e58ca481fe52ae8f2290e25de898 for Xorg 7.6
|
||||
src = fetchgit {
|
||||
url = git://anongit.freedesktop.org/xorg/driver/xf86-video-nested;
|
||||
rev = "fceee1716625badf698ca27dd5788a4deb8533bc";
|
||||
sha256 = "6b3544ddcf40602364fd0e528f6e677c37ef8d08f6c4e756caea7e29abf200f7";
|
||||
};
|
||||
|
||||
# Fixed in e123277d10337a1c3b853118df0d1becdddf3b77
|
||||
patchPhase = "sed -e 's/Werror/Werror -Wno-extra-portability/g' -i configure.ac";
|
||||
|
||||
buildInputs =
|
||||
[ autoconf automake fontsproto libX11 libXext libtool pkgconfig
|
||||
renderproto utilmacros xorgserver
|
||||
];
|
||||
|
||||
configureScript = "./autogen.sh";
|
||||
|
||||
meta = {
|
||||
homepage = git://anongit.freedesktop.org/xorg/driver/xf86-video-nested;
|
||||
description = "Driver to run Xorg on top of Xorg or something else";
|
||||
maintainers = [ stdenv.lib.maintainers.goibhniu ];
|
||||
};
|
||||
}
|
||||
@ -1,17 +1,19 @@
|
||||
{stdenv, fetchurl, pkgconfig, python, pyrex, pygtk, xlibs, gtk, makeWrapper}:
|
||||
{ stdenv, fetchurl, pkgconfig, python, cython
|
||||
, pygtk, pygobject, pycairo, notify, xlibs, gtk
|
||||
, ffmpeg, x264, libvpx, makeWrapper}:
|
||||
|
||||
stdenv.mkDerivation {
|
||||
name = "xpra-0.0.3";
|
||||
stdenv.mkDerivation rec {
|
||||
name = "xpra-0.3.2";
|
||||
|
||||
src = fetchurl {
|
||||
url = http://partiwm.org/static/downloads/parti-all-0.0.3.tar.gz;
|
||||
sha256 = "17inksd4cc7mba2vfs17gz1yk3h6x6wf06pm3hcbs5scq8rr5bkp";
|
||||
url = http://xpra.org/src/xpra-0.3.2.tar.bz2;
|
||||
sha256 = "1s1z6r0r78qvf59ci3vxammjz7lj5m64jyk0bfn7yxd5jl3sy41y";
|
||||
};
|
||||
|
||||
#src = /home/eelco/Dev/nixpkgs/parti-all-0.0.3;
|
||||
buildNativeInputs = [ cython ];
|
||||
|
||||
buildInputs = [
|
||||
pkgconfig python pyrex pygtk gtk makeWrapper
|
||||
pkgconfig python pygtk gtk ffmpeg x264 libvpx makeWrapper
|
||||
xlibs.inputproto xlibs.libXcomposite xlibs.libXdamage xlibs.libXtst
|
||||
];
|
||||
|
||||
@ -21,19 +23,26 @@ stdenv.mkDerivation {
|
||||
./do-build
|
||||
'';
|
||||
|
||||
pythonPaths = [
|
||||
"$out/lib/python"
|
||||
"$(toPythonPath ${pygtk})/gtk-2.0"
|
||||
] ++ map (i: "$(toPythonPath ${i})") [
|
||||
pygobject pycairo notify
|
||||
];
|
||||
|
||||
installPhase = ''
|
||||
mkdir -p $out
|
||||
cp -r install/* $out
|
||||
|
||||
for i in $(cd $out/bin && ls); do
|
||||
wrapProgram $out/bin/$i \
|
||||
--set PYTHONPATH "$out/lib/python:$(toPythonPath ${pygtk})/gtk-2.0:$PYTHONPATH" \
|
||||
--set PYTHONPATH "${stdenv.lib.concatStringsSep ":" pythonPaths}" \
|
||||
--prefix PATH : "${xlibs.xauth}/bin:${xlibs.xorgserver}/bin:${xlibs.xmodmap}/bin"
|
||||
done
|
||||
'';
|
||||
|
||||
meta = {
|
||||
homepage = http://partiwm.org/wiki/xpra;
|
||||
homepage = http://xpra.org/;
|
||||
description = "Persistent remote applications for X";
|
||||
};
|
||||
}
|
||||
|
||||
@ -1,45 +1,24 @@
|
||||
a :
|
||||
let
|
||||
fetchurl = a.fetchurl;
|
||||
fetchgit = a.fetchgit;
|
||||
{ stdenv, fetchgit, zlib, libuuid, acl, attr, e2fsprogs }:
|
||||
|
||||
version = a.lib.attrByPath ["version"] "0.19-20120328" a;
|
||||
buildInputs = with a; [
|
||||
zlib libuuid acl attr e2fsprogs
|
||||
];
|
||||
in
|
||||
let version = "0.19-20120328"; in
|
||||
|
||||
assert a.libuuid != null;
|
||||
stdenv.mkDerivation {
|
||||
name = "btrfs-progs-${version}";
|
||||
|
||||
rec {
|
||||
srcDrv = fetchgit {
|
||||
url="git://git.kernel.org/pub/scm/linux/kernel/git/mason/btrfs-progs.git" ;
|
||||
rev="1957076ab4fefa47b6efed3da541bc974c83eed7";
|
||||
sha256="566d863c5500652e999d0d6b823365fb06f2f8f9523e65e69eaa3e993e9b26e1";
|
||||
src = fetchgit {
|
||||
url = "git://git.kernel.org/pub/scm/linux/kernel/git/mason/btrfs-progs.git";
|
||||
rev = "1957076ab4fefa47b6efed3da541bc974c83eed7";
|
||||
sha256 = "566d863c5500652e999d0d6b823365fb06f2f8f9523e65e69eaa3e993e9b26e1";
|
||||
};
|
||||
|
||||
src = srcDrv + "/";
|
||||
buildInputs = [ zlib libuuid acl attr e2fsprogs ];
|
||||
|
||||
inherit buildInputs;
|
||||
configureFlags = [];
|
||||
makeFlags = ["prefix=$out CFLAGS=-Os"];
|
||||
makeFlags = "prefix=$(out)";
|
||||
|
||||
patches = [];
|
||||
phaseNames = ["fixMakefile" "doEnsureBtrfsImage" "doMakeInstall"];
|
||||
|
||||
fixMakefile = a.fullDepEntry ''
|
||||
sed -e 's@^progs = @progs=@g' -i Makefile
|
||||
'' ["minInit" "doUnpack"];
|
||||
|
||||
doEnsureBtrfsImage = a.fullDepEntry (''
|
||||
if ! grep 'progs = ' Makefile | grep btrfs-image; then
|
||||
sed -e 's/progs = \(.*\)\\/progs = \1btrfs-image \\/' -i Makefile
|
||||
fi
|
||||
'') ["minInit" "doUnpack"];
|
||||
|
||||
name = "btrfs-progs-" + version;
|
||||
meta = {
|
||||
description = "BTRFS utilities";
|
||||
maintainers = [a.lib.maintainers.raskin];
|
||||
description = "Utilities for the btrfs filesystem";
|
||||
homepage = https://btrfs.wiki.kernel.org/;
|
||||
maintainers = [ stdenv.lib.maintainers.raskin ];
|
||||
platforms = stdenv.lib.platforms.linux;
|
||||
};
|
||||
}
|
||||
|
||||
31
pkgs/tools/networking/trickle/default.nix
Normal file
31
pkgs/tools/networking/trickle/default.nix
Normal file
@ -0,0 +1,31 @@
|
||||
{ stdenv, fetchurl, libevent }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "trickle-1.07";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://monkey.org/~marius/trickle/${name}.tar.gz";
|
||||
sha256 = "0s1qq3k5mpcs9i7ng0l9fvr1f75abpbzfi1jaf3zpzbs1dz50dlx";
|
||||
};
|
||||
|
||||
buildInputs = [libevent];
|
||||
|
||||
preConfigure = ''
|
||||
sed -i 's|libevent.a|libevent.so|' configure
|
||||
'';
|
||||
|
||||
preBuild = ''
|
||||
sed -i '/#define in_addr_t/ s:^://:' config.h
|
||||
'';
|
||||
|
||||
LDFLAGS = "-levent";
|
||||
|
||||
configureFlags = "--with-libevent";
|
||||
|
||||
meta = {
|
||||
description = "Trickle, a portable lightweight userspace bandwidth shaper.";
|
||||
license = "BSD";
|
||||
homepage = http://monkey.org/~marius/pages/?page=trickle;
|
||||
platforms = stdenv.lib.platforms.linux;
|
||||
};
|
||||
}
|
||||
@ -5,11 +5,11 @@
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "nix-1.0";
|
||||
name = "nix-1.1";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://hydra.nixos.org/build/2609700/download/4/${name}.tar.bz2";
|
||||
sha256 = "27f1d4d2a5fb1951bfc9e706c0894a961aed1afe0d095e16eb8fbef94ee7ec17";
|
||||
url = "http://hydra.nixos.org/build/2860022/download/4/${name}.tar.bz2";
|
||||
sha256 = "edb2fc444eda49be144ca2901f1fc9472cd24896775ba02556ded5705863d324";
|
||||
};
|
||||
|
||||
buildNativeInputs = [ perl pkgconfig ];
|
||||
@ -53,6 +53,7 @@ stdenv.mkDerivation rec {
|
||||
'' + stdenv.lib.optionalString (
|
||||
stdenv.cross ? nix && stdenv.cross.nix ? system
|
||||
) ''--with-system=${stdenv.cross.nix.system}'';
|
||||
|
||||
doInstallCheck = false;
|
||||
};
|
||||
|
||||
|
||||
@ -5,11 +5,11 @@
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "nix-1.1pre2723_1aba0bf";
|
||||
name = "nix-1.1pre2749_ccc52ad";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://hydra.nixos.org/build/2746466/download/4/${name}.tar.bz2";
|
||||
sha256 = "06224ecbde09124eea25bfcafcb06637457bc6ac9a9e332d84e9eaf561599160";
|
||||
url = "http://hydra.nixos.org/build/2841643/download/4/${name}.tar.bz2";
|
||||
sha256 = "eae2135dd70d2734080ee644a597e131f60e71991dbabdabf67ab0818ff1f6fc";
|
||||
};
|
||||
|
||||
buildNativeInputs = [ perl pkgconfig ];
|
||||
@ -53,6 +53,7 @@ stdenv.mkDerivation rec {
|
||||
'' + stdenv.lib.optionalString (
|
||||
stdenv.cross ? nix && stdenv.cross.nix ? system
|
||||
) ''--with-system=${stdenv.cross.nix.system}'';
|
||||
|
||||
doInstallCheck = false;
|
||||
};
|
||||
|
||||
|
||||
@ -54,5 +54,7 @@ stdenv.mkDerivation rec {
|
||||
license = "GPLv3+";
|
||||
|
||||
maintainers = with stdenv.lib.maintainers; [ ludo urkud ];
|
||||
|
||||
platforms = stdenv.lib.platforms.all;
|
||||
};
|
||||
}
|
||||
|
||||
@ -18,10 +18,6 @@ cabal.mkDerivation (self: {
|
||||
description = "Preprocessor for typesetting Haskell sources with LaTeX";
|
||||
license = "GPL";
|
||||
platforms = self.ghc.meta.platforms;
|
||||
maintainers = [
|
||||
self.stdenv.lib.maintainers.andres
|
||||
self.stdenv.lib.maintainers.simons
|
||||
];
|
||||
maintainers = [ self.stdenv.lib.maintainers.andres ];
|
||||
};
|
||||
})
|
||||
|
||||
|
||||
@ -46,13 +46,14 @@ rec {
|
||||
|
||||
rm $out/texmf*/ls-R
|
||||
for i in web2c texconfig fonts/map; do
|
||||
cp -r $out/texmf/$i/* $out/texmf-config/$i || true
|
||||
cp -Lr $out/texmf/$i/* $out/texmf-config/$i || true
|
||||
done
|
||||
chmod -R u+w $out/texmf-config
|
||||
|
||||
TEXMFCONFIG=$out/texmf-config HOME=$PWD PATH=$PATH:$out/bin updmap --syncwithtrees
|
||||
PATH=$PATH:$out/bin mktexlsr $out/texmf*
|
||||
TEXMFCONFIG=$out/texmf-config HOME=$PWD PATH=$PATH:$out/bin updmap --syncwithtrees
|
||||
PATH=$PATH:$out/bin mktexlsr $out/texmf*
|
||||
yes | TEXMFCONFIG=$out/texmf-config HOME=$PWD PATH=$PATH:$out/bin updmap --syncwithtrees
|
||||
yes | PATH=$PATH:$out/bin mktexlsr $out/texmf*
|
||||
yes | TEXMFCONFIG=$out/texmf-config HOME=$PWD PATH=$PATH:$out/bin updmap --syncwithtrees
|
||||
yes | PATH=$PATH:$out/bin mktexlsr $out/texmf*
|
||||
'') ["minInit" "defEnsureDir" "addInputs"];
|
||||
|
||||
meta = {
|
||||
|
||||
@ -1,18 +1,18 @@
|
||||
args : with args;
|
||||
rec {
|
||||
src = fetchurl {
|
||||
url = mirror://debian/pool/main/t/texlive-bin/texlive-bin_2009.orig.tar.gz;
|
||||
sha256 = "0ywc8h4jnig53fs0bji2ivw5f9j6zlgdy477jqw7xvpc7migjpw7";
|
||||
url = mirror://debian/pool/main/t/texlive-bin/texlive-bin_2012.20120628.orig.tar.xz;
|
||||
sha256 = "0k94df3lfvghngzdzi2d4fz2z0gs8iglz7h3w2lxvlhiwwpmx601";
|
||||
};
|
||||
|
||||
texmfSrc = fetchurl {
|
||||
url = mirror://debian/pool/main/t/texlive-base/texlive-base_2009.orig.tar.gz;
|
||||
sha256 = "130z907xcxr10yrzbbmp9l8a00dabvi4bi702s5jxamjzav17cmf";
|
||||
url = mirror://debian/pool/main/t/texlive-base/texlive-base_2012.20120611.orig.tar.xz;
|
||||
sha256 = "116zm0qdq9rd4vakhd2py9q7lq3ihspc7hy33bh8wy5v1rgiqsm6";
|
||||
};
|
||||
|
||||
langTexmfSrc = fetchurl {
|
||||
url = mirror://debian/pool/main/t/texlive-lang/texlive-lang_2009.orig.tar.gz;
|
||||
sha256 = "10shnsc71n95zy9ys938pljdid9ampmc50k4lji9wv53hm14laic";
|
||||
url = mirror://debian/pool/main/t/texlive-lang/texlive-lang_2012.20120611.orig.tar.xz;
|
||||
sha256 = "0zh9svszfkbjx72i7sa9gg0gak93wf05845mxpjv56h8qwk4bffv";
|
||||
};
|
||||
|
||||
setupHook = ./setup-hook.sh;
|
||||
@ -44,15 +44,23 @@ rec {
|
||||
'') ["minInit" "doUnpack" "addInputs" "defEnsureDir"];
|
||||
|
||||
doPostInstall = fullDepEntry(''
|
||||
mv $out/bin $out/libexec
|
||||
mkdir -p $out/libexec/
|
||||
mv $out/bin $out/libexec/$(uname -m)
|
||||
mkdir -p $out/bin
|
||||
for i in "$out/libexec/"*"/"*; do
|
||||
test \( \! -d "$i" \) -a -x "$i" || continue
|
||||
echo -ne "#! $SHELL\\nexec $i \"\$@\"" >$out/bin/$(basename $i)
|
||||
chmod a+x $out/bin/$(basename $i)
|
||||
for i in "$out/libexec/"* "$out/libexec/"*/* ; do
|
||||
test \( \! -d "$i" \) -a \( -x "$i" -o -L "$i" \) || continue
|
||||
if [ -x "$i" ]; then
|
||||
echo -ne "#! $SHELL\\nexec $i \"\$@\"" >$out/bin/$(basename $i)
|
||||
chmod a+x $out/bin/$(basename $i)
|
||||
else
|
||||
mv "$i" "$out/libexec"
|
||||
ln -s "$(readlink -f "$out/libexec/$(basename "$i")")" "$out/bin/$(basename "$i")";
|
||||
ln -sf "$(readlink -f "$out/libexec/$(basename "$i")")" "$out/libexec/$(uname -m)/$(basename "$i")";
|
||||
rm "$out/libexec/$(basename "$i")"
|
||||
fi;
|
||||
done
|
||||
[ -d $out/texmf-config ] || ln -s $out/texmf $out/texmf-config
|
||||
ln -s "$out/"*texmf* "$out/share/"
|
||||
ln -s -v "$out/"*texmf* "$out/share/" || true
|
||||
|
||||
sed -e 's/.*pyhyph.*/=&/' -i $out/texmf-config/tex/generic/config/language.dat
|
||||
|
||||
@ -79,16 +87,20 @@ rec {
|
||||
zlib bzip2 ncurses libpng flex bison libX11 libICE
|
||||
xproto freetype t1lib gd libXaw icu ghostscript ed
|
||||
libXt libXpm libXmu libXext xextproto perl libSM
|
||||
ruby expat curl libjpeg python fontconfig
|
||||
ruby expat curl libjpeg python fontconfig xz
|
||||
pkgconfig poppler silgraphite lesstif zziplib
|
||||
];
|
||||
|
||||
configureFlags = [ "--with-x11"
|
||||
"--enable-ipc" "--with-mktexfmt"
|
||||
"--enable-ipc" "--with-mktexfmt" "--enable-shared"
|
||||
"--disable-native-texlive-build" "--with-system-zziplib"
|
||||
"--with-system-icu" "--with-system-libgs" "--with-system-t1lib"
|
||||
"--with-system-freetype2"
|
||||
];
|
||||
|
||||
phaseNames = ["addInputs" "doMainBuild" "doMakeInstall" "doPostInstall"];
|
||||
|
||||
name = "texlive-core-2009";
|
||||
name = "texlive-core-2012";
|
||||
meta = {
|
||||
description = "A TeX distribution";
|
||||
maintainers = [ args.lib.maintainers.raskin ];
|
||||
|
||||
@ -1,12 +1,12 @@
|
||||
args: with args;
|
||||
rec {
|
||||
name = "texlive-extra-2009";
|
||||
name = "texlive-extra-2012";
|
||||
src = fetchurl {
|
||||
url = mirror://debian/pool/main/t/texlive-extra/texlive-extra_2009.orig.tar.gz;
|
||||
sha256 = "04k48lxy76bad1270gb9k4aza2q13can2dbcf2hj0a3byls099kp";
|
||||
url = mirror://debian/pool/main/t/texlive-extra/texlive-extra_2012.20120611.orig.tar.xz;
|
||||
sha256 = "1wn2gwifb5ww6nb15zdbkk5yz5spynvwqscvrgxzb84p0z3hy8dq";
|
||||
};
|
||||
|
||||
buildInputs = [texLive];
|
||||
buildInputs = [texLive xz];
|
||||
phaseNames = ["doCopy"];
|
||||
doCopy = fullDepEntry (''
|
||||
mkdir -p $out/share
|
||||
|
||||
@ -445,9 +445,7 @@ let
|
||||
|
||||
bsod = callPackage ../misc/emulators/bsod { };
|
||||
|
||||
btrfsProgs = builderDefsPackage (import ../tools/filesystems/btrfsprogs) {
|
||||
inherit (pkgs) libuuid zlib acl attr fetchgit e2fsprogs;
|
||||
};
|
||||
btrfsProgs = callPackage ../tools/filesystems/btrfsprogs { };
|
||||
|
||||
catdoc = callPackage ../tools/text/catdoc { };
|
||||
|
||||
@ -1512,6 +1510,8 @@ let
|
||||
|
||||
torsocks = callPackage ../tools/security/tor/torsocks.nix { };
|
||||
|
||||
trickle = callPackage ../tools/networking/trickle {};
|
||||
|
||||
ttf2pt1 = callPackage ../tools/misc/ttf2pt1 { };
|
||||
ttf2pt1_cl_pdf = callPackage ../tools/misc/ttf2pt1 { };
|
||||
|
||||
@ -1789,6 +1789,8 @@ let
|
||||
|
||||
cmucl_binary = callPackage ../development/compilers/cmucl/binary.nix { };
|
||||
|
||||
cython = callPackage ../development/interpreters/cython { };
|
||||
|
||||
dylan = callPackage ../development/compilers/gwydion-dylan {
|
||||
dylan = callPackage ../development/compilers/gwydion-dylan/binary.nix { };
|
||||
};
|
||||
@ -2522,6 +2524,8 @@ let
|
||||
|
||||
swiProlog = callPackage ../development/compilers/swi-prolog { };
|
||||
|
||||
tbb = callPackage ../development/libraries/tbb { };
|
||||
|
||||
tinycc = callPackage ../development/compilers/tinycc { };
|
||||
|
||||
urweb = callPackage ../development/compilers/urweb { };
|
||||
@ -4677,6 +4681,8 @@ let
|
||||
|
||||
serd = callPackage ../development/libraries/serd {};
|
||||
|
||||
silgraphite = callPackage ../development/libraries/silgraphite {};
|
||||
|
||||
simgear = callPackage ../development/libraries/simgear {};
|
||||
|
||||
sfml_git = callPackage ../development/libraries/sfml { };
|
||||
@ -5443,9 +5449,7 @@ let
|
||||
inherit (xlibs) xproto;
|
||||
};
|
||||
|
||||
dmraid = builderDefsPackage ../os-specific/linux/dmraid {
|
||||
inherit devicemapper;
|
||||
};
|
||||
dmraid = callPackage ../os-specific/linux/dmraid { };
|
||||
|
||||
drbd = callPackage ../os-specific/linux/drbd { };
|
||||
|
||||
@ -5674,6 +5678,12 @@ let
|
||||
];
|
||||
};
|
||||
|
||||
linux_3_2_xen = linux_3_2.override {
|
||||
extraConfig = ''
|
||||
XEN_DOM0 y
|
||||
'';
|
||||
};
|
||||
|
||||
linux_3_3 = makeOverridable (import ../os-specific/linux/kernel/linux-3.3.nix) {
|
||||
inherit fetchurl stdenv perl mktemp module_init_tools ubootChooser;
|
||||
kernelPatches =
|
||||
@ -5812,6 +5822,7 @@ let
|
||||
linuxPackages_3_0 = recurseIntoAttrs (linuxPackagesFor linux_3_0 pkgs.linuxPackages_3_0);
|
||||
linuxPackages_3_1 = recurseIntoAttrs (linuxPackagesFor linux_3_1 pkgs.linuxPackages_3_1);
|
||||
linuxPackages_3_2 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_3_2 pkgs.linuxPackages_3_2);
|
||||
linuxPackages_3_2_xen = recurseIntoAttrs (linuxPackagesFor pkgs.linux_3_2_xen pkgs.linuxPackages_3_2_xen);
|
||||
linuxPackages_3_3 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_3_3 pkgs.linuxPackages_3_3);
|
||||
linuxPackages_3_4 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_3_4 pkgs.linuxPackages_3_4);
|
||||
|
||||
@ -6141,6 +6152,10 @@ let
|
||||
|
||||
xf86_input_wacom = callPackage ../os-specific/linux/xf86-input-wacom { };
|
||||
|
||||
xf86_video_nested = callPackage ../os-specific/linux/xf86-video-nested {
|
||||
inherit (xorg) fontsproto renderproto utilmacros xorgserver;
|
||||
};
|
||||
|
||||
xf86_video_nouveau = callPackage ../os-specific/linux/xf86-video-nouveau {
|
||||
inherit (xorg) xorgserver xproto fontsproto xf86driproto renderproto
|
||||
videoproto utilmacros;
|
||||
@ -6272,6 +6287,8 @@ let
|
||||
|
||||
terminus_font = callPackage ../data/fonts/terminus-font { };
|
||||
|
||||
tipa = callPackage ../data/fonts/tipa { };
|
||||
|
||||
ttf_bitstream_vera = callPackage ../data/fonts/ttf-bitstream-vera { };
|
||||
|
||||
ubuntu_font_family = callPackage ../data/fonts/ubuntu-font-family { };
|
||||
@ -7087,7 +7104,7 @@ let
|
||||
mcomix = callPackage ../applications/graphics/mcomix { };
|
||||
|
||||
mercurial = callPackage ../applications/version-management/mercurial {
|
||||
inherit (pythonPackages) curses;
|
||||
inherit (pythonPackages) curses docutils;
|
||||
guiSupport = false; # use mercurialFull to get hgk GUI
|
||||
};
|
||||
|
||||
@ -7720,7 +7737,7 @@ let
|
||||
};
|
||||
|
||||
xpra = callPackage ../tools/X11/xpra {
|
||||
pyrex = pyrex095;
|
||||
inherit (pythonPackages) notify;
|
||||
};
|
||||
|
||||
xscreensaver = callPackage ../misc/screensavers/xscreensaver {
|
||||
@ -8514,10 +8531,14 @@ let
|
||||
stateDir = getConfig [ "nix" "stateDir" ] "/nix/var";
|
||||
};
|
||||
|
||||
nixUnstable = nix;
|
||||
|
||||
/*
|
||||
nixUnstable = callPackage ../tools/package-management/nix/unstable.nix {
|
||||
storeDir = getConfig [ "nix" "storeDir" ] "/nix/store";
|
||||
stateDir = getConfig [ "nix" "stateDir" ] "/nix/var";
|
||||
};
|
||||
*/
|
||||
|
||||
nixCustomFun = src: preConfigure: enableScripts: configureFlags:
|
||||
import ../tools/package-management/nix/custom.nix {
|
||||
@ -8613,9 +8634,9 @@ let
|
||||
texFunctions = import ../tools/typesetting/tex/nix pkgs;
|
||||
|
||||
texLive = builderDefsPackage (import ../tools/typesetting/tex/texlive) {
|
||||
inherit builderDefs zlib bzip2 ncurses libpng ed
|
||||
gd t1lib freetype icu perl expat curl
|
||||
libjpeg bison python fontconfig flex;
|
||||
inherit builderDefs zlib bzip2 ncurses libpng ed lesstif
|
||||
gd t1lib freetype icu perl expat curl xz pkgconfig zziplib
|
||||
libjpeg bison python fontconfig flex poppler silgraphite;
|
||||
inherit (xlibs) libXaw libX11 xproto libXt libXpm
|
||||
libXmu libXext xextproto libSM libICE;
|
||||
ghostscript = ghostscriptX;
|
||||
@ -8624,7 +8645,7 @@ let
|
||||
|
||||
texLiveFull = lib.setName "texlive-full" (texLiveAggregationFun {
|
||||
paths = [ texLive texLiveExtra lmodern texLiveCMSuper texLiveLatexXColor
|
||||
texLivePGF texLiveBeamer texLiveModerncv ];
|
||||
texLivePGF texLiveBeamer texLiveModerncv tipa ];
|
||||
});
|
||||
|
||||
/* Look in configurations/misc/raskin.nix for usage example (around revisions
|
||||
@ -8649,7 +8670,7 @@ let
|
||||
};
|
||||
|
||||
texLiveExtra = builderDefsPackage (import ../tools/typesetting/tex/texlive/extra.nix) {
|
||||
inherit texLive;
|
||||
inherit texLive xz;
|
||||
};
|
||||
|
||||
texLiveCMSuper = builderDefsPackage (import ../tools/typesetting/tex/texlive/cm-super.nix) {
|
||||
|
||||
@ -126,7 +126,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
|
||||
haskellSrc = self.haskellSrc_1_0_1_5; # 7.5 ok
|
||||
html = self.html_1_0_1_2; # 7.5 ok
|
||||
HTTP = self.HTTP_4000_2_3; # 7.5 ok
|
||||
HUnit = self.HUnit_1_2_4_3; # 7.5 ok
|
||||
HUnit = self.HUnit_1_2_5_0; # 7.5 ok
|
||||
mtl = self.mtl_2_1_2; # 7.5 ok
|
||||
network = self.network_2_3_0_14; # 7.5 ok
|
||||
OpenGL = self.OpenGL_2_2_3_1; # 7.5 fail
|
||||
@ -473,6 +473,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
|
||||
|
||||
Boolean = callPackage ../development/libraries/haskell/Boolean {};
|
||||
|
||||
brainfuck = callPackage ../development/libraries/haskell/brainfuck {};
|
||||
|
||||
bson = callPackage ../development/libraries/haskell/bson {};
|
||||
|
||||
byteorder = callPackage ../development/libraries/haskell/byteorder {};
|
||||
@ -584,6 +586,10 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
|
||||
|
||||
dataenc = callPackage ../development/libraries/haskell/dataenc {};
|
||||
|
||||
dataInttrie = callPackage ../development/libraries/haskell/data-inttrie {};
|
||||
|
||||
dataMemocombinators = callPackage ../development/libraries/haskell/data-memocombinators {};
|
||||
|
||||
dataReify = callPackage ../development/libraries/haskell/data-reify {};
|
||||
|
||||
datetime = callPackage ../development/libraries/haskell/datetime {};
|
||||
@ -730,6 +736,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
|
||||
OpenGL = self.OpenGL25;
|
||||
};
|
||||
|
||||
glpkHs = callPackage ../development/libraries/haskell/glpk-hs {};
|
||||
|
||||
GLURaw = callPackage ../development/libraries/haskell/GLURaw {};
|
||||
|
||||
GLUT_2_1_1_2 = callPackage ../development/libraries/haskell/GLUT/2.1.1.2.nix {};
|
||||
@ -908,7 +916,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
|
||||
HUnit_1_2_2_3 = callPackage ../development/libraries/haskell/HUnit/1.2.2.3.nix {};
|
||||
HUnit_1_2_4_2 = callPackage ../development/libraries/haskell/HUnit/1.2.4.2.nix {};
|
||||
HUnit_1_2_4_3 = callPackage ../development/libraries/haskell/HUnit/1.2.4.3.nix {};
|
||||
HUnit = self.HUnit_1_2_4_3;
|
||||
HUnit_1_2_5_0 = callPackage ../development/libraries/haskell/HUnit/1.2.5.0.nix {};
|
||||
HUnit = self.HUnit_1_2_5_0;
|
||||
|
||||
hxt = callPackage ../development/libraries/haskell/hxt {};
|
||||
|
||||
@ -928,6 +937,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
|
||||
|
||||
IORefCAS = callPackage ../development/libraries/haskell/IORefCAS {};
|
||||
|
||||
IOSpec = callPackage ../development/libraries/haskell/IOSpec {};
|
||||
|
||||
ioStorage = callPackage ../development/libraries/haskell/io-storage {};
|
||||
|
||||
irc = callPackage ../development/libraries/haskell/irc {
|
||||
@ -961,6 +972,10 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
|
||||
|
||||
languageHaskellExtract = callPackage ../development/libraries/haskell/language-haskell-extract {};
|
||||
|
||||
lambdabot = callPackage ../development/libraries/haskell/lambdabot {};
|
||||
|
||||
lambdabotUtils = callPackage ../development/libraries/haskell/lambdabot-utils {};
|
||||
|
||||
largeword = callPackage ../development/libraries/haskell/largeword {};
|
||||
|
||||
lazysmallcheck = callPackage ../development/libraries/haskell/lazysmallcheck {};
|
||||
@ -977,6 +992,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
|
||||
|
||||
logfloat = callPackage ../development/libraries/haskell/logfloat {};
|
||||
|
||||
logict = callPackage ../development/libraries/haskell/logict {};
|
||||
|
||||
mathFunctions = callPackage ../development/libraries/haskell/math-functions {};
|
||||
|
||||
mainlandPretty = callPackage ../development/libraries/haskell/mainland-pretty {};
|
||||
@ -1068,12 +1085,16 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
|
||||
|
||||
NumInstances = callPackage ../development/libraries/haskell/NumInstances {};
|
||||
|
||||
numbers = callPackage ../development/libraries/haskell/numbers {};
|
||||
|
||||
numtype = callPackage ../development/libraries/haskell/numtype {};
|
||||
|
||||
OneTuple = callPackage ../development/libraries/haskell/OneTuple {};
|
||||
|
||||
ObjectName = callPackage ../development/libraries/haskell/ObjectName {};
|
||||
|
||||
oeis = callPackage ../development/libraries/haskell/oeis {};
|
||||
|
||||
OpenAL = callPackage ../development/libraries/haskell/OpenAL {};
|
||||
|
||||
OpenGL_2_2_1_1 = callPackage ../development/libraries/haskell/OpenGL/2.2.1.1.nix {};
|
||||
@ -1129,6 +1150,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
|
||||
|
||||
persistent = callPackage ../development/libraries/haskell/persistent {};
|
||||
|
||||
persistentPostgresql = callPackage ../development/libraries/haskell/persistent-postgresql {};
|
||||
|
||||
persistentSqlite = callPackage ../development/libraries/haskell/persistent-sqlite {};
|
||||
|
||||
persistentTemplate = callPackage ../development/libraries/haskell/persistent-template {};
|
||||
@ -1141,6 +1164,12 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
|
||||
|
||||
poolConduit = callPackage ../development/libraries/haskell/pool-conduit {};
|
||||
|
||||
postgresqlLibpq = callPackage ../development/libraries/haskell/postgresql-libpq {
|
||||
postgresql = pkgs.postgresql91;
|
||||
};
|
||||
|
||||
postgresqlSimple = callPackage ../development/libraries/haskell/postgresql-simple {};
|
||||
|
||||
ppm = callPackage ../development/libraries/haskell/ppm {};
|
||||
|
||||
prettyShow = callPackage ../development/libraries/haskell/pretty-show {};
|
||||
@ -1333,6 +1362,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
|
||||
|
||||
ShellacReadline = callPackage ../development/libraries/haskell/Shellac/Shellac-readline.nix {};
|
||||
|
||||
show = callPackage ../development/libraries/haskell/show {};
|
||||
|
||||
SMTPClient = callPackage ../development/libraries/haskell/SMTPClient {};
|
||||
|
||||
split = callPackage ../development/libraries/haskell/split {};
|
||||
@ -1445,6 +1476,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
|
||||
|
||||
unixCompat = callPackage ../development/libraries/haskell/unix-compat {};
|
||||
|
||||
unlambda = callPackage ../development/libraries/haskell/unlambda {};
|
||||
|
||||
unorderedContainers = callPackage ../development/libraries/haskell/unordered-containers {};
|
||||
|
||||
url = callPackage ../development/libraries/haskell/url {};
|
||||
|
||||
@ -686,6 +686,24 @@ let pythonPackages = python.modules // rec {
|
||||
};
|
||||
|
||||
|
||||
flask = buildPythonPackage {
|
||||
name = "flask-0.9";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://pypi.python.org/packages/source/F/Flask/Flask-0.9.tar.gz";
|
||||
md5 = "4a89ef2b3ab0f151f781182bd0cc8933";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ werkzeug jinja2 ];
|
||||
|
||||
meta = {
|
||||
homepage = http://flask.pocoo.org/;
|
||||
description = "A microframework based on Werkzeug, Jinja 2, and good intentions";
|
||||
license = "BSD";
|
||||
};
|
||||
};
|
||||
|
||||
|
||||
flup = buildPythonPackage (rec {
|
||||
name = "flup-1.0.2";
|
||||
|
||||
@ -2590,6 +2608,22 @@ let pythonPackages = python.modules // rec {
|
||||
};
|
||||
|
||||
|
||||
werkzeug = buildPythonPackage {
|
||||
name = "werkzeug-0.8.3";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://pypi.python.org/packages/source/W/Werkzeug/Werkzeug-0.8.3.tar.gz";
|
||||
md5 = "12aa03e302ce49da98703938f257347a";
|
||||
};
|
||||
|
||||
meta = {
|
||||
homepage = http://werkzeug.pocoo.org/;
|
||||
description = "A WSGI utility library for Python";
|
||||
license = "BSD";
|
||||
};
|
||||
};
|
||||
|
||||
|
||||
wxPython = wxPython28;
|
||||
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user