nordic-dev.net/nixpkgs
nordic-dev.net/nixpkgs
2
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-02 07:31:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge recent master

Browse Source
This commit is contained in:
Vladimír Čunát 2014-06-10 20:14:08 +02:00
commit f2352f7ecf
199 changed files with 5598 additions and 2940 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
lib/maintainers.nix
View File

@ -17,6 +17,7 @@
arobyn = "Alexei Robyn <shados@shados.net>";
astsmtl = "Alexander Tsamutali <astsmtl@yandex.ru>";
aszlig = "aszlig <aszlig@redmoonstudios.org>";
auntie = "Jonathan Glines <auntieNeo@gmail.com>";
bbenoist = "Baptist BENOIST <return_0@live.com>";
bennofs = "Benno Fünfstück <benno.fuenfstueck@gmail.com>";
berdario = "Dario Bertini <berdario@gmail.com>";

2
nixos/modules/config/i18n.nix
View File

@ -76,7 +76,7 @@ in
environment.systemPackages = [ glibcLocales ];
environment.variables =
environment.systemVariables =
{ LANG = config.i18n.defaultLocale;
LOCALE_ARCHIVE = "/run/current-system/sw/lib/locale/locale-archive";
};

1
nixos/modules/config/shells-environment.nix
View File

@ -19,6 +19,7 @@ in
default = {};
description = ''
A set of environment variables used in the global environment.
These variables will be set on shell initialisation.
The value of each variable can be either a string or a list of
strings. The latter is concatenated, interspersed with colon
characters.

56
nixos/modules/config/system-environment.nix Normal file
View File

@ -0,0 +1,56 @@
# This module defines a system-wide environment that will be
# initialised by pam_env (that is, not only in shells).
{ config, lib, pkgs, ... }:
with lib;
let
cfg = config.environment;
in
{
options = {
environment.systemVariables = mkOption {
default = {};
description = ''
A set of environment variables used in the global environment.
These variables will be set by PAM.
The value of each variable can be either a string or a list of
strings. The latter is concatenated, interspersed with colon
characters.
'';
type = types.attrsOf (mkOptionType {
name = "a string or a list of strings";
merge = loc: defs:
let
defs' = filterOverrides defs;
res = (head defs').value;
in
if isList res then concatLists (getValues defs')
else if lessThan 1 (length defs') then
throw "The option `${showOption loc}' is defined multiple times, in ${showFiles (getFiles defs)}."
else if !isString res then
throw "The option `${showOption loc}' does not have a string value, in ${showFiles (getFiles defs)}."
else res;
});
apply = mapAttrs (n: v: if isList v then concatStringsSep ":" v else v);
};
};
config = {
system.build.pamEnvironment = pkgs.writeText "pam-environment"
''
${concatStringsSep "\n" (
(mapAttrsToList (n: v: ''${n}="${concatStringsSep ":" v}"'')
(zipAttrsWith (const concatLists) ([ (mapAttrs (n: v: [ v ]) cfg.systemVariables) ]))))}
'';
};
}

2
nixos/modules/config/timezone.nix
View File

@ -30,7 +30,7 @@ in
config = {
environment.variables.TZDIR = "/etc/zoneinfo";
environment.systemVariables.TZDIR = "/etc/zoneinfo";
systemd.globalEnvironment.TZDIR = tzdir;

2
nixos/modules/installer/cd-dvd/installation-cd-base.nix
View File

@ -19,7 +19,7 @@ with lib;
# ISO naming.
isoImage.isoName = "${config.isoImage.isoBaseName}-${config.system.nixosVersion}-${pkgs.stdenv.system}.iso";
isoImage.volumeID = substring 0 11 "NIXOS_${config.system.nixosVersion}";
isoImage.volumeID = substring 0 11 "NIXOS_ISO";
# Make the installer more likely to succeed in low memory
# environments. The kernel's overcommit heustistics bite us

2
nixos/modules/installer/tools/nixos-build-vms/build-vms.nix
View File

@ -6,4 +6,4 @@ let nodes = import networkExpr; in
with import ../../../../lib/testing.nix { inherit system; };
(complete { inherit nodes; testScript = ""; }).driver
(makeTest { inherit nodes; testScript = ""; }).driver

1
nixos/modules/module-list.nix
View File

@ -14,6 +14,7 @@
./config/power-management.nix
./config/pulseaudio.nix
./config/shells-environment.nix
./config/system-environment.nix
./config/swap.nix
./config/sysctl.nix
./config/system-path.nix

9
nixos/modules/programs/environment.nix
View File

@ -19,13 +19,16 @@ in
environment.variables =
{ LOCATE_PATH = "/var/cache/locatedb";
NIXPKGS_CONFIG = "/etc/nix/nixpkgs-config.nix";
NIX_PATH =
PAGER = "less -R";
EDITOR = "nano";
};
environment.systemVariables =
{ NIX_PATH =
[ "/nix/var/nix/profiles/per-user/root/channels/nixos"
"nixpkgs=/etc/nixos/nixpkgs"
"nixos-config=/etc/nixos/configuration.nix"
];
PAGER = "less -R";
EDITOR = "nano";
};
environment.profiles =

8
nixos/modules/security/ca.nix
View File

@ -12,9 +12,11 @@ with lib;
}
];
environment.variables.OPENSSL_X509_CERT_FILE = "/etc/ssl/certs/ca-bundle.crt";
environment.variables.CURL_CA_BUNDLE = "/etc/ssl/certs/ca-bundle.crt";
environment.variables.GIT_SSL_CAINFO = "/etc/ssl/certs/ca-bundle.crt";
environment.systemVariables =
{ OPENSSL_X509_CERT_FILE = "/etc/ssl/certs/ca-bundle.crt";
CURL_CA_BUNDLE = "/etc/ssl/certs/ca-bundle.crt";
GIT_SSL_CAINFO = "/etc/ssl/certs/ca-bundle.crt";
};
};

1
nixos/modules/security/pam.nix
View File

@ -186,6 +186,7 @@ let
"password optional ${pkgs.samba}/lib/security/pam_smbpass.so nullok use_authtok try_first_pass"}
# Session management.
session required pam_env.so envfile=${config.system.build.pamEnvironment}
session required pam_unix.so
${optionalString cfg.setLoginUid
"session required pam_loginuid.so"}

10
nixos/modules/security/sudo.nix
View File

