MirrorHub/nixpkgs
0
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-16 23:03:40 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Merge remote-tracking branch 'upstream/master'

Browse source
This commit is contained in:
Aycan iRiCAN 2014-07-19 11:01:54 +03:00
commit 5a1167455e
60 changed files with 506 additions and 148 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
nixos/modules/services/x11/desktop-managers/default.nix
View file

@ -17,7 +17,7 @@ in
# Note: the order in which desktop manager modules are imported here
# determines the default: later modules (if enabled) are preferred.
# E.g., if KDE is enabled, it supersedes xterm.
imports = [ ./none.nix ./xterm.nix ./xfce.nix ./kde4.nix ./e17.nix ./gnome3.nix ./xbmc.nix ];
imports = [ ./none.nix ./xterm.nix ./xfce.nix ./kde4.nix ./e17.nix ./e18.nix ./gnome3.nix ./xbmc.nix ];
options = {

40
nixos/modules/services/x11/desktop-managers/e18.nix Normal file
View file

@ -0,0 +1,40 @@
{ config, pkgs, ... }:
with pkgs.lib;
let
xcfg = config.services.xserver;
cfg = xcfg.desktopManager.e18;
in
{
options = {
services.xserver.desktopManager.e18.enable = mkOption {
default = false;
example = true;
description = "Enable the E18 desktop environment.";
};
};
config = mkIf (xcfg.enable && cfg.enable) {
environment.systemPackages = [
pkgs.e18.efl pkgs.e18.evas pkgs.e18.emotion pkgs.e18.elementary pkgs.e18.enlightenment
pkgs.e18.terminology pkgs.e18.econnman
];
services.xserver.desktopManager.session = [
{ name = "E18";
start = ''
${pkgs.e18.enlightenment}/bin/enlightenment_start
waitPID=$!
'';
}];
};
}

1
nixos/modules/system/boot/systemd.nix
View file

@ -825,6 +825,7 @@ in
systemd.services."user@".restartIfChanged = false;
systemd.services.systemd-remount-fs.restartIfChanged = false;
systemd.services.systemd-journal-flush.restartIfChanged = false;
};
}

4
pkgs/applications/misc/calibre/default.nix
View file

