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

Merge remote-tracking branch 'origin/master' into staging.

Browse Source
This commit is contained in:
Peter Simons 2014-11-02 16:15:53 +01:00
commit a9c53037fa
172 changed files with 2334 additions and 1781 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
lib/maintainers.nix
View File

@ -5,12 +5,12 @@
alphabetically sorted. */
_1126 = "Christian Lask <mail@elfsechsundzwanzig.de>";
abbradar = "Nikolay Amiantov <ab@fmap.me>";
aforemny = "Alexander Foremny <alexanderforemny@googlemail.com>";
ak = "Alexander Kjeldaas <ak@formalprivacy.com>";
akc = "Anders Claesson <akc@akc.is>";
algorith = "Dries Van Daele <dries_van_daele@telenet.be>";
all = "Nix Committers <nix-commits@lists.science.uu.nl>";
abbradar = "Nikolay Amiantov <ab@fmap.me>";
amiddelk = "Arie Middelkoop <amiddelk@gmail.com>";
amorsillo = "Andrew Morsillo <andrew.morsillo@gmail.com>";
AndersonTorres = "Anderson Torres <torres.anderson.85@gmail.com>";
@ -46,8 +46,8 @@
coroa = "Jonas Hörsch <jonas@chaoflow.net>";
cstrahan = "Charles Strahan <charles.c.strahan@gmail.com>";
DamienCassou = "Damien Cassou <damien.cassou@gmail.com>";
DerGuteMoritz = "Moritz Heidkamp <moritz@twoticketsplease.de>";
dbohdan = "Danyil Bohdan <danyil.bohdan@gmail.com>";
DerGuteMoritz = "Moritz Heidkamp <moritz@twoticketsplease.de>";
dmalikov = "Dmitry Malikov <malikov.d.y@gmail.com>";
doublec = "Chris Double <chris.double@double.co.nz>";
ederoyd46 = "Matthew Brown <matt@ederoyd.co.uk>";
@ -104,6 +104,7 @@
offline = "Jaka Hudoklin <jakahudoklin@gmail.com>";
orbitz = "Malcolm Matalka <mmatalka@gmail.com>";
page = "Carles Pagès <page@cubata.homelinux.net>";
pashev = "Igor Pashev <pashev.igor@gmail.com>";
phreedom = "Evgeny Egorochkin <phreedom@yandex.ru>";
pierron = "Nicolas B. Pierron <nixos@nbp.name>";
piotr = "Piotr Pietraszkiewicz <ppietrasa@gmail.com>";
@ -139,8 +140,8 @@
tomberek = "Thomas Bereknyei <tomberek@gmail.com>";
tstrobel = "Thomas Strobel <ts468@cam.ac.uk>";
ttuegel = "Thomas Tuegel <ttuegel@gmail.com>";
twey = "James ‘Twey’ Kay <twey@twey.co.uk>";
tv = "Tomislav Viljetić <tv@shackspace.de>";
twey = "James ‘Twey’ Kay <twey@twey.co.uk>";
urkud = "Yury G. Kudryashov <urkud+nix@ya.ru>";
vandenoever = "Jos van den Oever <jos@vandenoever.info>";
vbgl = "Vincent Laporte <Vincent.Laporte@gmail.com>";

2
lib/modules.nix
View File

@ -58,7 +58,7 @@ rec {
if m ? config || m ? options then
let badAttrs = removeAttrs m ["imports" "options" "config" "key" "_file"]; in
if badAttrs != {} then
throw "Module `${key}' has an unsupported attribute `${head (attrNames badAttrs)}'."
throw "Module `${key}' has an unsupported attribute `${head (attrNames badAttrs)}'. This is caused by assignments to the top-level attributes `config' or `options'."
else
{ file = m._file or file;
key = toString m.key or key;

4
maintainers/scripts/travis-nox-review-pr.sh
View File

@ -32,9 +32,7 @@ elif [[ $1 == build ]]; then
nix-build pkgs/top-level/release.nix -A tarball
else
echo "=== Checking PR"
# The current HEAD is the PR merged into origin/master, so we compare
# against origin/master
nox-review wip --against origin/master
nox-review pr ${TRAVIS_PULL_REQUEST}
fi
else
echo "$0: Unknown option $1" >&2

34
nixos/modules/config/update-users-groups.pl
View File

@ -6,6 +6,15 @@ use JSON;
make_path("/var/lib/nixos", { mode => 0755 });
sub hashPassword {
my ($password) = @_;
my $salt = "";
my @chars = ('.', '/', 0..9, 'A'..'Z', 'a'..'z');
$salt .= $chars[rand 64] for (1..8);
return crypt($password, '$6$' . $salt . '$');
}
# Functions for allocating free GIDs/UIDs. FIXME: respect ID ranges in
# /etc/login.defs.
sub allocId {
@ -174,6 +183,8 @@ foreach my $u (@{$spec->{users}}) {
} else {
warn "warning: password file ‘$u->{passwordFile}’ does not exist\n";
}
} elsif (defined $u->{password}) {
$u->{hashedPassword} = hashPassword($u->{password});
}
$u->{fakePassword} = $existing->{fakePassword} // "x";
@ -208,32 +219,21 @@ my %shadowSeen;
foreach my $line (-f "/etc/shadow" ? read_file("/etc/shadow") : ()) {
chomp $line;
my ($name, $password, @rest) = split(':', $line, -9);
my ($name, $hashedPassword, @rest) = split(':', $line, -9);
my $u = $usersOut{$name};;
next if !defined $u;
$password = $u->{hashedPassword} if defined $u->{hashedPassword} && !$spec->{mutableUsers}; # FIXME
push @shadowNew, join(":", $name, $password, @rest) . "\n";
$hashedPassword = $u->{hashedPassword} if defined $u->{hashedPassword} && !$spec->{mutableUsers}; # FIXME
push @shadowNew, join(":", $name, $hashedPassword, @rest) . "\n";
$shadowSeen{$name} = 1;
}
foreach my $u (values %usersOut) {
next if defined $shadowSeen{$u->{name}};
my $password = "!";
$password = $u->{hashedPassword} if defined $u->{hashedPassword};
my $hashedPassword = "!";
$hashedPassword = $u->{hashedPassword} if defined $u->{hashedPassword};
# FIXME: set correct value for sp_lstchg.
push @shadowNew, join(":", $u->{name}, $password, "1::::::") . "\n";
push @shadowNew, join(":", $u->{name}, $hashedPassword, "1::::::") . "\n";
}
write_file("/etc/shadow.tmp", { perms => 0600 }, @shadowNew);
rename("/etc/shadow.tmp", "/etc/shadow") or die;
# Call chpasswd to apply password. FIXME: generate the hashes directly
# and merge into the /etc/shadow updating above.
foreach my $u (@{$spec->{users}}) {
if (defined $u->{password}) {
my $pid = open(PW, "| chpasswd") or die;
print PW "$u->{name}:$u->{password}\n";
close PW or die "unable to change password of user ‘$u->{name}’: $?\n";
}
}

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

@ -46,6 +46,14 @@ in
<filename>sudoers</filename> file.
'';
};
security.sudo.extraConfig = mkOption {
type = types.lines;
default = "";
description = ''
Extra configuration text appended to <filename>sudoers</filename>.
'';
};
};
@ -55,7 +63,8 @@ in
security.sudo.configFile =
''
# Don't edit this file. Set the NixOS option ‘security.sudo.configFile’ instead.
# Don't edit this file. Set the NixOS options ‘security.sudo.configFile’
# and security.sudo.extraConfig instead.
# Environment variables to keep for root and %wheel.
Defaults:root,%wheel env_keep+=TERMINFO_DIRS
@ -69,6 +78,7 @@ in
# Users in the "wheel" group can do anything.
%wheel ALL=(ALL) ${if cfg.wheelNeedsPassword then "" else "NOPASSWD: ALL, "}SETENV: ALL
${cfg.extraConfig}
'';
security.setuidPrograms = [ "sudo" "sudoedit" ];

15
nixos/modules/services/misc/gitolite.nix
View File

