mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-11-21 13:10:33 +00:00
Merge branch 'master' into p/stdenv
This commit is contained in:
Vladimír Čunát
commit
ba190a71c7
|
|
@ -107,6 +107,7 @@
|
|||
./services/desktops/gnome3/gnome-online-accounts.nix
|
||||
./services/desktops/gnome3/gnome-online-miners.nix
|
||||
./services/desktops/gnome3/gnome-user-share.nix
|
||||
./services/desktops/gnome3/gvfs.nix
|
||||
./services/desktops/gnome3/seahorse.nix
|
||||
./services/desktops/gnome3/sushi.nix
|
||||
./services/desktops/gnome3/tracker.nix
|
||||
|
|
|
|||
|
|
@ -7,8 +7,6 @@ let
|
|||
|
||||
inherit (pkgs) alsaUtils;
|
||||
|
||||
soundState = "/var/lib/alsa/asound.state";
|
||||
|
||||
in
|
||||
|
||||
{
|
||||
|
|
@ -35,6 +33,17 @@ in
|
|||
'';
|
||||
};
|
||||
|
||||
extraConfig = mkOption {
|
||||
type = types.lines;
|
||||
default = "";
|
||||
example = ''
|
||||
defaults.pcm.!card 3
|
||||
'';
|
||||
description = ''
|
||||
Set addition configuration for system-wide alsa.
|
||||
'';
|
||||
};
|
||||
|
||||
};
|
||||
|
||||
};
|
||||
|
|
@ -46,6 +55,13 @@ in
|
|||
|
||||
environment.systemPackages = [ alsaUtils ];
|
||||
|
||||
environment.etc = mkIf (config.sound.extraConfig != "")
|
||||
[
|
||||
{ source = pkgs.writeText "asound.conf" config.sound.extraConfig;
|
||||
target = "asound.conf";
|
||||
}
|
||||
];
|
||||
|
||||
# ALSA provides a udev rule for restoring volume settings.
|
||||
services.udev.packages = [ alsaUtils ];
|
||||
|
||||
|
|
|
|||
42
nixos/modules/services/desktops/gnome3/gvfs.nix
Normal file
42
nixos/modules/services/desktops/gnome3/gvfs.nix
Normal file
|
|
@ -0,0 +1,42 @@
|
|||
# gvfs backends
|
||||
|
||||
{ config, pkgs, ... }:
|
||||
|
||||
with pkgs.lib;
|
||||
|
||||
let
|
||||
gnome3 = config.environment.gnome3.packageSet;
|
||||
in
|
||||
{
|
||||
|
||||
###### interface
|
||||
|
||||
options = {
|
||||
|
||||
services.gnome3.gvfs = {
|
||||
|
||||
enable = mkOption {
|
||||
type = types.bool;
|
||||
default = false;
|
||||
description = ''
|
||||
Whether to enable gvfs backends, userspace virtual filesystem used
|
||||
by GNOME components via D-Bus.
|
||||
'';
|
||||
};
|
||||
|
||||
};
|
||||
|
||||
};
|
||||
|
||||
|
||||
###### implementation
|
||||
|
||||
config = mkIf config.services.gnome3.gvfs.enable {
|
||||
|
||||
environment.systemPackages = [ gnome3.gvfs ];
|
||||
|
||||
services.dbus.packages = [ gnome3.gvfs ];
|
||||
|
||||
};
|
||||
|
||||
}
|
||||
|
|
@ -63,6 +63,7 @@ in {
|
|||
services.gnome3.gnome-keyring.enable = true;
|
||||
services.gnome3.gnome-online-accounts.enable = mkDefault true;
|
||||
services.gnome3.gnome-user-share.enable = mkDefault true;
|
||||
services.gnome3.gvfs.enable = true;
|
||||
services.gnome3.seahorse.enable = mkDefault true;
|
||||
services.gnome3.sushi.enable = mkDefault true;
|
||||
services.gnome3.tracker.enable = mkDefault true;
|
||||
|
|
@ -86,8 +87,9 @@ in {
|
|||
export XDG_MENU_PREFIX=gnome
|
||||
|
||||
# Don't let epiphany depend upon gnome-shell
|
||||
# Don't let gnome-session depend upon vino (for .desktop autostart condition)
|
||||
# Override default mimeapps
|
||||
export XDG_DATA_DIRS=$XDG_DATA_DIRS''${XDG_DATA_DIRS:+:}${gnome3.gnome_shell}/share/gsettings-schemas/${gnome3.gnome_shell.name}:${mimeAppsList}/share
|
||||
export XDG_DATA_DIRS=$XDG_DATA_DIRS''${XDG_DATA_DIRS:+:}${gnome3.gnome_shell}/share/gsettings-schemas/${gnome3.gnome_shell.name}:${gnome3.vino}/share/gsettings-schemas/${gnome3.vino.name}:${mimeAppsList}/share
|
||||
|
||||
# Let gnome-control-center find gnome-shell search providers
|
||||
export GNOME_SEARCH_PROVIDERS_DIR=${config.system.path}/share/gnome-shell/search-providers/
|
||||
|
|
@ -101,13 +103,15 @@ in {
|
|||
};
|
||||
|
||||
environment.variables.GIO_EXTRA_MODULES = [ "${gnome3.dconf}/lib/gio/modules"
|
||||
"${gnome3.glib_networking}/lib/gio/modules" ];
|
||||
"${gnome3.glib_networking}/lib/gio/modules"
|
||||
"${gnome3.gvfs}/lib/gio/modules" ];
|
||||
environment.systemPackages =
|
||||
[ pkgs.desktop_file_utils
|
||||
gnome3.glib_networking
|
||||
gnome3.gtk3 # for gtk-update-icon-cache
|
||||
pkgs.ibus
|
||||
pkgs.shared_mime_info # for update-mime-database
|
||||
gnome3.gvfs
|
||||
gnome3.dconf
|
||||
gnome3.gnome-backgrounds
|
||||
gnome3.gnome_control_center
|
||||
|
|
|
|||
|
|
@ -65,7 +65,7 @@ let
|
|||
${if cfg.useBootLoader then ''
|
||||
-drive index=0,id=drive1,file=$NIX_DISK_IMAGE,if=virtio,cache=writeback,werror=report \
|
||||
-drive index=1,id=drive2,file=${bootDisk}/disk.img,if=virtio,readonly \
|
||||
-boot menu=on
|
||||
-boot menu=on \
|
||||
'' else ''
|
||||
-drive file=$NIX_DISK_IMAGE,if=virtio,cache=writeback,werror=report \
|
||||
-kernel ${config.system.build.toplevel}/kernel \
|
||||
|
|
|
|||
|
|
@ -6,7 +6,7 @@
|
|||
, perl, pkgconfig, python, serd, sord, sratom, suil }:
|
||||
|
||||
let
|
||||
tag = "3.5.357";
|
||||
tag = "3.5.380";
|
||||
in
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
|
|
@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
|
|||
src = fetchgit {
|
||||
url = git://git.ardour.org/ardour/ardour.git;
|
||||
rev = "refs/tags/${tag}";
|
||||
sha256 = "1e026fb9a6ad4179d52c4b578cc3861bdfd3629b9e7b7a7341d431c7d3692c42";
|
||||
sha256 = "dbcbb2d9143e196d079c27b15266e47d24b81cb7591fe64b717f3485965ded7b";
|
||||
};
|
||||
|
||||
buildInputs =
|
||||
|
|
@ -28,9 +28,9 @@ stdenv.mkDerivation rec {
|
|||
|
||||
patchPhase = ''
|
||||
# The funny revision number is from `git describe rev`
|
||||
printf '#include "libs/ardour/ardour/revision.h"\nnamespace ARDOUR { const char* revision = \"${tag}-gce4d125\"; }\n' > libs/ardour/revision.cc
|
||||
printf '#include "libs/ardour/ardour/revision.h"\nnamespace ARDOUR { const char* revision = \"${tag}-g2f6065b\"; }\n' > libs/ardour/revision.cc
|
||||
# Note the different version number
|
||||
sed -i '33i rev = \"3.5-357-gce4d125\"' wscript
|
||||
sed -i '33i rev = \"3.5-380-g2f6065b\"' wscript
|
||||
sed 's|/usr/include/libintl.h|${glibc}/include/libintl.h|' -i wscript
|
||||
sed -e 's|^#!/usr/bin/perl.*$|#!${perl}/bin/perl|g' -i tools/fmt-bindings
|
||||
sed -e 's|^#!/usr/bin/env.*$|#!${perl}/bin/perl|g' -i tools/*.pl
|
||||
|
|
|
|||
|
|
@ -1,8 +1,10 @@
|
|||
{ stdenv, fetchurl, boost, cmake, gettext, gstreamer, gst_plugins_base
|
||||
, liblastfm, qt4, taglib, fftw, glew, qjson, sqlite, libgpod, libplist
|
||||
, usbmuxd, libmtp, gvfs, libcdio, protobuf, libspotify, qca2, pkgconfig
|
||||
, sparsehash }:
|
||||
, sparsehash, config }:
|
||||
|
||||
let withSpotify = config.clementine.spotify or false;
|
||||
in
|
||||
stdenv.mkDerivation {
|
||||
name = "clementine-1.2.1";
|
||||
|
||||
|
|
@ -27,7 +29,6 @@ stdenv.mkDerivation {
|
|||
liblastfm
|
||||
libmtp
|
||||
libplist
|
||||
libspotify
|
||||
pkgconfig
|
||||
protobuf
|
||||
qca2
|
||||
|
|
@ -37,7 +38,7 @@ stdenv.mkDerivation {
|
|||
sqlite
|
||||
taglib
|
||||
usbmuxd
|
||||
];
|
||||
] ++ stdenv.lib.optional withSpotify libspotify;
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
homepage = "http://www.clementine-player.org";
|
||||
|
|
@ -45,6 +46,7 @@ stdenv.mkDerivation {
|
|||
license = licenses.gpl3Plus;
|
||||
platforms = platforms.linux;
|
||||
maintainers = [ maintainers.ttuegel ];
|
||||
hydraPlatforms = []; # libspotify is unfree
|
||||
# libspotify is unfree
|
||||
hydraPlatforms = optional (!withSpotify) platforms.linux;
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -2,11 +2,11 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "drumkv1-${version}";
|
||||
version = "0.4.1";
|
||||
version = "0.4.2";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://sourceforge/drumkv1/${name}.tar.gz";
|
||||
sha256 = "0wxbn5qm3dn9spwbm618flgrwvls7bipg0nhgn0lv4za2g823g56";
|
||||
sha256 = "18rvfgblynlmklk25azmppibn1bdjid97hipa323gnzmxgq0rfjq";
|
||||
};
|
||||
|
||||
buildInputs = [ jackaudio libsndfile lv2 qt4 ];
|
||||
|
|
|
|||
|
|
@ -1,17 +1,17 @@
|
|||
{ stdenv, fetchurl, ncurses, pkgconfig, alsaLib, flac, libmad, speex, ffmpeg_0_10, libvorbis, mpc, libsndfile, jackaudio, db, libmodplug, timidity, libid3tag, libtool }:
|
||||
{ stdenv, fetchurl, ncurses, pkgconfig, alsaLib, flac, libmad, speex, ffmpeg, libvorbis, mpc, libsndfile, jackaudio, db, libmodplug, timidity, libid3tag, libtool }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "moc-${version}";
|
||||
version = "2.5.0-beta1";
|
||||
version = "2.5.0-beta2";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://ftp.daper.net/pub/soft/moc/unstable/moc-${version}.tar.bz2";
|
||||
sha256 = "076816da9c6d1e61a386a1dda5f63ee2fc84bc31e9011ef70acc1d391d4c46a6";
|
||||
sha256 = "486d50584c3fb0067b8c03af54e44351633a7740b18dc3b7358322051467034c";
|
||||
};
|
||||
|
||||
configurePhase = "./configure prefix=$out";
|
||||
|
||||
buildInputs = [ ncurses pkgconfig alsaLib flac libmad speex ffmpeg_0_10 libvorbis mpc libsndfile jackaudio db libmodplug timidity libid3tag libtool ];
|
||||
buildInputs = [ ncurses pkgconfig alsaLib flac libmad speex ffmpeg libvorbis mpc libsndfile jackaudio db libmodplug timidity libid3tag libtool ];
|
||||
|
||||
meta = {
|
||||
description = "MOC (music on console) is a console audio player for LINUX/UNIX designed to be powerful and easy to use.";
|
||||
|
|
|
|||
|
|
@ -3,12 +3,12 @@
|
|||
, libtool, libvorbis, pkgconfig, qt4, rubberband, stdenv }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
version = "0.6.0";
|
||||
version = "0.6.1";
|
||||
name = "qtractor-${version}";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://sourceforge/qtractor/${name}.tar.gz";
|
||||
sha256 = "0aw6g0biqzysnsk5vd6wx3q1khyav6krhjz7bzk0v7d2160bn40r";
|
||||
sha256 = "09lyz1pn2dadr1ii2msyv3n13kq3mbgpcwcyfm0brm01c2fnh6wc";
|
||||
};
|
||||
|
||||
buildInputs =
|
||||
|
|
|
|||
|
|
@ -2,11 +2,11 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "samplv1-${version}";
|
||||
version = "0.4.1";
|
||||
version = "0.4.2";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://sourceforge/samplv1/${name}.tar.gz";
|
||||
sha256 = "1cx3qs9vrdwmym2qsghqq53bshnjqgpqypsilr1m2i1cpfnfrr6x";
|
||||
sha256 = "1vr6jbqnsgdq3v2h1ndp4pirnil3119dqwlq0k0kdscmcskvb9j4";
|
||||
};
|
||||
|
||||
buildInputs = [ jackaudio libsndfile lv2 qt4 ];
|
||||
|
|
|
|||
|
|
@ -2,11 +2,11 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "synthv1-${version}";
|
||||
version = "0.4.1";
|
||||
version = "0.4.2";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://sourceforge/synthv1/${name}.tar.gz";
|
||||
sha256 = "1j1x8n3rlwrh373wqmm6mj3cgyk3apvnpqygx1700fl4cf249agl";
|
||||
sha256 = "1r4fszbzwd0yfcch0mcsmh7781zw1317hiljn85w79721fs2m8hc";
|
||||
};
|
||||
|
||||
buildInputs = [ qt4 jackaudio lv2 ];
|
||||
|
|
|
|||
|
|
@ -1,11 +1,11 @@
|
|||
{ fetchurl, stdenv, emacs, texinfo, which, texLive }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "org-8.2.1";
|
||||
name = "org-8.2.6";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://orgmode.org/${name}.tar.gz";
|
||||
sha256 = "625e2b6786158bcf6c43194075f7638ab8048c68a60025289a051c407e467823";
|
||||
sha256 = "0f196r0n9m2np123sjabsqdw68h9qp6qr7l5v257am8qs7rj0jm1";
|
||||
};
|
||||
|
||||
buildInputs = [ emacs ];
|
||||
|
|
|
|||
|
|
@ -19,6 +19,7 @@ cabal.mkDerivation (self: {
|
|||
tastyGolden tastyHunit time transformers utf8String
|
||||
];
|
||||
extraLibraries = [ libXScrnSaver ];
|
||||
jailbreak = true;
|
||||
meta = {
|
||||
homepage = "http://arbtt.nomeata.de/";
|
||||
description = "Automatic Rule-Based Time Tracker";
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
{ stdenv, fetchurl, pkgconfig, which, openssl, qt4, libtool }:
|
||||
{ stdenv, fetchurl, pkgconfig, which, openssl, qt4, libtool, gcc, makeWrapper }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "xca-${version}";
|
||||
|
|
@ -15,7 +15,12 @@ stdenv.mkDerivation rec {
|
|||
prefix=$out ./configure ${openssl} ${libtool}
|
||||
'';
|
||||
|
||||
buildInputs = [ openssl qt4 libtool ];
|
||||
postInstall = ''
|
||||
wrapProgram "$out/bin/xca" \
|
||||
--prefix LD_LIBRARY_PATH : "${qt4}/lib:${gcc.gcc}/lib:${gcc.gcc}/lib64:${openssl}/lib:${libtool}/lib"
|
||||
'';
|
||||
|
||||
buildInputs = [ openssl qt4 libtool gcc makeWrapper ];
|
||||
nativeBuildInputs = [ pkgconfig ];
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
|
|
|
|||
|
|
@ -1,6 +1,7 @@
|
|||
{ cabal, alsaCore, alsaMixer, filepath, HTTP, libmpd, libXrandr
|
||||
, mtl, parsec, regexCompat, stm, time, utf8String, wirelesstools
|
||||
, X11, X11Xft
|
||||
{ cabal, alsaCore, alsaMixer, dbus, filepath, hinotify, HTTP
|
||||
, libmpd, libXrandr, mtl, parsec, regexCompat, stm, time
|
||||
, timezoneOlson, timezoneSeries, utf8String, wirelesstools, X11
|
||||
, X11Xft
|
||||
}:
|
||||
|
||||
cabal.mkDerivation (self: {
|
||||
|
|
@ -10,11 +11,12 @@ cabal.mkDerivation (self: {
|
|||
isLibrary = false;
|
||||
isExecutable = true;
|
||||
buildDepends = [
|
||||
alsaCore alsaMixer filepath HTTP libmpd mtl parsec regexCompat stm
|
||||
time utf8String X11 X11Xft
|
||||
alsaCore alsaMixer dbus filepath hinotify HTTP libmpd mtl parsec
|
||||
regexCompat stm time timezoneOlson timezoneSeries utf8String X11
|
||||
X11Xft
|
||||
];
|
||||
extraLibraries = [ libXrandr wirelesstools ];
|
||||
configureFlags = "-fwith_xft -fwith_iwlib -fwith_alsa -fwith_mpd";
|
||||
configureFlags = "-fall_extensions";
|
||||
meta = {
|
||||
homepage = "http://projects.haskell.org/xmobar/";
|
||||
description = "A Minimalistic Text Based Status Bar";
|
||||
|
|
|
|||
|
|
@ -2,12 +2,12 @@
|
|||
m4, glib_networking, gsettings_desktop_schemas }:
|
||||
|
||||
stdenv.mkDerivation {
|
||||
name = "dwb-2014-04-20";
|
||||
name = "dwb-2014-05-23";
|
||||
|
||||
src = fetchgit {
|
||||
url = "https://bitbucket.org/portix/dwb.git";
|
||||
rev = "117a6a8cdb84b30b0c084dee531b650664d09ba2";
|
||||
sha256 = "1k1nax3ij64b2hbn9paqj128yyzy41b61xd2m1ayq9y17k9als0b";
|
||||
rev = "813457c0cb6603d3b7a548fc97a8298a7fac34fa";
|
||||
sha256 = "1fywnf3yp6p84hap40nb9vrz1gswgnhppygmi1gzjzz3bphwf5pr";
|
||||
};
|
||||
|
||||
buildInputs = [ pkgconfig makeWrapper gsettings_desktop_schemas libsoup webkit gtk3 gnutls json_c m4 ];
|
||||
|
|
|
|||
|
|
@ -1,11 +1,11 @@
|
|||
{ stdenv, fetchurl, openssl, curl, coreutils, gawk, bash, which }:
|
||||
|
||||
stdenv.mkDerivation {
|
||||
name = "esniper-2.29.0";
|
||||
name = "esniper-2.30.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://sourceforge/esniper/esniper-2-29-0.tgz";
|
||||
sha256 = "052jfbzm0a88h3hss2vg1vfdrhibjwhbcdnwsbkk5i1z0jj16xxc";
|
||||
url = "mirror://sourceforge/esniper/esniper-2-30-0.tgz";
|
||||
sha256 = "1p85d5qfr3f35xfj5555ck4wwk5hqkh65ivam1527p8dwcz00wpl";
|
||||
};
|
||||
|
||||
buildInputs = [ openssl curl ];
|
||||
|
|
|
|||
|
|
@ -3,14 +3,14 @@
|
|||
, pythonPackages, cacert, cmake, makeWrapper }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
rev = "6f64ee699ba46c90b55d3b99c60e4807819e2b7b";
|
||||
version = "0.4.4-rev${rev}";
|
||||
rev = "02eed97d977567b0fb16cfeeaeebb863eab1e509";
|
||||
version = "1.0-rev${rev}";
|
||||
name = "weechat-${version}";
|
||||
|
||||
src = fetchgit {
|
||||
inherit rev;
|
||||
url = "git://github.com/weechat/weechat.git";
|
||||
sha256 = "1w58gir48kxvscf6njy3kmfxbjlnsf2byw3g3w6r47zjkgyxcf1z";
|
||||
sha256 = "0nk0p9chvn0h2pzq9793k2dz8h5iplz0zwqzyds55fbmsgzz51g2";
|
||||
};
|
||||
|
||||
buildInputs =
|
||||
|
|
|
|||
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
stdenv.mkDerivation rec
|
||||
{
|
||||
version = "2.1.1";
|
||||
version = "3.0.4";
|
||||
name = "seafile-client-${version}";
|
||||
|
||||
src = fetchurl
|
||||
{
|
||||
url = "https://github.com/haiwen/seafile-client/archive/v${version}.tar.gz";
|
||||
sha256 = "d98515ea229df702cbe973d85ec0bd5cf3f5282ef1022ba0157d5301b521c8e0";
|
||||
sha256 = "10iz45y8j5f9smi0srxw62frb97vhr0w938v8w3rsjcw9qq366a2";
|
||||
};
|
||||
|
||||
buildInputs = [ pkgconfig cmake qt4 seafile-shared makeWrapper ];
|
||||
|
|
|
|||
|
|
@ -1,11 +1,11 @@
|
|||
{stdenv, glibc, glibcLocales, gcc, coreutils, diffutils, findutils, gnused, gnugrep, gnutar, gzip, bzip2,
|
||||
bashInteractive, xz, shadow, gawk, less, su, buildEnv}:
|
||||
bashInteractive, xz, shadow, gawk, less, buildEnv}:
|
||||
{name, pkgs ? [], profile ? ""}:
|
||||
|
||||
let
|
||||
basePkgs = [
|
||||
glibc glibcLocales gcc coreutils diffutils findutils gnused gnugrep gnutar
|
||||
gzip bzip2 bashInteractive xz shadow gawk less su
|
||||
gzip bzip2 bashInteractive xz shadow gawk less
|
||||
];
|
||||
|
||||
# Compose a global profile for the chroot environment
|
||||
|
|
|
|||
|
|
@ -3,4 +3,4 @@
|
|||
chrootenvDest=/run/chrootenv/@name@
|
||||
|
||||
# Enter the LFS chroot environment
|
||||
chroot $chrootenvDest /usr/bin/env -i PS1="$PS1" TERM="$TERM" DISPLAY="$DISPLAY" HOME="/root" PATH="/bin:/sbin" /bin/bash --login
|
||||
sudo chroot --userspec "$USER:${GROUPS[0]}" --groups "${GROUPS[0]}" $chrootenvDest /usr/bin/env -i PS1="$PS1" TERM="$TERM" DISPLAY="$DISPLAY" HOME="$HOME" PATH="/bin:/sbin" XDG_RUNTIME_DIR="$XDG_RUNTIME_DIR" /bin/bash --login
|
||||
|
|
|
|||
|
|
@ -17,7 +17,7 @@ mount --bind /home $chrootenvDest/home
|
|||
|
||||
# Bind mount state directories
|
||||
mount --bind /var $chrootenvDest/var
|
||||
mount --bind /run $chrootenvDest/run
|
||||
mount --rbind /run $chrootenvDest/run
|
||||
|
||||
# Bind mount the host system's /etc
|
||||
mount --bind /etc $chrootenvDest/host-etc
|
||||
|
|
|
|||
|
|
@ -2,5 +2,5 @@
|
|||
|
||||
chrootenvDest=/run/chrootenv/@name@
|
||||
|
||||
# Unmount all bind mounts
|
||||
umount $chrootenvDest/{dev/pts,dev/shm,dev,nix/store,proc,sys,host-etc,home,var,run}
|
||||
# Unmount all (r)bind mounts
|
||||
umount -l $chrootenvDest/{dev/pts,dev/shm,dev,nix/store,proc,sys,host-etc,home,var,run}
|
||||
|
|
|
|||
|
|
@ -28,7 +28,7 @@ stdenv.mkDerivation rec {
|
|||
accountservice krb5 networkmanagerapplet libwacom samba libnotify libxkbfile
|
||||
shared_mime_info icu libtool docbook_xsl docbook_xsl_ns gnome3.grilo
|
||||
gdk_pixbuf gnome3.gnome_icon_theme librsvg clutter clutter_gtk
|
||||
hicolor_icon_theme gnome3.gnome_icon_theme_symbolic
|
||||
hicolor_icon_theme gnome3.gnome_icon_theme_symbolic gnome3.vino
|
||||
networkmanager modemmanager makeWrapper ];
|
||||
|
||||
preBuild = ''
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
{ stdenv, intltool, fetchurl, gtk3, glib, libsoup, pkgconfig, makeWrapper
|
||||
, libnotify, file }:
|
||||
, libnotify, file, telepathy_glib, dbus_glib }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "vino-${versionMajor}.${versionMinor}";
|
||||
|
|
@ -13,7 +13,8 @@ stdenv.mkDerivation rec {
|
|||
|
||||
doCheck = true;
|
||||
|
||||
buildInputs = [ gtk3 intltool glib libsoup pkgconfig libnotify file makeWrapper ];
|
||||
buildInputs = [ gtk3 intltool glib libsoup pkgconfig libnotify
|
||||
dbus_glib telepathy_glib file makeWrapper ];
|
||||
|
||||
preFixup = ''
|
||||
wrapProgram "$out/libexec/vino-server" \
|
||||
|
|
|
|||
|
|
@ -211,6 +211,8 @@ rec {
|
|||
|
||||
#### Misc -- other packages on http://ftp.gnome.org/pub/GNOME/sources/
|
||||
|
||||
geary = callPackage ./misc/geary { };
|
||||
|
||||
gfbgraph = callPackage ./misc/gfbgraph { };
|
||||
|
||||
goffice = callPackage ./misc/goffice { };
|
||||
|
|
|
|||
49
pkgs/desktops/gnome-3/3.12/misc/geary/default.nix
Normal file
49
pkgs/desktops/gnome-3/3.12/misc/geary/default.nix
Normal file
|
|
@ -0,0 +1,49 @@
|
|||
{ stdenv, fetchurl, intltool, pkgconfig, gtk3, vala
|
||||
, makeWrapper, gdk_pixbuf, cmake, desktop_file_utils
|
||||
, libnotify, libcanberra, libsecret, gmime
|
||||
, libpthreadstubs, hicolor_icon_theme
|
||||
, gnome3, librsvg, gnome_doc_utils, webkitgtk }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "geary-0.6.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnome/sources/geary/0.6/${name}.tar.xz";
|
||||
sha256 = "44ad1dc2c81c50006c751f8e72aa817f07002188da4c29e158060524a1962715";
|
||||
};
|
||||
|
||||
propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard ];
|
||||
|
||||
buildInputs = [ intltool pkgconfig gtk3 makeWrapper cmake desktop_file_utils gnome_doc_utils
|
||||
vala webkitgtk libnotify libcanberra gnome3.libgee libsecret gmime
|
||||
libpthreadstubs gnome3.gsettings_desktop_schemas hicolor_icon_theme
|
||||
gdk_pixbuf librsvg gnome3.gnome_icon_theme_symbolic gnome3.gnome_icon_theme ];
|
||||
|
||||
preConfigure = ''
|
||||
substituteInPlace src/CMakeLists.txt --replace '`pkg-config --variable=girdir gobject-introspection-1.0`' '${webkitgtk}/share/gir-1.0'
|
||||
'';
|
||||
|
||||
postInstall = ''
|
||||
mkdir -p $out/share/gsettings-schemas/${name}/
|
||||
mv $out/share/glib-2.0 $out/share/gsettings-schemas/${name}
|
||||
'';
|
||||
|
||||
preFixup = ''
|
||||
wrapProgram "$out/bin/geary" \
|
||||
--set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \
|
||||
--prefix XDG_DATA_DIRS : "$XDG_ICON_DIRS:${gnome3.gnome_themes_standard}/share:$out/share:$GSETTINGS_SCHEMAS_PATH"
|
||||
'';
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
patches = [ ./disable_valadoc.patch ];
|
||||
patchFlags = "-p0";
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
homepage = https://wiki.gnome.org/Apps/Geary;
|
||||
description = "Mail client for GNOME 3";
|
||||
maintainers = with maintainers; [ lethalman ];
|
||||
license = licenses.lgpl2;
|
||||
platforms = platforms.linux;
|
||||
};
|
||||
}
|
||||
24
pkgs/desktops/gnome-3/3.12/misc/geary/disable_valadoc.patch
Normal file
24
pkgs/desktops/gnome-3/3.12/misc/geary/disable_valadoc.patch
Normal file
|
|
@ -0,0 +1,24 @@
|
|||
--- src/CMakeLists.txt.orig 2014-05-23 14:41:20.809160364 +0200
|
||||
+++ src/CMakeLists.txt 2014-05-23 14:41:29.240261581 +0200
|
||||
@@ -696,21 +696,6 @@
|
||||
${CMAKE_COMMAND} -E copy geary-mailer ${CMAKE_BINARY_DIR}/
|
||||
)
|
||||
|
||||
-# Valadoc
|
||||
-#################################################
|
||||
-foreach(pkg ${ENGINE_PACKAGES})
|
||||
- list(APPEND valadoc_pkg_opts "--pkg=${pkg}")
|
||||
-endforeach(pkg ${ENGINE_PACKAGES})
|
||||
-
|
||||
-include(FindValadoc)
|
||||
-add_custom_target(
|
||||
- valadoc
|
||||
- WORKING_DIRECTORY
|
||||
- ${CMAKE_SOURCE_DIR}/src
|
||||
- COMMAND
|
||||
- ${VALADOC_EXECUTABLE} --force --no-protected -b ${CMAKE_CURRENT_SOURCE_DIR} -o ${CMAKE_SOURCE_DIR}/valadoc --package-name=geary --package-version=${VERSION} ${ENGINE_SRC} ${valadoc_pkg_opts} --vapidir=${CMAKE_SOURCE_DIR}/bindings/vapi
|
||||
-)
|
||||
-
|
||||
## Make clean: remove copied files
|
||||
##################################################
|
||||
set_property(
|
||||
|
|
@ -11,6 +11,6 @@ stdenv.mkDerivation rec {
|
|||
meta = {
|
||||
homepage = http://www.nasm.us/;
|
||||
description = "An 80x86 and x86-64 assembler designed for portability and modularity";
|
||||
platforms = stdenv.lib.platforms.linux;
|
||||
platforms = stdenv.lib.platforms.unix;
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -12,6 +12,6 @@ stdenv.mkDerivation rec {
|
|||
homepage = http://www.tortall.net/projects/yasm/;
|
||||
description = "Complete rewrite of the NASM assembler";
|
||||
license = "BSD";
|
||||
platforms = stdenv.lib.platforms.linux;
|
||||
platforms = stdenv.lib.platforms.unix;
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -3,7 +3,7 @@
|
|||
}:
|
||||
|
||||
stdenv.mkDerivation {
|
||||
name = "renpy-6.17.4";
|
||||
name = "renpy-6.17.6";
|
||||
|
||||
meta = {
|
||||
description = "Ren'Py Visual Novel Engine";
|
||||
|
|
@ -14,8 +14,8 @@ stdenv.mkDerivation {
|
|||
};
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://www.renpy.org/dl/6.17.4/renpy-6.17.4-source.tar.bz2";
|
||||
sha256 = "1n0ki944vawl1i3z9g5h65spdjvb8p0gj6rckv36fb2yq2adxclp";
|
||||
url = "http://www.renpy.org/dl/6.17.6/renpy-6.17.6-source.tar.bz2";
|
||||
sha256 = "0rkynw9cnr1zqdinz037d9zig6grhp2ca2pyxk80vhdpjb0xrkic";
|
||||
};
|
||||
|
||||
buildInputs = [
|
||||
|
|
|
|||
|
|
@ -42,7 +42,7 @@ stdenv.mkDerivation rec {
|
|||
"--enable-avresample"
|
||||
"--enable-runtime-cpudetect"
|
||||
]
|
||||
++ stdenv.lib.optional subtitleSupport "--enable-libass"
|
||||
++ stdenv.lib.optional (!stdenv.isDarwin && subtitleSupport) "--enable-libass"
|
||||
++ stdenv.lib.optional mp3Support "--enable-libmp3lame"
|
||||
++ stdenv.lib.optional speexSupport "--enable-libspeex"
|
||||
++ stdenv.lib.optional theoraSupport "--enable-libtheora"
|
||||
|
|
@ -55,13 +55,12 @@ stdenv.mkDerivation rec {
|
|||
++ stdenv.lib.optional faacSupport "--enable-libfaac --enable-nonfree"
|
||||
++ stdenv.lib.optional dc1394Support "--enable-libdc1394"
|
||||
++ stdenv.lib.optional x11grabSupport "--enable-x11grab"
|
||||
++ stdenv.lib.optional playSupport "--enable-ffplay"
|
||||
++ stdenv.lib.optional (!stdenv.isDarwin && playSupport) "--enable-ffplay"
|
||||
++ stdenv.lib.optional freetypeSupport "--enable-libfreetype --enable-fontconfig"
|
||||
++ stdenv.lib.optional fdkAACSupport "--enable-libfdk_aac --enable-nonfree"
|
||||
++ stdenv.lib.optional gnutlsSupport "--enable-gnutls";
|
||||
|
||||
buildInputs = [ pkgconfig lame yasm zlib bzip2 alsaLib texinfo perl ]
|
||||
++ stdenv.lib.optional subtitleSupport libass
|
||||
buildInputs = [ pkgconfig lame yasm zlib bzip2 texinfo perl ]
|
||||
++ stdenv.lib.optional mp3Support lame
|
||||
++ stdenv.lib.optional speexSupport speex
|
||||
++ stdenv.lib.optional theoraSupport libtheora
|
||||
|
|
@ -75,10 +74,12 @@ stdenv.mkDerivation rec {
|
|||
++ stdenv.lib.optional faacSupport faac
|
||||
++ stdenv.lib.optional dc1394Support libdc1394
|
||||
++ stdenv.lib.optionals x11grabSupport [ libXext libXfixes ]
|
||||
++ stdenv.lib.optional playSupport SDL
|
||||
++ stdenv.lib.optional (!stdenv.isDarwin && playSupport) SDL
|
||||
++ stdenv.lib.optionals freetypeSupport [ freetype fontconfig ]
|
||||
++ stdenv.lib.optional fdkAACSupport fdk_aac
|
||||
++ stdenv.lib.optional gnutlsSupport gnutls;
|
||||
++ stdenv.lib.optional gnutlsSupport gnutls
|
||||
++ stdenv.lib.optional (!stdenv.isDarwin && subtitleSupport) libass
|
||||
++ stdenv.lib.optional (!stdenv.isDarwin) alsaLib;
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
|
|
|
|||
|
|
@ -55,7 +55,9 @@ stdenv.mkDerivation rec {
|
|||
|
||||
nativeBuildInputs = [ pkgconfig gettext perl python ];
|
||||
|
||||
propagatedBuildInputs = [ pcre zlib libffi ] ++ libiconvOrEmpty ++ libintlOrEmpty;
|
||||
propagatedBuildInputs = [ pcre zlib libffi ]
|
||||
++ optional (!stdenv.isDarwin) libiconvOrEmpty
|
||||
++ libintlOrEmpty;
|
||||
|
||||
configureFlags =
|
||||
optional stdenv.isDarwin "--disable-compile-warnings"
|
||||
|
|
|
|||
|
|
@ -23,14 +23,17 @@ stdenv.mkDerivation rec {
|
|||
|
||||
propagatedBuildInputs = with xlibs; with stdenv.lib;
|
||||
[ glib cairo pango gdk_pixbuf atk ]
|
||||
++ optionals stdenv.isLinux
|
||||
[ libXrandr libXrender libXcomposite libXi libXcursor ]
|
||||
++ optional stdenv.isDarwin x11
|
||||
++ optionals (stdenv.isLinux || stdenv.isDarwin) [
|
||||
libXrandr libXrender libXcomposite libXi libXcursor
|
||||
]
|
||||
++ optionals stdenv.isDarwin [ x11 libXdamage ]
|
||||
++ libintlOrEmpty
|
||||
++ optional xineramaSupport libXinerama
|
||||
++ optionals cupsSupport [ cups ];
|
||||
|
||||
configureFlags = "--with-xinput=yes";
|
||||
configureFlags = if stdenv.isDarwin
|
||||
then "--disable-glibtest --disable-introspection --disable-visibility"
|
||||
else "--with-xinput=yes";
|
||||
|
||||
postInstall = "rm -rf $out/share/gtk-doc";
|
||||
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
{ stdenv, fetchurl, pkgconfig, glib, freetype, cairo, libintlOrEmpty
|
||||
, icu, graphite2
|
||||
, withIcu ? false # recommended by upstream as default, but most don't needed and it's big
|
||||
, withGraphite2 ? true # it is small and major distros do include it
|
||||
, withGraphite2 ? !stdenv.isDarwin # it is small and major distros do include it
|
||||
}:
|
||||
|
||||
# TODO: split non-icu and icu lib into different outputs?
|
||||
|
|
|
|||
|
|
@ -2,8 +2,8 @@
|
|||
|
||||
cabal.mkDerivation (self: {
|
||||
pname = "GLURaw";
|
||||
version = "1.4.0.0";
|
||||
sha256 = "0q86rpd5cx0vrb9d3y1fljc3mg0p8wy6xdn37ngv2s0f4kslq63g";
|
||||
version = "1.4.0.1";
|
||||
sha256 = "1k0f1vbbrsfc7jb4qbif4w4q87lsis5gvq7jd2n8zzslxd5n8mcn";
|
||||
buildDepends = [ OpenGLRaw ];
|
||||
extraLibraries = [ freeglut mesa ];
|
||||
meta = {
|
||||
|
|
@ -4,8 +4,8 @@
|
|||
|
||||
cabal.mkDerivation (self: {
|
||||
pname = "GLUT";
|
||||
version = "2.5.1.0";
|
||||
sha256 = "0zxj5i8rw402gpns5ivb1g5fkk502jwzrkviqhwhrxn7yxrybi1s";
|
||||
version = "2.5.1.1";
|
||||
sha256 = "0n9dkdjmpnbcjg0ll0ny7mw21xwwix0gxy0hq6yagmgaakhpg0aa";
|
||||
buildDepends = [ OpenGL OpenGLRaw ];
|
||||
extraLibraries = [ freeglut libICE libSM libXi libXmu mesa ];
|
||||
meta = {
|
||||
|
|
@ -0,0 +1,14 @@
|
|||
{ cabal, JuicyPixels, vector }:
|
||||
|
||||
cabal.mkDerivation (self: {
|
||||
pname = "JuicyPixels-util";
|
||||
version = "0.1";
|
||||
sha256 = "181wryax2k43qlblink9vcg2hk8f2qxn02ifmgxa2fl95z5ar0dc";
|
||||
buildDepends = [ JuicyPixels vector ];
|
||||
meta = {
|
||||
homepage = "https://github.com/fumieval/JuicyPixels-util";
|
||||
description = "Convert JuicyPixel images into RGBA format, flip, trim and so on";
|
||||
license = self.stdenv.lib.licenses.bsd3;
|
||||
platforms = self.ghc.meta.platforms;
|
||||
};
|
||||
})
|
||||
|
|
@ -2,8 +2,8 @@
|
|||
|
||||
cabal.mkDerivation (self: {
|
||||
pname = "OpenGL";
|
||||
version = "2.9.1.0";
|
||||
sha256 = "09xzjaa9qyh7bfsnq226v9zi6lhnalhmlqlca3808hgax8ijwhp3";
|
||||
version = "2.9.2.0";
|
||||
sha256 = "1sa5jmhj0az6sik6swv2vgzhv9gj34dbq2px23ag1a4yrk5gcn0p";
|
||||
buildDepends = [ GLURaw OpenGLRaw text ];
|
||||
extraLibraries = [ libX11 mesa ];
|
||||
meta = {
|
||||
15
pkgs/development/libraries/haskell/OpenGLRaw/1.5.0.0.nix
Normal file
15
pkgs/development/libraries/haskell/OpenGLRaw/1.5.0.0.nix
Normal file
|
|
@ -0,0 +1,15 @@
|
|||
{ cabal, mesa }:
|
||||
|
||||
cabal.mkDerivation (self: {
|
||||
pname = "OpenGLRaw";
|
||||
version = "1.5.0.0";
|
||||
sha256 = "04lsidv82fl7yb2fnqpx7q0vgiwxbswh8g7dv9q9s9i2jwiaaal5";
|
||||
extraLibraries = [ mesa ];
|
||||
meta = {
|
||||
homepage = "http://www.haskell.org/haskellwiki/Opengl";
|
||||
description = "A raw binding for the OpenGL graphics system";
|
||||
license = self.stdenv.lib.licenses.bsd3;
|
||||
platforms = self.ghc.meta.platforms;
|
||||
maintainers = [ self.stdenv.lib.maintainers.andres ];
|
||||
};
|
||||
})
|
||||
|
|
@ -16,14 +16,10 @@ cabal.mkDerivation (self: {
|
|||
attoparsec HUnit QuickCheck testFramework testFrameworkHunit
|
||||
testFrameworkQuickcheck2 text time unorderedContainers vector
|
||||
];
|
||||
patchPhase = ''
|
||||
sed -i -e 's|scientific >=.*,|scientific,|' aeson.cabal
|
||||
'';
|
||||
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 ];
|
||||
};
|
||||
})
|
||||
26
pkgs/development/libraries/haskell/aeson/0.7.0.6.nix
Normal file
26
pkgs/development/libraries/haskell/aeson/0.7.0.6.nix
Normal file
|
|
@ -0,0 +1,26 @@
|
|||
{ 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.7.0.6";
|
||||
sha256 = "0vsf9msz9iv7xvsnys5c0kbkldb0pvhiai02vz50b0d1kdsk2mb4";
|
||||
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 ];
|
||||
};
|
||||
})
|
||||
|
|
@ -1,20 +1,21 @@
|
|||
{ cabal, binary, clock, connection, dataBinaryIeee754, hspec
|
||||
, hspecExpectations, monadControl, network, split, text, xml
|
||||
, hspecExpectations, monadControl, network, split, text, vector
|
||||
, xml
|
||||
}:
|
||||
|
||||
cabal.mkDerivation (self: {
|
||||
pname = "amqp";
|
||||
version = "0.8.2";
|
||||
sha256 = "0hl9x6kbxdv32014k1w34d84wl4ivpiyg1ikpjr0nr9bsg3wr0gf";
|
||||
version = "0.8.3";
|
||||
sha256 = "0gl5vdhbic8llhbqmhnwj0wvykhbrci6zz53v5cayqfcwi1v1dw2";
|
||||
isLibrary = true;
|
||||
isExecutable = true;
|
||||
buildDepends = [
|
||||
binary clock connection dataBinaryIeee754 monadControl network
|
||||
split text xml
|
||||
split text vector xml
|
||||
];
|
||||
testDepends = [
|
||||
binary clock connection dataBinaryIeee754 hspec hspecExpectations
|
||||
network split text
|
||||
network split text vector
|
||||
];
|
||||
doCheck = false;
|
||||
meta = {
|
||||
|
|
|
|||
20
pkgs/development/libraries/haskell/attoparsec/0.11.3.4.nix
Normal file
20
pkgs/development/libraries/haskell/attoparsec/0.11.3.4.nix
Normal file
|
|
@ -0,0 +1,20 @@
|
|||
{ cabal, deepseq, QuickCheck, scientific, testFramework
|
||||
, testFrameworkQuickcheck2, text
|
||||
}:
|
||||
|
||||
cabal.mkDerivation (self: {
|
||||
pname = "attoparsec";
|
||||
version = "0.11.3.4";
|
||||
sha256 = "1zahmkb0n7jz0di35x3r8s0xnfg1awqybh2x2zicxbwazl4f53hi";
|
||||
buildDepends = [ deepseq scientific text ];
|
||||
testDepends = [
|
||||
QuickCheck testFramework testFrameworkQuickcheck2 text
|
||||
];
|
||||
meta = {
|
||||
homepage = "https://github.com/bos/attoparsec";
|
||||
description = "Fast combinator parsing for bytestrings and text";
|
||||
license = self.stdenv.lib.licenses.bsd3;
|
||||
platforms = self.ghc.meta.platforms;
|
||||
maintainers = [ self.stdenv.lib.maintainers.andres ];
|
||||
};
|
||||
})
|
||||
21
pkgs/development/libraries/haskell/boundingboxes/0.1.1.nix
Normal file
21
pkgs/development/libraries/haskell/boundingboxes/0.1.1.nix
Normal file
|
|
@ -0,0 +1,21 @@
|
|||
{ cabal, lens, linear, QuickCheck, random, testFramework
|
||||
, testFrameworkQuickcheck2, testFrameworkTh
|
||||
}:
|
||||
|
||||
cabal.mkDerivation (self: {
|
||||
pname = "boundingboxes";
|
||||
version = "0.1.1";
|
||||
sha256 = "1nl0lqgfwd98jzhhw7i4vvd88lpnn8770x2pcbyfzqcyr27079f0";
|
||||
buildDepends = [ lens linear ];
|
||||
testDepends = [
|
||||
lens linear QuickCheck random testFramework
|
||||
testFrameworkQuickcheck2 testFrameworkTh
|
||||
];
|
||||
doCheck = false;
|
||||
meta = {
|
||||
homepage = "https://github.com/fumieval/boundingboxes";
|
||||
description = "The type for 2D bounding box";
|
||||
license = self.stdenv.lib.licenses.bsd3;
|
||||
platforms = self.ghc.meta.platforms;
|
||||
};
|
||||
})
|
||||
21
pkgs/development/libraries/haskell/boundingboxes/0.2.nix
Normal file
21
pkgs/development/libraries/haskell/boundingboxes/0.2.nix
Normal file
|
|
@ -0,0 +1,21 @@
|
|||
{ cabal, lens, linear, QuickCheck, random, testFramework
|
||||
, testFrameworkQuickcheck2, testFrameworkTh
|
||||
}:
|
||||
|
||||
cabal.mkDerivation (self: {
|
||||
pname = "boundingboxes";
|
||||
version = "0.2";
|
||||
sha256 = "0xvh1h4papfrf6dg553rx6q8fqi06ff1ivgn4rdx3haqg1zf40hp";
|
||||
buildDepends = [ lens ];
|
||||
testDepends = [
|
||||
lens linear QuickCheck random testFramework
|
||||
testFrameworkQuickcheck2 testFrameworkTh
|
||||
];
|
||||
doCheck = false;
|
||||
meta = {
|
||||
homepage = "https://github.com/fumieval/boundingboxes";
|
||||
description = "The type for 2D bounding box";
|
||||
license = self.stdenv.lib.licenses.bsd3;
|
||||
platforms = self.ghc.meta.platforms;
|
||||
};
|
||||
})
|
||||
14
pkgs/development/libraries/haskell/categories/default.nix
Normal file
14
pkgs/development/libraries/haskell/categories/default.nix
Normal file
|
|
@ -0,0 +1,14 @@
|
|||
{ cabal, void }:
|
||||
|
||||
cabal.mkDerivation (self: {
|
||||
pname = "categories";
|
||||
version = "1.0.6";
|
||||
sha256 = "0i5mrxbhqj5g46lvwbw2m07prjvfwja6q8648qm6bq54z6zrl5cy";
|
||||
buildDepends = [ void ];
|
||||
meta = {
|
||||
homepage = "http://github.com/ekmett/categories";
|
||||
description = "Categories";
|
||||
license = self.stdenv.lib.licenses.bsd3;
|
||||
platforms = self.ghc.meta.platforms;
|
||||
};
|
||||
})
|
||||
14
pkgs/development/libraries/haskell/colors/default.nix
Normal file
14
pkgs/development/libraries/haskell/colors/default.nix
Normal file
|
|
@ -0,0 +1,14 @@
|
|||
{ cabal, profunctors }:
|
||||
|
||||
cabal.mkDerivation (self: {
|
||||
pname = "colors";
|
||||
version = "0.1.1";
|
||||
sha256 = "1i1n05prbp0l3xgx0w2lxzc5r81pcmbzclsamdr7fmjvhvh8blqm";
|
||||
buildDepends = [ profunctors ];
|
||||
meta = {
|
||||
homepage = "https://github.com/fumieval/colors";
|
||||
description = "A type for colors";
|
||||
license = self.stdenv.lib.licenses.bsd3;
|
||||
platforms = self.ghc.meta.platforms;
|
||||
};
|
||||
})
|
||||
23
pkgs/development/libraries/haskell/compdata/default.nix
Normal file
23
pkgs/development/libraries/haskell/compdata/default.nix
Normal file
|
|
@ -0,0 +1,23 @@
|
|||
{ cabal, deepseq, derive, HUnit, mtl, QuickCheck, testFramework
|
||||
, testFrameworkHunit, testFrameworkQuickcheck2, thExpandSyns
|
||||
, transformers, treeView
|
||||
}:
|
||||
|
||||
cabal.mkDerivation (self: {
|
||||
pname = "compdata";
|
||||
version = "0.8.1.0";
|
||||
sha256 = "06bsdhf40b8111k0fmfc53i5kib9n431f07qyj83pq8isgkk33xc";
|
||||
buildDepends = [
|
||||
deepseq derive mtl QuickCheck thExpandSyns transformers treeView
|
||||
];
|
||||
testDepends = [
|
||||
deepseq derive HUnit mtl QuickCheck testFramework
|
||||
testFrameworkHunit testFrameworkQuickcheck2 thExpandSyns
|
||||
transformers
|
||||
];
|
||||
meta = {
|
||||
description = "Compositional Data Types";
|
||||
license = self.stdenv.lib.licenses.bsd3;
|
||||
platforms = self.ghc.meta.platforms;
|
||||
};
|
||||
})
|
||||
|
|
@ -4,8 +4,8 @@
|
|||
|
||||
cabal.mkDerivation (self: {
|
||||
pname = "conduit";
|
||||
version = "1.1.2.1";
|
||||
sha256 = "1jzc3vnc0dr4nm79yx2kk5rsm06jfbf3h89y28bgv05r1pw6r7ai";
|
||||
version = "1.1.3";
|
||||
sha256 = "14fc7v00zmrcwba2rdnh7c6sx0rv5mmbwlgq5p8p7nlald1dcr6z";
|
||||
buildDepends = [
|
||||
exceptions liftedBase mmorph monadControl mtl resourcet
|
||||
transformers transformersBase void
|
||||
|
|
|
|||
13
pkgs/development/libraries/haskell/control-bool/default.nix
Normal file
13
pkgs/development/libraries/haskell/control-bool/default.nix
Normal file
|
|
@ -0,0 +1,13 @@
|
|||
{ cabal }:
|
||||
|
||||
cabal.mkDerivation (self: {
|
||||
pname = "control-bool";
|
||||
version = "0.2.1";
|
||||
sha256 = "10amxm1ff7xhd8g66n65wkbb8d17n77v1nmwxkbzhrask398asp4";
|
||||
meta = {
|
||||
homepage = "https://github.com/fumieval/control-bool";
|
||||
description = "Useful combinators for boolean expressions";
|
||||
license = self.stdenv.lib.licenses.bsd3;
|
||||
platforms = self.ghc.meta.platforms;
|
||||
};
|
||||
})
|
||||
|
|
@ -2,9 +2,10 @@
|
|||
|
||||
cabal.mkDerivation (self: {
|
||||
pname = "directory-tree";
|
||||
version = "0.11.0";
|
||||
sha256 = "07vqwnzbwfjvlwcl50x5jl9yzvqfln0m4k4lam9r5n49wv7p01c9";
|
||||
version = "0.12.0";
|
||||
sha256 = "1idknm7fwci91fkwvzl35g0qd0jk1vb00ds2x82zjf2hdbkcc2gz";
|
||||
buildDepends = [ filepath ];
|
||||
testDepends = [ filepath ];
|
||||
meta = {
|
||||
homepage = "http://brandon.si/code/directory-tree-module-released/";
|
||||
description = "A simple directory-like tree datatype, with useful IO functions";
|
||||
|
|
|
|||
|
|
@ -5,8 +5,8 @@
|
|||
|
||||
cabal.mkDerivation (self: {
|
||||
pname = "esqueleto";
|
||||
version = "1.4.1";
|
||||
sha256 = "0b2gwsd6014fhmq8lipc299n6ndak7fv6dmrvi9vgasw0a665ryj";
|
||||
version = "1.4.1.2";
|
||||
sha256 = "1qny5c0xy2vdsl4qmgqr83jxqw1r68r81xhmx236rhxcffs9yvw2";
|
||||
buildDepends = [
|
||||
conduit monadLogger persistent resourcet tagged text transformers
|
||||
unorderedContainers
|
||||
|
|
@ -18,7 +18,7 @@ cabal.mkDerivation (self: {
|
|||
];
|
||||
meta = {
|
||||
homepage = "https://github.com/meteficha/esqueleto";
|
||||
description = "Bare bones, type-safe EDSL for SQL queries on persistent backends";
|
||||
description = "Type-safe EDSL for SQL queries on persistent backends";
|
||||
license = self.stdenv.lib.licenses.bsd3;
|
||||
platforms = self.ghc.meta.platforms;
|
||||
maintainers = [ self.stdenv.lib.maintainers.ocharles ];
|
||||
|
|
|
|||
|
|
@ -7,8 +7,8 @@
|
|||
|
||||
cabal.mkDerivation (self: {
|
||||
pname = "fay";
|
||||
version = "0.20.0.3";
|
||||
sha256 = "1vs4brndk091mp7lm057my4ghlpv3563qg5blrs5zqcmnwnm75x5";
|
||||
version = "0.20.0.4";
|
||||
sha256 = "0cxcd4nxnq8nl03xgxa1nb0932hq4dz1lxpp3gqqs5k5wvs62303";
|
||||
isLibrary = true;
|
||||
isExecutable = true;
|
||||
buildDepends = [
|
||||
|
|
|
|||
|
|
@ -2,8 +2,8 @@
|
|||
|
||||
cabal.mkDerivation (self: {
|
||||
pname = "file-embed";
|
||||
version = "0.0.6";
|
||||
sha256 = "0ag3g8mv8cw8km785kskz8kv38zs8gimrc3lr9dvkc1qnp2fdmgz";
|
||||
version = "0.0.7";
|
||||
sha256 = "0mj8f70f9k78wjzcx59w68szajafmm119rcrsspmxsygglh8ji2g";
|
||||
buildDepends = [ filepath ];
|
||||
testDepends = [ filepath HUnit ];
|
||||
meta = {
|
||||
|
|
|
|||
23
pkgs/development/libraries/haskell/free-game/1.0.5.nix
Normal file
23
pkgs/development/libraries/haskell/free-game/1.0.5.nix
Normal file
|
|
@ -0,0 +1,23 @@
|
|||
{ cabal, boundingboxes, colors, controlBool, filepath, free
|
||||
, freetype2, GLFWB, hashable, JuicyPixels, JuicyPixelsUtil, lens
|
||||
, linear, mtl, OpenGL, OpenGLRaw, random, reflection, transformers
|
||||
, vector, void
|
||||
}:
|
||||
|
||||
cabal.mkDerivation (self: {
|
||||
pname = "free-game";
|
||||
version = "1.0.5";
|
||||
sha256 = "048hmb4zbn67ycdwy7alhfakdyv405ck79bzrxv2ra6w1v5b3yvf";
|
||||
buildDepends = [
|
||||
boundingboxes colors controlBool filepath free freetype2 GLFWB
|
||||
hashable JuicyPixels JuicyPixelsUtil lens linear mtl OpenGL
|
||||
OpenGLRaw random reflection transformers vector void
|
||||
];
|
||||
jailbreak = true;
|
||||
meta = {
|
||||
homepage = "https://github.com/fumieval/free-game";
|
||||
description = "Create games for free";
|
||||
license = self.stdenv.lib.licenses.bsd3;
|
||||
platforms = self.ghc.meta.platforms;
|
||||
};
|
||||
})
|
||||
23
pkgs/development/libraries/haskell/free-game/1.1.nix
Normal file
23
pkgs/development/libraries/haskell/free-game/1.1.nix
Normal file
|
|
@ -0,0 +1,23 @@
|
|||
{ cabal, boundingboxes, colors, controlBool, filepath, free
|
||||
, freetype2, GLFWB, hashable, JuicyPixels, JuicyPixelsUtil, lens
|
||||
, linear, mtl, OpenGL, OpenGLRaw, random, reflection, transformers
|
||||
, vector, void
|
||||
}:
|
||||
|
||||
cabal.mkDerivation (self: {
|
||||
pname = "free-game";
|
||||
version = "1.1";
|
||||
sha256 = "0id3vn2j44gd8krl5icacwxgx00h6r89yncjg10nyyb90rymvxzz";
|
||||
buildDepends = [
|
||||
boundingboxes colors controlBool filepath free freetype2 GLFWB
|
||||
hashable JuicyPixels JuicyPixelsUtil lens linear mtl OpenGL
|
||||
OpenGLRaw random reflection transformers vector void
|
||||
];
|
||||
jailbreak = true;
|
||||
meta = {
|
||||
homepage = "https://github.com/fumieval/free-game";
|
||||
description = "Create games for free";
|
||||
license = self.stdenv.lib.licenses.bsd3;
|
||||
platforms = self.ghc.meta.platforms;
|
||||
};
|
||||
})
|
||||
14
pkgs/development/libraries/haskell/freetype2/default.nix
Normal file
14
pkgs/development/libraries/haskell/freetype2/default.nix
Normal file
|
|
@ -0,0 +1,14 @@
|
|||
{ cabal }:
|
||||
|
||||
cabal.mkDerivation (self: {
|
||||
pname = "freetype2";
|
||||
version = "0.1.1";
|
||||
sha256 = "16ayyqvbl278z68ssfbv2nvbyxs7585zmnk2w53vlxvj0k9zj66s";
|
||||
isLibrary = true;
|
||||
isExecutable = true;
|
||||
meta = {
|
||||
description = "Haskell binding for FreeType 2 library";
|
||||
license = self.stdenv.lib.licenses.bsd3;
|
||||
platforms = self.ghc.meta.platforms;
|
||||
};
|
||||
})
|
||||
|
|
@ -4,17 +4,17 @@
|
|||
|
||||
cabal.mkDerivation (self: {
|
||||
pname = "ghc-vis";
|
||||
version = "0.7.2.1";
|
||||
sha256 = "160b45bgiz2ckva70dnmkf6i9bvffaavm5wzia2lk8c65pnvc9ih";
|
||||
version = "0.7.2.2";
|
||||
sha256 = "0abk76cy9qiblyways1r7jfsj996sj4laawzaz1j9p546plfkbnj";
|
||||
buildDepends = [
|
||||
cairo deepseq fgl ghcHeapView graphviz gtk mtl svgcairo text
|
||||
transformers xdot
|
||||
];
|
||||
jailbreak = true;
|
||||
postInstall = ''
|
||||
ensureDir "$out/share/ghci"
|
||||
ln -s "$out/share/$pname-$version/ghci" "$out/share/ghci/$pname"
|
||||
'';
|
||||
jailbreak = true;
|
||||
meta = {
|
||||
homepage = "http://felsin9.de/nnis/ghc-vis";
|
||||
description = "Live visualization of data structures in GHCi";
|
||||
|
|
|
|||
|
|
@ -13,6 +13,7 @@ cabal.mkDerivation (self: {
|
|||
filepath hashable MonadCatchIOTransformers mtl random text time
|
||||
transformers unorderedContainers vector xmlhtml
|
||||
];
|
||||
jailbreak = true;
|
||||
meta = {
|
||||
homepage = "http://snapframework.com/";
|
||||
description = "An Haskell template system supporting both HTML5 and XML";
|
||||
|
|
|
|||
|
|
@ -6,8 +6,8 @@
|
|||
|
||||
cabal.mkDerivation (self: {
|
||||
pname = "http-client";
|
||||
version = "0.3.2.2";
|
||||
sha256 = "1znfcn549zxz4wdlv9rvyqz0x52ygx9jba9r1fzxk08mbi8xz6ff";
|
||||
version = "0.3.3";
|
||||
sha256 = "001nmy6f57l2f7gc4mchz1gwam28qldkwmcxzs8jnqwczcirgk38";
|
||||
buildDepends = [
|
||||
base64Bytestring blazeBuilder caseInsensitive cookie
|
||||
dataDefaultClass deepseq exceptions filepath httpTypes mimeTypes
|
||||
|
|
|
|||
|
|
@ -1,11 +1,15 @@
|
|||
{ cabal, blazeBuilder, caseInsensitive, hspec, QuickCheck, text }:
|
||||
{ cabal, blazeBuilder, caseInsensitive, doctest, hspec, QuickCheck
|
||||
, quickcheckInstances, text
|
||||
}:
|
||||
|
||||
cabal.mkDerivation (self: {
|
||||
pname = "http-types";
|
||||
version = "0.8.4";
|
||||
sha256 = "0bz7g537if863vk29z72hndf1x019dj7shj1aa77pssrxma3a685";
|
||||
version = "0.8.5";
|
||||
sha256 = "0d282sf3xyk5makhnwfm2k9mgw1fkh07kasmy85fiwjkc1447ciw";
|
||||
buildDepends = [ blazeBuilder caseInsensitive text ];
|
||||
testDepends = [ blazeBuilder hspec QuickCheck text ];
|
||||
testDepends = [
|
||||
blazeBuilder doctest hspec QuickCheck quickcheckInstances text
|
||||
];
|
||||
jailbreak = true;
|
||||
meta = {
|
||||
homepage = "https://github.com/aristidb/http-types";
|
||||
|
|
|
|||
|
|
@ -2,8 +2,8 @@
|
|||
|
||||
cabal.mkDerivation (self: {
|
||||
pname = "httpd-shed";
|
||||
version = "0.4.0.1";
|
||||
sha256 = "04m07wqhaggkgksha7x528y890j30ay5axipfy6b1ma9cf0a9jwq";
|
||||
version = "0.4.0.2";
|
||||
sha256 = "0w37ra59xhk6gqrxpk83m1wmm7mqygcg59y5nl00x279c77qzxj3";
|
||||
isLibrary = true;
|
||||
isExecutable = true;
|
||||
buildDepends = [ network ];
|
||||
|
|
|
|||
|
|
@ -6,8 +6,8 @@
|
|||
|
||||
cabal.mkDerivation (self: {
|
||||
pname = "io-streams";
|
||||
version = "1.1.4.3";
|
||||
sha256 = "0qp63xfbfz5ymfn8l9fiy27z30fi4sq201zgsh9x2mkhp6z2yzld";
|
||||
version = "1.1.4.4";
|
||||
sha256 = "07kmmjn1bsjzfi27fk6fx56pchks866qwrxkyvwihfvd96wgqggd";
|
||||
buildDepends = [
|
||||
attoparsec blazeBuilder network primitive text time transformers
|
||||
vector zlibBindings
|
||||
|
|
|
|||
|
|
@ -0,0 +1,14 @@
|
|||
{ cabal, transformers }:
|
||||
|
||||
cabal.mkDerivation (self: {
|
||||
pname = "minioperational";
|
||||
version = "0.4.3";
|
||||
sha256 = "09z8536q0cc09iack6s8fghgrc5f3syq3sxf2cnai3rcfaqix86p";
|
||||
buildDepends = [ transformers ];
|
||||
meta = {
|
||||
homepage = "https://github.com/fumieval/minioperational";
|
||||
description = "fast and simple operational monad";
|
||||
license = self.stdenv.lib.licenses.bsd3;
|
||||
platforms = self.ghc.meta.platforms;
|
||||
};
|
||||
})
|
||||
|
|
@ -4,8 +4,8 @@
|
|||
|
||||
cabal.mkDerivation (self: {
|
||||
pname = "openssl-streams";
|
||||
version = "1.1.0.0";
|
||||
sha256 = "0xww3n1mhw0sp9nkx4847gqbq4wnfcnc2m782kn5n8jxnjnm1fqn";
|
||||
version = "1.1.0.2";
|
||||
sha256 = "0h3jxxdls0p1xxr02rfag7j9y13ll3xgzx2ldv1nsfcv3rzw2pfy";
|
||||
buildDepends = [ HsOpenSSL ioStreams network ];
|
||||
testDepends = [
|
||||
HsOpenSSL HUnit ioStreams network testFramework testFrameworkHunit
|
||||
|
|
|
|||
|
|
@ -1,13 +1,13 @@
|
|||
{ cabal, ansiWlPprint, HUnit, QuickCheck, testFramework
|
||||
, testFrameworkHunit, testFrameworkQuickcheck2
|
||||
, testFrameworkThPrime, transformers
|
||||
, testFrameworkThPrime, transformers, transformersCompat
|
||||
}:
|
||||
|
||||
cabal.mkDerivation (self: {
|
||||
pname = "optparse-applicative";
|
||||
version = "0.8.1";
|
||||
sha256 = "0zy295r2idrwz030i1slpgysyw08782cjc4vgpkxby8i6piixwlh";
|
||||
buildDepends = [ ansiWlPprint transformers ];
|
||||
version = "0.9.0";
|
||||
sha256 = "1nmwrg74wz8k3zwgw5aaf7padkawi0dlrclq6nsr17xz5yx524ay";
|
||||
buildDepends = [ ansiWlPprint transformers transformersCompat ];
|
||||
testDepends = [
|
||||
HUnit QuickCheck testFramework testFrameworkHunit
|
||||
testFrameworkQuickcheck2 testFrameworkThPrime
|
||||
|
|
|
|||
|
|
@ -4,8 +4,8 @@
|
|||
|
||||
cabal.mkDerivation (self: {
|
||||
pname = "pipes-aeson";
|
||||
version = "0.3.0";
|
||||
sha256 = "1kckdllw5xnh8z92gjw5swyxp9km879wqfly7af3iirwhickk4vn";
|
||||
version = "0.4";
|
||||
sha256 = "0cz9av3w8h2gh3cz7gs3ikplf60a111wcsr3z6vi8gqlmmgmck07";
|
||||
buildDepends = [
|
||||
aeson attoparsec pipes pipesAttoparsec pipesBytestring pipesParse
|
||||
transformers
|
||||
|
|
|
|||
|
|
@ -2,8 +2,8 @@
|
|||
|
||||
cabal.mkDerivation (self: {
|
||||
pname = "pipes-parse";
|
||||
version = "3.0.1";
|
||||
sha256 = "0f262p8mfcpvs3f3myy6bll9v61rfgrfdy2scdzf7vvx0h0lrpj7";
|
||||
version = "3.0.2";
|
||||
sha256 = "1d5lhh8knk0hmvd9wv2ihs5z9ybyvhd1n7qaazqkazqkyl14pd08";
|
||||
buildDepends = [ pipes transformers ];
|
||||
meta = {
|
||||
description = "Parsing infrastructure for the pipes ecosystem";
|
||||
|
|
|
|||
|
|
@ -1,16 +0,0 @@
|
|||
{ cabal, haskellLexer }:
|
||||
|
||||
cabal.mkDerivation (self: {
|
||||
pname = "pretty-show";
|
||||
version = "1.2";
|
||||
sha256 = "0lbalmyrqisgd2spbvzifsy25lr6cl9sgz78hav8q8r406k7nf2l";
|
||||
isLibrary = true;
|
||||
isExecutable = true;
|
||||
buildDepends = [ haskellLexer ];
|
||||
meta = {
|
||||
homepage = "http://wiki.github.com/yav/pretty-show";
|
||||
description = "Tools for working with derived Show instances";
|
||||
license = self.stdenv.lib.licenses.bsd3;
|
||||
platforms = self.ghc.meta.platforms;
|
||||
};
|
||||
})
|
||||
|
|
@ -2,8 +2,8 @@
|
|||
|
||||
cabal.mkDerivation (self: {
|
||||
pname = "pretty-show";
|
||||
version = "1.6.7";
|
||||
sha256 = "16qjp6cl3hyir5bchnncq95bp7nw5cpp5kd5mszkjjhzw1jj9srz";
|
||||
version = "1.6.8";
|
||||
sha256 = "0vfb712dvbb91659sch62d06vm0451b9l4l0hdwnlbhzjymmh2rs";
|
||||
isLibrary = true;
|
||||
isExecutable = true;
|
||||
buildDepends = [ filepath haskellLexer ];
|
||||
|
|
@ -0,0 +1,14 @@
|
|||
{ cabal, comonad, free, transformers }:
|
||||
|
||||
cabal.mkDerivation (self: {
|
||||
pname = "recursion-schemes";
|
||||
version = "4.0";
|
||||
sha256 = "1xc1k04p3birxgv5h3ypw85w0cgq4d5rsmadx4pc3j409y6i5p06";
|
||||
buildDepends = [ comonad free transformers ];
|
||||
meta = {
|
||||
homepage = "http://github.com/ekmett/recursion-schemes/";
|
||||
description = "Generalized bananas, lenses and barbed wire";
|
||||
license = self.stdenv.lib.licenses.bsd3;
|
||||
platforms = self.ghc.meta.platforms;
|
||||
};
|
||||
})
|
||||
22
pkgs/development/libraries/haskell/scientific/0.3.2.1.nix
Normal file
22
pkgs/development/libraries/haskell/scientific/0.3.2.1.nix
Normal file
|
|
@ -0,0 +1,22 @@
|
|||
{ cabal, deepseq, hashable, QuickCheck, smallcheck, tasty
|
||||
, tastyAntXml, tastyQuickcheck, tastySmallcheck, text
|
||||
}:
|
||||
|
||||
cabal.mkDerivation (self: {
|
||||
pname = "scientific";
|
||||
version = "0.3.2.1";
|
||||
sha256 = "0z0k0dqmv6a3spgl48yl00a55niv0gqjy906sh4r8xfpsabzl88s";
|
||||
buildDepends = [ deepseq hashable text ];
|
||||
testDepends = [
|
||||
QuickCheck smallcheck tasty tastyAntXml tastyQuickcheck
|
||||
tastySmallcheck text
|
||||
];
|
||||
jailbreak = true;
|
||||
meta = {
|
||||
homepage = "https://github.com/basvandijk/scientific";
|
||||
description = "Numbers represented using scientific notation";
|
||||
license = self.stdenv.lib.licenses.bsd3;
|
||||
platforms = self.ghc.meta.platforms;
|
||||
maintainers = [ self.stdenv.lib.maintainers.ocharles ];
|
||||
};
|
||||
})
|
||||
12
pkgs/development/libraries/haskell/setlocale/default.nix
Normal file
12
pkgs/development/libraries/haskell/setlocale/default.nix
Normal file
|
|
@ -0,0 +1,12 @@
|
|||
{ cabal }:
|
||||
|
||||
cabal.mkDerivation (self: {
|
||||
pname = "setlocale";
|
||||
version = "0.0.3";
|
||||
sha256 = "08pd20ibmslr94p52rn6x9w3swn9jy7vjlvxzw29h8dlqgmvcrjl";
|
||||
meta = {
|
||||
description = "A Haskell interface to setlocale()";
|
||||
license = self.stdenv.lib.licenses.publicDomain;
|
||||
platforms = self.ghc.meta.platforms;
|
||||
};
|
||||
})
|
||||
|
|
@ -5,8 +5,8 @@
|
|||
|
||||
cabal.mkDerivation (self: {
|
||||
pname = "shelly";
|
||||
version = "1.5.3.1";
|
||||
sha256 = "0lhan549nkxihd94byaknswczlr757smha2fwq7y82rr0k16im4y";
|
||||
version = "1.5.3.2";
|
||||
sha256 = "0ilqg7mffw8cnl3w175if74xwfij7460qqqsp6hzml7gzjdb0rky";
|
||||
buildDepends = [
|
||||
async enclosedExceptions exceptions liftedAsync liftedBase
|
||||
monadControl mtl systemFileio systemFilepath text time transformers
|
||||
|
|
|
|||
13
pkgs/development/libraries/haskell/split/0.1.4.3.nix
Normal file
13
pkgs/development/libraries/haskell/split/0.1.4.3.nix
Normal file
|
|
@ -0,0 +1,13 @@
|
|||
{ cabal }:
|
||||
|
||||
cabal.mkDerivation (self: {
|
||||
pname = "split";
|
||||
version = "0.1.4.3";
|
||||
sha256 = "1i9vmb0zvmhqj6qcbnsapsk9lhsyzznz336c8s7v4sz20s99hsby";
|
||||
meta = {
|
||||
homepage = "http://code.haskell.org/~byorgey/code/split";
|
||||
description = "Combinator library for splitting lists";
|
||||
license = self.stdenv.lib.licenses.bsd3;
|
||||
platforms = self.ghc.meta.platforms;
|
||||
};
|
||||
})
|
||||
|
|
@ -5,6 +5,7 @@ cabal.mkDerivation (self: {
|
|||
version = "0.2.2";
|
||||
sha256 = "0xa3j0gwr6k5vizxybnzk5fgb3pppgspi6mysnp2gwjp2dbrxkzr";
|
||||
testDepends = [ QuickCheck ];
|
||||
doCheck = self.stdenv.lib.versionOlder self.ghc.version "7.9";
|
||||
meta = {
|
||||
description = "Combinator library for splitting lists";
|
||||
license = self.stdenv.lib.licenses.bsd3;
|
||||
|
|
|
|||
|
|
@ -4,8 +4,8 @@
|
|||
|
||||
cabal.mkDerivation (self: {
|
||||
pname = "streaming-commons";
|
||||
version = "0.1.2.4";
|
||||
sha256 = "1wy1cdmx3fhxg9xb7v5r3nyyjhr7irvcwy3l4g6br671zh8j8kcg";
|
||||
version = "0.1.3";
|
||||
sha256 = "0zv309lqmv5bgbmxx5k0zk4iyxwj77lwqcaaycizi7559nzvsrh3";
|
||||
buildDepends = [
|
||||
blazeBuilder network random text transformers zlib
|
||||
];
|
||||
|
|
|
|||
|
|
@ -4,8 +4,8 @@
|
|||
|
||||
cabal.mkDerivation (self: {
|
||||
pname = "tasty";
|
||||
version = "0.8.0.4";
|
||||
sha256 = "016niwympxbxpg3yq7samgh92l20wxm2h6cwhqal4zdj8n9262j0";
|
||||
version = "0.8.1.1";
|
||||
sha256 = "04vzq5gwyd5zb6lsf8nbr5dypgf07b4aq70i1jghkg12v8h529dr";
|
||||
buildDepends = [
|
||||
ansiTerminal async deepseq mtl optparseApplicative regexTdfa stm
|
||||
tagged unboundedDelays
|
||||
|
|
|
|||
|
|
@ -1,19 +1,19 @@
|
|||
{ cabal, asn1Encoding, asn1Types, byteable, cereal, cipherAes
|
||||
, cipherRc4, cprngAes, cryptohash, cryptoNumbers, cryptoPubkey
|
||||
, cryptoPubkeyTypes, cryptoRandom, dataDefaultClass, mtl, network
|
||||
, QuickCheck, testFramework, testFrameworkQuickcheck2, time, x509
|
||||
, x509Store, x509Validation
|
||||
, cipherDes, cipherRc4, cprngAes, cryptoCipherTypes, cryptohash
|
||||
, cryptoNumbers, cryptoPubkey, cryptoPubkeyTypes, cryptoRandom
|
||||
, dataDefaultClass, mtl, network, QuickCheck, testFramework
|
||||
, testFrameworkQuickcheck2, time, x509, x509Store, x509Validation
|
||||
}:
|
||||
|
||||
cabal.mkDerivation (self: {
|
||||
pname = "tls";
|
||||
version = "1.2.7";
|
||||
sha256 = "0f0zlyiw6bgqkhg0czlpqyz8jgb1zbgbpzpk73v5p7hsjffsblgs";
|
||||
version = "1.2.8";
|
||||
sha256 = "0fm36jn2yri3fn6wadl5v4k0cpnansqlid4fhavgnp6mazf0q5ha";
|
||||
buildDepends = [
|
||||
asn1Encoding asn1Types byteable cereal cipherAes cipherRc4
|
||||
cryptohash cryptoNumbers cryptoPubkey cryptoPubkeyTypes
|
||||
cryptoRandom dataDefaultClass mtl network x509 x509Store
|
||||
x509Validation
|
||||
asn1Encoding asn1Types byteable cereal cipherAes cipherDes
|
||||
cipherRc4 cryptoCipherTypes cryptohash cryptoNumbers cryptoPubkey
|
||||
cryptoPubkeyTypes cryptoRandom dataDefaultClass mtl network x509
|
||||
x509Store x509Validation
|
||||
];
|
||||
testDepends = [
|
||||
cereal cprngAes cryptoPubkey cryptoRandom dataDefaultClass mtl
|
||||
|
|
@ -2,8 +2,8 @@
|
|||
|
||||
cabal.mkDerivation (self: {
|
||||
pname = "transformers-compat";
|
||||
version = "0.3.2";
|
||||
sha256 = "1rbwmbb04f6lnag1d11skznmxxygf9x7jjnjfkvyza4mnaxnrbpy";
|
||||
version = "0.3.3";
|
||||
sha256 = "14lmwqr6q79k1f7byvb0jcm4r7lprhxkl85z72pr6ghn7bsvqwps";
|
||||
buildDepends = [ transformers ];
|
||||
meta = {
|
||||
homepage = "http://github.com/ekmett/transformers-compat/";
|
||||
|
|
|
|||
|
|
@ -1,10 +1,10 @@
|
|||
{ cabal, baseUnicodeSymbols, bindingsLibusb, text, vector }:
|
||||
{ cabal, bindingsLibusb, text, vector }:
|
||||
|
||||
cabal.mkDerivation (self: {
|
||||
pname = "usb";
|
||||
version = "1.2";
|
||||
sha256 = "1k73avkmpbmg6iq2kmwhg2ifibni5c1yp202afdb6v7w5akvmc0b";
|
||||
buildDepends = [ baseUnicodeSymbols bindingsLibusb text vector ];
|
||||
version = "1.2.0.1";
|
||||
sha256 = "10bpkrsnin9f3g1p5a84nhxx5xlfjdxisc0q60iain30rn99g2mk";
|
||||
buildDepends = [ bindingsLibusb text vector ];
|
||||
jailbreak = true;
|
||||
meta = {
|
||||
homepage = "http://basvandijk.github.com/usb";
|
||||
|
|
|
|||
|
|
@ -4,8 +4,8 @@
|
|||
|
||||
cabal.mkDerivation (self: {
|
||||
pname = "vty-ui";
|
||||
version = "1.6.1";
|
||||
sha256 = "013a4wlhrhsbkh9wd8dxppn9aa0l7cfrgn3na6cifry34d96ql9d";
|
||||
version = "1.7";
|
||||
sha256 = "1wd7ada3x7d5rhl4z3h29m9h42513vbz6dp49xhn4j806mi164nd";
|
||||
isLibrary = true;
|
||||
isExecutable = true;
|
||||
buildDepends = [
|
||||
|
|
|
|||
|
|
@ -7,8 +7,8 @@
|
|||
|
||||
cabal.mkDerivation (self: {
|
||||
pname = "wai-extra";
|
||||
version = "2.1.1.1";
|
||||
sha256 = "1mqpy1klr4b5dvgk89hqyd8c2vg7rl0vypy3m9hxr2r4bzifkqc1";
|
||||
version = "2.1.1.2";
|
||||
sha256 = "000ksma1jmi7rfg2ib94baj31mcwqj2xfhkyv7lai89di0m0v6s4";
|
||||
buildDepends = [
|
||||
ansiTerminal base64Bytestring blazeBuilder blazeBuilderConduit
|
||||
caseInsensitive conduit conduitExtra dataDefault fastLogger
|
||||
|
|
|
|||
|
|
@ -4,8 +4,8 @@
|
|||
|
||||
cabal.mkDerivation (self: {
|
||||
pname = "wai-handler-launch";
|
||||
version = "2.0.1.2";
|
||||
sha256 = "1mcjxv4dkcc5rx1bj8zc5m2q2ifcdwhsl4x4fnrv1ir9kclzsm7q";
|
||||
version = "2.0.1.3";
|
||||
sha256 = "06im28x26jbzbdk9xz33kqvzblglk3b3b60qwal836hima69alsd";
|
||||
buildDepends = [
|
||||
blazeBuilder blazeBuilderConduit conduit conduitExtra httpTypes
|
||||
transformers wai warp zlibConduit
|
||||
|
|
|
|||
|
|
@ -5,8 +5,8 @@
|
|||
|
||||
cabal.mkDerivation (self: {
|
||||
pname = "wai-test";
|
||||
version = "2.0.1.2";
|
||||
sha256 = "11mkzh5wlfhdrwzqhsbcl3qnbawmks4vxr1vv0s2ny50q5na41ln";
|
||||
version = "2.0.1.3";
|
||||
sha256 = "18j77l2n41941f95awj6fj0w712628v5lsc3bif00cqnaixjmz48";
|
||||
buildDepends = [
|
||||
blazeBuilder blazeBuilderConduit caseInsensitive conduit
|
||||
conduitExtra cookie deepseq httpTypes network text transformers wai
|
||||
|
|
|
|||
|
|
@ -5,8 +5,8 @@
|
|||
|
||||
cabal.mkDerivation (self: {
|
||||
pname = "wai-websockets";
|
||||
version = "2.1.0.1";
|
||||
sha256 = "1ic1wgfp16j6lhypn1psmicafjavbhq5rvm32xqwkb65abhpg571";
|
||||
version = "2.1.0.2";
|
||||
sha256 = "16hff38x6fpmp4r1wkjd922s02v5na8zwy6mq5f5gsj7b70n2ww2";
|
||||
isLibrary = true;
|
||||
isExecutable = true;
|
||||
buildDepends = [
|
||||
|
|
|
|||
|
|
@ -4,8 +4,8 @@
|
|||
|
||||
cabal.mkDerivation (self: {
|
||||
pname = "wai";
|
||||
version = "2.1.0.2";
|
||||
sha256 = "02hj07s3vlhbd2hds5pyksghildadjqhr8mmiyabwb7ap8iybidg";
|
||||
version = "2.1.0.3";
|
||||
sha256 = "0qprvk63fvb4rddg9h385xbd5sr5bcgkpx6fqlw01pjzmmrig1m3";
|
||||
buildDepends = [
|
||||
blazeBuilder conduit conduitExtra httpTypes network text
|
||||
transformers vault
|
||||
|
|
|
|||
|
|
@ -7,8 +7,8 @@
|
|||
|
||||
cabal.mkDerivation (self: {
|
||||
pname = "warp";
|
||||
version = "2.1.5.1";
|
||||
sha256 = "1dx911y3nr2ixsn3zdp1rd97rydnvixr9chs3nmmkswzdg3qihvl";
|
||||
version = "2.1.5.2";
|
||||
sha256 = "0rv5fxw1d5dh6jzvs3bg2vjjr702xw59fx7mflygpqh8zivfh4ds";
|
||||
buildDepends = [
|
||||
blazeBuilder blazeBuilderConduit caseInsensitive conduit
|
||||
conduitExtra hashable httpDate httpTypes liftedBase network
|
||||
|
|
|
|||
16
pkgs/development/libraries/haskell/wcwidth/default.nix
Normal file
16
pkgs/development/libraries/haskell/wcwidth/default.nix
Normal file
|
|
@ -0,0 +1,16 @@
|
|||
{ cabal, attoparsec, setlocale, utf8String }:
|
||||
|
||||
cabal.mkDerivation (self: {
|
||||
pname = "wcwidth";
|
||||
version = "0.0.2";
|
||||
sha256 = "1n1fq7v64b59ajf5g50iqj9sa34wm7s2j3viay0kxpmvlcv8gipz";
|
||||
isLibrary = true;
|
||||
isExecutable = true;
|
||||
buildDepends = [ attoparsec setlocale utf8String ];
|
||||
meta = {
|
||||
homepage = "http://github.com/solidsnack/wcwidth/";
|
||||
description = "Native wcwidth";
|
||||
license = self.stdenv.lib.licenses.bsd3;
|
||||
platforms = self.ghc.meta.platforms;
|
||||
};
|
||||
})
|
||||
|
|
@ -6,8 +6,8 @@
|
|||
|
||||
cabal.mkDerivation (self: {
|
||||
pname = "websockets";
|
||||
version = "0.8.2.2";
|
||||
sha256 = "16q4znki5f4133cgwcs8wqgx6ljl8x59khrsdsi646nclb3lyl0a";
|
||||
version = "0.8.2.3";
|
||||
sha256 = "0j4lm5hkipd4q6kizrjy1cjdw2b0588m4k6fh50ss5qnqw9rkjkd";
|
||||
buildDepends = [
|
||||
attoparsec base64Bytestring binary blazeBuilder caseInsensitive
|
||||
entropy ioStreams mtl network random SHA text
|
||||
|
|
|
|||
|
|
@ -2,8 +2,8 @@
|
|||
|
||||
cabal.mkDerivation (self: {
|
||||
pname = "xdot";
|
||||
version = "0.2.4.2";
|
||||
sha256 = "0a5wmwcl3akw1n9xgdhvlrbvphvy9s528daax28137ixaphvrl0f";
|
||||
version = "0.2.4.3";
|
||||
sha256 = "0p6y3ng8nwi8sksy0881bs331asi73x816zd5v7qlg4v719s8jxg";
|
||||
buildDepends = [ cairo graphviz gtk mtl polyparse text ];
|
||||
jailbreak = true;
|
||||
meta = {
|
||||
|
|
|
|||
|
|
@ -6,8 +6,8 @@
|
|||
|
||||
cabal.mkDerivation (self: {
|
||||
pname = "xml-conduit";
|
||||
version = "1.2.0.1";
|
||||
sha256 = "0ry3h1csblssv2x8b63hvl2gqc0wyzyqbvp6iyisrk77wkz72jw9";
|
||||
version = "1.2.0.2";
|
||||
sha256 = "1kcrhyri4knkp1x9zn99qklkj4nd47gwdfy6q0pwdz7cgjskps1z";
|
||||
buildDepends = [
|
||||
attoparsec attoparsecConduit blazeBuilder blazeBuilderConduit
|
||||
blazeHtml blazeMarkup conduit conduitExtra dataDefault deepseq
|
||||
|
|
|
|||
|
|
@ -4,8 +4,8 @@
|
|||
|
||||
cabal.mkDerivation (self: {
|
||||
pname = "yaml";
|
||||
version = "0.8.8.2";
|
||||
sha256 = "0dqn5pzk3bh9pprnlp9ggmjdwbb1j9yyd6ihq7vwky5g4yrqbl8m";
|
||||
version = "0.8.8.3";
|
||||
sha256 = "031d1wx31mw9lw0swlcf1xfzdixaq6wmglhzaj9sixhid0r2isvf";
|
||||
isLibrary = true;
|
||||
isExecutable = true;
|
||||
buildDepends = [
|
||||
|
|
|
|||
19
pkgs/development/libraries/haskell/zip-archive/0.2.3.2.nix
Normal file
19
pkgs/development/libraries/haskell/zip-archive/0.2.3.2.nix
Normal file
|
|
@ -0,0 +1,19 @@
|
|||
{ cabal, binary, digest, filepath, HUnit, mtl, text, time, zlib }:
|
||||
|
||||
cabal.mkDerivation (self: {
|
||||
pname = "zip-archive";
|
||||
version = "0.2.3.2";
|
||||
sha256 = "1y69sk6jyw1klgpl6bcamq1i9wy1536hz9x4s9b8n375sbhj10f1";
|
||||
isLibrary = true;
|
||||
isExecutable = true;
|
||||
buildDepends = [ binary digest filepath mtl text time zlib ];
|
||||
testDepends = [ HUnit time ];
|
||||
doCheck = false;
|
||||
meta = {
|
||||
homepage = "http://github.com/jgm/zip-archive";
|
||||
description = "Library for creating and modifying zip archives";
|
||||
license = self.stdenv.lib.licenses.bsd3;
|
||||
platforms = self.ghc.meta.platforms;
|
||||
maintainers = [ self.stdenv.lib.maintainers.andres ];
|
||||
};
|
||||
})
|
||||
|
|
@ -2,14 +2,14 @@
|
|||
|
||||
stdenv.mkDerivation rec
|
||||
{
|
||||
version = "1.2.1";
|
||||
seafileVersion = "2.1.1";
|
||||
version = "1.2.2";
|
||||
seafileVersion = "3.0.4";
|
||||
name = "libsearpc-${version}";
|
||||
|
||||
src = fetchurl
|
||||
{
|
||||
url = "https://github.com/haiwen/libsearpc/archive/v${seafileVersion}.tar.gz";
|
||||
sha256 = "c0e7cc812c642ebb1339c3701570e78ff5b8c8aa2a521e5a505e28d9666e89ec";
|
||||
sha256 = "0s5bqqajxfzyw4km6nhhx39nyq20gv0fxlf2v6ifipvnyk14850k";
|
||||
};
|
||||
|
||||
patches = [ ./libsearpc.pc.patch ];
|
||||
|
|
@ -29,4 +29,4 @@ stdenv.mkDerivation rec
|
|||
platforms = stdenv.lib.platforms.linux;
|
||||
maintainers = [ stdenv.lib.maintainers.calrama ];
|
||||
};
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -19,7 +19,12 @@ stdenv.mkDerivation rec {
|
|||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
doCheck = true;
|
||||
# jww (2014-05-05): The tests currently fail on Darwin:
|
||||
#
|
||||
# ERROR:testiter.c:139:iter_char_test: assertion failed: (extents.width == x1 - x0)
|
||||
# .../bin/sh: line 5: 14823 Abort trap: 6 srcdir=. PANGO_RC_FILE=./pangorc ${dir}$tst
|
||||
# FAIL: testiter
|
||||
doCheck = !stdenv.isDarwin;
|
||||
postInstall = "rm -rf $out/share/gtk-doc";
|
||||
|
||||
meta = {
|
||||
|
|
|
|||
Some files were not shown because too many files have changed in this diff Show more
Loading…
Reference in a new issue