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

Merge master into x-updates

Browse Source 
Llvm refactorings from ae0c9b626f included.
Mesa is the only package using llvm_34 ATM.

Conflicts:
	pkgs/development/compilers/llvm/default.nix
This commit is contained in:
Vladimír Čunát 2014-01-13 22:00:31 +01:00
commit 1cb146f3e1
168 changed files with 2628 additions and 1723 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

83
doc/language-support.xml
View File

@ -112,7 +112,7 @@ file used by <filename>Makefile.PL</filename>:
buildPerlPackage rec {
name = "BerkeleyDB-0.36";
src = fetchurl {
url = "mirror://cpan/authors/id/P/PM/PMQS/${name}.tar.gz";
sha256 = "07xf50riarb60l1h6m2dqmql8q5dij619712fsgw7ach04d8g3z1";
@ -123,7 +123,7 @@ buildPerlPackage rec {
echo "INCLUDE = ${db4}/include" >> config.in
'';
}
</programlisting>
</programlisting>
</para>
@ -233,10 +233,83 @@ twisted = buildPythonPackage {
</section>
<section><title>Java</title>
<section xml:id="ssec-language-java"><title>Java</title>
<para>Java packages should install JAR files in
<filename>$out/lib/java</filename>.</para>
<para>Ant-based Java packages are typically built from source as follows:
<programlisting>
stdenv.mkDerivation {
name = "...";
src = fetchurl { ... };
buildInputs = [ jdk ant ];
buildPhase = "ant";
}
</programlisting>
Note that <varname>jdk</varname> is an alias for the OpenJDK.</para>
<para>JAR files that are intended to be used by other packages should
be installed in <filename>$out/share/java</filename>. The OpenJDK has
a stdenv setup hook that adds any JARs in the
<filename>share/java</filename> directories of the build inputs to the
<envar>CLASSPATH</envar> environment variable. For instance, if the
package <literal>libfoo</literal> installs a JAR named
<filename>foo.jar</filename> in its <filename>share/java</filename>
directory, and another package declares the attribute
<programlisting>
buildInputs = [ jdk libfoo ];
</programlisting>
then <envar>CLASSPATH</envar> will be set to
<filename>/nix/store/...-libfoo/share/java/foo.jar</filename>.</para>
<para>Private JARs
should be installed in a location like
<filename>$out/share/<replaceable>package-name</replaceable></filename>.</para>
<para>If your Java package provides a program, you need to generate a
wrapper script to run it using the OpenJRE. You can use
<literal>makeWrapper</literal> for this:
<programlisting>
buildInputs = [ makeWrapper ];
installPhase =
''
mkdir -p $out/bin
makeWrapper ${jre}/bin/java $out/bin/foo \
--add-flags "-cp $out/share/java/foo.jar org.foo.Main"
'';
</programlisting>
Note the use of <literal>jre</literal>, which is the part of the
OpenJDK package that contains the Java Runtime Environment. By using
<literal>${jre}/bin/java</literal> instead of
<literal>${jdk}/bin/java</literal>, you prevent your package from
depending on the JDK at runtime.</para>
<para>It is possible to use a different Java compiler than
<command>javac</command> from the OpenJDK. For instance, to use the
Eclipse Java Compiler:
<programlisting>
buildInputs = [ jre ant ecj ];
</programlisting>
(Note that here you don’t need the full JDK as an input, but just the
JRE.) The ECJ has a stdenv setup hook that sets some environment
variables to cause Ant to use ECJ, but this doesn’t work with all Ant
files. Similarly, you can use the GNU Java Compiler:
<programlisting>
buildInputs = [ gcj ant ];
</programlisting>
Here, Ant will automatically use <command>gij</command> (the GNU Java
Runtime) instead of the OpenJRE.</para>
</section>

1
lib/maintainers.nix
View File

@ -36,6 +36,7 @@
lovek323 = "Jason O'Conal <jason@oconal.id.au>";
ludo = "Ludovic Courtès <ludo@gnu.org>";
marcweber = "Marc Weber <marco-oweber@gmx.de>";
matejc = "Matej Cotman <cotman.matej@gmail.com>";
modulistic = "Pablo Costa <modulistic@gmail.com>";
mornfall = "Petr Ročkai <me@mornfall.net>";
ocharles = "Oliver Charles <ollie@ocharles.org.uk>";

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

@ -25,9 +25,11 @@ with pkgs.lib;
config = {
environment.variables.TZDIR = "/etc/zoneinfo";
environment.variables.TZ = config.time.timeZone;
environment.etc.localtime.source = "${pkgs.tzdata}/share/zoneinfo/${config.time.timeZone}";
environment.etc.localtime =
{ source = "${pkgs.tzdata}/share/zoneinfo/${config.time.timeZone}";
mode = "direct-symlink";
};
environment.etc.zoneinfo.source = "${pkgs.tzdata}/share/zoneinfo";

2
nixos/modules/misc/ids.nix
View File

@ -109,6 +109,7 @@
mongodb = 98;
openldap = 99;
memcached = 100;
cgminer = 101;
# When adding a uid, make sure it doesn't match an existing gid.
@ -197,6 +198,7 @@
minidlna = 91;
haproxy = 92;
openldap = 93;
connman = 94;
# When adding a gid, make sure it doesn't match an existing uid.

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

@ -147,6 +147,7 @@
./services/networking/avahi-daemon.nix
./services/networking/bind.nix
./services/networking/bitlbee.nix
./services/networking/connman.nix
./services/networking/cntlm.nix
./services/networking/chrony.nix
./services/networking/ddclient.nix

6
nixos/modules/services/databases/postgresql.nix
View File

@ -82,7 +82,11 @@ in
type = types.lines;
default = "";
description = ''
Defines how users authenticate themselves to the server.
Defines how users authenticate themselves to the server. By
default, "trust" access to local users will always be granted
along with any other custom options. If you do not want this,
set this option using "pkgs.lib.mkForce" to override this
behaviour.
'';
};

17
nixos/modules/services/misc/cgminer.nix
View File

@ -108,20 +108,21 @@ in
config = mkIf config.services.cgminer.enable {
users.extraUsers = singleton
{ name = cfg.user;
users.extraUsers = optionalAttrs (cfg.user == "cgminer") (singleton
{ name = "cgminer";
uid = config.ids.uids.cgminer;
description = "Cgminer user";
};
});
environment.systemPackages = [ cfg.package ];
systemd.services.cgminer = {
path = [ pkgs.cgminer ];
after = [ "display-manager.target" "network.target" ];
after = [ "network.target" "display-manager.service" ];
wantedBy = [ "multi-user.target" ];
environment = {
environment = {
LD_LIBRARY_PATH = ''/run/opengl-driver/lib:/run/opengl-driver-32/lib'';
DISPLAY = ":0";
GPU_MAX_ALLOC_PERCENT = "100";
@ -129,9 +130,11 @@ in
};
serviceConfig = {
ExecStart = "${pkgs.cgminer}/bin/cgminer -T -c ${cgminerConfig}";
ExecStart = "${pkgs.cgminer}/bin/cgminer --syslog --text-only --config ${cgminerConfig}";
User = cfg.user;
RestartSec = 10;
RestartSec = "30s";
Restart = "always";
StartLimitInterval = "1m";
};
};

94
nixos/modules/services/networking/connman.nix Normal file
View File

@ -0,0 +1,94 @@
{ config, pkgs, ... }:
with pkgs.lib;
with pkgs;
let
cfg = config.networking.connman;
in {
###### interface
options = {
networking.connman = {
enable = mkOption {
type = types.bool;
default = false;
description = ''
Whether to use ConnMan for managing your network connections.
'';
};
};
};
###### implementation
config = mkIf cfg.enable {
assertions = [{
assertion = config.networking.useDHCP == false;
message = "You can not use services.networking.connman with services.networking.useDHCP";
}{
assertion = config.networking.wireless.enable == true;
message = "You must use services.networking.connman with services.networking.wireless";
}{
assertion = config.networking.networkmanager.enable == false;
message = "You can not use services.networking.connman with services.networking.networkmanager";
}];
environment.systemPackages = [ connman ];
systemd.services."connman" = {
description = "Connection service";
wantedBy = [ "multi-user.target" ];
after = [ "syslog.target" ];
serviceConfig = {
Type = "dbus";
BusName = "net.connman";
Restart = "on-failure";
ExecStart = "${pkgs.connman}/sbin/connmand --nodaemon";
StandardOutput = "null";
};
};
systemd.services."connman-vpn" = {
description = "ConnMan VPN service";
wantedBy = [ "multi-user.target" ];
after = [ "syslog.target" ];
before = [ "connman" ];
serviceConfig = {
Type = "dbus";
BusName = "net.connman.vpn";
ExecStart = "${pkgs.connman}/sbin/connman-vpnd -n";
StandardOutput = "null";
};
};
systemd.services."net-connman-vpn" = {
description = "D-BUS Service";
serviceConfig = {
Name = "net.connman.vpn";
before = [ "connman" ];
ExecStart = "${pkgs.connman}/sbin/connman-vpnd -n";
User = "root";
SystemdService = "connman-vpn.service";
};
};
networking = {
useDHCP = false;
wireless.enable = true;
networkmanager.enable = false;
};
powerManagement.resumeCommands = ''
systemctl restart connman
'';
};
}

1
nixos/modules/services/x11/desktop-managers/xfce.nix
View File

@ -60,6 +60,7 @@ in
pkgs.xfce.xfce4session
pkgs.xfce.xfce4settings
pkgs.xfce.xfce4mixer
pkgs.xfce.xfce4screenshooter
pkgs.xfce.xfconf
pkgs.xfce.xfdesktop
pkgs.xfce.xfwm4

10
nixos/modules/system/etc/setup-etc.pl
View File

@ -57,9 +57,13 @@ sub link {
open MODE, "<$_.mode";
my $mode = <MODE>; chomp $mode;
close MODE;
copy "$static/$fn", "$target.tmp" or warn;
chmod oct($mode), "$target.tmp" or warn;
rename "$target.tmp", $target or warn;
if ($mode eq "direct-symlink") {
atomicSymlink readlink("$static/$fn"), $target or warn;
} else {
copy "$static/$fn", "$target.tmp" or warn;
chmod oct($mode), "$target.tmp" or warn;
rename "$target.tmp", $target or warn;
}
} elsif (-l "$_") {
atomicSymlink "$static/$fn", $target or warn;
}

8
pkgs/applications/audio/audacious/default.nix
View File

@ -4,19 +4,19 @@
}:
let
version = "3.4.1";
version = "3.4.3";
in
stdenv.mkDerivation {
name = "audacious-${version}";
src = fetchurl {
url = "http://distfiles.audacious-media-player.org/audacious-${version}.tar.bz2";
sha256 = "0wf99b0nrk90fyak4gpwi076qnsrmv1j8958cvi57rxig21lvvap";
sha256 = "04lzwdr1lx6ghbfxzygvnbmdl420w6rm453ds5lyb0hlvzs58d0q";
};
pluginsSrc = fetchurl {
url = "http://distfiles.audacious-media-player.org/audacious-plugins-${version}.tar.bz2";
sha256 = "02ivrxs6109nmmz9pkbf9dkm36s2lyp9vfv59sm0acxxd4db71md";
sha256 = "00r88q9fs9a0gicdmk2svcans7igcqgacrw303a5bn44is7pmrmy";
};
buildInputs =
@ -48,7 +48,7 @@ stdenv.mkDerivation {
(
source $stdenv/setup
# gsettings schemas for file dialogues
for file in "$out"/bin/*; do
for file in "$out/bin/"*; do
wrapProgram "$file" --prefix XDG_DATA_DIRS : "$XDG_ADD"
done
)

51
pkgs/applications/audio/projectm/default.nix Normal file
View File

@ -0,0 +1,51 @@
{ stdenv, fetchurl, pkgconfig, cmake
, glew, ftgl, ttf_bitstream_vera
, withQt ? true, qt4
, withLibvisual ? false, libvisual, SDL
, withJack ? false, jackaudio
, withPulseAudio ? true, pulseaudio
}:
assert withJack -> withQt;
assert withPulseAudio -> withQt;
stdenv.mkDerivation {
name = "projectm-2.1.0";
meta = {
description = "Music Visualizer";
homepage = "http://projectm.sourceforge.net/";
license = stdenv.lib.licenses.lgpl21Plus;
platforms = stdenv.lib.platforms.linux;
};
src = fetchurl {
url = "mirror://sourceforge/projectm/2.1.0/projectM-complete-2.1.0-Source.tar.gz";
sha256 = "1vh6jk68a0jdb6qwppb6f8cbgmhnv2ba3bcavzfd6sq06gq08cji";
};
patchPhase = ''
sed -i 's:''${LIBVISUAL_PLUGINSDIR}:''${CMAKE_INSTALL_PREFIX}/lib/libvisual-0.4:' \
src/projectM-libvisual/CMakeLists.txt
'';
nativeBuildInputs = [ pkgconfig cmake ];
cmakeFlags = ''
-DprojectM_FONT_MENU=${ttf_bitstream_vera}/share/fonts/truetype/VeraMono.ttf
-DprojectM_FONT_TITLE=${ttf_bitstream_vera}/share/fonts/truetype/Vera.ttf
-DINCLUDE-PROJECTM-TEST=OFF
-DINCLUDE-PROJECTM-QT=${if withQt then "ON" else "OFF"}
-DINCLUDE-PROJECTM-LIBVISUAL=${if withLibvisual then "ON" else "OFF"}
-DINCLUDE-PROJECTM-JACK=${if withJack then "ON" else "OFF"}
-DINCLUDE-PROJECTM-PULSEAUDIO=${if withPulseAudio then "ON" else "OFF"}
'';
buildInputs = with stdenv.lib;
[ glew ftgl ]
++ optional withQt qt4
++ optionals withLibvisual [ libvisual SDL ]
++ optional withJack jackaudio
++ optional withPulseAudio pulseaudio
;
}

70
pkgs/applications/audio/snd/default.nix
View File

@ -1,58 +1,26 @@
args :
let
lib = args.lib;
fetchurl = args.fetchurl;
fullDepEntry = args.fullDepEntry;
{ stdenv, fetchurl, pkgconfig
, gtk2, alsaLib
, fftw, gsl
}:
version = lib.attrByPath ["version"] "9.4" args;
buildInputs = with args; [gtk glib pkgconfig
libXpm gmp gettext libX11 fftw]
++ (lib.optional (args ? ruby) args.ruby)
++ (lib.optional (args ? mesa) args.mesa)
++ (lib.optional (args ? guile) args.guile)
++ (lib.optional (args ? libtool) args.libtool)
++ (lib.optional (args ? sndlib) args.sndlib)
++ (lib.optional (args ? alsaLib) args.alsaLib)
++ (lib.optional (args ? jackaudio) args.jackaudio)
;
configureFlags = ["--with-gtk" "--with-xpm"]
++ (lib.optional (args ? ruby) "--with-ruby" )
++ (lib.optional (args ? mesa) "--with-gl" )
++ (lib.optional (args ? guile) "--with-guile")
++ (lib.optional (args ? sndlib) "--with-midi" )
++ (lib.optional (args ? alsaLib) "--with-alsa")
++ (lib.optional (args ? jackaudio) "--with-jack" )
++ [ "--with-fftw" "--htmldir=$out/share/snd/html" "--with-doc-dir=$out/share/snd/html" ]
;
in
rec {
src = fetchurl {
url = "mirror://sourceforge/snd/snd-${version}.tar.gz";
sha256 = "0zqgfnkvkqxby1k74mwba1r4pb520glcsz5jjmpzm9m41nqnghmm";
};
stdenv.mkDerivation rec {
name = "snd-14.3";
inherit buildInputs;
configureFlags = [];
/* doConfigure should be specified separately */
phaseNames = ["doConfigure" "preBuild" "makeDocsWork"
"doMakeInstall" "doForceShare"];
makeDocsWork = fullDepEntry ''
# hackish way to make html docs work
h="$out/share/snd/html"; mkdir -p "$h"; cp *.html "$h"
patch -p1 < ${./doc.patch}
sed "s@HTML-DIR@$h@" -i index.scm snd-help.c
'' ["defEnsureDir"];
preBuild = fullDepEntry (''
export NIX_LDFLAGS="$NIX_LDFLAGS -L${args.libX11}/lib -lX11"
'') ["minInit" "doUnpack" "makeDocsWork"];
name = "snd-" + version;
meta = {
description = "Sound editor";
homepage = http://ccrma.stanford.edu/software/snd;
inherit src;
platforms = stdenv.lib.platforms.linux;
};
src = fetchurl {
url = "mirror://sourceforge/snd/${name}.tar.gz";
sha256 = "04shk34pza507kvm40dc6sdz5jz533z4q2h7m9hgqvw1r3f57ms6";
};
nativeBuildInputs = [ pkgconfig ];
buildInputs = [
gtk2 alsaLib
fftw gsl
];
}

62
pkgs/applications/audio/snd/doc.patch
View File

@ -1,62 +0,0 @@
diff --git a/index.scm b/index.scm
index 2148a58..713939c 100644
--- a/index.scm
+++ b/index.scm
@@ -18,24 +18,7 @@ and if one is found, and the Snd documentation can be found, calls (html-program
(lambda (n)
;; look for doc on current dir, then html dir, then global dir
;; snd.html is what we'll search for
- (let ((dir (if (file-exists? "snd.html")
- (getcwd)
- (if (and (string? (html-dir))
- (file-exists? (string-append (html-dir) "/snd.html")))
- (html-dir)
- (if (file-exists? "/usr/share/doc/snd-9/snd.html")
- "/usr/share/doc/snd-9"
- (if (file-exists? "/usr/local/share/doc/snd-9/snd.html")
- "/usr/local/share/doc/snd-9"
- (if (file-exists? "/usr/doc/snd-9/snd.html")
- "/usr/doc/snd-9"
- (if (file-exists? "/usr/share/doc/snd-8/snd.html")
- "/usr/share/doc/snd-8"
- (if (file-exists? "/usr/local/share/doc/snd-8/snd.html")
- "/usr/local/share/doc/snd-8"
- (if (file-exists? "/usr/doc/snd-8/snd.html")
- "/usr/doc/snd-8"
- #f))))))))))
+ (let (dir "HTML-DIR")
(if dir
(if (or (string=? (html-program) "netscape")
(string=? (html-program) "mozilla")
diff --git a/snd-help.c b/snd-help.c
index a6557e0..a40a02e 100644
--- a/snd-help.c
+++ b/snd-help.c
@@ -3554,26 +3554,7 @@ static char *doc_files[DOC_DIRECTORIES] = {
static char *html_directory(void)
{
- int i;
- if (mus_file_probe("snd.html"))
- return(mus_getcwd());
- if (html_dir(ss))
- {
- bool happy;
- char *hd = NULL;
- hd = (char *)CALLOC(snd_strlen(html_dir(ss)) + 16, sizeof(char));
- sprintf(hd, html_dir(ss), "/snd.html");
- happy = mus_file_probe(hd);
- FREE(hd);
- if (happy) return(copy_string(html_dir(ss)));
- }
-#ifdef MUS_DEFAULT_DOC_DIR
- if (mus_file_probe(MUS_DEFAULT_DOC_DIR "/snd.html"))
- return(copy_string(MUS_DEFAULT_DOC_DIR "/snd.html"));
-#endif
- for (i = 0; i < DOC_DIRECTORIES; i++)
- if (mus_file_probe(doc_files[i])) return(copy_string(doc_directories[i]));
- return(NULL);
+ return (copy_string ("HTML-DIR"));
}

6
pkgs/applications/editors/emacs-modes/haskell/default.nix
View File

@ -1,11 +1,11 @@
{ stdenv, fetchurl, emacs, texinfo }:
stdenv.mkDerivation rec {
name = "haskell-mode-13.07";
name = "haskell-mode-13.10";
src = fetchurl {
url = "https://github.com/haskell/haskell-mode/archive/v13.07.tar.gz";
sha256 = "15c8ncj9mykkrizy1a8l94gq37s8hj13v3p5rgyaj9z0cwgl85kx";
url = "https://github.com/haskell/haskell-mode/archive/v13.10.tar.gz";
sha256 = "0hcg7wpalcdw8j36m8vd854zrrgym074r7m903rpwfrhx9mlg02b";
};
buildInputs = [ emacs texinfo ];

8
pkgs/applications/editors/emacs-modes/jdee/default.nix
View File

@ -26,8 +26,8 @@ in
mkdir -p "dist"
cat > build.properties <<EOF
dist.lisp.dir = dist/share/emacs/site-lisp
dist.java.lib.dir = dist/lib/java
dist.jar.jde.file = dist/lib/java/jde.jar
dist.java.lib.dir = dist/share/java
dist.jar.jde.file = dist/share/java/jde.jar
dist.java.src.dir = dist/src/${name}/java
dist.doc.dir dist/doc/${name}
prefix.dir = $out
@ -40,7 +40,7 @@ in
for i in "lisp/"*.el
do
sed -i "$i" -e "s|@out@|$out|g ;
s|@javadir@|$out/lib/java|g ;
s|@javadir@|$out/share/java|g ;
s|@datadir@|$out/share/${name}|g"
done
'';
@ -55,7 +55,7 @@ in
# Move everything that's not a JAR to $datadir. This includes
# `sun_checks.xml', license files, etc.
cd "$out/lib/java"
cd "$out/share/java"
for i in *
do
if echo $i | grep -qv '\.jar''$'

6
pkgs/applications/editors/emacs-modes/jdee/java-directory.patch
View File

@ -14,7 +14,7 @@ Tell the elisp code about the right Java directory.
- (oset this bsh-cmd-dir (expand-file-name "bsh-commands" jde-java-directory))
- (oset this checkstyle-jar (expand-file-name "lib/checkstyle-all.jar" jde-java-directory))
- (oset this regexp-jar (expand-file-name "lib/jakarta-regexp.jar" jde-java-directory))
+ (let ((jde-java-directory "@out@/lib/java"))
+ (let ((jde-java-directory "@out@/share/java"))
+
+ (oset this bsh-cmd-dir "@datadir@/bsh-commands")
+ (oset this checkstyle-jar (expand-file-name "checkstyle-all.jar" jde-java-directory))
@ -38,7 +38,7 @@ Tell the elisp code about the right Java directory.
- (concat
- (jde-find-jde-data-directory)
- "java/"))
+ (jde-java-directory "@out@/lib/java")
+ (jde-java-directory "@out@/share/java")
(args (append
(unless jde-checkstyle-expanded-properties-file
(jde-checkstyle-get-property-args this))
@ -67,7 +67,7 @@ Tell the elisp code about the right Java directory.
- (jde-java-directory
- (expand-file-name "java"
- (jde-find-jde-data-directory)))
+ (jde-java-directory "@out@/lib/java")
+ (jde-java-directory "@out@/share/java")
(vm-args
(let (args)
(setq args

26
pkgs/applications/editors/jedit/default.nix
View File

@ -1,20 +1,20 @@
{ stdenv, fetchurl, ant, jre }:
{ stdenv, fetchurl, ant, jdk }:
let version = "4.4.2"; in
stdenv.mkDerivation {
name = "jedit-4.4.2";
name = "jedit-${version}";
src = fetchurl {
url = mirror://sourceforge/jedit/jedit4.4.2source.tar.bz2;
url = "mirror://sourceforge/jedit/jedit${version}source.tar.bz2";
sha256 = "5e9ad9c32871b77ef0b9fe46dcfcea57ec52558d36113b7280194a33430b8ceb";
};
setSourceRoot = ''
sourceRoot=jEdit
'';
buildInputs = [ ant jdk ];
buildPhase = ''
ant build
'';
sourceRoot = "jEdit";
buildPhase = "ant build";
installPhase = ''
mkdir -p $out/share/jEdit
@ -27,7 +27,7 @@ stdenv.mkDerivation {
cp -r macros/* $out/share/jEdit/macros
mkdir -p $out/share/jEdit/doc
cp -r doc/* $out/share/jEdit/doc
sed -i "s|Icon=.*|Icon=$out/share/jEdit/icons/jedit-icon48.png|g" package-files/linux/deb/jedit.desktop
mkdir -p $out/share/applications
mv package-files/linux/deb/jedit.desktop $out/share/applications/jedit.desktop
@ -35,7 +35,7 @@ stdenv.mkDerivation {
patch package-files/linux/jedit << EOF
5a6,8
> # specify the correct JAVA_HOME
> JAVA_HOME=${jre}
> JAVA_HOME=${jdk.jre}/lib/openjdk/jre
>
EOF
sed -i "s|/usr/share/jEdit/@jar.filename@|$out/share/jEdit/jedit.jar|g" package-files/linux/jedit
@ -44,9 +44,7 @@ stdenv.mkDerivation {
chmod +x $out/bin/jedit
'';
buildInputs = [ ant ];
meta = {
meta = {
description = "Mature programmer's text editor (Java based)";
homepage = http://www.jedit.org;
license = "GPL";

6
pkgs/applications/graphics/gocr/default.nix
View File

@ -1,11 +1,11 @@
{ stdenv, fetchurl, tk }:
stdenv.mkDerivation rec {
name = "gocr-0.49";
name = "gocr-0.50";
src = fetchurl {
url = http://www-e.uni-magdeburg.de/jschulen/ocr/gocr-0.49.tar.gz;
sha256 = "06hpzp7rkkwfr1fvmc8kcfz9v490i9yir7f7imh13gmka0fr6afc";
url = "http://www-e.uni-magdeburg.de/jschulen/ocr/${name}.tar.gz";
sha256 = "1dgmcpapy7h68d53q2c5d0bpgzgfb2nw2blndnx9qhc7z12149mw";
};
postInstall = ''

6
pkgs/applications/graphics/zgrviewer/default.nix
View File

@ -10,14 +10,14 @@ stdenv.mkDerivation rec {
buildInputs = [jre unzip];
buildPhase = "";
installPhase = ''
mkdir -p "$out"/{bin,lib/java/zvtm/plugins,share/doc/zvtm}
mkdir -p "$out"/{bin,share/java/zvtm/plugins,share/doc/zvtm}
cp overview.html *.license.* "$out/share/doc/zvtm"
cp -r target/* "$out/lib/java/zvtm/"
cp -r target/* "$out/share/java/zvtm/"
echo '#!/bin/sh' > "$out/bin/zgrviewer"
echo "java -jar '$out/lib/java/zvtm/zgrviewer-${version}.jar'" >> "$out/bin/zgrviewer"
echo "java -jar '$out/share/java/zvtm/zgrviewer-${version}.jar'" >> "$out/bin/zgrviewer"
chmod a+x "$out/bin/zgrviewer"
'';
meta = {

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

@ -1,14 +1,14 @@
{ stdenv, fetchurl, openssl }:
let
version = "6.3.20";
version = "6.3.26";
in
stdenv.mkDerivation {
name="fetchmail-${version}";
src = fetchurl {
url = "http://download.berlios.de/fetchmail/fetchmail-${version}.tar.bz2";
sha256 = "22e94f11d885cb9330a197fd80217d44f65e6b087e4d4b4d83e573adfc24aa7b";
sha256 = "08rafrs1dlr11myr0p99kg4k80qyy0fa63gg3ac88zn49174lwhw";
};
buildInputs = [ openssl ];

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

@ -23,7 +23,7 @@ assert mercurialSupport -> (mercurial != null);
let
name = "ikiwiki";
version = "3.20130904.1";
version = "3.20140102";
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 = "1nxycsz49y6801lbrvazzg7qc9q2vpr2ny1sba26f9gwc00c650h";
sha256 = "0nsyfq7j03cg4qq73kw7cxnc7wgbr2m75fqmmll77wyl9cb661lj";
};
buildInputs = [ perl TextMarkdown URI HTMLParser HTMLScrubber HTMLTemplate

24
pkgs/applications/misc/spacefm/default.nix Normal file
View File

@ -0,0 +1,24 @@
{ pkgs, fetchurl, stdenv, gtk3, udev, desktop_file_utils, shared_mime_info, intltool, pkgconfig }:
let
name = "spacefm-${version}";
version = "0.9.2";
in stdenv.mkDerivation {
inherit name;
src = fetchurl {
url="https://github.com/IgnorantGuru/spacefm/blob/pkg/${version}/${name}.tar.xz?raw=true";
sha256 ="3767137d74aa78597ffb42a6121784e91a4276efcd5d718b3793b9790f82268c";
};
buildInputs = [ gtk3 udev desktop_file_utils shared_mime_info intltool pkgconfig ];
meta = {
description = "SpaceFM is a multi-panel tabbed file and desktop manager for Linux with built-in VFS, udev- or HAL-based device manager, customizable menu system, and bash integration.";
platforms = pkgs.lib.platforms.linux;
license = pkgs.lib.licenses.gpl3;
};
}

10
pkgs/applications/networking/p2p/freenet/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchurl, apacheAntOpenJDK, jre }:
{ stdenv, fetchurl, ant, jdk }:
let
# The .gitmodules in freenet-official-20130413-eccc9b3198
@ -14,7 +14,7 @@ let
};
in
stdenv.mkDerivation {
name = "freenet-official-20130413-eccc9b3198";
name = "freenet-20130413-eccc9b3198";
src = fetchurl {
url = https://github.com/freenet/fred-official/tarball/eccc9b3198;
@ -29,7 +29,7 @@ stdenv.mkDerivation {
sed '/antcall.*-ext/d' -i build.xml
'';
buildInputs = [ apacheAntOpenJDK jre ];
buildInputs = [ ant jdk ];
buildPhase = "ant package-only";
@ -41,13 +41,13 @@ stdenv.mkDerivation {
cat <<EOF > $out/bin/freenet
#!${stdenv.shell}
${jre}/bin/java -cp $out/share/freenet/bcprov.jar:$out/share/freenet/freenet-ext.jar:$out/share/freenet/freenet.jar \\
${jdk.jre}/bin/java -cp $out/share/freenet/bcprov.jar:$out/share/freenet/freenet-ext.jar:$out/share/freenet/freenet.jar \\
-Xmx1024M freenet.node.NodeStarter
EOF
chmod +x $out/bin/freenet
'';
meta = {
meta = {
description = "Decentralised and censorship-resistant network";
homepage = https://freenetproject.org/;
license = "GPLv2+";

4
pkgs/applications/office/gnucash/default.nix
View File

@ -10,11 +10,11 @@
*/
stdenv.mkDerivation rec {
name = "gnucash-2.4.13";
name = "gnucash-2.4.15";
src = fetchurl {
url = "mirror://sourceforge/gnucash/${name}.tar.bz2";
sha256 = "0j4m00a3r1hcrhkfjkx3sgi2r4id4wrc639i4s00j35rx80540pn";
sha256 = "058mgfwic6a2g7jq6iip5hv45md1qaxy25dj4lvlzjjr141wm4gx";
};
buildInputs = [

4
pkgs/applications/science/math/maxima/default.nix
View File

@ -2,7 +2,7 @@
let
name = "maxima";
version = "5.31.3";
version = "5.32.1";
searchPath =
stdenv.lib.makeSearchPath "bin"
@ -13,7 +13,7 @@ stdenv.mkDerivation {
src = fetchurl {
url = "mirror://sourceforge/${name}/${name}-${version}.tar.gz";
sha256 = "1g959569plywqaxxp488ylblgkirqg24arwa93dplfxi4h7fc4km";
sha256 = "0krxha1jckgw5s52bjasf7bnkcnq81qyi2k1bcglgqzfp79b44gw";
};
buildInputs = [sbcl texinfo perl makeWrapper];

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

@ -1,14 +1,14 @@
{ stdenv, fetchurl, SDL, ftgl, pkgconfig, libpng, libjpeg, pcre, SDL_image, glew, mesa }:
let
name = "gource-0.37";
name = "gource-0.40";
in
stdenv.mkDerivation {
inherit name;
src = fetchurl {
url = "http://gource.googlecode.com/files/${name}.tar.gz";
sha256 = "03kd9nn65cl1p2jgn6pvpxmvnfscz3c8jqds90fsc0z37ij2iiyn";
sha256 = "04nirh07xjslqsph557as4s50nlf91bi6v2l7vmbifmkdf90m2cw";
};
buildInputs = [glew SDL ftgl pkgconfig libpng libjpeg pcre SDL_image mesa];
@ -29,7 +29,7 @@ stdenv.mkDerivation {
by several third party tools for CVS repositories.
'';
platforms = stdenv.lib.platforms.gnu;
hydraPlatforms = stdenv.lib.platforms.linux;
maintainers = [ stdenv.lib.maintainers.simons ];
};
}

4
pkgs/applications/version-management/mercurial/default.nix
View File

@ -2,7 +2,7 @@
, guiSupport ? false, tk ? null, curses }:
let
name = "mercurial-2.8.1";
name = "mercurial-2.8.2";
in
stdenv.mkDerivation {
@ -10,7 +10,7 @@ stdenv.mkDerivation {
src = fetchurl {
url = "http://mercurial.selenic.com/release/${name}.tar.gz";
sha256 = "0riksf6p07yxfq1xlraqhl8cacsgb1gg7si185mlbdknrh2a4ffj";
sha256 = "0vxyxx91k6z0knfqslbwxswbc52abrg2pdf395kwvij026ibm9f8";
};
inherit python; # pass it so that the same version can be used in hg2git

18
pkgs/applications/virtualization/virt-manager/default.nix
View File

@ -1,16 +1,18 @@
{ stdenv, fetchurl, pythonPackages, intltool, libvirt, libxml2Python, curl,
python, makeWrapper, virtinst, pyGtkGlade, pythonDBus, gnome_python, gtkvnc, vte}:
{ stdenv, fetchurl, pythonPackages, intltool, libxml2Python, curl, python
, makeWrapper, virtinst, pyGtkGlade, pythonDBus, gnome_python, gtkvnc, vte
, spiceSupport ? true, spice_gtk
}:
with stdenv.lib;
let version = "0.9.1"; in
let version = "0.9.5"; in
stdenv.mkDerivation rec {
name = "virt-manager-${version}";
src = fetchurl {
url = "http://virt-manager.et.redhat.com/download/sources/virt-manager/virt-manager-${version}.tar.gz";
sha256 = "15e064167ba5ff84ce6fc8790081d61890430f2967f89886a84095a23e40094a";
sha256 = "0gc06cdbq6c2a06l939516lvjii7lr0wng90kqgl1i5q5wlgnajx";
};
pythonPath = with pythonPackages;
@ -18,13 +20,13 @@ stdenv.mkDerivation rec {
paste_deploy m2crypto ipy boto_1_9 twisted sqlalchemy_migrate
distutils_extra simplejson readline glance cheetah lockfile httplib2
# !!! should libvirt be a build-time dependency? Note that
# libxml2Python is a dependency of libvirt.py.
# libxml2Python is a dependency of libvirt.py.
libvirt libxml2Python urlgrabber virtinst pyGtkGlade pythonDBus gnome_python
gtkvnc vte
];
] ++ optional spiceSupport spice_gtk;
buildInputs =
[ pythonPackages.python
[ pythonPackages.python
pythonPackages.wrapPython
pythonPackages.mox
pythonPackages.urlgrabber
@ -36,7 +38,7 @@ stdenv.mkDerivation rec {
] ++ pythonPath;
buildPhase = "make";
nativeBuildInputs = [ makeWrapper pythonPackages.wrapPython ];
# patch the runner script in order to make wrapPythonPrograms work and run the program using a syscall

4
pkgs/applications/virtualization/virtinst/default.nix
View File

@ -2,14 +2,14 @@
with stdenv.lib;
let version = "0.600.1"; in
let version = "0.600.4"; in
stdenv.mkDerivation rec {
name = "virtinst-${version}";
src = fetchurl {
url = "http://virt-manager.org/download/sources/virtinst/virtinst-${version}.tar.gz";
sha256 = "db342cf93aae1f23df02001bdb0b0cc2c5bf675dca37b4417f5a79bf5a374716";
sha256 = "175laiy49dni8hzi0cn14bbsdsigvgr9h6d9z2bcvbpa29spldvf";
};
pythonPath = with pythonPackages;

4
pkgs/applications/window-managers/i3/status.nix
View File

@ -2,11 +2,11 @@
}:
stdenv.mkDerivation rec {
name = "i3status-2.7";
name = "i3status-2.8";
src = fetchurl {
url = "http://i3wm.org/i3status/${name}.tar.bz2";
sha256 = "0cm6fhsc7hzsqni8pwhjl2l0rfd458paabn54cgzqnmwwdflwgq7";
sha256 = "1zh7z2qbw0jsrqdkc1irviq2n20mc5hq4h1mckyfcm238pfwa1mb";
};
buildInputs = [ confuse yajl alsaLib wirelesstools ];

10
pkgs/applications/window-managers/ratpoison/default.nix
View File

@ -2,11 +2,11 @@
, libXtst, xextproto, readline, libXi, pkgconfig, perl, autoconf, automake }:
stdenv.mkDerivation rec {
name = "ratpoison-1.4.5";
name = "ratpoison-1.4.6";
src = fetchurl {
url = "mirror://savannah/ratpoison/${name}.tar.gz";
sha256 = "7391079db20b8613eecfd81d64d243edc9d3c586750c8f2da2bb9db14d260f03";
sha256 = "1y1b38bng0naxfy50asshzg5xr1b2rn88mcgbds42y72d7y9d0za";
};
buildInputs =
@ -18,8 +18,6 @@ stdenv.mkDerivation rec {
preConfigure = "autoreconf -vf"; # needed because of the patch above
patches = [ ./glibc-fix.patch ];
postInstall = ''
mkdir -p $out/share/emacs/site-lisp
mv "$out/share/ratpoison/"*.el $out/share/emacs/site-lisp/
@ -45,7 +43,7 @@ stdenv.mkDerivation rec {
cripples Emacs and other quality pieces of software.
'';
maintainers = [ stdenv.lib.maintainers.simons ];
platforms = stdenv.lib.platforms.linux;
hydraPlatforms = stdenv.lib.platforms.linux;
maintainers = [ ];
};
}

22
pkgs/applications/window-managers/ratpoison/glibc-fix.patch
View File

@ -1,22 +0,0 @@
From 4ad0b38fb53506d613c4b4f7268dadfcedae9b8e Mon Sep 17 00:00:00 2001
From: Shawn Betts <sabetts@gmail.com>
Date: Mon, 13 Jul 2009 01:23:25 +0000
Subject: check for getline in configure.in
This fixes a build error encountered on glibc 2.10 systems
---
diff --git a/configure.in b/configure.in
index 0c1b42c..08f4ee8 100644
--- a/configure.in
+++ b/configure.in
@@ -146,7 +146,7 @@ AC_CHECK_HEADERS(unistd.h stdarg.h)
dnl Checks for typedefs, structures, and compiler characteristics.
dnl Checks for library functions.
-AC_CHECK_FUNCS(getopt getopt_long setsid setpgid setpgrp putenv vsnprintf usleep)
+AC_CHECK_FUNCS(getopt getopt_long setsid setpgid setpgrp putenv vsnprintf usleep getline)
AC_TYPE_SIGNAL
--
cgit v0.9.0.2

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

@ -148,6 +148,12 @@ init_submodules(){
git config -f .gitmodules --get-regexp submodule\.[^.]*\.path |
sed -n "s,^\(.*\)\.path $dir\$,\\1,p")
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"
fi
clone "$dir" "$url" "$hash" "";
done;
}

14
pkgs/build-support/release/ant-build.nix
View File

@ -8,7 +8,7 @@
, antProperties ? []
, antBuildInputs ? []
, buildfile ? "build.xml"
, ant ? pkgs.apacheAntOpenJDK
, ant ? pkgs.ant
, jre ? pkgs.openjdk
, hydraAntLogger ? pkgs.hydraAntLogger
, ... } @ args:
@ -31,7 +31,7 @@ stdenv.mkDerivation (
antSetupPhase = with stdenv.lib; ''
if test "$hydraAntLogger" != "" ; then
export ANT_ARGS="-logger org.hydra.ant.HydraLogger -lib `ls $hydraAntLogger/lib/java/*.jar | head -1`"
export ANT_ARGS="-logger org.hydra.ant.HydraLogger -lib `ls $hydraAntLogger/share/java/*.jar | head -1`"
fi
for abi in ${concatStringsSep " " (map (f: "`find ${f} -name '*.jar'`") antBuildInputs)}; do
export ANT_ARGS="$ANT_ARGS -lib $abi"
@ -39,20 +39,20 @@ stdenv.mkDerivation (
'';
installPhase = ''
mkdir -p $out/lib/java
mkdir -p $out/share/java
${ if jars == [] then ''
find . -name "*.jar" | xargs -I{} cp -v {} $out/lib/java
find . -name "*.jar" | xargs -I{} cp -v {} $out/share/java
'' else stdenv.lib.concatMapStrings (j: ''
cp -v ${j} $out/lib/java
cp -v ${j} $out/share/java
'') jars }
for j in $out/lib/java/*.jar ; do
for j in $out/share/java/*.jar ; do
echo file jar $j >> $out/nix-support/hydra-build-products
done
'';
generateWrappersPhase =
let
cp = w: "-cp '${lib.optionalString (w ? classPath) w.classPath}${lib.optionalString (w ? mainClass) ":$out/lib/java/*"}'";
cp = w: "-cp '${lib.optionalString (w ? classPath) w.classPath}${lib.optionalString (w ? mainClass) ":$out/share/java/*"}'";
in
''
header "Generating jar wrappers"

13
pkgs/build-support/setup-hooks/set-java-classpath.sh Normal file
View File

@ -0,0 +1,13 @@
# This setup hook adds every JAR in the share/java subdirectories of
# the build inputs to $CLASSPATH.
export CLASSPATH
addPkgToClassPath () {
local jar
for jar in $1/share/java/*.jar; do
export CLASSPATH=''${CLASSPATH}''${CLASSPATH:+:}''${jar}
done
}
envHooks=(''${envHooks[@]} addPkgToClassPath)

18
pkgs/desktops/gnome-3/core/gdm/default.nix Normal file
View File

@ -0,0 +1,18 @@
{ stdenv, fetchurl, pkgconfig, glib, itstool, libxml2, intltool, accountservice, libX11
, gtk, libcanberra_gtk3, pam, libtool
}:
stdenv.mkDerivation rec {
name = "gdm-3.10.0.1";
src = fetchurl {
url = "http://ftp.acc.umu.se/pub/GNOME/core/3.10/3.10.2/sources/${name}.tar.xz";
sha256 = "1rva3djas48m8w1gyv3nds3jxfkirdfl0bk30x79mizrk80456jl";
};
buildInputs = [ pkgconfig glib itstool libxml2 intltool accountservice libX11 gtk libcanberra_gtk3 pam libtool ];
meta = with stdenv.lib; {
platforms = platforms.linux;
};
}

4
pkgs/desktops/gnome-3/core/rest/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchurl, pkgconfig, glib, libsoup }:
{ stdenv, fetchurl, pkgconfig, glib, libsoup, gobjectIntrospection }:
stdenv.mkDerivation rec {
name = "rest-0.7.90";
@ -8,7 +8,7 @@ stdenv.mkDerivation rec {
sha256 = "08n0cvz44l4b1gkmjryap3ysd0wcbbbdjbcar73nr52dmk52ls0x";
};
buildInputs = [ pkgconfig glib libsoup ];
buildInputs = [ pkgconfig glib libsoup gobjectIntrospection];
configureFlags = "--with-ca-certificates=/etc/ssl/certs/ca-bundle.crt";

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

@ -26,6 +26,8 @@ rec {
gcr = callPackage ./core/gcr { }; # ToDo: tests fail
gdm = callPackage ./core/gdm { };
gnome_icon_theme = callPackage ./core/gnome-icon-theme { };
gnome-menus = callPackage ./core/gnome-menus { };

43
pkgs/desktops/xfce/applications/parole.nix Normal file
View File

@ -0,0 +1,43 @@
{ stdenv, fetchurl, makeWrapper, pkgconfig, intltool, gst_all_1
, gtk, dbus_glib, libxfce4ui, libxfce4util, xfconf
, taglib, libnotify
, withGstPlugins ? true
}:
stdenv.mkDerivation rec {
p_name = "parole";
ver_maj = "0.5";
ver_min = "4";
src = fetchurl {
url = "mirror://xfce/src/apps/${p_name}/${ver_maj}/${name}.tar.bz2";
sha256 = "1hxzqg9dfghrhvmnnccwwa4278fh2awkcqy89sla05m08mxvvx60";
};
name = "${p_name}-${ver_maj}.${ver_min}";
nativeBuildInputs = [ pkgconfig intltool ];
buildInputs = [
makeWrapper gst_all_1.gst-plugins-base
gtk dbus_glib libxfce4ui libxfce4util xfconf
taglib libnotify
];
configureFlags = [ "--with-gstreamer=1.0" ];
postInstall = stdenv.lib.optionalString withGstPlugins ''
wrapProgram "$out/bin/parole" --prefix \
GST_PLUGIN_PATH ":" ${stdenv.lib.concatStringsSep ":"
(map (s: s+"/lib/gstreamer-1.0") (with gst_all_1; [
gst-plugins-base gst-plugins-good
gst-plugins-bad gst-plugins-ugly
gst-libav
])) }
'';
meta = {
homepage = "http://goodies.xfce.org/projects/applications/${p_name}";
description = "Modern simple media player";
platforms = stdenv.lib.platforms.linux;
};
}

24
pkgs/desktops/xfce/applications/xfce4-screenshooter.nix Normal file
View File

@ -0,0 +1,24 @@
{ stdenv, fetchurl, pkgconfig, intltool, xfce4panel, libxfce4util, gtk, libsoup
, exo}:
stdenv.mkDerivation rec {
p_name = "xfce4-screenshooter";
ver_maj = "1.8";
ver_min = "1";
src = fetchurl {
url = "mirror://xfce/src/apps/${p_name}/${ver_maj}/${name}.tar.bz2";
sha256 = "40419892bd28989315eed053c159bba0f4264ed8c6c6738806024e481eab9492";
};
name = "${p_name}-${ver_maj}.${ver_min}";
buildInputs = [
pkgconfig intltool xfce4panel libxfce4util gtk libsoup exo
];
meta = {
homepage = http://goodies.xfce.org/projects/applications/xfce4-screenshooter;
description = "Xfce screenshooter";
license = "GPLv2+";
};
}

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

@ -41,12 +41,14 @@ xfce_self = rec { # the lines are very long but it seems better than the even-od
gigolo = callPackage ./applications/gigolo.nix { };
mousepad = callPackage ./applications/mousepad.nix { };
parole = callPackage ./applications/parole.nix { };
ristretto = callPackage ./applications/ristretto.nix { };
terminal = xfce4terminal; # it has changed its name
xfce4mixer = callPackage ./applications/xfce4-mixer.nix { };
xfce4notifyd = callPackage ./applications/xfce4-notifyd.nix { };
xfce4taskmanager= callPackage ./applications/xfce4-taskmanager.nix { };
xfce4terminal = callPackage ./applications/terminal.nix { };
xfce4screenshooter = callPackage ./applications/xfce4-screenshooter.nix { };
#### ART from "mirror://xfce/src/art/${p_name}/${ver_maj}/${name}.tar.bz2"

6
pkgs/development/compilers/closure/default.nix
View File

@ -14,11 +14,11 @@ stdenv.mkDerivation rec {
buildInputs = [ gnutar ];
installPhase = ''
mkdir -p $out/lib/java $out/bin
mkdir -p $out/share/java $out/bin
tar -xzf $src
cp -r compiler.jar $out/lib/java/
cp -r compiler.jar $out/share/java/
echo "#!${bash}/bin/bash" > $out/bin/closure-compiler
echo "${jre}/bin/java -jar $out/lib/java/compiler.jar \"\$@\"" >> $out/bin/closure-compiler
echo "${jre}/bin/java -jar $out/share/java/compiler.jar \"\$@\"" >> $out/bin/closure-compiler
chmod +x $out/bin/closure-compiler
'';

52
pkgs/development/compilers/dmd/default.nix Normal file
View File

@ -0,0 +1,52 @@
{ stdenv, fetchurl, gcc, unzip, curl }:
stdenv.mkDerivation {
name = "dmd-2.064.2";
src = fetchurl {
url = http://downloads.dlang.org/releases/2013/dmd.2.064.2.zip;
sha256 = "1i0jdybigffwyb7c43j0c4aayxx3b93zzqrjxyw6zgp06yhi06pm";
};
buildInputs = [ gcc unzip curl ];
configurePhase = "";
patchPhase = ''
cp src/VERSION src/dmd/
cp license.txt src/phobos/LICENSE_1_0.txt
'';
buildPhase = ''
cd src/dmd
make -f posix.mak INSTALL_DIR=$out
export DMD=$PWD/dmd
cd ../druntime
make -f posix.mak INSTALL_DIR=$out DMD=$DMD
cd ../phobos
make -f posix.mak INSTALL_DIR=$out DMD=$DMD
cd ../..
'';
installPhase = ''
cd src/dmd
tee dmd.conf.default << EOF
[Environment]
DFLAGS=-I$out/import -L-L$out/lib
EOF
make -f posix.mak INSTALL_DIR=$out install
export DMD=$PWD/dmd
cd ../druntime
make -f posix.mak INSTALL_DIR=$out install
cd ../phobos
make -f posix.mak INSTALL_DIR=$out install
cd ../..
'';
meta = {
description = "D language compiler";
homepage = http://dlang.org/;
license = "open source, see included files";
maintainers = with stdenv.lib.maintainers; [ vlstill ];
platforms = stdenv.lib.platforms.unix;
};
}

17
pkgs/development/compilers/llvm/default.nix
View File

@ -1,15 +1,22 @@
{ stdenv, fetchurl, perl, groff, cmake, python, libffi, binutils_gold }:
{ stdenv, fetchurl, perl, groff, cmake, python, libffi, binutils_gold, version }:
let version = "3.4"; in
with { inherit (stdenv.lib) optional; };
assert version == "3.4" || version == "3.3";
stdenv.mkDerivation rec {
name = "llvm-${version}";
src = fetchurl {
url = "http://llvm.org/releases/${version}/llvm-${version}.src.tar.gz";
sha256 = "0a169ba045r4apb9cv6ncrwl83l7yiajnzirkcdlhj1cd4nn3995";
sha256 =
if version == "3.4" then "0a169ba045r4apb9cv6ncrwl83l7yiajnzirkcdlhj1cd4nn3995"
else /*3.3*/ "0y3mfbb5qzcpw3v5qncn69x1hdrrrfirgs82ypi2annhf0g6nxk8";
};
# The default rlimits are too low for shared libraries.
patches = optional (version == "3.3") [ ./more-memory-for-bugpoint.patch ];
# libffi was propagated before, but it wasn't even being used, so
# unless something needs it just an input is fine.
buildInputs = [ perl groff cmake python libffi ]; # ToDo: polly, libc++; enable cxx11?
@ -22,7 +29,9 @@ stdenv.mkDerivation rec {
"-DCMAKE_BUILD_TYPE=Release"
"-DLLVM_ENABLE_FFI=ON"
"-DLLVM_BINUTILS_INCDIR=${binutils_gold}/include"
] ++ lib.optional (!isDarwin) "-DBUILD_SHARED_LIBS=ON";
]
++ optional (version == "3.3") "-DLLVM_EXPERIMENTAL_TARGETS_TO_BUILD=R600" # for mesa
++ optional (!isDarwin) "-DBUILD_SHARED_LIBS=ON";
enableParallelBuilding = true;

127
pkgs/development/compilers/openjdk/default.nix
View File

@ -1,30 +1,6 @@
{ stdenv
, fetchurl
, unzip
, zip
, procps
, coreutils
, alsaLib
, ant
, freetype
, cups
, which
, jdk
, nettools
, libX11
, libXt
, libXext
, libXrender
, libXtst
, libXi
, libXinerama
, libXcursor
, fontconfig
, cpio
, cacert
, jreOnly ? false
, perl
}:
{ stdenv, fetchurl, unzip, zip, procps, coreutils, alsaLib, ant, freetype, cups
, which, jdk, nettools, libX11, libXt, libXext, libXrender, libXtst, libXi, libXinerama
, libXcursor, fontconfig, cpio, cacert, perl, setJavaClassPath }:
let
@ -46,35 +22,20 @@ let
in
stdenv.mkDerivation rec {
name = "openj${if jreOnly then "re" else "dk"}-7u${update}b${build}";
name = "openjdk-7u${update}b${build}";
src = fetchurl {
url = http://www.java.net/download/openjdk/jdk7u40/promoted/b43/openjdk-7u40-fcs-src-b43-26_aug_2013.zip;
sha256 = "15h5nmbw6yn5596ccakqdbs0vd8hmslsfg5sfk8wmjvn31bfmy00";
};
# outputs = [ "out" ] ++ stdenv.lib.optionals (! jreOnly) [ "jre" ];
outputs = [ "out" "jre" ];
buildInputs = [
unzip
procps
ant
which
zip
cpio
nettools
alsaLib
libX11
libXt
libXext
libXrender
libXtst
libXi
libXinerama
libXcursor
fontconfig
perl
];
buildInputs =
[ unzip procps ant which zip cpio nettools alsaLib
libX11 libXt libXext libXrender libXtst libXi libXinerama libXcursor
fontconfig perl
];
NIX_LDFLAGS = "-lfontconfig -lXcursor -lXinerama";
@ -85,13 +46,12 @@ stdenv.mkDerivation rec {
sed -i "s@/bin/echo -e@${coreutils}/bin/echo -e@" \
openjdk/{jdk,corba}/make/common/shared/Defs-utils.gmk
sed -i "s@<Xrender.h>@<X11/extensions/Xrender.h>@" \
openjdk/jdk/src/solaris/native/sun/java2d/x11/XRSurfaceData.c
'';
patches = [ ./cppflags-include-fix.patch ];
NIX_NO_SELF_RPATH = true;
makeFlags = [
"SORT=${coreutils}/bin/sort"
"ALSA_INCLUDE=${alsaLib}/include/alsa/version.h"
@ -108,43 +68,68 @@ stdenv.mkDerivation rec {
"UNLIMITED_CRYPTO=1"
];
configurePhase = ''
make $makeFlags sanity
'';
configurePhase = "true";
installPhase = ''
mkdir -p $out
cp -av build/*/j2${if jreOnly then "re" else "sdk"}-image/* $out
mkdir -p $out/lib/openjdk $out/share $jre/lib/openjdk
cp -av build/*/j2sdk-image/* $out/lib/openjdk
# Move some stuff to top-level.
mv $out/lib/openjdk/include $out/include
mv $out/lib/openjdk/man $out/share/man
# Remove some broken manpages.
rm -rf $out/share/man/ja*
# Remove crap from the installation.
rm -rf $out/demo $out/sample
rm -rf $out/lib/openjdk/demo $out/lib/openjdk/sample
# Move the JRE to a separate output.
mv $out/lib/openjdk/jre $jre/lib/openjdk/
ln -s $jre/lib/openjdk/jre $out/lib/openjdk/jre
# Remove duplicate binaries.
for i in $(cd $out/lib/openjdk/bin && echo *); do
if cmp -s $out/lib/openjdk/bin/$i $jre/lib/openjdk/jre/bin/$i; then
ln -sfn $jre/lib/openjdk/jre/bin/$i $out/lib/openjdk/bin/$i
fi
done
# Generate certificates.
pushd $out/${if ! jreOnly then "jre/" else ""}lib/security
pushd $jre/lib/openjdk/jre/lib/security
rm cacerts
perl ${./generate-cacerts.pl} $out/bin/keytool ${cacert}/etc/ca-bundle.crt
perl ${./generate-cacerts.pl} $jre/lib/openjdk/jre/bin/keytool ${cacert}/etc/ca-bundle.crt
popd
ln -s $out/lib/openjdk/bin $out/bin
ln -s $jre/lib/openjdk/jre/bin $jre/bin
''; # */
# FIXME: this is unnecessary once the multiple-outputs branch is merged.
preFixup = ''
prefix=$jre stripDirs "$stripDebugList" "''${stripDebugFlags:--S}"
patchELF $jre
propagatedNativeBuildInputs+=" $jre"
# Propagate the setJavaClassPath setup hook from the JRE so that
# any package that depends on the JRE has $CLASSPATH set up
# properly.
mkdir -p $jre/nix-support
echo -n "${setJavaClassPath}" > $jre/nix-support/propagated-native-build-inputs
# Set JAVA_HOME automatically.
mkdir -p $out/nix-support
cat <<EOF > $out/nix-support/setup-hook
if [ -n "\$JAVA_HOME" ]; then export JAVA_HOME=$out; fi
EOF
'';
# '' + (if jreOnly then "" else ''
# if [ -z $jre ]; then
# exit 0
# fi
# mkdir -p $jre
# cp -av build/*/j2re-image/* $jre
# '');
meta = {
homepage = http://openjdk.java.net/;
license = "GPLv2";
description = "The open-source Java Development Kit";
maintainers = [ stdenv.lib.maintainers.shlevy ];
platforms = stdenv.lib.platforms.linux;
};

29
pkgs/development/compilers/rdmd/default.nix Normal file
View File

@ -0,0 +1,29 @@
{ stdenv, fetchurl, writeText, lib, dmd }:
stdenv.mkDerivation {
name = "rdmd-2.064";
src = fetchurl {
url = https://raw2.github.com/D-Programming-Language/tools/2.064/rdmd.d;
sha256 = "0b1g3ng6bkanvg00r6xb4ycpbh9x8b9dw589av665azxbcraqrs1";
name = "rdmd-src";
};
buildInputs = [ dmd ];
builder = writeText "drmd-builder.sh" ''
source $stdenv/setup
cp $src rdmd.d
dmd rdmd.d
mkdir -p $out/bin
cp rdmd $out/bin/
'';
meta = {
description = "rdmd wrapper for D language compiler";
homepage = http://dlang.org/rdmd.html;
license = lib.licenses.boost;
maintainers = with stdenv.lib.maintainers; [ vlstill ];
platforms = stdenv.lib.platforms.unix;
};
}

21
pkgs/development/compilers/swi-prolog/default.nix
View File

@ -1,29 +1,32 @@
{ stdenv, fetchurl, gmp, readline, openssl, libjpeg, unixODBC, zlib,
libXinerama, libXft, libXpm, libSM, libXt, freetype, pkgconfig,
fontconfig }:
{ stdenv, fetchurl, gmp, readline, openssl, libjpeg, unixODBC, zlib
, libXinerama, libXft, libXpm, libSM, libXt, freetype, pkgconfig
, fontconfig
}:
let
version = "6.4.1";
version = "6.6.1";
in
stdenv.mkDerivation {
name = "swi-prolog-${version}";
src = fetchurl {
url = "http://www.swi-prolog.org/download/stable/src/pl-${version}.tar.gz";
sha256 = "1szqqwypqfd0qr3sk0qlip1ar22kpqgba6b44klmr1aag0lrahs8";
sha256 = "033b7z60jd1907p9idaa3xzbid2aadhqcdwsa2g9c1c7q8fj1gy8";
};
buildInputs = [gmp readline openssl libjpeg unixODBC libXinerama
libXft libXpm libSM libXt zlib freetype pkgconfig fontconfig];
buildInputs = [ gmp readline openssl libjpeg unixODBC libXinerama
libXft libXpm libSM libXt zlib freetype pkgconfig fontconfig ];
configureFlags = "--with-world --enable-gmp --enable-shared";
makeFlags = "world";
buildFlags = "world";
meta = {
homepage = http://www.swi-prolog.org/;
description = "A Prolog compiler and interpreter";
license = "LGPL";
platforms = stdenv.lib.platforms.unix;
hydraPlatforms = stdenv.lib.platforms.linux;
maintainers = [ stdenv.lib.maintainers.simons ];
};
}

94
pkgs/development/eclipse/ecj/default.nix
View File

@ -1,59 +1,59 @@
{ stdenv, fetchurl, unzip, ant, gcj }:
{ stdenv, fetchurl, unzip, ant, jdk, makeWrapper }:
let
version = "3.7.2";
date = "201202080800";
isGCJ = stdenv.lib.strings.substring 0 3 gcj.name == "gcj";
javaExec = if isGCJ then "gij" else "java";
javaFlags = if isGCJ then "--cp" else "-cp";
in
stdenv.mkDerivation rec {
name = "ecj-${version}";
src = fetchurl {
url = "http://eclipse.ialto.org/eclipse/downloads/drops/R-${version}-${date}/ecjsrc-${version}.jar";
sha256 = "0swyysbyfmv068x8q1c5jqpwk5zb4xahg17aypx5rwb660f8fpbm";
};
stdenv.mkDerivation rec {
name = "ecj-${version}";
buildInputs = [ unzip ant gcj ];
src = fetchurl {
url = "http://eclipse.ialto.org/eclipse/downloads/drops/R-${version}-${date}/ecjsrc-${version}.jar";
sha256 = "0swyysbyfmv068x8q1c5jqpwk5zb4xahg17aypx5rwb660f8fpbm";
};
unpackPhase = ''
mkdir "${name}"
cd "${name}"
unzip "$src"
buildInputs = [ unzip ant jdk makeWrapper ];
unpackPhase = ''
mkdir "${name}"
cd "${name}"
unzip "$src"
'';
# Use whatever compiler Ant knows.
buildPhase = "ant build";
installPhase = ''
mkdir -pv $out/share/java
cp -v *.jar $out/share/java
mkdir -pv $out/bin
makeWrapper ${jdk.jre}/bin/java $out/bin/ecj \
--add-flags "-cp $out/share/java/ecj.jar org.eclipse.jdt.internal.compiler.batch.Main"
# Add a setup hook that causes Ant to use the ECJ.
mkdir -p $out/nix-support
cat <<EOF > $out/nix-support/setup-hook
export NIX_ANT_ARGS="-Dbuild.compiler=org.eclipse.jdt.core.JDTCompilerAdapter \$NIX_ANT_ARGS"
EOF
'';
meta = {
description = "The Eclipse Compiler for Java (ECJ)";
longDescription = ''
ECJ is an incremental Java compiler. Implemented as an Eclipse
builder, it is based on technology evolved from VisualAge for Java
compiler. In particular, it allows users to run and debug code which
still contains unresolved errors.
'';
# Use whatever compiler Ant knows.
buildPhase = "ant build";
homepage = http://www.eclipse.org/jdt/core/index.php;
installPhase = ''
mkdir -pv "$out/lib/java"
cp -v *.jar "$out/lib/java"
# http://www.eclipse.org/legal/epl-v10.html (free software, copyleft)
license = "EPLv1.0";
mkdir -pv "$out/bin"
cat > "$out/bin/ecj" <<EOF
#! /bin/sh
exec "$(type -P ${javaExec})" ${javaFlags} "$out/lib/java/ecj.jar" org.eclipse.jdt.internal.compiler.batch.Main \$@
EOF
chmod u+x "$out/bin/ecj"
'';
meta = {
description = "The Eclipse Compiler for Java (ECJ)";
longDescription = ''
ECJ is an incremental Java compiler. Implemented as an Eclipse
builder, it is based on technology evolved from VisualAge for Java
compiler. In particular, it allows users to run and debug code which
still contains unresolved errors.
'';
homepage = http://www.eclipse.org/jdt/core/index.php;
# http://www.eclipse.org/legal/epl-v10.html (free software, copyleft)
license = "EPLv1.0";
maintainers = [ ];
};
}
platforms = stdenv.lib.platforms.linux;
};
}

47
pkgs/development/interpreters/clojure/binary.nix
View File

@ -1,47 +0,0 @@
{stdenv, fetchurl, unzip}:
stdenv.mkDerivation rec {
version = "1.5.1";
name = "clojure-binary-${version}";
src = fetchurl {
url = "http://repo1.maven.org/maven2/org/clojure/clojure/${version}/clojure-${version}.zip";
sha256 = "1qgiji6ddvv40khp3qb3xfz09g7p4nnsh3pywqglb9f16v534yzy";
};
buildInputs = [ unzip ];
phases = "unpackPhase installPhase";
installPhase = "
mkdir -p $out/lib/java
cp clojure-${version}.jar clojure.jar
install -t $out/lib/java clojure.jar
";
meta = {
description = "a Lisp dialect for the JVM";
homepage = http://clojure.org/;
license = stdenv.lib.licenses.bsd3;
longDescription = ''
Clojure is a dynamic programming language that targets the Java
Virtual Machine. It is designed to be a general-purpose language,
combining the approachability and interactive development of a
scripting language with an efficient and robust infrastructure for
multithreaded programming. Clojure is a compiled language - it
compiles directly to JVM bytecode, yet remains completely
dynamic. Every feature supported by Clojure is supported at
runtime. Clojure provides easy access to the Java frameworks, with
optional type hints and type inference, to ensure that calls to Java
can avoid reflection.
Clojure is a dialect of Lisp, and shares with Lisp the code-as-data
philosophy and a powerful macro system. Clojure is predominantly a
functional programming language, and features a rich set of immutable,
persistent data structures. When mutable state is needed, Clojure
offers a software transactional memory system and reactive Agent
system that ensure clean, correct, multithreaded designs.
'';
};
}

11
pkgs/development/interpreters/clojure/clooj-wrapper.nix
View File

@ -1,11 +0,0 @@
{writeTextFile, jre, clooj}:
writeTextFile {
name = "clooj-wrapper";
executable = true;
destination = "/bin/clooj";
text = ''
#!/bin/sh
exec ${jre}/bin/java -jar ${clooj}/lib/java/clooj.jar
'';
}

25
pkgs/development/interpreters/clojure/clooj.nix
View File

@ -1,24 +1,27 @@
{stdenv, fetchurl}:
{ stdenv, fetchurl, jre, makeWrapper }:
let
jar = fetchurl {
url = https://github.com/downloads/arthuredelstein/clooj/clooj-0.1.36-STANDALONE.jar;
sha256 = "173c66c0aade3ae5d21622f629e60efa51a03ad83c087b02c25e806c5b7f838c";
};
in
let version = "0.4.4"; in
stdenv.mkDerivation {
name = "clooj-0.1.32";
name = "clooj-${version}";
jar = fetchurl {
url = "http://www.mediafire.com/download/prkf64humftrmz3/clooj-${version}-standalone.jar";
sha256 = "0hbc29bg2a86rm3sx9kvj7h7db9j0kbnrb706wsfiyk3zi3bavnd";
};
buildInputs = [ makeWrapper ];
phases = "installPhase";
installPhase = ''
mkdir -p $out/lib/java
ln -s ${jar} $out/lib/java/clooj.jar
mkdir -p $out/share/java
ln -s $jar $out/share/java/clooj.jar
makeWrapper ${jre}/bin/java $out/bin/clooj --add-flags "-jar $out/share/java/clooj.jar"
'';
meta = {
description = "clooj, a lightweight IDE for clojure";
description = "A lightweight IDE for Clojure";
homepage = https://github.com/arthuredelstein/clooj;
license = stdenv.lib.licenses.bsd3;
};

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

@ -1,30 +1,27 @@
{stdenv, fetchurl, unzip, ant, version ? "1.4.0" }:
{ stdenv, fetchurl, unzip, ant, jdk, makeWrapper }:
let version = "1.5.1"; in
let
src_hashes = {
"1.4.0" = "27a5a151d5cc1bc3e52dff47c66111e637fefeb42d9bedfa1284a1a31d080171";
"1.5.0-RC1" = "111jm0nxkvqr1vrwcpvr70v5paasp8msrj5h8zm1c144c8zc1vln";
};
in
stdenv.mkDerivation {
name = "clojure-${version}";
src = fetchurl {
url = "http://repo1.maven.org/maven2/org/clojure/clojure/${version}/clojure-${version}.zip";
sha256 = (builtins.getAttr version src_hashes);
sha256 = "1qgiji6ddvv40khp3qb3xfz09g7p4nnsh3pywqglb9f16v534yzy";
};
buildInputs = [ unzip ant ];
buildInputs = [ unzip ant jdk makeWrapper ];
buildPhase = "ant jar";
installPhase = "
mkdir -p $out/lib/java
install -t $out/lib/java clojure.jar
";
installPhase = ''
mkdir -p $out/share/java $out/bin
install -t $out/share/java clojure.jar
makeWrapper ${jdk.jre}/bin/java $out/bin/clojure --add-flags "-cp $out/share/java/clojure.jar clojure.main"
'';
meta = {
description = "a Lisp dialect for the JVM";
description = "A Lisp dialect for the JVM";
homepage = http://clojure.org/;
license = stdenv.lib.licenses.bsd3;
longDescription = ''

11
pkgs/development/interpreters/clojure/wrapper.nix
View File

@ -1,11 +0,0 @@
{writeTextFile, jre, clojure}:
writeTextFile {
name = "clojure-wrapper";
executable = true;
destination = "/bin/clojure";
text = ''
#!/bin/sh
exec ${jre}/bin/java -cp ${clojure}/lib/java/clojure.jar clojure.main
'';
}

5
pkgs/development/interpreters/kaffe/builder.sh
View File

@ -1,5 +0,0 @@
source $stdenv/setup || exit 1
configureFlags="--with-jikes=$jikes/bin/jikes --enable-pure-java-math"
genericBuild

14
pkgs/development/interpreters/kaffe/default.nix
View File

@ -1,14 +0,0 @@
{stdenv, fetchurl, alsaLib, xlibs, jikes}:
stdenv.mkDerivation {
name = "kaffe-1.1.4";
builder = ./builder.sh;
src = fetchurl {
url = ftp://ftp.kaffe.org/pub/kaffe/v1.1.x-development/kaffe-1.1.4.tar.gz;
md5 = "94d6e7035ba68c2221dce68bb5b3f6e9";
};
inherit jikes alsaLib;
inherit (xlibs) libXaw libX11;
buildInputs = [jikes alsaLib xlibs.libXaw xlibs.libX11];
}

4
pkgs/development/interpreters/lua-5/5.2.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchurl, readline }:
{ stdenv, fetchurl, readline, compat ? false }:
let
dsoPatch = fetchurl {
@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
patches = [ dsoPatch ];
configurePhase = ''
makeFlagsArray=( INSTALL_TOP=$out INSTALL_MAN=$out/share/man/man1 PLAT=linux CFLAGS="-DLUA_USE_LINUX -O2 -fPIC" LDLAGS="-fPIC" V=${majorVersion} R=${version} )
makeFlagsArray=( INSTALL_TOP=$out INSTALL_MAN=$out/share/man/man1 PLAT=linux CFLAGS="-DLUA_USE_LINUX -O2 -fPIC${if compat then " -DLUA_COMPAT_ALL" else ""}" LDLAGS="-fPIC" V=${majorVersion} R=${version} )
installFlagsArray=( TO_BIN="lua luac" TO_LIB="liblua.a liblua.so liblua.so.${majorVersion} liblua.so.${version}" INSTALL_DATA='cp -d' )
'';

13
pkgs/development/interpreters/maude/default.nix
View File

@ -15,12 +15,17 @@ stdenv.mkDerivation rec {
buildInputs = [flex bison ncurses buddy tecla gmpxx libsigsegv makeWrapper];
configurePhase = ''./configure --disable-dependency-tracking --prefix=$out --datadir=$out/share/maude TECLA_LIBS="-ltecla -lncursesw" CFLAGS="-O3" CXXFLAGS="-O3"'';
preConfigure = ''
configureFlagsArray=(
--datadir=$out/share/maude
TECLA_LIBS="-ltecla -lncursesw"
CFLAGS="-O3" CXXFLAGS="-O3"
)
'';
doCheck = true;
postInstall =
''
postInstall = ''
for n in "$out/bin/"*; do wrapProgram "$n" --suffix MAUDE_LIB ':' "$out/share/maude"; done
mkdir -p $out/share/maude
cp ${fullMaude} $out/share/maude/full-maude.maude
@ -41,7 +46,7 @@ stdenv.mkDerivation rec {
rewriting logic computation.
'';
platforms = stdenv.lib.platforms.all;
hydraPlatforms = stdenv.lib.platforms.linux;
maintainers = [ stdenv.lib.maintainers.simons ];
};
}

13
pkgs/development/libraries/accountservice/default.nix Normal file
View File

@ -0,0 +1,13 @@
{ stdenv, fetchurl, pkgconfig, glib, intltool, libtool, gobjectIntrospection, polkit }:
stdenv.mkDerivation rec {
name = "accountsservice-0.6.35";
src = fetchurl {
url = http://www.freedesktop.org/software/accountsservice/accountsservice-0.6.35.tar.xz;
sha256 = "0f1hzl6hw56xvwgmd4yvmdyj15xj1fafw45pzv3qarww7h0wg8b5";
};
buildInputs = [ pkgconfig glib intltool libtool gobjectIntrospection polkit ];
}

2
pkgs/development/libraries/cppunit/default.nix
View File

@ -11,7 +11,7 @@ stdenv.mkDerivation {
meta = {
homepage = "http://sourceforge.net/apps/mediawiki/cppunit/";
description = "C++ unit testing framework";
platforms = stdenv.lib.platforms.linux;
platforms = stdenv.lib.platforms.linux ++ stdenv.lib.platforms.darwin;
maintainers = [ stdenv.lib.maintainers.simons ];
};
}

4
pkgs/development/libraries/gmp/5.1.1.nix → pkgs/development/libraries/gmp/5.1.3.nix
View File

@ -1,11 +1,11 @@
{ stdenv, fetchurl, m4, cxx ? true }:
stdenv.mkDerivation rec {
name = "gmp-5.1.1";
name = "gmp-5.1.3";
src = fetchurl {
urls = [ "mirror://gnu/gmp/${name}.tar.bz2" "ftp://ftp.gmplib.org/pub/${name}/${name}.tar.bz2" ];
sha256 = "1bdgf04k2i12pfivxgjq68iarz3ngix9hpzbmkgijrdk92gpgm50";
sha256 = "0q5i39pxrasgn9qdxzpfbwhh11ph80p57x6hf48m74261d97j83m";
};
nativeBuildInputs = [ m4 ];

34
pkgs/development/libraries/gstreamer/bad/default.nix Normal file
View File

@ -0,0 +1,34 @@
{ stdenv, fetchurl, pkgconfig, python, gst-plugins-base, orc
, faac, faad2, libass, libkate, libmms
, libmodplug, mpeg2dec, mpg123
, openjpeg, libopus, librsvg
, timidity, libvdpau, wayland
, libwebp, xvidcore, gnutls
}:
stdenv.mkDerivation rec {
name = "gst-plugins-bad-1.2.2";
meta = {
homepage = "http://gstreamer.freedesktop.org";
license = stdenv.lib.licenses.gpl2Plus;
platforms = stdenv.lib.platforms.linux;
maintainers = with stdenv.lib.maintainers; [ iyzsong ];
};
src = fetchurl {
url = "${meta.homepage}/src/gst-plugins-bad/${name}.tar.xz";
sha256 = "63e78db11b482d0529a0bde01e2ac23fd32c7cb99a5508b53ee4ca1051871b2c";
};
nativeBuildInputs = [ pkgconfig python ];
buildInputs = [
gst-plugins-base orc
faac faad2 libass libkate libmms
libmodplug mpeg2dec mpg123
openjpeg libopus librsvg
timidity libvdpau wayland
libwebp xvidcore gnutls
];
}

32
pkgs/development/libraries/gstreamer/base/default.nix Normal file
View File

@ -0,0 +1,32 @@
{ stdenv, fetchurl, pkgconfig, python, gstreamer, gobjectIntrospection
, orc, alsaLib, libXv, pango, libtheora
, cdparanoia, libvisual
}:
stdenv.mkDerivation rec {
name = "gst-plugins-base-1.2.2";
meta = {
description = "Base plugins and helper libraries";
homepage = "http://gstreamer.freedesktop.org";
license = stdenv.lib.licenses.lgpl2Plus;
platforms = stdenv.lib.platforms.linux;
maintainers = with stdenv.lib.maintainers; [ iyzsong ];
};
src = fetchurl {
url = "${meta.homepage}/src/gst-plugins-base/${name}.tar.xz";
sha256 = "fa90cf21eac0a77f9393100356aef99ae42072c31dc218d3ae2e7f86cd5ced69";
};
nativeBuildInputs = [
pkgconfig python gobjectIntrospection
];
buildInputs = [
orc alsaLib libXv pango libtheora
cdparanoia libvisual
];
propagatedBuildInputs = [ gstreamer ];
}

26
pkgs/development/libraries/gstreamer/core/default.nix Normal file
View File

@ -0,0 +1,26 @@
{ stdenv, fetchurl, pkgconfig, perl, bison, flex, python, gobjectIntrospection
, glib
}:
stdenv.mkDerivation rec {
name = "gstreamer-1.2.2";
meta = {
description = "Open source multimedia framework";
homepage = "http://gstreamer.freedesktop.org";
license = stdenv.lib.licenses.lgpl2Plus;
platforms = stdenv.lib.platforms.linux;
maintainers = with stdenv.lib.maintainers; [ iyzsong ];
};
src = fetchurl {
url = "${meta.homepage}/src/gstreamer/${name}.tar.xz";
sha256 = "b9f12137ab663edc6c37429b38ca7911074b9c2a829267fe855d4e57d916a0b6";
};
nativeBuildInputs = [
pkgconfig perl bison flex python gobjectIntrospection
];
propagatedBuildInputs = [ glib ];
}

15
pkgs/development/libraries/gstreamer/default.nix Normal file
View File

@ -0,0 +1,15 @@
{ callPackage }:
rec {
gstreamer = callPackage ./core { };
gst-plugins-base = callPackage ./base { inherit gstreamer; };
gst-plugins-good = callPackage ./good { inherit gst-plugins-base; };
gst-plugins-bad = callPackage ./bad { inherit gst-plugins-base; };
gst-plugins-ugly = callPackage ./ugly { inherit gst-plugins-base; };
gst-libav = callPackage ./libav { inherit gst-plugins-base; };
}

33
pkgs/development/libraries/gstreamer/good/default.nix Normal file
View File

@ -0,0 +1,33 @@
{ stdenv, fetchurl, pkgconfig, python
, gst-plugins-base, orc, bzip2
, libv4l, libdv, libavc1394, libiec61883
, libvpx, speex, flac, taglib
, cairo, gdk_pixbuf, aalib, libcaca
, libsoup, pulseaudio
}:
stdenv.mkDerivation rec {
name = "gst-plugins-good-1.2.2";
meta = {
homepage = "http://gstreamer.freedesktop.org";
license = stdenv.lib.licenses.gpl2Plus;
platforms = stdenv.lib.platforms.linux;
maintainers = with stdenv.lib.maintainers; [ iyzsong ];
};
src = fetchurl {
url = "${meta.homepage}/src/gst-plugins-good/${name}.tar.xz";
sha256 = "6c090f00e8e4588f12807bd9fbb06a03b84a512c93e84d928123ee4a42228a81";
};
nativeBuildInputs = [ pkgconfig python ];
buildInputs = [
gst-plugins-base orc bzip2
libv4l libdv libavc1394 libiec61883
libvpx speex flac taglib
cairo gdk_pixbuf aalib libcaca
libsoup pulseaudio
];
}

0
pkgs/development/libraries/gstreamer/gnonlin/default.nix → pkgs/development/libraries/gstreamer/legacy/gnonlin/default.nix
View File

0
pkgs/development/libraries/gstreamer/gst-ffmpeg/default.nix → pkgs/development/libraries/gstreamer/legacy/gst-ffmpeg/default.nix
View File

0
pkgs/development/libraries/gstreamer/gst-plugins-bad/default.nix → pkgs/development/libraries/gstreamer/legacy/gst-plugins-bad/default.nix
View File

0
pkgs/development/libraries/gstreamer/gst-plugins-base/default.nix → pkgs/development/libraries/gstreamer/legacy/gst-plugins-base/default.nix
View File

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

0
pkgs/development/libraries/gstreamer/gst-plugins-good/v4l.patch → pkgs/development/libraries/gstreamer/legacy/gst-plugins-good/v4l.patch
View File

0
pkgs/development/libraries/gstreamer/gst-plugins-ugly/default.nix → pkgs/development/libraries/gstreamer/legacy/gst-plugins-ugly/default.nix
View File

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

0
pkgs/development/libraries/gstreamer/gstreamer/default.nix → pkgs/development/libraries/gstreamer/legacy/gstreamer/default.nix
View File

0
pkgs/development/libraries/gstreamer/gstreamer/setup-hook.sh → pkgs/development/libraries/gstreamer/legacy/gstreamer/setup-hook.sh
View File

0
pkgs/development/libraries/gstreamer/qt-gstreamer/boost1.48.patch → pkgs/development/libraries/gstreamer/legacy/qt-gstreamer/boost1.48.patch
View File

0
pkgs/development/libraries/gstreamer/qt-gstreamer/default.nix → pkgs/development/libraries/gstreamer/legacy/qt-gstreamer/default.nix
View File

35
pkgs/development/libraries/gstreamer/libav/default.nix Normal file
View File

@ -0,0 +1,35 @@
{ stdenv, fetchurl, pkgconfig, python, yasm
, gst-plugins-base, orc, bzip2
, withSystemLibav ? true, libav ? null
}:
assert withSystemLibav -> libav != null;
stdenv.mkDerivation rec {
name = "gst-libav-1.2.2";
meta = {
homepage = "http://gstreamer.freedesktop.org";
license = stdenv.lib.licenses.lgpl2Plus;
platforms = stdenv.lib.platforms.linux;
maintainers = with stdenv.lib.maintainers; [ iyzsong ];
};
src = fetchurl {
url = "${meta.homepage}/src/gst-libav/${name}.tar.xz";
sha256 = "585eb7971006100ad771a852e07bd2f3e23bcc6eb0b1253a40b5a0e40e4e7418";
};
configureFlags = stdenv.lib.optionalString withSystemLibav
"--with-system-libav";
nativeBuildInputs = with stdenv.lib;
[ pkgconfig python ]
++ optional (!withSystemLibav) yasm
;
buildInputs = with stdenv.lib;
[ gst-plugins-base orc bzip2 ]
++ optional withSystemLibav libav
;
}

29
pkgs/development/libraries/gstreamer/ugly/default.nix Normal file
View File

@ -0,0 +1,29 @@
{ stdenv, fetchurl, pkgconfig, python
, gst-plugins-base, orc
, a52dec, libcdio, libdvdread
, lame, libmad, libmpeg2, x264
}:
stdenv.mkDerivation rec {
name = "gst-plugins-ugly-1.2.2";
meta = {
homepage = "http://gstreamer.freedesktop.org";
license = stdenv.lib.licenses.lgpl2Plus;
platforms = stdenv.lib.platforms.linux;
maintainers = with stdenv.lib.maintainers; [ iyzsong ];
};
src = fetchurl {
url = "${meta.homepage}/src/gst-plugins-ugly/${name}.tar.xz";
sha256 = "4b6aac272a5be0d68f365ef6fba0f829fc5c1d1d601bb4dd9e85f5289b2b56c3";
};
nativeBuildInputs = [ pkgconfig python ];
buildInputs = [
gst-plugins-base orc
a52dec libcdio libdvdread
lame libmad libmpeg2 x264
];
}

5
pkgs/development/libraries/gtk-sharp-1/default.nix
View File

@ -23,7 +23,10 @@ stdenv.mkDerivation {
md5 = "2651d14fe77174ab20b8af53d150ee11";
};
patches = [ ./dllmap-glue.patch ];
patches = [
./dllmap-glue.patch
./glib-include.patch
];
buildInputs = [
pkgconfig mono glib pango gtk GConf libglade libgnomecanvas

24
pkgs/development/libraries/gtk-sharp-1/glib-include.patch Normal file
View File

@ -0,0 +1,24 @@
diff -ru gtk-sharp-1.0.6.orig/glib/glue/list.c gtk-sharp-1.0.6/glib/glue/list.c
--- gtk-sharp-1.0.6.orig/glib/glue/list.c 2014-01-09 10:58:06.727352451 +0000
+++ gtk-sharp-1.0.6/glib/glue/list.c 2014-01-09 11:00:34.256583614 +0000
@@ -20,7 +20,7 @@
*/
-#include <glib/glist.h>
+#include <glib.h>
/* Forward declarations */
gpointer gtksharp_list_get_data (GList *l);
diff -ru gtk-sharp-1.0.6.orig/glib/glue/slist.c gtk-sharp-1.0.6/glib/glue/slist.c
--- gtk-sharp-1.0.6.orig/glib/glue/slist.c 2014-01-09 10:58:06.727352451 +0000
+++ gtk-sharp-1.0.6/glib/glue/slist.c 2014-01-09 11:00:47.572695223 +0000
@@ -20,7 +20,7 @@
*/
-#include <glib/gslist.h>
+#include <glib.h>
/* Forward declarations */
gpointer gtksharp_slist_get_data (GSList *l);

15
pkgs/development/libraries/haskell/aeson-lens/default.nix Normal file
View File

@ -0,0 +1,15 @@
{ cabal, aeson, doctest, lens, text, unorderedContainers, vector }:
cabal.mkDerivation (self: {
pname = "aeson-lens";
version = "0.5.0.0";
sha256 = "1pr8cxkx41wi7095cp1gpqrwadwx6azcrdi1kr1ik0fs6606dkks";
buildDepends = [ aeson lens text unorderedContainers vector ];
testDepends = [ doctest ];
meta = {
description = "Lens of Aeson";
license = self.stdenv.lib.licenses.bsd3;
platforms = self.ghc.meta.platforms;
maintainers = [ self.stdenv.lib.maintainers.ocharles ];
};
})

27
pkgs/development/libraries/haskell/aws/default.nix Normal file
View File

@ -0,0 +1,27 @@
{ cabal, attempt, base64Bytestring, blazeBuilder, caseInsensitive
, cereal, conduit, cryptoApi, cryptohash, cryptohashCryptoapi
, dataDefault, failure, filepath, httpConduit, httpTypes
, liftedBase, monadControl, mtl, resourcet, text, time
, transformers, utf8String, xmlConduit
}:
cabal.mkDerivation (self: {
pname = "aws";
version = "0.8.4";
sha256 = "0p4m07lw33wd82phwfvyr1alqx3bsafnf25n60h1mss7l0rzyn0i";
isLibrary = true;
isExecutable = true;
buildDepends = [
attempt base64Bytestring blazeBuilder caseInsensitive cereal
conduit cryptoApi cryptohash cryptohashCryptoapi dataDefault
failure filepath httpConduit httpTypes liftedBase monadControl mtl
resourcet text time transformers utf8String xmlConduit
];
meta = {
homepage = "http://github.com/aristidb/aws";
description = "Amazon Web Services (AWS) for Haskell";
license = self.stdenv.lib.licenses.bsd3;
platforms = self.ghc.meta.platforms;
maintainers = [ self.stdenv.lib.maintainers.ocharles ];
};
})

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

@ -4,8 +4,8 @@
cabal.mkDerivation (self: {
pname = "blaze-html";
version = "0.6.1.2";
sha256 = "09a9gp40y31im763bri755if5j369a8m4kkl3c4wabq8q21y8z7m";
version = "0.6.1.3";
sha256 = "0hjyi3iv2770wicgfjipa901vk7mwr8kknfqvj3v9kzcvb4lq5aq";
buildDepends = [ blazeBuilder blazeMarkup text ];
testDepends = [
blazeBuilder blazeMarkup HUnit QuickCheck testFramework

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

@ -4,8 +4,8 @@
cabal.mkDerivation (self: {
pname = "blaze-markup";
version = "0.5.1.6";
sha256 = "09w0mwws1xz0h0h99n6ppbdycnrv5y74x6asgzvrzqaslrp5rhvm";
version = "0.5.1.7";
sha256 = "0wwr2jlydf5mkqg1mckwh9nqw8g830h2xrz1331j1hfsap53y6ky";
buildDepends = [ blazeBuilder text ];
testDepends = [
blazeBuilder HUnit QuickCheck testFramework testFrameworkHunit

22
pkgs/development/libraries/haskell/digestive-functors-aeson/default.nix Normal file
View File

@ -0,0 +1,22 @@
{ cabal, aeson, aesonLens, digestiveFunctors, HUnit, lens, mtl
, safe, tasty, tastyHunit, text, vector
}:
cabal.mkDerivation (self: {
pname = "digestive-functors-aeson";
version = "1.1.3";
sha256 = "0194yd2b9irm1gmk3d8awrsrmsr4lml63wr4vm8a92s7w3hdy0db";
buildDepends = [
aeson aesonLens digestiveFunctors lens safe text vector
];
testDepends = [
aeson digestiveFunctors HUnit mtl tasty tastyHunit text
];
meta = {
homepage = "http://github.com/ocharles/digestive-functors-aeson";
description = "Run digestive-functors forms against JSON";
license = self.stdenv.lib.licenses.gpl3;
platforms = self.ghc.meta.platforms;
maintainers = [ self.stdenv.lib.maintainers.ocharles ];
};
})

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

@ -2,8 +2,8 @@
cabal.mkDerivation (self: {
pname = "fast-logger";
version = "2.1.2";
sha256 = "0kz31jfhc40wlw3b49zcsn97y6vc9qqnaci743mgjskv4zbqaf34";
version = "2.1.4";
sha256 = "1fb75wx1v9h7690x43kd85lq1h9zi8nq438pqclzzrcfidsnm6z5";
buildDepends = [ blazeBuilder filepath text ];
testDepends = [ hspec ];
meta = {

15
pkgs/development/libraries/haskell/gloss-raster/default.nix Normal file
View File

@ -0,0 +1,15 @@
{ cabal, gloss, llvm, repa }:
cabal.mkDerivation (self: {
pname = "gloss-raster";
version = "1.8.1.1";
sha256 = "0qqk2fizmv1zdvi8lljxiqdwlmfzni4qzsdvm2jbvgg5qjx9l9qp";
buildDepends = [ gloss repa ];
extraLibraries = [ llvm ];
meta = {
homepage = "http://gloss.ouroborus.net";
description = "Parallel rendering of raster images";
license = self.stdenv.lib.licenses.mit;
platforms = self.ghc.meta.platforms;
};
})

22
pkgs/development/libraries/haskell/hsimport/default.nix Normal file
View File

@ -0,0 +1,22 @@
{ cabal, attoparsec, cmdargs, filepath, haskellSrcExts, lens, mtl
, split, tasty, tastyGolden, text
}:
cabal.mkDerivation (self: {
pname = "hsimport";
version = "0.2.6.8";
sha256 = "0brz7lxbnkwhjlbvs7xk3012mp9419v9wpczwa3nahl5afzbsp3i";
isLibrary = true;
isExecutable = true;
buildDepends = [
attoparsec cmdargs haskellSrcExts lens mtl split text
];
testDepends = [ filepath tasty tastyGolden ];
doCheck = false;
meta = {
description = "A command line program for extending the import list of a Haskell source file";
license = self.stdenv.lib.licenses.bsd3;
platforms = self.ghc.meta.platforms;
maintainers = [ self.stdenv.lib.maintainers.ocharles ];
};
})

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

@ -2,8 +2,8 @@
cabal.mkDerivation (self: {
pname = "http-attoparsec";
version = "0.1.0";
sha256 = "1ncdjzgb5kv20y9kps4nawvbwaqnfil9g552if638vv8hag8cwq9";
version = "0.1.1";
sha256 = "12l892fix11mrvm10awwvv31y59q5rb6gb0sqjp6l4p4ym9ngqa3";
buildDepends = [ attoparsec httpTypes ];
meta = {
homepage = "https://github.com/tlaitinen/http-attoparsec";

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

@ -6,8 +6,8 @@
cabal.mkDerivation (self: {
pname = "http-client";
version = "0.2.0.3";
sha256 = "0dy0nf92404hlg4f4zifx6b1qs5wadgky7snqrizl5kk5af43i4h";
version = "0.2.1";
sha256 = "1hwr8pjlal88b6clmrs0cksmyy1vmbybvr78s6kb2ppwrzmd2v8q";
buildDepends = [
base64Bytestring blazeBuilder caseInsensitive cookie dataDefault
deepseq failure httpTypes network publicsuffixlist text time

28
pkgs/development/libraries/haskell/io-streams/default.nix Normal file
View File

@ -0,0 +1,28 @@
{ cabal, attoparsec, blazeBuilder, deepseq, filepath, HUnit, mtl
, network, primitive, QuickCheck, testFramework, testFrameworkHunit
, testFrameworkQuickcheck2, text, time, transformers, vector, zlib
, zlibBindings
}:
cabal.mkDerivation (self: {
pname = "io-streams";
version = "1.1.4.0";
sha256 = "0fkys15ih3ld4l5rqjlsmhdkf9w3xnhj6hbbahazx7pj0xsv1hyh";
buildDepends = [
attoparsec blazeBuilder network primitive text time transformers
vector zlibBindings
];
testDepends = [
attoparsec blazeBuilder deepseq filepath HUnit mtl network
primitive QuickCheck testFramework testFrameworkHunit
testFrameworkQuickcheck2 text time transformers vector zlib
zlibBindings
];
configureFlags = "-fNoInteractiveTests";
meta = {
description = "Simple, composable, and easy-to-use stream I/O";
license = self.stdenv.lib.licenses.bsd3;
platforms = self.ghc.meta.platforms;
maintainers = [ self.stdenv.lib.maintainers.ocharles ];
};
})

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

@ -6,8 +6,8 @@
cabal.mkDerivation (self: {
pname = "linear";
version = "1.3.1.1";
sha256 = "174pqqc2gx8aigm51hfg7di35qbx65sgcqv6y1p25c2853g9h97y";
version = "1.4";
sha256 = "1a2l68q0l2vlp4wpf5wqvpnag326s38k2ifh8hcfczjhsg9cq45a";
buildDepends = [
binary distributive hashable reflection semigroupoids semigroups
tagged transformers unorderedContainers vector

4
pkgs/development/libraries/haskell/parsers/0.10.1.2.nix → pkgs/development/libraries/haskell/parsers/0.10.2.nix
View File

@ -4,8 +4,8 @@
cabal.mkDerivation (self: {
pname = "parsers";
version = "0.10.1.2";
sha256 = "1malfr2ls7f6di2rj2jcyxyqvjz0vb3p3v06j0r9if1bkjfzfp2j";
version = "0.10.2";
sha256 = "092wck874sdyyh4aql5kzsm8k9a7dscgndvzarhh98by5k3n45bk";
buildDepends = [
charset parsec text transformers unorderedContainers
];

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

@ -1,23 +1,23 @@
{ cabal, aeson, attoparsec, base64Bytestring, blazeHtml
, blazeMarkup, conduit, hspec, liftedBase, monadControl
, monadLogger, pathPieces, poolConduit, resourcet, silently, sqlite
, text, time, transformers, transformersBase, unorderedContainers
, vector
, monadLogger, pathPieces, poolConduit, resourcet, scientific
, silently, sqlite, text, time, transformers, transformersBase
, unorderedContainers, vector
}:
cabal.mkDerivation (self: {
pname = "persistent";
version = "1.3.0";
sha256 = "03m2knmjkm25n48shqc7i7mjr0npwdq2dva8ygv9imzjdcb1146m";
version = "1.3.0.2";
sha256 = "16bq0l6nqjpzlbzm47ip2m8b5yhwhf28fpv3hxy7qsnzmy7siv6y";
buildDepends = [
aeson attoparsec base64Bytestring blazeHtml blazeMarkup conduit
liftedBase monadControl monadLogger pathPieces poolConduit
resourcet silently text time transformers transformersBase
unorderedContainers vector
resourcet scientific silently text time transformers
transformersBase unorderedContainers vector
];
testDepends = [
aeson attoparsec base64Bytestring blazeHtml conduit hspec
monadControl monadLogger pathPieces resourcet text time
monadControl monadLogger pathPieces resourcet scientific text time
transformers unorderedContainers vector
];
extraLibraries = [ sqlite ];

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

@ -5,8 +5,8 @@
cabal.mkDerivation (self: {
pname = "postgresql-simple";
version = "0.4.0.1";
sha256 = "03lj7z0n6yx55xap9606slcp0yiignwild7sibkrmg05jkb193nn";
version = "0.4.0.2";
sha256 = "0gx9jmmzv6aaa6z88i3j51f5hp153dbwzw3x7jx329c5pjp536g9";
buildDepends = [
aeson attoparsec blazeBuilder blazeTextual postgresqlLibpq text
time transformers uuid vector

10
pkgs/development/libraries/haskell/quickcheck-instances/default.nix
View File

@ -1,10 +1,12 @@
{ cabal, QuickCheck, text, time }:
{ cabal, hashable, QuickCheck, text, time, unorderedContainers }:
cabal.mkDerivation (self: {
pname = "quickcheck-instances";
version = "0.3.5";
sha256 = "1ak55d3yi6ii01921zihn8mk12mws78w05gmhk766kpylhhgni5f";
buildDepends = [ QuickCheck text time ];
version = "0.3.6";
sha256 = "1vaqwsdgi2mirplzg66zysc1ivjjr0qxyiibsh6j771hxs9qk2pr";
buildDepends = [
hashable QuickCheck text time unorderedContainers
];
meta = {
homepage = "https://github.com/aslatter/qc-instances";
description = "Common quickcheck instances";

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

@ -8,7 +8,6 @@ cabal.mkDerivation (self: {
sha256 = "0xwxds884pqywjbc4j6qkx27nbi64sihig8ps9v884sk08021wrp";
buildDepends = [ deepseq hashable text ];
testDepends = [ smallcheck tasty tastySmallcheck text ];
doCheck = false;
meta = {
homepage = "https://github.com/basvandijk/scientific";
description = "Arbitrary-precision floating-point numbers represented using scientific notation";

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

@ -3,8 +3,8 @@
cabal.mkDerivation (self: {
pname = "shelly";
version = "1.4.0.1";
sha256 = "0hra0dk1zma15jd1cag04lcvw6cmddhghi4gpajrrvyij0pi6ij7";
version = "1.4.0.2";
sha256 = "1034jc86mci1ia3wk5gjxzn936cz4a159imikjgljqvyv8vrw1ck";
buildDepends = [
mtl systemFileio systemFilepath text time unixCompat
];

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