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

Merge recent master into x-updates

Browse Source 
Hydra: ?compare=1134869

Conflicts (just meta):
	pkgs/applications/networking/instant-messengers/telepathy/gabble/default.nix
This commit is contained in:
Vladimír Čunát
2014-07-09 22:13:29 +02:00
parent 73ad32e1d9 1ecae5c2c1
commit 5979d428b4
121 changed files with 1231 additions and 461 deletions
Download Patch File Download Diff File Expand all files Collapse all files
doc/Makefile
+3 -3
View File
@@ -21,18 +21,18 @@ all: NEWS.html NEWS.txt manual.html manual.pdf
NEWS.html: release-notes.xml
$(XSLTPROC) --nonet --xinclude --output $@ $(NEWS_OPTS) \
$(docbookxsl)/html/docbook.xsl release-notes.xml
$(docbookxsl)/xhtml/docbook.xsl release-notes.xml
NEWS.txt: release-notes.xml
$(XSLTPROC) --nonet --xinclude quote-literals.xsl release-notes.xml | \
$(XSLTPROC) --nonet --output $@.tmp.html $(NEWS_OPTS) \
$(docbookxsl)/html/docbook.xsl -
$(docbookxsl)/xhtml/docbook.xsl -
LANG=en_US w3m -dump $@.tmp.html > $@
rm $@.tmp.html
manual.html: *.xml
$(XSLTPROC) --nonet --xinclude --output manual.html \
$(docbookxsl)/html/docbook.xsl manual.xml
$(docbookxsl)/xhtml/docbook.xsl manual.xml
manual.pdf: *.xml
$(dblatex) \
lib/maintainers.nix
+1
View File
@@ -48,6 +48,7 @@
iElectric = "Domen Kozar <domen@dev.si>";
iyzsong = "Song Wenwu <iyzsong@gmail.com>";
jcumming = "Jack Cummings <jack@mudshark.org>";
jgeerds = "Jascha Geerds <jg@ekby.de>";
joamaki = "Jussi Maki <joamaki@gmail.com>";
joelteon = "Joel Taylor <me@joelt.io>";
jwiegley = "John Wiegley <johnw@newartisans.com>";
nixos/modules/misc/ids.nix
+2
View File
@@ -135,6 +135,7 @@
influxdb = 125;
nsd = 126;
gitolite = 127;
znc = 128;
# When adding a uid, make sure it doesn't match an existing gid. And don't use uids above 399!
@@ -243,6 +244,7 @@
teamspeak = 124;
influxdb = 125;
nsd = 126;
znc = 128;
# When adding a gid, make sure it doesn't match an existing uid. And don't use gids above 399!
nixos/modules/module-list.nix
+1
View File
@@ -237,6 +237,7 @@
./services/networking/wicd.nix
./services/networking/wpa_supplicant.nix
./services/networking/xinetd.nix
./services/networking/znc.nix
./services/printing/cupsd.nix
./services/scheduling/atd.nix
./services/scheduling/cron.nix
nixos/modules/programs/virtualbox.nix
+1
View File
@@ -14,6 +14,7 @@ let virtualbox = config.boot.kernelPackages.virtualbox; in
services.udev.extraRules =
''
KERNEL=="vboxdrv", OWNER="root", GROUP="vboxusers", MODE="0660", TAG+="systemd"
KERNEL=="vboxdrvu", OWNER="root", GROUP="root", MODE="0666", TAG+="systemd"
KERNEL=="vboxnetctl", OWNER="root", GROUP="root", MODE="0600", TAG+="systemd"
SUBSYSTEM=="usb_device", ACTION=="add", RUN+="${virtualbox}/libexec/virtualbox/VBoxCreateUSBNode.sh $major $minor $attr{bDeviceClass}"
SUBSYSTEM=="usb", ACTION=="add", ENV{DEVTYPE}=="usb_device", RUN+="${virtualbox}/libexec/virtualbox/VBoxCreateUSBNode.sh $major $minor $attr{bDeviceClass}"
nixos/modules/services/networking/znc.nix
+294
View File
@@ -0,0 +1,294 @@
{ config, lib, pkgs, ...}:
with lib;
let
cfg = config.services.znc;
defaultUser = "znc"; # Default user to own process.
# Default user and pass:
# un=znc
# pw=nixospass
defaultUserName = "znc";
defaultPassBlock = "
<Pass password>
Method = sha256
Hash = e2ce303c7ea75c571d80d8540a8699b46535be6a085be3414947d638e48d9e93
Salt = l5Xryew4g*!oa(ECfX2o
</Pass>
";
confOptions = { ... }: {
options = {
modules = mkOption {
type = types.listOf types.string;
default = [ "partyline" "webadmin" "adminlog" "log" ];
example = [ "partyline" "webadmin" "adminlog" "log" ];
description = ''
A list of modules to include in the `znc.conf` file.
'';
};
userName = mkOption {
default = defaultUserName;
example = "johntron";
type = types.string;
description = ''
The user name to use when generating the `znc.conf` file.
This is the user name used by the user logging into the ZNC web admin.
'';
};
nick = mkOption {
default = "znc-user";
example = "john";
type = types.string;
description = ''
The IRC nick to use when generating the `znc.conf` file.
'';
};
passBlock = mkOption {
default = defaultPassBlock;
example = "Must be the block generated by the `znc --makepass` command.";
type = types.string;
description = ''
The pass block to use when generating the `znc.conf` file.
This is the password used by the user logging into the ZNC web admin.
This is the block generated by the `znc --makepass` command.
!!! If not specified, please change this after starting the service. !!!
'';
};
port = mkOption {
default = "5000";
example = "5000";
type = types.string;
description = ''
Specifies the port on which to listen.
'';
};
useSSL = mkOption {
default = true;
example = true;
type = types.bool;
description = ''
Indicates whether the ZNC server should use SSL when listening on the specified port.
'';
};
};
};
# Keep znc.conf in nix store, then symlink or copy into `dataDir`, depending on `mutable`.
mkZncConf = confOpts: ''
// Also check http://en.znc.in/wiki/Configuration
AnonIPLimit = 10
ConnectDelay = 5
# Add `LoadModule = x` for each module...
${concatMapStrings (n: "LoadModule = ${n}\n") confOpts.modules}
MaxBufferSize = 500
ProtectWebSessions = true
SSLCertFile = ${cfg.dataDir}/znc.pem
ServerThrottle = 30
Skin = dark-clouds
StatusPrefix = *
Version = 1.2
<Listener listener0>
AllowIRC = true
AllowWeb = true
IPv4 = true
IPv6 = false
Port = ${if confOpts.useSSL then "+" else ""}${confOpts.port}
SSL = ${if confOpts.useSSL then "true" else "false"}
</Listener>
<User ${confOpts.userName}>
Admin = true
Allow = *
AltNick = ${confOpts.nick}_
AppendTimestamp = false
AutoClearChanBuffer = false
Buffer = 150
ChanModes = +stn
DenyLoadMod = false
DenySetBindHost = false
Ident = ident
JoinTries = 10
MaxJoins = 0
MaxNetworks = 1
MultiClients = true
Nick = ${confOpts.nick}
PrependTimestamp = true
QuitMsg = Quit
RealName = ${confOpts.nick}
TimestampFormat = [%H:%M:%S]
${confOpts.passBlock}
</User>
'';
zncConfFile = pkgs.writeTextFile {
name = "znc.conf";
text = if cfg.zncConf != ""
then cfg.zncConf
else mkZncConf cfg.confOptions;
};
in
{
###### Interface
options = {
services.znc = {
enable = mkOption {
default = false;
example = true;
type = types.bool;
description = ''
Enable a ZNC service for a user.
'';
};
user = mkOption {
default = "znc";
example = "john";
type = types.string;
description = ''
The name of an existing user account to use to own the ZNC server process.
If not specified, a default user will be created to own the process.
'';
};
dataDir = mkOption {
default = "/home/${cfg.user}/.znc";
example = "/home/john/.znc";
type = types.string;
description = ''
The data directory. Used for configuration files and modules.
'';
};
zncConf = mkOption {
default = "";
example = "See: http://wiki.znc.in/Configuration";
type = types.string;
description = ''
The contents of the `znc.conf` file to use when creating it.
If specified, `confOptions` will be ignored, and this value, as-is, will be used.
If left empty, a conf file with default values will be used.
Recommended to generate with `znc --makeconf` command.
'';
};
confOptions = mkOption {
default = {};
example = {
modules = [ "log" ];
userName = "john";
nick = "johntron";
};
type = types.optionSet;
description = ''
Values to use when creating a `znc.conf` file.
'';
options = confOptions;
};
mutable = mkOption {
default = false;
example = true;
type = types.bool;
description = ''
Indicates whether to allow the contents of the `dataDir` directory to be changed
by the user at run-time.
If true, modifications to the ZNC configuration after its initial creation are not
overwritten by a NixOS system rebuild.
If false, the ZNC configuration is rebuilt by every system rebuild.
If the user wants to manage the ZNC service using the web admin interface, this value
should be set to true.
'';
};
extraFlags = mkOption {
default = "";
example = "--debug";
type = types.string;
description = ''
Extra flags to use when executing znc command.
'';
};
};
};
###### Implementation
config = mkIf cfg.enable {
systemd.services."znc-${cfg.user}" = {
description = "ZNC Server of ${cfg.user}.";
wantedBy = [ "multi-user.target" ];
after = [ "network.service" ];
path = [ pkgs.znc ];
serviceConfig = {
User = "${cfg.user}";
Restart = "always";
ExecReload = "${pkgs.coreutils}/bin/kill -HUP $MAINPID";
ExecStop = "${pkgs.coreutils}/bin/kill -INT $MAINPID";
};
preStart = ''
${pkgs.coreutils}/bin/mkdir -p ${cfg.dataDir}
${pkgs.coreutils}/bin/chown ${cfg.user} ${cfg.dataDir} -R
${pkgs.coreutils}/bin/mkdir -p ${cfg.dataDir}/configs
# If mutable, regenerate conf file every time.
${optionalString (!cfg.mutable) ''
${pkgs.coreutils}/echo "znc-${cfg.user} is set to be system-managed. Now deleting old znc.conf file to be regenerated."
${pkgs.coreutils}/rm -f ${cfg.dataDir}/configs/znc.conf
''}
# Ensure essential files exist.
if [[ ! -f ${cfg.dataDir}/configs/znc.conf ]]; then
${pkgs.coreutils}/bin/echo "No znc.conf file found in ${cfg.dataDir}. Creating one now."
${if (!cfg.mutable)
then "${pkgs.coreutils}/bin/ln --force -s ${zncConfFile} ${cfg.dataDir}/configs/znc.conf"
else ''
${pkgs.coreutils}/bin/cp --no-clobber ${zncConfFile} ${cfg.dataDir}/configs/znc.conf
${pkgs.coreutils}/bin/chmod u+rw ${cfg.dataDir}/configs/znc.conf
${pkgs.coreutils}/bin/chown ${cfg.user} ${cfg.dataDir}/configs/znc.conf
''}
fi
if [[ ! -f ${cfg.dataDir}/znc.pem ]]; then
${pkgs.coreutils}/bin/echo "No znc.pem file found in ${cfg.dataDir}. Creating one now."
${pkgs.znc}/bin/znc --makepem
fi
'';
script = "${pkgs.znc}/bin/znc --foreground --datadir ${cfg.dataDir} ${cfg.extraFlags}";
};
users.extraUsers = optional (cfg.user == defaultUser)
{ name = defaultUser;
description = "ZNC server daemon owner";
group = defaultUser;
uid = config.ids.uids.znc;
createHome = true;
createUser = true;
};
users.extraGroups = optional (cfg.user == defaultUser)
{ name = defaultUser;
gid = config.ids.gids.znc;
members = [ defaultUser ];
};
};
}
nixos/modules/services/web-servers/apache-httpd/mediawiki.nix
+7 -6
View File
@@ -72,11 +72,11 @@ let
# Unpack Mediawiki and put the config file in its root directory.
mediawikiRoot = pkgs.stdenv.mkDerivation rec {
name= "mediawiki-1.20.8";
name= "mediawiki-1.23.1";
src = pkgs.fetchurl {
url = "http://download.wikimedia.org/mediawiki/1.20/${name}.tar.gz";
sha256 = "0yfmh5vnfbgpvicfqh7nh4hwdk4qbc6gfniv02vchkg5al0nn7ag";
url = "http://download.wikimedia.org/mediawiki/1.23/${name}.tar.gz";
sha256 = "07z5j8d988cdg4ml4n0vs9fwmj0p594ibbqdid16faxwqm52dkhl";
};
skins = config.skins;
@@ -93,9 +93,10 @@ let
ensureDir $out
cp -r * $out
cp ${mediawikiConfig} $out/LocalSettings.php
sed -i 's|/bin/bash|${pkgs.stdenv.shell}|' \
$out/maintenance/fuzz-tester.php \
$out/bin/ulimit.sh \
sed -i \
-e 's|/bin/bash|${pkgs.bash}/bin/bash|g' \
-e 's|/usr/bin/timeout|${pkgs.coreutils}/bin/timeout|g' \
$out/includes/limit.sh \
$out/includes/GlobalFunctions.php
'';
};
pkgs/applications/misc/arbtt/default.nix
+2 -2
View File
@@ -6,8 +6,8 @@
cabal.mkDerivation (self: {
pname = "arbtt";
version = "0.8";
sha256 = "0anjcg8ikd3jxc5rb3k215wj7ar4kg2plv8sdr8hv64758xkc5q9";
version = "0.8.1";
sha256 = "1qzmqjm8pfj59h0hrm28pp6qhzz2am5xq81mirnnchsgg52wrfn0";
isLibrary = false;
isExecutable = true;
buildDepends = [
pkgs/applications/misc/xmobar/default.nix
+1 -1
View File
@@ -18,7 +18,7 @@ cabal.mkDerivation (self: {
extraLibraries = [ libXrandr wirelesstools ];
configureFlags = "-fall_extensions";
meta = {
homepage = "http://projects.haskell.org/xmobar/";
homepage = "http://xmobar.org";
description = "A Minimalistic Text Based Status Bar";
license = self.stdenv.lib.licenses.bsd3;
platforms = self.ghc.meta.platforms;
pkgs/applications/networking/browsers/dwb/default.nix
+3 -3
View File
@@ -2,12 +2,12 @@
m4, glib_networking, gsettings_desktop_schemas, dconf }:
stdenv.mkDerivation {
name = "dwb-2014-06-17";
name = "dwb-2014-07-03";
src = fetchgit {
url = "https://bitbucket.org/portix/dwb.git";
rev = "9f4bdb9a1f8d5e45071019da4626231dfebd4d8e";
sha256 = "1nj34w2hhw47jsmswsc1y6a09my8zdd01qxwai8dxdvisld3marm";
rev = "6224470489eb5ba92987e01396269f8b7cd78ada";
sha256 = "04p9frsnh1qz067cw36anvr41an789fba839svdjrdva0f2751g8";
};
buildInputs = [ pkgconfig makeWrapper gsettings_desktop_schemas libsoup webkit gtk3 gnutls json_c m4 ];
pkgs/applications/networking/instant-messengers/telepathy/gabble/default.nix
+3 -4
View File
@@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
sha256 = "00ag32ccbj0hmy41rb0fg9gp40m7zbq45r4yijnyslk2mpkvg7c9";
};
nativeBuildInputs = [pkgconfig libxslt];
nativeBuildInputs = [ pkgconfig libxslt ];
buildInputs = [ libxml2 dbus_glib sqlite libsoup libnice telepathy_glib gnutls ]
++ stdenv.lib.optional doCheck dbus_daemon;
@@ -19,9 +19,8 @@ stdenv.mkDerivation rec {
doCheck = true;
meta = with stdenv.lib; {
description = "A Jabber/XMPP connection manager for the Telepathy framework";
homepage = http://telepathy.freedesktop.org;
license = licenses.lgpl21Plus;
platforms = platforms.unix;
description = "Jabber/XMPP connection manager for the Telepathy framework";
platforms = stdenv.lib.platforms.gnu;
};
}
pkgs/applications/networking/mailreaders/mutt/default.nix
+40 -34
View File
@@ -1,57 +1,63 @@
{ stdenv, fetchhg, autoconf, automake, ncurses, which
, perl, gdbm, openssl, cyrus_sasl, gpgme, libidn }:
{ stdenv, fetchurl, ncurses, which, perl
, sslSupport ? true
, imapSupport ? true
, headerCache ? true
, saslSupport ? true
, gpgmeSupport ? true
, gdbm ? null
, openssl ? null
, cyrus_sasl ? null
, gpgme ? null
}:
assert headerCache -> gdbm != null;
assert sslSupport -> openssl != null;
assert saslSupport -> cyrus_sasl != null;
let
version = "1.5.23-rel";
version = "1.5.23";
in
stdenv.mkDerivation rec {
name = "mutt-${version}";
src = fetchhg {
url = "http://dev.mutt.org/hg/mutt/";
rev = "mutt-${version}";
sha256 = "1m0aif066lsc0936ha9s1kfx63wsl1l1wiib7ax6xgzijawd80pp";
src = fetchurl {
url = "mirror://sourceforge/mutt/${name}.tar.gz";
sha256 = "0dzx4qk50pjfsb6cs5jahng96a52k12f7pm0sc78iqdrawg71w1s";
};
enableParallelBuilding = true;
buildInputs = [
autoconf automake ncurses which perl
gdbm openssl cyrus_sasl gpgme libidn
ncurses which perl
(if headerCache then gdbm else null)
(if sslSupport then openssl else null)
(if saslSupport then cyrus_sasl else null)
(if gpgmeSupport then gpgme else null)
];
# This patch is necessary, because during the configure phase mutt
# searches for some paths to store mail in that do not exist on
# NixOS, like /var/mail, /usr/mail and similiar. This patch adds
# /tmp to the list.
patches = [
./mailpath.patch
];
preConfigure = ''./prepare'';
configureFlags = [
"--prefix=$out"
"--with-mailpath=" "--enable-smtp"
# This allows calls with "-d N", that output debug info into ~/.muttdebug*
"--enable-debug"
"--enable-gpgme"
"--enable-hcache"
"--enable-imap"
"--enable-pop"
"--enable-smtp"
"--with-idn"
"--with-regex"
"--with-ssl"
"--with-sasl"
"--enable-pop" "--enable-imap"
# The next allows building mutt without having anything setgid
# set by the installer, and removing the need for the group 'mail'
# I set the value 'mailbox' because it is a default in the configure script
"--with-homespool=mailbox"
(if headerCache then "--enable-hcache" else "--disable-hcache")
(if sslSupport then "--with-ssl" else "--without-ssl")
(if imapSupport then "--enable-imap" else "--disable-imap")
(if saslSupport then "--with-sasl" else "--without-sasl")
(if gpgmeSupport then "--enable-gpgme" else "--disable-gpgme")
];
meta = with stdenv.lib; {
description = "A small but very powerful text-based mail client";
homepage = http://www.mutt.org;
license = "GPLv2+";
platforms = platforms.unix;
maintainers = with maintainers; [ the-kenny _1126 ];
maintainers = with maintainers; [ the-kenny ];
};
}
pkgs/applications/networking/p2p/transmission/default.nix
+2 -2
View File
@@ -4,7 +4,7 @@
}:
let
version = "2.83";
version = "2.84";
in
with { inherit (stdenv.lib) optional optionals optionalString; };
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
src = fetchurl {
url = "http://download.transmissionbt.com/files/transmission-${version}.tar.xz";
sha256 = "0cqlgl6jmjw1caybz6nzh3l8z0jak1dxba01isv72zvy2r8b1qdh";
sha256 = "1sxr1magqb5s26yvr5yhs1f7bmir8gl09niafg64lhgfnhv1kz59";
};
buildInputs = [ pkgconfig intltool file openssl curl libevent inotifyTools ]
pkgs/applications/science/math/sloane/default.nix
+5 -5
View File
@@ -1,16 +1,16 @@
{ cabal, ansiTerminal, filepath, HTTP, network, optparseApplicative
, stringsearch, terminalSize, time, zlib
, terminalSize, text, time, zlib
}:
cabal.mkDerivation (self: {
pname = "sloane";
version = "1.8";
sha256 = "0c30slsswfqwzi39hk6jraxz1y1a2yn8g8nyjvlnggwajx2rlm6p";
version = "1.8.2";
sha256 = "0kdznrvyrax1gihqxxw36jfbmjri808ii827fa71v2ijlm416hk1";
isLibrary = false;
isExecutable = true;
buildDepends = [
ansiTerminal filepath HTTP network optparseApplicative stringsearch
terminalSize time zlib
ansiTerminal filepath HTTP network optparseApplicative terminalSize
text time zlib
];
postInstall = ''
mkdir -p $out/share/man/man1
pkgs/applications/science/misc/boinc/default.nix
+3 -3
View File
@@ -3,12 +3,12 @@ mesa, libXmu, libXi, freeglut, libjpeg, libtool, wxGTK, xcbutil,
sqlite, gtk, patchelf, libXScrnSaver, libnotify, libX11, libxcb }:
stdenv.mkDerivation rec {
name = "boinc-7.0.44";
name = "boinc-7.2.42";
src = fetchgit {
url = "git://boinc.berkeley.edu/boinc-v2.git";
rev = "7c449b1fb8a681ceb27d6895751b62a2b3adf0f2";
sha256 = "0hdramyl9nip3gadp7xiaz8ngyld15i93d8ai1nsd04bmrvdfqia";
rev = "dd0d630882547c123ca0f8fda7a62e058d60f6a9";
sha256 = "1zifpi3mjgaj68fba6kammp3x7z8n2x164zz6fj91xfiapnan56j";
};
buildInputs = [ libtool automake autoconf m4 pkgconfig curl mesa libXmu libXi
pkgs/build-support/build-pecl.nix
+18 -4
View File
@@ -1,9 +1,23 @@
{ stdenv, php, autoreconfHook }:
{ stdenv, php, autoreconfHook, fetchurl }:
args: stdenv.mkDerivation (args // {
buildInputs = [ php autoreconfHook ] ++ args.buildInputs or [];
{ name
, buildInputs ? []
, makeFlags ? []
, src ? fetchurl {
url = "http://pecl.php.net/get/${name}.tgz";
inherit (args) sha256;
}
, ...
}@args:
makeFlags = [ "EXTENSION_DIR=$(out)/lib/php/extensions" ] ++ args.makeFlags or [];
stdenv.mkDerivation (args // {
name = "php-${name}";
inherit src;
buildInputs = [ php autoreconfHook ] ++ buildInputs;
makeFlags = [ "EXTENSION_DIR=$(out)/lib/php/extensions" ] ++ makeFlags;
autoreconfPhase = "phpize";
})
pkgs/desktops/gnome-3/3.12/apps/gnome-music/default.nix
+2 -2
View File
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
buildInputs = [ pkgconfig gtk3 glib intltool itstool gnome3.libmediaart
gdk_pixbuf gnome3.gnome_icon_theme librsvg python3
gnome3.grilo libxml2 python3Packages.pygobject3 libnotify
python3Packages.pycairo python3Packages.dbus
python3Packages.pycairo python3Packages.dbus gnome3.totem-pl-parser
gst_all_1.gstreamer gst_all_1.gst-plugins-base
gst_all_1.gst-plugins-good gst_all_1.gst-plugins-bad
hicolor_icon_theme gnome3.gnome_icon_theme_symbolic
@@ -28,7 +28,7 @@ stdenv.mkDerivation rec {
let
libPath = stdenv.lib.makeLibraryPath
[ glib gtk3 libnotify tracker gnome3.grilo cairo
gst_all_1.gstreamer gst_all_1.gst-plugins-base
gst_all_1.gstreamer gst_all_1.gst-plugins-base gnome3.totem-pl-parser
gst_all_1.gst-plugins-good gst_all_1.gst-plugins-bad ];
in
''
pkgs/desktops/gnome-3/3.12/core/empathy/default.nix
+3 -4
View File
@@ -19,9 +19,7 @@ stdenv.mkDerivation rec {
};
propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard
gnome3.gnome_icon_theme hicolor_icon_theme
gnome_online_accounts shared_mime_info
gnome3.gnome_icon_theme_symbolic ];
gnome_online_accounts shared_mime_info ];
propagatedBuildInputs = [ folks telepathy_logger evolution_data_server
telepathy_mission_control ];
buildInputs = [ pkgconfig gtk3 glib webkitgtk intltool itstool
@@ -31,6 +29,7 @@ stdenv.mkDerivation rec {
gcr libsecret pulseaudio gnome3.yelp_xsl gdk_pixbuf
libnotify clutter libsoup gnutls libgee p11_kit
libcanberra_gtk3 telepathy_farstream farstream
gnome3.gnome_icon_theme hicolor_icon_theme gnome3.gnome_icon_theme_symbolic
gnome3.gsettings_desktop_schemas file libtool librsvg ];
NIX_CFLAGS_COMPILE = [ "-I${dbus_glib}/include/dbus-1.0"
@@ -41,7 +40,7 @@ stdenv.mkDerivation rec {
for f in $out/bin/* $out/libexec/*; do
wrapProgram $f \
--set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \
--prefix XDG_DATA_DIRS : "$XDG_ICON_DIRS:${gnome3.gnome_themes_standard}/:${gnome3.gnome_themes_standard}/share:${hicolor_icon_theme}/share:$out/share:$GSETTINGS_SCHEMAS_PATH"
--prefix XDG_DATA_DIRS : "$XDG_ICON_DIRS:${gnome3.gnome_themes_standard}/share:$out/share:$GSETTINGS_SCHEMAS_PATH"
done
rm $out/share/icons/hicolor/icon-theme.cache
'';
pkgs/desktops/gnome-3/3.12/core/evolution-data-server/default.nix
+2 -2
View File
@@ -21,8 +21,8 @@ stdenv.mkDerivation rec {
++ stdenv.lib.optional valaSupport "--enable-vala-bindings";
preFixup = ''
for f in "$out/libexec/evolution-addressbook-factory" "$out/libexec/evolution-calendar-factory"; do
wrapProgram $f --prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH"
for f in "$out/libexec/"*; do
wrapProgram "$f" --prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH"
done
'';
pkgs/desktops/gnome-3/3.12/core/gnome-shell/default.nix
+8
View File
@@ -39,8 +39,16 @@ stdenv.mkDerivation rec {
wrapProgram "$out/libexec/gnome-shell-calendar-server" \
--prefix XDG_DATA_DIRS : "${evolution_data_server}/share:$out/share:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH"
echo "${unzip}/bin" > $out/${passthru.mozillaPlugin}/extra-bin-path
'';
enableParallelBuilding = true;
passthru = {
mozillaPlugin = "/lib/mozilla/plugins";
};
meta = with stdenv.lib; {
platforms = platforms.linux;
};
pkgs/development/compilers/rust/default.nix
+15 -17
View File
@@ -16,28 +16,25 @@
with if stdenv.system == "i686-linux" then {
platform = "linux-i386";
snapshot = "3bef5684fd0582fbd4ddebd4514182d4f72924f7";
snapshot_sha = "1c72d65pcgm3z4sly7al09mjvpp8asxbbv7iyzzv5k8f66ny2agy";
snapshot = "84339ea0f796ae468ef86797ef4587274bec19ea";
target = "i686-unknown-linux-gnu";
} else if stdenv.system == "x86_64-linux" then {
platform = "linux-x86_64";
snapshot = "a7b2af1076d48e4a687a71a21478293e834349bd";
snapshot_sha = "1c72d65pcgm3z4sly7al09mjvpp8asxbbv7iyzzv5k8f66ny2agy";
snapshot = "bd8a6bc1f28845b7f4b768f6bfa06e7fbdcfcaae";
target = "x86_64-unknown-linux-gnu";
} else if stdenv.system == "x86_64-darwin" then {
platform = "macos-x86_64";
snapshot = "22b884a3876cb3e40ad942ad68a496b5f239fca5";
snapshot_sha = "0qabkvyryiwlqhzy1kscff27rx788bv7lh7d8m1hnsv38wqhwqqb";
snapshot = "4a8c2e1b7634d73406bac32a1a97893ec3ed818d";
} else {};
let snapshotDate = "2014-03-28";
snapshotRev = "b8601a3";
let snapshotDate = "2014-06-21";
snapshotRev = "db9af1d";
snapshotName = "rust-stage0-${snapshotDate}-${snapshotRev}-${platform}-${snapshot}.tar.bz2"; in
stdenv.mkDerivation {
name = "rust-0.10";
name = "rust-0.11.0";
src = fetchurl {
url = http://static.rust-lang.org/dist/rust-0.10.tar.gz;
sha256 = "c72cfbbf03016804a81d7b68e8258ffaf018f8f5a25550ad64571ce6c2642cf9";
url = http://static.rust-lang.org/dist/rust-0.11.0.tar.gz;
sha256 = "1fhi8iiyyj5j48fpnp93sfv781z1dm0xy94h534vh4mz91jf7cyi";
};
# We need rust to build rust. If we don't provide it, configure will try to download it.
@@ -45,15 +42,16 @@ stdenv.mkDerivation {
name = "rust-stage0";
src = fetchurl {
url = "http://static.rust-lang.org/stage0-snapshots/${snapshotName}";
sha256 = snapshot_sha;
sha1 = snapshot;
};
dontStrip = true;
installPhase = ''
mkdir -p "$out"
cp -r bin "$out/bin"
'' + (if stdenv.isLinux then ''
patchelf --interpreter ${stdenv.glibc}/lib/${stdenv.gcc.dynamicLinker} \
--set-rpath ${stdenv.gcc.gcc}/lib/:${stdenv.gcc.gcc}/lib64/ \
$out/bin/rustc
patchelf --interpreter "${stdenv.glibc}/lib/${stdenv.gcc.dynamicLinker}" \
--set-rpath "${stdenv.gcc.gcc}/lib/:${stdenv.gcc.gcc}/lib64/" \
"$out/bin/rustc"
'' else "");
};
@@ -63,8 +61,8 @@ stdenv.mkDerivation {
patches = [ ./hardcode_paths.patch ./local_stage0.patch ];
postPatch = ''
substituteInPlace src/librustc/back/link.rs \
--subst-var-by "gccPath" ${stdenv.gcc}/bin/cc \
--subst-var-by "binutilsPath" ${stdenv.gcc.binutils}/bin/ar
--subst-var-by "ccPath" "${stdenv.gcc}/bin/cc" \
--subst-var-by "arPath" "${stdenv.gcc.binutils}/bin/ar"
'';
buildInputs = [ which file perl curl python27 makeWrapper ];
pkgs/development/compilers/rust/hardcode_paths.patch
+24 -33
View File
@@ -1,41 +1,32 @@
diff --git a/src/librustc/back/link.rs b/src/librustc/back/link.rs
index f198a41..3a47e51 100644
index 7a3e912..ced75fa 100644
--- a/src/librustc/back/link.rs
+++ b/src/librustc/back/link.rs
@@ -730,7 +730,7 @@ pub fn get_cc_prog(sess: &Session) -> ~str {
_ => {},
@@ -766,24 +766,15 @@ pub fn output_lib_filename(id: &CrateId) -> String {
pub fn get_cc_prog(sess: &Session) -> String {
match sess.opts.cg.linker {
- Some(ref linker) => return linker.to_string(),
- None => {}
+ Some(ref linker) => linker.to_string(),
+ None => "@ccPath@".to_string()
}
- get_system_tool(sess, "cc")
+ ~"@gccPath@"
}
pub fn get_ar_prog(sess: &Session) -> ~str {
@@ -739,26 +739,7 @@ pub fn get_ar_prog(sess: &Session) -> ~str {
None => {}
}
- get_system_tool(sess, "ar")
-}
-
-fn get_system_tool(sess: &Session, tool: &str) -> ~str {
- // In the future, FreeBSD will use clang as default compiler.
- // It would be flexible to use cc (system's default C compiler)
- // instead of hard-coded gcc.
- // For win32, there is no cc command, so we add a condition to make it use gcc.
- match sess.targ_cfg.os {
- abi::OsAndroid => match sess.opts.cg.android_cross_path {
- Some(ref path) => {
- let tool_str = match tool {
- "cc" => "gcc",
- _ => tool
- };
- format!("{}/bin/arm-linux-androideabi-{}", *path, tool_str)
- }
- None => {
- sess.fatal(format!("need Android NDK path for the '{}' tool \
- (-C android-cross-path)", tool))
- }
- },
- _ => tool.to_owned(),
- }
+ ~"@binutilsPath@"
- abi::OsWin32 => "gcc",
- _ => "cc",
- }.to_string()
}
pub fn get_ar_prog(sess: &Session) -> String {
match sess.opts.cg.ar {
Some(ref ar) => (*ar).clone(),
- None => "ar".to_string()
+ None => "@arPath@".to_string()
}
}
fn remove(sess: &Session, path: &Path) {
pkgs/development/libraries/accountsservice/default.nix
+3 -3
View File
@@ -2,11 +2,11 @@
, libtool, gobjectIntrospection, polkit, systemd, coreutils }:
stdenv.mkDerivation rec {
name = "accountsservice-0.6.35";
name = "accountsservice-0.6.37";
src = fetchurl {
url = http://www.freedesktop.org/software/accountsservice/accountsservice-0.6.35.tar.xz;
sha256 = "0f1hzl6hw56xvwgmd4yvmdyj15xj1fafw45pzv3qarww7h0wg8b5";
url = http://www.freedesktop.org/software/accountsservice/accountsservice-0.6.37.tar.xz;
sha256 = "1hd58lrl698ij7w1xk3fpj8zp7h6m2hpzvfmbw9sfx4xvhv13cmh";
};
buildInputs = [ pkgconfig glib intltool libtool makeWrapper
pkgs/development/libraries/allegro/default.nix
+1
View File
@@ -41,6 +41,7 @@ rec {
];
meta = {
branch = "4";
description = "A game programming library";
license = "free-noncopyleft"; # giftware
maintainers = with a.lib.maintainers;
pkgs/development/libraries/asio/default.nix
+2 -2
View File
@@ -1,11 +1,11 @@
{stdenv, fetchurl, boost, openssl}:
stdenv.mkDerivation rec {
name = "asio-1.10.1";
name = "asio-1.10.2";
src = fetchurl {
url = "mirror://sourceforge/asio/${name}.tar.bz2";
sha256 = "16dxzkra0wmhm2vp2p9lb1h6qsdjk82sxfgj6zlz792n7jnms2l2";
sha256 = "1lqxm3gc8rzzjq0m843l59ggbw32bih7smm5spry1j5khfc86p41";
};
propagatedBuildInputs = [ boost ];
pkgs/development/libraries/botan/default.upstream
+1 -1
View File
@@ -1,8 +1,8 @@
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(){
ensure_hash
set_var_value hash $CURRENT_HASH
set_var_value baseVersion ${CURRENT_VERSION%.*}
set_var_value revision ${CURRENT_VERSION##*.}
pkgs/development/libraries/botan/unstable.nix
+58
View File
@@ -0,0 +1,58 @@
x@{builderDefsPackage
, python
, bzip2, zlib, gmp, openssl
, boost
, ...}:
builderDefsPackage
(a :
let
helperArgNames = ["stdenv" "fetchurl" "builderDefsPackage"] ++
[];
buildInputs = map (n: builtins.getAttr n x)
(builtins.attrNames (builtins.removeAttrs x helperArgNames));
sourceInfo = rec {
baseName="botan";
tarBaseName="Botan";
baseVersion = "1.11";
revision = "9";
version="${baseVersion}.${revision}";
name="${baseName}-${version}";
url="http://files.randombit.net/${baseName}/v${baseVersion}/${tarBaseName}-${version}.tbz";
hash = "0jgx5va042gmr6nc91p5dd59wnfxlz19mz2nnyv74pvwwmizs09m";
};
in
rec {
src = a.fetchurl {
url = sourceInfo.url;
sha256 = sourceInfo.hash;
};
inherit (sourceInfo) name version;
inherit buildInputs;
/* doConfigure should be removed if not needed */
phaseNames = ["doConfigure" "doMakeInstall" "fixPkgConfig"];
configureCommand = "python configure.py --with-gnump --with-bzip2 --with-zlib --with-openssl";
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;
[
raskin
];
platforms = with a.lib.platforms;
unix;
inherit version;
};
passthru = {
updateInfo = {
downloadPage = "http://files.randombit.net/botan/";
};
};
}) x
pkgs/development/libraries/botan/unstable.upstream
+9
View File
@@ -0,0 +1,9 @@
url http://botan.randombit.net/download.html
version_link 'Botan-[0-9]+[.][0-9]+([.][0-9]+)?[.](tbz|tbz2|tar[.]bz2)$'
ensure_version
do_overwrite(){
ensure_hash
set_var_value hash $CURRENT_HASH
set_var_value baseVersion ${CURRENT_VERSION%.*}
set_var_value revision ${CURRENT_VERSION##*.}
}
pkgs/development/libraries/haskell/aes/default.nix → pkgs/development/libraries/haskell/AES/default.nix
View File
pkgs/development/libraries/haskell/Chart-cairo/default.nix
+2 -2
View File
@@ -4,8 +4,8 @@
cabal.mkDerivation (self: {
pname = "Chart-cairo";
version = "1.2.2";
sha256 = "1bbi5bvrh8wmgzv5am5ndgdr68gd68ipparkkk9ld4majwf4vm6w";
version = "1.2.3";
sha256 = "1lbl1qvgm4yxslahlms6kzfrhh8s2fcdiwmvk1bs319k1fylia1b";
buildDepends = [
cairo Chart colour dataDefaultClass lens mtl operational time
];
pkgs/development/libraries/haskell/Chart-diagrams/default.nix
+2 -2
View File
@@ -5,8 +5,8 @@
cabal.mkDerivation (self: {
pname = "Chart-diagrams";
version = "1.2.2";
sha256 = "144dy9vp3x04s03jrkyfqczpwayb8k7dq702w9wm3d8q4ysva62q";
version = "1.2.3";
sha256 = "08ps30vn9ljiyhgakwdbixn4csy504bsw3h5z9w1dxhn27wij772";
buildDepends = [
blazeSvg Chart colour dataDefaultClass diagramsCore diagramsLib
diagramsPostscript diagramsSvg lens mtl operational SVGFonts text
pkgs/development/libraries/haskell/Chart-gtk/default.nix
+2 -2
View File
@@ -2,8 +2,8 @@
cabal.mkDerivation (self: {
pname = "Chart-gtk";
version = "1.2.2";
sha256 = "1mg6nln0jwp6hals9vhhsfqiwix424fv1v1p4h99s0xwy5cna1z9";
version = "1.2.3";
sha256 = "0vl9nh48pa7sdrqh5a6smmfallf4mwzrvspc2v94cpnrcnickiyq";
buildDepends = [ cairo Chart ChartCairo colour gtk mtl time ];
jailbreak = true;
meta = {
pkgs/development/libraries/haskell/Chart/default.nix
+2 -2
View File
@@ -2,8 +2,8 @@
cabal.mkDerivation (self: {
pname = "Chart";
version = "1.2.2";
sha256 = "0yd3xca500lbzvlvhdsbrkiy53laikq6hc290rc061agvd535a7p";
version = "1.2.3";
sha256 = "067bahxig5xyd6zasi74k86qb7bxvbs3shjn9fbslhyckxg50q1j";
buildDepends = [
colour dataDefaultClass lens mtl operational time
];
pkgs/development/libraries/haskell/GLUtil/default.nix
+6 -4
View File
@@ -1,11 +1,13 @@
{ cabal, cpphs, JuicyPixels, linear, OpenGL, OpenGLRaw, vector }:
{ cabal, cpphs, JuicyPixels, linear, OpenGL, OpenGLRaw
, transformers, vector
}:
cabal.mkDerivation (self: {
pname = "GLUtil";
version = "0.7.4";
sha256 = "0l1w0k3q5g22y90w5frljqh1v4jb7gjzb3scg79zp42pc9v3h4l5";
version = "0.7.5";
sha256 = "1rbnq1nrs2b06ph60lh0yvygk82vvnm8c4d0anhjrqw9i58nd3iz";
buildDepends = [
cpphs JuicyPixels linear OpenGL OpenGLRaw vector
cpphs JuicyPixels linear OpenGL OpenGLRaw transformers vector
];
buildTools = [ cpphs ];
meta = {
pkgs/development/libraries/haskell/HFuse/default.nix
+3 -4
View File
@@ -2,12 +2,11 @@
cabal.mkDerivation (self: {
pname = "HFuse";
version = "0.2.4.1";
sha256 = "12k04dvh92kk2i68bcb70xnk378qxmh46f241k06di5rkcgwyg1k";
version = "0.2.4.2";
sha256 = "043f5x807h1dajd0bvmhln9pjkviszx1279m298w711mrszapqrq";
extraLibraries = [ fuse ];
preConfigure = ''
sed -i -e "s@ Extra-Lib-Dirs: /usr/local/lib@ Extra-Lib-Dirs: ${fuse}/lib@" HFuse.cabal
sed -i -e "s@ Include-Dirs: /usr/include, /usr/local/include, .@ Include-Dirs: ${fuse}/include@" HFuse.cabal
sed -i -e "s/LANGUAGE FlexibleContexts/LANGUAGE FlexibleContexts, RankNTypes/" System/Fuse.hsc
sed -i -e "s/E(Exception/E(catch, Exception, IOException/" System/Fuse.hsc
sed -i -e "s/IO(catch,/IO(/" System/Fuse.hsc
@@ -15,7 +14,7 @@ cabal.mkDerivation (self: {
sed -i -e "s/const exitFailure/\\\\(_ :: IOException) -> exitFailure/" System/Fuse.hsc
'';
meta = {
homepage = "https://github.com/toothbrush/hfuse";
homepage = "https://github.com/m15k/hfuse";
description = "HFuse is a binding for the Linux FUSE library";
license = self.stdenv.lib.licenses.bsd3;
platforms = self.stdenv.lib.platforms.linux;
pkgs/development/libraries/haskell/HTF/default.nix
+7 -7
View File
@@ -1,17 +1,17 @@
{ cabal, aeson, cpphs, Diff, filepath, haskellSrcExts, HUnit
, liftedBase, monadControl, mtl, QuickCheck, random, regexCompat
, temporary, text, unorderedContainers, xmlgen
{ cabal, aeson, base64Bytestring, cpphs, Diff, filepath
, haskellSrcExts, HUnit, liftedBase, monadControl, mtl, QuickCheck
, random, regexCompat, temporary, text, unorderedContainers, xmlgen
}:
cabal.mkDerivation (self: {
pname = "HTF";
version = "0.11.3.4";
sha256 = "0db47fvp33k83dnhvpygprm06p3z397f5ci154vqk7krjpxb2ynx";
version = "0.11.4.0";
sha256 = "0bg84x6xk359zby04xw62yy227fk85mgs7x5nkdbsxcajm7j0bs9";
isLibrary = true;
isExecutable = true;
buildDepends = [
aeson cpphs Diff haskellSrcExts HUnit liftedBase monadControl mtl
QuickCheck random regexCompat text xmlgen
aeson base64Bytestring cpphs Diff haskellSrcExts HUnit liftedBase
monadControl mtl QuickCheck random regexCompat text xmlgen
];
testDepends = [
aeson filepath mtl random regexCompat temporary text
pkgs/development/libraries/haskell/SHA2/default.nix
+2 -3
View File
@@ -1,14 +1,13 @@
{ cabal, aes, monadsTf, transformers }:
{ cabal, AES, monadsTf, transformers }:
cabal.mkDerivation (self: {
pname = "SHA2";
version = "0.2.5";
sha256 = "1zs79a327x6myfam3p2vr8lmszcaqnkll2qz8n4sy835vz328j40";
buildDepends = [ aes monadsTf transformers ];
buildDepends = [ AES monadsTf transformers ];
meta = {
description = "Fast, incremental SHA hashing for bytestrings";
license = self.stdenv.lib.licenses.bsd3;
platforms = self.ghc.meta.platforms;
};
})
pkgs/development/libraries/haskell/alsa-pcm/default.nix
+2 -2
View File
@@ -4,8 +4,8 @@
cabal.mkDerivation (self: {
pname = "alsa-pcm";
version = "0.6.0.2";
sha256 = "0zckp83wdqb6nl2k63fapa5h4vf1xyvbaycd0ixwr9k7mw75q7b9";
version = "0.6.0.3";
sha256 = "0rq0i17xhd0x7dnlhdf3i1fdvmyxrsbm0w0k9lrx20xpy4gw2zfs";
isLibrary = true;
isExecutable = true;
buildDepends = [
pkgs/development/libraries/haskell/binary-conduit/default.nix
+2 -2
View File
@@ -4,8 +4,8 @@
cabal.mkDerivation (self: {
pname = "binary-conduit";
version = "1.2.1.1";
sha256 = "0f6ki793fbgxpsqadfj796b4rbv6zhn4v4rrd48r48zzw9hmxmzd";
version = "1.2.2";
sha256 = "12dgqydc4zj1ffrcfqpd1dg40dc9hpynj1j69611kzpcqbj275pf";
buildDepends = [ binary conduit resourcet vector ];
testDepends = [
binary conduit hspec QuickCheck quickcheckAssertions resourcet
pkgs/development/libraries/haskell/boomerang/default.nix
+2 -2
View File
@@ -2,8 +2,8 @@
cabal.mkDerivation (self: {
pname = "boomerang";
version = "1.4.2";
sha256 = "0vy70anwnh7649za6nzb65fx09vqkf50a961da6gzwvbaf526rd0";
version = "1.4.3";
sha256 = "1i72mrl8n2cbrdi05zn37y1339r13vzvmrcc1zbkcak4c7r004zw";
buildDepends = [ mtl text ];
meta = {
description = "Library for invertible parsing and printing";
pkgs/development/libraries/haskell/cipher-aes/default.nix
+2 -2
View File
@@ -4,8 +4,8 @@
cabal.mkDerivation (self: {
pname = "cipher-aes";
version = "0.2.7";
sha256 = "1a5viy2frkdqhzzlipd2ik89a04gv95v4b98lgpsas2958r9c9yp";
version = "0.2.8";
sha256 = "13hg8gxhs7hmni72kp14hmhvfv1kj7fnl83i72bz3aq15vx3z61z";
buildDepends = [ byteable cryptoCipherTypes securemem ];
testDepends = [
byteable cryptoCipherTests cryptoCipherTypes QuickCheck
pkgs/development/libraries/haskell/conduit-combinators/default.nix
+2 -2
View File
@@ -6,8 +6,8 @@
cabal.mkDerivation (self: {
pname = "conduit-combinators";
version = "0.2.5.2";
sha256 = "00zvai14cgh2g9wa436kfdgyfzm3pksnhzy365y1yn96dwbbh1ih";
version = "0.2.6.1";
sha256 = "01q585fwfl7qw5yr7ry1zfwm0lbmizyidifk9jzxdfxppbccfxfc";
buildDepends = [
base16Bytestring base64Bytestring chunkedData conduit conduitExtra
monadControl monoTraversable mwcRandom primitive resourcet
pkgs/development/libraries/haskell/conduit-extra/default.nix
+2 -2
View File
@@ -5,8 +5,8 @@
cabal.mkDerivation (self: {
pname = "conduit-extra";
version = "1.1.0.4";
sha256 = "0l1cv65p8nvvb9qgcj87a682wh9xim0rbk2xzhdkd0r123csb118";
version = "1.1.1";
sha256 = "1876kg7zb0gasl7ijmx48r5r2jv3c5xxa1xb6g6iqfysx0qsv6z2";
buildDepends = [
attoparsec blazeBuilder conduit filepath monadControl network
primitive resourcet streamingCommons text transformers
pkgs/development/libraries/haskell/configurator/default.nix
+7 -4
View File
@@ -1,14 +1,17 @@
{ cabal, attoparsec, hashable, text, unixCompat
, unorderedContainers
{ cabal, attoparsec, filepath, hashable, HUnit, testFramework
, testFrameworkHunit, text, unixCompat, unorderedContainers
}:
cabal.mkDerivation (self: {
pname = "configurator";
version = "0.2.0.2";
sha256 = "011rgd48gv4idkh2dwg4mlyx3s6pgm1263xq5ixsa4sg3jqh9d8b";
version = "0.3.0.0";
sha256 = "1d1iq1knwiq6ia5g64rw5hqm6dakz912qj13r89737rfcxmrkfbf";
buildDepends = [
attoparsec hashable text unixCompat unorderedContainers
];
testDepends = [
filepath HUnit testFramework testFrameworkHunit text
];
meta = {
homepage = "http://github.com/bos/configurator";
description = "Configuration management";
pkgs/development/libraries/haskell/data-accessor/data-accessor-mtl.nix
+2 -2
View File
@@ -2,8 +2,8 @@
cabal.mkDerivation (self: {
pname = "data-accessor-mtl";
version = "0.2.0.3";
sha256 = "1aksmm4ykb96khgq5y4vd40zbn4c73hgl21xvyc295cwxsyrbvbk";
version = "0.2.0.4";
sha256 = "1i8lk0vy04giixng5addgj740cbvwlc7g62qgrmhfip0w9k93kqh";
buildDepends = [ dataAccessor mtl ];
meta = {
homepage = "http://www.haskell.org/haskellwiki/Record_access";
pkgs/development/libraries/haskell/data-accessor/data-accessor-transformers.nix
+2 -2
View File
@@ -2,8 +2,8 @@
cabal.mkDerivation (self: {
pname = "data-accessor-transformers";
version = "0.2.1.4";
sha256 = "1bf1j8g5q81zw51bri89hj3i9jnlmhdggw8rhw3n2v103399pf7d";
version = "0.2.1.6";
sha256 = "1iawhp1h68ynr2axj12jrn47nf08mss0ar8blagp59yi8j7170fa";
buildDepends = [ dataAccessor transformers ];
meta = {
homepage = "http://www.haskell.org/haskellwiki/Record_access";
pkgs/development/libraries/haskell/data-accessor/data-accessor.nix
+2 -2
View File
@@ -2,8 +2,8 @@
cabal.mkDerivation (self: {
pname = "data-accessor";
version = "0.2.2.5";
sha256 = "0z63fv41cnpk3h404gprk2f5jl7rrpyv97xmsgac9zgdm5zkkhm6";
version = "0.2.2.6";
sha256 = "0668qgllmp2911ppsb0g9z95nq2x0h2cvzyyjlb6iwhnjzyyg7gf";
buildDepends = [ transformers ];
jailbreak = true;
meta = {
pkgs/development/libraries/haskell/dependent-sum/default.nix
+2 -2
View File
@@ -2,8 +2,8 @@
cabal.mkDerivation (self: {
pname = "dependent-sum";
version = "0.2.0.2";
sha256 = "06amnc50j246f2za0ri49j6vyq6admx03w3xxjhhfnfx9lp6zmhm";
version = "0.2.1.0";
sha256 = "1h6wsrh206k6q3jcfdxvlsswbm47x30psp6x30l2z0j9jyf7jpl3";
meta = {
homepage = "https://github.com/mokus0/dependent-sum";
description = "Dependent sum type";
pkgs/development/libraries/haskell/dlist/default.nix
+2 -2
View File
@@ -2,8 +2,8 @@
cabal.mkDerivation (self: {
pname = "dlist";
version = "0.7.0.1";
sha256 = "197k608ja69xc531r7h3gmy1mf6dsk27b3mkpgp4zdw46z6lcb5l";
version = "0.7.1";
sha256 = "13ka30bn742ldacfgj2lhxvhwf769d0ziy2358vmd5xaq6fn1xfr";
buildDepends = [ deepseq ];
testDepends = [ Cabal QuickCheck ];
meta = {
pkgs/development/libraries/haskell/explicit-exception/default.nix
+2 -2
View File
@@ -2,8 +2,8 @@
cabal.mkDerivation (self: {
pname = "explicit-exception";
version = "0.1.7.2";
sha256 = "0zncj57mpngszl7jz3khhd4dajzis7aag0ad62hc8rkrv2j8f5q4";
version = "0.1.7.3";
sha256 = "0f1p1llz6z4ag1wnf57mgm861cbw7va0g0m8klp6f6pnirdhlwz1";
isLibrary = true;
isExecutable = true;
buildDepends = [ transformers ];
pkgs/development/libraries/haskell/fb/default.nix
+3 -3
View File
@@ -8,8 +8,8 @@
cabal.mkDerivation (self: {
pname = "fb";
version = "1.0.1";
sha256 = "0xhwv8fmhb1an15fnfjxzq0ijnhxxmfjwzd99dq1lsm0f7gd4hfi";
version = "1.0.2";
sha256 = "1xgldk690dpbmhzmjlngpbalmbs0xrc7265zc7frphpsbbw3cnqc";
buildDepends = [
aeson attoparsec base16Bytestring base64Bytestring cereal conduit
conduitExtra cryptoApi cryptohash cryptohashCryptoapi dataDefault
@@ -23,7 +23,7 @@ cabal.mkDerivation (self: {
jailbreak = true;
doCheck = false;
meta = {
homepage = "https://github.com/meteficha/fb";
homepage = "https://github.com/prowdsponsor/fb";
description = "Bindings to Facebook's API";
license = self.stdenv.lib.licenses.bsd3;
platforms = self.ghc.meta.platforms;
pkgs/development/libraries/haskell/gitit/default.nix
+10 -18
View File
@@ -1,32 +1,24 @@
{ cabal, base64Bytestring, blazeHtml, cgi, ConfigFile, feed
, filepath, filestore, ghcPaths, happstackServer, highlightingKate
, hslogger, HStringTemplate, HTTP, json, mtl, network, pandoc
, pandocTypes, parsec, random, recaptcha, safe, SHA, syb, tagsoup
, text, time, url, utf8String, xhtml, xml, xssSanitize, zlib, fetchpatch
{ cabal, base64Bytestring, blazeHtml, ConfigFile, feed, filepath
, filestore, ghcPaths, happstackServer, highlightingKate, hslogger
, HStringTemplate, HTTP, json, mtl, network, pandoc, pandocTypes
, parsec, random, recaptcha, safe, SHA, split, syb, tagsoup, text
, time, uri, url, utf8String, xhtml, xml, xssSanitize, zlib
}:
cabal.mkDerivation (self: {
pname = "gitit";
version = "0.10.3.1";
sha256 = "1sm6rryfyqr0nd4flbc5d520xyw2ajnkylvqf4fi4dhl6fnbpam5";
version = "0.10.4";
sha256 = "1z06v1pamrpm70zisrw3z3kv0d19dsjkmm75pvj5yxkacxv7qk7n";
isLibrary = true;
isExecutable = true;
buildDepends = [
base64Bytestring blazeHtml cgi ConfigFile feed filepath filestore
base64Bytestring blazeHtml ConfigFile feed filepath filestore
ghcPaths happstackServer highlightingKate hslogger HStringTemplate
HTTP json mtl network pandoc pandocTypes parsec random recaptcha
safe SHA syb tagsoup text time url utf8String xhtml xml xssSanitize
zlib
safe SHA split syb tagsoup text time uri url utf8String xhtml xml
xssSanitize zlib
];
jailbreak = true;
patches = [ (fetchpatch {
url = "https://github.com/jgm/gitit/commit/48155008397bdaed4f97c5678d83c70d4bc3f0ff.patch";
sha256 = "16n372wrikwb3g4pb3zljxnp19in0828wp40diqgkplhlnwww6nw";
})
];
preConfigure = ''
sed -i -e 's|network .*< 2.5|network|' gitit.cabal
'';
meta = {
homepage = "http://gitit.net";
description = "Wiki using happstack, git or darcs, and pandoc";
pkgs/development/libraries/haskell/gitlib-libgit2/default.nix
+29
View File
@@ -0,0 +1,29 @@
{ cabal, conduit, conduitCombinators, exceptions, fastLogger
, filepath, gitlib, gitlibTest, hlibgit2, hspec, hspecExpectations
, HUnit, liftedAsync, liftedBase, missingForeign, mmorph
, monadControl, monadLogger, monadLoops, mtl, resourcet, stm
, stmConduit, tagged, text, textIcu, time, transformers
, transformersBase
}:
cabal.mkDerivation (self: {
pname = "gitlib-libgit2";
version = "3.1.0";
sha256 = "1kjwc36fd14j2ipw53j8hdsy29gxir1qrm54wxgpp5n4q2kcs9pq";
buildDepends = [
conduit conduitCombinators exceptions fastLogger filepath gitlib
hlibgit2 liftedAsync liftedBase missingForeign mmorph monadControl
monadLogger monadLoops mtl resourcet stm stmConduit tagged text
textIcu time transformers transformersBase
];
testDepends = [
exceptions gitlib gitlibTest hspec hspecExpectations HUnit
monadLogger transformers
];
meta = {
description = "Libgit2 backend for gitlib";
license = self.stdenv.lib.licenses.mit;
platforms = self.ghc.meta.platforms;
maintainers = [ self.stdenv.lib.maintainers.ianwookim ];
};
})
pkgs/development/libraries/haskell/gitlib-test/default.nix
+20
View File
@@ -0,0 +1,20 @@
{ cabal, conduit, conduitCombinators, exceptions, gitlib, hspec
, hspecExpectations, HUnit, monadControl, tagged, text, time
, transformers
}:
cabal.mkDerivation (self: {
pname = "gitlib-test";
version = "3.1.0";
sha256 = "0hnwx5r9fdkxvx0zmqffpym921dvf1x2lky8w11y3rfhk9i1g7l4";
buildDepends = [
conduit conduitCombinators exceptions gitlib hspec
hspecExpectations HUnit monadControl tagged text time transformers
];
meta = {
description = "Test library for confirming gitlib backend compliance";
license = self.stdenv.lib.licenses.mit;
platforms = self.ghc.meta.platforms;
maintainers = [ self.stdenv.lib.maintainers.ianwookim ];
};
})
pkgs/development/libraries/haskell/gitlib/default.nix
+23
View File
@@ -0,0 +1,23 @@
{ cabal, base16Bytestring, conduit, conduitCombinators, exceptions
, filepath, hashable, liftedAsync, liftedBase, monadControl
, monadLogger, mtl, resourcet, semigroups, systemFilepath, tagged
, text, time, transformers, unorderedContainers
}:
cabal.mkDerivation (self: {
pname = "gitlib";
version = "3.1.0";
sha256 = "0zyym7m8bdhc4wi2jrhcmipmlq106qkd61c4y9iisgk73v2pg9f4";
buildDepends = [
base16Bytestring conduit conduitCombinators exceptions filepath
hashable liftedAsync liftedBase monadControl monadLogger mtl
resourcet semigroups systemFilepath tagged text time transformers
unorderedContainers
];
meta = {
description = "API library for working with Git repositories";
license = self.stdenv.lib.licenses.mit;
platforms = self.ghc.meta.platforms;
maintainers = [ self.stdenv.lib.maintainers.ianwookim ];
};
})
pkgs/development/libraries/haskell/gtkglext/default.nix
+5 -3
View File
@@ -1,12 +1,14 @@
{ pkgs, cabal, gtk, gtk2hsBuildtools, pangox_compat }:
{ cabal, glib, gtk, gtk2hsBuildtools, gtkglext, pango
, pangox_compat
}:
cabal.mkDerivation (self: {
pname = "gtkglext";
version = "0.12.5.0";
sha256 = "1xhalcb85cpswdpqxx64fxpmyqq7iakgaczjrbr25fp0h1glshhk";
buildDepends = [ gtk ];
buildDepends = [ glib gtk pango ];
buildTools = [ gtk2hsBuildtools ];
pkgconfigDepends = [ pkgs.gnome2.gtkglext pangox_compat ];
pkgconfigDepends = [ gtkglext pangox_compat ];
meta = {
homepage = "http://projects.haskell.org/gtk2hs/";
description = "Binding to the GTK+ OpenGL Extension";
pkgs/development/libraries/haskell/happstack/happstack-lite.nix
+2 -2
View File
@@ -2,8 +2,8 @@
cabal.mkDerivation (self: {
pname = "happstack-lite";
version = "7.3.3";
sha256 = "0iv60cch0fiy9kh21wcpk3s4nvd4j2p50pqr3y56bsqwxk53hhv8";
version = "7.3.4";
sha256 = "06ndqfd4x49yi17kgiz5xr05l1k6sj5g1f6kir10wgsqhmd0q811";
buildDepends = [ happstackServer mtl text ];
meta = {
homepage = "http://www.happstack.com/";
pkgs/development/libraries/haskell/happstack/happstack-server.nix
+2 -2
View File
@@ -7,8 +7,8 @@
cabal.mkDerivation (self: {
pname = "happstack-server";
version = "7.3.6";
sha256 = "0js1rzg1zpqg9mbi0kdzb5i8ggsrq4l8p0c05k85ppw6h5lwkayd";
version = "7.3.7";
sha256 = "1phw3hpnklcdav3wv10kwjsmrg8gshnsgd564p459pc4k2zffgh1";
buildDepends = [
base64Bytestring blazeHtml extensibleExceptions filepath hslogger
html monadControl mtl network parsec sendfile syb systemFilepath
pkgs/development/libraries/haskell/haste-compiler/default.nix
+25
View File
@@ -0,0 +1,25 @@
{ cabal, binary, blazeBuilder, bzlib, dataBinaryIeee754
, dataDefault, executablePath, filepath, ghcPaths, HTTP, monadsTf
, mtl, network, random, shellmate, systemFileio, tar, temporary
, time, transformers, utf8String, websockets, zipArchive
}:
cabal.mkDerivation (self: {
pname = "haste-compiler";
version = "0.3";
sha256 = "0a0hyra1h484c404d95d411l7gddaazy1ikwzlgkgzaqzd7j7dbd";
isLibrary = true;
isExecutable = true;
buildDepends = [
binary blazeBuilder bzlib dataBinaryIeee754 dataDefault
executablePath filepath ghcPaths HTTP monadsTf mtl network random
shellmate systemFileio tar temporary time transformers utf8String
websockets zipArchive
];
meta = {
homepage = "http://github.com/valderman/haste-compiler";
description = "Haskell To ECMAScript compiler";
license = self.stdenv.lib.licenses.bsd3;
platforms = self.ghc.meta.platforms;
};
})
pkgs/development/libraries/haskell/haste-perch/default.nix
+15
View File
@@ -0,0 +1,15 @@
{ cabal, hasteCompiler, mtl }:
cabal.mkDerivation (self: {
pname = "haste-perch";
version = "0.1.0.0";
sha256 = "0g2ijb0mzqs2iq4i47biaxbsg4v15w9ky6yyz6wmngwf06rg4iwj";
buildDepends = [ hasteCompiler mtl ];
jailbreak = true;
meta = {
homepage = "https://github.com/agocorona/haste-perch";
description = "Create dynamic HTML in the browser using blaze-html-style notation with Haste";
license = self.stdenv.lib.licenses.bsd3;
platforms = self.ghc.meta.platforms;
};
})
pkgs/development/libraries/haskell/hlibgit2/default.nix
+16
View File
@@ -0,0 +1,16 @@
{ cabal, bindingsDSL, git, openssl, zlib }:
cabal.mkDerivation (self: {
pname = "hlibgit2";
version = "0.18.0.13";
sha256 = "1bslg51kkhnwm48kxaad4izq3xmzv6dpqy10a5kh16vr5zy3w5hz";
buildDepends = [ bindingsDSL zlib ];
testDepends = [ git ];
extraLibraries = [ openssl ];
meta = {
description = "Low-level bindings to libgit2";
license = self.stdenv.lib.licenses.mit;
platforms = self.ghc.meta.platforms;
maintainers = [ self.stdenv.lib.maintainers.ianwookim ];
};
})
pkgs/development/libraries/haskell/hoauth2/default.nix
+2 -2
View File
@@ -4,8 +4,8 @@
cabal.mkDerivation (self: {
pname = "hoauth2";
version = "0.4.0";
sha256 = "1499rgcn3h4921x21s6l0spnjf3wvmsaa07pimgjgb4rjib3z2d5";
version = "0.4.1";
sha256 = "145lgy9bxx1xdljbkvi6s97n2z1k5fd0idp415r71ydw8h3i8ppx";
isLibrary = true;
isExecutable = true;
buildDepends = [
pkgs/development/libraries/haskell/http-client/default.nix
+2 -2
View File
@@ -6,8 +6,8 @@
cabal.mkDerivation (self: {
pname = "http-client";
version = "0.3.3.2";
sha256 = "02q2zph6clff0k86wkyf19j5dhfglqi3zvbs52hw8lygpkycpkk7";
version = "0.3.4";
sha256 = "0y4va0xfriv3qv31hbh7kbzmf61rr3ffr4z4vlfdlzacfv8307y4";
buildDepends = [
base64Bytestring blazeBuilder caseInsensitive cookie
dataDefaultClass deepseq exceptions filepath httpTypes mimeTypes
pkgs/development/libraries/haskell/http-streams/default.nix
+2 -2
View File
@@ -8,8 +8,8 @@
cabal.mkDerivation (self: {
pname = "http-streams";
version = "0.7.1.1";
sha256 = "0wh07gdb9w48mwsjvg07dq6gjvdm8ls654ki180r7p38v93rsmfx";
version = "0.7.2.0";
sha256 = "0h7fjnpday34skhafv2v0ybhfv0x915prfb4qa0ld4gm50scsinz";
buildDepends = [
aeson attoparsec base64Bytestring blazeBuilder caseInsensitive
HsOpenSSL httpCommon ioStreams mtl network opensslStreams text
pkgs/development/libraries/haskell/jack/default.nix
+2 -2
View File
@@ -4,8 +4,8 @@
cabal.mkDerivation (self: {
pname = "jack";
version = "0.7.0.2";
sha256 = "06mf1sw1lp81b3d4hsgc199m30drdnxzzlmsxg4p1yvydjfdk4gj";
version = "0.7.0.3";
sha256 = "12ap7xcgzmp5zwmqkwsgxplh5li21m7xngijr4mhnn9y33xc1lrk";
isLibrary = true;
isExecutable = true;
buildDepends = [
pkgs/development/libraries/haskell/lens-family-core/default.nix
+2 -2
View File
@@ -2,8 +2,8 @@
cabal.mkDerivation (self: {
pname = "lens-family-core";
version = "1.0.0";
sha256 = "149wfxddw58h5q42r3nknmac8wsc9c8xzsw6vrlfb4yasg7bhw53";
version = "1.1.0";
sha256 = "0pvc7iv7y5s3496w7ic9qzdw3l76ldnrg0my0jxi1dyn0vm9xwm3";
buildDepends = [ transformers ];
meta = {
description = "Haskell 98 Lens Families";
pkgs/development/libraries/haskell/lifted-base/default.nix
+2 -2
View File
@@ -4,8 +4,8 @@
cabal.mkDerivation (self: {
pname = "lifted-base";
version = "0.2.2.2";
sha256 = "02qjagh4a3zvad7xyvwjd6nkh44c41bqj32ddpn7ms1fv4sl0mam";
version = "0.2.3.0";
sha256 = "0wbh9l7hsbgvfplxyamvpb8nq6w147zsd2yskylfmpw7kyz6yp9n";
buildDepends = [ monadControl transformersBase ];
testDepends = [
HUnit monadControl testFramework testFrameworkHunit transformers
pkgs/development/libraries/haskell/midi/default.nix
+2 -2
View File
@@ -4,8 +4,8 @@
cabal.mkDerivation (self: {
pname = "midi";
version = "0.2.1.2";
sha256 = "077cxdazr97hjpq42l7hjn905pfhyshvaiwqjdfnzhjv6r48q4zk";
version = "0.2.1.3";
sha256 = "0mqf6q7686zdxljkz3bqa2zhkgirqz5c1fkbd3n4wyipzhjc773a";
buildDepends = [
binary eventList explicitException monoidTransformer nonNegative
QuickCheck random transformers utilityHt
pkgs/development/libraries/haskell/monad-loops/default.nix
+2 -2
View File
@@ -2,8 +2,8 @@
cabal.mkDerivation (self: {
pname = "monad-loops";
version = "0.4.2";
sha256 = "08sz08p4z1p78dv7rmsqvin59h19i6i07sp7jg3zwxwjxa76fds8";
version = "0.4.2.1";
sha256 = "1dprwndc0bxzpmrkj1xb9kzjrg3i06zsg43yaabn5x5gcaj8is56";
meta = {
homepage = "https://github.com/mokus0/monad-loops";
description = "Monadic loops";
pkgs/development/libraries/haskell/pipes-text/default.nix
+4 -4
View File
@@ -1,13 +1,13 @@
{ cabal, pipes, pipesBytestring, pipesGroup, pipesParse, pipesSafe
, profunctors, streamingCommons, text, transformers
, streamingCommons, text, transformers
}:
cabal.mkDerivation (self: {
pname = "pipes-text";
version = "0.0.0.11";
sha256 = "0c56gxm17bapdjgbp2f55z3f6vq8ryvsljqp3bcjjj18xv5pf1ls";
version = "0.0.0.12";
sha256 = "18xf0rhshbl03js50n98k96692w98j0j0dfyi67780i08c39dq6m";
buildDepends = [
pipes pipesBytestring pipesGroup pipesParse pipesSafe profunctors
pipes pipesBytestring pipesGroup pipesParse pipesSafe
streamingCommons text transformers
];
jailbreak = true;
pkgs/development/libraries/haskell/purescript/default.nix
+2 -2
View File
@@ -5,8 +5,8 @@
cabal.mkDerivation (self: {
pname = "purescript";
version = "0.5.2.4";
sha256 = "19k8kggmmy75qgg9xcvvd194s1vf5qx15ljx82zdscvks2j1r1sd";
version = "0.5.2.5";
sha256 = "17qbgdfhq9k4y7z3c879hkw22jcq86myd9xhs4saaa4xh3ix50x0";
isLibrary = true;
isExecutable = true;
buildDepends = [
pkgs/development/libraries/haskell/random-fu/default.nix
+2 -2
View File
@@ -4,8 +4,8 @@
cabal.mkDerivation (self: {
pname = "random-fu";
version = "0.2.5.0";
sha256 = "1yfq7mvplzdk64i7z5ip8vjynn48a65z28xrhcv91qi0yjxsxdm0";
version = "0.2.6.0";
sha256 = "1mi1hr3hxlnyjf01hgn7xinr1m0rax26759zbkhf5xn04ps0g01p";
buildDepends = [
erf mathFunctions monadLoops mtl randomShuffle randomSource rvar
syb transformers vector
pkgs/development/libraries/haskell/resource-pool-catchio/default.nix
+19
View File
@@ -0,0 +1,19 @@
{ cabal, hashable, MonadCatchIOTransformers, stm, time
, transformers, transformersBase, vector
}:
cabal.mkDerivation (self: {
pname = "resource-pool-catchio";
version = "0.2.1.0";
sha256 = "0g9r6hnn01n3p2ikcfkfc4afh83pzam29zal3k2ivajpl3kramsw";
buildDepends = [
hashable MonadCatchIOTransformers stm time transformers
transformersBase vector
];
meta = {
homepage = "http://github.com/norm2782/pool";
description = "Fork of resource-pool, with a MonadCatchIO constraint";
license = self.stdenv.lib.licenses.bsd3;
platforms = self.ghc.meta.platforms;
};
})
pkgs/development/libraries/haskell/safe/default.nix
+3 -3
View File
@@ -2,11 +2,11 @@
cabal.mkDerivation (self: {
pname = "safe";
version = "0.3.4";
sha256 = "0mwdaj0sjvqkgg077x1d896xphx64yrjvwbdhv7khdk3rh0vfl64";
version = "0.3.5";
sha256 = "0xv409ps1h1b28v8rkg59a09z001nmpvqvwf3mdkzkyzmxfgq30j";
meta = {
homepage = "http://community.haskell.org/~ndm/safe/";
description = "Library for safe (pattern match free) functions";
description = "Library of safe (exception free) functions";
license = self.stdenv.lib.licenses.bsd3;
platforms = self.ghc.meta.platforms;
maintainers = [ self.stdenv.lib.maintainers.andres ];
pkgs/development/libraries/haskell/semigroups/default.nix
+2 -2
View File
@@ -2,8 +2,8 @@
cabal.mkDerivation (self: {
pname = "semigroups";
version = "0.15";
sha256 = "1fkinmjyx7r39c8hf8f6n9zgn6m7c2y7l0san43s4g2cfg8pxn5s";
version = "0.15.1";
sha256 = "1vacnw598pl9acbcjjblrpdmjhmj3wz1ifrn9ki4q7yrsh4ml7mc";
buildDepends = [ hashable nats text unorderedContainers ];
meta = {
homepage = "http://github.com/ekmett/semigroups/";
pkgs/development/libraries/haskell/shakespeare/default.nix
+2 -2
View File
@@ -4,8 +4,8 @@
cabal.mkDerivation (self: {
pname = "shakespeare";
version = "2.0.0.3";
sha256 = "12dmhcv404bh7kn04d175bj2b0fadz4sjypwsq151mlhakr13x85";
version = "2.0.1";
sha256 = "1h1b7p4czdzrxb77515vqnck3rj3yw35h2ds6gzxzp7pdxprds27";
buildDepends = [
aeson blazeHtml blazeMarkup exceptions parsec systemFileio
systemFilepath text time transformers
pkgs/development/libraries/haskell/snap-web-routes/default.nix
+14
View File
@@ -0,0 +1,14 @@
{ cabal, heist, mtl, snap, snapCore, text, webRoutes, xmlhtml }:
cabal.mkDerivation (self: {
pname = "snap-web-routes";
version = "0.5.0.0";
sha256 = "1ml0b759k2n9bd2x4akz4dfyk8ywnpgrdlcymng4vhjxbzngnniv";
buildDepends = [ heist mtl snap snapCore text webRoutes xmlhtml ];
meta = {
homepage = "https://github.com/lukerandall/snap-web-routes";
description = "Type safe URLs for Snap";
license = self.stdenv.lib.licenses.bsd3;
platforms = self.ghc.meta.platforms;
};
})
pkgs/development/libraries/haskell/snaplet-postgresql-simple/default.nix
+22
View File
@@ -0,0 +1,22 @@
{ cabal, clientsession, configurator, errors
, MonadCatchIOTransformers, mtl, postgresqlSimple
, resourcePoolCatchio, snap, text, transformers
, unorderedContainers
}:
cabal.mkDerivation (self: {
pname = "snaplet-postgresql-simple";
version = "0.5";
sha256 = "0pzn0lg1slrllrrx1n9s1kp1pmq2ahrkjypcwnnld8zxzvz4g5jm";
buildDepends = [
clientsession configurator errors MonadCatchIOTransformers mtl
postgresqlSimple resourcePoolCatchio snap text transformers
unorderedContainers
];
meta = {
homepage = "https://github.com/mightybyte/snaplet-postgresql-simple";
description = "postgresql-simple snaplet for the Snap Framework";
license = self.stdenv.lib.licenses.bsd3;
platforms = self.ghc.meta.platforms;
};
})
pkgs/development/libraries/haskell/storable-record/default.nix
+2 -2
View File
@@ -2,8 +2,8 @@
cabal.mkDerivation (self: {
pname = "storable-record";
version = "0.0.2.5";
sha256 = "078vwwcr47d3dmzkhxr7ggjkq9d5rnxv4z8p049kdnmzfbcmisn3";
version = "0.0.3";
sha256 = "1mv2s4r7dqkl2fy0wjnywyr2zi2g53nkn0z72mgr8drkzdszzxx1";
isLibrary = true;
isExecutable = true;
buildDepends = [ transformers utilityHt ];
pkgs/development/libraries/haskell/syntactic/default.nix
+8 -9
View File
@@ -1,21 +1,20 @@
{ cabal, constraints, dataHash, mtl, QuickCheck, tasty, tastyGolden
, tastyQuickcheck, tastyTh, transformers, treeView, tuple
{ cabal, constraints, dataHash, mtl, QuickCheck, safe, tagged
, tasty, tastyGolden, tastyQuickcheck, tastyTh, treeView
, utf8String
}:
cabal.mkDerivation (self: {
pname = "syntactic";
version = "1.13";
sha256 = "1d5mb7ss6xr7rj93mwrdvkxkx1dlmywxx9sxsmqy7l6gaxs6gq8l";
buildDepends = [
constraints dataHash mtl transformers treeView tuple
];
version = "2.0";
sha256 = "0b90afdfymsbgllk8np3xfkgrn2b5ry3n2wbpkn660rknsayw94x";
buildDepends = [ constraints dataHash mtl safe tagged treeView ];
testDepends = [
mtl QuickCheck tasty tastyGolden tastyQuickcheck tastyTh utf8String
QuickCheck tagged tasty tastyGolden tastyQuickcheck tastyTh
utf8String
];
meta = {
homepage = "https://github.com/emilaxelsson/syntactic";
description = "Generic abstract syntax, and utilities for embedded languages";
description = "Generic representation and manipulation of abstract syntax";
license = self.stdenv.lib.licenses.bsd3;
platforms = self.ghc.meta.platforms;
};
pkgs/development/libraries/haskell/tasty-golden/default.nix
+4 -3
View File
@@ -1,14 +1,15 @@
{ cabal, deepseq, filepath, mtl, optparseApplicative, tagged, tasty
, temporaryRc
, tastyHunit, temporaryRc
}:
cabal.mkDerivation (self: {
pname = "tasty-golden";
version = "2.2.1.2";
sha256 = "107c6i1abw6dsd3cx1bgiyk8dnih7i9x4bl4kw6dfnva2kjkp4d1";
version = "2.2.2.3";
sha256 = "0vphim4qbx0g53xvh8x90k0l5r6afivbb4y31nvbq2avmrm1i82w";
buildDepends = [
deepseq filepath mtl optparseApplicative tagged tasty temporaryRc
];
testDepends = [ filepath tasty tastyHunit temporaryRc ];
meta = {
homepage = "https://github.com/feuerbach/tasty-golden";
description = "Golden tests support for tasty";
pkgs/development/libraries/haskell/tasty-th/default.nix
+2 -2
View File
@@ -2,8 +2,8 @@
cabal.mkDerivation (self: {
pname = "tasty-th";
version = "0.1.1";
sha256 = "0ndwfz2gq0did6dfjilhdaxzya2qw9gckjkj090cp2rbkahywsga";
version = "0.1.2";
sha256 = "1x3kixv0hnb7icigz2kfq959pivdc4jaaalvdgn8dlyqzkvfjzx4";
buildDepends = [ languageHaskellExtract tasty ];
meta = {
homepage = "http://github.com/bennofs/tasty-th";
pkgs/development/libraries/haskell/tasty/default.nix
+2 -2
View File
@@ -4,8 +4,8 @@
cabal.mkDerivation (self: {
pname = "tasty";
version = "0.8.1.1";
sha256 = "04vzq5gwyd5zb6lsf8nbr5dypgf07b4aq70i1jghkg12v8h529dr";
version = "0.8.1.2";
sha256 = "07pxnm9cx28vlfypa4psnnxcfx1i4qwimkf0nkfzqkhzqb85a58s";
buildDepends = [
ansiTerminal async deepseq mtl optparseApplicative regexTdfa stm
tagged unboundedDelays
pkgs/development/libraries/haskell/th-desugar/default.nix
+2 -2
View File
@@ -2,8 +2,8 @@
cabal.mkDerivation (self: {
pname = "th-desugar";
version = "1.4.0";
sha256 = "0jadwqhk9dqnicg3p958a6cyfvl70amjc1hl7bhlygpxpdfffwad";
version = "1.4.1";
sha256 = "1pjv301bshdmn3s5nrmmcx5d1b80c410lml73sai68dhx7v64vw2";
buildDepends = [ mtl syb ];
testDepends = [ hspec HUnit mtl syb ];
meta = {
pkgs/development/libraries/haskell/twitter-conduit/default.nix
+2 -2
View File
@@ -7,8 +7,8 @@
cabal.mkDerivation (self: {
pname = "twitter-conduit";
version = "0.0.4";
sha256 = "0fv2m3sy1gklch4v3sarvq4xk9p7pdz1s3ssl52riy3mg076ab09";
version = "0.0.5.1";
sha256 = "0wmr5124s6n0xdilzh2cd693ar2i0mwkgsik9ns1d34ibnvfibgv";
isLibrary = true;
isExecutable = true;
buildDepends = [
pkgs/development/libraries/haskell/vty-ui/default.nix
+2 -2
View File
@@ -4,8 +4,8 @@
cabal.mkDerivation (self: {
pname = "vty-ui";
version = "1.7";
sha256 = "1wd7ada3x7d5rhl4z3h29m9h42513vbz6dp49xhn4j806mi164nd";
version = "1.7.1";
sha256 = "1xgv2psbqcqpzgj1f1pis6hr7yvny8y9ajimllam7zsk6kbhngzz";
isLibrary = true;
isExecutable = true;
buildDepends = [
pkgs/development/libraries/haskell/web-routes/default.nix
+2 -2
View File
@@ -5,8 +5,8 @@
cabal.mkDerivation (self: {
pname = "web-routes";
version = "0.27.5";
sha256 = "1jx5wwmlylwrf45wy3w29ck1p7509mgy8m02vipd8apibx6ghp22";
version = "0.27.6";
sha256 = "16jmiwnwmq9bkifk14dfs88a2kyy7rqybyq68ybrjq1x84x6pkkp";
buildDepends = [
blazeBuilder httpTypes mtl parsec split text utf8String
];
pkgs/development/libraries/haskell/webdriver/default.nix
+2 -2
View File
@@ -7,8 +7,8 @@
cabal.mkDerivation (self: {
pname = "webdriver";
version = "0.5.4";
sha256 = "0839vw7drjn5iray4ma17f0pfgwx44q10ad8m564jvjgcml4yhvq";
version = "0.5.5";
sha256 = "1k656ghkaqlnp4a9dd99s3l2vm21zsqpqxwfg2lq5rx2yw402nga";
buildDepends = [
aeson attoparsec base64Bytestring cond dataDefault directoryTree
exceptions filepath HTTP liftedBase monadControl mtl network
pkgs/development/libraries/haskell/websockets/default.nix
+2 -2
View File
@@ -6,8 +6,8 @@
cabal.mkDerivation (self: {
pname = "websockets";
version = "0.8.2.4";
sha256 = "09mq04vhi53isj8z5930ibyai7bv634lnmhl4xl2d3fzz2afvff0";
version = "0.8.2.5";
sha256 = "1d8r9mrkwvac05gblxrnxdnnyqqidjcfv5j3njbb9dgzdj56gb1y";
buildDepends = [
attoparsec base64Bytestring binary blazeBuilder caseInsensitive
entropy ioStreams mtl network random SHA text
pkgs/development/libraries/libmm-qt/default.nix
+32
View File
@@ -0,0 +1,32 @@
{ stdenv, fetchurl, cmake, pkgconfig, qt4, doxygen, modemmanager }:
let
pname = "libmm-qt";
version = "1.0.1";
name = "${pname}-${version}";
in
stdenv.mkDerivation {
inherit name;
buildInputs = [
cmake
pkgconfig
qt4
doxygen
];
propagatedBuildInputs = [ modemmanager ];
src = fetchurl {
url = "mirror://kde/unstable/modemmanager-qt/${version}/src/${name}-1.tar.xz";
sha256 = "0ad57815a904ddb2660a7327c0bda5da47a2a60ce57b2b12f4aaff99b174f74a";
};
meta = with stdenv.lib; {
homepage = "https://projects.kde.org/projects/extragear/libs/libmm-qt";
description = "Qt wrapper for ModemManager DBus API";
license = licenses.lgpl21;
platforms = platforms.linux;
maintainers = [ maintainers.jgeerds ];
};
}
pkgs/development/libraries/libnm-qt/default.nix
+32
View File
@@ -0,0 +1,32 @@
{ stdenv, fetchurl, cmake, pkgconfig, qt4, networkmanager, libmm-qt }:
let
pname = "libnm-qt";
version = "0.9.8.1";
name = "${pname}-${version}";
in
stdenv.mkDerivation {
inherit name;
buildInputs = [
cmake
pkgconfig
qt4
networkmanager
];
propagatedBuildInputs = [ libmm-qt ];
src = fetchurl {
url = "mirror://kde/unstable/networkmanager-qt/${version}/src/${name}.tar.xz";
sha256 = "cde8bed2beb57015cb5f6772c1fe0843aab299b9529578c5406ba7fe614af23d";
};
meta = with stdenv.lib; {
homepage = "https://projects.kde.org/projects/extragear/libs/libnm-qt";
description = "Qt wrapper for NetworkManager DBus API";
license = licenses.lgpl21;
platforms = platforms.linux;
maintainer = [ maintainers.jgeerds ];
};
}
pkgs/development/libraries/php-apc/default.nix
-26
View File
@@ -1,26 +0,0 @@
{stdenv, fetchurl, php, autoconf, automake, libtool }:
stdenv.mkDerivation rec {
name = "php-apc-3.1.7";
src = fetchurl {
url = http://pecl.php.net/get/APC-3.1.7.tgz;
sha256 = "0xlvhw5398sl5zzkjm4rkk1m3fcra30zkq0k4i6fij0ylpd6nlls";
};
preConfigure = ''
phpize
sed -i 's,^EXTENSION_DIR.*,'EXTENSION_DIR=$out/lib/php/extensions, configure
'';
configureFlags = [ "--enable-apc" "--enable-apc-mmap" ];
buildInputs = [ php autoconf automake libtool ];
meta = {
description = "Alternative PHP Cache";
homepage = "http://pecl.php.net/package/APC";
license = "PHP+";
};
}
pkgs/development/libraries/php-xcache/default.nix
-33
View File
@@ -1,33 +0,0 @@
{stdenv, fetchurl, php, autoconf, automake, libtool, m4 }:
stdenv.mkDerivation rec {
name = "php-xcache-3.0.1";
src = fetchurl {
url = http://xcache.lighttpd.net/pub/Releases/3.0.1/xcache-3.0.1.tar.bz2;
md5 = "45086010bc4f82f506c08be1c556941b";
};
preConfigure = ''
phpize
sed -i 's,^EXTENSION_DIR.*,'EXTENSION_DIR=$out/lib/php/extensions, configure
'';
configureFlags = [
"--enable-xcache"
"--enable-xcache-coverager"
"--enable-xcache-optimizer"
"--enable-xcache-assembler"
"--enable-xcache-encoder"
"--enable-xcache-decoder"
];
buildInputs = [ php autoconf automake libtool m4 ];
meta = {
description = "Fast, stable PHP opcode cacher";
homepage = http://xcache.lighttpd.net/;
license = "BSD";
};
}
pkgs/development/libraries/szip/default.nix
+13 -5
View File
@@ -1,9 +1,17 @@
{ stdenv, fetchurl }:
stdenv.mkDerivation {
name = "szip-2.1";
src = fetchurl {
url = ftp://ftp.hdfgroup.org/lib-external/szip/2.1/src/szip-2.1.tar.gz;
sha256 = "1vym7r4by02m0yqj10023xyps5b21ryymnxb4nb2gs32arfxj5m8";
};
name = "szip-2.1";
src = fetchurl {
url = ftp://ftp.hdfgroup.org/lib-external/szip/2.1/src/szip-2.1.tar.gz;
sha256 = "1vym7r4by02m0yqj10023xyps5b21ryymnxb4nb2gs32arfxj5m8";
};
meta = {
description = "
Szip is a compression library that can be used with the hdf5 library.
";
homepage = http://www.hdfgroup.org/doc_resource/SZIP/;
license = stdenv.lib.licenses.unfree;
};
}
pkgs/development/ocaml-modules/biniou/default.nix
+32
View File
@@ -0,0 +1,32 @@
{stdenv, fetchurl, ocaml, findlib, easy-format}:
let
pname = "biniou";
version = "1.0.9";
webpage = "http://mjambon.com/${pname}.html";
in
stdenv.mkDerivation rec {
name = "${pname}-${version}";
src = fetchurl {
url = "http://mjambon.com/releases/${pname}/${name}.tar.gz";
sha256 = "14j3hrhbjqxbizr1pr8fcig9dmfzhbjjwzwyc99fcsdic67w8izb";
};
buildInputs = [ ocaml findlib easy-format ];
createFindlibDestdir = true;
makeFlags = "PREFIX=$(out)";
preBuild = ''
mkdir $out/bin
'';
meta = {
description = "A binary data format designed for speed, safety, ease of use and backward compatibility as protocols evolve";
homepage = "${webpage}";
license = stdenv.lib.licenses.bsd3;
platforms = ocaml.meta.platforms;
};
}
pkgs/development/ocaml-modules/yojson/default.nix
+32
View File
@@ -0,0 +1,32 @@
{stdenv, fetchurl, ocaml, findlib, cppo, easy-format, biniou}:
let
pname = "yojson";
version = "1.1.8";
webpage = "http://mjambon.com/${pname}.html";
in
stdenv.mkDerivation rec {
name = "${pname}-${version}";
src = fetchurl {
url = "http://mjambon.com/releases/${pname}/${name}.tar.gz";
sha256 = "0ayx17dimnpavdfyq6dk9xv2x1fx69by85vc6vl3nqxjkcv5d2rv";
};
buildInputs = [ ocaml findlib cppo easy-format biniou ];
createFindlibDestdir = true;
makeFlags = "PREFIX=$(out)";
preBuild = ''
mkdir $out/bin
'';
meta = {
description = "An optimized parsing and printing library for the JSON format";
homepage = "${webpage}";
license = stdenv.lib.licenses.bsd3;
platforms = ocaml.meta.platforms;
};
}
pkgs/development/python-modules/tables/default.nix
+1
View File
@@ -52,5 +52,6 @@ buildPythonPackage rec {
meta = {
description = "Hierarchical datasets for Python";
homepage = "http://www.pytables.org/";
license = stdenv.lib.licenses.bsd2;
};
}
pkgs/development/tools/haskell/hlint/default.nix
+2 -2
View File
@@ -4,8 +4,8 @@
cabal.mkDerivation (self: {
pname = "hlint";
version = "1.8.61";
sha256 = "08y8ny6dv14gxnzzr5f1hvs22m7y62yffyq2pzvw2aja8fbj5d2z";
version = "1.9";
sha256 = "1c8qpfrivsxx6raqnrz40li73hng4z0ygc1hl70qixbmsmv2a830";
isLibrary = true;
isExecutable = true;
buildDepends = [
pkgs/development/tools/misc/cpphs/default.nix
+2 -2
View File
@@ -2,8 +2,8 @@
cabal.mkDerivation (self: {
pname = "cpphs";
version = "1.18.4";
sha256 = "0rmcq66wn7lsc5g1wk6bbsr7jiw8h6bz5cbvdywnv7vmwsx8gh51";
version = "1.18.5";
sha256 = "0bqfz0wkfnxvv711fgmhmh6rbwffgna1pfqbj7whb6crqji9w7g7";
isLibrary = true;
isExecutable = true;
buildDepends = [ polyparse ];
pkgs/development/tools/misc/d-feet/default.nix
+7 -5
View File
@@ -1,7 +1,6 @@
{ stdenv, pkgconfig, fetchurl, itstool, intltool, libxml2, glib, gtk3
, pango, gdk_pixbuf, atk, pep8, python, makeWrapper
, pygobject3, gobjectIntrospection, libwnck3
, gnome_icon_theme }:
, pango, gdk_pixbuf, atk, pep8, python, makeWrapper, gnome3
, pygobject3, gobjectIntrospection, libwnck3 }:
let
version = "${major}.8";
@@ -18,16 +17,19 @@ stdenv.mkDerivation rec {
buildInputs = [
pkgconfig libxml2 itstool intltool glib gtk3 pep8 python
gnome3.gnome_icon_theme gnome3.gnome_icon_theme_symbolic
makeWrapper pygobject3 libwnck3
];
postInstall =
preFixup =
''
wrapProgram $out/bin/d-feet \
--prefix PYTHONPATH : "$(toPythonPath $out):$(toPythonPath ${pygobject3})" \
--prefix GI_TYPELIB_PATH : "$GI_TYPELIB_PATH" \
--prefix LD_LIBRARY_PATH : "${gtk3}/lib:${atk}/lib:${libwnck3}/lib" \
--prefix XDG_DATA_DIRS : "${gnome_icon_theme}/share:$out/share"
--prefix XDG_DATA_DIRS : "$XDG_ICON_DIRS:$out/share"
rm $out/share/icons/hicolor/icon-theme.cache
'';
meta = {

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