ilyakooo0/nixpkgs
1
0
Fork 0
mirror of https://github.com/ilyakooo0/nixpkgs.git synced 2024-12-26 21:33:03 +03:00
Code Issues Projects Releases Wiki Activity

Merge branch 'master' into staging

Browse Source
This commit is contained in:
Thomas Tuegel 2015-04-10 07:45:38 -05:00
commit 88918e10e9
156 changed files with 2541 additions and 1824 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.travis.yml
View File

@ -1,5 +1,6 @@
language: python
python: "3.4"
sudo: required
before_install: ./maintainers/scripts/travis-nox-review-pr.sh nix
install: ./maintainers/scripts/travis-nox-review-pr.sh nox
script: ./maintainers/scripts/travis-nox-review-pr.sh build

10
README.md
View File

@ -1,8 +1,11 @@
Nixpkgs is a collection of packages for [Nix](https://nixos.org/nix/) package
manager.
[<img src="http://nixos.org/logo/nixos-hires.png" width="500px" alt="logo" />
](https://nixos.org/nixos)
[![Build Status](https://travis-ci.org/NixOS/nixpkgs.svg?branch=master)](https://travis-ci.org/NixOS/nixpkgs) [![Issue Stats](http://www.issuestats.com/github/nixos/nixpkgs/badge/pr)](http://www.issuestats.com/github/nixos/nixpkgs) [![Issue Stats](http://www.issuestats.com/github/nixos/nixpkgs/badge/issue)](http://www.issuestats.com/github/nixos/nixpkgs)
Nixpkgs is a collection of packages for [Nix](https://nixos.org/nix/) package
manager.
[NixOS](https://nixos.org/nixos/) linux distribution source code is located inside `nixos/` folder.
* [NixOS installation instructions](https://nixos.org/nixos/manual/#ch-installation)
@ -18,3 +21,6 @@ Communication:
* [Mailing list](http://lists.science.uu.nl/mailman/listinfo/nix-dev)
* [IRC - #nixos on freenode.net](irc://irc.freenode.net/#nixos)
---
[![Throughput Graph](https://graphs.waffle.io/nixos/nixpkgs/throughput.svg)](https://waffle.io/nixos/nixpkgs/metrics)

4
nixos/lib/testing.nix
View File

@ -47,7 +47,7 @@ rec {
''
mkdir -p $out/nix-support
LOGFILE=$out/log.xml tests='eval $ENV{testScript}; die $@ if $@;' ${driver}/bin/nixos-test-driver || failed=1
LOGFILE=$out/log.xml tests='eval $ENV{testScript}; die $@ if $@;' ${driver}/bin/nixos-test-driver
# Generate a pretty-printed log.
xsltproc --output $out/log.html ${./test-driver/log2html.xsl} $out/log.xml
@ -63,8 +63,6 @@ rec {
mkdir -p $out/coverage-data
mv $i $out/coverage-data/$(dirname $(dirname $i))
done
[ -z "$failed" ] || touch $out/nix-support/failed
''; # */
};

3
nixos/modules/hardware/video/nvidia.nix
View File

@ -13,9 +13,6 @@ let
# driver.
nvidiaForKernel = kernelPackages:
if elem "nvidia" drivers then
if versionAtLeast kernelPackages.kernel.version "4.0" then
kernelPackages.nvidia_x11_beta
else
kernelPackages.nvidia_x11
else if elem "nvidiaLegacy173" drivers then
kernelPackages.nvidia_x11_legacy173

2
nixos/modules/installer/tools/nixos-generate-config.pl
View File

@ -148,7 +148,7 @@ sub pciCheck {
$device eq "0x4331" || $device eq "0x43a0" || $device eq "0x43b1"
) )
{
push @modulePackages, "config.boot.kernelPackages.broadcom_sta";
push @modulePackages, "\${config.boot.kernelPackages.broadcom_sta}";
push @kernelModules, "wl";
}

2
nixos/modules/installer/tools/nixos-install.sh
View File

@ -133,7 +133,7 @@ mkdir -m 0755 -p \
$mountPoint/nix/var/nix/db \
$mountPoint/nix/var/log/nix/drvs
mkdir -m 1735 -p $mountPoint/nix/store
mkdir -m 1775 -p $mountPoint/nix/store
chown root:nixbld $mountPoint/nix/store

4
nixos/modules/misc/nixpkgs.nix
View File

@ -59,8 +59,8 @@ in
};
nixpkgs.system = mkOption {
type = types.str;
default = builtins.currentSystem;
type = types.uniq types.str;
example = "i686-linux";
description = ''
Specifies the Nix platform type for which NixOS should be built.
If unset, it defaults to the platform type of your host system.

28
nixos/modules/services/games/minecraft-server.nix
View File

@ -8,6 +8,7 @@ in
{
options = {
services.minecraft-server = {
enable = mkOption {
type = types.bool;
default = false;
@ -15,7 +16,23 @@ in
If enabled, start a Minecraft Server. The listening port for
the server is always <literal>25565</literal>. The server
data will be loaded from and saved to
<literal>/var/lib/minecraft</literal>.
<literal>${cfg.dataDir}</literal>.
'';
};
dataDir = mkOption {
type = types.path;
default = "/var/lib/minecraft";
description = ''
Directory to store minecraft database and other state/data files.
'';
};
openFirewall = mkOption {
type = types.bool;
default = false;
description = ''
Whether to open ports in the firewall (if enabled) for the server.
'';
};
@ -30,7 +47,7 @@ in
config = mkIf cfg.enable {
users.extraUsers.minecraft = {
description = "Minecraft Server Service user";
home = "/var/lib/minecraft";
home = cfg.dataDir;
createHome = true;
uid = config.ids.uids.minecraft;
};
@ -43,9 +60,14 @@ in
serviceConfig.Restart = "always";
serviceConfig.User = "minecraft";
script = ''
cd /var/lib/minecraft
cd ${cfg.dataDir}
exec ${pkgs.minecraft-server}/bin/minecraft-server ${cfg.jvmOpts}
'';
};
networking.firewall = mkIf cfg.openFirewall {
allowedUDPPorts = [ 25565 ];
allowedTCPPorts = [ 25565 ];
};
};
}

2
nixos/modules/services/misc/docker-registry.nix
View File

@ -30,7 +30,7 @@ in {
storagePath = mkOption {
type = types.path;
default = "/var/lib/docker/registry";
description = "Docker registry strorage path.";
description = "Docker registry storage path.";
};
extraConfig = mkOption {

1
nixos/modules/services/misc/nixos-manual.nix
View File

@ -14,6 +14,7 @@ let
versionModule =
{ system.nixosVersionSuffix = config.system.nixosVersionSuffix;
system.nixosRevision = config.system.nixosRevision;
nixpkgs.system = config.nixpkgs.system;
};
eval = evalModules {

3
nixos/modules/services/networking/btsync.nix
View File

@ -200,7 +200,6 @@ in
package = mkOption {
type = types.package;
default = pkgs.bittorrentSync14;
example = literalExample "pkgs.bittorrentSync20";
description = ''
Branch of bittorrent sync to use.
@ -277,6 +276,8 @@ in
}
];
services.btsync.package = mkOptionDefault pkgs.bittorrentSync14;
users.extraUsers.btsync = {
description = "Bittorrent Sync Service user";
home = cfg.storagePath;

1
nixos/modules/services/x11/window-managers/default.nix
View File

@ -16,6 +16,7 @@ in
./i3.nix
./metacity.nix
./openbox.nix
./ratpoison.nix
./sawfish.nix
./stumpwm.nix
./spectrwm.nix

2
nixos/modules/system/boot/stage-2-init.sh
View File

@ -53,7 +53,7 @@ echo "booting system configuration $systemConfig" > /dev/kmsg
# Silence chown/chmod to fail gracefully on a readonly filesystem
# like squashfs.
chown -f 0:30000 /nix/store
chmod -f 1735 /nix/store
chmod -f 1775 /nix/store
if [ -n "@readOnlyStore@" ]; then
if ! readonly-mountpoint /nix/store; then
mount --bind /nix/store /nix/store

2
nixos/modules/virtualisation/amazon-config.nix
View File

@ -1,3 +1,3 @@
{
imports = [ ./amazon-image.nix ];
imports = [ <nixpkgs/nixos/modules/virtualisation/amazon-image.nix> ];
}

4
nixos/tests/misc.nix
View File

@ -102,6 +102,10 @@ import ./make-test.nix {
subtest "shell-vars", sub {
$machine->succeed('[ -n "$NIX_PATH" ]');
};
subtest "nix-db", sub {
$machine->succeed("nix-store -qR /run/current-system | grep nixos-");
};
'';
}

4
pkgs/applications/altcoins/default.nix
View File

@ -19,4 +19,8 @@ rec {
namecoin = callPackage ./namecoin.nix { inherit namecoind; };
namecoind = callPackage ./namecoind.nix { };
primecoin = callPackage ./primecoin.nix { withGui = true; };
primecoind = callPackage ./primecoin.nix { withGui = false; };
}

52
pkgs/applications/altcoins/primecoin.nix Normal file
View File

@ -0,0 +1,52 @@
{ stdenv, fetchurl, pkgconfig, openssl, db48, boost
, zlib, miniupnpc, qt4, utillinux, protobuf, qrencode
, withGui }:
with stdenv.lib;
stdenv.mkDerivation rec{
name = "primecoin" + (toString (optional (!withGui) "d")) + "-" + version;
version = "0.8.6";
src = fetchurl {
url = "https://github.com/primecoin/primecoin/archive/v${version}.tar.gz";
sha256 = "0cixnkici74204s9d5iqj5sccib5a8dig2p2fp1axdjifpg787i3";
};
buildInputs = [ pkgconfig openssl db48 boost zlib
miniupnpc utillinux protobuf ]
++ optionals withGui [ qt4 qrencode ];
configureFlags = [ "--with-boost-libdir=${boost.lib}/lib" ]
++ optionals withGui [ "--with-gui=qt4" ];
configurePhase = optional withGui "qmake";
preBuild = optional (!withGui) "cd src; cp makefile.unix Makefile";
installPhase =
if withGui
then "install -D bitcoin-qt $out/bin/primecoin-qt"
else "install -D bitcoind $out/bin/primecoind";
meta = {
description = "A new type cryptocurrency which is proof-of-work based on searching for prime numbers.";
longDescription= ''
Primecoin is an innovative cryptocurrency, a form of digital
currency secured by cryptography and issued through a
decentralized mining market. Derived from Satoshi Nakamoto's
Bitcoin, Primecoin introduces an unique form of proof-of-work
based on prime numbers.
The innovative prime proof-of-work in Primecoin not only
provides security and minting to the network, but also generates
a special form of prime number chains of interest to mathematical
research. Thus primecoin network is energy-multiuse, compared to
bitcoin.
'';
homepage = http://primecoin.io/;
maintainers = with maintainers; [ AndersonTorres ];
license = licenses.mit;
platforms = platforms.unix;
};
}

37
pkgs/applications/audio/guitarix/default.nix
View File

@ -1,26 +1,43 @@
{ stdenv, fetchurl, avahi, boost, eigen, fftw, gettext, glib, glibmm, gtk
, gtkmm, intltool, jack2, ladspaH, librdf, libsndfile, lilv, lv2
, pkgconfig, python, serd, sord, sratom }:
{ stdenv, fetchurl, gettext, intltool, pkgconfig, python
, avahi, bluez, boost, eigen, fftw, glib, glibmm, gtk, gtkmm, jack2
, ladspaH, librdf, libsndfile, lilv, lv2, serd, sord, sratom
, optimizationSupport ? false # Enable support for native CPU extensions
}:
let
inherit (stdenv.lib) optional;
in
stdenv.mkDerivation rec {
name = "guitarix-${version}";
version = "0.32.2";
version = "0.32.3";
src = fetchurl {
url = "mirror://sourceforge/guitarix/guitarix2-${version}.tar.bz2";
sha256 = "0mh4ma48hc8kq3xw25y1zjcrwgsdb0scd36vzw50a1qmmnh74rgp";
sha256 = "1ybc5jk7fj6n8qh9ajzl1f6fzdmzab4nwjrh4fsylm94dn1jv0if";
};
nativeBuildInputs = [ gettext intltool pkgconfig python ];
buildInputs = [
avahi boost eigen fftw gettext glib glibmm gtk gtkmm intltool
jack2 ladspaH librdf libsndfile lilv lv2 pkgconfig python serd sord sratom
avahi bluez boost eigen fftw glib glibmm gtk gtkmm jack2
ladspaH librdf libsndfile lilv lv2 serd sord sratom
];
configurePhase = "python waf configure --prefix=$out";
configureFlags = [
"--shared-lib"
"--no-desktop-update"
"--no-faust" # Need to package a release of faust, 0.9.58 or 0.9.65
"--enable-nls"
"--includeresampler" # Zita-resampler not packaged, use vendored version
"--includeconvolver" # Zita-convolver not packaged, use vendored version
] ++ optional optimizationSupport "--optimization";
buildPhase = "python waf build";
configurePhase = ''python waf configure --prefix=$out $configureFlags'';
installPhase = "python waf install";
buildPhase = ''python waf build'';
installPhase = ''python waf install'';
meta = with stdenv.lib; {
description = "A virtual guitar amplifier for Linux running with JACK";

4
pkgs/applications/editors/emacs-modes/writegood/default.nix
View File

@ -1,12 +1,12 @@
{stdenv, fetchurl, emacs}:
let version = "2.0";
let version = "2.0.2";
in stdenv.mkDerivation {
name = "writegood-mode-${version}";
src = fetchurl {
url = "https://github.com/bnbeckwith/writegood-mode/archive/v${version}.tar.gz";
sha256 = "0wf7bj9d00ggy3xigym885a3njfr98i3aqrrawf8x6lgbfc56dgp";
sha256 = "1ilbqj24vzpfh9n1wph7idj0914ga290jkpv9kr1pff3a0v5hf6k";
};
buildInputs = [ emacs ];

15
pkgs/applications/editors/sublime3/default.nix
View File

@ -38,8 +38,12 @@ in let
'';
installPhase = ''
# Correct sublime_text.desktop to exec `sublime' instead of /opt/sublime_text
sed -e 's,/opt/sublime_text/sublime_text,sublime,' -i sublime_text.desktop
mkdir -p $out
cp -prvd * $out/
# Without this, plugin_host crashes, even though it has the rpath
wrapProgram $out/plugin_host --prefix LD_PRELOAD : ${stdenv.cc.cc}/lib${stdenv.lib.optionalString stdenv.is64bit "64"}/libgcc_s.so.1:${openssl}/lib/libssl.so:${bzip2}/lib/libbz2.so
'';
@ -52,11 +56,16 @@ in stdenv.mkDerivation {
mkdir -p $out/bin
ln -s ${sublime}/sublime_text $out/bin/sublime
ln -s ${sublime}/sublime_text $out/bin/sublime3
mkdir -p $out/share/applications
ln -s ${sublime}/sublime_text.desktop $out/share/applications/sublime_text.desktop
ln -s ${sublime}/Icon/256x256/ $out/share/icons
'';
meta = {
meta = with stdenv.lib; {
description = "Sophisticated text editor for code, markup and prose";
maintainers = [ stdenv.lib.maintainers.wmertens ];
license = stdenv.lib.licenses.unfree;
homepage = https://www.sublimetext.com/;
maintainers = with maintainers; [ wmertens ];
license = licenses.unfree;
platforms = platforms.linux;
};
}

2
pkgs/applications/graphics/feh/default.nix
View File

@ -25,6 +25,6 @@ stdenv.mkDerivation rec {
homepage = https://derf.homelinux.org/projects/feh/;
license = stdenv.lib.licenses.mit;
maintainers = with stdenv.lib.maintainers; [viric];
platforms = with stdenv.lib.platforms; linux;
platforms = with stdenv.lib.platforms; unix;
};
}

5
pkgs/applications/graphics/inkscape/default.nix
View File

@ -16,6 +16,11 @@ stdenv.mkDerivation rec {
postPatch = ''
patchShebangs share/extensions
''
# Clang gets misdetected, so hardcode the right answer
+ stdenv.lib.optionalString (stdenv.cc.cc.isClang or false) ''
substituteInPlace src/ui/tool/node.h \
--replace "#if __cplusplus >= 201103L" "#if true"
'';
propagatedBuildInputs = [

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

@ -1,12 +1,12 @@
{ stdenv, fetchurl, xulrunner }:
stdenv.mkDerivation rec {
version = "2.0.8";
version = "2.0.9";
name = "pencil-${version}";
src = fetchurl {
url = "https://github.com/prikhi/pencil/releases/download/v${version}/Pencil-${version}-linux-pkg.tar.gz";
sha256 = "3426d0222b213649e448b06384556718c833667394f442682ff66da3cda1b881";
sha256 = "a109d28a695919d2da979de6a6d0baeb4e2820ff795aecd75ba08322f21ed3ee";
};
buildPhase = "";

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

@ -5,11 +5,11 @@
}:
stdenv.mkDerivation rec {
name = "calibre-2.22.0";
name = "calibre-2.23.0";
src = fetchurl {
url = "mirror://sourceforge/calibre/${name}.tar.xz";
sha256 = "19hpm5xzhjr0nfjm6xyqxjx2iwm3iw7y6bbs11337arfrxn16ly0";
sha256 = "0n99la1pacrw4ahb3wk0p68120p7j7v76mvpaf4qnkxy1vfdif7d";
};
inherit python;

6
pkgs/applications/misc/slic3r/default.nix
View File

@ -3,17 +3,17 @@
}:
stdenv.mkDerivation rec {
version = "1.2.1";
version = "1.2.6";
name = "slic3r-${version}";
src = fetchgit {
url = "git://github.com/alexrj/Slic3r";
rev = "refs/tags/${version}";
sha256 = "03xj2kv2d4j6nwmdd5cyghnvjyj4g7g9z0ynynbviyfiplmka2ph";
sha256 = "1ymk2n9dw1mpizwg6bxbzq60mg1cwljxlncaasdyakqrkkr22r8k";
};
buildInputs = with perlPackages; [ perl makeWrapper which
EncodeLocale MathClipper ExtUtilsXSpp
EncodeLocale MathClipper ExtUtilsXSpp threads
MathConvexHullMonotoneChain MathGeometryVoronoi MathPlanePath Moo
IOStringy ClassXSAccessor Wx GrowlGNTP NetDBus ImportInto XMLSAX
ExtUtilsMakeMaker OpenGL WxGLCanvas

7
pkgs/applications/networking/instant-messengers/blink/default.nix
View File

@ -2,14 +2,17 @@
pythonPackages.buildPythonPackage rec {
name = "blink-${version}";
version = "0.9.1";
version = "1.2.2";
src = fetchurl {
url = "http://download.ag-projects.com/BlinkQt/${name}.tar.gz";
sha256 = "f578e5186893c3488e7773fbb775028ae54540433a0c51aefa5af983ca2bfdae";
sha256 = "0z7bhfz2775cm7c7s794s5ighp5q7fb6jn8dw025m49vlgqzr78c";
};
patches = [ ./pythonpath.patch ];
postPatch = ''
sed -i 's|@out@|'"''${out}"'|g' blink/resources.py
'';
propagatedBuildInputs = [ pyqt4 pythonPackages.cjson pythonPackages.sipsimple twisted ];

30
pkgs/applications/networking/instant-messengers/blink/pythonpath.patch
View File

@ -1,12 +1,20 @@
diff --git a/blink/resources.py b/blink/resources.py
index 524d9e5..c271887 100644
--- a/blink/resources.py
+++ b/blink/resources.py
@@ -64,6 +64,7 @@ class Resources(object):
if script == '':
application_directory = os.path.realpath(script) # executed in interactive interpreter
diff -rupN a/blink/resources.py b/blink/resources.py
--- a/blink/resources.py 2015-03-17 03:24:06.000000000 -0600
+++ b/blink/resources.py 2015-04-07 22:52:06.101096413 -0600
@@ -60,14 +60,7 @@ class Resources(object):
@classproperty
def directory(cls):
if cls._cached_directory is None:
- if sys.path[0] == '':
- application_directory = os.path.realpath('') # executed in interactive interpreter
- else:
- binary_directory = os.path.dirname(os.path.realpath(sys.argv[0]))
- if os.path.basename(binary_directory) == 'bin':
- application_directory = os.path.dirname(binary_directory)
- else:
- application_directory = binary_directory
+ application_directory = '@out@'
if os.path.exists(os.path.join(application_directory, 'resources', 'blink.ui')):
cls._cached_directory = os.path.join(application_directory, 'resources').decode(sys.getfilesystemencoding())
else:
+ script = os.path.join(sys.path[0], script)
binary_directory = os.path.dirname(os.path.realpath(script))
if os.path.basename(binary_directory) == 'bin':
application_directory = os.path.dirname(binary_directory)
Binary files a/blink/.resources.py.swp and b/blink/.resources.py.swp differ

41
pkgs/applications/networking/instant-messengers/linphone/default.nix
View File

@ -1,33 +1,36 @@
{ stdenv, fetchurl, intltool, pkgconfig, gtk, libglade, libosip, libexosip
, speex, readline, mediastreamer, libsoup, udev, libnotify }:
{ stdenv, fetchurl, intltool, pkgconfig, readline, openldap, cyrus_sasl, libupnp
, zlib, libxml2, gtk2, libnotify, speex, ffmpeg, libX11, polarssl, libsoup, udev
, ortp, mediastreamer, sqlite, belle-sip, libosip, libexosip
}:
stdenv.mkDerivation rec {
name = "linphone-3.6.1";
name = "linphone-3.8.1";
src = fetchurl {
url = "mirror://savannah/linphone/3.6.x/sources/${name}.tar.gz";
sha256 = "186jm4nd4ggb0j8cs8wnpm4sy9cr7chq0c6kx2yc6y4k7qi83fh5";
url = "mirror://savannah/linphone/3.8.x/sources/${name}.tar.gz";
sha256 = "19xwar8z5hyp1bap1s437ipv90gspmjwcq5zznds55d7r6gbqicd";
};
buildInputs = [ gtk libglade libosip libexosip readline mediastreamer speex libsoup udev
libnotify ];
buildInputs = [
readline openldap cyrus_sasl libupnp zlib libxml2 gtk2 libnotify speex ffmpeg libX11
polarssl libsoup udev ortp mediastreamer sqlite belle-sip libosip libexosip
];
nativeBuildInputs = [ intltool pkgconfig ];
preConfigure = ''
rm -r mediastreamer2 oRTP
sed -i s,/bin/echo,echo, coreapi/Makefile*
'';
configureFlags = [
"--enable-ldap"
"--with-ffmpeg=${ffmpeg}"
"--with-polarssl=${polarssl}"
"--enable-lime"
"--enable-external-ortp"
"--enable-external-mediastreamer"
];
configureFlags = "--enable-external-ortp --enable-external-mediastreamer";
NIX_CFLAGS_COMPILE = "-Wno-error=deprecated-declarations"; # I'm lazy to fix these for them
meta = {
meta = with stdenv.lib; {
homepage = http://www.linphone.org/;
description = "Open Source video SIP softphone";
license = stdenv.lib.licenses.gpl2Plus;
platforms = stdenv.lib.platforms.gnu;
broken = true;
license = licenses.gpl2Plus;
platforms = platforms.linux;
};
}

2
pkgs/applications/networking/instant-messengers/twinkle/default.nix
View File

@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
buildInputs =
[ pkgconfig autoreconfHook commoncpp2 openssl boost libsndfile
libxml2 libjpeg readline qt3 perl file
libxml2 libjpeg readline qt3 perl file ccrtp
# optional ? :
alsaLib speex
libzrtpcpp xorg.libX11 xorg.libXaw xorg.libICE xorg.libXext

55
pkgs/applications/networking/mumble/default.nix
View File

@ -1,11 +1,8 @@
{ stdenv, fetchurl, qt4, boost, protobuf, libsndfile
, speex, libopus, avahi, pkgconfig
, jackSupport ? false
, jack2 ? null
, speechdSupport ? false
, speechd ? null
, pulseSupport ? false
, pulseaudio ? null
{ stdenv, fetchurl, pkgconfig
, avahi, boost, libopus, libsndfile, protobuf, qt4, speex
, jackSupport ? false, jack2 ? null
, speechdSupport ? false, speechd ? null
, pulseSupport ? false, pulseaudio ? null
}:
assert jackSupport -> jack2 != null;
@ -27,32 +24,46 @@ stdenv.mkDerivation rec {
patches = optional jackSupport ./mumble-jack-support.patch;
configureFlags = [
"CONFIG+=shared"
"CONFIG+=no-g15"
"CONFIG+=packaged"
"CONFIG+=no-update"
"CONFIG+=no-server"
"CONFIG+=no-embed-qt-translations"
"CONFIG+=bundled-celt"
"CONFIG+=no-bundled-opus"
"CONFIG+=no-bundled-speex"
] ++ optional (!speechdSupport) "CONFIG+=no-speechd"
++ optional jackSupport "CONFIG+=no-oss CONFIG+=no-alsa CONFIG+=jackaudio";
configurePhase = ''
qmake CONFIG+=no-g15 CONFIG+=no-update CONFIG+=no-server \
CONFIG+=no-embed-qt-translations CONFIG+=packaged \
CONFIG+=bundled-celt CONFIG+=no-bundled-opus \
${optionalString (!speechdSupport) "CONFIG+=no-speechd"} \
${optionalString jackSupport "CONFIG+=no-oss CONFIG+=no-alsa CONFIG+=jackaudio"} \
CONFIG+=no-bundled-speex
qmake $configureFlags
'';
nativeBuildInputs = [ pkgconfig ];
buildInputs = [ qt4 boost protobuf libsndfile speex
libopus avahi pkgconfig ]
++ (optional jackSupport jack2)
++ (optional speechdSupport speechd)
++ (optional pulseSupport pulseaudio);
buildInputs = [ avahi boost libopus libsndfile protobuf qt4 speex ]
++ optional jackSupport jack2
++ optional speechdSupport speechd
++ optional pulseSupport pulseaudio;
installPhase = ''
mkdir -p $out
cp -r ./release $out/bin
mkdir -p $out/share/applications
cp scripts/mumble.desktop $out/share/applications
mkdir -p $out/share/icons
cp icons/mumble.svg $out/share/icons
'';
meta = with stdenv.lib; {
homepage = "http://mumble.sourceforge.net/";
meta = with stdenv.lib; {
description = "Low-latency, high quality voice chat software";
homepage = "http://mumble.sourceforge.net/";
license = licenses.bsd3;
platforms = platforms.linux;
maintainers = with maintainers; [ viric ];
platforms = platforms.linux;
};
}

4
pkgs/applications/networking/sync/backintime/common.nix
View File

@ -1,13 +1,13 @@
{stdenv, fetchurl, makeWrapper, gettext, python3, python3Packages, rsync, cron, openssh, sshfsFuse, encfs }:
stdenv.mkDerivation rec {
version = "1.1.0";
version = "1.1.4";
name = "backintime-common-${version}";
src = fetchurl {
url = "https://launchpad.net/backintime/1.1/${version}/+download/backintime-${version}.tar.gz";
md5 = "21e15538c38d0c440c1281457319c7f1";
sha256 = "0w57b7xygwx83azz463fd4y7fxz0z6dy74f70ixhvhlsdpxw2ks3";
};
buildInputs = [ makeWrapper gettext python3 python3Packages.dbus python3Packages.keyring openssh cron rsync sshfsFuse encfs ];

4
pkgs/applications/networking/sync/backintime/qt4.nix
View File

@ -3,7 +3,7 @@
stdenv.mkDerivation rec {
inherit (backintime-common) version src installFlags meta;
name = "backintime-gnome-${version}";
name = "backintime-qt4-${version}";
buildInputs = [ makeWrapper gettext python3 python3Packages.pyqt4 backintime-common python3 ];
@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
configureFlags = [ ];
dontAddPrefix = true;
preFixup =
''
substituteInPlace "$out/bin/backintime-qt4" \

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

@ -26,7 +26,7 @@ let
throw "Mathematica requires i686-linux or x86_64 linux";
in
stdenv.mkDerivation rec {
version = "10.0.1";
version = "10.0.2";
name = "mathematica-${version}";
@ -37,7 +37,7 @@ stdenv.mkDerivation rec {
already part of the store. Find the file on your Mathematica CD
and add it to the nix store with nix-store --add-fixed sha256 <FILE>.
'';
sha256 = "1514qy5kbyislv8j7ryw8021k26y0z6dndliwy8hfi7w7kgb3ynq";
sha256 = "1d2yaiaikzcacjamlw64g3xkk81m3pb4vz4an12cv8nb7kb20x9l";
};
buildInputs = [

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

@ -17,13 +17,13 @@ assert javahlBindings -> jdk != null && perl != null;
stdenv.mkDerivation (rec {
version = "1.8.11";
version = "1.8.13";
name = "subversion-${version}";
src = fetchurl {
url = "mirror://apache/subversion/${name}.tar.bz2";
sha1 = "161edaee328f4fdcfd2a7c10ecd3fbcd51c61275";
sha1 = "aa0bd14ac6a8f0fb178cc9ff325387de01cd7452";
};
buildInputs = [ zlib apr aprutil sqlite ]

49
pkgs/applications/video/clipgrab/default.nix Normal file
View File

@ -0,0 +1,49 @@
{ stdenv, fetchurl, makeDesktopItem, qt4 }:
let version = "3.4.9"; in
stdenv.mkDerivation rec {
name = "clipgrab-${version}";
src = fetchurl {
sha256 = "0valq3cgx7yz11zcscz1vdjmppwbicvg0id61dcar22pyp2zkap1";
url = "http://download.clipgrab.de/${name}.tar.bz2";
};
meta = with stdenv.lib; {
inherit version;
description = "Video downloader for YouTube and other sites";
longDescription = ''
ClipGrab is a free downloader and converter for YouTube, Vimeo, Metacafe,
Dailymotion and many other online video sites. It converts downloaded
videos to MPEG4, MP3 or other formats in just one easy step.
'';
homepage = http://clipgrab.org/;
license = with licenses; gpl3Plus;
platforms = with platforms; linux;
maintainers = with maintainers; [ nckx ];
};
buildInputs = [ qt4 ];
configurePhase = ''
qmake clipgrab.pro
'';
enableParallelBuilding = true;
desktopItem = makeDesktopItem rec {
name = "clipgrab";
exec = name;
icon = name;
desktopName = "ClipGrab";
comment = "A friendly downloader for YouTube and other sites";
genericName = "Web video downloader";
categories = "Qt;AudioVideo;Audio;Video";
};
installPhase = ''
install -Dm755 clipgrab $out/bin/clipgrab
install -Dm644 icon.png $out/share/pixmaps/clipgrab.png
cp -r ${desktopItem}/share/applications $out/share
'';
}

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

@ -4,17 +4,17 @@
stdenv.mkDerivation rec {
name = "makemkv-${ver}";
ver = "1.9.1";
ver = "1.9.2";
builder = ./builder.sh;
src_bin = fetchurl {
url = "http://www.makemkv.com/download/makemkv-bin-${ver}.tar.gz";
sha256 = "0458ilchi64q8yw4kxck565anpn6lf5awrnkz17bk38qdgp0i2nq";
sha256 = "0hjby7imja9sg2h68al81n4zl72mc3y3fqmf61sf1sad4njs9bkj";
};
src_oss = fetchurl {
url = "http://www.makemkv.com/download/makemkv-oss-${ver}.tar.gz";
sha256 = "1x4mjx32839gf9k2zrjz2250valnqcaa2q89kc7sipgsl4b7wrr2";
sha256 = "074scfz835jynzmb28i8q44hc6ixvfg3crgirmy02bbpxakyp1v6";
};
buildInputs = [openssl qt4 mesa zlib pkgconfig libav];

140
pkgs/applications/video/mplayer2/default.nix
View File

@ -1,140 +0,0 @@
{ stdenv, fetchurl, fetchgit, freetype, pkgconfig, yasm, freefont_ttf, ffmpeg, libass
, python3, docutils, which
, x11Support ? true, libX11 ? null, libXext ? null, mesa ? null, libXxf86vm ? null
, xineramaSupport ? true, libXinerama ? null
, xvSupport ? true, libXv ? null
, alsaSupport ? true, alsaLib ? null
, screenSaverSupport ? true, libXScrnSaver ? null
, vdpauSupport ? true, libvdpau ? null
, dvdnavSupport ? true, libdvdnav ? null
, bluraySupport ? true, libbluray ? null
, speexSupport ? true, speex ? null
, theoraSupport ? true, libtheora ? null
, jackaudioSupport ? false, jack2 ? null
, pulseSupport ? true, pulseaudio ? null
, bs2bSupport ? false, libbs2b ? null
# For screenshots
, libpngSupport ? true, libpng ? null
, libjpegSupport ? true, libjpeg ? null
, useUnfreeCodecs ? false
}:
assert x11Support -> (libX11 != null && libXext != null && mesa != null && libXxf86vm != null);
assert xineramaSupport -> (libXinerama != null && x11Support);
assert xvSupport -> (libXv != null && x11Support);
assert alsaSupport -> alsaLib != null;
assert screenSaverSupport -> libXScrnSaver != null;
assert vdpauSupport -> libvdpau != null;
assert dvdnavSupport -> libdvdnav != null;
assert bluraySupport -> libbluray != null;
assert speexSupport -> speex != null;
assert theoraSupport -> libtheora != null;
assert jackaudioSupport -> jack2 != null;
assert pulseSupport -> pulseaudio != null;
assert bs2bSupport -> libbs2b != null;
assert libpngSupport -> libpng != null;
assert libjpegSupport -> libjpeg != null;
let
codecs_src =
let
dir = http://www.mplayerhq.hu/MPlayer/releases/codecs/;
in
if stdenv.system == "i686-linux" then fetchurl {
url = "${dir}/essential-20071007.tar.bz2";
sha256 = "18vls12n12rjw0mzw4pkp9vpcfmd1c21rzha19d7zil4hn7fs2ic";
} else if stdenv.system == "x86_64-linux" then fetchurl {
url = "${dir}/essential-amd64-20071007.tar.bz2";
sha256 = "13xf5b92w1ra5hw00ck151lypbmnylrnznq9hhb0sj36z5wz290x";
} else if stdenv.system == "powerpc-linux" then fetchurl {
url = "${dir}/essential-ppc-20071007.tar.bz2";
sha256 = "18mlj8dp4wnz42xbhdk1jlz2ygra6fbln9wyrcyvynxh96g1871z";
} else null;
codecs = if codecs_src != null then stdenv.mkDerivation {
name = "MPlayer-codecs-essential-20071007";
src = codecs_src;
installPhase = ''
mkdir $out
cp -prv * $out
'';
meta.license = stdenv.lib.licenses.unfree;
} else null;
in
stdenv.mkDerivation rec {
name = "mplayer2-20130428";
src = fetchgit {
url = "git://git.mplayer2.org/mplayer2.git";
rev = "6c87a981baa4972fd71c25dfddea017b5a972e89";
sha256 = "b09c1331141dd0939dfa424ae14dc0bdf82c8a72bb32c78e3ad15e3ee1d2c851";
};
prePatch = ''
sed -i /^_install_strip/d configure
sed -i '/stdlib/a#include <ctype.h>/' sub/sub*.c
'';
buildInputs = with stdenv.lib;
[ freetype pkgconfig ffmpeg libass docutils which ]
++ optionals x11Support [ libX11 libXext mesa libXxf86vm ]
++ optional alsaSupport alsaLib
++ optional xvSupport libXv
++ optional theoraSupport libtheora
++ optional xineramaSupport libXinerama
++ optionals dvdnavSupport [ libdvdnav libdvdnav.libdvdread ]
++ optional bluraySupport libbluray
++ optional jackaudioSupport jack2
++ optional pulseSupport pulseaudio
++ optional screenSaverSupport libXScrnSaver
++ optional vdpauSupport libvdpau
++ optional speexSupport speex
++ optional bs2bSupport libbs2b
++ optional libpngSupport libpng
++ optional libjpegSupport libjpeg
;
nativeBuildInputs = [ yasm python3 ];
postConfigure = ''
patchShebangs TOOLS
'';
configureFlags = with stdenv.lib;
''
${optionalString (useUnfreeCodecs && codecs != null) "--codecsdir=${codecs}"}
${optionalString (stdenv.isi686 || stdenv.isx86_64) "--enable-runtime-cpudetection"}
${optionalString dvdnavSupport "--extra-ldflags=-ldvdread"}
${if xvSupport then "--enable-xv" else "--disable-xv"}
${if x11Support then "--enable-x11 --enable-gl --extra-cflags=-I${libX11}/include"
else "--disable-x11 --disable-gl"}
--disable-xvid
--disable-ossaudio
'';
NIX_LDFLAGS = stdenv.lib.optionalString x11Support "-lX11 -lXext";
enableParallelBuilding = true;
# Provide a reasonable standard font. Maybe we should symlink here.
postInstall =
''
mkdir -p $out/share/mplayer
cp ${freefont_ttf}/share/fonts/truetype/FreeSans.ttf $out/share/mplayer/subfont.ttf
'';
meta = {
description = "A movie player that supports many video formats (MPlayer fork)";
homepage = "http://mplayer2.org";
license = stdenv.lib.licenses.gpl3Plus;
maintainers = [ stdenv.lib.maintainers.viric ];
platforms = stdenv.lib.platforms.linux;
};
}

18
pkgs/data/fonts/caladea/cambria-alias.conf Normal file
View File

@ -0,0 +1,18 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE fontconfig SYSTEM "fonts.dtd">
<fontconfig>
<!-- Configure Caladea as a metric-compatible alias for the
Microsoft Cambria font family. -->
<alias binding="same">
<family>Cambria</family>
<accept>
<family>Caladea</family>
</accept>
</alias>
<alias binding="same">
<family>Caladea</family>
<default>
<family>Cambria</family>
</default>
</alias>
</fontconfig>

40
pkgs/data/fonts/caladea/default.nix Normal file
View File

@ -0,0 +1,40 @@
{stdenv, fetchurl}:
stdenv.mkDerivation rec {
name = "caladea-${version}";
version = "20130214";
src = fetchurl {
url = "https://commondatastorage.googleapis.com/chromeos-localmirror/distfiles/crosextrafonts-${version}.tar.gz";
sha256 = "02addvvkbvf3bn21kfyj10j9w1c8hdxxld4wjmnc1j8ksqpir3f4";
};
phases = ["unpackPhase" "installPhase"];
installPhase = ''
mkdir -p $out/etc/fonts/conf.d
mkdir -p $out/share/fonts/truetype
cp -v *.ttf $out/share/fonts/truetype
cp -v ${./cambria-alias.conf} $out/etc/fonts/conf.d/30-cambria.conf
'';
meta = with stdenv.lib; {
# This font doesn't appear to have any official web site but this
# one provides some good information and samples.
homepage = http://openfontlibrary.org/en/font/caladea;
description = "A serif font metric-compatible with Microsoft Cambria";
longDescription = ''
Caladea is a free font that is metric-compatible with the
Microsoft Cambria font. Developed by Carolina Giovagnoli and
Andrés Torresi at Huerta Tipográfica foundry.
'';
license = licenses.asl20;
platforms = platforms.all;
maintainers = [maintainers.rycee];
# Reduce the priority of this package. The intent is that if you
# also install the `vista-fonts` package, then you probably will
# not want to install the font alias of this package.
priority = 10;
};
}

18
pkgs/data/fonts/carlito/calibri-alias.conf Normal file
View File

@ -0,0 +1,18 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE fontconfig SYSTEM "fonts.dtd">
<fontconfig>
<!-- Configure Carlito as a metric-compatible alias for the
Microsoft Calibri font family. -->
<alias binding="same">
<family>Calibri</family>
<accept>
<family>Carlito</family>
</accept>
</alias>
<alias binding="same">
<family>Carlito</family>
<default>
<family>Calibri</family>
</default>
</alias>
</fontconfig>

40
pkgs/data/fonts/carlito/default.nix Normal file
View File

@ -0,0 +1,40 @@
{stdenv, fetchurl}:
stdenv.mkDerivation rec {
name = "carlito-${version}";
version = "20130920";
src = fetchurl {
url = "https://commondatastorage.googleapis.com/chromeos-localmirror/distfiles/crosextrafonts-carlito-${version}.tar.gz";
sha256 = "0nmgzp6gdvv4dipswrw0l1bfjp4jbic2qvm7dpqiq71jpin2plab";
};
phases = ["unpackPhase" "installPhase"];
installPhase = ''
mkdir -p $out/etc/fonts/conf.d
mkdir -p $out/share/fonts/truetype
cp -v *.ttf $out/share/fonts/truetype
cp -v ${./calibri-alias.conf} $out/etc/fonts/conf.d/30-calibri.conf
'';
meta = with stdenv.lib; {
# This font doesn't appear to have any official web site but this
# one provides some good information and samples.
homepage = http://openfontlibrary.org/en/font/carlito;
description = "A sans-serif font metric-compatible with Microsoft Calibri";
longDescription = ''
Carlito is a free font that is metric-compatible with the
Microsoft Calibri font. The font is designed by Łukasz Dziedzic
of the tyPoland foundry and based his Lato font.
'';
license = licenses.ofl;
platforms = platforms.all;
maintainers = [maintainers.rycee];
# Reduce the priority of this package. The intent is that if you
# also install the `vista-fonts` package, then you probably will
# not want to install the font alias of this package.
priority = 10;
};
}

31
pkgs/data/fonts/comfortaa/default.nix Normal file
View File

@ -0,0 +1,31 @@
{stdenv, fetchurl, unzip}:
stdenv.mkDerivation rec {
name = "comfortaa-${version}";
version = "2.004";
src = fetchurl {
url = "http://openfontlibrary.org/assets/downloads/comfortaa/38318a69b56162733bf82bc0170b7521/comfortaa.zip";
sha256 = "0js0kk5g6b7xrq92b68gz5ipbiv1havnbgnfqzvlw3k3nllwnl9z";
};
phases = ["unpackPhase" "installPhase"];
buildInputs = [unzip];
installPhase = ''
mkdir -p $out/share/fonts/truetype
mkdir -p $out/share/doc/${name}
cp -v *.ttf $out/share/fonts/truetype/
cp -v FONTLOG.txt $out/share/doc/${name}/
cp -v donate.html $out/share/doc/${name}/
'';
meta = with stdenv.lib; {
homepage = http://aajohan.deviantart.com/art/Comfortaa-font-105395949;
description = "A clean and modern font suitable for headings and logos";
license = licenses.ofl;
platforms = platforms.all;
maintainers = [maintainers.rycee];
};
}

18
pkgs/data/fonts/comic-relief/comic-sans-ms-alias.conf Normal file
View File

@ -0,0 +1,18 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE fontconfig SYSTEM "fonts.dtd">
<fontconfig>
<!-- Configure Comic Relief as a metric-compatible alias for the
Microsoft Comic Sans font family. -->
<alias binding="same">
<family>Comic Sans MS</family>
<accept>
<family>Comic Relief</family>
</accept>
</alias>
<alias binding="same">
<family>Comic Relief</family>
<default>
<family>Comic Sans MS</family>
</default>
</alias>
</fontconfig>

49
pkgs/data/fonts/comic-relief/default.nix Normal file
View File

@ -0,0 +1,49 @@
{stdenv, fetchurl, unzip}:
stdenv.mkDerivation rec {
name = "comic-relief-${version}";
version = "1.1";
src = fetchurl {
url = "https://dl.dropbox.com/u/56493902/loudifier/comicrelief.zip";
sha256 = "0wpf10m9zmcfvcxgc7dxzdm3syam7d7qxlfabgr1nxzq299kh8ch";
};
buildInputs = [unzip];
phases = ["unpackPhase" "installPhase"];
unpackCmd = ''
mkdir -p ${name}
unzip -qq -d ${name} $src
'';
installPhase = ''
mkdir -p $out/etc/fonts/conf.d
mkdir -p $out/share/doc/${name}
mkdir -p $out/share/fonts/truetype
cp -v *.ttf $out/share/fonts/truetype
cp -v ${./comic-sans-ms-alias.conf} $out/etc/fonts/conf.d/30-comic-sans-ms.conf
cp -v FONTLOG.txt $out/share/doc/${name}
'';
meta = with stdenv.lib; {
homepage = http://loudifier.com/comic-relief/;
description = "A font metric-compatible with Microsoft Comic Sans";
longDescription = ''
Comic Relief is a typeface designed to be metrically equivalent
to the popular Comic Sans MS. Comic Relief can be used in place
of Comic Sans MS without having to move, resize, or reset any
part of the copy. It contains all glyphs and characters
available in Comic Sans MS.
'';
license = licenses.ofl;
platforms = platforms.all;
maintainers = [maintainers.rycee];
# Reduce the priority of this package. The intent is that if you
# also install the `corefonts` package, then you probably will not
# want to install the font alias of this package.
priority = 10;
};
}

22
pkgs/data/fonts/corefonts/default.nix
View File

@ -34,18 +34,34 @@ stdenv.mkDerivation {
buildInputs = [cabextract];
buildCommand = "
buildCommand = ''
for i in $exes; do
cabextract --lowercase $i
done
cabextract --lowercase viewer1.cab
fontDir=$out/share/fonts/truetype
mkdir -p $fontDir
cp *.ttf $fontDir
# Also put the EULA there to be on the safe side.
cp ${eula} $fontDir/eula.html
";
# Set up no-op font configs to override any aliases set up by
# other packages.
mkdir -p $out/etc/fonts/conf.d
for name in Andale-Mono Arial-Black Arial Comic-Sans-MS \
Courier-New Georgia Impact Times-New-Roman \
Trebuchet Verdana Webdings ; do
substitute ${./no-op.conf} $out/etc/fonts/conf.d/30-''${name,,}.conf \
--subst-var-by fontname "''${name//-/ }"
done
'';
meta = {
# Set a non-zero priority to allow easy overriding of the
# fontconfig configuration files.
priority = 5;
};
}

9
pkgs/data/fonts/corefonts/no-op.conf Normal file
View File

@ -0,0 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE fontconfig SYSTEM "fonts.dtd">
<fontconfig>
<!-- This configuation is intentionally left empty in order to
override any other font package that may wish to set up an
alias for the Microsoft @fontname@ font. If you actually do
want to have the alias then please change the priority of that
package; see the Nix manual page for nix-env for details. -->
</fontconfig>

28
pkgs/data/fonts/crimson/default.nix Normal file
View File

@ -0,0 +1,28 @@
{stdenv, fetchurl}:
stdenv.mkDerivation rec {
name = "crimson-${version}";
version = "2014.10";
src = fetchurl {
url = "https://github.com/skosch/Crimson/archive/fonts-october2014.tar.gz";
sha256 = "0qyihrhqb89vwg9cfpaf5xqmcjvs4r4614bxy634vmqv9v1bzn5b";
};
phases = ["unpackPhase" "installPhase"];
installPhase = ''
mkdir -p $out/share/fonts/opentype
mkdir -p $out/share/doc/${name}
cp -v "Desktop Fonts/OTF/"*.otf $out/share/fonts/opentype
cp -v README.md $out/share/doc/${name}
'';
meta = with stdenv.lib; {
homepage = https://aldusleaf.org/crimson.html;
description = "A font family inspired by beautiful oldstyle typefaces";
license = licenses.ofl;
platforms = platforms.all;
maintainers = [maintainers.rycee];
};
}

34
pkgs/data/fonts/fantasque-sans-mono/default.nix Normal file
View File

@ -0,0 +1,34 @@
{stdenv, fetchurl, unzip}:
stdenv.mkDerivation rec {
name = "fantasque-sans-mono-${version}";
version = "1.6.5";
src = fetchurl {
url = "https://github.com/belluzj/fantasque-sans/releases/download/v${version}/FantasqueSansMono.zip";
sha256 = "19a82xlbcnd7dxqmpp03b62gjvi33bh635r0bjw2l09lgir6alym";
};
buildInputs = [unzip];
phases = ["unpackPhase" "installPhase"];
unpackCmd = ''
mkdir -p ${name}
unzip -qq -d ${name} $src
'';
installPhase = ''
mkdir -p $out/share/fonts/opentype
mkdir -p $out/share/doc/${name}
cp -v "OTF/"*.otf $out/share/fonts/opentype
cp -v README.md $out/share/doc/${name}
'';
meta = with stdenv.lib; {
homepage = https://github.com/belluzj/fantasque-sans;
description = "A font family with a great monospaced variant for programmers";
license = licenses.ofl;
platforms = platforms.all;
maintainers = [maintainers.rycee];
};
}

75
pkgs/data/fonts/lobster-two/default.nix Normal file
View File

@ -0,0 +1,75 @@
{stdenv, fetchurl}:
let
# HG revision in which this version of the font can be fount.
rev = "8e98053718f9a15184c93d6530885791be71b756";
urlBase = "https://googlefontdirectory.googlecode.com/hg-history/${rev}/ofl/lobstertwo";
# Just a small convenience function.
fetch = {name, path ? "/src", sha256}:
{
inherit name;
file = fetchurl {
url = "${urlBase}${path}/${name}";
inherit sha256;
};
};
fontlog =
fetch {
name = "FONTLOG.txt";
path = "";
sha256 = "0n405i8m70q95y8w43gzr5yvkj7gx7rd3xa4rx6y8qcqv5g7v9if";
};
bold =
fetch {
name = "LobsterTwo-Bold.otf";
sha256 = "0gkayn96vvgngs9xnmcyyf16q4payk79ghvl354rl93ayb3gf7x0";
};
boldItalic =
fetch {
name = "LobsterTwo-BoldItalic.otf";
sha256 = "0wznqkvwjqi9s4bg10fpp2345by3nxa0m0w6b3al3zaqyx2p1dxp";
};
italic =
fetch {
name = "LobsterTwo-Italic.otf";
sha256 = "0lpnzwgwl5fm6gqy8bylbryz0hy94mf1mp615y5sh0wikdvk570z";
};
regular =
fetch {
name = "LobsterTwo-Regular.otf";
sha256 = "147m3sa3sqqbkbw1hgjdwnw8w0y37x58g5p09s7q2vm74flcpbq1";
};
in
stdenv.mkDerivation rec {
name = "lobstertwo-${version}";
version = "1.006";
phases = ["installPhase"];
installPhase = ''
mkdir -p $out/share/fonts/opentype
mkdir -p $out/share/doc/${name}
cp -v ${fontlog.file} $out/share/doc/${name}/${fontlog.name}
cp -v ${bold.file} $out/share/fonts/opentype/${bold.name}
cp -v ${boldItalic.file} $out/share/fonts/opentype/${boldItalic.name}
cp -v ${italic.file} $out/share/fonts/opentype/${italic.name}
cp -v ${regular.file} $out/share/fonts/opentype/${regular.name}
'';
meta = with stdenv.lib; {
homepage = http://www.impallari.com/lobstertwo;
description = "Script font with many ligatures";
license = licenses.ofl;
platforms = platforms.all;
maintainers = [maintainers.rycee];
};
}

26
pkgs/data/fonts/pecita/default.nix Normal file
View File

@ -0,0 +1,26 @@
{stdenv, fetchurl}:
stdenv.mkDerivation rec {
name = "pecita-${version}";
version = "1.1";
src = fetchurl {
url = "http://pecita.eu/b/Pecita.otf";
sha256 = "07krzpbmc5yhfbf3aklv1f150i2g1spaan9girmg3189jsn6qw6p";
};
phases = ["installPhase"];
installPhase = ''
mkdir -p $out/share/fonts/opentype
cp -v ${src} $out/share/fonts/opentype/Pecita.otf
'';
meta = with stdenv.lib; {
homepage = http://pecita.eu/police-en.php;
description = "Handwritten font with connected glyphs";
license = licenses.ofl;
platforms = platforms.all;
maintainers = [maintainers.rycee];
};
}

31
pkgs/data/fonts/quattrocento-sans/default.nix Normal file
View File

@ -0,0 +1,31 @@
{stdenv, fetchurl, unzip}:
stdenv.mkDerivation rec {
name = "quattrocento-sans-${version}";
version = "2.0";
src = fetchurl {
url = "http://www.impallari.com/media/releases/quattrocento-sans-v${version}.zip";
sha256 = "043jfdn18dgzpx3qb3s0hc541n6xv4gacsm4srd6f0pri45g4wh1";
};
buildInputs = [unzip];
phases = ["unpackPhase" "installPhase"];
sourceRoot = "quattrocento-sans-v${version}";
installPhase = ''
mkdir -p $out/share/fonts/opentype
mkdir -p $out/share/doc/${name}
cp -v "src/"*.otf $out/share/fonts/opentype
cp -v FONTLOG.txt $out/share/doc/${name}
'';
meta = with stdenv.lib; {
homepage = http://www.impallari.com/quattrocentosans/;
description = "A classic, elegant and sober sans-serif typeface";
license = licenses.ofl;
platforms = platforms.all;
maintainers = [maintainers.rycee];
};
}

29
pkgs/data/fonts/quattrocento/default.nix Normal file
View File

@ -0,0 +1,29 @@
{stdenv, fetchurl, unzip}:
stdenv.mkDerivation rec {
name = "quattrocento-${version}";
version = "1.1";
src = fetchurl {
url = "http://www.impallari.com/media/releases/quattrocento-v${version}.zip";
sha256 = "09wmbfwkry1r2cf5z4yy67wd4yzlnsjigg01r5r80z1phl0axn9n";
};
buildInputs = [unzip];
phases = ["unpackPhase" "installPhase"];
installPhase = ''
mkdir -p $out/share/fonts/opentype
mkdir -p $out/share/doc/${name}
cp -v "src/"*.otf $out/share/fonts/opentype
cp -v FONTLOG.txt $out/share/doc/${name}
'';
meta = with stdenv.lib; {
homepage = http://www.impallari.com/quattrocento/;
description = "A classic, elegant, sober and strong serif typeface";
license = licenses.ofl;
platforms = platforms.all;
maintainers = [maintainers.rycee];
};
}

19
pkgs/data/fonts/vista-fonts/default.nix
View File

@ -18,13 +18,26 @@ stdenv.mkDerivation {
buildPhase = "true";
installPhase = "
mkdir -p $out/share/fonts/truetype; cp *.ttf $out/share/fonts/truetype
";
installPhase = ''
mkdir -p $out/share/fonts/truetype
cp *.ttf $out/share/fonts/truetype
# Set up no-op font configs to override any aliases set up by
# other packages.
mkdir -p $out/etc/fonts/conf.d
for name in Calibri Cambria Candara Consolas Constantia Corbel ; do
substitute ${./no-op.conf} $out/etc/fonts/conf.d/30-''${name,,}.conf \
--subst-var-by fontname $name
done
'';
meta = {
description = "Some TrueType fonts from Microsoft Windows Vista (Calibri, Cambria, Candara, Consolas, Constantia, Corbel)";
homepage = http://www.microsoft.com/typography/ClearTypeFonts.mspx;
binaryDistribution = false; # haven't read the EULA, but we probably can't redistribute these files, so...
# Set a non-zero priority to allow easy overriding of the
# fontconfig configuration files.
priority = 5;
};
}

9
pkgs/data/fonts/vista-fonts/no-op.conf Normal file
View File

@ -0,0 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE fontconfig SYSTEM "fonts.dtd">
<fontconfig>
<!-- This configuation is intentionally left empty in order to
override any other font package that may wish to set up an
alias for the Microsoft @fontname@ font. If you actually do
want to have the alias then please change the priority of that
package; see the Nix manual page for nix-env for details. -->
</fontconfig>

4
pkgs/desktops/e19/efl.nix
View File

@ -3,10 +3,10 @@
stdenv.mkDerivation rec {
name = "efl-${version}";
version = "1.13.1";
version = "1.13.2";
src = fetchurl {
url = "http://download.enlightenment.org/rel/libs/efl/${name}.tar.gz";
sha256 = "0wjy2n2ggjd9mzv9y0ra21wfjdbw927hdh6pz537p820bnghcivy";
sha256 = "196293zf4pbyd5acs4nzb818yql9r67709ccfj7k3siyws6lsh4q";
};
buildInputs = [ pkgconfig openssl zlib freetype fontconfig fribidi SDL2 SDL mesa

4
pkgs/desktops/e19/elementary.nix
View File

@ -1,10 +1,10 @@
{ stdenv, fetchurl, pkgconfig, e19, libcap, gdbm }:
stdenv.mkDerivation rec {
name = "elementary-${version}";
version = "1.13.1";
version = "1.13.2";
src = fetchurl {
url = "http://download.enlightenment.org/rel/libs/elementary/${name}.tar.gz";
sha256 = "0jfbw48krpzcj944rvyy1rmq7cykad6cwhjh54fhp52lh7c5savk";
sha256 = "0f8hz60aj4ar8lqnc63nlxkpf3b51scjalgy1iphgjc27hzxcb9i";
};
buildInputs = [ pkgconfig e19.efl gdbm ] ++ stdenv.lib.optionals stdenv.isLinux [ libcap ];
preConfigure = ''

4
pkgs/desktops/e19/evas.nix
View File

@ -1,10 +1,10 @@
{ stdenv, fetchurl, pkgconfig, e19, zlib, libspectre, gstreamer, gst_plugins_base, gst_ffmpeg, gst_plugins_good, poppler, librsvg, libraw }:
stdenv.mkDerivation rec {
name = "evas_generic_loaders-${version}";
version = "1.13.0";
version = "1.13.2";
src = fetchurl {
url = "http://download.enlightenment.org/rel/libs/evas_generic_loaders/${name}.tar.gz";
sha256 = "16yzjk58bxsd0rlnpzrr8as9fxjjiq01swzhpadsgkmq33abgg63";
sha256 = "06m8p8k8dpyvzdm690zhdzcr7n0ld12bcgjdssjfl66lil5z2mc4";
};
buildInputs = [ pkgconfig e19.efl zlib libspectre gstreamer gst_plugins_base gst_ffmpeg gst_plugins_good poppler librsvg libraw ];
meta = {

4
pkgs/desktops/e19/rage.nix
View File

@ -2,10 +2,10 @@
, makeWrapper, lib }:
stdenv.mkDerivation rec {
name = "rage-${version}";
version = "0.1.0";
version = "0.1.1";
src = fetchurl {
url = "http://download.enlightenment.org/rel/apps/rage/${name}.tar.gz";
sha256 = "0d87n0rl24s7b8y3bdcg6i3yrzhil5f5vmgrmh451i4y38k84swk";
sha256 = "0jdhbzmnvl0i2zzmjs1wgvxmnv0lm76k7h5llbb8ai34xh4yp3fi";
};
buildInputs = [ e19.elementary e19.efl automake autoconf libtool pkgconfig
makeWrapper ];

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

@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
name = "closure-compiler-${version}";
version = "20130603";
version = "20150315";
src = fetchurl {
url = "http://dl.google.com/closure-compiler/compiler-${version}.tar.gz";
sha256 = "0bk0s8p9r9an5m0l8y23wjlx490k15i4zah0a384a2akzji8y095";
sha256 = "1vzwyhpqbrndg7mri81f1b2yi8cshw5pghvdda9vdxgq465sa52f";
};
phases = [ "installPhase" ];

14
pkgs/development/haskell-modules/configuration-common.nix
View File

@ -494,6 +494,9 @@ self: super: {
# https://github.com/joeyadams/haskell-stm-delay/issues/3
stm-delay = dontCheck super.stm-delay;
# https://github.com/cgaebel/stm-conduit/issues/33
stm-conduit = dontCheck super.stm-conduit;
# https://github.com/fumieval/call/issues/3
call = markBrokenVersion "0.1.2" super.call;
rhythm-game-tutorial = dontDistribute super.rhythm-game-tutorial; # depends on call
@ -678,9 +681,6 @@ self: super: {
# https://github.com/prowdsponsor/esqueleto/issues/93
esqueleto = dontCheck super.esqueleto;
# https://github.com/anchor/ceilometer-common/issues/16
ceilometer-common = dontCheck super.ceilometer-common;
# https://github.com/fumieval/audiovisual/issues/1
audiovisual = markBroken super.audiovisual;
@ -714,6 +714,14 @@ self: super: {
'';
});
# Uses OpenGL in testing
caramia = dontCheck super.caramia;
llvm-general = super.llvm-general.override { llvm-config = pkgs.llvmPackages_34.llvm; };
# Tries to run GUI in tests
leksah = dontCheck super.leksah;
} // {
# Not on Hackage.

38
pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix
View File

@ -134,9 +134,22 @@ self: super: {
'';
});
# see: https://github.com/jaspervdj/hakyll/issues/343
hakyll = overrideCabal super.hakyll (drv: {
buildDepends = drv.buildDepends ++ [ self.time-locale-compat ];
patches = [
(pkgs.fetchpatch {
url = "https://github.com/jaspervdj/hakyll/pull/344.patch";
sha256 = "130c0icw3cj209p219siaq0n8avmm0fpmph0iyjgx67w62sffrli";
})
];
});
# Cabal_1_22_1_1 requires filepath >=1 && <1.4
cabal-install = dontCheck (super.cabal-install.override { Cabal = null; });
HStringTemplate = self.HStringTemplate_0_8_3;
# We have Cabal 1.22.x.
jailbreak-cabal = super.jailbreak-cabal.override { Cabal = null; };
@ -170,6 +183,7 @@ self: super: {
patchPhase = "sed -i -e 's|base >= 3 && < 4.8|base|' utf8-string.cabal";
});
esqueleto = doJailbreak super.esqueleto;
pointfree = doJailbreak super.pointfree;
# bos/attoparsec#92
attoparsec = dontCheck super.attoparsec;
@ -215,23 +229,14 @@ self: super: {
});
wl-pprint = overrideCabal super.wl-pprint (drv: {
patchPhase = "sed -i '113iimport Prelude hiding ((<$>))' Text/PrettyPrint/Leijen.hs";
});
wl-pprint-text = overrideCabal super.wl-pprint-text (drv: {
patchPhase = ''
sed -i '71iimport Prelude hiding ((<$>))' Text/PrettyPrint/Leijen/Text/Monadic.hs
sed -i '119iimport Prelude hiding ((<$>))' Text/PrettyPrint/Leijen/Text.hs
'';
postPatch = "sed -i '113iimport Prelude hiding ((<$>))' Text/PrettyPrint/Leijen.hs";
jailbreak = true;
});
# https://github.com/kazu-yamamoto/unix-time/issues/30
unix-time = dontCheck super.unix-time;
# Until the changes have been pushed to Hackage
haskell-src-meta = overrideCabal (doJailbreak (appendPatch super.haskell-src-meta ./haskell-src-meta-ghc710.patch)) (drv: {
prePatch = "sed -i -e 's|template-haskell [^,]\\+|template-haskell|' haskell-src-meta.cabal && cat haskell-src-meta.cabal";
});
mono-traversable = appendPatch super.mono-traversable (pkgs.fetchpatch {
url = "https://github.com/snoyberg/mono-traversable/pull/68.patch";
sha256 = "11hqf6hi3sc34wl0fn4rpigdf7wfklcjv6jwp8c3129yphg8687h";
@ -240,10 +245,13 @@ self: super: {
url = "https://github.com/fpco/conduit-combinators/pull/16.patch";
sha256 = "0jpwpi3shdn5rms3lcr4srajbhhfp5dbwy7pl23c9kmlil3d9mk3";
});
yesod-bin = appendPatch super.yesod-bin (pkgs.fetchpatch {
url = "https://github.com/yesodweb/yesod/pull/966.patch";
sha256 = "0mm4swyn7qh30hw7ya8ykz5qvsd4ni4vmipq364yqbsi9ysrc6nb";
stripLen = 1;
annotated-wl-pprint = appendPatch super.annotated-wl-pprint (pkgs.fetchpatch {
url = "https://patch-diff.githubusercontent.com/raw/david-christiansen/annotated-wl-pprint/pull/2.patch";
sha256 = "0n0fbq3vd7b9kfmhg089q0dy40vawq4q88il3zc9ybivhi62nwv4";
});
ghc-events = appendPatch super.ghc-events (pkgs.fetchpatch {
url = "https://patch-diff.githubusercontent.com/raw/haskell/ghc-events/pull/8.patch";
sha256 = "1k881jrvzfvs761jgfhf5nsbmbc33c9333l4s0f5088p46ff2n1l";
});
ghcjs-prim = self.callPackage ({ mkDerivation, fetchgit, primitive }: mkDerivation {

10
pkgs/development/haskell-modules/configuration-ghc-7.8.x.nix
View File

@ -73,6 +73,15 @@ self: super: {
mtl-prelude = self.mtl-prelude_1_0_3;
equivalence = super.equivalence_0_2_5; # required by Agda
# purescript requires mtl 2.2.x.
purescript = overrideCabal (super.purescript.overrideScope (self: super: {
mkDerivation = drv: super.mkDerivation (drv // { doCheck = false; });
mtl = super.mtl_2_2_1;
transformers = super.transformers_0_4_3_0;
haskeline = self.haskeline_0_7_2_1;
transformers-compat = disableCabalFlag super.transformers-compat "three";
})) (drv: {});
# The test suite pulls in mtl 2.2.x
command-qq = dontCheck super.command-qq;
@ -96,7 +105,6 @@ self: super: {
highlighter2 = markBroken super.highlighter2;
hypher = markBroken super.hypher;
miniforth = markBroken super.miniforth;
purescript = markBroken super.purescript;
xhb-atom-cache = markBroken super.xhb-atom-cache;
xhb-ewmh = markBroken super.xhb-ewmh;
yesod-purescript = markBroken super.yesod-purescript;

17
pkgs/development/haskell-modules/configuration-ghcjs.nix
View File

@ -7,7 +7,7 @@ self: super: {
# LLVM is not supported on this GHC; use the latest one.
inherit (pkgs) llvmPackages;
jailbreak-cabal = pkgs.haskell-ng.packages.ghc7101.jailbreak-cabal;
inherit (pkgs.haskell-ng.packages.ghc7101) jailbreak-cabal alex happy;
# Many packages fail with:
# haddock: internal error: expectJust getPackageDetails
@ -95,16 +95,7 @@ self: super: {
'';
});
"ghcjs-dom" = self.callPackage
({ mkDerivation, base, mtl, text, ghcjs-base
}:
mkDerivation {
pname = "ghcjs-dom";
version = "0.1.1.3";
sha256 = "0pdxb2s7fflrh8sbqakv0qi13jkn3d0yc32xhg2944yfjg5fvlly";
buildDepends = [ base mtl text ghcjs-base ];
description = "DOM library that supports both GHCJS and WebKitGTK";
license = pkgs.stdenv.lib.licenses.mit;
hydraPlatforms = pkgs.stdenv.lib.platforms.none;
}) {};
ghcjs-dom = overrideCabal super.ghcjs-dom (drv: {
buildDepends = [ self.base self.mtl self.text self.ghcjs-base ];
});
}

605
pkgs/development/haskell-modules/hackage-packages.nix
View File

File diff suppressed because it is too large Load Diff

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

@ -1,14 +1,14 @@
{ stdenv, fetchurl, erlang, rebar, makeWrapper, coreutils, curl, bash, cacert }:
let
version = "1.0.3";
version = "1.0.4";
in
stdenv.mkDerivation {
name = "elixir-${version}";
src = fetchurl {
url = "https://github.com/elixir-lang/elixir/archive/v${version}.tar.gz";
sha256 = "ec6c4eaffcb771d91bdea9fb274600c624fd16b1891d194b3fcb2b521f52cc75";
sha256 = "1babp3ff6hajdm247zl9rc311k973cdnv6dqaai7l8817gg1yd3r";
};
buildInputs = [ erlang rebar makeWrapper ];

6
pkgs/development/interpreters/erlang/R17.nix
View File

@ -14,11 +14,11 @@ with stdenv.lib;
stdenv.mkDerivation rec {
name = "erlang-" + version + "${optionalString odbcSupport "-odbc"}"
+ "${optionalString javacSupport "-javac"}";
version = "17.4";
version = "17.5";
src = fetchurl {
url = "http://www.erlang.org/download/otp_src_${version}.tar.gz";
sha256 = "0mhzfs64wa00g0bv9hwf0sbl8lgs83jj8cq9c3wg1iksmskfv0hd";
sha256 = "0x34hj1a4j3rphqdaapdld7la4sqiqillamcz06wac0vk0684a1w";
};
buildInputs =
@ -39,7 +39,7 @@ stdenv.mkDerivation rec {
postInstall = let
manpages = fetchurl {
url = "http://www.erlang.org/download/otp_doc_man_${version}.tar.gz";
sha256 = "0n4sczblx8mjcck56rpxvyvz186hkzg0c1xjqrnpnz1nkn7dn73c";
sha256 = "1hspm285bl7i9a0d4r6j6lm5yk4sb5d9xzpia3simh0z06hv5cc5";
};
in ''
ln -s $out/lib/erlang/lib/erl_interface*/bin/erl_call $out/bin/erl_call

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

@ -4,11 +4,11 @@
stdenv.mkDerivation rec {
name = "groovy-${version}";
version = "2.4.2";
version = "2.4.3";
src = fetchurl {
url = "http://dl.bintray.com/groovy/maven/groovy-binary-${version}.zip";
sha256 = "02vbg9ywn76rslkinjk1dw3wrj76p5bahbhvz71drlp30cs1r28w";
sha256 = "1qfvw49fbw9svk4gsniw0g0ghal0dqm2hf1i77qmcf80lln1vhdh";
};
installPhase = ''

44
pkgs/development/libraries/belle-sip/default.nix Normal file
View File

@ -0,0 +1,44 @@
{ stdenv, fetchurl, libantlr3c, jre, polarssl }:
let
# We must use antlr-3.4 with belle-sip-1.4.0
# We might be able to use antlr-3.5+ in the future
antlr = fetchurl {
url = "http://www.antlr3.org/download/antlr-3.4-complete.jar";
sha256 = "1xqbam8vf04q5fasb0m2n1pn5dbp2yw763sj492ncq04c5mqcglx";
};
in
stdenv.mkDerivation rec {
name = "belle-sip-1.4.0";
src = fetchurl {
url = "mirror://savannah/linphone/belle-sip/${name}.tar.gz";
sha256 = "1lwxfvwvclbh0bfwf69jrknqzqh1igzm293wwwbmq4kn8c5fiypz";
};
nativeBuildInputs = [ jre ];
# belle-sip.pc doesn't have a library path for antlr3c or polarssl
propagatedBuildInputs = [ libantlr3c polarssl ];
postPatch = ''
mkdir -p $TMPDIR/share/java
cp ${antlr} $TMPDIR/share/java/antlr.jar
sed -i "s,\(antlr_java_prefixes=\).*,\1\"$TMPDIR/share/java\"," configure
cat configure | grep antlr_java
'';
configureFlags = [
"--with-polarssl=${polarssl}"
];
enableParallelBuild = true;
meta = with stdenv.lib; {
homepage = http://www.linphone.org/index.php/eng;
description = "A Voice-over-IP phone";
license = licenses.gpl2;
platforms = platforms.all;
};
}

18
pkgs/development/libraries/ccrtp/default.nix
View File

@ -1,15 +1,19 @@
{ stdenv, fetchurl, openssl, pkgconfig, libgcrypt, ucommon }:
{ stdenv, fetchurl, pkgconfig, ucommon, openssl, libgcrypt }:
stdenv.mkDerivation {
name = "ccrtp-2.0.9";
stdenv.mkDerivation rec {
name = "ccrtp-2.1.2";
src = fetchurl {
url = mirror://gnu/ccrtp/ccrtp-2.0.9.tar.gz;
sha256 = "1prh2niwa4lzvskk12j4ckr7dv141dfh8yjmpkbhbnv4gmpifci0";
url = "mirror://gnu/ccrtp/${name}.tar.gz";
sha256 = "17ili8l7zqbbkzr1rcy4hlnazkf50mds41wg6n7bfdsx3c7cldgh";
};
buildInputs = [ openssl pkgconfig libgcrypt ];
propagatedBuildInputs = [ ucommon ];
buildInputs = [ pkgconfig ];
propagatedBuildInputs = [ ucommon openssl libgcrypt ];
configureFlags = [
"--disable-demos"
];
doCheck = true;

12
pkgs/development/libraries/chromaprint/default.nix
View File

@ -1,20 +1,20 @@
{ stdenv, fetchurl, cmake, ffmpeg, boost }:
{ stdenv, fetchurl, cmake, boost, ffmpeg }:
stdenv.mkDerivation rec {
name = "chromaprint-${version}";
version = "1.1";
version = "1.2";
src = fetchurl {
url = "http://bitbucket.org/acoustid/chromaprint/downloads/${name}.tar.gz";
sha256 = "04nd8xmy4kgnpfffj6hw893f80bwhp43i01zpmrinn3497mdf53b";
sha256 = "06h36223r4bwcazp42faqs9w9g49wvspivd3z3309b12ld4qjaw2";
};
buildInputs = [ cmake ffmpeg boost ];
nativeBuildInputs = [ cmake ];
buildInputs = [ boost ffmpeg ];
cmakeFlags = [ "-DBUILD_EXAMPLES=ON" ];
postInstall = "installBin examples/fpcalc";
meta = with stdenv.lib; {
homepage = "http://acoustid.org/chromaprint";
description = "AcoustID audio fingerprinting library";

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

@ -16,7 +16,9 @@ stdenv.mkDerivation (rec {
# <sys/socket.h> with Glibc 2.9.
configureFlags = "--disable-debug --with-python=${python} CPPFLAGS=-D_GNU_SOURCE";
patches = [ ./deadlock.patch ] ++ map fetchurl (import ./debian-patches.nix);
patches = [ ./deadlock.patch ]
++ map fetchurl (import ./debian-patches.nix)
++ stdenv.lib.optional (stdenv.cc.cc.isClang or false) ./returnval.patch;
meta = with stdenv.lib; {

12
pkgs/development/libraries/gamin/returnval.patch Normal file
View File

@ -0,0 +1,12 @@
diff -rupN gamin-0.1.10-orig/server/gam_eq.c gamin-0.1.10/server/gam_eq.c
--- gamin-0.1.10-orig/server/gam_eq.c 2015-04-05 19:25:54.000000000 -0400
+++ gamin-0.1.10/server/gam_eq.c 2015-04-05 19:26:00.000000000 -0400
@@ -124,7 +124,7 @@ gam_eq_flush (gam_eq_t *eq, GamConnDataP
{
gboolean done_work = FALSE;
if (!eq)
- return;
+ return done_work;
#ifdef GAM_EQ_VERBOSE
GAM_DEBUG(DEBUG_INFO, "gam_eq: Flushing event queue for %s\n", gam_connection_get_pidname (conn));

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

@ -25,6 +25,6 @@ stdenv.mkDerivation rec {
license = stdenv.lib.licenses.lgpl2Plus;
maintainers = with stdenv.lib.maintainers; [urkud raskin];
platforms = stdenv.lib.platforms.linux;
platforms = stdenv.lib.platforms.unix;
};
}

2
pkgs/development/libraries/gtkmm/2.x.nix
View File

@ -33,6 +33,6 @@ stdenv.mkDerivation rec {
license = stdenv.lib.licenses.lgpl2Plus;
maintainers = with stdenv.lib.maintainers; [ raskin vcunat ];
platforms = stdenv.lib.platforms.linux;
platforms = stdenv.lib.platforms.unix;
};
}

2
pkgs/development/libraries/gtkmm/3.x.nix
View File

@ -37,6 +37,6 @@ stdenv.mkDerivation rec {
license = stdenv.lib.licenses.lgpl2Plus;
maintainers = with stdenv.lib.maintainers; [ raskin urkud vcunat ];
platforms = stdenv.lib.platforms.linux;
platforms = stdenv.lib.platforms.unix;
};
}

18
pkgs/development/libraries/imlib2/default.nix
View File

@ -21,7 +21,23 @@ stdenv.mkDerivation rec {
--replace "@my_libs@" ""
'';
# Do not build amd64 assembly code on Darwin, because it fails to compile
# with unknow directive errors
configureFlags = if stdenv.isDarwin then [ "--enable-amd64=no" ] else null;
meta = {
hydraPlatforms = stdenv.lib.platforms.linux;
description = "Image manipulation library";
longDescription = ''
This is the Imlib 2 library - a library that does image file loading and
saving as well as rendering, manipulation, arbitrary polygon support, etc.
It does ALL of these operations FAST. Imlib2 also tries to be highly
intelligent about doing them, so writing naive programs can be done
easily, without sacrificing speed.
'';
license = stdenv.lib.licenses.free;
platforms = stdenv.lib.platforms.unix;
maintainers = with stdenv.lib.maintainers; [ spwhitt ];
};
}

8
pkgs/development/libraries/kerberos/krb5.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchurl, pkgconfig, perl, ncurses, yacc, openssl, openldap }:
{ stdenv, fetchurl, pkgconfig, perl, ncurses, yacc, openssl, openldap, bootstrap_cmds }:
let
pname = "krb5";
@ -15,7 +15,9 @@ stdenv.mkDerivation (rec {
sha256 = "0gk6jvr64rf6l4xcyxn8i3fr5d1j7dhqvwyv3vw2qdkzz7yjkxjd";
};
buildInputs = [ pkgconfig perl ncurses yacc openssl openldap ];
buildInputs = [ pkgconfig perl ncurses yacc openssl openldap ]
# Provides the mig command used by the build scripts
++ stdenv.lib.optional stdenv.isDarwin bootstrap_cmds ;
unpackPhase = ''
tar -xf $src
@ -31,7 +33,7 @@ stdenv.mkDerivation (rec {
description = "MIT Kerberos 5";
homepage = webpage;
license = "MPL";
platforms = platforms.linux;
platforms = platforms.unix;
maintainers = with maintainers; [ wkennington ];
};

3
pkgs/development/libraries/libcdr/default.nix
View File

@ -12,6 +12,9 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ pkgconfig ];
configureFlags = if (stdenv.cc.cc.isClang or false)
then [ "--disable-werror" ] else null;
CXXFLAGS="--std=gnu++0x"; # For c++11 constants in lcms2.h
meta = {

12
pkgs/development/libraries/libcli/default.nix
View File

@ -1,12 +1,14 @@
{ stdenv, fetchurl }:
{ stdenv, fetchFromGitHub }:
let version = "1.9.7"; in
stdenv.mkDerivation rec {
version = "1.9.7";
name = "libcli-${version}";
src = fetchurl {
url = "https://github.com/dparrish/libcli/archive/v${version}.tar.gz";
sha256 = "0v4867jbach5zd1nq0sspq5q95vvbpnljzm2yf64k8a4w2vadpbx";
src = fetchFromGitHub {
sha256 = "08pmjhqkwldhmcwjhi2l27slf1fk6nxxfaihnk2637pqkycy8z0c";
rev = "v${version}";
repo = "libcli";
owner = "dparrish";
};
enableParallelBuilding = true;

3
pkgs/development/libraries/liboil/default.nix
View File

@ -16,6 +16,9 @@ stdenv.mkDerivation rec {
# errors
configureFlags = stdenv.lib.optional stdenv.isDarwin "--build=x86_64";
# fixes a cast in inline asm: easier than patching
buildFlags = stdenv.lib.optional stdenv.isDarwin "CFLAGS=-fheinous-gnu-extensions";
meta = with stdenv.lib; {
description = "A library of simple functions that are optimized for various CPUs";
homepage = http://liboil.freedesktop.org;

9
pkgs/development/libraries/librevenge/default.nix
View File

@ -19,11 +19,18 @@ stdenv.mkDerivation {
src = fetchurl {
inherit (s) url sha256;
};
# Clang generates warnings in Boost's header files
# -Werror causes these warnings to be interpreted as errors
# Simplest solution: disable -Werror
configureFlags = if (stdenv.cc.cc.isClang or false)
then [ "--disable-werror" ] else null;
meta = {
inherit (s) version;
description = ''A base library for writing document import filters'';
license = stdenv.lib.licenses.mpl20 ;
maintainers = [stdenv.lib.maintainers.raskin];
platforms = stdenv.lib.platforms.linux;
platforms = stdenv.lib.platforms.unix;
};
}

15
pkgs/development/libraries/libsecret/default.nix
View File

@ -1,20 +1,19 @@
{ stdenv, fetchurl, glib, dbus_libs, unzip, automake, libtool, autoconf, m4, docbook_xsl,
intltool, gtk_doc, gobjectIntrospection, pkgconfig, libxslt, libgcrypt }:
{ stdenv, fetchurl, glib, dbus_libs, unzip, docbook_xsl
, intltool, gtk_doc, gobjectIntrospection, pkgconfig, libxslt, libgcrypt
}:
stdenv.mkDerivation rec {
version = "0.16";
version = "0.18";
name = "libsecret-${version}";
src = fetchurl {
url = "https://git.gnome.org/browse/libsecret/snapshot/libsecret-${version}.zip";
sha256 = "1yf4zvzfa45wr5bqlh54g3bmd0lgcsa8hnhppa99czca0zj7bkks";
url = "mirror://gnome/sources/libsecret/${version}/${name}.tar.xz";
sha256 = "1qq29c01xxjyx5sl6y5h22w8r0ff4c73bph3gfx3h7mx5mvalwqc";
};
propagatedBuildInputs = [ glib dbus_libs ];
nativeBuildInputs = [ unzip ];
buildInputs = [ gtk_doc automake libtool autoconf intltool gobjectIntrospection pkgconfig libxslt libgcrypt m4 docbook_xsl ];
configureScript = "./autogen.sh";
buildInputs = [ gtk_doc intltool gobjectIntrospection pkgconfig libxslt libgcrypt docbook_xsl ];
meta = {
inherit (glib.meta) platforms maintainers;

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

@ -18,6 +18,6 @@ stdenv.mkDerivation rec {
meta = {
description = "A library providing ability to interpret and import visio diagrams into various applications";
homepage = http://www.freedesktop.org/wiki/Software/libvisio;
platforms = stdenv.lib.platforms.gnu; # random choice
platforms = stdenv.lib.platforms.unix;
};
}

21
pkgs/development/libraries/libzrtpcpp/1.6.nix
View File

@ -1,21 +0,0 @@
{ stdenv, fetchurl, commoncpp2, openssl, pkgconfig, ccrtp }:
stdenv.mkDerivation rec {
name = "libzrtpcpp-1.6.0";
src = fetchurl {
url = "mirror://gnu/ccrtp/${name}.tar.gz";
sha256 = "17aayr4f27rp4fvminxn6jx7kq56kkk341l7ypqb9h0k6kns27kb";
};
buildInputs = [ commoncpp2 openssl pkgconfig ccrtp ];
meta = {
description = "GNU RTP stack for the zrtp protocol developed by Phil Zimmermann";
homepage = "http://www.gnutelephony.org/index.php/GNU_ZRTP";
license = stdenv.lib.licenses.gpl2;
maintainers = [ stdenv.lib.maintainers.marcweber ];
platforms = stdenv.lib.platforms.linux;
broken = true;
};
}

3
pkgs/development/libraries/libzrtpcpp/default.nix
View File

@ -14,8 +14,7 @@ stdenv.mkDerivation rec {
'';
nativeBuildInputs = [ cmake pkgconfig ];
propagatedBuildInputs = [ openssl ccrtp ];
buildInputs = [ openssl ccrtp ];
meta = {
description = "GNU RTP stack for the zrtp protocol developed by Phil Zimmermann";

41
pkgs/development/libraries/mbedtls/default.nix Normal file
View File

@ -0,0 +1,41 @@
{ stdenv, fetchurl, perl }:
stdenv.mkDerivation rec {
name = "mbedtls-1.3.10";
src = fetchurl {
url = "https://polarssl.org/download/${name}-gpl.tgz";
sha256 = "0zj0vdmam52hk7c6s3y81bdb4mqawi9fskkcqlgnj8v61j7dhvvl";
};
nativeBuildInputs = [ perl ];
postPatch = ''
patchShebangs .
'';
makeFlags = [
"SHARED=1"
];
installFlags = [
"DESTDIR=\${out}"
];
postInstall = ''
rm $out/lib/lib{mbedtls.so.8,polarssl.{a,so}}
ln -s libmbedtls.so $out/lib/libmbedtls.so.8
ln -s libmbedtls.so $out/lib/libpolarssl.so
ln -s libmbedtls.a $out/lib/libpolarssl.a
'';
doCheck = true;
meta = with stdenv.lib; {
homepage = https://polarssl.org/;
description = "Portable cryptographic and SSL/TLS library, aka polarssl";
license = licenses.gpl3;
platforms = platforms.all;
maintainers = with maintainers; [ wkennington ];
};
}

39
pkgs/development/libraries/mediastreamer/default.nix
View File

@ -1,20 +1,39 @@
{ stdenv, fetchurl, pkgconfig, alsaLib, ffmpeg, speex, ortp, pulseaudio,
libv4l, libtheora, intltool, libvpx, gsm, mesa, libX11, libXv, libXext,
glew, libopus, libupnp, vim }:
{ stdenv, fetchurl, pkgconfig, intltool, alsaLib, pulseaudio, speex, gsm
, libopus, ffmpeg, libX11, libXv, mesa, glew, libtheora, libvpx, SDL, libupnp
, ortp, libv4l, libpcap, srtp, vim
}:
stdenv.mkDerivation rec {
name = "mediastreamer-2.10.0";
name = "mediastreamer-2.11.1";
src = fetchurl {
url = "mirror://savannah/linphone/mediastreamer/${name}.tar.gz";
sha256 = "1sp1vjcz0rx518l7cfmkb4802xa5wyylr2b5hxlpjk3ygg28g3c0";
sha256 = "0gfv4k2rsyvyq838xjgsrxmmn0fkw40apqs8vakzjwzsz2c9z8pd";
};
# TODO: make it load plugins from *_PLUGIN_PATH
nativeBuildInputs = [pkgconfig intltool];
postPatch = ''
sed -i "s/\(SRTP_LIBS=\"\$SRTP_LIBS -lsrtp\"\)/SRTP_LIBS=\"$(pkg-config --libs-only-l libsrtp)\"/g" configure
'';
propagatedBuildInputs = [ alsaLib ffmpeg speex ortp pulseaudio libX11
libXv libXext libv4l libtheora libvpx gsm mesa glew libopus libupnp vim ];
# TODO: make it load plugins from *_PLUGIN_PATH
nativeBuildInputs = [ pkgconfig intltool ];
configureFlags = "--enable-external-ortp";
propagatedBuildInputs = [
alsaLib pulseaudio speex gsm libopus
ffmpeg libX11 libXv mesa glew libtheora libvpx SDL libupnp
ortp libv4l libpcap srtp
vim
];
configureFlags = [
"--enable-external-ortp"
"--with-srtp=${srtp}"
];
meta = with stdenv.lib; {
description = "a powerful and lightweight streaming engine specialized for voice/video telephony applications";
homepage = http://www.linphone.org/technical-corner/mediastreamer2/overview;
license = licenses.gpl2;
platforms = platforms.linux;
};
}

9
pkgs/development/libraries/opencv/default.nix
View File

@ -2,21 +2,16 @@
, fetchpatch, pkgconfig, gstreamer, xineLib, glib, python27, python27Packages, unzip
, enableBloat ? false }:
let v = "2.4.10"; in
let v = "2.4.11"; in
stdenv.mkDerivation rec {
name = "opencv-${v}";
src = fetchurl {
url = "mirror://sourceforge/opencvlibrary/opencv-${v}.zip";
sha256 = "1ilnfm7id8jqg5xmfjhbq81sjxx64av90kwxcs8zv5rp523wpx0v";
sha256 = "1shz5g7ahvbb41gprxzvavllf235qhx0fpkjd7iwa3gv83ym46dg";
};
patches = [(fetchpatch {
url = "https://github.com/Itseez/opencv/commit/ea50be0529c24.diff";
sha256 = "0nm02v7rmfcndj3jzmv3mrqh3hk5n6axx6gdxndyhabn201hqswn";
})];
buildInputs =
[ unzip libjpeg libpng libtiff ]
++ lib.optionals enableBloat [ gtk glib jasper ffmpeg xineLib gstreamer python27 python27Packages.numpy ];

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

@ -1,19 +1,17 @@
{stdenv, fetchurl, srtp, libzrtpcpp, pkgconfig }:
{ stdenv, fetchurl }:
stdenv.mkDerivation rec {
name = "ortp-0.22.0";
name = "ortp-0.24.1";
src = fetchurl {
url = "mirror://savannah/linphone/ortp/sources/${name}.tar.gz";
sha256 = "02rdm6ymgblbx8fnjfvivkl4qkgbdizrf35fyb0vln9m7jdy4dvf";
sha256 = "1mach7cdq4kydqkll8ra1kir818da07z253rf9pihifipqhcxv6i";
};
configureFlags = "--enable-zrtp";
propagatedBuildInputs = [ srtp libzrtpcpp pkgconfig ];
meta = {
meta = with stdenv.lib; {
description = "A Real-Time Transport Protocol (RFC3550) stack";
homepage = http://www.linphone.org/index.php/eng/code_review/ortp;
license = licenses.lgpl21;
platforms = platforms.all;
};
}

2
pkgs/development/libraries/qt-5/5.4/default.nix
View File

@ -42,8 +42,6 @@ let
self =
{
qmake = callPackage ./qmake.nix { inherit (self) base; };
activeqt = callPackage
(
{ qtSubmodule, base }:

5
pkgs/development/libraries/schroedinger/default.nix
View File

@ -4,7 +4,10 @@ stdenv.mkDerivation {
name = "schroedinger-1.0.11";
src = fetchurl {
url = http://diracvideo.org/download/schroedinger/schroedinger-1.0.11.tar.gz;
urls = [
http://diracvideo.org/download/schroedinger/schroedinger-1.0.11.tar.gz
http://download.videolan.org/contrib/schroedinger-1.0.11.tar.gz
];
sha256 = "04prr667l4sn4zx256v1z36a0nnkxfdqyln48rbwlamr6l3jlmqy";
};

71
pkgs/development/libraries/srtp/default.nix
View File

@ -1,51 +1,36 @@
x@{builderDefsPackage
, autoconf, automake, libtool, doxygen, procps
, ...}:
builderDefsPackage
(a :
let
helperArgNames = ["stdenv" "fetchurl" "builderDefsPackage"] ++
[];
{ stdenv, fetchFromGitHub, pkgconfig
, openssl ? null, libpcap ? null
}:
buildInputs = map (n: builtins.getAttr n x)
(builtins.attrNames (builtins.removeAttrs x helperArgNames));
sourceInfo = rec {
baseName="srtp";
version="1.4.4";
name="${baseName}-${version}";
url="mirror://sourceforge/${baseName}/${name}.tgz";
hash="057k191hx7sf84wdvc8wr1nk4whhrvbg1vv3r4nyswjir6qwphnr";
};
in
rec {
src = a.fetchurl {
url = sourceInfo.url;
sha256 = sourceInfo.hash;
with stdenv.lib;
stdenv.mkDerivation rec {
name = "libsrtp-${version}";
version = "1.5.2";
src = fetchFromGitHub {
owner = "cisco";
repo = "libsrtp";
rev = "v${version}";
sha256 = "0iy1il72gnjcwbi16wf4kzdqs1xx8is9qvs6m49pg37218s26gdw";
};
inherit (sourceInfo) name version;
inherit buildInputs;
buildInputs = [ pkgconfig ];
/* doConfigure should be removed if not needed */
phaseNames = ["setVars" "doConfigure" "doMakeInstall"];
# libsrtp.pc references -lcrypto -lpcap without -L
propagatedBuildInputs = [ openssl libpcap ];
setVars = a.fullDepEntry ''
export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -fPIC"
'' ["minInit"];
configureFlags = [
"--disable-debug"
] ++ optional (openssl != null) "--enable-openssl";
postInstall = ''
rmdir $out/bin
'';
meta = {
description = "Secure RTP";
maintainers = with a.lib.maintainers;
[
raskin
];
platforms = with a.lib.platforms;
linux;
homepage = https://github.com/cisco/libsrtp;
description = "Secure RTP (SRTP) Reference Implementation";
license = licenses.bsd3;
platforms = platforms.all;
};
passthru = {
updateInfo = {
downloadPage = "http://srtp.sourceforge.net/download.html";
};
};
}) x
}

15
pkgs/development/libraries/srtp/linphone.nix
View File

@ -1,15 +0,0 @@
{ stdenv, fetchgit, automake, autoconf, libtool }:
stdenv.mkDerivation {
name = "srtp-linphone-git-20130530-1c9bd9065";
src = fetchgit {
url = git://git.linphone.org/srtp.git;
rev = "1c9bd9065";
sha256 = "0r4wbrih8bggs69fnfmzm17z1pp1zp8x9qwcckcq6wc54b16d9g3";
};
preConfigure = "autoreconf -vfi";
buildInputs = [ automake autoconf libtool ];
}

21
pkgs/development/libraries/ucommon/default.nix
View File

@ -1,17 +1,26 @@
{ fetchurl, stdenv, gnutls, pkgconfig, zlib, libgcrypt }:
{ stdenv, fetchurl, pkgconfig
, openssl ? null, zlib ? null, gnutls ? null
}:
let
xor = a: b: (a || b) && (!(a && b));
in
assert xor (openssl != null) (gnutls != null);
assert !(xor (openssl != null) (zlib != null));
stdenv.mkDerivation rec {
name = "ucommon-6.1.11";
name = "ucommon-6.3.1";
src = fetchurl {
url = "mirror://gnu/commoncpp/${name}.tar.gz";
sha256 = "0hpwxiyd7c3qnzksk6vw94cdig1v8yy6khgcaa87a7hb3zbkv4zg";
sha256 = "1marbwbqnllhm9nh22lvyfjy802pgy1wx7j7kkpkasbm9r0sb6mm";
};
buildInputs = [ pkgconfig gnutls zlib ];
buildInputs = [ pkgconfig ];
# Propagate libgcrypt because it appears in `ucommon.pc'.
propagatedBuildInputs = [ libgcrypt ];
# ucommon.pc has link time depdendencies on -lssl, -lcrypto, -lz, -lgnutls
propagatedBuildInputs = [ openssl zlib gnutls ];
doCheck = true;

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

@ -8,12 +8,12 @@ in
stdenv.mkDerivation rec {
name = "v8-${version}";
version = "3.26.31.15";
version = "3.30.33.16";
src = fetchurl {
url = "https://commondatastorage.googleapis.com/chromium-browser-official/"
+ "${name}.tar.bz2";
sha256 = "067pk6hr7wjx7yxhla5la0rnv51kf7837kfydzydjwapsbcx6m8l";
sha256 = "1azf1b36gqj4z5x0k9wq2dkp99zfyhwb0d6i2cl5fjm3k6js7l45";
};
patchPhase = ''

38
pkgs/development/libraries/wiredtiger/default.nix Normal file
View File

@ -0,0 +1,38 @@
{ stdenv, fetchFromGitHub, automake, autoconf, libtool
, bzip2, snappy, zlib, db
}:
stdenv.mkDerivation rec {
name = "wiredtiger-${version}";
version = "2.5.2";
src = fetchFromGitHub {
repo = "wiredtiger";
owner = "wiredtiger";
rev = version;
sha256 = "1rk26gfs4zpz88mkbdkhz65q4admpgf46x5zsnghl0ndirmnvq3p";
};
nativeBuildInputs = [ automake autoconf libtool ];
buildInputs = [ bzip2 snappy zlib db ];
configureFlags = [
"--with-berkeleydb=${db}"
"--enable-bzip2"
"--enable-leveldb"
"--enable-snappy"
"--enable-zlib"
];
preConfigure = ''
./autogen.sh
'';
meta = with stdenv.lib; {
homepage = http://wiredtiger.com/;
description = "";
license = licenses.gpl2;
platforms = platforms.unix;
maintainers = with maintainers; [ wkennington ];
};
}

4
pkgs/development/tools/analysis/checkstyle/default.nix
View File

@ -1,12 +1,12 @@
{ stdenv, fetchurl }:
stdenv.mkDerivation rec {
version = "6.4.1";
version = "6.5";
name = "checkstyle-${version}";
src = fetchurl {
url = "mirror://sourceforge/checkstyle/${version}/${name}-bin.tar.gz";
sha256 = "0w41h5m51mfswdrqpgyjs73x4qr73scswv34f5zwckcih4dvsdzz";
sha256 = "1231rzmk7kzv77hpa0jj227152br9ahjdvxvzifk0mdfw0b34rdl";
};
installPhase = ''

4
pkgs/development/tools/misc/global/default.nix
View File

@ -2,11 +2,11 @@
, pythonPackages, makeWrapper }:
stdenv.mkDerivation rec {
name = "global-6.3.4";
name = "global-6.4";
src = fetchurl {
url = "mirror://gnu/global/${name}.tar.gz";
sha256 = "0hcplcayyjf42d8ygzla6142b5dq4ybq4wg3n3cgx3b5yfhvic85";
sha256 = "13i4zwx6gaibc4j79wd0hgxysw8ibxz9c018zxhydnxlyadzcnri";
};
buildInputs = [ libtool ncurses makeWrapper ];

4
pkgs/development/tools/misc/intel-gpu-tools/default.nix
View File

@ -1,11 +1,11 @@
{ stdenv, fetchurl, pkgconfig, libdrm, libpciaccess, cairo, dri2proto, udev, libX11, libXext, libXv, libXrandr, glib, bison }:
stdenv.mkDerivation rec {
name = "intel-gpu-tools-1.9";
name = "intel-gpu-tools-1.10";
src = fetchurl {
url = "http://xorg.freedesktop.org/archive/individual/app/${name}.tar.bz2";
sha256 = "1lqy1adplb2bqpddznsavjc2fxn6rvzxnndmi8cnq7pyw25c5r0x";
sha256 = "0x4q7gv14yaniycgdxym9nazlj6wzcvjjhg40bbm5lkw5pqvxwkd";
};
buildInputs = [ pkgconfig libdrm libpciaccess cairo dri2proto udev libX11 libXext libXv libXrandr glib bison ];

6
pkgs/development/web/iojs/default.nix
View File

@ -1,7 +1,7 @@
{ stdenv, fetchurl, python, utillinux, openssl, http-parser, zlib, libuv, nightly ? false }:
let
version = if nightly then "1.5.2-nightly201503173c8ae2d934" else "1.5.1";
version = if nightly then "1.6.5-nightly20150409ff74931107" else "1.6.4";
inherit (stdenv.lib) optional maintainers licenses platforms;
in stdenv.mkDerivation {
name = "iojs-${version}";
@ -11,8 +11,8 @@ in stdenv.mkDerivation {
then "https://iojs.org/download/nightly/v${version}/iojs-v${version}.tar.gz"
else "https://iojs.org/dist/v${version}/iojs-v${version}.tar.gz";
sha256 = if nightly
then "10blf1hr80fknrzyrbj7qy2xn7wilnyn6y2r7ijrw2gns4ia3d0h"
else "0zdxdb9n0yk6dp6j6x3bka7vrnf7kz8jjcpl6fw5fr9f742s9s26";
then "04f7r4iv8p0jfylw4sxg3vsv14rbsi6n9hbqnwvdh6554yrm6d35"
else "1qzvf7g457dppzxn23wppjcm09vh1n6bhsvz5szhwgjvl0iv2pc7";
};
prePatch = ''

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