mirror of
https://github.com/ilyakooo0/nixpkgs.git
synced 2024-11-10 16:45:51 +03:00
Merge master into stdenv-updates
Conflicts: pkgs/applications/version-management/gource/default.nix pkgs/top-level/all-packages.nix
This commit is contained in:
Vladimír Čunát
commit
ac6761c908
@ -35,6 +35,7 @@
|
|||||||
ktosiek = "Tomasz Kontusz <tomasz.kontusz@gmail.com>";
|
ktosiek = "Tomasz Kontusz <tomasz.kontusz@gmail.com>";
|
||||||
lovek323 = "Jason O'Conal <jason@oconal.id.au>";
|
lovek323 = "Jason O'Conal <jason@oconal.id.au>";
|
||||||
ludo = "Ludovic Courtès <ludo@gnu.org>";
|
ludo = "Ludovic Courtès <ludo@gnu.org>";
|
||||||
|
madjar = "Georges Dubus <georges.dubus@compiletoi.net>";
|
||||||
marcweber = "Marc Weber <marco-oweber@gmx.de>";
|
marcweber = "Marc Weber <marco-oweber@gmx.de>";
|
||||||
matejc = "Matej Cotman <cotman.matej@gmail.com>";
|
matejc = "Matej Cotman <cotman.matej@gmail.com>";
|
||||||
modulistic = "Pablo Costa <modulistic@gmail.com>";
|
modulistic = "Pablo Costa <modulistic@gmail.com>";
|
||||||
@ -57,6 +58,7 @@
|
|||||||
shlevy = "Shea Levy <shea@shealevy.com>";
|
shlevy = "Shea Levy <shea@shealevy.com>";
|
||||||
simons = "Peter Simons <simons@cryp.to>";
|
simons = "Peter Simons <simons@cryp.to>";
|
||||||
smironov = "Sergey Mironov <ierton@gmail.com>";
|
smironov = "Sergey Mironov <ierton@gmail.com>";
|
||||||
|
sprock = "Roger Mason <rmason@mun.ca>";
|
||||||
thammers = "Tobias Hammerschmidt <jawr@gmx.de>";
|
thammers = "Tobias Hammerschmidt <jawr@gmx.de>";
|
||||||
the-kenny = "Moritz Ulrich <moritz@tarn-vedra.de>";
|
the-kenny = "Moritz Ulrich <moritz@tarn-vedra.de>";
|
||||||
tomberek = "Thomas Bereknyei <tomberek@gmail.com>";
|
tomberek = "Thomas Bereknyei <tomberek@gmail.com>";
|
||||||
|
|||||||
@ -14,7 +14,7 @@ rec {
|
|||||||
addMetaAttrs {description = "Bla blah";} somePkg
|
addMetaAttrs {description = "Bla blah";} somePkg
|
||||||
*/
|
*/
|
||||||
addMetaAttrs = newAttrs: drv:
|
addMetaAttrs = newAttrs: drv:
|
||||||
drv // { meta = (if drv ? meta then drv.meta else {}) // newAttrs; };
|
drv // { meta = (drv.meta or {}) // newAttrs; };
|
||||||
|
|
||||||
|
|
||||||
/* Change the symbolic name of a package for presentation purposes
|
/* Change the symbolic name of a package for presentation purposes
|
||||||
@ -51,7 +51,7 @@ rec {
|
|||||||
|
|
||||||
/* Apply lowPrio to an attrset with derivations
|
/* Apply lowPrio to an attrset with derivations
|
||||||
*/
|
*/
|
||||||
lowPrioSet = set: mapDerivationAttrset lowPrio set;
|
lowPrioSet = set: mapDerivationAttrset lowPrio set;
|
||||||
|
|
||||||
|
|
||||||
/* Increase the nix-env priority of the package, i.e., this
|
/* Increase the nix-env priority of the package, i.e., this
|
||||||
@ -63,5 +63,5 @@ rec {
|
|||||||
/* Apply hiPrio to an attrset with derivations
|
/* Apply hiPrio to an attrset with derivations
|
||||||
*/
|
*/
|
||||||
hiPrioSet = set: mapDerivationAttrset hiPrio set;
|
hiPrioSet = set: mapDerivationAttrset hiPrio set;
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|||||||
@ -201,6 +201,7 @@
|
|||||||
./services/scheduling/fcron.nix
|
./services/scheduling/fcron.nix
|
||||||
./services/search/elasticsearch.nix
|
./services/search/elasticsearch.nix
|
||||||
./services/security/clamav.nix
|
./services/security/clamav.nix
|
||||||
|
./services/security/haveged.nix
|
||||||
./services/security/fprot.nix
|
./services/security/fprot.nix
|
||||||
./services/security/frandom.nix
|
./services/security/frandom.nix
|
||||||
./services/security/tor.nix
|
./services/security/tor.nix
|
||||||
|
|||||||
63
nixos/modules/services/security/haveged.nix
Normal file
63
nixos/modules/services/security/haveged.nix
Normal file
@ -0,0 +1,63 @@
|
|||||||
|
{ config, pkgs, ... }:
|
||||||
|
|
||||||
|
with pkgs.lib;
|
||||||
|
|
||||||
|
let
|
||||||
|
|
||||||
|
cfg = config.services.haveged;
|
||||||
|
|
||||||
|
in
|
||||||
|
|
||||||
|
|
||||||
|
{
|
||||||
|
|
||||||
|
###### interface
|
||||||
|
|
||||||
|
options = {
|
||||||
|
|
||||||
|
services.haveged = {
|
||||||
|
|
||||||
|
enable = mkOption {
|
||||||
|
type = types.bool;
|
||||||
|
default = false;
|
||||||
|
description = ''
|
||||||
|
Whether to enable to haveged entropy daemon, which refills
|
||||||
|
/dev/random when low.
|
||||||
|
'';
|
||||||
|
};
|
||||||
|
|
||||||
|
refill_threshold = mkOption {
|
||||||
|
type = types.int;
|
||||||
|
default = 1024;
|
||||||
|
description = ''
|
||||||
|
The number of bits of available entropy beneath which
|
||||||
|
haveged should refill the entropy pool.
|
||||||
|
'';
|
||||||
|
};
|
||||||
|
|
||||||
|
};
|
||||||
|
|
||||||
|
};
|
||||||
|
|
||||||
|
|
||||||
|
###### implementation
|
||||||
|
|
||||||
|
config = mkIf cfg.enable {
|
||||||
|
|
||||||
|
systemd.services.haveged =
|
||||||
|
{ description = "Entropy Harvesting Daemon";
|
||||||
|
unitConfig.documentation = "man:haveged(8)";
|
||||||
|
wantedBy = [ "multi-user.target" ];
|
||||||
|
|
||||||
|
path = [ pkgs.haveged ];
|
||||||
|
|
||||||
|
serviceConfig =
|
||||||
|
{ Type = "forking";
|
||||||
|
ExecStart = "${pkgs.haveged}/sbin/haveged -w ${toString cfg.refill_threshold} -v 1";
|
||||||
|
PIDFile = "/run/haveged.pid";
|
||||||
|
};
|
||||||
|
};
|
||||||
|
|
||||||
|
};
|
||||||
|
|
||||||
|
}
|
||||||
@ -64,6 +64,10 @@ in {
|
|||||||
|
|
||||||
systemd.units."autovt@.service".linkTarget = "${config.systemd.units."kmsconvt@.service".unit}/kmsconvt@.service";
|
systemd.units."autovt@.service".linkTarget = "${config.systemd.units."kmsconvt@.service".unit}/kmsconvt@.service";
|
||||||
|
|
||||||
|
systemd.services."systemd-vconsole-setup".restartIfChanged = false;
|
||||||
|
|
||||||
|
systemd.units."kmsconvt@tty1.service".extraConfig.wait-for-vconsole-setup = "After=systemd-vconsole-setup.service";
|
||||||
|
|
||||||
services.kmscon.extraConfig = mkIf cfg.hwRender ''
|
services.kmscon.extraConfig = mkIf cfg.hwRender ''
|
||||||
drm
|
drm
|
||||||
hwaccel
|
hwaccel
|
||||||
|
|||||||
@ -11,16 +11,19 @@ let
|
|||||||
systemd = cfg.package;
|
systemd = cfg.package;
|
||||||
|
|
||||||
makeUnit = name: unit:
|
makeUnit = name: unit:
|
||||||
pkgs.runCommand "unit" ({ preferLocalBuild = true; } // optionalAttrs (unit.linkTarget == null) { inherit (unit) text; })
|
pkgs.runCommand "unit" { preferLocalBuild = true; inherit (unit) text; }
|
||||||
(if !unit.enable then ''
|
((if !unit.enable then ''
|
||||||
mkdir -p $out
|
mkdir -p $out
|
||||||
ln -s /dev/null $out/${name}
|
ln -s /dev/null $out/${name}
|
||||||
'' else if unit.linkTarget != null then ''
|
'' else if unit.linkTarget != null then ''
|
||||||
mkdir -p $out
|
mkdir -p $out
|
||||||
ln -s ${unit.linkTarget} $out/${name}
|
ln -s ${unit.linkTarget} $out/${name}
|
||||||
'' else ''
|
'' else if unit.text != null then ''
|
||||||
mkdir -p $out
|
mkdir -p $out
|
||||||
echo -n "$text" > $out/${name}
|
echo -n "$text" > $out/${name}
|
||||||
|
'' else "") + optionalString (unit.extraConfig != {}) ''
|
||||||
|
mkdir -p $out/${name}.d
|
||||||
|
${concatStringsSep "\n" (mapAttrsToList (n: v: "echo -n \"${v}\" > $out/${name}.d/${n}") unit.extraConfig)}
|
||||||
'');
|
'');
|
||||||
|
|
||||||
upstreamUnits =
|
upstreamUnits =
|
||||||
@ -392,7 +395,8 @@ in
|
|||||||
options = { name, config, ... }:
|
options = { name, config, ... }:
|
||||||
{ options = {
|
{ options = {
|
||||||
text = mkOption {
|
text = mkOption {
|
||||||
type = types.str;
|
type = types.nullOr types.str;
|
||||||
|
default = null;
|
||||||
description = "Text of this systemd unit.";
|
description = "Text of this systemd unit.";
|
||||||
};
|
};
|
||||||
enable = mkOption {
|
enable = mkOption {
|
||||||
@ -424,6 +428,17 @@ in
|
|||||||
description = "The file to symlink this target to.";
|
description = "The file to symlink this target to.";
|
||||||
type = types.nullOr types.path;
|
type = types.nullOr types.path;
|
||||||
};
|
};
|
||||||
|
extraConfig = mkOption {
|
||||||
|
default = {};
|
||||||
|
example = { "foo@1.conf" = "X-RestartIfChanged=false"; };
|
||||||
|
type = types.attrsOf types.lines;
|
||||||
|
description = ''
|
||||||
|
Extra files to be appended to the configuration for the unit.
|
||||||
|
This can be used to override configuration for a unit provided
|
||||||
|
by systemd or another package, or to override only a single instance
|
||||||
|
of a template unit.
|
||||||
|
'';
|
||||||
|
};
|
||||||
};
|
};
|
||||||
config = {
|
config = {
|
||||||
unit = makeUnit name config;
|
unit = makeUnit name config;
|
||||||
|
|||||||
@ -319,6 +319,7 @@ in {
|
|||||||
"mkfs.ext3 -L nixos /dev/sda2",
|
"mkfs.ext3 -L nixos /dev/sda2",
|
||||||
"mount LABEL=nixos /mnt",
|
"mount LABEL=nixos /mnt",
|
||||||
);
|
);
|
||||||
|
|
||||||
'';
|
'';
|
||||||
fileSystems = rootFS;
|
fileSystems = rootFS;
|
||||||
grubVersion = 1;
|
grubVersion = 1;
|
||||||
|
|||||||
@ -2,12 +2,12 @@
|
|||||||
, libarchive, liblrdf , libsndfile, pkgconfig, qt4, scons, subversion }:
|
, libarchive, liblrdf , libsndfile, pkgconfig, qt4, scons, subversion }:
|
||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
version = "0.9.5";
|
version = "0.9.5.1";
|
||||||
name = "hydrogen-${version}";
|
name = "hydrogen-${version}";
|
||||||
|
|
||||||
src = fetchurl {
|
src = fetchurl {
|
||||||
url = "mirror://sourceforge/hydrogen/hydrogen-${version}.tar.gz";
|
url = "mirror://sourceforge/hydrogen/hydrogen-${version}.tar.gz";
|
||||||
sha256 = "1hyri49va2ss26skd6p9swkx0kbr7ggifbahkrcfgj8yj7pp6g4n";
|
sha256 = "1fvyp6gfzcqcc90dmaqbm11p272zczz5pfz1z4lj33nfr7z0bqgb";
|
||||||
};
|
};
|
||||||
|
|
||||||
buildInputs = [
|
buildInputs = [
|
||||||
|
|||||||
@ -3,11 +3,11 @@
|
|||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
name = "jalv-${version}";
|
name = "jalv-${version}";
|
||||||
version = "1.4.2";
|
version = "1.4.4";
|
||||||
|
|
||||||
src = fetchurl {
|
src = fetchurl {
|
||||||
url = "http://download.drobilla.net/${name}.tar.bz2";
|
url = "http://download.drobilla.net/${name}.tar.bz2";
|
||||||
sha256 = "132cq347xpa91d9m7nnmpla7gz4xg0njfw7kzwnp0gz172k0klp7";
|
sha256 = "1iql1r52rmf87q6jkxhcxa3lpq7idzzg55ma91wphywyvh29q7lf";
|
||||||
};
|
};
|
||||||
|
|
||||||
buildInputs = [
|
buildInputs = [
|
||||||
|
|||||||
@ -1,17 +1,20 @@
|
|||||||
{ stdenv, fetchurl, SDL, alsaLib, cmake, fftw, jackaudio, libogg,
|
{ stdenv, fetchurl, SDL, alsaLib, cmake, fftwSinglePrec, jackaudio, libogg
|
||||||
libsamplerate, libsndfile, pkgconfig, pulseaudio, qt4 }:
|
, libsamplerate, libsndfile, pkgconfig, pulseaudio, qt4
|
||||||
|
}:
|
||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
name = "lmms-${version}";
|
name = "lmms-${version}";
|
||||||
version = "0.4.10";
|
version = "0.4.15";
|
||||||
|
|
||||||
src = fetchurl {
|
src = fetchurl {
|
||||||
url = "mirror://sourceforge/lmms/${name}.tar.bz2";
|
url = "mirror://sourceforge/lmms/${name}.tar.bz2";
|
||||||
sha256 = "035cqmxcbr9ipnicdv5l7h05q2hqbavxkbaxyq06ppnv2y7fxwrb";
|
sha256 = "02q2gbsqwk3hf9kvzz58a5bxmlb4cfr2mzy41wdvbxxdm2pcl101";
|
||||||
};
|
};
|
||||||
|
|
||||||
buildInputs = [ SDL alsaLib cmake fftw jackaudio libogg
|
buildInputs = [
|
||||||
libsamplerate libsndfile pkgconfig pulseaudio qt4 ];
|
SDL alsaLib cmake fftwSinglePrec jackaudio libogg libsamplerate
|
||||||
|
libsndfile pkgconfig pulseaudio qt4
|
||||||
|
];
|
||||||
|
|
||||||
meta = with stdenv.lib; {
|
meta = with stdenv.lib; {
|
||||||
description = "Linux MultiMedia Studio";
|
description = "Linux MultiMedia Studio";
|
||||||
|
|||||||
@ -2,11 +2,11 @@
|
|||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
name = "mda-lv2-${version}";
|
name = "mda-lv2-${version}";
|
||||||
version = "1.0.0";
|
version = "1.2.2";
|
||||||
|
|
||||||
src = fetchurl {
|
src = fetchurl {
|
||||||
url = "http://download.drobilla.net/${name}.tar.bz2";
|
url = "http://download.drobilla.net/${name}.tar.bz2";
|
||||||
sha256 = "1dbgvpz9qvlwsfkq9c0dx45bm223wwrzgiddlyln1agpns3qbf0f";
|
sha256 = "0hh40c5d2m0k5gb3vw031l6lqn59dg804an3mkmhkc7qv4gc6xm4";
|
||||||
};
|
};
|
||||||
|
|
||||||
buildInputs = [ fftwSinglePrec lv2 pkgconfig python ];
|
buildInputs = [ fftwSinglePrec lv2 pkgconfig python ];
|
||||||
|
|||||||
@ -2,11 +2,11 @@
|
|||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
name = "qsynth-${version}";
|
name = "qsynth-${version}";
|
||||||
version = "0.3.6";
|
version = "0.3.8";
|
||||||
|
|
||||||
src = fetchurl {
|
src = fetchurl {
|
||||||
url = "mirror://sourceforge/qsynth/${name}.tar.gz";
|
url = "mirror://sourceforge/qsynth/${name}.tar.gz";
|
||||||
sha256 = "0g7vaffpgs7v2p71ml5p7fzxz50mhlaklgf9zk4wbfk1hslqv5mm";
|
sha256 = "0wmq61cq93x2l00xwr871373mj3dwamz1dg6v62x7s8m1612ndrw";
|
||||||
};
|
};
|
||||||
|
|
||||||
buildInputs = [ alsaLib fluidsynth jackaudio qt4 ];
|
buildInputs = [ alsaLib fluidsynth jackaudio qt4 ];
|
||||||
@ -15,6 +15,7 @@ stdenv.mkDerivation rec {
|
|||||||
description = "Fluidsynth GUI";
|
description = "Fluidsynth GUI";
|
||||||
homepage = http://sourceforge.net/projects/qsynth;
|
homepage = http://sourceforge.net/projects/qsynth;
|
||||||
license = licenses.gpl2Plus;
|
license = licenses.gpl2Plus;
|
||||||
|
platforms = platforms.linux;
|
||||||
maintainers = [ maintainers.goibhniu ];
|
maintainers = [ maintainers.goibhniu ];
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|||||||
@ -3,12 +3,12 @@
|
|||||||
, libtool, libvorbis, pkgconfig, qt4, rubberband, stdenv }:
|
, libtool, libvorbis, pkgconfig, qt4, rubberband, stdenv }:
|
||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
version = "0.5.4";
|
version = "0.5.12";
|
||||||
name = "qtractor-${version}";
|
name = "qtractor-${version}";
|
||||||
|
|
||||||
src = fetchurl {
|
src = fetchurl {
|
||||||
url = "mirror://sourceforge/qtractor/${name}.tar.gz";
|
url = "mirror://sourceforge/qtractor/${name}.tar.gz";
|
||||||
sha256 = "08vnvjl4w6z49s5shnip0qlwib0gwixw9wrqbazkh62i328fa05l";
|
sha256 = "0yf2p9l3hj8pd550v3rbbjqkvxnvn8p6nsnm4aj2v5q4mgg2c8cc";
|
||||||
};
|
};
|
||||||
|
|
||||||
buildInputs =
|
buildInputs =
|
||||||
|
|||||||
@ -2,11 +2,11 @@
|
|||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
name = "samplv1-${version}";
|
name = "samplv1-${version}";
|
||||||
version = "0.3.5";
|
version = "0.3.6";
|
||||||
|
|
||||||
src = fetchurl {
|
src = fetchurl {
|
||||||
url = "mirror://sourceforge/samplv1/${name}.tar.gz";
|
url = "mirror://sourceforge/samplv1/${name}.tar.gz";
|
||||||
sha256 = "1q4ggcbbz9lfrjh0ybr3grgipjkq6w5fb9gz5k5cryzz92p7ihw9";
|
sha256 = "1fgy9w3mp0p8i1v41a7gmpzzk268k7bp75d4sgzfprikjihc6ary";
|
||||||
};
|
};
|
||||||
|
|
||||||
buildInputs = [ jackaudio libsndfile lv2 qt4 ];
|
buildInputs = [ jackaudio libsndfile lv2 qt4 ];
|
||||||
|
|||||||
@ -2,11 +2,11 @@
|
|||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
name = "synthv1-${version}";
|
name = "synthv1-${version}";
|
||||||
version = "0.3.2";
|
version = "0.3.6";
|
||||||
|
|
||||||
src = fetchurl {
|
src = fetchurl {
|
||||||
url = "mirror://sourceforge/synthv1/${name}.tar.gz";
|
url = "mirror://sourceforge/synthv1/${name}.tar.gz";
|
||||||
sha256 = "1230yf49qfw540yvp5n7sh6mf3k8590pzwc5mragd3nd6k6apgw9";
|
sha256 = "1xj4dk1g546f9fv2c4i7g3f1axrxfrxzk9w1nidhj3686j79nyry";
|
||||||
};
|
};
|
||||||
|
|
||||||
buildInputs = [ qt4 jackaudio lv2 ];
|
buildInputs = [ qt4 jackaudio lv2 ];
|
||||||
|
|||||||
@ -1,19 +1,23 @@
|
|||||||
{ stdenv, fetchurl, alsaLib, boost, cmake, fftwSinglePrec, fltk
|
{ stdenv, fetchurl, alsaLib, boost, cairo, cmake, fftwSinglePrec, fltk
|
||||||
, jackaudio, libsndfile, mesa, minixml, pkgconfig, zlib }:
|
, jackaudio, libsndfile, mesa, minixml, pkgconfig, zlib
|
||||||
|
}:
|
||||||
|
|
||||||
assert stdenv ? glibc;
|
assert stdenv ? glibc;
|
||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
name = "yoshimi-${version}";
|
name = "yoshimi-${version}";
|
||||||
version = "0.060.12";
|
version = "1.1.0";
|
||||||
|
|
||||||
src = fetchurl {
|
src = fetchurl {
|
||||||
url = "mirror://sourceforge/yoshimi/${name}.tar.bz2";
|
url = "mirror://sourceforge/yoshimi/${name}.tar.bz2";
|
||||||
sha256 = "14javywkw6af9z9c7jr06rzdgzncyaz2ab6f0v0k6bgdndlcgslc";
|
sha256 = "0rb0q0bqsaaj3imdjgfaigj1kbjqkx1gm91nh2mdgy9i09rygsbv";
|
||||||
};
|
};
|
||||||
|
|
||||||
buildInputs = [ alsaLib boost fftwSinglePrec fltk jackaudio libsndfile mesa
|
buildInputs = [
|
||||||
minixml zlib ];
|
alsaLib boost cairo fftwSinglePrec fltk jackaudio libsndfile mesa
|
||||||
|
minixml zlib
|
||||||
|
];
|
||||||
|
|
||||||
nativeBuildInputs = [ cmake pkgconfig ];
|
nativeBuildInputs = [ cmake pkgconfig ];
|
||||||
|
|
||||||
preConfigure = "cd src";
|
preConfigure = "cd src";
|
||||||
|
|||||||
@ -1,26 +1,19 @@
|
|||||||
{ stdenv, fetchurl, alsaLib, cmake, fftw, fltk13, minixml, pkgconfig, zlib }:
|
{ stdenv, fetchurl, alsaLib, cmake, jackaudio, fftw, fltk13, minixml
|
||||||
|
, pkgconfig, zlib
|
||||||
|
}:
|
||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
name = "zynaddsubfx-${version}";
|
name = "zynaddsubfx-${version}";
|
||||||
version = "2.4.1";
|
version = "2.4.3";
|
||||||
|
|
||||||
src = fetchurl {
|
src = fetchurl {
|
||||||
url = "mirror://sourceforge/zynaddsubfx/ZynAddSubFX-${version}.tar.bz2";
|
url = "mirror://sourceforge/zynaddsubfx/ZynAddSubFX-${version}.tar.bz2";
|
||||||
sha256 = "1zn5lgh76rrbfj8d4jys2gc1j2pqrbdd18ywfdrk0s7jq4inwyfg";
|
sha256 = "0kgmwyh4rhyqdfrdzhbzjjk2hzggkp9c4aac6sy3xv6cc1b5jjxq";
|
||||||
};
|
};
|
||||||
|
|
||||||
buildInputs = [ alsaLib fftw fltk13 minixml zlib ];
|
buildInputs = [ alsaLib jackaudio fftw fltk13 minixml zlib ];
|
||||||
nativeBuildInputs = [ cmake pkgconfig ];
|
nativeBuildInputs = [ cmake pkgconfig ];
|
||||||
|
|
||||||
patches = [
|
|
||||||
(fetchurl {
|
|
||||||
url = http://patch-tracker.debian.org/patch/series/dl/zynaddsubfx/2.4.0-1.2/09_fluid_1.3.patch;
|
|
||||||
sha256 = "06wl7fs44b24ls1fzh21596n6zzc3ywm2bcdfrkfiiwpzin3yjq6";
|
|
||||||
})
|
|
||||||
];
|
|
||||||
|
|
||||||
#installPhase = "mkdir -pv $out/bin; cp -v zynaddsubfx $out/bin";
|
|
||||||
|
|
||||||
meta = with stdenv.lib; {
|
meta = with stdenv.lib; {
|
||||||
description = "high quality software synthesizer";
|
description = "high quality software synthesizer";
|
||||||
homepage = http://zynaddsubfx.sourceforge.net;
|
homepage = http://zynaddsubfx.sourceforge.net;
|
||||||
|
|||||||
@ -1,4 +1,4 @@
|
|||||||
{ clangStdenv, fetchgit, llvm, clangUnwrapped }:
|
{ clangStdenv, fetchgit, llvmFull }:
|
||||||
|
|
||||||
clangStdenv.mkDerivation {
|
clangStdenv.mkDerivation {
|
||||||
name = "emacs-clang-complete-async-20130218";
|
name = "emacs-clang-complete-async-20130218";
|
||||||
@ -8,7 +8,7 @@ clangStdenv.mkDerivation {
|
|||||||
sha256 = "1c8zqi6axbsb951azz9iqx3j52j30nd9ypv396hvids3g02cirrf";
|
sha256 = "1c8zqi6axbsb951azz9iqx3j52j30nd9ypv396hvids3g02cirrf";
|
||||||
};
|
};
|
||||||
|
|
||||||
buildInputs = [ llvm clangUnwrapped ];
|
buildInputs = [ llvmFull ];
|
||||||
|
|
||||||
installPhase = ''
|
installPhase = ''
|
||||||
mkdir -p $out/bin
|
mkdir -p $out/bin
|
||||||
|
|||||||
20
pkgs/applications/graphics/hoodle/default.nix
Normal file
20
pkgs/applications/graphics/hoodle/default.nix
Normal file
@ -0,0 +1,20 @@
|
|||||||
|
{ cabal, cmdargs, configurator, dyre, filepath, hoodleCore, mtl }:
|
||||||
|
|
||||||
|
cabal.mkDerivation (self: {
|
||||||
|
pname = "hoodle";
|
||||||
|
version = "0.2.2.1";
|
||||||
|
sha256 = "1qkyyzfmprhniwarnq6cdmv1r6605b3h2lsc1rlalxhq6jh5gamd";
|
||||||
|
isLibrary = true;
|
||||||
|
isExecutable = true;
|
||||||
|
buildDepends = [
|
||||||
|
cmdargs configurator dyre filepath hoodleCore mtl
|
||||||
|
];
|
||||||
|
jailbreak = true;
|
||||||
|
meta = {
|
||||||
|
homepage = "http://ianwookim.org/hoodle";
|
||||||
|
description = "Executable for hoodle";
|
||||||
|
license = self.stdenv.lib.licenses.gpl3;
|
||||||
|
platforms = self.ghc.meta.platforms;
|
||||||
|
maintainers = [ self.stdenv.lib.maintainers.ianwookim ];
|
||||||
|
};
|
||||||
|
})
|
||||||
@ -4,11 +4,11 @@
|
|||||||
}:
|
}:
|
||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
name = "calibre-1.17.0";
|
name = "calibre-1.20.0";
|
||||||
|
|
||||||
src = fetchurl {
|
src = fetchurl {
|
||||||
url = "mirror://sourceforge/calibre/${name}.tar.xz";
|
url = "mirror://sourceforge/calibre/${name}.tar.xz";
|
||||||
sha256 = "1g0kwfr0v4hgwik7hpajdvg1ganyi7hlq6wvq4r5218yvdq5mkzn";
|
sha256 = "1i7sybl6in0js8an1zp3mzqv394xnwx79rmv1hj7g6abpsqhjpj7";
|
||||||
};
|
};
|
||||||
|
|
||||||
inherit python;
|
inherit python;
|
||||||
|
|||||||
@ -1,21 +1,27 @@
|
|||||||
{ pkgs, fetchurl, stdenv, gtk3, udev, desktop_file_utils, shared_mime_info, intltool, pkgconfig }:
|
{ pkgs, fetchurl, stdenv, gtk3, udev, desktop_file_utils, shared_mime_info
|
||||||
|
, intltool, pkgconfig, makeWrapper
|
||||||
|
}:
|
||||||
|
|
||||||
let
|
let
|
||||||
name = "spacefm-${version}";
|
|
||||||
version = "0.9.2";
|
version = "0.9.2";
|
||||||
|
|
||||||
in stdenv.mkDerivation {
|
in stdenv.mkDerivation rec {
|
||||||
inherit name;
|
name = "spacefm-${version}";
|
||||||
|
|
||||||
src = fetchurl {
|
src = fetchurl {
|
||||||
url="https://github.com/IgnorantGuru/spacefm/blob/pkg/${version}/${name}.tar.xz?raw=true";
|
url = "https://github.com/IgnorantGuru/spacefm/blob/pkg/${version}/${name}.tar.xz?raw=true";
|
||||||
sha256 ="3767137d74aa78597ffb42a6121784e91a4276efcd5d718b3793b9790f82268c";
|
sha256 = "3767137d74aa78597ffb42a6121784e91a4276efcd5d718b3793b9790f82268c";
|
||||||
};
|
};
|
||||||
|
|
||||||
buildInputs = [ gtk3 udev desktop_file_utils shared_mime_info intltool pkgconfig ];
|
buildInputs = [ gtk3 udev desktop_file_utils shared_mime_info intltool pkgconfig makeWrapper ];
|
||||||
|
|
||||||
|
postInstall = ''
|
||||||
|
wrapProgram "$out/bin/spacefm" \
|
||||||
|
--prefix XDG_DATA_DIRS : "${gtk3}/share"
|
||||||
|
'';
|
||||||
|
|
||||||
meta = {
|
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.";
|
description = "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;
|
platforms = pkgs.lib.platforms.linux;
|
||||||
license = pkgs.lib.licenses.gpl3;
|
license = pkgs.lib.licenses.gpl3;
|
||||||
};
|
};
|
||||||
|
|||||||
@ -11,8 +11,8 @@
|
|||||||
sha256 = "0d0kgy160pyg472ka43gxk7n09pqhhs9nd93jyxrp9qsyllfc425";
|
sha256 = "0d0kgy160pyg472ka43gxk7n09pqhhs9nd93jyxrp9qsyllfc425";
|
||||||
};
|
};
|
||||||
stable = {
|
stable = {
|
||||||
version = "31.0.1650.57";
|
version = "32.0.1700.77";
|
||||||
url = "http://commondatastorage.googleapis.com/chromium-browser-official/chromium-31.0.1650.57.tar.xz";
|
url = "http://commondatastorage.googleapis.com/chromium-browser-official/chromium-32.0.1700.77.tar.xz";
|
||||||
sha256 = "1xv7frf47hhvqm6f3n2l308yfrs4d8ri70q6pndx7hslhyiixzl9";
|
sha256 = "1mwqa5k32d168swpw0bdcnhglxwcqdsx766fq0iz22h3hd4ccdwa";
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|||||||
@ -1,28 +1,34 @@
|
|||||||
{ stdenv, fetchurl, python, perl, ncurses, x11, bzip2, zlib, openssl
|
{ stdenv, fetchurl, perl, ncurses, x11, bzip2, zlib, openssl
|
||||||
, spidermonkey, gpm
|
, spidermonkey, gpm
|
||||||
, enableGuile ? true, guile ? null }:
|
, enableGuile ? false, guile ? null # Incompatible licenses, LGPLv3 - GPLv2
|
||||||
|
, enablePython ? false, python ? null
|
||||||
|
}:
|
||||||
|
|
||||||
assert enableGuile -> guile != null;
|
assert enableGuile -> guile != null;
|
||||||
|
assert enablePython -> python != null;
|
||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
name = "elinks-0.12pre5";
|
name = "elinks-0.12pre6";
|
||||||
|
|
||||||
src = fetchurl {
|
src = fetchurl {
|
||||||
url = http://elinks.or.cz/download/elinks-0.12pre5.tar.bz2;
|
url = http://elinks.or.cz/download/elinks-0.12pre6.tar.bz2;
|
||||||
sha256 = "1li4vlbq8wvnigxlkzb15490y90jg6y9yzzrqpqcz2h965w5869d";
|
sha256 = "1nnakbi01g7yd3zqwprchh5yp45br8086b0kbbpmnclabcvlcdiq";
|
||||||
};
|
};
|
||||||
|
|
||||||
patches = [ ./gc-init.patch ];
|
patches = [ ./gc-init.patch ];
|
||||||
|
|
||||||
buildInputs = [ python perl ncurses x11 bzip2 zlib openssl spidermonkey gpm ]
|
buildInputs = [ perl ncurses x11 bzip2 zlib openssl spidermonkey gpm ]
|
||||||
++ stdenv.lib.optional enableGuile guile;
|
++ stdenv.lib.optional enableGuile guile
|
||||||
|
++ stdenv.lib.optional enablePython python;
|
||||||
|
|
||||||
configureFlags =
|
configureFlags =
|
||||||
''
|
''
|
||||||
--enable-finger --enable-html-highlight
|
--enable-finger --enable-html-highlight
|
||||||
--with-perl --with-python --enable-gopher --enable-cgi --enable-bittorrent
|
--with-perl --enable-gopher --enable-cgi --enable-bittorrent
|
||||||
|
--with-spidermonkey=${spidermonkey}
|
||||||
--enable-nntp --with-openssl=${openssl}
|
--enable-nntp --with-openssl=${openssl}
|
||||||
'' + stdenv.lib.optionalString enableGuile " --with-guile";
|
'' + stdenv.lib.optionalString enableGuile " --with-guile"
|
||||||
|
+ stdenv.lib.optionalString enablePython " --with-python";
|
||||||
|
|
||||||
crossAttrs = {
|
crossAttrs = {
|
||||||
propagatedBuildInputs = [ ncurses.crossDrv zlib.crossDrv openssl.crossDrv ];
|
propagatedBuildInputs = [ ncurses.crossDrv zlib.crossDrv openssl.crossDrv ];
|
||||||
@ -37,5 +43,6 @@ stdenv.mkDerivation rec {
|
|||||||
meta = {
|
meta = {
|
||||||
description = "Full-featured text-mode web browser";
|
description = "Full-featured text-mode web browser";
|
||||||
homepage = http://elinks.or.cz;
|
homepage = http://elinks.or.cz;
|
||||||
|
license = "GPLv2";
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|||||||
23
pkgs/applications/science/math/fricas/default.nix
Normal file
23
pkgs/applications/science/math/fricas/default.nix
Normal file
@ -0,0 +1,23 @@
|
|||||||
|
{ stdenv, fetchurl, sbcl, libX11, libXpm, libICE, libSM, libXt, libXau, libXdmcp }:
|
||||||
|
|
||||||
|
stdenv.mkDerivation rec {
|
||||||
|
name = "fricas-1.2.2";
|
||||||
|
|
||||||
|
src = fetchurl {
|
||||||
|
url = "http://sourceforge.net/projects/fricas/files/fricas/1.2.2/${name}-full.tar.bz2";
|
||||||
|
sha256 = "87db64a1fd4211f3b776793acea931b4271d2e7a28396414c7d7397d833defe1";
|
||||||
|
};
|
||||||
|
|
||||||
|
buildInputs = [ sbcl libX11 libXpm libICE libSM libXt libXau libXdmcp ];
|
||||||
|
|
||||||
|
dontStrip = true;
|
||||||
|
|
||||||
|
meta = {
|
||||||
|
homepage = http://fricas.sourceforge.net/;
|
||||||
|
description = "Fricas CAS";
|
||||||
|
license = stdenv.lib.licenses.bsd3;
|
||||||
|
|
||||||
|
hydraPlatforms = stdenv.lib.platforms.linux;
|
||||||
|
maintainers = stdenv.lib.maintainers.sprock;
|
||||||
|
};
|
||||||
|
}
|
||||||
11
pkgs/applications/science/misc/root/cmake.patch
Normal file
11
pkgs/applications/science/misc/root/cmake.patch
Normal file
@ -0,0 +1,11 @@
|
|||||||
|
--- cmake/modules/RootBuildOptions.cmake 1969-12-31 20:30:01.000000000 -0330
|
||||||
|
+++ cmake/modules/RootBuildOptions.cmake 2014-01-10 14:09:29.424937408 -0330
|
||||||
|
@@ -149,7 +149,7 @@
|
||||||
|
|
||||||
|
#---General Build options----------------------------------------------------------------------
|
||||||
|
# use, i.e. don't skip the full RPATH for the build tree
|
||||||
|
-set(CMAKE_SKIP_BUILD_RPATH FALSE)
|
||||||
|
+set(CMAKE_SKIP_BUILD_RPATH TRUE)
|
||||||
|
# when building, don't use the install RPATH already (but later on when installing)
|
||||||
|
set(CMAKE_BUILD_WITH_INSTALL_RPATH FALSE)
|
||||||
|
# add the automatically determined parts of the RPATH
|
||||||
27
pkgs/applications/science/misc/root/default.nix
Normal file
27
pkgs/applications/science/misc/root/default.nix
Normal file
@ -0,0 +1,27 @@
|
|||||||
|
{ stdenv, fetchurl, cmake, mesa, libX11, gfortran, libXpm, libXft, libXext, zlib }:
|
||||||
|
|
||||||
|
stdenv.mkDerivation rec {
|
||||||
|
name = "root-${version}";
|
||||||
|
version = "5.34.14";
|
||||||
|
|
||||||
|
src = fetchurl {
|
||||||
|
url = "ftp://root.cern.ch/root/root_v${version}.source.tar.gz";
|
||||||
|
sha256 = "d5347ba1b614eb083cf08050b784d66a93c125ed89938708da1adb33323dee2b";
|
||||||
|
};
|
||||||
|
|
||||||
|
buildInputs = [ cmake gfortran mesa libX11 libXpm libXft libXext zlib ];
|
||||||
|
|
||||||
|
# CMAKE_INSTALL_RPATH_USE_LINK_PATH is set to FALSE in
|
||||||
|
# <rootsrc>/cmake/modules/RootBuildOptions.cmake.
|
||||||
|
# This patch sets it to TRUE.
|
||||||
|
patches = [ ./cmake.patch ];
|
||||||
|
patchFlags = "-p0";
|
||||||
|
|
||||||
|
enableParallelBuilding = true;
|
||||||
|
|
||||||
|
meta = {
|
||||||
|
homepage = "http://root.cern.ch/drupal/";
|
||||||
|
description = "A data analysis framework";
|
||||||
|
platforms = stdenv.lib.platforms.mesaPlatforms;
|
||||||
|
};
|
||||||
|
}
|
||||||
@ -1,23 +1,35 @@
|
|||||||
{ stdenv, fetchurl, openssl, zlib, asciidoc, libxml2, libxslt, docbook_xml_xslt }:
|
{ stdenv, fetchurl, openssl, zlib, asciidoc, libxml2, libxslt
|
||||||
|
, docbook_xml_xslt, pkgconfig, luajit
|
||||||
|
, gzip, bzip2, xz
|
||||||
|
}:
|
||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
name = "cgit-0.9.2";
|
name = "cgit-0.10";
|
||||||
|
|
||||||
src = fetchurl {
|
src = fetchurl {
|
||||||
url = "http://git.zx2c4.com/cgit/snapshot/${name}.tar.xz";
|
url = "http://git.zx2c4.com/cgit/snapshot/${name}.tar.xz";
|
||||||
sha256 = "0q177q1r7ssna32c760l4dx6p4aaz6kdv27zn2jb34bx98045h08";
|
sha256 = "0ynywva0lrsasdm3nlk3dmd8k5bnrd9qlvmk4n42dfw9g1xj5i4h";
|
||||||
};
|
};
|
||||||
|
|
||||||
# cgit is is tightly coupled with git and needs a git source tree to build.
|
# cgit is is tightly coupled with git and needs a git source tree to build.
|
||||||
# The cgit-0.9.2 Makefile has GIT_VER = 1.8.3, so use that version.
|
# The cgit-0.10 Makefile has GIT_VER = 1.8.5, so use that version.
|
||||||
# IMPORTANT: Remember to check which git version cgit needs on every version
|
# IMPORTANT: Remember to check which git version cgit needs on every version
|
||||||
# bump.
|
# bump.
|
||||||
gitSrc = fetchurl {
|
gitSrc = fetchurl {
|
||||||
url = https://git-core.googlecode.com/files/git-1.8.3.tar.gz;
|
url = https://git-core.googlecode.com/files/git-1.8.5.tar.gz;
|
||||||
sha256 = "0fn5xdx30dl8dl1cdpqif5hgc3qnxlqfpwyhm0sm1wgqhgbcdlzi";
|
sha256 = "08vbq8y3jx1da417hkqmrkdkysac1sqjvrjmaj1v56dmkghm43w7";
|
||||||
};
|
};
|
||||||
|
|
||||||
buildInputs = [ openssl zlib asciidoc libxml2 libxslt docbook_xml_xslt ];
|
buildInputs = [
|
||||||
|
openssl zlib asciidoc libxml2 libxslt docbook_xml_xslt pkgconfig luajit
|
||||||
|
];
|
||||||
|
|
||||||
|
postPatch = ''
|
||||||
|
sed -e 's|"gzip"|"${gzip}/bin/gzip"|' \
|
||||||
|
-e 's|"bzip2"|"${bzip2}/bin/bzip2"|' \
|
||||||
|
-e 's|"xz"|"${xz}/bin/xz"|' \
|
||||||
|
-i ui-snapshot.c
|
||||||
|
'';
|
||||||
|
|
||||||
# Give cgit a git source tree and pass configuration parameters (as make
|
# Give cgit a git source tree and pass configuration parameters (as make
|
||||||
# variables).
|
# variables).
|
||||||
|
|||||||
@ -1,5 +1,5 @@
|
|||||||
{ stdenv, fetchurl, SDL, ftgl, pkgconfig, libpng, libjpeg, pcre
|
{ stdenv, fetchurl, SDL, ftgl, pkgconfig, libpng, libjpeg, pcre
|
||||||
, SDL_image, glew, mesa, boostHeaders
|
, SDL_image, glew, mesa, boost, glm
|
||||||
}:
|
}:
|
||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
@ -11,16 +11,17 @@ stdenv.mkDerivation rec {
|
|||||||
};
|
};
|
||||||
|
|
||||||
buildInputs = [
|
buildInputs = [
|
||||||
glew SDL ftgl pkgconfig libpng libjpeg pcre SDL_image mesa boostHeaders
|
glew SDL ftgl pkgconfig libpng libjpeg pcre SDL_image mesa boost glm
|
||||||
];
|
];
|
||||||
|
|
||||||
|
configureFlags = "--with-boost-libdir=${boost}/lib";
|
||||||
|
|
||||||
NIX_CFLAGS_COMPILE = "-fpermissive"; # fix build with newer gcc versions
|
NIX_CFLAGS_COMPILE = "-fpermissive"; # fix build with newer gcc versions
|
||||||
|
|
||||||
meta = {
|
meta = {
|
||||||
homepage = "http://code.google.com/p/gource/";
|
homepage = "http://code.google.com/p/gource/";
|
||||||
description = "software version control visualization tool";
|
description = "software version control visualization tool";
|
||||||
license = stdenv.lib.licenses.gpl3Plus;
|
license = stdenv.lib.licenses.gpl3Plus;
|
||||||
|
|
||||||
longDescription = ''
|
longDescription = ''
|
||||||
Software projects are displayed by Gource as an animated tree with
|
Software projects are displayed by Gource as an animated tree with
|
||||||
the root directory of the project at its centre. Directories
|
the root directory of the project at its centre. Directories
|
||||||
@ -31,7 +32,6 @@ stdenv.mkDerivation rec {
|
|||||||
Mercurial and Bazaar and SVN. Gource can also parse logs produced
|
Mercurial and Bazaar and SVN. Gource can also parse logs produced
|
||||||
by several third party tools for CVS repositories.
|
by several third party tools for CVS repositories.
|
||||||
'';
|
'';
|
||||||
|
platforms = stdenv.lib.platforms.linux;
|
||||||
broken = true;
|
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|||||||
@ -1,13 +0,0 @@
|
|||||||
#!/usr/bin/python -t
|
|
||||||
# this script was written to use /etc/nixos/nixpkgs/pkgs/development/python-modules/generic/wrap.sh
|
|
||||||
# which already automates python executable wrapping by extending the PATH/pythonPath
|
|
||||||
|
|
||||||
# from http://docs.python.org/library/subprocess.html
|
|
||||||
# Warning Invoking the system shell with shell=True can be a security hazard if combined with untrusted input. See the warning under Frequently Used Arguments for details.
|
|
||||||
|
|
||||||
from subprocess import Popen, PIPE, STDOUT
|
|
||||||
|
|
||||||
cmd = 'PYTHON_EXECUTABLE_PATH -t THE_CUSTOM_PATH/share/virt-manager/THE_CUSTOM_PROGRAM.py'
|
|
||||||
p = Popen(cmd, shell=True, stdin=PIPE, stdout=PIPE, stderr=STDOUT, close_fds=True)
|
|
||||||
output = p.stdout.read()
|
|
||||||
print output
|
|
||||||
@ -41,10 +41,6 @@ stdenv.mkDerivation rec {
|
|||||||
|
|
||||||
nativeBuildInputs = [ makeWrapper pythonPackages.wrapPython ];
|
nativeBuildInputs = [ makeWrapper pythonPackages.wrapPython ];
|
||||||
|
|
||||||
# patch the runner script in order to make wrapPythonPrograms work and run the program using a syscall
|
|
||||||
# example code: /etc/nixos/nixpkgs/pkgs/development/interpreters/spidermonkey/1.8.0-rc1.nix
|
|
||||||
customRunner = ./custom_runner.py;
|
|
||||||
|
|
||||||
# TODO
|
# TODO
|
||||||
# virt-manager -> import gtk.glade -> No module named glade --> fixed by removing 'pygtk' and by only using pyGtkGlade
|
# virt-manager -> import gtk.glade -> No module named glade --> fixed by removing 'pygtk' and by only using pyGtkGlade
|
||||||
# -> import gconf -> ImportError: No module named gconf
|
# -> import gconf -> ImportError: No module named gconf
|
||||||
@ -62,21 +58,13 @@ stdenv.mkDerivation rec {
|
|||||||
# -> fixed by http://nixos.org/wiki/Solve_GConf_errors_when_running_GNOME_applications & a restart
|
# -> fixed by http://nixos.org/wiki/Solve_GConf_errors_when_running_GNOME_applications & a restart
|
||||||
# virt-manager-tui -> ImportError: No module named newt_syrup.dialogscreen
|
# virt-manager-tui -> ImportError: No module named newt_syrup.dialogscreen
|
||||||
|
|
||||||
patchPhase = ''
|
|
||||||
cat ${customRunner} > src/virt-manager.in
|
|
||||||
substituteInPlace "src/virt-manager.in" --replace "THE_CUSTOM_PATH" "$out"
|
|
||||||
substituteInPlace "src/virt-manager.in" --replace "THE_CUSTOM_PROGRAM" "virt-manager"
|
|
||||||
substituteInPlace "src/virt-manager.in" --replace "PYTHON_EXECUTABLE_PATH" "${python}/bin/python"
|
|
||||||
|
|
||||||
cat ${customRunner} > src/virt-manager-tui.in
|
|
||||||
substituteInPlace "src/virt-manager-tui.in" --replace "THE_CUSTOM_PATH" "$out"
|
|
||||||
substituteInPlace "src/virt-manager-tui.in" --replace "THE_CUSTOM_PROGRAM" "virt-manager-tui"
|
|
||||||
substituteInPlace "src/virt-manager-tui.in" --replace "PYTHON_EXECUTABLE_PATH" "${python}/bin/python"
|
|
||||||
'';
|
|
||||||
|
|
||||||
# /etc/nixos/nixpkgs/pkgs/development/python-modules/generic/wrap.sh
|
|
||||||
installPhase = ''
|
installPhase = ''
|
||||||
make install
|
make install
|
||||||
|
|
||||||
|
# A hack, but the most reliable method so far
|
||||||
|
echo "#!/usr/bin/env python" | cat - src/virt-manager.py > $out/bin/virt-manager
|
||||||
|
echo "#!/usr/bin/env python" | cat - src/virt-manager-tui.py > $out/bin/virt-manager-tui
|
||||||
|
|
||||||
wrapPythonPrograms
|
wrapPythonPrograms
|
||||||
'';
|
'';
|
||||||
|
|
||||||
|
|||||||
@ -59,13 +59,16 @@ doSubstitute() {
|
|||||||
local src=$1
|
local src=$1
|
||||||
local dst=$2
|
local dst=$2
|
||||||
local uselibcxx=
|
local uselibcxx=
|
||||||
|
local uselibcxxabi=
|
||||||
if test -n "$libcxx" && echo $dst | fgrep ++; then uselibcxx=$libcxx; fi
|
if test -n "$libcxx" && echo $dst | fgrep ++; then uselibcxx=$libcxx; fi
|
||||||
|
if test -n "$libcxxabi" && echo $dst | fgrep ++; then uselibcxxabi=$libcxxabi; fi
|
||||||
# Can't use substitute() here, because replace may not have been
|
# Can't use substitute() here, because replace may not have been
|
||||||
# built yet (in the bootstrap).
|
# built yet (in the bootstrap).
|
||||||
sed \
|
sed \
|
||||||
-e "s^@out@^$out^g" \
|
-e "s^@out@^$out^g" \
|
||||||
-e "s^@shell@^$shell^g" \
|
-e "s^@shell@^$shell^g" \
|
||||||
-e "s^@libcxx@^$uselibcxx^g" \
|
-e "s^@libcxx@^$uselibcxx^g" \
|
||||||
|
-e "s^@libcxxabi@^$uselibcxxabi^g" \
|
||||||
-e "s^@clang@^$clang^g" \
|
-e "s^@clang@^$clang^g" \
|
||||||
-e "s^@clangProg@^$clangProg^g" \
|
-e "s^@clangProg@^$clangProg^g" \
|
||||||
-e "s^@binutils@^$binutils^g" \
|
-e "s^@binutils@^$binutils^g" \
|
||||||
|
|||||||
@ -76,11 +76,12 @@ if test "$NIX_ENFORCE_PURITY" = "1" -a -n "$NIX_STORE"; then
|
|||||||
n=$((n + 1))
|
n=$((n + 1))
|
||||||
done
|
done
|
||||||
params=("${rest[@]}")
|
params=("${rest[@]}")
|
||||||
|
NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE --sysroot=/var/empty"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
if test -n "@libcxx@"; then
|
if test -n "@libcxx@"; then
|
||||||
NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -isystem@libcxx@/include/c++/v1 -stdlib=libc++"
|
NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -isystem@libcxx@/include/c++/v1 -stdlib=libc++"
|
||||||
NIX_CFLAGS_LINK="$NIX_CFLAGS_LINK -L@libcxx@/lib -stdlib=libc++ -lc++abi"
|
NIX_CFLAGS_LINK="$NIX_CFLAGS_LINK -L@libcxx@/lib -stdlib=libc++ -L@libcxxabi@/lib -lc++abi"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
# Add the flags for the C compiler proper.
|
# Add the flags for the C compiler proper.
|
||||||
@ -137,13 +138,6 @@ if test -n "$NIX_CLANG_WRAPPER_EXEC_HOOK"; then
|
|||||||
source "$NIX_CLANG_WRAPPER_EXEC_HOOK"
|
source "$NIX_CLANG_WRAPPER_EXEC_HOOK"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
# We nuke LD_LIBRARY_PATH here, because clang dynamically links to LLVM.
|
|
||||||
# Unfortunately, when such clang is used to build LLVM again, it can get in
|
|
||||||
# trouble temporarily binding to the build-directory versions of the libraries
|
|
||||||
# (the buildsystem sets LD_LIBRARY_PATH). That is very undesirable and can
|
|
||||||
# cause mysterious failures.
|
|
||||||
LD_LIBRARY_PATH=
|
|
||||||
|
|
||||||
# Call the real `clang'. Filter out warnings from stderr about unused
|
# Call the real `clang'. Filter out warnings from stderr about unused
|
||||||
# `-B' flags, since they confuse some programs. Deep bash magic to
|
# `-B' flags, since they confuse some programs. Deep bash magic to
|
||||||
# apply grep to stderr (by swapping stdin/stderr twice).
|
# apply grep to stderr (by swapping stdin/stderr twice).
|
||||||
|
|||||||
@ -34,6 +34,9 @@ stdenv.mkDerivation {
|
|||||||
addFlags = ./add-flags;
|
addFlags = ./add-flags;
|
||||||
|
|
||||||
inherit nativeTools nativeLibc nativePrefix clang clangVersion libcxx;
|
inherit nativeTools nativeLibc nativePrefix clang clangVersion libcxx;
|
||||||
|
|
||||||
|
libcxxabi = libcxx.abi or null;
|
||||||
|
|
||||||
gcc = clang.gcc;
|
gcc = clang.gcc;
|
||||||
libc = if nativeLibc then null else libc;
|
libc = if nativeLibc then null else libc;
|
||||||
binutils = if nativeTools then null else binutils;
|
binutils = if nativeTools then null else binutils;
|
||||||
|
|||||||
@ -32,6 +32,9 @@ if test "$NIX_ENFORCE_PURITY" = "1" -a -n "$NIX_STORE" \
|
|||||||
# We cannot skip this; barf.
|
# We cannot skip this; barf.
|
||||||
echo "impure path \`$p' used in link" >&2
|
echo "impure path \`$p' used in link" >&2
|
||||||
exit 1
|
exit 1
|
||||||
|
elif test "${p:0:9}" = "--sysroot"; then
|
||||||
|
# Our ld is not built with sysroot support (Can we fix that?)
|
||||||
|
:
|
||||||
else
|
else
|
||||||
rest=("${rest[@]}" "$p")
|
rest=("${rest[@]}" "$p")
|
||||||
fi
|
fi
|
||||||
|
|||||||
@ -976,6 +976,32 @@ rec {
|
|||||||
unifiedSystemDir = true;
|
unifiedSystemDir = true;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
fedora20i386 = {
|
||||||
|
name = "fedora-20-i386";
|
||||||
|
fullName = "Fedora 20 (i386)";
|
||||||
|
packagesList = fetchurl {
|
||||||
|
url = mirror://fedora/linux/releases/20/Everything/i386/os/repodata/ae9c6ae73a12a64227e6b8e7b2d7e1c2a9515bd9c82f2af006c838e7a445dcb9-primary.xml.gz;
|
||||||
|
sha256 = "1ffw8njfff680vq2lby8v5dm3af2w7bv5rxqwqkl59hj7bknm75f";
|
||||||
|
};
|
||||||
|
urlPrefix = mirror://fedora/linux/releases/20/Everything/i386/os;
|
||||||
|
archs = ["noarch" "i386" "i586" "i686"];
|
||||||
|
packages = commonFedoraPackages ++ [ "cronie" "util-linux" ];
|
||||||
|
unifiedSystemDir = true;
|
||||||
|
};
|
||||||
|
|
||||||
|
fedora20x86_64 = {
|
||||||
|
name = "fedora-20-x86_64";
|
||||||
|
fullName = "Fedora 20 (x86_64)";
|
||||||
|
packagesList = fetchurl {
|
||||||
|
url = mirror://fedora/linux/releases/20/Everything/x86_64/os/repodata/d7777ea6ec66e1c86c3fe1900adf5bf8d877fb77dd06e439bd76bbbec4e82094-primary.xml.gz;
|
||||||
|
sha256 = "1510x32bxfvnplwy81nxfzxpgn7qbgghm4717xnciqb6xjk7wxyp";
|
||||||
|
};
|
||||||
|
urlPrefix = mirror://fedora/linux/releases/20/Everything/x86_64/os;
|
||||||
|
archs = ["noarch" "x86_64"];
|
||||||
|
packages = commonFedoraPackages ++ [ "cronie" "util-linux" ];
|
||||||
|
unifiedSystemDir = true;
|
||||||
|
};
|
||||||
|
|
||||||
opensuse103i386 = {
|
opensuse103i386 = {
|
||||||
name = "opensuse-10.3-i586";
|
name = "opensuse-10.3-i586";
|
||||||
fullName = "openSUSE 10.3 (i586)";
|
fullName = "openSUSE 10.3 (i586)";
|
||||||
|
|||||||
27
pkgs/desktops/gnome-3/core/caribou/default.nix
Normal file
27
pkgs/desktops/gnome-3/core/caribou/default.nix
Normal file
@ -0,0 +1,27 @@
|
|||||||
|
{ fetchurl, stdenv, pkgconfig, gnome3, clutter, dbus, pythonPackages, libxml2
|
||||||
|
, libxklavier, libXtst, gtk2, intltool, libxslt }:
|
||||||
|
|
||||||
|
|
||||||
|
stdenv.mkDerivation rec {
|
||||||
|
name = "caribou-0.4.12";
|
||||||
|
|
||||||
|
src = fetchurl {
|
||||||
|
url = "mirror://gnome/sources/caribou/0.4/${name}.tar.xz";
|
||||||
|
sha256 = "0235sws58rg0kadxbp2nq5ha76zmhd4mr10n9qlbryf8p78qsvii";
|
||||||
|
};
|
||||||
|
|
||||||
|
buildInputs = with gnome3;
|
||||||
|
[ glib pkgconfig gtk clutter at_spi2_core dbus pythonPackages.python pythonPackages.pygobject3
|
||||||
|
libxml2 libXtst gtk2 intltool libxslt ];
|
||||||
|
|
||||||
|
propagatedBuildInputs = [ gnome3.libgee libxklavier ];
|
||||||
|
|
||||||
|
preBuild = ''
|
||||||
|
patchShebangs .
|
||||||
|
'';
|
||||||
|
|
||||||
|
meta = with stdenv.lib; {
|
||||||
|
platforms = platforms.linux;
|
||||||
|
};
|
||||||
|
|
||||||
|
}
|
||||||
20
pkgs/desktops/gnome-3/core/geocode-glib/default.nix
Normal file
20
pkgs/desktops/gnome-3/core/geocode-glib/default.nix
Normal file
@ -0,0 +1,20 @@
|
|||||||
|
{ fetchurl, stdenv, pkgconfig, gnome3, intltool, libsoup, json_glib }:
|
||||||
|
|
||||||
|
|
||||||
|
stdenv.mkDerivation rec {
|
||||||
|
name = "geocode-glib-3.10.0";
|
||||||
|
|
||||||
|
|
||||||
|
src = fetchurl {
|
||||||
|
url = "mirror://gnome/sources/geocode-glib/3.10/${name}.tar.xz";
|
||||||
|
sha256 = "0dx6v9n4dsskcy6630s77cyb32xlykdall0d555976warycc3v8a";
|
||||||
|
};
|
||||||
|
|
||||||
|
buildInputs = with gnome3;
|
||||||
|
[ intltool pkgconfig glib libsoup json_glib ];
|
||||||
|
|
||||||
|
meta = with stdenv.lib; {
|
||||||
|
platforms = platforms.linux;
|
||||||
|
};
|
||||||
|
|
||||||
|
}
|
||||||
21
pkgs/desktops/gnome-3/core/gjs/default.nix
Normal file
21
pkgs/desktops/gnome-3/core/gjs/default.nix
Normal file
@ -0,0 +1,21 @@
|
|||||||
|
{ fetchurl, stdenv, pkgconfig, gnome3, gobjectIntrospection, spidermonkey_17 }:
|
||||||
|
|
||||||
|
|
||||||
|
stdenv.mkDerivation rec {
|
||||||
|
name = "gjs-1.38.1";
|
||||||
|
|
||||||
|
src = fetchurl {
|
||||||
|
url = "mirror://gnome/sources/gjs/1.38/${name}.tar.xz";
|
||||||
|
sha256 = "0xl1zc5ncaxqs5ww5j82rzqrg429l8pdapqclxiba7dxwyh6a83b";
|
||||||
|
};
|
||||||
|
|
||||||
|
buildInputs = with gnome3;
|
||||||
|
[ gobjectIntrospection pkgconfig glib ];
|
||||||
|
|
||||||
|
propagatedBuildInputs = [ spidermonkey_17 ];
|
||||||
|
|
||||||
|
meta = with stdenv.lib; {
|
||||||
|
platforms = platforms.linux;
|
||||||
|
};
|
||||||
|
|
||||||
|
}
|
||||||
35
pkgs/desktops/gnome-3/core/gnome-settings-daemon/default.nix
Normal file
35
pkgs/desktops/gnome-3/core/gnome-settings-daemon/default.nix
Normal file
@ -0,0 +1,35 @@
|
|||||||
|
{ fetchurl, stdenv, pkgconfig, gnome3, intltool, glib, libnotify, lcms2, libXtst
|
||||||
|
, libxkbfile, pulseaudio, libcanberra_gtk3, upower, colord, libgweather, polkit
|
||||||
|
, geoclue2, librsvg, xf86_input_wacom, udev, libwacom, libxslt, libtool
|
||||||
|
, docbook_xsl, docbook_xsl_ns, makeWrapper }:
|
||||||
|
|
||||||
|
stdenv.mkDerivation rec {
|
||||||
|
name = "gnome-settings-daemon-3.10.2";
|
||||||
|
|
||||||
|
src = fetchurl {
|
||||||
|
url = "mirror://gnome/sources/gnome-settings-daemon/3.10/${name}.tar.xz";
|
||||||
|
sha256 = "0r42lzlgk0w40ws4d3s7yayn6n8zqlnh5b6k88gvgv1lwk39k240";
|
||||||
|
};
|
||||||
|
|
||||||
|
configureFlags = "--disable-ibus";
|
||||||
|
|
||||||
|
# fatal error: gio/gunixfdlist.h: No such file or directory
|
||||||
|
NIX_CFLAGS_COMPILE = "-I${glib}/include/gio-unix-2.0";
|
||||||
|
|
||||||
|
buildInputs = with gnome3;
|
||||||
|
[ intltool pkgconfig gtk glib gsettings_desktop_schemas libnotify gnome_desktop
|
||||||
|
lcms2 libXtst libxkbfile pulseaudio libcanberra_gtk3 upower colord libgweather
|
||||||
|
polkit geocode_glib geoclue2 librsvg xf86_input_wacom udev libwacom libxslt
|
||||||
|
libtool docbook_xsl docbook_xsl_ns makeWrapper ];
|
||||||
|
|
||||||
|
postInstall = ''
|
||||||
|
wrapProgram "$out/libexec/gnome-settings-daemon-localeexec" \
|
||||||
|
--prefix GI_TYPELIB_PATH : "$GI_TYPELIB_PATH" \
|
||||||
|
--prefix XDG_DATA_DIRS : "${gnome3.gtk}/share:${gnome3.gsettings_desktop_schemas}/share:$out/share"
|
||||||
|
'';
|
||||||
|
|
||||||
|
meta = with stdenv.lib; {
|
||||||
|
platforms = platforms.linux;
|
||||||
|
};
|
||||||
|
|
||||||
|
}
|
||||||
24
pkgs/desktops/gnome-3/core/mutter/default.nix
Normal file
24
pkgs/desktops/gnome-3/core/mutter/default.nix
Normal file
@ -0,0 +1,24 @@
|
|||||||
|
{ fetchurl, stdenv, pkgconfig, gnome3, intltool, gobjectIntrospection, upower, cairo
|
||||||
|
, pango, cogl, clutter }:
|
||||||
|
|
||||||
|
|
||||||
|
stdenv.mkDerivation rec {
|
||||||
|
name = "mutter-3.10.2";
|
||||||
|
|
||||||
|
src = fetchurl {
|
||||||
|
url = "mirror://gnome/sources/mutter/3.10/${name}.tar.xz";
|
||||||
|
sha256 = "000iclb96mgc4rp2q0cy72nfwyfzl6avijl9nmk87f5sgyy670a3";
|
||||||
|
};
|
||||||
|
|
||||||
|
# fatal error: gio/gunixfdlist.h: No such file or directory
|
||||||
|
NIX_CFLAGS_COMPILE = "-I${gnome3.glib}/include/gio-unix-2.0";
|
||||||
|
|
||||||
|
buildInputs = with gnome3;
|
||||||
|
[ pkgconfig intltool glib gobjectIntrospection gtk gsettings_desktop_schemas upower
|
||||||
|
gnome_desktop cairo pango cogl clutter zenity ];
|
||||||
|
|
||||||
|
meta = with stdenv.lib; {
|
||||||
|
platforms = platforms.linux;
|
||||||
|
};
|
||||||
|
|
||||||
|
}
|
||||||
@ -18,16 +18,22 @@ rec {
|
|||||||
|
|
||||||
at_spi2_core = callPackage ./core/at-spi2-core { };
|
at_spi2_core = callPackage ./core/at-spi2-core { };
|
||||||
|
|
||||||
|
caribou = callPackage ./core/caribou { };
|
||||||
|
|
||||||
dconf = callPackage ./core/dconf { };
|
dconf = callPackage ./core/dconf { };
|
||||||
|
|
||||||
evince = callPackage ./core/evince { }; # ToDo: dbus would prevent compilation, enable tests
|
evince = callPackage ./core/evince { }; # ToDo: dbus would prevent compilation, enable tests
|
||||||
|
|
||||||
gconf = callPackage ./core/gconf { };
|
gconf = callPackage ./core/gconf { };
|
||||||
|
|
||||||
|
geocode_glib = callPackage ./core/geocode-glib { };
|
||||||
|
|
||||||
gcr = callPackage ./core/gcr { }; # ToDo: tests fail
|
gcr = callPackage ./core/gcr { }; # ToDo: tests fail
|
||||||
|
|
||||||
gdm = callPackage ./core/gdm { };
|
gdm = callPackage ./core/gdm { };
|
||||||
|
|
||||||
|
gjs = callPackage ./core/gjs { };
|
||||||
|
|
||||||
gnome_icon_theme = callPackage ./core/gnome-icon-theme { };
|
gnome_icon_theme = callPackage ./core/gnome-icon-theme { };
|
||||||
|
|
||||||
gnome-menus = callPackage ./core/gnome-menus { };
|
gnome-menus = callPackage ./core/gnome-menus { };
|
||||||
@ -39,6 +45,8 @@ rec {
|
|||||||
|
|
||||||
gnome_session = callPackage ./core/gnome-session { };
|
gnome_session = callPackage ./core/gnome-session { };
|
||||||
|
|
||||||
|
gnome_settings_daemon = callPackage ./core/gnome-settings-daemon { };
|
||||||
|
|
||||||
gnome_terminal = callPackage ./core/gnome-terminal { };
|
gnome_terminal = callPackage ./core/gnome-terminal { };
|
||||||
|
|
||||||
gnome_themes_standard = callPackage ./core/gnome-themes-standard { };
|
gnome_themes_standard = callPackage ./core/gnome-themes-standard { };
|
||||||
@ -63,6 +71,8 @@ rec {
|
|||||||
|
|
||||||
libzapojit = callPackage ./core/libzapojit { };
|
libzapojit = callPackage ./core/libzapojit { };
|
||||||
|
|
||||||
|
mutter = callPackage ./core/mutter { };
|
||||||
|
|
||||||
nautilus = callPackage ./core/nautilus { };
|
nautilus = callPackage ./core/nautilus { };
|
||||||
|
|
||||||
rest = callPackage ./core/rest { };
|
rest = callPackage ./core/rest { };
|
||||||
|
|||||||
@ -1,162 +0,0 @@
|
|||||||
diff -Naur cfe-3.3.src-orig/lib/Driver/ToolChains.cpp cfe-3.3.src/lib/Driver/ToolChains.cpp
|
|
||||||
--- cfe-3.3.src-orig/lib/Driver/ToolChains.cpp 2013-05-06 12:26:41.000000000 -0400
|
|
||||||
+++ cfe-3.3.src/lib/Driver/ToolChains.cpp 2013-06-21 19:28:12.120364372 -0400
|
|
||||||
@@ -2318,17 +2318,6 @@
|
|
||||||
Paths);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
- addPathIfExists(SysRoot + "/lib/" + MultiarchTriple, Paths);
|
|
||||||
- addPathIfExists(SysRoot + "/lib/../" + Multilib, Paths);
|
|
||||||
- addPathIfExists(SysRoot + "/usr/lib/" + MultiarchTriple, Paths);
|
|
||||||
- addPathIfExists(SysRoot + "/usr/lib/../" + Multilib, Paths);
|
|
||||||
-
|
|
||||||
- // Try walking via the GCC triple path in case of multiarch GCC
|
|
||||||
- // installations with strange symlinks.
|
|
||||||
- if (GCCInstallation.isValid())
|
|
||||||
- addPathIfExists(SysRoot + "/usr/lib/" + GCCInstallation.getTriple().str() +
|
|
||||||
- "/../../" + Multilib, Paths);
|
|
||||||
-
|
|
||||||
// Add the non-multilib suffixed paths (if potentially different).
|
|
||||||
if (GCCInstallation.isValid()) {
|
|
||||||
const std::string &LibPath = GCCInstallation.getParentLibPath();
|
|
||||||
@@ -2341,8 +2330,6 @@
|
|
||||||
addPathIfExists(LibPath, Paths);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
- addPathIfExists(SysRoot + "/lib", Paths);
|
|
||||||
- addPathIfExists(SysRoot + "/usr/lib", Paths);
|
|
||||||
|
|
||||||
IsPIEDefault = SanitizerArgs(*this, Args).hasZeroBaseShadow();
|
|
||||||
}
|
|
||||||
@@ -2395,9 +2382,6 @@
|
|
||||||
if (DriverArgs.hasArg(options::OPT_nostdinc))
|
|
||||||
return;
|
|
||||||
|
|
||||||
- if (!DriverArgs.hasArg(options::OPT_nostdlibinc))
|
|
||||||
- addSystemInclude(DriverArgs, CC1Args, SysRoot + "/usr/local/include");
|
|
||||||
-
|
|
||||||
if (!DriverArgs.hasArg(options::OPT_nobuiltininc)) {
|
|
||||||
llvm::sys::Path P(D.ResourceDir);
|
|
||||||
P.appendComponent("include");
|
|
||||||
@@ -2479,26 +2463,6 @@
|
|
||||||
"/usr/include/powerpc64-linux-gnu"
|
|
||||||
};
|
|
||||||
ArrayRef<StringRef> MultiarchIncludeDirs;
|
|
||||||
- if (getTriple().getArch() == llvm::Triple::x86_64) {
|
|
||||||
- MultiarchIncludeDirs = X86_64MultiarchIncludeDirs;
|
|
||||||
- } else if (getTriple().getArch() == llvm::Triple::x86) {
|
|
||||||
- MultiarchIncludeDirs = X86MultiarchIncludeDirs;
|
|
||||||
- } else if (getTriple().getArch() == llvm::Triple::aarch64) {
|
|
||||||
- MultiarchIncludeDirs = AArch64MultiarchIncludeDirs;
|
|
||||||
- } else if (getTriple().getArch() == llvm::Triple::arm) {
|
|
||||||
- if (getTriple().getEnvironment() == llvm::Triple::GNUEABIHF)
|
|
||||||
- MultiarchIncludeDirs = ARMHFMultiarchIncludeDirs;
|
|
||||||
- else
|
|
||||||
- MultiarchIncludeDirs = ARMMultiarchIncludeDirs;
|
|
||||||
- } else if (getTriple().getArch() == llvm::Triple::mips) {
|
|
||||||
- MultiarchIncludeDirs = MIPSMultiarchIncludeDirs;
|
|
||||||
- } else if (getTriple().getArch() == llvm::Triple::mipsel) {
|
|
||||||
- MultiarchIncludeDirs = MIPSELMultiarchIncludeDirs;
|
|
||||||
- } else if (getTriple().getArch() == llvm::Triple::ppc) {
|
|
||||||
- MultiarchIncludeDirs = PPCMultiarchIncludeDirs;
|
|
||||||
- } else if (getTriple().getArch() == llvm::Triple::ppc64) {
|
|
||||||
- MultiarchIncludeDirs = PPC64MultiarchIncludeDirs;
|
|
||||||
- }
|
|
||||||
for (ArrayRef<StringRef>::iterator I = MultiarchIncludeDirs.begin(),
|
|
||||||
E = MultiarchIncludeDirs.end();
|
|
||||||
I != E; ++I) {
|
|
||||||
@@ -2510,13 +2474,6 @@
|
|
||||||
|
|
||||||
if (getTriple().getOS() == llvm::Triple::RTEMS)
|
|
||||||
return;
|
|
||||||
-
|
|
||||||
- // Add an include of '/include' directly. This isn't provided by default by
|
|
||||||
- // system GCCs, but is often used with cross-compiling GCCs, and harmless to
|
|
||||||
- // add even when Clang is acting as-if it were a system compiler.
|
|
||||||
- addExternCSystemInclude(DriverArgs, CC1Args, SysRoot + "/include");
|
|
||||||
-
|
|
||||||
- addExternCSystemInclude(DriverArgs, CC1Args, SysRoot + "/usr/include");
|
|
||||||
}
|
|
||||||
|
|
||||||
/// \brief Helper to add the three variant paths for a libstdc++ installation.
|
|
||||||
diff -Naur cfe-3.3.src-orig/lib/Driver/Tools.cpp cfe-3.3.src/lib/Driver/Tools.cpp
|
|
||||||
--- cfe-3.3.src-orig/lib/Driver/Tools.cpp 2013-05-30 14:01:30.000000000 -0400
|
|
||||||
+++ cfe-3.3.src/lib/Driver/Tools.cpp 2013-06-21 19:30:51.604726574 -0400
|
|
||||||
@@ -5976,43 +5976,6 @@
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
- if (ToolChain.getArch() == llvm::Triple::arm ||
|
|
||||||
- ToolChain.getArch() == llvm::Triple::thumb ||
|
|
||||||
- (!Args.hasArg(options::OPT_static) &&
|
|
||||||
- !Args.hasArg(options::OPT_shared))) {
|
|
||||||
- CmdArgs.push_back("-dynamic-linker");
|
|
||||||
- if (isAndroid)
|
|
||||||
- CmdArgs.push_back("/system/bin/linker");
|
|
||||||
- else if (ToolChain.getArch() == llvm::Triple::x86)
|
|
||||||
- CmdArgs.push_back("/lib/ld-linux.so.2");
|
|
||||||
- else if (ToolChain.getArch() == llvm::Triple::aarch64)
|
|
||||||
- CmdArgs.push_back("/lib/ld-linux-aarch64.so.1");
|
|
||||||
- else if (ToolChain.getArch() == llvm::Triple::arm ||
|
|
||||||
- ToolChain.getArch() == llvm::Triple::thumb) {
|
|
||||||
- if (ToolChain.getTriple().getEnvironment() == llvm::Triple::GNUEABIHF)
|
|
||||||
- CmdArgs.push_back("/lib/ld-linux-armhf.so.3");
|
|
||||||
- else
|
|
||||||
- CmdArgs.push_back("/lib/ld-linux.so.3");
|
|
||||||
- }
|
|
||||||
- else if (ToolChain.getArch() == llvm::Triple::mips ||
|
|
||||||
- ToolChain.getArch() == llvm::Triple::mipsel)
|
|
||||||
- CmdArgs.push_back("/lib/ld.so.1");
|
|
||||||
- else if (ToolChain.getArch() == llvm::Triple::mips64 ||
|
|
||||||
- ToolChain.getArch() == llvm::Triple::mips64el) {
|
|
||||||
- if (hasMipsN32ABIArg(Args))
|
|
||||||
- CmdArgs.push_back("/lib32/ld.so.1");
|
|
||||||
- else
|
|
||||||
- CmdArgs.push_back("/lib64/ld.so.1");
|
|
||||||
- }
|
|
||||||
- else if (ToolChain.getArch() == llvm::Triple::ppc)
|
|
||||||
- CmdArgs.push_back("/lib/ld.so.1");
|
|
||||||
- else if (ToolChain.getArch() == llvm::Triple::ppc64 ||
|
|
||||||
- ToolChain.getArch() == llvm::Triple::systemz)
|
|
||||||
- CmdArgs.push_back("/lib64/ld64.so.1");
|
|
||||||
- else
|
|
||||||
- CmdArgs.push_back("/lib64/ld-linux-x86-64.so.2");
|
|
||||||
- }
|
|
||||||
-
|
|
||||||
CmdArgs.push_back("-o");
|
|
||||||
CmdArgs.push_back(Output.getFilename());
|
|
||||||
|
|
||||||
diff -Naur cfe-3.3.src-orig/lib/Frontend/InitHeaderSearch.cpp cfe-3.3.src/lib/Frontend/InitHeaderSearch.cpp
|
|
||||||
--- cfe-3.3.src-orig/lib/Frontend/InitHeaderSearch.cpp 2013-04-29 21:21:43.000000000 -0400
|
|
||||||
+++ cfe-3.3.src/lib/Frontend/InitHeaderSearch.cpp 2013-06-21 19:32:47.627016565 -0400
|
|
||||||
@@ -225,20 +225,6 @@
|
|
||||||
const HeaderSearchOptions &HSOpts) {
|
|
||||||
llvm::Triple::OSType os = triple.getOS();
|
|
||||||
|
|
||||||
- if (HSOpts.UseStandardSystemIncludes) {
|
|
||||||
- switch (os) {
|
|
||||||
- case llvm::Triple::FreeBSD:
|
|
||||||
- case llvm::Triple::NetBSD:
|
|
||||||
- case llvm::Triple::OpenBSD:
|
|
||||||
- case llvm::Triple::Bitrig:
|
|
||||||
- break;
|
|
||||||
- default:
|
|
||||||
- // FIXME: temporary hack: hard-coded paths.
|
|
||||||
- AddPath("/usr/local/include", System, false);
|
|
||||||
- break;
|
|
||||||
- }
|
|
||||||
- }
|
|
||||||
-
|
|
||||||
// Builtin includes use #include_next directives and should be positioned
|
|
||||||
// just prior C include dirs.
|
|
||||||
if (HSOpts.UseBuiltinIncludes) {
|
|
||||||
@@ -332,9 +318,6 @@
|
|
||||||
default:
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
-
|
|
||||||
- if ( os != llvm::Triple::RTEMS )
|
|
||||||
- AddPath("/usr/include", ExternCSystem, false);
|
|
||||||
}
|
|
||||||
|
|
||||||
void InitHeaderSearch::
|
|
||||||
@ -1,9 +0,0 @@
|
|||||||
--- a/utils/TableGen/CMakeLists.txt (revision 190146)
|
|
||||||
+++ b/utils/TableGen/CMakeLists.txt (working copy)
|
|
||||||
@@ -1,4 +1,5 @@
|
|
||||||
set(LLVM_LINK_COMPONENTS Support)
|
|
||||||
+set(LLVM_TOOLS_BINARY_DIR ${CMAKE_CURRENT_BINARY_DIR})
|
|
||||||
|
|
||||||
add_tablegen(clang-tblgen CLANG
|
|
||||||
ClangASTNodesEmitter.cpp
|
|
||||||
|
|
||||||
@ -1,41 +0,0 @@
|
|||||||
{ stdenv, fetchurl, perl, groff, llvm, cmake, libxml2, python }:
|
|
||||||
|
|
||||||
let
|
|
||||||
version = "3.3";
|
|
||||||
gccReal = if (stdenv.gcc.gcc or null) == null then stdenv.gcc else stdenv.gcc.gcc;
|
|
||||||
in
|
|
||||||
|
|
||||||
stdenv.mkDerivation {
|
|
||||||
name = "clang-${version}";
|
|
||||||
|
|
||||||
buildInputs = [ perl llvm groff cmake libxml2 python ];
|
|
||||||
|
|
||||||
patches = [ ./clang-tablegen-dir.patch ] ++
|
|
||||||
stdenv.lib.optional (stdenv.gcc.libc != null) ./clang-purity.patch;
|
|
||||||
|
|
||||||
cmakeFlags = [
|
|
||||||
"-DCLANG_PATH_TO_LLVM_BUILD=${llvm}"
|
|
||||||
"-DCMAKE_BUILD_TYPE=Release"
|
|
||||||
"-DLLVM_TARGETS_TO_BUILD=all"
|
|
||||||
"-DGCC_INSTALL_PREFIX=${gccReal}"
|
|
||||||
] ++ stdenv.lib.optionals (stdenv.gcc.libc != null) [
|
|
||||||
"-DC_INCLUDE_DIRS=${stdenv.gcc.libc}/include/"
|
|
||||||
];
|
|
||||||
|
|
||||||
enableParallelBuilding = true;
|
|
||||||
|
|
||||||
src = fetchurl {
|
|
||||||
url = "http://llvm.org/releases/${version}/cfe-${version}.src.tar.gz";
|
|
||||||
sha256 = "15mrvw43s4frk1j49qr4v5viq68h8qlf10qs6ghd6mrsmgj5vddi";
|
|
||||||
};
|
|
||||||
|
|
||||||
passthru = { gcc = stdenv.gcc.gcc; };
|
|
||||||
|
|
||||||
meta = {
|
|
||||||
homepage = http://clang.llvm.org/;
|
|
||||||
description = "A C language family frontend for LLVM";
|
|
||||||
license = "BSD";
|
|
||||||
maintainers = with stdenv.lib.maintainers; [viric shlevy];
|
|
||||||
platforms = with stdenv.lib.platforms; all;
|
|
||||||
};
|
|
||||||
}
|
|
||||||
@ -43,7 +43,7 @@ stdenv.mkDerivation rec {
|
|||||||
description = "Collection of modular and reusable compiler and toolchain technologies";
|
description = "Collection of modular and reusable compiler and toolchain technologies";
|
||||||
homepage = http://llvm.org/;
|
homepage = http://llvm.org/;
|
||||||
license = licenses.bsd3;
|
license = licenses.bsd3;
|
||||||
maintainers = with maintainers; [ lovek323 raskin shlevy viric ];
|
maintainers = with maintainers; [ lovek323 raskin viric ];
|
||||||
platforms = platforms.all;
|
platforms = platforms.all;
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|||||||
@ -1,18 +1,18 @@
|
|||||||
{stdenv, fetchurl, llvm, gmp, mpfr, mpc}:
|
{stdenv, fetchurl, llvm, gmp, mpfr, mpc, ncurses, zlib}:
|
||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
version = "3.3";
|
version = "3.4";
|
||||||
name = "dragonegg-${version}";
|
name = "dragonegg-${version}";
|
||||||
|
|
||||||
src = fetchurl {
|
src = fetchurl {
|
||||||
url = "http://llvm.org/releases/${version}/${name}.src.tar.gz";
|
url = "http://llvm.org/releases/${version}/${name}.src.tar.gz";
|
||||||
sha256 = "1kfryjaz5hxh3q6m50qjrwnyjb3smg2zyh025lhz9km3x4kshlri";
|
sha256 = "1733czbvby1ww3xkwcwmm0km0bpwhfyxvf56wb0zv5gksp3kbgrl";
|
||||||
};
|
};
|
||||||
|
|
||||||
# The gcc the plugin will be built for (the same used building dragonegg)
|
# The gcc the plugin will be built for (the same used building dragonegg)
|
||||||
GCC = "gcc";
|
GCC = "gcc";
|
||||||
|
|
||||||
buildInputs = [ llvm gmp mpfr mpc ];
|
buildInputs = [ llvm gmp mpfr mpc ncurses zlib ];
|
||||||
|
|
||||||
installPhase = ''
|
installPhase = ''
|
||||||
mkdir -p $out/lib $out/share/doc/${name}
|
mkdir -p $out/lib $out/share/doc/${name}
|
||||||
|
|||||||
89
pkgs/development/compilers/llvm/full.nix
Normal file
89
pkgs/development/compilers/llvm/full.nix
Normal file
@ -0,0 +1,89 @@
|
|||||||
|
{ stdenv
|
||||||
|
, fetchurl
|
||||||
|
, perl, groff
|
||||||
|
, cmake
|
||||||
|
, libxml2
|
||||||
|
, python
|
||||||
|
, libffi
|
||||||
|
, zlib
|
||||||
|
, ncurses
|
||||||
|
, isl
|
||||||
|
, gmp
|
||||||
|
, doxygen
|
||||||
|
, binutils
|
||||||
|
, swig
|
||||||
|
, which
|
||||||
|
, libedit
|
||||||
|
, valgrind
|
||||||
|
}:
|
||||||
|
|
||||||
|
let
|
||||||
|
version = "3.4";
|
||||||
|
|
||||||
|
fetch = name: sha256: fetchurl {
|
||||||
|
url = "http://llvm.org/releases/${version}/${name}-${version}.src.tar.gz";
|
||||||
|
inherit sha256;
|
||||||
|
};
|
||||||
|
|
||||||
|
inherit (stdenv.lib) concatStrings mapAttrsToList;
|
||||||
|
in stdenv.mkDerivation {
|
||||||
|
name = "llvm-full-${version}";
|
||||||
|
|
||||||
|
unpackPhase = ''
|
||||||
|
unpackFile ${fetch "llvm" "0a169ba045r4apb9cv6ncrwl83l7yiajnzirkcdlhj1cd4nn3995"}
|
||||||
|
mv llvm-${version} llvm
|
||||||
|
sourceRoot=$PWD/llvm
|
||||||
|
${concatStrings (mapAttrsToList (name: { location, sha256 }: ''
|
||||||
|
unpackFile ${fetch name sha256}
|
||||||
|
mv ${name}-${version} $sourceRoot/${location}
|
||||||
|
'') {
|
||||||
|
clang = { location = "tools/clang"; sha256 = "06rb4j1ifbznl3gfhl98s7ilj0ns01p7y7zap4p7ynmqnc6pia92"; };
|
||||||
|
clang-tools-extra = { location = "tools/clang/tools/extra"; sha256 = "1d1822mwxxl9agmyacqjw800kzz5x8xr0sdmi8fgx5xfa5sii1ds"; };
|
||||||
|
compiler-rt = { location = "projects/compiler-rt"; sha256 = "0p5b6varxdqn7q3n77xym63hhq4qqxd2981pfpa65r1w72qqjz7k"; };
|
||||||
|
lld = { location = "tools/lld"; sha256 = "1sd4scqynryfrmcc4h0ljgwn2dgjmbbmf38z50ya6l0janpd2nxz"; };
|
||||||
|
lldb = { location = "tools/lldb"; sha256 = "0h8cmjrhjhigk7k2qll1pcf6jfgmbdzkzfz2i048pkfg851s0x4g"; };
|
||||||
|
polly = { location = "tools/polly"; sha256 = "1rqflmgzg1vzjm0r32c5ck8x3q0qm3g0hh8ggbjazh6x7nvmy6lz"; };
|
||||||
|
})}
|
||||||
|
sed -i 's|/usr/bin/env||' \
|
||||||
|
$sourceRoot/tools/lldb/scripts/Python/finish-swig-Python-LLDB.sh \
|
||||||
|
$sourceRoot/tools/lldb/scripts/Python/build-swig-Python.sh
|
||||||
|
'';
|
||||||
|
|
||||||
|
buildInputs = [ perl
|
||||||
|
groff
|
||||||
|
cmake
|
||||||
|
libxml2
|
||||||
|
python
|
||||||
|
libffi
|
||||||
|
zlib
|
||||||
|
ncurses
|
||||||
|
isl
|
||||||
|
gmp
|
||||||
|
doxygen
|
||||||
|
swig
|
||||||
|
which
|
||||||
|
libedit
|
||||||
|
valgrind
|
||||||
|
];
|
||||||
|
|
||||||
|
cmakeFlags = [
|
||||||
|
"-DCMAKE_BUILD_TYPE=Release"
|
||||||
|
"-DLLVM_ENABLE_FFI=ON"
|
||||||
|
"-DGCC_INSTALL_PREFIX=${stdenv.gcc.gcc}"
|
||||||
|
"-DC_INCLUDE_DIRS=${stdenv.gcc.libc}/include/"
|
||||||
|
"-DLLVM_BINUTILS_INCDIR=${binutils}/include"
|
||||||
|
"-DCMAKE_CXX_FLAGS=-std=c++11"
|
||||||
|
];
|
||||||
|
|
||||||
|
passthru.gcc = stdenv.gcc.gcc;
|
||||||
|
|
||||||
|
enableParallelBuilding = true;
|
||||||
|
|
||||||
|
meta = {
|
||||||
|
description = "Collection of modular and reusable compiler and toolchain technologies";
|
||||||
|
homepage = http://llvm.org/;
|
||||||
|
license = stdenv.lib.licenses.bsd3;
|
||||||
|
maintainers = [ stdenv.lib.maintainers.shlevy ];
|
||||||
|
platforms = stdenv.lib.platforms.all;
|
||||||
|
};
|
||||||
|
}
|
||||||
51
pkgs/development/compilers/rust/default.nix
Normal file
51
pkgs/development/compilers/rust/default.nix
Normal file
@ -0,0 +1,51 @@
|
|||||||
|
{stdenv, fetchurl, which, file, perl, curl, python27, makeWrapper}:
|
||||||
|
|
||||||
|
let snapshotName = "rust-stage0-2014-01-05-a6d3e57-linux-x86_64-aa8fbbacdb1d8a078f3a3fe3478dcbc506bd4090.tar.bz2"; in
|
||||||
|
stdenv.mkDerivation {
|
||||||
|
name = "rust-0.9";
|
||||||
|
|
||||||
|
src = fetchurl {
|
||||||
|
url = http://static.rust-lang.org/dist/rust-0.9.tar.gz;
|
||||||
|
sha256 = "1lfmgnn00wrc30nf5lgg52w58ir3xpsnpmzk2v5a35xp8lsir4f0";
|
||||||
|
};
|
||||||
|
|
||||||
|
# We need rust to build rust. If we don't provide it, configure will try to download it
|
||||||
|
snapshot = fetchurl {
|
||||||
|
url = "http://static.rust-lang.org/stage0-snapshots/${snapshotName}";
|
||||||
|
sha256 = "17inc23jpznqp0vnskvznm74mm24c1nffhz2bkadhvp2ww0vpjjx";
|
||||||
|
};
|
||||||
|
|
||||||
|
# Put the snapshot where it is expected
|
||||||
|
postUnpack = ''
|
||||||
|
mkdir $sourceRoot/dl
|
||||||
|
ln -s $snapshot $sourceRoot/dl/${snapshotName}
|
||||||
|
'';
|
||||||
|
|
||||||
|
# Modify the snapshot compiler so that is can be executed
|
||||||
|
preBuild = if stdenv.isLinux then ''
|
||||||
|
make x86_64-unknown-linux-gnu/stage0/bin/rustc
|
||||||
|
patchelf --interpreter ${stdenv.glibc}/lib/ld-linux-x86-64.so.2 \
|
||||||
|
--set-rpath ${stdenv.gcc.gcc}/lib/ \
|
||||||
|
x86_64-unknown-linux-gnu/stage0/bin/rustc
|
||||||
|
'' else null;
|
||||||
|
|
||||||
|
# rustc requires cc
|
||||||
|
postInstall = ''
|
||||||
|
for f in $out/bin/*; do
|
||||||
|
wrapProgram $f --prefix PATH : "${stdenv.gcc}/bin"
|
||||||
|
done
|
||||||
|
'';
|
||||||
|
|
||||||
|
buildInputs = [ which file perl curl python27 makeWrapper ];
|
||||||
|
enableParallelBuilding = true;
|
||||||
|
|
||||||
|
meta = {
|
||||||
|
homepage = http://www.rust-lang.org/;
|
||||||
|
description = "A safe, concurrent, practical language";
|
||||||
|
maintainers = [ stdenv.lib.maintainers.madjar ];
|
||||||
|
license = map (builtins.getAttr "shortName") [ stdenv.lib.licenses.mit stdenv.lib.licenses.asl20 ];
|
||||||
|
# platforms as per http://static.rust-lang.org/doc/master/tutorial.html#getting-started
|
||||||
|
platforms = [ "i686-linux" "x86_64-linux" "x86_64-darwin" ];
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
40
pkgs/development/interpreters/spidermonkey/17.0.nix
Normal file
40
pkgs/development/interpreters/spidermonkey/17.0.nix
Normal file
@ -0,0 +1,40 @@
|
|||||||
|
{ stdenv, fetchurl, pkgconfig, nspr, perl, python, zip }:
|
||||||
|
|
||||||
|
stdenv.mkDerivation rec {
|
||||||
|
version = "17.0.0";
|
||||||
|
name = "spidermonkey-${version}";
|
||||||
|
|
||||||
|
src = fetchurl {
|
||||||
|
url = "http://ftp.mozilla.org/pub/mozilla.org/js/mozjs${version}.tar.gz";
|
||||||
|
sha256 = "1fig2wf4f10v43mqx67y68z6h77sy900d1w0pz9qarrqx57rc7ij";
|
||||||
|
};
|
||||||
|
|
||||||
|
propagatedBuildInputs = [ nspr ];
|
||||||
|
|
||||||
|
buildInputs = [ pkgconfig perl python zip ];
|
||||||
|
|
||||||
|
postUnpack = "sourceRoot=\${sourceRoot}/js/src";
|
||||||
|
|
||||||
|
preConfigure = ''
|
||||||
|
export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I${nspr}/include/nspr"
|
||||||
|
export LIBXUL_DIST=$out
|
||||||
|
'';
|
||||||
|
|
||||||
|
configureFlags = [ "--enable-threadsafe" "--with-system-nspr" ];
|
||||||
|
|
||||||
|
# hack around a make problem, see https://github.com/NixOS/nixpkgs/issues/1279#issuecomment-29547393
|
||||||
|
preBuild = "touch -- {.,shell,jsapi-tests}/{-lpthread,-ldl}";
|
||||||
|
|
||||||
|
enableParallelBuilding = true;
|
||||||
|
|
||||||
|
doCheck = true;
|
||||||
|
preCheck = "rm jit-test/tests/sunspider/check-date-format-tofte.js"; # https://bugzil.la/600522
|
||||||
|
|
||||||
|
meta = with stdenv.lib; {
|
||||||
|
description = "Mozilla's JavaScript engine written in C/C++";
|
||||||
|
homepage = https://developer.mozilla.org/en/SpiderMonkey;
|
||||||
|
# TODO: MPL/GPL/LGPL tri-license.
|
||||||
|
maintainers = [ maintainers.goibhniu ];
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
@ -2,11 +2,11 @@
|
|||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
name = "lilv-${version}";
|
name = "lilv-${version}";
|
||||||
version = "0.16.0";
|
version = "0.18.0";
|
||||||
|
|
||||||
src = fetchurl {
|
src = fetchurl {
|
||||||
url = "http://download.drobilla.net/${name}.tar.bz2";
|
url = "http://download.drobilla.net/${name}.tar.bz2";
|
||||||
sha256 = "1ddrcikypi7gfmj5cqn975axzrgv7mhzif4h0ni9w5b4v64rvcyg";
|
sha256 = "1k9wfc08ylgbkwbnvh1fx1bdzl3y59xrrx8gv0vk68yzcvcmv6am";
|
||||||
};
|
};
|
||||||
|
|
||||||
buildInputs = [ lv2 pkgconfig python serd sord sratom ];
|
buildInputs = [ lv2 pkgconfig python serd sord sratom ];
|
||||||
|
|||||||
@ -2,11 +2,11 @@
|
|||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
name = "lv2-${version}";
|
name = "lv2-${version}";
|
||||||
version = "1.6.0";
|
version = "1.8.0";
|
||||||
|
|
||||||
src = fetchurl {
|
src = fetchurl {
|
||||||
url = "http://lv2plug.in/spec/${name}.tar.bz2";
|
url = "http://lv2plug.in/spec/${name}.tar.bz2";
|
||||||
sha256 = "0nxrkmcpsm4v25wp2l7lcw4n0823kbplilpv51fszf710qsn7k9v";
|
sha256 = "1mxkp7gajh1alw6s358cqwf3qkpr1ld9wfxwswnqrxcd9a7hxjd4";
|
||||||
};
|
};
|
||||||
|
|
||||||
buildInputs = [ gtk libsndfile pkgconfig python ];
|
buildInputs = [ gtk libsndfile pkgconfig python ];
|
||||||
|
|||||||
@ -2,11 +2,11 @@
|
|||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
name = "sratom-${version}";
|
name = "sratom-${version}";
|
||||||
version = "0.4.2";
|
version = "0.4.4";
|
||||||
|
|
||||||
src = fetchurl {
|
src = fetchurl {
|
||||||
url = "http://download.drobilla.net/${name}.tar.bz2";
|
url = "http://download.drobilla.net/${name}.tar.bz2";
|
||||||
sha256 = "16i5snknl9frz638mgr58lp11ap1xmkbrkb3l6f0ad8ddqpcjm3i";
|
sha256 = "1q4044md8nmqah8ay5mf4lgdl6x0sfa4cjqyqk9da8nqzvs2j37s";
|
||||||
};
|
};
|
||||||
|
|
||||||
buildInputs = [ lv2 pkgconfig python serd sord ];
|
buildInputs = [ lv2 pkgconfig python serd sord ];
|
||||||
|
|||||||
@ -2,11 +2,11 @@
|
|||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
name = "suil-${version}";
|
name = "suil-${version}";
|
||||||
version = "0.6.16";
|
version = "0.8.0";
|
||||||
|
|
||||||
src = fetchurl {
|
src = fetchurl {
|
||||||
url = "http://download.drobilla.net/${name}.tar.bz2";
|
url = "http://download.drobilla.net/${name}.tar.bz2";
|
||||||
sha256 = "101xq7pd8kvnqwm4viaj4ikhn65jxrlrkg79ca954yqrdb9p9w8v";
|
sha256 = "0y5sbgaivb03vmr3jcpzj16wqxa5h744ml4w3ylzglbxs2bqgl7n";
|
||||||
};
|
};
|
||||||
|
|
||||||
buildInputs = [ gtk lv2 pkgconfig python qt4 serd sord sratom ];
|
buildInputs = [ gtk lv2 pkgconfig python qt4 serd sord sratom ];
|
||||||
|
|||||||
@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
|
|||||||
speexSupport = config.ffmpeg.speex or true;
|
speexSupport = config.ffmpeg.speex or true;
|
||||||
theoraSupport = config.ffmpeg.theora or true;
|
theoraSupport = config.ffmpeg.theora or true;
|
||||||
vorbisSupport = config.ffmpeg.vorbis or true;
|
vorbisSupport = config.ffmpeg.vorbis or true;
|
||||||
vpxSupport = config.ffmpeg.vpx or false;
|
vpxSupport = config.ffmpeg.vpx or true;
|
||||||
x264Support = config.ffmpeg.x264 or true;
|
x264Support = config.ffmpeg.x264 or true;
|
||||||
xvidSupport = config.ffmpeg.xvid or true;
|
xvidSupport = config.ffmpeg.xvid or true;
|
||||||
opusSupport = config.ffmpeg.opus or true;
|
opusSupport = config.ffmpeg.opus or true;
|
||||||
|
|||||||
34
pkgs/development/libraries/glm/default.nix
Normal file
34
pkgs/development/libraries/glm/default.nix
Normal file
@ -0,0 +1,34 @@
|
|||||||
|
{ stdenv, fetchurl, unzip }:
|
||||||
|
|
||||||
|
stdenv.mkDerivation rec {
|
||||||
|
name = "glm-0.9.5.1";
|
||||||
|
|
||||||
|
src = fetchurl {
|
||||||
|
url = "mirror://sourceforge/project/ogl-math/${name}/${name}.zip";
|
||||||
|
sha256 = "1x8bpmqdszzkg21r411w7cy4mqd5dcvb9jghc8h3xrx7ldbicqjg";
|
||||||
|
};
|
||||||
|
|
||||||
|
buildInputs = [ unzip ];
|
||||||
|
|
||||||
|
outputs = [ "out" "doc" ];
|
||||||
|
|
||||||
|
installPhase = ''
|
||||||
|
mkdir -p "$out/include"
|
||||||
|
cp -r glm "$out/include"
|
||||||
|
|
||||||
|
mkdir -p "$doc/share/doc/glm"
|
||||||
|
cp -r doc/* "$doc/share/doc/glm"
|
||||||
|
'';
|
||||||
|
|
||||||
|
meta = with stdenv.lib; {
|
||||||
|
description = "OpenGL Mathematics library for C++";
|
||||||
|
longDescription = ''
|
||||||
|
OpenGL Mathematics (GLM) is a header only C++ mathematics library for
|
||||||
|
graphics software based on the OpenGL Shading Language (GLSL)
|
||||||
|
specification and released under the MIT license.
|
||||||
|
'';
|
||||||
|
homepage = http://glm.g-truc.net/;
|
||||||
|
license = licenses.mit;
|
||||||
|
platforms = platforms.unix;
|
||||||
|
};
|
||||||
|
}
|
||||||
@ -4,8 +4,8 @@
|
|||||||
|
|
||||||
cabal.mkDerivation (self: {
|
cabal.mkDerivation (self: {
|
||||||
pname = "JuicyPixels";
|
pname = "JuicyPixels";
|
||||||
version = "3.1.2";
|
version = "3.1.3";
|
||||||
sha256 = "19bal3g3cp4nn8g3zp4yi5g4zw5wnkbi74gcra8mxs4zy99bf8s2";
|
sha256 = "1zyrdd8mhgj0lchsznyhqhxb48ql8fhfqi5qs54qaxan514w6x70";
|
||||||
buildDepends = [
|
buildDepends = [
|
||||||
binary deepseq mtl primitive transformers vector zlib
|
binary deepseq mtl primitive transformers vector zlib
|
||||||
];
|
];
|
||||||
|
|||||||
14
pkgs/development/libraries/haskell/TypeCompose/default.nix
Normal file
14
pkgs/development/libraries/haskell/TypeCompose/default.nix
Normal file
@ -0,0 +1,14 @@
|
|||||||
|
{ cabal }:
|
||||||
|
|
||||||
|
cabal.mkDerivation (self: {
|
||||||
|
pname = "TypeCompose";
|
||||||
|
version = "0.9.9";
|
||||||
|
sha256 = "0i89r1yaglkcc1fdhn0m4hws5rqcpmkg32ddznch7a3rz1l9gqwg";
|
||||||
|
meta = {
|
||||||
|
homepage = "https://github.com/conal/TypeCompose";
|
||||||
|
description = "Type composition classes & instances";
|
||||||
|
license = self.stdenv.lib.licenses.bsd3;
|
||||||
|
platforms = self.ghc.meta.platforms;
|
||||||
|
maintainers = [ self.stdenv.lib.maintainers.ianwookim ];
|
||||||
|
};
|
||||||
|
})
|
||||||
26
pkgs/development/libraries/haskell/aeson/0.7.0.0.nix
Normal file
26
pkgs/development/libraries/haskell/aeson/0.7.0.0.nix
Normal file
@ -0,0 +1,26 @@
|
|||||||
|
{ cabal, attoparsec, deepseq, dlist, hashable, HUnit, mtl
|
||||||
|
, QuickCheck, scientific, syb, testFramework, testFrameworkHunit
|
||||||
|
, testFrameworkQuickcheck2, text, time, unorderedContainers, vector
|
||||||
|
}:
|
||||||
|
|
||||||
|
cabal.mkDerivation (self: {
|
||||||
|
pname = "aeson";
|
||||||
|
version = "0.7.0.0";
|
||||||
|
sha256 = "14xh7i07ha2hgljq0y0v7f5gkn0pv2zqj8l9j92957mf7f17zwf6";
|
||||||
|
buildDepends = [
|
||||||
|
attoparsec deepseq dlist hashable mtl scientific syb text time
|
||||||
|
unorderedContainers vector
|
||||||
|
];
|
||||||
|
testDepends = [
|
||||||
|
attoparsec HUnit QuickCheck testFramework testFrameworkHunit
|
||||||
|
testFrameworkQuickcheck2 text time unorderedContainers vector
|
||||||
|
];
|
||||||
|
doCheck = false;
|
||||||
|
meta = {
|
||||||
|
homepage = "https://github.com/bos/aeson";
|
||||||
|
description = "Fast JSON parsing and encoding";
|
||||||
|
license = self.stdenv.lib.licenses.bsd3;
|
||||||
|
platforms = self.ghc.meta.platforms;
|
||||||
|
maintainers = [ self.stdenv.lib.maintainers.andres ];
|
||||||
|
};
|
||||||
|
})
|
||||||
@ -2,8 +2,8 @@
|
|||||||
|
|
||||||
cabal.mkDerivation (self: {
|
cabal.mkDerivation (self: {
|
||||||
pname = "base16-bytestring";
|
pname = "base16-bytestring";
|
||||||
version = "0.1.1.5";
|
version = "0.1.1.6";
|
||||||
sha256 = "1fgd3zdzjfry6jaz8hwhim0p2c35l73cxxambh0ff7p5fqjrlwym";
|
sha256 = "0jf40m3yijqw6wd1rwwvviww46fasphaay9m9rgqyhf5aahnbzjs";
|
||||||
meta = {
|
meta = {
|
||||||
homepage = "http://github.com/bos/base16-bytestring";
|
homepage = "http://github.com/bos/base16-bytestring";
|
||||||
description = "Fast base16 (hex) encoding and decoding for ByteStrings";
|
description = "Fast base16 (hex) encoding and decoding for ByteStrings";
|
||||||
|
|||||||
@ -4,8 +4,8 @@
|
|||||||
|
|
||||||
cabal.mkDerivation (self: {
|
cabal.mkDerivation (self: {
|
||||||
pname = "case-insensitive";
|
pname = "case-insensitive";
|
||||||
version = "1.1.0.2";
|
version = "1.1.0.3";
|
||||||
sha256 = "0200jpz2xs67sw5dczfj8nlz2yp40k05bv3rk1phdc093n13kaww";
|
sha256 = "0fr69lfb976gflr8w6d68zn4pz86jfxbb2i49fw3mmam67k5y9bv";
|
||||||
buildDepends = [ deepseq hashable text ];
|
buildDepends = [ deepseq hashable text ];
|
||||||
testDepends = [ HUnit testFramework testFrameworkHunit text ];
|
testDepends = [ HUnit testFramework testFrameworkHunit text ];
|
||||||
meta = {
|
meta = {
|
||||||
@ -4,8 +4,8 @@
|
|||||||
|
|
||||||
cabal.mkDerivation (self: {
|
cabal.mkDerivation (self: {
|
||||||
pname = "conduit";
|
pname = "conduit";
|
||||||
version = "1.0.10";
|
version = "1.0.11.1";
|
||||||
sha256 = "12vqh747rdldw3n42cxzd77rzb66129dc690n23q5xy7pbhzilfp";
|
sha256 = "115iqdhwmnn04bmby2bmbm6pykb2akaca0c3i79nvw1annml65lg";
|
||||||
buildDepends = [
|
buildDepends = [
|
||||||
liftedBase mmorph monadControl mtl resourcet text transformers
|
liftedBase mmorph monadControl mtl resourcet text transformers
|
||||||
transformersBase void
|
transformersBase void
|
||||||
|
|||||||
@ -0,0 +1,19 @@
|
|||||||
|
{ cabal, cereal, either, lens, mtl, safecopy, transformers
|
||||||
|
, transformersFree, uuid
|
||||||
|
}:
|
||||||
|
|
||||||
|
cabal.mkDerivation (self: {
|
||||||
|
pname = "coroutine-object";
|
||||||
|
version = "0.2.0.0";
|
||||||
|
sha256 = "1jl5glnk4ildjrxyxscxd0v7xfqbd9vpv5gaxygsfsbfr1zizp3s";
|
||||||
|
buildDepends = [
|
||||||
|
cereal either lens mtl safecopy transformers transformersFree uuid
|
||||||
|
];
|
||||||
|
jailbreak = true;
|
||||||
|
meta = {
|
||||||
|
description = "Object-oriented programming realization using coroutine";
|
||||||
|
license = self.stdenv.lib.licenses.bsd3;
|
||||||
|
platforms = self.ghc.meta.platforms;
|
||||||
|
maintainers = [ self.stdenv.lib.maintainers.ianwookim ];
|
||||||
|
};
|
||||||
|
})
|
||||||
@ -4,8 +4,8 @@
|
|||||||
|
|
||||||
cabal.mkDerivation (self: {
|
cabal.mkDerivation (self: {
|
||||||
pname = "cryptohash";
|
pname = "cryptohash";
|
||||||
version = "0.11.1";
|
version = "0.11.2";
|
||||||
sha256 = "0ww7bikl8i50m1pwkqp145bfsiy07npnjw48j3il4w2ia0b3axmy";
|
sha256 = "0az2p7lql1lchl85ca26b5sbvhqsv47daavyfqy84qmr3w3wyr28";
|
||||||
buildDepends = [ byteable ];
|
buildDepends = [ byteable ];
|
||||||
testDepends = [
|
testDepends = [
|
||||||
byteable HUnit QuickCheck testFramework testFrameworkHunit
|
byteable HUnit QuickCheck testFramework testFrameworkHunit
|
||||||
|
|||||||
@ -4,13 +4,12 @@
|
|||||||
|
|
||||||
cabal.mkDerivation (self: {
|
cabal.mkDerivation (self: {
|
||||||
pname = "exceptions";
|
pname = "exceptions";
|
||||||
version = "0.3.2";
|
version = "0.3.3";
|
||||||
sha256 = "0c1d78wm8is9kyv26drbx3f1sq2bfcq5m6wfw2qzwgalb3z2kxlw";
|
sha256 = "1gng8zvsljm6xrb5gy501f1dl47z171wkic8bsivhn4rgp9lby9l";
|
||||||
buildDepends = [ mtl transformers ];
|
buildDepends = [ mtl transformers ];
|
||||||
testDepends = [
|
testDepends = [
|
||||||
mtl QuickCheck testFramework testFrameworkQuickcheck2 transformers
|
mtl QuickCheck testFramework testFrameworkQuickcheck2 transformers
|
||||||
];
|
];
|
||||||
doCheck = false;
|
|
||||||
meta = {
|
meta = {
|
||||||
homepage = "http://github.com/ekmett/exceptions/";
|
homepage = "http://github.com/ekmett/exceptions/";
|
||||||
description = "Extensible optionally-pure exceptions";
|
description = "Extensible optionally-pure exceptions";
|
||||||
|
|||||||
@ -2,8 +2,8 @@
|
|||||||
|
|
||||||
cabal.mkDerivation (self: {
|
cabal.mkDerivation (self: {
|
||||||
pname = "gloss-raster";
|
pname = "gloss-raster";
|
||||||
version = "1.8.1.1";
|
version = "1.8.1.2";
|
||||||
sha256 = "0qqk2fizmv1zdvi8lljxiqdwlmfzni4qzsdvm2jbvgg5qjx9l9qp";
|
sha256 = "1cpibilv027rfx7xz957f1d7wy6b5z6dgfjrw425ck497r8gfgp4";
|
||||||
buildDepends = [ gloss repa ];
|
buildDepends = [ gloss repa ];
|
||||||
extraLibraries = [ llvm ];
|
extraLibraries = [ llvm ];
|
||||||
meta = {
|
meta = {
|
||||||
|
|||||||
@ -2,8 +2,8 @@
|
|||||||
|
|
||||||
cabal.mkDerivation (self: {
|
cabal.mkDerivation (self: {
|
||||||
pname = "gloss";
|
pname = "gloss";
|
||||||
version = "1.8.1.1";
|
version = "1.8.1.2";
|
||||||
sha256 = "135rrgzx4xq8279zbsl4538hjn8np4g6409fgva2cb9shw8z5pmj";
|
sha256 = "1ky1gckvyww855dy3fzllf1ixbmc3jpdvz85hx719pcygy7qh71m";
|
||||||
buildDepends = [ bmp GLUT OpenGL ];
|
buildDepends = [ bmp GLUT OpenGL ];
|
||||||
jailbreak = true;
|
jailbreak = true;
|
||||||
meta = {
|
meta = {
|
||||||
|
|||||||
@ -2,14 +2,14 @@
|
|||||||
|
|
||||||
cabal.mkDerivation (self: {
|
cabal.mkDerivation (self: {
|
||||||
pname = "gnuidn";
|
pname = "gnuidn";
|
||||||
version = "0.2";
|
version = "0.2.1";
|
||||||
sha256 = "0xk72p3z1lwlmab0jcf7m48p5pncgz00hb7l96naz1gdkbq7xizd";
|
sha256 = "1jii635wc3j1jnwwx24j9gg9xd91g2iw5967acn74p7db62lqx37";
|
||||||
buildDepends = [ text ];
|
buildDepends = [ text ];
|
||||||
buildTools = [ c2hs ];
|
buildTools = [ c2hs ];
|
||||||
extraLibraries = [ libidn ];
|
extraLibraries = [ libidn ];
|
||||||
pkgconfigDepends = [ libidn ];
|
pkgconfigDepends = [ libidn ];
|
||||||
meta = {
|
meta = {
|
||||||
homepage = "http://john-millikin.com/software/bindings/gnuidn/";
|
homepage = "https://john-millikin.com/software/haskell-gnuidn/";
|
||||||
description = "Bindings for GNU IDN";
|
description = "Bindings for GNU IDN";
|
||||||
license = self.stdenv.lib.licenses.gpl3;
|
license = self.stdenv.lib.licenses.gpl3;
|
||||||
platforms = self.ghc.meta.platforms;
|
platforms = self.ghc.meta.platforms;
|
||||||
|
|||||||
@ -8,8 +8,8 @@
|
|||||||
|
|
||||||
cabal.mkDerivation (self: {
|
cabal.mkDerivation (self: {
|
||||||
pname = "hakyll";
|
pname = "hakyll";
|
||||||
version = "4.4.3.0";
|
version = "4.4.3.1";
|
||||||
sha256 = "1ngjzqgyhdfkzikyg6cicqdb6cpw2bbfr4g73vgmzlg8spy1cyg5";
|
sha256 = "0k301mzy8sagrxdzkhz006j1i1zmsx9iy5ais9gif3gxj2sd3b2a";
|
||||||
isLibrary = true;
|
isLibrary = true;
|
||||||
isExecutable = true;
|
isExecutable = true;
|
||||||
buildDepends = [
|
buildDepends = [
|
||||||
@ -25,10 +25,10 @@ cabal.mkDerivation (self: {
|
|||||||
snapCore snapServer systemFilepath tagsoup testFramework
|
snapCore snapServer systemFilepath tagsoup testFramework
|
||||||
testFrameworkHunit testFrameworkQuickcheck2 text time
|
testFrameworkHunit testFrameworkQuickcheck2 text time
|
||||||
];
|
];
|
||||||
doCheck = false;
|
|
||||||
patchPhase = ''
|
patchPhase = ''
|
||||||
sed -i -e 's|pandoc-citeproc >=.*,|pandoc-citeproc,|' hakyll.cabal
|
sed -i -e 's|pandoc-citeproc >=.*,|pandoc-citeproc,|' hakyll.cabal
|
||||||
'';
|
'';
|
||||||
|
doCheck = false;
|
||||||
meta = {
|
meta = {
|
||||||
homepage = "http://jaspervdj.be/hakyll";
|
homepage = "http://jaspervdj.be/hakyll";
|
||||||
description = "A static website compiler library";
|
description = "A static website compiler library";
|
||||||
|
|||||||
@ -6,8 +6,8 @@
|
|||||||
|
|
||||||
cabal.mkDerivation (self: {
|
cabal.mkDerivation (self: {
|
||||||
pname = "heist";
|
pname = "heist";
|
||||||
version = "0.13.0.4";
|
version = "0.13.0.5";
|
||||||
sha256 = "15iixsjlx3zd44dcdxla5pgpl16995pk9g34zjqynmhcj7sfv5as";
|
sha256 = "17lpqiidy1s6yzhh865y7dhkcv34p7pxzljpn64yyfa2pc8885dj";
|
||||||
buildDepends = [
|
buildDepends = [
|
||||||
aeson attoparsec blazeBuilder blazeHtml directoryTree dlist errors
|
aeson attoparsec blazeBuilder blazeHtml directoryTree dlist errors
|
||||||
filepath hashable MonadCatchIOTransformers mtl random text time
|
filepath hashable MonadCatchIOTransformers mtl random text time
|
||||||
|
|||||||
@ -0,0 +1,18 @@
|
|||||||
|
{ cabal, blazeBuilder, doubleConversion, hoodleTypes, lens, strict
|
||||||
|
}:
|
||||||
|
|
||||||
|
cabal.mkDerivation (self: {
|
||||||
|
pname = "hoodle-builder";
|
||||||
|
version = "0.2.2";
|
||||||
|
sha256 = "0gagfpjihf6lafi90r883n9agaj1pw4gygaaxv4xxfsc270855bq";
|
||||||
|
buildDepends = [
|
||||||
|
blazeBuilder doubleConversion hoodleTypes lens strict
|
||||||
|
];
|
||||||
|
jailbreak = true;
|
||||||
|
meta = {
|
||||||
|
description = "text builder for hoodle file format";
|
||||||
|
license = self.stdenv.lib.licenses.bsd3;
|
||||||
|
platforms = self.ghc.meta.platforms;
|
||||||
|
maintainers = [ self.stdenv.lib.maintainers.ianwookim ];
|
||||||
|
};
|
||||||
|
})
|
||||||
31
pkgs/development/libraries/haskell/hoodle-core/default.nix
Normal file
31
pkgs/development/libraries/haskell/hoodle-core/default.nix
Normal file
@ -0,0 +1,31 @@
|
|||||||
|
{ cabal, attoparsec, base64Bytestring, binary, cairo, cereal
|
||||||
|
, configurator, coroutineObject, dbus, Diff, dyre, either, errors
|
||||||
|
, filepath, fsnotify, gd, gtk, hoodleBuilder, hoodleParser
|
||||||
|
, hoodleRender, hoodleTypes, lens, libX11, libXi, monadLoops, mtl
|
||||||
|
, network, networkInfo, networkSimple, pango, poppler, pureMD5, stm
|
||||||
|
, strict, svgcairo, systemFilepath, text, time, transformers
|
||||||
|
, transformersFree, uuid, xournalParser
|
||||||
|
}:
|
||||||
|
|
||||||
|
cabal.mkDerivation (self: {
|
||||||
|
pname = "hoodle-core";
|
||||||
|
version = "0.13.0.0";
|
||||||
|
sha256 = "1krq7i7kvymjhj9kar2rpy4qkbak8p4n1ifswdnk9r1dw7fr8vdx";
|
||||||
|
buildDepends = [
|
||||||
|
attoparsec base64Bytestring binary cairo cereal configurator
|
||||||
|
coroutineObject dbus Diff dyre either errors filepath fsnotify gd
|
||||||
|
gtk hoodleBuilder hoodleParser hoodleRender hoodleTypes lens
|
||||||
|
monadLoops mtl network networkInfo networkSimple pango poppler
|
||||||
|
pureMD5 stm strict svgcairo systemFilepath text time transformers
|
||||||
|
transformersFree uuid xournalParser
|
||||||
|
];
|
||||||
|
extraLibraries = [ libX11 libXi ];
|
||||||
|
jailbreak = true;
|
||||||
|
meta = {
|
||||||
|
homepage = "http://ianwookim.org/hoodle";
|
||||||
|
description = "Core library for hoodle";
|
||||||
|
license = self.stdenv.lib.licenses.gpl3;
|
||||||
|
platforms = self.ghc.meta.platforms;
|
||||||
|
maintainers = [ self.stdenv.lib.maintainers.ianwookim ];
|
||||||
|
};
|
||||||
|
})
|
||||||
21
pkgs/development/libraries/haskell/hoodle-parser/default.nix
Normal file
21
pkgs/development/libraries/haskell/hoodle-parser/default.nix
Normal file
@ -0,0 +1,21 @@
|
|||||||
|
{ cabal, attoparsec, either, hoodleTypes, lens, mtl, strict, text
|
||||||
|
, transformers, xournalTypes
|
||||||
|
}:
|
||||||
|
|
||||||
|
cabal.mkDerivation (self: {
|
||||||
|
pname = "hoodle-parser";
|
||||||
|
version = "0.2.2";
|
||||||
|
sha256 = "1m0jf7820hkdq69866hwqd1cc6rv331jrar8ayr28692h09j02rm";
|
||||||
|
buildDepends = [
|
||||||
|
attoparsec either hoodleTypes lens mtl strict text transformers
|
||||||
|
xournalTypes
|
||||||
|
];
|
||||||
|
jailbreak = true;
|
||||||
|
meta = {
|
||||||
|
homepage = "http://ianwookim.org/hoodle";
|
||||||
|
description = "Hoodle file parser";
|
||||||
|
license = self.stdenv.lib.licenses.bsd3;
|
||||||
|
platforms = self.ghc.meta.platforms;
|
||||||
|
maintainers = [ self.stdenv.lib.maintainers.ianwookim ];
|
||||||
|
};
|
||||||
|
})
|
||||||
20
pkgs/development/libraries/haskell/hoodle-render/default.nix
Normal file
20
pkgs/development/libraries/haskell/hoodle-render/default.nix
Normal file
@ -0,0 +1,20 @@
|
|||||||
|
{ cabal, base64Bytestring, cairo, filepath, gd, hoodleTypes, lens
|
||||||
|
, monadLoops, mtl, poppler, strict, svgcairo, uuid
|
||||||
|
}:
|
||||||
|
|
||||||
|
cabal.mkDerivation (self: {
|
||||||
|
pname = "hoodle-render";
|
||||||
|
version = "0.3.2";
|
||||||
|
sha256 = "1mmx27g1vqpndk26nz2hy7rckcgg68clvr5x31cqz9f8sifd8rsg";
|
||||||
|
buildDepends = [
|
||||||
|
base64Bytestring cairo filepath gd hoodleTypes lens monadLoops mtl
|
||||||
|
poppler strict svgcairo uuid
|
||||||
|
];
|
||||||
|
jailbreak = true;
|
||||||
|
meta = {
|
||||||
|
description = "Hoodle file renderer";
|
||||||
|
license = self.stdenv.lib.licenses.bsd3;
|
||||||
|
platforms = self.ghc.meta.platforms;
|
||||||
|
maintainers = [ self.stdenv.lib.maintainers.ianwookim ];
|
||||||
|
};
|
||||||
|
})
|
||||||
15
pkgs/development/libraries/haskell/hoodle-types/default.nix
Normal file
15
pkgs/development/libraries/haskell/hoodle-types/default.nix
Normal file
@ -0,0 +1,15 @@
|
|||||||
|
{ cabal, cereal, lens, mtl, strict, uuid }:
|
||||||
|
|
||||||
|
cabal.mkDerivation (self: {
|
||||||
|
pname = "hoodle-types";
|
||||||
|
version = "0.2.2";
|
||||||
|
sha256 = "0dw2ji676nq3idb7izzzfnxzhyngf84wkapc0la43g4w4hzv1zxz";
|
||||||
|
buildDepends = [ cereal lens mtl strict uuid ];
|
||||||
|
jailbreak = true;
|
||||||
|
meta = {
|
||||||
|
description = "Data types for programs for hoodle file format";
|
||||||
|
license = self.stdenv.lib.licenses.bsd3;
|
||||||
|
platforms = self.ghc.meta.platforms;
|
||||||
|
maintainers = [ self.stdenv.lib.maintainers.ianwookim ];
|
||||||
|
};
|
||||||
|
})
|
||||||
@ -2,8 +2,8 @@
|
|||||||
|
|
||||||
cabal.mkDerivation (self: {
|
cabal.mkDerivation (self: {
|
||||||
pname = "pipes-bytestring";
|
pname = "pipes-bytestring";
|
||||||
version = "1.0.2";
|
version = "1.0.3";
|
||||||
sha256 = "09wzmi3xh9n69xsxw0ik4qf2ld1vksca88ggknqbzbnjxq82jjrr";
|
sha256 = "11jiaf5vs0jz8m0x9dlcvflh636131bj4jnlrj3r5nz1v7a64v6b";
|
||||||
buildDepends = [ pipes pipesParse transformers ];
|
buildDepends = [ pipes pipesParse transformers ];
|
||||||
meta = {
|
meta = {
|
||||||
description = "ByteString support for pipes";
|
description = "ByteString support for pipes";
|
||||||
|
|||||||
@ -8,8 +8,8 @@
|
|||||||
|
|
||||||
cabal.mkDerivation (self: {
|
cabal.mkDerivation (self: {
|
||||||
pname = "snap";
|
pname = "snap";
|
||||||
version = "0.13.2.0";
|
version = "0.13.2.1";
|
||||||
sha256 = "1jwgl6dmi1ljfqvfjxcsv3q4h9lcqpmxk4zsjkxdx77z201lhm3b";
|
sha256 = "0jkjxyw7pcfl8r6gs0amzpkxardncvxsh20m7lad6aqjkcwh8r4l";
|
||||||
isLibrary = true;
|
isLibrary = true;
|
||||||
isExecutable = true;
|
isExecutable = true;
|
||||||
buildDepends = [
|
buildDepends = [
|
||||||
|
|||||||
@ -6,8 +6,8 @@
|
|||||||
|
|
||||||
cabal.mkDerivation (self: {
|
cabal.mkDerivation (self: {
|
||||||
pname = "stm-conduit";
|
pname = "stm-conduit";
|
||||||
version = "2.1.4";
|
version = "2.2";
|
||||||
sha256 = "0xl3g96blawy5bkvialq6jxnf4wajxb5fg1sh7p9kvw1gvacqwqk";
|
sha256 = "14fz8izr8fxi3s78fhz4p5yfdkfcipcfpcj6dn5w0fkcd2hc2a66";
|
||||||
buildDepends = [
|
buildDepends = [
|
||||||
async conduit liftedAsync liftedBase monadControl monadLoops
|
async conduit liftedAsync liftedBase monadControl monadLoops
|
||||||
resourcet stm stmChans transformers
|
resourcet stm stmChans transformers
|
||||||
|
|||||||
20
pkgs/development/libraries/haskell/tasty-rerun/default.nix
Normal file
20
pkgs/development/libraries/haskell/tasty-rerun/default.nix
Normal file
@ -0,0 +1,20 @@
|
|||||||
|
{ cabal, mtl, optparseApplicative, reducers, split, stm, tagged
|
||||||
|
, tasty, transformers
|
||||||
|
}:
|
||||||
|
|
||||||
|
cabal.mkDerivation (self: {
|
||||||
|
pname = "tasty-rerun";
|
||||||
|
version = "1.0.0";
|
||||||
|
sha256 = "0vpgsb5fgvb9mx07zq53slqxxk2vvr2c9c9p1fhrm9qadfirsqc8";
|
||||||
|
buildDepends = [
|
||||||
|
mtl optparseApplicative reducers split stm tagged tasty
|
||||||
|
transformers
|
||||||
|
];
|
||||||
|
meta = {
|
||||||
|
homepage = "http://github.com/ocharles/tasty-rerun";
|
||||||
|
description = "Run tests by filtering the test tree depending on the result of previous test runs";
|
||||||
|
license = self.stdenv.lib.licenses.bsd3;
|
||||||
|
platforms = self.ghc.meta.platforms;
|
||||||
|
maintainers = [ self.stdenv.lib.maintainers.ocharles ];
|
||||||
|
};
|
||||||
|
})
|
||||||
@ -0,0 +1,26 @@
|
|||||||
|
{ cabal, attoparsecEnumerator, dataDefault, deepseq, filepath
|
||||||
|
, hashable, json, MonadCatchIOTransformers, network, safe, snapCore
|
||||||
|
, snapServer, stm, text, time, transformers, unorderedContainers
|
||||||
|
, utf8String, vault, websockets, websocketsSnap
|
||||||
|
}:
|
||||||
|
|
||||||
|
cabal.mkDerivation (self: {
|
||||||
|
pname = "threepenny-gui";
|
||||||
|
version = "0.4.0.2";
|
||||||
|
sha256 = "0dx6jrpxvd6ypz314hmq8nngy0wjx3bwx3r9h1c6y70id31lr9pg";
|
||||||
|
isLibrary = true;
|
||||||
|
isExecutable = true;
|
||||||
|
buildDepends = [
|
||||||
|
attoparsecEnumerator dataDefault deepseq filepath hashable json
|
||||||
|
MonadCatchIOTransformers network safe snapCore snapServer stm text
|
||||||
|
time transformers unorderedContainers utf8String vault websockets
|
||||||
|
websocketsSnap
|
||||||
|
];
|
||||||
|
meta = {
|
||||||
|
homepage = "http://www.haskell.org/haskellwiki/Threepenny-gui";
|
||||||
|
description = "GUI framework that uses the web browser as a display";
|
||||||
|
license = self.stdenv.lib.licenses.bsd3;
|
||||||
|
platforms = self.ghc.meta.platforms;
|
||||||
|
maintainers = [ self.stdenv.lib.maintainers.ocharles ];
|
||||||
|
};
|
||||||
|
})
|
||||||
@ -0,0 +1,15 @@
|
|||||||
|
{ cabal, binary, extensibleExceptions, time, timezoneSeries }:
|
||||||
|
|
||||||
|
cabal.mkDerivation (self: {
|
||||||
|
pname = "timezone-olson";
|
||||||
|
version = "0.1.2";
|
||||||
|
sha256 = "1dp0nppvx732c27pybbyqw6jkx4kdgfc6vnc539m0xv005afpq9y";
|
||||||
|
buildDepends = [ binary extensibleExceptions time timezoneSeries ];
|
||||||
|
meta = {
|
||||||
|
homepage = "http://projects.haskell.org/time-ng/";
|
||||||
|
description = "A pure Haskell parser and renderer for binary Olson timezone files";
|
||||||
|
license = self.stdenv.lib.licenses.bsd3;
|
||||||
|
platforms = self.ghc.meta.platforms;
|
||||||
|
maintainers = [ self.stdenv.lib.maintainers.ocharles ];
|
||||||
|
};
|
||||||
|
})
|
||||||
@ -0,0 +1,15 @@
|
|||||||
|
{ cabal, time }:
|
||||||
|
|
||||||
|
cabal.mkDerivation (self: {
|
||||||
|
pname = "timezone-series";
|
||||||
|
version = "0.1.2";
|
||||||
|
sha256 = "0clvm1kwmxid5bhb74vgrpzynn4sff2k6mfzb43i7737w5fy86gp";
|
||||||
|
buildDepends = [ time ];
|
||||||
|
meta = {
|
||||||
|
homepage = "http://projects.haskell.org/time-ng/";
|
||||||
|
description = "Enhanced timezone handling for Data.Time";
|
||||||
|
license = self.stdenv.lib.licenses.bsd3;
|
||||||
|
platforms = self.ghc.meta.platforms;
|
||||||
|
maintainers = [ self.stdenv.lib.maintainers.ocharles ];
|
||||||
|
};
|
||||||
|
})
|
||||||
@ -0,0 +1,14 @@
|
|||||||
|
{ cabal, transformers }:
|
||||||
|
|
||||||
|
cabal.mkDerivation (self: {
|
||||||
|
pname = "transformers-free";
|
||||||
|
version = "1.0.1";
|
||||||
|
sha256 = "0fbzkr7ifvqng8wqi3332vwvmx36f8z167angyskfdd0a5rik2z0";
|
||||||
|
buildDepends = [ transformers ];
|
||||||
|
meta = {
|
||||||
|
description = "Free monad transformers";
|
||||||
|
license = self.stdenv.lib.licenses.bsd3;
|
||||||
|
platforms = self.ghc.meta.platforms;
|
||||||
|
maintainers = [ self.stdenv.lib.maintainers.ianwookim ];
|
||||||
|
};
|
||||||
|
})
|
||||||
@ -2,8 +2,8 @@
|
|||||||
|
|
||||||
cabal.mkDerivation (self: {
|
cabal.mkDerivation (self: {
|
||||||
pname = "vector-space-points";
|
pname = "vector-space-points";
|
||||||
version = "0.1.2.1";
|
version = "0.1.3";
|
||||||
sha256 = "0prbmk48xdr2gbxqpv0g89xz5v3k9wps9v2gymkh32jag2lgzi66";
|
sha256 = "0bk2zrccf5bxh14dzhhv89mr755j801ziqyxgv69ksdyxh8hx2qg";
|
||||||
buildDepends = [ newtype vectorSpace ];
|
buildDepends = [ newtype vectorSpace ];
|
||||||
meta = {
|
meta = {
|
||||||
description = "A type for points, as distinct from vectors";
|
description = "A type for points, as distinct from vectors";
|
||||||
|
|||||||
@ -7,8 +7,8 @@
|
|||||||
|
|
||||||
cabal.mkDerivation (self: {
|
cabal.mkDerivation (self: {
|
||||||
pname = "wai-extra";
|
pname = "wai-extra";
|
||||||
version = "2.0.2";
|
version = "2.0.3";
|
||||||
sha256 = "1va9lds6vziid3kksyp1pl4bz1l02qjybm4x438q5a7n6yxmmd65";
|
sha256 = "18x5jcq4yl33ixl7rb79ncx107bw6y8dmw2gwcmxb93h5yiam7s5";
|
||||||
buildDepends = [
|
buildDepends = [
|
||||||
ansiTerminal base64Bytestring blazeBuilder blazeBuilderConduit
|
ansiTerminal base64Bytestring blazeBuilder blazeBuilderConduit
|
||||||
caseInsensitive conduit dataDefault fastLogger httpTypes liftedBase
|
caseInsensitive conduit dataDefault fastLogger httpTypes liftedBase
|
||||||
|
|||||||
@ -0,0 +1,22 @@
|
|||||||
|
{ cabal, attoparsec, attoparsecConduit, conduit, lens, mtl, strict
|
||||||
|
, text, transformers, xmlConduit, xmlTypes, xournalTypes
|
||||||
|
, zlibConduit
|
||||||
|
}:
|
||||||
|
|
||||||
|
cabal.mkDerivation (self: {
|
||||||
|
pname = "xournal-parser";
|
||||||
|
version = "0.5.0.2";
|
||||||
|
sha256 = "1s9z7s6mcsn4s2krrcb1x63ca1d0rpyzdhb147w9524qw7gvbjin";
|
||||||
|
buildDepends = [
|
||||||
|
attoparsec attoparsecConduit conduit lens mtl strict text
|
||||||
|
transformers xmlConduit xmlTypes xournalTypes zlibConduit
|
||||||
|
];
|
||||||
|
jailbreak = true;
|
||||||
|
meta = {
|
||||||
|
homepage = "http://ianwookim.org/hoodle";
|
||||||
|
description = "Xournal file parser";
|
||||||
|
license = self.stdenv.lib.licenses.bsd3;
|
||||||
|
platforms = self.ghc.meta.platforms;
|
||||||
|
maintainers = [ self.stdenv.lib.maintainers.ianwookim ];
|
||||||
|
};
|
||||||
|
})
|
||||||
15
pkgs/development/libraries/haskell/xournal-types/default.nix
Normal file
15
pkgs/development/libraries/haskell/xournal-types/default.nix
Normal file
@ -0,0 +1,15 @@
|
|||||||
|
{ cabal, cereal, lens, strict, TypeCompose }:
|
||||||
|
|
||||||
|
cabal.mkDerivation (self: {
|
||||||
|
pname = "xournal-types";
|
||||||
|
version = "0.5.0.2";
|
||||||
|
sha256 = "1z1zxgwnd2bpgmiimil2jnz4xdcvvi59y2qdvqgy42b10db8rvkm";
|
||||||
|
buildDepends = [ cereal lens strict TypeCompose ];
|
||||||
|
jailbreak = true;
|
||||||
|
meta = {
|
||||||
|
description = "Data types for programs for xournal file format";
|
||||||
|
license = self.stdenv.lib.licenses.bsd3;
|
||||||
|
platforms = self.ghc.meta.platforms;
|
||||||
|
maintainers = [ self.stdenv.lib.maintainers.ianwookim ];
|
||||||
|
};
|
||||||
|
})
|
||||||
@ -8,8 +8,8 @@
|
|||||||
|
|
||||||
cabal.mkDerivation (self: {
|
cabal.mkDerivation (self: {
|
||||||
pname = "yesod-auth";
|
pname = "yesod-auth";
|
||||||
version = "1.2.5.2";
|
version = "1.2.5.3";
|
||||||
sha256 = "13gvcwgpq4l3d50h855qdcn0k93a8cy918jg577ch3fqhwk70q8g";
|
sha256 = "0rpyx9p3si5453166v9paq18nz209w6lxz3hy5nxg1hyihwh8gy9";
|
||||||
buildDepends = [
|
buildDepends = [
|
||||||
aeson authenticate blazeHtml blazeMarkup dataDefault emailValidate
|
aeson authenticate blazeHtml blazeMarkup dataDefault emailValidate
|
||||||
fileEmbed hamlet httpConduit httpTypes liftedBase mimeMail network
|
fileEmbed hamlet httpConduit httpTypes liftedBase mimeMail network
|
||||||
|
|||||||
@ -6,8 +6,8 @@
|
|||||||
|
|
||||||
cabal.mkDerivation (self: {
|
cabal.mkDerivation (self: {
|
||||||
pname = "yesod-form";
|
pname = "yesod-form";
|
||||||
version = "1.3.4.2";
|
version = "1.3.4.3";
|
||||||
sha256 = "06qw2hx0iv46xdmkbbw1sgwzvyr82h0v267dxfw19235s9yfzbfg";
|
sha256 = "1yf9kvnlkgfdpv44afj2zwdk8jh382lxj56jvafgw1bxa1hsn408";
|
||||||
buildDepends = [
|
buildDepends = [
|
||||||
aeson attoparsec blazeBuilder blazeHtml blazeMarkup cryptoApi
|
aeson attoparsec blazeBuilder blazeHtml blazeMarkup cryptoApi
|
||||||
dataDefault emailValidate hamlet network persistent resourcet
|
dataDefault emailValidate hamlet network persistent resourcet
|
||||||
|
|||||||
@ -2,65 +2,67 @@
|
|||||||
, attoparsecConduit, authenticate, base64Bytestring
|
, attoparsecConduit, authenticate, base64Bytestring
|
||||||
, baseUnicodeSymbols, blazeBuilder, blazeBuilderConduit, blazeHtml
|
, baseUnicodeSymbols, blazeBuilder, blazeBuilderConduit, blazeHtml
|
||||||
, blazeMarkup, byteable, byteorder, caseInsensitive, cereal
|
, blazeMarkup, byteable, byteorder, caseInsensitive, cereal
|
||||||
, certificate, cipherAes, cipherRc4, clientsession, conduit
|
, certificate, cipherAes, cipherBlowfish, cipherCamellia, cipherDes
|
||||||
, connection, controlMonadLoop, cookie, cprngAes, cryptoApi
|
, cipherRc4, clientsession, conduit, connection, controlMonadLoop
|
||||||
, cryptoCipherTypes, cryptoConduit, cryptohash, cryptohashCryptoapi
|
, cookie, cprngAes, cryptoApi, cryptocipher, cryptoCipherTypes
|
||||||
, cryptoNumbers, cryptoPubkey, cryptoPubkeyTypes, cryptoRandom
|
, cryptoConduit, cryptohash, cryptohashCryptoapi, cryptoNumbers
|
||||||
|
, cryptoPubkey, cryptoPubkeyTypes, cryptoRandom, cryptoRandomApi
|
||||||
, cssText, dataDefault, dataDefaultClass, dataDefaultInstancesBase
|
, cssText, dataDefault, dataDefaultClass, dataDefaultInstancesBase
|
||||||
, dataDefaultInstancesContainers, dataDefaultInstancesDlist
|
, dataDefaultInstancesContainers, dataDefaultInstancesDlist
|
||||||
, dataDefaultInstancesOldLocale, dlist, emailValidate, entropy
|
, dataDefaultInstancesOldLocale, dlist, emailValidate, entropy
|
||||||
, failure, fastLogger, fileEmbed, filesystemConduit, hamlet, hjsmin
|
, esqueleto, failure, fastLogger, fileEmbed, filesystemConduit
|
||||||
, hspec, hspecExpectations, htmlConduit, httpAttoparsec, httpClient
|
, hamlet, hjsmin, hspec, hspecExpectations, htmlConduit
|
||||||
, httpClientConduit, httpClientTls, httpConduit, httpDate
|
, httpAttoparsec, httpClient, httpClientConduit, httpClientTls
|
||||||
, httpTypes, languageJavascript, liftedBase, mimeMail, mimeTypes
|
, httpConduit, httpDate, httpTypes, languageJavascript, liftedBase
|
||||||
, mmorph, monadControl, monadLogger, monadLoops, networkConduit
|
, mimeMail, mimeTypes, mmorph, monadControl, monadLogger
|
||||||
, pathPieces, pem, persistent, persistentTemplate, poolConduit
|
, monadLoops, networkConduit, pathPieces, pem, persistent
|
||||||
, primitive, processConduit, publicsuffixlist, pureMD5, pwstoreFast
|
, persistentTemplate, poolConduit, primitive, processConduit
|
||||||
, quickcheckIo, resourcePool, resourcet, safe, securemem
|
, publicsuffixlist, pureMD5, pwstoreFast, quickcheckIo
|
||||||
, semigroups, setenv, SHA, shakespeare, shakespeareCss
|
, resourcePool, resourcet, safe, scientific, securemem, semigroups
|
||||||
, shakespeareI18n, shakespeareJs, shakespeareText, silently
|
, setenv, SHA, shakespeare, shakespeareCss, shakespeareI18n
|
||||||
, simpleSendfile, skein, socks, stmChans, stringsearch
|
, shakespeareJs, shakespeareText, silently, simpleSendfile, skein
|
||||||
, systemFileio, systemFilepath, tagged, tagsoup, tagstreamConduit
|
, socks, stmChans, stringsearch, systemFileio, systemFilepath
|
||||||
, tls, tlsExtra, transformersBase, unixCompat, unorderedContainers
|
, tagged, tagsoup, tagstreamConduit, tls, tlsExtra
|
||||||
, utf8Light, utf8String, vector, void, wai, waiAppStatic, waiExtra
|
, transformersBase, unixCompat, unorderedContainers, utf8Light
|
||||||
, waiLogger, waiTest, warp, word8, xmlConduit, xmlTypes
|
, utf8String, vector, void, wai, waiAppStatic, waiExtra, waiLogger
|
||||||
, xssSanitize, yaml, yesod, yesodAuth, yesodCore, yesodForm
|
, waiTest, warp, warpTls, word8, xmlConduit, xmlTypes, xssSanitize
|
||||||
, yesodPersistent, yesodRoutes, yesodStatic, yesodTest
|
, yaml, yesod, yesodAuth, yesodCore, yesodForm, yesodPersistent
|
||||||
, zlibBindings, zlibConduit
|
, yesodRoutes, yesodStatic, yesodTest, zlibBindings, zlibConduit
|
||||||
}:
|
}:
|
||||||
|
|
||||||
cabal.mkDerivation (self: {
|
cabal.mkDerivation (self: {
|
||||||
pname = "yesod-platform";
|
pname = "yesod-platform";
|
||||||
version = "1.2.5.3";
|
version = "1.2.6";
|
||||||
sha256 = "0k9srgsnz9cgpxhdk04qz27lqp1xm97bprxjv93j1sxny92v6122";
|
sha256 = "15ixhxim14672hl9cl92sbi94yzv6g6zgg07jvkciixg0hd8xr6p";
|
||||||
buildDepends = [
|
buildDepends = [
|
||||||
aeson ansiTerminal asn1Data asn1Types attoparsec attoparsecConduit
|
aeson ansiTerminal asn1Data asn1Types attoparsec attoparsecConduit
|
||||||
authenticate base64Bytestring baseUnicodeSymbols blazeBuilder
|
authenticate base64Bytestring baseUnicodeSymbols blazeBuilder
|
||||||
blazeBuilderConduit blazeHtml blazeMarkup byteable byteorder
|
blazeBuilderConduit blazeHtml blazeMarkup byteable byteorder
|
||||||
caseInsensitive cereal certificate cipherAes cipherRc4
|
caseInsensitive cereal certificate cipherAes cipherBlowfish
|
||||||
clientsession conduit connection controlMonadLoop cookie cprngAes
|
cipherCamellia cipherDes cipherRc4 clientsession conduit connection
|
||||||
cryptoApi cryptoCipherTypes cryptoConduit cryptohash
|
controlMonadLoop cookie cprngAes cryptoApi cryptocipher
|
||||||
cryptohashCryptoapi cryptoNumbers cryptoPubkey cryptoPubkeyTypes
|
cryptoCipherTypes cryptoConduit cryptohash cryptohashCryptoapi
|
||||||
cryptoRandom cssText dataDefault dataDefaultClass
|
cryptoNumbers cryptoPubkey cryptoPubkeyTypes cryptoRandom
|
||||||
|
cryptoRandomApi cssText dataDefault dataDefaultClass
|
||||||
dataDefaultInstancesBase dataDefaultInstancesContainers
|
dataDefaultInstancesBase dataDefaultInstancesContainers
|
||||||
dataDefaultInstancesDlist dataDefaultInstancesOldLocale dlist
|
dataDefaultInstancesDlist dataDefaultInstancesOldLocale dlist
|
||||||
emailValidate entropy failure fastLogger fileEmbed
|
emailValidate entropy esqueleto failure fastLogger fileEmbed
|
||||||
filesystemConduit hamlet hjsmin hspec hspecExpectations htmlConduit
|
filesystemConduit hamlet hjsmin hspec hspecExpectations htmlConduit
|
||||||
httpAttoparsec httpClient httpClientConduit httpClientTls
|
httpAttoparsec httpClient httpClientConduit httpClientTls
|
||||||
httpConduit httpDate httpTypes languageJavascript liftedBase
|
httpConduit httpDate httpTypes languageJavascript liftedBase
|
||||||
mimeMail mimeTypes mmorph monadControl monadLogger monadLoops
|
mimeMail mimeTypes mmorph monadControl monadLogger monadLoops
|
||||||
networkConduit pathPieces pem persistent persistentTemplate
|
networkConduit pathPieces pem persistent persistentTemplate
|
||||||
poolConduit primitive processConduit publicsuffixlist pureMD5
|
poolConduit primitive processConduit publicsuffixlist pureMD5
|
||||||
pwstoreFast quickcheckIo resourcePool resourcet safe securemem
|
pwstoreFast quickcheckIo resourcePool resourcet safe scientific
|
||||||
semigroups setenv SHA shakespeare shakespeareCss shakespeareI18n
|
securemem semigroups setenv SHA shakespeare shakespeareCss
|
||||||
shakespeareJs shakespeareText silently simpleSendfile skein socks
|
shakespeareI18n shakespeareJs shakespeareText silently
|
||||||
stmChans stringsearch systemFileio systemFilepath tagged tagsoup
|
simpleSendfile skein socks stmChans stringsearch systemFileio
|
||||||
tagstreamConduit tls tlsExtra transformersBase unixCompat
|
systemFilepath tagged tagsoup tagstreamConduit tls tlsExtra
|
||||||
unorderedContainers utf8Light utf8String vector void wai
|
transformersBase unixCompat unorderedContainers utf8Light
|
||||||
waiAppStatic waiExtra waiLogger waiTest warp word8 xmlConduit
|
utf8String vector void wai waiAppStatic waiExtra waiLogger waiTest
|
||||||
xmlTypes xssSanitize yaml yesod yesodAuth yesodCore yesodForm
|
warp warpTls word8 xmlConduit xmlTypes xssSanitize yaml yesod
|
||||||
yesodPersistent yesodRoutes yesodStatic yesodTest zlibBindings
|
yesodAuth yesodCore yesodForm yesodPersistent yesodRoutes
|
||||||
zlibConduit
|
yesodStatic yesodTest zlibBindings zlibConduit
|
||||||
];
|
];
|
||||||
jailbreak = true;
|
jailbreak = true;
|
||||||
meta = {
|
meta = {
|
||||||
|
|||||||
20
pkgs/development/libraries/isl/0.12.2.nix
Normal file
20
pkgs/development/libraries/isl/0.12.2.nix
Normal file
@ -0,0 +1,20 @@
|
|||||||
|
{ stdenv, fetchurl, gmp }:
|
||||||
|
|
||||||
|
stdenv.mkDerivation rec {
|
||||||
|
name = "isl-0.12.2"; # CLooG 0.16.3 fails to build with ISL 0.08.
|
||||||
|
|
||||||
|
src = fetchurl {
|
||||||
|
url = "http://isl.gforge.inria.fr/${name}.tar.bz2";
|
||||||
|
sha256 = "1d0zs64yw6fzs6b7kxq6nh9kvas16h8b43agwh30118jjzpdpczl";
|
||||||
|
};
|
||||||
|
|
||||||
|
buildInputs = [ gmp ];
|
||||||
|
|
||||||
|
meta = {
|
||||||
|
homepage = http://www.kotnet.org/~skimo/isl/;
|
||||||
|
license = "LGPLv2.1";
|
||||||
|
description = "A library for manipulating sets and relations of integer points bounded by linear constraints";
|
||||||
|
maintainers = [ stdenv.lib.maintainers.shlevy ];
|
||||||
|
platforms = stdenv.lib.platforms.all;
|
||||||
|
};
|
||||||
|
}
|
||||||
@ -1,18 +1,21 @@
|
|||||||
{ stdenv, fetchurl_gnome, glib, pkgconfig, gobjectIntrospection }:
|
{ stdenv, fetchurl_gnome, glib, pkgconfig, gobjectIntrospection, dbus }:
|
||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
name = src.pkgname;
|
name = src.pkgname;
|
||||||
|
|
||||||
src = fetchurl_gnome {
|
src = fetchurl_gnome {
|
||||||
project = "json-glib";
|
project = "json-glib";
|
||||||
major = "0"; minor = "14"; patchlevel = "2"; extension = "xz";
|
major = "0";
|
||||||
sha256 = "19wlpsbdnm3mq2a6yjpzj0cwrmlkarp2m5x6g63b0r2n7vxaa5mq";
|
minor = "16";
|
||||||
|
patchlevel = "2";
|
||||||
|
extension = "xz";
|
||||||
|
sha256 = "0b22yw0n87mg7a5lkqw1d7xqnm8qj1bwy0wklv9b2yn29qv7am59";
|
||||||
};
|
};
|
||||||
|
|
||||||
configureflags= " --with-introspection " ;
|
configureflags= "--with-introspection" ;
|
||||||
|
|
||||||
propagatedBuildInputs = [ glib ];
|
propagatedBuildInputs = [ glib gobjectIntrospection ];
|
||||||
nativeBuildInputs = [ pkgconfig gobjectIntrospection];
|
nativeBuildInputs = [ pkgconfig ];
|
||||||
|
|
||||||
meta = {
|
meta = {
|
||||||
homepage = http://live.gnome.org/JsonGlib;
|
homepage = http://live.gnome.org/JsonGlib;
|
||||||
|
|||||||
@ -1,46 +1,26 @@
|
|||||||
{ stdenv, fetchsvn, cmake, libunwind }:
|
{ stdenv, fetchurl, fetchsvn, cmake, libcxxabi }:
|
||||||
|
|
||||||
let rev = "190100"; in
|
let
|
||||||
|
version = "3.4";
|
||||||
|
|
||||||
stdenv.mkDerivation rec {
|
in stdenv.mkDerivation rec {
|
||||||
name = "libc++-pre${rev}";
|
name = "libc++-${version}";
|
||||||
|
|
||||||
src = fetchsvn {
|
src = fetchurl {
|
||||||
url = "http://llvm.org/svn/llvm-project/libcxx/trunk";
|
url = "http://llvm.org/releases/${version}/libcxx-${version}.src.tar.gz";
|
||||||
inherit rev;
|
sha256 = "1sqd5qhqj7qnn9zjxx9bv7ky4f7xgmh9sbgd53y1kszhg41217xx";
|
||||||
sha256 = "0hnfvzzrkj797kp9sk2yncvbmiyx0d72k8bys3z7l6i47d37xv03";
|
|
||||||
};
|
};
|
||||||
|
|
||||||
cxxabi = fetchsvn {
|
buildInputs = [ cmake libcxxabi ];
|
||||||
url = "http://llvm.org/svn/llvm-project/libcxxabi/trunk";
|
|
||||||
inherit rev;
|
|
||||||
sha256 = "1kdyvngwd229cgmcqpawaf0qizas8bqc0g8s08fmbgwsrh1qrryp";
|
|
||||||
};
|
|
||||||
|
|
||||||
buildInputs = [ cmake ];
|
|
||||||
|
|
||||||
preConfigure = ''
|
|
||||||
sed -i 's/;cxa_demangle.h//' CMakeLists.txt
|
|
||||||
cp -R ${cxxabi} cxxabi
|
|
||||||
chmod u+w -R cxxabi # umm
|
|
||||||
(export NIX_CFLAGS_COMPILE="-I${libunwind}/include -I$PWD/include";
|
|
||||||
export NIX_CFLAGS_LINK="-L${libunwind}/lib -lunwind";
|
|
||||||
cd cxxabi/lib
|
|
||||||
sed -e s,-lstdc++,, -i buildit # do not link to libstdc++!
|
|
||||||
./buildit
|
|
||||||
mkdir -p $out/lib && cp libc++abi.so.1.0 $out/lib
|
|
||||||
cd $out/lib
|
|
||||||
ln -s libc++abi.so.1.0 libc++abi.so
|
|
||||||
ln -s libc++abi.so.1.0 libc++abi.so.1)
|
|
||||||
'';
|
|
||||||
|
|
||||||
cmakeFlags = [ "-DCMAKE_BUILD_TYPE=Release"
|
cmakeFlags = [ "-DCMAKE_BUILD_TYPE=Release"
|
||||||
"-DLIBCXX_LIBCXXABI_INCLUDE_PATHS=${cxxabi}/include"
|
"-DLIBCXX_LIBCXXABI_INCLUDE_PATHS=${libcxxabi}/include"
|
||||||
"-DLIBCXX_CXX_ABI=libcxxabi" ];
|
"-DLIBCXX_CXX_ABI=libcxxabi" ];
|
||||||
buildPhase = ''NIX_CFLAGS_LINK="-L$out/lib -lc++abi" make'';
|
|
||||||
|
|
||||||
enableParallelBuilding = true;
|
enableParallelBuilding = true;
|
||||||
|
|
||||||
|
passthru.abi = libcxxabi;
|
||||||
|
|
||||||
meta = {
|
meta = {
|
||||||
homepage = http://libcxx.llvm.org/;
|
homepage = http://libcxx.llvm.org/;
|
||||||
description = "A new implementation of the C++ standard library, targeting C++11";
|
description = "A new implementation of the C++ standard library, targeting C++11";
|
||||||
@ -49,4 +29,3 @@ stdenv.mkDerivation rec {
|
|||||||
platforms = stdenv.lib.platforms.all;
|
platforms = stdenv.lib.platforms.all;
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
39
pkgs/development/libraries/libc++abi/default.nix
Normal file
39
pkgs/development/libraries/libc++abi/default.nix
Normal file
@ -0,0 +1,39 @@
|
|||||||
|
{ stdenv, fetchsvn, libcxx, libunwind }:
|
||||||
|
let
|
||||||
|
rev = "199626";
|
||||||
|
in stdenv.mkDerivation {
|
||||||
|
name = "libcxxabi-pre-${rev}";
|
||||||
|
|
||||||
|
src = fetchsvn {
|
||||||
|
url = http://llvm.org/svn/llvm-project/libcxxabi/trunk;
|
||||||
|
rev = "199626";
|
||||||
|
sha256 = "0h1x1s40x5r65ar53rv34lmgcfil3zxaknqr64dka1mz29xhhrxy";
|
||||||
|
};
|
||||||
|
|
||||||
|
NIX_CFLAGS_LINK="-L${libunwind}/lib -lunwind";
|
||||||
|
|
||||||
|
postUnpack = ''
|
||||||
|
unpackFile ${libcxx.src}
|
||||||
|
export NIX_CFLAGS_COMPILE="-I${libunwind}/include -I$PWD/include -I$(readlink -f libcxx-*)/include"
|
||||||
|
'';
|
||||||
|
|
||||||
|
installPhase = ''
|
||||||
|
install -d -m 755 $out/include $out/lib
|
||||||
|
install -m 644 lib/libc++abi.so.1.0 $out/lib
|
||||||
|
install -m 644 include/cxxabi.h $out/include
|
||||||
|
ln -s libc++abi.so.1.0 $out/lib/libc++abi.so
|
||||||
|
ln -s libc++abi.so.1.0 $out/lib/libc++abi.so.1
|
||||||
|
'';
|
||||||
|
|
||||||
|
patchPhase = "sed -e s,-lstdc++,, -i lib/buildit";
|
||||||
|
|
||||||
|
buildPhase = "(cd lib; ./buildit)";
|
||||||
|
|
||||||
|
meta = {
|
||||||
|
homepage = http://libcxxabi.llvm.org/;
|
||||||
|
description = "A new implementation of low level support for a standard C++ library";
|
||||||
|
license = "BSD";
|
||||||
|
maintainers = stdenv.lib.maintainers.shlevy;
|
||||||
|
platforms = stdenv.lib.platforms.all;
|
||||||
|
};
|
||||||
|
}
|
||||||
40
pkgs/development/libraries/libossp-uuid/default.nix
Normal file
40
pkgs/development/libraries/libossp-uuid/default.nix
Normal file
@ -0,0 +1,40 @@
|
|||||||
|
{stdenv, fetchurl}:
|
||||||
|
|
||||||
|
let version = "1.6.2"; in
|
||||||
|
|
||||||
|
stdenv.mkDerivation {
|
||||||
|
name = "libossp-uuid-${version}";
|
||||||
|
|
||||||
|
src = fetchurl {
|
||||||
|
url = "ftp://ftp.ossp.org/pkg/lib/uuid/uuid-${version}.tar.gz";
|
||||||
|
sha256= "11a615225baa5f8bb686824423f50e4427acd3f70d394765bdff32801f0fd5b0";
|
||||||
|
};
|
||||||
|
|
||||||
|
meta = {
|
||||||
|
homepage = http://www.ossp.org/pkg/lib/uuid/;
|
||||||
|
description = "OSSP uuid ISO-C and C++ shared library";
|
||||||
|
longDescription =
|
||||||
|
''
|
||||||
|
OSSP uuid is a ISO-C:1999 application programming interface
|
||||||
|
(API) and corresponding command line interface (CLI) for the
|
||||||
|
generation of DCE 1.1, ISO/IEC 11578:1996 and RFC 4122
|
||||||
|
compliant Universally Unique Identifier (UUID). It supports
|
||||||
|
DCE 1.1 variant UUIDs of version 1 (time and node based),
|
||||||
|
version 3 (name based, MD5), version 4 (random number based)
|
||||||
|
and version 5 (name based, SHA-1). Additional API bindings are
|
||||||
|
provided for the languages ISO-C++:1998, Perl:5 and
|
||||||
|
PHP:4/5. Optional backward compatibility exists for the ISO-C
|
||||||
|
DCE-1.1 and Perl Data::UUID APIs.
|
||||||
|
|
||||||
|
UUIDs are 128 bit numbers which are intended to have a high
|
||||||
|
likelihood of uniqueness over space and time and are
|
||||||
|
computationally difficult to guess. They are globally unique
|
||||||
|
identifiers which can be locally generated without contacting
|
||||||
|
a global registration authority. UUIDs are intended as unique
|
||||||
|
identifiers for both mass tagging objects with an extremely
|
||||||
|
short lifetime and to reliably identifying very persistent
|
||||||
|
objects across a network.
|
||||||
|
'';
|
||||||
|
license = stdenv.lib.licenses.bsd2;
|
||||||
|
};
|
||||||
|
}
|
||||||
@ -1,13 +1,13 @@
|
|||||||
{stdenv, fetchurl, bash, yasm, which, perl}:
|
{stdenv, fetchurl, bash, yasm, which, perl}:
|
||||||
|
|
||||||
let version = "1.2.0";
|
let version = "1.3.0";
|
||||||
in
|
in
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
name = "libvpx-" + version;
|
name = "libvpx-" + version;
|
||||||
|
|
||||||
src = fetchurl { # sadly, there's no official tarball for this release
|
src = fetchurl { # sadly, there's no official tarball for this release
|
||||||
url = "ftp://ftp.archlinux.org/other/libvpx/libvpx-${version}.tar.xz";
|
url = "http://webm.googlecode.com/files/libvpx-v1.3.0.tar.bz2";
|
||||||
sha256 = "02k9ylswgr2hvjqmg422fa9ggym0g94gzwb14nnckly698rvjc50";
|
sha1 = "191b95817aede8c136cc3f3745fb1b8c50e6d5dc";
|
||||||
};
|
};
|
||||||
|
|
||||||
patchPhase = ''
|
patchPhase = ''
|
||||||
@ -29,7 +29,7 @@ stdenv.mkDerivation rec {
|
|||||||
[ "--disable-install-srcs" "--disable-install-docs" "--disable-examples"
|
[ "--disable-install-srcs" "--disable-install-docs" "--disable-examples"
|
||||||
"--enable-vp8" "--enable-runtime-cpu-detect" "--enable-pic" ]
|
"--enable-vp8" "--enable-runtime-cpu-detect" "--enable-pic" ]
|
||||||
# --enable-shared is only supported on ELF
|
# --enable-shared is only supported on ELF
|
||||||
++ stdenv.lib.optional (!stdenv.isDarwin) "--enable-shared";
|
++ stdenv.lib.optional (!stdenv.isDarwin) "--disable-static --enable-shared";
|
||||||
|
|
||||||
installPhase = ''
|
installPhase = ''
|
||||||
make quiet=false DIST_DIR=$out install
|
make quiet=false DIST_DIR=$out install
|
||||||
|
|||||||
19
pkgs/development/libraries/libwacom/default.nix
Normal file
19
pkgs/development/libraries/libwacom/default.nix
Normal file
@ -0,0 +1,19 @@
|
|||||||
|
{ fetchurl, stdenv, glib, pkgconfig, udev }:
|
||||||
|
|
||||||
|
stdenv.mkDerivation rec {
|
||||||
|
name = "libwacom-0.7.1";
|
||||||
|
|
||||||
|
src = fetchurl {
|
||||||
|
url = "mirror://sourceforge/linuxwacom/libwacom/${name}.tar.bz2";
|
||||||
|
sha256 = "1agdaa1bv5mp4l32qgsw63swnnv0p279jiy9madgw4y3d8d12dwm";
|
||||||
|
};
|
||||||
|
|
||||||
|
buildInputs = [ glib pkgconfig udev ];
|
||||||
|
|
||||||
|
meta = with stdenv.lib; {
|
||||||
|
platforms = platforms.linux;
|
||||||
|
homepage = http://sourceforge.net/projects/linuxwacom/;
|
||||||
|
description = "libraries, configuration, and diagnostic tools for Wacom tablets running under Linux";
|
||||||
|
};
|
||||||
|
|
||||||
|
}
|
||||||
@ -1,4 +1,4 @@
|
|||||||
{ stdenv, fetchurl, xz, qt4, vlc, automoc4, cmake, phonon }:
|
{ stdenv, fetchurl, xz, qt4, vlc, automoc4, cmake, pkgconfig, phonon }:
|
||||||
|
|
||||||
let
|
let
|
||||||
pname = "phonon-backend-vlc";
|
pname = "phonon-backend-vlc";
|
||||||
@ -14,7 +14,7 @@ stdenv.mkDerivation {
|
|||||||
sha256 = "1rhzc3d188l6ygxgfxwikscj71pyy0nchzikvkkq465r9ajavdgd";
|
sha256 = "1rhzc3d188l6ygxgfxwikscj71pyy0nchzikvkkq465r9ajavdgd";
|
||||||
};
|
};
|
||||||
|
|
||||||
nativeBuildInputs = [ cmake automoc4 xz ];
|
nativeBuildInputs = [ cmake pkgconfig automoc4 xz ];
|
||||||
|
|
||||||
buildInputs = [ qt4 vlc_ phonon ];
|
buildInputs = [ qt4 vlc_ phonon ];
|
||||||
|
|
||||||
|
|||||||
@ -4,14 +4,14 @@
|
|||||||
}:
|
}:
|
||||||
|
|
||||||
let
|
let
|
||||||
version = "0.24.4"; # even major numbers are stable
|
version = "0.24.5"; # even major numbers are stable
|
||||||
sha256 = "1qh1gk6hq5cfpkqyxxgkpyl78na8dckmh6zbgsqbpw762yd518y8";
|
sha256 = "114zfm4771iq25wa4bsg4nc2gnr6waaj8936wd23r4hc2084jrd2";
|
||||||
|
|
||||||
qtcairo_patches =
|
qtcairo_patches =
|
||||||
let qtcairo = fetchgit { # the version for poppler-0.22
|
let qtcairo = fetchgit { # the version for poppler-0.24
|
||||||
url = "git://github.com/giddie/poppler-qt4-cairo-backend.git";
|
url = "git://github.com/giddie/poppler-qt4-cairo-backend.git";
|
||||||
rev = "ad9a9ba0628df33522f4b7722cb0cd027269babe";
|
rev = "c4578cde09834e0d70873f63b1c2a410f66bb4f9";
|
||||||
sha256 = "072p7x9902avg2r1ma5br97q8nm8sbk19y0qi4b4g9x2xj2fpajq";
|
sha256 = "07bs2phmp7f4mqrwqz2bgyw2gw7s00mwsm548bsikyz1cbj7fl93";
|
||||||
}; in
|
}; in
|
||||||
[ "${qtcairo}/0001-Cairo-backend-added-to-Qt4-wrapper.patch"
|
[ "${qtcairo}/0001-Cairo-backend-added-to-Qt4-wrapper.patch"
|
||||||
"${qtcairo}/0002-Setting-default-Qt4-backend-to-Cairo.patch"
|
"${qtcairo}/0002-Setting-default-Qt4-backend-to-Cairo.patch"
|
||||||
|
|||||||
@ -2,16 +2,14 @@
|
|||||||
|
|
||||||
let
|
let
|
||||||
ocaml_version = (builtins.parseDrvName ocaml.name).version;
|
ocaml_version = (builtins.parseDrvName ocaml.name).version;
|
||||||
version = "0.8.3";
|
|
||||||
in
|
in
|
||||||
|
|
||||||
stdenv.mkDerivation {
|
stdenv.mkDerivation {
|
||||||
name = "camomile-${version}";
|
name = "camomile-0.8.5";
|
||||||
|
|
||||||
src = fetchurl {
|
src = fetchurl {
|
||||||
url = "mirror://sourceforge/camomile/camomile-${version}.tar.bz2";
|
url = https://github.com/yoriyuki/Camomile/releases/download/rel-0.8.5/camomile-0.8.5.tar.bz2;
|
||||||
#sha256 = "0x43pjxx70kgip86mmdn08s97k4qzdqc8i79xfyyx28smy1bsa00";
|
sha256 = "003ikpvpaliy5hblhckfmln34zqz0mk3y2m1fqvbjngh3h2np045";
|
||||||
sha256 = "0yzj6j88aqrkbcynqh1d7r54670m1sqf889vdcgk143w85fxdj4l";
|
|
||||||
};
|
};
|
||||||
|
|
||||||
buildInputs = [ocaml findlib];
|
buildInputs = [ocaml findlib];
|
||||||
@ -19,9 +17,9 @@ stdenv.mkDerivation {
|
|||||||
createFindlibDestdir = true;
|
createFindlibDestdir = true;
|
||||||
|
|
||||||
meta = {
|
meta = {
|
||||||
homepage = http://camomile.sourceforge.net/;
|
homepage = https://github.com/yoriyuki/Camomile/tree/master/Camomile;
|
||||||
description = "A comprehensive Unicode library for OCaml";
|
description = "A comprehensive Unicode library for OCaml";
|
||||||
license = "LGPL";
|
license = stdenv.lib.licenses.lgpl21;
|
||||||
platforms = ocaml.meta.platforms;
|
platforms = ocaml.meta.platforms;
|
||||||
maintainers = [
|
maintainers = [
|
||||||
stdenv.lib.maintainers.z77z
|
stdenv.lib.maintainers.z77z
|
||||||
|
|||||||
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in New Issue
Block a user