@ -4,11 +4,11 @@
}:
stdenv.mkDerivation rec {
name = "calibre-1.44.0";
name = "calibre-1.45.0";
src = fetchurl {
url = "mirror://sourceforge/calibre/${name}.tar.xz";
sha256 = "14k9rzp4rphls4zkzrdq8kk0mgzsh5sdmngxklb58r71xj2r995j";
sha256 = "0g9fzpkjvi0h7h5azk3v425l8gxd8zidcz3nrzlg26hgvbkzpm20";
};
inherit python;

26
pkgs/applications/version-management/git-and-tools/git-annex/default.nix
View file

@ -7,19 +7,19 @@
, gnupg1, gnutls, hamlet, hinotify, hS3, hslogger, HTTP, httpClient
, httpConduit, httpTypes, IfElse, json, liftedBase, lsof, MissingH
, monadControl, mtl, network, networkInfo, networkMulticast
, networkProtocolXmpp, openssh, optparseApplicative, perl
, QuickCheck, random, regexTdfa, rsync, SafeSemaphore, securemem
, SHA, shakespeare, stm, tasty, tastyHunit, tastyQuickcheck
, tastyRerun, text, time, transformers, unixCompat, utf8String
, uuid, wai, waiExtra, warp, warpTls, which, xmlTypes, yesod
, yesodCore, yesodDefault, yesodForm, yesodStatic
, networkProtocolXmpp, openssh, optparseApplicative, pathPieces
, perl, QuickCheck, random, regexTdfa, rsync, SafeSemaphore
, securemem, SHA, shakespeare, stm, tasty, tastyHunit
, tastyQuickcheck, tastyRerun, text, time, transformers, unixCompat
, utf8String, uuid, wai, waiExtra, warp, warpTls, which, xmlTypes
, yesod, yesodCore, yesodDefault, yesodForm, yesodStatic
, fsnotify
}:
cabal.mkDerivation (self: {
pname = "git-annex";
version = "5.20140709";
sha256 = "0n636b52199kj8w3awfvrabg6c76kb133gbfh9r8sp0xrg376z2s";
version = "5.20140717";
sha256 = "199gqp85f6xnyg3svs23n3r6q4pflvz4zy5y376klay9mzzp0rbl";
isLibrary = false;
isExecutable = true;
buildDepends = [
@ -29,11 +29,11 @@ cabal.mkDerivation (self: {
feed filepath gnutls hamlet hS3 hslogger HTTP httpClient
httpConduit httpTypes IfElse json liftedBase MissingH monadControl
mtl network networkInfo networkMulticast networkProtocolXmpp
optparseApplicative QuickCheck random regexTdfa SafeSemaphore
securemem SHA shakespeare stm tasty tastyHunit tastyQuickcheck
tastyRerun text time transformers unixCompat utf8String uuid wai
waiExtra warp warpTls xmlTypes yesod yesodCore yesodDefault
yesodForm yesodStatic
optparseApplicative pathPieces QuickCheck random regexTdfa
SafeSemaphore securemem SHA shakespeare stm tasty tastyHunit
tastyQuickcheck tastyRerun text time transformers unixCompat
utf8String uuid wai waiExtra warp warpTls xmlTypes yesod yesodCore
yesodDefault yesodForm yesodStatic
] ++ (if self.stdenv.isDarwin then [
fsnotify
] else [

2
pkgs/build-support/upstream-updater/urls-from-page.sh
View file

@ -9,6 +9,6 @@ relpath="${path#$server}"
echo "URL: $url" >&2
curl -A 'text/html; text/xhtml; text/xml; */*' -L -k "$url" | sed -re 's/^/-/;s/[hH][rR][eE][fF]=("([^"]*)"|'\''([^'\'']*)'\''|([^"'\'' <>&]+)[ <>&])/\n+\2\3\4\n-/g' | \
curl -A 'text/html; text/xhtml; text/xml; */*' -L -k "$url" | sed -re 's/^/-/;s/[^a-zA-Z][hH][rR][eE][fF]=("([^"]*)"|'\''([^'\'']*)'\''|([^"'\'' <>&]+)[ <>&])/\n+\2\3\4\n-/g' | \
sed -e '/^-/d; s/^[+]//; /^#/d;'"s/^\\//$protocol:\\/\\/$server\\//g" | \
sed -re 's`^[^:]*$`'"$protocol://$basepath/&\`"

16
pkgs/desktops/e18/default.nix Normal file
View file

@ -0,0 +1,16 @@
{ callPackage, pkgs }:
rec {
#### CORE EFL
efl = callPackage ./efl.nix { };
evas = callPackage ./evas.nix { };
emotion = callPackage ./emotion.nix { };
elementary = callPackage ./elementary.nix { };
#### WINDOW MANAGER
enlightenment = callPackage ./enlightenment.nix { };
#### APPLICATIONS
econnman = callPackage ./econnman.nix { };
terminology = callPackage ./terminology.nix { };
}

23
pkgs/desktops/e18/econnman.nix Normal file
View file

@ -0,0 +1,23 @@
{ stdenv, fetchurl, pkgconfig, e18, python27, python27Packages, dbus, makeWrapper }:
stdenv.mkDerivation rec {
name = "econnman-${version}";
version = "1.1";
src = fetchurl {
url = "http://download.enlightenment.org/rel/apps/econnman/${name}.tar.gz";
sha256 = "057pwwavlvrrq26bncqnfrf449zzaim0zq717xv86av4n940gwv0";
};
buildInputs = [ makeWrapper pkgconfig e18.efl python27 dbus ];
propagatedBuildInputs = [ python27Packages.pythonefl python27Packages.dbus e18.elementary ];
postInstall = ''
wrapProgram $out/bin/econnman-bin --prefix PYTHONPATH : ${python27Packages.dbus}/lib/python2.7/site-packages:${python27Packages.pythonefl}/lib/python2.7/site-packages
'';
meta = {
description = "Econnman is a user interface for the connman network connection manager";
homepage = http://enlightenment.org/;
maintainers = [ stdenv.lib.maintainers.matejc ];
platforms = stdenv.lib.platforms.linux;
license = stdenv.lib.licenses.lgpl3;
};
}

23
pkgs/desktops/e18/efl.nix Normal file
View file

@ -0,0 +1,23 @@
{ stdenv, fetchurl, pkgconfig, openssl, libjpeg, zlib, freetype, fontconfig, fribidi, SDL, mesa, giflib, libpng, libtiff, glib, gst_all_1, pulseaudio, libsndfile, xlibs, wayland, libdrm, libxkbcommon, udev, utillinuxCurses, dbus, bullet, luajit, python27Packages }:
stdenv.mkDerivation rec {
name = "efl-${version}";
version = "1.10.2";
src = fetchurl {
url = "http://download.enlightenment.org/rel/libs/efl/${name}.tar.gz";
sha256 = "0py8x0kv2hgl5v983xb6653fvmvn20im6picpc0hqfyxy09g1b24";
};
buildInputs = [ pkgconfig openssl zlib freetype fontconfig fribidi SDL mesa giflib libpng libtiff glib gst_all_1.gstreamer gst_all_1.gst-plugins-base gst_all_1.gst-libav pulseaudio libsndfile xlibs.libXcursor xlibs.printproto xlibs.libX11 libdrm udev utillinuxCurses luajit ];
propagatedBuildInputs = [ wayland libxkbcommon python27Packages.dbus dbus libjpeg xlibs.libXcomposite xlibs.libXdamage xlibs.libXinerama xlibs.libXp xlibs.libXtst xlibs.libXi xlibs.libXext bullet xlibs.libXScrnSaver ];
configureFlags = [ "--with-opengl=full" "--with-tests=none" "--enable-wayland" "--enable-sdl" "--enable-drm" ];
preConfigure = ''
export NIX_CFLAGS_COMPILE="-I${xlibs.libXtst} $NIX_CFLAGS_COMPILE"
export PKG_CONFIG_PATH="${gst_all_1.gst-plugins-base}/lib/pkgconfig/gstreamer-video-0.10.pc:$PKG_CONFIG_PATH"
'';
meta = {
description = "Enlightenment Core libraries";
homepage = http://enlightenment.org/;
maintainers = [ stdenv.lib.maintainers.matejc ];
platforms = stdenv.lib.platforms.linux;
license = stdenv.lib.licenses.lgpl3;
};
}

20
pkgs/desktops/e18/elementary.nix Normal file
View file

@ -0,0 +1,20 @@
{ stdenv, fetchurl, pkgconfig, e18 }:
stdenv.mkDerivation rec {
name = "elementary-${version}";
version = "1.10.2";
src = fetchurl {
url = "http://download.enlightenment.org/rel/libs/elementary/${name}.tar.gz";
sha256 = "0y3knvmabl9adc8pd54p7qxpf7gvciixc1rk40hqppwhdgbgpz28";
};
buildInputs = [ pkgconfig e18.efl ];
preConfigure = ''
export NIX_CFLAGS_COMPILE="-I${e18.efl}/include/ethumb-1 $NIX_CFLAGS_COMPILE"
'';
meta = {
description = "Widget set/toolkit";
homepage = http://enlightenment.org/;
maintainers = [ stdenv.lib.maintainers.matejc ];
platforms = stdenv.lib.platforms.linux;
license = stdenv.lib.licenses.lgpl2;
};
}

20
pkgs/desktops/e18/emotion.nix Normal file
View file

@ -0,0 +1,20 @@
{ stdenv, fetchurl, pkgconfig, e18, vlc }:
stdenv.mkDerivation rec {
name = "emotion_generic_players-${version}";
version = "1.10.0";
src = fetchurl {
url = "http://download.enlightenment.org/rel/libs/emotion_generic_players/${name}.tar.gz";
sha256 = "1nwlrk9inrhiv6jpzji10ikcdlhzhz7f2b5qhi2ai8bb6j61ryyc";
};
buildInputs = [ pkgconfig e18.efl vlc ];
preConfigure = ''
export NIX_CFLAGS_COMPILE="-I${e18.efl}/include/eo-1 $NIX_CFLAGS_COMPILE"
'';
meta = {
description = "Extra video decoders";
homepage = http://enlightenment.org/;
maintainers = [ stdenv.lib.maintainers.matejc ];
platforms = stdenv.lib.platforms.linux;
license = stdenv.lib.licenses.bsd2;
};
}

20
pkgs/desktops/e18/enlightenment.nix Normal file
View file

@ -0,0 +1,20 @@
{ stdenv, fetchurl, pkgconfig, e18, xlibs, libffi, pam, alsaLib, luajit }:
stdenv.mkDerivation rec {
name = "enlightenment-${version}";
version = "0.18.8";
src = fetchurl {
url = "http://download.enlightenment.org/rel/apps/enlightenment/${name}.tar.gz";
sha256 = "1fsigbrknkwy909p1gqwxag1bar3p413s4f6fq3qnbsd6gjbvj8l";
};
buildInputs = [ pkgconfig e18.efl e18.elementary xlibs.libxcb xlibs.xcbutilkeysyms xlibs.libXrandr libffi pam alsaLib luajit ];
preConfigure = ''
export NIX_CFLAGS_COMPILE="-I${e18.efl}/include/eo-1 -I${e18.efl}/include/ecore-imf-1 -I${e18.efl}/include/ethumb-client-1 -I${e18.efl}/include/ethumb-1 $NIX_CFLAGS_COMPILE"
'';
meta = {
description = "The Compositing Window Manager and Desktop Shell";
homepage = http://enlightenment.org/;
maintainers = [ stdenv.lib.maintainers.matejc ];
platforms = stdenv.lib.platforms.linux;
license = stdenv.lib.licenses.bsd2;
};
}

17
pkgs/desktops/e18/evas.nix Normal file
View file

@ -0,0 +1,17 @@
{ stdenv, fetchurl, pkgconfig, e18, zlib }:
stdenv.mkDerivation rec {
name = "evas_generic_loaders-${version}";
version = "1.10.0";
src = fetchurl {
url = "http://download.enlightenment.org/rel/libs/evas_generic_loaders/${name}.tar.gz";
sha256 = "0qx44g7a8pzcgspx8q10zjiwzafis301fhpchd4pskfxhqd4qagm";
};
buildInputs = [ pkgconfig e18.efl zlib ];
meta = {
description = "Extra image decoders";
homepage = http://enlightenment.org/;
maintainers = [ stdenv.lib.maintainers.matejc ];
platforms = stdenv.lib.platforms.linux;
license = stdenv.lib.licenses.gpl2;
};
}

23
pkgs/desktops/e18/terminology.nix Normal file
View file

@ -0,0 +1,23 @@
{ stdenv, fetchurl, pkgconfig, e18 }:
stdenv.mkDerivation rec {
name = "terminology-${version}";
version = "0.6.1";
src = fetchurl {
url = "http://download.enlightenment.org/rel/apps/terminology/${name}.tar.gz";
sha256 = "1wi9njyfs95y4nb9jd30032qqka5cg7k0wacck8s1yqxwg5ng38x";
};
buildInputs = [ pkgconfig e18.efl e18.elementary ];
preConfigure = ''
export NIX_CFLAGS_COMPILE="-I${e18.efl}/include/eo-1 $NIX_CFLAGS_COMPILE"
export NIX_CFLAGS_COMPILE="-I${e18.efl}/include/ecore-con-1 $NIX_CFLAGS_COMPILE"
export NIX_CFLAGS_COMPILE="-I${e18.efl}/include/eldbus-1 $NIX_CFLAGS_COMPILE"
export NIX_CFLAGS_COMPILE="-I${e18.efl}/include/ethumb-1 $NIX_CFLAGS_COMPILE"
'';
meta = {
description = "The best terminal emulator written with the EFL";
homepage = http://enlightenment.org/;
maintainers = [ stdenv.lib.maintainers.matejc ];
platforms = stdenv.lib.platforms.linux;
license = stdenv.lib.licenses.bsd2;
};
}

6
pkgs/development/compilers/hhvm/default.nix
View file

@ -7,12 +7,12 @@
stdenv.mkDerivation rec {
name = "hhvm-${version}";
version = "3.1.0";
version = "3.2.0";
src = fetchgit {
url = "https://github.com/facebook/hhvm.git";
rev = "71ecbd8fb5e94b2a008387a2b5e9a8df5c6f5c7b";
sha256 = "1zv3k3bxahwyna2jgicwxm9lxs11jddpc9v41488rmzvfhdmzzkn";
rev = "01228273b8cf709aacbd3df1c51b1e690ecebac8";
sha256 = "418d5a55ac4ba5335a42329ebfb7dd96fdb8d5edbc2700251c86e9fa2ae4a967";
fetchSubmodules = true;
};

30
pkgs/development/compilers/idris/default.nix
View file

@ -1,27 +1,27 @@
# This file was auto-generated by cabal2nix. Please do NOT edit manually!
{ cabal, annotatedWlPprint, ansiTerminal, ansiWlPprint, binary
, blazeHtml, blazeMarkup, boehmgc, Cabal, cheapskate, deepseq
, filepath, gmp, happy, haskeline, languageJava, lens, libffi
, llvmGeneral, llvmGeneralPure, mtl, network, optparseApplicative
, parsers, split, text, time, transformers, trifecta
, unorderedContainers, utf8String, vector, vectorBinaryInstances
, xml, zlib
{ cabal, annotatedWlPprint, ansiTerminal, ansiWlPprint
, base64Bytestring, binary, blazeHtml, blazeMarkup, boehmgc, Cabal
, cheapskate, deepseq, filepath, fingertree, gmp, happy, haskeline
, languageJava, lens, libffi, llvmGeneral, llvmGeneralPure, mtl
, network, optparseApplicative, parsers, split, text, time
, transformers, trifecta, unorderedContainers, utf8String, vector
, vectorBinaryInstances, xml, zlib
}:
cabal.mkDerivation (self: {
pname = "idris";
version = "0.9.13.1";
sha256 = "09528c2zxriw3l8c7dd2k5db9j1qmqhs6nbqwc7dkskzqv9snz7n";
version = "0.9.14";
sha256 = "0kfzp89sass93p9zsxq616zfix7ipi1rmjqmcjixihi01k7c0b8b";
isLibrary = true;
isExecutable = true;
buildDepends = [
annotatedWlPprint ansiTerminal ansiWlPprint binary blazeHtml
blazeMarkup Cabal cheapskate deepseq filepath haskeline
languageJava lens libffi llvmGeneral llvmGeneralPure mtl network
optparseApplicative parsers split text time transformers trifecta
unorderedContainers utf8String vector vectorBinaryInstances xml
zlib
annotatedWlPprint ansiTerminal ansiWlPprint base64Bytestring binary
blazeHtml blazeMarkup Cabal cheapskate deepseq filepath fingertree
haskeline languageJava lens libffi llvmGeneral llvmGeneralPure mtl
network optparseApplicative parsers split text time transformers
trifecta unorderedContainers utf8String vector
vectorBinaryInstances xml zlib
];
buildTools = [ happy ];
extraLibraries = [ boehmgc gmp ];

12
pkgs/development/libraries/haskell/HTF/default.nix
View file

@ -2,21 +2,23 @@
{ cabal, aeson, base64Bytestring, cpphs, Diff, filepath
, haskellSrcExts, HUnit, liftedBase, monadControl, mtl, QuickCheck
, random, regexCompat, temporary, text, unorderedContainers, xmlgen
, random, regexCompat, temporary, text, time, unorderedContainers
, vector, xmlgen
}:
cabal.mkDerivation (self: {
pname = "HTF";
version = "0.11.4.0";
sha256 = "0bg84x6xk359zby04xw62yy227fk85mgs7x5nkdbsxcajm7j0bs9";
version = "0.12.0.0";
sha256 = "1mbil44gbcl52f84dphxkdvxsyz8bhc532mlq37aqr1bmj54rv0i";
isLibrary = true;
isExecutable = true;
buildDepends = [
aeson base64Bytestring cpphs Diff haskellSrcExts HUnit liftedBase
monadControl mtl QuickCheck random regexCompat text xmlgen
monadControl mtl QuickCheck random regexCompat text time vector
xmlgen
];
testDepends = [
aeson filepath mtl random regexCompat temporary text
aeson filepath HUnit mtl random regexCompat temporary text
unorderedContainers
];
doCheck = false;

19
pkgs/development/libraries/haskell/QuickCheck/2.7.6.nix Normal file
View file

@ -0,0 +1,19 @@
# This file was auto-generated by cabal2nix. Please do NOT edit manually!
{ cabal, random, testFramework, tfRandom, transformers }:
cabal.mkDerivation (self: {
pname = "QuickCheck";
version = "2.7.6";
sha256 = "09y5l0062l9i5jp9v6811kvkk4zpy0mizwaw44abgz0x1h59gn40";
buildDepends = [ random tfRandom transformers ];
testDepends = [ testFramework ];
noHaddock = self.stdenv.lib.versionOlder self.ghc.version "6.11";
meta = {
homepage = "https://github.com/nick8325/quickcheck";
description = "Automatic testing of Haskell programs";
license = self.stdenv.lib.licenses.bsd3;
platforms = self.ghc.meta.platforms;
maintainers = [ self.stdenv.lib.maintainers.andres ];
};
})

28
pkgs/development/libraries/haskell/aeson/0.8.0.0.nix Normal file
View file

@ -0,0 +1,28 @@
# This file was auto-generated by cabal2nix. Please do NOT edit manually!
{ cabal, attoparsec, blazeBuilder, deepseq, dlist, hashable, HUnit
, mtl, QuickCheck, scientific, syb, testFramework
, testFrameworkHunit, testFrameworkQuickcheck2, text, time
, unorderedContainers, vector
}:
cabal.mkDerivation (self: {
pname = "aeson";
version = "0.8.0.0";
sha256 = "0p2x03wjawhav87jp57vwclra0gjwn1gqk74zgnji25ypwsvgkk4";
buildDepends = [
attoparsec blazeBuilder deepseq dlist hashable mtl scientific syb
text time unorderedContainers vector
];
testDepends = [
attoparsec HUnit QuickCheck testFramework testFrameworkHunit
testFrameworkQuickcheck2 text time unorderedContainers vector
];
meta = {
homepage = "https://github.com/bos/aeson";
description = "Fast JSON parsing and encoding";
license = self.stdenv.lib.licenses.bsd3;
platforms = self.ghc.meta.platforms;
maintainers = [ self.stdenv.lib.maintainers.andres ];
};
})

15
pkgs/development/libraries/haskell/applicative-quoters/default.nix Normal file
View file

@ -0,0 +1,15 @@
# This file was auto-generated by cabal2nix. Please do NOT edit manually!
{ cabal, haskellSrcMeta }:
cabal.mkDerivation (self: {
pname = "applicative-quoters";
version = "0.1.0.8";
sha256 = "10m29d0938khjdazsmsvvncr5xndnpzpm1b7ymzb3b4b81xmcpgl";
buildDepends = [ haskellSrcMeta ];
meta = {
description = "Quasiquoters for idiom brackets and an applicative do-notation";
license = self.stdenv.lib.licenses.bsd3;
platforms = self.ghc.meta.platforms;
};
})

14
pkgs/development/libraries/haskell/conduit-extra/default.nix
View file

@ -1,22 +1,22 @@
# This file was auto-generated by cabal2nix. Please do NOT edit manually!
{ cabal, attoparsec, blazeBuilder, conduit, exceptions, filepath
, hspec, monadControl, network, primitive, resourcet
{ cabal, async, attoparsec, blazeBuilder, conduit, exceptions
, filepath, hspec, monadControl, network, primitive, resourcet, stm
, streamingCommons, text, transformers, transformersBase
}:
cabal.mkDerivation (self: {
pname = "conduit-extra";
version = "1.1.1";
sha256 = "1876kg7zb0gasl7ijmx48r5r2jv3c5xxa1xb6g6iqfysx0qsv6z2";
version = "1.1.2";
sha256 = "1hglg491vgy6hjggi7067rjly3dlnr3byf6xlc20narzr25sxfxi";
buildDepends = [
attoparsec blazeBuilder conduit filepath monadControl network
primitive resourcet streamingCommons text transformers
primitive resourcet stm streamingCommons text transformers
transformersBase
];
testDepends = [
attoparsec blazeBuilder conduit exceptions hspec resourcet text
transformers transformersBase
async attoparsec blazeBuilder conduit exceptions hspec resourcet
stm text transformers transformersBase
];
noHaddock = true;
meta = {

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

@ -6,8 +6,8 @@
cabal.mkDerivation (self: {
pname = "conduit";
version = "1.1.6";
sha256 = "1nhjj5zz934fd6fdbmkl8xvnvlaprxccgpwxffmdgqwxhvxgprq3";
version = "1.1.7";
sha256 = "0xk2his7qbidnzs56xcgnjipbnqmmnh74qy8dfvbznkkqhxdzmz6";
buildDepends = [
exceptions liftedBase mmorph monadControl mtl resourcet
transformers transformersBase void

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

@ -6,8 +6,8 @@
cabal.mkDerivation (self: {
pname = "connection";
version = "0.2.1";
sha256 = "1wdjfc9lld3wkr7ncjkszmrwqp74p994ml3chymniz440xg1lxwy";
version = "0.2.3";
sha256 = "02mqn19pssdak82jw38p3cbwjyfvmjc6fawgx5981hzbdgb64vsb";
buildDepends = [
cprngAes dataDefaultClass network socks tls x509 x509Store
x509System x509Validation

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

@ -4,8 +4,8 @@
cabal.mkDerivation (self: {
pname = "highlighting-kate";
version = "0.5.8.3";
sha256 = "03x9vp6mvk9hxs92cmy42aqiyh4prnh343xg36znyjii6xw2x3mf";
version = "0.5.8.4";
sha256 = "018j5z4cl9iv5m9wzjykh2gcn5d4fi7vahj76jv0ah101g6fqvrh";
isLibrary = true;
isExecutable = true;
buildDepends = [

4
pkgs/development/libraries/haskell/http-client-tls/default.nix
View file

@ -6,8 +6,8 @@
cabal.mkDerivation (self: {
pname = "http-client-tls";
version = "0.2.1.2";
sha256 = "08qq2d4mqdd80jb99wm4gd4bqvnrlcpblvqgn18p8bzhw1qq6siy";
version = "0.2.2";
sha256 = "0a01r05h5fxswyn6k6cgqgak4scqjan72hyy5wbdqzzhl4rmh7j5";
buildDepends = [
connection dataDefaultClass httpClient network tls
];

4
pkgs/development/libraries/haskell/http-client/default.nix
View file

@ -8,8 +8,8 @@
cabal.mkDerivation (self: {
pname = "http-client";
version = "0.3.4";
sha256 = "0y4va0xfriv3qv31hbh7kbzmf61rr3ffr4z4vlfdlzacfv8307y4";
version = "0.3.5";
sha256 = "0ffr4xccm2yp5ikiz5dzzjm82vz7gab56l80ra9criry9qirmwqh";
buildDepends = [
base64Bytestring blazeBuilder caseInsensitive cookie
dataDefaultClass deepseq exceptions filepath httpTypes mimeTypes

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

@ -9,8 +9,8 @@
cabal.mkDerivation (self: {
pname = "http-conduit";
version = "2.1.2.3";
sha256 = "07d9lhkqf1kr4mg61q0pcf8y73wkdymazxrvr425wjh9363r89gl";
version = "2.1.3";
sha256 = "1z9i0b9kl1kqh3nvbhh5vmqyg19pkdpj4cbkfhj0r47rbcynhwlb";
buildDepends = [
conduit httpClient httpClientTls httpTypes liftedBase monadControl
mtl resourcet transformers

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

@ -6,8 +6,8 @@
cabal.mkDerivation (self: {
pname = "interpolate";
version = "0.0.2";
sha256 = "0l9hrgwmvp7h2mgw90gk45zgp0yy00201ki9hwg26sh2wd0sj6f8";
version = "0.0.3";
sha256 = "05aksslx7mvic3cgw9ixwjp0r759a4gf7m178pbp8xm8dpdksjjw";
buildDepends = [ haskellSrcMeta ];
testDepends = [
doctest haskellSrcMeta hspec QuickCheck quickcheckInstances text

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

@ -6,8 +6,8 @@
cabal.mkDerivation (self: {
pname = "iproute";
version = "1.2.12";
sha256 = "19pr6my4nw7qq9lsp6xvz55lm9svwzqka5qcqy79sfdkxg459rg5";
version = "1.3.0";
sha256 = "1n9lcm1f2rlqkvg90zikf2h4badzh9r24zqb27648l48254m6q5p";
buildDepends = [ appar byteorder network ];
testDepends = [
appar byteorder doctest hspec network QuickCheck safe

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

@ -7,8 +7,8 @@
cabal.mkDerivation (self: {
pname = "monad-logger";
version = "0.3.6.1";
sha256 = "0ylsrhp2a9qir03nmmz6rkim149pw1fgm63lfg611gvh598ig6ss";
version = "0.3.7";
sha256 = "03fzp8cvx8qapyjgnm6gywj8b1pcd43y3fb4vg1wgxa55lsg6y58";
buildDepends = [
blazeBuilder conduit conduitExtra exceptions fastLogger liftedBase
monadControl monadLoops mtl resourcet stm stmChans text

23
pkgs/development/libraries/haskell/parsers/0.12.nix Normal file
View file

@ -0,0 +1,23 @@
# This file was auto-generated by cabal2nix. Please do NOT edit manually!
{ cabal, attoparsec, charset, doctest, filepath, parsec, QuickCheck
, quickcheckInstances, text, transformers, unorderedContainers
}:
cabal.mkDerivation (self: {
pname = "parsers";
version = "0.12";
sha256 = "0lb1djb2mmlkfqpbz7683i27d3ivv0r99l6w79951wgsqb62xph3";
buildDepends = [
attoparsec charset parsec text transformers unorderedContainers
];
testDepends = [
attoparsec doctest filepath parsec QuickCheck quickcheckInstances
];
meta = {
homepage = "http://github.com/ekmett/parsers/";
description = "Parsing combinators";
license = self.stdenv.lib.licenses.bsd3;
platforms = self.ghc.meta.platforms;
};
})

4
pkgs/development/libraries/haskell/path-pieces/default.nix
View file

@ -4,8 +4,8 @@
cabal.mkDerivation (self: {
pname = "path-pieces";
version = "0.1.3.1";
sha256 = "140pkci5k6aa9ncxa29fn2p0g6lb79zci0k02nblv59qmj5hj8ic";
version = "0.1.4";
sha256 = "1fxhp4bk88km7z1rdpify7l38li5k21qxw3vgcmq9b6bblvz6y2v";
buildDepends = [ text time ];
testDepends = [ hspec HUnit QuickCheck text ];
meta = {

14
pkgs/development/libraries/haskell/process-conduit/default.nix
View file

@ -1,22 +1,22 @@
# This file was auto-generated by cabal2nix. Please do NOT edit manually!
{ cabal, conduit, controlMonadLoop, hspec, mtl, resourcet
, shakespeare, shakespeareText, text
{ cabal, conduit, conduitExtra, controlMonadLoop, hspec, mtl
, resourcet, shakespeare, shakespeareText, text
}:
cabal.mkDerivation (self: {
pname = "process-conduit";
version = "1.1.0.0";
sha256 = "1b3snck651cpb7i3c78cn264zrjan3lzydf59209abkvb6fv1hql";
version = "1.2.0.1";
sha256 = "0hnbywmjvk3y26sc9a0jfqzm04pg08zd2bflld1mvni02s89lvc8";
buildDepends = [
conduit controlMonadLoop mtl resourcet shakespeare shakespeareText
text
];
testDepends = [ conduit hspec ];
testDepends = [ conduit conduitExtra hspec resourcet ];
doCheck = false;
meta = {
homepage = "http://github.com/tanakh/process-conduit";
description = "Conduits for processes";
homepage = "http://github.com/snoyberg/process-conduit";
description = "Conduits for processes (deprecated)";
license = self.stdenv.lib.licenses.bsd3;
platforms = self.ghc.meta.platforms;
};

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

@ -7,8 +7,8 @@
cabal.mkDerivation (self: {
pname = "purescript";
version = "0.5.2.6";
sha256 = "0aszzaj3942xgq0nmql68s5cgplhkqrk0k6cfd1mx5lq5n0qxf94";
version = "0.5.3";
sha256 = "05vhz3j4gx9paxmvimy154730078bl148819shwml6l6vq02723i";
isLibrary = true;
isExecutable = true;
buildDepends = [

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

@ -4,8 +4,8 @@
cabal.mkDerivation (self: {
pname = "reflection";
version = "1.4";
sha256 = "0i6yb3fa9wizyaz8x9b7yzkw9jf7zahdrkr2y0iw7igdxqn4n0k7";
version = "1.5.1";
sha256 = "18ail6j7rs5jff9zxphxd7vjkwanpv12dhi98s86r65425fdhjlx";
buildDepends = [ tagged ];
meta = {
homepage = "http://github.com/ekmett/reflection";

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

@ -4,8 +4,8 @@
cabal.mkDerivation (self: {
pname = "safe";
version = "0.3.6";
sha256 = "03fjasjw8mh8c15xg8dncdn9g8scr427889vchcckilll40kvzvm";
version = "0.3.7";
sha256 = "0rw8mjarwl7rwc6fczq0zxlp1nlb6r1rk71whwziwi032hgc8561";
meta = {
homepage = "http://community.haskell.org/~ndm/safe/";
description = "Library of safe (exception free) functions";

8
pkgs/development/libraries/haskell/statistics/default.nix
View file

@ -1,6 +1,6 @@
# This file was auto-generated by cabal2nix. Please do NOT edit manually!
{ cabal, binary, deepseq, erf, HUnit, ieee754, mathFunctions
{ cabal, aeson, binary, deepseq, erf, HUnit, ieee754, mathFunctions
, monadPar, mwcRandom, primitive, QuickCheck, testFramework
, testFrameworkHunit, testFrameworkQuickcheck2, vector
, vectorAlgorithms, vectorBinaryInstances
@ -8,10 +8,10 @@
cabal.mkDerivation (self: {
pname = "statistics";
version = "0.11.0.3";
sha256 = "184lzivqjjj69pxcnr5ibxjqikypfl5nd63i44qgwdhwyvcaqdh3";
version = "0.13.1.0";
sha256 = "0y46fna0kqs8bsqbf3v1k9ppq3njd5kxf1qlvvmphydpi3x038nd";
buildDepends = [
binary deepseq erf mathFunctions monadPar mwcRandom primitive
aeson binary deepseq erf mathFunctions monadPar mwcRandom primitive
vector vectorAlgorithms vectorBinaryInstances
];
testDepends = [

8
pkgs/development/libraries/haskell/streaming-commons/default.nix
View file

@ -1,15 +1,15 @@
# This file was auto-generated by cabal2nix. Please do NOT edit manually!
{ cabal, async, blazeBuilder, deepseq, hspec, network, QuickCheck
, random, text, transformers, zlib
, random, stm, text, transformers, zlib
}:
cabal.mkDerivation (self: {
pname = "streaming-commons";
version = "0.1.3.1";
sha256 = "0ryj9pp681f1pqvcyy5ci2zng6ax93j5navm886k095wxmamhzmf";
version = "0.1.4";
sha256 = "0p18sha2xa583rn9jyhylcykgrvydrwnl47c2wxf1c1yswn45iz6";
buildDepends = [
blazeBuilder network random text transformers zlib
blazeBuilder network random stm text transformers zlib
];
testDepends = [
async blazeBuilder deepseq hspec network QuickCheck text zlib

3
pkgs/development/libraries/haskell/thyme/default.nix
View file

@ -2,13 +2,14 @@
{ cabal, aeson, attoparsec, Cabal, deepseq, filepath, mtl
, profunctors, QuickCheck, random, systemPosixRedirect, text, time
, vector, vectorSpace, vectorThUnbox
, vector, vectorSpace, vectorThUnbox, cpphs
}:
cabal.mkDerivation (self: {
pname = "thyme";
version = "0.3.5.2";
sha256 = "1vb5qn9m88y9738d9znim5lprb8z10am5yjaksdjl151li8apd6x";
buildTools = [ cpphs ];
buildDepends = [
aeson attoparsec deepseq mtl profunctors QuickCheck random text
time vector vectorSpace vectorThUnbox

4
pkgs/development/libraries/haskell/unix-time/default.nix
View file

@ -4,8 +4,8 @@
cabal.mkDerivation (self: {
pname = "unix-time";
version = "0.3.1";
sha256 = "1r7glbcr3108zrlpy2d09jyk1gv9k90d5saajipmb1f5l45rdhnj";
version = "0.3.2";
sha256 = "0bbzrm4hprqsljwscpfmnw3ipj809q7570alzn1qampijsbb4cds";
buildDepends = [ binary ];
testDepends = [ doctest hspec QuickCheck time ];
meta = {

18
pkgs/development/libraries/haskell/webdriver/default.nix
View file

@ -1,21 +1,21 @@
# This file was auto-generated by cabal2nix. Please do NOT edit manually!
{ cabal, aeson, attoparsec, base64Bytestring, cond, dataDefault
, directoryTree, exceptions, filepath, HTTP, liftedBase
, monadControl, mtl, network, parallel, scientific, temporary, text
, time, transformers, transformersBase, unorderedContainers, vector
, zipArchive
, directoryTree, exceptions, filepath, httpClient, httpTypes
, liftedBase, monadControl, mtl, network, parallel, scientific
, temporary, text, time, transformers, transformersBase
, unorderedContainers, vector, zipArchive
}:
cabal.mkDerivation (self: {
pname = "webdriver";
version = "0.5.5";
sha256 = "1k656ghkaqlnp4a9dd99s3l2vm21zsqpqxwfg2lq5rx2yw402nga";
version = "0.6.0.1";
sha256 = "0qpk1i6qr12lcx25bdljwqxgdhf5qk67h04bp6vwmm16dwzsyqd1";
buildDepends = [
aeson attoparsec base64Bytestring cond dataDefault directoryTree
exceptions filepath HTTP liftedBase monadControl mtl network
scientific temporary text time transformers transformersBase
unorderedContainers vector zipArchive
exceptions filepath httpClient httpTypes liftedBase monadControl
mtl network scientific temporary text time transformers
transformersBase unorderedContainers vector zipArchive
];
testDepends = [ parallel text ];
jailbreak = true;

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

@ -4,8 +4,8 @@
cabal.mkDerivation (self: {
pname = "word8";
version = "0.1.0";
sha256 = "1729ip83wyw8w3v8mzmazaw5b9l81zg95hrkmfq3qjk5gz1s75s0";
version = "0.1.1";
sha256 = "1xpa0haacimrblxg3x3n5vdcnkg3ff5zqamppdarv0zvkcdj139r";
testDepends = [ hspec ];
meta = {
description = "Word8 library";

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

@ -6,8 +6,8 @@
cabal.mkDerivation (self: {
pname = "yaml";
version = "0.8.8.3";
sha256 = "031d1wx31mw9lw0swlcf1xfzdixaq6wmglhzaj9sixhid0r2isvf";
version = "0.8.8.4";
sha256 = "1mh5xv66cqvk0r5n6pwcm11m9489y40l69ca417yvymkksmncc7b";
isLibrary = true;
isExecutable = true;
buildDepends = [

2
pkgs/development/mobile/titaniumenv/build-app.nix
View file

@ -67,7 +67,7 @@ stdenv.mkDerivation {
security unlock-keychain -p "" $keychainName
security import ${iosCertificate} -k $keychainName -P "${iosCertificatePassword}" -A
provisioningId=$(grep UUID -A1 -a ${iosMobileProvisioningProfile} | grep -o "[-A-Z0-9]\{36\}")
provisioningId=$(grep UUID -A1 -a ${iosMobileProvisioningProfile} | grep -o "[-A-Za-z0-9]\{36\}")
# Ensure that the requested provisioning profile can be found

4
pkgs/development/mobile/titaniumenv/default.nix
View file

@ -1,4 +1,4 @@
{pkgs, pkgs_i686, xcodeVersion ? "5.0", tiVersion ? "3.2.1.GA"}:
{pkgs, pkgs_i686, xcodeVersion ? "5.0", tiVersion ? "3.2.3.GA"}:
let
# We have to use Oracle's JDK. On Darwin, just simply expose the host system's
@ -30,7 +30,7 @@ rec {
titaniumsdk = let
titaniumSdkFile = if tiVersion == "3.1.4.GA" then ./titaniumsdk-3.1.nix
else if tiVersion == "3.2.3.GA" then ./titaniumsdk-3.2.nix
else if tiVersion == "3.3.0.RC2" then ./titaniumsdk-3.3.nix
else if tiVersion == "3.3.0.GA" then ./titaniumsdk-3.3.nix
else throw "Titanium version not supported: "+tiVersion;
in
import titaniumSdkFile {

12
pkgs/development/mobile/titaniumenv/titaniumsdk-3.3.nix
View file

@ -1,14 +1,14 @@
{stdenv, fetchurl, unzip, makeWrapper, python, jdk}:
stdenv.mkDerivation {
name = "mobilesdk-3.3.0.RC2";
name = "mobilesdk-3.3.0.GA";
src = if (stdenv.system == "i686-linux" || stdenv.system == "x86_64-linux") then fetchurl {
url = http://builds.appcelerator.com/mobile/3.3.0/mobilesdk-3.3.0.RC2-linux.zip;
sha1 = "ad4d0003b81ffc5947c1961548ad4b8591aaec5b";
url = http://builds.appcelerator.com/mobile/3.3.0/mobilesdk-3.3.0.GA-linux.zip;
sha1 = "9a9cca05a4cf8700df60b7e9d9cd969ecb70d81e";
}
else if stdenv.system == "x86_64-darwin" then fetchurl {
url = http://builds.appcelerator.com/mobile/3.3.0/mobilesdk-3.3.0.RC2-osx.zip;
sha1 = "621080fdd48801bfec7113fef1f224caabf0d4dd";
url = http://builds.appcelerator.com/mobile/3.3.0/mobilesdk-3.3.0.GA-osx.zip;
sha1 = "c6333e4da2564b9c51b865c1db49a062fbc743af";
}
else throw "Platform: ${stdenv.system} not supported!";
@ -28,7 +28,7 @@ stdenv.mkDerivation {
# Rename ugly version number
cd mobilesdk/*
cd 3.3.0.RC2
cd 3.3.0.GA
# Zip files do not support timestamps lower than 1980. We have to apply a few work-arounds to cope with that
# Yes, I know it's nasty :-)

2
pkgs/development/mobile/xcodeenv/build-app.nix
View file

@ -60,7 +60,7 @@ stdenv.mkDerivation {
security import ${certificateFile} -k $keychainName -P "${certificatePassword}" -A
# Determine provisioning ID
PROVISIONING_PROFILE=$(grep UUID -A1 -a ${provisioningProfile} | grep -o "[-A-Z0-9]\{36\}")
PROVISIONING_PROFILE=$(grep UUID -A1 -a ${provisioningProfile} | grep -o "[-A-Za-z0-9]\{36\}")
if [ ! -f "$HOME/Library/MobileDevice/Provisioning Profiles/$PROVISIONING_PROFILE.mobileprovision" ]
then

23
pkgs/development/tools/documentation/haddock/2.14.3.nix Normal file
View file

@ -0,0 +1,23 @@
# This file was auto-generated by cabal2nix. Please do NOT edit manually!
{ cabal, Cabal, deepseq, filepath, ghcPaths, hspec, QuickCheck
, xhtml
}:
cabal.mkDerivation (self: {
pname = "haddock";
version = "2.14.3";
sha256 = "031ikrsbkpmmwgdkgdr8s19dfx5y6n39rmyljjdfqygas17gcm6l";
isLibrary = true;
isExecutable = true;
buildDepends = [ Cabal deepseq filepath ghcPaths xhtml ];
testDepends = [ Cabal deepseq filepath hspec QuickCheck ];
doCheck = false;
meta = {
homepage = "http://www.haskell.org/haddock/";
description = "A documentation-generation tool for Haskell libraries";
license = self.stdenv.lib.licenses.bsd3;
platforms = self.ghc.meta.platforms;
maintainers = [ self.stdenv.lib.maintainers.andres ];
};
})

4
pkgs/development/tools/haskell/HaRe/default.nix
View file

@ -9,8 +9,8 @@
cabal.mkDerivation (self: {
pname = "HaRe";
version = "0.7.2.4";
sha256 = "1ljyvs3mdgxzyvss071yvgnrnmhdyp9a10cmvij1d47li1wbj1j1";
version = "0.7.2.5";
sha256 = "09v0z1r03bzazgjf26fv54q1jpmv14zyl6w9083xcf2cs3yy6vfh";
isLibrary = true;
isExecutable = true;
buildDepends = [

5
pkgs/development/tools/haskell/codex/default.nix
View file

@ -6,10 +6,11 @@
cabal.mkDerivation (self: {
pname = "codex";
version = "0.1.0.1";
sha256 = "1s2sn2i0ah4wgyzz5vqkm65jkl3c38cwa2kp0az4xl3vb8y6x7la";
version = "0.1.0.2";
sha256 = "0dsc5dx5zcxf5wd2qf6gqzr8d613z1gkllmzzkbny3lxa512crsw";
isLibrary = true;
isExecutable = true;
jailbreak = true;
buildDepends = [
Cabal downloadCurl either filepath hackageDb MissingH monadLoops
tar text transformers yaml zlib

12
pkgs/development/tools/misc/usb-modeswitch/default.nix
View file

@ -1,11 +1,11 @@
{ stdenv, fetchurl, libusb }:
{ stdenv, fetchurl, pkgconfig, libusb1 }:
stdenv.mkDerivation {
name = "usb-modeswitch-1.1.2";
stdenv.mkDerivation rec {
name = "usb-modeswitch-2.2.0";
src =fetchurl {
url = "http://www.draisberghof.de/usb_modeswitch/usb-modeswitch-1.1.2.tar.bz2";
sha256 = "1wzhd0r49nh5y43qrvsi3c7a29206zwd6v8xlpb8dqm40xg3j9nz";
url = "http://www.draisberghof.de/usb_modeswitch/${name}.tar.bz2";
sha256 = "0flaj3mq0xhzk72kkpclwglf77kcw5rkwvkaimn5zvbiw4yi0li7";
};
# make clean: we always build from source. It should be necessary on x86_64 only
@ -16,7 +16,7 @@ stdenv.mkDerivation {
makeFlags="DESTDIR=$out PREFIX=$out"
'';
buildInputs = [ libusb ];
buildInputs = [ pkgconfig libusb1 ];
meta = {
license = "GPLv2";

19
pkgs/development/tools/vagrant/default.nix
View file

@ -4,18 +4,18 @@
assert stdenv.system == "x86_64-linux" || stdenv.system == "i686-linux";
stdenv.mkDerivation rec {
name = "vagrant-1.4.3";
name = "vagrant-1.6.3";
src =
if stdenv.system == "x86_64-linux" then
fetchurl {
url = https://dl.bintray.com/mitchellh/vagrant/vagrant_1.4.3_x86_64.deb;
sha256 = "dbd06de0f3560e2d046448d627bca0cbb0ee34b036ef605aa87ed20e6ad2684b";
url = https://dl.bintray.com/mitchellh/vagrant/vagrant_1.6.3_x86_64.deb;
sha256 = "1gmdg92dw7afnvpji0wg4nzr7vhk8mrmcqk3hcrkwscby2f2bhqg";
}
else
fetchurl {
url = https://dl.bintray.com/mitchellh/vagrant/vagrant_1.4.3_i686.deb;
sha256 = "66e613fc1c9e31ecaf8e5f1d07d2ae4fca3d4fc2e43593543962664258d9af9b";
url = https://dl.bintray.com/mitchellh/vagrant/vagrant_1.6.3_i686.deb;
sha256 = "1z26b6yghqgx8jbi2igf4kk4h6rzy869gli2vj7ayl7vbqdfvb60";
};
meta = with stdenv.lib; {
@ -81,4 +81,13 @@ stdenv.mkDerivation rec {
cp -r opt "$out"
cp -r usr/bin "$out"
'';
preFixup = ''
# 'hide' the template file from shebang-patching
chmod -x $out/opt/vagrant/embedded/gems/gems/bundler-1.6.2/lib/bundler/templates/Executable
'';
postFixup = ''
chmod +x $out/opt/vagrant/embedded/gems/gems/bundler-1.6.2/lib/bundler/templates/Executable
'';
}

11
pkgs/servers/monitoring/munin/default.nix
View file

@ -99,18 +99,17 @@ stdenv.mkDerivation rec {
ln -s $out/nix-support/propagated-native-build-inputs $out/nix-support/propagated-user-env-packages
fi
# TODO: toPerlLibPath can be added to
# pkgs/development/interpreters/perl5.16/setup-hook.sh (and the other perl
# versions) just like for python. NOTE: it causes massive rebuilds.
# $(toPerlLibPath $out perlPackages.Log4Perl ...)
for file in "$out"/bin/munindoc "$out"/sbin/munin-* "$out"/lib/munin-* "$out"/www/cgi/*; do
# don't wrap .jar files
case "$file" in
*.jar) continue;;
esac
wrapProgram "$file" \
--set PERL5LIB "$out/lib/perl5/site_perl:${perlPackages.Log4Perl}/lib/perl5/site_perl:${perlPackages.IOSocketInet6}/lib/perl5/site_perl:${perlPackages.Socket6}/lib/perl5/site_perl:${perlPackages.URI}/lib/perl5/site_perl:${perlPackages.DBFile}/lib/perl5/site_perl:${perlPackages.DateManip}/lib/perl5/site_perl:${perlPackages.HTMLTemplate}/lib/perl5/site_perl:${perlPackages.FileCopyRecursive}/lib/perl5/site_perl:${perlPackages.FCGI}/lib/perl5/site_perl:${perlPackages.NetSNMP}/lib/perl5/site_perl:${perlPackages.NetServer}/lib/perl5/site_perl:${perlPackages.ListMoreUtils}/lib/perl5/site_perl:${perlPackages.TimeHiRes}/lib/perl5/site_perl:${rrdtool}/lib/perl:${perlPackages.DBDPg}/lib/perl5/site_perl:${perlPackages.LWPUserAgent}/lib/perl5/site_perl"
--set PERL5LIB "$out/lib/perl5/site_perl:${with perlPackages; stdenv.lib.makePerlPath [
Log4Perl IOSocketInet6 Socket6 URI DBFile DateManip
HTMLTemplate FileCopyRecursive FCGI NetSNMP NetServer
ListMoreUtils TimeHiRes DBDPg LWPUserAgent
]}"
done
'';

2
pkgs/servers/mpd/default.nix
View file

@ -55,7 +55,7 @@ in stdenv.mkDerivation rec {
++ opt mpg123Support mpg123
++ opt aacSupport faad2
++ opt zipSupport zziplib
++ opt zipSupport pulseaudio;
++ opt pulseaudioSupport pulseaudio;
configureFlags =
[ (mkFlag (!stdenv.isDarwin && alsaSupport) "alsa")

2
pkgs/shells/zsh/default.nix
View file

@ -70,6 +70,6 @@ EOF
license = "MIT-like";
homePage = "http://www.zsh.org/";
maintainers = with stdenv.lib.maintainers; [ chaoflow ];
platforms = stdenv.lib.platforms.gnu; # arbitrary choice
platforms = stdenv.lib.platforms.unix;
};
}

6
pkgs/tools/networking/connman/default.nix
View file

@ -3,11 +3,11 @@
wpa_supplicant, readline6, pptp, ppp, tree }:
stdenv.mkDerivation {
name = "connman-1.20";
name = "connman-1.24";
src = fetchgit {
url = "git://git.kernel.org/pub/scm/network/connman/connman.git";
rev = "8047f3d051b32d38ac0b1e78296b482368728ec6";
sha256 = "0hb03rzrspgry8z43x8x76vlq1hdq2wggkk7wbidavnqhpmz7dxz";
rev = "11b8a873988ab5fc3f360c5b6fb25a6761fe7683";
sha256 = "12z1krm5qnjyamc3qr2px7wvz7qkss7jk5brnmhyalqmcnkwcbrm";
};
buildInputs = [ autoconf automake libtool pkgconfig openconnect polkit

6
pkgs/tools/package-management/nix/unstable.nix
View file

@ -5,11 +5,11 @@
}:
stdenv.mkDerivation rec {
name = "nix-1.8pre3666_5bcb982";
name = "nix-1.8pre3679_f609eec";
src = fetchurl {
url = "http://hydra.nixos.org/build/12516859/download/5/${name}.tar.xz";
sha256 = "6b968ec6db727dad2dc1fb6d31395996bd7cad14fddadfa996661c1f2c142c32";
url = "http://hydra.nixos.org/build/12606291/download/5/${name}.tar.xz";
sha256 = "d185c00db8c1ab977d37695da0130628290af8dc315b3e24aa24d3ee25cdf875";
};
nativeBuildInputs = [ perl pkgconfig ];

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

@ -4156,7 +4156,9 @@ let
uncrustify = callPackage ../development/tools/misc/uncrustify { };
vagrant = callPackage ../development/tools/vagrant { };
vagrant = callPackage ../development/tools/vagrant {
ruby = ruby2;
};
gdb = callPackage ../development/tools/misc/gdb {
hurd = gnu.hurdCross;
@ -10481,6 +10483,11 @@ let
import ../desktops/e17 { inherit callPackage pkgs; }
);
e18 = recurseIntoAttrs (
let callPackage = newScope pkgs.e18; in
import ../desktops/e18 { inherit callPackage pkgs; }
);
gnome2 = callPackage ../desktops/gnome-2 {
callPackage = pkgs.newScope pkgs.gnome2;
self = pkgs.gnome2;

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

@ -141,7 +141,8 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in
aeson_0_7_0_4 = callPackage ../development/libraries/haskell/aeson/0.7.0.4.nix { blazeBuilder = null; };
aeson_0_7_0_6 = callPackage ../development/libraries/haskell/aeson/0.7.0.6.nix { blazeBuilder = null; };
aeson = self.aeson_0_7_0_6;
aeson_0_8_0_0 = callPackage ../development/libraries/haskell/aeson/0.8.0.0.nix { blazeBuilder = null; };
aeson = self.aeson_0_7_0_6; # 0.8.0.0 breaks too many packages at the moment
aesonPretty = callPackage ../development/libraries/haskell/aeson-pretty {};
@ -163,6 +164,8 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in
ansiWlPprint = callPackage ../development/libraries/haskell/ansi-wl-pprint {};
applicativeQuoters = callPackage ../development/libraries/haskell/applicative-quoters {};
ariadne = callPackage ../development/libraries/haskell/ariadne {};
arithmoi = callPackage ../development/libraries/haskell/arithmoi {};
@ -1725,7 +1728,8 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in
parsers_0_10_3 = callPackage ../development/libraries/haskell/parsers/0.10.3.nix {};
parsers_0_11_0_3 = callPackage ../development/libraries/haskell/parsers/0.11.0.3.nix {};
parsers = self.parsers_0_11_0_3;
parsers_0_12 = callPackage ../development/libraries/haskell/parsers/0.12.nix {};
parsers = self.parsers_0_11_0_3; # the new version breaks trifecta
parsimony = callPackage ../development/libraries/haskell/parsimony {};
@ -1875,7 +1879,8 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in
QuickCheck_2_5_1_1 = callPackage ../development/libraries/haskell/QuickCheck/2.5.1.1.nix {};
QuickCheck_2_6 = callPackage ../development/libraries/haskell/QuickCheck/2.6.nix {};
QuickCheck_2_7_5 = callPackage ../development/libraries/haskell/QuickCheck/2.7.5.nix {};
QuickCheck = self.QuickCheck_2_7_5;
QuickCheck_2_7_6 = callPackage ../development/libraries/haskell/QuickCheck/2.7.6.nix {};
QuickCheck = self.QuickCheck_2_7_6;
quickcheckAssertions = callPackage ../development/libraries/haskell/quickcheck-assertions {};
@ -2708,6 +2713,7 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in
Agda_2_3_2_2 = callPackage ../development/compilers/agda/2.3.2.2.nix {};
Agda_2_4_0_1 = callPackage ../development/compilers/agda/2.4.0.1.nix {
binary = self.binary_0_7_2_1;
QuickCheck = self.QuickCheck_2_7_5;
};
Agda = self.Agda_2_4_0_1;
@ -2758,7 +2764,8 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in
haddock_2_12_0 = callPackage ../development/tools/documentation/haddock/2.12.0.nix {};
haddock_2_13_2 = callPackage ../development/tools/documentation/haddock/2.13.2.nix {};
haddock_2_14_2 = callPackage ../development/tools/documentation/haddock/2.14.2.nix {};
haddock = self.haddock_2_14_2;
haddock_2_14_3 = callPackage ../development/tools/documentation/haddock/2.14.3.nix {};
haddock = self.haddock_2_14_3;
HandsomeSoup = callPackage ../development/libraries/haskell/HandsomeSoup {};

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

@ -9511,6 +9511,27 @@ rec {
};
};
pythonefl = buildPythonPackage rec {
name = "python-efl-${version}";
version = "1.10.0";
src = fetchurl {
url = "http://download.enlightenment.org/rel/bindings/python/${name}.tar.gz";
sha256 = "1inv2qalnm9paifdwyh9q3ffxcp9bjj92phvfw1rgkaildvfji5i";
};
preConfigure = ''
export NIX_CFLAGS_COMPILE="-I${pkgs.e18.efl}/include/eo-1 -I${pkgs.e18.efl}/include/eina-1 -I${pkgs.e18.efl}/include/eina-1/eina -I${pkgs.e18.efl}/include/evas-1 -I${dbus}/include/dbus-1.0 -I${pkgs.e18.efl}/include/efl-1 -I${pkgs.e18.efl}/include/eet-1 -I${pkgs.e18.efl}/include/ecore-1 -I${pkgs.e18.efl}/include/ecore-evas-1 -I${pkgs.e18.efl}/include/ecore-file-1 -I${pkgs.e18.efl}/include/ecore-input-1 -I${pkgs.e18.efl}/include/ecore-imf-1 -I${pkgs.e18.efl}/include/ecore-con-1 -I${pkgs.e18.efl}/include/edje-1 -I${pkgs.e18.efl}/include/eldbus-1 -I${pkgs.e18.efl}/include/efreet-1 -I${pkgs.e18.efl}/include/ethumb-client-1 -I${pkgs.e18.efl}/include/ethumb-1 -I${pkgs.e18.efl}/include/ecore-x-1 $NIX_CFLAGS_COMPILE"
'';
buildInputs = [ pkgs.pkgconfig pkgs.e18.efl pkgs.e18.elementary ];
meta = {
description = "Python bindings for EFL and Elementary.";
homepage = http://enlightenment.org/;
maintainers = [ stdenv.lib.maintainers.matejc ];
platforms = stdenv.lib.platforms.linux;
license = stdenv.lib.licenses.gpl3;
};
};
# python2.7 specific packages
} // optionalAttrs isPy27 (
with pythonPackages;