@ -15,14 +15,21 @@ in
default = false;
description = ''
Enable gitolite management under the
<literal>gitolite</literal> user. The Gitolite home
directory is <literal>/var/lib/gitolite</literal>. After
<literal>gitolite</literal> user. After
switching to a configuration with Gitolite enabled, you can
then run <literal>git clone
gitolite@host:gitolite-admin.git</literal> to manage it further.
'';
};
dataDir = mkOption {
type = types.str;
default = "/var/lib/gitolite";
description = ''
Gitolite home directory (used to store all the repositories).
'';
};
adminPubkey = mkOption {
type = types.str;
description = ''
@ -45,7 +52,7 @@ in
config = mkIf cfg.enable {
users.extraUsers.gitolite = {
description = "Gitolite user";
home = "/var/lib/gitolite";
home = cfg.dataDir;
createHome = true;
uid = config.ids.uids.gitolite;
useDefaultShell = true;
@ -61,7 +68,7 @@ in
path = [ pkgs.gitolite pkgs.git pkgs.perl pkgs.bash pkgs.openssh ];
script = ''
cd /var/lib/gitolite
cd ${cfg.dataDir}
mkdir -p .gitolite/logs
if [ ! -d repositories ]; then
gitolite setup -pk ${pubkeyFile}

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

@ -36,6 +36,7 @@ let
# /etc/nixos/configuration.nix. Do not edit it!
build-users-group = nixbld
build-max-jobs = ${toString (cfg.maxJobs)}
build-cores = ${toString (cfg.buildCores)}
build-use-chroot = ${if cfg.useChroot then "true" else "false"}
build-chroot-dirs = ${toString cfg.chrootDirs} /bin/sh=${sh} $(echo $extraPaths)
binary-caches = ${toString cfg.binaryCaches}
@ -74,6 +75,19 @@ in
";
};
buildCores = mkOption {
type = types.int;
default = 1;
example = 64;
description = ''
This option defines the maximum number of concurrent tasks during
one build. It affects, e.g., -j option for make. The default is 1.
Some builds may become non-deterministic with this option; use with
care! Packages will only be affected if enableParallelBuilding is
set for them.
'';
};
useChroot = mkOption {
type = types.bool;
default = false;

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

@ -306,7 +306,7 @@ in {
example = literalExample ''
{
GRAPHITE_USERNAME = "user";
GRAPHITE_PASSWORD = "pass";
GRAPHITE_PASSWORD = "pass";
}
'';
};
@ -344,7 +344,7 @@ in {
name: Test
'';
example = literalExample ''
pushbullet_key: pushbullet_api_key
pushbullet_key: pushbullet_api_key
alerts:
- target: stats.seatgeek.app.deal_quality.venue_info_cache.hit
warning: .5
@ -456,7 +456,7 @@ in {
environment.systemPackages = [ pkgs.python27Packages.graphite_web ];
})
(mkIf cfg.api.enable {
(mkIf cfg.api.enable {
systemd.services.graphiteApi = {
description = "Graphite Api Interface";
wantedBy = [ "multi-user.target" ];
@ -472,7 +472,7 @@ in {
ExecStart = ''
${pkgs.python27Packages.waitress}/bin/waitress-serve \
--host=${cfg.api.host} --port=${toString cfg.api.port} \
graphite_api.app:app
graphite_api.app:app
'';
User = "graphite";
Group = "graphite";
@ -501,7 +501,7 @@ in {
ExecStart = "${pkgs.seyren}/bin/seyren -httpPort ${toString cfg.seyren.port}";
WorkingDirectory = dataDir;
User = "graphite";
Group = "graphite";
Group = "graphite";
};
preStart = ''
if ! test -e ${dataDir}/db-created; then
@ -526,7 +526,7 @@ in {
serviceConfig = {
ExecStart = "${pkgs.pythonPackages.graphite_pager}/bin/graphite-pager --config ${pagerConfig}";
User = "graphite";
Group = "graphite";
Group = "graphite";
};
};
@ -535,14 +535,16 @@ in {
environment.systemPackages = [ pkgs.pythonPackages.graphite_pager ];
})
{
users.extraUsers = singleton {
name = "graphite";
uid = config.ids.uids.graphite;
description = "Graphite daemon user";
home = dataDir;
};
users.extraGroups.graphite.gid = config.ids.gids.graphite;
}
# Disabled: Don't create this user unconditionally!
#
# {
# users.extraUsers = singleton {
# name = "graphite";
# uid = config.ids.uids.graphite;
# description = "Graphite daemon user";
# home = dataDir;
# };
# users.extraGroups.graphite.gid = config.ids.gids.graphite;
# }
];
}

6
nixos/modules/services/networking/nat.nix
View File

@ -157,9 +157,9 @@ in
boot = {
kernelModules = [ "nf_nat_ftp" ];
kernel.sysctl = mkOverride 99 {
"net.ipv4.conf.all.forwarding" = true;
"net.ipv4.conf.default.forwarding" = true;
kernel.sysctl = {
"net.ipv4.conf.all.forwarding" = mkOverride 99 true;
"net.ipv4.conf.default.forwarding" = mkOverride 99 true;
};
};

24
pkgs/applications/audio/easytag/default.nix
View File

@ -1,28 +1,28 @@
{ stdenv, fetchurl, pkgconfig, intltool, gtk, glib, libid3tag, id3lib, taglib
, libvorbis, libogg, flac, itstool, libxml2
{ stdenv, fetchurl, pkgconfig, intltool, gtk3, glib, libid3tag, id3lib, taglib
, libvorbis, libogg, flac, itstool, libxml2, gsettings_desktop_schemas
, makeWrapper, gnome_icon_theme
}:
stdenv.mkDerivation rec {
name = "easytag-${version}";
version = "2.2.4";
version = "2.3.1";
src = fetchurl {
url = "mirror://gnome/sources/easytag/2.2/${name}.tar.xz";
sha256 = "14f0s0l28fwxnc37aw1imal2xcg9ykq35mx2j9gaqzz02ymjk0s5";
url = "mirror://gnome/sources/easytag/2.3/${name}.tar.xz";
sha256 = "19cdx4hma4nl38m1zrc3mq9cjg6knw970abk5anhg7cvpc1371s7";
};
preConfigure = ''
# pkg-config v0.23 should be enough.
sed -i -e '/_pkg_min_version=0.24/s/24/23/' \
-e 's/have_mp3=no/have_mp3=yes/' \
-e 's/ID3TAG_DEPS="id3tag"/ID3TAG_DEPS=""/' configure
preFixup = ''
wrapProgram $out/bin/easytag \
--prefix XDG_DATA_DIRS : "$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH:$out/share"
'';
NIX_LDFLAGS = "-lid3tag -lz";
nativeBuildInputs = [ makeWrapper ];
buildInputs = [
pkgconfig intltool gtk glib libid3tag id3lib taglib libvorbis libogg flac
itstool libxml2
pkgconfig intltool gtk3 glib libid3tag id3lib taglib libvorbis libogg flac
itstool libxml2 gsettings_desktop_schemas gnome_icon_theme
];
meta = {

25
pkgs/applications/editors/focuswriter/default.nix Normal file
View File

@ -0,0 +1,25 @@
{stdenv, fetchurl, qt4, pkgconfig, hunspell}:
stdenv.mkDerivation rec {
name = "focuswriter-${version}";
version = "1.5.3";
src = fetchurl {
url = http://gottcode.org/focuswriter/focuswriter-1.5.3-src.tar.bz2;
sha256 = "1i58jxbiy95ijf81g8c3gwxhcg3irzssna3wv7vhrd57g4lcfj0w";
};
buildInputs = [ qt4 pkgconfig hunspell ];
configurePhase = "qmake PREFIX=/";
installPhase = "make install INSTALL_ROOT=$out";
meta = {
description = "Simple, distraction-free writing environment";
license = stdenv.lib.licenses.gpl2;
maintainers = [ stdenv.lib.maintainers.madjar ];
platforms = stdenv.lib.platforms.all;
homepage = "http://gottcode.org/focuswriter/";
};
}

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

@ -5,11 +5,11 @@
}:
stdenv.mkDerivation rec {
name = "calibre-2.7.0";
name = "calibre-2.8.0";
src = fetchurl {
url = "mirror://sourceforge/calibre/${name}.tar.xz";
sha256 = "0j8ypdcrxf961093pw3h5bxhd5kd1i6vjnf9cyi55j54j31zy021";
sha256 = "0wjkcgv7y4ll4lh5av6zs0q3k9y6p36sndw3864zhgwqwff00k12";
};
inherit python;

4
pkgs/applications/misc/ikiwiki/default.nix
View File

@ -23,7 +23,7 @@ assert mercurialSupport -> (mercurial != null);
let
name = "ikiwiki";
version = "3.20140916";
version = "3.20141016";
lib = stdenv.lib;
in
@ -32,7 +32,7 @@ stdenv.mkDerivation {
src = fetchurl {
url = "http://ftp.de.debian.org/debian/pool/main/i/ikiwiki/${name}_${version}.tar.gz";
sha256 = "05nws8jkcbhg767wqgn7in1p8zbcx2kdnhxz19fq52ncfzk2ndn0";
sha256 = "1amvrb6djil7g0yabsngfs0f1n7qcvj2hddipjkgfjbmghd6jqiw";
};
buildInputs = [ perl TextMarkdown URI HTMLParser HTMLScrubber HTMLTemplate

58
pkgs/applications/networking/instant-messengers/pidgin-plugins/pidgin-latex/default.nix
View File

@ -1,46 +1,32 @@
{ stdenv, fetchurl, pidgin, imagemagick, ghostscript
, pkgconfig, glib, gtk, texLive
}:
{ stdenv, fetchurl, pkgconfig, pidgin, texLive, imagemagick, glib, gtk }:
let version = "1.5.0";
in
stdenv.mkDerivation {
name = "pidgin-latex";
name = "pidgin-latex-${version}";
src = fetchurl {
url = http://tapas.affenbande.org/pidgin-latex/pidgin-latex-0.9.tgz;
sha256 = "1yqd3qgxd3n8hm60qg7yv7j1crr6f3d4yrdpgwdpw2pyf92p8nxp";
url = "mirror://sourceforge/pidgin-latex/pidgin-latex_${version}.tar.bz2";
sha256 = "9c850aee90d7e59de834f83e09fa6e3e51b123f06e265ead70957608ada95441";
};
preBuild = ''
sed -e '/^PREFIX/d' -i Makefile ;
sed -e 's@/usr/bin/latex@${texLive}/bin/pdflatex@g' -i pidgin-latex.h
sed -e 's@/usr/bin/convert@${imagemagick}/bin/convert@g' -i pidgin-latex.h
sed -e 's@.*convert_path.*@const gchar *convert = CONVERT_PATH;@'
sed -e 's@.*latex_path.*@const gchar *convert = LATEX_PATH;@'
sed -e 's/%s.dvi/%s.pdf/' -i pidgin-latex.c
sed -e 's/latex_system\(.*\)FALSE/latex_system\1TRUE/' -i pidgin-latex.c
nativeBuildInputs = [pkgconfig];
buildInputs = [gtk glib pidgin];
makeFlags = "PREFIX=$(out)";
postPatch = ''
sed -e 's/-Wl,-soname//' -i Makefile
'';
makeFlags = "PREFIX=\$(out)";
passthru = {
wrapArgs = "--prefix PATH ':' ${texLive}/bin:${imagemagick}/bin";
};
preInstall = "mkdir -p $out/lib/pidgin $out/bin";
postInstall = ''
mkdir -p $out/share/pidgin-latex
ln -s $out/lib/pidgin/pidgin-latex.so $out/share/pidgin-latex/
'';
buildInputs = [pidgin imagemagick ghostscript pkgconfig glib gtk texLive];
meta = {
longDescription = ''
Pidgin-LaTeX is a pidgin plugin that cuts everything inside \$\$
.. \$\$ and feeds to LaTeX. A bit of conversion (automated, of
course) - and you see every formula that occurs in conversation
in pretty graphical form. There are some glitches - when a
formula fails to compile, you can see just previous formula..
Enable it for user by linking to ~/.purple/plugins - from
sw/share/pidgin-latex , not from store of course.
'';
homepage = http://tapas.affenbande.org/wordpress/?page_id=70;
meta = with stdenv.lib; {
homepage = http://sourceforge.net/projects/pidgin-latex/;
description = "LaTeX rendering plugin for Pidgin IM";
licenses = licenses.gpl2;
platforms = platforms.linux;
maintainers = maintainers.abbradar;
};
}

44
pkgs/applications/networking/instant-messengers/pidgin-plugins/pidgin-latex/pidgin-latex-sf.nix
View File

@ -1,44 +0,0 @@
args : with args;
let version = "1.5.0";
in
rec {
src = fetchurl {
url = "mirror://sourceforge/pidgin-latex/pidgin-latex_${version}.tar.bz2";
sha256 = "9c850aee90d7e59de834f83e09fa6e3e51b123f06e265ead70957608ada95441";
};
buildInputs = [texLive pkgconfig gtk imagemagick glib pidgin which];
configureFlags = [];
installFlags = [
"PREFIX=$out"
];
preBuild = fullDepEntry (''
mkdir -p $out/bin
ln -s $(which convert) $out/bin
ln -s $(which xelatex) $out/bin
ln -s $(which dvips) $out/bin
sed -e 's/-Wl,-soname//' -i Makefile
sed -e 's/\(PATH("\)latex/\1xelatex/' -i LaTeX.c
sed -e 's/|| execute(cmddvips, dvipsopts, 10) //' -i LaTeX.c
sed -e 's/ strcat([*]file_ps, "[.]ps");/ strcat(*file_ps, ".pdf");/' -i LaTeX.c
sed -e 's/\([*]convertopts\[5\]=[{]"\)\(\\"",\)/\1 -trim \2/' -i LaTeX.c
sed -e 's/\(#define HEADER ".*\)12pt\(.*\)"/\116pt\2\\\\usepackage{fontspec}\\\\usepackage{xunicode}"/' -i LaTeX.h
'') ["minInit" "addInputs" "defEnsureDir" "doUnpack"];
postInstall = fullDepEntry (''
mkdir -p $out/lib
mkdir -p $out/share/pidgin-latex
ln -s ../../lib/pidgin/LaTeX.so $out/share/pidgin-latex
'') ["minInit" "defEnsureDir" "doMakeInstall"];
/* doConfigure should be specified separately */
phaseNames = [ "preBuild" "doMakeInstall" "postInstall"];
name = "pidgin-latex-${version}";
meta = {
description = "LaTeX rendering plugin for Pidgin IM";
priority = "10";
};
}

7
pkgs/applications/networking/instant-messengers/pidgin/wrapper.nix
View File

@ -1,6 +1,8 @@
{ stdenv, buildEnv, pidgin, makeWrapper, plugins }:
let drv = buildEnv {
let
extraArgs = map (x: x.wrapArgs or "") plugins;
drv = buildEnv {
name = "pidgin-with-plugins-" + (builtins.parseDrvName pidgin.name).version;
paths = [ pidgin ] ++ plugins;
@ -15,7 +17,8 @@ let drv = buildEnv {
done
fi
wrapProgram $out/bin/pidgin \
--suffix-each PURPLE_PLUGIN_PATH ':' "$out/lib/purple-${pidgin.version} $out/lib/pidgin"
--suffix-each PURPLE_PLUGIN_PATH ':' "$out/lib/purple-${pidgin.version} $out/lib/pidgin" \
${toString extraArgs}
'';
};
in stdenv.lib.overrideDerivation drv (x : { buildInputs = x.buildInputs ++ [ makeWrapper ]; })

7
pkgs/applications/science/math/R/default.nix
View File

@ -6,11 +6,11 @@
}:
stdenv.mkDerivation rec {
name = "R-3.1.0";
name = "R-3.1.2";
src = fetchurl {
url = "http://cran.r-project.org/src/base/R-3/${name}.tar.gz";
sha256 = "1qjzbw341bvi1h4jwbvdkvq8j0z9l3m85mpgrlfw0n2cz2806s4a";
sha256 = "0ypsm11c7n49pgh2ricyhhpfhas3famscdazzdp2zq70rapm1ldw";
};
buildInputs = [ blas bzip2 gfortran liblapack libX11 libXmu libXt
@ -54,7 +54,8 @@ stdenv.mkDerivation rec {
installTargets = [ "install" "install-info" "install-pdf" ];
doCheck = true;
# The test suite fails when building without the recommended packages.
doCheck = withRecommendedPackages;
enableParallelBuilding = true;

2
pkgs/applications/version-management/darcs/default.nix
View File

@ -24,7 +24,7 @@ cabal.mkDerivation (self: {
mv contrib/darcs_completion $out/etc/bash_completion.d/darcs
'';
patchPhase = ''
sed -i -e 's|random.*==.*|random|' darcs.cabal
sed -i -e 's|random.*==.*|random|' -e 's|text.*>=.*,|text,|' darcs.cabal
'';
meta = {
homepage = "http://darcs.net/";

17
pkgs/applications/version-management/git-and-tools/github-backup/default.nix
View File

@ -1,19 +1,20 @@
# This file was auto-generated by cabal2nix. Please do NOT edit manually!
{ cabal, extensibleExceptions, filepath, git, github, hslogger
, IfElse, MissingH, mtl, network, optparseApplicative, prettyShow
, text, unixCompat
{ cabal, exceptions, filepath, git, github, hslogger, IfElse
, MissingH, mtl, network, networkUri, optparseApplicative
, prettyShow, text, transformers, unixCompat
}:
cabal.mkDerivation (self: {
pname = "github-backup";
version = "1.20140721";
sha256 = "0bnkfmgpk1iaaqck4ppn461fzk3s2761w2nxfrvw10gc934lhrxc";
version = "1.20141031";
sha256 = "1rg8hz7g12k6h3vflm51l6gdi0wckmxwdq1213ykrbl8w8bvlkm8";
isLibrary = false;
isExecutable = true;
buildDepends = [
extensibleExceptions filepath github hslogger IfElse MissingH mtl
network optparseApplicative prettyShow text unixCompat
exceptions filepath github hslogger IfElse MissingH mtl network
networkUri optparseApplicative prettyShow text transformers
unixCompat
];
buildTools = [ git ];
meta = {
@ -21,7 +22,5 @@ cabal.mkDerivation (self: {
description = "backs up everything github knows about a repository, to the repository";
license = "GPL";
platforms = self.ghc.meta.platforms;
hydraPlatforms = self.stdenv.lib.platforms.none;
broken = true;
};
})

6
pkgs/applications/version-management/git-repo/default.nix
View File

@ -1,12 +1,12 @@
{ stdenv, fetchurl, python }:
stdenv.mkDerivation {
name = "git-repo-1.20";
name = "git-repo-1.21";
src = fetchurl {
# I could not find a versioned url for the 1.20 version. In case
# I could not find a versioned url for the 1.21 version. In case
# the sha mismatches, check the homepage for new version and sha.
url = "http://commondatastorage.googleapis.com/git-repo-downloads/repo";
sha1 = "e197cb48ff4ddda4d11f23940d316e323b29671c";
sha1 = "b8bd1804f432ecf1bab730949c82b93b0fc5fede";
};
unpackPhase = "true";

277
pkgs/build-support/fetchgit/nix-prefetch-git
View File

@ -10,51 +10,51 @@ fetchSubmodules=
builder=
if test -n "$deepClone"; then
deepClone=true
deepClone=true
else
deepClone=false
deepClone=false
fi
if test "$leaveDotGit" != 1; then
leaveDotGit=
leaveDotGit=
else
leaveDotGit=true
leaveDotGit=true
fi
argi=0
argfun=""
for arg; do
if test -z "$argfun"; then
case $arg in
--out) argfun=set_out;;
--url) argfun=set_url;;
--rev) argfun=set_rev;;
--hash) argfun=set_hashType;;
--deepClone) deepClone=true;;
--no-deepClone) deepClone=false;;
--leave-dotGit) leaveDotGit=true;;
--fetch-submodules) fetchSubmodules=true;;
--builder) builder=true;;
*)
argi=$(($argi + 1))
case $argi in
1) url=$arg;;
2) rev=$arg;;
3) expHash=$arg;;
*) exit 1;;
esac
;;
esac
else
case $argfun in
set_*)
var=$(echo $argfun | sed 's,^set_,,')
eval $var=$arg
;;
esac
argfun=""
fi
if test -z "$argfun"; then
case $arg in
--out) argfun=set_out;;
--url) argfun=set_url;;
--rev) argfun=set_rev;;
--hash) argfun=set_hashType;;
--deepClone) deepClone=true;;
--no-deepClone) deepClone=false;;
--leave-dotGit) leaveDotGit=true;;
--fetch-submodules) fetchSubmodules=true;;
--builder) builder=true;;
*)
argi=$(($argi + 1))
case $argi in
1) url=$arg;;
2) rev=$arg;;
3) expHash=$arg;;
*) exit 1;;
esac
;;
esac
else
case $argfun in
set_*)
var=$(echo $argfun | sed 's,^set_,,')
eval $var=$arg
;;
esac
argfun=""
fi
done
usage(){
@ -75,19 +75,19 @@ Options:
}
if test -z "$url"; then
usage
usage
fi
init_remote(){
local url=$1;
git init;
git remote add origin $url;
local url=$1
git init
git remote add origin $url
}
# Return the reference of an hash if it exists on the remote repository.
ref_from_hash(){
local hash=$1;
local hash=$1
git ls-remote origin | sed -n "\,$hash\t, { s,\(.*\)\t\(.*\),\2,; p; q}"
}
@ -99,12 +99,12 @@ hash_from_ref(){
# Fetch everything and checkout the right sha1
checkout_hash(){
local hash="$1";
local ref="$2";
local hash="$1"
local ref="$2"
if test -z "$hash"; then
hash=$(hash_from_ref $ref);
fi;
hash=$(hash_from_ref $ref)
fi
git fetch ${builder:+--progress} origin || return 1
git checkout -b fetchgit $hash || return 1
@ -112,28 +112,28 @@ checkout_hash(){
# Fetch only a branch/tag and checkout it.
checkout_ref(){
local hash="$1";
local ref="$2";
local hash="$1"
local ref="$2"
if "$deepClone"; then
# The caller explicitly asked for a deep clone. Deep clones
# allow "git describe" and similar tools to work. See
# http://thread.gmane.org/gmane.linux.distributions.nixos/3569
# for a discussion.
return 1
# The caller explicitly asked for a deep clone. Deep clones
# allow "git describe" and similar tools to work. See
# http://thread.gmane.org/gmane.linux.distributions.nixos/3569
# for a discussion.
return 1
fi
if test -z "$ref"; then
ref=$(ref_from_hash $hash);
fi;
ref=$(ref_from_hash $hash)
fi
if test -n "$ref"; then
# --depth option is ignored on http repository.
git fetch ${builder:+--progress} --depth 1 origin +"$ref" || return 1
git checkout -b fetchgit FETCH_HEAD || return 1
else
return 1;
fi;
return 1
fi
}
# Update submodules
@ -145,20 +145,20 @@ init_submodules(){
git submodule status |
while read l; do
# checkout each submodule
local hash=$(echo $l | awk '{print substr($1,2)}');
local dir=$(echo $l | awk '{print $2}');
local hash=$(echo $l | awk '{print substr($1,2)}')
local dir=$(echo $l | awk '{print $2}')
local name=$(
git config -f .gitmodules --get-regexp submodule\.[^.]*\.path |
sed -n "s,^\(.*\)\.path $dir\$,\\1,p")
local url=$(git config -f .gitmodules --get ${name}.url);
local url=$(git config -f .gitmodules --get ${name}.url)
# Get Absolute URL if we have a relative URL
if ! echo "$url" | grep '^[a-zA-Z]\+://' >/dev/null 2>&1; then
url="$(git config --get remote.origin.url)/$url"
url="$(git config --get remote.origin.url)/$url"
fi
clone "$dir" "$url" "$hash" "";
done;
clone "$dir" "$url" "$hash" ""
done
}
clone(){
@ -168,37 +168,74 @@ clone(){
local hash="$3"
local ref="$4"
cd $dir;
cd $dir
# Initialize the repository.
init_remote "$url";
init_remote "$url"
# Download data from the repository.
checkout_ref "$hash" "$ref" ||
checkout_hash "$hash" "$ref" || (
echo 1>&2 "Unable to checkout $hash$ref from $url.";
exit 1;
echo 1>&2 "Unable to checkout $hash$ref from $url."
exit 1
)
# Checkout linked sources.
if test -n "$fetchSubmodules"; then
init_submodules;
init_submodules
fi
if [ -z "$builder" -a -f .topdeps ]; then
if tg help 2>&1 > /dev/null
then
echo "populating TopGit branches..."
tg remote --populate origin
else
echo "WARNING: would populate TopGit branches but TopGit is not available" >&2
echo "WARNING: install TopGit to fix the problem" >&2
fi
if tg help 2>&1 > /dev/null
then
echo "populating TopGit branches..."
tg remote --populate origin
else
echo "WARNING: would populate TopGit branches but TopGit is not available" >&2
echo "WARNING: install TopGit to fix the problem" >&2
fi
fi
cd $top;
cd $top
}
# Remove all remote branches, remove tags not reachable from HEAD, do a full
# repack and then garbage collect unreferenced objects.
make_deterministic_repo(){
local repo="$1"
# run in sub-shell to not touch current working directory
(
cd "$repo"
# Remove files that contain timestamps or otherwise have non-deterministic
# properties.
rm -rf .git/logs/ .git/hooks/ .git/index .git/FETCH_HEAD .git/ORIG_HEAD \
.git/refs/remotes/origin/HEAD .git/config
# Remove all remote branches.
git branch -r | while read branch; do
git branch -rD "$branch" >&2
done
# Remove tags not reachable from HEAD. If we're exactly on a tag, don't
# delete it.
maybe_tag=$(git tag --points-at HEAD)
git tag --contains HEAD | while read tag; do
if [ "$tag" != "$maybe_tag" ]; then
git tag -d "$tag" >&2
fi
done
# Do a full repack, for determinism.
# Repack does not add unreferenced objects to a pack file.
git repack -A -d -f
# Garbage collect unreferenced objects.
git gc --prune=all
)
}
clone_user_rev() {
local dir="$1"
local url="$2"
@ -210,10 +247,10 @@ clone_user_rev() {
clone "$dir" "$url" "" "$rev" 1>&2;;
*)
if test -z "$(echo $rev | tr -d 0123456789abcdef)"; then
clone "$dir" "$url" "$rev" "" 1>&2;
clone "$dir" "$url" "$rev" "" 1>&2
else
echo 1>&2 "Bad commit hash or bad reference.";
exit 1;
echo 1>&2 "Bad commit hash or bad reference."
exit 1
fi;;
esac
@ -224,65 +261,65 @@ clone_user_rev() {
# Allow doing additional processing before .git removal
eval "$NIX_PREFETCH_GIT_CHECKOUT_HOOK"
if test -z "$leaveDotGit"; then
echo "removing \`.git'..." >&2
echo "removing \`.git'..." >&2
find $dir -name .git\* | xargs rm -rf
else
# The logs and index contain timestamps, and the hooks contain
# the nix path of git's bash
find $dir -name .git | xargs -I {} rm -rf {}/logs {}/index {}/hooks
find $dir -name .git | while read gitdir; do
make_deterministic_repo "$(readlink -f "$gitdir/..")"
done
fi
}
if test -n "$builder"; then
test -n "$out" -a -n "$url" -a -n "$rev" || usage
mkdir $out
clone_user_rev "$out" "$url" "$rev"
test -n "$out" -a -n "$url" -a -n "$rev" || usage
mkdir $out
clone_user_rev "$out" "$url" "$rev"
else
if test -z "$hashType"; then
hashType=sha256
fi
if test -z "$hashType"; then
hashType=sha256
fi
# If the hash was given, a file with that hash may already be in the
# store.
if test -n "$expHash"; then
finalPath=$(nix-store --print-fixed-path --recursive "$hashType" "$expHash" git-export)
if ! nix-store --check-validity "$finalPath" 2> /dev/null; then
finalPath=
fi
hash=$expHash
fi
# If the hash was given, a file with that hash may already be in the
# store.
if test -n "$expHash"; then
finalPath=$(nix-store --print-fixed-path --recursive "$hashType" "$expHash" git-export)
if ! nix-store --check-validity "$finalPath" 2> /dev/null; then
finalPath=
fi
hash=$expHash
fi
# If we don't know the hash or a path with that hash doesn't exist,
# download the file and add it to the store.
if test -z "$finalPath"; then
# If we don't know the hash or a path with that hash doesn't exist,
# download the file and add it to the store.
if test -z "$finalPath"; then
tmpPath="$(mktemp -d "${TMPDIR:-/tmp}/git-checkout-tmp-XXXXXXXX")"
trap "rm -rf \"$tmpPath\"" EXIT
tmpPath="$(mktemp -d "${TMPDIR:-/tmp}/git-checkout-tmp-XXXXXXXX")"
trap "rm -rf \"$tmpPath\"" EXIT
tmpFile="$tmpPath/git-export"
mkdir "$tmpFile"
tmpFile="$tmpPath/git-export"
mkdir "$tmpFile"
# Perform the checkout.
clone_user_rev "$tmpFile" "$url" "$rev"
# Perform the checkout.
clone_user_rev "$tmpFile" "$url" "$rev"
# Compute the hash.
hash=$(nix-hash --type $hashType $hashFormat $tmpFile)
if ! test -n "$QUIET"; then echo "hash is $hash" >&2; fi
# Compute the hash.
hash=$(nix-hash --type $hashType $hashFormat $tmpFile)
if ! test -n "$QUIET"; then echo "hash is $hash" >&2; fi
# Add the downloaded file to the Nix store.
finalPath=$(nix-store --add-fixed --recursive "$hashType" $tmpFile)
# Add the downloaded file to the Nix store.
finalPath=$(nix-store --add-fixed --recursive "$hashType" $tmpFile)
if test -n "$expHash" -a "$expHash" != "$hash"; then
echo "hash mismatch for URL \`$url'"
exit 1
fi
fi
if test -n "$expHash" -a "$expHash" != "$hash"; then
echo "hash mismatch for URL \`$url'"
exit 1
fi
fi
if ! test -n "$QUIET"; then echo "path is $finalPath" >&2; fi
if ! test -n "$QUIET"; then echo "path is $finalPath" >&2; fi
echo $hash
echo $hash
if test -n "$PRINT_PATH"; then
echo $finalPath
fi
if test -n "$PRINT_PATH"; then
echo $finalPath
fi
fi

10
pkgs/desktops/xfce/applications/xfce4-mixer.nix
View File

@ -1,6 +1,7 @@
{ stdenv, fetchurl, pkgconfig, intltool, makeWrapper
, glib, gstreamer, gst_plugins_base, gtk
, libxfce4util, libxfce4ui, xfce4panel, xfconf, libunique ? null
, pulseaudioSupport ? false, gst_plugins_good
}:
let
@ -9,7 +10,10 @@ let
gst_plugins_minimal = gst_plugins_base.override {
minimalDeps = true;
};
gst_plugins = [ gst_plugins_minimal ];
gst_plugins_pulse = gst_plugins_good.override {
minimalDeps = true;
};
gst_plugins = [ gst_plugins_minimal ] ++ stdenv.lib.optional pulseaudioSupport gst_plugins_pulse;
in
@ -25,9 +29,9 @@ stdenv.mkDerivation rec {
name = "${p_name}-${ver_maj}.${ver_min}";
buildInputs =
[ pkgconfig intltool glib gstreamer gst_plugins_minimal gtk
[ pkgconfig intltool glib gstreamer gtk
libxfce4util libxfce4ui xfce4panel xfconf libunique makeWrapper
];
] ++ gst_plugins;
postInstall =
''

6
pkgs/desktops/xfce/default.nix
View File

@ -1,4 +1,4 @@
{ pkgs, newScope }: let
{ config, pkgs, newScope }: let
callPackage = newScope (deps // xfce_self);
@ -44,7 +44,9 @@ xfce_self = rec { # the lines are very long but it seems better than the even-od
parole = callPackage ./applications/parole.nix { };
ristretto = callPackage ./applications/ristretto.nix { };
terminal = xfce4terminal; # it has changed its name
xfce4mixer = callPackage ./applications/xfce4-mixer.nix { };
xfce4mixer = callPackage ./applications/xfce4-mixer.nix {
pulseaudioSupport = config.pulseaudio or false;
};
xfce4notifyd = callPackage ./applications/xfce4-notifyd.nix { };
xfce4taskmanager= callPackage ./applications/xfce4-taskmanager.nix { };
xfce4terminal = callPackage ./applications/terminal.nix { };

1
pkgs/development/compilers/agda/default.nix
View File

@ -25,6 +25,7 @@ cabal.mkDerivation (self: {
$out/bin/agda -c --no-main $(find $out/share -name Primitive.agda)
$out/bin/agda-mode compile
'';
jailbreak = true;
meta = {
homepage = "http://wiki.portal.chalmers.se/agda/";
description = "A dependently typed functional programming language and proof assistant";

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

@ -23,7 +23,8 @@ cabal.mkDerivation (self: {
];
buildTools = [ happy ];
extraLibraries = [ boehmgc gmp ];
configureFlags = "-fllvm -fgmp -fffi";
configureFlags = "-fgmp -fffi";
jailbreak = true;
meta = {
homepage = "http://www.idris-lang.org/";
description = "Functional Programming Language with Dependent Types";

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

@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
name = "nasm-${version}";
version = "2.11.05";
version = "2.11.06";
src = fetchurl {
url = "http://www.nasm.us/pub/nasm/releasebuilds/${version}/${name}.tar.bz2";
sha256 = "1sgspnascc0asmwlv3jm1mq4vzx653sa7vlg48z20pfybk7pnhaa";
sha256 = "0v1y1kx09nzmk8w4v79jxhn15fmi3g7l9nmgkn7ldjl1d5yxkdl7";
};
meta = {

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

@ -1,11 +1,11 @@
{ stdenv, fetchurl, makeWrapper, jre }:
stdenv.mkDerivation rec {
name = "scala-2.11.2";
name = "scala-2.11.4";
src = fetchurl {
url = "http://www.scala-lang.org/files/archive/${name}.tgz";
sha256 = "0mnjhjiixjphr9v101v408815hkl6hlghx9h7lmmylv5z7gk3p8k";
sha256 = "1140xyp8kbv4l6l95pqj2bawzlvs7h39ivikdv09n13qvqcml3q0";
};
buildInputs = [ jre makeWrapper ] ;

57
pkgs/development/interpreters/python/3.2/CVE-2014-1912.patch
View File

@ -1,57 +0,0 @@
# Edited from Mercurial patch: deleted the NEWS hunk, since it didn't apply cleanly.
# It added the following line to NEWS:
# - Issue #20246: Fix buffer overflow in socket.recvfrom_into.
# HG changeset patch
# User Benjamin Peterson <benjamin@python.org>
# Date 1389671978 18000
# Node ID 9c56217e5c793685eeaf0ee224848c402bdf1e4c
# Parent 2b5cd6d4d149dea6c6941b7e07ada248b29fc9f6
complain when nbytes > buflen to fix possible buffer overflow (closes #20246)
diff --git a/Lib/test/test_socket.py b/Lib/test/test_socket.py
--- a/Lib/test/test_socket.py
+++ b/Lib/test/test_socket.py
@@ -1968,6 +1968,14 @@ class BufferIOTest(SocketConnectedTest):
_testRecvFromIntoMemoryview = _testRecvFromIntoArray
+ def testRecvFromIntoSmallBuffer(self):
+ # See issue #20246.
+ buf = bytearray(8)
+ self.assertRaises(ValueError, self.cli_conn.recvfrom_into, buf, 1024)
+
+ def _testRecvFromIntoSmallBuffer(self):
+ self.serv_conn.send(MSG*2048)
+
TIPC_STYPE = 2000
TIPC_LOWER = 200
diff --git a/Misc/ACKS b/Misc/ACKS
--- a/Misc/ACKS
+++ b/Misc/ACKS
@@ -1020,6 +1020,7 @@ Eric V. Smith
Christopher Smith
Gregory P. Smith
Roy Smith
+Ryan Smith-Roberts
Rafal Smotrzyk
Dirk Soede
Paul Sokolovsky
diff --git a/Misc/NEWS b/Misc/NEWS
--- a/Modules/socketmodule.c
+++ b/Modules/socketmodule.c
@@ -2598,6 +2598,11 @@ sock_recvfrom_into(PySocketSockObject *s
if (recvlen == 0) {
/* If nbytes was not specified, use the buffer's length */
recvlen = buflen;
+ } else if (recvlen > buflen) {
+ PyBuffer_Release(&pbuf);
+ PyErr_SetString(PyExc_ValueError,
+ "nbytes is greater than the length of the buffer");
+ return NULL;
}
readlen = sock_recvfrom_guts(s, buf, recvlen, flags, &addr);

12
pkgs/development/interpreters/python/3.2/default.nix
View File

@ -19,7 +19,7 @@ with stdenv.lib;
let
majorVersion = "3.2";
version = "${majorVersion}.5";
version = "${majorVersion}.6";
buildInputs = filter (p: p != null) [
zlib bzip2 gdbm sqlite db readline ncurses openssl tcl tk libX11 xproto
@ -30,16 +30,10 @@ stdenv.mkDerivation {
inherit majorVersion version;
src = fetchurl {
url = "http://www.python.org/ftp/python/${version}/Python-${version}.tar.bz2";
sha256 = "0pxs234g08v3lar09lvzxw4vqdpwkbqmvkv894j2w7aklskcjd6v";
url = "http://www.python.org/ftp/python/${version}/Python-${version}.tar.xz";
sha256 = "1p3vvvh3qw8avq959hdl6bq5d6r7mbhrnigqzgx6mllzh40va4hx";
};
patches =
[
# See http://bugs.python.org/issue20246
./CVE-2014-1912.patch
];
NIX_LDFLAGS = stdenv.lib.optionalString stdenv.isLinux "-lgcc_s";
preConfigure = ''

4
pkgs/development/interpreters/python/3.3/default.nix
View File

@ -20,7 +20,7 @@ with stdenv.lib;
let
majorVersion = "3.3";
version = "${majorVersion}.5";
version = "${majorVersion}.6";
buildInputs = filter (p: p != null) [
zlib bzip2 lzma gdbm sqlite db readline ncurses openssl tcl tk libX11 xproto
@ -32,7 +32,7 @@ stdenv.mkDerivation {
src = fetchurl {
url = "http://www.python.org/ftp/python/${version}/Python-${version}.tar.xz";
sha256 = "1rdncc7g8g6f3lfdg33rli1yffbiq8z283xy4f5ksl1l8i49psdb";
sha256 = "0gsxpgd5p4mwd01gw501vsyahncyw3h9836ypkr3y32kgazy89jj";
};
NIX_LDFLAGS = stdenv.lib.optionalString stdenv.isLinux "-lgcc_s";

4
pkgs/development/libraries/git2/default.nix
View File

@ -1,13 +1,13 @@
{stdenv, fetchurl, cmake, zlib, python, libssh2, openssl, http-parser}:
stdenv.mkDerivation rec {
version = "0.21.1";
version = "0.21.2";
name = "libgit2-${version}";
src = fetchurl {
name = "${name}.tar.gz";
url = "https://github.com/libgit2/libgit2/tarball/v${version}";
sha256 = "0afbvcsryg7bsmbfj23l09b1xngkmqhf043njl8wm44qslrxibkz";
sha256 = "0icf119lhha96rk8m6s38sczjr0idr7yczw6knby61m81a25a96y";
};
cmakeFlags = "-DTHREADSAFE=ON";

11
pkgs/development/libraries/gstreamer/legacy/gst-plugins-good/default.nix
View File

@ -2,6 +2,9 @@
, flac, libjpeg, zlib, speex, libpng, libdv, libcaca, libvpx
, libiec61883, libavc1394, taglib, pulseaudio, gdk_pixbuf, orc
, glib, gstreamer, bzip2
, # Whether to build no plugins that have external dependencies
# (except the PulseAudio plugin).
minimalDeps ? false
}:
stdenv.mkDerivation rec {
@ -20,10 +23,10 @@ stdenv.mkDerivation rec {
configureFlags = "--disable-oss";
buildInputs =
[ pkgconfig glib gstreamer gst_plugins_base libavc1394 libiec61883
aalib libcaca cairo libdv flac libjpeg libpng pulseaudio speex
taglib bzip2 libvpx gdk_pixbuf orc
];
[ pkgconfig glib gstreamer gst_plugins_base pulseaudio ]
++ stdenv.lib.optionals (!minimalDeps)
[ aalib libcaca cairo libdv flac libjpeg libpng speex
taglib bzip2 libvpx gdk_pixbuf orc ];
enableParallelBuilding = true;

10
pkgs/development/libraries/gstreamer/legacy/gst-python/default.nix
View File

@ -1,5 +1,5 @@
{ fetchurl, stdenv, pkgconfig, python, gstreamer
, gst_plugins_base, pygtk
, gst_plugins_base, pygobject
}:
stdenv.mkDerivation rec {
@ -13,12 +13,16 @@ stdenv.mkDerivation rec {
sha256 = "0y1i4n5m1diljqr9dsq12anwazrhbs70jziich47gkdwllcza9lg";
};
# Need to disable the testFake test case due to bug in pygobject.
# See https://bugzilla.gnome.org/show_bug.cgi?id=692479
patches = [ ./disable-testFake.patch ];
buildInputs =
[ pkgconfig gst_plugins_base pygtk ]
[ pkgconfig gst_plugins_base pygobject ]
;
propagatedBuildInputs = [ gstreamer python ];
meta = {
homepage = http://gstreamer.freedesktop.org;

56
pkgs/development/libraries/gstreamer/legacy/gst-python/disable-testFake.patch Normal file
View File

@ -0,0 +1,56 @@
diff -Nurp gst-python-0.10.22.orig/testsuite/test_bin.py gst-python-0.10.22/testsuite/test_bin.py
--- gst-python-0.10.22.orig/testsuite/test_bin.py 2014-10-29 18:58:00.921827721 +0100
+++ gst-python-0.10.22/testsuite/test_bin.py 2014-10-29 19:00:32.019353092 +0100
@@ -131,52 +131,6 @@ class BinAddRemove(TestCase):
self.assertRaises(gst.AddError, self.bin.add, src, sink)
self.bin.remove(src, sink)
self.assertRaises(gst.RemoveError, self.bin.remove, src, sink)
-
-class Preroll(TestCase):
- def setUp(self):
- TestCase.setUp(self)
- self.bin = gst.Bin('bin')
-
- def tearDown(self):
- # FIXME: wait for state change thread to settle down
- while self.bin.__gstrefcount__ > 1:
- time.sleep(0.1)
- self.assertEquals(self.bin.__gstrefcount__, 1)
- del self.bin
- TestCase.tearDown(self)
-
- def testFake(self):
- src = gst.element_factory_make('fakesrc')
- sink = gst.element_factory_make('fakesink')
- self.bin.add(src)
-
- # bin will go to paused, src pad task will start and error out
- self.bin.set_state(gst.STATE_PAUSED)
- ret = self.bin.get_state()
- self.assertEquals(ret[0], gst.STATE_CHANGE_SUCCESS)
- self.assertEquals(ret[1], gst.STATE_PAUSED)
- self.assertEquals(ret[2], gst.STATE_VOID_PENDING)
-
- # adding the sink will cause the bin to go in preroll mode
- gst.debug('adding sink and setting to PAUSED, should cause preroll')
- self.bin.add(sink)
- sink.set_state(gst.STATE_PAUSED)
- ret = self.bin.get_state(timeout=0)
- self.assertEquals(ret[0], gst.STATE_CHANGE_ASYNC)
- self.assertEquals(ret[1], gst.STATE_PAUSED)
- self.assertEquals(ret[2], gst.STATE_PAUSED)
-
- # to actually complete preroll, we need to link and re-enable fakesrc
- src.set_state(gst.STATE_READY)
- src.link(sink)
- src.set_state(gst.STATE_PAUSED)
- ret = self.bin.get_state()
- self.assertEquals(ret[0], gst.STATE_CHANGE_SUCCESS)
- self.assertEquals(ret[1], gst.STATE_PAUSED)
- self.assertEquals(ret[2], gst.STATE_VOID_PENDING)
-
- self.bin.set_state(gst.STATE_NULL)
- self.bin.get_state()
class ConstructorTest(TestCase):
def testGood(self):

6
pkgs/development/libraries/haskell/ConfigFile/default.nix
View File

@ -4,15 +4,15 @@
cabal.mkDerivation (self: {
pname = "ConfigFile";
version = "1.1.2";
sha256 = "0xidr8dk5sc9g1v9gw7fmmrsyqiawx2rxg4c36pm4jbcj8jdzxiq";
version = "1.1.4";
sha256 = "057mw146bip9wzs7j4b5xr1x24d8w0kr4i3inri5m57jkwspn25f";
isLibrary = true;
isExecutable = true;
buildDepends = [ MissingH mtl parsec ];
meta = {
homepage = "http://software.complete.org/configfile";
description = "Configuration file reading & writing";
license = "LGPL";
license = self.stdenv.lib.licenses.bsd3;
platforms = self.ghc.meta.platforms;
};
})

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

@ -6,8 +6,8 @@
cabal.mkDerivation (self: {
pname = "HSH";
version = "2.1.1";
sha256 = "14aijsafd8mkh46dy071haix16p31ppdn2s3r9kxdbjjas6qh13g";
version = "2.1.2";
sha256 = "17ysn131xskx4s1g5kg08zy141q3q16bns4bsg3yjzvf6cjpz2kq";
isLibrary = true;
isExecutable = true;
buildDepends = [

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

@ -8,8 +8,8 @@
cabal.mkDerivation (self: {
pname = "HTF";
version = "0.12.2.2";
sha256 = "02n3nqghcl9wmcr2iar9bg8nziddsvp43rzyasq4fnh166y87gc4";
version = "0.12.2.3";
sha256 = "0g5z2ypn6i7wpz1439c6qjmi8lw2b86zaljkgwchjn8r8gvw4mbm";
isLibrary = true;
isExecutable = true;
buildDepends = [

7
pkgs/development/libraries/haskell/HaXml/default.nix
View File

@ -4,13 +4,14 @@
cabal.mkDerivation (self: {
pname = "HaXml";
version = "1.24.1";
sha256 = "1pvqgczksxasayvdb6d4g7ya7g7w1v9hsa35kaxm9bcic9y8q9az";
version = "1.25";
sha256 = "02l53v9c8qzkp5zzs31973pp27q4k2h04h9x3852gah78qjvnslk";
isLibrary = true;
isExecutable = true;
buildDepends = [ filepath polyparse random ];
noHaddock = true;
meta = {
homepage = "http://www.cs.york.ac.uk/fp/HaXml/";
homepage = "http://projects.haskell.org/HaXml/";
description = "Utilities for manipulating XML documents";
license = "LGPL";
platforms = self.ghc.meta.platforms;

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

@ -6,8 +6,8 @@
cabal.mkDerivation (self: {
pname = "MissingH";
version = "1.2.1.0";
sha256 = "08zpzfhl31w35x13vapimwd508j4nydi8v3vid668r4fkqnymbss";
version = "1.3.0.1";
sha256 = "1cwdhgqqv2riqwhsgyrpmqyzvg19lx6zp1g7xdp4rikh7rkn03ds";
buildDepends = [
filepath hslogger HUnit mtl network parsec random regexCompat time
];

15
pkgs/development/libraries/haskell/MonadRandom/0.3.nix Normal file
View File

@ -0,0 +1,15 @@
# This file was auto-generated by cabal2nix. Please do NOT edit manually!
{ cabal, mtl, random, transformers }:
cabal.mkDerivation (self: {
pname = "MonadRandom";
version = "0.3";
sha256 = "0bmsccjcz6glb0x0nkjlq3qywfibf0wxxv4dvdhjfw5sx6im9qx3";
buildDepends = [ mtl random transformers ];
meta = {
description = "Random-number generation monad";
license = "unknown";
platforms = self.ghc.meta.platforms;
};
})

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

@ -8,8 +8,8 @@
cabal.mkDerivation (self: {
pname = "ariadne";
version = "0.1.2.2";
sha256 = "0dp2xs1g9cw27gwvw2qzyv1qk3z97mg8ab6rfx967r7ad76lkzx2";
version = "0.1.2.3";
sha256 = "02hyn3y4h7w4l5k48kp73al67lp8vzlymblb7al72w14r01ww8p3";
isLibrary = false;
isExecutable = true;
buildDepends = [

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

@ -4,8 +4,8 @@
cabal.mkDerivation (self: {
pname = "bindings-libusb";
version = "1.4.4.1";
sha256 = "1cip5a0n8svjkzawpx3wi9z7nywmn9bl3k2w559b3awy0wixybrx";
version = "1.4.5.0";
sha256 = "0xnx9p6wqbwiaqigdnf7x6vd0qq7w9wm0vxsh93adpb5wdpjza66";
buildDepends = [ bindingsDSL ];
pkgconfigDepends = [ libusb ];
meta = {

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

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

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

@ -13,6 +13,7 @@ cabal.mkDerivation (self: {
buildDepends = [
blazeHtml dataDefault mtl syb text uniplate xssSanitize
];
jailbreak = true;
meta = {
homepage = "http://github.com/jgm/cheapskate";
description = "Experimental markdown processor";

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

@ -8,6 +8,7 @@ cabal.mkDerivation (self: {
sha256 = "1w2617kpj6rblmycqb97gyshwbvzp5w2h4xh494mvdzi3bkahqpn";
buildDepends = [ mtl text ];
testDepends = [ HUnit mtl testFramework testFrameworkHunit text ];
jailbreak = true;
meta = {
homepage = "http://fvisser.nl/clay";
description = "CSS preprocessor as embedded Haskell";

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

@ -4,8 +4,8 @@
cabal.mkDerivation (self: {
pname = "cmdargs";
version = "0.10.11";
sha256 = "0wfw6gpqbd89wzq6gh11bc35m2wbaf2jnkf6gxhpml70jn6ca8nz";
version = "0.10.12";
sha256 = "0axn3ycw4rijh1ka5f73gz9w330s851cpxbv39ia4xnb0l95hrjy";
isLibrary = true;
isExecutable = true;
buildDepends = [ filepath transformers ];

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

@ -20,6 +20,7 @@ cabal.mkDerivation (self: {
diagramsLib HUnit QuickCheck testFramework testFrameworkHunit
testFrameworkQuickcheck2
];
jailbreak = true;
meta = {
homepage = "http://projects.haskell.org/diagrams/";
description = "Collection of user contributions to diagrams EDSL";

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

@ -12,6 +12,7 @@ cabal.mkDerivation (self: {
dualTree lens MemoTrie monoidExtras newtype semigroups vectorSpace
vectorSpacePoints
];
jailbreak = true;
meta = {
homepage = "http://projects.haskell.org/diagrams";
description = "Core libraries for diagrams EDSL";

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

@ -16,6 +16,7 @@ cabal.mkDerivation (self: {
monoidExtras optparseApplicative semigroups tagged vectorSpace
vectorSpacePoints
];
jailbreak = true;
meta = {
homepage = "http://projects.haskell.org/diagrams";
description = "Embedded domain-specific language for declarative graphics";

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

@ -13,6 +13,7 @@ cabal.mkDerivation (self: {
dataDefaultClass diagramsCore diagramsLib dlist filepath hashable
lens monoidExtras mtl semigroups split vectorSpace
];
jailbreak = true;
meta = {
homepage = "http://projects.haskell.org/diagrams/";
description = "Postscript backend for diagrams drawing EDSL";

1
pkgs/development/libraries/haskell/diagrams/rasterific.nix
View File

@ -14,6 +14,7 @@ cabal.mkDerivation (self: {
JuicyPixels lens mtl optparseApplicative Rasterific split
statestack time
];
jailbreak = true;
meta = {
homepage = "http://projects.haskell.org/diagrams/";
description = "Rasterific backend for diagrams";

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

@ -14,6 +14,7 @@ cabal.mkDerivation (self: {
diagramsLib filepath hashable JuicyPixels lens monoidExtras mtl
split time vectorSpace
];
jailbreak = true;
meta = {
homepage = "http://projects.haskell.org/diagrams/";
description = "SVG backend for diagrams drawing EDSL";

1
pkgs/development/libraries/haskell/digestive-functors-aeson/default.nix
View File

@ -20,5 +20,6 @@ cabal.mkDerivation (self: {
license = self.stdenv.lib.licenses.gpl3;
platforms = self.ghc.meta.platforms;
maintainers = with self.stdenv.lib.maintainers; [ ocharles ];
broken = true;
};
})

1
pkgs/development/libraries/haskell/digestive-functors-snap/default.nix
View File

@ -7,6 +7,7 @@ cabal.mkDerivation (self: {
version = "0.6.1.0";
sha256 = "07xb8jr70j03kggk55p3zzp07y7amzm7f8hdzry4vff7yx41rxhr";
buildDepends = [ digestiveFunctors filepath mtl snapCore text ];
jailbreak = true;
meta = {
homepage = "http://github.com/jaspervdj/digestive-functors";
description = "Snap backend for the digestive-functors library";

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

@ -9,6 +9,7 @@ cabal.mkDerivation (self: {
buildDepends = [
binary extensibleExceptions HaXml mtl regexCompat
];
jailbreak = true;
meta = {
homepage = "http://code.haskell.org/encoding/";
description = "A library for various character encodings";

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

@ -4,8 +4,8 @@
cabal.mkDerivation (self: {
pname = "entropy";
version = "0.3.3";
sha256 = "0px97mims7pbxyh8jqckc14ahdjj7r3hhckzpjqnxpkcisb2c738";
version = "0.3.4";
sha256 = "1khfvrk49zf0rd90d34983048mxy093ci2qk8866qq0hwi53b0q0";
meta = {
homepage = "https://github.com/TomMD/entropy";
description = "A platform independent entropy source";

6
pkgs/development/libraries/haskell/extra/default.nix
View File

@ -4,10 +4,10 @@
cabal.mkDerivation (self: {
pname = "extra";
version = "0.4";
sha256 = "1wqhnfm297iwf6l4bkhnlbv4bb54b9y5qig7h5n7fjn88bxgwj1l";
version = "0.6";
sha256 = "1mayrzlk6kycdwcag60pzas5cmbhlxid1bkfsaqa371bfjs79zpn";
buildDepends = [ filepath time ];
testDepends = [ QuickCheck time ];
testDepends = [ filepath QuickCheck time ];
meta = {
homepage = "https://github.com/ndmitchell/extra#readme";
description = "Extra functions I use";

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

@ -6,11 +6,12 @@
cabal.mkDerivation (self: {
pname = "filestore";
version = "0.6.0.3";
sha256 = "03qmv3cqp1fv7b7pdjdx12cb27bfjbwwjdhkcvkfq89qwk9wh1h0";
version = "0.6.0.4";
sha256 = "1b3ymdqwcn84m8kkybshx10bfylby49i0yhbassvlgf0n096lp12";
buildDepends = [ Diff filepath parsec split time utf8String xml ];
testDepends = [ Diff filepath HUnit mtl time ];
jailbreak = true;
doCheck = false;
meta = {
description = "Interface for versioning file stores";
license = self.stdenv.lib.licenses.bsd3;

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

@ -9,6 +9,7 @@ cabal.mkDerivation (self: {
buildDepends = [
dataDefaultClass lens vectorSpace vectorSpacePoints
];
jailbreak = true;
meta = {
description = "Simple force-directed layout";
license = self.stdenv.lib.licenses.bsd3;

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

@ -3,24 +3,27 @@
{ cabal, async, Cabal, convertible, dataDefault, deepseq, djinnGhc
, doctest, emacs, filepath, ghcPaths, ghcSybUtils, haskellSrcExts
, hlint, hspec, ioChoice, makeWrapper, monadControl, monadJournal
, mtl, split, syb, text, time, transformers, transformersBase
, mtl, split, syb, temporary, text, time, transformers
, transformersBase
}:
cabal.mkDerivation (self: {
pname = "ghc-mod";
version = "5.1.1.0";
sha256 = "0msx2x976ap4jx506mzp48sdigc29vq4ypjbxiyn30mjw52rg53w";
version = "5.2.0.0";
sha256 = "1zwdr3zlnc8d49d6jrvj2yrfnamp1120gffzd6vfxqgvapk71vfk";
isLibrary = true;
isExecutable = true;
buildDepends = [
async Cabal convertible dataDefault deepseq djinnGhc filepath
ghcPaths ghcSybUtils haskellSrcExts hlint ioChoice monadControl
monadJournal mtl split syb text time transformers transformersBase
monadJournal mtl split syb temporary text time transformers
transformersBase
];
testDepends = [
Cabal convertible deepseq djinnGhc doctest filepath ghcPaths
ghcSybUtils haskellSrcExts hlint hspec ioChoice monadControl
monadJournal mtl split syb text time transformers transformersBase
monadJournal mtl split syb temporary text time transformers
transformersBase
];
buildTools = [ emacs makeWrapper ];
doCheck = false;

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

@ -6,8 +6,8 @@
cabal.mkDerivation (self: {
pname = "ghc-vis";
version = "0.7.2.6";
sha256 = "12jyxcqyrqiai0fdfnpvsn1v64is7p8zixi745k29h54i0px1j89";
version = "0.7.2.7";
sha256 = "0kxkmbp71yx5mskzpcyjd8s2yq01q1q6dxmqzmwg6naalcpcbswv";
buildDepends = [
cairo deepseq fgl ghcHeapView graphviz gtk mtl svgcairo text
transformers xdot

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

@ -2,25 +2,24 @@
{ cabal, aeson, base64Bytestring, blazeHtml, ConfigFile, feed
, filepath, filestore, ghcPaths, happstackServer, highlightingKate
, hoauth2, hslogger, HStringTemplate, HTTP, httpClient
, httpClientTls, json, mtl, network, networkUri, pandoc
, pandocTypes, parsec, random, recaptcha, safe, SHA, split, syb
, tagsoup, text, time, uri, url, utf8String, xhtml, xml
, xssSanitize, zlib
, hoauth2, hslogger, HStringTemplate, HTTP, httpClientTls
, httpConduit, json, mtl, network, networkUri, pandoc, pandocTypes
, parsec, random, recaptcha, safe, SHA, split, syb, tagsoup, text
, time, uri, url, utf8String, uuid, xhtml, xml, xssSanitize, zlib
}:
cabal.mkDerivation (self: {
pname = "gitit";
version = "0.10.5.1";
sha256 = "0wi40f34xqqz0q8m14g7ay6yk37c3fkdijydv0di43i20bxixjhv";
version = "0.10.6.1";
sha256 = "1l6zra0yiwrmiycblp25b5yd1yrz94537l8zkspkf7z6wc8vdkn0";
isLibrary = true;
isExecutable = true;
buildDepends = [
aeson base64Bytestring blazeHtml ConfigFile feed filepath filestore
ghcPaths happstackServer highlightingKate hoauth2 hslogger
HStringTemplate HTTP httpClient httpClientTls json mtl network
HStringTemplate HTTP httpClientTls httpConduit json mtl network
networkUri pandoc pandocTypes parsec random recaptcha safe SHA
split syb tagsoup text time uri url utf8String xhtml xml
split syb tagsoup text time uri url utf8String uuid xhtml xml
xssSanitize zlib
];
jailbreak = true;

6
pkgs/development/libraries/haskell/graphviz/default.nix
View File

@ -1,7 +1,7 @@
# This file was auto-generated by cabal2nix. Please do NOT edit manually!
{ cabal, colour, dlist, fgl, filepath, polyparse, QuickCheck
, temporary, text, transformers, wlPprintText
, systemGraphviz, temporary, text, transformers, wlPprintText
}:
cabal.mkDerivation (self: {
@ -14,8 +14,8 @@ cabal.mkDerivation (self: {
colour dlist fgl filepath polyparse temporary text transformers
wlPprintText
];
testDepends = [ fgl filepath QuickCheck text ];
doCheck = false;
testDepends = [ fgl filepath QuickCheck systemGraphviz text ];
jailbreak = true;
meta = {
homepage = "http://projects.haskell.org/graphviz/";
description = "Bindings to Graphviz for graph visualisation";

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

@ -11,8 +11,8 @@
cabal.mkDerivation (self: {
pname = "hakyll";
version = "4.5.5.1";
sha256 = "060wcak242p2gja616bdair4sg2k04s8cld5nlk8p3b6an2isld9";
version = "4.6.0.0";
sha256 = "0ihaw53935g9pyasa8g5qi1dgvxanhhpkg0xcjq7aazqk2cciqy3";
isLibrary = true;
isExecutable = true;
buildDepends = [

1
pkgs/development/libraries/haskell/haskell-platform/2009.2.0.2.nix
View File

@ -17,6 +17,7 @@ cabal.mkDerivation (self : {
stm time xhtml zlib parsec network
cabalInstall alex happy ghc
];
propagatedUserEnvPkgs = self.propagatedBuildInputs;
meta = {
description = "Haskell Platform meta package";
license = self.stdenv.lib.licenses.bsd3;

1
pkgs/development/libraries/haskell/haskell-platform/2010.1.0.0.nix
View File

@ -17,6 +17,7 @@ cabal.mkDerivation (self : {
stm xhtml zlib parsec
cabalInstall alex happy ghc
];
propagatedUserEnvPkgs = self.propagatedBuildInputs;
meta = {
description = "Haskell Platform meta package";
license = self.stdenv.lib.licenses.bsd3;

1
pkgs/development/libraries/haskell/haskell-platform/2010.2.0.0.nix
View File

@ -17,6 +17,7 @@ cabal.mkDerivation (self : {
stm xhtml zlib mtl parsec deepseq
cabalInstall alex happy ghc
];
propagatedUserEnvPkgs = self.propagatedBuildInputs;
meta = {
description = "Haskell Platform meta package";
license = self.stdenv.lib.licenses.bsd3;

1
pkgs/development/libraries/haskell/haskell-platform/2011.2.0.0.nix
View File

@ -19,6 +19,7 @@ cabal.mkDerivation (self : {
cabalInstall alex happy ghc
];
noHaddock = true;
propagatedUserEnvPkgs = self.propagatedBuildInputs;
meta = {
description = "Haskell Platform meta package";
license = self.stdenv.lib.licenses.bsd3;

1
pkgs/development/libraries/haskell/haskell-platform/2011.2.0.1.nix
View File

@ -29,6 +29,7 @@ cabal.mkDerivation (self : {
touch $sourceRoot/LICENSE
'';
noHaddock = true;
propagatedUserEnvPkgs = self.propagatedBuildInputs;
meta = {
description = "Haskell Platform meta package";
license = self.stdenv.lib.licenses.bsd3;

1
pkgs/development/libraries/haskell/haskell-platform/2011.4.0.0.nix
View File

@ -29,6 +29,7 @@ cabal.mkDerivation (self : {
touch $sourceRoot/LICENSE
'';
noHaddock = true;
propagatedUserEnvPkgs = self.propagatedBuildInputs;
meta = {
homepage = "http://haskell.org/platform";
description = "Haskell Platform meta package";

1
pkgs/development/libraries/haskell/haskell-platform/2012.2.0.0.nix
View File

@ -29,6 +29,7 @@ cabal.mkDerivation (self : {
touch $sourceRoot/LICENSE
'';
noHaddock = true;
propagatedUserEnvPkgs = self.propagatedBuildInputs;
meta = {
homepage = "http://haskell.org/platform";
description = "Haskell Platform meta package";

1
pkgs/development/libraries/haskell/haskell-platform/2012.4.0.0.nix
View File

@ -31,6 +31,7 @@ cabal.mkDerivation (self : {
touch $sourceRoot/LICENSE
'';
noHaddock = true;
propagatedUserEnvPkgs = self.propagatedBuildInputs;
meta = {
homepage = "http://haskell.org/platform";
description = "Haskell Platform meta package";

1
pkgs/development/libraries/haskell/haskell-platform/2013.2.0.0.nix
View File

@ -33,6 +33,7 @@ cabal.mkDerivation (self : {
touch $sourceRoot/LICENSE
'';
noHaddock = true;
propagatedUserEnvPkgs = self.propagatedBuildInputs;
meta = {
homepage = "http://haskell.org/platform";
description = "Haskell Platform meta package";

4
pkgs/development/libraries/haskell/haskell-src-exts/1.16.0.nix → pkgs/development/libraries/haskell/haskell-src-exts/1.16.0.1.nix
View File

@ -6,8 +6,8 @@
cabal.mkDerivation (self: {
pname = "haskell-src-exts";
version = "1.16.0";
sha256 = "15nhmwd2vfv14d4mc35alcjxg165a8jh0pgzinmx8aa8zbzvz5ha";
version = "1.16.0.1";
sha256 = "1h8gjw5g92rvvzadqzpscg73x7ajvs1wlphrh27afim3scdd8frz";
buildDepends = [ cpphs ];
testDepends = [
filepath mtl smallcheck syb tasty tastyGolden tastySmallcheck

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

@ -18,6 +18,7 @@ cabal.mkDerivation (self: {
mtl pbkdf QuickCheck split testFramework testFrameworkHunit
testFrameworkQuickcheck2 text
];
jailbreak = true;
doCheck = false;
meta = {
homepage = "http://github.com/haskoin/haskoin";

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

@ -6,8 +6,8 @@
cabal.mkDerivation (self: {
pname = "haskore";
version = "0.2.0.4";
sha256 = "0hhsiazdz44amilcwfxl0r10yxzhql83pgd21k89fmg1gkc4q46j";
version = "0.2.0.5";
sha256 = "0zvr7hwxnv01g626617yv7f0vwpmyqvlwbyc6yhb2mrlfqwdgbd0";
isLibrary = true;
isExecutable = true;
buildDepends = [

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

@ -4,8 +4,8 @@
cabal.mkDerivation (self: {
pname = "haste-perch";
version = "0.1.0.3";
sha256 = "1ad7kv47kq0sav49qnqdk76blk44sgjvk1zgn5k2bqvfnr26641j";
version = "0.1.0.4";
sha256 = "12ssfik7v671727yxplz44gwgy9i815l44r4z3x066ndcqglr306";
buildDepends = [ hasteCompiler transformers ];
meta = {
homepage = "https://github.com/agocorona/haste-perch";

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

@ -12,6 +12,7 @@ cabal.mkDerivation (self: {
base64Bytestring blazeBuilder HaXml HTTP mtl network networkUri
time utf8String
];
jailbreak = true;
meta = {
homepage = "http://www.haskell.org/haskellwiki/HaXR";
description = "XML-RPC client and server library";

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

@ -15,6 +15,7 @@ cabal.mkDerivation (self: {
text transformers transformersBase
];
testDepends = [ doctest filepath ];
jailbreak = true;
meta = {
homepage = "http://github.com/bennofs/hcltest/";
description = "A testing library for command line applications";

17
pkgs/development/libraries/haskell/hmatrix-gsl/default.nix Normal file
View File

@ -0,0 +1,17 @@
# This file was auto-generated by cabal2nix. Please do NOT edit manually!
{ cabal, gsl, hmatrix, random, vector }:
cabal.mkDerivation (self: {
pname = "hmatrix-gsl";
version = "0.16.0.2";
sha256 = "1l865v2vpjl7f5741z58m9gw1ksskgzfm5gzp9pxiqazsgb2h5ym";
buildDepends = [ hmatrix random vector ];
pkgconfigDepends = [ gsl ];
meta = {
homepage = "https://github.com/albertoruiz/hmatrix";
description = "Numerical computation";
license = "GPL";
platforms = self.ghc.meta.platforms;
};
})

10
pkgs/development/libraries/haskell/hmatrix-special/default.nix
View File

@ -1,15 +1,15 @@
# This file was auto-generated by cabal2nix. Please do NOT edit manually!
{ cabal, gsl, hmatrix }:
{ cabal, gsl, hmatrix, hmatrixGsl }:
cabal.mkDerivation (self: {
pname = "hmatrix-special";
version = "0.2.0";
sha256 = "0lp8mvagbzayq3r08wgk498n6d9vgb1skb8wzrzi5a1fc5j8m0wj";
buildDepends = [ hmatrix ];
version = "0.3.0.1";
sha256 = "1ziqzbfrk7xyah5n0cys1ccnmj2z91wxdamanv3y5v717zhdrqix";
buildDepends = [ hmatrix hmatrixGsl ];
extraLibraries = [ gsl ];
meta = {
homepage = "http://perception.inf.um.es/hmatrix";
homepage = "https://github.com/albertoruiz/hmatrix";
description = "Interface to GSL special functions";
license = "GPL";
platforms = self.ghc.meta.platforms;

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

@ -7,8 +7,8 @@
cabal.mkDerivation (self: {
pname = "hspec-meta";
version = "1.12.1";
sha256 = "1920gpcam7y3slg1an8ywhw6lxammgy21nmxbxlh77iz65rldzls";
version = "1.12.2";
sha256 = "1gx62pqii2y29wxk6krzrwj18xp15y3qxyvnkkgcq9j984146zfs";
isLibrary = true;
isExecutable = true;
buildDepends = [

1
pkgs/development/libraries/haskell/hspec-wai/default.nix
View File

@ -18,5 +18,6 @@ cabal.mkDerivation (self: {
description = "Experimental Hspec support for testing WAI applications (depends on hspec2!)";
license = self.stdenv.lib.licenses.mit;
platforms = self.ghc.meta.platforms;
hydraPlatforms = self.stdenv.lib.platforms.none;
};
})

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

@ -8,8 +8,8 @@
cabal.mkDerivation (self: {
pname = "hspec";
version = "1.12.1";
sha256 = "0w42lsl5qs452f04qpbr6nvs4qgp7cwd9262f34vzjq8m83nhjwk";
version = "1.12.2";
sha256 = "1ika9qqw8y9j95db9xgjsfj9s9jb56hq962mwbpx1pl5d15m5262";
isLibrary = true;
isExecutable = true;
buildDepends = [

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

@ -26,5 +26,6 @@ cabal.mkDerivation (self: {
description = "Alpha version of Hspec 2.0";
license = self.stdenv.lib.licenses.mit;
platforms = self.ghc.meta.platforms;
broken = true;
};
})

16
pkgs/development/libraries/haskell/imm/default.nix
View File

@ -2,27 +2,27 @@
{ cabal, async, caseInsensitive, cond, dataDefault, dyre, feed
, filepath, hslogger, httpConduit, httpTypes, lens, mimeMail
, monadControl, mtl, network, opml, random, resourcet, text
, textIcu, time, timerep, tls, transformers, transformersBase
, monadControl, mtl, network, networkUri, opml, random, resourcet
, text, textIcu, time, timerep, tls, transformers, transformersBase
, utf8String, xdgBasedir, xml
}:
cabal.mkDerivation (self: {
pname = "imm";
version = "0.6.0.2";
sha256 = "0bawp8zqpkxig33ybv0yxv6bh51rfhsyp0q7l0lh61gy17rx0gsa";
version = "0.6.0.3";
sha256 = "0fhqb36xj2xr1hhfrhk1npms9lnvbh6fmvki9mmm3gqs06hb925l";
isLibrary = true;
isExecutable = true;
buildDepends = [
async caseInsensitive cond dataDefault dyre feed filepath hslogger
httpConduit httpTypes lens mimeMail monadControl mtl network opml
random resourcet text textIcu time timerep tls transformers
transformersBase utf8String xdgBasedir xml
httpConduit httpTypes lens mimeMail monadControl mtl network
networkUri opml random resourcet text textIcu time timerep tls
transformers transformersBase utf8String xdgBasedir xml
];
meta = {
description = "Retrieve RSS/Atom feeds and write one mail per new item in a maildir";
license = "unknown";
platforms = self.ghc.meta.platforms;
broken = true;
maintainers = with self.stdenv.lib.maintainers; [ bergey ];
};
})

1
pkgs/development/libraries/haskell/json-assertions/default.nix
View File

@ -7,6 +7,7 @@ cabal.mkDerivation (self: {
version = "1.0.5";
sha256 = "1vf6y8xbl48giq1p6d62294rfvfdw62l1q4dspy990ii0v5gkyck";
buildDepends = [ aeson indexed indexedFree lens lensAeson text ];
jailbreak = true;
meta = {
homepage = "http://github.com/ocharles/json-assertions.git";
description = "Test that your (Aeson) JSON encoding matches your expectations";

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

@ -4,8 +4,8 @@
cabal.mkDerivation (self: {
pname = "language-c-inline";
version = "0.7.6.1";
sha256 = "0giyclrkxbigqpgrvlz896nsiqi7fghm79pzcxmxn7vslmardn4a";
version = "0.7.7.0";
sha256 = "10wj8dlsjimgln14y7b50pnnn865ln46v3xcqwr7ahjcl3icavg6";
buildDepends = [ filepath languageCQuote mainlandPretty ];
testDepends = [ languageCQuote ];
meta = {

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

@ -4,8 +4,8 @@
cabal.mkDerivation (self: {
pname = "language-c";
version = "0.4.6";
sha256 = "0pzd3g5q3sjfngs29biannza6l9am75kcjy5q0xcjv7xhz0z1m31";
version = "0.4.7";
sha256 = "1r0jlncv6d6ai8kblrdq9gz8abx57b24y6hfh30xx20zdgccjvaz";
buildDepends = [ filepath syb ];
buildTools = [ alex happy ];
meta = {

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

@ -7,8 +7,8 @@
cabal.mkDerivation (self: {
pname = "lens-aeson";
version = "1.0.0.1";
sha256 = "1gkplcvi570bd824q4zswi1ajb3730b7qng48g1zpjskvikn32qn";
version = "1.0.0.2";
sha256 = "1hq0zs1h4wapy1n9vyr4yiysnwbv26di8gl6msx3jkcahvlnkvlp";
buildDepends = [
aeson attoparsec lens scientific text unorderedContainers vector
];

4
pkgs/development/libraries/haskell/lens-family-th/default.nix
View File

@ -4,8 +4,8 @@
cabal.mkDerivation (self: {
pname = "lens-family-th";
version = "0.3.0.0";
sha256 = "0p9z278rpr9mqdpxa5izllplfrbxwzdziqjzjn4x1j2g9f3q5f8s";
version = "0.4.0.0";
sha256 = "02fc3kppb7y2c6j22wi2mzcxffj4k3dl3x09vjllqchfpfcpwbm5";
meta = {
homepage = "http://github.com/DanBurton/lens-family-th#readme";
description = "Generate lens-family style lenses";

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

@ -6,18 +6,18 @@
, QuickCheck, reflection, semigroupoids, semigroups, simpleReflect
, split, tagged, testFramework, testFrameworkHunit
, testFrameworkQuickcheck2, testFrameworkTh, text, transformers
, transformersCompat, unorderedContainers, vector, void, zlib
, transformersCompat, unorderedContainers, vector, void
}:
cabal.mkDerivation (self: {
pname = "lens";
version = "4.4.0.2";
sha256 = "03h1r6np1aas5nnw3nsqcvl9an9yriikcgapnfck82pmmdvg5l47";
version = "4.5";
sha256 = "009wdzybzmk7cs27fzigsmxknim6f9s7lp7iivgcsfn49pd8imwv";
buildDepends = [
bifunctors comonad contravariant distributive exceptions filepath
free hashable mtl parallel primitive profunctors reflection
semigroupoids semigroups split tagged text transformers
transformersCompat unorderedContainers vector void zlib
transformersCompat unorderedContainers vector void
];
testDepends = [
deepseq doctest filepath genericDeriving hlint HUnit mtl nats
@ -25,9 +25,6 @@ cabal.mkDerivation (self: {
testFrameworkHunit testFrameworkQuickcheck2 testFrameworkTh text
transformers unorderedContainers vector
];
patchPhase = ''
configureFlags="-f-test-hlint"
'';
meta = {
homepage = "http://github.com/ekmett/lens/";
description = "Lenses, Folds and Traversals";

1
pkgs/development/libraries/haskell/libsystemd-journal/default.nix
View File

@ -14,6 +14,7 @@ cabal.mkDerivation (self: {
unixBytestring unorderedContainers uuid vector
];
extraLibraries = [ systemd-journal ];
jailbreak = true;
meta = {
homepage = "http://github.com/ocharles/libsystemd-journal";
description = "Haskell bindings to libsystemd-journal";

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

@ -8,8 +8,8 @@
cabal.mkDerivation (self: {
pname = "linear";
version = "1.10.1.2";
sha256 = "05zbqdcdjq7anng2nymy05wsnk9qpk8mgivqcndbfjpk4l1r9k94";
version = "1.11.2";
sha256 = "11xinkqg4p6q287qiljq7p9lq0s58hznw2as29ppb5n3q5pab3ib";
buildDepends = [
adjunctions binary distributive hashable lens reflection
semigroupoids semigroups tagged transformers unorderedContainers

23
pkgs/development/libraries/haskell/llvm-general-pure/3.3.8.2.nix
View File

@ -1,23 +0,0 @@
# This file was auto-generated by cabal2nix. Please do NOT edit manually!
{ cabal, HUnit, mtl, parsec, QuickCheck, setenv, testFramework
, testFrameworkHunit, testFrameworkQuickcheck2, transformers
}:
cabal.mkDerivation (self: {
pname = "llvm-general-pure";
version = "3.3.8.2";
sha256 = "171mp9rydw6r2khcmvkcfjk934ckfahwyx1b4a15gmj8sr1s9hzp";
buildDepends = [ mtl parsec setenv transformers ];
testDepends = [
HUnit mtl QuickCheck testFramework testFrameworkHunit
testFrameworkQuickcheck2
];
doCheck = false;
meta = {
description = "Pure Haskell LLVM functionality (no FFI)";
license = self.stdenv.lib.licenses.bsd3;
platforms = self.ghc.meta.platforms;
hydraPlatforms = self.stdenv.lib.platforms.none;
};
})

0
pkgs/development/libraries/haskell/llvm-general-pure/3.4.4.0.nix → pkgs/development/libraries/haskell/llvm-general-pure/default.nix
View File

27
pkgs/development/libraries/haskell/llvm-general/3.3.8.2.nix
View File

@ -1,27 +0,0 @@
# This file was auto-generated by cabal2nix. Please do NOT edit manually!
{ cabal, HUnit, llvmConfig, llvmGeneralPure, mtl, parsec
, QuickCheck, setenv, testFramework, testFrameworkHunit
, testFrameworkQuickcheck2, transformers, utf8String
}:
cabal.mkDerivation (self: {
pname = "llvm-general";
version = "3.3.8.2";
sha256 = "11qnvpnx4i8mjdgn5y58rl70wf8pzmd555hrdaki1f4q0035cmm5";
buildDepends = [
llvmGeneralPure mtl parsec setenv transformers utf8String
];
testDepends = [
HUnit llvmGeneralPure mtl QuickCheck testFramework
testFrameworkHunit testFrameworkQuickcheck2
];
buildTools = [ llvmConfig ];
doCheck = false;
meta = {
description = "General purpose LLVM bindings";
license = self.stdenv.lib.licenses.bsd3;
platforms = self.ghc.meta.platforms;
hydraPlatforms = self.stdenv.lib.platforms.none;
};
})

0
pkgs/development/libraries/haskell/llvm-general/3.4.4.0.nix → pkgs/development/libraries/haskell/llvm-general/default.nix
View File

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

@ -6,8 +6,8 @@
cabal.mkDerivation (self: {
pname = "logging";
version = "1.4.1";
sha256 = "15mhpafv797f8aifjyjb5nc0fkd7if7bvx5hx9mzxycdzlk28gfp";
version = "2.1.0";
sha256 = "15ad4g7zkbklawd98m6x838fr5383vkvq92y75f56j1kj17g7rrh";
buildDepends = [
binary fastLogger liftedBase monadControl monadLogger pcreLight
text time transformers vectorSpace

1
pkgs/development/libraries/haskell/mainland-pretty/default.nix
View File

@ -7,6 +7,7 @@ cabal.mkDerivation (self: {
version = "0.2.7";
sha256 = "1g4s2xscj6dpkcghs5lws658ki0rhriivpdr5ilcycvr28k3l35q";
buildDepends = [ srcloc text ];
jailbreak = true;
meta = {
homepage = "http://www.eecs.harvard.edu/~mainland/";
description = "Pretty printing designed for printing source code";

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