b12f/nixpkgs
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Merge master into stdenv-updates

Browse source 
Conflicts:
	pkgs/development/lisp-modules/stumpwm/default.nix (auto-solved)
	pkgs/top-level/all-packages.nix (trivial)
This commit is contained in:
Vladimír Čunát 2014-01-12 12:27:06 +01:00
parent 51713fbbfc a0070a9157
commit a2c316288c
281 changed files with 3039 additions and 2058 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
lib/maintainers.nix
View file

@ -27,13 +27,16 @@
garbas = "Rok Garbas <rok@garbas.si>";
goibhniu = "Cillian de Róiste <cillian.deroiste@gmail.com>";
guibert = "David Guibert <david.guibert@gmail.com>";
ianwookim = "Ian-Woo Kim <ianwookim@gmail.com>";
iElectric = "Domen Kozar <domen@dev.si>";
iyzsong = "Song Wenwu <iyzsong@gmail.com>";
jcumming = "Jack Cummings <jack@mudshark.org>";
kkallio = "Karn Kallio <tierpluspluslists@gmail.com>";
ktosiek = "Tomasz Kontusz <tomasz.kontusz@gmail.com>";
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>";

1
nixos/modules/misc/ids.nix
View file

@ -197,6 +197,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.
'';
};

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
'';
};
}

11
nixos/modules/services/x11/xserver.nix
View file

@ -16,7 +16,6 @@ let
ati_unfree = { modules = [ kernelPackages.ati_drivers_x11 ]; driverName = "fglrx"; };
nouveau = { modules = [ pkgs.xf86_video_nouveau ]; };
nvidia = { modules = [ kernelPackages.nvidia_x11 ]; };
nvidiaLegacy96 = { modules = [ kernelPackages.nvidia_x11_legacy96 ]; driverName = "nvidia"; };
nvidiaLegacy173 = { modules = [ kernelPackages.nvidia_x11_legacy173 ]; driverName = "nvidia"; };
nvidiaLegacy304 = { modules = [ kernelPackages.nvidia_x11_legacy304 ]; driverName = "nvidia"; };
unichrome = { modules = [ pkgs.xorgVideoUnichrome ]; };
@ -443,7 +442,6 @@ in
boot.extraModulePackages =
optional (elem "nvidia" driverNames) kernelPackages.nvidia_x11 ++
optional (elem "nvidiaLegacy96" driverNames) kernelPackages.nvidia_x11_legacy96 ++
optional (elem "nvidiaLegacy173" driverNames) kernelPackages.nvidia_x11_legacy173 ++
optional (elem "nvidiaLegacy304" driverNames) kernelPackages.nvidia_x11_legacy304 ++
optional (elem "virtualbox" driverNames) kernelPackages.virtualboxGuestAdditions ++
@ -497,7 +495,6 @@ in
pkgs.xdg_utils
]
++ optional (elem "nvidia" driverNames) kernelPackages.nvidia_x11
++ optional (elem "nvidiaLegacy96" driverNames) kernelPackages.nvidia_x11_legacy96
++ optional (elem "nvidiaLegacy173" driverNames) kernelPackages.nvidia_x11_legacy173
++ optional (elem "nvidiaLegacy304" driverNames) kernelPackages.nvidia_x11_legacy304
++ optional (elem "virtualbox" driverNames) xorg.xrefresh
@ -521,8 +518,6 @@ in
XORG_DRI_DRIVER_PATH = "/run/opengl-driver/lib/dri"; # !!! Depends on the driver selected at runtime.
} // optionalAttrs (elem "nvidia" driverNames) {
LD_LIBRARY_PATH = "${xorg.libX11}/lib:${xorg.libXext}/lib:${kernelPackages.nvidia_x11}/lib";
} // optionalAttrs (elem "nvidiaLegacy96" driverNames) {
LD_LIBRARY_PATH = "${xorg.libX11}/lib:${xorg.libXext}/lib:${kernelPackages.nvidia_x11_legacy96}/lib";
} // optionalAttrs (elem "nvidiaLegacy173" driverNames) {
LD_LIBRARY_PATH = "${xorg.libX11}/lib:${xorg.libXext}/lib:${kernelPackages.nvidia_x11_legacy173}/lib";
} // optionalAttrs (elem "nvidiaLegacy304" driverNames) {
@ -542,17 +537,15 @@ in
''
ln -sf ${kernelPackages.nvidia_x11} /run/opengl-driver
${optionalString cfg.driSupport32Bit
"ln -sf ${pkgs_i686.linuxPackages.nvidia_x11.override { libsOnly = true; kernelDev = null; } } /run/opengl-driver-32"}
"ln -sf ${pkgs_i686.linuxPackages.nvidia_x11.override { libsOnly = true; kernel = null; } } /run/opengl-driver-32"}
''
else if elem "nvidiaLegacy96" driverNames then
"ln -sf ${kernelPackages.nvidia_x11_legacy96} /run/opengl-driver"
else if elem "nvidiaLegacy173" driverNames then
"ln -sf ${kernelPackages.nvidia_x11_legacy173} /run/opengl-driver"
else if elem "nvidiaLegacy304" driverNames then
''
ln -sf ${kernelPackages.nvidia_x11_legacy304} /run/opengl-driver
${optionalString cfg.driSupport32Bit
"ln -sf ${pkgs_i686.linuxPackages.nvidia_x11_legacy304.override { libsOnly = true; kernelDev = null; } } /run/opengl-driver-32"}
"ln -sf ${pkgs_i686.linuxPackages.nvidia_x11_legacy304.override { libsOnly = true; kernel = null; } } /run/opengl-driver-32"}
''
else if elem "ati_unfree" driverNames then
"ln -sf ${kernelPackages.ati_drivers_x11} /run/opengl-driver"

2
nixos/modules/system/boot/loader/gummiboot/gummiboot.nix
View file

@ -14,7 +14,7 @@ let
inherit (pkgs) python gummiboot;
inherit (config.environment) nix;
nix = config.nix.package;
inherit (cfg) timeout;

21
pkgs/applications/audio/lastfmsubmitd/default.nix Normal file
View file

@ -0,0 +1,21 @@
{ stdenv, fetchurl, pythonPackages }:
pythonPackages.buildPythonPackage rec {
name = "lastfmsubmitd-${version}";
namePrefix = "";
version = "1.0.6";
src = fetchurl {
url = "http://www.red-bean.com/decklin/lastfmsubmitd/lastfmsubmitd-${version}.tar.gz";
sha256 = "c2636d5095a95167366bacd458624d67b046e060244fa54ba2c2e3efb79f9b0e";
};
doCheck = false;
installCommand = "python setup.py install --prefix=$out";
meta = {
homepage = "http://www.red-bean.com/decklin/lastfmsubmitd/";
description = "An last.fm audio scrobbler and daemon";
};
}

4
pkgs/applications/audio/moc/default.nix
View file

@ -1,4 +1,4 @@
{ stdenv, fetchurl, ncurses, pkgconfig, alsaLib, flac, libmad, speex, ffmpeg, libvorbis, mpc, libsndfile, jackaudio, db4, libav, libmodplug, timidity, libid3tag, libtool }:
{ stdenv, fetchurl, ncurses, pkgconfig, alsaLib, flac, libmad, speex, ffmpeg_0_10, libvorbis, mpc, libsndfile, jackaudio, db4, libmodplug, timidity, libid3tag, libtool }:
stdenv.mkDerivation rec {
name = "moc-${version}";
@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
configurePhase = "./configure prefix=$out";
buildInputs = [ ncurses pkgconfig alsaLib flac libmad speex ffmpeg libvorbis mpc libsndfile jackaudio db4 libav libmodplug timidity libid3tag libtool ];
buildInputs = [ ncurses pkgconfig alsaLib flac libmad speex ffmpeg_0_10 libvorbis mpc libsndfile jackaudio db4 libmodplug timidity libid3tag libtool ];
meta = {
description = "MOC (music on console) is a console audio player for LINUX/UNIX designed to be powerful and easy to use.";

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"));
}

30
pkgs/applications/editors/emacs-modes/idris/default.nix Normal file
View file

@ -0,0 +1,30 @@
{ stdenv, fetchgit, emacs }:
stdenv.mkDerivation rec {
name = "idris-mode-20140106";
src = fetchgit {
url = https://github.com/idris-hackers/idris-mode.git;
rev = "47df65dd5b554c1d7cf70a07c3bd06d80867f870";
sha256 = "55df66d1bace134bea83f0547e01daf068fc96dc080cf88ea8945ddcb2d08ea4";
};
buildInputs = [ emacs ];
buildPhase = ''
emacs -L . --batch -f batch-byte-compile *.el
'';
installPhase = ''
install -d $out/share/emacs/site-lisp
install *.el *.elc $out/share/emacs/site-lisp
'';
meta = {
description = "Emacs major mode for Idris";
homepage = https://github.com/idris-hackers/idris-modehttps://github.com/idris-hackers/idris-mode;
license = "GPLv3";
platforms = stdenv.lib.platforms.all;
};
}

14
pkgs/applications/editors/yi/yi-contrib.nix Normal file
View file

@ -0,0 +1,14 @@
{ cabal, dataAccessor, filepath, mtl, split, yi }:
cabal.mkDerivation (self: {
pname = "yi-contrib";
version = "0.7.0";
sha256 = "12x9ps5yrszr8dlj15kmsm9myq3gzd9x9nacvl3x6cq91wk53mzj";
buildDepends = [ dataAccessor filepath mtl split yi ];
meta = {
homepage = "http://haskell.org/haskellwiki/Yi";
description = "Add-ons to Yi, the Haskell-Scriptable Editor";
license = "GPL";
platforms = self.ghc.meta.platforms;
};
})

37
pkgs/applications/editors/yi/yi.nix Normal file
View file

@ -0,0 +1,37 @@
{ cabal, alex, binary, Cabal, cautiousFile, concreteTyperep
, dataAccessor, dataAccessorMtl, dataAccessorTemplate, derive, Diff
, dlist, dyre, filepath, fingertree, ghcPaths, glib, gtk, hashable
, hint, HUnit, mtl, pango, parsec, pointedlist, pureMD5, QuickCheck
, random, regexBase, regexTdfa, split, testFramework
, testFrameworkHunit, time, uniplate, unixCompat
, unorderedContainers, utf8String, vty, xdgBasedir
}:
cabal.mkDerivation (self: {
pname = "yi";
version = "0.7.0";
sha256 = "0mzcjgp12k5mxb37r6chxsk726b1qxds49ch656bpgrg7n22w2j1";
isLibrary = true;
isExecutable = true;
buildDepends = [
binary Cabal cautiousFile concreteTyperep dataAccessor
dataAccessorMtl dataAccessorTemplate derive Diff dlist dyre
filepath fingertree ghcPaths glib gtk hashable hint mtl pango
parsec pointedlist pureMD5 QuickCheck random regexBase regexTdfa
split time uniplate unixCompat unorderedContainers utf8String vty
xdgBasedir
];
testDepends = [
filepath HUnit QuickCheck testFramework testFrameworkHunit
];
buildTools = [ alex ];
configureFlags = "-fpango";
jailbreak = true;
doCheck = false;
meta = {
homepage = "http://haskell.org/haskellwiki/Yi";
description = "The Haskell-Scriptable Editor";
license = "GPL";
platforms = self.ghc.meta.platforms;
};
})

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;
};
}

