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

Merge master into x-updates

Browse Source
This commit is contained in:
Vladimír Čunát 2014-01-11 18:44:55 +01:00
commit 91b7fa9169
306 changed files with 3287 additions and 2213 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/maintainers.nix
View File

@ -27,10 +27,12 @@
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>";

1
nixos/modules/services/networking/dhcpcd.nix
View File

@ -11,6 +11,7 @@ let
ignoredInterfaces =
map (i: i.name) (filter (i: i.ipAddress != null) (attrValues config.networking.interfaces))
++ concatLists (attrValues (mapAttrs (n: v: v.interfaces) config.networking.bridges))
++ concatLists (attrValues (mapAttrs (n: v: v.interfaces) config.networking.bonds))
++ config.networking.dhcpcd.denyInterfaces;
# Config file adapted from the one that ships with dhcpcd.

5
nixos/modules/services/networking/networkmanager.nix
View File

@ -146,6 +146,9 @@ in {
{ source = "${networkmanager_openconnect}/etc/NetworkManager/VPN/nm-openconnect-service.name";
target = "NetworkManager/VPN/nm-openconnect-service.name";
}
{ source = "${networkmanager_pptp}/etc/NetworkManager/VPN/nm-pptp-service.name";
target = "NetworkManager/VPN/nm-pptp-service.name";
}
] ++ pkgs.lib.optional (cfg.appendNameservers == [] || cfg.insertNameservers == [])
{ source = overrideNameserversScript;
target = "NetworkManager/dispatcher.d/02overridedns";
@ -155,6 +158,7 @@ in {
networkmanager_openvpn
networkmanager_vpnc
networkmanager_openconnect
networkmanager_pptp
];
users.extraGroups = singleton {
@ -199,6 +203,7 @@ in {
networkmanager_openvpn
networkmanager_vpnc
networkmanager_openconnect
networkmanager_pptp
];
services.udev.packages = cfg.packages;

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;

113
nixos/modules/tasks/network-interfaces.nix
View File

@ -7,6 +7,7 @@ let
cfg = config.networking;
interfaces = attrValues cfg.interfaces;
hasVirtuals = any (i: i.virtual) interfaces;
hasBonds = cfg.bonds != { };
interfaceOpts = { name, ... }: {
@ -228,6 +229,60 @@ in
};
networking.bonds = mkOption {
default = { };
example = {
bond0 = {
interfaces = [ "eth0" "wlan0" ];
miimon = 100;
mode = "active-backup";
};
fatpipe.interfaces = [ "enp4s0f0" "enp4s0f1" "enp5s0f0" "enp5s0f1" ];
};
description = ''
This option allows you to define bond devices that aggregate multiple,
underlying networking interfaces together. The value of this option is
an attribute set. Each attribute specifies a bond, with the attribute
name specifying the name of the bond's network interface
'';
type = types.attrsOf types.optionSet;
options = {
interfaces = mkOption {
example = [ "enp4s0f0" "enp4s0f1" "wlan0" ];
type = types.listOf types.string;
description = "The interfaces to bond together";
};
miimon = mkOption {
default = null;
example = 100;
type = types.nullOr types.int;
description = ''
Miimon is the number of millisecond in between each round of polling
by the device driver for failed links. By default polling is not
enabled and the driver is trusted to properly detect and handle
failure scenarios.
'';
};
mode = mkOption {
default = null;
example = "active-backup";
type = types.nullOr types.string;
description = ''
The mode which the bond will be running. The default mode for
the bonding driver is balance-rr, optimizing for throughput.
More information about valid modes can be found at
https://www.kernel.org/doc/Documentation/networking/bonding.txt
'';
};
};
};
networking.vlans = mkOption {
default = { };
example = {
@ -284,7 +339,15 @@ in
config = {
boot.kernelModules = optional cfg.enableIPv6 "ipv6" ++ optional hasVirtuals "tun";
boot.kernelModules = [ ]
++ optional cfg.enableIPv6 "ipv6"
++ optional hasVirtuals "tun"
++ optional hasBonds "bonding";
boot.extraModprobeConfig =
# This setting is intentional as it prevents default bond devices
# from being created.
optionalString hasBonds "options bonding max_bonds=0";
environment.systemPackages =
[ pkgs.host
@ -450,6 +513,9 @@ in
path = [ pkgs.bridge_utils pkgs.iproute ];
script =
''
# Remove Dead Interfaces
ip link show "${n}" >/dev/null 2>&1 && ip link delete "${n}"
brctl addbr "${n}"
# Set bridge's hello time to 0 to avoid startup delays.
@ -474,12 +540,50 @@ in
'';
};
createBondDevice = n: v:
let
deps = map (i: "sys-subsystem-net-devices-${i}.device") v.interfaces;
in
{ description = "Bond Interface ${n}";
wantedBy = [ "network.target" "sys-subsystem-net-devices-${n}.device" ];
bindsTo = deps;
after = deps;
serviceConfig.Type = "oneshot";
serviceConfig.RemainAfterExit = true;
path = [ pkgs.ifenslave pkgs.iproute ];
script = ''
# Remove Dead Interfaces
ip link show "${n}" >/dev/null 2>&1 && ip link delete "${n}"
ip link add "${n}" type bond
# !!! There must be a better way to wait for the interface
while [ ! -d /sys/class/net/${n} ]; do sleep 0.1; done;
# Set the miimon and mode options
${optionalString (v.miimon != null)
"echo ${toString v.miimon} > /sys/class/net/${n}/bonding/miimon"}
${optionalString (v.mode != null)
"echo \"${v.mode}\" > /sys/class/net/${n}/bonding/mode"}
# Bring up the bridge and enslave the specified interfaces
ip link set "${n}" up
${flip concatMapStrings v.interfaces (i: ''
ifenslave "${n}" "${i}"
'')}
'';
postStop = ''
ip link set "${n}" down
ifenslave -d "${n}"
ip link delete "${n}"
'';
};
createVlanDevice = n: v:
let
deps = [ "sys-subsystem-net-devices-${v.interface}.device" ];
in
{
description = "Vlan Interface ${n}";
{ description = "Vlan Interface ${n}";
wantedBy = [ "network.target" "sys-subsystem-net-devices-${n}.device" ];
bindsTo = deps;
after = deps;
@ -487,6 +591,8 @@ in
serviceConfig.RemainAfterExit = true;
path = [ pkgs.iproute ];
script = ''
# Remove Dead Interfaces
ip link show "${n}" >/dev/null 2>&1 && ip link delete "${n}"
ip link add link "${v.interface}" "${n}" type vlan id "${toString v.id}"
ip link set "${n}" up
'';
@ -499,6 +605,7 @@ in
map configureInterface interfaces ++
map createTunDevice (filter (i: i.virtual) interfaces))
// mapAttrs createBridgeDevice cfg.bridges
// mapAttrs createBondDevice cfg.bonds
// mapAttrs createVlanDevice cfg.vlans
// { "network-setup" = networkSetup; };

14
pkgs/applications/audio/clementine/clementine-1.2.1-include-paths.patch Normal file
View File

@ -0,0 +1,14 @@
diff -ur clementine-1.2.1-a/CMakeLists.txt clementine-1.2.1-b/CMakeLists.txt
--- clementine-1.2.1-a/CMakeLists.txt 2013-11-25 15:16:24.000000000 -0600
+++ clementine-1.2.1-b/CMakeLists.txt 2013-12-30 17:01:48.470011058 -0600
@@ -158,6 +158,10 @@
include_directories(${TAGLIB_INCLUDE_DIRS})
include_directories(${QJSON_INCLUDE_DIRS})
include_directories(${GSTREAMER_INCLUDE_DIRS})
+include_directories(${GSTREAMER_APP_INCLUDE_DIRS})
+include_directories(${GSTREAMER_BASE_INCLUDE_DIRS})
+include_directories(${GSTREAMER_CDDA_INCLUDE_DIRS})
+include_directories(${GSTREAMER_TAG_INCLUDE_DIRS})
include_directories(${GLIB_INCLUDE_DIRS})
include_directories(${GLIBCONFIG_INCLUDE_DIRS})
include_directories(${LIBXML_INCLUDE_DIRS})

48
pkgs/applications/audio/clementine/default.nix Normal file
View File

@ -0,0 +1,48 @@
{ stdenv, fetchurl, boost, cmake, gettext, gstreamer, gst_plugins_base
, liblastfm, qt4, taglib, fftw, glew, qjson, sqlite, libgpod, libplist
, usbmuxd, libmtp, gvfs, libcdio, protobuf, libspotify, qca2, pkgconfig
, sparsehash }:
stdenv.mkDerivation {
name = "clementine-1.2.1";
src = fetchurl {
url = http://clementine-player.googlecode.com/files/clementine-1.2.1.tar.gz;
sha256 = "0kk5cjmb8nirx0im3c0z91af2k72zxi6lwzm6rb57qihya5nwmfv";
};
patches = [ ./clementine-1.2.1-include-paths.patch ];
buildInputs = [
boost
cmake
fftw
gettext
glew
gst_plugins_base
gstreamer
gvfs
libcdio
libgpod
liblastfm
libmtp
libplist
libspotify
pkgconfig
protobuf
qca2
qjson
qt4
sparsehash
sqlite
taglib
usbmuxd
];
meta = with stdenv.lib; {
homepage = "http://www.clementine-player.org";
description = "A multiplatform music player";
license = licenses.gpl3Plus;
platforms = platforms.linux;
};
}

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.";

2
pkgs/applications/audio/qmmp/default.nix
View File

@ -54,7 +54,7 @@ stdenv.mkDerivation rec {
homepage = http://qmmp.ylsoftware.com/;
license = licenses.gpl2;
platforms = platforms.linux;
maintainers = [maintainers.bjornfor];
maintainers = [ maintainers.bjornfor ];
repositories.svn = http://qmmp.googlecode.com/svn/;
};
}

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

13
pkgs/applications/editors/vim/configurable.nix
View File

@ -87,7 +87,17 @@ composableDerivation {
// edf { name = "tcl"; enable = { nativeBuildInputs = [tcl]; }; } #Include Tcl interpreter.
// edf { name = "ruby"; feat = "rubyinterp"; enable = { nativeBuildInputs = [ruby]; };} #Include Ruby interpreter.
// edf { name = "lua" ; feat = "luainterp"; enable = { nativeBuildInputs = [lua]; configureFlags = ["--with-lua-prefix=${args.lua}"];};}
// edf {
name = "lua";
feat = "luainterp";
enable = {
nativeBuildInputs = [lua];
configureFlags = [
"--with-lua-prefix=${args.lua}"
"--enable-luainterp"
];
};
}
// edf { name = "cscope"; } #Include cscope interface.
// edf { name = "workshop"; } #Include Sun Visual Workshop support.
// edf { name = "netbeans"; } #Disable NetBeans integration support.
@ -102,6 +112,7 @@ composableDerivation {
;
cfg = {
luaSupport = config.vim.lua or true;
pythonSupport = config.vim.python or true;
rubySupport = config.vim.ruby or true;
nlsSupport = config.vim.nls or false;

4
pkgs/applications/editors/vim/ft-nix-support.patch
View File

@ -38,7 +38,8 @@ index 0000000..a2f9918
+ finish
+endif
+
+syn keyword nixKeyword let throw inherit import true false null with
+syn keyword nixKeyword let in rec assert inherit import true false null with ...
+syn keyword nixBuiltin import abort baseNameOf dirOf isNull builtins map removeAttrs throw toString derivation
+syn keyword nixConditional if else then
+syn keyword nixBrace ( ) { } =
+syn keyword nixBuiltin __currentSystem __currentTime __isFunction __getEnv __trace __toPath __pathExists
@ -54,6 +55,7 @@ index 0000000..a2f9918
+syn region nixString start=+"+ skip=+\\"+ end=+"+ contains=nixStringParam
+
+hi def link nixKeyword Keyword
+hi def link nixBuiltin Function
+hi def link nixConditional Conditional
+hi def link nixBrace Special
+hi def link nixString String

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

3
pkgs/applications/graphics/gimp/plugins/default.nix
View File

@ -146,10 +146,9 @@ rec {
gmic =
let
imagemagick = pkgs.imagemagickBig; # maybe the non big version is enough?
fftw = pkgs.fftw.override {pthreads = true;};
in pluginDerivation rec {
name = "gmic-1.5.7.2";
buildInputs = [imagemagick pkgconfig fftw gimp] ++ gimp.nativeBuildInputs;
buildInputs = [imagemagick pkgconfig pkgs.fftw gimp] ++ gimp.nativeBuildInputs;
src = fetchurl {
url = mirror://sourceforge/gmic/gmic_1.5.7.2.tar.gz;
sha256 = "1cpbxb3p2c8bcv2cbr150whapzjc7w09i3jza0z9x3xj8c0vdyv1";

3
pkgs/applications/graphics/openscad/default.nix
View File

@ -1,5 +1,6 @@
{ stdenv, fetchurl, qt4, bison, flex, eigen, boost, mesa, glew, opencsg, cgal
, mpfr, gmp }:
, mpfr, gmp
}:
stdenv.mkDerivation rec {
version = "2013.06";

8
pkgs/applications/graphics/sane/backends-git.nix
View File

@ -7,12 +7,12 @@ in
assert hotplugSupport -> (stdenv.system == "i686-linux" || stdenv.system == "x86_64-linux");
stdenv.mkDerivation {
name = "sane-backends-1.0.23.296-gf139120";
name = "sane-backends-1.0.24.73-g6c4f6bc";
src = fetchgit {
url = "http://git.debian.org/git/sane/sane-backends.git";
rev = "f139120c72db6de98be95b52c206c2a4d8071e92";
sha256 = "1b2fv19c8ijh9l0jjilli3j70n17wvcgpqq1nxmiby3ai6nrzk8d";
url = "git://alioth.debian.org/git/sane/sane-backends.git";
rev = "6c4f6bc58615755dc734281703b594cea3ebf848";
sha256 = "0f7lbv1rnr53n4rpihcd8dkfm01xvwfnx9i1nqaadrzbpvgkjrfa";
};
udevSupport = hotplugSupport;

7
pkgs/applications/graphics/sane/backends.nix
View File

@ -8,12 +8,13 @@ let
firmware = gt68xxFirmware { inherit fetchurl; };
in
stdenv.mkDerivation rec {
version = "1.0.23";
version = "1.0.24";
name = "sane-backends-${version}";
src = fetchurl {
url = "https://launchpad.net/ubuntu/+archive/primary/+files/sane-backends_${version}.orig.tar.gz";
sha256 = "4d4f5b2881615af7fc0ed75fdde7dc623a749e80e40f3f792fe4010163cbb029";
url = "https://alioth.debian.org/frs/download.php/file/3958/${name}.tar.gz";
curlOpts = "--insecure";
sha256 = "0ba68m6bzni54axjk15i51rya7hfsdliwvqyan5msl7iaid0iir7";
};
udevSupport = hotplugSupport;

12
pkgs/applications/ike/default.nix
View File

@ -1,8 +1,12 @@
{ stdenv, fetchurl, cmake, openssl, libedit, flex, bison, qt4, makeWrapper, gcc }:
{ stdenv, fetchurl, cmake, openssl, libedit, flex, bison, qt4, makeWrapper
, gcc, nettools, iproute, linuxHeaders }:
# NOTE: use $out/etc/iked.conf as sample configuration and also set: dhcp_file "/etc/iked.dhcp";
# launch with "iked -f /etc/iked.conf"
# NOTE: my testings reveal that kernels 3.11.10 and 3.12.6 won't let the traffic through the tunnel,
# so I'm sticking with 3.4
stdenv.mkDerivation rec {
name = "ike-2.2.1";
@ -11,11 +15,13 @@ stdenv.mkDerivation rec {
sha256 = "0fhyr2psd93b0zf7yfb72q3nqnh65mymgq5jpjcsj9jv5kfr6l8y";
};
buildInputs = [ cmake openssl libedit flex bison qt4 makeWrapper ];
buildInputs = [ cmake openssl libedit flex bison qt4 makeWrapper nettools iproute ];
configurePhase = ''
mkdir -p $out/{bin,sbin,lib}
cmake -DQTGUI=YES -DETCDIR=$out/etc -DLIBDIR=$out/lib -DSBINDIR=$out/sbin -DBINDIR=$out/bin -DMANDIR=$out/man -DNATT=YES -DCMAKE_INSTALL_PREFIX:BOOL=$out
cmake -DQTGUI=YES -DETCDIR=$out/etc -DLIBDIR=$out/lib -DSBINDIR=$out/sbin -DBINDIR=$out/bin \
-DKRNINC="${linuxHeaders}/include/" -DTESTS=YES \
-DMANDIR=$out/man -DNATT=YES -DCMAKE_INSTALL_PREFIX:BOOL=$out
'';
buildPhase = ''

2
pkgs/applications/misc/evtest/default.nix
View File

@ -17,6 +17,6 @@ stdenv.mkDerivation rec {
description = "Simple tool for input event debugging";
license = "GPLv2";
platforms = platforms.linux;
maintainers = [maintainers.bjornfor];
maintainers = [ maintainers.bjornfor ];
};
}

3
pkgs/applications/misc/gnuradio/default.nix
View File

@ -18,7 +18,8 @@
# gr-video-sdl: PAL and NTSC display
, SDL
, libusb1, orc, pyopengl
, makeWrapper }:
, makeWrapper
}:
stdenv.mkDerivation rec {
name = "gnuradio-${version}";

5
pkgs/applications/misc/pitz/default.nix
View File

@ -1,5 +1,6 @@
{ stdenv, fetchurl, buildPythonPackage, tempita, jinja2, pyyaml, clepy, mock
, nose, decorator, docutils }:
, nose, decorator, docutils
}:
# TODO: pitz has a pitz-shell utility that depends on ipython, but it just
# errors out and dies (it probably depends on an old ipython version):
@ -28,6 +29,6 @@ buildPythonPackage rec {
license = licenses.bsd3;
homepage = http://pitz.tplus1.com/;
platforms = platforms.linux;
maintainers = [maintainers.bjornfor];
maintainers = [ maintainers.bjornfor ];
};
}

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

@ -2,7 +2,8 @@
# Perl modules:
, EncodeLocale, MathClipper, ExtUtilsXSpp, BoostGeometryUtils
, MathConvexHullMonotoneChain, MathGeometryVoronoi, MathPlanePath, Moo
, IOStringy, ClassXSAccessor, Wx, GrowlGNTP, NetDBus }:
, IOStringy, ClassXSAccessor, Wx, GrowlGNTP, NetDBus
}:
stdenv.mkDerivation rec {
version = "0.9.10b";

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

2
pkgs/applications/science/spyder/default.nix
View File

@ -52,6 +52,6 @@ buildPythonPackage rec {
homepage = https://code.google.com/p/spyderlib/;
license = licenses.mit;
platforms = platforms.linux;
maintainers = [maintainers.bjornfor];
maintainers = [ maintainers.bjornfor ];
};
}

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

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

@ -1,13 +1,11 @@
{ bdbSupport ? false # build support for Berkeley DB repositories
, httpServer ? false # build Apache DAV module
, httpSupport ? false # client must support http
, sslSupport ? false # client must support https
, compressionSupport ? false # client must support http compression
, pythonBindings ? false
, perlBindings ? false
, javahlBindings ? false
, saslSupport ? false
, stdenv, fetchurl, apr, aprutil, neon, zlib, sqlite
, stdenv, fetchurl, apr, aprutil, zlib, sqlite
, httpd ? null, expat, swig ? null, jdk ? null, python ? null, perl ? null
, sasl ? null, serf ? null
}:
@ -16,8 +14,6 @@ assert bdbSupport -> aprutil.bdbSupport;
assert httpServer -> httpd != null;
assert pythonBindings -> swig != null && python != null;
assert javahlBindings -> jdk != null && perl != null;
assert sslSupport -> neon.sslSupport;
assert compressionSupport -> neon.compressionSupport;
stdenv.mkDerivation rec {
@ -31,7 +27,6 @@ stdenv.mkDerivation rec {
};
buildInputs = [ zlib apr aprutil sqlite ]
++ stdenv.lib.optional httpSupport neon
++ stdenv.lib.optional httpSupport serf
++ stdenv.lib.optional pythonBindings python
++ stdenv.lib.optional perlBindings perl

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

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

2
pkgs/build-support/fetchsvn/builder.sh
View File

@ -22,7 +22,7 @@ fi;
# server's certificate. This is perfectly safe: we don't care
# whether the server is being spoofed --- only the cryptographic
# hash of the output matters. Pass in extra p's to handle redirects.
printf 'p\np\np\n' | svn export ${ignoreExternals:+--ignore-externals} \
printf 'p\np\np\n' | svn export --trust-server-cert --non-interactive ${ignoreExternals:+--ignore-externals} \
-r "$rev" "$url" "$out"
stopNest

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/data/misc/freepats/default.nix
View File

@ -19,6 +19,6 @@ stdenv.mkDerivation rec {
homepage = http://freepats.zenvoid.org/;
license = licenses.gpl2;
platforms = platforms.all;
maintainers = [maintainers.bjornfor];
maintainers = [ maintainers.bjornfor ];
};
}

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

@ -105,8 +105,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;
};
}

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

36
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,6 +18,8 @@ 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 { };
@ -31,16 +33,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 +72,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 +88,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;
};
}

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 = [

2
pkgs/development/compilers/sdcc/default.nix
View File

@ -29,6 +29,6 @@ stdenv.mkDerivation rec {
homepage = http://sdcc.sourceforge.net/;
license = licenses.gpl2;
platforms = platforms.linux;
maintainers = [maintainers.bjornfor];
maintainers = [ maintainers.bjornfor ];
};
}

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

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

@ -1,14 +1,14 @@
{ stdenv, fetchurl, erlang, rebar, makeWrapper, coreutils }:
let
version = "0.11.2";
version = "0.12.0";
in
stdenv.mkDerivation {
name = "elixir-${version}";
src = fetchurl {
url = "https://github.com/elixir-lang/elixir/archive/v${version}.tar.gz";
sha256 = "0rgx33q013c5y2jjwd4l93pzd3v3fha8xdsrhpl9c9wb7yprjc5x";
sha256 = "0cir2y36zljwphiqyz8xmq7qq0f094jmfy3qwk3wdm05c05nqnc8";
};
buildInputs = [ erlang rebar makeWrapper ];

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

16
pkgs/development/libraries/apr-util/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchurl, apr, expat
{ stdenv, fetchurl, makeWrapper, apr, expat, gnused
, sslSupport ? true, openssl
, bdbSupport ? false, db4
, ldapSupport ? true, openldap
@ -8,6 +8,10 @@ assert sslSupport -> openssl != null;
assert bdbSupport -> db4 != null;
assert ldapSupport -> openldap != null;
let
optional = stdenv.lib.optional;
in
stdenv.mkDerivation rec {
name = "apr-util-1.5.3";
@ -24,7 +28,15 @@ stdenv.mkDerivation rec {
${stdenv.lib.optionalString ldapSupport "--with-ldap"}
'';
propagatedBuildInputs = stdenv.lib.optional ldapSupport openldap;
propagatedBuildInputs = [ makeWrapper apr expat ]
++ optional sslSupport openssl
++ optional bdbSupport db4
++ optional ldapSupport openldap;
# Give apr1 access to sed for runtime invocations
postInstall = ''
wrapProgram $out/bin/apu-1-config --prefix PATH : "${gnused}/bin"
'';
enableParallelBuilding = true;

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

51
pkgs/development/libraries/fftw/default.nix
View File

@ -1,30 +1,32 @@
{fetchurl, stdenv, builderDefs, stringsWithDeps, singlePrecision ? false, pthreads ? false, float ? false}:
{ fetchurl, stdenv, builderDefs, precision ? "double" }:
assert stdenv.lib.elem precision [ "single" "double" "long-double" "quad-precision" ];
with { inherit (stdenv.lib) optional; };
let
version = "3.3.2";
localDefs = builderDefs.passthru.function {
src =
fetchurl {
url = "ftp://ftp.fftw.org/pub/fftw/fftw-${version}.tar.gz";
sha256 = "b1236a780ca6e66fc5f8eda6ef0665d680e8253d9f01d7bf211b714a50032d01";
};
buildInputs = [];
configureFlags = ["--enable-shared"]
# some distros seem to be shipping both versions within the same package?
# why does --enable-float still result in ..3f.so instead of ..3.so?
++ (if singlePrecision then [ "--enable-single" ] else [ ])
++ (if float then [ "--enable-float" ] else [ ])
++ (stdenv.lib.optional (!pthreads) "--enable-openmp")
++ (stdenv.lib.optional pthreads "--enable-threads")
# I think all i686 has sse
++ (if (stdenv.isi686 || stdenv.isx86_64) && singlePrecision then [ "--enable-sse" ] else [ ])
# I think all x86_64 has sse2
++ (if stdenv.isx86_64 && ! singlePrecision then [ "--enable-sse2" ] else [ ]);
version = "3.3.3";
localDefs = builderDefs.passthru.function {
src =
fetchurl {
url = "ftp://ftp.fftw.org/pub/fftw/fftw-${version}.tar.gz";
sha256 = "1wwp9b2va7vkq3ay7a9jk22nr4x5q6m37rzqy2j8y3d11c5grkc5";
};
buildInputs = [];
configureFlags = [
"--enable-shared" "--disable-static"
"--enable-threads" "--enable-openmp" # very small wrappers
]
++ optional (precision != "double") "--enable-${precision}"
# all x86_64 have sse2
++ optional stdenv.isx86_64 "--enable-sse2";
};
in with localDefs;
stdenv.mkDerivation {
name = "fftw-3.3.2" + ( if singlePrecision then "-single" else "-double" );
builder = writeScript "fftw-3.3.2-builder"
stdenv.mkDerivation rec {
name = "fftw-${precision}-${version}";
builder = writeScript "${name}-builder"
(textClosure localDefs [doConfigure doMakeInstall doForceShare]);
meta = {
description = "Fastest Fourier Transform in the West library";
@ -34,3 +36,4 @@ stdenv.mkDerivation {
inherit src;
};
}

6
pkgs/development/libraries/fltk/fltk13.nix
View File

@ -3,13 +3,13 @@
let inherit (composableDerivation) edf; in
let version = "1.3.0"; in
let version = "1.3.2"; in
composableDerivation.composableDerivation {} {
name = "fltk-${version}";
src = fetchurl {
url = "ftp://ftp.easysw.com/pub/fltk/${version}/fltk-${version}-source.tar.gz";
sha256 = "075j6ljx4dfg9rnkardn24y0f26ylpakm0yylg6a9kllha07c1lr";
url = "http://fltk.org/pub/fltk/${version}/fltk-${version}-source.tar.gz";
sha256 = "1974brlk723095vf8z72kazq1cbqr9a51kq6b0xda6zkjkgl8q0p";
};
propagatedBuildInputs = [ x11 inputproto libXi freeglut ];

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

4
pkgs/development/libraries/glibc/2.18/common.nix
View File

@ -61,7 +61,9 @@ stdenv.mkDerivation ({
./cve-2013-4332.patch
./cve-2013-4458.patch
./cve-2013-4788.patch
];
]
# the problem only seems to affect i686, so avoid re-hash x86_64 ATM
++ stdenv.lib.optional stdenv.isi686 ./strstr-sse42-hack.patch;
postPatch = ''
# Needed for glibc to build with the gnumake 3.82

14
pkgs/development/libraries/glibc/2.18/strstr-sse42-hack.patch Normal file
View File

@ -0,0 +1,14 @@
https://bugs.archlinux.org/task/36556
diff --git a/sysdeps/x86_64/multiarch/strstr.c b/sysdeps/x86_64/multiarch/strstr.c
index cd63b68..03d8b9a 100644
--- a/sysdeps/x86_64/multiarch/strstr.c
+++ b/sysdeps/x86_64/multiarch/strstr.c
@@ -86,7 +86,7 @@
/* Simple replacement of movdqu to address 4KB boundary cross issue.
If EOS occurs within less than 16B before 4KB boundary, we don't
cross to next page. */
-static __m128i
+static inline __m128i
__m128i_strloadu (const unsigned char * p, __m128i zero)
{
if (__builtin_expect ((int) ((size_t) p & 0xfff) > 0xff0, 0))

18
pkgs/development/libraries/gtkspell/3.nix Normal file
View File

@ -0,0 +1,18 @@
{stdenv, fetchurl, gtk3, aspell, pkgconfig, enchant, intltool}:
stdenv.mkDerivation rec {
name = "gtkspell-${version}";
version = "3.0.4";
src = fetchurl {
url = "mirror://sourceforge/gtkspell/gtkspell3-${version}.tar.gz";
sha256 = "19z48gfbraasrxai7qdkxxvky0kwifkkzqz0jqcskhcr1ikqxgzs";
};
buildInputs = [ aspell pkgconfig gtk3 enchant intltool ];
propagatedBuildInputs = [ enchant ];
meta = with stdenv.lib; {
platforms = platforms.linux;
};
}

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

@ -4,8 +4,8 @@
cabal.mkDerivation (self: {
pname = "DRBG";
version = "0.5.1";
sha256 = "0mqgll5rf0h0yrdng1w9i8pis4yv9f4qffkh4c0g1ng5lxa9l747";
version = "0.5.2";
sha256 = "0c8w8h2mxpk2avj6321q9a1smzp970cyn87aj98vn8dln7h9cqsi";
isLibrary = true;
isExecutable = true;
buildDepends = [

8
pkgs/development/libraries/haskell/MonadCatchIO-mtl/default.nix
View File

@ -1,10 +1,10 @@
{ cabal, extensibleExceptions, mtl }:
{ cabal, extensibleExceptions, MonadCatchIOTransformers }:
cabal.mkDerivation (self: {
pname = "MonadCatchIO-mtl";
version = "0.3.0.5";
sha256 = "01c2xif4aly2lmg2qkri791ignq3r2qg4xbc8m06cdm6gh5a2dqp";
buildDepends = [ extensibleExceptions mtl ];
version = "0.3.1.0";
sha256 = "0qarf73c8zq8dgvxdiwqybpjfy8gba9vf4k0skiwyk5iphilxhhq";
buildDepends = [ extensibleExceptions MonadCatchIOTransformers ];
meta = {
homepage = "http://darcsden.com/jcpetruzza/MonadCatchIO-mtl";
description = "Monad-transformer version of the Control.Exception module";

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

@ -14,6 +14,7 @@ cabal.mkDerivation (self: {
binary cryptoApi cryptoPubkeyTypes DRBG pureMD5 QuickCheck SHA
tagged testFramework testFrameworkQuickcheck2
];
doCheck = false;
meta = {
description = "Implementation of RSA, using the padding schemes of PKCS#1 v2.1.";
license = self.stdenv.lib.licenses.bsd3;

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

@ -2,8 +2,8 @@
cabal.mkDerivation (self: {
pname = "SHA";
version = "1.6.1";
sha256 = "1v3a2skkbr64y7x1aqpq1qz03isc42l9hd1viqcsv4qlld595fgx";
version = "1.6.2.1";
sha256 = "0knzwqgwshr9b0rf8mf6xmgp3qxv4yavg0zy9xz4zmgm5319mvla";
isLibrary = true;
isExecutable = true;
buildDepends = [ binary ];

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

@ -4,8 +4,8 @@
cabal.mkDerivation (self: {
pname = "aeson-pretty";
version = "0.7";
sha256 = "0zkqs3f4mr0v0j582h9ssq7dxgfkk59s7y66b640hc4zf0b5p7g7";
version = "0.7.1";
sha256 = "0gmm1kmdbanfyfdyij1gnazycp1x9703qfa5hgrz39j9046zg3y6";
isLibrary = true;
isExecutable = true;
buildDepends = [

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