@ -58,9 +58,6 @@ in
# Don't edit this file. Set the NixOS option ‘security.sudo.configFile’ instead.
# Environment variables to keep for root and %wheel.
Defaults:root,%wheel env_keep+=LOCALE_ARCHIVE
Defaults:root,%wheel env_keep+=NIX_CONF_DIR
Defaults:root,%wheel env_keep+=NIX_PATH
Defaults:root,%wheel env_keep+=TERMINFO_DIRS
Defaults:root,%wheel env_keep+=TERMINFO
@ -81,10 +78,13 @@ in
security.pam.services.sudo = { sshAgentAuth = true; };
environment.etc = singleton
{ source = pkgs.writeText "sudoers-in" cfg.configFile;
{ source =
pkgs.runCommand "sudoers"
{src = pkgs.writeText "sudoers-in" cfg.configFile; }
# Make sure that the sudoers file is syntactically valid.
# (currently disabled - NIXOS-66)
#"${pkgs.sudo}/sbin/visudo -f $src -c && cp $src $out";
"${pkgs.sudo.override {keepVisudo = true;}}/sbin/visudo -f $src -c &&
cp $src $out";
target = "sudoers";
mode = "0440";
};

3
nixos/modules/services/misc/disnix.nix
View File

@ -125,13 +125,14 @@ in
after = [ "dbus.service" ]
++ optional config.services.httpd.enable "httpd.service"
++ optional config.services.mysql.enable "mysql.service"
++ optional config.services.postgresql.enable "postgresql.service"
++ optional config.services.tomcat.enable "tomcat.service"
++ optional config.services.svnserve.enable "svnserve.service"
++ optional config.services.mongodb.enable "mongodb.service";
restartIfChanged = false;
path = [ pkgs.nix pkgs.disnix pkgs.dysnomia ];
path = [ pkgs.nix pkgs.disnix dysnomia ];
environment = {
HOME = "/root";

2
nixos/modules/services/misc/nix-daemon.nix
View File

@ -318,7 +318,7 @@ in
};
# Set up the environment variables for running Nix.
environment.variables = cfg.envVars;
environment.systemVariables = cfg.envVars;
environment.extraInit =
''

41
nixos/modules/services/monitoring/graphite.nix
View File

@ -47,19 +47,19 @@ in {
web = {
enable = mkOption {
description = "Whether to enable graphite web frontend";
description = "Whether to enable graphite web frontend.";
default = false;
type = types.uniq types.bool;
};
host = mkOption {
description = "Graphite web frontend listen address";
description = "Graphite web frontend listen address.";
default = "127.0.0.1";
type = types.str;
};
port = mkOption {
description = "Graphite web frontend port";
description = "Graphite web frontend port.";
default = 8080;
type = types.int;
};
@ -67,7 +67,7 @@ in {
carbon = {
config = mkOption {
description = "Content of carbon configuration file";
description = "Content of carbon configuration file.";
default = ''
[cache]
# Listen on localhost by default for security reasons
@ -83,13 +83,13 @@ in {
};
enableCache = mkOption {
description = "Whether to enable carbon cache, the graphite storage daemon";
description = "Whether to enable carbon cache, the graphite storage daemon.";
default = false;
type = types.uniq types.bool;
};
storageAggregation = mkOption {
description = "Defines how to aggregate data to lower-precision retentions";
description = "Defines how to aggregate data to lower-precision retentions.";
default = null;
type = types.uniq (types.nullOr types.string);
example = ''
@ -101,7 +101,7 @@ in {
};
storageSchemas = mkOption {
description = "Defines retention rates for storing metrics";
description = "Defines retention rates for storing metrics.";
default = "";
type = types.uniq (types.nullOr types.string);
example = ''
@ -112,21 +112,24 @@ in {
};
blacklist = mkOption {
description = "Any metrics received which match one of the experssions will be dropped";
description = "Any metrics received which match one of the experssions will be dropped.";
default = null;
type = types.uniq (types.nullOr types.string);
example = "^some\.noisy\.metric\.prefix\..*";
};
whitelist = mkOption {
description = "Only metrics received which match one of the experssions will be persisted";
description = "Only metrics received which match one of the experssions will be persisted.";
default = null;
type = types.uniq (types.nullOr types.string);
example = ".*";
};
rewriteRules = mkOption {
description = "Regular expression patterns that can be used to rewrite metric names in a search and replace fashion";
description = ''
Regular expression patterns that can be used to rewrite metric names
in a search and replace fashion.
'';
default = null;
type = types.uniq (types.nullOr types.string);
example = ''
@ -137,7 +140,7 @@ in {
};
enableRelay = mkOption {
description = "Whether to enable carbon relay, the carbon replication and sharding service";
description = "Whether to enable carbon relay, the carbon replication and sharding service.";
default = false;
type = types.uniq types.bool;
};
@ -154,13 +157,13 @@ in {
};
enableAggregator = mkOption {
description = "Whether to enable carbon agregator, the carbon buffering service";
description = "Whether to enable carbon agregator, the carbon buffering service.";
default = false;
type = types.uniq types.bool;
};
aggregationRules = mkOption {
description = "Defines if and how received metrics will be agregated";
description = "Defines if and how received metrics will be agregated.";
default = null;
type = types.uniq (types.nullOr types.string);
example = ''
@ -188,10 +191,7 @@ in {
};
restartTriggers = [
pkgs.pythonPackages.carbon
cfg.carbon.config
cfg.carbon.storageAggregation
cfg.carbon.storageSchemas
cfg.carbon.rewriteRules
configDir
];
preStart = ''
mkdir -p ${cfg.dataDir}/whisper
@ -212,7 +212,8 @@ in {
Group = "graphite";
};
restartTriggers = [
pkgs.pythonPackages.carbon cfg.carbon.config cfg.carbon.aggregationRules
pkgs.pythonPackages.carbon
configDir
];
};
@ -228,7 +229,8 @@ in {
Group = "graphite";
};
restartTriggers = [
pkgs.pythonPackages.carbon cfg.carbon.config cfg.carbon.relayRules
pkgs.pythonPackages.carbon
configDir
];
};
@ -271,7 +273,6 @@ in {
'';
restartTriggers = [
pkgs.python27Packages.graphite_web
pkgs.python27Packages.waitress
];
};

33
nixos/modules/system/activation/top-level.nix
View File

@ -95,7 +95,7 @@ let
# kernel, systemd units, init scripts, etc.) as well as a script
# `switch-to-configuration' that activates the configuration and
# makes it bootable.
system = showWarnings (
baseSystem = showWarnings (
if [] == failed then pkgs.stdenv.mkDerivation {
name = "nixos-${config.system.nixosVersion}";
preferLocalBuild = true;
@ -118,6 +118,10 @@ let
perl = "${pkgs.perl}/bin/perl -I${pkgs.perlPackages.FileSlurp}/lib/perl5/site_perl";
} else throw "\nFailed assertions:\n${concatStringsSep "\n" (map (x: "- ${x}") failed)}");
# Replace runtime dependencies
system = fold ({ oldDependency, newDependency }: drv:
pkgs.replaceDependency { inherit oldDependency newDependency drv; }
) baseSystem config.system.replaceRuntimeDependencies;
in
@ -184,6 +188,33 @@ in
'';
};
system.replaceRuntimeDependencies = mkOption {
default = [];
example = lib.literalExample "[ ({ original = pkgs.openssl; replacement = pkgs.callPackage /path/to/openssl { ... }; }) ]";
type = types.listOf (types.submodule (
{ options, ... }: {
options.original = mkOption {
type = types.package;
description = "The original package to override.";
};
options.replacement = mkOption {
type = types.package;
description = "The replacement package.";
};
})
);
apply = map ({ original, replacement, ... }: {
oldDependency = original;
newDependency = replacement;
});
description = ''
List of packages to override without doing a full rebuild.
The original derivation and replacement derivation must have the same
name length, and ideally should have close-to-identical directory layout.
'';
};
};

68
pkgs/applications/editors/atom/default.nix Normal file
View File

@ -0,0 +1,68 @@
{ stdenv, fetchurl, buildEnv, makeDesktopItem, makeWrapper, zlib, glib, alsaLib
, dbus, gtk, atk, pango, freetype, fontconfig, libgnome_keyring3, gdk_pixbuf
, cairo, cups, expat, libgpgerror, nspr, gconf, nss, xlibs
}:
let
atomEnv = buildEnv {
name = "env-atom";
paths = [
stdenv.gcc.gcc zlib glib dbus gtk atk pango freetype libgnome_keyring3
fontconfig gdk_pixbuf cairo cups expat libgpgerror alsaLib nspr gconf nss
xlibs.libXrender xlibs.libX11 xlibs.libXext xlibs.libXdamage xlibs.libXtst
xlibs.libXcomposite xlibs.libXi xlibs.libXfixes
];
};
in stdenv.mkDerivation rec {
name = "atom-${version}";
version = "0.99.0";
src = fetchurl {
url = https://github.com/hotice/webupd8/raw/master/atom-linux64-0.99.0~git20140525.tar.xz;
sha256 = "55c2415c96e1182ae1517751cbea1db64e9962683b384cfe5e182aec10aebecd";
name = "${name}.tar.xz";
};
iconsrc = fetchurl {
url = https://raw.githubusercontent.com/atom/atom/master/resources/atom.png;
sha256 = "66dc0b432eed7bcd738b7c1b194e539178a83d427c78f103041981f2b840e030";
};
desktopItem = makeDesktopItem {
name = "atom";
exec = "atom";
icon = iconsrc;
comment = "A hackable text editor for the 21st Century";
desktopName = "Atom";
genericName = "Text editor";
categories = "Development;TextEditor";
};
buildInputs = [ atomEnv makeWrapper ];
phases = [ "installPhase" ];
installPhase = ''
ensureDir $out/share/atom
ensureDir $out/bin
tar -C $out/share/atom -xvf $src
patchelf --set-interpreter "$(cat $NIX_GCC/nix-support/dynamic-linker)" \
$out/share/atom/atom
patchelf --set-interpreter "$(cat $NIX_GCC/nix-support/dynamic-linker)" \
$out/share/atom/resources/app/apm/node_modules/atom-package-manager/bin/node
makeWrapper $out/share/atom/atom $out/bin/atom \
--prefix "LD_LIBRARY_PATH" : "${atomEnv}/lib:${atomEnv}/lib64"
# Create a desktop item.
mkdir -p "$out/share/applications"
cp "${desktopItem}"/share/applications/* "$out/share/applications/"
'';
meta = with stdenv.lib; {
description = "A hackable text editor for the 21st Century";
homepage = https://atom.io/;
license = [ licenses.mit ];
maintainers = [ maintainers.offline ];
platforms = [ "x86_64-linux" ];
};
}

38
pkgs/applications/editors/yi/yi.nix
View File

@ -5,6 +5,12 @@
, split, tasty, tastyHunit, tastyQuickcheck, time, transformersBase
, uniplate, unixCompat, unorderedContainers, utf8String, vty
, xdgBasedir
, withPango ? true
# User may need extra dependencies for their configuration file so we
# want to specify it here to have them available when wrapping the
# produced binary.
, extraDepends ? [ ]
}:
cabal.mkDerivation (self: {
@ -15,21 +21,43 @@ cabal.mkDerivation (self: {
isExecutable = true;
buildDepends = [
binary Cabal cautiousFile concreteTyperep dataDefault derive Diff
dlist dyre filepath fingertree glib gtk hashable hint lens mtl
pango parsec pointedlist QuickCheck random regexBase regexTdfa safe
dlist dyre filepath fingertree hashable hint lens mtl
parsec pointedlist QuickCheck random regexBase regexTdfa safe
split time transformersBase uniplate unixCompat unorderedContainers
utf8String vty xdgBasedir
];
] ++ (if withPango then [ pango gtk glib ] else [ ]) ++ extraDepends;
testDepends = [
filepath HUnit QuickCheck tasty tastyHunit tastyQuickcheck
];
buildTools = [ alex ];
configureFlags = "-fpango";
configureFlags = if withPango then "-fpango" else "-f-pango";
doCheck = false;
# https://ghc.haskell.org/trac/ghc/ticket/9170
noHaddock = self.ghc.version == "7.6.3";
# Allows Yi to find the libraries it needs at runtime.
postInstall = ''
mv $out/bin/yi $out/bin/.yi-wrapped
cat - > $out/bin/yi <<EOF
#! ${self.stdenv.shell}
# Trailing : is necessary for it to pick up Prelude &c.
export GHC_PACKAGE_PATH=$(${self.ghc.GHCGetPackages} ${self.ghc.version} \
| sed 's/-package-db\ //g' \
| sed 's/^\ //g' \
| sed 's/\ /:/g')\
:$out/lib/ghc-${self.ghc.version}/package.conf.d/yi-$version.installedconf:
eval exec $out/bin/.yi-wrapped "\$@"
EOF
chmod +x $out/bin/yi
'';
meta = {
homepage = "http://haskell.org/haskellwiki/Yi";
description = "The Haskell-Scriptable Editor";
license = "GPL";
license = self.stdenv.lib.licenses.gpl2;
platforms = self.ghc.meta.platforms;
maintainers = [ self.stdenv.lib.maintainers.fuuzetsu ];
};
})

4
pkgs/applications/graphics/potrace/default.nix
View File

@ -10,12 +10,14 @@ stdenv.mkDerivation {
sha256 = "1bbyl7jgigawmwc8r14znv8lb6lrcxh8zpvynrl6s800dr4yp9as";
};
configureFlags = ["--with-libpotrace"];
buildInputs = [ zlib ];
meta = {
homepage = http://potrace.sourceforge.net/;
description = "A tool for tracing a bitmap, which means, transforming a bitmap into a smooth, scalable image";
platforms = stdenv.lib.platforms.linux;
platforms = stdenv.lib.platforms.unix;
maintainers = [ stdenv.lib.maintainers.pSub ];
license = "GPL2";
};

6
pkgs/applications/networking/browsers/vimb/default.nix
View File

@ -4,16 +4,16 @@
stdenv.mkDerivation rec {
name = "vimb-${version}";
version = "2.2";
version = "2.4";
src = fetchurl {
url = "https://github.com/fanglingsu/vimb/archive/${version}.tar.gz";
sha256 = "18gig6rcxv0i4a8mz3jv29zpj0323zw45jsg1ycx61a08rzag60m";
sha256 = "167ilbsd4y4zl493k6g4j5v85y784qz8z7qflzd1ccsjjznv7fm8";
};
# Nixos default ca bundle
patchPhase = ''
sed -i s,/etc/ssl/certs/ca-certificates.crt,/etc/ssl/certs/ca-bundle.crt, src/default.h
sed -i s,/etc/ssl/certs/ca-certificates.crt,/etc/ssl/certs/ca-bundle.crt, src/setting.c
'';
buildInputs = [ makeWrapper gtk libsoup pkgconfig webkit gsettings_desktop_schemas ];

4
pkgs/applications/networking/ftp/filezilla/default.nix
View File

@ -1,13 +1,13 @@
{ stdenv, fetchurl, dbus, gnutls, wxGTK28, libidn, tinyxml, gettext
, pkgconfig, xdg_utils, gtk2, sqlite }:
let version = "3.8.0"; in
let version = "3.8.1"; in
stdenv.mkDerivation {
name = "filezilla-${version}";
src = fetchurl {
url = "mirror://sourceforge/project/filezilla/FileZilla_Client/${version}/FileZilla_${version}_src.tar.bz2";
sha256 = "02635sh88zvmqhqs7yx982dmfa1qd0rhk4z1fqvgh5pr2ac1r74d";
sha256 = "0kqyz8yb15kbzx02l3riswg95prbp402k4672nwxrzs35049rg36";
};
configureFlags = [

16
pkgs/applications/networking/irc/weechat/default.nix
View File

@ -14,8 +14,8 @@ stdenv.mkDerivation rec {
buildInputs =
[ ncurses perl python openssl aspell gnutls zlib curl pkgconfig
libgcrypt ruby lua5 tcl guile pythonPackages.pycrypto makeWrapper
cacert cmake
];
cacert cmake ]
++ stdenv.lib.optional stdenv.isDarwin pythonPackages.pync;
# This patch is based on
# weechat/c324610226cef15ecfb1235113c8243b068084c8. It fixes
@ -24,17 +24,23 @@ stdenv.mkDerivation rec {
# then.
patches = [ ./fix-gnutls-32.diff ];
NIX_CFLAGS_COMPILE = "-I${python}/include/${python.libPrefix}";
postInstall = ''
NIX_PYTHONPATH="$out/lib/${python.libPrefix}/site-packages"
'' + stdenv.lib.optionalString stdenv.isDarwin ''
NIX_PYTHONPATH+="${pythonPackages.pync}/lib/${python.libPrefix}/site-packages"
'' + ''
wrapProgram "$out/bin/weechat" \
--prefix PYTHONPATH : "$PYTHONPATH" \
--prefix PYTHONPATH : "$out/lib/${python.libPrefix}/site-packages"
--prefix PYTHONPATH : "$NIX_PYTHONPATH"
'';
meta = {
homepage = http://www.weechat.org/;
description = "A fast, light and extensible chat client";
license = stdenv.lib.licenses.gpl3;
maintainers = with stdenv.lib.maintainers; [ garbas the-kenny ];
platforms = stdenv.lib.platforms.linux;
maintainers = with stdenv.lib.maintainers; [ lovek323 garbas the-kenny ];
platforms = stdenv.lib.platforms.unix;
};
}

16
pkgs/applications/networking/irc/weechat/devel.nix
View File

@ -16,20 +16,26 @@ stdenv.mkDerivation rec {
buildInputs =
[ ncurses perl python openssl aspell gnutls zlib curl pkgconfig
libgcrypt ruby lua5 tcl guile pythonPackages.pycrypto makeWrapper
cacert cmake
];
cacert cmake ]
++ stdenv.lib.optional stdenv.isDarwin pythonPackages.pync;
NIX_CFLAGS_COMPILE = "-I${python}/include/${python.libPrefix}";
postInstall = ''
NIX_PYTHON_PATH="$out/lib/${python.libPrefix}/site-packages"
'' + stdenv.lib.optionalString stdenv.isDarwin ''
NIX_PYTHON_PATH+="${pythonPackages.pync}/lib/${python.libPrefix}/site-packages"
'' + ''
wrapProgram "$out/bin/weechat" \
--prefix PYTHONPATH : "$PYTHONPATH" \
--prefix PYTHONPATH : "$out/lib/${python.libPrefix}/site-packages"
--prefix PYTHONPATH : "$NIX_PYTHONPATH"
'';
meta = {
homepage = http://www.weechat.org/;
description = "A fast, light and extensible chat client";
license = stdenv.lib.licenses.gpl3;
maintainers = with stdenv.lib.maintainers; [ garbas the-kenny ];
platforms = stdenv.lib.platforms.linux;
maintainers = with stdenv.lib.maintainers; [ lovek323 garbas the-kenny ];
platforms = stdenv.lib.platforms.unix;
};
}

38
pkgs/applications/networking/mailreaders/sup/default.nix
View File

@ -1,32 +1,40 @@
{ stdenv, fetchgit, ruby, rake, rubygems, makeWrapper, ncursesw_sup
{ stdenv, fetchurl, ruby, rake, rubygems, makeWrapper, ncursesw_sup
, xapian_ruby, gpgme, libiconvOrEmpty, mime_types, chronic, trollop, lockfile
, gettext, iconv, locale, text, highline, rmail_sup, unicode, gnupg, which }:
, gettext, iconv, locale, text, highline, rmail_sup, unicode, gnupg, which
, bundler, git }:
stdenv.mkDerivation rec {
version = "20140312";
version = "0.18.0";
name = "sup-${version}";
meta = {
homepage = http://supmua.org;
description = "A curses threads-with-tags style email client";
maintainers = with stdenv.lib.maintainers; [ lovek323 ];
homepage = http://supmua.org;
license = stdenv.lib.licenses.gpl2;
maintainers = with stdenv.lib.maintainers; [ lovek323 ];
platforms = stdenv.lib.platforms.unix;
};
dontStrip = true;
src = fetchgit {
url = git://github.com/sup-heliotrope/sup.git;
rev = "0cad7b308237c07b8a46149908b2ad4806ac3d1d";
sha256 = "83534b6ad9fb6aa883d630c927e3a71bd09a646e3254b4eb0cc7a09f69a525bc";
src = fetchurl {
url = "https://github.com/sup-heliotrope/sup/archive/release-${version}.tar.gz";
sha256 = "1dhg0i2v0ddhwi32ih5lc56x00kbaikd2wdplgzlshq0nljr9xy0";
};
buildInputs =
[ ruby rake rubygems makeWrapper gpgme ncursesw_sup xapian_ruby
libiconvOrEmpty ];
[ rake ruby rubygems makeWrapper gpgme ncursesw_sup xapian_ruby
libiconvOrEmpty git ];
buildPhase = "rake gem";
phases = [ "unpackPhase" "buildPhase" "installPhase" ];
buildPhase = ''
# the builder uses git to get a listing of the files
git init >/dev/null
git add .
git commit -m "message" >/dev/null
gem build sup.gemspec
'';
installPhase = ''
export HOME=$TMP/home; mkdir -pv "$HOME"
@ -50,13 +58,13 @@ stdenv.mkDerivation rec {
# Don't install some dependencies -- we have already installed
# the dependencies but gem doesn't acknowledge this
gem install --no-verbose --install-dir "$out/${ruby.gemPath}" \
--bindir "$out/bin" --no-rdoc --no-ri pkg/sup-999.gem \
--ignore-dependencies
--bindir "$out/bin" --no-rdoc --no-ri sup-${version}.gem \
--ignore-dependencies >/dev/null
# specify ruby interpreter explicitly
sed -i '1 s|^.*$|#!${ruby}/bin/ruby|' bin/sup-sync-back-maildir
cp bin/sup-sync-back-maildir "$out"/bin
cp bin/sup-sync-back-maildir "$out/bin"
for prog in $out/bin/*; do
wrapProgram "$prog" --prefix GEM_PATH : "$GEM_PATH" --prefix PATH : "${gnupg}/bin:${which}/bin"

59
pkgs/applications/version-management/git-and-tools/git-annex/default.nix
View File

@ -1,50 +1,41 @@
{ cabal, aeson, async, blazeBuilder, bloomfilter, bup, byteable
, caseInsensitive, clientsession, cryptoApi, cryptohash, curl
, dataDefault, dataenc, DAV, dbus, dlist, dns, editDistance
, extensibleExceptions, fdoNotify, feed, filepath, git, gnupg1
, gnutls, hamlet, hinotify, hS3, hslogger, HTTP, httpClient
, exceptions, extensibleExceptions, fdoNotify, feed, filepath, git
, gnupg1, gnutls, hamlet, hinotify, hS3, hslogger, HTTP, httpClient
, httpConduit, httpTypes, IfElse, json, liftedBase, lsof, MissingH
, MonadCatchIOTransformers, monadControl, mtl, network
, networkConduit, 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, waiLogger, warp, warpTls, which, xmlTypes, yesod
, yesodCore, yesodDefault, yesodForm, yesodStatic
, monadControl, mtl, network, networkConduit, 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, waiLogger, warp, warpTls
, which, xmlTypes, yesod, yesodCore, yesodDefault, yesodForm
, yesodStatic, fsnotify
}:
cabal.mkDerivation (self: {
pname = "git-annex";
version = "5.20140517";
sha256 = "150xf6664rfdljswc270m2pqvia4sywph4rrrbky6izy6a0vq680";
version = "5.20140606";
sha256 = "1b9hslkdv82lf8njwzy51yj8dgg2wn7g08wy73lk7pnddfh8qjpy";
isLibrary = false;
isExecutable = true;
buildDepends = [
aeson async blazeBuilder bloomfilter byteable caseInsensitive
clientsession cryptoApi cryptohash dataDefault dataenc DAV dbus
dlist dns editDistance extensibleExceptions fdoNotify feed filepath
gnutls hamlet hinotify hS3 hslogger HTTP httpClient httpConduit
httpTypes IfElse json liftedBase MissingH MonadCatchIOTransformers
monadControl mtl network networkConduit networkInfo
networkMulticast networkProtocolXmpp optparseApplicative QuickCheck
random regexTdfa SafeSemaphore securemem SHA shakespeare stm tasty
tastyHunit tastyQuickcheck tastyRerun text time transformers
unixCompat utf8String uuid wai waiLogger warp warpTls xmlTypes
yesod yesodCore yesodDefault yesodForm yesodStatic
];
clientsession cryptoApi cryptohash dataDefault dataenc DAV
dlist dns editDistance exceptions extensibleExceptions
feed filepath gnutls hamlet hS3 hslogger HTTP httpClient
httpConduit httpTypes IfElse json liftedBase MissingH monadControl
mtl network networkConduit networkInfo networkMulticast
networkProtocolXmpp optparseApplicative QuickCheck random regexTdfa
SafeSemaphore securemem SHA shakespeare stm tasty tastyHunit
tastyQuickcheck tastyRerun text time transformers unixCompat
utf8String uuid wai waiLogger warp warpTls xmlTypes yesod yesodCore
yesodDefault yesodForm yesodStatic
] ++ (if !self.stdenv.isDarwin
then [ dbus fdoNotify hinotify ] else [ fsnotify ]);
buildTools = [ bup curl git gnupg1 lsof openssh perl rsync which ];
configureFlags = "-fS3
-fWebDAV
-fInotify
-fDbus
-fAssistant
-fWebapp
-fPairing
-fXMPP
-fDNS
-fProduction
-fTDFA";
configureFlags = "-fAssistant -fProduction";
preConfigure = ''
export HOME="$NIX_BUILD_TOP/tmp"
mkdir "$HOME"

13
pkgs/applications/version-management/monotone/default.nix
View File

@ -1,8 +1,10 @@
{ stdenv, fetchurl, boost, zlib, botan, libidn
, lua, pcre, sqlite, perl, pkgconfig, expect }:
, lua, pcre, sqlite, perl, pkgconfig, expect
, bzip2, gmp, openssl
}:
let
version = "1.0";
version = "1.1";
perlVersion = (builtins.parseDrvName perl.name).version;
in
@ -13,12 +15,13 @@ stdenv.mkDerivation rec {
src = fetchurl {
url = "http://monotone.ca/downloads/${version}/monotone-${version}.tar.bz2";
sha256 = "5c530bc4652b2c08b5291659f0c130618a14780f075f981e947952dcaefc31dc";
sha256 = "124cwgi2q86hagslbk5idxbs9j896rfjzryhr6z63r6l485gcp7r";
};
patches = [ ./glibc-file-handle.patch ];
patches = [ ];
buildInputs = [ boost zlib botan libidn lua pcre sqlite pkgconfig expect ];
buildInputs = [ boost zlib botan libidn lua pcre sqlite pkgconfig expect
openssl gmp bzip2 ];
postInstall = ''
mkdir -p $out/share/${name}

8
pkgs/applications/version-management/monotone/default.upstream Normal file
View File

@ -0,0 +1,8 @@
url http://www.monotone.ca/downloads.php
do_overwrite(){
ensure_version
ensure_hash
set_var_value version $CURRENT_VERSION
set_var_value sha256 $CURRENT_HASH
}

166
pkgs/applications/version-management/monotone/glibc-file-handle.patch
View File

@ -1,166 +0,0 @@
Revision: da62cad10eda55aa233ac124273f3db4f541137a
Parent: 65bcb8cf8b32f68a5b48629b328f6d65979e58df
Author: Thomas Moschny <thomas.moschny@gmx.de>
Date: 07.05.2011 13:32:06
Branch: net.venge.monotone
Changelog:
* src/rcs_file.cc: Rename struct "file_handle" to "rcs_file_handle"
to avoid a name clash with a struct of same name defined by newer
glibc's "fcntl.h". For aesthetic reasons, also rename struct
"file_source".
References:
https://code.monotone.ca/p/monotone/source/commit/da62cad10eda55aa233ac124273f3db4f541137a/
https://bugs.gentoo.org/396651
============================================================
--- a/src/rcs_file.cc 885b3fbe7b6cfed78816f0e57cd71d44616213c6
+++ b/src/rcs_file.cc 03cf68912a4a708545ebce3d415c0e970ddead0b
@@ -42,12 +42,12 @@ struct
#ifdef HAVE_MMAP
struct
-file_handle
+rcs_file_handle
{
string const & filename;
off_t length;
int fd;
- file_handle(string const & fn) :
+ rcs_file_handle(string const & fn) :
filename(fn),
length(0),
fd(-1)
@@ -60,13 +60,13 @@ file_handle
if (fd == -1)
throw oops("open of " + filename + " failed");
}
- ~file_handle()
+ ~rcs_file_handle()
{
if (close(fd) == -1)
throw oops("close of " + filename + " failed");
}
};
-struct file_source
+struct rcs_file_source
{
string const & filename;
int fd;
@@ -91,7 +91,7 @@ struct file_source
++pos;
return good();
}
- file_source(string const & fn,
+ rcs_file_source(string const & fn,
int f,
off_t len) :
filename(fn),
@@ -104,7 +104,7 @@ struct file_source
if (mapping == MAP_FAILED)
throw oops("mmap of " + filename + " failed");
}
- ~file_source()
+ ~rcs_file_source()
{
if (munmap(mapping, length) == -1)
throw oops("munmapping " + filename + " failed, after reading RCS file");
@@ -112,12 +112,12 @@ struct
};
#elif defined(WIN32)
struct
-file_handle
+rcs_file_handle
{
string const & filename;
off_t length;
HANDLE fd;
- file_handle(string const & fn) :
+ rcs_file_handle(string const & fn) :
filename(fn),
length(0),
fd(NULL)
@@ -134,7 +134,7 @@ file_handle
if (fd == NULL)
throw oops("open of " + filename + " failed");
}
- ~file_handle()
+ ~rcs_file_handle()
{
if (CloseHandle(fd)==0)
throw oops("close of " + filename + " failed");
@@ -142,7 +142,7 @@ struct
};
struct
-file_source
+rcs_file_source
{
string const & filename;
HANDLE fd,map;
@@ -167,7 +167,7 @@ file_source
++pos;
return good();
}
- file_source(string const & fn,
+ rcs_file_source(string const & fn,
HANDLE f,
off_t len) :
filename(fn),
@@ -183,7 +183,7 @@ file_source
if (mapping==NULL)
throw oops("MapViewOfFile of " + filename + " failed");
}
- ~file_source()
+ ~rcs_file_source()
{
if (UnmapViewOfFile(mapping)==0)
throw oops("UnmapViewOfFile of " + filename + " failed");
@@ -193,7 +193,7 @@ file_source
};
#else
// no mmap at all
-typedef istream file_source;
+typedef istream rcs_file_source;
#endif
typedef enum
@@ -220,7 +220,7 @@ static token_type
}
static token_type
-get_token(file_source & ist,
+get_token(rcs_file_source & ist,
string & str,
size_t & line,
size_t & col)
@@ -303,14 +303,14 @@ struct parser
struct parser
{
- file_source & ist;
+ rcs_file_source & ist;
rcs_file & r;
string token;
token_type ttype;
size_t line, col;
- parser(file_source & s,
+ parser(rcs_file_source & s,
rcs_file & r)
: ist(s), r(r), line(1), col(1)
{}
@@ -489,8 +489,8 @@ parse_rcs_file(string const & filename,
parse_rcs_file(string const & filename, rcs_file & r)
{
#if defined(HAVE_MMAP) || defined(WIN32)
- file_handle handle(filename);
- file_source ifs(filename, handle.fd, handle.length);
+ rcs_file_handle handle(filename);
+ rcs_file_source ifs(filename, handle.fd, handle.length);
#else
ifstream ifs(filename.c_str());
ifs.unsetf(ios_base::skipws);

6
pkgs/applications/video/xbmc/default.nix
View File

@ -34,11 +34,11 @@ assert vdpauSupport -> libvdpau != null && ffmpeg.vdpauSupport;
assert pulseSupport -> pulseaudio != null;
stdenv.mkDerivation rec {
name = "xbmc-13.0";
name = "xbmc-13.1";
src = fetchurl {
url = "https://github.com/xbmc/xbmc/archive/13.0-Gotham.tar.gz";
sha256 = "096hin8qp1864ypyw9xysy13niwf79bgfgivxi7w7mh2dagn0mjx";
url = "https://github.com/xbmc/xbmc/archive/13.1-Gotham.tar.gz";
sha256 = "0y56c5csfp8xhk088g47m3bzrri73z868yfx6b04gnrdmr760jrl";
};
buildInputs = [

28
pkgs/build-support/nix-prefetch-tools/default.nix Normal file
View File

@ -0,0 +1,28 @@
{stdenv}:
stdenv.mkDerivation {
name = "nix-prefetch-tools";
src = "";
srcRoot=".";
prePhases = "undefUnpack";
undefUnpack = ''
unpackPhase () { :; };
'';
installPhase = ''
mkdir -p $out/bin
cp ${../fetchbzr/nix-prefetch-bzr} $out/bin
cp ${../fetchcvs/nix-prefetch-cvs} $out/bin
cp ${../fetchgit/nix-prefetch-git} $out/bin
cp ${../fetchhg/nix-prefetch-hg} $out/bin
cp ${../fetchsvn/nix-prefetch-svn} $out/bin
chmod a+x $out/bin/*
'';
meta = {
description = ''
A package to include all the NixPkgs prefetchers
'';
maintainers = with stdenv.lib.maintainers; [raskin];
platforms = with stdenv.lib.platforms; unix;
# Quicker to build than to download, I hope
hydraPlatforms = [];
};
}

2
pkgs/desktops/gnome-3/3.12/default.nix
View File

@ -116,7 +116,7 @@ rec {
gucharmap = callPackage ./core/gucharmap { };
gvfs = pkgs.gvfs.override { gnome = gnome3; };
gvfs = pkgs.gvfs.override { gnome = gnome3; lightWeight = false; };
eog = callPackage ./core/eog { };

4
pkgs/development/compilers/compcert/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchurl, coq, ocaml, gcc }:
{ stdenv, fetchurl, coq, ocaml, ocamlPackages, gcc }:
stdenv.mkDerivation rec {
name = "compcert-${version}";
@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
sha256 = "1cq4my646ll1mszs5mbzwk4vp8l8qnsc96fpcv2pl35aw5i6jqm8";
};
buildInputs = [ coq ocaml ];
buildInputs = [ coq ocaml ocamlPackages.menhir ];
enableParallelBuilding = true;
configurePhase = "./configure -prefix $out -toolprefix ${gcc}/bin/ ia32-linux";

26
pkgs/development/compilers/idris/default.nix
View File

@ -1,23 +1,25 @@
{ cabal, annotatedWlPprint, ansiTerminal, ansiWlPprint, binary
, boehmgc, Cabal, cheapskate, deepseq, filepath, gmp, happy
, haskeline, languageJava, lens, libffi, llvmGeneral
, llvmGeneralPure, mtl, network, parsers, split, text, time
, transformers, trifecta, unorderedContainers, utf8String, vector
, vectorBinaryInstances, xml, zlib
, 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.mkDerivation (self: {
pname = "idris";
version = "0.9.12";
sha256 = "151h9qkx7yw24q0b60r78hki1y8m6sxmfars7wywnbzk3kalqb6x";
version = "0.9.13";
sha256 = "0bpp8b19s1przycndvl542ar9dc285ccnwm7cic33ym1lcqil86n";
isLibrary = true;
isExecutable = true;
buildDepends = [
annotatedWlPprint ansiTerminal ansiWlPprint binary Cabal cheapskate
deepseq filepath haskeline languageJava lens libffi llvmGeneral
llvmGeneralPure mtl network parsers split text time transformers
trifecta unorderedContainers utf8String vector
vectorBinaryInstances xml zlib
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
];
buildTools = [ happy ];
extraLibraries = [ boehmgc gmp ];

5
pkgs/development/interpreters/clojure/default.nix
View File

@ -1,13 +1,13 @@
{ stdenv, fetchurl, unzip, ant, jdk, makeWrapper }:
let version = "1.5.1"; in
let version = "1.6.0"; in
stdenv.mkDerivation {
name = "clojure-${version}";
src = fetchurl {
url = "http://repo1.maven.org/maven2/org/clojure/clojure/${version}/clojure-${version}.zip";
sha256 = "1qgiji6ddvv40khp3qb3xfz09g7p4nnsh3pywqglb9f16v534yzy";
sha256 = "0yv67gackrzlwn9f8cnpw14y2hwspklxhy1450rl71vdrqjahlwq";
};
buildInputs = [ unzip ant jdk makeWrapper ];
@ -43,5 +43,6 @@ stdenv.mkDerivation {
offers a software transactional memory system and reactive Agent
system that ensure clean, correct, multithreaded designs.
'';
maintainers = with stdenv.lib.maintainers; [ the-kenny ];
};
}

9
pkgs/development/interpreters/pypy/2.2/default.nix
View File

@ -5,7 +5,7 @@ assert zlibSupport -> zlib != null;
let
majorVersion = "2.2";
majorVersion = "2.3";
version = "${majorVersion}.1";
pythonVersion = "2.7";
libPrefix = "pypy${majorVersion}";
@ -16,8 +16,8 @@ let
inherit majorVersion version;
src = fetchurl {
url = "https://bitbucket.org/pypy/pypy/downloads/pypy-${version}-src.tar.bz2";
sha256 = "0pq36n6bap96smpacx8gvgl8yvi9r7ddl4mlpsi5cdj4gqc4a815";
url = "https://bitbucket.org/pypy/pypy/get/release-${version}.tar.bz2";
sha256 = "0fg4l48c7n59n5j3b1dgcsr927xzylkfny4a6pnk6z0pq2bhvl9z";
};
buildInputs = [ bzip2 openssl pkgconfig pythonFull libffi ncurses expat sqlite ]
@ -60,7 +60,8 @@ let
# disable test_mhlib because it fails for unknown reason
# disable test_multiprocessing due to transient errors
# disable sqlite3 due to https://bugs.pypy.org/issue1740
./pypy-c ./pypy/test_all.py --pypy=./pypy-c -k '-test_sqlite -test_socket -test_shutil -test_mhlib -test_multiprocessing' lib-python
# disable test_os because test_urandom_failure fails
./pypy-c ./pypy/test_all.py --pypy=./pypy-c -k '-test_sqlite -test_socket -test_os -test_shutil -test_mhlib -test_multiprocessing' lib-python
'';
installPhase = ''

4
pkgs/development/interpreters/racket/default.nix
View File

@ -1,6 +1,6 @@
{ stdenv, fetchurl, cairo, file, pango, glib, gtk
, which, libtool, makeWrapper, libjpeg, libpng
, fontconfig, liberation_ttf, sqlite } :
, fontconfig, liberation_ttf, sqlite, openssl } :
stdenv.mkDerivation rec {
pname = "racket";
@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
};
# Various racket executables do run-time searches for these.
ffiSharedLibs = "${glib}/lib:${cairo}/lib:${pango}/lib:${gtk}/lib:${libjpeg}/lib:${libpng}/lib:${sqlite}/lib";
ffiSharedLibs = "${glib}/lib:${cairo}/lib:${pango}/lib:${gtk}/lib:${libjpeg}/lib:${libpng}/lib:${sqlite}/lib:${openssl}/lib";
buildInputs = [ file libtool which makeWrapper fontconfig liberation_ttf sqlite ];

14
pkgs/development/libraries/botan/default.nix
View File

@ -14,12 +14,12 @@ let
sourceInfo = rec {
baseName="botan";
tarBaseName="Botan";
baseVersion="1.8";
revision="11";
baseVersion = "1.10";
revision = "8";
version="${baseVersion}.${revision}";
name="${baseName}-${version}";
url="http://files.randombit.net/${baseName}/v${baseVersion}/${tarBaseName}-${version}.tbz";
hash="194vffc9gfb0912lzndn8nzblg2d2gjmk13fc8hppgpw7ln0mdn3";
hash = "182f316rbdd6jrqn92vjms3jyb9syn4ic0nzi3b7rfjbj3zdabxw";
};
in
rec {
@ -32,9 +32,14 @@ rec {
inherit buildInputs;
/* doConfigure should be removed if not needed */
phaseNames = ["doConfigure" "doMakeInstall"];
phaseNames = ["doConfigure" "doMakeInstall" "fixPkgConfig"];
configureCommand = "python configure.py --with-gnump --with-bzip2 --with-zlib --with-openssl --with-tr1-implementation=boost";
fixPkgConfig = a.fullDepEntry ''
cd "$out"/lib/pkgconfig
ln -s botan-*.pc botan.pc || true
'' ["minInit" "doMakeInstall"];
meta = {
description = "Cryptographic algorithms library";
maintainers = with a.lib.maintainers;
@ -43,6 +48,7 @@ rec {
];
platforms = with a.lib.platforms;
unix;
inherit version;
};
passthru = {
updateInfo = {

9
pkgs/development/libraries/botan/default.upstream Normal file
View File

@ -0,0 +1,9 @@
url http://botan.randombit.net/download.html
version_link 'Botan-[0-9]+[.][0-9]*[02468]([.][0-9]+)?[.](tbz|tbz2|tar[.]bz2)$'
ensure_version
ensure_hash
do_overwrite(){
set_var_value hash $CURRENT_HASH
set_var_value baseVersion ${CURRENT_VERSION%.*}
set_var_value revision ${CURRENT_VERSION##*.}
}

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

@ -6,8 +6,8 @@
cabal.mkDerivation (self: {
pname = "BlogLiterately";
version = "0.7.1.6";
sha256 = "0mzq0br9jsymml57kcxqyr401lckzm43fy74l3wy25n6grv64hd4";
version = "0.7.1.7";
sha256 = "05i0v5mrmnxbmrqrm473z6hs9j4c2jv1l81i4kdmm2wia6p93s90";
isLibrary = true;
isExecutable = true;
buildDepends = [

4
pkgs/development/libraries/haskell/Cabal/1.20.0.0.nix → pkgs/development/libraries/haskell/Cabal/1.20.0.1.nix
View File

@ -5,8 +5,8 @@
cabal.mkDerivation (self: {
pname = "Cabal";
version = "1.20.0.0";
sha256 = "1m2lp6v1959mdm9zfg6fg1xw2iv749r4rzj576lqvn66slwsjpw1";
version = "1.20.0.1";
sha256 = "0vcpw4rskqlg2swsxk93p77svb007qvpwlpj2ia55avpi4c3xf8m";
buildDepends = [ deepseq filepath time ];
testDepends = [
extensibleExceptions filepath HUnit QuickCheck regexPosix

4
pkgs/development/libraries/haskell/HTTP/4000.2.15.nix → pkgs/development/libraries/haskell/HTTP/4000.2.17.nix
View File

@ -5,8 +5,8 @@
cabal.mkDerivation (self: {
pname = "HTTP";
version = "4000.2.15";
sha256 = "1bw79hq5nzx1gab9p3d3szr0wkiv9zvf2ld9d4i48z6fnmil4qwj";
version = "4000.2.17";
sha256 = "1701mgf1gw00nxd70kkr86yl80qxy63rpqky2g9m2nfr6y4y5b59";
buildDepends = [ mtl network parsec ];
testDepends = [
caseInsensitive conduit conduitExtra deepseq httpdShed httpTypes

23
pkgs/development/libraries/haskell/MFlow/default.nix Normal file
View File

@ -0,0 +1,23 @@
{ cabal, blazeHtml, blazeMarkup, caseInsensitive, clientsession
, conduit, conduitExtra, cpphs, extensibleExceptions, httpTypes, monadloc
, mtl, parsec, random, RefSerialize, stm, TCache, text, time
, transformers, utf8String, vector, wai, warp, warpTls, Workflow
}:
cabal.mkDerivation (self: {
pname = "MFlow";
version = "0.4.5.4";
sha256 = "1ih9ni14xmqvcfvayjkggmpmw3s9yzp17gf4xzygldmjcs35j4n3";
buildDepends = [
blazeHtml blazeMarkup caseInsensitive clientsession conduit
conduitExtra cpphs extensibleExceptions httpTypes monadloc mtl parsec
random RefSerialize stm TCache text time transformers utf8String
vector wai warp warpTls Workflow
];
meta = {
description = "stateful, RESTful web framework";
license = self.stdenv.lib.licenses.bsd3;
platforms = self.ghc.meta.platforms;
maintainers = [ self.stdenv.lib.maintainers.tomberek ];
};
})

1
pkgs/development/libraries/haskell/MonadCatchIO-transformers/default.nix
View File

@ -5,6 +5,7 @@ cabal.mkDerivation (self: {
version = "0.3.1.0";
sha256 = "1r5syyalk8a81byhk39yp0j7vdrvlrpppbg52dql1fx6kfhysaxn";
buildDepends = [ extensibleExceptions monadsTf transformers ];
jailbreak = true;
meta = {
description = "Monad-transformer compatible version of the Control.Exception module";
license = self.stdenv.lib.licenses.bsd3;

10
pkgs/development/libraries/haskell/QuickCheck/2.7.3.nix → pkgs/development/libraries/haskell/QuickCheck/2.7.5.nix
View File

@ -1,14 +1,14 @@
{ cabal, random, testFramework, tfRandom }:
{ cabal, random, testFramework, tfRandom, transformers }:
cabal.mkDerivation (self: {
pname = "QuickCheck";
version = "2.7.3";
sha256 = "196pz0b32m84ydwm4wk7m8512bmsxw7nsqpxbyfxsyi3ykq220yh";
buildDepends = [ random tfRandom ];
version = "2.7.5";
sha256 = "1bak50yxf8qfwfw1f5bd2p1ynx1ndjv24yp6gd2a2a1fag34x0rb";
buildDepends = [ random tfRandom transformers ];
testDepends = [ testFramework ];
noHaddock = self.stdenv.lib.versionOlder self.ghc.version "6.11";
meta = {
homepage = "http://code.haskell.org/QuickCheck";
homepage = "https://github.com/nick8325/quickcheck";
description = "Automatic testing of Haskell programs";
license = self.stdenv.lib.licenses.bsd3;
platforms = self.ghc.meta.platforms;

14
pkgs/development/libraries/haskell/RefSerialize/default.nix Normal file
View File

@ -0,0 +1,14 @@
{ cabal, binary, hashtables, stringsearch }:
cabal.mkDerivation (self: {
pname = "RefSerialize";
version = "0.3.1.3";
sha256 = "0qrca0jismpvjy7i4xx19ljrj72gqcmwqg47a51ykncsvci0fjrm";
buildDepends = [ binary hashtables stringsearch ];
meta = {
description = "Write to and read from ByteStrings maintaining internal memory references";
license = self.stdenv.lib.licenses.bsd3;
platforms = self.ghc.meta.platforms;
maintainers = [ self.stdenv.lib.maintainers.tomberek ];
};
})

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

@ -5,6 +5,7 @@ cabal.mkDerivation (self: {
version = "0.5.3.3";
sha256 = "1772r6rfajcn622dxwy9z1bvv53l5xj6acbcv8n9p7h01fs52mpr";
buildDepends = [ mtl typeEquality ];
noHaddock = true;
meta = {
homepage = "http://code.google.com/p/replib/";
description = "Generic programming library with representation types";

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

@ -4,8 +4,8 @@
cabal.mkDerivation (self: {
pname = "SVGFonts";
version = "1.4.0.2";
sha256 = "1a1f0jdz36zpj1196zv5qwg35rm4ra0b4z5spr1m3696292nj8ph";
version = "1.4.0.3";
sha256 = "0jkjcf27xqjzv9lny7j181kcma26wngrq3vzw2sp2hwkdcjryyin";
buildDepends = [
attoparsec blazeMarkup blazeSvg dataDefaultClass diagramsLib parsec
split text tuple vector vectorSpace xml

6
pkgs/development/libraries/haskell/Shellac/Shellac.nix
View File

@ -2,11 +2,11 @@
cabal.mkDerivation (self: {
pname = "Shellac";
version = "0.9.5.1";
sha256 = "19fpbh5ijy9xc3rhl9qwyan8jfnz9nsqvnsjxb7kkb7l2bpz4qfp";
version = "0.9.5.2";
sha256 = "1js9la0hziqsmb56q9kzfycda2sw3xm4kv2y5q2h3zlw5gzc5xli";
buildDepends = [ mtl ];
meta = {
homepage = "http://www.cs.princeton.edu/~rdockins/shellac/home/";
homepage = "http://rwd.rdockins.name/shellac/home/";
description = "A framework for creating shell envinronments";
license = self.stdenv.lib.licenses.bsd3;
platforms = self.ghc.meta.platforms;

14
pkgs/development/libraries/haskell/TCache/default.nix Normal file
View File

@ -0,0 +1,14 @@
{ cabal, hashtables, mtl, RefSerialize, stm, text }:
cabal.mkDerivation (self: {
pname = "TCache";
version = "0.12.0";
sha256 = "0marslz5jg66r3i2d0yjjrj11bpywpadcxs5k4j6782iczxybd7s";
buildDepends = [ hashtables mtl RefSerialize stm text ];
meta = {
description = "A Transactional cache with user-defined persistence";
license = self.stdenv.lib.licenses.bsd3;
platforms = self.ghc.meta.platforms;
maintainers = [ self.stdenv.lib.maintainers.tomberek ];
};
})

19
pkgs/development/libraries/haskell/Workflow/default.nix Normal file
View File

@ -0,0 +1,19 @@
{ cabal, binary, exceptions, extensibleExceptions, mtl
, RefSerialize, stm, TCache, vector
}:
cabal.mkDerivation (self: {
pname = "Workflow";
version = "0.8.1";
sha256 = "0z23g68gcbbn43i78cql4is9js3m4z16rm2x8s57f73n0hx7f00l";
buildDepends = [
binary exceptions extensibleExceptions mtl RefSerialize stm TCache
vector
];
meta = {
description = "Workflow patterns over a monad for thread state logging & recovery";
license = self.stdenv.lib.licenses.bsd3;
platforms = self.ghc.meta.platforms;
maintainers = [ self.stdenv.lib.maintainers.tomberek ];
};
})

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

@ -4,8 +4,8 @@
cabal.mkDerivation (self: {
pname = "active";
version = "0.1.0.14";
sha256 = "0ibigflx3krmf7gw0zqmqx73rw1p62cwjyl26rxbj5vzbl3bdb4g";
version = "0.1.0.16";
sha256 = "0x4z9n0avk9pr9v64vfmbbpxx2n6cl32d8sw8y2w61345s2z628k";
buildDepends = [ newtype semigroupoids semigroups vectorSpace ];
testDepends = [
newtype QuickCheck semigroupoids semigroups vectorSpace

11
pkgs/development/libraries/haskell/adjunctions/default.nix
View File

@ -1,14 +1,15 @@
{ cabal, comonad, contravariant, distributive, free, mtl
, semigroupoids, semigroups, tagged, transformers, void
, profunctors, semigroupoids, semigroups, tagged, transformers
, void
}:
cabal.mkDerivation (self: {
pname = "adjunctions";
version = "4.0.3";
sha256 = "0rh3vffbq407k9g95dingw6zqq3fk87pknyrqj1mrbmgrnllr8k0";
version = "4.1.0.1";
sha256 = "18p2pabid7dx96qcpd2ywv5mhjp55srhm5g013pn697jcxyq2xiv";
buildDepends = [
comonad contravariant distributive free mtl semigroupoids
semigroups tagged transformers void
comonad contravariant distributive free mtl profunctors
semigroupoids semigroups tagged transformers void
];
meta = {
homepage = "http://github.com/ekmett/adjunctions/";

17
pkgs/development/libraries/haskell/alternative-io/default.nix
View File

@ -1,17 +0,0 @@
{ cabal, liftedBase, monadControl, transformers, transformersBase
}:
cabal.mkDerivation (self: {
pname = "alternative-io";
version = "0.0.1";
sha256 = "01hypbci3hw2czkmx78ls51ycx518ich4k753jgv0z8ilrq8isch";
buildDepends = [
liftedBase monadControl transformers transformersBase
];
meta = {
description = "IO as Alternative instance (deprecated)";
license = self.stdenv.lib.licenses.bsd3;
platforms = self.ghc.meta.platforms;
maintainers = [ self.stdenv.lib.maintainers.andres ];
};
})

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

@ -5,6 +5,7 @@ cabal.mkDerivation (self: {
version = "0.4.1.0";
sha256 = "1xmwxmvl9l1fa2sgr4ff7al8b5d5136h4fq9r05abj3nfnx1a0iq";
buildDepends = [ mtl random ];
jailbreak = true;
meta = {
homepage = "https://bitbucket.org/dafis/arithmoi";
description = "Efficient basic number-theoretic functions. Primes, powers, integer logarithms.";

4
pkgs/development/libraries/haskell/attoparsec-enumerator/default.nix
View File

@ -2,8 +2,8 @@
cabal.mkDerivation (self: {
pname = "attoparsec-enumerator";
version = "0.3.2";
sha256 = "1jrrdhzqjfb78bhnjpy0j0qywqd2j67an41pcn8y6331nzmzsrl8";
version = "0.3.3";
sha256 = "0z57bbw97v92dkjp57zj9nfzsdas2n1qfw472k1aa84iqb6hbw9w";
buildDepends = [ attoparsec enumerator text ];
meta = {
homepage = "https://john-millikin.com/software/attoparsec-enumerator/";

21
pkgs/development/libraries/haskell/attoparsec/0.12.0.0.nix Normal file
View File

@ -0,0 +1,21 @@
{ cabal, deepseq, QuickCheck, scientific, testFramework
, testFrameworkQuickcheck2, text
}:
cabal.mkDerivation (self: {
pname = "attoparsec";
version = "0.12.0.0";
sha256 = "04wdb2i2yqybkfnjs3f25nf7xz1nq5sn8z23klbm4xnqaiajmkmr";
buildDepends = [ deepseq scientific text ];
testDepends = [
deepseq QuickCheck scientific 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 ];
};
})

1
pkgs/development/libraries/haskell/base64-bytestring/default.nix
View File

@ -10,6 +10,7 @@ cabal.mkDerivation (self: {
HUnit QuickCheck testFramework testFrameworkHunit
testFrameworkQuickcheck2
];
doCheck = false;
meta = {
homepage = "https://github.com/bos/base64-bytestring";
description = "Fast base64 encoding and decoding for ByteStrings";

1
pkgs/development/libraries/haskell/blaze-builder-enumerator/default.nix
View File

@ -5,6 +5,7 @@ cabal.mkDerivation (self: {
version = "0.2.0.5";
sha256 = "0bbbv9wwzw9ss3d02mszdzxzhg6pcrnpwir9bvby7xkmfqpyffaa";
buildDepends = [ blazeBuilder enumerator transformers ];
jailbreak = true;
meta = {
homepage = "https://github.com/meiersi/blaze-builder-enumerator";
description = "Enumeratees for the incremental conversion of builders to bytestrings";

24
pkgs/development/libraries/haskell/cabal-cargs/default.nix Normal file
View File

@ -0,0 +1,24 @@
{ cabal, Cabal, cabalLenses, cmdargs, either, filepath, lens
, strict, systemFileio, systemFilepath, tasty, tastyGolden, text
, transformers, unorderedContainers
}:
cabal.mkDerivation (self: {
pname = "cabal-cargs";
version = "0.6.1";
sha256 = "1bf903kgs16f054crwq0yyp6ijch80qn3d5ksy4j0fnyxxrdqvsa";
isLibrary = true;
isExecutable = true;
buildDepends = [
Cabal cabalLenses cmdargs either lens strict systemFileio
systemFilepath text transformers unorderedContainers
];
testDepends = [ filepath tasty tastyGolden ];
jailbreak = true;
meta = {
description = "A command line program for extracting compiler arguments from a cabal file";
license = self.stdenv.lib.licenses.bsd3;
platforms = self.ghc.meta.platforms;
maintainers = [ self.stdenv.lib.maintainers.tomberek ];
};
})

1
pkgs/development/libraries/haskell/cabal-lenses/default.nix
View File

@ -5,6 +5,7 @@ cabal.mkDerivation (self: {
version = "0.1";
sha256 = "0jss4h7crh7mndl5ghbpziy37cg9i29cc64fgxvxb63hpk0q2m17";
buildDepends = [ Cabal lens unorderedContainers ];
jailbreak = true;
meta = {
description = "Lenses and traversals for the Cabal library";
license = self.stdenv.lib.licenses.bsd3;

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

@ -5,8 +5,8 @@
cabal.mkDerivation (self: {
pname = "cassava";
version = "0.4.0.0";
sha256 = "0w3npv3403n9rl9nmn8ngp04js28bvsb5c4js17sy1gqgsakqdrl";
version = "0.4.1.0";
sha256 = "0whky3mavmprr8cgnzlg2ich99w09bdlks8rg6z9m1x86q66ivw2";
buildDepends = [
attoparsec blazeBuilder deepseq text unorderedContainers vector
];

12
pkgs/development/libraries/haskell/concurrent-extra/default.nix
View File

@ -1,15 +1,15 @@
{ cabal, baseUnicodeSymbols, HUnit, stm, testFramework
, testFrameworkHunit, unboundedDelays
{ cabal, async, baseUnicodeSymbols, HUnit, random, stm
, testFramework, testFrameworkHunit, unboundedDelays
}:
cabal.mkDerivation (self: {
pname = "concurrent-extra";
version = "0.7.0.7";
sha256 = "1736y8am24x29qq1016f2dvb6adavl1h46bsjfwnkw40a9djd5cr";
version = "0.7.0.8";
sha256 = "0q6n7wlakvnvfrjr3zmxbn9i0dxq96071j565vffp0r5abxkn83q";
buildDepends = [ baseUnicodeSymbols stm unboundedDelays ];
testDepends = [
baseUnicodeSymbols HUnit stm testFramework testFrameworkHunit
unboundedDelays
async baseUnicodeSymbols HUnit random stm testFramework
testFrameworkHunit unboundedDelays
];
meta = {
homepage = "https://github.com/basvandijk/concurrent-extra";

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

@ -5,8 +5,8 @@
cabal.mkDerivation (self: {
pname = "conduit-extra";
version = "1.1.0.3";
sha256 = "117lirx05pgpmys6dlknkcni3znrvqyhmj6djqxnqbjcn3ynhqdk";
version = "1.1.0.4";
sha256 = "0l1cv65p8nvvb9qgcj87a682wh9xim0rbk2xzhdkd0r123csb118";
buildDepends = [
attoparsec blazeBuilder conduit filepath monadControl network
primitive resourcet streamingCommons text transformers

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

@ -4,13 +4,15 @@
cabal.mkDerivation (self: {
pname = "conduit";
version = "1.1.3";
sha256 = "14fc7v00zmrcwba2rdnh7c6sx0rv5mmbwlgq5p8p7nlald1dcr6z";
version = "1.1.6";
sha256 = "1nhjj5zz934fd6fdbmkl8xvnvlaprxccgpwxffmdgqwxhvxgprq3";
buildDepends = [
exceptions liftedBase mmorph monadControl mtl resourcet
transformers transformersBase void
];
testDepends = [ hspec mtl QuickCheck resourcet transformers void ];
testDepends = [
exceptions hspec mtl QuickCheck resourcet transformers void
];
doCheck = false;
meta = {
homepage = "http://github.com/snoyberg/conduit";

11
pkgs/development/libraries/haskell/cryptohash/default.nix
View File

@ -1,15 +1,14 @@
{ cabal, byteable, HUnit, QuickCheck, testFramework
, testFrameworkHunit, testFrameworkQuickcheck2
{ cabal, byteable, HUnit, QuickCheck, tasty, tastyHunit
, tastyQuickcheck
}:
cabal.mkDerivation (self: {
pname = "cryptohash";
version = "0.11.4";
sha256 = "1laakkc1xzp2bmai0sfi86784wharqbyanlp1d1f1q6nj318by3y";
version = "0.11.5";
sha256 = "0vxnwnjch2r9d54q5f5bfz60npjc7s7x6a5233md7fa756822b9d";
buildDepends = [ byteable ];
testDepends = [
byteable HUnit QuickCheck testFramework testFrameworkHunit
testFrameworkQuickcheck2
byteable HUnit QuickCheck tasty tastyHunit tastyQuickcheck
];
meta = {
homepage = "http://github.com/vincenthz/hs-cryptohash";

1
pkgs/development/libraries/haskell/data-accessor/data-accessor.nix
View File

@ -5,6 +5,7 @@ cabal.mkDerivation (self: {
version = "0.2.2.5";
sha256 = "0z63fv41cnpk3h404gprk2f5jl7rrpyv97xmsgac9zgdm5zkkhm6";
buildDepends = [ transformers ];
jailbreak = true;
meta = {
homepage = "http://www.haskell.org/haskellwiki/Record_access";
description = "Utilities for accessing and manipulating fields of records";

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

@ -4,8 +4,8 @@
cabal.mkDerivation (self: {
pname = "dbmigrations";
version = "0.7";
sha256 = "1mpmka6jszip8sm8k9mrk0fg1q7wp36n0szyiqy7fnbzijfw0xlz";
version = "0.8";
sha256 = "0m1zvc61y0n7p66iwsb8wzwgivxnc08cm1h3xvf1jnwrv294dwch";
isLibrary = true;
isExecutable = true;
buildDepends = [

10
pkgs/development/libraries/haskell/diagrams/cairo.nix
View File

@ -1,16 +1,16 @@
{ cabal, cairo, colour, dataDefaultClass, diagramsCore, diagramsLib
, filepath, hashable, JuicyPixels, lens, mtl, optparseApplicative
, split, statestack, time, vector
, pango, split, statestack, time, transformers, vector
}:
cabal.mkDerivation (self: {
pname = "diagrams-cairo";
version = "1.1.0.2";
sha256 = "0y36cx89rlbmj470a6g11wlzkwzznjkjmkcpm7dzbxvfxw4pp70z";
version = "1.2";
sha256 = "0vzjp1i5hk971r7f55gpdl0jibrjg9j4ny7p408kb8zl2ynlxv6l";
buildDepends = [
cairo colour dataDefaultClass diagramsCore diagramsLib filepath
hashable JuicyPixels lens mtl optparseApplicative split statestack
time vector
hashable JuicyPixels lens mtl optparseApplicative pango split
statestack time transformers vector
];
meta = {
homepage = "http://projects.haskell.org/diagrams";

4
pkgs/development/libraries/haskell/diagrams/contrib.nix
View File

@ -7,8 +7,8 @@
cabal.mkDerivation (self: {
pname = "diagrams-contrib";
version = "1.1.1.5";
sha256 = "1165qq5pzj3vr8f6545hpa5ri8jy43r1ydmimzy7xg9iynjgxass";
version = "1.1.2";
sha256 = "1gljmzlhc6vck5lcsq9lhf2k4dik5pp62k85y2kkxgq0mxnmqf0g";
buildDepends = [
arithmoi circlePacking colour dataDefault dataDefaultClass
diagramsCore diagramsLib forceLayout lens MonadRandom mtl parsec

4
pkgs/development/libraries/haskell/diagrams/core.nix
View File

@ -4,8 +4,8 @@
cabal.mkDerivation (self: {
pname = "diagrams-core";
version = "1.1.0.3";
sha256 = "0kl4bc5mvly227rzalzy9q6ki321drcdfsjqriv3ac70qmcfqyma";
version = "1.2.0.1";
sha256 = "01rzd2zdg0pv7b299z6s6i6l6xggiszb2qs00vh5dbss295n1sps";
buildDepends = [
dualTree lens MemoTrie monoidExtras newtype semigroups vectorSpace
vectorSpacePoints

4
pkgs/development/libraries/haskell/diagrams/diagrams.nix
View File

@ -2,8 +2,8 @@
cabal.mkDerivation (self: {
pname = "diagrams";
version = "1.1.0.1";
sha256 = "0cxmrikcxgnrki9z8i33z7fbjpkx0vw849zj1cbq1zh8ry8xhhvg";
version = "1.2";
sha256 = "17j7hyd86h9msc8ni19agb0yhixga76q9kh4i109iyiyqizdnfhg";
buildDepends = [
diagramsContrib diagramsCore diagramsLib diagramsSvg
];

19
pkgs/development/libraries/haskell/diagrams/lib.nix
View File

@ -1,17 +1,18 @@
{ cabal, active, colour, dataDefaultClass, diagramsCore, filepath
, fingertree, hashable, intervals, lens, MemoTrie, monoidExtras
, optparseApplicative, safe, semigroups, tagged, vectorSpace
, vectorSpacePoints
{ cabal, active, colour, dataDefaultClass, diagramsCore, dualTree
, filepath, fingertree, hashable, intervals, JuicyPixels, lens
, MemoTrie, monoidExtras, optparseApplicative, safe, semigroups
, tagged, vectorSpace, vectorSpacePoints
}:
cabal.mkDerivation (self: {
pname = "diagrams-lib";
version = "1.1.0.7";
sha256 = "0ad5105aa2ds0hrx0184jhvzw1mw5l659hx745rsyl8wyi5yrcy7";
version = "1.2.0.1";
sha256 = "0p7rq97hnal90dciq1nln1s16kdb1xk9rrwaxhkxqr6kjjr2njf4";
buildDepends = [
active colour dataDefaultClass diagramsCore filepath fingertree
hashable intervals lens MemoTrie monoidExtras optparseApplicative
safe semigroups tagged vectorSpace vectorSpacePoints
active colour dataDefaultClass diagramsCore dualTree filepath
fingertree hashable intervals JuicyPixels lens MemoTrie
monoidExtras optparseApplicative safe semigroups tagged vectorSpace
vectorSpacePoints
];
jailbreak = true;
meta = {

4
pkgs/development/libraries/haskell/diagrams/postscript.nix
View File

@ -5,8 +5,8 @@
cabal.mkDerivation (self: {
pname = "diagrams-postscript";
version = "1.0.2.4";
sha256 = "0vjzvjyrbmnjgl8ln58a44nhh4abq5q2c6fvlpxpfhxh2ligsmas";
version = "1.1";
sha256 = "0l077libp6h8ka9ygkmajvzdymndlhx60nb5f6jaqvp7yx80hz3m";
buildDepends = [
dataDefaultClass diagramsCore diagramsLib dlist filepath hashable
lens monoidExtras mtl semigroups split vectorSpace

15
pkgs/development/libraries/haskell/diagrams/svg.nix
View File

@ -1,15 +1,16 @@
{ cabal, blazeMarkup, blazeSvg, colour, diagramsCore, diagramsLib
, filepath, hashable, lens, monoidExtras, mtl, split, time
, vectorSpace
{ cabal, base64Bytestring, blazeMarkup, blazeSvg, colour
, diagramsCore, diagramsLib, filepath, hashable, JuicyPixels, lens
, monoidExtras, mtl, split, time, vectorSpace
}:
cabal.mkDerivation (self: {
pname = "diagrams-svg";
version = "1.0.2.1";
sha256 = "1qm4vk67knl4bpp84kwm95blshf7slarpl620m8irslsq3yag507";
version = "1.1";
sha256 = "0b34rh35pay4x8dg0i06xvr3d865hbxzj2x77jly9l1j7sa1qaj1";
buildDepends = [
blazeMarkup blazeSvg colour diagramsCore diagramsLib filepath
hashable lens monoidExtras mtl split time vectorSpace
base64Bytestring blazeMarkup blazeSvg colour diagramsCore
diagramsLib filepath hashable JuicyPixels lens monoidExtras mtl
split time vectorSpace
];
jailbreak = true;
meta = {

17
pkgs/development/libraries/haskell/dns/default.nix
View File

@ -1,19 +1,18 @@
{ cabal, attoparsec, attoparsecConduit, binary, blazeBuilder
, conduit, conduitExtra, doctest, hspec, iproute, mtl, network
, random, resourcet
{ cabal, attoparsec, binary, blazeBuilder, conduit, conduitExtra
, doctest, hspec, iproute, mtl, network, random, resourcet
}:
cabal.mkDerivation (self: {
pname = "dns";
version = "1.2.3";
sha256 = "0h03zh75yzrx08p99ll123qd9a7a2ccj9gad1f8y3340dz3pa7ld";
version = "1.3.0";
sha256 = "1zd639d69ha3g1yz7ssvwarwiwyi975ps4i5y8vrarcq2jnnsb6n";
buildDepends = [
attoparsec attoparsecConduit binary blazeBuilder conduit
conduitExtra iproute mtl network random resourcet
attoparsec binary blazeBuilder conduit conduitExtra iproute mtl
network random resourcet
];
testDepends = [
attoparsec attoparsecConduit binary blazeBuilder conduit
conduitExtra doctest hspec iproute mtl network random resourcet
attoparsec binary blazeBuilder conduit conduitExtra doctest hspec
iproute mtl network random resourcet
];
testTarget = "spec";
meta = {

4
pkgs/development/libraries/haskell/dual-tree/default.nix
View File

@ -2,8 +2,8 @@
cabal.mkDerivation (self: {
pname = "dual-tree";
version = "0.2.0.3";
sha256 = "17l0jjxi8lj17hbn73wg252gdpbnp81aay7xlmx42g99pj377bmb";
version = "0.2.0.4";
sha256 = "0visavx0zqgmcjcq07vfhk6dn867269w2gxa8nvc79gya56c6wdp";
buildDepends = [ monoidExtras newtype semigroups ];
jailbreak = true;
meta = {

12
pkgs/development/libraries/haskell/either/default.nix
View File

@ -1,14 +1,14 @@
{ cabal, monadControl, MonadRandom, mtl, semigroupoids, semigroups
, transformers, transformersBase
{ cabal, exceptions, free, monadControl, MonadRandom, mtl
, semigroupoids, semigroups, transformers, transformersBase
}:
cabal.mkDerivation (self: {
pname = "either";
version = "4.1.2";
sha256 = "1c2dp22al9qq2w1xks5s3n8dcan9wpashvn24i4g8avs8yfrr5v4";
version = "4.3.0.1";
sha256 = "1ib6288gxzqfm2y198dzhhq588mlwqxm07pcrj4h66g1mcy54q1f";
buildDepends = [
monadControl MonadRandom mtl semigroupoids semigroups transformers
transformersBase
exceptions free monadControl MonadRandom mtl semigroupoids
semigroups transformers transformersBase
];
noHaddock = self.stdenv.lib.versionOlder self.ghc.version "7.6";
meta = {

4
pkgs/development/libraries/haskell/ekg-core/default.nix
View File

@ -2,8 +2,8 @@
cabal.mkDerivation (self: {
pname = "ekg-core";
version = "0.1.0.0";
sha256 = "19ghqj9zbb198d45bw7k9mlf2z57yq74wgbkp62b9li2ndbcpdzh";
version = "0.1.0.1";
sha256 = "1zha9r43nalxdw22s79mf89fwfzi8lq0q9ldhw7f6c63dnwxyjja";
buildDepends = [ text unorderedContainers ];
meta = {
homepage = "https://github.com/tibbe/ekg-core";

9
pkgs/development/libraries/haskell/enclosed-exceptions/default.nix
View File

@ -1,16 +1,17 @@
{ cabal, async, deepseq, hspec, liftedBase, monadControl
, QuickCheck, transformers
, QuickCheck, transformers, transformersBase
}:
cabal.mkDerivation (self: {
pname = "enclosed-exceptions";
version = "1.0.0.1";
sha256 = "0imq5kp45yfkhkz51ld869pf9hnlkbh92nk0aig1z8cc6akjnjw0";
version = "1.0.0.2";
sha256 = "1jbgqqavkhz2x5br17bdhv17rcmyi7a5mxplakhgyyg73wkjq04h";
buildDepends = [
async deepseq liftedBase monadControl transformers
async deepseq liftedBase monadControl transformers transformersBase
];
testDepends = [
async deepseq hspec liftedBase monadControl QuickCheck transformers
transformersBase
];
meta = {
homepage = "https://github.com/jcristovao/enclosed-exceptions";

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

@ -2,8 +2,8 @@
cabal.mkDerivation (self: {
pname = "encoding";
version = "0.7";
sha256 = "1h6yki4d3912sr8nsk1cff2pdvzw8ys6xnzi97b5ay1f8i28bmi5";
version = "0.7.0.1";
sha256 = "18s6cfcjwjx5dja14rf35rx71cbpr8ylg4x29ffx2blsk8ib9zxh";
buildDepends = [
binary extensibleExceptions HaXml mtl regexCompat
];

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

@ -2,8 +2,8 @@
cabal.mkDerivation (self: {
pname = "entropy";
version = "0.2.2.4";
sha256 = "1cjmpb0rh1ib4j9mwmf1irn401vmjawxkshxdmmb4643rmcgx1gm";
version = "0.3";
sha256 = "0b1yx7409xw8jz2rj8695xscjnw4p7y80niq9cbkqrmnqbqnwj2q";
meta = {
homepage = "https://github.com/TomMD/entropy";
description = "A platform independent entropy source";

4
pkgs/development/libraries/haskell/exception-mtl/default.nix
View File

@ -2,8 +2,8 @@
cabal.mkDerivation (self: {
pname = "exception-mtl";
version = "0.3.0.3";
sha256 = "1mmkp16c5ixknhm69a2zjrs9q0dd5ragmljnjjd6lxpakdlw64ww";
version = "0.3.0.4";
sha256 = "16airfs3z1qmx42qww22m21fryr8210m7ji5rgkl2amjvj4lllvc";
buildDepends = [ exceptionTransformers mtl transformers ];
meta = {
homepage = "http://www.eecs.harvard.edu/~mainland/";

4
pkgs/development/libraries/haskell/extensible-effects/default.nix
View File

@ -4,8 +4,8 @@
cabal.mkDerivation (self: {
pname = "extensible-effects";
version = "1.6.0";
sha256 = "08g2py6iywwpsr09v6hfhq6ihjp1yq3aibz8jlqhsmagjjjxgfsq";
version = "1.7.1";
sha256 = "1i7bmyga63svnky03f5xvz63795pjsqp3x7rn9amj55yj11fmp05";
buildDepends = [ transformers transformersBase ];
testDepends = [
HUnit QuickCheck testFramework testFrameworkHunit

5
pkgs/development/libraries/haskell/failure/default.nix
View File

@ -2,9 +2,10 @@
cabal.mkDerivation (self: {
pname = "failure";
version = "0.2.0.2";
sha256 = "0hvcsn7qx00613f23vvb3vjpjlcy0nfavsai9f6s3yvmyssk5kfv";
version = "0.2.0.3";
sha256 = "0jimc2x46zq7wnmzfbnqi67jl8yhbvr0fa65ljlc9p3fns9mca3p";
buildDepends = [ transformers ];
jailbreak = true;
meta = {
homepage = "http://www.haskell.org/haskellwiki/Failure";
description = "A simple type class for success/failure computations. (deprecated)";

4
pkgs/development/libraries/haskell/force-layout/default.nix
View File

@ -2,8 +2,8 @@
cabal.mkDerivation (self: {
pname = "force-layout";
version = "0.3.0.3";
sha256 = "0xix9syfiya5wx0iwzs7sp3ksqyp15vjlpir71x8md8v0hkrnh5a";
version = "0.3.0.4";
sha256 = "1zgqcz9b86qax1hyl32a1giapvn2wpnb4gcfn8czkcr0m7c2iwdg";
buildDepends = [
dataDefaultClass lens vectorSpace vectorSpacePoints
];

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

@ -4,8 +4,8 @@
cabal.mkDerivation (self: {
pname = "free";
version = "4.7.1";
sha256 = "14qvc153g7n8fkl2giyyya8l7fs4limgnm18hdw5dpj841kwxgzm";
version = "4.9";
sha256 = "01pa9ax9i4pkh9a5achndx5s7sxvhnk6rm57g8rzav79hzsr4cnx";
buildDepends = [
bifunctors comonad distributive mtl preludeExtras profunctors
semigroupoids semigroups transformers

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

@ -4,8 +4,8 @@
cabal.mkDerivation (self: {
pname = "ghc-mod";
version = "4.1.1";
sha256 = "0jsm881khbpa316rvka2ixzmm4kim7w9gbriz94m08b3yj3f00q9";
version = "4.1.2";
sha256 = "0xdpy61dc56zvpgr2z9cdyd85d65l426vnbfgsw6w494w0bp3sh7";
isLibrary = true;
isExecutable = true;
buildDepends = [

4
pkgs/development/libraries/haskell/ghcjs-dom/default.nix
View File

@ -2,8 +2,8 @@
cabal.mkDerivation (self: {
pname = "ghcjs-dom";
version = "0.0.7";
sha256 = "1yg2c0slndg3y9bk95xkbgl8zp4lmcgw9wk3jkk1sdizn3y3yggq";
version = "0.0.9";
sha256 = "0vphhm9wr80p4brcjzhmp2kh0a5rlwzif26w2q054fshxa97kv2a";
buildDepends = [ ghcjsBase mtl ];
meta = {
description = "DOM library that supports both GHCJS and WebKitGTK";

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

@ -6,6 +6,7 @@ cabal.mkDerivation (self: {
sha256 = "178hzal5gqw3rmgijv9ph9xa6d4sld279z4a8cjyx3hv4azciwr4";
buildDepends = [ filepath terminfo transformers utf8String ];
configureFlags = "-fterminfo";
jailbreak = true;
meta = {
homepage = "http://trac.haskell.org/haskeline";
description = "A command-line interface for user input, written in Haskell";

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

@ -4,8 +4,8 @@
cabal.mkDerivation (self: {
pname = "haskell-packages";
version = "0.2.3.4";
sha256 = "0qj5n1yc481n5c8gi5dgk22pxj58gf7z30621spr7gwlv001sk1y";
version = "0.2.4";
sha256 = "1ygpa2k0hyx2xwny33kr0h847zvvsp4z1pwqrd92sf7vzpyz5nch";
buildDepends = [
aeson Cabal deepseq either filepath haskellSrcExts hseCpp mtl
optparseApplicative tagged

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

@ -6,8 +6,8 @@
cabal.mkDerivation (self: {
pname = "heist";
version = "0.13.1";
sha256 = "0v9c5hhybn617nmjswqkjrf7bjb5073achfi05ivw1gblbvsj0ir";
version = "0.13.1.2";
sha256 = "0c80lf00n3iv55mw4p61bjx14gildvxnvfdaa755ghkg1wcd59s5";
buildDepends = [
aeson attoparsec blazeBuilder blazeHtml directoryTree dlist errors
filepath hashable MonadCatchIOTransformers mtl random text time

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

@ -2,8 +2,8 @@
cabal.mkDerivation (self: {
pname = "highlighting-kate";
version = "0.5.8.1";
sha256 = "10hbsra6ifjj765shf6x4c8kgb5bmv3zcgya3lcswvwa9xn78h9p";
version = "0.5.8.2";
sha256 = "1c85yfzi3ri3j1fmqvd4pc4pp95jpm62a2nbbibpybl2h88dsjsb";
isLibrary = true;
isExecutable = true;
buildDepends = [

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

@ -6,8 +6,8 @@
cabal.mkDerivation (self: {
pname = "hit";
version = "0.6.0";
sha256 = "1haslqhnpfdll5cl3vq1y03h916lydhc9mq4gagm9qzjfjqv54k2";
version = "0.6.1";
sha256 = "175i6gag596dy341jlr5sjj55qcaqgymrcr1czcaigsxsn5yx8b9";
isLibrary = true;
isExecutable = true;
buildDepends = [

14
pkgs/development/libraries/haskell/hoauth2/default.nix
View File

@ -1,14 +1,16 @@
{ cabal, aeson, bytestringShow, conduit, httpConduit, httpTypes
, monadControl, mtl, random, resourcet, text, transformers
{ cabal, aeson, bytestringShow, httpConduit, httpTypes
, monadControl, mtl, random, text, transformers
}:
cabal.mkDerivation (self: {
pname = "hoauth2";
version = "0.3.6.1";
sha256 = "0nfh77fxyl8vbdnrrp28hsl1zhxhmg8mjn0gfvc2i3w5rd6j0lda";
version = "0.4.0";
sha256 = "1499rgcn3h4921x21s6l0spnjf3wvmsaa07pimgjgb4rjib3z2d5";
isLibrary = true;
isExecutable = true;
buildDepends = [
aeson bytestringShow conduit httpConduit httpTypes monadControl mtl
random resourcet text transformers
aeson bytestringShow httpConduit httpTypes monadControl mtl random
text transformers
];
meta = {
homepage = "https://github.com/freizl/hoauth2";

11
pkgs/development/libraries/haskell/hourglass/default.nix
View File

@ -1,15 +1,12 @@
{ cabal, deepseq, HUnit, mtl, QuickCheck, testFramework
, testFrameworkHunit, testFrameworkQuickcheck2, time
}:
{ cabal, deepseq, mtl, tasty, tastyHunit, tastyQuickcheck, time }:
cabal.mkDerivation (self: {
pname = "hourglass";
version = "0.1.2";
sha256 = "18jvl4f8vfabvd9vlhxjjlswc80x8w4h6gdflvzdkjrknnyk118j";
version = "0.2.0";
sha256 = "13zphy3gfj9p7vsa477qy30968fnz5kq7d0lzb1pyg5hxkx44rim";
buildDepends = [ deepseq ];
testDepends = [
deepseq HUnit mtl QuickCheck testFramework testFrameworkHunit
testFrameworkQuickcheck2 time
deepseq mtl tasty tastyHunit tastyQuickcheck time
];
meta = {
homepage = "https://github.com/vincenthz/hs-hourglass";

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

@ -11,6 +11,7 @@ cabal.mkDerivation (self: {
HUnit mtl parsec QuickCheck testFramework testFrameworkHunit
testFrameworkQuickcheck2 testFrameworkTh
];
jailbreak = true;
meta = {
description = "Package for user configuration files (INI)";
license = self.stdenv.lib.licenses.bsd3;

4
pkgs/development/libraries/haskell/io-streams/default.nix
View File

@ -6,8 +6,8 @@
cabal.mkDerivation (self: {
pname = "io-streams";
version = "1.1.4.4";
sha256 = "07kmmjn1bsjzfi27fk6fx56pchks866qwrxkyvwihfvd96wgqggd";
version = "1.1.4.6";
sha256 = "0vn6vlgfapmyd9y87i9i0y480w8w81xd3lnhh66a6lalskd4bjdw";
buildDepends = [
attoparsec blazeBuilder network primitive text time transformers
vector zlibBindings

4
pkgs/development/libraries/haskell/kan-extensions/default.nix
View File

@ -4,8 +4,8 @@
cabal.mkDerivation (self: {
pname = "kan-extensions";
version = "4.0.2";
sha256 = "05invi86i2a115jdy2nzdkc0i6g170j0xcxycw2z2qjigvjsaizi";
version = "4.0.3";
sha256 = "05zqlxm6i66d996jcpjhnmij28a4zwc0l0nc9cyxamfwmyd9754b";
buildDepends = [
adjunctions comonad contravariant distributive free mtl pointed
semigroupoids speculation transformers

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

@ -2,8 +2,8 @@
cabal.mkDerivation (self: {
pname = "keys";
version = "3.10";
sha256 = "1s2xkzvaqk507wrgabpxli8g8n83arflmdhxq40f7qkvyflhhmyh";
version = "3.10.1";
sha256 = "007lbpfan5n1cgswsrzc4xjv0kjmjr9vn4lpqm3gwk3lnfpg8i4n";
buildDepends = [
comonad free semigroupoids semigroups transformers
];

4
pkgs/development/libraries/haskell/language-c-inline/default.nix
View File

@ -2,8 +2,8 @@
cabal.mkDerivation (self: {
pname = "language-c-inline";
version = "0.5.0.0";
sha256 = "1cyl45bi2d38yyd1ybxippl8mv3hsl1chzn7rqm40fds97h07j2z";
version = "0.6.0.0";
sha256 = "08a22sr01kch365p5536fv32rxsfmdd6hkhcq1j7vhchjrsy3f6w";
buildDepends = [ filepath languageCQuote mainlandPretty ];
testDepends = [ languageCQuote ];
doCheck = false;

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