9
pkgs/applications/misc/xmobar/default.nix
View file

@ -1,5 +1,5 @@
{ cabal, filepath, libXrandr, mtl, parsec, regexCompat, stm, time
, utf8String, wirelesstools, X11, X11Xft
{ cabal, alsaCore, alsaMixer, filepath, libXrandr, mtl, parsec
, regexCompat, stm, time, utf8String, wirelesstools, X11, X11Xft
}:
cabal.mkDerivation (self: {
@ -9,10 +9,11 @@ cabal.mkDerivation (self: {
isLibrary = false;
isExecutable = true;
buildDepends = [
filepath mtl parsec regexCompat stm time utf8String X11 X11Xft
alsaCore alsaMixer filepath mtl parsec regexCompat stm time
utf8String X11 X11Xft
];
extraLibraries = [ libXrandr wirelesstools ];
configureFlags = "-fwith_xft -fwith_iwlib";
configureFlags = "-fwith_xft -fwith_iwlib -fwith_alsa";
meta = {
homepage = "http://projects.haskell.org/xmobar/";
description = "A Minimalistic Text Based Status Bar";

4
pkgs/applications/networking/mailreaders/notmuch/default.nix
View file

@ -3,11 +3,11 @@
}:
stdenv.mkDerivation rec {
name = "notmuch-0.16";
name = "notmuch-0.17";
src = fetchurl {
url = "http://notmuchmail.org/releases/${name}.tar.gz";
sha256 = "0i7k85lfp9l0grmq7cvai2f3pw15jcrhcp96mmamr15y2pn2syg7";
sha256 = "15dypk2damyvxgfc8dy6iiky1ayxnj5samd4v300pi9nwpky05fj";
};
buildInputs = [ bash emacs gdb glib gmime gnupg pkgconfig talloc xapian ];

4
pkgs/applications/networking/sniffers/wireshark/default.nix
View file

@ -2,14 +2,14 @@
, geoip, heimdal, lua5, gtk, makeDesktopItem
}:
let version = "1.10.3"; in
let version = "1.10.5"; in
stdenv.mkDerivation {
name = "wireshark-${version}";
src = fetchurl {
url = "mirror://sourceforge/wireshark/wireshark-${version}.tar.bz2";
sha256 = "1329zph63z5mcij9lp111bh6b2w88z3d40gvjld2rjmhmqv1nr61";
sha256 = "1xa1l6z8n1gwnyv5mq4zmyr0afy6s0qpl9wqflg3ipbkjpd908d0";
};
buildInputs =

4
pkgs/applications/office/ledger/3.0.nix
View file

@ -1,7 +1,7 @@
{ stdenv, fetchgit, cmake, boost, gmp, mpfr, libedit, python, texinfo }:
let
rev = "8d38060968";
rev = "3b5f496536";
in
stdenv.mkDerivation {
name = "ledger3-2013.12.${rev}";
@ -9,7 +9,7 @@ stdenv.mkDerivation {
src = fetchgit {
url = "https://github.com/ledger/ledger.git";
inherit rev;
sha256 = "e100f28d18e1804fc8aa8b0141cc33d6d95bbe329e803ba887622ac5f8d3d972";
sha256 = "0r36zsdsyy6aylfcwyqra4796y4abi3b27wv5fvk3g2bmyzqzx4j";
};
buildInputs = [ cmake boost gmp mpfr libedit python texinfo ];

9
pkgs/applications/version-management/git-and-tools/git-annex/default.nix
View file

@ -14,8 +14,8 @@
cabal.mkDerivation (self: {
pname = "git-annex";
version = "5.20131221";
sha256 = "1gkb8fc0fjjn0rigajgliqy381pmkpx4ha1rx65dcw15rqnrawb3";
version = "5.20140108";
sha256 = "17j1avmg66lda52p93689n4mas46rfbjdvss1rvmdh10cj7hg8jy";
isLibrary = false;
isExecutable = true;
buildDepends = [
@ -42,12 +42,11 @@ cabal.mkDerivation (self: {
-fDNS
-fProduction
-fTDFA";
doCheck = false;
installPhase = ''
preConfigure = ''
export HOME="$NIX_BUILD_TOP/tmp"
mkdir "$HOME"
./Setup install
'';
installPhase = "./Setup install";
checkPhase = ''
cp dist/build/git-annex/git-annex git-annex
./git-annex test

5
pkgs/applications/version-management/tailor/default.nix
View file

@ -2,7 +2,10 @@ args : with args;
let version = if args ? version then args.version else "0.9.35"; in
rec {
src = fetchurl {
url = "http://darcs.arstecnica.it/tailor/tailor-${version}.tar.gz";
urls = [
"http://darcs.arstecnica.it/tailor/tailor-${version}.tar.gz"
"http://pkgs.fedoraproject.org/repo/pkgs/tailor/tailor-${version}.tar.gz/58a6bc1c1d922b0b1e4579c6440448d1/tailor-${version}.tar.gz"
];
sha256 = "061acapxxn5ab3ipb5nd3nm8pk2xj67bi83jrfd6lqq3273fmdjh";
};

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;

8
pkgs/applications/virtualization/virtualbox/default.nix
View file

@ -1,5 +1,5 @@
{ stdenv, fetchurl, lib, iasl, dev86, pam, libxslt, libxml2, libX11, xproto, libXext
, libXcursor, libXmu, qt4, libIDL, SDL, libcap, zlib, libpng, glib, kernelDev, lvm2
, libXcursor, libXmu, qt4, libIDL, SDL, libcap, zlib, libpng, glib, kernel, lvm2
, which, alsaLib, curl, gawk
, xorriso, makeself, perl, pkgconfig
, javaBindings ? false, jdk ? null
@ -52,7 +52,7 @@ let
};
in stdenv.mkDerivation {
name = "virtualbox-${version}-${kernelDev.version}";
name = "virtualbox-${version}-${kernel.version}";
src = fetchurl {
url = "http://download.virtualbox.org/virtualbox/${version}/VirtualBox-${version}.tar.bz2";
@ -61,14 +61,14 @@ in stdenv.mkDerivation {
buildInputs =
[ iasl dev86 libxslt libxml2 xproto libX11 libXext libXcursor qt4 libIDL SDL
libcap glib kernelDev lvm2 python alsaLib curl pam xorriso makeself perl
libcap glib lvm2 python alsaLib curl pam xorriso makeself perl
pkgconfig which libXmu ]
++ optional javaBindings jdk
++ optional pythonBindings python;
prePatch = ''
set -x
MODULES_BUILD_DIR=`echo ${kernelDev}/lib/modules/*/build`
MODULES_BUILD_DIR=`echo ${kernel.dev}/lib/modules/*/build`
sed -e 's@/lib/modules/`uname -r`/build@'$MODULES_BUILD_DIR@ \
-e 's@MKISOFS --version@MKISOFS -version@' \
-e 's@PYTHONDIR=.*@PYTHONDIR=${if pythonBindings then python else ""}@' \

8
pkgs/applications/virtualization/virtualbox/guest-additions/default.nix
View file

@ -1,4 +1,4 @@
{ stdenv, fetchurl, lib, patchelf, cdrkit, kernelDev, which, makeWrapper
{ stdenv, fetchurl, lib, patchelf, cdrkit, kernel, which, makeWrapper
, xorg, dbus, virtualbox }:
let
@ -8,14 +8,14 @@ let
in
stdenv.mkDerivation {
name = "VirtualBox-GuestAdditions-${version}-${kernelDev.version}";
name = "VirtualBox-GuestAdditions-${version}-${kernel.version}";
src = fetchurl {
url = "http://download.virtualbox.org/virtualbox/${version}/VBoxGuestAdditions_${version}.iso";
sha256 = "f11a7f13dfe7bf9f246fb877144bb467fe6deadcd876568ec79b6ccd3b59d767";
};
KERN_DIR = "${kernelDev}/lib/modules/*/build";
KERN_DIR = "${kernel.dev}/lib/modules/*/build";
buildInputs = [ patchelf cdrkit makeWrapper dbus ];
@ -115,7 +115,7 @@ stdenv.mkDerivation {
for i in *
do
cd $i
kernelVersion=$(cd ${kernelDev}/lib/modules; ls)
kernelVersion=$(cd ${kernel.dev}/lib/modules; ls)
export MODULE_DIR=$out/lib/modules/$kernelVersion/misc
find . -type f | xargs sed -i -e "s|-o root||g" \
-e "s|-g root||g"

9
pkgs/build-support/fetchbower/default.nix Normal file
View file

@ -0,0 +1,9 @@
{ stdenv, fetch-bower, git }: name: version: target: outputHash: stdenv.mkDerivation {
name = "${name}-${version}";
realBuilder = "${fetch-bower}/bin/fetch-bower";
args = [ name version target ];
outputHashMode = "recursive";
outputHashAlgo = "sha256";
inherit outputHash;
PATH = "${git}/bin";
}

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;
}

12
pkgs/build-support/vm/default.nix
View file

@ -1467,22 +1467,22 @@ rec {
debian70x86_64 = debian7x86_64;
debian7i386 = {
name = "debian-7.2-wheezy-i386";
fullName = "Debian 7.2 Wheezy (i386)";
name = "debian-7.3-wheezy-i386";
fullName = "Debian 7.3 Wheezy (i386)";
packagesList = fetchurl {
url = mirror://debian/dists/wheezy/main/binary-i386/Packages.bz2;
sha256 = "2e80242e323f233c40b3020b0f1a57d12df8a120ee82af88ff7032ba4688f97d";
sha256 = "037637520ce371a50beb5446fd27a731f30b51bc362c2f4a5dcfce9c7e30ffb6";
};
urlPrefix = mirror://debian;
packages = commonDebianPackages;
};
debian7x86_64 = {
name = "debian-7.2-wheezy-amd64";
fullName = "Debian 7.2 Wheezy (amd64)";
name = "debian-7.3-wheezy-amd64";
fullName = "Debian 7.3 Wheezy (amd64)";
packagesList = fetchurl {
url = mirror://debian/dists/wheezy/main/binary-amd64/Packages.bz2;
sha256 = "adfc4cd3d3b855c73c9e2e12163a33c193f98c9bad25765080fa6136378a6e3b";
sha256 = "c2ed55a2a263d482826c934b97ad910984fa5695ab1c480841741b828d0590a5";
};
urlPrefix = mirror://debian;
packages = commonDebianPackages;

2
pkgs/desktops/gnome-2/default.nix
View file

@ -107,8 +107,6 @@ let overridden = set // overrides; set = with overridden; {
gtksourceview = callPackage ./desktop/gtksourceview { };
nautilus = callPackage ./desktop/nautilus { };
gnome_icon_theme = callPackage ./desktop/gnome-icon-theme { };
vte = callPackage ./desktop/vte { };

10
pkgs/desktops/gnome-2/desktop/nautilus/default.nix
View file

@ -1,10 +0,0 @@
{stdenv, fetchurl, pkgconfig, libxml2, dbus_glib, shared_mime_info, libexif, gtk, gnome_desktop, libunique, intltool, GConf}:
stdenv.mkDerivation {
name = "nautilus-2.28.0";
src = fetchurl {
url = mirror://gnome/sources/nautilus/2.28/nautilus-2.28.0.tar.bz2;
sha256 = "0wmskjxf231r2vra22zy02561gh5q10pj3lhzya13dvlliyv4q9p";
};
buildInputs = [ pkgconfig libxml2 dbus_glib shared_mime_info libexif gtk gnome_desktop libunique intltool GConf ];
}

4
pkgs/desktops/gnome-3/core/at-spi2-atk/default.nix
View file

@ -14,4 +14,8 @@ stdenv.mkDerivation rec {
buildInputs = [ python pkgconfig popt atk libX11 libICE xlibs.libXtst libXi
intltool dbus_glib at_spi2_core libSM ];
meta = with stdenv.lib; {
platforms = platforms.linux;
};
}

4
pkgs/desktops/gnome-3/core/at-spi2-core/default.nix
View file

@ -19,6 +19,10 @@ stdenv.mkDerivation (rec {
# ToDo: on non-NixOS we create a symlink from there?
configureFlags = "--with-dbus-daemondir=/run/current-system/sw/bin/";
meta = with stdenv.lib; {
platforms = platforms.linux;
};
}
// stdenv.lib.optionalAttrs stdenv.isDarwin {
NIX_LDFLAGS = "-lintl";

19
pkgs/desktops/gnome-3/core/dconf/default.nix Normal file
View file

@ -0,0 +1,19 @@
{ stdenv, fetchurl, vala, libxslt, pkgconfig, glib, dbus_glib, gnome3
, libxml2, intltool, docbook_xsl_ns, docbook_xsl }:
stdenv.mkDerivation rec {
name = "dconf-${version}";
version = "0.18.0";
src = fetchurl {
url = "mirror://gnome/sources/dconf/0.18/${name}.tar.xz";
sha256 = "0mf921pnkhs8xn1dr2wxfq277vjsbkpl9cccv0gaz4460z31p6qh";
};
buildInputs = [ vala libxslt pkgconfig glib dbus_glib gnome3.gtk libxml2
intltool docbook_xsl docbook_xsl_ns ];
meta = with stdenv.lib; {
platforms = platforms.linux;
};
}

28
pkgs/desktops/gnome-3/core/eog/default.nix Normal file
View file

@ -0,0 +1,28 @@
{ fetchurl, stdenv, intltool, pkgconfig, itstool, libxml2, libjpeg, gnome3
, shared_mime_info, makeWrapper, librsvg, libexif }:
stdenv.mkDerivation rec {
name = "eog-3.10.2";
src = fetchurl {
url = "mirror://gnome/sources/eog/3.10/${name}.tar.xz";
sha256 = "0qs7wmn987vd0cw8w16gmb0bnda3nkcwfg1q343l4rm6kih9ik2w";
};
buildInputs = with gnome3;
[ intltool pkgconfig itstool libxml2 libjpeg gtk glib libpeas makeWrapper librsvg
gsettings_desktop_schemas shared_mime_info gnome_icon_theme gnome_desktop libexif ];
postInstall = ''
wrapProgram "$out/bin/eog" \
--prefix GI_TYPELIB_PATH : "$GI_TYPELIB_PATH" \
--prefix XDG_DATA_DIRS : "${shared_mime_info}/share:${gnome3.gnome_icon_theme}/share:${gnome3.gsettings_desktop_schemas}/share:$out/share"
'';
meta = with stdenv.lib; {
homepage = https://wiki.gnome.org/Apps/EyeOfGnome;
platforms = platforms.linux;
description = "GNOME image viewer";
};
}

27
pkgs/desktops/gnome-3/core/evince/default.nix
View file

@ -1,27 +1,26 @@
{ fetchurl, stdenv, pkgconfig, intltool, perl, perlXMLParser, libxml2
, glib, gtk3, pango, atk, gdk_pixbuf, shared_mime_info
, itstool, gnome_icon_theme, libgnome_keyring, gsettings_desktop_schemas
, poppler, ghostscriptX, djvulibre, libspectre
, makeWrapper #, python /*just for tests*/
, recentListSize ? null # 5 is not enough, allow passing a different number
, glib, gtk3, pango, atk, gdk_pixbuf, shared_mime_info, itstool, gnome3
, poppler, ghostscriptX, djvulibre, libspectre, libsecret , makeWrapper
, librsvg, recentListSize ? null # 5 is not enough, allow passing a different number
}:
stdenv.mkDerivation rec {
name = "evince-3.6.1";
name = "evince-3.10.3";
src = fetchurl {
url = "mirror://gnome/sources/evince/3.6/${name}.tar.xz";
sha256 = "1da1pij030dh8mb0pr0jnyszgsbjnh8lc17rj5ii52j3kmbv51qv";
url = "mirror://gnome/sources/evince/3.10/${name}.tar.xz";
sha256 = "1bz9ypsvlfw1vgs7i5glba1h1n6c90f0d1g64linhg6xjcxcq3dk";
};
buildInputs = [
pkgconfig intltool perl perlXMLParser libxml2
glib gtk3 pango atk gdk_pixbuf
itstool gnome_icon_theme libgnome_keyring gsettings_desktop_schemas
itstool gnome3.gnome_icon_theme gnome3.libgnome_keyring gnome3.gsettings_desktop_schemas
poppler ghostscriptX djvulibre libspectre
makeWrapper
makeWrapper libsecret
];
preFixup = "rm $out/share/icons/hicolor/icon-theme.cache";
configureFlags = [
@ -44,11 +43,12 @@ stdenv.mkDerivation rec {
# Tell Glib/GIO about the MIME info directory, which is used
# by `g_file_info_get_content_type ()'.
wrapProgram "$out/bin/evince" \
--prefix XDG_DATA_DIRS : "${shared_mime_info}/share:$out/share"
'' + gsettings_desktop_schemas.doCompileSchemas;
--set GDK_PIXBUF_MODULE_FILE ${librsvg}/lib/gdk-pixbuf/loaders.cache \
--prefix XDG_DATA_DIRS : "${gnome3.gnome_icon_theme}/share:${gnome3.gsettings_desktop_schemas}/share:${shared_mime_info}/share:$out/share"
'';
doCheck = false; # would need pythonPackages.dogTail, which is missing
meta = {
meta = with stdenv.lib; {
homepage = http://www.gnome.org/projects/evince/;
description = "GNOME's document viewer";
@ -60,5 +60,6 @@ stdenv.mkDerivation rec {
'';
license = "GPLv2+";
platforms = platforms.linux;
};
}

7
pkgs/desktops/gnome-3/core/gconf/default.nix
View file

@ -4,7 +4,7 @@
stdenv.mkDerivation rec {
versionMajor = "3.2";
versionMinor = "5";
versionMinor = "6";
moduleName = "GConf";
origName = "${moduleName}-${versionMajor}.${versionMinor}";
@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
src = fetchurl {
url = "mirror://gnome/sources/${moduleName}/${versionMajor}/${origName}.tar.xz";
sha256 = "1ijqks0jxc4dyfxg4vnbqds4aj6miyahlsmlqlkf2bi1798akpjd";
sha256 = "0k3q9nh53yhc9qxf1zaicz4sk8p3kzq4ndjdsgpaa2db0ccbj4hr";
};
buildInputs = [ libxml2 polkit gtk orbit ];
@ -22,8 +22,9 @@ stdenv.mkDerivation rec {
# ToDo: ldap reported as not found but afterwards reported as supported
meta = {
meta = with stdenv.lib; {
homepage = http://projects.gnome.org/gconf/;
description = "A system for storing application preferences";
platforms = platforms.linux;
};
}

12
pkgs/desktops/gnome-3/core/gcr/default.nix
View file

@ -2,11 +2,11 @@
, libgcrypt, libtasn1, dbus_glib, gtk, pango, gdk_pixbuf, atk }:
stdenv.mkDerivation rec {
name = "gcr-3.6.2";
name = "gcr-3.10.1";
src = fetchurl {
url = "mirror://gnome/sources/gcr/3.6/${name}.tar.xz";
sha256 = "16xyqxv2hxl3a4m8ahilqcf1ps58w1ijh8dav1l5nqz36ljdn2gp";
url = "mirror://gnome/sources/gcr/3.10/${name}.tar.xz";
sha256 = "0nv470a8cvw4rw49hf5aqvll1rpkacmsr3pj8s1l205yaid4yvq0";
};
buildInputs = [
@ -14,7 +14,11 @@ stdenv.mkDerivation rec {
libgcrypt libtasn1 dbus_glib gtk pango gdk_pixbuf atk
];
configureFlags = "--disable-introspection";
configureFlags = [ "--disable-introspection" ];
#doCheck = true;
meta = with stdenv.lib; {
platforms = platforms.linux;
};
}

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;
};
}

10
pkgs/desktops/gnome-3/core/gnome-icon-theme/default.nix
View file

@ -1,12 +1,16 @@
{ stdenv, fetchurl, pkgconfig, intltool, iconnamingutils, gtk }:
stdenv.mkDerivation rec {
name = "gnome-icon-theme-3.6.2";
name = "gnome-icon-theme-3.10.0";
src = fetchurl {
url = "mirror://gnome/sources/gnome-icon-theme/3.6/${name}.tar.xz";
sha256 = "0i8hkx2c1g5ckrvbkvs9n47i8fby8p9xs6p5l0mxdx9aq4smak9i";
url = "mirror://gnome/sources/gnome-icon-theme/3.10/${name}.tar.xz";
sha256 = "1xinbgkkvlhazj887ajcl13i7kdc1wcca02jwxzvjrvchjsp4m66";
};
nativeBuildInputs = [ pkgconfig intltool iconnamingutils gtk ];
meta = with stdenv.lib; {
platforms = platforms.linux;
};
}

19
pkgs/desktops/gnome-3/core/gnome-keyring/default.nix
View file

@ -1,12 +1,13 @@
{stdenv, fetchurl, pkgconfig, dbus, libgcrypt, libtasn1, pam, python, glib
, gtk3, intltool, gconf, libgnome_keyring, pango, gcr, gdk_pixbuf, atk, p11_kit }:
{ stdenv, fetchurl, pkgconfig, dbus, libgcrypt, libtasn1, pam, python, glib, libxslt
, gtk3, intltool, gconf, libgnome_keyring, pango, gcr, gdk_pixbuf, atk, p11_kit
, docbook_xsl_ns, docbook_xsl }:
stdenv.mkDerivation rec {
name = "gnome-keyring-3.6.3";
name = "gnome-keyring-3.10.1";
src = fetchurl {
url = "mirror://gnome/sources/gnome-keyring/3.6/${name}.tar.xz";
sha256 = "0la107v75vh8v165lk391xg820h8hxa209766wr98pm22qzkl5g0";
url = "mirror://gnome/sources/gnome-keyring/3.10/${name}.tar.xz";
sha256 = "1y6v2p14jx5h6yh14c53pd8r0r5zbmcgw8v4nxvf94kd9jliy00q";
};
buildInputs = [
@ -14,13 +15,17 @@ stdenv.mkDerivation rec {
pango gcr gdk_pixbuf atk p11_kit
];
propagatedBuildInputs = [ glib libtasn1 ];
propagatedBuildInputs = [ glib libtasn1 libxslt ];
nativeBuildInputs = [ pkgconfig intltool ];
nativeBuildInputs = [ pkgconfig intltool docbook_xsl_ns docbook_xsl ];
configureFlags = [
"--with-ca-certificates=/etc/ssl/certs/ca-bundle.crt" # NixOS hardcoded path
"--with-pkcs11-config=$$out/etc/pkcs11/" # installation directories
"--with-pkcs11-modules=$$out/lib/pkcs11/"
];
meta = with stdenv.lib; {
platforms = platforms.linux;
};
}

20
pkgs/desktops/gnome-3/core/gnome-online-accounts/default.nix Normal file
View file

@ -0,0 +1,20 @@
{ stdenv, fetchurl, pkgconfig, glib, libxslt, gtk, webkitgtk, json_glib, rest, libsecret, dbus_glib
, telepathy_glib, intltool, dbus_libs, icu, libsoup, docbook_xsl_ns, docbook_xsl
}:
stdenv.mkDerivation rec {
name = "gnome-online-accounts-3.10.2";
src = fetchurl {
url = "http://ftp.acc.umu.se/pub/GNOME/core/3.10/3.10.2/sources/${name}.tar.xz";
sha256 = "15qvw40dmi886491s3abpidsm2lx65fhglhj99bvcdskhk0ih90b";
};
NIX_CFLAGS_COMPILE = "-I${dbus_glib}/include/dbus-1.0 -I${dbus_libs}/include/dbus-1.0";
buildInputs = [ pkgconfig glib libxslt gtk webkitgtk json_glib rest libsecret dbus_glib telepathy_glib intltool icu libsoup docbook_xsl_ns docbook_xsl];
meta = with stdenv.lib; {
platforms = platforms.linux;
};
}

29
pkgs/desktops/gnome-3/core/gnome-session/default.nix Normal file
View file

@ -0,0 +1,29 @@
{ fetchurl, stdenv, pkgconfig, gnome3, glib, dbus_glib, json_glib, upower
, libxslt, intltool, makeWrapper }:
stdenv.mkDerivation rec {
name = "gnome-session-3.10.1";
src = fetchurl {
url = "mirror://gnome/sources/gnome-session/3.10/${name}.tar.xz";
sha256 = "1k59yss7r748nvr0cdjrqmx0zy26b93rfn66lsdg9fz60x77087n";
};
buildInputs = with gnome3;
[ pkgconfig glib gnome_desktop gtk dbus_glib json_glib libxslt
gsettings_desktop_schemas upower intltool gconf makeWrapper ];
# TODO: dbus, gnome-shell, gnome-settings-daemon
postInstall = ''
wrapProgram "$out/bin/gnome-session" \
--prefix GI_TYPELIB_PATH : "$GI_TYPELIB_PATH" \
--prefix XDG_DATA_DIRS : "${gnome3.gsettings_desktop_schemas}/share:$out/share"
'';
meta = with stdenv.lib; {
platforms = platforms.linux;
};
}

21
pkgs/desktops/gnome-3/core/gnome-terminal/default.nix
View file

@ -1,20 +1,25 @@
{ stdenv, fetchurl, pkgconfig, cairo, libxml2, libxslt, gnome3, pango
, gnome_doc_utils, intltool, libX11, which, gconf }:
{ stdenv, fetchurl, pkgconfig, cairo, libxml2, gnome3, pango
, gnome_doc_utils, intltool, libX11, which, gconf, libuuid
, desktop_file_utils, itstool, ncurses }:
stdenv.mkDerivation rec {
versionMajor = "3.4";
versionMinor = "1.1";
versionMajor = "3.10";
versionMinor = "2";
name = "gnome-terminal-${versionMajor}.${versionMinor}";
src = fetchurl {
url = "mirror://gnome/sources/gnome-terminal/${versionMajor}/${name}.tar.xz";
sha256 = "1p9zqjmkxryf2kyghhhwwpsh4kd8y1jzzwc9zxghmpxszi9a5m0l";
sha256 = "04yrk9531f373nl64jx3pczsnq7a56mj3n436jbhjp74kp12fa70";
};
configureFlags = "--disable-scrollkeeper";
buildInputs = [ gnome3.gtk gnome3.gsettings_desktop_schemas gnome3.vte gconf ];
buildInputs = [ gnome3.gtk gnome3.gsettings_desktop_schemas gnome3.vte
gnome3.dconf gnome3.gconf itstool ncurses ];
nativeBuildInputs = [ pkgconfig intltool gnome_doc_utils which ];
nativeBuildInputs = [ pkgconfig intltool gnome_doc_utils which libuuid libxml2 desktop_file_utils ];
meta = with stdenv.lib; {
platforms = platforms.linux;
};
}

15
pkgs/misc/themes/gnome-themes-standard/default.nix → pkgs/desktops/gnome-3/core/gnome-themes-standard/default.nix
View file

@ -1,9 +1,10 @@
{ stdenv, fetchurl, intltool, gtk3, librsvg, pkgconfig, pango, atk, gtk2, gdk_pixbuf }:
stdenv.mkDerivation {
name = "gnome-themes-standard";
stdenv.mkDerivation rec {
name = "gnome-themes-standard-3.10.0";
src = fetchurl {
url = "http://ftp.gnome.org/pub/GNOME/sources/gnome-themes-standard/3.7/gnome-themes-standard-3.7.92.tar.xz";
sha256 = "0a1ed83c07f57b5b45b8f3817ca0ca14feecb56de505243c086fb306c88da8de";
url = "mirror://gnome/sources/gnome-themes-standard/3.10/${name}.tar.xz";
sha256 = "0f2b3ypkfvrdsxcvp14ja9wqj382f1p46yrjvhhxkkjgagy6qb41";
};
buildInputs = [ intltool gtk3 librsvg pkgconfig pango atk gtk2 gdk_pixbuf ];
@ -12,4 +13,8 @@ stdenv.mkDerivation {
cat ${gdk_pixbuf}/lib/gdk-pixbuf-2.0/2.10.0/loaders.cache ${librsvg}/lib/gdk-pixbuf/loaders.cache > loaders.cache
export GDK_PIXBUF_MODULE_FILE=`readlink -e loaders.cache`
'';
}
meta = with stdenv.lib; {
platforms = platforms.linux;
};
}

8
pkgs/desktops/gnome-3/core/gsettings-desktop-schemas/default.nix
View file

@ -1,10 +1,10 @@
{ stdenv, fetchurl, pkgconfig, intltool, glib
{ stdenv, fetchurl, pkgconfig, intltool, glib, gobjectIntrospection
# just for passthru
, gtk3, gsettings_desktop_schemas }:
stdenv.mkDerivation rec {
versionMajor = "3.6";
versionMajor = "3.10";
versionMinor = "1";
moduleName = "gsettings-desktop-schemas";
@ -12,10 +12,10 @@ stdenv.mkDerivation rec {
src = fetchurl {
url = "mirror://gnome/sources/${moduleName}/${versionMajor}/${name}.tar.xz";
sha256 = "1rk71q2rky9nzy0zb5jsvxa62vhg7dk65kdgdifq8s761797ga6r";
sha256 = "04b8wy10l6pzs5928gnzaia73dz5fjlcdy39xi3mf50ajv27h8s5";
};
buildInputs = [ glib ];
buildInputs = [ glib gobjectIntrospection ];
nativeBuildInputs = [ pkgconfig intltool ];

4
pkgs/desktops/gnome-3/core/libcroco/default.nix
View file

@ -11,4 +11,8 @@ stdenv.mkDerivation rec {
configureFlags = stdenv.lib.optional stdenv.isDarwin "--disable-Bsymbolic";
buildInputs = [ pkgconfig libxml2 glib ];
meta = with stdenv.lib; {
platforms = platforms.linux;
};
}

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

@ -0,0 +1,18 @@
{ stdenv, fetchurl, autoconf, vala, pkgconfig, glib, gobjectIntrospection }:
stdenv.mkDerivation rec {
name = "libgee-0.13.4";
src = fetchurl {
url = "https://download.gnome.org/sources/libgee/0.13/${name}.tar.xz";
sha256 = "1gzyx8gy5m6r8km3xbb1kszz0v3p9vsbzwb78pf3fw122gwbjj4k";
};
patches = [ ./fix_introspection_paths.patch ];
buildInputs = [ autoconf vala pkgconfig glib gobjectIntrospection ];
meta = with stdenv.lib; {
platforms = platforms.linux;
};
}

13
pkgs/desktops/gnome-3/core/libgee/fix_introspection_paths.patch Normal file
View file

@ -0,0 +1,13 @@
--- fix_introspection_paths.patch/configure 2014-01-07 17:43:53.521339338 +0000
+++ fix_introspection_paths.patch/configure-fix 2014-01-07 17:45:11.068635069 +0000
@@ -12085,8 +12085,8 @@
INTROSPECTION_SCANNER=`$PKG_CONFIG --variable=g_ir_scanner gobject-introspection-1.0`
INTROSPECTION_COMPILER=`$PKG_CONFIG --variable=g_ir_compiler gobject-introspection-1.0`
INTROSPECTION_GENERATE=`$PKG_CONFIG --variable=g_ir_generate gobject-introspection-1.0`
- INTROSPECTION_GIRDIR=`$PKG_CONFIG --variable=girdir gobject-introspection-1.0`
- INTROSPECTION_TYPELIBDIR="$($PKG_CONFIG --variable=typelibdir gobject-introspection-1.0)"
+ INTROSPECTION_GIRDIR="${datadir}/gir-1.0"
+ INTROSPECTION_TYPELIBDIR="${libdir}/girepository-1.0"
INTROSPECTION_CFLAGS=`$PKG_CONFIG --cflags gobject-introspection-1.0`
INTROSPECTION_LIBS=`$PKG_CONFIG --libs gobject-introspection-1.0`
INTROSPECTION_MAKEFILE=`$PKG_CONFIG --variable=datadir gobject-introspection-1.0`/gobject-introspection-1.0/Makefile.introspection

13
pkgs/desktops/gnome-3/core/libgweather/default.nix
View file

@ -2,13 +2,20 @@
, pango, gdk_pixbuf, atk }:
stdenv.mkDerivation rec {
name = "libgweather-3.6.2";
name = "libgweather-3.10.1";
src = fetchurl {
url = "mirror://gnome/sources/libgweather/3.6/${name}.tar.xz";
sha256 = "1c50m0zrnfh4g58rzf33dfw8ggslj38c61p8a75905bmj3rfyahg";
url = "mirror://gnome/sources/libgweather/3.10/${name}.tar.xz";
sha256 = "1iyg0l90m14iw0ksjbmrrhb5fqn0y7x5f726y56gxd4qcxgpi3mf";
};
makeFlags = "INTROSPECTION_GIRDIR=$(out)/share/gir-1.0/ INTROSPECTION_TYPELIBDIR=$(out)/lib/girepository-1.0";
configureFlags = if stdenv ? glibc then "--with-zoneinfo-dir=${stdenv.glibc}/share/zoneinfo" else "";
propagatedBuildInputs = [ libxml2 gtk libsoup gconf pango gdk_pixbuf atk ];
nativeBuildInputs = [ pkgconfig intltool ];
meta = with stdenv.lib; {
platforms = platforms.linux;
};
}

20
pkgs/desktops/gnome-3/core/libgxps/default.nix Normal file
View file

@ -0,0 +1,20 @@
{ stdenv, fetchurl, pkgconfig, glib, cairo, libarchive, freetype, libjpeg, libtiff
, openssl, bzip2, acl, attr
}:
stdenv.mkDerivation rec {
name = "libgxps-0.2.2";
src = fetchurl {
url = "http://ftp.acc.umu.se/pub/GNOME/core/3.10/3.10.2/sources/${name}.tar.xz";
sha256 = "1gi0b0x0354jyqc48vspk2hg2q1403cf2p9ibj847nzhkdrh9l9r";
};
buildInputs = [ pkgconfig glib cairo libarchive freetype libjpeg libtiff acl openssl bzip2 attr];
configureFlags = "--without-liblcms2";
meta = with stdenv.lib; {
platforms = platforms.linux;
};
}

22
pkgs/desktops/gnome-3/core/libpeas/default.nix Normal file
View file

@ -0,0 +1,22 @@
{ stdenv, fetchurl, pkgconfig, gnome3, intltool, gobjectIntrospection }:
stdenv.mkDerivation rec {
name = "libpeas-${version}";
version = "1.9.0";
buildInputs = with gnome3; [ intltool pkgconfig glib gobjectIntrospection gtk3 ];
src = fetchurl {
url = "mirror://gnome/sources/libpeas/1.9/${name}.tar.xz";
sha256 = "13fzyzv6c0cfdj83z1s16lv8k997wpnzyzr0wfwcfkcmvz64g1q0";
};
preFixup = ''
rm $out/share/icons/hicolor/icon-theme.cache
'';
meta = with stdenv.lib; {
platforms = platforms.linux;
};
}

16
pkgs/desktops/gnome-3/core/libqmi/default.nix Normal file
View file

@ -0,0 +1,16 @@
{ stdenv, fetchurl, pkgconfig, glib, python }:
stdenv.mkDerivation rec {
name = "libqmi-1.0";
src = fetchurl {
url = "http://ftp.acc.umu.se/pub/GNOME/core/3.10/3.10.2/sources/${name}.tar.xz";
sha256 = "0w4cd7nihp73frh3sfi13fx0rkwmd581xpil54bsjc7pw7z01bd1";
};
buildInputs = [ pkgconfig glib python ];
meta = with stdenv.lib; {
platforms = platforms.linux;
};
}

16
pkgs/desktops/gnome-3/core/libzapojit/default.nix Normal file
View file

@ -0,0 +1,16 @@
{ stdenv, fetchurl, pkgconfig, glib, intltool, json_glib, rest, libsoup, gtk, gnome_online_accounts }:
stdenv.mkDerivation rec {
name = "libzapojit-0.0.3";
src = fetchurl {
url = "http://ftp.acc.umu.se/pub/GNOME/core/3.10/3.10.2/sources/${name}.tar.xz";
sha256 = "0zn3s7ryjc3k1abj4k55dr2na844l451nrg9s6cvnnhh569zj99x";
};
buildInputs = [ pkgconfig glib intltool json_glib rest libsoup gtk gnome_online_accounts ];
meta = with stdenv.lib; {
platforms = platforms.linux;
};
}

27
pkgs/desktops/gnome-3/core/nautilus/default.nix Normal file
View file

@ -0,0 +1,27 @@
{ stdenv, fetchurl, pkgconfig, libxml2, dbus_glib, shared_mime_info, libexif
, gtk, gnome3, libunique, intltool, gobjectIntrospection
, libnotify, makeWrapper, exempi }:
stdenv.mkDerivation rec {
name = "nautilus-3.10.1";
src = fetchurl {
url = "mirror://gnome/sources/nautilus/3.10/${name}.tar.xz";
sha256 = "09y7dxaw4bjgan3q10azky0h6kndqv2lfn75iip12zchf2hk59gn";
};
configureFlags = [ "--enable-tracker=no" ];
buildInputs = [ pkgconfig libxml2 dbus_glib shared_mime_info libexif gtk libunique intltool exempi
gnome3.gnome_desktop gnome3.gsettings_desktop_schemas libnotify makeWrapper ];
postInstall = ''
wrapProgram "$out/bin/nautilus" \
--prefix GI_TYPELIB_PATH : "$GI_TYPELIB_PATH" \
--prefix XDG_DATA_DIRS : "${gtk}/share:${gnome3.gnome_icon_theme}:${gnome3.gsettings_desktop_schemas}/share:$out/share"
'';
meta = with stdenv.lib; {
platforms = platforms.linux;
};
}

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

@ -0,0 +1,18 @@
{ stdenv, fetchurl, pkgconfig, glib, libsoup, gobjectIntrospection }:
stdenv.mkDerivation rec {
name = "rest-0.7.90";
src = fetchurl {
url = "http://ftp.acc.umu.se/pub/GNOME/core/3.10/3.10.2/sources/${name}.tar.xz";
sha256 = "08n0cvz44l4b1gkmjryap3ysd0wcbbbdjbcar73nr52dmk52ls0x";
};
buildInputs = [ pkgconfig glib libsoup gobjectIntrospection];
configureFlags = "--with-ca-certificates=/etc/ssl/certs/ca-bundle.crt";
meta = with stdenv.lib; {
platforms = platforms.linux;
};
}

6
pkgs/desktops/gnome-3/core/vte/default.nix
View file

@ -3,15 +3,15 @@
stdenv.mkDerivation rec {
versionMajor = "0.32";
versionMinor = "2";
versionMajor = "0.34";
versionMinor = "9";
moduleName = "vte";
name = "${moduleName}-${versionMajor}.${versionMinor}";
src = fetchurl {
url = "mirror://gnome/sources/${moduleName}/${versionMajor}/${name}.tar.xz";
sha256 = "0sj837b9ib36gx00hzdinv23f7w91fd5mcw1p6wdi053yxqw17nn";
sha256 = "1q93dsxg56f57mxblmh8kn4v9kyc643j2pjf1j3mn2kxypnwaf3g";
};
buildInputs = [ intltool pkgconfig gnome3.glib gnome3.gtk ncurses ] ++

13
pkgs/desktops/gnome-3/core/zenity/default.nix
View file

@ -1,20 +1,23 @@
{ stdenv, fetchurl, pkgconfig, cairo, libxml2, libxslt, gnome3, pango
, gnome_doc_utils, intltool, libX11, which }:
, gnome_doc_utils, intltool, libX11, which, itstool }:
stdenv.mkDerivation rec {
versionMajor = "3.4";
versionMajor = "3.8";
versionMinor = "0";
name = "zenity-${versionMajor}.${versionMinor}";
src = fetchurl {
url = "mirror://gnome/sources/zenity/${versionMajor}/zenity-${versionMajor}.${versionMinor}.tar.xz";
sha256 = "1bqbfcvd3kj2xk15fvbcdaqvyg9qvymlhn8cwvg5m6v4gicniw2w";
sha256 = "0gsnwvhsqqba5i6d4jh86j29q4q18hmvhj9c1v76vwlj2nvz1ywl";
};
configureFlags = "--disable-scrollkeeper";
buildInputs = [ gnome3.gtk libxml2 libxslt libX11 ];
buildInputs = [ gnome3.gtk libxml2 libxslt libX11 itstool ];
nativeBuildInputs = [ pkgconfig intltool gnome_doc_utils which ];
meta = with stdenv.lib; {
platforms = platforms.linux;
};
}

38
pkgs/desktops/gnome-3/default.nix
View file

@ -10,7 +10,7 @@ rec {
#### Overrides of libraries
librsvg = pkgs.librsvg.override { inherit gtk2; }; # gtk2 mysteriously needed in librsvg for goffice (commented in Gentoo)
libsoup = pkgs.libsoup_2_44;
#### Core (http://ftp.acc.umu.se/pub/GNOME/core/)
@ -18,12 +18,16 @@ rec {
at_spi2_core = callPackage ./core/at-spi2-core { };
dconf = callPackage ./core/dconf { };
evince = callPackage ./core/evince { }; # ToDo: dbus would prevent compilation, enable tests
gconf = callPackage ./core/gconf { };
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 { };
@ -31,16 +35,38 @@ rec {
gnome_keyring = callPackage ./core/gnome-keyring { };
libgnome_keyring = callPackage ./core/libgnome-keyring { };
gnome_online_accounts = callPackage ./core/gnome-online-accounts { };
gnome_session = callPackage ./core/gnome-session { };
gnome_terminal = callPackage ./core/gnome-terminal { };
gnome_themes_standard = callPackage ./core/gnome-themes-standard { };
gsettings_desktop_schemas = callPackage ./core/gsettings-desktop-schemas { };
gvfs = pkgs.gvfs.override { gnome = pkgs.gnome3; };
eog = callPackage ./core/eog { };
libcroco = callPackage ./core/libcroco {};
libgee = callPackage ./core/libgee { };
libgxps = callPackage ./core/libgxps { };
libpeas = callPackage ./core/libpeas {};
libqmi = callPackage ./core/libqmi {};
libgweather = callPackage ./core/libgweather { };
libzapojit = callPackage ./core/libzapojit { };
nautilus = callPackage ./core/nautilus { };
rest = callPackage ./core/rest { };
vte = callPackage ./core/vte { };
zenity = callPackage ./core/zenity { };
@ -48,13 +74,13 @@ rec {
#### Apps (http://ftp.acc.umu.se/pub/GNOME/apps/)
file-roller = callPackage ./desktop/file-roller { };
gnome_dictionary = callPackage ./desktop/gnome-dictionary { };
gnome_desktop = callPackage ./desktop/gnome-desktop { };
# Removed from recent GNOME releases, but still required
scrollkeeper = callPackage ./desktop/scrollkeeper { };
gtksourceview = callPackage ./desktop/gtksourceview { };
# scrollkeeper replacement
rarian = callPackage ./desktop/rarian { };
@ -64,4 +90,8 @@ rec {
goffice = callPackage ./misc/goffice { };
gitg = callPackage ./misc/gitg { };
libgit2-glib = callPackage ./misc/libgit2-glib { automake = pkgs.automake111x; };
}

29
pkgs/desktops/gnome-3/desktop/file-roller/default.nix Normal file
View file

@ -0,0 +1,29 @@
{ stdenv, fetchurl, glib, pkgconfig, gnome3, intltool, itstool, libxml2, libarchive
, attr, bzip2, acl, makeWrapper }:
stdenv.mkDerivation rec {
name = "file-roller-${version}";
majVersion = "3.10";
version = "${majVersion}.2.1";
src = fetchurl {
url = "mirror://gnome/sources/file-roller/${majVersion}/${name}.tar.xz";
sha256 = "14374z1yfbjlgpl4k1ih8b35x8kzvh99y22rwwkc2wfz0d0i1qgx";
};
# TODO: support nautilus
# it tries to create {nautilus}/lib/nautilus/extensions-3.0/libnautilus-fileroller.so
buildInputs = [ glib pkgconfig gnome3.gtk intltool itstool libxml2 libarchive
attr bzip2 acl makeWrapper ];
postInstall = ''
wrapProgram "$out/bin/file-roller" \
--prefix XDG_DATA_DIRS : "${gnome3.gtk}/share:$out/share"
'';
meta = with stdenv.lib; {
platforms = platforms.linux;
};
}

23
pkgs/desktops/gnome-3/desktop/gnome-desktop/default.nix
View file

@ -1,20 +1,27 @@
{ stdenv, fetchurl, pkgconfig, python, libxml2Python, libxslt, which, libX11, gnome3
, intltool, gnome_doc_utils }:
{ stdenv, fetchurl, pkgconfig, python, libxml2Python, libxslt, which, libX11, gnome3, gtk3, glib
, intltool, gnome_doc_utils, libxkbfile, xkeyboard_config, isocodes, itstool, wayland
, gobjectIntrospection }:
stdenv.mkDerivation rec {
majorVersion = "3.5";
minorVersion = "3";
majorVersion = "3.10";
minorVersion = "1";
name = "gnome-desktop-${majorVersion}.${minorVersion}";
# this should probably be setuphook for glib
NIX_CFLAGS_COMPILE = "-I${glib}/include/gio-unix-2.0";
enableParallelBuilding = true;
src = fetchurl {
url = "mirror://gnome/sources/gnome-desktop/${majorVersion}/${name}.tar.xz";
sha256 = "1nrqcp1p5cxhfjjy5hjpvkqmzsgl2353a08fg0b11c932v95bsba";
sha256 = "0hdvm909lbpnixqv11qdx9iaycx4dpxys46fa128bqp8alisgb0h";
};
configureFlags = "--disable-scrollkeeper";
buildInputs = [ pkgconfig python libxml2Python libxslt which libX11
gnome3.gtk gnome3.glib intltool gnome_doc_utils ];
buildInputs = [ pkgconfig python libxml2Python libxslt which libX11 xkeyboard_config isocodes itstool wayland
gtk3 glib intltool gnome_doc_utils libxkbfile gnome3.gsettings_desktop_schemas gobjectIntrospection ];
meta = with stdenv.lib; {
platforms = platforms.linux;
};
}

15
pkgs/desktops/gnome-3/desktop/gnome-dictionary/default.nix
View file

@ -1,15 +1,20 @@
{ stdenv, fetchurl, pkgconfig, gnome3, gnome_doc_utils, intltool, which
, libxml2, libxslt }:
, libxml2, libxslt, itstool }:
stdenv.mkDerivation rec {
version = "3.5.2";
version = "3.10.0";
name = "gnome-dictionary-${version}";
src = fetchurl {
url = "mirror://gnome/sources/gnome-dictionary/3.5/${name}.tar.xz";
sha256 = "1cq32csxn27vir5nlixx337ym2nal9ykq3s1j7yynh2adh4m0jil";
url = "mirror://gnome/sources/gnome-dictionary/3.10/${name}.tar.xz";
sha256 = "1mqf6ln0cgrw12n9fg81sjbhavrgzvvq7fy3gl55il7pa3z612r5";
};
buildInputs = [ gnome3.gtk ];
nativeBuildInputs = [ pkgconfig intltool gnome_doc_utils which libxml2 libxslt gnome3.scrollkeeper ];
nativeBuildInputs = [ pkgconfig intltool gnome_doc_utils which libxml2 libxslt itstool ];
meta = with stdenv.lib; {
platforms = platforms.linux;
};
}

19
pkgs/desktops/gnome-3/desktop/gtksourceview/default.nix Normal file
View file

@ -0,0 +1,19 @@
{ stdenv, fetchurl, pkgconfig, atk, cairo, glib, gtk3, pango
, libxml2Python, perl, intltool, gettext }:
stdenv.mkDerivation rec {
name = "gtksourceview-${version}";
version = "3.10.1";
src = fetchurl {
url = "https://download.gnome.org/sources/gtksourceview/3.10/gtksourceview-${version}.tar.xz";
sha256 = "008bzfr1s6ywpj8c8qx7495lz9g0ziccwbxg88s0l4dl6bw49piq";
};
buildInputs = [ pkgconfig atk cairo glib gtk3 pango
libxml2Python perl intltool gettext ];
meta = with stdenv.lib; {
platforms = platforms.linux;
};
}

5
pkgs/desktops/gnome-3/desktop/rarian/default.nix
View file

@ -6,6 +6,11 @@ stdenv.mkDerivation rec {
url = "mirror://gnome/sources/rarian/0.8/${name}.tar.bz2";
sha256 = "aafe886d46e467eb3414e91fa9e42955bd4b618c3e19c42c773026b205a84577";
};
buildInputs = [pkgconfig perl perlXMLParser libxml2 libxslt];
configureFlags = "--with-xml-catalog=${docbook_xml_dtd_42}/xml/dtd/docbook/docbook.cat";
meta = with stdenv.lib; {
platforms = platforms.linux;
};
}

18
pkgs/desktops/gnome-3/desktop/scrollkeeper/default.nix
View file

@ -1,18 +0,0 @@
{stdenv, fetchurl, pkgconfig, perl, perlXMLParser, libxml2, libxslt, docbook_xml_dtd_42, automake}:
stdenv.mkDerivation {
name = "scrollkeeper-0.3.14";
src = fetchurl {
url = mirror://gnome/sources/scrollkeeper/0.3/scrollkeeper-0.3.14.tar.bz2;
sha256 = "08n1xgj1f53zahwm0wpn3jid3rfbhi3iwby0ilaaldnid5qriqgc";
};
# The fuloong2f is not supported by scrollkeeper-0.3.14 config.guess
preConfigure = "
substituteInPlace extract/dtds/Makefile.am --replace /usr/bin/xmlcatalog xmlcatalog
cp ${automake}/share/automake*/config.{sub,guess} .
";
buildInputs = [pkgconfig perl perlXMLParser libxml2 libxslt];
configureFlags = "--with-xml-catalog=${docbook_xml_dtd_42}/xml/dtd/docbook/docbook.cat";
}

50
pkgs/desktops/gnome-3/misc/gitg/default.nix Normal file
View file

@ -0,0 +1,50 @@
{ stdenv, fetchurl, fetchgit, vala, intltool, libgit2, pkgconfig, gtk3, glib
, json_glib, webkitgtk, makeWrapper, libpeas, bash, gobjectIntrospection
, gnome3, gtkspell3, shared_mime_info, libgee, libgit2-glib }:
# TODO: icons and theme still does not work
# use packaged gnome3.gnome_icon_theme_symbolic
stdenv.mkDerivation rec {
name = "gitg-0.3.2";
src = fetchurl {
url = "https://download.gnome.org/sources/gitg/0.3/${name}.tar.xz";
sha256 = "03vc59d1r3326piqdph6qjqnc40chm1lpg52lpf8466ddjs0x8vp";
};
configureFlags = [ "--disable-static" ];
preCheck = ''
substituteInPlace tests/libgitg/test-commit.c --replace "/bin/bash" "${bash}/bin/bash"
'';
doCheck = true;
makeFlags = "INTROSPECTION_GIRDIR=$(out)/share/gir-1.0/ INTROSPECTION_TYPELIBDIR=$(out)/lib/girepository-1.0";
propagatedUserEnvPkgs = [ shared_mime_info
gnome3.gnome_themes_standard ];
buildInputs = [ vala intltool libgit2 pkgconfig gtk3 glib json_glib webkitgtk libgee libpeas
libgit2-glib gtkspell3 gnome3.gsettings_desktop_schemas gnome3.gtksourceview
gobjectIntrospection makeWrapper ];
postInstall = ''
wrapProgram "$out/bin/gitg" \
--prefix GI_TYPELIB_PATH : "$GI_TYPELIB_PATH" \
--prefix XDG_DATA_DIRS : "${gtk3}/share:${gnome3.gnome_themes_standard}/share:${gnome3.gsettings_desktop_schemas}/share:$out/share"
'';
preFixup = ''
rm $out/share/icons/hicolor/icon-theme.cache
rm $out/share/gitg/icons/hicolor/icon-theme.cache
'';
meta = with stdenv.lib; {
homepage = https://wiki.gnome.org/action/show/Apps/Gitg;
description = "GNOME GUI client to view git repositories";
maintainers = with maintainers; [ iElectric ];
license = licenses.gpl2;
platforms = platforms.linux;
};
}

1
pkgs/desktops/gnome-3/misc/goffice/default.nix
View file

@ -29,5 +29,4 @@ stdenv.mkDerivation rec {
platforms = stdenv.lib.platforms.gnu;
};
passthru = { inherit meta; };
}

21
pkgs/desktops/gnome-3/misc/libgit2-glib/default.nix Normal file
View file

@ -0,0 +1,21 @@
{ stdenv, fetchurl, which, gnome3, autoconf, automake, libtool, pkgconfig
, gtk_doc, gobjectIntrospection, libgit2, glib }:
stdenv.mkDerivation rec {
name = "libgit2-glib-${version}";
version = "0.0.10";
src = fetchurl {
url = "https://github.com/GNOME/libgit2-glib/archive/v${version}.tar.gz";
sha256 = "0zn3k85jw6yks8s5ca8dyh9mwh4if1lni9gz9bd5lqlpa803ixxs";
};
configureScript = "sh ./autogen.sh";
buildInputs = [ which gnome3.gnome_common autoconf automake libtool
pkgconfig gtk_doc gobjectIntrospection libgit2 glib ];
meta = with stdenv.lib; {
platforms = platforms.linux;
};
}

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;
};
}

1
pkgs/desktops/xfce/default.nix
View file

@ -41,6 +41,7 @@ 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 { };

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;
};
}

4
pkgs/development/compilers/elm/elm-server.nix
View file

@ -4,8 +4,8 @@
cabal.mkDerivation (self: {
pname = "elm-server";
version = "0.9.0.2";
sha256 = "0g362llb7jkwz8xhyhhsc8hz0vj7s7bgfz1az5qfh1cm4h8nynwr";
version = "0.10.1";
sha256 = "0rh01jm9h9zbslnzy6xg7bin76gdmypannh3ly40azplw9xmf2dn";
isLibrary = false;
isExecutable = true;
buildDepends = [

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;
};
}

24
pkgs/development/compilers/vala/15.2.nix
View file

@ -1,24 +0,0 @@
{stdenv, fetchurl, yacc, flex, pkgconfig, glib, xz}:
stdenv.mkDerivation rec {
version = "0.15.2";
name = "vala-${version}";
src = fetchurl {
url = "mirror://gnome/sources/vala/0.15/${name}.tar.xz";
sha256 = "0g71zq6dpqrw2f40wfzdf18fdw41ymr17laqniy2kr622hkxdi8w";
};
nativeBuildInputs = [ yacc flex pkgconfig xz ];
buildInputs = [ glib ];
meta = {
description = "Compiler for the GObject type system";
homepage = "http://live.gnome.org/Vala";
license = "free-copyleft";
platforms = stdenv.lib.platforms.all;
maintainers = [ stdenv.lib.maintainers.antono ];
};
}

24
pkgs/development/compilers/vala/16.1.nix
View file

@ -1,24 +0,0 @@
{stdenv, fetchurl, yacc, flex, pkgconfig, glib, xz}:
stdenv.mkDerivation rec {
version = "0.16.1";
name = "vala-${version}";
src = fetchurl {
url = "mirror://gnome/sources/vala/0.16/${name}.tar.xz";
sha256 = "1n708n9ixyy9qrzyv1wf4ybvcclx43ib9ki028wwpvkz6kv8zqlb";
};
nativeBuildInputs = [ yacc flex pkgconfig xz ];
buildInputs = [ glib ];
meta = {
description = "Compiler for the GObject type system";
homepage = "http://live.gnome.org/Vala";
license = "free-copyleft";
platforms = stdenv.lib.platforms.all;
maintainers = [ stdenv.lib.maintainers.antono ];
};
}

48
pkgs/development/compilers/vala/default.nix
View file

@ -1,31 +1,31 @@
{ stdenv, fetchurl, yacc, flex, pkgconfig, glib, dbus, dbus_tools
, libiconvOrEmpty, libintlOrEmpty }:
{ stdenv, fetchurl, pkgconfig, flex, bison, libxslt
, glib, libiconvOrEmpty, libintlOrEmpty
}:
let
major = "0.23";
minor = "1";
sha256 = "1m8f2d01r4jqp266mk29qsl68lzh7c258cqd5zzbpbryxszlzdfj";
in
stdenv.mkDerivation rec {
p_name = "vala";
ver_maj = "0.19";
ver_min = "0";
src = fetchurl {
url = "mirror://gnome/sources/${p_name}/${ver_maj}/${name}.tar.xz";
sha256 = "1vn524hcnaggz8zx49mvf7p4z1mscrlj2syg7jjhph8nak5wi0bp";
};
name = "${p_name}-${ver_maj}.${ver_min}";
postPatch = "patchShebangs .";
nativeBuildInputs = [ yacc flex pkgconfig ];
buildInputs = [ glib ] ++ libiconvOrEmpty ++ libintlOrEmpty
++ stdenv.lib.optional doCheck [ dbus dbus_tools ];
doCheck = false; # problems when launching dbus tests
name = "vala-${major}.${minor}";
meta = {
description = "Compiler for the GObject type system";
description = "Compiler for GObject type system";
homepage = "http://live.gnome.org/Vala";
license = "free-copyleft";
platforms = stdenv.lib.platforms.all;
maintainers = [ stdenv.lib.maintainers.antono ];
license = stdenv.lib.licenses.lgpl21Plus;
platforms = stdenv.lib.platforms.unix;
maintainers = with stdenv.lib.maintainers; [ antono iyzsong ];
};
src = fetchurl {
url = "mirror://gnome/sources/vala/${major}/${name}.tar.xz";
inherit sha256;
};
nativeBuildInputs = [ pkgconfig flex bison libxslt ];
buildInputs = [ glib ]
++ libiconvOrEmpty
++ libintlOrEmpty;
}

30
pkgs/development/interpreters/octave/default.nix
View file

@ -1,22 +1,36 @@
{stdenv, fetchurl, gfortran, readline, ncurses, perl, flex, texinfo, qhull,
libX11, graphicsmagick, pcre, liblapack, texLive, pkgconfig, mesa, fltk,
fftw, fftwSinglePrec, zlib, curl, qrupdate }:
libX11, graphicsmagick, pcre, liblapack, pkgconfig, mesa, fltk,
fftw, fftwSinglePrec, zlib, curl, qrupdate
, qt ? null, ghostscript ? null, llvm ? null, hdf5 ? null,glpk ? null
, suitesparse ? null, gnuplot ? null, openjdk ? null, python ? null
}:
let
version = "3.6.4";
version = "3.8.0";
in
stdenv.mkDerivation rec {
name = "octave-${version}";
src = fetchurl {
url = "mirror://gnu/octave/${name}.tar.bz2";
sha256 = "0qn9s7jrjmrn6w3rvp8d7vfnymyv0spnxzrp9l7p8p8zb7wms67s";
sha256 = "1yclb8p4mcx9xcjajyynxfnc5spw90lp44d84v56ksrlvp3314si";
};
buildInputs = [ gfortran readline ncurses perl flex texinfo qhull libX11
graphicsmagick pcre liblapack pkgconfig mesa fltk zlib curl
fftw fftwSinglePrec qrupdate ];
fftw fftwSinglePrec qrupdate ]
++ (stdenv.lib.optional (qt != null) qt)
++ (stdenv.lib.optional (ghostscript != null) ghostscript)
++ (stdenv.lib.optional (llvm != null) llvm)
++ (stdenv.lib.optional (hdf5 != null) hdf5)
++ (stdenv.lib.optional (glpk != null) glpk)
++ (stdenv.lib.optional (suitesparse != null) suitesparse)
++ (stdenv.lib.optional (openjdk != null) openjdk)
++ (stdenv.lib.optional (gnuplot != null) gnuplot)
++ (stdenv.lib.optional (python != null) python)
;
doCheck = true;
# there is a mysterious sh: command not found
doCheck = false;
/* The build failed with a missing libranlib.la in hydra,
but worked on my computer. I think they have concurrency problems */
@ -27,7 +41,7 @@ stdenv.mkDerivation rec {
# Keep a copy of the octave tests detailed results in the output
# derivation, because someone may care
postInstall = ''
cp test/fntests.log $out/share/octave/${name}-fntests.log
cp test/fntests.log $out/share/octave/${name}-fntests.log || true
'';
passthru = {
@ -38,7 +52,7 @@ stdenv.mkDerivation rec {
meta = {
homepage = http://octave.org/;
license = "GPLv3+";
maintainers = with stdenv.lib.maintainers; [viric];
maintainers = with stdenv.lib.maintainers; [viric raskin];
platforms = with stdenv.lib.platforms; linux;
};
}

38
pkgs/development/interpreters/supercollider/default.nix Normal file
View file

@ -0,0 +1,38 @@
{ stdenv, fetchurl, cmake, pkgconfig
, jackaudio, libsndfile, fftw, curl
, libXt, qt
}:
stdenv.mkDerivation rec {
name = "supercollider-3.6.6";
meta = {
description = "Programming language for real time audio synthesis";
homepage = "http://supercollider.sourceforge.net/";
license = stdenv.lib.licenses.gpl3Plus;
platforms = stdenv.lib.platforms.linux;
};
src = fetchurl {
url = "mirror://sourceforge/supercollider/Source/3.6/SuperCollider-3.6.6-Source.tar.bz2";
sha256 = "11khrv6jchs0vv0lv43am8lp0x1rr3h6l2xj9dmwrxcpdayfbalr";
};
# QGtkStyle unavailable
patchPhase = ''
substituteInPlace editors/sc-ide/widgets/code_editor/autocompleter.cpp \
--replace Q_WS_X11 Q_GTK_STYLE
'';
cmakeFlags = [
"-DSC_WII=OFF"
"-DSC_EL=OFF"
];
nativeBuildInputs = [ cmake pkgconfig ];
buildInputs = [
jackaudio libsndfile fftw curl
libXt qt
];
}

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 ];
}

19
pkgs/development/libraries/exempi/default.nix Normal file
View file

@ -0,0 +1,19 @@
{ stdenv, fetchurl, expat, zlib, boost }:
stdenv.mkDerivation rec {
name = "exempi-2.2.1";
src = fetchurl {
url = "http://libopenraw.freedesktop.org/download/${name}.tar.bz2";
sha256 = "00d6gycl0wcyd3c71y0jp033a64z203rq0p0y07aig0s0j0477kc";
};
configureFlags = [ "--with-boost=${boost}" ];
buildInputs = [ expat zlib boost ];
meta = with stdenv.lib; {
platforms = platforms.linux;
license = licenses.bsd3;
};
}

19
pkgs/development/libraries/fdk-aac/default.nix Normal file
View file

@ -0,0 +1,19 @@
{ stdenv, fetchurl }:
let version = "0.1.3";
in
stdenv.mkDerivation {
name = "fdk-aac-${version}";
src = fetchurl {
url = "mirror://sourceforge/opencore-amr/fdk-aac/fdk-aac-${version}.tar.gz";
sha256 = "138c1l6c571289czihk0vlcfbla7qlac2jd5yyps5dyg08l8gjx9";
};
meta = with stdenv.lib; {
description = "A high-quality implementation of the AAC codec from Android";
homepage = "http://sourceforge.net/projects/opencore-amr/";
license = licenses.asl20;
platforms = platforms.linux;
};
}

58
pkgs/development/libraries/ffmpeg/2.x.nix
View file

@ -1,35 +1,9 @@
{ stdenv, fetchurl, pkgconfig, yasm, zlib, bzip2, alsaLib, texinfo, perl
, mp3Support ? true, lame ? null
, speexSupport ? true, speex ? null
, theoraSupport ? true, libtheora ? null
, vorbisSupport ? true, libvorbis ? null
, vpxSupport ? false, libvpx ? null
, x264Support ? true, x264 ? null
, xvidSupport ? true, xvidcore ? null
, opusSupport ? true, libopus ? null
, vdpauSupport ? true, libvdpau ? null
, vaapiSupport ? true, libva ? null
, faacSupport ? false, faac ? null
, dc1394Support ? false, libdc1394 ? null
, x11grabSupport ? false, libXext ? null, libXfixes ? null
, playSupport ? true, SDL ? null
, freetypeSupport ? true, freetype ? null, fontconfig ? null
{ stdenv, fetchurl, config, pkgconfig, yasm, zlib, bzip2, alsaLib, texinfo, perl
, lame, speex, libtheora, libvorbis, libvpx, x264, xvidcore, libopus
, libvdpau, libva, faac, libdc1394, libXext, libXfixes, SDL
, freetype, fontconfig, fdk_aac
}:
assert speexSupport -> speex != null;
assert theoraSupport -> libtheora != null;
assert vorbisSupport -> libvorbis != null;
assert vpxSupport -> libvpx != null;
assert x264Support -> x264 != null;
assert xvidSupport -> xvidcore != null;
assert opusSupport -> libopus != null;
assert vdpauSupport -> libvdpau != null;
assert vaapiSupport -> libva != null;
assert faacSupport -> faac != null;
assert x11grabSupport -> libXext != null && libXfixes != null;
assert playSupport -> SDL != null;
assert freetypeSupport -> freetype != null;
stdenv.mkDerivation rec {
name = "ffmpeg-2.1.1";
@ -38,6 +12,23 @@ stdenv.mkDerivation rec {
sha256 = "1qnspbpwa6cflsb6mkm84ay4nfx60ism6d7lgvnasidck9dmxydy";
};
mp3Support = config.ffmpeg.mp3 or true;
speexSupport = config.ffmpeg.speex or true;
theoraSupport = config.ffmpeg.theora or true;
vorbisSupport = config.ffmpeg.vorbis or true;
vpxSupport = config.ffmpeg.vpx or false;
x264Support = config.ffmpeg.x264 or true;
xvidSupport = config.ffmpeg.xvid or true;
opusSupport = config.ffmpeg.opus or true;
vdpauSupport = config.ffmpeg.vdpau or true;
vaapiSupport = config.ffmpeg.vaapi or true;
faacSupport = config.ffmpeg.faac or false;
fdkAACSupport = config.ffmpeg.fdk or false;
dc1394Support = config.ffmpeg.dc1394 or false;
x11grabSupport = config.ffmpeg.x11grab or false;
playSupport = config.ffmpeg.play or true;
freetypeSupport = config.ffmpeg.freetype or true;
# `--enable-gpl' (as well as the `postproc' and `swscale') mean that
# the resulting library is GPL'ed, so it can only be used in GPL'ed
# applications.
@ -62,7 +53,8 @@ stdenv.mkDerivation rec {
++ stdenv.lib.optional dc1394Support "--enable-libdc1394"
++ stdenv.lib.optional x11grabSupport "--enable-x11grab"
++ stdenv.lib.optional playSupport "--enable-ffplay"
++ stdenv.lib.optional freetypeSupport "--enable-libfreetype --enable-fontconfig";
++ stdenv.lib.optional freetypeSupport "--enable-libfreetype --enable-fontconfig"
++ stdenv.lib.optional fdkAACSupport "--enable-libfdk_aac --enable-nonfree";
buildInputs = [ pkgconfig lame yasm zlib bzip2 alsaLib texinfo perl ]
++ stdenv.lib.optional mp3Support lame
@ -79,7 +71,8 @@ stdenv.mkDerivation rec {
++ stdenv.lib.optional dc1394Support libdc1394
++ stdenv.lib.optionals x11grabSupport [ libXext libXfixes ]
++ stdenv.lib.optional playSupport SDL
++ stdenv.lib.optionals freetypeSupport [ freetype fontconfig ];
++ stdenv.lib.optionals freetypeSupport [ freetype fontconfig ]
++ stdenv.lib.optional fdkAACSupport fdk_aac;
enableParallelBuilding = true;
@ -100,5 +93,6 @@ stdenv.mkDerivation rec {
meta = {
homepage = http://www.ffmpeg.org/;
description = "A complete, cross-platform solution to record, convert and stream audio and video";
license = if (fdkAACSupport || faacSupport) then stdenv.lib.licenses.unfree else stdenv.lib.licenses.gpl2Plus;
};
}

2
pkgs/development/libraries/git2/default.nix
View file

@ -10,6 +10,8 @@ stdenv.mkDerivation rec {
sha256 = "1iyncz8fqazw683dxjls3lf5pw3f5ma8kachkvjz7dsq57wxllbj";
};
cmakeFlags = "-DTHREADSAFE=ON";
nativeBuildInputs = [ cmake python ];
buildInputs = [ zlib ];

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

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